RDMA/mlx5: Support per-plane port IB counters by querying PPCNT register

Supports per-plane port counters by querying PPCNT register with the
"extended port counters" group, as the query_vport_counter command
doesn't support plane ports.

Signed-off-by: Mark Zhang <markzhang@nvidia.com>
Link: https://lore.kernel.org/r/06ffb582d67159b7def4654c8272d3d6e8bd2f2f.1718553901.git.leon@kernel.org
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index ead836d159d3694777fb71ab41eb4995fa44af84..1b6c5e37d1697d0d7dbff35528679e617b706cce 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -147,8 +147,39 @@ static void pma_cnt_assign(struct ib_pma_portcounters *pma_cnt,
                             vl_15_dropped);
 }
 
-static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, void *out,
-                         size_t sz)
+static void pma_cnt_ext_assign_ppcnt(struct ib_pma_portcounters_ext *cnt_ext,
+                                    void *out)
+{
+       void *out_pma = MLX5_ADDR_OF(ppcnt_reg, out,
+                                    counter_set);
+
+#define MLX5_GET_EXT_CNTR(counter_name)                        \
+       MLX5_GET64(ib_ext_port_cntrs_grp_data_layout,   \
+                  out_pma, counter_name##_high)
+
+       cnt_ext->port_xmit_data =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_xmit_data) >> 2);
+       cnt_ext->port_rcv_data =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_rcv_data) >> 2);
+
+       cnt_ext->port_xmit_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_xmit_pkts));
+       cnt_ext->port_rcv_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_rcv_pkts));
+
+       cnt_ext->port_unicast_xmit_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_unicast_xmit_pkts));
+       cnt_ext->port_unicast_rcv_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_unicast_rcv_pkts));
+
+       cnt_ext->port_multicast_xmit_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_multicast_xmit_pkts));
+       cnt_ext->port_multicast_rcv_packets =
+               cpu_to_be64(MLX5_GET_EXT_CNTR(port_multicast_rcv_pkts));
+}
+
+static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, u8 plane_num,
+                         void *out, size_t sz, bool ext)
 {
        u32 *in;
        int err;
@@ -160,8 +191,14 @@ static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, void *out,
        }
 
        MLX5_SET(ppcnt_reg, in, local_port, port_num);
-
-       MLX5_SET(ppcnt_reg, in, grp, MLX5_INFINIBAND_PORT_COUNTERS_GROUP);
+       MLX5_SET(ppcnt_reg, in, plane_ind, plane_num);
+
+       if (ext)
+               MLX5_SET(ppcnt_reg, in, grp,
+                        MLX5_INFINIBAND_EXTENDED_PORT_COUNTERS_GROUP);
+       else
+               MLX5_SET(ppcnt_reg, in, grp,
+                        MLX5_INFINIBAND_PORT_COUNTERS_GROUP);
        err = mlx5_core_access_reg(dev, in, sz, out,
                                   sz, MLX5_REG_PPCNT, 0, 0);
 
@@ -189,7 +226,8 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,
                mdev_port_num = 1;
        }
        if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1 &&
-           !mlx5_core_mp_enabled(mdev)) {
+           !mlx5_core_mp_enabled(mdev) &&
+           dev->ib_dev.type != RDMA_DEVICE_TYPE_SMI) {
                /* set local port to one for Function-Per-Port HCA. */
                mdev = dev->mdev;
                mdev_port_num = 1;
@@ -208,7 +246,8 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,
        if (in_mad->mad_hdr.attr_id == IB_PMA_PORT_COUNTERS_EXT) {
                struct ib_pma_portcounters_ext *pma_cnt_ext =
                        (struct ib_pma_portcounters_ext *)(out_mad->data + 40);
-               int sz = MLX5_ST_SZ_BYTES(query_vport_counter_out);
+               int sz = max(MLX5_ST_SZ_BYTES(query_vport_counter_out),
+                            MLX5_ST_SZ_BYTES(ppcnt_reg));
 
                out_cnt = kvzalloc(sz, GFP_KERNEL);
                if (!out_cnt) {
@@ -216,10 +255,18 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,
                        goto done;
                }
 
-               err = mlx5_core_query_vport_counter(mdev, 0, 0, mdev_port_num,
-                                                   out_cnt);
-               if (!err)
-                       pma_cnt_ext_assign(pma_cnt_ext, out_cnt);
+               if (dev->ib_dev.type == RDMA_DEVICE_TYPE_SMI) {
+                       err = query_ib_ppcnt(mdev, mdev_port_num,
+                                            port_num, out_cnt, sz, 1);
+                       if (!err)
+                               pma_cnt_ext_assign_ppcnt(pma_cnt_ext, out_cnt);
+               } else {
+                       err = mlx5_core_query_vport_counter(mdev, 0, 0,
+                                                           mdev_port_num,
+                                                           out_cnt);
+                       if (!err)
+                               pma_cnt_ext_assign(pma_cnt_ext, out_cnt);
+               }
        } else {
                struct ib_pma_portcounters *pma_cnt =
                        (struct ib_pma_portcounters *)(out_mad->data + 40);
@@ -231,7 +278,7 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,
                        goto done;
                }
 
-               err = query_ib_ppcnt(mdev, mdev_port_num, out_cnt, sz);
+               err = query_ib_ppcnt(mdev, mdev_port_num, 0, out_cnt, sz, 0);
                if (!err)
                        pma_cnt_assign(pma_cnt, out_cnt);
        }

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index d7bb31d9a4463abf132df7b5d928d9a98c71bf76..68bd1b4737eabac5830a50683dcab2b81f40f3a7 100644 (file)
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -1466,6 +1466,7 @@ enum {
        MLX5_PER_TRAFFIC_CLASS_CONGESTION_GROUP = 0x13,
        MLX5_PHYSICAL_LAYER_STATISTICAL_GROUP = 0x16,
        MLX5_INFINIBAND_PORT_COUNTERS_GROUP   = 0x20,
+       MLX5_INFINIBAND_EXTENDED_PORT_COUNTERS_GROUP = 0x21,
 };
 
 enum {