qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Karim Taha <kariem.taha2.7@gmail.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
	imp@bsdimp.com, Stacey Son <sson@FreeBSD.org>,
	Karim Taha <kariem.taha2.7@gmail.com>
Subject: [PATCH v5 18/23] bsd-user: Implement do_obreak function
Date: Thu, 14 Sep 2023 23:41:02 +0300	[thread overview]
Message-ID: <20230914204107.23778-19-kariem.taha2.7@gmail.com> (raw)
In-Reply-To: <20230914204107.23778-1-kariem.taha2.7@gmail.com>

From: Stacey Son <sson@FreeBSD.org>

Match linux-user, by manually applying the following commits, in order:

d28b3c90cfad1a7e211ae2bce36ecb9071086129   linux-user: Make sure initial brk(0) is page-aligned
15ad98536ad9410fb32ddf1ff09389b677643faa   linux-user: Fix qemu brk() to not zero bytes on current page
dfe49864afb06e7e452a4366051697bc4fcfc1a5   linux-user: Prohibit brk() to to shrink below initial heap address
eac78a4b0b7da4de2c0a297f4d528ca9cc6256a3   linux-user: Fix signed math overflow in brk() syscall
c6cc059eca18d9f6e4e26bb8b6d1135ddb35d81a   linux-user: Do not call get_errno() in do_brk()
e69e032d1a8ee8d754ca119009a3c2c997f8bb30   linux-user: Use MAP_FIXED_NOREPLACE for do_brk()
cb9d5d1fda0bc2312fc0c779b4ea1d7bf826f31f   linux-user: Do nothing if too small brk is specified
2aea137a425a87b930a33590177b04368fd7cc12   linux-user: Do not align brk with host page size

Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/bsd-mem.h            | 45 +++++++++++++++++++++++++++++++++++
 bsd-user/freebsd/os-syscall.c |  7 ++++++
 2 files changed, 52 insertions(+)

diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
index 0c8d96d9a4..b296c5c6f0 100644
--- a/bsd-user/bsd-mem.h
+++ b/bsd-user/bsd-mem.h
@@ -212,4 +212,49 @@ static inline abi_long do_bsd_mincore(abi_ulong target_addr, abi_ulong len,
     return ret;
 }
 
+/* do_brk() must return target values and target errnos. */
+static inline abi_long do_obreak(abi_ulong brk_val)
+{
+    abi_long mapped_addr;
+    abi_ulong new_brk;
+    abi_ulong old_brk;
+
+    /* brk pointers are always untagged */
+
+    /* do not allow to shrink below initial brk value */
+    if (brk_val < initial_target_brk) {
+        return target_brk;
+    }
+
+    new_brk = TARGET_PAGE_ALIGN(brk_val);
+    old_brk = TARGET_PAGE_ALIGN(target_brk);
+
+    /* new and old target_brk might be on the same page */
+    if (new_brk == old_brk) {
+        target_brk = brk_val;
+        return target_brk;
+    }
+
+    /* Release heap if necesary */
+    if (new_brk < old_brk) {
+        target_munmap(new_brk, old_brk - new_brk);
+
+        target_brk = brk_val;
+        return target_brk;
+    }
+
+    mapped_addr = target_mmap(old_brk, new_brk - old_brk,
+                              PROT_READ | PROT_WRITE,
+                              MAP_FIXED | MAP_EXCL | MAP_ANON | MAP_PRIVATE,
+                              -1, 0);
+
+    if (mapped_addr == old_brk) {
+        target_brk = brk_val;
+        return target_brk;
+    }
+
+    /* For everything else, return the previous break. */
+    return target_brk;
+}
+
 #endif /* BSD_USER_BSD_MEM_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 8ba5fcc6ca..5cd60fc272 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -651,6 +651,13 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
         break;
 #endif
 
+        /*
+         * Misc
+         */
+    case TARGET_FREEBSD_NR_break:
+        ret = do_obreak(arg1);
+        break;
+
         /*
          * sys{ctl, arch, call}
          */
