From nobody Tue Apr 7 06:30:20 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 9EC5530BF4F for ; Mon, 16 Mar 2026 02:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773627034; cv=none; b=aMN2ZwxU9YlgEq3VUzUhG5FxTh5sUkhYwr32SBAnOVHyRZW3A2+jgvOPrXaDtSk64KA8OMMB7h0KxKJWN8xSWSw+QI/7dRHCTS5P/HxSO2q+bT28Ih+ZFPqFH5uO5EhyQ/uSoCu+hfbv3uQ2ZSZM1KjCOhXDG4rsJ8xCot86lEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773627034; c=relaxed/simple; bh=NA2WPiExcFM1F1Er32slS17NHJTG/FN7y2tKTlUTUQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TvEeKzet3JDTMhR00kjx51YAIksfktFJ7DuPWwJ6xa5zXgVYSiXcyHhkNLtFnKBxR4ek6i1w+Lym2s3y9GB/xRVb43cn9rjKMyh1h3feV4+blbeo1opKukQ/Hhd65niQWMZ3aQdvPj1dc1ye58nz+3M/ZjehSYIIaWp7gv7vZIg= 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=Z2H5CHbS; arc=none smtp.client-ip=209.85.216.46 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="Z2H5CHbS" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-35a04d6aeb0so2423979a91.0 for ; Sun, 15 Mar 2026 19:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773627032; x=1774231832; 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; bh=MWF2mf3kVPfppDp36uMCmkCxPdxULYmBpYhT7oMPfhU=; b=Z2H5CHbSvuUUU83B+YJHt2zwIY6rc1/234OnVbjP4bZmN++uY4F82faoDfiHw2BcX9 AVdmjS+TlE53AJywca+pJvv7dXH1SDsN/IDr3LX3ax1SOEf/jgI6nmy17x0s512qiviG dcTAp2Cb32xQiPrq6A35/Me+BPZBOwIV4oRNfkpSPtV56+02IuJ7M7JpClv1IKs/yQWB 8xwC+qP+CGbJjHvxmfrzIzzKYzecIp3DztuBxfubrxvlb8B4qgbx9KCHURhdnkSnQU1X LuUzWezNF2UN3U+nLUAyoB8E6ZH67IK1MPCh1Q8H0xPXSf8r+vf+DvYI+IiHDoYNlIAQ 5pjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773627032; x=1774231832; 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; bh=MWF2mf3kVPfppDp36uMCmkCxPdxULYmBpYhT7oMPfhU=; b=mZCIHyfIBs0MOGy10cLXYnkpdM5Xs74Hny6J4y4t2kF6q/MPtrJXKgV+j4v/lb4U4f DyKmh+PfGXAYjO6GN6YUmPx5VUaeNwS8bjuF9M5+8YrObB36YDzx0S84MNm9TObzbYdT 1eUcI75uv+UzHFThFir/rDHw0hYQhCftYsOs4SK5c+3PYl415fmm02JvqZXBpkmoMuGe vhe8hI6U6peZsH0JW+bgoyKM3lAOhuCmD9Cj/3Lis4kfwm1vpS8gsEss/qEyZcvBphJz K0/CRYXM6UgEbGy3k/JIK2/5ko6gj630PcVZP6hvgkLZXERcOYRXGjVklYhNFgme9Jei dj0Q== X-Forwarded-Encrypted: i=1; AJvYcCUGQ4obD/wpttb6mtpbnpmJO95aw0QxNEviDDb2Dx6zo1hLMLlbripBaMTFY2rH5ky0pKGVtfIWBAN+M8o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4zNPCwVdFyefLJ28uFF4hwRPKMGS/7EheznLU7J5I98JCigMb J8WOSjIlTobcqSyARMHyrNOoCeGtNQPQ6yPlFAFTcv1nh9pFZhxg9B2m X-Gm-Gg: ATEYQzyRjPbur/A5hIpvVk5Pbi3j5qTkvtfuBemvOqZrw9rJW1bTj8lFE5j5WjNJwgm yO7CfinVV6s4ASaHO2j3dFv+p4utDtdkdhNku/553HUL5RmFub6hcugQI4a8ln+MMoyJwPjwWKq djw3BO/buhAmetfXX7oMxz17b+OaDBmZflzDfEKUyyYMX70FFHpXlLtVkzPljam37qW1v0YC9HG sX/lCxkcxSnrhLIsRWWeZwisG3h+PVjAYvDJWiWsoQjReizgUk81RHH13JAEsa1twz7aGyl3iTL zV+Wbb6YNhUPHQ5iH8BLOS1zjObfDx+UCoeVW6GPk150WmtC0TqdZXxnOKVrTxOdkuhbpbsslrC ac8oO6lG+ygb7wV+FbGSooJmMNLI6oT2q3VGYC0FAyJwQfh5SI0vVvpfgoq/1GnqqPH3iu+Jba9 w3HTSf1dUdK879r/L7eLgghILRa+v2EBlJGgfahg6aHqTlmsgj1S1vv0n/i3LAMeW/ X-Received: by 2002:a17:90b:3501:b0:359:fa1e:2bc3 with SMTP id 98e67ed59e1d1-35a21ea5dbfmr10103044a91.6.1773627031911; Sun, 15 Mar 2026 19:10:31 -0700 (PDT) Received: from luna.turtle.lan (static-23-234-93-211.cust.tzulo.com. [23.234.93.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35a02ffdfb7sm17705805a91.14.2026.03.15.19.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 19:10:31 -0700 (PDT) From: Sam Edwards X-Google-Original-From: Sam Edwards To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Russell King , Maxime Chevallier , Ovidiu Panait , Vladimir Oltean , Baruch Siach , Serge Semin , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sam Edwards , stable@vger.kernel.org Subject: [PATCH 2/3] net: stmmac: Prevent indefinite RX stall on buffer exhaustion Date: Sun, 15 Mar 2026 19:10:08 -0700 Message-ID: <20260316021009.262358-3-CFSworks@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260316021009.262358-1-CFSworks@gmail.com> References: <20260316021009.262358-1-CFSworks@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The stmmac driver handles interrupts in the usual NAPI way: an interrupt arrives, the NAPI instance is scheduled and interrupts are masked, and the actual work occurs in the NAPI polling function. Once no further work remains, interrupts are unmasked and the NAPI instance is put to sleep to await a future interrupt. In the receive case, the MAC only sends the interrupt when a DMA operation completes; thus the driver must make sure a usable RX DMA descriptor exists before expecting a future interrupt. The main receive loop in stmmac_rx() exits under one of 3 conditions: 1) It encounters a DMA descriptor with OWN=3D1, indicating that no further pending data exists. The MAC will use this descriptor for the next RX DMA operation, so the driver can expect a future interrupt. 2) It exhausts the NAPI budget. In this case, the driver doesn't know whether the MAC has any usable DMA descriptors. But when the driver consumes its full budget, that signals NAPI to keep polling, so the question is moot. 3) It runs out of (non-dirty) descriptors in the RX ring. In this case, the MAC will only have a usable descriptor if stmmac_rx_refill() succeeds (at least partially). Currently, stmmac_rx() lacks any check against scenario #3 and stmmac_rx_refill() failing: it will stop NAPI polling and unmask interrupts to await an interrupt that will never arrive, stalling the receive pipeline indefinitely. Fix this by checking if stmmac_rx_dirty() returns its maximal value, returning the full budget (which tells NAPI to keep polling) if so. Cc: stable@vger.kernel.org Signed-off-by: Sam Edwards --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index f98b070073c0..d18ee145f5ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5593,6 +5593,7 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int= limit, u32 queue) */ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) { + int budget =3D limit; u32 rx_errors =3D 0, rx_dropped =3D 0, rx_bytes =3D 0, rx_packets =3D 0; struct stmmac_rxq_stats *rxq_stats =3D &priv->xstats.rxq_stats[queue]; struct stmmac_rx_queue *rx_q =3D &priv->dma_conf.rx_queue[queue]; @@ -5870,6 +5871,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int l= imit, u32 queue) priv->xstats.rx_dropped +=3D rx_dropped; priv->xstats.rx_errors +=3D rx_errors; =20 + /* If the RX queue is completely dirty, we can't expect a future + * interrupt; tell NAPI to keep polling. + */ + if (unlikely(stmmac_rx_dirty(priv, queue) =3D=3D priv->dma_conf.dma_rx_si= ze - 1)) + return budget; + return count; } =20 --=20 2.52.0