From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B633635C685 for ; Sun, 30 Aug 2026 23:22:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788132165; cv=none; b=b8SdbqNBMHiFvCuNvq1YNkm+BSHiXubGz70QAWbkio146TDL5zH11XCmxI3+SZltwklJREZ0tkYkfpOku7s5pDro17B1fa+FzCGFTokN2DVhGJaBNOVVsRcC4xLUJKTJgv++/79fn26hYknyQW16o3zK1se5413OykomeThcZuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788132165; c=relaxed/simple; bh=ldiZ/+7239M5gwa7J+DQkVJm3fO1y4M0nP2v9KbMz50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LG0lOmqQ3iCAXJckHt5b3PUVs0LLic9pAh8/yPJ/lSkNYEn9fIJ+mPOddv49FrmqzXNcvjICqhvhKhoUbQYblH2ZlZxEd2kn8SeVlZUcKF3CzQea70PVaxMywcOTkBH+4jxUjDlVhI1UJ/45NSfj724pExdHAIIf+NpN15//daQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BlQfhAUI; arc=none smtp.client-ip=209.85.128.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BlQfhAUI" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-836cb2fa1bcso24898627b3.1 for ; Sun, 30 Aug 2026 16:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788132161; x=1788736961; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EiW+JJ76BaAeq9W86nvcOxiyWOdlbAiuuIswuaS2d+Q=; b=BlQfhAUIx0/9AYTI5b4GrEJAX7xlc/cPlQbF0ikcqt81g+ubRzESCTEubIaTvnLRJI KBxzy6Rn7mw4WI+jSnSzJwnUIP1qAB1ZtswWaBNFd7Kninev/rtuRpJR7KWnX40gDmoA e22UK0SG/jb2hZxaH7feALEbKyy61usEYXtYtx19sF2lVQt/xpcPAEzisGIS5VE6tAWh uyN1QzW+IxApSv+cw/yhTGDHvXHv89jumJGUY22/h9PkGjB6bzyT1wJccw2PpAnPg//L koZ6oBv0PY2U6n4ANeteD6S+jNUUbkOmDnCuuTAPQ7i3ZcsyN8Ds7eKC2jPmMFwAPxbH BhiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788132161; x=1788736961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EiW+JJ76BaAeq9W86nvcOxiyWOdlbAiuuIswuaS2d+Q=; b=VKp0jSWVuFYYqCSP0MSPhbOljdCd58XBmwmFPjITCEgFSyeMD+osKhtVKh1VxDWWxp 47Or5/2+Y1imQgCgAx2bL3MwH0cKwOElkHc6ngfWsjFkx1MUbZ2IyndOThuZJ6SurhTP pa7RFfCwYKIoLtgebx0Mdsp8WKUfIOCXzokczv+v0dFGUsPywmNSBvcu3dolkJLpwEkg J2U+KOSTYE1GlQtG58RqhIgDgXnoaEPamDFORr8KOKIT2BhRL/+Q+n4TtQL9kZpYC4yw OixwGKx8cbNG7jFyBCCPtE49LemvO/A9A+jlq21rk+z8f4nB5M8Hl4S06QDM75xgyOfk Foag== X-Gm-Message-State: AFuF++nGls1mitFu8zPFVGolSronXyM3jgaI3CIi7n+1onq4Np3eZXzW jSUDJgufJn91meJSYUx8h/t+1ASfACwjkJfv9Tdagain+ouAaiX9V8SY X-Gm-Gg: AYBFou1ZhJtfqNw8/km1SAHiwjXUBygcZkABhxU1MYuLe3xoYVH0FwNbTOsk5zf9ju5 9Nu/eXTtiq2ZjfGf4Tf3ysFwUZnqvjBGtHsG2G1GgD24Ey6pK+f9u+WSnM8XvbIl/KKndZn8Psi gOFvELPkCTyFIg402c4zxG3Q7ckc11ujSh2OVoI3c3fI9lrVQEzVqhNEM5qYg5LLNWqfw3B1pHp U4LdLzvtyVApRmmjc0b86Y/KcKN4RUpU6vPIqWNcobQD2sCNSISDzJH8MeBExC10SxK5AF4yKnc m45DH1gCebzDrwmHSf7pOHeMSJ1a9j2XRc9WF6GYoyVyz/2pfQ7POMMeNPWNSnJTV2OWO0OPT1X sVBw7otSay9PNM6V5RnctDxkzyM11o9QapNV40gYews35+Xb/tOqgaNaAc6VMxLcBXz5ByZdWmG Q1pkO8fTZW0wjAm7XsuB/ODIQW9MVSnrcxFNgl1ySoT+v8gDY6Z3E= X-Received: by 2002:a05:690c:30a:b0:80f:9998:e614 with SMTP id 00721157ae682-85d6eff6efamr86639137b3.28.1788132161448; Sun, 30 Aug 2026 16:22:41 -0700 (PDT) Received: from devobuntu.lan ([2600:6c5c:6b00:316::23]) by smtp.gmail.com with ESMTPSA id 00721157ae682-85e677606aesm39025937b3.45.2026.08.30.16.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 16:22:41 -0700 (PDT) From: Matt Vollrath To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Tony Nguyen , Przemek Kitszel , Alexander Lobakin , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Vollrath Subject: [PATCH iwl-next 6/8] e1000e: disable NAPI while interface is down Date: Sun, 30 Aug 2026 19:21:44 -0400 Message-ID: <20260830232146.36948-7-tactii@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260830232146.36948-1-tactii@gmail.com> References: <20260830232146.36948-1-tactii@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The upcoming page pool conversion requires that NAPI is disabled during reconfiguration windows. Otherwise pool destruction would fail the assertion that NAPI will not race, causing a benign but loud warning. Move napi_disable into e1000e_down and add a napi_enable to e1000e_up. This follows convention of all other Intel drivers. Because napi_disable would hang if called twice, all callers of e1000e_down must now be serialized. As of this patch, I'm convinced this is true. Signed-off-by: Matt Vollrath Assisted-by: Claude:claude-5-fable --- drivers/net/ethernet/intel/e1000e/netdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 194166531bc8..6d846cacb026 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -3527,6 +3527,8 @@ void e1000e_up(struct e1000_adapter *adapter) /* hardware has been reset, we need to reload some things */ e1000_configure(adapter); + napi_enable(&adapter->napi); + clear_bit(__E1000_DOWN, &adapter->state); if (adapter->msix_entries) @@ -3601,7 +3603,7 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset) e1000_irq_disable(adapter); - napi_synchronize(&adapter->napi); + napi_disable(&adapter->napi); timer_delete_sync(&adapter->watchdog_timer); timer_delete_sync(&adapter->phy_info_timer); @@ -4055,7 +4057,6 @@ int e1000e_close(struct net_device *netdev) netif_queue_set_napi(netdev, 0, NETDEV_QUEUE_TYPE_RX, NULL); netif_queue_set_napi(netdev, 0, NETDEV_QUEUE_TYPE_TX, NULL); - napi_disable(&adapter->napi); e1000e_free_tx_resources(adapter->tx_ring); e1000e_free_rx_resources(adapter->rx_ring); -- 2.43.0