From nobody Tue Feb 25 07:59:47 2025 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 4Z294X2JZHz5pHkg; Tue, 25 Feb 2025 07:59:56 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z294X1g7Gz3jgG; Tue, 25 Feb 2025 07:59:56 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740470396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mSEx2eb3TXQUSLjSzZ5tA+jkdfYsRKYHQy/PRC5AKC8=; b=CS8LX4ZpqJi5CdRr2AJcZYnIW7CeB11/OuR399HkSXavD3dCADk8K8b9Y1lso2AyxPuZS1 +lldBg54siIXB1vHlah7VCIhU9U26zc/L/UOOs5for0aTd5KpVU5bWASoIfHiJzzUs3Ygi pKof+eqJt5i08YKAkVenq3oxZHvG9myo5CYw1cX/dPCzV5VlpUEc3/Ad6ninGE5twd7J+Q uEFOKgspp98r3qgKy+f+0nhFeCbCQTwmFsq2l/3X4tNoB4soroKSL8yndNlBq2zdBAR/SC ndACKZNgttQ110Ay7Bc5s8Cza4QsQ0l32oQhKu+dCRG0tgmnpnzpJWGdX2sGTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740470396; a=rsa-sha256; cv=none; b=QgyoM0rB2gxxX/iyR51ONHoPEKPTVf4w85Lo+1Zk2FJoTKfP0btd4rIJiXOWSJZqUEQEAH uK3dMoiqUibns/mCQUod1mukOYLd8BLHCLz+4I0m+p1hvGzWxfJNWFqGLBaK7m6Zt3aDbi MAOCoiBTMwTbM6x895MTCp9bGh6QcmeMlhc1lnVmf2aMFZu5k7w3jjqYz8OX5ybvM/W8PC SmVtPl4SV52O5Gr9iLtimrti6JLAcn5omw01/B+qfuN6FBDVQZhbM0PlOQb+ssb2qtm1Wx 6Ox9p/n8llR8z623uWJmMhYFrRcCKVH8GRglz8W7BBuTla2GPj9HPppirHBKEA== 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=1740470396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mSEx2eb3TXQUSLjSzZ5tA+jkdfYsRKYHQy/PRC5AKC8=; b=MGsv+58Lla1ijBu+EbLfKzanfmRFfVeFqHGvM/hFLbeYDG31BSE/uoRTNU60hBWZwZDbWH nMzpUv78aoohOhlxUhz5qHjTRIvNerCOXfKiLIyf0NsC6IlSQPnKZWbYgcRyGg9WSvU8+e SQn1keL2Et0VJ0eQSXwuewuN1MYzFXzGJE/kR5C2tf2bJAkmG8pGU+4iUDtn6ClCZBlmH6 PiKxZ8/548mBI58fqL6eCBBYWx/vY+325jFa+FccinrClWMnZa0eh4u+MftBFSzsKVUkfs n3Y1FOW8y7ARlRwxoABa9h1lPdTXB+1C3KZqLPUw4uL1Jxrnp5SwmzE/GEpWcQ== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Z294V4TBTz1C6l; Tue, 25 Feb 2025 07:59:54 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 93b4a5445658 - main - netgraph: prevent panic with INVARIANTS-enabled kernel From: Zhenlei Huang In-Reply-To: <202502250722.51P7Mwnr064433@gitrepo.freebsd.org> Date: Tue, 25 Feb 2025 15:59:47 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202502250722.51P7Mwnr064433@gitrepo.freebsd.org> To: Eugene Grosbein X-Mailer: Apple Mail (2.3696.120.41.1.10) > On Feb 25, 2025, at 3:22 PM, Eugene Grosbein = wrote: >=20 > The branch main has been updated by eugen: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D93b4a54456589e78dcd37f2db8333baf= f3f3f0b2 >=20 > commit 93b4a54456589e78dcd37f2db8333baff3f3f0b2 > Author: Eugene Grosbein > AuthorDate: 2025-02-25 07:18:29 +0000 > Commit: Eugene Grosbein > CommitDate: 2025-02-25 07:22:53 +0000 >=20 > netgraph: prevent panic with INVARIANTS-enabled kernel >=20 > This change makes NG_ABI_VERSION depend on INVARIANTS > in addition to NETGRAPH_DEBUG. >=20 > PR: 257876 Maybe a wrong PR ? The PR 257876 is about port math/deal.ii , I do not see any relationship = between it and netgraph(3) or netgraph(4). Best regards, Zhenlei > MFC-after: 2 weeks > --- > sys/netgraph/netgraph.h | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) >=20 > 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) >=20 > /* > * Forward references for the basic structures so we can