From nobody Sat Feb 01 09:02:11 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 4YlRbR5y5dz5mbCf; Sat, 01 Feb 2025 09:02:11 +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 4YlRbR277xz41Rh; Sat, 01 Feb 2025 09:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400531; 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=hnqwTD0QbP+vVOTxoTqoA28tU8Vx6xDlkJ+LWWxkgOI=; b=hLavNDY1OGgdGBAD5CzvETVznveLtxjvav1XvqjxPEchsGmm6aNnINC/IHoAeHoDhPZ1IH JFCXEHPclRj2KMMTpB0xi2CCepSFIV7HgOKucRaH9tWWYIubaNPVA0Bv6CME/eKGFmGxqZ +hYAqh+JRTsMc5qeX1AsBeWqCehwcQnHtZGlPSP7oQ5Oy08GalUtoOFrhXD/lWrcHGr5Ie 5wGEyhsClit2VcbNpSRZ3FNiDQEmOix39EJCv3BXDcb51uB0h6Sj982/WuTabLgYUC/6eq xKQv2XrcytLuaPL51XtFptdZdOzlEHOAfJIXcI+kncljvBtmmWQ8mxkCH90zMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400531; 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=hnqwTD0QbP+vVOTxoTqoA28tU8Vx6xDlkJ+LWWxkgOI=; b=pqFcTvCQDNNgIFufQto8YKDpCmkcFC+oDYybmVz184GiaA0VgD1Ob7qisKNmjp1Dx2n5wD jGLgQqevwTT4ax2cXpgxphmpXNflNtLeve4nnNbEWOV3PhcmJdel0gt3b51FOA8mxsolYp zdWF44PrVN7nVqkJAHREKFXCTp/VK6Uv9AVCQigVFUfXvzxvWdzMdWDWbwYiTGfgPkPNhh b0Aw0rSUQAwgO/RhGAF6FeGsy8dOF1tJFuBVXtUsVSigcvUrK9IjDnY3/ZUr+KJBRscfEK +1FHOZjYDruQHo0WSSlldeehGpe/+W01Syrwlj3yQeWiGG5hLtUpoIFmATo6+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738400531; a=rsa-sha256; cv=none; b=cL302DgiDA0hmN8aZpM5Ij0hkPla6a9ERNjlADXsNd+sUbmEMms2LWGhhvY8xDz+WnPdtR Ttn5vMzF0Jg7Txf121oxPMxBxl+viMCeZNOC5KYT9Q+CAki/bqbG6cMZZgGwsAyRbVCUeT GlmXWtRx+rkTw03Op2Ued2a0LxWDBW9OWsy9H8hZuB4CqECBqt5HIdW1eZflkecya3SfcO X0vJJ/KiWyqIJL7cRGEpoGwUglJ+aPAW2KQ3f/EXAjbCuU6/So7XG/NcUhfLdmjTJRE4Ig koyGxcvAwvjh2yeN9kwAgVKo1VsYhZpu6qQYLcApYRnK93q0mXwuj1ATMBhE0w== 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 4YlRbR1cBNzxsw; Sat, 01 Feb 2025 09:02:11 +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 51192Brs047991; Sat, 1 Feb 2025 09:02:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51192BEv047988; Sat, 1 Feb 2025 09:02:11 GMT (envelope-from git) Date: Sat, 1 Feb 2025 09:02:11 GMT Message-Id: <202502010902.51192BEv047988@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: 59f9d8c4bf64 - main - nlm: set vnet(9) context in the NLM syscall 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: 59f9d8c4bf6485a1143e2df514dea5060551a3ee Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=59f9d8c4bf6485a1143e2df514dea5060551a3ee commit 59f9d8c4bf6485a1143e2df514dea5060551a3ee Author: Gleb Smirnoff AuthorDate: 2025-02-01 01:02:17 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 09:00:26 +0000 nlm: set vnet(9) context in the NLM syscall With the kernel RPC binding moving to Netlink transport all clients need to have proper vnet(9) context set. This change will unlikely make NLM properly virtualized, but at least it will not panic on the default VNET when kernel is compiled with VIMAGE. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D48555 --- sys/nlm/nlm_prot_impl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c index 5275f4362a71..02b7383cd640 100644 --- a/sys/nlm/nlm_prot_impl.c +++ b/sys/nlm/nlm_prot_impl.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1711,7 +1712,11 @@ sys_nlm_syscall(struct thread *td, struct nlm_syscall_args *uap) nlm_grace_threshold = time_uptime + uap->grace_period; nlm_next_idle_check = time_uptime + NLM_IDLE_PERIOD; - return nlm_server_main(uap->addr_count, uap->addrs); + CURVNET_SET(TD_TO_VNET(td)); + error = nlm_server_main(uap->addr_count, uap->addrs); + CURVNET_RESTORE(); + + return (error); } /**********************************************************************/