From nobody Sat Feb 01 19:33:54 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 4YljcL5Bnxz5mW57; Sat, 01 Feb 2025 19:33:54 +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 4YljcL4S1Bz3CPs; Sat, 01 Feb 2025 19:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738438434; 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=OrQBN3aQWi8KvYc2NCNt1KgnhhY7O/uG2sKPjA9+BSc=; b=Mr2J0O6dMrNAEseTfuq/6PVI2zY+/dtDfaEPtT7pYaTs47fkTMl/eKhnmmovK4XwCy/51s z8osij7G5gTG2jA9EUfYZT+VGxAihjRgUwhrTtaPCIjW2tgqAM5FrPOsBTtJ0E0NuujfaN ogR6OBjfEaOZUMT4U7r987yXIo/NQp8cBxccwJT/DDtLFpQO/oIIVj4jJVRQT+ULJ8fZjF eyK9BLMeQ8luEb0b70b2Du7WJCoQ//lkv0OPwUnLZVFKGdlqN+IUBlwibE7Lhj4/Pb+AH/ DP8kYPY8xKZqPiJhtWcoKbgAD7kiBoPjQ4HzGiukVW7zUESttV8oPMFn/oqPPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738438434; 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=OrQBN3aQWi8KvYc2NCNt1KgnhhY7O/uG2sKPjA9+BSc=; b=qtMYlQUTG4ZYU22gl6zUYApIAMc3Pqet6jvy/4yfRDPs9lzJsVaPln7urV1iQsUyWNuuJZ rqZRCA8PoHQqoYnF84DMCfRVZQauoN0BEk4r+R+mEoXo+T1DVyvk8NX9AMoW77sp8q+qIk eWo8BbHJHfbB4cthBzEuyaGWMic63kTqSBLcJq0IMdew7lUzXhZ9ejFCiluU+pvGz4N4rC ADMM1orF2CQDrAzeM2ph8kAelS5bfYfUkALyvodxvgyLYvwESuTMAJ0a3iRKzNykZFwz3W gfy0xYSCdY7UMkDv15TOihQwWdVg1GHLWZd67LhtnmrN2ubHzWp1ooGTwOudgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738438434; a=rsa-sha256; cv=none; b=NfmpojDpf5Hs43ipKGFNP8iK2N3o+m4SqrFdPoynbBYQZAvobV0uZ6ykahPLYMVAJOcJwO UGVeKqjD7TsI6p3+rmSjcqUv4VRZl2HoxvRs5EfDtepxlmyTMOlCSmA3jnhTGsZ8chAmK+ Wbf/cpomZlLSKm65D8Zoba+Hd84K6SfZouBaCT5SnHrgVuIwuphu3J0qFUT/0I892AQZ9y 7uzW8cr1fPt+/zZ2iN5xPu40o8/TaaWjApQ8MYzG/lMrjzFPikhxKsJpkOWviAjP7QbU/s fzjY7WYeGSdtcgDx/mDN9p0PNmWmWa7t3AM1Mcs+64OBI8WStrvjsnAoDPOirQ== 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 4YljcL3mLdz2tb; Sat, 01 Feb 2025 19:33:54 +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 511JXsjh024343; Sat, 1 Feb 2025 19:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 511JXsap024340; Sat, 1 Feb 2025 19:33:54 GMT (envelope-from git) Date: Sat, 1 Feb 2025 19:33:54 GMT Message-Id: <202502011933.511JXsap024340@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: 96104caaf00e - main - rpcsec_tls: do not create an RPC client per vnet 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: 96104caaf00ef48d43c93e95f04ec4de01ee1550 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=96104caaf00ef48d43c93e95f04ec4de01ee1550 commit 96104caaf00ef48d43c93e95f04ec4de01ee1550 Author: Gleb Smirnoff AuthorDate: 2025-02-01 19:13:45 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 19:13:45 +0000 rpcsec_tls: do not create an RPC client per vnet A netlink RPC client should be global. The filtering of RPC calls is done by the nl_send_group() that would distribute the call to all subscribers in the curvnet of clnt_nl_call() context. Fixes: a3a6dc24f34a1b0522bd0dd8fcb6b84c69686251 Fixes: 42eec5201ab936f7227950c2c159c02c9cb342d4 --- sys/rpc/rpcsec_tls/rpctls_impl.c | 48 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index adca24c3e3d5..6745a04e8ac8 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -78,8 +78,8 @@ static struct opaque_auth rpctls_null_verf; KRPC_VNET_DECLARE(uint64_t, svc_vc_tls_handshake_success); KRPC_VNET_DECLARE(uint64_t, svc_vc_tls_handshake_failed); -KRPC_VNET_DEFINE_STATIC(CLIENT *, rpctls_connect_handle); -KRPC_VNET_DEFINE_STATIC(CLIENT *, rpctls_server_handle); +static CLIENT *rpctls_connect_handle; +static CLIENT *rpctls_server_handle; struct upsock { RB_ENTRY(upsock) tree; @@ -127,28 +127,6 @@ rpctls_client_nl_create(const char *group, const rpcprog_t program, return (cl); } -static void -rpctls_vnetinit(const void *unused __unused) -{ - - KRPC_VNET(rpctls_connect_handle) = - rpctls_client_nl_create("tlsclnt", RPCTLSCD, RPCTLSCDVERS); - KRPC_VNET(rpctls_server_handle) = - rpctls_client_nl_create("tlsserv", RPCTLSSD, RPCTLSSDVERS); -} -VNET_SYSINIT(rpctls_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY, - rpctls_vnetinit, NULL); - -static void -rpctls_cleanup(void *unused __unused) -{ - - clnt_destroy(KRPC_VNET(rpctls_connect_handle)); - clnt_destroy(KRPC_VNET(rpctls_server_handle)); -} -VNET_SYSUNINIT(rpctls_cleanup, SI_SUB_VNET_DONE, SI_ORDER_ANY, - rpctls_cleanup, NULL); - int rpctls_init(void) { @@ -163,6 +141,10 @@ rpctls_init(void) rpctls_null_verf.oa_flavor = AUTH_NULL; rpctls_null_verf.oa_base = RPCTLS_START_STRING; rpctls_null_verf.oa_length = strlen(RPCTLS_START_STRING); + rpctls_connect_handle = rpctls_client_nl_create("tlsclnt", + RPCTLSCD, RPCTLSCDVERS); + rpctls_server_handle = rpctls_client_nl_create("tlsserv", + RPCTLSSD, RPCTLSSDVERS); return (0); } @@ -271,7 +253,6 @@ rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, .cl = newclient, .server = false, }; - CLIENT *cl = KRPC_VNET(rpctls_connect_handle); /* First, do the AUTH_TLS NULL RPC. */ memset(&ext, 0, sizeof(ext)); @@ -298,7 +279,7 @@ rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, } else arg.certname.certname_len = 0; arg.socookie = (uint64_t)so; - stat = rpctlscd_connect_2(&arg, &res, cl); + stat = rpctlscd_connect_2(&arg, &res, rpctls_connect_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; else @@ -323,11 +304,10 @@ rpctls_cl_handlerecord(void *socookie, uint32_t *reterr) struct rpctlscd_handlerecord_arg arg; struct rpctlscd_handlerecord_res res; enum clnt_stat stat; - CLIENT *cl = KRPC_VNET(rpctls_connect_handle); /* Do the handlerecord upcall. */ arg.socookie = (uint64_t)socookie; - stat = rpctlscd_handlerecord_2(&arg, &res, cl); + stat = rpctlscd_handlerecord_2(&arg, &res, rpctls_connect_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; return (stat); @@ -339,11 +319,10 @@ rpctls_srv_handlerecord(void *socookie, uint32_t *reterr) struct rpctlssd_handlerecord_arg arg; struct rpctlssd_handlerecord_res res; enum clnt_stat stat; - CLIENT *cl = KRPC_VNET(rpctls_server_handle); /* Do the handlerecord upcall. */ arg.socookie = (uint64_t)socookie; - stat = rpctlssd_handlerecord_2(&arg, &res, cl); + stat = rpctlssd_handlerecord_2(&arg, &res, rpctls_server_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; return (stat); @@ -356,11 +335,10 @@ rpctls_cl_disconnect(void *socookie, uint32_t *reterr) struct rpctlscd_disconnect_arg arg; struct rpctlscd_disconnect_res res; enum clnt_stat stat; - CLIENT *cl = KRPC_VNET(rpctls_connect_handle); /* Do the disconnect upcall. */ arg.socookie = (uint64_t)socookie; - stat = rpctlscd_disconnect_2(&arg, &res, cl); + stat = rpctlscd_disconnect_2(&arg, &res, rpctls_connect_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; return (stat); @@ -372,11 +350,10 @@ rpctls_srv_disconnect(void *socookie, uint32_t *reterr) struct rpctlssd_disconnect_arg arg; struct rpctlssd_disconnect_res res; enum clnt_stat stat; - CLIENT *cl = KRPC_VNET(rpctls_server_handle); /* Do the disconnect upcall. */ arg.socookie = (uint64_t)socookie; - stat = rpctlssd_disconnect_2(&arg, &res, cl); + stat = rpctlssd_disconnect_2(&arg, &res, rpctls_server_handle); if (stat == RPC_SUCCESS) *reterr = res.reterr; return (stat); @@ -393,7 +370,6 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, .xp = xprt, .server = true, }; - CLIENT *cl = KRPC_VNET(rpctls_server_handle); struct rpctlssd_connect_arg arg; struct rpctlssd_connect_res res; gid_t *gidp; @@ -407,7 +383,7 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, /* Do the server upcall. */ res.gid.gid_val = NULL; arg.socookie = (uint64_t)xprt->xp_socket; - stat = rpctlssd_connect_2(&arg, &res, cl); + stat = rpctlssd_connect_2(&arg, &res, rpctls_server_handle); if (stat == RPC_SUCCESS) { *flags = res.flags; if ((*flags & (RPCTLS_FLAGS_CERTUSER |