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 9E6804195A0; Fri, 4 Sep 2026 06:21:10 +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=1788502871; cv=none; b=RFlc3lUdKHc7uumYDy8UtVA10v0SqEXb/1S5FZVg1lZe8PT7UuD2l43NpDX4sjlqCmCDCCmQda1LverBuH6Fa9JTWPPUNbxbgBS5/xaECVzzrsWxccquEE0UllrJM4S0t1IHlEHAhV/PnIv5w8YfCDIhSgCBn9gyQoXeNlmczZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788502871; c=relaxed/simple; bh=lf65LyMpgO132r6EA1xHWVv3cTuIxRrNhfvyvOas0Mg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q6B6NmH9xbylMCGWXBiidXRFqk/i9n1Hbfse/pQR4U1jARQ+8XFjIoAOAJf+mDyiHgGu2XEcaYxXTW+30cficVw8dKen0Uem7GdCZNiUfIK3Ho048LJOsOQxuA2p9wICkBpCSduhEUx3M9LLvv9AkIaaoDyAtB37DB+mD5mm+dE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fnLIE5lh; 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="fnLIE5lh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE80B1F00A3D; Fri, 4 Sep 2026 06:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788502870; bh=idFEhedg7AbOaJH6swbp9xhvNbjWxm9lIVgZhdJEW6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fnLIE5lhIbu8Ic5ce3lKBim/BbNc1fLFfgGpIAPWn20gBz5/kA18lUEbGmR4et8s4 uvBwnrC8FkE+26G5IRy9dWn/w1nnYQXxLyuM5JPajn+7vMN0z6FFP3+yqTWlXxxyh8 qwwOi1+x28By9vVxIr/DhV0l2CFIpkYgxtaoR2a0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Breno Leitao , Nicolai Buchwitz , Jason Xing , Paolo Abeni Subject: [PATCH 6.12 357/403] net: fix spurious TX timeout after dev_activate() Date: Fri, 4 Sep 2026 07:02:40 +0200 Message-ID: <20260904045742.932720551@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045734.806166532@linuxfoundation.org> References: <20260904045734.806166532@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Breno Leitao commit 82aeed2400786bd3f79d88cb8b8f42e6127e5923 upstream. While debugging another issue today, I found out that my TX queue is reported as stopped for 4294907392 ms (49.7 days), on a machine that had been up for four minutes. bnxt_en 0002:01:00.0 eth0: NETDEV WATCHDOG: CPU: 28: transmit queue 23 timed out 4294907392 ms 4294907392 is not an elapsed time. It is the value of jiffies at that moment: INITIAL_JIFFIES is 4294667296, which leaves jiffies 59 seconds short of wrapping. dev_activate() runs transition_one_qdisc() over every TX queue, which resets trans_start to 0, and then stamps only queue 0 through netif_trans_update(). Stamp jiffies instead. A queue stopped across dev_activate() now gets a full watchdog_timeo of grace, and is still reported if it is stopped that long. Fixes: 9b36627acecd ("net: remove dev->trans_start") Cc: stable@vger.kernel.org Signed-off-by: Breno Leitao Reviewed-by: Nicolai Buchwitz Reviewed-by: Jason Xing Link: https://patch.msgid.link/20260825-trans_start-v2-1-286b4d6d70cb@debian.org Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -1242,7 +1242,7 @@ static void transition_one_qdisc(struct rcu_assign_pointer(dev_queue->qdisc, new_qdisc); if (need_watchdog_p) { - WRITE_ONCE(dev_queue->trans_start, 0); + WRITE_ONCE(dev_queue->trans_start, jiffies); *need_watchdog_p = 1; } }