Added IB diag counters from UEK2

Orabug: 26088208
Signed-off-by: christopher.gray@oracle.com

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index f1e4ca236d5f8f4488867d96408804748ae0f4d3..4e1c1522aeb29f1c723aeb5c8da802cc0b16107c 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2211,6 +2211,136 @@ static void mlx4_ib_free_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
        kfree(ibdev->eq_table);
 }
 
+/*
+ * create show function and a device_attribute struct pointing to
+ * the function for _name
+ */
+#define DEVICE_DIAG_RPRT_ATTR(_name, _offset, _op_mod)         \
+static ssize_t show_rprt_##_name(struct device *dev,           \
+                                struct device_attribute *attr, \
+                                char *buf){                    \
+       return show_diag_rprt(dev, buf, _offset, _op_mod);      \
+}                                                              \
+static DEVICE_ATTR(_name, S_IRUGO, show_rprt_##_name, NULL);
+
+#define MLX4_DIAG_RPRT_CLEAR_DIAGS 3
+
+static size_t show_diag_rprt(struct device *device, char *buf,
+                            u32 offset, u8 op_modifier)
+{
+       size_t ret;
+       u32 counter_offset = offset;
+       u32 diag_counter = 0;
+       struct mlx4_ib_dev *dev = container_of(device, struct mlx4_ib_dev,
+                                              ib_dev.dev);
+
+       ret = mlx4_query_diag_counters(dev->dev, 1, op_modifier,
+                                      &counter_offset, &diag_counter);
+       if (ret)
+               return ret;
+
+       return sprintf(buf, "%d\n", diag_counter);
+}
+
+static ssize_t clear_diag_counters(struct device *device,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t length)
+{
+       size_t ret;
+       struct mlx4_ib_dev *dev = container_of(device, struct mlx4_ib_dev,
+                                              ib_dev.dev);
+
+       ret = mlx4_query_diag_counters(dev->dev, 0, MLX4_DIAG_RPRT_CLEAR_DIAGS,
+                                      NULL, NULL);
+       if (ret)
+               return ret;
+
+       return length;
+}
+
+DEVICE_DIAG_RPRT_ATTR(rq_num_lle       , 0x00, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_lle       , 0x04, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_lqpoe     , 0x08, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_lqpoe     , 0x0C, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_leeoe     , 0x10, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_leeoe     , 0x14, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_lpe       , 0x18, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_lpe       , 0x1C, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_wrfe      , 0x20, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_wrfe      , 0x24, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_mwbe      , 0x2C, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_bre       , 0x34, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_lae       , 0x38, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rire      , 0x44, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_rire      , 0x48, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rae       , 0x4C, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_rae       , 0x50, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_roe       , 0x54, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_tree      , 0x5C, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rree      , 0x64, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_rnr       , 0x68, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rnr       , 0x6C, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rabrte    , 0x7C, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_ieecne    , 0x84, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_ieecse    , 0x8C, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_oos       , 0x100, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_oos       , 0x104, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_mce       , 0x108, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_rsync     , 0x110, 2);
+DEVICE_DIAG_RPRT_ATTR(sq_num_rsync     , 0x114, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_udsdprd   , 0x118, 2);
+DEVICE_DIAG_RPRT_ATTR(rq_num_ucsdprd   , 0x120, 2);
+DEVICE_DIAG_RPRT_ATTR(num_cqovf                , 0x1A0, 2);
+DEVICE_DIAG_RPRT_ATTR(num_eqovf                , 0x1A4, 2);
+DEVICE_DIAG_RPRT_ATTR(num_baddb                , 0x1A8, 2);
+
+static DEVICE_ATTR(clear_diag, S_IWUSR, NULL, clear_diag_counters);
+
+static struct attribute *diag_rprt_attrs[] = {
+       &dev_attr_rq_num_lle.attr,
+       &dev_attr_sq_num_lle.attr,
+       &dev_attr_rq_num_lqpoe.attr,
+       &dev_attr_sq_num_lqpoe.attr,
+       &dev_attr_rq_num_leeoe.attr,
+       &dev_attr_sq_num_leeoe.attr,
+       &dev_attr_rq_num_lpe.attr,
+       &dev_attr_sq_num_lpe.attr,
+       &dev_attr_rq_num_wrfe.attr,
+       &dev_attr_sq_num_wrfe.attr,
+       &dev_attr_sq_num_mwbe.attr,
+       &dev_attr_sq_num_bre.attr,
+       &dev_attr_rq_num_lae.attr,
+       &dev_attr_sq_num_rire.attr,
+       &dev_attr_rq_num_rire.attr,
+       &dev_attr_sq_num_rae.attr,
+       &dev_attr_rq_num_rae.attr,
+       &dev_attr_sq_num_roe.attr,
+       &dev_attr_sq_num_tree.attr,
+       &dev_attr_sq_num_rree.attr,
+       &dev_attr_rq_num_rnr.attr,
+       &dev_attr_sq_num_rnr.attr,
+       &dev_attr_sq_num_rabrte.attr,
+       &dev_attr_sq_num_ieecne.attr,
+       &dev_attr_sq_num_ieecse.attr,
+       &dev_attr_rq_num_oos.attr,
+       &dev_attr_sq_num_oos.attr,
+       &dev_attr_rq_num_mce.attr,
+       &dev_attr_rq_num_rsync.attr,
+       &dev_attr_sq_num_rsync.attr,
+       &dev_attr_rq_num_udsdprd.attr,
+       &dev_attr_rq_num_ucsdprd.attr,
+       &dev_attr_num_cqovf.attr,
+       &dev_attr_num_eqovf.attr,
+       &dev_attr_num_baddb.attr,
+       &dev_attr_clear_diag.attr,
+       NULL
+};
+
+static struct attribute_group diag_counters_group = {
+       .name  = "diag_counters",
+       .attrs  = diag_rprt_attrs
+};
+
 static void *mlx4_ib_add(struct mlx4_dev *dev)
 {
        struct mlx4_ib_dev *ibdev;
@@ -2495,6 +2625,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                                       mlx4_class_attributes[j]))
                        goto err_notif;
        }
