ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/nvme: Add a HostNQN parameter to NVMe bdev creation

Browse Source 
Change-Id: I3ec1603d1d73f67773fcb7f43d63b1db55d4d6af
Reviewed-on: https://review.gerrithub.io/416055
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Ben Walker 2018-06-19 15:00:54 -07:00 committed by Jim Harris
parent b99dd2af4a
commit d733654b5c
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/bdev/nvme/bdev_nvme.c
View File

@ -91,6 +91,7 @@ struct nvme_probe_ctx {
size_t count;
struct spdk_nvme_transport_id trids[NVME_MAX_CONTROLLERS];
const char *names[NVME_MAX_CONTROLLERS];
const char *hostnqn;
};
enum timeout_action {
@ -106,6 +107,7 @@ static int g_nvme_adminq_poll_timeout_us = 0;
static bool g_nvme_hotplug_enabled = false;
static int g_nvme_hotplug_poll_timeout_us = 0;
static struct spdk_poller *g_hotplug_poller;
static char *g_nvme_hostnqn = NULL;
static pthread_mutex_t g_bdev_nvme_mutex = PTHREAD_MUTEX_INITIALIZER;
static TAILQ_HEAD(, nvme_ctrlr) g_nvme_ctrlrs = TAILQ_HEAD_INITIALIZER(g_nvme_ctrlrs);
@ -773,6 +775,7 @@ static bool
probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
struct spdk_nvme_ctrlr_opts *opts)
{
struct nvme_probe_ctx *ctx = cb_ctx;
SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Probing device %s\n", trid->traddr);
@ -784,7 +787,6 @@ probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {
bool claim_device = false;
struct nvme_probe_ctx *ctx = cb_ctx;
size_t i;
for (i = 0; i < ctx->count; i++) {
@ -800,6 +802,10 @@ probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
}
}
if (ctx->hostnqn) {
snprintf(opts->hostnqn, sizeof(opts->hostnqn), "%s", ctx->hostnqn);
}
return true;
}
@ -967,7 +973,8 @@ bdev_nvme_hotplug(void *arg)
int
spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
const char *base_name,
const char **names, size_t *count)
const char **names, size_t *count,
const char *hostnqn)
{
struct nvme_probe_ctx *probe_ctx;
struct nvme_ctrlr *nvme_ctrlr;
@ -989,6 +996,7 @@ spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
probe_ctx->count = 1;
probe_ctx->trids[0] = *trid;
probe_ctx->names[0] = base_name;
probe_ctx->hostnqn = hostnqn;
if (spdk_nvme_probe(trid, probe_ctx, probe_cb, attach_cb, NULL)) {
SPDK_ERRLOG("Failed to probe for new devices\n");
free(probe_ctx);
@ -1111,6 +1119,11 @@ bdev_nvme_library_init(void)
g_nvme_hotplug_poll_timeout_us = 100000;
}
g_nvme_hostnqn = spdk_conf_section_get_val(sp, "HostNQN");
if (g_nvme_hostnqn) {
probe_ctx->hostnqn = g_nvme_hostnqn;
}
for (i = 0; i < NVME_MAX_CONTROLLERS; i++) {
val = spdk_conf_section_get_nmval(sp, "TransportID", i, 0);
if (val == NULL) {
@ -1153,6 +1166,10 @@ bdev_nvme_library_init(void)
spdk_nvme_ctrlr_get_default_ctrlr_opts(&opts, sizeof(opts));
if (probe_ctx->hostnqn != NULL) {
snprintf(opts.hostnqn, sizeof(opts.hostnqn), "%s", probe_ctx->hostnqn);
}
ctrlr = spdk_nvme_connect(&probe_ctx->trids[i], &opts, sizeof(opts));
if (ctrlr == NULL) {
SPDK_ERRLOG("Unable to connect to provided trid (traddr: %s)\n",
@ -1531,6 +1548,9 @@ bdev_nvme_get_spdk_running_config(FILE *fp)
"# Set how often the hotplug is processed for insert and remove events."
"# Units in microseconds.\n");
fprintf(fp, "HotplugPollRate %d\n", g_nvme_hotplug_poll_timeout_us);
if (g_nvme_hostnqn) {
fprintf(fp, "HostNQN %s\n", g_nvme_hostnqn);
}
fprintf(fp, "\n");
}

3
lib/bdev/nvme/bdev_nvme.h
View File

@ -72,7 +72,8 @@ struct nvme_bdev {
int spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
const char *base_name,
const char **names, size_t *count);
const char **names, size_t *count,
const char *hostnqn);
struct spdk_nvme_ctrlr *spdk_bdev_nvme_get_ctrlr(struct spdk_bdev *bdev);
#endif // SPDK_BDEV_NVME_H

5
lib/bdev/nvme/bdev_nvme_rpc.c
View File

@ -56,6 +56,7 @@ struct rpc_construct_nvme {
char *traddr;
char *trsvcid;
char *subnqn;
char *hostnqn;
};
static void
@ -67,6 +68,7 @@ free_rpc_construct_nvme(struct rpc_construct_nvme *req)
free(req->traddr);
free(req->trsvcid);
free(req->subnqn);
free(req->hostnqn);
}
static const struct spdk_json_object_decoder rpc_construct_nvme_decoders[] = {
@ -77,6 +79,7 @@ static const struct spdk_json_object_decoder rpc_construct_nvme_decoders[] = {
{"adrfam", offsetof(struct rpc_construct_nvme, adrfam), spdk_json_decode_string, true},
{"trsvcid", offsetof(struct rpc_construct_nvme, trsvcid), spdk_json_decode_string, true},
{"subnqn", offsetof(struct rpc_construct_nvme, subnqn), spdk_json_decode_string, true},
{"hostnqn", offsetof(struct rpc_construct_nvme, hostnqn), spdk_json_decode_string, true}
};
#define NVME_MAX_BDEVS_PER_RPC 128
@ -130,7 +133,7 @@ spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_request *request,
}
count = NVME_MAX_BDEVS_PER_RPC;
if (spdk_bdev_nvme_create(&trid, req.name, names, &count)) {
if (spdk_bdev_nvme_create(&trid, req.name, names, &count, req.hostnqn)) {
goto invalid;
}

1
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -31,6 +31,7 @@ function run_nvme_remote() {
if [ "$1" = "remote" ]; then
echo "[NVMe]" >> $testdir/iscsi.conf.tmp
echo " HostNQN nqn.2016-06.io.spdk:host1" >> $testdir/iscsi.conf.tmp
echo " TransportID \"trtype:RDMA adrfam:ipv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420 subnqn:nqn.2016-06.io.spdk:cnode1\" Nvme0" >> $testdir/iscsi.conf.tmp
fi
# Start the iSCSI target without using stub