nvme-tcp: Add option to set the physical interface to be used when connecting over TCP sockets.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 nvme-tcp: Add option to set the physical interface to be used when connecting over TCP sockets.
From: Martin Belanger <[email protected]>
Add 'Host Transport Interface' (host-triface) option. This can be used to specify the IP interface to use for the connection. The driver uses that to set SO_BINDTODEVICE on the TCP socket before connecting.
--- drivers/nvme/host/core.c | 5 +++++ drivers/nvme/host/fabrics.c | 14 +++++++++++++ drivers/nvme/host/fabrics.h | 6 +++++- drivers/nvme/host/tcp.c | 41 ++++++++++++++++++++++++++++++++++--- 4 files changed, 62 insertions(+), 4 deletions(-)
drivers/nvme/host/core.c +5 -0
@@ -3961,6 +3961,11 @@ static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) ret =add_uevent_var (env,"NVME_HOST_TRADDR=%s" , opts->host_traddr ?:"none" ); +if (ret) +return ret; + + ret =add_uevent_var (env,"NVME_HOST_TRIFACE=%s" , + opts->host_triface ?:"none" ); }return ret; }
drivers/nvme/host/fabrics.c +14 -0
@@ -112,6 +112,9 @@ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size)if (ctrl->opts->mask &NVMF_OPT_HOST_TRADDR ) len +=scnprintf (buf + len, size - len,"%shost_traddr=%s" , (len) ?"," :"" , ctrl->opts->host_traddr); +if (ctrl->opts->mask &NVMF_OPT_HOST_TRIFACE ) + len +=scnprintf (buf + len, size - len,"%shost_triface=%s" , + (len) ?"," :"" , ctrl->opts->host_triface); len +=scnprintf (buf + len, size - len,"\n" );return len;
@@ -604,6 +607,7 @@ static const match_table_t opt_tokens = { { NVMF_OPT_KATO, "keep_alive_tmo=%d" }, { NVMF_OPT_HOSTNQN, "hostnqn=%s" }, { NVMF_OPT_HOST_TRADDR, "host_traddr=%s" }, + { NVMF_OPT_HOST_TRIFACE, "host_triface=%s" }, { NVMF_OPT_HOST_ID, "hostid=%s" }, { NVMF_OPT_DUP_CONNECT, "duplicate_connect" }, { NVMF_OPT_DISABLE_SQFLOW, "disable_sqflow" },
@@ -813,6 +817,15 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,kfree (opts->host_traddr); opts->host_traddr = p;break ; +case NVMF_OPT_HOST_TRIFACE : + p =match_strdup (args); +if (!p) { + ret = -ENOMEM ; + goto out; + } +kfree (opts->host_triface); + opts->host_triface = p; +break ;case NVMF_OPT_HOST_ID : p =match_strdup (args);if (!p) {
@@ -997,6 +1010,7 @@ void nvmf_free_options(struct nvmf_ctrl_options *opts)kfree (opts->trsvcid);kfree (opts->subsysnqn);kfree (opts->host_traddr); +kfree (opts->host_triface);kfree (opts); }EXPORT_SYMBOL_GPL (nvmf_free_options);
drivers/nvme/host/fabrics.h +5 -1
@@ -59,6 +59,7 @@ enum {NVMF_OPT_NR_POLL_QUEUES =1 <<18 ,NVMF_OPT_TOS =1 <<19 ,NVMF_OPT_FAIL_FAST_TMO =1 <<20 , + NVMF_OPT_HOST_TRIFACE = 1 << 21, };/**
@@ -76,7 +77,9 @@ enum {* @trsvcid: The transport-specific TRSVCID field for a port on the * subsystem which is adding a controller. * @host_traddr: A transport-specific field identifying the NVME host port -* to use for the connection to the controller. +* to use for the connection to the controller. +* @host_triface: A transport-specific field identifying the NVME host +* interface to use for the connection to the controller. * @queue_size: Number of IO queue elements. * @nr_io_queues: Number of controller IO queues that will be established. * @reconnect_delay: Time between two consecutive reconnect attempts.
@@ -101,6 +104,7 @@ struct nvmf_ctrl_options {char *traddr;char *trsvcid;char *host_traddr; +char *host_triface;size_t queue_size;unsigned int nr_io_queues;unsigned int reconnect_delay;
drivers/nvme/host/tcp.c +38 -3
71 lines not on this page · raw message
--
2.25.1
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 188 lines · Martin Belanger
From: Martin Belanger <[email protected]>
Add 'Host Transport Interface' (host-triface) option. This can be used to specify the IP interface to use for the connection. The driver uses that to set
SO_BINDTODEVICEon the TCP socket before connecting.Signed-off-by Martin Belanger <[email protected]>--- drivers/nvme/host/core.c | 5 +++++ drivers/nvme/host/fabrics.c | 14 +++++++++++++ drivers/nvme/host/fabrics.h | 6 +++++- drivers/nvme/host/tcp.c | 41 ++++++++++++++++++++++++++++++++++--- 4 files changed, 62 insertions(+), 4 deletions(-)drivers/nvme/host/core.c +5
-0@@ -3961,6 +3961,11 @@ static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) ret =add_uevent_var (env,"NVME_HOST_TRADDR=%s" , opts->host_traddr ?:"none" ); +if (ret) +return ret; + + ret =add_uevent_var (env,"NVME_HOST_TRIFACE=%s" , + opts->host_triface ?:"none" ); }return ret; }drivers/nvme/host/fabrics.c +14
-0@@ -112,6 +112,9 @@ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size)if (ctrl->opts->mask &NVMF_OPT_HOST_TRADDR ) len +=scnprintf (buf + len, size - len,"%shost_traddr=%s" , (len) ?"," :"" , ctrl->opts->host_traddr); +if (ctrl->opts->mask &NVMF_OPT_HOST_TRIFACE ) + len +=scnprintf (buf + len, size - len,"%shost_triface=%s" , + (len) ?"," :"" , ctrl->opts->host_triface); len +=scnprintf (buf + len, size - len,"\n" );return len;@@ -604,6 +607,7 @@ static const match_table_t opt_tokens = { { NVMF_OPT_KATO, "keep_alive_tmo=%d" }, { NVMF_OPT_HOSTNQN, "hostnqn=%s" }, { NVMF_OPT_HOST_TRADDR, "host_traddr=%s" }, + { NVMF_OPT_HOST_TRIFACE, "host_triface=%s" }, { NVMF_OPT_HOST_ID, "hostid=%s" }, { NVMF_OPT_DUP_CONNECT, "duplicate_connect" }, { NVMF_OPT_DISABLE_SQFLOW, "disable_sqflow" },@@ -813,6 +817,15 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,kfree (opts->host_traddr); opts->host_traddr = p;break ; +case NVMF_OPT_HOST_TRIFACE : + p =match_strdup (args); +if (!p) { + ret = -ENOMEM ; + goto out; + } +kfree (opts->host_triface); + opts->host_triface = p; +break ;case NVMF_OPT_HOST_ID : p =match_strdup (args);if (!p) {@@ -997,6 +1010,7 @@ void nvmf_free_options(struct nvmf_ctrl_options *opts)kfree (opts->trsvcid);kfree (opts->subsysnqn);kfree (opts->host_traddr); +kfree (opts->host_triface);kfree (opts); }EXPORT_SYMBOL_GPL (nvmf_free_options);drivers/nvme/host/fabrics.h +5
-1@@ -59,6 +59,7 @@ enum {NVMF_OPT_NR_POLL_QUEUES =1 <<18 ,NVMF_OPT_TOS =1 <<19 ,NVMF_OPT_FAIL_FAST_TMO =1 <<20 , + NVMF_OPT_HOST_TRIFACE = 1 << 21, };/** @@ -76,7 +77,9 @@ enum {* @trsvcid: The transport-specific TRSVCID field for a port on the * subsystem which is adding a controller. * @host_traddr: A transport-specific field identifying the NVME host port -* to use for the connection to the controller. +* to use for the connection to the controller. +* @host_triface: A transport-specific field identifying the NVME host +* interface to use for the connection to the controller. * @queue_size: Number of IO queue elements. * @nr_io_queues: Number of controller IO queues that will be established. * @reconnect_delay: Time between two consecutive reconnect attempts. @@ -101,6 +104,7 @@ struct nvmf_ctrl_options {char *traddr;char *trsvcid;char *host_traddr; +char *host_triface;size_t queue_size;unsigned int nr_io_queues;unsigned int reconnect_delay;drivers/nvme/host/tcp.c +38
-4@@ -1447,6 +1447,20 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, } } +if (nctrl->opts->mask &NVMF_OPT_HOST_TRIFACE ) { +char *iface = nctrl->opts->host_triface; +sockptr_t optval =KERNEL_SOCKPTR (iface); + + ret =sock_setsockopt (queue->sock,SOL_SOCKET ,SO_BINDTODEVICE , + optval,strlen (iface)); +if (ret) { +dev_err (nctrl->device, +"failed to bind to interface %s queue %d err %d\n" , + iface, qid, ret); + goto err_sock; + } + } + queue->hdr_digest = nctrl->opts->hdr_digest; queue->data_digest = nctrl->opts->data_digest;if (queue->hdr_digest || queue->data_digest) {@@ -2457,6 +2471,10 @@ nvme_tcp_existing_controller(struct nvmf_ctrl_options *opts)static struct nvme_ctrl *nvme_tcp_create_ctrl (struct device *dev,struct nvmf_ctrl_options *opts) { +const char *iface_key ="" ; +const char *iface_val ="" ; +const char *srce_key ="" ; +const char *srce_val ="" ;struct nvme_tcp_ctrl *ctrl;int ret;@@ -2502,6 +2520,22 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev, opts->host_traddr); goto out_free_ctrl; } + srce_key =", src-addr " ; + srce_val = opts->host_traddr; + } + +if (opts->mask &NVMF_OPT_HOST_TRIFACE ) { +struct net_device *ndev; + + ndev =dev_get_by_name (&init_net, opts->host_triface); +if (!ndev) { +pr_err ("invalid interface passed: %s\n" , + opts->host_triface); + ret = -ENODEV ; + goto out_free_ctrl; + } + iface_key =", iface " ; + iface_val = opts->host_triface; }if (!opts->duplicate_connect &&nvme_tcp_existing_controller (opts)) {@@ -2530,8 +2564,9 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,if (ret) goto out_uninit_ctrl; -dev_info (ctrl->ctrl.device,"new ctrl: NQN \"%s\", addr %pISp\n" , - ctrl->ctrl.opts->subsysnqn, &ctrl->addr); +dev_info (ctrl->ctrl.device,"new ctrl: NQN \"%s\", addr %pISp%s%s%s%s\n" , + ctrl->ctrl.opts->subsysnqn, &ctrl->addr, + srce_key, srce_val, iface_key, iface_val);mutex_lock (&nvme_tcp_ctrl_mutex);list_add_tail (&ctrl->list, &nvme_tcp_ctrl_list);@@ -2560,7 +2595,7 @@ static struct nvmf_transport_ops nvme_tcp_transport = {NVMF_OPT_HOST_TRADDR |NVMF_OPT_CTRL_LOSS_TMO |NVMF_OPT_HDR_DIGEST |NVMF_OPT_DATA_DIGEST |NVMF_OPT_NR_WRITE_QUEUES |NVMF_OPT_NR_POLL_QUEUES | - NVMF_OPT_TOS, + NVMF_OPT_TOS | NVMF_OPT_HOST_TRIFACE, .create_ctrl = nvme_tcp_create_ctrl, }; --
Quoted 2 lines
2.25.1
I thought I did have some comments to this patch, but haven't seen any answers to it. Nor does the patch seem to be modified to address those comments. Apologies if my reviews didn't go through.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme