linux-user/flatload: Take mmap_lock in load_flt_binary()
v2 cover linux-user/flatload: Take mmap_lock in load_flt_binary()
Fix for https://gitlab.com/qemu-project/qemu/-/issues/2525
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (4):
accel/tcg: Make page_set_flags() documentation public linux-user/flatload: Take mmap_lock in load_flt_binary() tests/avocado: Allow running user-mode tests tests/avocado: Run STM32 bFLT busybox binary in current directory
include/exec/cpu-all.h | 13 +++++++++++++ accel/tcg/user-exec.c | 5 ----- linux-user/flatload.c | 3 +++ tests/avocado/avocado_qemu/__init__.py | 2 +- tests/avocado/load_bflt.py | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-)
Signature · 1 line
2.45.2
PATCH v2 1/4 accel/tcg: Make page_set_flags() documentation public
Commit e505a063ba ("translate-all: Add assert_(memory|tb)_lock annotations") states page_set_flags() is "public APIs and [is] documented as needing them held for linux-user mode". Document the prototype.
--- include/exec/cpu-all.h | 13 +++++++++++++ accel/tcg/user-exec.c | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-)
include/exec/cpu-all.h +13 -0
@@ -166,7 +166,20 @@ typedef int (*walk_memory_regions_fn)(void *, target_ulong,int walk_memory_regions (void *,walk_memory_regions_fn );int page_get_flags (target_ulong address); + +/** +* page_set_flags: +* @start: first byte of range +* @last: last byte of range +* @flags: flags to set +* Context: holding mmap lock +* +* Modify the flags of a page and invalidate the code if necessary. +* The flag PAGE_WRITE_ORG is positioned automatically depending +* on PAGE_WRITE. The mmap_lock should already be held. +*/ void page_set_flags (target_ulong start,target_ulong last,int flags); +void page_reset_target_data (target_ulong start,target_ulong last);/**
accel/tcg/user-exec.c +0 -5
@@ -485,11 +485,6 @@ static bool pageflags_set_clear(target_ulong start, target_ulong last,return inval_tb; } -/* -* Modify the flags of a page and invalidate the code if necessary. -* The flag PAGE_WRITE_ORG is positioned automatically depending -* on PAGE_WRITE. The mmap_lock should already be held. -*/ void page_set_flags (target_ulong start,target_ulong last,int flags) {bool reset = false;
Signature · 1 line
2.45.2
PATCH v2 2/4 linux-user/flatload: Take mmap_lock in load_flt_binary()
In reply to Philippe Mathieu-Daudéload_flt_binary() calls load_flat_file() -> page_set_flags().
page_set_flags() must be called with the mmap_lock held, otherwise it aborts:
$ qemu-arm -L stm32/lib/ stm32/bin/busybox qemu-arm: ../accel/tcg/user-exec.c:505: page_set_flags: Assertion `have_mmap_lock()' failed. Aborted (core dumped)
Fix by taking the lock in load_flt_binary().
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2525
--- linux-user/flatload.c | 3 +++ 1 file changed, 3 insertions(+)
linux-user/flatload.c +3 -0
@@ -487,7 +487,10 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) stack_len += (bprm->envc +1 ) *4 ;/* the envp array */ +mmap_lock (); res =load_flat_file (bprm, libinfo,0 , &stack_len); +mmap_unlock (); +if (is_error (res)) {return res; }
Signature · 1 line
2.45.2
Quoted 5 lines · Philippe Mathieu-Daudé
load_flt_binary()callsload_flat_file()->page_set_flags().
page_set_flags()must be called with themmap_lockheld, otherwise it aborts:
Quoted 8 lines
$ qemu-arm -L stm32/lib/ stm32/bin/busybox qemu-arm: ../accel/tcg/user-exec.c:505: page_set_flags: Assertion `have_mmap_lock()' failed. Aborted (core dumped)Fix by taking the lock in
load_flt_binary().Fixes fbd3c4cff6 ("linux-user/arm: Mark the commpage executable")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2525
This one seems like it should go to -stable, is it not?
Thanks,
/mjt
Quoted 10 lines · Michael Tokarev
Quoted 9 lines · Philippe Mathieu-Daudé
load_flt_binary()callsload_flat_file()->page_set_flags().
page_set_flags()must be called with themmap_lockheld, otherwise it aborts:$ qemu-arm -L stm32/lib/ stm32/bin/busybox qemu-arm: ../accel/tcg/user-exec.c:505: page_set_flags: Assertion `have_mmap_lock()' failed. Aborted (core dumped)
Quoted 6 lines
Quoted 4 lines
Fix by taking the lock in
load_flt_binary().Fixes fbd3c4cff6 ("linux-user/arm: Mark the commpage executable")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2525
This one seems like it should go to -stable, is it not?
Yes, I think so.
r~
PATCH v2 3/4 tests/avocado: Allow running user-mode tests
In reply to Philippe Mathieu-DaudéCommit 816d4201ea ("tests/avocado: Move LinuxTest related code into a separate file") removed the Avocado 'process' import which is used by the QemuUserTest class, restore it.
--- tests/avocado/avocado_qemu/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/avocado/avocado_qemu/__init__.py +1 -1
@@ -17,7 +17,7 @@ import uuid import avocado -from avocado.utils import ssh +from avocado.utils import process, ssh from avocado.utils.path import find_command from qemu.machine import QEMUMachine
Signature · 1 line
2.45.2
PATCH v2 4/4 tests/avocado: Run STM32 bFLT busybox binary in current directory
In reply to Philippe Mathieu-DaudéWhen this test was added in commit 8011837a01, self.workdir was set to the test directory. As of this commit, it is not set anymore. Rather than using a full path to the busybox binary, we can run it in the current directory, effectively kludging the fact that self.workdir is not set. Good enough to run the test:
Fetching asset from tests/avocado/load_bflt.py:LoadBFLT.test_stm32
JOB ID : 020d317281b042f46ad99013530d29df0f1d7eb7
JOB LOG : tests/results/job-2024-08-22T10.17-020d317/job.log
(1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.09 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB TIME : 0.62 s
--- tests/avocado/load_bflt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/avocado/load_bflt.py +1 -1
@@ -41,7 +41,7 @@ def test_stm32(self): 'Stm32_mini_rootfs.cpio.bz2') rootfs_hash = '9f065e6ba40cce7411ba757f924f30fcc57951e6' rootfs_path_bz2 = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash) - busybox_path = os.path.join(self.workdir, "/bin/busybox") + busybox_path = os.path.join(self.workdir, "bin/busybox") self.extract_cpio(rootfs_path_bz2)
Signature · 1 line
2.45.2
Re: [PATCH v2 4/4] tests/avocado: Run STM32 bFLT busybox binary in current directory
Quoted 25 lines · Philippe Mathieu-Daudé
When this test was added in commit
8011837a01, self.workdir was set to the test directory. As of this commit, it is not set anymore. Rather than using a full path to the busybox binary, we can run it in the current directory, effectively kludging the fact that self.workdir is not set. Good enough to run the test:Fetching asset from tests/avocado/load_bflt.py:LoadBFLT.test_stm32 JOB ID : 020d317281b042f46ad99013530d29df0f1d7eb7 JOB LOG : tests/results/job-2024-08-22T10.17-020d317/job.log (1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.09 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 0.62 sReported-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/avocado/load_bflt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/avocado/load_bflt.py +0
-0
tests/avocado/load_bflt.py def test_stm32(self): · line 44
Quoted 5 lines
tests/avocado/load_bflt.py +1
-1@@ -41,7 +41,7 @@ def test_stm32(self): 'Stm32_mini_rootfs.cpio.bz2') rootfs_hash = '9f065e6ba40cce7411ba757f924f30fcc57951e6' rootfs_path_bz2 = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash) - busybox_path = os.path.join(self.workdir, "/bin/busybox") + busybox_path = os.path.join(self.workdir, "bin/busybox")
Good enough for now, indeed.
Quoted 5 lines · Philippe Mathieu-Daudé
Philippe Mathieu-Daudé (4):
accel/tcg: Makepage_set_flags()documentation public linux-user/flatload: Takemmap_lockinload_flt_binary()tests/avocado: Allow running user-mode tests tests/avocado: Run STM32 bFLT busybox binary in current directory
r~
Quoted 7 lines · Philippe Mathieu-Daudé
Fix for https://gitlab.com/qemu-project/qemu/-/issues/2525
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (4):
accel/tcg: Makepage_set_flags()documentation public linux-user/flatload: Takemmap_lockinload_flt_binary()
Queued these two patches.
r~