Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbda523 authored by Eli Cohen's avatar Eli Cohen Committed by Doug Ledford
Browse files

IB/mlx5: Wait for all async command completions to complete 



Wait before continuing unload till all pending mkey async creation requests
are done.

Fixes: e126ba97 ('mlx5: Add driver for Mellanox Connect-IB adapters')
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 86695a65

drivers/infiniband/hw/mlx5/mr.c

+28 −0
Original line number Diff line number Diff line
@@ -645,6 +645,33 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev) 
	return 0;

}



static void wait_for_async_commands(struct mlx5_ib_dev *dev)

{

	struct mlx5_mr_cache *cache = &dev->cache;

	struct mlx5_cache_ent *ent;

	int total = 0;

	int i;

	int j;



	for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) {

		ent = &cache->ent[i];

		for (j = 0 ; j < 1000; j++) {

			if (!ent->pending)

				break;

			msleep(50);

		}

	}

	for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) {

		ent = &cache->ent[i];

		total += ent->pending;

	}



	if (total)

		mlx5_ib_warn(dev, "aborted while there are %d pending mr requests\n", total);

	else

		mlx5_ib_warn(dev, "done with all pending requests\n");

}



int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev)

{

	int i;
@@ -658,6 +685,7 @@ int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev) 
		clean_keys(dev, i);



	destroy_workqueue(dev->cache.wq);

	wait_for_async_commands(dev);

	del_timer_sync(&dev->delay_timer);



	return 0;