From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753002AbdK3O4X (ORCPT ); Thu, 30 Nov 2017 09:56:23 -0500 Received: from mx2.suse.de ([195.135.220.15]:49200 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428AbdK3O4X (ORCPT ); Thu, 30 Nov 2017 09:56:23 -0500 From: Johannes Thumshirn To: Christoph Hellwig Cc: Hannes Reinecke , Linux Kernel Mailinglist , Sagi Grimberg , Keith Busch , Linux NVMe Mailinglist , Johannes Thumshirn , James Smart Subject: [PATCH] nvme-fc: don't require user to enter host_traddr Date: Thu, 30 Nov 2017 15:56:15 +0100 Message-Id: <20171130145615.7506-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.13.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org One major usability difference between NVMf RDMA and FC is resolving the default host transport address in RDMA. This is perfectly doable in FC as well, as we already have all possible lport <-> rport combinations pre-populated so we can pick the first lport that has a connection to our desired rport per default or optionally use the user supplied lport if we have one. Signed-off-by: Johannes Thumshirn Cc: James Smart --- drivers/nvme/host/fc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 7ab0be55c7d0..46ab900bbe26 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3328,15 +3328,19 @@ nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) if (ret || !raddr.nn || !raddr.pn) return ERR_PTR(-EINVAL); - ret = nvme_fc_parse_traddr(&laddr, opts->host_traddr, NVMF_TRADDR_SIZE); - if (ret || !laddr.nn || !laddr.pn) - return ERR_PTR(-EINVAL); + if (opts->mask & NVMF_OPT_HOST_TRADDR) { + ret = nvme_fc_parse_traddr(&laddr, opts->host_traddr, + NVMF_TRADDR_SIZE); + if (ret || !laddr.nn || !laddr.pn) + return ERR_PTR(-EINVAL); + } /* find the host and remote ports to connect together */ spin_lock_irqsave(&nvme_fc_lock, flags); list_for_each_entry(lport, &nvme_fc_lport_list, port_list) { - if (lport->localport.node_name != laddr.nn || - lport->localport.port_name != laddr.pn) + if ((laddr.nn || laddr.pn) && + (lport->localport.node_name != laddr.nn || + lport->localport.port_name != laddr.pn)) continue; list_for_each_entry(rport, &lport->endp_list, endp_list) { @@ -3364,8 +3368,9 @@ nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) static struct nvmf_transport_ops nvme_fc_transport = { .name = "fc", - .required_opts = NVMF_OPT_TRADDR | NVMF_OPT_HOST_TRADDR, - .allowed_opts = NVMF_OPT_RECONNECT_DELAY | NVMF_OPT_CTRL_LOSS_TMO, + .required_opts = NVMF_OPT_TRADDR, + .allowed_opts = NVMF_OPT_RECONNECT_DELAY | NVMF_OPT_CTRL_LOSS_TMO + | NVMF_OPT_HOST_TRADDR, .create_ctrl = nvme_fc_create_ctrl, }; -- 2.13.6