IB/mlx4: Propagate P_Key and guid change port management events to slaves

P_Key change and guid change events are not of interest to all slaves,
but only to those slaves which "see" the table slots whose contents
have change.

For example, if the guid at port 1, index 5 has changed in the PPF, we
wish to propagate the gid-change event only to the function which has
that guid index mapped to its port/guid table (in this case it is
slave #5). Other functions should not get the event, since the event
does not affect them.

Similarly with P_Keys -- P_Key change events are forwarded only to
slaves which have that P_Key index mapped to their virtual P_Key table.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index b8cb25e..591c289 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -54,6 +54,15 @@ enum {
 #define MLX4_TUN_IS_RECV(a)  (((a) >>  MLX4_TUN_SEND_WRID_SHIFT) & 0x1)
 #define MLX4_TUN_WRID_QPN(a) (((a) >> MLX4_TUN_QPN_SHIFT) & 0x3)
 
+ /* Port mgmt change event handling */
+
+#define GET_BLK_PTR_FROM_EQE(eqe) be32_to_cpu(eqe->event.port_mgmt_change.params.tbl_change_info.block_ptr)
+#define GET_MASK_FROM_EQE(eqe) be32_to_cpu(eqe->event.port_mgmt_change.params.tbl_change_info.tbl_entries_mask)
+#define NUM_IDX_IN_PKEY_TBL_BLK 32
+#define GUID_TBL_ENTRY_SIZE 8     /* size in bytes */
+#define GUID_TBL_BLK_NUM_ENTRIES 8
+#define GUID_TBL_BLK_SIZE (GUID_TBL_ENTRY_SIZE * GUID_TBL_BLK_NUM_ENTRIES)
+
 struct mlx4_mad_rcv_buf {
        struct ib_grh grh;
        u8 payload[256];
@@ -76,6 +85,9 @@ struct mlx4_rcv_tunnel_mad {
 } __packed;
 
 static void handle_client_rereg_event(struct mlx4_ib_dev *dev, u8 port_num);
+static void handle_lid_change_event(struct mlx4_ib_dev *dev, u8 port_num);
+static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,
+                               int block, u32 change_bitmap);
 
 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
 {
@@ -220,8 +232,7 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
                                handle_client_rereg_event(dev, port_num);
 
                        if (prev_lid != lid)
-                               mlx4_ib_dispatch_event(dev, port_num,
-                                                      IB_EVENT_LID_CHANGE);
+                               handle_lid_change_event(dev, port_num);
                        break;
 
                case IB_SMP_ATTR_PKEY_TABLE:
@@ -231,6 +242,9 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
                                break;
                        }
 
+                       /* at this point, we are running in the master.
+                        * Slaves do not receive SMPs.
+                        */
                        bn  = be32_to_cpu(((struct ib_smp *)mad)->attr_mod) & 0xFFFF;
                        base = (__be16 *) &(((struct ib_smp *)mad)->data[0]);
                        pkey_change_bitmap = 0;
@@ -248,10 +262,13 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
                                 "block=0x%x, change_bitmap=0x%x\n",
                                 port_num, bn, pkey_change_bitmap);
 
-                       if (pkey_change_bitmap)
+                       if (pkey_change_bitmap) {
                                mlx4_ib_dispatch_event(dev, port_num,
                                                       IB_EVENT_PKEY_CHANGE);
-
+                               if (!dev->sriov.is_going_down)
+                                       __propagate_pkey_ev(dev, port_num, bn,
+                                                           pkey_change_bitmap);
+                       }
                        break;
 
                case IB_SMP_ATTR_GUID_INFO:
@@ -259,12 +276,56 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
                        if (!mlx4_is_master(dev->dev))
                                mlx4_ib_dispatch_event(dev, port_num,
                                                       IB_EVENT_GID_CHANGE);
+                       /*if master, notify relevant slaves*/
+                       if (mlx4_is_master(dev->dev) &&
+                           !dev->sriov.is_going_down) {
+                               bn = be32_to_cpu(((struct ib_smp *)mad)->attr_mod);
+                               mlx4_ib_update_cache_on_guid_change(dev, bn, port_num,
+                                                                   (u8 *)(&((struct ib_smp *)mad)->data));
+                               mlx4_ib_notify_slaves_on_guid_change(dev, bn, port_num,
+                                                                    (u8 *)(&((struct ib_smp *)mad)->data));
+                       }
                        break;
+
                default:
                        break;
                }
 }
 
