1 files changed, 61 insertions, 41 deletions

diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c
index 8c57ba747772..f61d094746c0 100644
--- a/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@ -18,6 +18,7 @@
 #include <net/ip_fib.h>
 #include <net/ip6_fib.h>
 #include <net/fib_rules.h>
+#include <net/netns/generic.h>
 
 #include "netdevsim.h"
 
@@ -32,14 +33,15 @@ struct nsim_per_fib_data {
 };
 
 struct nsim_fib_data {
-        struct notifier_block fib_nb;
         struct nsim_per_fib_data ipv4;
         struct nsim_per_fib_data ipv6;
 };
 
-u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, bool max)
+static unsigned int nsim_fib_net_id;
+
+u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max)
 {
+        struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);
         struct nsim_fib_entry *entry;
 
         switch (res_id) {
@@ -62,10 +64,10 @@ u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
         return max ? entry->max : entry->num;
 }
 
-int nsim_fib_set_max(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, u64 val,
+int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,
                      struct netlink_ext_ack *extack)
 {
+        struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);
         struct nsim_fib_entry *entry;
         int err = 0;
 
@@ -118,9 +120,9 @@ static int nsim_fib_rule_account(struct nsim_fib_entry *entry, bool add,
         return err;
 }
 
-static int nsim_fib_rule_event(struct nsim_fib_data *data,
-                               struct fib_notifier_info *info, bool add)
+static int nsim_fib_rule_event(struct fib_notifier_info *info, bool add)
 {
+        struct nsim_fib_data *data = net_generic(info->net, nsim_fib_net_id);
         struct netlink_ext_ack *extack = info->extack;
         int err = 0;
 
@@ -155,9 +157,9 @@ static int nsim_fib_account(struct nsim_fib_entry *entry, bool add,
         return err;
 }
 
-static int nsim_fib_event(struct nsim_fib_data *data,
-                          struct fib_notifier_info *info, bool add)
+static int nsim_fib_event(struct fib_notifier_info *info, bool add)
 {
+        struct nsim_fib_data *data = net_generic(info->net, nsim_fib_net_id);
         struct netlink_ext_ack *extack = info->extack;
         int err = 0;
 
@@ -176,22 +178,18 @@ static int nsim_fib_event(struct nsim_fib_data *data,
 static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,
                              void *ptr)
 {
-        struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,
-                                                  fib_nb);
         struct fib_notifier_info *info = ptr;
         int err = 0;
 
         switch (event) {
         case FIB_EVENT_RULE_ADD: /* fall through */
         case FIB_EVENT_RULE_DEL:
-                err = nsim_fib_rule_event(data, info,
-                                          event == FIB_EVENT_RULE_ADD);
+                err = nsim_fib_rule_event(info, event == FIB_EVENT_RULE_ADD);
                 break;
 
         case FIB_EVENT_ENTRY_ADD:  /* fall through */
         case FIB_EVENT_ENTRY_DEL:
-                err = nsim_fib_event(data, info,
-                                     event == FIB_EVENT_ENTRY_ADD);
+                err = nsim_fib_event(info, event == FIB_EVENT_ENTRY_ADD);
                 break;
         }
 
@@ -201,23 +199,30 @@ static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,
 /* inconsistent dump, trying again */
 static void nsim_fib_dump_inconsistent(struct notifier_block *nb)
 {
-        struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,
-                                                  fib_nb);
+        struct nsim_fib_data *data;
+        struct net *net;
+
+        rcu_read_lock();
+        for_each_net_rcu(net) {
+                data = net_generic(net, nsim_fib_net_id);
+
+                data->ipv4.fib.num = 0ULL;
+                data->ipv4.rules.num = 0ULL;
 
-        data->ipv4.fib.num = 0ULL;
-        data->ipv4.rules.num = 0ULL;
-        data->ipv6.fib.num = 0ULL;
-        data->ipv6.rules.num = 0ULL;
+                data->ipv6.fib.num = 0ULL;
+                data->ipv6.rules.num = 0ULL;
+        }
+        rcu_read_unlock();
 }
 
-struct nsim_fib_data *nsim_fib_create(void)
-{
-        struct nsim_fib_data *data;
-        int err;
+static struct notifier_block nsim_fib_nb = {
+        .notifier_call = nsim_fib_event_nb,
+};
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return ERR_PTR(-ENOMEM);
+/* Initialize per network namespace state */
+static int __net_init nsim_fib_netns_init(struct net *net)
+{
+        struct nsim_fib_data *data = net_generic(net, nsim_fib_net_id);
 
         data->ipv4.fib.max = (u64)-1;
         data->ipv4.rules.max = (u64)-1;
@@ -225,22 +230,37 @@ struct nsim_fib_data *nsim_fib_create(void)
         data->ipv6.fib.max = (u64)-1;
         data->ipv6.rules.max = (u64)-1;
 
-        data->fib_nb.notifier_call = nsim_fib_event_nb;
-        err = register_fib_notifier(&data->fib_nb, nsim_fib_dump_inconsistent);
-        if (err) {
-                pr_err("Failed to register fib notifier\n");
-                goto err_out;
-        }
+        return 0;
+}
 
-        return data;
+static struct pernet_operations nsim_fib_net_ops = {
+        .init = nsim_fib_netns_init,
+        .id   = &nsim_fib_net_id,
+        .size = sizeof(struct nsim_fib_data),
+};
 
-err_out:
-        kfree(data);
-        return ERR_PTR(err);
+void nsim_fib_exit(void)
+{
+        unregister_pernet_subsys(&nsim_fib_net_ops);
+        unregister_fib_notifier(&nsim_fib_nb);
 }
 
-void nsim_fib_destroy(struct nsim_fib_data *data)
+int nsim_fib_init(void)
 {
-        unregister_fib_notifier(&data->fib_nb);
-        kfree(data);
+        int err;
+
+        err = register_pernet_subsys(&nsim_fib_net_ops);
+        if (err < 0) {
+                pr_err("Failed to register pernet subsystem\n");
+                goto err_out;
+        }
+
+        err = register_fib_notifier(&nsim_fib_nb, nsim_fib_dump_inconsistent);
+        if (err < 0) {
+                pr_err("Failed to register fib notifier\n");
+                goto err_out;
+        }
+
+err_out:
+        return err;
 }