devlink: introduce port ops placeholder

In devlink, some of the objects have separate ops registered alongside
with the object itself. Port however have ops in devlink_ops structure.
For drivers what register multiple kinds of ports with different ops
this is not convenient. Introduce devlink_port_ops and a set
of functions that allow drivers to pass ops pointer during
port registration.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index ec109b39c3ea9c607af2508950dccf6f30555716..a1e230d24f0520d4039a70a29ba455deccf17596 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -123,6 +123,7 @@ struct devlink_port {
        struct list_head list;
        struct list_head region_list;
        struct devlink *devlink;
+       const struct devlink_port_ops *ops;
        unsigned int index;
        spinlock_t type_lock; /* Protects type and type_eth/ib
                               * structures consistency.
@@ -1649,15 +1650,43 @@ void devl_unregister(struct devlink *devlink);
 void devlink_register(struct devlink *devlink);
 void devlink_unregister(struct devlink *devlink);
 void devlink_free(struct devlink *devlink);
+
+/**
+ * struct devlink_port_ops - Port operations
+ */
+struct devlink_port_ops {
+};
+
 void devlink_port_init(struct devlink *devlink,
                       struct devlink_port *devlink_port);
 void devlink_port_fini(struct devlink_port *devlink_port);
-int devl_port_register(struct devlink *devlink,
-                      struct devlink_port *devlink_port,
-                      unsigned int port_index);
-int devlink_port_register(struct devlink *devlink,
-                         struct devlink_port *devlink_port,
-                         unsigned int port_index);
+
+int devl_port_register_with_ops(struct devlink *devlink,
+                               struct devlink_port *devlink_port,
+                               unsigned int port_index,
+                               const struct devlink_port_ops *ops);
+
+static inline int devl_port_register(struct devlink *devlink,
+                                    struct devlink_port *devlink_port,
+                                    unsigned int port_index)
+{
+       return devl_port_register_with_ops(devlink, devlink_port,
+                                          port_index, NULL);
+}
+
+int devlink_port_register_with_ops(struct devlink *devlink,
+                                  struct devlink_port *devlink_port,
+                                  unsigned int port_index,
+                                  const struct devlink_port_ops *ops);
+
+static inline int devlink_port_register(struct devlink *devlink,
+                                       struct devlink_port *devlink_port,
+                                       unsigned int port_index)
+{
+       return devlink_port_register_with_ops(devlink, devlink_port,
+                                             port_index, NULL);
+}
+
 void devl_port_unregister(struct devlink_port *devlink_port);
 void devlink_port_unregister(struct devlink_port *devlink_port);
 void devlink_port_type_eth_set(struct devlink_port *devlink_port);

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 9e801b7491942e33798c9285fee0af0a6f8be524..2295fa542dd8babf0fe83a4bad7db35b710f1cec 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -6793,12 +6793,15 @@ void devlink_port_fini(struct devlink_port *devlink_port)
 }
 EXPORT_SYMBOL_GPL(devlink_port_fini);
 
+static const struct devlink_port_ops devlink_port_dummy_ops = {};
+
 /**
- * devl_port_register() - Register devlink port
+ * devl_port_register_with_ops() - Register devlink port
  *
  * @devlink: devlink
  * @devlink_port: devlink port
  * @port_index: driver-specific numerical identifier of the port
+ * @ops: port ops
  *
  * Register devlink port with provided port index. User can use
  * any indexing, even hw-related one. devlink_port structure
@@ -6806,9 +6809,10 @@ EXPORT_SYMBOL_GPL(devlink_port_fini);
  * Note that the caller should take care of zeroing the devlink_port
  * structure.
  */
-int devl_port_register(struct devlink *devlink,
-                      struct devlink_port *devlink_port,
-                      unsigned int port_index)
+int devl_port_register_with_ops(struct devlink *devlink,
+                               struct devlink_port *devlink_port,
+                               unsigned int port_index,
+                               const struct devlink_port_ops *ops)
 {
        int err;
 
@@ -6819,6 +6823,7 @@ int devl_port_register(struct devlink *devlink,
        devlink_port_init(devlink, devlink_port);
        devlink_port->registered = true;
        devlink_port->index = port_index;
+       devlink_port->ops = ops ? ops : &devlink_port_dummy_ops;
        spin_lock_init(&devlink_port->type_lock);
        INIT_LIST_HEAD(&devlink_port->reporter_list);
        err = xa_insert(&devlink->ports, port_index, devlink_port, GFP_KERNEL);
@@ -6830,14 +6835,15 @@ int devl_port_register(struct devlink *devlink,
        devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);
        return 0;
 }
-EXPORT_SYMBOL_GPL(devl_port_register);
+EXPORT_SYMBOL_GPL(devl_port_register_with_ops);
 
 /**
- *     devlink_port_register - Register devlink port
+ *     devlink_port_register_with_ops - Register devlink port
  *
  *     @devlink: devlink
  *     @devlink_port: devlink port
  *     @port_index: driver-specific numerical identifier of the port
+ *     @ops: port ops
  *
  *     Register devlink port with provided port index. User can use
  *     any indexing, even hw-related one. devlink_port structure
@@ -6847,18 +6853,20 @@ EXPORT_SYMBOL_GPL(devl_port_register);
  *
  *     Context: Takes and release devlink->lock <mutex>.
  */
-int devlink_port_register(struct devlink *devlink,
-                         struct devlink_port *devlink_port,
-                         unsigned int port_index)
+int devlink_port_register_with_ops(struct devlink *devlink,
+                                  struct devlink_port *devlink_port,
+                                  unsigned int port_index,
+                                  const struct devlink_port_ops *ops)
 {
        int err;
 
        devl_lock(devlink);
-       err = devl_port_register(devlink, devlink_port, port_index);
+       err = devl_port_register_with_ops(devlink, devlink_port,
+                                         port_index, ops);
        devl_unlock(devlink);
        return err;
 }
-EXPORT_SYMBOL_GPL(devlink_port_register);
+EXPORT_SYMBOL_GPL(devlink_port_register_with_ops);
 
 /**
  * devl_port_unregister() - Unregister devlink port