1 files changed, 25 insertions, 38 deletions

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index c5c417a3c0ce..bcc40a236624 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -73,46 +73,47 @@ static void nsim_dev_port_debugfs_exit(struct nsim_dev_port *nsim_dev_port)
         debugfs_remove_recursive(nsim_dev_port->ddir);
 }
 
+static struct net *nsim_devlink_net(struct devlink *devlink)
+{
+        return &init_net;
+}
+
 static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV4_FIB, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, false);
 }
 
 static u64 nsim_dev_ipv4_fib_rules_res_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV4_FIB_RULES, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, false);
 }
 
 static u64 nsim_dev_ipv6_fib_resource_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV6_FIB, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, false);
 }
 
 static u64 nsim_dev_ipv6_fib_rules_res_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV6_FIB_RULES, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, false);
 }
 
 static int nsim_dev_resources_register(struct devlink *devlink)
 {
-        struct nsim_dev *nsim_dev = devlink_priv(devlink);
         struct devlink_resource_size_params params = {
                 .size_max = (u64)-1,
                 .size_granularity = 1,
                 .unit = DEVLINK_RESOURCE_UNIT_ENTRY
         };
+        struct net *net = nsim_devlink_net(devlink);
         int err;
         u64 n;
 
@@ -126,8 +127,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 goto out;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV4_FIB, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, true);
         err = devlink_resource_register(devlink, "fib", n,
                                         NSIM_RESOURCE_IPV4_FIB,
                                         NSIM_RESOURCE_IPV4, &params);
@@ -136,8 +136,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 return err;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV4_FIB_RULES, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, true);
         err = devlink_resource_register(devlink, "fib-rules", n,
                                         NSIM_RESOURCE_IPV4_FIB_RULES,
                                         NSIM_RESOURCE_IPV4, &params);
@@ -156,8 +155,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 goto out;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV6_FIB, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, true);
         err = devlink_resource_register(devlink, "fib", n,
                                         NSIM_RESOURCE_IPV6_FIB,
                                         NSIM_RESOURCE_IPV6, &params);
@@ -166,8 +164,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 return err;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV6_FIB_RULES, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, true);
         err = devlink_resource_register(devlink, "fib-rules", n,
                                         NSIM_RESOURCE_IPV6_FIB_RULES,
                                         NSIM_RESOURCE_IPV6, &params);
@@ -179,19 +176,19 @@ static int nsim_dev_resources_register(struct devlink *devlink)
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV4_FIB,
                                           nsim_dev_ipv4_fib_resource_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV4_FIB_RULES,
                                           nsim_dev_ipv4_fib_rules_res_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV6_FIB,
                                           nsim_dev_ipv6_fib_resource_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV6_FIB_RULES,
                                           nsim_dev_ipv6_fib_rules_res_occ_get,
-                                          nsim_dev);
+                                          net);
 out:
         return err;
 }
@@ -199,11 +196,11 @@ out:
 static int nsim_dev_reload(struct devlink *devlink,
                            struct netlink_ext_ack *extack)
 {
-        struct nsim_dev *nsim_dev = devlink_priv(devlink);
         enum nsim_resource_id res_ids[] = {
                 NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,
                 NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES
         };
+        struct net *net = nsim_devlink_net(devlink);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(res_ids); ++i) {
@@ -212,8 +209,7 @@ static int nsim_dev_reload(struct devlink *devlink,
 
                 err = devlink_resource_size_get(devlink, res_ids[i], &val);
                 if (!err) {
-                        err = nsim_fib_set_max(nsim_dev->fib_data,
-                                               res_ids[i], val, extack);
+                        err = nsim_fib_set_max(net, res_ids[i], val, extack);
                         if (err)
                                 return err;
                 }
@@ -285,15 +281,9 @@ nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, unsigned int port_count)
         mutex_init(&nsim_dev->port_list_lock);
         nsim_dev->fw_update_status = true;
 
-        nsim_dev->fib_data = nsim_fib_create();
-        if (IS_ERR(nsim_dev->fib_data)) {
-                err = PTR_ERR(nsim_dev->fib_data);
-                goto err_devlink_free;
-        }
-
         err = nsim_dev_resources_register(devlink);
         if (err)
-                goto err_fib_destroy;
+                goto err_devlink_free;
 
         err = devlink_register(devlink, &nsim_bus_dev->dev);
         if (err)
@@ -315,8 +305,6 @@ err_dl_unregister:
         devlink_unregister(devlink);
 err_resources_unregister:
         devlink_resources_unregister(devlink, NULL);
-err_fib_destroy:
-        nsim_fib_destroy(nsim_dev->fib_data);
 err_devlink_free:
         devlink_free(devlink);
         return ERR_PTR(err);
@@ -330,7 +318,6 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
         nsim_dev_debugfs_exit(nsim_dev);
         devlink_unregister(devlink);
         devlink_resources_unregister(devlink, NULL);
-        nsim_fib_destroy(nsim_dev->fib_data);
         mutex_destroy(&nsim_dev->port_list_lock);
         devlink_free(devlink);
 }