From patchwork Thu Dec 23 01:32:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 12697864 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10D0AC433F5 for ; Thu, 23 Dec 2021 01:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640223200; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uVeO0q2zlJAh69fjsJR3oTU358wcGEqllW0R+138KPo=; b=af3NRC/2LbKlbrkdtKBUqrIu7QBcAdSF6Pfx+m4R6YetVJmYJCx31hqjnu8RkGRXpRRO8f kG3pQTI4wq4sIBTolilzPLYuv4QA9sF9re3/J5uCnWcRqHRtR17LXEOGtNUqJXIDju2PUi i+DrisCCH7dyc5xX8z4AShkZngKDd2U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-103-6LYUX7SGPb-K7pBaf759Xg-1; Wed, 22 Dec 2021 20:33:17 -0500 X-MC-Unique: 6LYUX7SGPb-K7pBaf759Xg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 260AB100E325; Thu, 23 Dec 2021 01:33:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71E5B104253B; Thu, 23 Dec 2021 01:33:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3FCB61809CB8; Thu, 23 Dec 2021 01:33:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BN1Wi7P009270 for ; Wed, 22 Dec 2021 20:32:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 408DF7EE89; Thu, 23 Dec 2021 01:32:44 +0000 (UTC) Received: from octiron.msp.redhat.com (unknown [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 959D77EE6B; Thu, 23 Dec 2021 01:32:40 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 1BN1WcRS001722; Wed, 22 Dec 2021 19:32:38 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 1BN1WbZc001721; Wed, 22 Dec 2021 19:32:37 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Wed, 22 Dec 2021 19:32:33 -0600 Message-Id: <1640223155-1678-2-git-send-email-bmarzins@redhat.com> In-Reply-To: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> References: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH 1/3] libmultipath: fix DI_NOIO pathinfo PATH_PENDING handling X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com pp->state should only be set to PATH_PENDING if it is currently in the PATH_UNCHECKED or PATH_WILD states. Otherwise, it should retain its current state. Fix this in pathinfo() calls with DI_NOIO, to match with the rest of the code. Signed-off-by: Benjamin Marzinski --- libmultipath/discovery.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index 7d939ae0..6e5d1005 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -2345,7 +2345,10 @@ int pathinfo(struct path *pp, struct config *conf, int mask) * Avoid any IO on the device itself. * simply use the path_offline() return as its state */ - pp->chkrstate = pp->state = path_state; + if (path_state != PATH_PENDING || + pp->state == PATH_UNCHECKED || + pp->state == PATH_WILD) + pp->chkrstate = pp->state = path_state; return PATHINFO_OK; } From patchwork Thu Dec 23 01:32:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 12697866 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0611FC433FE for ; Thu, 23 Dec 2021 01:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640223205; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gEofLU5fIeMuaZb0YwpN/66pB6tirEjE9yeZddkW9OE=; b=DoJHMBN4ieUGXfYyvCczKfHVUqTQWN0IiKz/lUuE2l+LQQHdODVCNB6+BPK1W9ZnnAqlCq 7zq5LI1OeBFiZitnsRiWekr77Dw7/uaW/54mTUXOkpSpDgqyphHTmqeyrBV9rBQLBe5GVF KWGI1Q6wCLa2AY+HxcnsKleXqud3FPE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-2cda00a0NfWbTuCgQ3PLag-1; Wed, 22 Dec 2021 20:33:22 -0500 X-MC-Unique: 2cda00a0NfWbTuCgQ3PLag-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26A22100E32B; Thu, 23 Dec 2021 01:33:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A78E104253B; Thu, 23 Dec 2021 01:33:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D85A71809CB8; Thu, 23 Dec 2021 01:33:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BN1WlHq009285 for ; Wed, 22 Dec 2021 20:32:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 14FA277478; Thu, 23 Dec 2021 01:32:47 +0000 (UTC) Received: from octiron.msp.redhat.com (unknown [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A86D577C8A; Thu, 23 Dec 2021 01:32:42 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 1BN1Weu6001726; Wed, 22 Dec 2021 19:32:40 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 1BN1Wdku001725; Wed, 22 Dec 2021 19:32:39 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Wed, 22 Dec 2021 19:32:34 -0600 Message-Id: <1640223155-1678-3-git-send-email-bmarzins@redhat.com> In-Reply-To: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> References: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH 2/3] libmultipath: simplify out __set_no_path_retry() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com The only caller of __set_no_path_retry() is set_no_path_retry(), so remove the define and the unneeded arguments from the function. Signed-off-by: Benjamin Marzinski --- libmultipath/libmultipath.version | 2 +- libmultipath/structs_vec.c | 11 +++++------ libmultipath/structs_vec.h | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version index 7cdce9fc..2d0c9f26 100644 --- a/libmultipath/libmultipath.version +++ b/libmultipath/libmultipath.version @@ -176,7 +176,7 @@ global: select_reservation_key; send_packet; set_max_fds; - __set_no_path_retry; + set_no_path_retry; set_path_removed; set_prkey; setup_map; diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c index cb0ebae6..f1031f61 100644 --- a/libmultipath/structs_vec.c +++ b/libmultipath/structs_vec.c @@ -588,23 +588,22 @@ static void leave_recovery_mode(struct multipath *mpp) } } -void __set_no_path_retry(struct multipath *mpp, bool check_features) +void set_no_path_retry(struct multipath *mpp) { bool is_queueing = false; /* assign a value to make gcc happy */ - check_features = check_features && mpp->features != NULL; - if (check_features) + if (mpp->features) is_queueing = strstr(mpp->features, "queue_if_no_path"); switch (mpp->no_path_retry) { case NO_PATH_RETRY_UNDEF: break; case NO_PATH_RETRY_FAIL: - if (!check_features || is_queueing) + if (!mpp->features || is_queueing) dm_queue_if_no_path(mpp->alias, 0); break; case NO_PATH_RETRY_QUEUE: - if (!check_features || !is_queueing) + if (!mpp->features || !is_queueing) dm_queue_if_no_path(mpp->alias, 1); break; default: @@ -613,7 +612,7 @@ void __set_no_path_retry(struct multipath *mpp, bool check_features) * If in_recovery is set, leave_recovery_mode() takes * care of dm_queue_if_no_path. Otherwise, do it here. */ - if ((!check_features || !is_queueing) && + if ((!mpp->features || !is_queueing) && !mpp->in_recovery) dm_queue_if_no_path(mpp->alias, 1); leave_recovery_mode(mpp); diff --git a/libmultipath/structs_vec.h b/libmultipath/structs_vec.h index d33fe984..3253f1bb 100644 --- a/libmultipath/structs_vec.h +++ b/libmultipath/structs_vec.h @@ -11,8 +11,7 @@ struct vectors { struct mutex_lock lock; /* defined in lock.h */ }; -void __set_no_path_retry(struct multipath *mpp, bool check_features); -#define set_no_path_retry(mpp) __set_no_path_retry(mpp, true) +void set_no_path_retry(struct multipath *mpp); int adopt_paths (vector pathvec, struct multipath * mpp); void orphan_path (struct path * pp, const char *reason); From patchwork Thu Dec 23 01:32:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 12697865 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B372C4332F for ; Thu, 23 Dec 2021 01:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640223205; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nrvym706WgFHafod+lkkMS5Xh17F72WGTi0yp8ejR98=; b=edYAYfXxwyD577Qq2WjvmhbYvNlTBFuzDf/C9qR5ozBDPD6aNshA/WtyFyZtWNXjaSGiwo AeW1aAwr+HNBKpJa4IzctmGjfsq7EpdeIptO2BlYuisPoTaJkkuF+KYWnXPUZ87uYCBJtF oA8W08jLA0zc8WMFcYSMpVAf26B/kuE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-327-C6u2YeYrP_2EiClGrmZWdw-1; Wed, 22 Dec 2021 20:33:21 -0500 X-MC-Unique: C6u2YeYrP_2EiClGrmZWdw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F17E100E326; Thu, 23 Dec 2021 01:33:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 373977FB99; Thu, 23 Dec 2021 01:33:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 12B774CA93; Thu, 23 Dec 2021 01:33:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BN1WiPW009272 for ; Wed, 22 Dec 2021 20:32:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4998E10911B4; Thu, 23 Dec 2021 01:32:44 +0000 (UTC) Received: from octiron.msp.redhat.com (unknown [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32489104253B; Thu, 23 Dec 2021 01:32:44 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 1BN1WggJ001731; Wed, 22 Dec 2021 19:32:42 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 1BN1Wfq9001730; Wed, 22 Dec 2021 19:32:41 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Wed, 22 Dec 2021 19:32:35 -0600 Message-Id: <1640223155-1678-4-git-send-email-bmarzins@redhat.com> In-Reply-To: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> References: <1640223155-1678-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH 3/3] libmultipath: don't enter recovery mode with pending paths X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com set_no_path_retry() could make a multipath device enter recovery mode simply because its paths were still in the PATH_PENDING state. This is possible when a multipath device is first created. After commit 2e61b8fb [libmultipath (coverity): Revert "setup_map: wait for pending path checkers to finish"] it has become much more likely. To avoid this, don't enter recovery mode as long as there are some paths in PATH_PENDING. Since path's can only be in this state if they've never had their state checker finish, this change will only effect recently created devices, whose checker hasn't completed yet. Signed-off-by: Benjamin Marzinski --- libmultipath/structs_vec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c index f1031f61..6c23df86 100644 --- a/libmultipath/structs_vec.c +++ b/libmultipath/structs_vec.c @@ -616,7 +616,7 @@ void set_no_path_retry(struct multipath *mpp) !mpp->in_recovery) dm_queue_if_no_path(mpp->alias, 1); leave_recovery_mode(mpp); - } else + } else if (pathcount(mpp, PATH_PENDING) == 0) enter_recovery_mode(mpp); break; }