Commit cc055dd3 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA/cma: Use RDMA device port iterator 

Use RDMA device port iterator to avoid open coding.

Link: https://lore.kernel.org/r/20200126142652.104803-4-leon@kernel.org


Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 081ea519

drivers/infiniband/core/cma.c

+7 −6
Original line number Diff line number Diff line
@@ -728,8 +728,8 @@ static int cma_iw_acquire_dev(struct rdma_id_private *id_priv, 
	struct cma_device *cma_dev;

	enum ib_gid_type gid_type;

	int ret = -ENODEV;

	unsigned int port;

	union ib_gid gid;

	u8 port;



	if (dev_addr->dev_type != ARPHRD_INFINIBAND &&

	    id_priv->id.ps == RDMA_PS_IPOIB)
@@ -753,7 +753,8 @@ static int cma_iw_acquire_dev(struct rdma_id_private *id_priv, 
	}



	list_for_each_entry(cma_dev, &dev_list, list) {

		for (port = 1; port <= cma_dev->device->phys_port_cnt; ++port) {

		rdma_for_each_port (cma_dev->device, port) {



			if (listen_id_priv->cma_dev == cma_dev &&

			    listen_id_priv->id.port_num == port)

				continue;
@@ -786,8 +787,8 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) 
	struct cma_device *cma_dev, *cur_dev;

	struct sockaddr_ib *addr;

	union ib_gid gid, sgid, *dgid;

	unsigned int p;

	u16 pkey, index;

	u8 p;

	enum ib_port_state port_state;

	int i;
@@ -798,7 +799,7 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) 


	mutex_lock(&lock);

	list_for_each_entry(cur_dev, &dev_list, list) {

		for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {

		rdma_for_each_port (cur_dev->device, p) {

			if (!rdma_cap_af_ib(cur_dev->device, p))

				continue;
@@ -3029,9 +3030,9 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv) 
	struct cma_device *cma_dev, *cur_dev;

	union ib_gid gid;

	enum ib_port_state port_state;

	unsigned int p;

	u16 pkey;

	int ret;

	u8 p;



	cma_dev = NULL;

	mutex_lock(&lock);
@@ -3043,7 +3044,7 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv) 
		if (!cma_dev)

			cma_dev = cur_dev;



		for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {

		rdma_for_each_port (cur_dev->device, p) {

			if (!ib_get_cached_port_state(cur_dev->device, p, &port_state) &&

			    port_state == IB_PORT_ACTIVE) {

				cma_dev = cur_dev;