+       if (sysfs_create_group(&ibdev->ib_dev.dev.kobj, &diag_counters_group))
+               goto err_notif;
 
        ibdev->ib_active = true;
 
@@ -2640,6 +2772,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
        flush_workqueue(wq);
 
        mlx4_ib_close_sriov(ibdev);
+       sysfs_remove_group(&ibdev->ib_dev.dev.kobj, &diag_counters_group);
        mlx4_ib_mad_cleanup(ibdev);
        ib_unregister_device(&ibdev->ib_dev);
        if (ibdev->iboe.nb.notifier_call) {

diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index f539296c0b91e11812673ca6aecb6a6d90a54db0..c9fc7ffb16cc480dff29d6cd5f714528ec7bea7b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -2415,6 +2415,41 @@ int mlx4_get_phys_port_id(struct mlx4_dev *dev)
        return ret;
 }
 
+int mlx4_query_diag_counters(struct mlx4_dev *dev, int array_length,
+                            u8 op_modifier, u32 in_offset[],
+                            u32 counter_out[])
+{
+       struct mlx4_cmd_mailbox *mailbox;
+       u32 *outbox;
+       int ret;
+       int i;
+
+       mailbox = mlx4_alloc_cmd_mailbox(dev);
+       if (IS_ERR(mailbox))
+               return PTR_ERR(mailbox);
+       outbox = mailbox->buf;
+
+       ret = mlx4_cmd_box(dev, 0, mailbox->dma, 0, op_modifier,
+                          MLX4_CMD_DIAG_RPRT, MLX4_CMD_TIME_CLASS_A,
+                          MLX4_CMD_NATIVE);
+       if (ret)
+               goto out;
+
+       for (i = 0; i < array_length; i++) {
+               if (in_offset[i] > MLX4_MAILBOX_SIZE) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+               MLX4_GET(counter_out[i], outbox, in_offset[i]);
+       }
+
+out:
+       mlx4_free_cmd_mailbox(dev, mailbox);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(mlx4_query_diag_counters);
+
 #define MLX4_WOL_SETUP_MODE (5 << 28)
 int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port)
 {

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 76f276ed676a1a713a4e30f74a986e4999d317a5..80ee7f1a80f60aea9648712ca11653b34c926d42 100644 (file)
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -1338,6 +1338,10 @@ void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr,
                    u32 *lkey, u32 *rkey);
 int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr);
 int mlx4_SYNC_TPT(struct mlx4_dev *dev);
+int mlx4_query_diag_counters(struct mlx4_dev *mlx4_dev, int array_length,
+                            u8 op_modifier, u32 in_offset[],
+                            u32 counter_out[]);
+
 int mlx4_test_interrupts(struct mlx4_dev *dev);
 int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap,
                   int *vector);