Commit c0069a78 authored by Ankit Kumar's avatar Ankit Kumar Committed by Jim Harris
Browse files

identify: fix redundant check for fdp log pages support 



The get_feature for feature id SPDK_NVME_FEAT_FDP already verifies if
fdps bit is set in controller attributes. All the fdp log pages are
requested based on the completion of that get feature command.

Change-Id: Ied1e1a4e705f76486027d87d98f373c0c01c8f2e
Signed-off-by: default avatarAnkit Kumar <ankit.kumar@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22841


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 0d61c7d6

app/spdk_nvme_identify/identify.c

+32 −40
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ get_fdp_cfg_log_page(struct spdk_nvme_ns *ns) 


	outstanding_commands = 0;



	if (spdk_nvme_ctrlr_is_log_page_supported(ctrlr, SPDK_NVME_LOG_FDP_CONFIGURATIONS)) {

	/* Fetch the FDP configurations log page for only 4096 bytes */

	if (spdk_nvme_ctrlr_cmd_get_log_page_ext(ctrlr, SPDK_NVME_LOG_FDP_CONFIGURATIONS, 0,

			g_fdp_cfg_log_page, FDP_LOG_PAGE_SIZE, 0, 0, (nsdata->endgid << 16),
@@ -534,7 +533,6 @@ get_fdp_cfg_log_page(struct spdk_nvme_ns *ns) 
		printf("spdk_nvme_ctrlr_cmd_get_log_page_ext(FDP config) failed\n");

		return -1;

	}

	}



	while (outstanding_commands) {

		spdk_nvme_ctrlr_process_admin_completions(ctrlr);
@@ -551,7 +549,6 @@ get_fdp_ruhu_log_page(struct spdk_nvme_ns *ns) 


	outstanding_commands = 0;



	if (spdk_nvme_ctrlr_is_log_page_supported(ctrlr, SPDK_NVME_LOG_RECLAIM_UNIT_HANDLE_USAGE)) {

	/* Fetch the reclaim unit handle usage log page for only 4096 bytes */

	if (spdk_nvme_ctrlr_cmd_get_log_page_ext(ctrlr, SPDK_NVME_LOG_RECLAIM_UNIT_HANDLE_USAGE, 0,

			g_fdp_ruhu_log_page, FDP_LOG_PAGE_SIZE, 0, 0, (nsdata->endgid << 16),
@@ -561,7 +558,6 @@ get_fdp_ruhu_log_page(struct spdk_nvme_ns *ns) 
		printf("spdk_nvme_ctrlr_cmd_get_log_page_ext(RUH usage) failed\n");

		return -1;

	}

	}



	while (outstanding_commands) {

		spdk_nvme_ctrlr_process_admin_completions(ctrlr);
@@ -578,7 +574,6 @@ get_fdp_stats_log_page(struct spdk_nvme_ns *ns) 


	outstanding_commands = 0;



	if (spdk_nvme_ctrlr_is_log_page_supported(ctrlr, SPDK_NVME_LOG_FDP_STATISTICS)) {

	if (spdk_nvme_ctrlr_cmd_get_log_page_ext(ctrlr, SPDK_NVME_LOG_FDP_STATISTICS, 0,

			&g_fdp_stats_log_page, 64, 0, 0, (nsdata->endgid << 16), 0,

			get_log_page_completion, NULL) == 0) {
@@ -587,7 +582,6 @@ get_fdp_stats_log_page(struct spdk_nvme_ns *ns) 
		printf("spdk_nvme_ctrlr_cmd_get_log_page_ext(FDP stats) failed\n");

		return -1;

	}

	}



	while (outstanding_commands) {

		spdk_nvme_ctrlr_process_admin_completions(ctrlr);
@@ -604,7 +598,6 @@ get_fdp_events_log_page(struct spdk_nvme_ns *ns) 


	outstanding_commands = 0;



	if (spdk_nvme_ctrlr_is_log_page_supported(ctrlr, SPDK_NVME_LOG_FDP_EVENTS)) {

	/* Only fetch FDP host events here */

	if (spdk_nvme_ctrlr_cmd_get_log_page_ext(ctrlr, SPDK_NVME_LOG_FDP_EVENTS, 0,

			g_fdp_events_log_page, FDP_LOG_PAGE_SIZE, 0,
@@ -615,7 +608,6 @@ get_fdp_events_log_page(struct spdk_nvme_ns *ns) 
		printf("spdk_nvme_ctrlr_cmd_get_log_page_ext(FDP events) failed\n");

		return -1;

	}

	}



	while (outstanding_commands) {

		spdk_nvme_ctrlr_process_admin_completions(ctrlr);