fbnic: convert to ndo_set_rx_mode_async

Convert fbnic from ndo_set_rx_mode to ndo_set_rx_mode_async. The
driver's __fbnic_set_rx_mode() now takes explicit uc/mc list
parameters and uses __hw_addr_sync_dev() on the snapshots instead
of __dev_uc_sync/__dev_mc_sync on the netdev directly.

Update callers in fbnic_up, fbnic_fw_config_after_crash,
fbnic_bmc_rpc_check and fbnic_set_mac to pass the real address
lists calling __fbnic_set_rx_mode outside the async work path.

Cc: Alexander Duyck <alexanderduyck@fb.com>
Cc: kernel-team@meta.com
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20260416185712.2155425-6-sdf@fomichev.me
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
index b4b396ca9bce3c1a2be1586d802e1470cfc6d4ec..c406a3b56b37fd8c206638db20835020f234fdd3 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
@@ -183,7 +183,9 @@ static int fbnic_mc_unsync(struct net_device *netdev, const unsigned char *addr)
        return ret;
 }
 
-void __fbnic_set_rx_mode(struct fbnic_dev *fbd)
+void __fbnic_set_rx_mode(struct fbnic_dev *fbd,
+                        struct netdev_hw_addr_list *uc,
+                        struct netdev_hw_addr_list *mc)
 {
        bool uc_promisc = false, mc_promisc = false;
        struct net_device *netdev = fbd->netdev;
@@ -213,10 +215,10 @@ void __fbnic_set_rx_mode(struct fbnic_dev *fbd)
        }
 
        /* Synchronize unicast and multicast address lists */
-       err = __dev_uc_sync(netdev, fbnic_uc_sync, fbnic_uc_unsync);
+       err = __hw_addr_sync_dev(uc, netdev, fbnic_uc_sync, fbnic_uc_unsync);
        if (err == -ENOSPC)
                uc_promisc = true;
-       err = __dev_mc_sync(netdev, fbnic_mc_sync, fbnic_mc_unsync);
+       err = __hw_addr_sync_dev(mc, netdev, fbnic_mc_sync, fbnic_mc_unsync);
        if (err == -ENOSPC)
                mc_promisc = true;
 
@@ -238,18 +240,21 @@ void __fbnic_set_rx_mode(struct fbnic_dev *fbd)
        fbnic_write_tce_tcam(fbd);
 }
 
-static void fbnic_set_rx_mode(struct net_device *netdev)
+static void fbnic_set_rx_mode(struct net_device *netdev,
+                             struct netdev_hw_addr_list *uc,
+                             struct netdev_hw_addr_list *mc)
 {
        struct fbnic_net *fbn = netdev_priv(netdev);
        struct fbnic_dev *fbd = fbn->fbd;
 
        /* No need to update the hardware if we are not running */
        if (netif_running(netdev))
-               __fbnic_set_rx_mode(fbd);
+               __fbnic_set_rx_mode(fbd, uc, mc);
 }
 
 static int fbnic_set_mac(struct net_device *netdev, void *p)
 {
+       struct fbnic_net *fbn = netdev_priv(netdev);
        struct sockaddr *addr = p;
 
        if (!is_valid_ether_addr(addr->sa_data))
@@ -257,7 +262,8 @@ static int fbnic_set_mac(struct net_device *netdev, void *p)
 
        eth_hw_addr_set(netdev, addr->sa_data);
 
-       fbnic_set_rx_mode(netdev);
+       if (netif_running(netdev))
+               __fbnic_set_rx_mode(fbn->fbd, &netdev->uc, &netdev->mc);
 
        return 0;
 }
@@ -551,7 +557,7 @@ static const struct net_device_ops fbnic_netdev_ops = {
        .ndo_features_check     = fbnic_features_check,
        .ndo_set_mac_address    = fbnic_set_mac,
        .ndo_change_mtu         = fbnic_change_mtu,
-       .ndo_set_rx_mode        = fbnic_set_rx_mode,
+       .ndo_set_rx_mode_async  = fbnic_set_rx_mode,
        .ndo_get_stats64        = fbnic_get_stats64,
        .ndo_bpf                = fbnic_bpf,
        .ndo_hwtstamp_get       = fbnic_hwtstamp_get,

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.h b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.h
index 9129a658f8fad3cb5e8bb5288bc64f34f4cdf93b..eded20b0e9e43782fcf04d76751c2ca6889be9bd 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.h
@@ -97,7 +97,9 @@ void fbnic_time_init(struct fbnic_net *fbn);
 int fbnic_time_start(struct fbnic_net *fbn);
 void fbnic_time_stop(struct fbnic_net *fbn);
 
-void __fbnic_set_rx_mode(struct fbnic_dev *fbd);
+void __fbnic_set_rx_mode(struct fbnic_dev *fbd,
+                        struct netdev_hw_addr_list *uc,
+                        struct netdev_hw_addr_list *mc);
 void fbnic_clear_rx_mode(struct fbnic_dev *fbd);
 
 void fbnic_phylink_get_pauseparam(struct net_device *netdev,

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
index b7c0b7349d0087a3710b3f4ca85dd2159b84c61b..7e85b480203c8341c42a193549f724b750a433f2 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
@@ -135,7 +135,7 @@ void fbnic_up(struct fbnic_net *fbn)
 
        fbnic_rss_reinit_hw(fbn->fbd, fbn);
 
-       __fbnic_set_rx_mode(fbn->fbd);
+       __fbnic_set_rx_mode(fbn->fbd, &fbn->netdev->uc, &fbn->netdev->mc);
 
        /* Enable Tx/Rx processing */
        fbnic_napi_enable(fbn);
@@ -180,7 +180,7 @@ static int fbnic_fw_config_after_crash(struct fbnic_dev *fbd)
        }
 
        fbnic_rpc_reset_valid_entries(fbd);
-       __fbnic_set_rx_mode(fbd);
+       __fbnic_set_rx_mode(fbd, &fbd->netdev->uc, &fbd->netdev->mc);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
index 42a186db43ea93274896570d82a098716d38e343..fe95b6f69646327955c90aadc2026d684d2c20ae 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
@@ -244,7 +244,7 @@ void fbnic_bmc_rpc_check(struct fbnic_dev *fbd)
 
        if (fbd->fw_cap.need_bmc_tcam_reinit) {
                fbnic_bmc_rpc_init(fbd);
-               __fbnic_set_rx_mode(fbd);
+               __fbnic_set_rx_mode(fbd, &fbd->netdev->uc, &fbd->netdev->mc);
                fbd->fw_cap.need_bmc_tcam_reinit = false;
        }