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

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>

diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c
index 680ad27..736ab76 100644 (file)
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@ -463,10 +463,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;
@@ -503,6 +508,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;
@@ -510,9 +516,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;