qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Pierrick Bouvier <pierrick.bouvier@linaro.org>,
	Helge Deller <deller@gmx.de>
Subject: [PULL 10/39] linux-user/arm: Remove qemu_host_page_size from init_guest_commpage
Date: Thu, 22 Feb 2024 10:42:54 -1000	[thread overview]
Message-ID: <20240222204323.268539-11-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240222204323.268539-1-richard.henderson@linaro.org>

Use qemu_real_host_page_size.
If the commpage is not within reserved_va, use MAP_FIXED_NOREPLACE.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20240102015808.132373-8-richard.henderson@linaro.org>
---
 linux-user/elfload.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index a9f1077861..f3f1ab4f69 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -460,6 +460,7 @@ enum {
 static bool init_guest_commpage(void)
 {
     ARMCPU *cpu = ARM_CPU(thread_cpu);
+    int host_page_size = qemu_real_host_page_size();
     abi_ptr commpage;
     void *want;
     void *addr;
@@ -472,10 +473,12 @@ static bool init_guest_commpage(void)
         return true;
     }
 
-    commpage = HI_COMMPAGE & -qemu_host_page_size;
+    commpage = HI_COMMPAGE & -host_page_size;
     want = g2h_untagged(commpage);
-    addr = mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE,
-                MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
+    addr = mmap(want, host_page_size, PROT_READ | PROT_WRITE,
+                MAP_ANONYMOUS | MAP_PRIVATE |
+                (commpage < reserved_va ? MAP_FIXED : MAP_FIXED_NOREPLACE),
+                -1, 0);
 
     if (addr == MAP_FAILED) {
         perror("Allocating guest commpage");
@@ -488,12 +491,12 @@ static bool init_guest_commpage(void)
     /* Set kernel helper versions; rest of page is 0.  */
     __put_user(5, (uint32_t *)g2h_untagged(0xffff0ffcu));
 
-    if (mprotect(addr, qemu_host_page_size, PROT_READ)) {
+    if (mprotect(addr, host_page_size, PROT_READ)) {
         perror("Protecting guest commpage");
         exit(EXIT_FAILURE);
     }
 
-    page_set_flags(commpage, commpage | ~qemu_host_page_mask,
+    page_set_flags(commpage, commpage | (host_page_size - 1),
                    PAGE_READ | PAGE_EXEC | PAGE_VALID);
     return true;
 }
-- 
2.34.1



  parent reply	other threads:[~2024-02-22 20:45 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22 20:42 [PULL 00/39] tcg and linux-user patch queue Richard Henderson
2024-02-22 20:42 ` [PULL 01/39] tcg/aarch64: Apple does not align __int128_t in even registers Richard Henderson
2024-02-22 20:42 ` [PULL 02/39] accel/tcg: Set can_do_io at at start of lookup_tb_ptr helper Richard Henderson
2024-02-22 20:42 ` [PULL 03/39] tcg: Avoid double lock if page tables happen to be in mmio memory Richard Henderson
2024-02-22 20:42 ` [PULL 04/39] accel/tcg: Remove qemu_host_page_size from page_protect/page_unprotect Richard Henderson
2024-02-22 20:42 ` [PULL 05/39] linux-user: Adjust SVr4 NULL page mapping Richard Henderson
2024-02-22 20:42 ` [PULL 06/39] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Richard Henderson
2024-02-22 20:42 ` [PULL 07/39] linux-user: Remove qemu_host_page_size from create_elf_tables Richard Henderson
2024-02-22 20:42 ` [PULL 08/39] linux-user/hppa: Simplify init_guest_commpage Richard Henderson
2024-02-22 20:42 ` [PULL 09/39] linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage Richard Henderson
2024-02-22 20:42 ` Richard Henderson [this message]
2024-02-22 20:42 ` [PULL 11/39] linux-user: Remove qemu_host_page_{size, mask} from mmap.c Richard Henderson
2024-02-22 20:42 ` [PULL 12/39] linux-user: Remove REAL_HOST_PAGE_ALIGN " Richard Henderson
2024-02-22 20:42 ` [PULL 13/39] linux-user: Remove HOST_PAGE_ALIGN " Richard Henderson
2024-02-22 20:42 ` [PULL 14/39] migration: Remove qemu_host_page_size Richard Henderson
2024-02-22 20:42 ` [PULL 15/39] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Richard Henderson
2024-02-22 20:43 ` [PULL 16/39] softmmu/physmem: Remove qemu_host_page_size Richard Henderson
2024-02-22 20:43 ` [PULL 17/39] softmmu/physmem: Remove HOST_PAGE_ALIGN Richard Henderson
2024-02-22 20:43 ` [PULL 18/39] linux-user: Remove qemu_host_page_size from main Richard Henderson
2024-02-22 20:43 ` [PULL 19/39] linux-user: Split out target_mmap__locked Richard Henderson
2024-02-22 20:43 ` [PULL 20/39] linux-user: Move some mmap checks outside the lock Richard Henderson
2024-02-22 20:43 ` [PULL 21/39] linux-user: Fix sub-host-page mmap Richard Henderson
2024-02-22 20:43 ` [PULL 22/39] linux-user: Split out mmap_end Richard Henderson
2024-02-22 20:43 ` [PULL 23/39] linux-user: Do early mmap placement only for reserved_va Richard Henderson
2024-02-22 20:43 ` [PULL 24/39] linux-user: Split out do_munmap Richard Henderson
2024-02-22 20:43 ` [PULL 25/39] linux-user: Use do_munmap for target_mmap failure Richard Henderson
2024-02-22 20:43 ` [PULL 26/39] linux-user: Split out mmap_h_eq_g Richard Henderson
2024-02-22 20:43 ` [PULL 27/39] linux-user: Split out mmap_h_lt_g Richard Henderson
2024-02-22 20:43 ` [PULL 28/39] linux-user: Split out mmap_h_gt_g Richard Henderson
2024-02-22 20:43 ` [PULL 29/39] tests/tcg: Remove run-test-mmap-* Richard Henderson
2024-02-22 20:43 ` [PULL 30/39] tests/tcg: Extend file in linux-madvise.c Richard Henderson
2024-02-22 20:43 ` [PULL 31/39] *-user: Deprecate and disable -p pagesize Richard Henderson
2024-02-22 20:43 ` [PULL 32/39] cpu: Remove page_size_init Richard Henderson
2024-02-22 20:43 ` [PULL 33/39] accel/tcg: Disconnect TargetPageDataNode from page size Richard Henderson
2024-02-22 20:43 ` [PULL 34/39] linux-user: Allow TARGET_PAGE_BITS_VARY Richard Henderson
2024-02-22 20:43 ` [PULL 35/39] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only Richard Henderson
2024-02-22 20:43 ` [PULL 36/39] linux-user: Bound mmap_min_addr by host page size Richard Henderson
2024-02-22 20:43 ` [PULL 37/39] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only Richard Henderson
2024-02-22 20:43 ` [PULL 38/39] target/alpha: " Richard Henderson
2024-02-22 20:43 ` [PULL 39/39] linux-user: Remove pgb_dynamic alignment assertion Richard Henderson
2024-02-23 13:45 ` [PULL 00/39] tcg and linux-user patch queue Peter Maydell
2024-02-23 22:26   ` 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=20240222204323.268539-11-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=deller@gmx.de \
    --cc=pierrick.bouvier@linaro.org \
    --cc=qemu-devel@nongnu.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).