From nobody Fri Jan 17 02:31:55 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 4YZ3f4244Tz5kH04; Fri, 17 Jan 2025 02:31:56 +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 4YZ3f40qX2z3cMT; Fri, 17 Jan 2025 02:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737081116; 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=cCsuWDcy2Y3/MQL3IEIx65v91ppQOYQk5L3auj6zyEQ=; b=bxtMMeQXGxblJzFZ0Obdg4tWA8NDQpI+QIn1L4fAllBQnHzmF4qSmJUUhdUaGTOpUva+z2 RwDYc7WI9oFZdpfsGkmXMCwEQ1USXc+RCSFysOHUqSphOVsXx2BUQBzOxNSSJf//Z2znkD ZAaDUz2UowgPconwEsT/s30hvl7bvQjdF3LLsQ1bC/QOL88VwFoG3Vw9k/YMZ7/Sd1AlHd +RRabWK5rNfT1UywFnNI8lorNutUC/hBXijcEaAxdoa/+wB+/DDHlpHVqB1nQdsVKaKMIu 6ruDEfPPSGSWo7gAI7Ez0ODapNz5Gne1LKh2MJvA7HnSG0Dd95ABn/fIY7MO0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737081116; 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=cCsuWDcy2Y3/MQL3IEIx65v91ppQOYQk5L3auj6zyEQ=; b=dqI+BzdtQ7/H5V9qjJlbYxG0ITYggl/bpR3SVurMyTRLSVSc7EbIcr2GQvP/pRr7Y5MCG0 MsGCefTiftOIaXTv0EWtXvYLcKbGcQDaeWe5kWGXNofbBYPjfFx76TldStbvySjevShy7E ijiObWSBSrfL3xPWCR/3yPwvsdhtZ3XP3yHNWYF4TPhQtDLG5m8vJF2igHBFeGaIX3UUpa Pw5Gqx0rz+td6kQqryfD60/Yr3eiipMIzQVDQMy7YEnxn+G5NdDzKQlg/qbM1Wv8cYAVcg M6OU4y8k+v8rWYKgt22LqaC94viMFpi1r9OsBxCRYTK4xUcsmZF/l91Aq3TO2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737081116; a=rsa-sha256; cv=none; b=CMtrLT0IJkxYj0YvO8jUPJ3MnoOYQ9WCQWwwTu/qAK/rW7cBqB40BR0dxwJHo9kKUdjlAE BmmfRjxd7jjjKD6QDrnuoPfwzPe0azfd3L8XS/hSlU6G34p/5xhheH9ulJQR2kUk+aWJ7O IJPBGysrbF3KqtaZBn6AgPqJ5PNjQ7HVBvtBB4iQ0SOC6Jx0/5YD1A/FUt1uUMf4A9bSe1 JFY+hTIKSkc65wj7tdxh+5+iR4sUNMqr7UkGpeppujrmwNtlFxj5CBM6NBh2qVCs+7RGkB kbO66e7P8viGNOcjuue72TG6qbFXleDPswP02WPs1C+UAlVtt9NvkHPX17n8XA== 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 4YZ3f40QVWz106l; Fri, 17 Jan 2025 02:31:56 +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 50H2VtJV044467; Fri, 17 Jan 2025 02:31:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50H2VtNN044464; Fri, 17 Jan 2025 02:31:55 GMT (envelope-from git) Date: Fri, 17 Jan 2025 02:31:55 GMT Message-Id: <202501170231.50H2VtNN044464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a1be7978f187 - main - netisr: avoid VNET recursion warning in netisr_register() 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1be7978f1879313c141882a1e0812b468dead57 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a1be7978f1879313c141882a1e0812b468dead57 commit a1be7978f1879313c141882a1e0812b468dead57 Author: Gleb Smirnoff AuthorDate: 2025-01-17 02:31:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-17 02:31:15 +0000 netisr: avoid VNET recursion warning in netisr_register() While here, move some assertions to the top of the function. --- sys/net/netisr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 4ae1aa9ab89d..e9b8fa4d833c 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -395,6 +395,9 @@ netisr_register(const struct netisr_handler *nhp) /* * Test that the requested registration is valid. */ + CURVNET_ASSERT_SET(); + KASSERT(IS_DEFAULT_VNET(curvnet), ("%s: curvnet %p is not vnet0 %p", + __func__, curvnet, vnet0)); KASSERT(nhp->nh_name != NULL, ("%s: nh_name NULL for %u", __func__, proto)); KASSERT(nhp->nh_handler != NULL, @@ -454,15 +457,12 @@ netisr_register(const struct netisr_handler *nhp) npwp->nw_qlimit = netisr_proto[proto].np_qlimit; } + V_netisr_enable[proto] = 1; #ifdef VIMAGE - /* - * Test that we are in vnet0 and have a curvnet set. - */ - KASSERT(curvnet != NULL, ("%s: curvnet is NULL", __func__)); - KASSERT(IS_DEFAULT_VNET(curvnet), ("%s: curvnet %p is not vnet0 %p", - __func__, curvnet, vnet0)); VNET_LIST_RLOCK_NOSLEEP(); VNET_FOREACH(vnet_iter) { + if (vnet_iter == curvnet) + continue; CURVNET_SET(vnet_iter); V_netisr_enable[proto] = 1; CURVNET_RESTORE();