From nobody Sat Jan 18 06:08:17 2025 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 4YZmPG1TRDz5ksjN; Sat, 18 Jan 2025 06:08:18 +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 4YZmPG0ljqz3xsx; Sat, 18 Jan 2025 06:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737180498; 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=0paNKTvlMEBd5naWJpQgDAc39PfU34S4b6FdNg7Vjvk=; b=Vkp/+wuiWOSoeUlpJIJyzM2dz32VmZSghxuhLSSGUIewa5NtFewbLhh/uQV0nmGf8HtiZR Q5ccYxcWslconAiPmqTJq41kg6G5sZ1twgFeh4Z3+AGt7fw2my0dOturpUbLapMmH26S10 6WmWnAAtO6yv3FKRDw6+MoFwdRs5qK59pPoZEpZSuoMovtuZkLxqlOdFmNML6xn6ShE57t PzUGxHV1Mk4QlTSf5+0DvK1aBLwaSlSWiYEsLtpTTwHGJYVCDNZC4OIubPRvGJQHZVq2X7 bmp5gcjgX/4g0YAyrKWXteoWo3B3EL6yyLxmOzEWNAOclXHVHPkCYSDvu6QkcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737180498; 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=0paNKTvlMEBd5naWJpQgDAc39PfU34S4b6FdNg7Vjvk=; b=DsJuy5swhV5Luj+Z8bmanQYpK6GhtpFICbj5Tf2yKz24Rrx8l/NUUl3pXujjXg8rKKmxgg eaRnCRDG0sKKly42lrMBP9dESi0f+KqzG2Gxw4vzBJZPp4zQIRoP4htOt2KesKpBSiOhyO LoeZ69R9ojhGb9yjUgkawpJzV3joSU4wcxoXBmGii4JmMnlowM+iEDhBEsMKsJdOsTnuKp ZFjOHVD7jip5hqn/jj6tp2Bjn7hw0SUubepTEhk5onKL3MDLuW+bfn+RUlxJ3RW0YKvXgj ctYFcbv70HAkSo11+u9tRVk6BIRBrA16VyV+x+AjutCXHlMSFKHlvS21Qqcujw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737180498; a=rsa-sha256; cv=none; b=U4Aaw0K7HoJKk42BUzusb0jRZBe3LNF1VVdOyBtkGIZCAnsT2wkalXTYpD4Jix1fo+Mzo/ Iw0qfrygf3q3ubmWYfYP+JT5P7iS6F/Ii3wWKi7Vy6ViGWzRoS4gp/tJsy+z7WKDjRmQg3 0S28wEBDuRQ07h9UjOeT9FU55NNHIMrZZs5P3iv93oxsT7E69CaUQ05eIwUxSqvgSfQZKc JP01x+hmfROXyCxNP+Bshaw86Md3pt7C6/0IQGiZGB/7yMp0bZCB1XVuyOPmtRJjC/QpCY Fe5/oQkL56cSFztPiWYUxzqMcuG8GAQipnXLzexkqCX5jfzFRwNvWz8ec4Sxjw== 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 4YZmPG0HgGzsB3; Sat, 18 Jan 2025 06:08:18 +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 50I68HtF071481; Sat, 18 Jan 2025 06:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50I68Hk6071478; Sat, 18 Jan 2025 06:08:17 GMT (envelope-from git) Date: Sat, 18 Jan 2025 06:08:17 GMT Message-Id: <202501180608.50I68Hk6071478@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: 488660360a71 - main - krpc/svc_vc: keep the vnet context during calls into rpctls 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 488660360a71f65a31d3709559554c1a90f7220e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=488660360a71f65a31d3709559554c1a90f7220e commit 488660360a71f65a31d3709559554c1a90f7220e Author: Gleb Smirnoff AuthorDate: 2025-01-18 06:01:46 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-18 06:07:45 +0000 krpc/svc_vc: keep the vnet context during calls into rpctls --- sys/rpc/svc_vc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index 9fc4108a5149..f70aabc5425d 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -493,6 +493,7 @@ svc_vc_destroy_common(SVCXPRT *xprt) if (xprt->xp_socket) { if ((xprt->xp_tls & (RPCTLS_FLAGS_HANDSHAKE | RPCTLS_FLAGS_HANDSHFAIL)) != 0) { + CURVNET_SET(xprt->xp_socket->so_vnet); if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0) { /* * If the upcall fails, the socket has @@ -505,7 +506,6 @@ svc_vc_destroy_common(SVCXPRT *xprt) xprt->xp_sslproc, &reterr); } /* Must sorele() to get rid of reference. */ - CURVNET_SET(xprt->xp_socket->so_vnet); sorele(xprt->xp_socket); CURVNET_RESTORE(); } else @@ -853,13 +853,13 @@ tryagain: if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0 && error == ENXIO) { KRPC_VNET(svc_vc_tls_alerts)++; - KRPC_CURVNET_RESTORE(); /* Disable reception. */ xprt->xp_dontrcv = TRUE; sx_xunlock(&xprt->xp_lock); ret = rpctls_srv_handlerecord(xprt->xp_sslsec, xprt->xp_sslusec, xprt->xp_sslrefno, xprt->xp_sslproc, &reterr); + KRPC_CURVNET_RESTORE(); sx_xlock(&xprt->xp_lock); xprt->xp_dontrcv = FALSE; if (ret != RPC_SUCCESS || reterr != RPCTLSERR_OK) {