Commit 1a9c19a9 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib/nvme: remove spdk prefix from internal headers. 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Iccde5860b83217163428ff504cba87a1cf209720
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2444


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 230f827a

lib/nvme/nvme.c

+9 −9
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ nvme_completion_poll_cb(void *arg, const struct spdk_nvme_cpl *cpl) 
 * and status as the callback argument.

 */

int

spdk_nvme_wait_for_completion_robust_lock(

nvme_wait_for_completion_robust_lock(

	struct spdk_nvme_qpair *qpair,

	struct nvme_completion_poll_status *status,

	pthread_mutex_t *robust_mutex)
@@ -152,10 +152,10 @@ spdk_nvme_wait_for_completion_robust_lock( 
}



int

spdk_nvme_wait_for_completion(struct spdk_nvme_qpair *qpair,

nvme_wait_for_completion(struct spdk_nvme_qpair *qpair,

			 struct nvme_completion_poll_status *status)

{

	return spdk_nvme_wait_for_completion_robust_lock(qpair, status, NULL);

	return nvme_wait_for_completion_robust_lock(qpair, status, NULL);

}



/**
@@ -174,7 +174,7 @@ spdk_nvme_wait_for_completion(struct spdk_nvme_qpair *qpair, 
 * and status as the callback argument.

 */

int

spdk_nvme_wait_for_completion_timeout(struct spdk_nvme_qpair *qpair,

nvme_wait_for_completion_timeout(struct spdk_nvme_qpair *qpair,

				 struct nvme_completion_poll_status *status,

				 uint64_t timeout_in_secs)

{
@@ -439,7 +439,7 @@ nvme_driver_init(void) 
	nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);



	g_spdk_nvme_driver->initialized = false;

	g_spdk_nvme_driver->hotplug_fd = spdk_uevent_connect();

	g_spdk_nvme_driver->hotplug_fd = nvme_uevent_connect();

	if (g_spdk_nvme_driver->hotplug_fd < 0) {

		SPDK_DEBUGLOG(SPDK_LOG_NVME, "Failed to open uevent netlink socket\n");

	}
@@ -648,7 +648,7 @@ nvme_probe_internal(struct spdk_nvme_probe_ctx *probe_ctx, 
			}



			/* Do not attach if we failed to initialize it in this process */

			if (spdk_nvme_ctrlr_get_current_process(ctrlr) == NULL) {

			if (nvme_ctrlr_get_current_process(ctrlr) == NULL) {

				continue;

			}

lib/nvme/nvme_ctrlr.c

+25 −25
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ nvme_ctrlr_proc_add_io_qpair(struct spdk_nvme_qpair *qpair) 
	struct spdk_nvme_ctrlr_process	*active_proc;

	struct spdk_nvme_ctrlr		*ctrlr = qpair->ctrlr;



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		TAILQ_INSERT_TAIL(&active_proc->allocated_io_qpairs, qpair, per_process_tailq);

		qpair->active_proc = active_proc;
@@ -217,7 +217,7 @@ nvme_ctrlr_proc_remove_io_qpair(struct spdk_nvme_qpair *qpair) 
	struct spdk_nvme_ctrlr		*ctrlr = qpair->ctrlr;

	struct spdk_nvme_qpair          *active_qpair, *tmp_qpair;



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (!active_proc) {

		return;

	}
@@ -621,7 +621,7 @@ static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr) 
		return rc;

	}



	if (spdk_nvme_wait_for_completion_timeout(ctrlr->adminq, status,

	if (nvme_wait_for_completion_timeout(ctrlr->adminq, status,

					     ctrlr->opts.admin_timeout_ms / 1000)) {

		spdk_free(log_page_directory);

		SPDK_WARNLOG("Intel log pages not supported on Intel drive!\n");
@@ -706,7 +706,7 @@ nvme_ctrlr_set_arbitration_feature(struct spdk_nvme_ctrlr *ctrlr) 
		return;

	}



	if (spdk_nvme_wait_for_completion_timeout(ctrlr->adminq, status,

	if (nvme_wait_for_completion_timeout(ctrlr->adminq, status,

					     ctrlr->opts.admin_timeout_ms / 1000)) {

		SPDK_ERRLOG("Timeout to set arbitration feature\n");

	}
@@ -2068,7 +2068,7 @@ nvme_ctrlr_async_event_cb(void *arg, const struct spdk_nvme_cpl *cpl) 
		nvme_ctrlr_update_namespaces(ctrlr);

	}



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc && active_proc->aer_cb_fn) {

		active_proc->aer_cb_fn(active_proc->aer_cb_arg, cpl);

	}
@@ -2179,7 +2179,7 @@ nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr) 
}



struct spdk_nvme_ctrlr_process *

spdk_nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr, pid_t pid)

nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr, pid_t pid)

