From nobody Thu May 18 23:15:13 2023 X-Original-To: dev-commits-src-branches@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 4QMm694jf3z4C83p; Thu, 18 May 2023 23:15:13 +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 4QMm6943jsz49ds; Thu, 18 May 2023 23:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684451713; 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=Tr3wb24u19Wyhom8klKeyeRmq4o3XfzPiex68KH6+BY=; b=LrI0Rbk/tZ+jXQ4aNpx0otfC1hck8MjjjkDoNfJ9qGsDwtJrpd8U8Chlh5nO+olXIa2fy5 4j8VzfTSan8/9OcdIIVpT+tlVaYdZhsnfDKOxkHk7m9NHDVZwHl1AIB4uCp3Aox9kD4FNM m8Gx1kz+7scNme2s80osbF/tHfcixoLtM1qiZ7Zpthj6wRNRv6yRKGiRBNssMaJMMNpCkA 1h0qdrI+TPVMoTy5wVpHPiDWgQ3VKKAsxkGFlknLNkcXDC2zjhyUBSNX4/abNBrhCrOxsh psGv837cAIDijfMF/wlxA+DQnELqPyfVzvVohTuJDw2K0XykCZPzfMQqcqYZCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684451713; 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=Tr3wb24u19Wyhom8klKeyeRmq4o3XfzPiex68KH6+BY=; b=SKIUYryhYIHmgzJ5hzX/IKlHeBIL5zn1uoqHf0g5yU8UEw2XjI2y7DSK3ay6FcbjtEy0y1 uRvdfTyWpF2UFTqZrqWm9X7B/NcHNve6t0la7Pyy8ein9dL0Df/3euZNwyXJiAJlxm8ETL s2t2PZ2za1uMGLTJ+i/SjfdqKHYicZ/XUzW+KTWCGpqPjvWNi2rB87oJcYwSjmafJeXMc0 w6YoOIBjN5eMQE0RzauP+vviH3YrlbsuBCaBcL1qMX8ILVRkMZ6Ji8rv8RIz12hilClj0S sJcHRVptAsKJyRzCFZadWTEN+5xlxrOcnc68MK9B8H3FJp6pd6BmCwjgyGMKGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684451713; a=rsa-sha256; cv=none; b=J18RczZHIqwN0iDlDVAx6zOtesJeRV4DlcuwnZWpTlos2uXibrvBYInYX9RQUpFMWZog+r k/TeN9tr5HdfXEhjA6Mpu8JzpzBgFdfJpvpmajrWp5s+dgKqps2Fe/J7j0ZAbCo0vIYJbE tTTIvvuEIjtkWlUtu6nWk/ERB2m91jlBAPDuAfAa4crHbQyd+AdUr96gpBc52+/nPKEp+F +0UTTI4NU9r7zphuMcXb2zJW3YI9l2arG6roLuu+2/DjDDfr0B/nTJcC3r7c0vWKVZd5VS jP3KOT2xhQVVesS1YEkuPnfGxGxh2n/o96MvXUViK4d6eb2PRZPra0E16IHg+A== 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 4QMm692s4cz14gj; Thu, 18 May 2023 23:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34INFDsY029011; Thu, 18 May 2023 23:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34INFD0M029010; Thu, 18 May 2023 23:15:13 GMT (envelope-from git) Date: Thu, 18 May 2023 23:15:13 GMT Message-Id: <202305182315.34INFD0M029010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 34a0d4cbae16 - stable/13 - svc_rpcsec_gss.c: Separate out the non-vnet initialization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 34a0d4cbae1689a5f362a2d8cf32f23335fa0359 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=34a0d4cbae1689a5f362a2d8cf32f23335fa0359 commit 34a0d4cbae1689a5f362a2d8cf32f23335fa0359 Author: Rick Macklem AuthorDate: 2023-03-01 23:29:25 +0000 Commit: Rick Macklem CommitDate: 2023-05-18 23:12:47 +0000 svc_rpcsec_gss.c: Separate out the non-vnet initialization Without this patch, a single initialization function was used to initialize both the vnet'd and non-vnet'd data. This patch separates out the non-vnet'd initializations into a separate function invoked by SYSINIT(). This avoids use of IS_DEFAULT_VNET() in the initialization functions and also configures the non-vnet'd initialization function to be called first, although ordering is not currently needed. (cherry picked from commit 57ff348804f98d956f2e203b665de5a8989dbf8c) --- sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index 05be03bb74ea..872468aa7b18 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -207,6 +207,25 @@ KGSS_VNET_DEFINE_STATIC(uint32_t, svc_rpc_gss_next_clientid) = 1; static void svc_rpc_gss_init(void *unused __unused) +{ + + svc_auth_reg(RPCSEC_GSS, svc_rpc_gss, rpc_gss_svc_getcred); + sx_init(&svc_rpc_gss_lock, "gsslock"); +} +SYSINIT(svc_rpc_gss_init, SI_SUB_VFS, SI_ORDER_ANY, + svc_rpc_gss_init, NULL); + +static void +svc_rpc_gss_cleanup(void *unused __unused) +{ + + sx_destroy(&svc_rpc_gss_lock); +} +SYSUNINIT(svc_rpc_gss_cleanup, SI_SUB_VFS, SI_ORDER_ANY, + svc_rpc_gss_cleanup, NULL); + +static void +svc_rpc_gss_vnetinit(void *unused __unused) { int i; @@ -216,26 +235,20 @@ svc_rpc_gss_init(void *unused __unused) for (i = 0; i < svc_rpc_gss_client_hash_size; i++) TAILQ_INIT(&KGSS_VNET(svc_rpc_gss_client_hash)[i]); TAILQ_INIT(&KGSS_VNET(svc_rpc_gss_clients)); - if (IS_DEFAULT_VNET(curvnet)) { - svc_auth_reg(RPCSEC_GSS, svc_rpc_gss, rpc_gss_svc_getcred); - sx_init(&svc_rpc_gss_lock, "gsslock"); - } } -VNET_SYSINIT(svc_rpc_gss_init, SI_SUB_VNET_DONE, SI_ORDER_ANY, - svc_rpc_gss_init, NULL); +VNET_SYSINIT(svc_rpc_gss_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY, + svc_rpc_gss_vnetinit, NULL); static void -svc_rpc_gss_cleanup(void *unused __unused) +svc_rpc_gss_vnet_cleanup(void *unused __unused) { mem_free(KGSS_VNET(svc_rpc_gss_client_hash), sizeof(struct svc_rpc_gss_client_list) * svc_rpc_gss_client_hash_size); - if (IS_DEFAULT_VNET(curvnet)) - sx_destroy(&svc_rpc_gss_lock); } -VNET_SYSUNINIT(svc_rpc_gss_cleanup, SI_SUB_VNET_DONE, SI_ORDER_ANY, - svc_rpc_gss_cleanup, NULL); +VNET_SYSUNINIT(svc_rpc_gss_vnet_cleanup, SI_SUB_VNET_DONE, SI_ORDER_ANY, + svc_rpc_gss_vnet_cleanup, NULL); bool_t rpc_gss_set_callback(rpc_gss_callback_t *cb)