From nobody Mon Feb 9 14:32:03 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 6A8043346AC for ; Tue, 6 Jan 2026 15:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711915; cv=none; b=rRUmFSXQt1PthdvFvn2OsHRBYwnyFNuNBRgYsL++WsEHS4THT18cxFPpSFNvGq4yYwoWxrP4OMaoQu7S9ptCsr5oG93qC9qTQFM9WAOiH/SXeQfBcvnYLkRkal1phVa5jKaEfK8ptD2Z+FqJRnS7v3cRoI9hyL832/fXJbM2O60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711915; c=relaxed/simple; bh=iakYf4ocTYJ7pB+W5zvpfHG5k1a398Tzn3uAlEF7lF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=todb5coHr/Jl/o0BwXZOxzseLj6tQiMY4okwW+JN+KQWqDpXvGGdiFPccibXJBOq8/yXLOoCWtwu2Pc1AVLyHJ0ptj7m8QLsmyqucF/5tZMsIyGHXKtpsotOuFiQ5By+d0K3nA8DEK8j2auOjKgB0nfSp8PbxstzFkxncoihBME= 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.210.175 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-pf1-f175.google.com with SMTP id d2e1a72fcca58-7b9c17dd591so916059b3a.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=kmyMexOnlyqgdIBAXcGR2hYdfMOdp+432MitY+unBO0hMQPRJci3T+4iAT4nWSI9a7 R2wO1Spd0QK8ZasSoXB6byKYFdQxyPEb/xN6neDyFN5VhahvRfjj1eC0CeZ5IBUVNvLt plaD6lLMGEKKFn8gBG0oj/Hhz9PyScAgSeJnLe3M17ElgtfDudmKt3UE8wyOFHDfO+zI GJOJs9QIdD6pVgqjYW/SsaJg5YY2pcfQyz8GEd9N5pptgmeHcJkHUbc2etowuIBx/odO y1OZ0YAoJY7xNn+KMHZOv5RQ3UFeppL2ycOXaLa8iaB31HBGlWTxU/MrYQPSxylgphT0 oG2g== X-Forwarded-Encrypted: i=1; AJvYcCX9eEjXTQst5Xh/GZaypQcO7ms985NYT7baHywTk6FP/ObnYZdWVbuthNsRS0GcCcj6AujpBODDFgQEDbI=@vger.kernel.org X-Gm-Message-State: AOJu0YwUxt3HJWLc2V0ZwKuG08A7p2kfxOxAKnJ5HUbh8o8QpjSDQquv oLsoH5iQtJkPALrmYKlcPwA3QVskTg7yt1eSn39e74Fp39TyrJzCTZ+Q X-Gm-Gg: AY/fxX4sI57hR1KM7LWN8XhB/cBe0xOqZj0sjTXf/KcMrGNnIjUDP84n7g/Un8L8rkK 8sOBgjTQ79YLSX8jIhz4//jbAY2I4eXzTPUtrq9cM+AhuGteSbv0Q736OOFRtWPvY5g8xn0DsfH nUGn6T/jTVnkzRnKeLvJ80TshUcNFuEp/HCmqWFxaSFgO6Ar+mIlebkBNU1S+JcN/5PezVD1t1B a4/EEddqjCF8frkPFg+g11Eq0MT2rQcNT+FuLV3EzNkehkuc9KabR6NS4tyCeF7pyUXhIPyYfhJ g5i++eWfB8LKFUw2/Uvm9OXhCnY6N8NLFs/4PuF8BYnKitFhr3xn/tuIkEHvA/i/VdNfgEkL5DN PfxMKxfP8OoTmKdm/+te99F3zYAzunYAQ6nnqJ3hSThR5pCZnZ38NqthjTKolZGnRwzFM4aqtrw Oh8y54TzNw 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: 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. 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, 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 @@ -3385,17 +3385,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) { 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_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) { @@ -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", qind= ex, err); =20 - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); return err; } =20 @@ -5811,7 +5801,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