[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] bsd-user/bsd-file.h: Meat of the write system calls
From: |
Warner Losh |
Subject: |
[PATCH v2 5/6] bsd-user/bsd-file.h: Meat of the write system calls |
Date: |
Wed, 8 Jun 2022 15:17:10 -0600 |
Implement write, writev, pwrite and pwritev and connect them to the
system call dispatch routine.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/bsd-file.h | 84 +++++++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 22 +++++++++
2 files changed, 106 insertions(+)
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
index 839f8c5c55a..e9e2c85eb67 100644
--- a/bsd-user/bsd-file.h
+++ b/bsd-user/bsd-file.h
@@ -32,6 +32,11 @@ ssize_t safe_pread(int fd, void *buf, size_t nbytes, off_t
offset);
ssize_t safe_readv(int fd, const struct iovec *iov, int iovcnt);
ssize_t safe_preadv(int fd, const struct iovec *iov, int iovcnt, off_t offset);
+ssize_t safe_write(int fd, void *buf, size_t nbytes);
+ssize_t safe_pwrite(int fd, void *buf, size_t nbytes, off_t offset);
+ssize_t safe_writev(int fd, const struct iovec *iov, int iovcnt);
+ssize_t safe_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t
offset);
+
/* read(2) */
static abi_long do_bsd_read(abi_long arg1, abi_long arg2, abi_long arg3)
{
@@ -106,4 +111,83 @@ static abi_long do_bsd_preadv(void *cpu_env, abi_long arg1,
return ret;
}
+/* write(2) */
+static abi_long do_bsd_write(abi_long arg1, abi_long arg2, abi_long arg3)
+{
+ abi_long nbytes, ret;
+ void *p;
+
+ /* nbytes < 0 implies that it was larger than SIZE_MAX. */
+ nbytes = arg3;
+ if (nbytes < 0) {
+ return -TARGET_EINVAL;
+ }
+ p = lock_user(VERIFY_READ, arg2, nbytes, 1);
+ if (p == NULL) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(safe_write(arg1, p, arg3));
+ unlock_user(p, arg2, 0);
+
+ return ret;
+}
+
+/* pwrite(2) */
+static abi_long do_bsd_pwrite(void *cpu_env, abi_long arg1,
+ abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6)
+{
+ abi_long ret;
+ void *p;
+
+ p = lock_user(VERIFY_READ, arg2, arg3, 1);
+ if (p == NULL) {
+ return -TARGET_EFAULT;
+ }
+ if (regpairs_aligned(cpu_env) != 0) {
+ arg4 = arg5;
+ arg5 = arg6;
+ }
+ ret = get_errno(safe_pwrite(arg1, p, arg3, target_arg64(arg4, arg5)));
+ unlock_user(p, arg2, 0);
+
+ return ret;
+}
+
+/* writev(2) */
+static abi_long do_bsd_writev(abi_long arg1, abi_long arg2, abi_long arg3)
+{
+ abi_long ret;
+ struct iovec *vec = lock_iovec(VERIFY_READ, arg2, arg3, 1);
+
+ if (vec != NULL) {
+ ret = get_errno(safe_writev(arg1, vec, arg3));
+ unlock_iovec(vec, arg2, arg3, 0);
+ } else {
+ ret = -host_to_target_errno(errno);
+ }
+
+ return ret;
+}
+
+/* pwritev(2) */
+static abi_long do_bsd_pwritev(void *cpu_env, abi_long arg1,
+ abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6)
+{
+ abi_long ret;
+ struct iovec *vec = lock_iovec(VERIFY_READ, arg2, arg3, 1);
+
+ if (vec != NULL) {
+ if (regpairs_aligned(cpu_env) != 0) {
+ arg4 = arg5;
+ arg5 = arg6;
+ }
+ ret = get_errno(safe_pwritev(arg1, vec, arg3, target_arg64(arg4,
arg5)));
+ unlock_iovec(vec, arg2, arg3, 0);
+ } else {
+ ret = -host_to_target_errno(errno);
+ }
+
+ return ret;
+}
+
#endif /* BSD_FILE_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 8ca92f29857..3a33d54fa4d 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -50,6 +50,13 @@ safe_syscall3(ssize_t, readv, int, fd, const struct iovec *,
iov, int, iovcnt);
safe_syscall4(ssize_t, preadv, int, fd, const struct iovec *, iov, int, iovcnt,
off_t, offset);
+safe_syscall3(ssize_t, write, int, fd, void *, buf, size_t, nbytes);
+safe_syscall4(ssize_t, pwrite, int, fd, void *, buf, size_t, nbytes, off_t,
+ offset);
+safe_syscall3(ssize_t, writev, int, fd, const struct iovec *, iov, int,
iovcnt);
+safe_syscall4(ssize_t, pwritev, int, fd, const struct iovec *, iov, int,
iovcnt,
+ off_t, offset);
+
void target_set_brk(abi_ulong new_brk)
{
}
@@ -226,6 +233,21 @@ static abi_long freebsd_syscall(void *cpu_env, int num,
abi_long arg1,
case TARGET_FREEBSD_NR_preadv: /* preadv(2) */
ret = do_bsd_preadv(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
+
+ case TARGET_FREEBSD_NR_write: /* write(2) */
+ ret = do_bsd_write(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_pwrite: /* pwrite(2) */
+ ret = do_bsd_pwrite(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
+ break;
+
+ case TARGET_FREEBSD_NR_writev: /* writev(2) */
+ ret = do_bsd_writev(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_pwritev: /* pwritev(2) */
+ ret = do_bsd_pwritev(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
break;
default:
--
2.33.1
- [PATCH v2 0/6] bsd-user upstreaming: read, write and exit, Warner Losh, 2022/06/08
- [PATCH v2 2/6] bsd-user/freebsd/os-syscall.c: unlock_iovec, Warner Losh, 2022/06/08
- [PATCH v2 1/6] bsd-user/freebsd/os-syscall.c: lock_iovec, Warner Losh, 2022/06/08
- [PATCH v2 4/6] bsd-user/bsd-file.h: Add implementations for read, pread, readv and preadv, Warner Losh, 2022/06/08
- [PATCH v2 3/6] bsd-user/freebsd/os-syscall.c: Tracing and error boilerplate, Warner Losh, 2022/06/08
- [PATCH v2 5/6] bsd-user/bsd-file.h: Meat of the write system calls,
Warner Losh <=
- [PATCH v2 6/6] bsd-user/freebsd/os-syscall.c: Implement exit, Warner Losh, 2022/06/08
- Re: [PATCH v2 0/6] bsd-user upstreaming: read, write and exit, Richard Henderson, 2022/06/09