From nobody Mon Feb 9 00:54:11 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D323B25A33A for ; Fri, 2 Jan 2026 15:21:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767367262; cv=none; b=WKRbnNuHdMQ0x7qg27oKTfVwjWN8Fjh8oJTK5N/VVng20BfNeK1Ln3ADI989tVAWJ2Dd1Ll4mU9wVHe/1RRAXee5/2HyRmS7G1QtuDz9Xqkh9McAg2viyyHBCADynC6ISuNCPamywLpk70MiHDkPlr8KKOX8Zry6Zcx0v+5cVn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767367262; c=relaxed/simple; bh=/4eiguhDqiumviny97YbX/V0ioG/S7VlDOjqS+Yf6c8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yg3IbKQPNh95nHYt47WOOEBMwp5ij1uetmLwnqr7dCE3KzK/owwKjly3FJeflS4be839V8kOXEy42UOaqqkxnfaDTGLgyO91OYZKaggIIviB7zhxo7k49YhRoDd4IrGog5U4NKhXqgbhQFy3Oc40+A0sUHuL2H7BCmVV4MaDZlw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fMtEg4lF; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fMtEg4lF" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-34c902f6845so17249537a91.2 for ; Fri, 02 Jan 2026 07:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767367260; x=1767972060; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n9jxgbD+/yxl3j2kHcSn/k4rVRA0Pzivb1lp5AvUuyE=; b=fMtEg4lFf06H+5Uz4Nw99Dw09SIhxEiIMRs6w8pMj7dKJQof0b0YcXHySIaCkTb1xm k+/ms4lhK/2j5CE2y7rXZfq2KJJs1Gt358lsPCkEPyI6tVMIWFwxl1SG2ThhP4Wnxyx3 Z1qOTS8W6nF8zuplxpyXl71ak5LBm0ZmzOkomW3E9t3J0R6JV3bcdHhQATiXIcRCUd/u pEYj9AqHSgBajjN9SPUgCiG1GP6JOBR5zf6EPnf406/8JBihowLwnP3fRLRio2koZOU7 mwP2ZvaM51T5BKUOh6uE4boZtU2JLnInpZ4xYH318MsKups0msNln4q8xrPy/SG+vGPk +4tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767367260; x=1767972060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=n9jxgbD+/yxl3j2kHcSn/k4rVRA0Pzivb1lp5AvUuyE=; b=C3J5jFrNv6eYDS1pVS7MRCM+m1MgX9vBIi9l0F7g7UhLGs3IT7l2dv02nnaOVS5k/q UvhYT5QFU9GRHM66xeT21yqiFT3pkAiw2pEOr4okfUeebbwG+tkyqWnyvLtaPdXC0xJ4 dMGDCFV4UT0m9rgoNk/NcjyxBDPqVIIshZAdo7viwpJoFQGqhccTfZw5W4i8O3YdxuwR zNeH9uZ/abPAmM6VV7vK88r2Fbm01cAUuK4ANOO5BIkdWBTPtXaAUw7f2Numd4NCZfk2 cDKXduITu1rz+uTstQLfJkpiqxbnXuZs6D+G3C2x3F9CLWm34QEIuUFnSCvAJiWyatn/ aRNQ== X-Forwarded-Encrypted: i=1; AJvYcCWk5IuRvaChoBg/JZHBynfL9fRgTFaMkhetcIIph66cfew4DqPR2n8MMCjaIpn+fcnbkxbYdbUQMpHSgZI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2ZMdi3/emWlwNIdusArfwBoEhDpCuKjPxnnoBg1srEbsARobX KxE2/JdFcYZ1EDzLkoRrwbPnG727I5y73vR+ML7GRX2q190EPJcf+rnR X-Gm-Gg: AY/fxX4z4ibSbC/5fE+Ppd2WVboMj5xa0phD6XZi26TRyOAegn6VTi3omSm/477dV6L caKwL3KYpwf25VuZkOkTrodydaJX60Wiqh0C7MYep2RfTAkTJC+Cjllchx6KElUT6gx5hIY5pgJ XeNRFZHwH/h8zLzKjpn7U1Yr2wvjTK+myhR8grkgu8vbCSQNQra9J+2BWzNth/6cK+MalO8cpKu AwwVbwSLkkFLSOmjmOJC21iKzPP0c0FAipCxD4KknkSRC/I5D+E31plncpmtvGR11KGGjDChYEv th+ChSI2JRKZIIxykF5IOIRp2gWy6irEuWJBfMcGvIq69bBSdFxZjF6MZ/IbEFfO9Gs6IyTzwgv SP1ewh4pLPY0t4GCXhUq8xIWCKQCBz1AG6M1SFr2bpxVPtv2kaHPIgh71j7YS/2PPcNWw6Skqbp CcuMk6Qpnktcoacsq8Qi23fIs= X-Google-Smtp-Source: AGHT+IG+uB/bwtxyi8mZp0xNuzYOVJCRuR6o1MY96JjPiCTZmrbu0bFieKOLX9lXthIPYGtwJPA6DA== X-Received: by 2002:a17:90b:5188:b0:340:cb18:922 with SMTP id 98e67ed59e1d1-34e92139e2dmr36663487a91.14.1767367260086; Fri, 02 Jan 2026 07:21:00 -0800 (PST) Received: from minh.192.168.1.1 ([2001:ee0:4f4c:210:a612:725:7af0:96ca]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c1e7c146aabsm35041268a12.25.2026.01.02.07.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 07:20:59 -0800 (PST) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v2 3/3] virtio-net: clean up __virtnet_rx_pause/resume Date: Fri, 2 Jan 2026 22:20:23 +0700 Message-ID: <20260102152023.10773-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260102152023.10773-1-minhquangbui99@gmail.com> References: <20260102152023.10773-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The delayed refill worker is removed which makes virtnet_rx_pause/resume quite the same as __virtnet_rx_pause/resume. So remove __virtnet_rx_pause/resume and move the code to virtnet_rx_pause/resume. Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7e77a05b5662..95c80f55fa9a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3366,8 +3366,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, st= ruct net_device *dev) return NETDEV_TX_OK; } =20 -static void __virtnet_rx_pause(struct virtnet_info *vi, - struct receive_queue *rq) +static void virtnet_rx_pause(struct virtnet_info *vi, + struct receive_queue *rq) { bool running =3D netif_running(vi->dev); =20 @@ -3382,17 +3382,12 @@ static void virtnet_rx_pause_all(struct virtnet_inf= o *vi) int i; =20 for (i =3D 0; i < vi->max_queue_pairs; i++) - __virtnet_rx_pause(vi, &vi->rq[i]); + virtnet_rx_pause(vi, &vi->rq[i]); } =20 -static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue= *rq) -{ - __virtnet_rx_pause(vi, rq); -} - -static void __virtnet_rx_resume(struct virtnet_info *vi, - struct receive_queue *rq, - bool refill) +static void virtnet_rx_resume(struct virtnet_info *vi, + struct receive_queue *rq, + bool refill) { bool running =3D netif_running(vi->dev); =20 @@ -3412,17 +3407,12 @@ static void virtnet_rx_resume_all(struct virtnet_in= fo *vi) =20 for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) - __virtnet_rx_resume(vi, &vi->rq[i], true); + virtnet_rx_resume(vi, &vi->rq[i], true); else - __virtnet_rx_resume(vi, &vi->rq[i], false); + virtnet_rx_resume(vi, &vi->rq[i], false); } } =20 -static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queu= e *rq) -{ - __virtnet_rx_resume(vi, rq, true); -} - static int virtnet_rx_resize(struct virtnet_info *vi, struct receive_queue *rq, u32 ring_num) { @@ -3436,7 +3426,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi, if (err) netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qind= ex, err); =20 - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); return err; } =20 @@ -5814,7 +5804,7 @@ static int virtnet_rq_bind_xsk_pool(struct virtnet_in= fo *vi, struct receive_queu =20 rq->xsk_pool =3D pool; =20 - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); =20 if (pool) return 0; --=20 2.43.0