Commit 33d04c66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fix from Jason Gunthorpe:
 "One fix for a bug that blktests hits when using rxe: tear down the CQ
  pool before waiting for all references to go away"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/core: Fix ordering of CQ pool destruction
parents 574ec42e 4aa16152

drivers/infiniband/core/device.c

+4 −2
Original line number Diff line number Diff line
@@ -1285,6 +1285,8 @@ static void disable_device(struct ib_device *device) 
		remove_client_context(device, cid);

	}



	ib_cq_pool_destroy(device);



	/* Pairs with refcount_set in enable_device */

	ib_device_put(device);

	wait_for_completion(&device->unreg_completion);
@@ -1328,6 +1330,8 @@ static int enable_device_and_get(struct ib_device *device) 
			goto out;

	}



	ib_cq_pool_init(device);



	down_read(&clients_rwsem);

	xa_for_each_marked (&clients, index, client, CLIENT_REGISTERED) {

		ret = add_client_context(device, client);
@@ -1400,7 +1404,6 @@ int ib_register_device(struct ib_device *device, const char *name) 
		goto dev_cleanup;

	}



	ib_cq_pool_init(device);

	ret = enable_device_and_get(device);

	dev_set_uevent_suppress(&device->dev, false);

	/* Mark for userspace that device is ready */
@@ -1455,7 +1458,6 @@ static void __ib_unregister_device(struct ib_device *ib_dev) 
		goto out;



	disable_device(ib_dev);

	ib_cq_pool_destroy(ib_dev);



	/* Expedite removing unregistered pointers from the hash table */

	free_netdevs(ib_dev);