{

	struct spdk_nvme_ctrlr_process	*active_proc;
@@ -2193,9 +2193,9 @@ spdk_nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr, pid_t pid) 
}



struct spdk_nvme_ctrlr_process *

spdk_nvme_ctrlr_get_current_process(struct spdk_nvme_ctrlr *ctrlr)

nvme_ctrlr_get_current_process(struct spdk_nvme_ctrlr *ctrlr)

{

	return spdk_nvme_ctrlr_get_process(ctrlr, getpid());

	return nvme_ctrlr_get_process(ctrlr, getpid());

}



/**
@@ -2211,7 +2211,7 @@ nvme_ctrlr_add_process(struct spdk_nvme_ctrlr *ctrlr, void *devhandle) 
	pid_t				pid = getpid();



	/* Check whether the process is already added or not */

	if (spdk_nvme_ctrlr_get_process(ctrlr, pid)) {

	if (nvme_ctrlr_get_process(ctrlr, pid)) {

		return 0;

	}
@@ -2355,7 +2355,7 @@ nvme_ctrlr_proc_get_ref(struct spdk_nvme_ctrlr *ctrlr) 


	nvme_ctrlr_remove_inactive_proc(ctrlr);



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		active_proc->ref++;

	}
@@ -2373,7 +2373,7 @@ nvme_ctrlr_proc_put_ref(struct spdk_nvme_ctrlr *ctrlr) 


	proc_count = nvme_ctrlr_remove_inactive_proc(ctrlr);



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		active_proc->ref--;

		assert(active_proc->ref >= 0);
@@ -2420,7 +2420,7 @@ nvme_ctrlr_proc_get_devhandle(struct spdk_nvme_ctrlr *ctrlr) 


	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		devhandle = active_proc->devhandle;

	}
