From nobody Fri Jul 15 18:04:03 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 4Lkzkr3LJWz4TGpl; Fri, 15 Jul 2022 18:04:04 +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 4Lkzkr17yxz3Rly; Fri, 15 Jul 2022 18:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908244; 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=v15VkIdyVPQC3u/G6D4a5Wgxp8+aiJdIEoS4Rp/Nfjg=; b=U93Z6cLJ/rayBQeL9L0f9JDpW7qvbFyvvbdCN8x04lcDe6+tp9AHcmB9oJLIIdFN7XzSgo evxYIozLTnFTpxL3FfwjMvTz8IBB/dbDBo4bYR8GGkHTtpSnhqOTW/F1yeYztdu1QqEYbi 4AgMKBYXLaBpmvftJsVBWrQmrrrYdIJM9r8wsaPgeaW8rvO/pQXrMO53YGVm6E1GqkiVuv XFDAeddrvsESHMSWqZq1XI6V/C32ZdxhAaU6wbKmPHn1SGR8oStOAwo7KocIdCyOFElByF 7jz3JhafpfXpW5pz1YsS/uoCWoQNYC1PZRoaXp/PAEb0oIV/9Ch54mpOaND01g== 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 4Lkzkq752Pzrk4; Fri, 15 Jul 2022 18:04: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 26FI43RN060336; Fri, 15 Jul 2022 18:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FI43P9060335; Fri, 15 Jul 2022 18:04:03 GMT (envelope-from git) Date: Fri, 15 Jul 2022 18:04:03 GMT Message-Id: <202207151804.26FI43P9060335@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: 8138a766b068 - main - kboot: Implement mount(2) 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: 8138a766b068a17ad8f13ddcb850f356c04d9074 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908244; 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=v15VkIdyVPQC3u/G6D4a5Wgxp8+aiJdIEoS4Rp/Nfjg=; b=TURS+cU05w9EhdBeS71UWGx5E8uezsObNejzpnphhfoe4qhiUYJwpZ9u605RkyIouPnjc1 GphAlBGM+UJDShrvDf0MB94HcuFlwkttcm35YIEYZfQFOeg+qafRBrb5EXSjYlxatsL9av OimoKaO4qoRezXjf4CwOQyED/QaVnD0BzLvAMozpJ6c18Ev9KSs5Poj3jAgK+3nPz/ehiu SD5BZKzb59Eh43CnrdA7oi5fgGheOZv4G/aE3ZepkmNwdEqvKk7PQ7Ju99ZqZnhxOjdcN8 jD1VTcQ4uWuVFBgb5ZPo55dYXmEcubuUx4tgpENtdGppDwoYtn9WUc8+rZTRHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657908244; a=rsa-sha256; cv=none; b=BG35syAeJSNzBxfu1NgEOrlsbBOEtsdFybNTA0NNjh06VOXnERgJEU1+O6a+RjF+pB1y+8 YeBAibbzFNzcQo7LyptlQxHdNyVMOQYWPA4dlukyVrWukwmsmwYab7jZKd58kxEGRC5LJN y9aPuCpYlgpv1ykKb/8NyuKcJM9AESpcQjAP6rmu00qGu+fqly0zwRl2VCp8Q0aOk0v3zr XmaQQFBz3dxpQ7IMzoWowdIoqkf18WCkH0txSw5knWU3SPxJXl7gkeDrYpDEOA84XuDKt6 q6NViMdHT3nwSc4AeyJfcW/fZgSIOQJ1njIiFS7epw0Lfzx2szq6qkR2iEByNA== 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=8138a766b068a17ad8f13ddcb850f356c04d9074 commit 8138a766b068a17ad8f13ddcb850f356c04d9074 Author: Warner Losh AuthorDate: 2022-06-30 18:16:46 +0000 Commit: Warner Losh CommitDate: 2022-07-15 18:00:50 +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 --- 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) {