IB/sa: Make sure SA queries use default P_Key

MADs sent to the SA should use the the default P_Key (0x7fff/0xffff).
There's no requirement that the default P_Key is stored at index 0 in
the local P_Key table, so add code to the sa_query module to look up
the index of the default P_Key when creating an address handle for the
SA (which is done any time the P_Key table might change), and use this
index for all SA queries.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 9d3797fcc37e30b8f236661e2f82af6befd09c73..20ab6b3e484d517f29a21fa316f51e01681b30c7 100644 (file)
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -56,6 +56,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 struct ib_sa_sm_ah {
        struct ib_ah        *ah;
        struct kref          ref;
+       u16                  pkey_index;
        u8                   src_path_mask;
 };
 
@@ -382,6 +383,13 @@ static void update_sm_ah(struct work_struct *work)
        kref_init(&new_ah->ref);
        new_ah->src_path_mask = (1 << port_attr.lmc) - 1;
 
+       new_ah->pkey_index = 0;
+       if (ib_find_pkey(port->agent->device, port->port_num,
+                        IB_DEFAULT_PKEY_FULL, &new_ah->pkey_index) &&
+           ib_find_pkey(port->agent->device, port->port_num,
+                        IB_DEFAULT_PKEY_PARTIAL, &new_ah->pkey_index))
+               printk(KERN_ERR "Couldn't find index for default PKey\n");
+
        memset(&ah_attr, 0, sizeof ah_attr);
        ah_attr.dlid     = port_attr.sm_lid;
        ah_attr.sl       = port_attr.sm_sl;
@@ -512,6 +520,35 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
 }
 EXPORT_SYMBOL(ib_init_ah_from_path);
 
