From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90DA1CCF9F8 for ; Wed, 5 Nov 2025 17:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Cc:To:From: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/p/H/x19IYQujvkq2QTs7zEQtvzBASPF2ofhFO8neXg=; b=b50funBEaKp/ymxUeU3Is4Ypbd G//gBr+brxrO21ViQCjCjXHOA/B6R6jj5OfpcXEe3Li3hhbA1JuN0A1Myp3LIJuiSWv3gN5UmG0fX eVSzFzsaYfr+x+MXlx0uuLmKVbMU7dOQBLxoJu7oTuvWzNBizSmnK9lS9NORBxRX5ZHZlEVV/RaJx Sb784hWx9OiAUil24S2BMR4KYeM6iSFlTP7P1LYheFq8QxUNx9H3IoRitlB1PBzO+8sd26RgrI1y/ ybqVs1l77w6sOrJsJC5ijfUnI6hz8r4PuW9G0IywjTmC3fBdlJxHDC4FvC4Oo43UL4CM4HYixcLik udACcw2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vGhJ0-0000000EAwM-02LF; Wed, 05 Nov 2025 17:28:22 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vGhIx-0000000EAtg-3Oi2 for linux-arm-kernel@lists.infradead.org; Wed, 05 Nov 2025 17:28:20 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id A1EAD60207; Wed, 5 Nov 2025 17:28:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F358C116B1; Wed, 5 Nov 2025 17:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762363698; bh=qBxeUGo0ojlcdD0EQyP1rqmZRW7Xn9CXpQtmjLZHoB0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=GA9epBiGmB07XAPsrd6KyTHrW4yo49Q48S2PhkZCGqWDMQu8mlt+Irij0p76pLBAN 1dqk5mfppEWysjH1JlFifOkvVYqResdD2MhA0myvyzM0AMwznDCerASkaLLwpdWrqz jhXI2+MZIolN990eAk+1z9Paz/Pq6j0oM8HX6BB9X7XrpThBiBJn1FxtrhZnoxV5TC 6iCiNQzi5LOWsgjOtKb3s5/7t1jrmbQVTlFZuHyz712Pa2Ouy2Vgi6Ft8boRb/yOSG 1B5ElQ6771jeiRsPULU0yLtEEGfjbYfLwFvVo+Wwn/JHFmuMPQjrlHVugWsMf4tobU 3kbyNSS4/0RLg== Subject: [PATCH net V3 1/2] veth: enable dev_watchdog for detecting stalled TXQs From: Jesper Dangaard Brouer To: netdev@vger.kernel.org, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Cc: Jesper Dangaard Brouer , Eric Dumazet , "David S. Miller" , Jakub Kicinski , Paolo Abeni , ihor.solodrai@linux.dev, "Michael S. Tsirkin" , makita.toshiaki@lab.ntt.co.jp, toshiaki.makita1@gmail.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@cloudflare.com Date: Wed, 05 Nov 2025 18:28:12 +0100 Message-ID: <176236369293.30034.1875162194564877560.stgit@firesoul> In-Reply-To: <176236363962.30034.10275956147958212569.stgit@firesoul> References: <176236363962.30034.10275956147958212569.stgit@firesoul> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The changes introduced in commit dc82a33297fc ("veth: apply qdisc backpressure on full ptr_ring to reduce TX drops") have been found to cause a race condition in production environments. Under specific circumstances, observed exclusively on ARM64 (aarch64) systems with Ampere Altra Max CPUs, a transmit queue (TXQ) can become permanently stalled. This happens when the race condition leads to the TXQ entering the QUEUE_STATE_DRV_XOFF state without a corresponding queue wake-up, preventing the attached qdisc from dequeueing packets and causing the network link to halt. As a first step towards resolving this issue, this patch introduces a failsafe mechanism. It enables the net device watchdog by setting a timeout value and implements the .ndo_tx_timeout callback. If a TXQ stalls, the watchdog will trigger the veth_tx_timeout() function, which logs a warning and calls netif_tx_wake_queue() to unstall the queue and allow traffic to resume. The log message will look like this: veth42: NETDEV WATCHDOG: CPU: 34: transmit queue 0 timed out 5393 ms veth42: veth backpressure stalled(n:1) TXQ(0) re-enable This provides a necessary recovery mechanism while the underlying race condition is investigated further. Subsequent patches will address the root cause and add more robust state handling. Fixes: dc82a33297fc ("veth: apply qdisc backpressure on full ptr_ring to reduce TX drops") Reviewed-by: Toke Høiland-Jørgensen Signed-off-by: Jesper Dangaard Brouer --- drivers/net/veth.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index a3046142cb8e..7b1a9805b270 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -959,8 +959,10 @@ static int veth_xdp_rcv(struct veth_rq *rq, int budget, rq->stats.vs.xdp_packets += done; u64_stats_update_end(&rq->stats.syncp); - if (peer_txq && unlikely(netif_tx_queue_stopped(peer_txq))) + if (peer_txq && unlikely(netif_tx_queue_stopped(peer_txq))) { + txq_trans_cond_update(peer_txq); netif_tx_wake_queue(peer_txq); + } return done; } @@ -1373,6 +1375,16 @@ static int veth_set_channels(struct net_device *dev, goto out; } +static void veth_tx_timeout(struct net_device *dev, unsigned int txqueue) +{ + struct netdev_queue *txq = netdev_get_tx_queue(dev, txqueue); + + netdev_err(dev, "veth backpressure stalled(n:%ld) TXQ(%u) re-enable\n", + atomic_long_read(&txq->trans_timeout), txqueue); + + netif_tx_wake_queue(txq); +} + static int veth_open(struct net_device *dev) { struct veth_priv *priv = netdev_priv(dev); @@ -1711,6 +1723,7 @@ static const struct net_device_ops veth_netdev_ops = { .ndo_bpf = veth_xdp, .ndo_xdp_xmit = veth_ndo_xdp_xmit, .ndo_get_peer_dev = veth_peer_dev, + .ndo_tx_timeout = veth_tx_timeout, }; static const struct xdp_metadata_ops veth_xdp_metadata_ops = { @@ -1749,6 +1762,7 @@ static void veth_setup(struct net_device *dev) dev->priv_destructor = veth_dev_free; dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; dev->max_mtu = ETH_MAX_MTU; + dev->watchdog_timeo = msecs_to_jiffies(5000); dev->hw_features = VETH_FEATURES; dev->hw_enc_features = VETH_FEATURES;