From nobody Fri Apr 21 10:17:51 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 4Q2r7h2VQPz46CYW; Fri, 21 Apr 2023 10:17:52 +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 4Q2r7h1fXgz3Q6R; Fri, 21 Apr 2023 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072272; 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=neRsCKak3AK0ZYhRwKaJHDEGrPyHdGYZGVvpfYLIx40=; b=aM9qvI0FtjCrqE5HLt7u37wAzsRqIKxCRTMFHX7EOp+2drm/XEbehmfh6rmdbc4F49wGwE rWPJh73YtPqGKpHriTdnY2pJEVDa0xVp9MAiVMcIh2pUG6Gl8fAuaW5zvfRkNX+g8GVxWp 6Z8mHXGKHb5oIpiTPsc47u5NIgfKZwyzhsPslU0w4kngchygSPlmjx8mwYA98k8qf0FaJF VvQulAoMcNG/iPqpoeABi4j1sJH5SeWremi4vdIbDJnYKaKRhnf/hzhDTDevkJ5uKHb60S s1LW9aKxL/UDPs7RX9vlMckxovQ4GiM73mskXvsFWFNDwukEvL5PJy5ykG7b7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072272; 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=neRsCKak3AK0ZYhRwKaJHDEGrPyHdGYZGVvpfYLIx40=; b=LymIaLmj0NzNJl/0SM6vCB0t5A37Iqu4Ou1ykLQkc0uNsm4rYqc2OlTKdRpP3pMJEB0imX jgovCG4l//92qBTtGlMPAoc8aHY2ny+fl6iJDSERbYwk4S1RVyje4v/jsu1PC3Zdpxkjn7 g8+Ee6dnGB3sZH55gTibQ8CUoPX/R/U+6OCBaRM2bPo+/S7IanQFAXvli7N5S+HoOTVSNN RO5zw62Q1xJZAnkDUPNZQzx+ZSoaicKzdHmKTQZWOZWvLy5ezfGCLuQ72M4ZWiR4GN7wl0 sHH21weP3u/37+FOyK2cUzez/3S/tmUuCaKnOaCzfsI0bQueyCR31G7jEvoTpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682072272; a=rsa-sha256; cv=none; b=UOpziRTlGC630T2nxKkor7ZLzaOReomere5rso7KPhdniejYC99k1kMavGySoumijilaFH 25p/amjk3XhlAPH0CJ7bKp2bRzqHaHOFdlxfJRJ7NZwi2szUYNIaW7WVcLcGbXr3/io1SG 7d85ZJlBKlDyZgT9Hg76Na7kUYzoyim7yX1wEKIaGOL958bKrQW9jQiUTQ2/TUw1ipJX3e NGJ/DRYWlGrK6XkuhFxEMawdWG4XaaigebDrHLn3CMj4PGaBW+s4RxhezTraVmkCd44jwC 3gWl5zvyMsRmoaeubMQqADiJs1ECPHAc/Zme6hiHs7cMI9eZCCu/GfnCRAaTGg== 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 4Q2r7h0WsdzGgr; Fri, 21 Apr 2023 10:17:52 +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 33LAHp7T024895; Fri, 21 Apr 2023 10:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LAHp8H024894; Fri, 21 Apr 2023 10:17:51 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:17:51 GMT Message-Id: <202304211017.33LAHp8H024894@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: 673685a50aeb - stable/12 - lagg(4): Correctly define some sysctl variables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 673685a50aeb090b81bbd84f5c606728e00aba68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=673685a50aeb090b81bbd84f5c606728e00aba68 commit 673685a50aeb090b81bbd84f5c606728e00aba68 Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:16:10 +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) (cherry picked from commit 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f) --- sys/net/if_lagg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 796aa7f24dcd..34bcd37bed73 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -269,15 +269,15 @@ 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 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