IB/mad: Add dev_notice messages for various umad/mad registration failures

Registration failures can be difficult to debug from userspace.  This
gives more visibility.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 08f430319fc8699f061d348f4d1bb1ed0cc27bde..f46995d4f54bcba2b0d7845701ca8291f4f4a6a8 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -214,58 +214,95 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
 
        /* Validate parameters */
        qpn = get_spl_qp_index(qp_type);
-       if (qpn == -1)
+       if (qpn == -1) {
+               dev_notice(&device->dev,
+                          "ib_register_mad_agent: invalid QP Type %d\n",
+                          qp_type);
                goto error1;
+       }
 
-       if (rmpp_version && rmpp_version != IB_MGMT_RMPP_VERSION)
+       if (rmpp_version && rmpp_version != IB_MGMT_RMPP_VERSION) {
+               dev_notice(&device->dev,
+                          "ib_register_mad_agent: invalid RMPP Version %u\n",
+                          rmpp_version);
                goto error1;
+       }
 
        /* Validate MAD registration request if supplied */
        if (mad_reg_req) {
-               if (mad_reg_req->mgmt_class_version >= MAX_MGMT_VERSION)
+               if (mad_reg_req->mgmt_class_version >= MAX_MGMT_VERSION) {
+                       dev_notice(&device->dev,
+                                  "ib_register_mad_agent: invalid Class Version %u\n",
+                                  mad_reg_req->mgmt_class_version);
                        goto error1;
-               if (!recv_handler)
+               }
+               if (!recv_handler) {
+                       dev_notice(&device->dev,
+                                  "ib_register_mad_agent: no recv_handler\n");
                        goto error1;
+               }
                if (mad_reg_req->mgmt_class >= MAX_MGMT_CLASS) {
                        /*
                         * IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE is the only
                         * one in this range currently allowed
                         */
                        if (mad_reg_req->mgmt_class !=
-                           IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
+                           IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) {
+                               dev_notice(&device->dev,
+                                          "ib_register_mad_agent: Invalid Mgmt Class 0x%x\n",
+                                          mad_reg_req->mgmt_class);
                                goto error1;
+                       }
                } else if (mad_reg_req->mgmt_class == 0) {
                        /*
                         * Class 0 is reserved in IBA and is used for
                         * aliasing of IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE
                         */
+                       dev_notice(&device->dev,
+                                  "ib_register_mad_agent: Invalid Mgmt Class 0\n");
                        goto error1;
                } else if (is_vendor_class(mad_reg_req->mgmt_class)) {
                        /*
                         * If class is in "new" vendor range,
                         * ensure supplied OUI is not zero
                         */
-                       if (!is_vendor_oui(mad_reg_req->oui))
+                       if (!is_vendor_oui(mad_reg_req->oui)) {
+                               dev_notice(&device->dev,
+                                          "ib_register_mad_agent: No OUI specified for class 0x%x\n",
+                                          mad_reg_req->mgmt_class);
                                goto error1;
+                       }
                }
                /* Make sure class supplied is consistent with RMPP */
                if (!ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {
-                       if (rmpp_version)
+                       if (rmpp_version) {
+                               dev_notice(&device->dev,
+                                          "ib_register_mad_agent: RMPP version for non-RMPP class 0x%x\n",
+                                          mad_reg_req->mgmt_class);
                                goto error1;
+                       }
                }
                /* Make sure class supplied is consistent with QP type */
                if (qp_type == IB_QPT_SMI) {
                        if ((mad_reg_req->mgmt_class !=
                                        IB_MGMT_CLASS_SUBN_LID_ROUTED) &&
                            (mad_reg_req->mgmt_class !=
-                                       IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE))
+                                       IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) {
+                               dev_notice(&device->dev,
+                                          "ib_register_mad_agent: Invalid SM QP type: class 0x%x\n",
+                                          mad_reg_req->mgmt_class);
                                goto error1;
+                       }
                } else {
                        if ((mad_reg_req->mgmt_class ==
                                        IB_MGMT_CLASS_SUBN_LID_ROUTED) ||
                            (mad_reg_req->mgmt_class ==
-                                       IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE))
+                                       IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) {
+                               dev_notice(&device->dev,
+                                          "ib_register_mad_agent: Invalid GS QP type: class 0x%x\n",
+                                          mad_reg_req->mgmt_class);
                                goto error1;
+                       }
                }
        } else {
                /* No registration request supplied */
@@ -276,6 +313,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
        /* Validate device and port */
        port_priv = ib_get_mad_port(device, port_num);
        if (!port_priv) {
+               dev_notice(&device->dev, "ib_register_mad_agent: Invalid port\n");
                ret = ERR_PTR(-ENODEV);
                goto error1;
        }
@@ -283,6 +321,8 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
        /* Verify the QP requested is supported.  For example, Ethernet devices
         * will not have QP0 */
        if (!port_priv->qp_info[qpn].qp) {
+               dev_notice(&device->dev,
+                          "ib_register_mad_agent: QP %d not supported\n", qpn);
                ret = ERR_PTR(-EPROTONOSUPPORT);
                goto error1;
        }

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 6be596dc360acf33c9712504ec078c9ef688fb39..ea90a3ebb9c2c8d6e101d4fec27b1d8214782b4e 100644 (file)
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -616,6 +616,8 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
        mutex_lock(&file->mutex);
 
        if (!file->port->ib_dev) {
+               dev_notice(file->port->dev,
+                          "ib_umad_reg_agent: invalid device\n");
                ret = -EPIPE;
                goto out;
        }
@@ -626,6 +628,9 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
        }
 
        if (ureq.qpn != 0 && ureq.qpn != 1) {
+               dev_notice(file->port->dev,
+                          "ib_umad_reg_agent: invalid QPN %d specified\n",
+                          ureq.qpn);
                ret = -EINVAL;
                goto out;
        }
@@ -634,6 +639,9 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, void __user *arg,
                if (!__get_agent(file, agent_id))
                        goto found;
 
+       dev_notice(file->port->dev,
+                  "ib_umad_reg_agent: Max Agents (%u) reached\n",
+                  IB_UMAD_MAX_AGENTS);
        ret = -ENOMEM;
        goto out;