IB/mlx4: Create paravirt contexts for VFs when master IB driver initializes
[cascardo/linux.git] / drivers / infiniband / hw / mlx4 / mad.c
index e988493..21a7941 100644 (file)
 
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
+#include <rdma/ib_sa.h>
+#include <rdma/ib_cache.h>
 
+#include <linux/random.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/gfp.h>
 #include <rdma/ib_pma.h>
@@ -52,6 +55,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];
@@ -73,7 +85,24 @@ struct mlx4_rcv_tunnel_mad {
        struct ib_mad mad;
 } __packed;
 
-int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
+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_gen_node_guid(void)
+{
+#define NODE_GUID_HI   ((u64) (((u64)IB_OPENIB_OUI) << 40))
+       return cpu_to_be64(NODE_GUID_HI | random32());
+}
+
+__be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
+{
+       return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
+               cpu_to_be64(0xff00000000000000LL);
+}
+
+int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int mad_ifc_flags,
                 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
                 void *in_mad, void *response_mad)
 {
@@ -100,10 +129,13 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
         * Key check traps can't be generated unless we have in_wc to
         * tell us where to send the trap.
         */
-       if (ignore_mkey || !in_wc)
+       if ((mad_ifc_flags & MLX4_MAD_IFC_IGNORE_MKEY) || !in_wc)
                op_modifier |= 0x1;
-       if (ignore_bkey || !in_wc)
+       if ((mad_ifc_flags & MLX4_MAD_IFC_IGNORE_BKEY) || !in_wc)
                op_modifier |= 0x2;
+       if (mlx4_is_mfunc(dev->dev) &&
+           (mad_ifc_flags & MLX4_MAD_IFC_NET_VIEW || in_wc))
+               op_modifier |= 0x8;
 
        if (in_wc) {
                struct {
@@ -136,10 +168,10 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
                in_modifier |= in_wc->slid << 16;
        }
 
-       err = mlx4_cmd_box(dev->dev, inmailbox->dma, outmailbox->dma,
-                          in_modifier, op_modifier,
+       err = mlx4_cmd_box(dev->dev, inmailbox->dma, outmailbox->dma, in_modifier,
+                          mlx4_is_master(dev->dev) ? (op_modifier & ~0x8) : op_modifier,
                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,
-                          MLX4_CMD_NATIVE);
+                          (op_modifier & 0x8) ? MLX4_CMD_NATIVE : MLX4_CMD_WRAPPED);
 
        if (!err)
                memcpy(response_mad, outmailbox->buf, 256);
@@ -185,6 +217,10 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
 {
        struct ib_port_info *pinfo;
        u16 lid;
+       __be16 *base;
+       u32 bn, pkey_change_bitmap;
+       int i;
+
 
        struct mlx4_ib_dev *dev = to_mdev(ibdev);
        if ((mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
@@ -200,17 +236,46 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
                                     pinfo->neighbormtu_mastersmsl & 0xf);
 
                        if (pinfo->clientrereg_resv_subnetto & 0x80)
-                               mlx4_ib_dispatch_event(dev, port_num,
-                                                      IB_EVENT_CLIENT_REREGISTER);
+                               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:
-                       mlx4_ib_dispatch_event(dev, port_num,
-                                              IB_EVENT_PKEY_CHANGE);
+                       if (!mlx4_is_mfunc(dev->dev)) {
+                               mlx4_ib_dispatch_event(dev, port_num,
+                                                      IB_EVENT_PKEY_CHANGE);
+                               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;
+                       for (i = 0; i < 32; i++) {
+                               pr_debug("PKEY[%d] = x%x\n",
+                                        i + bn*32, be16_to_cpu(base[i]));
+                               if (be16_to_cpu(base[i]) !=
+                                   dev->pkeys.phys_pkey_cache[port_num - 1][i + bn*32]) {
+                                       pkey_change_bitmap |= (1 << i);
+                                       dev->pkeys.phys_pkey_cache[port_num - 1][i + bn*32] =
+                                               be16_to_cpu(base[i]);
+                               }
+                       }
+                       pr_debug("PKEY Change event: port=%d, "
+                                "block=0x%x, change_bitmap=0x%x\n",
+                                port_num, bn, 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:
@@ -218,12 +283,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)
 {
@@ -271,6 +380,268 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *ma
        }
 }
 
+static int mlx4_ib_demux_sa_handler(struct ib_device *ibdev, int port, int slave,
+                                                            struct ib_sa_mad *sa_mad)
+{
+       int ret = 0;
+
+       /* dispatch to different sa handlers */
+       switch (be16_to_cpu(sa_mad->mad_hdr.attr_id)) {
+       case IB_SA_ATTR_MC_MEMBER_REC:
+               ret = mlx4_ib_mcg_demux_handler(ibdev, port, slave, sa_mad);
+               break;
+       default:
+               break;
+       }
+       return ret;
+}
+
+int mlx4_ib_find_real_gid(struct ib_device *ibdev, u8 port, __be64 guid)
+{
+       struct mlx4_ib_dev *dev = to_mdev(ibdev);
+       int i;
+
+       for (i = 0; i < dev->dev->caps.sqp_demux; i++) {
+               if (dev->sriov.demux[port - 1].guid_cache[i] == guid)
+                       return i;
+       }
+       return -1;
+}
+
+
+static int get_pkey_phys_indices(struct mlx4_ib_dev *ibdev, u8 port, u8 ph_pkey_ix,
+                                u8 *full_pk_ix, u8 *partial_pk_ix,
+                                int *is_full_member)
+{
+       u16 search_pkey;
+       int fm;
+       int err = 0;
+       u16 pk;
+
+       err = ib_get_cached_pkey(&ibdev->ib_dev, port, ph_pkey_ix, &search_pkey);
+       if (err)
+               return err;
+
+       fm = (search_pkey & 0x8000) ? 1 : 0;
+       if (fm) {
+               *full_pk_ix = ph_pkey_ix;
+               search_pkey &= 0x7FFF;
+       } else {
+               *partial_pk_ix = ph_pkey_ix;
+               search_pkey |= 0x8000;
+       }
+
+       if (ib_find_exact_cached_pkey(&ibdev->ib_dev, port, search_pkey, &pk))
+               pk = 0xFFFF;
+
+       if (fm)
+               *partial_pk_ix = (pk & 0xFF);
+       else
+               *full_pk_ix = (pk & 0xFF);
+
+       *is_full_member = fm;
+       return err;
+}
+
+int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
+                         enum ib_qp_type dest_qpt, struct ib_wc *wc,
+                         struct ib_grh *grh, struct ib_mad *mad)
+{
+       struct ib_sge list;
+       struct ib_send_wr wr, *bad_wr;
+       struct mlx4_ib_demux_pv_ctx *tun_ctx;
+       struct mlx4_ib_demux_pv_qp *tun_qp;
+       struct mlx4_rcv_tunnel_mad *tun_mad;
+       struct ib_ah_attr attr;
+       struct ib_ah *ah;
+       struct ib_qp *src_qp = NULL;
+       unsigned tun_tx_ix = 0;
+       int dqpn;
+       int ret = 0;
+       int i;
+       int is_full_member = 0;
+       u16 tun_pkey_ix;
+       u8 ph_pkey_ix, full_pk_ix = 0, partial_pk_ix = 0;
+
+       if (dest_qpt > IB_QPT_GSI)
+               return -EINVAL;
+
+       tun_ctx = dev->sriov.demux[port-1].tun[slave];
+
+       /* check if proxy qp created */
+       if (!tun_ctx || tun_ctx->state != DEMUX_PV_STATE_ACTIVE)
+               return -EAGAIN;
+
+       /* QP0 forwarding only for Dom0 */
+       if (!dest_qpt && (mlx4_master_func_num(dev->dev) != slave))
+               return -EINVAL;
+
+       if (!dest_qpt)
+               tun_qp = &tun_ctx->qp[0];
+       else
+               tun_qp = &tun_ctx->qp[1];
+
+       /* compute pkey index for slave */
+       /* get physical pkey -- virtualized Dom0 pkey to phys*/
+       if (dest_qpt) {
+               ph_pkey_ix =
+                       dev->pkeys.virt2phys_pkey[mlx4_master_func_num(dev->dev)][port - 1][wc->pkey_index];
+
+               /* now, translate this to the slave pkey index */
+               ret = get_pkey_phys_indices(dev, port, ph_pkey_ix, &full_pk_ix,
+                                           &partial_pk_ix, &is_full_member);
+               if (ret)
+                       return -EINVAL;
+
+               for (i = 0; i < dev->dev->caps.pkey_table_len[port]; i++) {
+                       if ((dev->pkeys.virt2phys_pkey[slave][port - 1][i] == full_pk_ix) ||
+                           (is_full_member &&
+                            (dev->pkeys.virt2phys_pkey[slave][port - 1][i] == partial_pk_ix)))
+                               break;
+               }
+               if (i == dev->dev->caps.pkey_table_len[port])
+                       return -EINVAL;
+               tun_pkey_ix = i;
+       } else
+               tun_pkey_ix = dev->pkeys.virt2phys_pkey[slave][port - 1][0];
+
+       dqpn = dev->dev->phys_caps.base_proxy_sqpn + 8 * slave + port + (dest_qpt * 2) - 1;
+
+       /* get tunnel tx data buf for slave */
+       src_qp = tun_qp->qp;
+
+       /* create ah. Just need an empty one with the port num for the post send.
+        * The driver will set the force loopback bit in post_send */
+       memset(&attr, 0, sizeof attr);
+       attr.port_num = port;
+       ah = ib_create_ah(tun_ctx->pd, &attr);
+       if (IS_ERR(ah))
+               return -ENOMEM;
+
+       /* allocate tunnel tx buf after pass failure returns */
+       spin_lock(&tun_qp->tx_lock);
+       if (tun_qp->tx_ix_head - tun_qp->tx_ix_tail >=
+           (MLX4_NUM_TUNNEL_BUFS - 1))
+               ret = -EAGAIN;
+       else
+               tun_tx_ix = (++tun_qp->tx_ix_head) & (MLX4_NUM_TUNNEL_BUFS - 1);
+       spin_unlock(&tun_qp->tx_lock);
+       if (ret)
+               goto out;
+
+       tun_mad = (struct mlx4_rcv_tunnel_mad *) (tun_qp->tx_ring[tun_tx_ix].buf.addr);
+       if (tun_qp->tx_ring[tun_tx_ix].ah)
+               ib_destroy_ah(tun_qp->tx_ring[tun_tx_ix].ah);
+       tun_qp->tx_ring[tun_tx_ix].ah = ah;
+       ib_dma_sync_single_for_cpu(&dev->ib_dev,
+                                  tun_qp->tx_ring[tun_tx_ix].buf.map,
+                                  sizeof (struct mlx4_rcv_tunnel_mad),
+                                  DMA_TO_DEVICE);
+
+       /* copy over to tunnel buffer */
+       if (grh)
+               memcpy(&tun_mad->grh, grh, sizeof *grh);
+       memcpy(&tun_mad->mad, mad, sizeof *mad);
+
+       /* adjust tunnel data */
+       tun_mad->hdr.pkey_index = cpu_to_be16(tun_pkey_ix);
+       tun_mad->hdr.sl_vid = cpu_to_be16(((u16)(wc->sl)) << 12);
+       tun_mad->hdr.slid_mac_47_32 = cpu_to_be16(wc->slid);
+       tun_mad->hdr.flags_src_qp = cpu_to_be32(wc->src_qp & 0xFFFFFF);
+       tun_mad->hdr.g_ml_path = (grh && (wc->wc_flags & IB_WC_GRH)) ? 0x80 : 0;
+
+       ib_dma_sync_single_for_device(&dev->ib_dev,
+                                     tun_qp->tx_ring[tun_tx_ix].buf.map,
+                                     sizeof (struct mlx4_rcv_tunnel_mad),
+                                     DMA_TO_DEVICE);
+
+       list.addr = tun_qp->tx_ring[tun_tx_ix].buf.map;
+       list.length = sizeof (struct mlx4_rcv_tunnel_mad);
+       list.lkey = tun_ctx->mr->lkey;
+
+       wr.wr.ud.ah = ah;
+       wr.wr.ud.port_num = port;
+       wr.wr.ud.remote_qkey = IB_QP_SET_QKEY;
+       wr.wr.ud.remote_qpn = dqpn;
+       wr.next = NULL;
+       wr.wr_id = ((u64) tun_tx_ix) | MLX4_TUN_SET_WRID_QPN(dest_qpt);
+       wr.sg_list = &list;
+       wr.num_sge = 1;
+       wr.opcode = IB_WR_SEND;
+       wr.send_flags = IB_SEND_SIGNALED;
+
+       ret = ib_post_send(src_qp, &wr, &bad_wr);
+out:
+       if (ret)
+               ib_destroy_ah(ah);
+       return ret;
+}
+
+static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port,
+                       struct ib_wc *wc, struct ib_grh *grh,
+                       struct ib_mad *mad)
+{
+       struct mlx4_ib_dev *dev = to_mdev(ibdev);
+       int err;
+       int slave;
+       u8 *slave_id;
+
+       /* Initially assume that this mad is for us */
+       slave = mlx4_master_func_num(dev->dev);
+
+       /* See if the slave id is encoded in a response mad */
+       if (mad->mad_hdr.method & 0x80) {
+               slave_id = (u8 *) &mad->mad_hdr.tid;
+               slave = *slave_id;
+               if (slave != 255) /*255 indicates the dom0*/
+                       *slave_id = 0; /* remap tid */
+       }
+
+       /* If a grh is present, we demux according to it */
+       if (wc->wc_flags & IB_WC_GRH) {
+               slave = mlx4_ib_find_real_gid(ibdev, port, grh->dgid.global.interface_id);
+               if (slave < 0) {
+                       mlx4_ib_warn(ibdev, "failed matching grh\n");
+                       return -ENOENT;
+               }
+       }
+       /* Class-specific handling */
+       switch (mad->mad_hdr.mgmt_class) {
+       case IB_MGMT_CLASS_SUBN_ADM:
+               if (mlx4_ib_demux_sa_handler(ibdev, port, slave,
+                                            (struct ib_sa_mad *) mad))
+                       return 0;
+               break;
+       case IB_MGMT_CLASS_CM:
+               if (mlx4_ib_demux_cm_handler(ibdev, port, &slave, mad))
+                       return 0;
+               break;
+       case IB_MGMT_CLASS_DEVICE_MGMT:
+               if (mad->mad_hdr.method != IB_MGMT_METHOD_GET_RESP)
+                       return 0;
+               break;
+       default:
+               /* Drop unsupported classes for slaves in tunnel mode */
+               if (slave != mlx4_master_func_num(dev->dev)) {
+                       pr_debug("dropping unsupported ingress mad from class:%d "
+                                "for slave:%d\n", mad->mad_hdr.mgmt_class, slave);
+                       return 0;
+               }
+       }
+       /*make sure that no slave==255 was not handled yet.*/
+       if (slave >= dev->dev->caps.sqp_demux) {
+               mlx4_ib_warn(ibdev, "slave id: %d is bigger than allowed:%d\n",
+                            slave, dev->dev->caps.sqp_demux);
+               return -ENOENT;
+       }
+
+       err = mlx4_ib_send_to_slave(dev, slave, port, wc->qp->qp_type, wc, grh, mad);
+       if (err)
+               pr_debug("failed sending to slave %d via tunnel qp (%d)\n",
+                        slave, err);
+       return 0;
+}
+
 static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                        struct ib_wc *in_wc, struct ib_grh *in_grh,
                        struct ib_mad *in_mad, struct ib_mad *out_mad)
@@ -335,8 +706,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                prev_lid = pattr.lid;
 
        err = mlx4_MAD_IFC(to_mdev(ibdev),
-                          mad_flags & IB_MAD_IGNORE_MKEY,
-                          mad_flags & IB_MAD_IGNORE_BKEY,
+                          (mad_flags & IB_MAD_IGNORE_MKEY ? MLX4_MAD_IFC_IGNORE_MKEY : 0) |
+                          (mad_flags & IB_MAD_IGNORE_BKEY ? MLX4_MAD_IFC_IGNORE_BKEY : 0) |
+                          MLX4_MAD_IFC_NET_VIEW,
                           port_num, in_wc, in_grh, in_mad, out_mad);
        if (err)
                return IB_MAD_RESULT_FAILURE;
@@ -344,7 +716,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
        if (!out_mad->mad_hdr.status) {
                if (!(to_mdev(ibdev)->dev->caps.flags & MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV))
                        smp_snoop(ibdev, port_num, in_mad, prev_lid);
-               node_desc_override(ibdev, out_mad);
+               /* slaves get node desc from FW */
+               if (!mlx4_is_slave(to_mdev(ibdev)->dev))
+                       node_desc_override(ibdev, out_mad);
        }
 
        /* set return bit in status of directed route responses */
@@ -427,6 +801,8 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
 static void send_handler(struct ib_mad_agent *agent,
                         struct ib_mad_send_wc *mad_send_wc)
 {
+       if (mad_send_wc->send_buf->context[0])
+               ib_destroy_ah(mad_send_wc->send_buf->context[0]);
        ib_free_send_mad(mad_send_wc->send_buf);
 }
 
@@ -485,6 +861,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) {
+                       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);
@@ -492,6 +952,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:
@@ -507,24 +969,36 @@ 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)
-                       mlx4_ib_dispatch_event(dev, port,
-                                              IB_EVENT_CLIENT_REREGISTER);
+                       handle_client_rereg_event(dev, port);
                break;
 
        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 "
@@ -582,6 +1056,231 @@ static int mlx4_ib_post_pv_qp_buf(struct mlx4_ib_demux_pv_ctx *ctx,
        return ib_post_recv(tun_qp->qp, &recv_wr, &bad_recv_wr);
 }
 
+static int mlx4_ib_multiplex_sa_handler(struct ib_device *ibdev, int port,
+               int slave, struct ib_sa_mad *sa_mad)
+{
+       int ret = 0;
+
+       /* dispatch to different sa handlers */
+       switch (be16_to_cpu(sa_mad->mad_hdr.attr_id)) {
+       case IB_SA_ATTR_MC_MEMBER_REC:
+               ret = mlx4_ib_mcg_multiplex_handler(ibdev, port, slave, sa_mad);
+               break;
+       default:
+               break;
+       }
+       return ret;
+}
+
+static int is_proxy_qp0(struct mlx4_ib_dev *dev, int qpn, int slave)
+{
+       int proxy_start = dev->dev->phys_caps.base_proxy_sqpn + 8 * slave;
+
+       return (qpn >= proxy_start && qpn <= proxy_start + 1);
+}
+
+
+int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
+                        enum ib_qp_type dest_qpt, u16 pkey_index, u32 remote_qpn,
+                        u32 qkey, struct ib_ah_attr *attr, struct ib_mad *mad)
+{
+       struct ib_sge list;
+       struct ib_send_wr wr, *bad_wr;
+       struct mlx4_ib_demux_pv_ctx *sqp_ctx;
+       struct mlx4_ib_demux_pv_qp *sqp;
+       struct mlx4_mad_snd_buf *sqp_mad;
+       struct ib_ah *ah;
+       struct ib_qp *send_qp = NULL;
+       unsigned wire_tx_ix = 0;
+       int ret = 0;
+       u16 wire_pkey_ix;
+       int src_qpnum;
+       u8 sgid_index;
+
+
+       sqp_ctx = dev->sriov.sqps[port-1];
+
+       /* check if proxy qp created */
+       if (!sqp_ctx || sqp_ctx->state != DEMUX_PV_STATE_ACTIVE)
+               return -EAGAIN;
+
+       /* QP0 forwarding only for Dom0 */
+       if (dest_qpt == IB_QPT_SMI && (mlx4_master_func_num(dev->dev) != slave))
+               return -EINVAL;
+
+       if (dest_qpt == IB_QPT_SMI) {
+               src_qpnum = 0;
+               sqp = &sqp_ctx->qp[0];
+               wire_pkey_ix = dev->pkeys.virt2phys_pkey[slave][port - 1][0];
+       } else {
+               src_qpnum = 1;
+               sqp = &sqp_ctx->qp[1];
+               wire_pkey_ix = dev->pkeys.virt2phys_pkey[slave][port - 1][pkey_index];
+       }
+
+       send_qp = sqp->qp;
+
+       /* create ah */
+       sgid_index = attr->grh.sgid_index;
+       attr->grh.sgid_index = 0;
+       ah = ib_create_ah(sqp_ctx->pd, attr);
+       if (IS_ERR(ah))
+               return -ENOMEM;
+       attr->grh.sgid_index = sgid_index;
+       to_mah(ah)->av.ib.gid_index = sgid_index;
+       /* get rid of force-loopback bit */
+       to_mah(ah)->av.ib.port_pd &= cpu_to_be32(0x7FFFFFFF);
+       spin_lock(&sqp->tx_lock);
+       if (sqp->tx_ix_head - sqp->tx_ix_tail >=
+           (MLX4_NUM_TUNNEL_BUFS - 1))
+               ret = -EAGAIN;
+       else
+               wire_tx_ix = (++sqp->tx_ix_head) & (MLX4_NUM_TUNNEL_BUFS - 1);
+       spin_unlock(&sqp->tx_lock);
+       if (ret)
+               goto out;
+
+       sqp_mad = (struct mlx4_mad_snd_buf *) (sqp->tx_ring[wire_tx_ix].buf.addr);
+       if (sqp->tx_ring[wire_tx_ix].ah)
+               ib_destroy_ah(sqp->tx_ring[wire_tx_ix].ah);
+       sqp->tx_ring[wire_tx_ix].ah = ah;
+       ib_dma_sync_single_for_cpu(&dev->ib_dev,
+                                  sqp->tx_ring[wire_tx_ix].buf.map,
+                                  sizeof (struct mlx4_mad_snd_buf),
+                                  DMA_TO_DEVICE);
+
+       memcpy(&sqp_mad->payload, mad, sizeof *mad);
+
+       ib_dma_sync_single_for_device(&dev->ib_dev,
+                                     sqp->tx_ring[wire_tx_ix].buf.map,
+                                     sizeof (struct mlx4_mad_snd_buf),
+                                     DMA_TO_DEVICE);
+
+       list.addr = sqp->tx_ring[wire_tx_ix].buf.map;
+       list.length = sizeof (struct mlx4_mad_snd_buf);
+       list.lkey = sqp_ctx->mr->lkey;
+
+       wr.wr.ud.ah = ah;
+       wr.wr.ud.port_num = port;
+       wr.wr.ud.pkey_index = wire_pkey_ix;
+       wr.wr.ud.remote_qkey = qkey;
+       wr.wr.ud.remote_qpn = remote_qpn;
+       wr.next = NULL;
+       wr.wr_id = ((u64) wire_tx_ix) | MLX4_TUN_SET_WRID_QPN(src_qpnum);
+       wr.sg_list = &list;
+       wr.num_sge = 1;
+       wr.opcode = IB_WR_SEND;
+       wr.send_flags = IB_SEND_SIGNALED;
+
+       ret = ib_post_send(send_qp, &wr, &bad_wr);
+out:
+       if (ret)
+               ib_destroy_ah(ah);
+       return ret;
+}
+
+static void mlx4_ib_multiplex_mad(struct mlx4_ib_demux_pv_ctx *ctx, struct ib_wc *wc)
+{
+       struct mlx4_ib_dev *dev = to_mdev(ctx->ib_dev);
+       struct mlx4_ib_demux_pv_qp *tun_qp = &ctx->qp[MLX4_TUN_WRID_QPN(wc->wr_id)];
+       int wr_ix = wc->wr_id & (MLX4_NUM_TUNNEL_BUFS - 1);
+       struct mlx4_tunnel_mad *tunnel = tun_qp->ring[wr_ix].addr;
+       struct mlx4_ib_ah ah;
+       struct ib_ah_attr ah_attr;
+       u8 *slave_id;
+       int slave;
+
+       /* Get slave that sent this packet */
+       if (wc->src_qp < dev->dev->phys_caps.base_proxy_sqpn ||
+           wc->src_qp >= dev->dev->phys_caps.base_proxy_sqpn + 8 * MLX4_MFUNC_MAX ||
+           (wc->src_qp & 0x1) != ctx->port - 1 ||
+           wc->src_qp & 0x4) {
+               mlx4_ib_warn(ctx->ib_dev, "can't multiplex bad sqp:%d\n", wc->src_qp);
+               return;
+       }
+       slave = ((wc->src_qp & ~0x7) - dev->dev->phys_caps.base_proxy_sqpn) / 8;
+       if (slave != ctx->slave) {
+               mlx4_ib_warn(ctx->ib_dev, "can't multiplex bad sqp:%d: "
+                            "belongs to another slave\n", wc->src_qp);
+               return;
+       }
+       if (slave != mlx4_master_func_num(dev->dev) && !(wc->src_qp & 0x2)) {
+               mlx4_ib_warn(ctx->ib_dev, "can't multiplex bad sqp:%d: "
+                            "non-master trying to send QP0 packets\n", wc->src_qp);
+               return;
+       }
+
+       /* Map transaction ID */
+       ib_dma_sync_single_for_cpu(ctx->ib_dev, tun_qp->ring[wr_ix].map,
+                                  sizeof (struct mlx4_tunnel_mad),
+                                  DMA_FROM_DEVICE);
+       switch (tunnel->mad.mad_hdr.method) {
+       case IB_MGMT_METHOD_SET:
+       case IB_MGMT_METHOD_GET:
+       case IB_MGMT_METHOD_REPORT:
+       case IB_SA_METHOD_GET_TABLE:
+       case IB_SA_METHOD_DELETE:
+       case IB_SA_METHOD_GET_MULTI:
+       case IB_SA_METHOD_GET_TRACE_TBL:
+               slave_id = (u8 *) &tunnel->mad.mad_hdr.tid;
+               if (*slave_id) {
+                       mlx4_ib_warn(ctx->ib_dev, "egress mad has non-null tid msb:%d "
+                                    "class:%d slave:%d\n", *slave_id,
+                                    tunnel->mad.mad_hdr.mgmt_class, slave);
+                       return;
+               } else
+                       *slave_id = slave;
+       default:
+               /* nothing */;
+       }
+
+       /* Class-specific handling */
+       switch (tunnel->mad.mad_hdr.mgmt_class) {
+       case IB_MGMT_CLASS_SUBN_ADM:
+               if (mlx4_ib_multiplex_sa_handler(ctx->ib_dev, ctx->port, slave,
+                             (struct ib_sa_mad *) &tunnel->mad))
+                       return;
+               break;
+       case IB_MGMT_CLASS_CM:
+               if (mlx4_ib_multiplex_cm_handler(ctx->ib_dev, ctx->port, slave,
+                             (struct ib_mad *) &tunnel->mad))
+                       return;
+               break;
+       case IB_MGMT_CLASS_DEVICE_MGMT:
+               if (tunnel->mad.mad_hdr.method != IB_MGMT_METHOD_GET &&
+                   tunnel->mad.mad_hdr.method != IB_MGMT_METHOD_SET)
+                       return;
+               break;
+       default:
+               /* Drop unsupported classes for slaves in tunnel mode */
+               if (slave != mlx4_master_func_num(dev->dev)) {
+                       mlx4_ib_warn(ctx->ib_dev, "dropping unsupported egress mad from class:%d "
+                                    "for slave:%d\n", tunnel->mad.mad_hdr.mgmt_class, slave);
+                       return;
+               }
+       }
+
+       /* We are using standard ib_core services to send the mad, so generate a
+        * stadard address handle by decoding the tunnelled mlx4_ah fields */
+       memcpy(&ah.av, &tunnel->hdr.av, sizeof (struct mlx4_av));
+       ah.ibah.device = ctx->ib_dev;
+       mlx4_ib_query_ah(&ah.ibah, &ah_attr);
+       if ((ah_attr.ah_flags & IB_AH_GRH) &&
+           (ah_attr.grh.sgid_index != slave)) {
+               mlx4_ib_warn(ctx->ib_dev, "slave:%d accessed invalid sgid_index:%d\n",
+                            slave, ah_attr.grh.sgid_index);
+               return;
+       }
+
+       mlx4_ib_send_to_wire(dev, slave, ctx->port,
+                            is_proxy_qp0(dev, wc->src_qp, slave) ?
+                            IB_QPT_SMI : IB_QPT_GSI,
+                            be16_to_cpu(tunnel->hdr.pkey_index),
+                            be32_to_cpu(tunnel->hdr.remote_qpn),
+                            be32_to_cpu(tunnel->hdr.qkey),
+                            &ah_attr, &tunnel->mad);
+}
+
 static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx,
                                 enum ib_qp_type qp_type, int is_tun)
 {
@@ -706,7 +1405,57 @@ static void mlx4_ib_free_pv_qp_bufs(struct mlx4_ib_demux_pv_ctx *ctx,
 
 static void mlx4_ib_tunnel_comp_worker(struct work_struct *work)
 {
-       /* dummy until next patch in series */
+       struct mlx4_ib_demux_pv_ctx *ctx;
+       struct mlx4_ib_demux_pv_qp *tun_qp;
+       struct ib_wc wc;
+       int ret;
+       ctx = container_of(work, struct mlx4_ib_demux_pv_ctx, work);
+       ib_req_notify_cq(ctx->cq, IB_CQ_NEXT_COMP);
+
+       while (ib_poll_cq(ctx->cq, 1, &wc) == 1) {
+               tun_qp = &ctx->qp[MLX4_TUN_WRID_QPN(wc.wr_id)];
+               if (wc.status == IB_WC_SUCCESS) {
+                       switch (wc.opcode) {
+                       case IB_WC_RECV:
+                               mlx4_ib_multiplex_mad(ctx, &wc);
+                               ret = mlx4_ib_post_pv_qp_buf(ctx, tun_qp,
+                                                            wc.wr_id &
+                                                            (MLX4_NUM_TUNNEL_BUFS - 1));
+                               if (ret)
+                                       pr_err("Failed reposting tunnel "
+                                              "buf:%lld\n", wc.wr_id);
+                               break;
+                       case IB_WC_SEND:
+                               pr_debug("received tunnel send completion:"
+                                        "wrid=0x%llx, status=0x%x\n",
+                                        wc.wr_id, wc.status);
+                               ib_destroy_ah(tun_qp->tx_ring[wc.wr_id &
+                                             (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
+                               tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah
+                                       = NULL;
+                               spin_lock(&tun_qp->tx_lock);
+                               tun_qp->tx_ix_tail++;
+                               spin_unlock(&tun_qp->tx_lock);
+
+                               break;
+                       default:
+                               break;
+                       }
+               } else  {
+                       pr_debug("mlx4_ib: completion error in tunnel: %d."
+                                " status = %d, wrid = 0x%llx\n",
+                                ctx->slave, wc.status, wc.wr_id);
+                       if (!MLX4_TUN_IS_RECV(wc.wr_id)) {
+                               ib_destroy_ah(tun_qp->tx_ring[wc.wr_id &
+                                             (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
+                               tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah
+                                       = NULL;
+                               spin_lock(&tun_qp->tx_lock);
+                               tun_qp->tx_ix_tail++;
+                               spin_unlock(&tun_qp->tx_lock);
+                       }
+               }
+       }
 }
 
 static void pv_qp_event_handler(struct ib_event *event, void *qp_context)
@@ -814,7 +1563,60 @@ err_qp:
  */
 static void mlx4_ib_sqp_comp_worker(struct work_struct *work)
 {
-       /* dummy until next patch in series */
+       struct mlx4_ib_demux_pv_ctx *ctx;
+       struct mlx4_ib_demux_pv_qp *sqp;
+       struct ib_wc wc;
+       struct ib_grh *grh;
+       struct ib_mad *mad;
+
+       ctx = container_of(work, struct mlx4_ib_demux_pv_ctx, work);
+       ib_req_notify_cq(ctx->cq, IB_CQ_NEXT_COMP);
+
+       while (mlx4_ib_poll_cq(ctx->cq, 1, &wc) == 1) {
+               sqp = &ctx->qp[MLX4_TUN_WRID_QPN(wc.wr_id)];
+               if (wc.status == IB_WC_SUCCESS) {
+                       switch (wc.opcode) {
+                       case IB_WC_SEND:
+                               ib_destroy_ah(sqp->tx_ring[wc.wr_id &
+                                             (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
+                               sqp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah
+                                       = NULL;
+                               spin_lock(&sqp->tx_lock);
+                               sqp->tx_ix_tail++;
+                               spin_unlock(&sqp->tx_lock);
+                               break;
+                       case IB_WC_RECV:
+                               mad = (struct ib_mad *) &(((struct mlx4_mad_rcv_buf *)
+                                               (sqp->ring[wc.wr_id &
+                                               (MLX4_NUM_TUNNEL_BUFS - 1)].addr))->payload);
+                               grh = &(((struct mlx4_mad_rcv_buf *)
+                                               (sqp->ring[wc.wr_id &
+                                               (MLX4_NUM_TUNNEL_BUFS - 1)].addr))->grh);
+                               mlx4_ib_demux_mad(ctx->ib_dev, ctx->port, &wc, grh, mad);
+                               if (mlx4_ib_post_pv_qp_buf(ctx, sqp, wc.wr_id &
+                                                          (MLX4_NUM_TUNNEL_BUFS - 1)))
+                                       pr_err("Failed reposting SQP "
+                                              "buf:%lld\n", wc.wr_id);
+                               break;
+                       default:
+                               BUG_ON(1);
+                               break;
+                       }
+               } else  {
+                       pr_debug("mlx4_ib: completion error in tunnel: %d."
+                                " status = %d, wrid = 0x%llx\n",
+                                ctx->slave, wc.status, wc.wr_id);
+                       if (!MLX4_TUN_IS_RECV(wc.wr_id)) {
+                               ib_destroy_ah(sqp->tx_ring[wc.wr_id &
+                                             (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
+                               sqp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah
+                                       = NULL;
+                               spin_lock(&sqp->tx_lock);
+                               sqp->tx_ix_tail++;
+                               spin_unlock(&sqp->tx_lock);
+                       }
+               }
+       }
 }
 
 static int alloc_pv_object(struct mlx4_ib_dev *dev, int slave, int port,
@@ -850,6 +1652,9 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port,
 {
        int ret, cq_size;
 
+       if (ctx->state != DEMUX_PV_STATE_DOWN)
+               return -EEXIST;
+
        ctx->state = DEMUX_PV_STATE_STARTING;
        /* have QP0 only on port owner, and only if link layer is IB */
        if (ctx->slave == mlx4_master_func_num(to_mdev(ctx->ib_dev)->dev) &&
@@ -994,6 +1799,7 @@ static int mlx4_ib_tunnels_update(struct mlx4_ib_dev *dev, int slave,
        int ret = 0;
 
        if (!do_init) {
+               clean_vf_mcast(&dev->sriov.demux[port - 1], slave);
                /* for master, destroy real sqp resources */
                if (slave == mlx4_master_func_num(dev->dev))
                        destroy_pv_resources(dev, slave, port,
@@ -1047,10 +1853,16 @@ static int mlx4_ib_alloc_demux_ctx(struct mlx4_ib_dev *dev,
                ret = alloc_pv_object(dev, i, port, &ctx->tun[i]);
                if (ret) {
                        ret = -ENOMEM;
-                       goto err_wq;
+                       goto err_mcg;
                }
        }
 
+       ret = mlx4_ib_mcg_port_init(ctx);
+       if (ret) {
+               pr_err("Failed initializing mcg para-virt (%d)\n", ret);
+               goto err_mcg;
+       }
+
        snprintf(name, sizeof name, "mlx4_ibt%d", port);
        ctx->wq = create_singlethread_workqueue(name);
        if (!ctx->wq) {
@@ -1074,6 +1886,8 @@ err_udwq:
        ctx->wq = NULL;
 
 err_wq:
+       mlx4_ib_mcg_port_cleanup(ctx, 1);
+err_mcg:
        for (i = 0; i < dev->dev->caps.sqp_demux; i++)
                free_pv_object(dev, i, port);
        kfree(ctx->tun);
@@ -1109,6 +1923,7 @@ static void mlx4_ib_free_demux_ctx(struct mlx4_ib_demux_ctx *ctx)
        int i;
        if (ctx) {
                struct mlx4_ib_dev *dev = to_mdev(ctx->ib_dev);
+               mlx4_ib_mcg_port_cleanup(ctx, 1);
                for (i = 0; i < dev->dev->caps.sqp_demux; i++) {
                        if (!ctx->tun[i])
                                continue;
@@ -1148,6 +1963,7 @@ int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev)
 
        dev->sriov.is_going_down = 0;
        spin_lock_init(&dev->sriov.going_down_lock);
+       mlx4_ib_cm_paravirt_init(dev);
 
        mlx4_ib_warn(&dev->ib_dev, "multi-function enabled\n");
 
@@ -1156,9 +1972,32 @@ int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev)
                return 0;
        }
 
+       for (i = 0; i < dev->dev->caps.sqp_demux; i++) {
+               if (i == mlx4_master_func_num(dev->dev))
+                       mlx4_put_slave_node_guid(dev->dev, i, dev->ib_dev.node_guid);
+               else
+                       mlx4_put_slave_node_guid(dev->dev, i, mlx4_ib_gen_node_guid());
+       }
+
+       err = mlx4_ib_init_alias_guid_service(dev);
+       if (err) {
+               mlx4_ib_warn(&dev->ib_dev, "Failed init alias guid process.\n");
+               goto paravirt_err;
+       }
+       err = mlx4_ib_device_register_sysfs(dev);
+       if (err) {
+               mlx4_ib_warn(&dev->ib_dev, "Failed to register sysfs\n");
+               goto sysfs_err;
+       }
+
        mlx4_ib_warn(&dev->ib_dev, "initializing demux service for %d qp1 clients\n",
                     dev->dev->caps.sqp_demux);
        for (i = 0; i < dev->num_ports; i++) {
+               union ib_gid gid;
+               err = __mlx4_ib_query_gid(&dev->ib_dev, i + 1, 0, &gid, 1);
+               if (err)
+                       goto demux_err;
+               dev->sriov.demux[i].guid_cache[0] = gid.global.interface_id;
                err = alloc_pv_object(dev, mlx4_master_func_num(dev->dev), i + 1,
                                      &dev->sriov.sqps[i]);
                if (err)
@@ -1176,6 +2015,13 @@ demux_err:
                mlx4_ib_free_demux_ctx(&dev->sriov.demux[i]);
                --i;
        }
+       mlx4_ib_device_unregister_sysfs(dev);
+
+sysfs_err:
+       mlx4_ib_destroy_alias_guid_service(dev);
+
+paravirt_err:
+       mlx4_ib_cm_paravirt_clean(dev, -1);
 
        return err;
 }
@@ -1191,7 +2037,7 @@ void mlx4_ib_close_sriov(struct mlx4_ib_dev *dev)
        spin_lock_irqsave(&dev->sriov.going_down_lock, flags);
        dev->sriov.is_going_down = 1;
        spin_unlock_irqrestore(&dev->sriov.going_down_lock, flags);
-       if (mlx4_is_master(dev->dev))
+       if (mlx4_is_master(dev->dev)) {
                for (i = 0; i < dev->num_ports; i++) {
                        flush_workqueue(dev->sriov.demux[i].ud_wq);
                        mlx4_ib_free_sqp_ctx(dev->sriov.sqps[i]);
@@ -1199,4 +2045,9 @@ void mlx4_ib_close_sriov(struct mlx4_ib_dev *dev)
                        dev->sriov.sqps[i] = NULL;
                        mlx4_ib_free_demux_ctx(&dev->sriov.demux[i]);
                }
+
+               mlx4_ib_cm_paravirt_clean(dev, -1);
+               mlx4_ib_destroy_alias_guid_service(dev);
+               mlx4_ib_device_unregister_sysfs(dev);
+       }
 }