From nobody Mon Jan 27 18:36:06 2025 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 4YhcYz3QhTz5m4vN; Mon, 27 Jan 2025 18:36:07 +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 4YhcYz0n49z3wWb; Mon, 27 Jan 2025 18:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002967; 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=wjqO9O15OtYxF0hW7rv8QF2+oHqiosvkDBOaTt5pAAo=; b=BWobNcJUPNQP6OhJOCPdfNnsJ+zt4v65y6em0fBg7MCrDcQxVlSNlrtO2SLXwgvqFDugOu l154MqBblKKlYH6ADYEoJQjXXugytv0fz5rhLQq2R6M8MOHNEO2ZUJNJYs3d1b9+Egfs5o eBWbjyIV6bMinaPeQ+22BsXs7huYNEvtMnq8yMUnmNHQDPhbt18xpeDjmeHwV8RAp1KgIT rnjqP3pIxdlRqHTgdxpmPyzPixjjDP/bXAHlJFzl7NQ5Isw0Vrf6jP0AqsjhPU2LK+RbdD 6+kJKkYdSSkfW2T0YlPZyoWSrUmbt1kEXSA5LnFoBTTqrLE1F+XrUgek2n5lDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002967; 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=wjqO9O15OtYxF0hW7rv8QF2+oHqiosvkDBOaTt5pAAo=; b=PFuU1UeU/47rQoITuOdkWuqpb0fvY2fKbBofZbR/06f7I5Uk3L0hkYmrWz1rApqx6P8utM Ox0x0wzBY1TaSa4OXcoZDgbYUZsDl5xJUxFnZ4l3Gp2XjcGbYBzB/SvYKodpGNZ+RDt6RM /8aJWWcYq+Ps7GWfVSlj5skIrliLmFw5xJ7PPtZ4h4ZIm3YxPiU8EVCWJP2KTVAwIRjb/0 u1WJ7xREmZ70Yk66shlGqXvgsV/paATHqPu+IfWj8XOX6R0yi7fOgmsQGg3uXzI36tctyl alHgx18TDVpBmBxvLERfwIkEId/mvgeWhfriSrLv4+urdaHkdlINmn6E1KofBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738002967; a=rsa-sha256; cv=none; b=q731kwodKw+L/AGA5AKF/Ux2EIJTxX8wOx4Q9Sg8/mygySqqhNMO+bozXWIMTyY/4tZgtb aexGHkH6vXZvXH/fCV2lVzWrBTMsFLPWyg/jrvXqUBDBESGjtWW1+COZBScyqvrsVTjeX8 ceABtBDe5Cbi4EA0QMmHvvvCN6eSLRiiUJ84qIA17vvuXwLJG8wFnS+68fYX3lafdPFnSz liM1+FIadWg2wRSZovAehwx0cd8UJAWr8i7wFoTdAXJH+PjOqreA1Tnw0/xA8FDC9e0Ctt xyJSkKUIUdJKBkuC0ydWD/86zdJPCpbfv1TAqnSDLx4QBAw02Naqy/1uVpyhFg== 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 4YhcYz0BXXzgms; Mon, 27 Jan 2025 18:36:07 +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 50RIa6GM029736; Mon, 27 Jan 2025 18:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIa6Eb029733; Mon, 27 Jan 2025 18:36:06 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:36:06 GMT Message-Id: <202501271836.50RIa6Eb029733@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: 353cf44d828c - stable/13 - carp: Explicitly mark tunnable net.inet.carp.allow with CTLFLAG_NOFETCH 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 353cf44d828c0b43ad34dab7ab4572186087a331 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=353cf44d828c0b43ad34dab7ab4572186087a331 commit 353cf44d828c0b43ad34dab7ab4572186087a331 Author: Zhenlei Huang AuthorDate: 2023-09-09 08:10:32 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-27 18:32:59 +0000 carp: Explicitly mark tunnable net.inet.carp.allow with CTLFLAG_NOFETCH With recent change 110113bc086f, a vnet tunable can be initialized when there is a corresponding kernel environment variable unless it is marked with the flag CTLFLAG_NOFETCH. The initialization may happen during early boot(linker preload), at that time vnet0 has not been created. The hander carp_allow_sysctl() for the tunable net.inet.carp.allow requires vnet, thus invoking it during early boot will cause kernel panic. The tunnable is initialized by vnet sysinit routine ipcarp_sysinit() so let's just mark it with flag CTLFLAG_NOFETCH. No functional change intended. Fixes: 110113bc086f sysctl(9): Enable vnet sysctl variables to be loader tunable MFC after: 2 week Differential Revision: https://reviews.freebsd.org/D41525 (cherry picked from commit 242fa308f3c3def32b2e61e0b78c11b3697e4492) (cherry picked from commit d67b1748ea34ad6f66072694fd8b623ab0ea72b1) --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index cc7add7c3d64..9b651ac2eba1 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -219,7 +219,7 @@ static int carp_demote_adj_sysctl(SYSCTL_HANDLER_ARGS); SYSCTL_NODE(_net_inet, IPPROTO_CARP, carp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "CARP"); SYSCTL_PROC(_net_inet_carp, OID_AUTO, allow, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, &VNET_NAME(carp_allow), 0, carp_allow_sysctl, "I", "Accept incoming CARP packets"); SYSCTL_PROC(_net_inet_carp, OID_AUTO, dscp,