From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 11B6A33468C for ; Tue, 6 Jan 2026 15:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711916; cv=none; b=HEPRoEtz8PhV7D9sks1ZcizRM1ZioWprzqgATqci4uIve9tzWVPizGrIoKtf3qLoIaAlvMh/ixNiTBG8+XujAob2tRp/Md2ZVhIMcyoaizxQlfjIlUAL3/JB/larIfehR9+aQ3G6txz0H7ir5xeMplNq1BYRpItVx91i2M8tO18= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711916; c=relaxed/simple; bh=iakYf4ocTYJ7pB+W5zvpfHG5k1a398Tzn3uAlEF7lF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NwTbwR2HGYAzAZcatVzgS7TfnHZjyhvnk/C/2XEuIbaKx/eER5w0xJaYMotqIHmkWhyjhn63KIwkoRfSa+qhA3oVIXfXXSNfYJyjEs/vW4EIZL0Ol/RJxjM3pRe9PLvs2fS5FmW4Dm7H3aguB/8DE3kFD4MMIdh83s7x0ex8Xok= 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=HJ+6srUx; arc=none smtp.client-ip=209.85.215.182 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="HJ+6srUx" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c1cf2f0523eso727451a12.3 for ; Tue, 06 Jan 2026 07:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767711914; x=1768316714; 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=tC197L1plDdByX5sXGNPm444DjHNEfSXtphhEaSIChs=; b=HJ+6srUxc0B6lbhk29dbeB8itqsVzV+e3e6No4yk10VYagLjPzoDqErPYENPTVqg8W 2jVE7mNl3vWxpvDjexCocIbXtqOsJuzsZwDsJ/0VzkmvENFKqTZBI7Bv9pQi4J0cIKJn HiOeTn49McPHCBHUuf5Yyy4FBtqz3i+dOlghUEoJbjW/cXZ8jJingCrbUC0cwZSob7bY 5ezwDP35mDWaZs8b9tcH0l2ZoOC0scwNRPL7+WiLo4vS7tfVsMFCd8CUaxsWTYVggdr/ UwGw6UGsBKsr6ClSevAdi7hk/KBTWZLVwng6YpI/oyNTskEXERCQx5ZPlgYZzvLnCjxg 27Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767711914; x=1768316714; 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=tC197L1plDdByX5sXGNPm444DjHNEfSXtphhEaSIChs=; b=s82bQrvpOda6hbAYWosHPeT/RpgoLZ1J2tykNCfb/O5qVXwVHtflkkrbkRLEDnFlGj t1eIikoYpL5FsdVWDgJmBHBXgAEVgTdht+05eAz4j5eRxMAkAtFqJplK+yx1WN8T+h2m UmOivLkB/wzT+PPazAAoi+cjqiW70QMPUmFedx1IRCzgkqrAjYZpULVrgb/ucBZWGMjv RJfA4Vg+L2OB8cfnk0CLs+MKgUKgon8P4iagp5w2g+nMOo3W8DjOhU/uUjDzGSlNdXFE AzRFqfuyLTpHjWTWnl4D2hynBgauL9mSMfg7S/3NhruvRYljbJ+dH7+GJt+UQvQD4CJn c8Aw== X-Gm-Message-State: AOJu0YxvcgXJ3PyCC+mMTCnf2cCFP5emzuvHJ9seJwIs8rWVEvK2XGLo KLh12OUHt/1z3NK93ivv0WdMx8+kdWgAIkA+RcXxNBvS60tus2UDlUNJG2O3dA== X-Gm-Gg: AY/fxX4HinvfPI9BoI0BnrD6ZQOYyhvuG+T23sjZkFd2XO2oVv7CXHWn5BZhaAi86Dq AwRrlXkXR8bce9rnfNIOteKMb6UfaO3dBcGZg2hyUTmG85jBr0efv4nmoY1vMnKDYUCYUUuFLN1 2pD2pBipQG7SVjvowuGopJ6tGJzFHNHEz5gfaXXhG+fSEO35GvkN0VD4YMmG5ileEJGyM3tOzFu ZguO3wxt04B5dYl2sgOpmZz7PQ4pXtwl058h4YkE8IXwenKaFF673B9KzVDjO4/9E1WSYE/p9kb 8tyYOjBfMF9ToPTKpgmy4Vcdm2rDgNbiBfnNqPjtyuWUmI6f3nLyGRFyJmJOiWp0tTNMVG8JX+u SQYkWtH7mfOFE9pTN8jLdW7D2SA0umB2POcrNjdCE7NWjHuUUtLU/VeR4AKlZ5bwH8JaDZVZb3Y tSRMQ8fKaN X-Google-Smtp-Source: AGHT+IGhJ2thPSuMeCWJuvxELL17nB4aCL3Ngpi+wjeWS3G5XiZYgyewYqUsGwlAYN2kTVU2XU2ttQ== X-Received: by 2002:a05:6a21:3290:b0:366:14b2:313 with SMTP id adf61e73a8af0-389823cbca6mr3147694637.70.1767711913785; Tue, 06 Jan 2026 07:05:13 -0800 (PST) Received: from minh.. ([14.187.47.150]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cbfc2f481sm2674231a12.10.2026.01.06.07.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 07:05:13 -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 v3 3/3] virtio-net: clean up __virtnet_rx_pause/resume Date: Tue, 6 Jan 2026 22:04:38 +0700 Message-ID: <20260106150438.7425-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106150438.7425-1-minhquangbui99@gmail.com> References: <20260106150438.7425-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Acked-by: Michael S. Tsirkin 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 a4dbc958689b..745bae756920 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3369,8 +3369,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } -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 = netif_running(vi->dev); @@ -3385,17 +3385,12 @@ static void virtnet_rx_pause_all(struct virtnet_info *vi) int i; for (i = 0; i < vi->max_queue_pairs; i++) - __virtnet_rx_pause(vi, &vi->rq[i]); + virtnet_rx_pause(vi, &vi->rq[i]); } -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) { if (netif_running(vi->dev)) { /* Pre-fill rq agressively, to make sure we are ready to get @@ -3414,17 +3409,12 @@ static void virtnet_rx_resume_all(struct virtnet_info *vi) for (i = 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); } } -static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue *rq) -{ - __virtnet_rx_resume(vi, rq, true); -} - static int virtnet_rx_resize(struct virtnet_info *vi, struct receive_queue *rq, u32 ring_num) { @@ -3438,7 +3428,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", qindex, err); - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); return err; } @@ -5811,7 +5801,7 @@ static int virtnet_rq_bind_xsk_pool(struct virtnet_info *vi, struct receive_queu rq->xsk_pool = pool; - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); if (pool) return 0; -- 2.43.0