Skip to content

Commit

Permalink
bsd-user: Implment madvise(2) to match the linux-user implementation.
Browse files Browse the repository at this point in the history
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230925182709.4834-17-kariem.taha2.7@gmail.com>
  • Loading branch information
Karim Taha authored and bsdimp committed Oct 3, 2023
1 parent 0a49ef0 commit 0c1ced4
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 0 deletions.
53 changes: 53 additions & 0 deletions bsd-user/bsd-mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,59 @@ static inline abi_long do_bsd_munlockall(void)
return get_errno(munlockall());
}

/* madvise(2) */
static inline abi_long do_bsd_madvise(abi_long arg1, abi_long arg2,
abi_long arg3)
{
abi_ulong len;
int ret = 0;
abi_long start = arg1;
abi_long len_in = arg2;
abi_long advice = arg3;

if (start & ~TARGET_PAGE_MASK) {
return -TARGET_EINVAL;
}
if (len_in == 0) {
return 0;
}
len = TARGET_PAGE_ALIGN(len_in);
if (len == 0 || !guest_range_valid_untagged(start, len)) {
return -TARGET_EINVAL;
}

/*
* Most advice values are hints, so ignoring and returning success is ok.
*
* However, some advice values such as MADV_DONTNEED, are not hints and
* need to be emulated.
*
* A straight passthrough for those may not be safe because qemu sometimes
* turns private file-backed mappings into anonymous mappings.
* If all guest pages have PAGE_PASSTHROUGH set, mappings have the
* same semantics for the host as for the guest.
*
* MADV_DONTNEED is passed through, if possible.
* If passthrough isn't possible, we nevertheless (wrongly!) return
* success, which is broken but some userspace programs fail to work
* otherwise. Completely implementing such emulation is quite complicated
* though.
*/
mmap_lock();
switch (advice) {
case MADV_DONTNEED:
if (page_check_range(start, len, PAGE_PASSTHROUGH)) {
ret = get_errno(madvise(g2h_untagged(start), len, advice));
if (ret == 0) {
page_reset_target_data(start, start + len - 1);
}
}
}
mmap_unlock();

return ret;
}

/* minherit(2) */
static inline abi_long do_bsd_minherit(abi_long addr, abi_long len,
abi_long inherit)
Expand Down
4 changes: 4 additions & 0 deletions bsd-user/freebsd/os-syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,10 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_bsd_munlockall();
break;

case TARGET_FREEBSD_NR_madvise: /* madvise(2) */
ret = do_bsd_madvise(arg1, arg2, arg3);
break;

case TARGET_FREEBSD_NR_minherit: /* minherit(2) */
ret = do_bsd_minherit(arg1, arg2, arg3);
break;
Expand Down
2 changes: 2 additions & 0 deletions bsd-user/syscall_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ struct bsd_shm_regions {
/*
* sys/mman.h
*/
#define TARGET_MADV_DONTNEED 4 /* dont need these pages */

#define TARGET_FREEBSD_MAP_RESERVED0080 0x0080 /* previously misimplemented */
/* MAP_INHERIT */
#define TARGET_FREEBSD_MAP_RESERVED0100 0x0100 /* previously unimplemented */
Expand Down

0 comments on commit 0c1ced4

Please sign in to comment.