From nobody Sat Feb 01 09:02:14 2025 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 4YlRbW1rg2z5mb8h; Sat, 01 Feb 2025 09:02:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YlRbV4s8wz41VD; Sat, 01 Feb 2025 09:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400534; 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=ZRLO5etYCPAY0TeOrAYbfPixFFChiCF5a2f0rk8l5nA=; b=VkREsENYFRZyARzv9J+Qmn0Qd+/XkfVHf5XEOLzcEU/7Zg+ZhdsRra3PXL7B/1U7W3XQzg 7FgTeRZYrNTw8jLDZbleZP2rFtyHgIEKmzZmv3pWPAm5NYwz6z4csdhINGP7Bh9wUTRdEV Y80d6GXOYSspFy+X8Xhe4GQAvbLzIZI+SVnWIRHtOREaKjB2EFVWuNrpSyiDDTeDK0s5V2 W+Q68vRCSv3AcR3dqXWc7H8uFuWaPnG0L2H5bU2xUoz3WUL/gV3hVgof99bumfGk7+5Eux k8ksMk9aSrLoFRVO8yclU8VtU4CaSS8gq7EFbNr2C6L8UQqTK1dKczlkd3htEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400534; 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=ZRLO5etYCPAY0TeOrAYbfPixFFChiCF5a2f0rk8l5nA=; b=hGdpHrJyLIqRP1V4m4Z6CXah3Y1te/mpXbjfYpKN+v5VGkrQlWLEts+pBmmnJeua3xvKMJ ifzh3THOrM9RVYH7mV8aGRi6VKDC5oV3FJJhfJHyDaEn5nFcTQsooCdfDaN5Hr2Xb2ft9a OCuCASHt2dHE6xGE4Oz+JE6KTZpdqF7xGUhf7IQnhvWaGB0ci1bjc+nH4NaL2VcCyKVBB4 dGmgwIyWWjdFvA1pDAFpc0nH6FmMNvoJriWrN3nOorQpPKYuuNmSJHAc4fqVP5oq1fGh9U X4FC7MWxcFk3h8aNEn1vK+wN3uJV+urVmjTnZWDdE1Aj41AiDDoIGhI9nNYZtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738400534; a=rsa-sha256; cv=none; b=xMNesUtdcW6fBhVIXxuZKAuTeHwolV4pRpcpAfsXgjsjbRwkdgrTtvmvP0eXY2HQhedxF1 Dnhd+9sr1fCfGT2RZhwprLEhOmFDsUANZQ704H6pjAZEJsb4Ko3OAH7fYi6UB9Y6uYNeoq RPIZ9dBjda6byzSFRB8+i/6D7jN4kZykhIAdCV060uQtkYxf6PwKkMGhdYPwAmr9MuZDTE 4A2Wvlj6W+rG+WrwdZIGQyKQXhRShG0yDQHMU2TZ74yDtYszDwBF4966u217Y2o52yU9Kk ZzlMF4R+TOiguM6wgtXckgJJ1i8vFJi0UsdeJMtwByj3EEyyttbIKLatdkvhuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YlRbV4SL4zxsy; Sat, 01 Feb 2025 09:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51192ELi048088; Sat, 1 Feb 2025 09:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51192E2S048085; Sat, 1 Feb 2025 09:02:14 GMT (envelope-from git) Date: Sat, 1 Feb 2025 09:02:14 GMT Message-Id: <202502010902.51192E2S048085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b837f100e1c8 - main - nfs: set vnet(9) context in mountnfs() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b837f100e1c854d1f805b615f0bce5ede85f8552 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b837f100e1c854d1f805b615f0bce5ede85f8552 commit b837f100e1c854d1f805b615f0bce5ede85f8552 Author: Gleb Smirnoff AuthorDate: 2025-02-01 01:02:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 09:00:26 +0000 nfs: set vnet(9) context in mountnfs() This seems to be the right place to set it once and for all, without setting it deep in kgssapi/rpctls/etc leaf functions. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D48558 --- sys/fs/nfsclient/nfs_clvfsops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 1cbe8e70867f..6bc67b342cbe 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -1524,12 +1524,14 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam, #endif NFSCL_DEBUG(3, "in mnt\n"); + CURVNET_SET(CRED_TO_VNET(cred)); clp = NULL; if (mp->mnt_flag & MNT_UPDATE) { nmp = VFSTONFS(mp); printf("%s: MNT_UPDATE is no longer handled here\n", __func__); free(nam, M_SONAME); free(tlscertname, M_NEWNFSMNT); + CURVNET_RESTORE(); return (0); } else { /* NFS-over-TLS requires that rpctls be functioning. */ @@ -1544,6 +1546,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam, if (error != 0) { free(nam, M_SONAME); free(tlscertname, M_NEWNFSMNT); + CURVNET_RESTORE(); return (error); } } @@ -1816,6 +1819,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam, */ NFSVOPUNLOCK(*vpp); vfs_cache_root_set(mp, *vpp); + CURVNET_RESTORE(); return (0); } error = EIO; @@ -1844,6 +1848,7 @@ bad: free(nmp->nm_tlscertname, M_NEWNFSMNT); free(nmp, M_NEWNFSMNT); free(nam, M_SONAME); + CURVNET_RESTORE(); return (error); }