From nobody Thu Nov 23 15:25:11 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 4Sbhkc16bFz51d6g; Thu, 23 Nov 2023 15:25:12 +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 4Sbhkc0d7Zz4Hpr; Thu, 23 Nov 2023 15:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700753112; 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=vUhW2p08xXYw0Xw3pOlTQmWD0iQAUzwMEpYhllLj/hQ=; b=owaHi6HYfPLNaohhCAQpPeL0fd+ygw5LV545jxuFOwXiwGZX8NnpayCINgQSdAT/evfUM7 MXWBDenn04HytdvSaZXawX5+w3+BQXUy4Cbs464dLhJsa2Rea060i9JZIZ4G1uJlH/L2Wr 90LospRkPV8ALJ5Yozo4DW99zxfymZ5jSustRiOhtYBMo4lBR/5usk63TAdS21pNHZbsLE R+kBKQT/tD+/y1zxtXHdTL0wc68qf0UVyulKR3kuWSjohqjEVIpwJZnsZDR1DEVdt4QDZV qy59NSQCq1Y+VCtW9u1kKarAe3lN/c77pV9XC4od2eNCigGKaTKeLXtqaia92g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700753112; 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=vUhW2p08xXYw0Xw3pOlTQmWD0iQAUzwMEpYhllLj/hQ=; b=SCsbHedZ57Hw/SPNceiVG/c7Nz3YeHN/Jbj499qF17aglEGJssCQGyGBlgnDkQ/0MzMUrx AYnEaYar0Q8myap5M+/jGGrGLMngjF9zrBrorMTQkgAc1Ki7SxW0aJknSunLz80tf76Oxc xjBMd7Fj9NFgJ+ICSX+VQ3Yk/UGdQVCiN7Y+MVjyo1YZexp57uW+rHR5BtMAMXHMCpCbNG hg0tBIVsjscWDUj0JBjysXo6U7bnYhQXud6TQ/6/j9DJKMt/yaOvxUEs2Cnz8s/3ecgENV vwzvzEJ03eyCVOB/sljF4rkgGftHKHrOamml98MaTCfqBtqRQklikZ+avkyYDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700753112; a=rsa-sha256; cv=none; b=R6B7j4pUxAgZKHsQFNsgpfRB8hM+wvFGRPalgBUWamHlrE8erS+ZFnPpfraxl2WIOTBouJ MSmedZQd2HhsOlsXjsmkfp60/03va7gtcoTgsJF/MnHrseaLZ66JlS9PQ9JrvV/vewro/S tdFQcT79cXbvDfbTB7mVQkUgxF/y/Z6lQRB0zkhfbeSocdEvXopTr90I3cV8Uzc6qdlUWJ f73s7qmDGQ7/1BUY1akl2gAC3J2ee2O6AlFY73DTnIfpITUqOwtSov+my/i/PuvVLC1Sn/ goP7576Rx/6TthqnYLqZ1T/JK7MoDVlZ5oefwdc+bUl0a2zgNOMvVPNxyCNAgA== 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 4Sbhkb6VSVz16lj; Thu, 23 Nov 2023 15:25:11 +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 3ANFPBJ9039296; Thu, 23 Nov 2023 15:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANFPBo6039293; Thu, 23 Nov 2023 15:25:11 GMT (envelope-from git) Date: Thu, 23 Nov 2023 15:25:11 GMT Message-Id: <202311231525.3ANFPBo6039293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f5f277728ade - main - 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/main X-Git-Reftype: branch X-Git-Commit: f5f277728adec4c5b3e840a1fb16bd16f8cc956d Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f277728adec4c5b3e840a1fb16bd16f8cc956d commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Rick Macklem CommitDate: 2023-11-23 15:23:33 +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 Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42672 --- 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 10b29b569cc5..462fd8bf19bb 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);