-- 
2.42.0



  parent reply	other threads:[~2023-09-14 20:47 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-14 20:40 [PATCH v5 00/23] bsd-user: Implement mmap related system calls for FreeBSD Karim Taha
2023-09-14 20:40 ` [PATCH v5 01/23] bsd-user: Implement struct target_ipc_perm Karim Taha
2023-09-14 20:40 ` [PATCH v5 02/23] bsd-user: Implement struct target_shmid_ds Karim Taha
2023-09-14 20:40 ` [PATCH v5 03/23] bsd-user: Declarations for ipc_perm and shmid_ds conversion functions Karim Taha
2023-09-14 20:40 ` [PATCH v5 04/23] bsd-user: Introduce freebsd/os-misc.h to the source tree Karim Taha
2023-09-14 20:40 ` [PATCH v5 05/23] bsd-user: Implement shm_open2(2) system call Karim Taha
2023-09-17 10:33   ` Warner Losh
2023-09-14 20:40 ` [PATCH v5 06/23] bsd-user: Implement shm_rename(2) " Karim Taha
2023-09-14 20:40 ` [PATCH v5 07/23] bsd-user: Add bsd-mem.c to meson.build Karim Taha
2023-09-14 20:40 ` [PATCH v5 08/23] bsd-user: Implement target_set_brk function in bsd-mem.c instead of os-syscall.c Karim Taha
2023-09-14 20:40 ` [PATCH v5 09/23] bsd-user: Implement ipc_perm conversion between host and target Karim Taha
2023-09-17 10:34   ` Warner Losh
2023-09-14 20:40 ` [PATCH v5 10/23] bsd-user: Implement shmid_ds " Karim Taha
2023-09-17 10:35   ` Warner Losh
2023-09-14 20:40 ` [PATCH v5 11/23] bsd-user: Introduce bsd-mem.h to the source tree Karim Taha
2023-09-14 20:40 ` [PATCH v5 12/23] bsd-user: Implement mmap(2) and munmap(2) Karim Taha
2023-09-14 20:40 ` [PATCH v5 13/23] bsd-user: Implement mprotect(2) Karim Taha
2023-09-14 20:40 ` [PATCH v5 14/23] bsd-user: Implement msync(2) Karim Taha
2023-09-14 20:40 ` [PATCH v5 15/23] bsd-user: Implement mlock(2), munlock(2), mlockall(2), munlockall(2), minherit(2) Karim Taha
2023-09-14 20:41 ` [PATCH v5 16/23] bsd-user: Implment madvise(2) to match the linux-user implementation Karim Taha
2023-09-17 10:38   ` Warner Losh
2023-09-14 20:41 ` [PATCH v5 17/23] bsd-user: Implement mincore(2) Karim Taha
2023-09-17 11:03   ` Warner Losh
2023-09-14 20:41 ` Karim Taha [this message]
2023-09-17 11:04   ` [PATCH v5 18/23] bsd-user: Implement do_obreak function Warner Losh
2023-09-14 20:41 ` [PATCH v5 19/23] bsd-user: Implement shm_open(2) Karim Taha
2023-09-17 11:06   ` Warner Losh
2023-09-14 20:41 ` [PATCH v5 20/23] bsd-user: Implement shm_unlink(2) and shmget(2) Karim Taha
2023-09-14 20:41 ` [PATCH v5 21/23] bsd-user: Implement shmctl(2) Karim Taha
2023-09-17 11:07   ` Warner Losh
2023-09-14 20:41 ` [PATCH v5 22/23] bsd-user: Implement shmat(2) and shmdt(2) Karim Taha
2023-09-15 12:38   ` Richard Henderson
2023-09-14 20:41 ` [PATCH v5 23/23] bsd-user: Add stubs for vadvise(), sbrk() and sstk() Karim Taha

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=20230914204107.23778-19-kariem.taha2.7@gmail.com \
    --to=kariem.taha2.7@gmail.com \
    --cc=imp@bsdimp.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=sson@FreeBSD.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).