diff options
| author | Ira Weiny <ira.weiny@intel.com> | 2015-06-06 21:38:29 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-06-12 21:49:17 +0300 |
| commit | 337877a466bb8b0c51f4fa727eeef7d734665632 (patch) | |
| tree | 3d05512e358f2fe92e15db23a2b7bc18312f116b /drivers/infiniband/core | |
| parent | da2dfaa3a35cb5b68fc6ab2e442339de03cacd09 (diff) | |
| download | linux-337877a466bb8b0c51f4fa727eeef7d734665632.tar.xz | |
IB/core: Add ability for drivers to report an alternate MAD size.
Add max MAD size to the device immutable data set and have all drivers that
support MADs report the current IB MAD size (IB_MGMT_MAD_SIZE) to the core.
Verify MAD size data in both the MAD core and when reading the immutable data.
OPA drivers will report alternate MAD sizes in subsequent patches.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/device.c | 11 | ||||
| -rw-r--r-- | drivers/infiniband/core/mad.c | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 694bd669b2d8..9567756ca4f9 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -211,6 +211,12 @@ static int add_client_context(struct ib_device *device, struct ib_client *client return 0; } +static int verify_immutable(const struct ib_device *dev, u8 port) +{ + return WARN_ON(!rdma_cap_ib_mad(dev, port) && + rdma_max_mad_size(dev, port) != 0); +} + static int read_port_immutable(struct ib_device *device) { int ret = -ENOMEM; @@ -236,6 +242,11 @@ static int read_port_immutable(struct ib_device *device) &device->port_immutable[port]); if (ret) goto err; + + if (verify_immutable(device, port)) { + ret = -EINVAL; + goto err; + } } ret = 0; diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index b6d56e97bbaf..c3452fc54e88 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -2939,6 +2939,9 @@ static int ib_mad_port_open(struct ib_device *device, int has_smi; struct ib_cq_init_attr cq_attr = {}; + if (WARN_ON(rdma_max_mad_size(device, port_num) < IB_MGMT_MAD_SIZE)) + return -EFAULT; + /* Create new device info */ port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL); if (!port_priv) { |