IB/rdmavt: Add mad agents to rdmavt

This patch adds mad agent create and free to rdmavt.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/mad.c b/drivers/infiniband/sw/rdmavt/mad.c
index eef702943451d8fac05703ca0b45f4dbf36250fd..e01f3fb47c5cb247846bd83a5d002790f0e727d0 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mad.c
+++ b/drivers/infiniband/sw/rdmavt/mad.c
@@ -45,6 +45,7 @@
  *
  */
 
+#include <rdma/ib_mad.h>
 #include "mad.h"
 
 /**
@@ -83,3 +84,74 @@ int rvt_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,
         */
        return IB_MAD_RESULT_FAILURE;
 }
+
+static void rvt_send_mad_handler(struct ib_mad_agent *agent,
+                                struct ib_mad_send_wc *mad_send_wc)
+{
+       ib_free_send_mad(mad_send_wc->send_buf);
+}
+
+int rvt_create_mad_agents(struct rvt_dev_info *rdi)
+{
+       struct ib_mad_agent *agent;
+       struct rvt_ibport *rvp;
+       int p;
+       int ret;
+
+       for (p = 0; p < rdi->dparms.nports; p++) {
+               rvp = rdi->ports[p];
+               agent = ib_register_mad_agent(&rdi->ibdev, p + 1,
+                                             IB_QPT_SMI,
+                                             NULL, 0, rvt_send_mad_handler,
+                                             NULL, NULL, 0);
+               if (IS_ERR(agent)) {
+                       ret = PTR_ERR(agent);
+                       goto err;
+               }
+
+               rvp->send_agent = agent;
+
+               if (rdi->driver_f.notify_create_mad_agent)
+                       rdi->driver_f.notify_create_mad_agent(rdi, p);
+       }
+
+       return 0;
+
+err:
+       for (p = 0; p < rdi->dparms.nports; p++) {
+               rvp = rdi->ports[p];
+               if (rvp->send_agent) {
+                       agent = rvp->send_agent;
+                       rvp->send_agent = NULL;
+                       ib_unregister_mad_agent(agent);
+                       if (rdi->driver_f.notify_free_mad_agent)
+                               rdi->driver_f.notify_free_mad_agent(rdi, p);
+               }
+       }
+
+       return ret;
+}
+
+void rvt_free_mad_agents(struct rvt_dev_info *rdi)
+{
+       struct ib_mad_agent *agent;
+       struct rvt_ibport *rvp;
+       int p;
+
+       for (p = 0; p < rdi->dparms.nports; p++) {
+               rvp = rdi->ports[p];
+               if (rvp->send_agent) {
+                       agent = rvp->send_agent;
+                       rvp->send_agent = NULL;
+                       ib_unregister_mad_agent(agent);
+               }
+               if (rvp->sm_ah) {
+                       ib_destroy_ah(&rvp->sm_ah->ibah);
+                       rvp->sm_ah = NULL;
+               }
+
+               if (rdi->driver_f.notify_free_mad_agent)
+                       rdi->driver_f.notify_free_mad_agent(rdi, p);
+       }
+}
+

diff --git a/drivers/infiniband/sw/rdmavt/mad.h b/drivers/infiniband/sw/rdmavt/mad.h
index ee740e9ed387180f227bb00e5a8a9fb8e0629390..5d8a6a9f1f8ccccfcc7dc3291b1d647ff9013934 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mad.h
+++ b/drivers/infiniband/sw/rdmavt/mad.h
@@ -55,5 +55,6 @@ int rvt_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,
                    const struct ib_mad_hdr *in, size_t in_mad_size,
                    struct ib_mad_hdr *out, size_t *out_mad_size,
                    u16 *out_mad_pkey_index);
-
+int rvt_create_mad_agents(struct rvt_dev_info *rdi);
+void rvt_free_mad_agents(struct rvt_dev_info *rdi);
 #endif          /* DEF_RVTMAD_H */

diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 450caa7e38cf1f61f9230df7f4d6fd3002ac42cc..7496d43685ab12f15a52a45eaf510bdba9fceb2a 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -416,6 +416,8 @@ int rvt_register_device(struct rvt_dev_info *rdi)
                goto bail_cq;
        }
 
+       rvt_create_mad_agents(rdi);
+
        rvt_pr_info(rdi, "Registration with rdmavt done.\n");
        return ret;
 
@@ -438,6 +440,8 @@ void rvt_unregister_device(struct rvt_dev_info *rdi)
        if (!rdi)
                return;
 
+       rvt_free_mad_agents(rdi);
+
        ib_unregister_device(&rdi->ibdev);
        rvt_cq_exit(rdi);
        rvt_mr_exit(rdi);

diff --git a/drivers/infiniband/sw/rdmavt/vt.h b/drivers/infiniband/sw/rdmavt/vt.h
index 54ee05a4a9b9e65b5f114cbe1954b7112b7a1f88..d9f78ccf1c35bb20d9a6b47804b87a7c0767ec47 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.h
+++ b/drivers/infiniband/sw/rdmavt/vt.h
@@ -59,6 +59,7 @@
 #include "mcast.h"
 #include "mmap.h"
 #include "cq.h"
+#include "mad.h"
 
 #define rvt_pr_info(rdi, fmt, ...) \
        __rvt_pr_info(rdi->driver_f.get_pci_dev(rdi), \

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 7768e041f244743ef8a4cd925484084904ae311a..31f9e5a08da0f3186a9dd99283da15c694489745 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -136,7 +136,8 @@ struct rvt_ibport {
         */
        u16 *pkey_table;
 
-       /* TODO: Move sm_ah and smi_ah into here as well*/
+       struct rvt_ah *sm_ah;
+       struct rvt_ah *smi_ah;
 };
 
 #define RVT_CQN_MAX 16 /* maximum length of cq name */
@@ -263,6 +264,9 @@ struct rvt_driver_provided {
                               int attr_mask, struct ib_udata *udata);
        void (*modify_qp)(struct rvt_qp *qp, struct ib_qp_attr *attr,
                          int attr_mask, struct ib_udata *udata);
+
+       void (*notify_create_mad_agent)(struct rvt_dev_info *rdi, int port_idx);
+       void (*notify_free_mad_agent)(struct rvt_dev_info *rdi, int port_idx);
 };
 
 struct rvt_dev_info {