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 587A4242910; Fri, 4 Sep 2026 06:00:44 +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=1788501645; cv=none; b=vDXyK4Ig85hTLf8Pi2xBxzUcRElCnwGjiq+H2tvLs3EisrnKXvW9IaSmJp29qjqA7zP6LagIYWYdhdYd16bb5yDUsG6VXttRWWw9fvdojaqR3ebOyJ9mlC6ehau63ReT4uutY4ytiFyE3vTZXmzuHXcSsimLTJ7eiPIqYFsnx+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788501645; c=relaxed/simple; bh=CxSdZmcq+mcxw8aj78mVcpEDpCu4kcT6J3PJWQOdijM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q9DtLpm7K/vrbYnEZMS7OPM4qiZ89dWnyV8HU0wWBASr/HstjpawyUsW9ZW9if5IZK+04WzY4i0LyCw+aiDBeWHu0DXCP3UiBSTdhhm1PB23MsEEfJYp95Gof7c1sh67GdHud3dGg3+I0NtwQmWcVS8I+OAFyJSd6RvMuImvjYo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zceTqCs8; 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="zceTqCs8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B210C1F00A3D; Fri, 4 Sep 2026 06:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788501644; bh=X/HBUin4xVlRbxlQvkvXRJgY1xAxVaDgPMF5uaQeeh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zceTqCs8Hnpf7PMTntoGawTlT6nDGmaxhz5gBbeA9prVJy5VjTSkbOXedcQ2Ri6tM gzzMkJUK19haNJ5Ni4N9zJ400a0cUCjPPw/FRHx/3b8EI0CdnvwhGXTanzM7va9AvJ c7HTC8gBxmBKSqWTyPpvF9okRNWk4oebP5BEtBkk= 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.18 480/552] net: fix spurious TX timeout after dev_activate() Date: Fri, 4 Sep 2026 07:00:37 +0200 Message-ID: <20260904045801.558857127@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@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: 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 @@ -1259,7 +1259,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; } }