From nobody Sun Nov 26 00:54:35 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 4Sd9Gg5hz9z5298h; Sun, 26 Nov 2023 00:54: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 4Sd9Gg5BPQz3P5R; Sun, 26 Nov 2023 00:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960075; 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=xKZZ6wlztjN1YESm9nOQ9BPFU4Ou41Qxs7xJnWGqgRc=; b=JsA1Z51NwkldMx/GRDbpKRa8G9Gd7RVjPh0cOhKPZ8pzQLRYPlekY0qDWDLk47H50gtXtx gDOpgj7HDJsegoHv0ldcmg8mT20KgzW2RgQkAnFKmX5svL4N3J4pVHJQkzEyROqtywPNO9 /BerlytfOeXo1dnT/AC0SbflQKkyU807gwv6O/0ebmQdzVyE9+6dTAtMwv4nUajEoO1JSU b5FC2gqYCCTbqewf3+y/kxwkOr9Ny23/5+B/kjJoXPwznCSqetrxhNWxZ9X33yFv5Hg6WA tmhki+mG7SBn2ErnmP69zaPz8zTgXdVGNm6C3m7BJXiv5IqSWCp9x/bO2edXjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960075; 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=xKZZ6wlztjN1YESm9nOQ9BPFU4Ou41Qxs7xJnWGqgRc=; b=WBjqwB4QqK/2GAbdi1M/DDwuyHuNYnWvOblkdzDpiBip+Ab/cbOt0BIGUc7+rx/3q0lgMl 73QEZx9xvRsSLd2b6v1HBw/hklwh8xl4uj3GBv4t0dxRTmongdruSNjtiKtzkI/NCQ4tp9 Wq1sx/CxpqiB+qkdRDJLEtnrtiSubwxpoqLHJV58KQx9eYYrSwv29gcKWLL/ZqQBurN67T be5vH/BDkR3N5EhNAQTiR+69rnfSzdbW23TxEvpM3gbVOctpf6FZPDp1Rc/a5PHgFRu0YJ p2WZ5028E/leVvtl9uzt7Cp7IFd2mUHLHHqKKq9CHoXCt7Cple8dVS8xvVZzrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700960075; a=rsa-sha256; cv=none; b=WDee5/9FrKs2sgt4cB3rlNq/RlM7BWuCjG/WP8rYWyWLTsVjA8uvOid6eb/HmET7ygd0v/ bZPBuO1Ds10k9THn9Che5GsNi8vT2sPVJJcEENNzIid3zyHNz0aAQWAtMgsxeLzqfHLjXs 9G4QioyA2tc/kx0I6auAATf/xNps7OvqxAhhXYKLRFIPyWP69xFPw5k6vCpTtbuoH4hbKn z1bNEE8CVTyKQuUMjplsglLB9bJsnxOHaQVE6PeISuChnIu2pDhhOyHc/R4yAiqjXzO8Wq CYak8KsJXvsheTXLxa29WxzxrIpAW92a35ulinilMhl6YhOVM+OoCHbSLE4e7A== 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 4Sd9Gg4DwVzbNb; Sun, 26 Nov 2023 00:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ0sZeZ007585; Sun, 26 Nov 2023 00:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0sZjF007582; Sun, 26 Nov 2023 00:54:35 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:54:35 GMT Message-Id: <202311260054.3AQ0sZjF007582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: a7c25f0d0644 - stable/14 - nfsd: Fix NFS access to .zfs/snapshot snapshots 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7c25f0d064425bc7a3b170aa441fecf0ae38600 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a7c25f0d064425bc7a3b170aa441fecf0ae38600 commit a7c25f0d064425bc7a3b170aa441fecf0ae38600 Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Rick Macklem CommitDate: 2023-11-26 00:53:29 +0000 nfsd: Fix NFS access to .zfs/snapshot snapshots When a process attempts to access a snapshot under //.zfs/snapshot, the snapshot is automounted. However, without this patch, the automount does not set mnt_exjail, which results in the snapshot not being accessible over NFS. This patch defines a new function called vfs_exjail_clone() which sets mnt_exjail from another mount point and then uses that function to set mnt_exjail in the snapshot automount. A separate patch that is currently a pull request for OpenZFS, calls this function to fix the problem. PR: 275200 (cherry picked from commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d) --- sys/kern/vfs_mount.c | 35 +++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 1a559bfd998e..1ba3b1559a69 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3136,6 +3136,41 @@ suspend_all_fs(void) mtx_unlock(&mountlist_mtx); } +/* + * Clone the mnt_exjail field to a new mount point. + */ +void +vfs_exjail_clone(struct mount *inmp, struct mount *outmp) +{ + struct ucred *cr; + struct prison *pr; + + MNT_ILOCK(inmp); + cr = inmp->mnt_exjail; + if (cr != NULL) { + crhold(cr); + MNT_IUNLOCK(inmp); + pr = cr->cr_prison; + sx_slock(&allprison_lock); + if (!prison_isalive(pr)) { + sx_sunlock(&allprison_lock); + crfree(cr); + return; + } + MNT_ILOCK(outmp); + if (outmp->mnt_exjail == NULL) { + outmp->mnt_exjail = cr; + atomic_add_int(&pr->pr_exportcnt, 1); + cr = NULL; + } + MNT_IUNLOCK(outmp); + sx_sunlock(&allprison_lock); + if (cr != NULL) + crfree(cr); + } else + MNT_IUNLOCK(inmp); +} + void resume_all_fs(void) { diff --git a/sys/sys/mount.h b/sys/sys/mount.h index c4e1f83e9683..70f4bc2b834e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -980,6 +980,9 @@ enum vfs_notify_upper_type { * exported vnode operations */ +/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */ +#define VFS_SUPPORTS_EXJAIL_CLONE 1 + int dounmount(struct mount *, uint64_t, struct thread *); int kernel_mount(struct mntarg *ma, uint64_t flags); @@ -1016,6 +1019,7 @@ int vfs_setpublicfs /* set publicly exported fs */ (struct mount *, struct netexport *, struct export_args *); void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); +void vfs_exjail_clone(struct mount *, struct mount *); void vfs_exjail_delete(struct prison *); int vfs_export /* process mount export info */ (struct mount *, struct export_args *, bool);