From nobody Mon Feb 9 00:01:06 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 E731B25D1E9 for ; Fri, 2 Jan 2026 15:20:55 +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=1767367257; cv=none; b=O4VAmGfa94kfXnT3ECsyBE2dzS6xaXvW6EihX388f5PgbMHXYk22zzi3H6W7rZjqAaH4g/gjHuuvJjakfFrvket2S7nApOZXt4AOpnRyl3iicowhVNMH5WJjPK5gd/hjWBox+xoEkYETaT22nmJ/zcyVJG7rmbvfAuJIouaPE9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767367257; c=relaxed/simple; bh=IhIOm/waVwb/Npd7naFhHnteaL1RMxK1LRiQGSxMRvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kuSYqys7ELNHERQYyifjFik6y2ablit9iUwWJHDB+hjKKUPUizJ32BB4Tzo0NS0C3VekR61yZP6XaRsFQ7sfTxBcW/ZuMFSWe5qRZDVL+oZKs5kgohD/9gSXjP24i8okAk8cLC/lX/Zhti1E7aCDIbNAl+mna2IeRzwtqSpDB1E= 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=bbAX9zBw; 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="bbAX9zBw" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7aae5f2633dso12599636b3a.3 for ; Fri, 02 Jan 2026 07:20:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767367255; x=1767972055; 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=6p9926v+j8hRdiPJTHDEVVkAKp32Z3dkDYChWeFnkTc=; b=bbAX9zBw2ONdq3W1f+IIpkty+jiVkPi6HUJOuSvWcyDpDG6ag+uahKLobxHVzQETcu c3D/HZf/9pKSpiYlfqOYCuOQWg/MVEZilwJg6td/XSvDjCzPNIBpVLXT8UM4GVutawqq Hl+qgzpGxyGishWTGs1Vq1v0lAiTr0XsnlJXcfad89HcVL/Qk8tQosmu69rSLtu4PxIf bUKhFgfs5Q6Oi7hSG8qZHG5DRuSvl2cj0KVL7VhXQiZ7ul5Mo1RxASdCHQrUShWcP/es opsx+O7bWys9VhuGTf+7Vg0FPrfCRY9PFWDKOgHAiF0pAlJzEt7gDCJu3tAS4pQMwGgx SObQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767367255; x=1767972055; 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=6p9926v+j8hRdiPJTHDEVVkAKp32Z3dkDYChWeFnkTc=; b=YPCRpklfs4bOlrpDsDiwVNJawDHY/ryX6DEYa8OPyfCTp1wjQFxQY4C7h5ULYLMjLJ Ax2Aed0eqEb1eq0Z+mAVm4fk7hiLI7xKiQUwcPHjsQv3ecHVwoeLe0dUcra44YB6u4Ln gEPfjcFNVX5nzzPzRpYVu6cyNiKRtjEYy06Y5ClVyy56QK0siEEncb7ROWySaoZ5L+8o 0HmR7Qx5sH7a00nqRMr632BEckufouQJMngrCCq6t//xvDFzwa2Z/oOvhT2l4S9dV6NA VwL92Bf/G7jXp03+xCDL92RNjp/C09T8LKWvBy6AEoBRU0mXgqZfZgI7cOGNfxKKfvDW 7Gcg== X-Forwarded-Encrypted: i=1; AJvYcCXuLuaKvnFfyMJrvPyFd/0tZDPPvw56Y3LBeSqinooUmC3+MC0G7+yrLM3dsprLOFqWXFfwcyJrBinXQeI=@vger.kernel.org X-Gm-Message-State: AOJu0YzLz85XVy2eoL5+OP3CocGlwgSdSSqNIGNDKtvgeON03+7xuWrk W1wpbvlzSBDM4eB/I4Hs2HCww5IOA3V3gglfV4teCxW0KacqEe518IQI X-Gm-Gg: AY/fxX4zgwCKMAXHeTmRVkoZQttLrxdjSsTk5QJ6RaLYEsYyobu1i3G80x3usUXqfpA at5m6NHWNQaZUYIt3Z562zJXeYjP9cofBZlZsLsxARSL5QwEp8dXvxdz/n9xjhUAJFUzFgwt9PK GDPPPNDy47XvivN5AlYjyOq7gSimFKxKypf52F87+/JJXFj0zjKKeOMGWnyaRl0FbPTtT3t4vcw vQHqj4qYIUIbfu+DxjiH37uUMDHOyezf7lY/rYc63LfopT1aNuH9m4Di2dsq66MvV6RPUVlGit8 g+6/6Q/ghQBfgM8imgGBn4+UB/O0iAW1G+zEWC2bBD+OO/s4vdSzhgu33ZhXBTBAlOCC4s7hV58 f8FsBY5CAnTuWFoOGVYfXUwDTY7RKc8SyxrjtO3TdovnZg6iejTznpY9wMywkc+JXoNnZR2sMO/ 0ITgEpez40MVaGmfi0R+N75gQ= X-Google-Smtp-Source: AGHT+IG6Z89asELtZL25bqp1wItzqCcfh/QFAyUyxW2i4m6A92FWF0k6z8ouT/hhDGRbNkmbOPf90w== X-Received: by 2002:a05:6a20:431a:b0:35d:5d40:6d86 with SMTP id adf61e73a8af0-376a9de51cbmr41286930637.40.1767367254850; Fri, 02 Jan 2026 07:20:54 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 07:20:53 -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 2/3] virtio-net: remove unused delayed refill worker Date: Fri, 2 Jan 2026 22:20:22 +0700 Message-ID: <20260102152023.10773-3-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" Since we change to retry refilling receive buffer in NAPI poll instead of delayed worker, remove all unused delayed refill worker code. Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 86 ---------------------------------------- 1 file changed, 86 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ac514c9383ae..7e77a05b5662 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -441,9 +441,6 @@ struct virtnet_info { /* Packet virtio header size */ u8 hdr_len; =20 - /* Work struct for delayed refilling if we run low on memory. */ - struct delayed_work refill; - /* UDP tunnel support */ bool tx_tnl; =20 @@ -451,12 +448,6 @@ struct virtnet_info { =20 bool rx_tnl_csum; =20 - /* Is delayed refill enabled? */ - bool refill_enabled; - - /* The lock to synchronize the access to refill_enabled */ - spinlock_t refill_lock; - /* Work struct for config space updates */ struct work_struct config_work; =20 @@ -720,20 +711,6 @@ static void virtnet_rq_free_buf(struct virtnet_info *v= i, put_page(virt_to_head_page(buf)); } =20 -static void enable_delayed_refill(struct virtnet_info *vi) -{ - spin_lock_bh(&vi->refill_lock); - vi->refill_enabled =3D true; - spin_unlock_bh(&vi->refill_lock); -} - -static void disable_delayed_refill(struct virtnet_info *vi) -{ - spin_lock_bh(&vi->refill_lock); - vi->refill_enabled =3D false; - spin_unlock_bh(&vi->refill_lock); -} - static void enable_rx_mode_work(struct virtnet_info *vi) { rtnl_lock(); @@ -2948,42 +2925,6 @@ static void virtnet_napi_disable(struct receive_queu= e *rq) napi_disable(napi); } =20 -static void refill_work(struct work_struct *work) -{ - struct virtnet_info *vi =3D - container_of(work, struct virtnet_info, refill.work); - bool still_empty; - int i; - - for (i =3D 0; i < vi->curr_queue_pairs; i++) { - struct receive_queue *rq =3D &vi->rq[i]; - - /* - * When queue API support is added in the future and the call - * below becomes napi_disable_locked, this driver will need to - * be refactored. - * - * One possible solution would be to: - * - cancel refill_work with cancel_delayed_work (note: - * non-sync) - * - cancel refill_work with cancel_delayed_work_sync in - * virtnet_remove after the netdev is unregistered - * - wrap all of the work in a lock (perhaps the netdev - * instance lock) - * - check netif_running() and return early to avoid a race - */ - napi_disable(&rq->napi); - still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_do_enable(rq->vq, &rq->napi); - - /* In theory, this can happen: if we don't get any buffers in - * we will *never* try to fill again. - */ - if (still_empty) - schedule_delayed_work(&vi->refill, HZ/2); - } -} - static int virtnet_receive_xsk_bufs(struct virtnet_info *vi, struct receive_queue *rq, int budget, @@ -3222,8 +3163,6 @@ static int virtnet_open(struct net_device *dev) struct virtnet_info *vi =3D netdev_priv(dev); int i, err; =20 - enable_delayed_refill(vi); - for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) /* If this fails, we will retry later in @@ -3249,9 +3188,6 @@ static int virtnet_open(struct net_device *dev) return 0; =20 err_enable_qp: - disable_delayed_refill(vi); - cancel_delayed_work_sync(&vi->refill); - for (i--; i >=3D 0; i--) { virtnet_disable_queue_pair(vi, i); virtnet_cancel_dim(vi, &vi->rq[i].dim); @@ -3445,24 +3381,12 @@ static void virtnet_rx_pause_all(struct virtnet_inf= o *vi) { int i; =20 - /* - * Make sure refill_work does not run concurrently to - * avoid napi_disable race which leads to deadlock. - */ - disable_delayed_refill(vi); - cancel_delayed_work_sync(&vi->refill); for (i =3D 0; i < vi->max_queue_pairs; i++) __virtnet_rx_pause(vi, &vi->rq[i]); } =20 static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue= *rq) { - /* - * Make sure refill_work does not run concurrently to - * avoid napi_disable race which leads to deadlock. - */ - disable_delayed_refill(vi); - cancel_delayed_work_sync(&vi->refill); __virtnet_rx_pause(vi, rq); } =20 @@ -3486,7 +3410,6 @@ static void virtnet_rx_resume_all(struct virtnet_info= *vi) { int i; =20 - enable_delayed_refill(vi); for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) __virtnet_rx_resume(vi, &vi->rq[i], true); @@ -3497,7 +3420,6 @@ static void virtnet_rx_resume_all(struct virtnet_info= *vi) =20 static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queu= e *rq) { - enable_delayed_refill(vi); __virtnet_rx_resume(vi, rq, true); } =20 @@ -3848,10 +3770,6 @@ static int virtnet_close(struct net_device *dev) struct virtnet_info *vi =3D netdev_priv(dev); int i; =20 - /* Make sure NAPI doesn't schedule refill work */ - disable_delayed_refill(vi); - /* Make sure refill_work doesn't re-enable napi! */ - cancel_delayed_work_sync(&vi->refill); /* Prevent the config change callback from changing carrier * after close */ @@ -5807,7 +5725,6 @@ static int virtnet_restore_up(struct virtio_device *v= dev) =20 virtio_device_ready(vdev); =20 - enable_delayed_refill(vi); enable_rx_mode_work(vi); =20 if (netif_running(vi->dev)) { @@ -6564,7 +6481,6 @@ static int virtnet_alloc_queues(struct virtnet_info *= vi) if (!vi->rq) goto err_rq; =20 - INIT_DELAYED_WORK(&vi->refill, refill_work); for (i =3D 0; i < vi->max_queue_pairs; i++) { vi->rq[i].pages =3D NULL; netif_napi_add_config(vi->dev, &vi->rq[i].napi, virtnet_poll, @@ -6906,7 +6822,6 @@ static int virtnet_probe(struct virtio_device *vdev) =20 INIT_WORK(&vi->config_work, virtnet_config_changed_work); INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); - spin_lock_init(&vi->refill_lock); =20 if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { vi->mergeable_rx_bufs =3D true; @@ -7170,7 +7085,6 @@ static int virtnet_probe(struct virtio_device *vdev) net_failover_destroy(vi->failover); free_vqs: virtio_reset_device(vdev); - cancel_delayed_work_sync(&vi->refill); free_receive_page_frags(vi); virtnet_del_vqs(vi); free: --=20 2.43.0