From nobody Tue Feb 25 07:22:58 2025 X-Original-To: dev-commits-src-main@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 4Z28Ft5TWkz5pDMD; Tue, 25 Feb 2025 07:22:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z28Ft1h4gz3GGg; Tue, 25 Feb 2025 07:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740468178; 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=T4GKiYFoasKe40Vfg9pq2mVKrl88Yg3bgkCgnNjLv5I=; b=yrl4amxX1cPULjgFYIoeJJl/mswmo4q8UFcWveM9u+ovnNLTNaRPgaeHZcc9odqsRXpjSQ CJF8l88EH5QVoV+3Zyndq1MHAr8Y9ym6nRp24sILNq+KyHtTyREgYrhcMjVNoXe9dWfIgH obh2Bnpw5/T/5x6KDucirpeZ2A1yOkWY1kiZsLW4n8ILZNylwsqhCGhg1xj75yF04CSiKe CLVS94mh0+MVHdmPqP5zP9Mkxr8ClbaGOEutSWwutIXNjLisB1/EC1CYBk6KgIQYEPp61n xj5IWur3+KrgFWpgeYoeoIfdp4h97jLTzlywd/Y9vS3xKWkuCJy9jc2iN7BwIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740468178; a=rsa-sha256; cv=none; b=U0A9y/9ECPmKyNFPjpRyLypbeJQ/viu59Txpoa4WfOHGJD9GnB2H5cCT77kkvr5kR9aja6 tKfDyOPF4Wks8NaHC+a8ASqaUd7vb2RsIJV1yIHzPXh5C2Fdzonds9dc2IRCTWiHnLfsxo MWcq+gIG25icGPzrzg0jDizZnEds2Fek3nu/dJ/hoRssC1yUwjWb3YU1OfW7Ew1Wf0zYdv xDluw0uxKdqhf/sOcq4JWSMTKdnGA8PXA5DNQlOu/RqiR6H5ebCXtG6t1yoZa1xCz5YSDM Nsp0ksuksGxsfJax7el8yBScDEPaPVqN1B+ZkwTxVKdy5u45FxYgJNvLm8aBcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740468178; 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=T4GKiYFoasKe40Vfg9pq2mVKrl88Yg3bgkCgnNjLv5I=; b=ICsPj5BPunEGoPqxeWK0mliPltQKfDA+eGKqMIWWpw3C1/DYpvulAgPksq+ZNr+a3AEK1R JDuqJGWt1cx8Ey1YyFyYuwSbAv/Xiog4pWtblCV2i8lfCuVe/lPn4LeJyeb/MUVP2m1O8Z CHJwwLuMLPCmDIFGFoxaco/hWQk7o3BPe5CHtB5jJmFOyou6KOcKMcAg43fQ+co9p/eygd rjraE0RAwHrpdRFbLhoiDsz8gOBVZOgPVMFCqeyDsLAYQXhfcLi2T5v3vMPQJGdiHw7w57 xP2LOUadBZD/IrV9CuQohyqXG4LJkFR3OdtZ3rMyCo1Vt8PnvjWGWRPliPIMsw== 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 4Z28Ft12pJz1Rc; Tue, 25 Feb 2025 07:22:58 +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 51P7MwvB064436; Tue, 25 Feb 2025 07:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P7Mwnr064433; Tue, 25 Feb 2025 07:22:58 GMT (envelope-from git) Date: Tue, 25 Feb 2025 07:22:58 GMT Message-Id: <202502250722.51P7Mwnr064433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 93b4a5445658 - main - netgraph: prevent panic with INVARIANTS-enabled kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93b4a54456589e78dcd37f2db8333baff3f3f0b2 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=93b4a54456589e78dcd37f2db8333baff3f3f0b2 commit 93b4a54456589e78dcd37f2db8333baff3f3f0b2 Author: Eugene Grosbein AuthorDate: 2025-02-25 07:18:29 +0000 Commit: Eugene Grosbein CommitDate: 2025-02-25 07:22:53 +0000 netgraph: prevent panic with INVARIANTS-enabled kernel This change makes NG_ABI_VERSION depend on INVARIANTS in addition to NETGRAPH_DEBUG. PR: 257876 MFC-after: 2 weeks --- sys/netgraph/netgraph.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index e83f61d3f60b..10db352e0fa2 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -69,11 +69,20 @@ * modules. */ #define _NG_ABI_VERSION 12 -#ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ -#define NG_ABI_VERSION (_NG_ABI_VERSION + 0x10000) -#else /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ -#define NG_ABI_VERSION _NG_ABI_VERSION -#endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ + +#ifdef NETGRAPH_DEBUG +#define _NG_ABI_PREFIX1 0x10000 +#else +#define _NG_ABI_PREFIX1 0 +#endif + +#ifdef INVARIANTS +#define _NG_ABI_PREFIX2 0x20000 +#else +#define _NG_ABI_PREFIX2 0 +#endif + +#define NG_ABI_VERSION (_NG_ABI_PREFIX1 + _NG_ABI_PREFIX2 + _NG_ABI_VERSION) /* * Forward references for the basic structures so we can