mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
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: 1bd8e0a9d0
("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>
This commit is contained in:
parent
54ecb8f702
commit
663912a637
1 changed files with 11 additions and 1 deletions
|
@ -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,
|
int rdma_counter_bind_qpn(struct ib_device *dev, u8 port,
|
||||||
u32 qp_num, u32 counter_id)
|
u32 qp_num, u32 counter_id)
|
||||||
{
|
{
|
||||||
|
struct rdma_port_counter *port_counter;
|
||||||
struct rdma_counter *counter;
|
struct rdma_counter *counter;
|
||||||
struct ib_qp *qp;
|
struct ib_qp *qp;
|
||||||
int ret;
|
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);
|
qp = rdma_counter_get_qp(dev, qp_num);
|
||||||
if (!qp)
|
if (!qp)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
@ -503,6 +508,7 @@ int rdma_counter_bind_qpn(struct ib_device *dev, u8 port,
|
||||||
int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port,
|
int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port,
|
||||||
u32 qp_num, u32 *counter_id)
|
u32 qp_num, u32 *counter_id)
|
||||||
{
|
{
|
||||||
|
struct rdma_port_counter *port_counter;
|
||||||
struct rdma_counter *counter;
|
struct rdma_counter *counter;
|
||||||
struct ib_qp *qp;
|
struct ib_qp *qp;
|
||||||
int ret;
|
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))
|
if (!rdma_is_port_valid(dev, port))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (!dev->port_data[port].port_counter.hstats)
|
port_counter = &dev->port_data[port].port_counter;
|
||||||
|
if (!port_counter->hstats)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
if (port_counter->mode.mode == RDMA_COUNTER_MODE_AUTO)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
qp = rdma_counter_get_qp(dev, qp_num);
|
qp = rdma_counter_get_qp(dev, qp_num);
|
||||||
if (!qp)
|
if (!qp)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
Loading…
Reference in a new issue