]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
RDMA/counter: Allow manually bind QPs with different pids to same counter
authorMark Zhang <markz@mellanox.com>
Thu, 2 Jul 2020 08:29:33 +0000 (11:29 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 11:07:34 +0000 (13:07 +0200)
[ Upstream commit cbeb7d896c0f296451ffa7b67e7706786b8364c8 ]

In manual mode allow bind user QPs with different pids to same counter,
since this is allowed in auto mode.
Bind kernel QPs and user QPs to the same counter are not allowed.

Fixes: 1bd8e0a9d0fd ("RDMA/counter: Allow manual mode configuration support")
Link: https://lore.kernel.org/r/20200702082933.424537-4-leon@kernel.org
Signed-off-by: Mark Zhang <markz@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/core/counters.c

index 6deb1901fbd029b726f787da69fedd211e9f1016..417ebf4d8ba9b640a6f529465afc082bf1414a26 100644 (file)
@@ -483,7 +483,7 @@ int rdma_counter_bind_qpn(struct ib_device *dev, u8 port,
                goto err;
        }
 
-       if (counter->res.task != qp->res.task) {
+       if (rdma_is_kernel_res(&counter->res) != rdma_is_kernel_res(&qp->res)) {
                ret = -EINVAL;
                goto err_task;
        }