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 3FDF6420898; Sat, 12 Sep 2026 13:17:05 +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=1789219026; cv=none; b=WPz0srWzGocnwL9ZJa+gi3odRxp7fwCqGAk6Gz/LecT7+HNPtcp3AWgorVNsZkijGmiF396kzy3/+k8VkSbKAhgrKK8q2ynt9VGJwJSkM4bYHNRrPwNKE4KIDmiXG5o8exYriuSV+iIVohELcEKlTj5c9paKvz7X+1xahCgiNJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789219026; c=relaxed/simple; bh=/kFUAVjjcQ934X0PZ4F+1D1Vsk8JZFglSOsM0Jcg5zc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=buz6drD8AfbMR38rEgxCm5Jgi4mSzh1Ka86GNsrX84Y7y98ZK8C/wk9x7NfgHlVUz7g4Z2csQcnb+K72L5iwSZVfW3UDCfo7+Vvv85qqLxjPvjPdrXLhwZOI5liAaz8t3HJWkaC7FRWl4tVm8G25pF5cQCTGiOkRRG41bg70tm8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WD87ZiSZ; 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="WD87ZiSZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF0C41F000FF; Sat, 12 Sep 2026 13:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789219025; bh=BMmq6CrxJzriECtxZeXTAW5QpZ0mAAR5Q6JrBoqrsuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WD87ZiSZBasLBQjFGtAY+vcrD++kqwAmoO4zWCJVAvsD4t3Ofd7jNtgy07uIzjW8z P9F9+erSBEmqW4qPoCCFD6v+zDrJPrBzKB9GjcXBYofG7ykF0aIWGmkGyuPUt2XYrn Sy76ZGC/dWl+mAkNtTNZyroOVW7skEarzX1Q57Qc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Ye , Simon Horman , Mika Westerberg , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 1249/1376] net: thunderbolt: Count delivered packets in rx_packets and rx_bytes Date: Sat, 12 Sep 2026 09:01:15 +0200 Message-ID: <20260912065635.379788561@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@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: Fan Ye [ Upstream commit c5ae83ee02c04487b1be1d143b791ec2caca888e ] tbnet_poll() increments rx_packets once per received frame because that is the NAPI work unit, and then adds the same number to stats.rx_packets. An skb is handed to the stack only when the last frame of a packet arrives, so once the MTU exceeds TBNET_MAX_PAYLOAD_SIZE the statistic reports frames. tx_packets is bumped once per skb, so the two ends of a link disagree: at MTU 65330 the receiver reports 16 times the packets its sender sent. rx_bytes has the matching problem: frames of a packet that is later dropped mid-assembly are already accounted, so it does not correspond to rx_packets as documented. Account for both where the packet is completed, and leave the NAPI work counter alone. Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable") Signed-off-by: Fan Ye Reviewed-by: Simon Horman Acked-by: Mika Westerberg Link: https://patch.msgid.link/20260815-tbnet-rx-stats-v1-1-8da375c2cd09@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/thunderbolt/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/thunderbolt/main.c b/drivers/net/thunderbolt/main.c index 7bb9aa20fab9f..096f3ff36a437 100644 --- a/drivers/net/thunderbolt/main.c +++ b/drivers/net/thunderbolt/main.c @@ -907,9 +907,11 @@ static int tbnet_poll(struct napi_struct *napi, int budget) le32_to_cpu(net->rx_hdr.frame_count) - 1; rx_packets++; - net->stats.rx_bytes += frame_size; if (last) { + /* Before eth_type_trans() pulls the Ethernet header. */ + net->stats.rx_packets++; + net->stats.rx_bytes += skb->len; skb->protocol = eth_type_trans(skb, net->dev); trace_tbnet_rx_skb(skb); napi_gro_receive(&net->napi, skb); @@ -917,8 +919,6 @@ static int tbnet_poll(struct napi_struct *napi, int budget) } } - net->stats.rx_packets += rx_packets; - if (cleaned_count) tbnet_alloc_rx_buffers(net, cleaned_count); -- 2.53.0