From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 33/38] linux-user: Emulate /proc/self/smaps
Date: Mon, 3 Jul 2023 14:44:22 +0100 [thread overview]
Message-ID: <20230703134427.1389440-34-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230703134427.1389440-1-alex.bennee@linaro.org>
From: Ilya Leoshkevich <iii@linux.ibm.com>
/proc/self/smaps is an extension of /proc/self/maps: it provides the
same lines, plus additional information about each range.
GDB uses /proc/self/smaps when available, which means that
generate-core-file tries it first before falling back to
/proc/self/maps. This, in turn, causes it to dump the host mappings,
since /proc/self/smaps is not emulated and is just passed through.
Fix by emulating /proc/self/smaps. Provide true values only for
Size, KernelPageSize, MMUPageSize and VmFlags. Leave all other values
at 0, which is a valid conservative estimate.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230621203627.1808446-4-iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230630180423.558337-34-alex.bennee@linaro.org>
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ecd9f5e23d..08162cc966 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8042,7 +8042,36 @@ static int open_self_cmdline(CPUArchState *cpu_env, int fd)
return 0;
}
-static int open_self_maps(CPUArchState *cpu_env, int fd)
+static void show_smaps(int fd, unsigned long size)
+{
+ unsigned long page_size_kb = TARGET_PAGE_SIZE >> 10;
+ unsigned long size_kb = size >> 10;
+
+ dprintf(fd, "Size: %lu kB\n"
+ "KernelPageSize: %lu kB\n"
+ "MMUPageSize: %lu kB\n"
+ "Rss: 0 kB\n"
+ "Pss: 0 kB\n"
+ "Pss_Dirty: 0 kB\n"
+ "Shared_Clean: 0 kB\n"
+ "Shared_Dirty: 0 kB\n"
+ "Private_Clean: 0 kB\n"
+ "Private_Dirty: 0 kB\n"
+ "Referenced: 0 kB\n"
+ "Anonymous: 0 kB\n"
+ "LazyFree: 0 kB\n"
+ "AnonHugePages: 0 kB\n"
+ "ShmemPmdMapped: 0 kB\n"
+ "FilePmdMapped: 0 kB\n"
+ "Shared_Hugetlb: 0 kB\n"
+ "Private_Hugetlb: 0 kB\n"
+ "Swap: 0 kB\n"
+ "SwapPss: 0 kB\n"
+ "Locked: 0 kB\n"
+ "THPeligible: 0\n", size_kb, page_size_kb, page_size_kb);
+}
+
+static int open_self_maps_1(CPUArchState *cpu_env, int fd, bool smaps)
{
CPUState *cpu = env_cpu(cpu_env);
TaskState *ts = cpu->opaque;
@@ -8089,6 +8118,18 @@ static int open_self_maps(CPUArchState *cpu_env, int fd)
} else {
dprintf(fd, "\n");
}
+ if (smaps) {
+ show_smaps(fd, max - min);
+ dprintf(fd, "VmFlags:%s%s%s%s%s%s%s%s\n",
+ (flags & PAGE_READ) ? " rd" : "",
+ (flags & PAGE_WRITE_ORG) ? " wr" : "",
+ (flags & PAGE_EXEC) ? " ex" : "",
+ e->is_priv ? "" : " sh",
+ (flags & PAGE_READ) ? " mr" : "",
+ (flags & PAGE_WRITE_ORG) ? " mw" : "",
+ (flags & PAGE_EXEC) ? " me" : "",
+ e->is_priv ? "" : " ms");
+ }
}
}
@@ -8103,11 +8144,25 @@ static int open_self_maps(CPUArchState *cpu_env, int fd)
" --xp 00000000 00:00 0",
TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE);
dprintf(fd, "%*s%s\n", 73 - count, "", "[vsyscall]");
+ if (smaps) {
+ show_smaps(fd, TARGET_PAGE_SIZE);
+ dprintf(fd, "VmFlags: ex\n");
+ }
#endif
return 0;
}
+static int open_self_maps(CPUArchState *cpu_env, int fd)
+{
+ return open_self_maps_1(cpu_env, fd, false);
+}
+
+static int open_self_smaps(CPUArchState *cpu_env, int fd)
+{
+ return open_self_maps_1(cpu_env, fd, true);
+}
+
static int open_self_stat(CPUArchState *cpu_env, int fd)
{
CPUState *cpu = env_cpu(cpu_env);
@@ -8459,6 +8514,7 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *pathname,
const struct fake_open *fake_open;
static const struct fake_open fakes[] = {
{ "maps", open_self_maps, is_proc_myself },
+ { "smaps", open_self_smaps, is_proc_myself },
{ "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself },
--
2.39.2
next prev parent reply other threads:[~2023-07-03 13:54 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-03 13:43 [PULL 00/38] maintainer updates for 8.1: testing, fuzz, plugins, docs, gdbstub Alex Bennée
2023-07-03 13:43 ` [PULL 01/38] gitlab: explicit set artifacts publishing criteria Alex Bennée
2023-07-03 13:43 ` [PULL 02/38] gitlab: ensure coverage job also publishes meson log Alex Bennée
2023-07-03 13:43 ` [PULL 03/38] gitlab: reduce testing scope of check-gcov Alex Bennée
2023-07-03 13:43 ` [PULL 04/38] docs/devel: remind developers to run CI container pipeline when updating images Alex Bennée
2023-07-03 13:43 ` [PULL 05/38] tests/tcg: add mechanism to handle plugin arguments Alex Bennée
2023-07-03 13:43 ` [PULL 06/38] qemu-keymap: properly check return from xkb_keymap_mod_get_index Alex Bennée
2023-07-03 13:43 ` [PULL 07/38] scripts/oss-fuzz: add a suppression for keymap Alex Bennée
2023-07-03 13:43 ` [PULL 08/38] tests/qtests: clean-up and fix leak in generic_fuzz Alex Bennée
2023-07-03 13:43 ` [PULL 09/38] tests/docker: add test-fuzz Alex Bennée
2023-07-03 13:43 ` [PULL 10/38] Makefile: add lcitool-refresh to UNCHECKED_GOALS Alex Bennée
2023-07-03 13:44 ` [PULL 11/38] tests/lcitool: update to latest version Alex Bennée
2023-07-03 13:44 ` [PULL 12/38] tests/lcitool: Bump fedora container versions Alex Bennée
2023-07-03 13:44 ` [PULL 13/38] tests/lcitool: add an explicit gcc-native package Alex Bennée
2023-07-03 13:44 ` [PULL 14/38] tests/lcitool: introduce qemu-minimal Alex Bennée
2023-07-03 13:44 ` [PULL 15/38] tests/docker: convert riscv64-cross to lcitool Alex Bennée
2023-07-03 13:44 ` [PULL 16/38] tests/avocado: update firmware to enable sbsa-ref/max Alex Bennée
2023-07-03 13:44 ` [PULL 17/38] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable Alex Bennée
2023-07-03 13:44 ` [PULL 18/38] target/arm: make arm_casq_ptw CONFIG_TCG only Alex Bennée
2023-07-03 13:44 ` [PULL 19/38] plugins: force slow path when plugins instrument memory ops Alex Bennée
2023-07-03 13:44 ` [PULL 20/38] plugins: fix memory leak while parsing options Alex Bennée
2023-07-03 13:44 ` [PULL 21/38] plugins: update lockstep to use g_memdup2 Alex Bennée
2023-11-13 10:46 ` Thomas Huth
2023-11-13 11:40 ` Alex Bennée
2023-11-13 11:55 ` Daniel P. Berrangé
2023-11-13 12:21 ` Thomas Huth
2023-07-03 13:44 ` [PULL 22/38] docs/devel: add some front matter to the devel index Alex Bennée
2023-07-03 13:44 ` [PULL 23/38] include/migration: mark vmstate_register() as a legacy function Alex Bennée
2023-07-03 13:44 ` [PULL 24/38] include/hw/qdev-core: fixup kerneldoc annotations Alex Bennée
2023-07-03 13:44 ` [PULL 25/38] docs/devel/qom.rst: Correct code style Alex Bennée
2023-07-03 13:44 ` [PULL 26/38] docs/devel: split qom-api reference into new file Alex Bennée
2023-07-03 13:44 ` [PULL 27/38] docs/devel: introduce some key concepts for QOM development Alex Bennée
2023-07-03 13:44 ` [PULL 28/38] gdbstub: lightly refactor connection to avoid snprintf Alex Bennée
2023-07-03 13:44 ` [PULL 29/38] gdbstub: Permit reverse step/break to provide stop response Alex Bennée
2023-07-08 6:17 ` Michael Tokarev
2023-07-08 10:10 ` Alex Bennée
2023-07-09 8:12 ` Michael Tokarev
2023-07-03 13:44 ` [PULL 30/38] gdbstub: clean-up vcont handling to avoid goto Alex Bennée
2023-07-03 13:44 ` [PULL 31/38] linux-user: Expose do_guest_openat() and do_guest_readlink() Alex Bennée
2023-07-03 13:44 ` [PULL 32/38] linux-user: Add "safe" parameter to do_guest_openat() Alex Bennée
2023-07-03 13:44 ` Alex Bennée [this message]
2023-07-03 13:44 ` [PULL 34/38] gdbstub: Expose gdb_get_process() and gdb_get_first_cpu_in_process() Alex Bennée
2023-07-03 13:44 ` [PULL 35/38] gdbstub: Report the actual qemu-user pid Alex Bennée
2023-07-03 13:44 ` [PULL 36/38] gdbstub: Add support for info proc mappings Alex Bennée
2023-07-03 13:44 ` [PULL 37/38] docs: Document security implications of debugging Alex Bennée
2023-07-03 13:44 ` [PULL 38/38] tests/tcg: Add a test for info proc mappings Alex Bennée
2023-07-04 8:19 ` [PULL 00/38] maintainer updates for 8.1: testing, fuzz, plugins, docs, gdbstub Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230703134427.1389440-34-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=iii@linux.ibm.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).