From nobody Tue Jan 24 22:10:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h4C1FCxz3bf8T; Tue, 24 Jan 2023 22:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h4C0nl6z4Knb; Tue, 24 Jan 2023 22:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t17xzZn5TgtLu0ruHmySAJuRaDwJYP6wZFB0ktGLD3I=; b=kVSUzaJiDnKJzcoYrDmpwlYoUZ4SzEKcBd/BEH5mXj+tdyblovKD/JAzt2mIUnvYoJ5ws+ uiVHfcNuF16nkpphDf2xQrkqDAnm/BpxDCT2HuJfcHpVqpXHYD+Pay0v3+cete7AEZQ+jP xzGHhnR33VEqITqhFiWvi0qrrx/DC1jIEoDF0IrgZzartZeBOuSasOoa+R0MlEUUzFcHgZ iHX59yVehY39pg6S6Na5MKJgoYAR3KfvtydQk1O3nFMT/UzZODVx8H4Yc9dWYIgnd/jvAp HyXnlH+FkONAyZFLqVFWyxb1nrYuDqnszsAlsHRWPIercmgw33DN/qLd14p1Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t17xzZn5TgtLu0ruHmySAJuRaDwJYP6wZFB0ktGLD3I=; b=D92R6GxIit1gFacX8BQSVmY9fCpWwRIhy+7HFynzosv7i/eCbyXDdjdmaQ5vwkTzhvMOoV A+IjIvlpOi8lpgAazY9YZsuGw6xGB2bw48MJ3lQWG/Ysnjja1d0/ToF9jSndP3oZAY6Lkg PPSJzH4LXE0y5a408heMcUDCkTZv+csnoDgZkw6J5ARspYWYpmr7Q8Z9GHhGcU2E+611n8 c1GC7kbi/Z7VcD/KgDgqRf341kFTyDekXNZQqL3Fqa2vGwb/o+7dLtpgt8E0yAGwNwCPQc kq4iwUpGqVvg4nezlMYpKO9Q8bhnik2noc7Q7+ulcoyUfD4oMmQFW7PRloyG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598235; a=rsa-sha256; cv=none; b=uNtqpVRVQd2oYwinNkaNkXgOYwfX4Ww5RFgtacpzolUMQEns84GKpCEzE0zO52vZlq5Kxc JJN5ijktjm0HS8zO537VA93uwJlPOiqfYm20MjoQ1W7hD5voQxkMQCTlEc5xY+hWAxriRb TLh9DTMUtkdCF9JBsMRk8ecnieW1JjNdLkfsFVWi6rLmSNYfIC6US4JuMOn5HVLaoAQjnN Lx1GxN1AHNc7/vCBYcrUuvgyFYUzsVDoNOKdo7BXGfQpVphosHKhKeGmg9p79+HlfghtB3 +LSzRF/aGgvgRWu01z61vEdfJUX5W7N0LbDC0pG+mFEBQBX4MIWzYTeX2h6ekg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h4B6xkmzQFG; Tue, 24 Jan 2023 22:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAYNa080243; Tue, 24 Jan 2023 22:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAY9g080242; Tue, 24 Jan 2023 22:10:34 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:34 GMT Message-Id: <202301242210.30OMAY9g080242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4449947ac892 - stable/13 - kboot: sort system calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4449947ac8929f96efa911fa7f146c29592eb614 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4449947ac8929f96efa911fa7f146c29592eb614 commit 4449947ac8929f96efa911fa7f146c29592eb614 Author: Warner Losh AuthorDate: 2022-06-13 17:39:55 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:21 +0000 kboot: sort system calls Sort the system calls. No functional change intended. Sponsored by: Netflix (cherry picked from commit 201c1d0d25ee5ac50092a7334b7ebfa238ce2c0f) --- stand/kboot/host_syscall.h | 34 ++++++++++++++-------- stand/kboot/host_syscalls.c | 69 ++++++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 43 deletions(-) diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index f6f22a736d53..b7861e1af6f1 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -32,13 +32,9 @@ long host_syscall(int number, ...); -ssize_t host_read(int fd, void *buf, size_t nbyte); -ssize_t host_write(int fd, const void *buf, size_t nbyte); -int host_open(const char *path, int flags, int mode); -ssize_t host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, int whence); -int host_close(int fd); -void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off); -#define host_getmem(size) host_mmap(0, size, 3 /* RW */, 0x22 /* ANON */, -1, 0); +/* + * Data types + */ struct old_utsname { char sysname[65]; char nodename[65]; @@ -46,16 +42,32 @@ struct old_utsname { char version[65]; char machine[65]; }; -int host_uname(struct old_utsname *); + struct host_timeval { time_t tv_sec; long tv_usec; }; + +/* + * System Calls + */ +int host_close(int fd); +int host_getdents(int fd, void *dirp, int count); int host_gettimeofday(struct host_timeval *a, void *b); -int host_select(int nfds, long *readfds, long *writefds, long *exceptfds, - struct host_timeval *timeout); int kexec_load(uint32_t start, int nsegs, uint32_t segs); +ssize_t host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, int whence); +void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off); +int host_open(const char *path, int flags, int mode); +ssize_t host_read(int fd, void *buf, size_t nbyte); int host_reboot(int, int, int, uintptr_t); -int host_getdents(int fd, void *dirp, int count); +int host_select(int nfds, long *readfds, long *writefds, long *exceptfds, + struct host_timeval *timeout); +int host_uname(struct old_utsname *); +ssize_t host_write(int fd, const void *buf, size_t nbyte); + +/* + * Wrappers / one-liners + */ +#define host_getmem(size) host_mmap(0, size, 3 /* RW */, 0x22 /* ANON */, -1, 0); #endif diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index fd14095d7d68..3a5cdd7d8ea4 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -2,24 +2,33 @@ #include "syscall_nr.h" #include -ssize_t -host_read(int fd, void *buf, size_t nbyte) +/* + * Various trivial wrappers for Linux system calls. Please keep sorted + * alphabetically. + */ + +int +host_close(int fd) { - return host_syscall(SYS_read, fd, (uintptr_t)buf, nbyte); - /* XXX original overrode errors */ + return host_syscall(SYS_close, fd); } -ssize_t -host_write(int fd, const void *buf, size_t nbyte) +int +host_getdents(int fd, void *dirp, int count) { - return host_syscall(SYS_write, fd, (uintptr_t)buf, nbyte); + return host_syscall(SYS_getdents, fd, (uintptr_t)dirp, count); } - + int -host_open(const char *path, int flags, int mode) +host_gettimeofday(struct host_timeval *a, void *b) { - return host_syscall(SYS_open, (uintptr_t)path, flags, mode); - /* XXX original overrode errors */ + return host_syscall(SYS_gettimeofday, (uintptr_t)a, (uintptr_t)b); +} + +int +kexec_load(uint32_t start, int nsegs, uint32_t segs) +{ + return host_syscall(SYS_kexec_load, start, nsegs, segs, KEXEC_ARCH << 16); } ssize_t @@ -36,12 +45,6 @@ host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, in #endif } -int -host_close(int fd) -{ - return host_syscall(SYS_close, fd); -} - void * host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) { @@ -49,38 +52,40 @@ host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) } int -host_uname(struct old_utsname *uts) +host_open(const char *path, int flags, int mode) { - return host_syscall(SYS_uname, (uintptr_t)uts); + return host_syscall(SYS_open, (uintptr_t)path, flags, mode); + /* XXX original overrode errors */ } -int -host_gettimeofday(struct host_timeval *a, void *b) +ssize_t +host_read(int fd, void *buf, size_t nbyte) { - return host_syscall(SYS_gettimeofday, (uintptr_t)a, (uintptr_t)b); + return host_syscall(SYS_read, fd, (uintptr_t)buf, nbyte); + /* XXX original overrode errors */ } int -host_select(int nfds, long *readfds, long *writefds, long *exceptfds, - struct host_timeval *timeout) +host_reboot(int magic1, int magic2, int cmd, uintptr_t arg) { - return host_syscall(SYS_select, nfds, (uintptr_t)readfds, (uintptr_t)writefds, (uintptr_t)exceptfds, (uintptr_t)timeout, 0); + return host_syscall(SYS_reboot, magic1, magic2, cmd, arg); } int -kexec_load(uint32_t start, int nsegs, uint32_t segs) +host_select(int nfds, long *readfds, long *writefds, long *exceptfds, + struct host_timeval *timeout) { - return host_syscall(SYS_kexec_load, start, nsegs, segs, KEXEC_ARCH << 16); + return host_syscall(SYS_select, nfds, (uintptr_t)readfds, (uintptr_t)writefds, (uintptr_t)exceptfds, (uintptr_t)timeout, 0); } int -host_reboot(int magic1, int magic2, int cmd, uintptr_t arg) +host_uname(struct old_utsname *uts) { - return host_syscall(SYS_reboot, magic1, magic2, cmd, arg); + return host_syscall(SYS_uname, (uintptr_t)uts); } -int -host_getdents(int fd, void *dirp, int count) +ssize_t +host_write(int fd, const void *buf, size_t nbyte) { - return host_syscall(SYS_getdents, fd, (uintptr_t)dirp, count); + return host_syscall(SYS_write, fd, (uintptr_t)buf, nbyte); }