From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79E64C433DB for ; Mon, 22 Feb 2021 06:42:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7DD764E44 for ; Mon, 22 Feb 2021 06:42:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7DD764E44 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GYUyLrgO4R5Q/07L9OuiZEuVtc5jVRYXMkTB1jGHHQk=; b=S5LN/+fETH2vxiB7eDl7mik1nG nG2ChiSNu/QFifmhGkER/3WReV4ND+J5bklIJ5dRlBwMQ3FGKby48N8mZ/eU/bTgnvR8xImYKu4Na UyCcNtqB4UYw/DkfQQSLS7LyCvUd35RJL6Hwp3MVRi2ze3sLDN3hEHvUdOeo4wWlrVxHBhTUtOjrG +49NG66vborKTDCQK+GYi6Z2Z5YvaPET5JIPyakufUO9e1+ouS26e2ViXSC6wESTsOB7d1txQqz+E TcECcaJuZMiWshysfJ7XAtQtG+RjOp3iI3PuZ8s+hR9AEG6PxFbn++unrbAZBVeZ9FJZkIDgAR0s5 Uedai/Pw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lE4v5-0003sA-O7; Mon, 22 Feb 2021 06:42:11 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lE4uy-0003rl-9c for linux-nvme@lists.infradead.org; Mon, 22 Feb 2021 06:42:05 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D403FACD4; Mon, 22 Feb 2021 06:42:00 +0000 (UTC) From: Hannes Reinecke To: Christoph Hellwig Subject: [PATCHv2] nvme: add 'fail_if_no_path' sysfs attribute Date: Mon, 22 Feb 2021 07:41:55 +0100 Message-Id: <20210222064155.105742-1-hare@suse.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210222_014204_573966_606BB48D X-CRM114-Status: GOOD ( 21.29 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvme@lists.infradead.org, Sagi Grimberg , Keith Busch , Hannes Reinecke Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org In some setups like RAID we need to return an I/O error once all paths are unavailable to allow the upper layers to start their own error recovery (like redirecting I/O to other mirrors). This patch adds a sysfs attribute 'fail_if_no_path' to allow the admin to enable that behaviour instead of the current 'queue until a path becomes available' policy. Signed-off-by: Hannes Reinecke --- drivers/nvme/host/core.c | 5 +++++ drivers/nvme/host/multipath.c | 38 +++++++++++++++++++++++++++++++++-- drivers/nvme/host/nvme.h | 2 ++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5c1ec3bfb9d3..ef20029a46b2 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3466,6 +3466,7 @@ static struct attribute *nvme_ns_id_attrs[] = { #ifdef CONFIG_NVME_MULTIPATH &dev_attr_ana_grpid.attr, &dev_attr_ana_state.attr, + &dev_attr_fail_if_no_path.attr, #endif NULL, }; @@ -3496,6 +3497,10 @@ static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj, if (!nvme_ctrl_use_ana(nvme_get_ns_from_dev(dev)->ctrl)) return 0; } + if (a == &dev_attr_fail_if_no_path.attr) { + if (dev_to_disk(dev)->fops == &nvme_bdev_ops) + return 0; + } #endif return a->mode; } diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 0696319adaf6..35ed2f6d431b 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -283,10 +283,13 @@ static bool nvme_available_path(struct nvme_ns_head *head) continue; switch (ns->ctrl->state) { case NVME_CTRL_LIVE: + return true; case NVME_CTRL_RESETTING: - case NVME_CTRL_CONNECTING: /* fallthru */ - return true; + case NVME_CTRL_CONNECTING: + if (!test_bit(NVME_NSHEAD_FAIL_IF_NO_PATH, + &head->flags)) + return true; default: break; } @@ -641,6 +644,37 @@ static ssize_t ana_state_show(struct device *dev, struct device_attribute *attr, } DEVICE_ATTR_RO(ana_state); +static ssize_t fail_if_no_path_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct gendisk *disk = dev_to_disk(dev); + struct nvme_ns_head *head = disk->private_data; + + return sprintf(buf, "%d\n", + test_bit(NVME_NSHEAD_FAIL_IF_NO_PATH, &head->flags) ? + 1 : 0); +} + +static ssize_t fail_if_no_path_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + struct gendisk *disk = dev_to_disk(dev); + struct nvme_ns_head *head = disk->private_data; + int fail_if_no_path, err; + + err = kstrtoint(buf, 10, &fail_if_no_path); + if (err) + return -EINVAL; + + if (fail_if_no_path <= 0) + clear_bit(NVME_NSHEAD_FAIL_IF_NO_PATH, &head->flags); + else + set_bit(NVME_NSHEAD_FAIL_IF_NO_PATH, &head->flags); + return count; +} +DEVICE_ATTR(fail_if_no_path, S_IRUGO | S_IWUSR, + fail_if_no_path_show, fail_if_no_path_store); + static int nvme_lookup_ana_group_desc(struct nvme_ctrl *ctrl, struct nvme_ana_group_desc *desc, void *data) { diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 02aa4ba665c0..e8de2b9dcdc7 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -419,6 +419,7 @@ struct nvme_ns_head { struct mutex lock; unsigned long flags; #define NVME_NSHEAD_DISK_LIVE 0 +#define NVME_NSHEAD_FAIL_IF_NO_PATH 1 struct nvme_ns __rcu *current_path[]; #endif }; @@ -695,6 +696,7 @@ static inline void nvme_trace_bio_complete(struct request *req) extern struct device_attribute dev_attr_ana_grpid; extern struct device_attribute dev_attr_ana_state; +extern struct device_attribute dev_attr_fail_if_no_path; extern struct device_attribute subsys_attr_iopolicy; #else -- 2.26.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme