RDMA/core: Replace the ib_port_data hw_stats pointers with a ib_port pointer

It is much saner to store a pointer to the kobject structure that contains
the cannonical stats pointer than to copy the stats pointers into a public
structure.

Future patches will require the sysfs pointer for other purposes.

Link: https://lore.kernel.org/r/f90551dfd296cde1cb507bbef27cca9891d19871.1623427137.git.leonro@nvidia.com
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 29809dd300419fb3f4d36488912d593e69ad1ce9..ec5c2c3db423031c5296c1368d58f8f78b063ee5 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -378,6 +378,7 @@ struct net_device *rdma_read_gid_attr_ndev_rcu(const struct ib_gid_attr *attr);
 
 void ib_free_port_attrs(struct ib_core_device *coredev);
 int ib_setup_port_attrs(struct ib_core_device *coredev);
+struct rdma_hw_stats *ib_get_hw_stats_port(struct ib_device *ibdev, u32 port_num);
 
 int rdma_compatdev_set(u8 enable);
 

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 01316926cef63d8149c74adbcb20078770c83246..e9b4b2cccaa0ffb324119a27c3d42b2d6e1f0fee 100644 (file)
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -2066,7 +2066,8 @@ static int stat_get_doit_default_counter(struct sk_buff *skb,
        }
 
        port = nla_get_u32(tb[RDMA_NLDEV_ATTR_PORT_INDEX]);
-       if (!rdma_is_port_valid(device, port)) {
+       stats = ib_get_hw_stats_port(device, port);
+       if (!stats) {
                ret = -EINVAL;
                goto err;
        }
@@ -2088,11 +2089,6 @@ static int stat_get_doit_default_counter(struct sk_buff *skb,
                goto err_msg;
        }
 
-       stats = device->port_data ? device->port_data[port].hw_stats : NULL;
-       if (stats == NULL) {
-               ret = -EINVAL;
-               goto err_msg;
-       }
        mutex_lock(&stats->lock);
 
        num_cnts = device->ops.get_hw_stats(device, stats, port, 0);

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index d11ceff2b4e44c7e0091169cd5d85e671447f48c..b153dee1e0fafbafee21f746b2366e5b81032376 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -1031,8 +1031,6 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                        goto err;
                port->hw_stats_ag = hsag;
                port->hw_stats = stats;
-               if (device->port_data)
-                       device->port_data[port_num].hw_stats = stats;
        } else {
                struct kobject *kobj = &device->dev.kobj;
                ret = sysfs_create_group(kobj, hsag);
@@ -1053,6 +1051,14 @@ err_free_stats:
        kfree(stats);
 }
 
+struct rdma_hw_stats *ib_get_hw_stats_port(struct ib_device *ibdev,
+                                          u32 port_num)
+{
+       if (!ibdev->port_data || !rdma_is_port_valid(ibdev, port_num))
+               return NULL;
+       return ibdev->port_data[port_num].sysfs->hw_stats;
+}
+
 static int add_port(struct ib_core_device *coredev, int port_num)
 {
        struct ib_device *device = rdma_device_to_ibdev(&coredev->dev);
@@ -1171,6 +1177,8 @@ static int add_port(struct ib_core_device *coredev, int port_num)
                setup_hw_stats(device, p, port_num);
 
        list_add_tail(&p->kobj.entry, &coredev->port_list);
+       if (device->port_data && is_full_dev)
+               device->port_data[port_num].sysfs = p;
 
        kobject_uevent(&p->kobj, KOBJ_ADD);
        return 0;
@@ -1361,7 +1369,7 @@ void ib_free_port_attrs(struct ib_core_device *coredev)
                        free_hsag(&port->kobj, port->hw_stats_ag);
                kfree(port->hw_stats);
                if (device->port_data && is_full_dev)
-                       device->port_data[port->port_num].hw_stats = NULL;
+                       device->port_data[port->port_num].sysfs = NULL;
 
                if (port->pma_table)
                        sysfs_remove_group(p, port->pma_table);

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 849a06441e293956106cee777995b69569dfeecb..7a4cb7022f910c7a0d03b91714fb91c5a9b09c18 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -50,6 +50,7 @@ struct ib_uqp_object;
 struct ib_usrq_object;
 struct ib_uwq_object;
 struct rdma_cm_id;
+struct ib_port;
 
 extern struct workqueue_struct *ib_wq;
 extern struct workqueue_struct *ib_comp_wq;
@@ -2182,7 +2183,7 @@ struct ib_port_data {
        struct net_device __rcu *netdev;
        struct hlist_node ndev_hash_link;
        struct rdma_port_counter port_counter;
-       struct rdma_hw_stats *hw_stats;
+       struct ib_port *sysfs;
 };
 
 /* rdma netdev type - specifies protocol type */