+static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,
+                               int block, u32 change_bitmap)
+{
+       int i, ix, slave, err;
+       int have_event = 0;
+
+       for (slave = 0; slave < dev->dev->caps.sqp_demux; slave++) {
+               if (slave == mlx4_master_func_num(dev->dev))
+                       continue;
+               if (!mlx4_is_slave_active(dev->dev, slave))
+                       continue;
+
+               have_event = 0;
+               for (i = 0; i < 32; i++) {
+                       if (!(change_bitmap & (1 << i)))
+                               continue;
+                       for (ix = 0;
+                            ix < dev->dev->caps.pkey_table_len[port_num]; ix++) {
+                               if (dev->pkeys.virt2phys_pkey[slave][port_num - 1]
+                                   [ix] == i + 32 * block) {
+                                       err = mlx4_gen_pkey_eqe(dev->dev, slave, port_num);
+                                       pr_debug("propagate_pkey_ev: slave %d,"
+                                                " port %d, ix %d (%d)\n",
+                                                slave, port_num, ix, err);
+                                       have_event = 1;
+                                       break;
+                               }
+                       }
+                       if (have_event)
+                               break;
+               }
+       }
+}
+
 static void node_desc_override(struct ib_device *dev,
                               struct ib_mad *mad)
 {
@@ -789,18 +850,90 @@ void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev)
        }
 }
 
+static void handle_lid_change_event(struct mlx4_ib_dev *dev, u8 port_num)
+{
+       mlx4_ib_dispatch_event(dev, port_num, IB_EVENT_LID_CHANGE);
+
+       if (mlx4_is_master(dev->dev) && !dev->sriov.is_going_down)
+               mlx4_gen_slaves_port_mgt_ev(dev->dev, port_num,
+                                           MLX4_EQ_PORT_INFO_LID_CHANGE_MASK);
+}
+
 static void handle_client_rereg_event(struct mlx4_ib_dev *dev, u8 port_num)
 {
        /* re-configure the alias-guid and mcg's */
        if (mlx4_is_master(dev->dev)) {
                mlx4_ib_invalidate_all_guid_record(dev, port_num);
 
-               if (!dev->sriov.is_going_down)
+               if (!dev->sriov.is_going_down) {
                        mlx4_ib_mcg_port_cleanup(&dev->sriov.demux[port_num - 1], 0);
+                       mlx4_gen_slaves_port_mgt_ev(dev->dev, port_num,
+                                                   MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK);
+               }
        }
        mlx4_ib_dispatch_event(dev, port_num, IB_EVENT_CLIENT_REREGISTER);
 }
 
