From patchwork Tue Aug 20 07:33:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuan Zhuo X-Patchwork-Id: 13769518 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (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 965B916BE33; Tue, 20 Aug 2024 07:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724139229; cv=none; b=Lh1a9u2yfbEu5iaSonJBZBcW5AIvrhJLkWVRjhmlVZU2TKxMc4lezKj5qOFpksdoe+W2OZcNfGuPlqVncKOQnMnGzcBvg4QeT7zS/pKjHPdqxKf6HfP4ywtj5sOSn/xegwnNtBl5JnM7HtnZCjflU+C6ItOmAwGun1fG/JbYmmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724139229; c=relaxed/simple; bh=4mqt0Sf4UXB9+mnzPe5IrS4VGLL+gLuW9luNr6DfFVY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ubzv7QdsEEEqWoqy+tqjFRbfyy87iFfHoaGZjvD4mx7yQJp1wizCNH1zOV7lRQVqeEsR1pqug9U0LuKM5tAh9N9hXmA4cYwW3x5kaZ2XxYIMxRVOH2p3DaQUKi2AeegzlBPeqPgsA3PICVmegUsLpSjLJvt4F/50yn8mlwG2H8g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=DC/GphEx; arc=none smtp.client-ip=115.124.30.110 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="DC/GphEx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1724139225; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=nFdXQSjR0G+Riirzm8nTYumj0+tDaWSVrKp34+cShhE=; b=DC/GphExKJAddhbxb62eHjV3JqZ4teBpEc/QUI8EjUSkdd/o12R/iqPOBq2c+tFllIMyDrH/1yQsnHu5viwaWRcCbpS0VRcdMdnXZTlSQQ0m0KoL+QCUCDFpjguWFuOFKkQPjBpKSpy/ZxUG18otgNkVwnZm/nEN8geOsO22sk4= Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0WDHmKrl_1724139222) by smtp.aliyun-inc.com; Tue, 20 Aug 2024 15:33:42 +0800 From: Xuan Zhuo To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev, bpf@vger.kernel.org Subject: [PATCH net-next 12/13] virtio_net: update tx timeout record Date: Tue, 20 Aug 2024 15:33:29 +0800 Message-Id: <20240820073330.9161-13-xuanzhuo@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240820073330.9161-1-xuanzhuo@linux.alibaba.com> References: <20240820073330.9161-1-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Git-Hash: b206d29d23af X-Patchwork-Delegate: kuba@kernel.org If send queue sent some packets, we update the tx timeout record to prevent the tx timeout. Signed-off-by: Xuan Zhuo Acked-by: Jason Wang --- drivers/net/virtio_net.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a898568bed5c..28c5f9e77fa3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1478,6 +1478,13 @@ static bool virtnet_xsk_xmit(struct send_queue *sq, struct xsk_buff_pool *pool, if (!is_xdp_raw_buffer_queue(vi, sq - vi->sq)) check_sq_full_and_disable(vi, vi->dev, sq); + if (stats.packets) { + struct netdev_queue *txq; + + txq = netdev_get_tx_queue(vi->dev, sq - vi->sq); + txq_trans_cond_update(txq); + } + u64_stats_update_begin(&sq->stats.syncp); u64_stats_add(&sq->stats.packets, stats.packets); u64_stats_add(&sq->stats.bytes, stats.bytes);