mirror of https://gitee.com/openkylin/linux.git
IB/{mlx5,ocrdma,qedr,rxe}: Omit port validation from IB verbs
RDMA core layer already make sure port is valid, no need to check it here again. For the pkey validation this depends on commit b3ac5742fead ("RDMA/core: Validate port number in query_pkey verb") Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Acked-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
parent
a1462351b5
commit
59590b8ad2
|
@ -526,11 +526,6 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u8 port,
|
|||
int ext_active_speed;
|
||||
int err = -ENOMEM;
|
||||
|
||||
if (port < 1 || port > dev->num_ports) {
|
||||
mlx5_ib_warn(dev, "invalid port number %d\n", port);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
in_mad = kzalloc(sizeof(*in_mad), GFP_KERNEL);
|
||||
out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
|
||||
if (!in_mad || !out_mad)
|
||||
|
|
|
@ -177,11 +177,6 @@ int ocrdma_query_port(struct ib_device *ibdev,
|
|||
|
||||
/* props being zeroed by the caller, avoid zeroing it here */
|
||||
dev = get_ocrdma_dev(ibdev);
|
||||
if (port > 1) {
|
||||
pr_err("%s(%d) invalid_port=0x%x\n", __func__,
|
||||
dev->id, port);
|
||||
return -EINVAL;
|
||||
}
|
||||
netdev = dev->nic_info.netdev;
|
||||
if (netif_running(netdev) && netif_oper_up(netdev)) {
|
||||
port_state = IB_PORT_ACTIVE;
|
||||
|
@ -215,13 +210,6 @@ int ocrdma_query_port(struct ib_device *ibdev,
|
|||
int ocrdma_modify_port(struct ib_device *ibdev, u8 port, int mask,
|
||||
struct ib_port_modify *props)
|
||||
{
|
||||
struct ocrdma_dev *dev;
|
||||
|
||||
dev = get_ocrdma_dev(ibdev);
|
||||
if (port > 1) {
|
||||
pr_err("%s(%d) invalid_port=0x%x\n", __func__, dev->id, port);
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -216,10 +216,6 @@ int qedr_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *attr)
|
|||
struct qed_rdma_port *rdma_port;
|
||||
|
||||
dev = get_qedr_dev(ibdev);
|
||||
if (port > 1) {
|
||||
DP_ERR(dev, "invalid_port=0x%x\n", port);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!dev->rdma_ctx) {
|
||||
DP_ERR(dev, "rdma_ctx is NULL\n");
|
||||
|
@ -263,14 +259,6 @@ int qedr_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *attr)
|
|||
int qedr_modify_port(struct ib_device *ibdev, u8 port, int mask,
|
||||
struct ib_port_modify *props)
|
||||
{
|
||||
struct qedr_dev *dev;
|
||||
|
||||
dev = get_qedr_dev(ibdev);
|
||||
if (port > 1) {
|
||||
DP_ERR(dev, "invalid_port=0x%x\n", port);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -56,12 +56,7 @@ static int rxe_query_port(struct ib_device *dev,
|
|||
{
|
||||
struct rxe_dev *rxe = to_rdev(dev);
|
||||
struct rxe_port *port;
|
||||
int rc = -EINVAL;
|
||||
|
||||
if (unlikely(port_num != 1)) {
|
||||
pr_warn("invalid port_number %d\n", port_num);
|
||||
goto out;
|
||||
}
|
||||
int rc;
|
||||
|
||||
port = &rxe->port;
|
||||
|
||||
|
@ -81,7 +76,6 @@ static int rxe_query_port(struct ib_device *dev,
|
|||
|
||||
mutex_unlock(&rxe->usdev_lock);
|
||||
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -104,12 +98,6 @@ static int rxe_query_pkey(struct ib_device *device,
|
|||
struct rxe_dev *rxe = to_rdev(device);
|
||||
struct rxe_port *port;
|
||||
|
||||
if (unlikely(port_num != 1)) {
|
||||
dev_warn(device->dev.parent, "invalid port_num = %d\n",
|
||||
port_num);
|
||||
goto err1;
|
||||
}
|
||||
|
||||
port = &rxe->port;
|
||||
|
||||
if (unlikely(index >= port->attr.pkey_tbl_len)) {
|
||||
|
@ -147,11 +135,6 @@ static int rxe_modify_port(struct ib_device *dev,
|
|||
struct rxe_dev *rxe = to_rdev(dev);
|
||||
struct rxe_port *port;
|
||||
|
||||
if (unlikely(port_num != 1)) {
|
||||
pr_warn("invalid port_num = %d\n", port_num);
|
||||
goto err1;
|
||||
}
|
||||
|
||||
port = &rxe->port;
|
||||
|
||||
port->attr.port_cap_flags |= attr->set_port_cap_mask;
|
||||
|
@ -161,9 +144,6 @@ static int rxe_modify_port(struct ib_device *dev,
|
|||
port->attr.qkey_viol_cntr = 0;
|
||||
|
||||
return 0;
|
||||
|
||||
err1:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static enum rdma_link_layer rxe_get_link_layer(struct ib_device *dev,
|
||||
|
|
Loading…
Reference in New Issue