+static void propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,
+                             struct mlx4_eqe *eqe)
+{
+       __propagate_pkey_ev(dev, port_num, GET_BLK_PTR_FROM_EQE(eqe),
+                           GET_MASK_FROM_EQE(eqe));
+}
+
+static void handle_slaves_guid_change(struct mlx4_ib_dev *dev, u8 port_num,
+                                     u32 guid_tbl_blk_num, u32 change_bitmap)
+{
+       struct ib_smp *in_mad  = NULL;
+       struct ib_smp *out_mad  = NULL;
+       u16 i;
+
+       if (!mlx4_is_mfunc(dev->dev) || !mlx4_is_master(dev->dev))
+               return;
+
+       in_mad  = kmalloc(sizeof *in_mad, GFP_KERNEL);
+       out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+       if (!in_mad || !out_mad) {
+               mlx4_ib_warn(&dev->ib_dev, "failed to allocate memory for guid info mads\n");
+               goto out;
+       }
+
+       guid_tbl_blk_num  *= 4;
+
+       for (i = 0; i < 4; i++) {
+               if (change_bitmap && (!((change_bitmap >> (8 * i)) & 0xff)))
+                       continue;
+               memset(in_mad, 0, sizeof *in_mad);
+               memset(out_mad, 0, sizeof *out_mad);
+
+               in_mad->base_version  = 1;
+               in_mad->mgmt_class    = IB_MGMT_CLASS_SUBN_LID_ROUTED;
+               in_mad->class_version = 1;
+               in_mad->method        = IB_MGMT_METHOD_GET;
+               in_mad->attr_id       = IB_SMP_ATTR_GUID_INFO;
+               in_mad->attr_mod      = cpu_to_be32(guid_tbl_blk_num + i);
+
+               if (mlx4_MAD_IFC(dev,
+                                MLX4_MAD_IFC_IGNORE_KEYS | MLX4_MAD_IFC_NET_VIEW,
+                                port_num, NULL, NULL, in_mad, out_mad)) {
+                       mlx4_ib_warn(&dev->ib_dev, "Failed in get GUID INFO MAD_IFC\n");
+                       goto out;
+               }
+
+               mlx4_ib_update_cache_on_guid_change(dev, guid_tbl_blk_num + i,
+                                                   port_num,
+                                                   (u8 *)(&((struct ib_smp *)out_mad)->data));
+               mlx4_ib_notify_slaves_on_guid_change(dev, guid_tbl_blk_num + i,
+                                                    port_num,
+                                                    (u8 *)(&((struct ib_smp *)out_mad)->data));
+       }
+
+out:
+       kfree(in_mad);
+       kfree(out_mad);
+       return;
+}
+
 void handle_port_mgmt_change_event(struct work_struct *work)
 {
        struct ib_event_work *ew = container_of(work, struct ib_event_work, work);
@@ -808,6 +941,8 @@ void handle_port_mgmt_change_event(struct work_struct *work)
        struct mlx4_eqe *eqe = &(ew->ib_eqe);
        u8 port = eqe->event.port_mgmt_change.port;
        u32 changed_attr;
+       u32 tbl_block;
+       u32 change_bitmap;
 
        switch (eqe->subtype) {
        case MLX4_DEV_PMC_SUBTYPE_PORT_INFO:
@@ -823,11 +958,16 @@ void handle_port_mgmt_change_event(struct work_struct *work)
 
                /* Check if it is a lid change event */
                if (changed_attr & MLX4_EQ_PORT_INFO_LID_CHANGE_MASK)
-                       mlx4_ib_dispatch_event(dev, port, IB_EVENT_LID_CHANGE);
+                       handle_lid_change_event(dev, port);
 
                /* Generate GUID changed event */
-               if (changed_attr & MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK)
+               if (changed_attr & MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK) {
                        mlx4_ib_dispatch_event(dev, port, IB_EVENT_GID_CHANGE);
+                       /*if master, notify all slaves*/
+                       if (mlx4_is_master(dev->dev))
+                               mlx4_gen_slaves_port_mgt_ev(dev->dev, port,
+                                                           MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK);
+               }
 
                if (changed_attr & MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK)
                        handle_client_rereg_event(dev, port);
@@ -835,11 +975,19 @@ void handle_port_mgmt_change_event(struct work_struct *work)
 
        case MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE:
                mlx4_ib_dispatch_event(dev, port, IB_EVENT_PKEY_CHANGE);
+               if (mlx4_is_master(dev->dev) && !dev->sriov.is_going_down)
+                       propagate_pkey_ev(dev, port, eqe);
                break;
        case MLX4_DEV_PMC_SUBTYPE_GUID_INFO:
                /* paravirtualized master's guid is guid 0 -- does not change */
                if (!mlx4_is_master(dev->dev))
                        mlx4_ib_dispatch_event(dev, port, IB_EVENT_GID_CHANGE);
+               /*if master, notify relevant slaves*/
+               else if (!dev->sriov.is_going_down) {
+                       tbl_block = GET_BLK_PTR_FROM_EQE(eqe);
+                       change_bitmap = GET_MASK_FROM_EQE(eqe);
+                       handle_slaves_guid_change(dev, port, tbl_block, change_bitmap);
+               }
                break;
        default:
                pr_warn("Unsupported subtype 0x%x for "

diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 35be901..b788039 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -729,6 +729,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
                               struct mlx4_cmd_mailbox *outbox,
                               struct mlx4_cmd_info *cmd)
 {
+       u64     flags;
        int     err = 0;
        u8      field;
 
@@ -737,6 +738,11 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
        if (err)
                return err;
 
+       /* add port mng change event capability unconditionally to slaves */
+       MLX4_GET(flags, outbox->buf, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
+       flags |= MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV;
+       MLX4_PUT(outbox->buf, flags, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
+
        /* For guests, report Blueflame disabled */
        MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_BF_OFFSET);
        field &= 0x7f;