Commit d24ea900 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: add offset to spdk_nvme_ctrlr_cmd_get_log_page() 



Change-Id: I1af4950995062f892062f29db85da2a8dd793d85
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 99389857

examples/nvme/arbitration/arbitration.c

+1 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ print_latency_statistics(const char *op_name, enum spdk_nvme_intel_log_page log_ 
				    SPDK_NVME_GLOBAL_NS_TAG,

				    &ctrlr->latency_page,

				    sizeof(struct spdk_nvme_intel_rw_latency_page),

				    0,

				    enable_latency_tracking_complete,

				    NULL)) {

				printf("nvme_ctrlr_cmd_get_log_page() failed\n");

examples/nvme/identify/identify.c

+5 −4
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ get_error_log_page(struct spdk_nvme_ctrlr *ctrlr) 
	if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_LOG_ERROR,

					     SPDK_NVME_GLOBAL_NS_TAG, error_page,

					     sizeof(*error_page) * (cdata->elpe + 1),

					     0,

					     get_log_page_completion, NULL)) {

		printf("spdk_nvme_ctrlr_cmd_get_log_page() failed\n");

		exit(1);
@@ -201,7 +202,7 @@ static int 
get_health_log_page(struct spdk_nvme_ctrlr *ctrlr)

{

	if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_LOG_HEALTH_INFORMATION,

					     SPDK_NVME_GLOBAL_NS_TAG, &health_page, sizeof(health_page), get_log_page_completion, NULL)) {

					     SPDK_NVME_GLOBAL_NS_TAG, &health_page, sizeof(health_page), 0, get_log_page_completion, NULL)) {

		printf("spdk_nvme_ctrlr_cmd_get_log_page() failed\n");

		exit(1);

	}
@@ -213,7 +214,7 @@ static int 
get_intel_smart_log_page(struct spdk_nvme_ctrlr *ctrlr)

{

	if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_INTEL_LOG_SMART, SPDK_NVME_GLOBAL_NS_TAG,

					     &intel_smart_page, sizeof(intel_smart_page), get_log_page_completion, NULL)) {

					     &intel_smart_page, sizeof(intel_smart_page), 0, get_log_page_completion, NULL)) {

		printf("spdk_nvme_ctrlr_cmd_get_log_page() failed\n");

		exit(1);

	}
@@ -225,7 +226,7 @@ static int 
get_intel_temperature_log_page(struct spdk_nvme_ctrlr *ctrlr)

{

	if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_INTEL_LOG_TEMPERATURE,

					     SPDK_NVME_GLOBAL_NS_TAG, &intel_temperature_page, sizeof(intel_temperature_page),

					     SPDK_NVME_GLOBAL_NS_TAG, &intel_temperature_page, sizeof(intel_temperature_page), 0,

					     get_log_page_completion, NULL)) {

		printf("spdk_nvme_ctrlr_cmd_get_log_page() failed\n");

		exit(1);
@@ -237,7 +238,7 @@ static int 
get_intel_md_log_page(struct spdk_nvme_ctrlr *ctrlr)

{

	if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_INTEL_MARKETING_DESCRIPTION,

					     SPDK_NVME_GLOBAL_NS_TAG, &intel_md_page, sizeof(intel_md_page),

					     SPDK_NVME_GLOBAL_NS_TAG, &intel_md_page, sizeof(intel_md_page), 0,

					     get_log_page_completion, NULL)) {

		printf("spdk_nvme_ctrlr_cmd_get_log_page() failed\n");

		exit(1);

examples/nvme/perf/perf.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ print_latency_statistics(const char *op_name, enum spdk_nvme_intel_log_page log_ 
	while (ctrlr) {

		if (spdk_nvme_ctrlr_is_log_page_supported(ctrlr->ctrlr, log_page)) {

			if (spdk_nvme_ctrlr_cmd_get_log_page(ctrlr->ctrlr, log_page, SPDK_NVME_GLOBAL_NS_TAG,

							     ctrlr->latency_page, sizeof(struct spdk_nvme_intel_rw_latency_page),

							     ctrlr->latency_page, sizeof(struct spdk_nvme_intel_rw_latency_page), 0,

							     enable_latency_tracking_complete,

							     NULL)) {

				printf("nvme_ctrlr_cmd_get_log_page() failed\n");

include/spdk/nvme.h

+4 −0
Original line number Diff line number Diff line
@@ -517,6 +517,9 @@ struct spdk_nvme_ns *spdk_nvme_ctrlr_get_ns(struct spdk_nvme_ctrlr *ctrlr, uint3 
 * \param nsid Depending on the log page, this may be 0, a namespace identifier, or SPDK_NVME_GLOBAL_NS_TAG.

 * \param payload The pointer to the payload buffer.

 * \param payload_size The size of payload buffer.

 * \param offset Offset in bytes within the log page to start retrieving log page data.

 *               May only be non-zero if the controller supports extended data for Get Log Page

 *               as reported in the controller data log page attributes.

 * \param cb_fn Callback function to invoke when the log page has been retrieved.

 * \param cb_arg Argument to pass to the callback function.

 *
@@ -533,6 +536,7 @@ struct spdk_nvme_ns *spdk_nvme_ctrlr_get_ns(struct spdk_nvme_ctrlr *ctrlr, uint3 
int spdk_nvme_ctrlr_cmd_get_log_page(struct spdk_nvme_ctrlr *ctrlr,

				     uint8_t log_page, uint32_t nsid,

				     void *payload, uint32_t payload_size,

				     uint64_t offset,

				     spdk_nvme_cmd_cb cb_fn, void *cb_arg);



/**

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr) 


	status.done = false;

	spdk_nvme_ctrlr_cmd_get_log_page(ctrlr, SPDK_NVME_INTEL_LOG_PAGE_DIRECTORY, SPDK_NVME_GLOBAL_NS_TAG,

					 log_page_directory, sizeof(struct spdk_nvme_intel_log_page_directory),

					 log_page_directory, sizeof(struct spdk_nvme_intel_log_page_directory), 0,

					 nvme_completion_poll_cb,

					 &status);

	while (status.done == false) {