From nobody Mon Jan 03 18:22:54 2022 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 4C2C0191D1B6; Mon, 3 Jan 2022 18:22:55 +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 4JSPHf5jtfz3Dp4; Mon, 3 Jan 2022 18:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A4C492301; Mon, 3 Jan 2022 18:22:54 +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 203IMslC026247; Mon, 3 Jan 2022 18:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203IMsre026246; Mon, 3 Jan 2022 18:22:54 GMT (envelope-from git) Date: Mon, 3 Jan 2022 18:22:54 GMT Message-Id: <202201031822.203IMsre026246@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: 340c7343f4e0 - main - protocols: don't execute protosw_init() for every VNET 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 340c7343f4e02fa7d7b36cbefa0d9856d1811eea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641234174; 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=raKcg6nYDofR8DUFWEhyd5J90TogJbcnjNAJ1T6uTL8=; b=Chh6BuHPqEia6eVV1q/+l3c7btIXlZDaYmUFQG0aZ3ldTuKa5T/BTFW8YAPFhXb6EOq2/k 5yu6fFv8x7r+VHriQPbUeOOvc/FmUYOVatQlleHhj6Lzv6o/VMnBIzx4IG6afqEYFbj5+M 8TUv0+21l+2uq8TN6tylcb6KNjke1Fw/Ij/a2OUX0fFHv+ryIj8kOLCdlX5QGkY7h1qhZN UaonLgoeSeJ+oBqjVenkY4Kec9oguYWbmQeZ1IpSBJ9IcWQkLq1n19HwAHoyDZv8+APcDC gyC4CsEIiu8fZ0X1WIGbysUh/c6tJjmtj9EwQygNmZN/pDsAnpMa6fltni8xFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641234174; a=rsa-sha256; cv=none; b=IhaIToDn9QBvsiLhGH++Slvc+MNmcehtLj7oUSqwBdXVkj+ZqhAYBOyQNS9jFjQX8mEnvZ b2lTekVVVAEmZAIqXw4Dhg8ZZxfLPWlrcWM7BR+RpKd5UPpsIQI2Nan42vXigkhRi7xS/a AX9ArzGwfQqkTzFFCfKad61vQE4bC9eJx06uubYswTjDjEq8E3FooEECzk2xNXOsVKMQ4H yuQTCzeJewGexEsGjMh086Agzz+gLbHz8p1k9Vfbq4YGOsegxh9Y88RGHIu8WP/g/KmPD6 FJ1/spKzuZe+reUypM0Nk14o9FGd9kK6+cRdEV/BqXx+rMl9DerBlxSw+EiCFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=340c7343f4e02fa7d7b36cbefa0d9856d1811eea commit 340c7343f4e02fa7d7b36cbefa0d9856d1811eea Author: Gleb Smirnoff AuthorDate: 2022-01-03 18:15:21 +0000 Commit: Gleb Smirnoff CommitDate: 2022-01-03 18:15:21 +0000 protocols: don't execute protosw_init() for every VNET The function now modifies pr_usrreqs only, which are always global. Rename it to pr_usrreqs_init(). Differential revision: https://reviews.freebsd.org/D33538 --- sys/kern/uipc_domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 200637e00ad8..da21ed29a716 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -116,12 +116,12 @@ struct pr_usrreqs nousrreqs = { }; static void -protosw_init(struct protosw *pr) +pr_usrreqs_init(struct protosw *pr) { struct pr_usrreqs *pu; pu = pr->pr_usrreqs; - KASSERT(pu != NULL, ("protosw_init: %ssw[%d] has no usrreqs!", + KASSERT(pu != NULL, ("%s: %ssw[%d] has no usrreqs!", __func__, pr->pr_domain->dom_name, (int)(pr - pr->pr_domain->dom_protosw))); @@ -191,8 +191,6 @@ domain_init(void *arg) if (dp->dom_init) (*dp->dom_init)(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { - protosw_init(pr); - /* * Note that with VIMAGE enabled, domain_init() will be * re-invoked for each new vnet that's created. The below lists @@ -200,6 +198,7 @@ domain_init(void *arg) * state for non-default vnets. */ if (IS_DEFAULT_VNET(curvnet)) { + pr_usrreqs_init(pr); rm_wlock(&pftimo_lock); if (pr->pr_fasttimo != NULL) LIST_INSERT_HEAD(&pffast_list, pr, @@ -412,6 +411,7 @@ pf_proto_register(int family, struct protosw *npr) /* Copy the new struct protosw over the spacer. */ bcopy(npr, fpr, sizeof(*fpr)); + pr_usrreqs_init(fpr); rm_wlock(&pftimo_lock); if (fpr->pr_fasttimo != NULL) LIST_INSERT_HEAD(&pffast_list, fpr, pr_fasttimos);