From patchwork Wed Oct 30 08:24:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuan Zhuo X-Patchwork-Id: 13856106 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) (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 22D3E1E25EF; Wed, 30 Oct 2024 08:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730276711; cv=none; b=Khh016OJSWQ+WYt98M1z117L+UQZqw4zLYTVzAJDrrm2kToelRHYlU3mpyIK8fr5my0SQ8m6xnOnZwVcpnz1zRsIbXddpsmVbE2pSbZuc9+lwt/MCuAZeCX7CQnJlotSTFdpA+BcuUBZQFXf0b7Hb69VuHTxjGZk2FwIE+AgUcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730276711; c=relaxed/simple; bh=suz4/wIUjvCp2KxBQ9i/vB6ENzm2A0f6k0//N6jEHF8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CWuqEwLN/BJVUsMTXOx6fYVauzPZuQw9iu6Y/RTpP1rIzbvSDtkLCPZ/G37CcZz0dQPfo+Ae0VH/hLMPXDIg+IG21pMLMqihRx4/4eVoY8n2L+VYQ1OBPGN4ooBSpWvLFYoIGBs4foM7cNdTwJxtMOu6CHtP4mgUxIuqhD5RPRg= 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=PRIkdCcm; arc=none smtp.client-ip=115.124.30.99 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="PRIkdCcm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1730276706; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=cOdJ5apOhrU/PhlRyQA/lMXJqnGIVbREsBpXXR0lajI=; b=PRIkdCcmQocY6uF3SuNW5dBOn7tjXZ+fXy2g7oS/EoHRm4YQTin4Yql/zlQ0IIR3RrlUiPvzpVskfo28MvqpcbpOWKsRW8ti2i4fTjURriadau4sM3dxrRMFQa+f8Cay400Seggeq6Pere9iWcvghq+Ixg3Qg02TSQ4CEHjvNmw= Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0WIDKNMO_1730276705 cluster:ay36) by smtp.aliyun-inc.com; Wed, 30 Oct 2024 16:25:06 +0800 From: Xuan Zhuo To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn , "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 v2 12/13] virtio_net: update tx timeout record Date: Wed, 30 Oct 2024 16:24:52 +0800 Message-Id: <20241030082453.97310-13-xuanzhuo@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20241030082453.97310-1-xuanzhuo@linux.alibaba.com> References: <20241030082453.97310-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: 87bfcb32ef14 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 4d00d73d8088..091e3ed0cafa 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1490,6 +1490,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 (sent) { + 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);