@@ -3037,7 +3037,7 @@ spdk_nvme_ctrlr_register_aer_callback(struct spdk_nvme_ctrlr *ctrlr, 


	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		active_proc->aer_cb_fn = aer_cb_fn;

		active_proc->aer_cb_arg = aer_cb_arg;
@@ -3054,7 +3054,7 @@ spdk_nvme_ctrlr_register_timeout_callback(struct spdk_nvme_ctrlr *ctrlr, 


	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);



	active_proc = spdk_nvme_ctrlr_get_current_process(ctrlr);

	active_proc = nvme_ctrlr_get_current_process(ctrlr);

	if (active_proc) {

		active_proc->timeout_ticks = timeout_us * spdk_get_ticks_hz() / 1000000ULL;

		active_proc->timeout_cb_fn = cb_fn;
@@ -3102,7 +3102,7 @@ spdk_nvme_ctrlr_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_attach_ns failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3140,7 +3140,7 @@ spdk_nvme_ctrlr_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_detach_ns failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3180,7 +3180,7 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat 
		free(status);

		return 0;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_create_ns failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3219,7 +3219,7 @@ spdk_nvme_ctrlr_delete_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid) 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_delete_ns failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3258,7 +3258,7 @@ spdk_nvme_ctrlr_format(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_format failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3323,7 +3323,7 @@ spdk_nvme_ctrlr_update_firmware(struct spdk_nvme_ctrlr *ctrlr, void *payload, ui 
			return res;

		}



		if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

			SPDK_ERRLOG("spdk_nvme_ctrlr_fw_image_download failed!\n");

			if (!status->timed_out) {

				free(status);
@@ -3348,7 +3348,7 @@ spdk_nvme_ctrlr_update_firmware(struct spdk_nvme_ctrlr *ctrlr, void *payload, ui 
		return res;

	}



	res = spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock);

	res = nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock);



	memcpy(completion_status, &status->cpl.status, sizeof(struct spdk_nvme_status));
@@ -3445,7 +3445,7 @@ spdk_nvme_ctrlr_security_receive(struct spdk_nvme_ctrlr *ctrlr, uint8_t secp, 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_cmd_security_receive failed!\n");

		if (!status->timed_out) {

			free(status);
@@ -3477,7 +3477,7 @@ spdk_nvme_ctrlr_security_send(struct spdk_nvme_ctrlr *ctrlr, uint8_t secp, 
		free(status);

		return res;

	}

	if (spdk_nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {

		SPDK_ERRLOG("spdk_nvme_ctrlr_cmd_security_send failed!\n");

		if (!status->timed_out) {

			free(status);

lib/nvme/nvme_fabric.c

+5 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ nvme_fabric_prop_set_cmd(struct spdk_nvme_ctrlr *ctrlr, 
		return rc;

	}



	if (spdk_nvme_wait_for_completion(ctrlr->adminq, status)) {

	if (nvme_wait_for_completion(ctrlr->adminq, status)) {

		if (!status->timed_out) {

			free(status);

		}
@@ -112,7 +112,7 @@ nvme_fabric_prop_get_cmd(struct spdk_nvme_ctrlr *ctrlr, 
		return rc;

	}



	if (spdk_nvme_wait_for_completion(ctrlr->adminq, status)) {

	if (nvme_wait_for_completion(ctrlr->adminq, status)) {

		if (!status->timed_out) {

			free(status);

		}
@@ -248,7 +248,7 @@ nvme_fabric_get_discovery_log_page(struct spdk_nvme_ctrlr *ctrlr, 
		return -1;

	}



	if (spdk_nvme_wait_for_completion(ctrlr->adminq, status)) {

	if (nvme_wait_for_completion(ctrlr->adminq, status)) {

		if (!status->timed_out) {

			free(status);

		}
@@ -316,7 +316,7 @@ nvme_fabric_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, 
		return rc;

	}



	if (spdk_nvme_wait_for_completion(discovery_ctrlr->adminq, status)) {

	if (nvme_wait_for_completion(discovery_ctrlr->adminq, status)) {

		SPDK_ERRLOG("nvme_identify_controller failed!\n");

		nvme_ctrlr_destruct(discovery_ctrlr);

		if (!status->timed_out) {
@@ -454,7 +454,7 @@ nvme_fabric_qpair_connect(struct spdk_nvme_qpair *qpair, uint32_t num_entries) 
		return rc;

	}



	if (spdk_nvme_wait_for_completion(qpair, status)) {

	if (nvme_wait_for_completion(qpair, status)) {

		SPDK_ERRLOG("Connect command failed\n");

		spdk_free(nvmf_data);

		if (!status->timed_out) {

lib/nvme/nvme_internal.h

+6 −6
Original line number Diff line number Diff line
@@ -883,18 +883,18 @@ int nvme_ctrlr_cmd_sanitize(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
				struct spdk_nvme_sanitize *sanitize, uint32_t cdw11,

				spdk_nvme_cmd_cb cb_fn, void *cb_arg);

void	nvme_completion_poll_cb(void *arg, const struct spdk_nvme_cpl *cpl);

int	spdk_nvme_wait_for_completion(struct spdk_nvme_qpair *qpair,

int	nvme_wait_for_completion(struct spdk_nvme_qpair *qpair,

				 struct nvme_completion_poll_status *status);

int	spdk_nvme_wait_for_completion_robust_lock(struct spdk_nvme_qpair *qpair,

int	nvme_wait_for_completion_robust_lock(struct spdk_nvme_qpair *qpair,

		struct nvme_completion_poll_status *status,

		pthread_mutex_t *robust_mutex);

int	spdk_nvme_wait_for_completion_timeout(struct spdk_nvme_qpair *qpair,

int	nvme_wait_for_completion_timeout(struct spdk_nvme_qpair *qpair,

		struct nvme_completion_poll_status *status,

		uint64_t timeout_in_secs);



struct spdk_nvme_ctrlr_process *spdk_nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr,

struct spdk_nvme_ctrlr_process *nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr,

		pid_t pid);

struct spdk_nvme_ctrlr_process *spdk_nvme_ctrlr_get_current_process(struct spdk_nvme_ctrlr *ctrlr);

struct spdk_nvme_ctrlr_process *nvme_ctrlr_get_current_process(struct spdk_nvme_ctrlr *ctrlr);

int	nvme_ctrlr_add_process(struct spdk_nvme_ctrlr *ctrlr, void *devhandle);

void	nvme_ctrlr_free_processes(struct spdk_nvme_ctrlr *ctrlr);

struct spdk_pci_device *nvme_ctrlr_proc_get_devhandle(struct spdk_nvme_ctrlr *ctrlr);

lib/nvme/nvme_ns.c

+4 −4
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ nvme_ctrlr_identify_ns(struct spdk_nvme_ns *ns) 
		return rc;

	}



	if (spdk_nvme_wait_for_completion_robust_lock(ns->ctrlr->adminq, status,

	if (nvme_wait_for_completion_robust_lock(ns->ctrlr->adminq, status,

			&ns->ctrlr->ctrlr_lock)) {

		if (!status->timed_out) {

			free(status);
@@ -178,7 +178,7 @@ nvme_ctrlr_identify_id_desc(struct spdk_nvme_ns *ns) 
		return rc;

	}



	rc = spdk_nvme_wait_for_completion_robust_lock(ns->ctrlr->adminq, status, &ns->ctrlr->ctrlr_lock);

	rc = nvme_wait_for_completion_robust_lock(ns->ctrlr->adminq, status, &ns->ctrlr->ctrlr_lock);

	if (rc != 0) {

		SPDK_WARNLOG("Failed to retrieve NS ID Descriptor List\n");

		memset(ns->id_desc_list, 0, sizeof(ns->id_desc_list));
@@ -310,7 +310,7 @@ spdk_nvme_ns_get_optimal_io_boundary(struct spdk_nvme_ns *ns) 
}



static const void *

_spdk_nvme_ns_find_id_desc(const struct spdk_nvme_ns *ns, enum spdk_nvme_nidt type, size_t *length)

nvme_ns_find_id_desc(const struct spdk_nvme_ns *ns, enum spdk_nvme_nidt type, size_t *length)

{

	const struct spdk_nvme_ns_id_desc *desc;

	size_t offset;
@@ -350,7 +350,7 @@ spdk_nvme_ns_get_uuid(const struct spdk_nvme_ns *ns) 
	const struct spdk_uuid *uuid;

	size_t uuid_size;



	uuid = _spdk_nvme_ns_find_id_desc(ns, SPDK_NVME_NIDT_UUID, &uuid_size);

	uuid = nvme_ns_find_id_desc(ns, SPDK_NVME_NIDT_UUID, &uuid_size);

	if (uuid == NULL || uuid_size != sizeof(*uuid)) {

		return NULL;

	}