From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B0E2339387; Fri, 7 Aug 2026 15:08:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115287; cv=none; b=CjDlb7EJHqruM4pdnagqWJSFbXHyOail3wh4xlAMx6WXzH+WlrLjr7uOEYW+ykoY7GX4d4/T/SrmvUo16G7cQMmnXbLdRC0vJOP94Rb4SeRIe1xXLBOR26SHqAPi68VvIVSbrVZqgwdQlue+3nqmL5fMXXknNS8laBaLnQ/O808= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115287; c=relaxed/simple; bh=gANHdNHmVTFg4nrlsHkUswOLQI2mcctRxvNeAEmbLEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c6HN/Wa3AgI+feflo44uRGsMDuldXSGe28HfcYqsooyNrXN6eSKEz/oqowqX6VZIKvQBoHcjQmtjA80PNcMgLZM7a1lYWOmQwFNv3rSrDxZmZZKPKNvA1F3xuYOZMuUFtsVDSTFtF7UhViR6k1hFD1uqwEKIza/DOTgcBGTE85c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tEsuFONJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tEsuFONJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 842871F00A3A; Fri, 7 Aug 2026 15:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786115286; bh=9Lo0c+/Z4Exmh1xg2Au0q+AOmvkYHjvuLGwQ0p1naaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tEsuFONJCpcw5KER+acp8MZMqvK+9ex7y809ebd16XpHufoIREYTebzLHP8I9QTSE IZa6NZXuCiLBcmk6z9ELaYMkNxZLaAVKr0TwkoEoaOaGSx2OuVhu1NrRfYZ5+Mxy6+ RfGEwUpTanxKk53sGMipZhTrVI1SW49sOy34MKnY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maciej Fijalkowski , David Carlier , Dima Ruinskiy , Moriya Kadosh , Tony Nguyen Subject: [PATCH 6.18 222/396] igc: remove napi_synchronize() in igc_down() Date: Fri, 7 Aug 2026 16:36:22 +0200 Message-ID: <20260807143429.052716310@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143424.272339768@linuxfoundation.org> References: <20260807143424.272339768@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Carlier commit 5ffab5b9589c50e4cfc0cf36ffd76c89422d4019 upstream. When an AF_XDP zero-copy application is killed abruptly, the XSK pool is torn down but NAPI keeps polling. igc_clean_rx_irq_zc() then returns the full budget on every poll, so napi_complete_done() never clears NAPI_STATE_SCHED. igc_down() calls napi_synchronize() before napi_disable(), so it spins forever waiting for that bit and the interface never goes down. Drop the napi_synchronize() and let napi_disable() do the job -- it sets NAPI_STATE_DISABLE, which forces the stuck poll to complete. Reorder it ahead of igc_set_queue_napi() so the NAPI mapping is cleared only after polling has stopped, matching the recent igb fix b1e067240379. Fixes: fc9df2a0b520 ("igc: Enable RX via AF_XDP zero-copy") Suggested-by: Maciej Fijalkowski Cc: stable@vger.kernel.org Signed-off-by: David Carlier Reviewed-by: Maciej Fijalkowski Reviewed-by: Dima Ruinskiy Tested-by: Moriya Kadosh Signed-off-by: Tony Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/igc/igc_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -5354,9 +5354,8 @@ void igc_down(struct igc_adapter *adapte for (i = 0; i < adapter->num_q_vectors; i++) { if (adapter->q_vector[i]) { - napi_synchronize(&adapter->q_vector[i]->napi); - igc_set_queue_napi(adapter, i, NULL); napi_disable(&adapter->q_vector[i]->napi); + igc_set_queue_napi(adapter, i, NULL); } }