Commit 0dd4394f authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Konrad Sztyber
Browse files

accel/mlx5: Fix deinit process 



The crypto_ctx pointer is checked in accel_mlx5_deinit
to unregister IO device, but due to an error during
ctx init, crypto_ctx might be not NULL but IO device
might be not registered. To fix it, add a flag which
indicates that module was successfully initialized.
Also, fix accel_mlx5_free_resources to correctly
release partially constructed ctx

Signed-off-by: default avatarAlexey Marchuk <alexeymar@nvidia.com>
Change-Id: Ieb9cffc98ef237c12b8c4d25354cbe7ad2907528
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23110


Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
parent e10905f0

module/accel/mlx5/accel_mlx5.c

+4 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct accel_mlx5_module { 
	struct accel_mlx5_attr attr;

	char **allowed_devs;

	size_t allowed_devs_count;

	bool initialized;

	bool enabled;

	bool crypto_supported;

};
@@ -1104,6 +1105,7 @@ accel_mlx5_free_resources(void) 


	free(g_accel_mlx5.crypto_ctxs);

	g_accel_mlx5.crypto_ctxs = NULL;

	g_accel_mlx5.initialized = false;

}



static void
@@ -1120,7 +1122,7 @@ accel_mlx5_deinit(void *ctx) 
		accel_mlx5_allowed_devs_free();

	}

	spdk_mlx5_crypto_devs_allow(NULL, 0);

	if (g_accel_mlx5.crypto_ctxs) {

	if (g_accel_mlx5.initialized) {

		spdk_io_device_unregister(&g_accel_mlx5, accel_mlx5_deinit_cb);

	} else {

		spdk_accel_module_finish();
@@ -1374,7 +1376,7 @@ accel_mlx5_init(void) 
	SPDK_NOTICELOG("Accel framework mlx5 initialized, found %d devices.\n", num_devs);

	spdk_io_device_register(&g_accel_mlx5, accel_mlx5_create_cb, accel_mlx5_destroy_cb,

				sizeof(struct accel_mlx5_io_channel), "accel_mlx5");



	g_accel_mlx5.initialized = true;

	free(rdma_devs);

	free(caps);