From nobody Mon Jun 27 20:57:46 2022 X-Original-To: dev-commits-src-main@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 CDD7B87D21C; Mon, 27 Jun 2022 20:57:46 +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 4LX0RZ3MRGz4Vcq; Mon, 27 Jun 2022 20:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656363466; 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=Hyzuj20imlt8N9uiV1BqRUDQt3QcUoTJ9p67HGPa8hc=; b=Cunn2b4EzJgn+6rELfHLW2L2I7798LtVnkh0DIjWNiOh3RMSS4auKWhDPySzuj1RIBF32R GdRL40aSEhT/dv37aGkUWbIEPxU1OT+K2NNlLG8VVylvxaV1p7hOwuX9d2bzXu/QL1t9jj 9qrGQnvMQ/lrd/9N1VS3eNcOmJjinYU09PiaIODY8uGM52E1zrb34N1jScG5LdwZp6PgP5 S7U5nlj0FCMDYuZgbnuLmccAxJo6tCMqo34uGJdwR1KB4A3BAGKLHDnDiWZ1tmKGiDgSVK 0vhlIDv1ZB7Er4+1xMveW+i1ZQp127B0PcZrX/XMGgEOXAXiEAMAcAEuwTmozA== 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 4D01D7B01; Mon, 27 Jun 2022 20:57:46 +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 25RKvk2D029207; Mon, 27 Jun 2022 20:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RKvkNn029206; Mon, 27 Jun 2022 20:57:46 GMT (envelope-from git) Date: Mon, 27 Jun 2022 20:57:46 GMT Message-Id: <202206272057.25RKvkNn029206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 201c1d0d25ee - main - kboot: sort system calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 201c1d0d25ee5ac50092a7334b7ebfa238ce2c0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656363466; 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=Hyzuj20imlt8N9uiV1BqRUDQt3QcUoTJ9p67HGPa8hc=; b=E29EwkAiW0CNdGR10CaDJlJMBxwiEIFAY2ryGTQHsqBRr9jXw0Wft3cJPBqK0txVnI1Tlh TZY93Ov105zO+dhdoOh6T76DMhupFsiAk2Env8v4xMQkXUbV51x5B8WM8f/wN+FM9g4NaL xa6F3E6dibOIv/8es69mlz+dsC+4OkGPJTz57Dw/OPXSLx01X1ULS1fX+c/IGrJ0TJ7KsV r8zwlwx2Z8mGr989I42oi8qSFitcPNoOZhUN4Lrr11wF/36OnIdr/i/m1y6o4/p0Wwav1i z7EdXN7d/h17ipufJ/dTSl3tXp+C53W7O3p2E/3CFiyEQ54x7OtnYH9fo7Htfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656363466; a=rsa-sha256; cv=none; b=mcHHkgENIubK7tHZRoQJ5vkJlrWFVpm5yc91vzYdH3fyb6OUIzKcwotIIXeV0KHg7L5aJt temBRHtgFobb8A9g4YqAfd/XeIbvM3jaw/JjeYP02mrX54pJl3+YMgrmmLFw791y7cGBkv fVfUXrl58iHcOKudI4urY3b/OTYdjud0qo/olAW6I7ytDyZoed9fQgYrbtDjtN+9dEu3Aw MJh96LoopJPBfx181xKcw53dyy0ua71eEeiMurmiFCFzBjKM3trCtUo6Jb0K6VYB+Bu3UQ Zi68vTNWvalNjWkkViGEhf8ft81G+higjwPtDxzK1eouYYfzqsU+ODQYjq0FlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=201c1d0d25ee5ac50092a7334b7ebfa238ce2c0f commit 201c1d0d25ee5ac50092a7334b7ebfa238ce2c0f Author: Warner Losh AuthorDate: 2022-06-13 17:39:55 +0000 Commit: Warner Losh CommitDate: 2022-06-27 20:54:45 +0000 kboot: sort system calls Sort the system calls. No functional change intended. Sponsored by: Netflix --- 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); }