From nobody Tue Apr 7 09:18:08 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 82F9030C610 for ; Sat, 14 Mar 2026 18:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773512953; cv=none; b=aD2b+CmxE+agV8kLgMkG7taXY6CameqmASRppds49RC/K4WiddMVi7TlTbNUXtWmUPrxNZrC5UQXMSzwATFZ3MXUhn4YBjgX9jN/QAd5Gmm3LgaFyKulacYOmxRYcxCo4EHeoxYb6WE9/VWsYpyOPucUILFwVR0sJa6HjSUcfFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773512953; c=relaxed/simple; bh=VSzdK6fFXXfUKXv/QSuO1q2/KGkkuP3m3IoNyvnhahY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j5YQ64EMHhdW2eS4SoJ3uGRixuFvkpeobeMb0a0CnZWTnQe/vy618FehKGG1jkHoBZTsxYxtW22LmC/qQ4e6ym94EGqwRhwwpwwtmVpuiqrExMyvMQKaSNhrEWmRejzkL9PPGhl30E6+0qF5lsTkuyOtmMJCb4eM+MpxodzXCIo= 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=Hpm+UR2I; arc=none smtp.client-ip=209.85.216.53 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="Hpm+UR2I" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-35a08ce49dcso3044718a91.2 for ; Sat, 14 Mar 2026 11:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773512950; x=1774117750; 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=vPjyZJZYcHWPj/blRqGZlp+ucpD5kzaKMmjNcDwFvP0=; b=Hpm+UR2ISoqTel3g0/QJQAMklk2H8ruIjLxccQ2UanzGSbxtebZP+AKADohef7TKO9 fOYm0/CY0vPXp5P59c2WxCegyZqtO2xCvLEBhT2GCMv4WfEoAA564Gr3o3gKBZK0GOLh w9iyC/3zE/aW2a9rd3Mkc1lc+jl8GBeHQ23KkJf6DLQxnVdDKUSPAueeeayvVceRZQ4E 7K8BwMM9juEJQkyF0WT1OR0hJYZXwqsgEitezBm6E+fMD4RqmYiBa3kuXowv2FrnQrF1 CcnbY1Qxk3NdLKwDiqaQIEZou1kQNHNMbF0hqh8P0LdcbZpqEWZyh3bkkXPysF9t4KgR MsSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773512950; x=1774117750; 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=vPjyZJZYcHWPj/blRqGZlp+ucpD5kzaKMmjNcDwFvP0=; b=PzA8Bv7235iz+8JP08EoTSbEduNoF2tj0G9jszbDWXy02L4ytzbOlMlFX4BHG3WhIr 9jeT3WWCg+8xfYFOddVakoqii9yPS+TCx14AqUPpF+mS1IIZI4Fkp7u7Oys2uHFmgKTr G2noAV9FTz1lR1pkoMYW5WdaNanNhIJxVlkf0oSiV1etNprtNBETRvE0mq8IBPmgqo8+ T2H0mQbedjqT4Y9n5F6hgFXurxFOrbg5FsD2+H+npnx6o3UElXTnyP/r82K5T4CVtXTh EDbLOMIzHREd+Yr4qIQ8ZanvwaR7zy+qJog1smL1AqW0W2sZ2XkjI3ZG4q790kkeOhEC naug== X-Forwarded-Encrypted: i=1; AJvYcCUyjmKruKm4bf0OOoNdcNtBP9DUsSf8gQV7m9saWbgH0FlqTYTOsvUdjFSJZt7Xc+BMMqMJYjDLZyUfB64=@vger.kernel.org X-Gm-Message-State: AOJu0Yzp3MP1VjP7XZ+OzELDDH04zpL2I5p4ODuj95OPyx7LIZiRVuZc CN2Vmj6/O0Mb+DIK7ocJAX1zf+5F9vIkEfyqbHGsfaKWsl0JMdi/I8MO X-Gm-Gg: ATEYQzxy+V0Skz/AmgQG+k5jt7fFpF+ydh2yLFm009K4XJE3b3xFTEOWyAbnR5LI8Nj 8c2PQvC4mk7hfNuxwttSPw7FaMlJ0mysuxSRaRk39cN53bIUMKIbgUtPSSrw7bL4IIQNUJo3tUX Q93128W7k/ybBqOLCs+eYQaRutqVLnVytYQIVCG06ITw0JbNdiRJVbJbwswetE41zacHwv4zPxk DiNoKax11uLSpRX0wAlX3N2+xygnuoenynWZXOrP+hJC6xcM1KZicD9gyzxRddFNMJ4dOyK+pcC DiNdHy+inYIsjfHIOlHijRkj8UW5/QlGq+cln/qA8JsYS0N/52t84NB0UCHrRWBCmpoSPmfhRQH VpIIyM/Tt1VcKD7p2AQs3LergUqjB0bcb1uJPNlhOA7FYFTFsnTmkFn2lRF+r8wR6fYi9TW+vYD aL6gdo1q1QGtXqwv7IbPjJ+1DWSJypd60A4EVn4FhP5kLE+nY3QcQmZaL8nsRUWAzNuAHujhNB5 oCB8A== X-Received: by 2002:a17:903:1210:b0:2ae:b9cd:d2df with SMTP id d9443c01a7336-2aecab1f32bmr78786355ad.34.1773512949621; Sat, 14 Mar 2026 11:29:09 -0700 (PDT) Received: from localhost.localdomain ([122.168.66.151]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece62c581sm77673525ad.33.2026.03.14.11.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2026 11:29:09 -0700 (PDT) From: I Viswanath To: stfomichev@gmail.com, horms@kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, kuba@kernel.org, davem@davemloft.net, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, jasowang@redhat.com, mst@redhat.com, przemyslaw.kitszel@intel.com, anthony.l.nguyen@intel.com, jacob.e.keller@intel.com, ronak.doshi@broadcom.com, pcnet32@frontier.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, virtualization@lists.linux.dev, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, I Viswanath Subject: [PATCH net-next v9 3/7] virtio-net: Implement ndo_set_rx_mode_async callback Date: Sat, 14 Mar 2026 23:58:05 +0530 Message-ID: <20260314182809.362808-4-viswanathiyyappan@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260314182809.362808-1-viswanathiyyappan@gmail.com> References: <20260314182809.362808-1-viswanathiyyappan@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" Implement the ndo_set_rx_mode_async callback and update the driver to use the snapshot/commit model for RX mode update. Signed-off-by: I Viswanath Reviewed-by: Aleksandr Loktionov --- =20 There are no calls to netif_set_rx_mode in virtio-net =20 drivers/net/virtio_net.c | 85 ++++++++++++---------------------------- 1 file changed, 25 insertions(+), 60 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 811b90da15a9..70255d09401c 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -448,12 +448,6 @@ struct virtnet_info { /* Work struct for config space updates */ struct work_struct config_work; =20 - /* Work struct for setting rx mode */ - struct work_struct rx_mode_work; - - /* OK to queue work setting RX mode? */ - bool rx_mode_work_enabled; - /* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set; =20 @@ -717,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_rx_mode_work(struct virtnet_info *vi) -{ - rtnl_lock(); - vi->rx_mode_work_enabled =3D true; - rtnl_unlock(); -} - -static void disable_rx_mode_work(struct virtnet_info *vi) -{ - rtnl_lock(); - vi->rx_mode_work_enabled =3D false; - rtnl_unlock(); -} - static void virtqueue_napi_schedule(struct napi_struct *napi, struct virtqueue *vq) { @@ -3802,33 +3782,30 @@ static int virtnet_close(struct net_device *dev) return 0; } =20 -static void virtnet_rx_mode_work(struct work_struct *work) +static void virtnet_set_rx_mode_async(struct net_device *dev) { - struct virtnet_info *vi =3D - container_of(work, struct virtnet_info, rx_mode_work); + struct virtnet_info *vi =3D netdev_priv(dev); u8 *promisc_allmulti __free(kfree) =3D NULL; - struct net_device *dev =3D vi->dev; struct scatterlist sg[2]; struct virtio_net_ctrl_mac *mac_data; - struct netdev_hw_addr *ha; + char *ha_addr; int uc_count; int mc_count; void *buf; - int i; + int i, ni; =20 - /* We can't dynamically set ndo_set_rx_mode, so return gracefully */ + /* We can't dynamically set rx_mode, so return gracefully */ if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX)) return; =20 - promisc_allmulti =3D kzalloc_obj(*promisc_allmulti); + promisc_allmulti =3D kzalloc_obj(*promisc_allmulti, GFP_ATOMIC); if (!promisc_allmulti) { dev_warn(&dev->dev, "Failed to set RX mode, no memory.\n"); return; } =20 - rtnl_lock(); - - *promisc_allmulti =3D !!(dev->flags & IFF_PROMISC); + *promisc_allmulti =3D netif_get_rx_mode_cfg(dev, + NETIF_RX_MODE_CFG_PROMISC); sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti)); =20 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, @@ -3836,7 +3813,8 @@ static void virtnet_rx_mode_work(struct work_struct *= work) dev_warn(&dev->dev, "Failed to %sable promisc mode.\n", *promisc_allmulti ? "en" : "dis"); =20 - *promisc_allmulti =3D !!(dev->flags & IFF_ALLMULTI); + *promisc_allmulti =3D netif_get_rx_mode_cfg(dev, + NETIF_RX_MODE_CFG_ALLMULTI); sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti)); =20 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, @@ -3844,27 +3822,22 @@ static void virtnet_rx_mode_work(struct work_struct= *work) dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n", *promisc_allmulti ? "en" : "dis"); =20 - netif_addr_lock_bh(dev); - - uc_count =3D netdev_uc_count(dev); - mc_count =3D netdev_mc_count(dev); + uc_count =3D netif_rx_mode_uc_count(dev); + mc_count =3D netif_rx_mode_mc_count(dev); /* MAC filter - use one buffer for both lists */ buf =3D kzalloc(((uc_count + mc_count) * ETH_ALEN) + (2 * sizeof(mac_data->entries)), GFP_ATOMIC); mac_data =3D buf; - if (!buf) { - netif_addr_unlock_bh(dev); - rtnl_unlock(); + if (!buf) return; - } =20 sg_init_table(sg, 2); =20 /* Store the unicast list and count in the front of the buffer */ mac_data->entries =3D cpu_to_virtio32(vi->vdev, uc_count); i =3D 0; - netdev_for_each_uc_addr(ha, dev) - memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN); + netif_rx_mode_for_each_uc_addr(ha_addr, dev, ni) + memcpy(&mac_data->macs[i++][0], ha_addr, ETH_ALEN); =20 sg_set_buf(&sg[0], mac_data, sizeof(mac_data->entries) + (uc_count * ETH_ALEN)); @@ -3874,10 +3847,8 @@ static void virtnet_rx_mode_work(struct work_struct = *work) =20 mac_data->entries =3D cpu_to_virtio32(vi->vdev, mc_count); i =3D 0; - netdev_for_each_mc_addr(ha, dev) - memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN); - - netif_addr_unlock_bh(dev); + netif_rx_mode_for_each_mc_addr(ha_addr, dev, ni) + memcpy(&mac_data->macs[i++][0], ha_addr, ETH_ALEN); =20 sg_set_buf(&sg[1], mac_data, sizeof(mac_data->entries) + (mc_count * ETH_ALEN)); @@ -3886,17 +3857,16 @@ static void virtnet_rx_mode_work(struct work_struct= *work) VIRTIO_NET_CTRL_MAC_TABLE_SET, sg)) dev_warn(&dev->dev, "Failed to set MAC filter table.\n"); =20 - rtnl_unlock(); - kfree(buf); } =20 static void virtnet_set_rx_mode(struct net_device *dev) { - struct virtnet_info *vi =3D netdev_priv(dev); + bool allmulti =3D !!(dev->flags & IFF_ALLMULTI); + bool promisc =3D !!(dev->flags & IFF_PROMISC); =20 - if (vi->rx_mode_work_enabled) - schedule_work(&vi->rx_mode_work); + netif_set_rx_mode_cfg(dev, NETIF_RX_MODE_CFG_ALLMULTI, allmulti); + netif_set_rx_mode_cfg(dev, NETIF_RX_MODE_CFG_PROMISC, promisc); } =20 static int virtnet_vlan_rx_add_vid(struct net_device *dev, @@ -5711,8 +5681,6 @@ static void virtnet_freeze_down(struct virtio_device = *vdev) =20 /* Make sure no work handler is accessing the device */ flush_work(&vi->config_work); - disable_rx_mode_work(vi); - flush_work(&vi->rx_mode_work); =20 if (netif_running(vi->dev)) { rtnl_lock(); @@ -5738,8 +5706,6 @@ static int virtnet_restore_up(struct virtio_device *v= dev) =20 virtio_device_ready(vdev); =20 - enable_rx_mode_work(vi); - if (netif_running(vi->dev)) { rtnl_lock(); err =3D virtnet_open(vi->dev); @@ -6214,6 +6180,7 @@ static const struct net_device_ops virtnet_netdev =3D= { .ndo_validate_addr =3D eth_validate_addr, .ndo_set_mac_address =3D virtnet_set_mac_address, .ndo_set_rx_mode =3D virtnet_set_rx_mode, + .ndo_set_rx_mode_async =3D virtnet_set_rx_mode_async, .ndo_get_stats64 =3D virtnet_stats, .ndo_vlan_rx_add_vid =3D virtnet_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid =3D virtnet_vlan_rx_kill_vid, @@ -6834,7 +6801,6 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv =3D vi; =20 INIT_WORK(&vi->config_work, virtnet_config_changed_work); - INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); =20 if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { vi->mergeable_rx_bufs =3D true; @@ -6986,8 +6952,6 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); =20 - enable_rx_mode_work(vi); - /* serialize netdev register + virtio_device_ready() with ndo_open() */ rtnl_lock(); =20 @@ -7136,8 +7100,6 @@ static void virtnet_remove(struct virtio_device *vdev) =20 /* Make sure no work handler is accessing the device. */ flush_work(&vi->config_work); - disable_rx_mode_work(vi); - flush_work(&vi->rx_mode_work); =20 virtnet_free_irq_moder(vi); =20 @@ -7158,6 +7120,7 @@ static __maybe_unused int virtnet_freeze(struct virti= o_device *vdev) virtnet_freeze_down(vdev); remove_vq_common(vi); =20 + netif_disable_async_ops(vi->dev); return 0; } =20 @@ -7166,6 +7129,7 @@ static __maybe_unused int virtnet_restore(struct virt= io_device *vdev) struct virtnet_info *vi =3D vdev->priv; int err; =20 + netif_enable_async_ops(vi->dev); err =3D virtnet_restore_up(vdev); if (err) return err; @@ -7175,6 +7139,7 @@ static __maybe_unused int virtnet_restore(struct virt= io_device *vdev) if (err) { virtnet_freeze_down(vdev); remove_vq_common(vi); + netif_disable_async_ops(vi->dev); return err; } =20 --=20 2.47.3