netdevsim: Add devlink resource for nexthops

The Spectrum ASIC has a dedicated table where nexthops (i.e., adjacency
entries) are populated. The size of this table can be controlled via
devlink-resource.

Add such a resource to netdevsim so that its occupancy will reflect the
number of nexthop objects currently programmed to the device.

By limiting the size of the resource, error paths could be exercised and
tested.

Example output:

# devlink resource show netdevsim/netdevsim10
netdevsim/netdevsim10:
  name IPv4 size unlimited unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
    resources:
      name fib size unlimited occ 4 unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
      name fib-rules size unlimited occ 3 unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
  name IPv6 size unlimited unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
    resources:
      name fib size unlimited occ 1 unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
      name fib-rules size unlimited occ 2 unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none
  name nexthops size unlimited occ 0 unit entry size_min 0 size_max unlimited size_gran 1 dpipe_tables none

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/Documentation/networking/devlink/netdevsim.rst b/Documentation/networking/devlink/netdevsim.rst
index 2a266b7e7b38ccb34395fd5da62cc67635c96c5c..02c2d20dc6732df7b2f55f1de64b0c812bf2a8d8 100644 (file)
--- a/Documentation/networking/devlink/netdevsim.rst
+++ b/Documentation/networking/devlink/netdevsim.rst
@@ -46,7 +46,7 @@ Resources
 =========
 
 The ``netdevsim`` driver exposes resources to control the number of FIB
-entries and FIB rule entries that the driver will allow.
+entries, FIB rule entries and nexthops that the driver will allow.
 
 .. code:: shell
 
@@ -54,6 +54,7 @@ entries and FIB rule entries that the driver will allow.
     $ devlink resource set netdevsim/netdevsim0 path /IPv4/fib-rules size 16
     $ devlink resource set netdevsim/netdevsim0 path /IPv6/fib size 64
     $ devlink resource set netdevsim/netdevsim0 path /IPv6/fib-rules size 16
+    $ devlink resource set netdevsim/netdevsim0 path /nexthops size 16
     $ devlink dev reload netdevsim/netdevsim0
 
 Driver-specific Traps

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index d070614176755870127e37df1dee5daecd213562..49cc1fea9e02b6660a4b916aa210d64690a3b1ce 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -324,6 +324,12 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                return err;
        }
 
+       /* Resources for nexthops */
+       err = devlink_resource_register(devlink, "nexthops", (u64)-1,
+                                       NSIM_RESOURCE_NEXTHOPS,
+                                       DEVLINK_RESOURCE_ID_PARENT_TOP,
+                                       &params);
+
 out:
        return err;
 }

diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c
index deea17a0e79c9ee55cbd27c76881d0e1fdc05bfd..3ec0f8896efe389b2359d35734ecb4f07c057eb8 100644 (file)
--- a/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@ -42,6 +42,7 @@ struct nsim_fib_data {
        struct notifier_block fib_nb;
        struct nsim_per_fib_data ipv4;
        struct nsim_per_fib_data ipv6;
+       struct nsim_fib_entry nexthops;
        struct rhashtable fib_rt_ht;
        struct list_head fib_rt_list;
        spinlock_t fib_lock;    /* Protects hashtable, list and accounting */
@@ -104,6 +105,9 @@ u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
        case NSIM_RESOURCE_IPV6_FIB_RULES:
                entry = &fib_data->ipv6.rules;
                break;
+       case NSIM_RESOURCE_NEXTHOPS:
+               entry = &fib_data->nexthops;
+               break;
        default:
                return 0;
        }
@@ -129,6 +133,9 @@ static void nsim_fib_set_max(struct nsim_fib_data *fib_data,
        case NSIM_RESOURCE_IPV6_FIB_RULES:
                entry = &fib_data->ipv6.rules;
                break;
+       case NSIM_RESOURCE_NEXTHOPS:
+               entry = &fib_data->nexthops;
+               break;
        default:
                WARN_ON(1);
                return;
@@ -866,12 +873,20 @@ static u64 nsim_fib_ipv6_rules_res_occ_get(void *priv)
        return nsim_fib_get_val(data, NSIM_RESOURCE_IPV6_FIB_RULES, false);
 }
 
+static u64 nsim_fib_nexthops_res_occ_get(void *priv)
+{
+       struct nsim_fib_data *data = priv;
+
+       return nsim_fib_get_val(data, NSIM_RESOURCE_NEXTHOPS, false);
+}
+
 static void nsim_fib_set_max_all(struct nsim_fib_data *data,
                                 struct devlink *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
+               NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES,
+               NSIM_RESOURCE_NEXTHOPS,
        };
        int i;
 
@@ -929,6 +944,10 @@ struct nsim_fib_data *nsim_fib_create(struct devlink *devlink,
                                          NSIM_RESOURCE_IPV6_FIB_RULES,
                                          nsim_fib_ipv6_rules_res_occ_get,
                                          data);
+       devlink_resource_occ_get_register(devlink,
+                                         NSIM_RESOURCE_NEXTHOPS,
+                                         nsim_fib_nexthops_res_occ_get,
+                                         data);
        return data;
 
 err_rhashtable_destroy:
@@ -941,6 +960,8 @@ err_data_free:
 
 void nsim_fib_destroy(struct devlink *devlink, struct nsim_fib_data *data)
 {
+       devlink_resource_occ_get_unregister(devlink,
+                                           NSIM_RESOURCE_NEXTHOPS);
        devlink_resource_occ_get_unregister(devlink,
                                            NSIM_RESOURCE_IPV6_FIB_RULES);
        devlink_resource_occ_get_unregister(devlink,

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 827fc80f50a07b53277d75bba73a2b109e827caf..698be048041b9406ebf2f18726946b18e630124a 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -158,6 +158,7 @@ enum nsim_resource_id {
        NSIM_RESOURCE_IPV6,
        NSIM_RESOURCE_IPV6_FIB,
        NSIM_RESOURCE_IPV6_FIB_RULES,
+       NSIM_RESOURCE_NEXTHOPS,
 };
 
 struct nsim_dev_health {