From nobody Thu Oct 31 04:43:52 2024 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 4XfBGJ41gdz5b41l; Thu, 31 Oct 2024 04:43: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfBGJ2w1pz537R; Thu, 31 Oct 2024 04:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730349832; 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=giJFVXAlTJPpIspOthT4mN6QLu+wmxCktEApAdMEsWE=; b=DUPBvkmVv28ifBvG2YnYNlWRHVcAK64ZPJ0T1vvXPQWrGpoTVYvDPj/AjoXxOEmOiwLP6e PhrsOsrFgqXwMkMXd0ApVLqDX1IcCfXW0ixKxqJdfLFkQGo7g0GulGpKVCu3zWtvW9LY3s 67+oPaHphyMrEXNIO0JBLrenu+OrEdzBh1hjIW/8bPvYgVC4h1MLymXRK+mj/9h6DR1MPe 6XoVdNu4RympzmSC0r3c1PPhH9VoDwrp5dgzXzlvXduVclxQla5HGvaZ01aK3n9DF5RpZa v+2Me8kVnDyIHljwtZtWQQfBOBIKxnP9O4q5bd117f/3KBRlPnXwIqxkU0+3Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730349832; 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=giJFVXAlTJPpIspOthT4mN6QLu+wmxCktEApAdMEsWE=; b=Zm3PtAUlKTWROGwNvExTsZYXipso1sLumHrNgPXavHbue5U48mC9zMJKKakEQeXvQMvgv7 /H0YbiOJ9VLV/AKrWrZqu9RRkxZc8HlVYVVNBmMMFLM2Y/btn3LYOTNxmfRxLfIpMf+jPn uwbIHnpzDWXIqlSQ58l0khuvt7le0oJFpgoar8MnhbHcTd+tiyxJ3Loy97UGNPXSXsDZGx QrWoFzjTC1TMVGQF5L2meVmV8kR05Up9EbFZbNBk5e+Fepa2Tp9LA1o968hTY/3AGhaqcl juUii6z/8arDpy7autP3kWo49IuxdLOsaYem8KiYJE9i0/dS9s3avEsxKup8Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730349832; a=rsa-sha256; cv=none; b=VOVhA9vartcU5R+EeVRYP7FG6cqPF3llr7Jh4fS2X/px2o5xysGvq+JKiyulGKmzNuj5Fy Xsa9WLj5FI9R1j+T5XyuA7fpq9r1Qmc6U+QJKpTE82oIGUzRv2LU5qN8y3O2XOM58hM7EZ AgwCfGYaf6BZDZCko4VgrRUkf9CHvb7D0d7vOdXTy8ZMO09uG/8qUi0OXtyxDWuSY8gJtD S6PxnqLXihNgVVO15vBzlJcSZdrWnrrxWVl5PCUmQWrOL03KGFOdav2soomBP+aYXgC3jQ AKJHwwYZxFCQgxqr2YEwAAa6ZoE6sPfPU0+fwpk2BD6tMcogrv5IfwBmUP3BqA== 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 4XfBGJ2WMVzM4F; Thu, 31 Oct 2024 04:43:52 +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 49V4hqs1006510; Thu, 31 Oct 2024 04:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49V4hq5v006507; Thu, 31 Oct 2024 04:43:52 GMT (envelope-from git) Date: Thu, 31 Oct 2024 04:43:52 GMT Message-Id: <202410310443.49V4hq5v006507@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: 2f3c87296cc7 - stable/14 - ifnet: Assert that we are assigning network stack correctly 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/14 X-Git-Reftype: branch X-Git-Commit: 2f3c87296cc727fc21fbb4d549deaed7dfa2fef1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2f3c87296cc727fc21fbb4d549deaed7dfa2fef1 commit 2f3c87296cc727fc21fbb4d549deaed7dfa2fef1 Author: Zhenlei Huang AuthorDate: 2024-10-22 04:32:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-31 04:40:16 +0000 ifnet: Assert that we are assigning network stack correctly It makes no sense to assign NULL vnet to an interface when the kernel option VIMAGE is enabled. Add an assertion to catch that. This will also help diagnosing problem report [1] and [2]. 1. https://bugs.freebsd.org/275381 2. https://bugs.freebsd.org/282168 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46982 (cherry picked from commit d1d839d0b593541174ca48c675c9eff4ddb4715e) --- sys/net/if.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if.c b/sys/net/if.c index fe51ba5a0b60..edc7d8376bbf 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -834,6 +834,7 @@ if_attach_internal(struct ifnet *ifp, bool vmove) MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); #ifdef VIMAGE + CURVNET_ASSERT_SET(); ifp->if_vnet = curvnet; if (ifp->if_home_vnet == NULL) ifp->if_home_vnet = curvnet;