nvme-fc: add support for duplicate_connect option
authorJames Smart <jsmart2021@gmail.com>
Fri, 20 Oct 2017 23:17:08 +0000 (16:17 -0700)
committerChristoph Hellwig <hch@lst.de>
Fri, 27 Oct 2017 06:25:32 +0000 (09:25 +0300)
Adds support for the duplicate_connect option. When set to true,
checks whether there's an existing controller via the same host port
and target port for the same host (hostnqn, hostid) to the same
subsystem. Fails the connection request if an existing controller.

Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fc.c

index aa9aec6923bb75b8f2ab424bcae0919c494bccec..d12775d1298357941ae7fd1dab8a328c022b5628 100644 (file)
@@ -2792,6 +2792,33 @@ static const struct blk_mq_ops nvme_fc_admin_mq_ops = {
 };
 
 
+/*
+ * Fails a controller request if it matches an existing controller
+ * (association) with the same tuple:
+ * <Host NQN, Host ID, local FC port, remote FC port, SUBSYS NQN>
+ *
+ * The ports don't need to be compared as they are intrinsically
+ * already matched by the port pointers supplied.
+ */
+static bool
+nvme_fc_existing_controller(struct nvme_fc_rport *rport,
+               struct nvmf_ctrl_options *opts)
+{
+       struct nvme_fc_ctrl *ctrl;
+       unsigned long flags;
+       bool found = false;
+
+       spin_lock_irqsave(&rport->lock, flags);
+       list_for_each_entry(ctrl, &rport->ctrl_list, ctrl_list) {
+               found = nvmf_ctlr_matches_baseopts(&ctrl->ctrl, opts);
+               if (found)
+                       break;
+       }
+       spin_unlock_irqrestore(&rport->lock, flags);
+
+       return found;
+}
+
 static struct nvme_ctrl *
 nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
        struct nvme_fc_lport *lport, struct nvme_fc_rport *rport)
@@ -2806,6 +2833,12 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
                goto out_fail;
        }
 
+       if (!opts->duplicate_connect &&
+           nvme_fc_existing_controller(rport, opts)) {
+               ret = -EALREADY;
+               goto out_fail;
+       }
+
        ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
        if (!ctrl) {
                ret = -ENOMEM;