From patchwork Sun Apr 17 18:30:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 562900 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp1889940map; Sun, 17 Apr 2022 12:11:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0UnFoLzsi8ttTerhc8lHCvzJ3+xsr4H2uqK8YdLOlJ6YvFk/Gs17idvyWV/fvrtnMY6kC X-Received: by 2002:a05:6214:5189:b0:446:5077:7f75 with SMTP id kl9-20020a056214518900b0044650777f75mr3262840qvb.37.1650222685997; Sun, 17 Apr 2022 12:11:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650222685; cv=none; d=google.com; s=arc-20160816; b=o8k+CH4vt1l6elVc4xzLu+U+eMhdZaeU020Mx9Nld7jtb3JKwFFmYxG3v0fukepTcK /QI2s4EerSDpuQSQCOv9RGKPICV9XJPYalR1Pd8h0GaHxpstN3pUqafvGcF/OdEsKnI9 YWiAzc5279N19tTQvRrKaTImUwT/OoEPug5WM8x692NO0magp2hHiONILOn7RVNBVNED x2Iogso82TmbgFLq67vnVjkOh0pTJLk9CHbMfBSC1sJEruj8CEslOupbdDKIzSykXT81 BVKDS70SyiWXy80M69onvXHWShh4LzqyHjwhwiAWLX4RaQ/7heByWcbHyQWu0EYM7ELC Ji2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=b1JYMpL7TO2R6BVJG41yV+OL5PQM9UAMtxfbal+NfyA=; b=pibkzsY3aF2eR/OoHrxZCI0yUZLiqu8dIUpfIpLadBVHksO9mDUiMJnCPvZzXvKX3j cmOx+pO37e3er90zhjwTMPk6qx/eZX/N4r2zDJ4cud1vG8seJhJsr9tw3LOsk4jJ8ifR xhnB1o0yGB7qyeAat0j1smtQOj7LcD/RdQf4YYDd02tlYhzMpafiJdhrlx+QZOOKOxjX 0/djCy7JoJTDMQgDMHfXo3QqyvgjWTW+JgPV8j9Jxrt4285XmmvjWilxcVW0ZSD5apFq 5W2YUfxYQHksYePpSbxaBtPWQTIK8r11iFz0yYZ8I3RCACKaNp8uucEiHY8HU740pUYJ vSdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="yfe6HtL/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o2-20020ac85a42000000b002f1f8e1397csi1079175qta.406.2022.04.17.12.11.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Apr 2022 12:11:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="yfe6HtL/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngAIv-0006P0-Jq for patch@linaro.org; Sun, 17 Apr 2022 15:11:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng9fX-0000U1-80 for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:30:49 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:43791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng9fU-0001oL-Uh for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:30:42 -0400 Received: by mail-pj1-x102f.google.com with SMTP id j8-20020a17090a060800b001cd4fb60dccso12293485pjj.2 for ; Sun, 17 Apr 2022 11:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b1JYMpL7TO2R6BVJG41yV+OL5PQM9UAMtxfbal+NfyA=; b=yfe6HtL/zw68n5sFn0qjUCyH7rMnaJx6Moi2MG888bSwDT1+AIFmoLsNai2XLXPW0Q fmc/NWt5NJtx0AQ/LVqE2MKSy0se9L/zn2W4UDZ/k7kfRsU+ZxKa9GIUEc77Zz6IFjR5 whnjGLiiYFhcB7BL0h6tqz9iMtKYiuRA4JJAWXktgFuKuMzcZP95eQleSGmP9cmvcqBP hHWZjuSZC9SqUXZ40INQRw3+9ClO9AUc2acHRxrxkAExKJEHCDisx+tkhXAScQLHfJ5T D4NCiEKRRcoop/OUU8MHXS0Df47j1tK5/o6OgEXSyjGTyPVOuPqYaC9r39XH/4W+5c5q H0kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b1JYMpL7TO2R6BVJG41yV+OL5PQM9UAMtxfbal+NfyA=; b=qIfvfn7EJ3XaowdEyQ9eBw8bG0HYcBwKso3FRhtsnqdLOUfA5BZfiX4CsMg80YVSHW mp+owksuMTc3OYxcySieD2RtImhsimWky9F+OIYywJ2yVEnggGkN7FdC+zR1XPTxihXB 0KSema5ZfUT1b8kCeh2jsak//yVov8iKmPpfA9a8tkFVh8XNNaMh1PIhWAqbT1JH8OLY 8Tm1jZchrbJYnI/1qm/2diVM6zxxD4SBDkGdpdmnKe+GeXjEI45zr4r6y+zfIXJ/GvpB xGsqcB46TOl+7uzlJT2i5iE7Dxq/pXVO4WWerqC2c611iIDniMqHsSycrbqkGmfh2jvu q7dw== X-Gm-Message-State: AOAM533SF8ophCbLwtqVqy4DqchYqaba0s8Eeuq5hfY6oN96B+1TfalE d10tzMcIK+EEQMjISkKOsncKycmckmc4YA== X-Received: by 2002:a17:902:b10c:b0:154:a3b5:b33a with SMTP id q12-20020a170902b10c00b00154a3b5b33amr7652514plr.3.1650220239650; Sun, 17 Apr 2022 11:30:39 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id on10-20020a17090b1d0a00b001d08a7d569csm8154011pjb.56.2022.04.17.11.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 11:30:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 22/39] linux-user: Expand log_page_dump inline Date: Sun, 17 Apr 2022 11:30:02 -0700 Message-Id: <20220417183019.755276-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417183019.755276-1-richard.henderson@linaro.org> References: <20220417183019.755276-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have extra stuff to log at the same time. Hoist the qemu_log_lock/unlock to the caller and use fprintf. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/log.h | 15 --------------- linux-user/main.c | 43 +++++++++++++++++++++++++++++-------------- linux-user/mmap.c | 7 ++++++- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index 06ab9841ee..ad0a40cfeb 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -42,19 +42,4 @@ static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags) } } -#ifdef NEED_CPU_H -#if defined(CONFIG_USER_ONLY) -/* page_dump() output to the log file: */ -static inline void log_page_dump(const char *operation) -{ - FILE *logfile = qemu_log_trylock(); - if (logfile) { - fprintf(logfile, "page layout changed following %s\n", operation); - page_dump(logfile); - } - qemu_log_unlock(logfile); -} -#endif -#endif - #endif diff --git a/linux-user/main.c b/linux-user/main.c index 6aed4929ab..d263b2a669 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -857,21 +857,36 @@ int main(int argc, char **argv, char **envp) g_free(target_environ); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - qemu_log("guest_base %p\n", (void *)guest_base); - log_page_dump("binary load"); + FILE *f = qemu_log_trylock(); + if (f) { + fprintf(f, "guest_base %p\n", (void *)guest_base); + fprintf(f, "page layout changed following binary load\n"); + page_dump(f); - qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); - qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); - qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", info->start_code); - qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", info->start_data); - qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); - qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", info->start_stack); - qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); - qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); - qemu_log("argv_start 0x" TARGET_ABI_FMT_lx "\n", info->arg_start); - qemu_log("env_start 0x" TARGET_ABI_FMT_lx "\n", - info->arg_end + (abi_ulong)sizeof(abi_ulong)); - qemu_log("auxv_start 0x" TARGET_ABI_FMT_lx "\n", info->saved_auxv); + fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", + info->start_brk); + fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", + info->end_code); + fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n", + info->start_code); + fprintf(f, "start_data 0x" TARGET_ABI_FMT_lx "\n", + info->start_data); + fprintf(f, "end_data 0x" TARGET_ABI_FMT_lx "\n", + info->end_data); + fprintf(f, "start_stack 0x" TARGET_ABI_FMT_lx "\n", + info->start_stack); + fprintf(f, "brk 0x" TARGET_ABI_FMT_lx "\n", + info->brk); + fprintf(f, "entry 0x" TARGET_ABI_FMT_lx "\n", + info->entry); + fprintf(f, "argv_start 0x" TARGET_ABI_FMT_lx "\n", + info->arg_start); + fprintf(f, "env_start 0x" TARGET_ABI_FMT_lx "\n", + info->arg_end + (abi_ulong)sizeof(abi_ulong)); + fprintf(f, "auxv_start 0x" TARGET_ABI_FMT_lx "\n", + info->saved_auxv); + qemu_log_unlock(f); + } } target_set_brk(info->brk); diff --git a/linux-user/mmap.c b/linux-user/mmap.c index c125031b90..bbb2c2e178 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -630,7 +630,12 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot, the_end: trace_target_mmap_complete(start); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - log_page_dump(__func__); + FILE *f = qemu_log_trylock(); + if (f) { + fprintf(f, "page layout changed following mmap\n"); + page_dump(f); + qemu_log_unlock(f); + } } tb_invalidate_phys_range(start, start + len); mmap_unlock();