Compare commits
No commits in common. "a9" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/libnvme-1.2.tar.gz
|
SOURCES/libnvme-1.9.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
32d5f81b7af835e5596cb390f7dd2ac889414e1d SOURCES/libnvme-1.2.tar.gz
|
7ce814bb26bd5fc33b99f5ba48d99538f23756cd SOURCES/libnvme-1.9.tar.gz
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
From 78ce3528d00bb433c661fd24672a1b5c6795b59f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Belanger <martin.belanger@dell.com>
|
|
||||||
Date: Fri, 18 Nov 2022 10:41:32 -0500
|
|
||||||
Subject: [PATCH] fabrics: Fix bad UUID size introduced in recent UUID changes
|
|
||||||
Content-type: text/plain
|
|
||||||
|
|
||||||
71c25d1cf741 ("util: Add simple UUID type") introduced a regression in
|
|
||||||
nvmf_get_tel(). nvmf_get_tel() returns the lenght of the binary
|
|
||||||
representation. Hence use NVME_UUID_LEN instead.
|
|
||||||
|
|
||||||
Signed-off-by: Martin Belanger <martin.belanger@dell.com>
|
|
||||||
[dwagner: massaged commit message]
|
|
||||||
Signed-off-by: Daniel Wagner <dwagner@suse.de>
|
|
||||||
---
|
|
||||||
src/nvme/fabrics.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
|
||||||
index f943090..36bdc2d 100644
|
|
||||||
--- a/src/nvme/fabrics.c
|
|
||||||
+++ b/src/nvme/fabrics.c
|
|
||||||
@@ -1127,7 +1127,7 @@ static __u32 nvmf_get_tel(const char *hostsymname)
|
|
||||||
__u16 len;
|
|
||||||
|
|
||||||
/* Host ID is mandatory */
|
|
||||||
- tel += nvmf_exat_size(NVME_UUID_LEN_STRING);
|
|
||||||
+ tel += nvmf_exat_size(NVME_UUID_LEN);
|
|
||||||
|
|
||||||
/* Symbolic name is optional */
|
|
||||||
len = hostsymname ? strlen(hostsymname) : 0;
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
32
SOURCES/0001-tree-handle-no-address-phy-slot-dirs.patch
Normal file
32
SOURCES/0001-tree-handle-no-address-phy-slot-dirs.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 49a4cd8f62d05bb4e1b6e1365bad638c366cdba9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Greg Joyce <gjoyce@linux.ibm.com>
|
||||||
|
Date: Tue, 23 Jul 2024 01:04:42 +0530
|
||||||
|
Subject: [PATCH] tree: handle no address phy slot dirs
|
||||||
|
|
||||||
|
Not all directories have an address. Verify addr before calling
|
||||||
|
strcmp().
|
||||||
|
|
||||||
|
Fixes: 42ac45359635 ("tree: Add PCI physical slot number for controller")
|
||||||
|
Signed-off-by: Greg Joyce <gjoyce@linux.ibm.com>
|
||||||
|
---
|
||||||
|
src/nvme/tree.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
|
||||||
|
index 288b23c73a1b..b0ee94047634 100644
|
||||||
|
--- a/src/nvme/tree.c
|
||||||
|
+++ b/src/nvme/tree.c
|
||||||
|
@@ -1867,6 +1867,10 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
addr = nvme_get_attr(path, "address");
|
||||||
|
+
|
||||||
|
+ /* some directories don't have an address entry */
|
||||||
|
+ if (!addr)
|
||||||
|
+ continue;
|
||||||
|
if (strcmp(addr, target_addr) == 0)
|
||||||
|
return strdup(entry->d_name);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,392 +0,0 @@
|
|||||||
From f0a1eefd0e52c1ab64622693400ebe35fa9e9e79 Mon Sep 17 00:00:00 2001
|
|
||||||
From: eabdullin <ed.abdullin.1@gmail.com>
|
|
||||||
Date: Thu, 3 Aug 2023 09:36:51 +0300
|
|
||||||
Subject: [PATCH] fabrics: Do not pass unsupported options to kernel
|
|
||||||
|
|
||||||
The kernel API might not support all options libnvme is supporting.
|
|
||||||
Filter out all options which the kernel doesn't support.
|
|
||||||
---
|
|
||||||
src/nvme/fabrics.c | 212 +++++++++++++++++++++++++++++++++++++++------
|
|
||||||
src/nvme/private.h | 33 +++++++
|
|
||||||
src/nvme/tree.c | 1 +
|
|
||||||
3 files changed, 218 insertions(+), 28 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
|
||||||
index 7aeec70..47d2ea1 100644
|
|
||||||
--- a/src/nvme/fabrics.c
|
|
||||||
+++ b/src/nvme/fabrics.c
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <ccan/endian/endian.h>
|
|
||||||
#include <ccan/list/list.h>
|
|
||||||
#include <ccan/array_size/array_size.h>
|
|
||||||
+#include <ccan/str/str.h>
|
|
||||||
|
|
||||||
#include "fabrics.h"
|
|
||||||
#include "linux.h"
|
|
||||||
@@ -244,7 +245,7 @@ void nvmf_update_config(nvme_ctrl_t c, const struct nvme_fabrics_config *cfg)
|
|
||||||
UPDATE_CFG_OPTION(ctrl_cfg, cfg, tls, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int add_bool_argument(char **argstr, char *tok, bool arg)
|
|
||||||
+static int __add_bool_argument(char **argstr, char *tok, bool arg)
|
|
||||||
{
|
|
||||||
char *nstr;
|
|
||||||
|
|
||||||
@@ -260,7 +261,7 @@ static int add_bool_argument(char **argstr, char *tok, bool arg)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int add_int_argument(char **argstr, char *tok, int arg, bool allow_zero)
|
|
||||||
+static int __add_int_argument(char **argstr, char *tok, int arg, bool allow_zero)
|
|
||||||
{
|
|
||||||
char *nstr;
|
|
||||||
|
|
||||||
@@ -276,7 +277,7 @@ static int add_int_argument(char **argstr, char *tok, int arg, bool allow_zero)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int add_int_or_minus_one_argument(char **argstr, char *tok, int arg)
|
|
||||||
+static int __add_int_or_minus_one_argument(char **argstr, char *tok, int arg)
|
|
||||||
{
|
|
||||||
char *nstr;
|
|
||||||
|
|
||||||
@@ -292,7 +293,7 @@ static int add_int_or_minus_one_argument(char **argstr, char *tok, int arg)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int add_argument(char **argstr, const char *tok, const char *arg)
|
|
||||||
+static int __add_argument(char **argstr, const char *tok, const char *arg)
|
|
||||||
{
|
|
||||||
char *nstr;
|
|
||||||
|
|
||||||
@@ -308,6 +309,71 @@ static int add_argument(char **argstr, const char *tok, const char *arg)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#define add_bool_argument(o, argstr, tok, arg) \
|
|
||||||
+({ \
|
|
||||||
+ int ret; \
|
|
||||||
+ if (r->options->tok) { \
|
|
||||||
+ ret = __add_bool_argument(argstr, \
|
|
||||||
+ stringify(tok), \
|
|
||||||
+ arg); \
|
|
||||||
+ } else { \
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, \
|
|
||||||
+ "option \"%s\" ignored\n", \
|
|
||||||
+ stringify(tok)); \
|
|
||||||
+ ret = 0; \
|
|
||||||
+ } \
|
|
||||||
+ ret; \
|
|
||||||
+})
|
|
||||||
+
|
|
||||||
+#define add_int_argument(o, argstr, tok, arg, allow_zero) \
|
|
||||||
+({ \
|
|
||||||
+ int ret; \
|
|
||||||
+ if (r->options->tok) { \
|
|
||||||
+ ret = __add_int_argument(argstr, \
|
|
||||||
+ stringify(tok), \
|
|
||||||
+ arg, \
|
|
||||||
+ allow_zero); \
|
|
||||||
+ } else { \
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, \
|
|
||||||
+ "option \"%s\" ignored\n", \
|
|
||||||
+ stringify(tok)); \
|
|
||||||
+ ret = 0; \
|
|
||||||
+ } \
|
|
||||||
+ ret; \
|
|
||||||
+})
|
|
||||||
+
|
|
||||||
+#define add_int_or_minus_one_argument(o, argstr, tok, arg) \
|
|
||||||
+({ \
|
|
||||||
+ int ret; \
|
|
||||||
+ if (r->options->tok) { \
|
|
||||||
+ ret = __add_int_or_minus_one_argument(argstr, \
|
|
||||||
+ stringify(tok), \
|
|
||||||
+ arg); \
|
|
||||||
+ } else { \
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, \
|
|
||||||
+ "option \"%s\" ignored\n", \
|
|
||||||
+ stringify(tok)); \
|
|
||||||
+ ret = 0; \
|
|
||||||
+ } \
|
|
||||||
+ ret; \
|
|
||||||
+})
|
|
||||||
+
|
|
||||||
+#define add_argument(r, argstr, tok, arg) \
|
|
||||||
+({ \
|
|
||||||
+ int ret; \
|
|
||||||
+ if (r->options->tok) { \
|
|
||||||
+ ret = __add_argument(argstr, \
|
|
||||||
+ stringify(tok), \
|
|
||||||
+ arg); \
|
|
||||||
+ } else { \
|
|
||||||
+ nvme_msg(r, LOG_NOTICE, \
|
|
||||||
+ "option \"%s\" ignored\n", \
|
|
||||||
+ stringify(tok)); \
|
|
||||||
+ ret = 0; \
|
|
||||||
+ } \
|
|
||||||
+ ret; \
|
|
||||||
+})
|
|
||||||
+
|
|
||||||
static int inet4_pton(const char *src, uint16_t port,
|
|
||||||
struct sockaddr_storage *addr)
|
|
||||||
{
|
|
||||||
@@ -436,6 +502,7 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
|
|
||||||
const char *transport = nvme_ctrl_get_transport(c);
|
|
||||||
const char *hostnqn, *hostid, *hostkey, *ctrlkey;
|
|
||||||
bool discover = false, discovery_nqn = false;
|
|
||||||
+ nvme_root_t r = h->r;
|
|
||||||
|
|
||||||
if (!transport) {
|
|
||||||
nvme_msg(h->r, LOG_ERR, "need a transport (-t) argument\n");
|
|
||||||
@@ -469,57 +536,57 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
|
|
||||||
if (!hostkey)
|
|
||||||
hostkey = nvme_ctrl_get_dhchap_host_key(c);
|
|
||||||
ctrlkey = nvme_ctrl_get_dhchap_key(c);
|
|
||||||
- if (add_argument(argstr, "transport", transport) ||
|
|
||||||
- add_argument(argstr, "traddr",
|
|
||||||
+ if (add_argument(r, argstr, transport, transport) ||
|
|
||||||
+ add_argument(r, argstr, traddr,
|
|
||||||
nvme_ctrl_get_traddr(c)) ||
|
|
||||||
- add_argument(argstr, "host_traddr",
|
|
||||||
+ add_argument(r, argstr, host_traddr,
|
|
||||||
cfg->host_traddr) ||
|
|
||||||
- add_argument(argstr, "host_iface",
|
|
||||||
+ add_argument(r, argstr, host_iface,
|
|
||||||
cfg->host_iface) ||
|
|
||||||
- add_argument(argstr, "trsvcid",
|
|
||||||
+ add_argument(r, argstr, trsvcid,
|
|
||||||
nvme_ctrl_get_trsvcid(c)) ||
|
|
||||||
- (hostnqn && add_argument(argstr, "hostnqn", hostnqn)) ||
|
|
||||||
- (hostid && add_argument(argstr, "hostid", hostid)) ||
|
|
||||||
+ (hostnqn && add_argument(r, argstr, hostnqn, hostnqn)) ||
|
|
||||||
+ (hostid && add_argument(r, argstr, hostid, hostid)) ||
|
|
||||||
(discover && !discovery_nqn &&
|
|
||||||
- add_bool_argument(argstr, "discovery", true)) ||
|
|
||||||
+ add_bool_argument(r, argstr, discovery, true)) ||
|
|
||||||
(!discover && hostkey &&
|
|
||||||
- add_argument(argstr, "dhchap_secret", hostkey)) ||
|
|
||||||
+ add_argument(r, argstr, dhchap_secret, hostkey)) ||
|
|
||||||
(!discover && ctrlkey &&
|
|
||||||
- add_argument(argstr, "dhchap_ctrl_secret", ctrlkey)) ||
|
|
||||||
+ add_argument(r, argstr, dhchap_ctrl_secret, ctrlkey)) ||
|
|
||||||
(!discover &&
|
|
||||||
- add_int_argument(argstr, "nr_io_queues",
|
|
||||||
+ add_int_argument(r, argstr, nr_io_queues,
|
|
||||||
cfg->nr_io_queues, false)) ||
|
|
||||||
(!discover &&
|
|
||||||
- add_int_argument(argstr, "nr_write_queues",
|
|
||||||
+ add_int_argument(r, argstr, nr_write_queues,
|
|
||||||
cfg->nr_write_queues, false)) ||
|
|
||||||
(!discover &&
|
|
||||||
- add_int_argument(argstr, "nr_poll_queues",
|
|
||||||
+ add_int_argument(r, argstr, nr_poll_queues,
|
|
||||||
cfg->nr_poll_queues, false)) ||
|
|
||||||
(!discover &&
|
|
||||||
- add_int_argument(argstr, "queue_size",
|
|
||||||
+ add_int_argument(r, argstr, queue_size,
|
|
||||||
cfg->queue_size, false)) ||
|
|
||||||
- add_int_argument(argstr, "keep_alive_tmo",
|
|
||||||
+ add_int_argument(r, argstr, keep_alive_tmo,
|
|
||||||
cfg->keep_alive_tmo, false) ||
|
|
||||||
- add_int_argument(argstr, "reconnect_delay",
|
|
||||||
+ add_int_argument(r, argstr, reconnect_delay,
|
|
||||||
cfg->reconnect_delay, false) ||
|
|
||||||
(strcmp(transport, "loop") &&
|
|
||||||
- add_int_or_minus_one_argument(argstr, "ctrl_loss_tmo",
|
|
||||||
+ add_int_or_minus_one_argument(r, argstr, ctrl_loss_tmo,
|
|
||||||
cfg->ctrl_loss_tmo)) ||
|
|
||||||
(strcmp(transport, "loop") &&
|
|
||||||
- add_int_argument(argstr, "fast_io_fail_tmo",
|
|
||||||
+ add_int_argument(r, argstr, fast_io_fail_tmo,
|
|
||||||
cfg->fast_io_fail_tmo, false)) ||
|
|
||||||
(strcmp(transport, "loop") &&
|
|
||||||
- add_int_argument(argstr, "tos", cfg->tos, true)) ||
|
|
||||||
- add_bool_argument(argstr, "duplicate_connect",
|
|
||||||
+ add_int_argument(r, argstr, tos, cfg->tos, true)) ||
|
|
||||||
+ add_bool_argument(r, argstr, duplicate_connect,
|
|
||||||
cfg->duplicate_connect) ||
|
|
||||||
- add_bool_argument(argstr, "disable_sqflow",
|
|
||||||
+ add_bool_argument(r, argstr, disable_sqflow,
|
|
||||||
cfg->disable_sqflow) ||
|
|
||||||
(!strcmp(transport, "tcp") &&
|
|
||||||
- add_bool_argument(argstr, "hdr_digest", cfg->hdr_digest)) ||
|
|
||||||
+ add_bool_argument(r, argstr, hdr_digest, cfg->hdr_digest)) ||
|
|
||||||
(!strcmp(transport, "tcp") &&
|
|
||||||
- add_bool_argument(argstr, "data_digest", cfg->data_digest)) ||
|
|
||||||
+ add_bool_argument(r, argstr, data_digest, cfg->data_digest)) ||
|
|
||||||
(!strcmp(transport, "tcp") &&
|
|
||||||
- add_bool_argument(argstr, "tls", cfg->tls))) {
|
|
||||||
+ add_bool_argument(r, argstr, tls, cfg->tls))) {
|
|
||||||
free(*argstr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
@@ -527,6 +594,92 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#define parse_option(r, v, name) \
|
|
||||||
+ if (!strcmp(v, stringify(name))) { \
|
|
||||||
+ r->options->name = true; \
|
|
||||||
+ continue; \
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+static int __nvmf_supported_options(nvme_root_t r)
|
|
||||||
+{
|
|
||||||
+ char buf[0x1000], *options, *p, *v;
|
|
||||||
+ int fd, ret;
|
|
||||||
+ size_t len;
|
|
||||||
+
|
|
||||||
+ if (r->options)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ r->options = calloc(1, sizeof(*r->options));
|
|
||||||
+ if (!r->options)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ fd = open(nvmf_dev, O_RDONLY);
|
|
||||||
+ if (fd < 0) {
|
|
||||||
+ nvme_msg(r, LOG_ERR, "Failed to open %s: %s\n",
|
|
||||||
+ nvmf_dev, strerror(errno));
|
|
||||||
+ return -ENVME_CONNECT_OPEN;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ memset(buf, 0x0, sizeof(buf));
|
|
||||||
+ len = read(fd, buf, sizeof(buf) - 1);
|
|
||||||
+ if (len < 0) {
|
|
||||||
+ nvme_msg(r, LOG_ERR, "Failed to read from %s: %s\n",
|
|
||||||
+ nvmf_dev, strerror(errno));
|
|
||||||
+ ret = -ENVME_CONNECT_READ;
|
|
||||||
+ goto out_close;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ buf[len] = '\0';
|
|
||||||
+ options = buf;
|
|
||||||
+
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, "kernel supports: ");
|
|
||||||
+
|
|
||||||
+ while ((p = strsep(&options, ",\n")) != NULL) {
|
|
||||||
+ if (!*p)
|
|
||||||
+ continue;
|
|
||||||
+ v = strsep(&p, "= ");
|
|
||||||
+ if (!v)
|
|
||||||
+ continue;
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, "%s ", v);
|
|
||||||
+
|
|
||||||
+ parse_option(r, v, cntlid);
|
|
||||||
+ parse_option(r, v, ctrl_loss_tmo);
|
|
||||||
+ parse_option(r, v, data_digest);
|
|
||||||
+ parse_option(r, v, dhchap_ctrl_secret);
|
|
||||||
+ parse_option(r, v, dhchap_secret);
|
|
||||||
+ parse_option(r, v, disable_sqflow);
|
|
||||||
+ parse_option(r, v, discovery);
|
|
||||||
+ parse_option(r, v, duplicate_connect);
|
|
||||||
+ parse_option(r, v, fast_io_fail_tmo);
|
|
||||||
+ parse_option(r, v, hdr_digest);
|
|
||||||
+ parse_option(r, v, host_iface);
|
|
||||||
+ parse_option(r, v, host_traddr);
|
|
||||||
+ parse_option(r, v, hostid);
|
|
||||||
+ parse_option(r, v, hostnqn);
|
|
||||||
+ parse_option(r, v, instance);
|
|
||||||
+ parse_option(r, v, keep_alive_tmo);
|
|
||||||
+ parse_option(r, v, keyring);
|
|
||||||
+ parse_option(r, v, nqn);
|
|
||||||
+ parse_option(r, v, nr_io_queues);
|
|
||||||
+ parse_option(r, v, nr_poll_queues);
|
|
||||||
+ parse_option(r, v, nr_write_queues);
|
|
||||||
+ parse_option(r, v, queue_size);
|
|
||||||
+ parse_option(r, v, reconnect_delay);
|
|
||||||
+ parse_option(r, v, tls);
|
|
||||||
+ parse_option(r, v, tls_key);
|
|
||||||
+ parse_option(r, v, tos);
|
|
||||||
+ parse_option(r, v, traddr);
|
|
||||||
+ parse_option(r, v, transport);
|
|
||||||
+ parse_option(r, v, trsvcid);
|
|
||||||
+ }
|
|
||||||
+ nvme_msg(r, LOG_DEBUG, "\n");
|
|
||||||
+ ret = 0;
|
|
||||||
+
|
|
||||||
+out_close:
|
|
||||||
+ close(fd);
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int __nvmf_add_ctrl(nvme_root_t r, const char *argstr)
|
|
||||||
{
|
|
||||||
int ret, fd, len = strlen(argstr);
|
|
||||||
@@ -647,6 +800,9 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
|
|
||||||
free(traddr);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ ret = __nvmf_supported_options(h->r);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
ret = build_options(h, c, &argstr);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
diff --git a/src/nvme/private.h b/src/nvme/private.h
|
|
||||||
index cdd1bbf..e7a6cd9 100644
|
|
||||||
--- a/src/nvme/private.h
|
|
||||||
+++ b/src/nvme/private.h
|
|
||||||
@@ -116,6 +116,38 @@ struct nvme_host {
|
|
||||||
char *hostsymname;
|
|
||||||
};
|
|
||||||
|
|
||||||
+struct nvme_fabric_options {
|
|
||||||
+ bool cntlid;
|
|
||||||
+ bool ctrl_loss_tmo;
|
|
||||||
+ bool data_digest;
|
|
||||||
+ bool dhchap_ctrl_secret;
|
|
||||||
+ bool dhchap_secret;
|
|
||||||
+ bool disable_sqflow;
|
|
||||||
+ bool discovery;
|
|
||||||
+ bool duplicate_connect;
|
|
||||||
+ bool fast_io_fail_tmo;
|
|
||||||
+ bool hdr_digest;
|
|
||||||
+ bool host_iface;
|
|
||||||
+ bool host_traddr;
|
|
||||||
+ bool hostid;
|
|
||||||
+ bool hostnqn;
|
|
||||||
+ bool instance;
|
|
||||||
+ bool keep_alive_tmo;
|
|
||||||
+ bool keyring;
|
|
||||||
+ bool nqn;
|
|
||||||
+ bool nr_io_queues;
|
|
||||||
+ bool nr_poll_queues;
|
|
||||||
+ bool nr_write_queues;
|
|
||||||
+ bool queue_size;
|
|
||||||
+ bool reconnect_delay;
|
|
||||||
+ bool tls;
|
|
||||||
+ bool tls_key;
|
|
||||||
+ bool tos;
|
|
||||||
+ bool traddr;
|
|
||||||
+ bool transport;
|
|
||||||
+ bool trsvcid;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct nvme_root {
|
|
||||||
char *config_file;
|
|
||||||
struct list_head hosts;
|
|
||||||
@@ -125,6 +157,7 @@ struct nvme_root {
|
|
||||||
bool log_pid;
|
|
||||||
bool log_timestamp;
|
|
||||||
bool modified;
|
|
||||||
+ struct nvme_fabric_options *options;
|
|
||||||
};
|
|
||||||
|
|
||||||
int nvme_set_attr(const char *dir, const char *attr, const char *value);
|
|
||||||
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
|
|
||||||
index b992824..e7854c7 100644
|
|
||||||
--- a/src/nvme/tree.c
|
|
||||||
+++ b/src/nvme/tree.c
|
|
||||||
@@ -275,6 +275,7 @@ void nvme_free_tree(nvme_root_t r)
|
|
||||||
{
|
|
||||||
struct nvme_host *h, *_h;
|
|
||||||
|
|
||||||
+ free(r->options);
|
|
||||||
nvme_for_each_host_safe(r, h, _h)
|
|
||||||
__nvme_free_host(h);
|
|
||||||
if (r->config_file)
|
|
||||||
--
|
|
||||||
2.39.2 (Apple Git-143)
|
|
||||||
|
|
||||||
609
SOURCES/libnvme-1.10-uriparser.patch
Normal file
609
SOURCES/libnvme-1.10-uriparser.patch
Normal file
@ -0,0 +1,609 @@
|
|||||||
|
From 6829a6903c7a32a7b4dd32597c7f2a811b5a58bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Wed, 17 Apr 2024 18:04:34 +0200
|
||||||
|
Subject: [PATCH 1/3] fabrics: Introduce simple URI parser
|
||||||
|
|
||||||
|
A very simple URI parser implementing URI syntax described
|
||||||
|
in the Boot Specification, rev. 1.0.
|
||||||
|
|
||||||
|
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
---
|
||||||
|
src/libnvme.map | 2 +
|
||||||
|
src/nvme/fabrics.c | 116 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
src/nvme/fabrics.h | 44 +++++++++++++++++
|
||||||
|
3 files changed, 162 insertions(+)
|
||||||
|
|
||||||
|
diff -up libnvme-1.9/src/libnvme.map.bak libnvme-1.9/src/libnvme.map
|
||||||
|
--- libnvme-1.9/src/libnvme.map.bak 2024-05-03 14:08:20.000000000 +0200
|
||||||
|
+++ libnvme-1.9/src/libnvme.map 2024-06-21 15:46:53.920532333 +0200
|
||||||
|
@@ -10,6 +10,8 @@ LIBNVME_1.9 {
|
||||||
|
nvme_submit_passthru64;
|
||||||
|
nvme_update_key;
|
||||||
|
nvme_ctrl_get_cntlid;
|
||||||
|
+ nvme_parse_uri;
|
||||||
|
+ nvme_free_uri;
|
||||||
|
};
|
||||||
|
|
||||||
|
LIBNVME_1_8 {
|
||||||
|
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
||||||
|
index 6738e9dc..324a7321 100644
|
||||||
|
--- a/src/nvme/fabrics.c
|
||||||
|
+++ b/src/nvme/fabrics.c
|
||||||
|
@@ -1703,3 +1703,119 @@ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result)
|
||||||
|
*/
|
||||||
|
return nvmf_dim(c, tas, NVMF_TRTYPE_TCP, nvme_get_adrfam(c), "", NULL, result);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
+{
|
||||||
|
+ struct nvme_fabrics_uri *uri;
|
||||||
|
+ _cleanup_free_ char *scheme = NULL;
|
||||||
|
+ _cleanup_free_ char *authority = NULL;
|
||||||
|
+ _cleanup_free_ char *path = NULL;
|
||||||
|
+ const char *host;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ /* As defined in Boot Specification rev. 1.0:
|
||||||
|
+ *
|
||||||
|
+ * section 1.5.7: NVMe-oF URI Format
|
||||||
|
+ * nvme+tcp://192.168.1.1:4420/
|
||||||
|
+ * nvme+tcp://[FE80::1010]:4420/
|
||||||
|
+ *
|
||||||
|
+ * section 3.1.2.5.3: DHCP Root-Path - a hierarchical NVMe-oF URI Format
|
||||||
|
+ * NVME<+PROTOCOL>://<SERVERNAME/IP>[:TRANSPORT PORT]/<SUBSYS NQN>/<NID>
|
||||||
|
+ * or
|
||||||
|
+ * NVME<+PROTOCOL>://<DISCOVERY CONTROLLER ADDRESS>[:DISCOVERY-
|
||||||
|
+ * -CONTROLLER PORT]/NQN.2014-08.ORG.NVMEXPRESS.DISCOVERY/<NID>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ /* TODO: unescape? */
|
||||||
|
+
|
||||||
|
+ uri = calloc(1, sizeof(struct nvme_fabrics_uri));
|
||||||
|
+ if (!uri)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ if (sscanf(str, "%m[^:/]://%m[^/?#]%ms",
|
||||||
|
+ &scheme, &authority, &path) < 2) {
|
||||||
|
+ nvme_free_uri(uri);
|
||||||
|
+ errno = EINVAL;
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (sscanf(scheme, "%m[^+]+%ms",
|
||||||
|
+ &uri->scheme, &uri->protocol) < 1) {
|
||||||
|
+ nvme_free_uri(uri);
|
||||||
|
+ errno = EINVAL;
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* split userinfo */
|
||||||
|
+ host = strrchr(authority, '@');
|
||||||
|
+ if (host) {
|
||||||
|
+ host++;
|
||||||
|
+ uri->userinfo = strndup(authority, host - authority);
|
||||||
|
+ } else
|
||||||
|
+ host = authority;
|
||||||
|
+
|
||||||
|
+ /* try matching IPv6 address first */
|
||||||
|
+ if (sscanf(host, "[%m[^]]]:%d",
|
||||||
|
+ &uri->host, &uri->port) < 1)
|
||||||
|
+ /* treat it as IPv4/hostname */
|
||||||
|
+ if (sscanf(host, "%m[^:]:%d",
|
||||||
|
+ &uri->host, &uri->port) < 1) {
|
||||||
|
+ nvme_free_uri(uri);
|
||||||
|
+ errno = EINVAL;
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* split path into elements */
|
||||||
|
+ if (path) {
|
||||||
|
+ char *e, *elem;
|
||||||
|
+
|
||||||
|
+ /* separate the fragment */
|
||||||
|
+ e = strrchr(path, '#');
|
||||||
|
+ if (e) {
|
||||||
|
+ uri->fragment = strdup(e + 1);
|
||||||
|
+ *e = '\0';
|
||||||
|
+ }
|
||||||
|
+ /* separate the query string */
|
||||||
|
+ e = strrchr(path, '?');
|
||||||
|
+ if (e) {
|
||||||
|
+ uri->query = strdup(e + 1);
|
||||||
|
+ *e = '\0';
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* count elements first */
|
||||||
|
+ for (i = 0, e = path; *e; e++)
|
||||||
|
+ if (*e == '/' && *(e + 1) != '/')
|
||||||
|
+ i++;
|
||||||
|
+ uri->path_segments = calloc(i + 2, sizeof(char *));
|
||||||
|
+
|
||||||
|
+ i = 0;
|
||||||
|
+ elem = strtok_r(path, "/", &e);
|
||||||
|
+ if (elem)
|
||||||
|
+ uri->path_segments[i++] = strdup(elem);
|
||||||
|
+ while (elem && strlen(elem)) {
|
||||||
|
+ elem = strtok_r(NULL, "/", &e);
|
||||||
|
+ if (elem)
|
||||||
|
+ uri->path_segments[i++] = strdup(elem);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return uri;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void nvme_free_uri(struct nvme_fabrics_uri *uri)
|
||||||
|
+{
|
||||||
|
+ char **s;
|
||||||
|
+
|
||||||
|
+ if (!uri)
|
||||||
|
+ return;
|
||||||
|
+ free(uri->scheme);
|
||||||
|
+ free(uri->protocol);
|
||||||
|
+ free(uri->userinfo);
|
||||||
|
+ free(uri->host);
|
||||||
|
+ for (s = uri->path_segments; s && *s; s++)
|
||||||
|
+ free(*s);
|
||||||
|
+ free(uri->path_segments);
|
||||||
|
+ free(uri->query);
|
||||||
|
+ free(uri->fragment);
|
||||||
|
+ free(uri);
|
||||||
|
+}
|
||||||
|
diff --git a/src/nvme/fabrics.h b/src/nvme/fabrics.h
|
||||||
|
index 4ebeb35e..3be35310 100644
|
||||||
|
--- a/src/nvme/fabrics.h
|
||||||
|
+++ b/src/nvme/fabrics.h
|
||||||
|
@@ -67,6 +67,28 @@ struct nvme_fabrics_config {
|
||||||
|
bool concat;
|
||||||
|
};
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * struct nvme_fabrics_uri - Parsed URI structure
|
||||||
|
+ * @scheme: Scheme name (typically 'nvme')
|
||||||
|
+ * @protocol: Optional protocol/transport (e.g. 'tcp')
|
||||||
|
+ * @userinfo: Optional user information component of the URI authority
|
||||||
|
+ * @host: Host transport address
|
||||||
|
+ * @port: The port subcomponent or 0 if not specified
|
||||||
|
+ * @path_segments: NULL-terminated array of path segments
|
||||||
|
+ * @query: Optional query string component (separated by '?')
|
||||||
|
+ * @fragment: Optional fragment identifier component (separated by '#')
|
||||||
|
+ */
|
||||||
|
+struct nvme_fabrics_uri {
|
||||||
|
+ char *scheme;
|
||||||
|
+ char *protocol;
|
||||||
|
+ char *userinfo;
|
||||||
|
+ char *host;
|
||||||
|
+ int port;
|
||||||
|
+ char **path_segments;
|
||||||
|
+ char *query;
|
||||||
|
+ char *fragment;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* nvmf_trtype_str() - Decode TRTYPE field
|
||||||
|
* @trtype: value to be decoded
|
||||||
|
@@ -324,4 +346,26 @@ bool nvmf_is_registration_supported(nvme_ctrl_t c);
|
||||||
|
*/
|
||||||
|
int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result);
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * nvme_parse_uri() - Parse the URI string
|
||||||
|
+ * @str: URI string
|
||||||
|
+ *
|
||||||
|
+ * Parse the URI string as defined in the NVM Express Boot Specification.
|
||||||
|
+ * Supported URI elements looks as follows:
|
||||||
|
+ *
|
||||||
|
+ * nvme+tcp://user@host:port/subsys_nqn/nid?query=val#fragment
|
||||||
|
+ *
|
||||||
|
+ * Return: &nvme_fabrics_uri structure on success; NULL on failure with errno
|
||||||
|
+ * set.
|
||||||
|
+ */
|
||||||
|
+struct nvme_fabrics_uri *nvme_parse_uri(const char *str);
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * nvme_free_uri() - Free the URI structure
|
||||||
|
+ * @uri: &nvme_fabrics_uri structure
|
||||||
|
+ *
|
||||||
|
+ * Free an &nvme_fabrics_uri structure.
|
||||||
|
+ */
|
||||||
|
+void nvme_free_uri(struct nvme_fabrics_uri *uri);
|
||||||
|
+
|
||||||
|
#endif /* _LIBNVME_FABRICS_H */
|
||||||
|
|
||||||
|
From 27ea060ef42c76ed1c88d92c435b88b481e7defb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Wed, 17 Apr 2024 18:06:23 +0200
|
||||||
|
Subject: [PATCH 2/3] tests: Add uriparser tests
|
||||||
|
|
||||||
|
Simple testcase both for valid and malformed URI strings.
|
||||||
|
|
||||||
|
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
---
|
||||||
|
test/meson.build | 9 ++
|
||||||
|
test/uriparser.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 217 insertions(+)
|
||||||
|
create mode 100644 test/uriparser.c
|
||||||
|
|
||||||
|
diff --git a/test/meson.build b/test/meson.build
|
||||||
|
index 93e69991..55992df7 100644
|
||||||
|
--- a/test/meson.build
|
||||||
|
+++ b/test/meson.build
|
||||||
|
@@ -66,6 +66,15 @@ uuid = executable(
|
||||||
|
|
||||||
|
test('uuid', uuid)
|
||||||
|
|
||||||
|
+uriparser = executable(
|
||||||
|
+ 'test-uriparser',
|
||||||
|
+ ['uriparser.c'],
|
||||||
|
+ dependencies: libnvme_dep,
|
||||||
|
+ include_directories: [incdir, internal_incdir]
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
+test('uriparser', uriparser)
|
||||||
|
+
|
||||||
|
if conf.get('HAVE_NETDB')
|
||||||
|
mock_ifaddrs = library(
|
||||||
|
'mock-ifaddrs',
|
||||||
|
diff --git a/test/uriparser.c b/test/uriparser.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..cf26bfd2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/uriparser.c
|
||||||
|
@@ -0,0 +1,208 @@
|
||||||
|
+// SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
+/**
|
||||||
|
+ * This file is part of libnvme.
|
||||||
|
+ * Copyright (c) 2024 Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <assert.h>
|
||||||
|
+#include <string.h>
|
||||||
|
+#include <stdbool.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
+#include <ccan/array_size/array_size.h>
|
||||||
|
+
|
||||||
|
+#include <libnvme.h>
|
||||||
|
+#include <nvme/private.h>
|
||||||
|
+
|
||||||
|
+struct test_data {
|
||||||
|
+ const char *uri;
|
||||||
|
+ /* parsed data */
|
||||||
|
+ const char *scheme;
|
||||||
|
+ const char *host;
|
||||||
|
+ const char *user;
|
||||||
|
+ const char *proto;
|
||||||
|
+ int port;
|
||||||
|
+ const char *path[7];
|
||||||
|
+ const char *query;
|
||||||
|
+ const char *frag;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static struct test_data test_data[] = {
|
||||||
|
+ { "nvme://192.168.1.1", "nvme", "192.168.1.1" },
|
||||||
|
+ { "nvme://192.168.1.1/", "nvme", "192.168.1.1" },
|
||||||
|
+ { "nvme://192.168.1.1:1234", "nvme", "192.168.1.1", .port = 1234 },
|
||||||
|
+ { "nvme://192.168.1.1:1234/", "nvme", "192.168.1.1", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://192.168.1.1", "nvme", "192.168.1.1", .proto = "tcp" },
|
||||||
|
+ { "nvme+rdma://192.168.1.1/", "nvme", "192.168.1.1", .proto = "rdma" },
|
||||||
|
+ { "nvme+tcp://192.168.1.1:1234",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://192.168.1.1:1234/",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://192.168.1.1:4420/path",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "path", NULL }},
|
||||||
|
+ { "nvme+tcp://192.168.1.1/path/",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .path = { "path", NULL }},
|
||||||
|
+ { "nvme+tcp://192.168.1.1:4420/p1/p2/p3",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme+tcp://192.168.1.1:4420/p1/p2/p3/",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme+tcp://192.168.1.1:4420//p1//p2/////p3",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme+tcp://192.168.1.1:4420//p1//p2/////p3/",
|
||||||
|
+ "nvme", "192.168.1.1", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme://[fe80::1010]", "nvme", "fe80::1010" },
|
||||||
|
+ { "nvme://[fe80::1010]/", "nvme", "fe80::1010" },
|
||||||
|
+ { "nvme://[fe80::1010]:1234", "nvme", "fe80::1010", .port = 1234 },
|
||||||
|
+ { "nvme://[fe80::1010]:1234/", "nvme", "fe80::1010", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://[fe80::1010]", "nvme", "fe80::1010", .proto = "tcp" },
|
||||||
|
+ { "nvme+rdma://[fe80::1010]/", "nvme", "fe80::1010", .proto = "rdma" },
|
||||||
|
+ { "nvme+tcp://[fe80::1010]:1234",
|
||||||
|
+ "nvme", "fe80::1010", .proto = "tcp", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://[fe80::1010]:1234/",
|
||||||
|
+ "nvme", "fe80::1010", .proto = "tcp", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://[fe80::1010]:4420/path",
|
||||||
|
+ "nvme", "fe80::1010", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "path", NULL }},
|
||||||
|
+ { "nvme+tcp://[fe80::1010]/path/",
|
||||||
|
+ "nvme", "fe80::1010", .proto = "tcp", .path = { "path", NULL }},
|
||||||
|
+ { "nvme+tcp://[fe80::1010]:4420/p1/p2/p3",
|
||||||
|
+ "nvme", "fe80::1010", .proto = "tcp", .port = 4420,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme+tcp://[fe80::fc7d:8cff:fe5b:962e]:666/p1/p2/p3/",
|
||||||
|
+ "nvme", "fe80::fc7d:8cff:fe5b:962e", .proto = "tcp", .port = 666,
|
||||||
|
+ .path = { "p1", "p2", "p3", NULL }},
|
||||||
|
+ { "nvme://h?query", "nvme", "h", .query = "query" },
|
||||||
|
+ { "nvme://h/?query", "nvme", "h", .query = "query" },
|
||||||
|
+ { "nvme://h/x?query",
|
||||||
|
+ "nvme", "h", .path = { "x" }, .query = "query" },
|
||||||
|
+ { "nvme://h/p1/?query",
|
||||||
|
+ "nvme", "h", .path = { "p1" }, .query = "query" },
|
||||||
|
+ { "nvme://h/p1/x?query",
|
||||||
|
+ "nvme", "h", .path = { "p1", "x" }, .query = "query" },
|
||||||
|
+ { "nvme://h#fragment", "nvme", "h", .frag = "fragment" },
|
||||||
|
+ { "nvme://h/#fragment", "nvme", "h", .frag = "fragment" },
|
||||||
|
+ { "nvme://h/x#fragment",
|
||||||
|
+ "nvme", "h", .path = { "x" }, .frag = "fragment" },
|
||||||
|
+ { "nvme://h/p1/#fragment",
|
||||||
|
+ "nvme", "h", .path = { "p1" }, .frag = "fragment" },
|
||||||
|
+ { "nvme://h/p1/x#fragment",
|
||||||
|
+ "nvme", "h", .path = { "p1", "x" }, .frag = "fragment" },
|
||||||
|
+ { "nvme://h/?query#fragment",
|
||||||
|
+ "nvme", "h", .query = "query", .frag = "fragment" },
|
||||||
|
+ { "nvme://h/x?query#fragment",
|
||||||
|
+ "nvme", "h", .path = { "x" }, .query = "query", .frag = "fragment" },
|
||||||
|
+ { "nvme://h/p1/?query#fragment",
|
||||||
|
+ "nvme", "h", .path = { "p1" }, .query = "query", .frag = "fragment" },
|
||||||
|
+ { "nvme://h/p1/x?query#fragment",
|
||||||
|
+ "nvme", "h", .path = { "p1", "x" }, .query = "query",
|
||||||
|
+ .frag = "fragment" },
|
||||||
|
+ { "nvme://h/#fragment?query",
|
||||||
|
+ "nvme", "h", .frag = "fragment?query" },
|
||||||
|
+ { "nvme://h/x#fragment?query",
|
||||||
|
+ "nvme", "h", .path = { "x" }, .frag = "fragment?query" },
|
||||||
|
+ { "nvme://h/p1/#fragment?query",
|
||||||
|
+ "nvme", "h", .path = { "p1" }, .frag = "fragment?query" },
|
||||||
|
+ { "nvme://h/p1/x#fragment?query",
|
||||||
|
+ "nvme", "h", .path = { "p1", "x" }, .frag = "fragment?query" },
|
||||||
|
+ { "nvme://user@h", "nvme", "h", .user = "user" },
|
||||||
|
+ { "nvme://user@h/", "nvme", "h", .user = "user" },
|
||||||
|
+ { "nvme://user:pass@h/", "nvme", "h", .user = "user:pass" },
|
||||||
|
+ { "nvme://[fe80::1010]@h/", "nvme", "h", .user = "[fe80::1010]" },
|
||||||
|
+ { "nvme://u[fe80::1010]@h/", "nvme", "h", .user = "u[fe80::1010]" },
|
||||||
|
+ { "nvme://u[aa:bb::cc]@h/", "nvme", "h", .user = "u[aa:bb::cc]" },
|
||||||
|
+ { "nvme+rdma://u[aa:bb::cc]@[aa:bb::cc]:12345/p1/x?q=val#fr",
|
||||||
|
+ "nvme", "aa:bb::cc", .proto = "rdma", .port = 12345,
|
||||||
|
+ .user = "u[aa:bb::cc]", .path = { "p1", "x" },
|
||||||
|
+ .query = "q=val", .frag = "fr" },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+const char *test_data_bad[] = {
|
||||||
|
+ "",
|
||||||
|
+ " ",
|
||||||
|
+ "nonsense",
|
||||||
|
+ "vnme:",
|
||||||
|
+ "vnme:/",
|
||||||
|
+ "vnme://",
|
||||||
|
+ "vnme:///",
|
||||||
|
+ "vnme+foo://",
|
||||||
|
+ "nvme:hostname/",
|
||||||
|
+ "nvme:/hostname/",
|
||||||
|
+ "nvme:///hostname/",
|
||||||
|
+ "nvme+foo:///hostname/",
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static void test_uriparser(void)
|
||||||
|
+{
|
||||||
|
+ printf("Testing URI parser:\n");
|
||||||
|
+ for (int i = 0; i < ARRAY_SIZE(test_data); i++) {
|
||||||
|
+ const struct test_data *d = &test_data[i];
|
||||||
|
+ struct nvme_fabrics_uri *parsed_data;
|
||||||
|
+ char **s;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ printf(" '%s'...", d->uri);
|
||||||
|
+ parsed_data = nvme_parse_uri(d->uri);
|
||||||
|
+ assert(parsed_data);
|
||||||
|
+
|
||||||
|
+ assert(strcmp(d->scheme, parsed_data->scheme) == 0);
|
||||||
|
+ if (d->proto) {
|
||||||
|
+ assert(parsed_data->protocol != NULL);
|
||||||
|
+ assert(strcmp(d->proto, parsed_data->protocol) == 0);
|
||||||
|
+ } else
|
||||||
|
+ assert(d->proto == parsed_data->protocol);
|
||||||
|
+ assert(strcmp(d->host, parsed_data->host) == 0);
|
||||||
|
+ assert(d->port == parsed_data->port);
|
||||||
|
+
|
||||||
|
+ if (!parsed_data->path_segments)
|
||||||
|
+ assert(d->path[0] == NULL);
|
||||||
|
+ else {
|
||||||
|
+ for (i = 0, s = parsed_data->path_segments;
|
||||||
|
+ s && *s; s++, i++) {
|
||||||
|
+ assert(d->path[i] != NULL);
|
||||||
|
+ assert(strcmp(d->path[i], *s) == 0);
|
||||||
|
+ }
|
||||||
|
+ /* trailing NULL element */
|
||||||
|
+ assert(d->path[i] == parsed_data->path_segments[i]);
|
||||||
|
+ }
|
||||||
|
+ if (d->query) {
|
||||||
|
+ assert(parsed_data->query != NULL);
|
||||||
|
+ assert(strcmp(d->query, parsed_data->query) == 0);
|
||||||
|
+ } else
|
||||||
|
+ assert(d->query == parsed_data->query);
|
||||||
|
+ if (d->frag) {
|
||||||
|
+ assert(parsed_data->fragment != NULL);
|
||||||
|
+ assert(strcmp(d->frag, parsed_data->fragment) == 0);
|
||||||
|
+ } else
|
||||||
|
+ assert(d->frag == parsed_data->fragment);
|
||||||
|
+ nvme_free_uri(parsed_data);
|
||||||
|
+ printf(" OK\n");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void test_uriparser_bad(void)
|
||||||
|
+{
|
||||||
|
+ printf("Testing malformed URI strings:\n");
|
||||||
|
+ for (int i = 0; i < ARRAY_SIZE(test_data_bad); i++) {
|
||||||
|
+ struct nvme_fabrics_uri *parsed_data;
|
||||||
|
+
|
||||||
|
+ printf(" '%s'...", test_data_bad[i]);
|
||||||
|
+ parsed_data = nvme_parse_uri(test_data_bad[i]);
|
||||||
|
+ assert(parsed_data == NULL);
|
||||||
|
+ printf(" OK\n");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int main(int argc, char *argv[])
|
||||||
|
+{
|
||||||
|
+ test_uriparser();
|
||||||
|
+ test_uriparser_bad();
|
||||||
|
+
|
||||||
|
+ fflush(stdout);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
|
||||||
|
From b2044e8f416b54df34e0d162b59ca0745db92927 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Mon, 13 May 2024 17:38:25 +0200
|
||||||
|
Subject: [PATCH 3/3] fabrics: Unescape URI elements
|
||||||
|
|
||||||
|
This adds support for unescaping percent-encoded URI parts.
|
||||||
|
|
||||||
|
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
---
|
||||||
|
src/nvme/fabrics.c | 47 +++++++++++++++++++++++++++++++++++++---------
|
||||||
|
test/uriparser.c | 13 +++++++++++++
|
||||||
|
2 files changed, 51 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
|
||||||
|
index 324a7321..e5921f8b 100644
|
||||||
|
--- a/src/nvme/fabrics.c
|
||||||
|
+++ b/src/nvme/fabrics.c
|
||||||
|
@@ -1704,12 +1704,41 @@ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result)
|
||||||
|
return nvmf_dim(c, tas, NVMF_TRTYPE_TCP, nvme_get_adrfam(c), "", NULL, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#define IS_XDIGIT(c) ((c >= '0' && c <= '9') || \
|
||||||
|
+ (c >= 'A' && c <= 'F') || \
|
||||||
|
+ (c >= 'a' && c <= 'f'))
|
||||||
|
+#define XDIGIT_VAL(c) ((c >= '0' && c <= '9') ? c - '0' : ( \
|
||||||
|
+ (c >= 'A' && c <= 'F') ? c - 'A' + 10 : c - 'a' + 10))
|
||||||
|
+
|
||||||
|
+/* returns newly allocated string */
|
||||||
|
+static char *unescape_uri(const char *str, int len)
|
||||||
|
+{
|
||||||
|
+ char *dst;
|
||||||
|
+ int l;
|
||||||
|
+ int i, j;
|
||||||
|
+
|
||||||
|
+ l = len > 0 ? len : strlen(str);
|
||||||
|
+ dst = malloc(l + 1);
|
||||||
|
+ for (i = 0, j = 0; i < l; i++, j++) {
|
||||||
|
+ if (str[i] == '%' && i + 2 < l &&
|
||||||
|
+ IS_XDIGIT(str[i + 1]) && IS_XDIGIT(str[i + 2])) {
|
||||||
|
+ dst[j] = (XDIGIT_VAL(str[i + 1]) << 4) +
|
||||||
|
+ XDIGIT_VAL(str[i + 2]);
|
||||||
|
+ i += 2;
|
||||||
|
+ } else
|
||||||
|
+ dst[j] = str[i];
|
||||||
|
+ }
|
||||||
|
+ dst[j] = '\0';
|
||||||
|
+ return dst;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
{
|
||||||
|
struct nvme_fabrics_uri *uri;
|
||||||
|
_cleanup_free_ char *scheme = NULL;
|
||||||
|
_cleanup_free_ char *authority = NULL;
|
||||||
|
_cleanup_free_ char *path = NULL;
|
||||||
|
+ _cleanup_free_ char *h = NULL;
|
||||||
|
const char *host;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -1726,8 +1755,6 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
* -CONTROLLER PORT]/NQN.2014-08.ORG.NVMEXPRESS.DISCOVERY/<NID>
|
||||||
|
*/
|
||||||
|
|
||||||
|
- /* TODO: unescape? */
|
||||||
|
-
|
||||||
|
uri = calloc(1, sizeof(struct nvme_fabrics_uri));
|
||||||
|
if (!uri)
|
||||||
|
return NULL;
|
||||||
|
@@ -1750,20 +1777,22 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
host = strrchr(authority, '@');
|
||||||
|
if (host) {
|
||||||
|
host++;
|
||||||
|
- uri->userinfo = strndup(authority, host - authority);
|
||||||
|
+ uri->userinfo = unescape_uri(authority, host - authority);
|
||||||
|
} else
|
||||||
|
host = authority;
|
||||||
|
|
||||||
|
/* try matching IPv6 address first */
|
||||||
|
if (sscanf(host, "[%m[^]]]:%d",
|
||||||
|
- &uri->host, &uri->port) < 1)
|
||||||
|
+ &uri->host, &uri->port) < 1) {
|
||||||
|
/* treat it as IPv4/hostname */
|
||||||
|
if (sscanf(host, "%m[^:]:%d",
|
||||||
|
- &uri->host, &uri->port) < 1) {
|
||||||
|
+ &h, &uri->port) < 1) {
|
||||||
|
nvme_free_uri(uri);
|
||||||
|
errno = EINVAL;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
+ uri->host = unescape_uri(h, 0);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* split path into elements */
|
||||||
|
if (path) {
|
||||||
|
@@ -1772,13 +1801,13 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
/* separate the fragment */
|
||||||
|
e = strrchr(path, '#');
|
||||||
|
if (e) {
|
||||||
|
- uri->fragment = strdup(e + 1);
|
||||||
|
+ uri->fragment = unescape_uri(e + 1, 0);
|
||||||
|
*e = '\0';
|
||||||
|
}
|
||||||
|
/* separate the query string */
|
||||||
|
e = strrchr(path, '?');
|
||||||
|
if (e) {
|
||||||
|
- uri->query = strdup(e + 1);
|
||||||
|
+ uri->query = unescape_uri(e + 1, 0);
|
||||||
|
*e = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1791,11 +1820,11 @@ struct nvme_fabrics_uri *nvme_parse_uri(const char *str)
|
||||||
|
i = 0;
|
||||||
|
elem = strtok_r(path, "/", &e);
|
||||||
|
if (elem)
|
||||||
|
- uri->path_segments[i++] = strdup(elem);
|
||||||
|
+ uri->path_segments[i++] = unescape_uri(elem, 0);
|
||||||
|
while (elem && strlen(elem)) {
|
||||||
|
elem = strtok_r(NULL, "/", &e);
|
||||||
|
if (elem)
|
||||||
|
- uri->path_segments[i++] = strdup(elem);
|
||||||
|
+ uri->path_segments[i++] = unescape_uri(elem, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/test/uriparser.c b/test/uriparser.c
|
||||||
|
index cf26bfd2..09b2a732 100644
|
||||||
|
--- a/test/uriparser.c
|
||||||
|
+++ b/test/uriparser.c
|
||||||
|
@@ -119,6 +119,19 @@ static struct test_data test_data[] = {
|
||||||
|
"nvme", "aa:bb::cc", .proto = "rdma", .port = 12345,
|
||||||
|
.user = "u[aa:bb::cc]", .path = { "p1", "x" },
|
||||||
|
.query = "q=val", .frag = "fr" },
|
||||||
|
+ { "nvme://ex%5Cmp%3Ae", "nvme", "ex\\mp:e" },
|
||||||
|
+ { "nvme://ex%5Cmp%3Ae.com/", "nvme", "ex\\mp:e.com" },
|
||||||
|
+ { "nvme://u%24er@ex%5Cmp%3Ae.com/", "nvme", "ex\\mp:e.com",
|
||||||
|
+ .user = "u$er" },
|
||||||
|
+ { "nvme+tcp://ex%5Cmp%3Ae.com:1234",
|
||||||
|
+ "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234 },
|
||||||
|
+ { "nvme+tcp://ex%5Cmp%3Ae.com:1234/p1/ex%3Camp%3Ele/p3",
|
||||||
|
+ "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234,
|
||||||
|
+ .path = { "p1", "ex<amp>le", "p3", NULL } },
|
||||||
|
+ { "nvme+tcp://ex%5Cmp%3Ae.com:1234/p1/%3C%3E/p3?q%5E%24ry#fr%26gm%23nt",
|
||||||
|
+ "nvme", "ex\\mp:e.com", .proto = "tcp", .port = 1234,
|
||||||
|
+ .path = { "p1", "<>", "p3", NULL }, .query = "q^$ry",
|
||||||
|
+ .frag = "fr&gm#nt" },
|
||||||
|
};
|
||||||
|
|
||||||
|
const char *test_data_bad[] = {
|
||||||
@ -3,23 +3,25 @@
|
|||||||
|
|
||||||
Name: libnvme
|
Name: libnvme
|
||||||
Summary: Linux-native nvme device management library
|
Summary: Linux-native nvme device management library
|
||||||
Version: 1.2
|
Version: 1.9
|
||||||
Release: 3%{?dist}.alma
|
Release: 3%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPL-2.1-or-later
|
||||||
URL: https://github.com/linux-nvme/libnvme
|
URL: https://github.com/linux-nvme/libnvme
|
||||||
Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
|
Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
|
||||||
|
|
||||||
Patch0: 0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch
|
# https://issues.redhat.com/browse/RHEL-37608
|
||||||
# Patch was taken from upstream and modified to apply cleanly
|
Patch0: libnvme-1.10-uriparser.patch
|
||||||
# https://gitlab.com/redhat/centos-stream/rpms/libnvme/-/blob/a6eb4250d55ee57293574472a4563caaa3f8133f/0001-fabrics-Do-not-pass-unsupported-options-to-kernel.patch
|
Patch1: 0001-tree-handle-no-address-phy-slot-dirs.patch
|
||||||
Patch1: 0002-fabrics-Do-not-pass-unsupported-options-to-kernel.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc gcc-c++
|
BuildRequires: gcc gcc-c++
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: meson >= 0.48.0
|
BuildRequires: meson >= 0.50.0
|
||||||
BuildRequires: json-c-devel >= 0.13
|
BuildRequires: json-c-devel >= 0.13
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: keyutils-libs-devel
|
||||||
|
|
||||||
|
Requires: keyutils-libs
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Provides type definitions for NVMe specification structures,
|
Provides type definitions for NVMe specification structures,
|
||||||
@ -48,7 +50,6 @@ This package contains the reference manual for %{name}.
|
|||||||
Summary: Python3 bindings for libnvme
|
Summary: Python3 bindings for libnvme
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Provides: python3-nvme = %{version}-%{release}
|
Provides: python3-nvme = %{version}-%{release}
|
||||||
Obsoletes: python3-nvme < 1.0~rc7
|
|
||||||
%{?python_provide:%python_provide python3-libnvme}
|
%{?python_provide:%python_provide python3-libnvme}
|
||||||
|
|
||||||
%description -n python3-libnvme
|
%description -n python3-libnvme
|
||||||
@ -58,7 +59,7 @@ This package contains Python bindings for libnvme.
|
|||||||
%autosetup -p1 -n %{name}-%{version_no_tilde}
|
%autosetup -p1 -n %{name}-%{version_no_tilde}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -Dpython=true -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir}
|
%meson -Dpython=enabled -Dlibdbus=disabled -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir}
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -74,9 +75,9 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/
|
|||||||
%files
|
%files
|
||||||
%license COPYING ccan/licenses/*
|
%license COPYING ccan/licenses/*
|
||||||
%{_libdir}/libnvme.so.1
|
%{_libdir}/libnvme.so.1
|
||||||
%{_libdir}/libnvme.so.1.2.0
|
%{_libdir}/libnvme.so.1.9.0
|
||||||
%{_libdir}/libnvme-mi.so.1
|
%{_libdir}/libnvme-mi.so.1
|
||||||
%{_libdir}/libnvme-mi.so.1.2.0
|
%{_libdir}/libnvme-mi.so.1.9.0
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_libdir}/libnvme.so
|
%{_libdir}/libnvme.so
|
||||||
@ -96,8 +97,41 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/
|
|||||||
%{python3_sitearch}/libnvme/*
|
%{python3_sitearch}/libnvme/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 02 2023 Eduard Abdullin <eabdullin@almlainux.org> - 1.2-3.alma
|
* Thu Aug 01 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.9-3
|
||||||
- Apply 0002-fabrics-Do-not-pass-unsupported-options-to-kernel patch
|
- Backport fix for RHEL-49544
|
||||||
|
|
||||||
|
* Wed Jul 24 2024 Tomas Bzatek <tbzatek@redhat.com> - 1.9-2
|
||||||
|
- Backport URI parser API
|
||||||
|
|
||||||
|
* Tue May 07 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.9-1
|
||||||
|
- Rebase to version 1.9
|
||||||
|
|
||||||
|
* Tue Apr 02 2024 Maurizio Lombardi <mlombard@redhat.com> - 1.8-1
|
||||||
|
- Update to version 1.8
|
||||||
|
|
||||||
|
* Fri Nov 03 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.6-1
|
||||||
|
- Update to version 1.6, including the stack-smashing fixes
|
||||||
|
|
||||||
|
* Mon Jul 17 2023 John Meneghini <jmeneghi@redhat.com> - 1.4-7
|
||||||
|
- Fix BZ#2223429
|
||||||
|
|
||||||
|
* Mon Jun 05 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-6
|
||||||
|
- Rebuild for BZ2212307
|
||||||
|
|
||||||
|
* Tue May 16 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-5
|
||||||
|
- Add support to NBFT (BZ2188516)
|
||||||
|
|
||||||
|
* Mon May 08 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-4
|
||||||
|
- Fix BZ#2190206
|
||||||
|
|
||||||
|
* Fri May 05 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-3
|
||||||
|
- Fix Jira RHEL-258
|
||||||
|
|
||||||
|
* Thu Apr 06 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-2
|
||||||
|
- Rebuild the package
|
||||||
|
|
||||||
|
* Mon Apr 03 2023 Maurizio Lombardi <mlombard@redhat.com> - 1.4-1
|
||||||
|
- Update to version 1.4
|
||||||
|
|
||||||
* Thu Jan 12 2023 John Meneghini <jmeneghi@redhat.com> - 1.2-2
|
* Thu Jan 12 2023 John Meneghini <jmeneghi@redhat.com> - 1.2-2
|
||||||
- Fix BZ2158264
|
- Fix BZ2158264
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user