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 v3 22/23] bsd-user: Implement shmat(2) and shmdt(2)
Date: Sat, 9 Sep 2023 22:37:03 +0300 [thread overview]
Message-ID: <20230909193704.1827-23-kariem.taha2.7@gmail.com> (raw)
In-Reply-To: <20230909193704.1827-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 | 76 +++++++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 8 ++++
2 files changed, 84 insertions(+)
diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
index 68f34b5d36..8e5f22da5b 100644
--- a/bsd-user/bsd-mem.h
+++ b/bsd-user/bsd-mem.h
@@ -343,4 +343,80 @@ 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;
+ }
+
+ if (!guest_range_valid_untagged(shmaddr, shm_info.shm_segsz)) {
+ return -TARGET_EINVAL;
+ }
+
+ 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);
+ }
+ }
+
+ 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 35f94f51fc..fe0968773e 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.42.0
next prev parent reply other threads:[~2023-09-09 19:41 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 19:36 [PATCH v3 00/23] bsd-user: Implement mmap related system calls for FreeBSD Karim Taha
2023-09-09 19:36 ` [PATCH v3 01/23] bsd-user: Implement struct target_ipc_perm Karim Taha
2023-09-09 19:36 ` [PATCH v3 02/23] bsd-user: Implement struct target_shmid_ds Karim Taha
2023-09-09 19:36 ` [PATCH v3 03/23] bsd-user: Declarations for ipc_perm and shmid_ds conversion functions Karim Taha
2023-09-09 19:36 ` [PATCH v3 04/23] bsd-user: Introduce freebsd/os-misc.h to the source tree Karim Taha
2023-09-09 19:36 ` [PATCH v3 05/23] bsd-user: Implement shm_open2(2) system call Karim Taha
2023-09-11 23:51 ` Richard Henderson
2023-09-09 19:36 ` [PATCH v3 06/23] bsd-user: Implement shm_rename(2) " Karim Taha
2023-09-09 19:36 ` [PATCH v3 07/23] bsd-user: Add bsd-mem.c to meson.build Karim Taha
2023-09-09 19:36 ` [PATCH v3 08/23] bsd-user: Implement target_set_brk function in bsd-mem.c instead of os-syscall.c Karim Taha
2023-09-09 19:36 ` [PATCH v3 09/23] bsd-user: Implement ipc_perm conversion between host and target Karim Taha
2023-09-09 19:36 ` [PATCH v3 10/23] bsd-user: Implement shmid_ds " Karim Taha
2023-09-11 23:53 ` Richard Henderson
2023-09-09 19:36 ` [PATCH v3 11/23] bsd-user: Introduce bsd-mem.h to the source tree Karim Taha
2023-09-09 19:36 ` [PATCH v3 12/23] bsd-user: Implement mmap(2) and munmap(2) Karim Taha
2023-09-09 19:36 ` [PATCH v3 13/23] bsd-user: Implement mprotect(2) Karim Taha
2023-09-09 19:36 ` [PATCH v3 14/23] bsd-user: Implement msync(2) Karim Taha
2023-09-09 19:36 ` [PATCH v3 15/23] bsd-user: Implement mlock(2), munlock(2), mlockall(2), munlockall(2), minherit(2) Karim Taha
2023-09-09 19:36 ` [PATCH v3 16/23] bsd-user: Implment madvise(2) to match the linux-user implementation Karim Taha
2023-09-11 23:56 ` Richard Henderson
2023-09-09 19:36 ` [PATCH v3 17/23] bsd-user: Implement mincore(2) Karim Taha
2023-09-12 0:03 ` Richard Henderson
2023-09-13 22:02 ` Karim Taha
2023-09-13 22:24 ` Richard Henderson
2023-09-09 19:36 ` [PATCH v3 18/23] bsd-user: Implement do_obreak function Karim Taha
2023-09-12 0:05 ` Richard Henderson
2023-09-09 19:37 ` [PATCH v3 19/23] bsd-user: Implement shm_open(2) Karim Taha
2023-09-12 0:06 ` Richard Henderson
2023-09-09 19:37 ` [PATCH v3 20/23] bsd-user: Implement shm_unlink(2) and shmget(2) Karim Taha
2023-09-09 19:37 ` [PATCH v3 21/23] bsd-user: Implement shmctl(2) Karim Taha
2023-09-13 13:01 ` Karim Taha
2023-09-13 15:33 ` Richard Henderson
2023-09-09 19:37 ` Karim Taha [this message]
2023-09-12 0:08 ` [PATCH v3 22/23] bsd-user: Implement shmat(2) and shmdt(2) Richard Henderson
2023-09-14 16:55 ` Karim Taha
2023-09-14 17:52 ` Richard Henderson
2023-09-09 19:37 ` [PATCH v3 23/23] bsd-user: Add stubs for vadvise(), sbrk() and sstk() Karim Taha
2023-09-12 0:09 ` 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=20230909193704.1827-23-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).