+static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&query->port->ah_lock, flags);
+       kref_get(&query->port->sm_ah->ref);
+       query->sm_ah = query->port->sm_ah;
+       spin_unlock_irqrestore(&query->port->ah_lock, flags);
+
+       query->mad_buf = ib_create_send_mad(query->port->agent, 1,
+                                           query->sm_ah->pkey_index,
+                                           0, IB_MGMT_SA_HDR, IB_MGMT_SA_DATA,
+                                           gfp_mask);
+       if (!query->mad_buf) {
+               kref_put(&query->sm_ah->ref, free_sm_ah);
+               return -ENOMEM;
+       }
+
+       query->mad_buf->ah = query->sm_ah->ah;
+
+       return 0;
+}
+
+static void free_mad(struct ib_sa_query *query)
+{
+       ib_free_send_mad(query->mad_buf);
+       kref_put(&query->sm_ah->ref, free_sm_ah);
+}
+
 static void init_mad(struct ib_sa_mad *mad, struct ib_mad_agent *agent)
 {
        unsigned long flags;
@@ -548,20 +585,11 @@ retry:
        query->mad_buf->context[0] = query;
        query->id = id;
 
-       spin_lock_irqsave(&query->port->ah_lock, flags);
-       kref_get(&query->port->sm_ah->ref);
-       query->sm_ah = query->port->sm_ah;
-       spin_unlock_irqrestore(&query->port->ah_lock, flags);
-
-       query->mad_buf->ah = query->sm_ah->ah;
-
        ret = ib_post_send_mad(query->mad_buf, NULL);
        if (ret) {
                spin_lock_irqsave(&idr_lock, flags);
                idr_remove(&query_idr, id);
                spin_unlock_irqrestore(&idr_lock, flags);
-
-               kref_put(&query->sm_ah->ref, free_sm_ah);
        }
 
        /*
@@ -647,13 +675,10 @@ int ib_sa_path_rec_get(struct ib_sa_client *client,
        if (!query)
                return -ENOMEM;
 
-       query->sa_query.mad_buf = ib_create_send_mad(agent, 1, 0,
-                                                    0, IB_MGMT_SA_HDR,
-                                                    IB_MGMT_SA_DATA, gfp_mask);
-       if (!query->sa_query.mad_buf) {
-               ret = -ENOMEM;
+       query->sa_query.port     = port;
+       ret = alloc_mad(&query->sa_query, gfp_mask);
+       if (ret)
                goto err1;
-       }
 
        ib_sa_client_get(client);
        query->sa_query.client = client;
@@ -665,7 +690,6 @@ int ib_sa_path_rec_get(struct ib_sa_client *client,
 
        query->sa_query.callback = callback ? ib_sa_path_rec_callback : NULL;
        query->sa_query.release  = ib_sa_path_rec_release;
-       query->sa_query.port     = port;
        mad->mad_hdr.method      = IB_MGMT_METHOD_GET;
        mad->mad_hdr.attr_id     = cpu_to_be16(IB_SA_ATTR_PATH_REC);
        mad->sa_hdr.comp_mask    = comp_mask;
@@ -683,7 +707,7 @@ int ib_sa_path_rec_get(struct ib_sa_client *client,
 err2:
        *sa_query = NULL;
        ib_sa_client_put(query->sa_query.client);
-       ib_free_send_mad(query->sa_query.mad_buf);
+       free_mad(&query->sa_query);
 
 err1:
        kfree(query);
@@ -773,13 +797,10 @@ int ib_sa_service_rec_query(struct ib_sa_client *client,
        if (!query)
                return -ENOMEM;
 
-       query->sa_query.mad_buf = ib_create_send_mad(agent, 1, 0,
-                                                    0, IB_MGMT_SA_HDR,
-                                                    IB_MGMT_SA_DATA, gfp_mask);
-       if (!query->sa_query.mad_buf) {
-               ret = -ENOMEM;
+       query->sa_query.port     = port;
+       ret = alloc_mad(&query->sa_query, gfp_mask);
+       if (ret)
                goto err1;
-       }
 
        ib_sa_client_get(client);
        query->sa_query.client = client;
@@ -791,7 +812,6 @@ int ib_sa_service_rec_query(struct ib_sa_client *client,
 
        query->sa_query.callback = callback ? ib_sa_service_rec_callback : NULL;
        query->sa_query.release  = ib_sa_service_rec_release;
-       query->sa_query.port     = port;
        mad->mad_hdr.method      = method;
        mad->mad_hdr.attr_id     = cpu_to_be16(IB_SA_ATTR_SERVICE_REC);
        mad->sa_hdr.comp_mask    = comp_mask;
@@ -810,7 +830,7 @@ int ib_sa_service_rec_query(struct ib_sa_client *client,
 err2:
        *sa_query = NULL;
        ib_sa_client_put(query->sa_query.client);
-       ib_free_send_mad(query->sa_query.mad_buf);
+       free_mad(&query->sa_query);
 
 err1:
        kfree(query);
@@ -869,13 +889,10 @@ int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
        if (!query)
                return -ENOMEM;
 
-       query->sa_query.mad_buf = ib_create_send_mad(agent, 1, 0,
-                                                    0, IB_MGMT_SA_HDR,
-                                                    IB_MGMT_SA_DATA, gfp_mask);
-       if (!query->sa_query.mad_buf) {
-               ret = -ENOMEM;
+       query->sa_query.port     = port;
+       ret = alloc_mad(&query->sa_query, gfp_mask);
+       if (ret)
                goto err1;
-       }
 
        ib_sa_client_get(client);
        query->sa_query.client = client;
@@ -887,7 +904,6 @@ int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
 
        query->sa_query.callback = callback ? ib_sa_mcmember_rec_callback : NULL;
        query->sa_query.release  = ib_sa_mcmember_rec_release;
-       query->sa_query.port     = port;
        mad->mad_hdr.method      = method;
        mad->mad_hdr.attr_id     = cpu_to_be16(IB_SA_ATTR_MC_MEMBER_REC);
        mad->sa_hdr.comp_mask    = comp_mask;
@@ -906,7 +922,7 @@ int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
 err2:
        *sa_query = NULL;
        ib_sa_client_put(query->sa_query.client);
-       ib_free_send_mad(query->sa_query.mad_buf);
+       free_mad(&query->sa_query);
 
 err1:
        kfree(query);
@@ -939,8 +955,7 @@ static void send_handler(struct ib_mad_agent *agent,
        idr_remove(&query_idr, query->id);
        spin_unlock_irqrestore(&idr_lock, flags);
 
-       ib_free_send_mad(mad_send_wc->send_buf);
-       kref_put(&query->sm_ah->ref, free_sm_ah);
+       free_mad(query);
        ib_sa_client_put(query->client);
        query->release(query);
 }

diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index 739fa4d0e539bc195a1dc02494c3def9eff352e6..30712ddd8a5e6b6cc1add751f95948e9a3382bbd 100644 (file)
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -111,6 +111,9 @@
 #define IB_QP1_QKEY    0x80010000
 #define IB_QP_SET_QKEY 0x80000000
 
+#define IB_DEFAULT_PKEY_PARTIAL 0x7FFF
+#define IB_DEFAULT_PKEY_FULL   0xFFFF
+
 enum {
        IB_MGMT_MAD_HDR = 24,
        IB_MGMT_MAD_DATA = 232,