From nobody Tue Jan 24 22:11:02 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 4P1h4l60npz3bdwt; Tue, 24 Jan 2023 22:11:03 +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 4P1h4l30Rgz4Lxr; Tue, 24 Jan 2023 22:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598263; 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=KWsWloj6IFa50K95Sfs4Wfz+rvu2rO8FA/cM6639ZL8=; b=LzEi6uDxnWjxlsRhmJEqKErMwklsNBL8KjhFyDqJ0VDuY+QFXAdaUQRpfaHMh20PgP54rf PlQZhAcmxKvnggRiv04qQm6ZZ8r7MG7ctIWYOiZaflFWbDdejbsqDH97RgBDvgl65S8WLx fNvpFT+5ckN8PcAWRMxMeNVngoYhrYRfSKdjUnpEE1H4TFPd8+YgsmjAdLuvQ4b9z9M1Jq CryPM6rrL3DWjSBBfxu+pEtxYbFpkYqxHKoRRl0Ngakj5VO9fXo1Ofiu7n1PEfVi5f4r7V 9FzB19TvfgC3TaaQxGfO99b1za3bWzgNkdkKtrrLieQ/XK541HKF5SP/YnWGBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598263; 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=KWsWloj6IFa50K95Sfs4Wfz+rvu2rO8FA/cM6639ZL8=; b=bbgFXtB9nVugAUOnGCukf0g6ySQrDNIVS3d/G/I9+z3C8iCezEKEoIFePxuiBZF2Q73WoK 7KlbAt0Wu10xi+I3IPLK71MVjWabsU5qqrvdNQkBsHmvn/3+adyUrTcpKeHriLDHSTGnYg P3qF7YmL91EQKdQ32pRYjABeot9Hu4uUiLps4finziV7X/ot0M4aHObls/6IRts9DcHDE+ vUAf4jnoLPDkuqXST9b3Bqp1+vqbBLn9FXjkVmooVEyGo0BI9J5TwXZJieFj56oBYlVhRq 4Sx6qt0Je2N0vJYUvJU+rizk6dvCOWqDdv5c0eDQanCsyWTZM3Gaf/ywPspoow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598263; a=rsa-sha256; cv=none; b=Itoa2YyA6gxhthYk9/F0bbQy35U5mn8LPvBd9Mag7Gsp1ifa7JYTls5uClUpxFeIjni6QN 39uPWT2Fjrun6W9zOp5LE/apL6GVVY99h2SI//uIXTdKTQ7CGGHzUfsdQ5ED+px1bNDFCL 8/HGk7jOZkDUgct+2aFrx12jdbDRh2womJMb4aE9n1PmcX/b+rBNfNzARXz5LzythJMfY1 OtHpToa009kxBpo2Ttc/JSJbFnGXns7Vf4MWgTlRbGEUR0xrOdw5Y5PiRYuINxJ0B6X492 /z/NwC3/xdhfEpyij7b4g0vLfRC3SVRF5IqRD3Bc8ujiiTGzHoNb0HGjkoaXcg== 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 4P1h4l0JxKzQTd; Tue, 24 Jan 2023 22:11:03 +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 30OMB2Xj083388; Tue, 24 Jan 2023 22:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMB2Fo083387; Tue, 24 Jan 2023 22:11:02 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:02 GMT Message-Id: <202301242211.30OMB2Fo083387@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: 60688f592d9f - stable/13 - kboot: Implement mount(2) 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: 60688f592d9fcde35b623b9759f4fd61cd796b48 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=60688f592d9fcde35b623b9759f4fd61cd796b48 commit 60688f592d9fcde35b623b9759f4fd61cd796b48 Author: Warner Losh AuthorDate: 2022-06-30 18:16:46 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:24 +0000 kboot: Implement mount(2) Create a wrapper for the mount system call. To ensure a sane early boot environment and to gather data we need for kexec, we may need to mount some special filesystems. Sponsored by: Netflix (cherry picked from commit 8138a766b068a17ad8f13ddcb850f356c04d9074) --- stand/kboot/arch/amd64/syscall_nr.h | 1 + stand/kboot/arch/powerpc64/syscall_nr.h | 1 + stand/kboot/host_syscall.h | 5 +++++ stand/kboot/host_syscalls.c | 7 +++++++ 4 files changed, 14 insertions(+) diff --git a/stand/kboot/arch/amd64/syscall_nr.h b/stand/kboot/arch/amd64/syscall_nr.h index b847b21efa88..4e2f686e7ae5 100644 --- a/stand/kboot/arch/amd64/syscall_nr.h +++ b/stand/kboot/arch/amd64/syscall_nr.h @@ -7,6 +7,7 @@ #define SYS_lseek 8 #define SYS_mkdirat 258 #define SYS_mmap 9 +#define SYS_mount 165 #define SYS_munmap 11 #define SYS_newfstat 5 #define SYS_newfstatat 262 diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/arch/powerpc64/syscall_nr.h index b86874b92e76..404a6f15fafc 100644 --- a/stand/kboot/arch/powerpc64/syscall_nr.h +++ b/stand/kboot/arch/powerpc64/syscall_nr.h @@ -8,6 +8,7 @@ #define SYS_llseek 140 #define SYS_mkdirat 287 #define SYS_mmap 90 +#define SYS_mount 21 #define SYS_munmap 91 #define SYS_newfstat SYS_fstat #define SYS_newfstatat 291 diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 76a5efb0a091..1ce74d3f393d 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -88,6 +88,9 @@ struct host_timeval { #define HOST_AT_FDCWD -100 /* Relative to current directory */ +/* Mount flags from uapi */ +#define MS_RELATIME (1 << 21) + /* * System Calls */ @@ -101,6 +104,8 @@ int host_kexec_load(uint32_t start, int nsegs, uint32_t segs, uint32_t flags); ssize_t host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, int whence); int host_mkdir(const char *, host_mode_t); void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off); +int host_mount(const char *src, const char *target, const char *type, + unsigned long flags, void *data); int host_munmap(void *addr, size_t len); int host_open(const char *path, int flags, int mode); ssize_t host_read(int fd, void *buf, size_t nbyte); diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index 99f5444eb469..1dd7aeb1963b 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -75,6 +75,13 @@ host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) return (void *)host_syscall(SYS_mmap, (uintptr_t)addr, len, prot, flags, fd, off); } +int +host_mount(const char *src, const char *target, const char *type, unsigned long flags, + void *data) +{ + return host_syscall(SYS_mount, src, target, type, flags, data); +} + int host_munmap(void *addr, size_t len) {