Commit 59590b8a authored by Yuval Shaia's avatar Yuval Shaia Committed by Jason Gunthorpe
Browse files

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: default avatarYuval Shaia <yuval.shaia@oracle.com>
Acked-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a1462351

drivers/infiniband/hw/mlx5/mad.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

}

drivers/infiniband/hw/qedr/verbs.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

}

drivers/infiniband/sw/rxe/rxe_verbs.c

+1 −21
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE