Commit be0e8f34 authored by Parav Pandit's avatar Parav Pandit Committed by Doug Ledford
Browse files

IB/core: Reuse gid_table_release_one() in table allocation failure 



_gid_table_setup_one() only performs GID table cache memory allocation,
marks entries as invalid (free) and marks the reserved entries.
At this point GID table is empty and no entries are added.

On dual port device if _gid_table_setup_one() fails to allocate the gid
table for 2nd port, there is no need to perform cleanup_gid_table_port()
to delete GID entries, as GID table is empty.
Therefore make use of existing gid_table_release_one() routine which
frees the GID table memory and avoid code duplication.

Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 25a1cd3f

drivers/infiniband/core/cache.c

+16 −26
Original line number Diff line number Diff line
@@ -778,50 +778,40 @@ static void gid_table_reserve_default(struct ib_device *ib_dev, u8 port, 
	}

}





static void gid_table_release_one(struct ib_device *ib_dev)

{

	struct ib_gid_table *table;

	u8 port;



	for (port = 0; port < ib_dev->phys_port_cnt; port++) {

		table = ib_dev->cache.ports[port].gid;

		release_gid_table(table);

		ib_dev->cache.ports[port].gid = NULL;

	}

}



static int _gid_table_setup_one(struct ib_device *ib_dev)

{

	u8 port;

	struct ib_gid_table *table;

	int err = 0;



	for (port = 0; port < ib_dev->phys_port_cnt; port++) {

		u8 rdma_port = port + rdma_start_port(ib_dev);



		table =	alloc_gid_table(

				ib_dev->port_immutable[rdma_port].gid_tbl_len);

		if (!table) {

			err = -ENOMEM;

		if (!table)

			goto rollback_table_setup;

		}



		gid_table_reserve_default(ib_dev, rdma_port, table);

		ib_dev->cache.ports[port].gid = table;

	}



	return 0;



rollback_table_setup:

	for (port = 0; port < ib_dev->phys_port_cnt; port++) {

		table = ib_dev->cache.ports[port].gid;



		cleanup_gid_table_port(ib_dev, port + rdma_start_port(ib_dev),

				       table);

		release_gid_table(table);

	}



	return err;

}



static void gid_table_release_one(struct ib_device *ib_dev)

{

	struct ib_gid_table *table;

	u8 port;



	for (port = 0; port < ib_dev->phys_port_cnt; port++) {

		table = ib_dev->cache.ports[port].gid;

		release_gid_table(table);

		ib_dev->cache.ports[port].gid = NULL;

	}

	gid_table_release_one(ib_dev);

	return -ENOMEM;

}



static void gid_table_cleanup_one(struct ib_device *ib_dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE