From nobody Tue Dec 2 02:49:40 2025 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 E7C9A36B043 for ; Tue, 18 Nov 2025 16:44:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763484254; cv=none; b=j3ZLkzBFx4Ay8PlhypDzcKTqWlp3WuXZWo9RdCgeTPVjTK05W0XwhWZqDAh8XIcBICg5v7Z6fDXm3qpmQsGCNKpofk+ndOc7d6J3mW+i3XfmMfE8OjgsyWH01S303TYj8YFzrj8k48KS4NBFM0aiiF0mP0treEPH1bQXPphdJUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763484254; c=relaxed/simple; bh=0FQ386+g3fJmb2sXgWLF41NLQyulgHxdCvrCfZwHMVM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=coHCpceg5zv247xha0BUJ6lC0XrEqtjXPXjJuaOFvrDo4ohha4iuKiRgECEaYekgXLdLUQhcPIRPc1DhZFNVsucZ+10Y+5awNY2VMOOy/3OyuATxv8BfGwItE8Zft/oDEIBvr0LZeMZ6PB75N+rsyweQoipEId+ljk0Rr+mgyh4= 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=jKysXBoI; arc=none smtp.client-ip=209.85.216.45 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="jKysXBoI" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-34374febdefso6101062a91.0 for ; Tue, 18 Nov 2025 08:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763484251; x=1764089051; 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=TwmtgOlhlWBYCrE1LogTIJtjLPIo0fBin+YkiTpkdPg=; b=jKysXBoI1WRTMhaLZDwrtq0Wpm5XQ2PIVtl9tzmMDuTnSV9p8vvzW0QKbdGs6Megso EvzdNxbkovVieJuVGsCiDcoGOuH8H/pRoBO8zBul6KXeQVLlQjgXAn3j2tKzo8xHXsKx 5H83/sXJvD38OJA99hVOFgRMPrzXGRwJLakri4MQJlpXpsOYbW/JUY3uWOa7lhMWrlHv u17RcsXEHkGv5jOyH98f19uDmoY5ifJQJnEzdISYmVlIiG8qUDByC6LC0TkEKgQ6eZcj iU+CfAC6n/zS9vSvTXmjm2Nv/p+ZZmU8vawJT6S5RM6Z9pHoBQnsWBf9TSGPNTpK8/np 8J0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763484251; x=1764089051; 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=TwmtgOlhlWBYCrE1LogTIJtjLPIo0fBin+YkiTpkdPg=; b=DcQb0jJjdFAfyDDs8QlqtTW44m28O0puUMKqnFVuM5pc9yRw5dIsPrYp9/kY0OP8RP 37Q9M4tHTUB0MWFkzZFtcs6Ne2s+DkI74Lbowbl43odTezPmgsdOCOzflM0gT9OquCvK gReAjYMoYkEv2ctDnaDhoP9D0RZIGDlu3fterHCGagXZOaCy5mqYiGx65NkDl9wa+1xw d2TnuDSMNBmwY44lNPwmGJ5N/O/3Xd2REqTEjulLXuH3jg0qA44O9cXOjxpLm3AfA+sS BMB4DmX/v7ljLyakuHxCuEpntpr+1W/qMMKb351j8PrGFClXwxwW1kq6DE5AY4pgm7lh 3aUg== X-Forwarded-Encrypted: i=1; AJvYcCWWTfBgTVjiP03RYQrFmCP0tuXFW6jclq+4MOEKQ0TDA4/Lgccq/l48SaOxvXUvfBHrlTN0t3EWqzV+zb0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3Kf6dLA65N4K7m4zTP5/KsQsuhLTkgcUsXJgMYnVKQqfMnB++ KFF76M/OqdwF2qbf3gLZJMIOalUCVkX4eKOyViOWWQyQK6sqwuE9PUFo X-Gm-Gg: ASbGncsLAtAmn4tp7l95hTO6XTUEIBvXFYcjYyB+Q8vbCjjqjBuIvjx0dym4n9h4abV miwvc7T9V5TrpdObQN4eVfIkx4auZ5wDpP0VL6RlwYgeW+cdbmRE2NilMKTeyQ0lLJ1YlZuqwiw 5Td4JX325H5oRbULwZWoao6CLw3tOc1/Mzix2di2xQjdsAUsuHdiRSYLDPPeTRzYMudCj3R94bR Lu4q9SxtBS0TYPGymF0h8hnH/bGXqGFzv/EzfQneQdP05KtS78eYGuH5z7ba4jSxJv0weLLe80d i/3Oz6YTQkkJkhlP0ZmYU5M7ZPc3UH9a8F7M1R6XCRNPxZrkfbPkjloUYJ09HeCqLJHHiHrGssl uOZ4o2XPcek2U+bb/VyRWqmxHYEqueiscwtoJawRQeWwXddz+fmS0u5IXMMvke1MMtAMF7bd6Yb eRj8VNeJ714hfZI06dp/bX+UjJMu9gEY08pHm72FhmQfloBW+ERhIGnA== X-Google-Smtp-Source: AGHT+IGP4POJh+nQC68ptxHo+oArpwmANuGeak47u/8AJD4JE1aggtVetdUtI5VFttSw6IUoTGKYcw== X-Received: by 2002:a17:90b:4b49:b0:340:f009:ca89 with SMTP id 98e67ed59e1d1-343fa62fabemr18013927a91.22.1763484250931; Tue, 18 Nov 2025 08:44:10 -0800 (PST) Received: from COB-LTR7HP24-497.domain.name ([223.185.135.16]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3456513f162sm13544843a91.8.2025.11.18.08.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 08:44:10 -0800 (PST) From: I Viswanath To: kuba@kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, horms@kernel.org, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, sdf@fomichev.me, kuniyu@google.com, skhawaja@google.com, aleksander.lobakin@intel.com Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linux.dev, I Viswanath Subject: [RFT net-next v4 2/2] virtio-net: Implement ndO_write_rx_mode callback Date: Tue, 18 Nov 2025 22:13:33 +0530 Message-Id: <20251118164333.24842-3-viswanathiyyappan@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251118164333.24842-1-viswanathiyyappan@gmail.com> References: <20251118164333.24842-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 ndo_write_rx_mode callback for virtio-net Signed-off-by: I Viswanath --- drivers/net/virtio_net.c | 56 +++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index cfa006b88688..20494ed5a0f6 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -460,9 +460,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; =20 @@ -3857,18 +3854,17 @@ static int virtnet_close(struct net_device *dev) return 0; } =20 -static void virtnet_rx_mode_work(struct work_struct *work) +static void virtnet_write_rx_mode(struct net_device *dev) { - struct virtnet_info *vi =3D - container_of(work, struct virtnet_info, rx_mode_work); + struct virtnet_info *vi =3D netif_rx_mode_get_priv_ptr(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 idx; int i; =20 /* We can't dynamically set ndo_set_rx_mode, so return gracefully */ @@ -3881,9 +3877,8 @@ static void virtnet_rx_mode_work(struct work_struct *= work) return; } =20 - rtnl_lock(); - - *promisc_allmulti =3D !!(dev->flags & IFF_PROMISC); + *promisc_allmulti =3D netif_rx_mode_get_bit(dev, + NETIF_RX_MODE_PROM_EN); sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti)); =20 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, @@ -3891,7 +3886,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_rx_mode_get_bit(dev, + NETIF_RX_MODE_ALLMULTI_EN); sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti)); =20 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, @@ -3899,27 +3895,24 @@ 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 netif_rx_mode_get_uc_count(dev); + mc_count =3D netif_rx_mode_get_mc_count(dev); =20 - uc_count =3D netdev_uc_count(dev); - mc_count =3D netdev_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(dev, ha_addr, idx) + 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)); @@ -3929,10 +3922,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(dev, ha_addr, idx) + 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)); @@ -3941,17 +3932,18 @@ 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); + char cfg_disabled; + + cfg_disabled =3D !vi->rx_mode_work_enabled; + netif_rx_mode_set_bit(dev, NETIF_RX_MODE_SET_DIS, cfg_disabled); =20 - if (vi->rx_mode_work_enabled) - schedule_work(&vi->rx_mode_work); + netif_rx_mode_set_priv_ptr(dev, vi); } =20 static int virtnet_vlan_rx_add_vid(struct net_device *dev, @@ -5767,7 +5759,7 @@ static void virtnet_freeze_down(struct virtio_device = *vdev) /* 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); + netif_rx_mode_flush_work(vi->dev); =20 if (netif_running(vi->dev)) { rtnl_lock(); @@ -6270,6 +6262,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_write_rx_mode =3D virtnet_write_rx_mode, .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, @@ -6891,7 +6884,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); spin_lock_init(&vi->refill_lock); =20 if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { @@ -7196,7 +7188,7 @@ static void virtnet_remove(struct virtio_device *vdev) /* 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); + netif_rx_mode_flush_work(vi->dev); =20 virtnet_free_irq_moder(vi); =20 --=20 2.34.1