RDMA/counter: Prevent QP counter manual binding in auto mode

commit 663912a6378a34fd4f43b8d873f0c6c6322d9d0e upstream.

If auto mode is configured, manual counter allocation and QP bind is not
allowed.

Fixes: 1bd8e0a9d0fd ("RDMA/counter: Allow manual mode configuration support")
Link: https://lore.kernel.org/r/20190916071154.20383-3-leon@kernel.org
Signed-off-by: Mark Zhang <markz@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c
index 023478107f0e59c54f8c054a7039384c98e781ef..46dd50ff7c85a1da4ac51ace70a0a4c8a073f253 100644 (file)
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@ -466,10 +466,15 @@ static struct rdma_counter *rdma_get_counter_by_id(struct ib_device *dev,
 int rdma_counter_bind_qpn(struct ib_device *dev, u8 port,
                          u32 qp_num, u32 counter_id)
 {
+       struct rdma_port_counter *port_counter;
        struct rdma_counter *counter;
        struct ib_qp *qp;
        int ret;
 
+       port_counter = &dev->port_data[port].port_counter;
+       if (port_counter->mode.mode == RDMA_COUNTER_MODE_AUTO)
+               return -EINVAL;
+
        qp = rdma_counter_get_qp(dev, qp_num);
        if (!qp)
                return -ENOENT;
@@ -506,6 +511,7 @@ err:
 int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port,
                                u32 qp_num, u32 *counter_id)
 {
+       struct rdma_port_counter *port_counter;
        struct rdma_counter *counter;
        struct ib_qp *qp;
        int ret;
@@ -513,9 +519,13 @@ 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)
+       port_counter = &dev->port_data[port].port_counter;
+       if (!port_counter->hstats)
                return -EOPNOTSUPP;
 
+       if (port_counter->mode.mode == RDMA_COUNTER_MODE_AUTO)
+               return -EINVAL;
+
        qp = rdma_counter_get_qp(dev, qp_num);
        if (!qp)
                return -ENOENT;