diff mbox series

[v3,22/23] bsd-user: Implement shmat(2) and shmdt(2)

Message ID 20230909193704.1827-23-kariem.taha2.7@gmail.com
State New
Headers show
Series bsd-user: Implement mmap related system calls for FreeBSD. | expand

Commit Message

Karim Taha Sept. 9, 2023, 7:37 p.m. UTC 
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(+)

Comments

Richard Henderson Sept. 12, 2023, 12:08 a.m. UTC | #1 
On 9/9/23 12:37, Karim Taha wrote:
> +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)));
> +}

On success, this needs to mmap_reserve the region for reserved_va.


r~
Karim Taha Sept. 14, 2023, 4:55 p.m. UTC | #2 
Richard Henderson <richard.henderson@linaro.org> writes:

Do I need to enclose `shmdt implmenetation` in a WITH_MMAP_LOCK_GUARD() block?

Mr.Warner forwared me a patch series ,that you sent on Sun 20 Aug,
for the linux-user, which encloses the implementation in such a block.

--
Karim Taha
> On 9/9/23 12:37, Karim Taha wrote:
>> +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)));
>> +}
>
> On success, this needs to mmap_reserve the region for reserved_va.
>
>
> r~
Richard Henderson Sept. 14, 2023, 5:52 p.m. UTC | #3 
On 9/14/23 09:55, Karim Taha wrote:
> Richard Henderson <richard.henderson@linaro.org> writes:
> 
> Do I need to enclose `shmdt implmenetation` in a WITH_MMAP_LOCK_GUARD() block?
> 
> Mr.Warner forwared me a patch series ,that you sent on Sun 20 Aug,
> for the linux-user, which encloses the implementation in such a block.

Yes.  All changes to the guest address space must be done with the lock.


r~
diff mbox series

Patch

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
          */