From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 364CC3ED5C6 for ; Thu, 19 Mar 2026 18:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773945674; cv=none; b=o1nlT30HHOBGS2Os/qy02eSKmSVwVID0qfN/Su6Tw9UK8Ap5tiAtV3DPmTSniuth+AmgoseJbkgZVksGUE86dPX/JjFptif0WWJ5DDduxMz0OC74ON2cAV0I+H05Xm+7D8IuifjFNPaVBHy0TOkjdPbf1ON0/ED7iCRkw3tJzKE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773945674; c=relaxed/simple; bh=ezG3pC99w4U2uwQ/yG5pLTV/NpoABjnTbl6EjBflYnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BMJkrxUVz90z4Hb39kN6IH1JR2WDAseRgRQKGdeL+M50GbiWOxYOpkQlJE18eLBwzaLAaikVz9to5GrOW2rZrC/pBkq8FZfF9hAoyDa4QWQGltO0kMssmasEg9FdkuV576dbP20DTV/K/MPHWr5GI9zuHvcNm5nVj3UDCZxOHks= 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=e3YBlNPP; arc=none smtp.client-ip=209.85.210.54 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="e3YBlNPP" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7d7c5b8cb24so931158a34.0 for ; Thu, 19 Mar 2026 11:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773945670; x=1774550470; 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=wX6S1CdKc2mUwaozX73tCsBdgQ9rtIDSRhAEJ71WCy8=; b=e3YBlNPPJhBndwM7QhT4+/pIvEfTThLD9Kaz/rhgubMYCHO0CTApNCHL5iZBhvjEax ls+jMrI3ZcTgodf1ZwRhZJGu9d3A8VXSqKT8UAegFhlG7t9V/1bBQvfVTCPqiSwRLTiu BpQ52b6SAhsk7jvEf8iMfZRsbZG6S8MFXHmIegtvHxOgXMVvknfRfIcRIthb3B9lyzb8 fEhwJwi9xjUVTtSGfX6oBOOuPIwXwAOBBq2fhy27GwAx29SLdJm7HhfMdjeasQtQmp6b DpBUELMaW+feb6an/xsU/3W7Ed06XIMV5TQaA6ezebpHp+Ix4ZGztNJALnD76/rIhysZ sWIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773945670; x=1774550470; 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=wX6S1CdKc2mUwaozX73tCsBdgQ9rtIDSRhAEJ71WCy8=; b=rihgaLbtA7SiM1UgY0nhW8sK0pGx/oRIESQwq5iFpNrbetRLayG56PUm6BJDVQZYv5 u0ssE8M17EG6EOk2JKwDMN8aw3//JWrfOGVfzbNpYJ3s0zKbOoQ1+wlXA/UAcjV2Rvjj 5MT/V6MJZ/FfRIszQFuygrDjSQodt/TtRFPN/2xcwVUuuZ1BnYbywniIaeIJ5RNdM4lO JrtLvgzQkx+dLUrh5pHDJi2Ed2G0v1KumxuGRqMNvRWqvlIrGsgnAHrFyDtfsMFI7t13 OhQEuKn87ppkK+d3soYX6uCKmfHeLGH4ibb/JbzY6BmeRd5Q2DlxtzGsJ7+kAXOU3H72 6I+Q== X-Forwarded-Encrypted: i=1; AJvYcCW8lh7QZdKBK8mk85hNgfgpimbgR4ShYFt0EkLEOTLOupEcj3oDq+98N5LzdGfh2t/AZ+j8Pvs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5SbBGKSc1SyW0UmNGghu7ilXClwL6TPwurtS1963syVByNGYe yvSfAEvgipLb6d7JpMUBSmeztkvhGnwc+OSPJo1qQMC62BboamCwaPOm X-Gm-Gg: ATEYQzw61Nbt3Sfgv/MBT+qIhRKdvYM2oEVKNw2g25jSIK2kysZADE7AE4IiTAGj8ab QssFOQb3srgsOrXPRo89kweTSdUpJcQZ5QULoky4+c1DGyWt0KlsyuZFfCAjbXWJm6zJ0RgVRtL bDufxIdOrw71DllO9XSgGPd+mktpNIllsf99SsaiKMWmx5fGD6p5/xoRciU/BSxMU35wCpykPMc 1DYEWb7hh74tr2idLqzKk3efCvoBmyis3+fEeDlrhd6hA8rG3Ac37M6356k8IK24aV4wu8kCO5m pwTydWtefIcjCiFxp2MGvaZu1EIdnELMzEzofBi9marSOtJh5j4z8f41MG5HEnjOMJiRGOAm5o1 rPiJnJzbfoBJhBegpnNDc+c6C5m9A9IMaOVrLowaDkyGceOJf8qkYIZs6JUoudI4aR1ewnT+Nkt Ze9G5Udb2JcAcIC7qJX1hdchZq9W8Y+EFqmsN95KxzQ22Yvkfvpqsldcbf4/LE/oW+YwDtYMTVn IKJ3uJTU78= X-Received: by 2002:a05:6830:700f:b0:7c7:6043:dd8f with SMTP id 46e09a7af769-7d7eaedc687mr238381a34.15.1773945669849; Thu, 19 Mar 2026 11:41:09 -0700 (PDT) Received: from celestia.turtle.lan (static-23-234-115-121.cust.tzulo.com. [23.234.115.121]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d7eadcb757sm181486a34.15.2026.03.19.11.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 11:41:09 -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 net v2 2/2] net: stmmac: Prevent indefinite RX stall on buffer exhaustion Date: Thu, 19 Mar 2026 11:40:31 -0700 Message-ID: <20260319184031.8596-3-CFSworks@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260319184031.8596-1-CFSworks@gmail.com> References: <20260319184031.8596-1-CFSworks@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=1, 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. Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers.") 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/net/ethernet/stmicro/stmmac/stmmac_main.c index f98b070073c0..05d3c548ce28 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5604,6 +5604,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) unsigned int desc_size; struct sk_buff *skb = NULL; struct stmmac_xdp_buff ctx; + int budget = limit; int xdp_status = 0; int bufsz; @@ -5870,6 +5871,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) priv->xstats.rx_dropped += rx_dropped; priv->xstats.rx_errors += rx_errors; + /* 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) == priv->dma_conf.dma_rx_size - 1)) + return budget; + return count; } -- 2.52.0