| Message ID | 20190807101819.7581-1-leon@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d97de8887a12c598abc4d2e4e57a54c1f030e112 |
| Headers | show |
| Series | [rdma-rc] RDMA/counter: Prevent QP counter binding if counters unsupported | expand |
On Wed, 2019-08-07 at 13:18 +0300, Leon Romanovsky wrote: > From: Mark Zhang <markz@mellanox.com> > > In case of rdma_counter_init() fails, counter allocation and QP bind > should not be allowed. > > Fixes: 413d3347503b ("RDMA/counter: Add set/clear per-port auto mode > support") > Fixes: 1bd8e0a9d0fd ("RDMA/counter: Allow manual mode configuration > support") > Signed-off-by: Mark Zhang <markz@mellanox.com> > Reviewed-by: Parav Pandit <parav@mellanox.com> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Looks good, applied to for-rc, thanks.
diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c index 45d5164e9574..b79890739a2c 100644 --- a/drivers/infiniband/core/counters.c +++ b/drivers/infiniband/core/counters.c @@ -38,6 +38,9 @@ int rdma_counter_set_auto_mode(struct ib_device *dev, u8 port, int ret; port_counter = &dev->port_data[port].port_counter; + if (!port_counter->hstats) + return -EOPNOTSUPP; + mutex_lock(&port_counter->lock); if (on) { ret = __counter_set_mode(&port_counter->mode, @@ -509,6 +512,9 @@ int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port, if (!rdma_is_port_valid(dev, port)) return -EINVAL; + if (!dev->port_data[port].port_counter.hstats) + return -EOPNOTSUPP; + qp = rdma_counter_get_qp(dev, qp_num); if (!qp) return -ENOENT;