Skip to content

Commit

Permalink
linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage
Browse files Browse the repository at this point in the history
Use qemu_real_host_page_size.
If !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-7-richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed Feb 22, 2024
1 parent 506416d commit 228a425
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions linux-user/elfload.c
Original file line number Diff line number Diff line change
Expand Up @@ -1532,10 +1532,14 @@ static bool init_guest_commpage(void)
0x3a, 0x68, 0x3b, 0x00, /* trap 0 */
};

void *want = g2h_untagged(LO_COMMPAGE & -qemu_host_page_size);
void *addr = mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);

int host_page_size = qemu_real_host_page_size();
void *want, *addr;

want = g2h_untagged(LO_COMMPAGE & -host_page_size);
addr = mmap(want, host_page_size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE |
(reserved_va ? MAP_FIXED : MAP_FIXED_NOREPLACE),
-1, 0);
if (addr == MAP_FAILED) {
perror("Allocating guest commpage");
exit(EXIT_FAILURE);
Expand All @@ -1544,9 +1548,9 @@ static bool init_guest_commpage(void)
return false;
}

memcpy(addr, kuser_page, sizeof(kuser_page));
memcpy(g2h_untagged(LO_COMMPAGE), kuser_page, sizeof(kuser_page));

if (mprotect(addr, qemu_host_page_size, PROT_READ)) {
if (mprotect(addr, host_page_size, PROT_READ)) {
perror("Protecting guest commpage");
exit(EXIT_FAILURE);
}
Expand Down

0 comments on commit 228a425

Please sign in to comment.