From: Karim Taha <kariem.taha2.7@gmail.com>
To: qemu-devel@nongnu.org
Cc: imp@bsdimp.com, Stacey Son <sson@FreeBSD.org>,
Karim Taha <kariem.taha2.7@gmail.com>
Subject: [PATCH 21/22] Implement shmat(2) and shmdt(2)
Date: Sat, 19 Aug 2023 11:48:05 +0200 [thread overview]
Message-ID: <20230819094806.14965-22-kariem.taha2.7@gmail.com> (raw)
In-Reply-To: <20230819094806.14965-1-kariem.taha2.7@gmail.com>
From: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
---
bsd-user/bsd-mem.h | 72 +++++++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 8 ++++
2 files changed, 80 insertions(+)
diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
index 221ad76d8c..f737b94885 100644
--- a/bsd-user/bsd-mem.h
+++ b/bsd-user/bsd-mem.h
@@ -335,4 +335,76 @@ static inline abi_long do_bsd_shmctl(abi_long shmid, abi_long cmd,
return ret;
}
+/* shmat(2) */
+static inline abi_long do_bsd_shmat(int shmid, abi_ulong shmaddr, int shmflg)
+{
+ abi_ulong raddr;
+ abi_long ret;
+ void *host_raddr;
+ struct shmid_ds shm_info;
+ int i;
+
+ /* Find out the length of the shared memory segment. */
+ ret = get_errno(shmctl(shmid, IPC_STAT, &shm_info));
+ if (is_error(ret)) {
+ /* Can't get the length */
+ return ret;
+ }
+
+ mmap_lock();
+
+ if (shmaddr) {
+ host_raddr = shmat(shmid, (void *)g2h_untagged(shmaddr), shmflg);
+ } else {
+ abi_ulong mmap_start;
+
+ mmap_start = mmap_find_vma(0, shm_info.shm_segsz);
+
+ if (mmap_start == -1) {
+ errno = ENOMEM;
+ host_raddr = (void *)-1;
+ } else {
+ host_raddr = shmat(shmid, g2h_untagged(mmap_start),
+ shmflg); /* | SHM_REMAP XXX WHY? */
+ }
+ }
+
+ if (host_raddr == (void *)-1) {
+ mmap_unlock();
+ return get_errno((long)host_raddr);
+ }
+ raddr = h2g((unsigned long)host_raddr);
+
+ page_set_flags(raddr, raddr + shm_info.shm_segsz,
+ PAGE_VALID | PAGE_READ | ((shmflg & SHM_RDONLY) ? 0 : PAGE_WRITE));
+
+ for (i = 0; i < N_BSD_SHM_REGIONS; i++) {
+ if (bsd_shm_regions[i].start == 0) {
+ bsd_shm_regions[i].start = raddr;
+ bsd_shm_regions[i].size = shm_info.shm_segsz;
+ break;
+ }
+ }
+
+ mmap_unlock();
+ return raddr;
+}
+
+/* shmdt(2) */
+static inline abi_long do_bsd_shmdt(abi_ulong shmaddr)
+{
+ int i;
+
+ for (i = 0; i < N_BSD_SHM_REGIONS; ++i) {
+ if (bsd_shm_regions[i].start == shmaddr) {
+ bsd_shm_regions[i].start = 0;
+ page_set_flags(shmaddr,
+ shmaddr + bsd_shm_regions[i].size, 0);
+ break;
+ }
+ }
+
+ return get_errno(shmdt(g2h_untagged(shmaddr)));
+}
+
#endif /* BSD_USER_BSD_MEM_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 9681c65ce9..f76bc1eb38 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -559,6 +559,14 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_bsd_shmctl(arg1, arg2, arg3);
break;
+ case TARGET_FREEBSD_NR_shmat: /* shmat(2) */
+ ret = do_bsd_shmat(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_shmdt: /* shmdt(2) */
+ ret = do_bsd_shmdt(arg1);
+ break;
+
/*
* Misc
*/
--
2.40.0
next prev parent reply other threads:[~2023-08-19 9:50 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-19 9:47 [PATCH 00/22] Implement the mmap system call for FreeBSD Karim Taha
2023-08-19 9:47 ` [PATCH 01/22] Implement struct target_ipc_perm Karim Taha
2023-08-19 14:37 ` Richard Henderson
2023-08-20 4:07 ` Warner Losh
2023-08-19 9:47 ` [PATCH 02/22] Implement struct target_shmid_ds Karim Taha
2023-08-19 14:38 ` Richard Henderson
2023-08-20 4:08 ` Warner Losh
2023-08-19 9:47 ` [PATCH 03/22] Declarations for ipc_perm and shmid_ds conversion functions Karim Taha
2023-08-19 14:40 ` Richard Henderson
2023-08-20 4:08 ` Warner Losh
2023-08-19 9:47 ` [PATCH 04/22] Introduce freebsd/os-misc.h to the source tree Karim Taha
2023-08-19 14:40 ` Richard Henderson
2023-08-20 4:09 ` Warner Losh
2023-08-19 9:47 ` [PATCH 05/22] Implement shm_open2(2) system call Karim Taha
2023-08-19 15:10 ` Richard Henderson
2023-08-20 4:16 ` Warner Losh
2023-08-19 9:47 ` [PATCH 06/22] Implement shm_rename(2) " Karim Taha
2023-08-20 4:18 ` Warner Losh
2023-08-20 14:05 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 07/22] Add bsd-mem.c to meson.build Karim Taha
2023-08-20 4:19 ` Warner Losh
2023-08-20 14:06 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 08/22] Implement target_set_brk function in bsd-mem.c instead of os-syscall.c Karim Taha
2023-08-20 4:22 ` Warner Losh
2023-08-20 14:12 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 09/22] Implement ipc_perm conversion between host and target Karim Taha
2023-08-20 4:23 ` Warner Losh
2023-08-20 14:16 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 10/22] Implement shmid_ds " Karim Taha
2023-08-20 4:25 ` Warner Losh
2023-08-20 14:20 ` Richard Henderson
2023-09-03 8:45 ` Kariiem Taha
2023-09-05 1:43 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 11/22] Introduce bsd-mem.h to the source tree Karim Taha
2023-08-20 4:26 ` Warner Losh
2023-08-20 14:21 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 12/22] Implement mmap(2) and munmap(2) Karim Taha
2023-08-20 4:27 ` Warner Losh
2023-08-20 14:25 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 13/22] Implement mprotect(2) Karim Taha
2023-08-20 4:28 ` Warner Losh
2023-08-20 14:25 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 14/22] Implement msync(2) Karim Taha
2023-08-20 4:34 ` Warner Losh
2023-08-20 14:37 ` Richard Henderson
2023-08-19 9:47 ` [PATCH 15/22] Implement mlock(2), munlock(2), mlockall(2), munlockall(2), madvise(2), minherit(2) Karim Taha
2023-08-20 4:37 ` Warner Losh
2023-08-20 14:42 ` Richard Henderson
2023-08-20 14:43 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 16/22] Implement mincore(2) Karim Taha
2023-08-20 4:37 ` Warner Losh
2023-08-20 14:55 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 17/22] Implement do_obreak function Karim Taha
2023-08-20 4:40 ` Warner Losh
2023-08-20 15:03 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 18/22] Implement shm_open(2) Karim Taha
2023-08-20 4:42 ` Warner Losh
2023-08-20 15:04 ` Richard Henderson
2023-08-20 15:10 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 19/22] Implement shm_unlink(2) and shmget(2) Karim Taha
2023-08-20 4:42 ` Warner Losh
2023-08-20 15:05 ` Richard Henderson
2023-08-20 15:07 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 20/22] Implement shmctl(2) Karim Taha
2023-08-20 4:43 ` Warner Losh
2023-08-20 15:13 ` Richard Henderson
2023-09-09 1:59 ` Karim Taha
2023-09-09 17:51 ` Richard Henderson
2023-08-19 9:48 ` Karim Taha [this message]
2023-08-20 4:44 ` [PATCH 21/22] Implement shmat(2) and shmdt(2) Warner Losh
2023-08-20 15:30 ` Richard Henderson
2023-08-22 18:03 ` Warner Losh
2023-08-22 18:11 ` Richard Henderson
2023-08-22 19:54 ` Warner Losh
2023-08-22 21:00 ` Richard Henderson
2023-08-19 9:48 ` [PATCH 22/22] Add stubs for vadvise(), sbrk() and sstk() Karim Taha
2023-08-20 4:45 ` Warner Losh
2023-08-20 15:35 ` Richard Henderson
2023-08-20 20:42 ` Warner Losh
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=20230819094806.14965-22-kariem.taha2.7@gmail.com \
--to=kariem.taha2.7@gmail.com \
--cc=imp@bsdimp.com \
--cc=qemu-devel@nongnu.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).