From nobody Fri Apr 21 10:11:31 2023 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 4Q2r0N2FlFz46CJb; Fri, 21 Apr 2023 10:11:32 +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 4Q2r0N1S1Hz3NMp; Fri, 21 Apr 2023 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071892; 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=oHhKLF+dXbS9g0J3Rgi4NdWwrctiJMdvK4oyveE7EA4=; b=RBqWVvnFNDRObXRxktX6qt3a6M62RTzfrBu2D85Boqy66S5a2vmqoBoUIvYjvpwF8iRH2k hmzkiogGhwclPiCZ8h22lR1AkeY7Dg7dmywEwzbSKPbuWEPhUqguLZknFqmU0jeiASBXjQ DLMg/Gjcd3a65RF/loO22v7ygxOUChovBdI7pn+cl+9DDDKFJZPbE4hcIdL8W0FbQCgQTO cA3P6pId7XyeGCejBcqQcM+6YDE0gg/wSbyTjX1fc2tUxnEu4sbkwUFdQEQndLQ+BKLdXD s9o4+RGtTBpGx3AbRFEWp300G4o2CVZMrdno12miv4T/GIp9/TPZXVU6Y4rYTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071892; 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=oHhKLF+dXbS9g0J3Rgi4NdWwrctiJMdvK4oyveE7EA4=; b=ncalg0DURFxkVkBbyTR/gvi1A75Ace/KWUH/EOHbfVfbYlh0HgJbzikFGP5RAwrTsI/p0N o7HhKzc50CNCBNkujZFkWhyXd9aX6QSNdxRkqWTf8tQjZo5lk37tlOdv0ohyOvpI7fC5VN UeF4UjlsfIF8cdiT6alW4943OGH8ZYAVeYiElgtD9Gw6hmFZ/8BB/9Sw1hCXUjfamylttg aqCQWIW0MFtd70Aykj1oNKi+cLhif7XEEB8yJdRHxKGZSvO31hbAJhxSxxK2JxIkE87ZG6 arJ+xTGzpaqs5uvcd2xpOemUqkSclvKzy6yZqTzc/byFC5WUUDn85ZEXSLSoVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071892; a=rsa-sha256; cv=none; b=OK5aLwWdbdBxmD/jy6Y6VJPjit/PPIbpgvupEdFDBpG9WfwNp7jaKt1v9SwDxO6mkuY420 OXK04MYuyvBVO6M9gAWo0kB/qdJkfAVYiMJKm4+OuPF5RzbJnUCZaXmKH+OPl8PZZzAdAi sZaYjR8wmfSIE61qwY69NDQjOIxTcRyXICiksvlkhjtDq+qAHe+B8Mt9fBZUqJtFhpUzXB FwattZnvj4QN7U63Rn4doLC+yWLjlYAKeBien6lSNlwZfQCAnepAkFxbnkdIW74qY5QHsy pEWky2Sz1bHfLVJrmMmX/4ryxjkgLg2kHcge1tH7PMrfF01aRkAvBFZBcYmKIg== 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 4Q2r0N0GYnzG8D; Fri, 21 Apr 2023 10:11:32 +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 33LABVgb020387; Fri, 21 Apr 2023 10:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABVs5020386; Fri, 21 Apr 2023 10:11:31 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:31 GMT Message-Id: <202304211011.33LABVs5020386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 774a2ee9ad7a - stable/13 - lagg(4): Correctly define some sysctl variables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f commit 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:12 +0000 lagg(4): Correctly define some sysctl variables 939a050ad96c virtualized lagg(4), but the corresponding sysctl of some virtualized global variables are not marked with CTLFLAG_VNET. A try to operate on those variables via sysctl will effectively go to the 'master' copies and the virtualized ones are not read or set accordingly. As a side effect, on updating the 'master' copy, the virtualized global variables of newly created vnets will have correct values. PR: 270705 Reviewed by: kp Fixes: 939a050ad96c Virtualize lagg(4) cloner MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39467 (cherry picked from commit 401f03445e4aa42960e337604560593c7096e589) --- sys/net/if_lagg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 687c07971d60..55d68bbde226 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -278,22 +278,22 @@ SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW | CTLFLAG_VNET, /* Default value for using flowid */ VNET_DEFINE_STATIC(int, def_use_flowid) = 0; #define V_def_use_flowid VNET(def_use_flowid) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RWTUN, - &VNET_NAME(def_use_flowid), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_use_flowid), 0, "Default setting for using flow id for load sharing"); /* Default value for using numa */ VNET_DEFINE_STATIC(int, def_use_numa) = 1; #define V_def_use_numa VNET(def_use_numa) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_numa, CTLFLAG_RWTUN, - &VNET_NAME(def_use_numa), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_numa, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_use_numa), 0, "Use numa to steer flows"); /* Default value for flowid shift */ VNET_DEFINE_STATIC(int, def_flowid_shift) = 16; #define V_def_flowid_shift VNET(def_flowid_shift) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RWTUN, - &VNET_NAME(def_flowid_shift), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_flowid_shift), 0, "Default setting for flowid shift for load sharing"); static void