From patchwork Thu Dec 17 22:50:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11980955 X-Patchwork-Delegate: snitzer@redhat.com 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY 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 364D9C4361B for ; Thu, 17 Dec 2020 22:51:38 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2B4A23A24 for ; Thu, 17 Dec 2020 22:51:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2B4A23A24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608245496; 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=RpU1e5zlllv2z0tnFMHA0v57nO5ox1vhPPsIRRIpQdQ=; b=OMFMe/S7c+ExUAke+fmCSD2H5gqNEZqTiXz6lbCbn7eAKscZiETLG36JcMJVPnEKzD8Nao xqPACt7P+PZsptOzxTaqMxAwq7sEoHxsUwUKQx4wY4HNsvKTPIaziwDVWVVStde2KCseYf j1R0nsce8u7MSi3sfd3EGLgnBGk9LB8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-cT_IIejaNiOOhqqa0YPUtA-1; Thu, 17 Dec 2020 17:51:34 -0500 X-MC-Unique: cT_IIejaNiOOhqqa0YPUtA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1123610054FF; Thu, 17 Dec 2020 22:51:30 +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 E5CCD27C5D; Thu, 17 Dec 2020 22:51:29 +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 BEF014EDB6; Thu, 17 Dec 2020 22:51:29 +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 0BHMpBxp008326 for ; Thu, 17 Dec 2020 17:51:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4F5B4669EC; Thu, 17 Dec 2020 22:51:11 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB4BB5D6DC; Thu, 17 Dec 2020 22:51:06 +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 0BHMp59t001855; Thu, 17 Dec 2020 16:51:05 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHMp5nv001854; Thu, 17 Dec 2020 16:51:05 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 17 Dec 2020 16:50:59 -0600 Message-Id: <1608245463-1746-2-git-send-email-bmarzins@redhat.com> In-Reply-To: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> References: <1608245463-1746-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 v3 1/5] libmultipath: move fast_io_fail defines to structs.h 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.23 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 Since fast_io_fail is part of the multipath struct, its symbolic values belong in structs.h. Also, make it an instance of a general enum, which will be used again in future patches, and change the set/print functions which use it to use the general enum instead. Signed-off-by: Benjamin Marzinski --- libmultipath/config.h | 8 -------- libmultipath/dict.c | 30 +++++++++++++++--------------- libmultipath/dict.h | 2 +- libmultipath/propsel.c | 2 +- libmultipath/structs.h | 17 +++++++++++++++++ 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/libmultipath/config.h b/libmultipath/config.h index 5d460359..661dd586 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h @@ -10,14 +10,6 @@ #define ORIGIN_DEFAULT 0 #define ORIGIN_CONFIG 1 -/* - * In kernel, fast_io_fail == 0 means immediate failure on rport delete. - * OTOH '0' means not-configured in various places in multipath-tools. - */ -#define MP_FAST_IO_FAIL_UNSET (0) -#define MP_FAST_IO_FAIL_OFF (-1) -#define MP_FAST_IO_FAIL_ZERO (-2) - enum devtypes { DEV_NONE, DEV_DEVT, diff --git a/libmultipath/dict.c b/libmultipath/dict.c index f12c2e5c..f4357da1 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -822,7 +822,7 @@ declare_mp_attr_handler(gid, set_gid) declare_mp_attr_snprint(gid, print_gid) static int -set_fast_io_fail(vector strvec, void *ptr) +set_undef_off_zero(vector strvec, void *ptr) { char * buff; int *int_ptr = (int *)ptr; @@ -832,36 +832,36 @@ set_fast_io_fail(vector strvec, void *ptr) return 1; if (strcmp(buff, "off") == 0) - *int_ptr = MP_FAST_IO_FAIL_OFF; + *int_ptr = UOZ_OFF; else if (sscanf(buff, "%d", int_ptr) != 1 || - *int_ptr < MP_FAST_IO_FAIL_ZERO) - *int_ptr = MP_FAST_IO_FAIL_UNSET; + *int_ptr < UOZ_ZERO) + *int_ptr = UOZ_UNDEF; else if (*int_ptr == 0) - *int_ptr = MP_FAST_IO_FAIL_ZERO; + *int_ptr = UOZ_ZERO; FREE(buff); return 0; } int -print_fast_io_fail(char * buff, int len, long v) +print_undef_off_zero(char * buff, int len, long v) { - if (v == MP_FAST_IO_FAIL_UNSET) + if (v == UOZ_UNDEF) return 0; - if (v == MP_FAST_IO_FAIL_OFF) + if (v == UOZ_OFF) return snprintf(buff, len, "\"off\""); - if (v == MP_FAST_IO_FAIL_ZERO) + if (v == UOZ_ZERO) return snprintf(buff, len, "0"); return snprintf(buff, len, "%ld", v); } -declare_def_handler(fast_io_fail, set_fast_io_fail) -declare_def_snprint_defint(fast_io_fail, print_fast_io_fail, +declare_def_handler(fast_io_fail, set_undef_off_zero) +declare_def_snprint_defint(fast_io_fail, print_undef_off_zero, DEFAULT_FAST_IO_FAIL) -declare_ovr_handler(fast_io_fail, set_fast_io_fail) -declare_ovr_snprint(fast_io_fail, print_fast_io_fail) -declare_hw_handler(fast_io_fail, set_fast_io_fail) -declare_hw_snprint(fast_io_fail, print_fast_io_fail) +declare_ovr_handler(fast_io_fail, set_undef_off_zero) +declare_ovr_snprint(fast_io_fail, print_undef_off_zero) +declare_hw_handler(fast_io_fail, set_undef_off_zero) +declare_hw_snprint(fast_io_fail, print_undef_off_zero) static int set_dev_loss(vector strvec, void *ptr) diff --git a/libmultipath/dict.h b/libmultipath/dict.h index a40ac66f..a917e1ca 100644 --- a/libmultipath/dict.h +++ b/libmultipath/dict.h @@ -13,7 +13,7 @@ int print_rr_weight(char *buff, int len, long v); int print_pgfailback(char *buff, int len, long v); int print_pgpolicy(char *buff, int len, long v); int print_no_path_retry(char *buff, int len, long v); -int print_fast_io_fail(char *buff, int len, long v); +int print_undef_off_zero(char *buff, int len, long v); int print_dev_loss(char *buff, int len, unsigned long v); int print_reservation_key(char * buff, int len, struct be64 key, uint8_t flags, int source); diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 3f2c2cfa..67d025cf 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -754,7 +754,7 @@ int select_fast_io_fail(struct config *conf, struct multipath *mp) mp_set_conf(fast_io_fail); mp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL); out: - print_fast_io_fail(buff, 12, mp->fast_io_fail); + print_undef_off_zero(buff, 12, mp->fast_io_fail); condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, origin); return 0; } diff --git a/libmultipath/structs.h b/libmultipath/structs.h index 4ce30551..cfa7b649 100644 --- a/libmultipath/structs.h +++ b/libmultipath/structs.h @@ -219,6 +219,23 @@ enum vpd_vendor_ids { VPD_VP_ARRAY_SIZE, /* This must remain the last entry */ }; +/* + * Multipath treats 0 as undefined for optional config parameters. + * Use this for cases where 0 is a valid option for systems multipath + * is communicating with + */ +enum undefined_off_zero { + UOZ_UNDEF = 0, + UOZ_OFF = -1, + UOZ_ZERO = -2, +}; + +enum fast_io_fail_states { + MP_FAST_IO_FAIL_UNSET = UOZ_UNDEF, + MP_FAST_IO_FAIL_OFF = UOZ_OFF, + MP_FAST_IO_FAIL_ZERO = UOZ_ZERO, +}; + struct vpd_vendor_page { int pg; const char *name; From patchwork Thu Dec 17 22:51:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11980959 X-Patchwork-Delegate: snitzer@redhat.com 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 93EF8C2BBD4 for ; Thu, 17 Dec 2020 22:51:39 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19E0D23A24 for ; Thu, 17 Dec 2020 22:51:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19E0D23A24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608245498; 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=j11QQddkM2zOiQ8qe2nyhrmhcEzQOTNFN0caE1ZkP6U=; b=XsOV4n4LJhpgk0zT3jtAiBUqjnGBecCtm/RepX4RT9VfcFHqj2XVU0pJE+mED+AJxx6M4l XoeUwuPC7r9kUk7fWhBzcuLetKbaTaatPU0J75XSxS58Se+3DQZ6WLpoqlSJrFCmpY4dlC +o0vC8RaLoupOs59pxGdisit1J6T5r0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-anKl79ILP02fJwgmqtU6uw-1; Thu, 17 Dec 2020 17:51:35 -0500 X-MC-Unique: anKl79ILP02fJwgmqtU6uw-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 1337D1005504; Thu, 17 Dec 2020 22:51:30 +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 ED55B60C61; Thu, 17 Dec 2020 22:51:29 +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 BF1B21809CA0; Thu, 17 Dec 2020 22:51:29 +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 0BHMpBxI008336 for ; Thu, 17 Dec 2020 17:51:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F4E219EF2; Thu, 17 Dec 2020 22:51:11 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E26402BFE4; Thu, 17 Dec 2020 22:51:07 +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 0BHMp6Jg001859; Thu, 17 Dec 2020 16:51:06 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHMp6Tv001858; Thu, 17 Dec 2020 16:51:06 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 17 Dec 2020 16:51:00 -0600 Message-Id: <1608245463-1746-3-git-send-email-bmarzins@redhat.com> In-Reply-To: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> References: <1608245463-1746-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 v3 2/5] libmultipath: add eh_deadline multipath.conf parameter 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 There are times a fc rport is never lost, meaning that fast_io_fail_tmo and dev_loss_tmo never trigger, but scsi commands still hang. This can cause problems in cases where users have strict timing requirements, and the easiest way to solve these issues is to set eh_deadline. Since it's already possible to set fast_io_fail_tmo and dev_loss_tmo from multipath.conf, and have multipath take care of setting it correctly for the scsi devices in sysfs, it makes sense to allow users to set eh_deadline here as well. Signed-off-by: Benjamin Marzinski --- libmultipath/config.c | 2 ++ libmultipath/config.h | 2 ++ libmultipath/configure.c | 1 + libmultipath/dict.c | 10 +++++++ libmultipath/discovery.c | 60 +++++++++++++++++++++++++++++++++----- libmultipath/propsel.c | 17 +++++++++++ libmultipath/propsel.h | 1 + libmultipath/structs.h | 7 +++++ multipath/multipath.conf.5 | 16 ++++++++++ 9 files changed, 109 insertions(+), 7 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index 49e7fb81..9f3cb38d 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -424,6 +424,7 @@ merge_hwe (struct hwentry * dst, struct hwentry * src) merge_num(flush_on_last_del); merge_num(fast_io_fail); merge_num(dev_loss); + merge_num(eh_deadline); merge_num(user_friendly_names); merge_num(retain_hwhandler); merge_num(detect_prio); @@ -579,6 +580,7 @@ store_hwe (vector hwtable, struct hwentry * dhwe) hwe->flush_on_last_del = dhwe->flush_on_last_del; hwe->fast_io_fail = dhwe->fast_io_fail; hwe->dev_loss = dhwe->dev_loss; + hwe->eh_deadline = dhwe->eh_deadline; hwe->user_friendly_names = dhwe->user_friendly_names; hwe->retain_hwhandler = dhwe->retain_hwhandler; hwe->detect_prio = dhwe->detect_prio; diff --git a/libmultipath/config.h b/libmultipath/config.h index 661dd586..9ce37f16 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h @@ -63,6 +63,7 @@ struct hwentry { int flush_on_last_del; int fast_io_fail; unsigned int dev_loss; + int eh_deadline; int user_friendly_names; int retain_hwhandler; int detect_prio; @@ -148,6 +149,7 @@ struct config { int attribute_flags; int fast_io_fail; unsigned int dev_loss; + int eh_deadline; int log_checker_err; int allow_queueing; int allow_usb_devices; diff --git a/libmultipath/configure.c b/libmultipath/configure.c index 3dbc1f16..4da705d2 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -368,6 +368,7 @@ int setup_map(struct multipath *mpp, char *params, int params_size, select_gid(conf, mpp); select_fast_io_fail(conf, mpp); select_dev_loss(conf, mpp); + select_eh_deadline(conf, mpp); select_reservation_key(conf, mpp); select_deferred_remove(conf, mpp); select_marginal_path_err_sample_time(conf, mpp); diff --git a/libmultipath/dict.c b/libmultipath/dict.c index f4357da1..bab96146 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -899,6 +899,13 @@ declare_ovr_snprint(dev_loss, print_dev_loss) declare_hw_handler(dev_loss, set_dev_loss) declare_hw_snprint(dev_loss, print_dev_loss) +declare_def_handler(eh_deadline, set_undef_off_zero) +declare_def_snprint(eh_deadline, print_undef_off_zero) +declare_ovr_handler(eh_deadline, set_undef_off_zero) +declare_ovr_snprint(eh_deadline, print_undef_off_zero) +declare_hw_handler(eh_deadline, set_undef_off_zero) +declare_hw_snprint(eh_deadline, print_undef_off_zero) + static int set_pgpolicy(vector strvec, void *ptr) { @@ -1771,6 +1778,7 @@ init_keywords(vector keywords) install_keyword("gid", &def_gid_handler, &snprint_def_gid); install_keyword("fast_io_fail_tmo", &def_fast_io_fail_handler, &snprint_def_fast_io_fail); install_keyword("dev_loss_tmo", &def_dev_loss_handler, &snprint_def_dev_loss); + install_keyword("eh_deadline", &def_eh_deadline_handler, &snprint_def_eh_deadline); install_keyword("bindings_file", &def_bindings_file_handler, &snprint_def_bindings_file); install_keyword("wwids_file", &def_wwids_file_handler, &snprint_def_wwids_file); install_keyword("prkeys_file", &def_prkeys_file_handler, &snprint_def_prkeys_file); @@ -1880,6 +1888,7 @@ init_keywords(vector keywords) install_keyword("flush_on_last_del", &hw_flush_on_last_del_handler, &snprint_hw_flush_on_last_del); install_keyword("fast_io_fail_tmo", &hw_fast_io_fail_handler, &snprint_hw_fast_io_fail); install_keyword("dev_loss_tmo", &hw_dev_loss_handler, &snprint_hw_dev_loss); + install_keyword("eh_deadline", &hw_eh_deadline_handler, &snprint_hw_eh_deadline); install_keyword("user_friendly_names", &hw_user_friendly_names_handler, &snprint_hw_user_friendly_names); install_keyword("retain_attached_hw_handler", &hw_retain_hwhandler_handler, &snprint_hw_retain_hwhandler); install_keyword("detect_prio", &hw_detect_prio_handler, &snprint_hw_detect_prio); @@ -1920,6 +1929,7 @@ init_keywords(vector keywords) install_keyword("flush_on_last_del", &ovr_flush_on_last_del_handler, &snprint_ovr_flush_on_last_del); install_keyword("fast_io_fail_tmo", &ovr_fast_io_fail_handler, &snprint_ovr_fast_io_fail); install_keyword("dev_loss_tmo", &ovr_dev_loss_handler, &snprint_ovr_dev_loss); + install_keyword("eh_deadline", &ovr_eh_deadline_handler, &snprint_ovr_eh_deadline); install_keyword("user_friendly_names", &ovr_user_friendly_names_handler, &snprint_ovr_user_friendly_names); install_keyword("retain_attached_hw_handler", &ovr_retain_hwhandler_handler, &snprint_ovr_retain_hwhandler); install_keyword("detect_prio", &ovr_detect_prio_handler, &snprint_ovr_detect_prio); diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index c74f13bf..add7bb97 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -587,6 +587,42 @@ sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen) return !!preferred; } +static int +sysfs_set_eh_deadline(struct multipath *mpp, struct path *pp) +{ + struct udev_device *hostdev; + char host_name[HOST_NAME_LEN], value[16]; + int ret, len; + + if (mpp->eh_deadline == EH_DEADLINE_UNSET) + return 0; + + sprintf(host_name, "host%d", pp->sg_id.host_no); + hostdev = udev_device_new_from_subsystem_sysname(udev, + "scsi_host", host_name); + if (!hostdev) + return 1; + + if (mpp->eh_deadline == EH_DEADLINE_OFF) + len = sprintf(value, "off"); + else if (mpp->eh_deadline == EH_DEADLINE_ZERO) + len = sprintf(value, "0"); + else + len = sprintf(value, "%d", mpp->eh_deadline); + + ret = sysfs_attr_set_value(hostdev, "eh_deadline", + value, len + 1); + /* + * not all scsi drivers support setting eh_deadline, so failing + * is totally reasonable + */ + if (ret <= 0) + condlog(3, "%s: failed to set eh_deadline to %s, error %d", udev_device_get_sysname(hostdev), value, -ret); + + udev_device_unref(hostdev); + return (ret <= 0); +} + static void sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp) { @@ -596,6 +632,10 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp) unsigned int tmo; int ret; + if (mpp->dev_loss == DEV_LOSS_TMO_UNSET && + mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET) + return; + sprintf(rport_id, "rport-%d:%d-%d", pp->sg_id.host_no, pp->sg_id.channel, pp->sg_id.transport_id); rport_dev = udev_device_new_from_subsystem_sysname(udev, @@ -703,6 +743,11 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp) char session_id[64]; char value[11]; + if (mpp->dev_loss != DEV_LOSS_TMO_UNSET) + condlog(3, "%s: ignoring dev_loss_tmo on iSCSI", pp->dev); + if (mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET) + return; + sprintf(session_id, "session%d", pp->sg_id.transport_id); session_dev = udev_device_new_from_subsystem_sysname(udev, "iscsi_session", session_id); @@ -714,9 +759,6 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp) condlog(4, "target%d:%d:%d -> %s", pp->sg_id.host_no, pp->sg_id.channel, pp->sg_id.scsi_id, session_id); - if (mpp->dev_loss != DEV_LOSS_TMO_UNSET) { - condlog(3, "%s: ignoring dev_loss_tmo on iSCSI", pp->dev); - } if (mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) { if (mpp->fast_io_fail == MP_FAST_IO_FAIL_OFF) { condlog(3, "%s: can't switch off fast_io_fail_tmo " @@ -744,6 +786,8 @@ sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp) char end_dev_id[64]; char value[11]; + if (mpp->dev_loss == DEV_LOSS_TMO_UNSET) + return; sprintf(end_dev_id, "end_device-%d:%d", pp->sg_id.host_no, pp->sg_id.transport_id); sas_dev = udev_device_new_from_subsystem_sysname(udev, @@ -801,7 +845,8 @@ sysfs_set_scsi_tmo (struct multipath *mpp, unsigned int checkint) mpp->fast_io_fail = MP_FAST_IO_FAIL_OFF; } if (mpp->dev_loss == DEV_LOSS_TMO_UNSET && - mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET) + mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET && + mpp->eh_deadline == EH_DEADLINE_UNSET) return 0; vector_foreach_slot(mpp->paths, pp, i) { @@ -814,17 +859,18 @@ sysfs_set_scsi_tmo (struct multipath *mpp, unsigned int checkint) switch (pp->sg_id.proto_id) { case SCSI_PROTOCOL_FCP: sysfs_set_rport_tmo(mpp, pp); - continue; + break; case SCSI_PROTOCOL_ISCSI: sysfs_set_session_tmo(mpp, pp); - continue; + break; case SCSI_PROTOCOL_SAS: sysfs_set_nexus_loss_tmo(mpp, pp); - continue; + break; default: if (!err_path) err_path = pp; } + sysfs_set_eh_deadline(mpp, pp); } if (err_path) { diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 67d025cf..fa4ac5d9 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -775,6 +775,23 @@ out: return 0; } +int select_eh_deadline(struct config *conf, struct multipath *mp) +{ + const char *origin; + char buff[12]; + + mp_set_ovr(eh_deadline); + mp_set_hwe(eh_deadline); + mp_set_conf(eh_deadline); + mp->eh_deadline = EH_DEADLINE_UNSET; + /* not changing sysfs in default cause, so don't print anything */ + return 0; +out: + print_undef_off_zero(buff, 12, mp->eh_deadline); + condlog(3, "%s: eh_deadline = %s %s", mp->alias, buff, origin); + return 0; +} + int select_flush_on_last_del(struct config *conf, struct multipath *mp) { const char *origin; diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h index 3d6edd8a..a68bacf0 100644 --- a/libmultipath/propsel.h +++ b/libmultipath/propsel.h @@ -17,6 +17,7 @@ int select_uid(struct config *conf, struct multipath *mp); int select_gid(struct config *conf, struct multipath *mp); int select_fast_io_fail(struct config *conf, struct multipath *mp); int select_dev_loss(struct config *conf, struct multipath *mp); +int select_eh_deadline(struct config *conf, struct multipath *mp); int select_reservation_key(struct config *conf, struct multipath *mp); int select_retain_hwhandler (struct config *conf, struct multipath * mp); int select_detect_prio(struct config *conf, struct path * pp); diff --git a/libmultipath/structs.h b/libmultipath/structs.h index cfa7b649..d6ff6762 100644 --- a/libmultipath/structs.h +++ b/libmultipath/structs.h @@ -236,6 +236,12 @@ enum fast_io_fail_states { MP_FAST_IO_FAIL_ZERO = UOZ_ZERO, }; +enum eh_deadline_states { + EH_DEADLINE_UNSET = UOZ_UNDEF, + EH_DEADLINE_OFF = UOZ_OFF, + EH_DEADLINE_ZERO = UOZ_ZERO, +}; + struct vpd_vendor_page { int pg; const char *name; @@ -356,6 +362,7 @@ struct multipath { int ghost_delay; int ghost_delay_tick; unsigned int dev_loss; + int eh_deadline; uid_t uid; gid_t gid; mode_t mode; diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 index 7242d39b..ea66a01e 100644 --- a/multipath/multipath.conf.5 +++ b/multipath/multipath.conf.5 @@ -717,6 +717,22 @@ The default is: \fB600\fR . . .TP +.B eh_deadline +Specify the maximum number of seconds the SCSI layer will spend doing error +handling when scsi devices fail. After this timeout the scsi layer will perform +a full HBA reset. Setting this may be necessary in cases where the rport is +never lost, so \fIfast_io_fail_tmo\fR and \fIdev_loss_tmo\fR will never +trigger, but (frequently do to load) scsi commands still hang. \fBNote:\fR when +the scsi error handler performs the HBA reset, all target paths on that HBA +will be affected. eh_deadline should only be set in cases where all targets on +the affected HBAs are multipathed. +.RS +.TP +The default is: \fB\fR +.RE +. +. +.TP .B bindings_file The full pathname of the binding file to be used when the user_friendly_names option is set. From patchwork Thu Dec 17 22:51:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11980951 X-Patchwork-Delegate: snitzer@redhat.com 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 297E5C4361B for ; Thu, 17 Dec 2020 22:51:24 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B080923A24 for ; Thu, 17 Dec 2020 22:51:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B080923A24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608245482; 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=vkKZ8KCaYg0Fw4T/mmyvsf8ixZK4nJGjcCNNyZLvDEo=; b=eX2nmGrGwCZy/k4xNCBDxuXIqX/s8A2pdeah+Gq3KcKXuOlNrhWl6opm8obGVc2SLkxcj2 po350cwR72AYlOPkczaZLrFuzmkEouN36uEoApGRDfDjr35gvZqOSUBkELo2wRhx7Lp7WO 7hJx1Ql1PBYk03WnU11iueDwFvYbhjE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-1TYJjJc7PPuCubvrHIMZPA-1; Thu, 17 Dec 2020 17:51:20 -0500 X-MC-Unique: 1TYJjJc7PPuCubvrHIMZPA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0032800D62; Thu, 17 Dec 2020 22:51:15 +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 51D5E2BFE4; Thu, 17 Dec 2020 22:51:15 +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 BF6DB4A7C6; Thu, 17 Dec 2020 22:51:12 +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 0BHMpBNh008327 for ; Thu, 17 Dec 2020 17:51:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5336919EF2; Thu, 17 Dec 2020 22:51:11 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E98B2BFEE; Thu, 17 Dec 2020 22:51:08 +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 0BHMp7OV001863; Thu, 17 Dec 2020 16:51:07 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHMp7uf001862; Thu, 17 Dec 2020 16:51:07 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 17 Dec 2020 16:51:01 -0600 Message-Id: <1608245463-1746-4-git-send-email-bmarzins@redhat.com> In-Reply-To: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> References: <1608245463-1746-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 v3 3/5] multipathd: remove redundant vector_free() int configure 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.11 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 remove_maps(vecs) already calls vector_free(vecs->mpvec) Signed-off-by: Benjamin Marzinski --- multipathd/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index b6a5f5b7..2eab4854 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2634,14 +2634,10 @@ configure (struct vectors * vecs) } /* - * purge dm of old maps + * purge dm of old maps and save new set of maps formed by + * considering current path state */ remove_maps(vecs); - - /* - * save new set of maps formed by considering current path state - */ - vector_free(vecs->mpvec); vecs->mpvec = mpvec; /* From patchwork Thu Dec 17 22:51:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11980949 X-Patchwork-Delegate: snitzer@redhat.com 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 3A2A2C2BBCF for ; Thu, 17 Dec 2020 22:51:24 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C375C23A31 for ; Thu, 17 Dec 2020 22:51:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C375C23A31 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608245482; 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=ygXoS82cDFTLYcRqzbvRFikplpv1O3uDDxfNqAH+3sU=; b=RyuF+o6DBVe4sT/oxRnvern3algxELdh9twhZs8wBQWqYI/9Z+PLy/CJZ5MWLS+z4HRzu+ oxDtvPcxxOsMyeuL2nxFERwwNlYP2yiPIGPyvf7dagew5+y0SgJPKBZRtSp+SHFPnJAnb7 3JMN54glZa74DizE+eHcT7leHp3Se7I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-417-QuGk8RYFN-qvh8lAglg2jw-1; Thu, 17 Dec 2020 17:51:20 -0500 X-MC-Unique: QuGk8RYFN-qvh8lAglg2jw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E04A91005513; Thu, 17 Dec 2020 22:51:15 +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 4994F1B534; Thu, 17 Dec 2020 22:51:15 +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 ADE68180954D; Thu, 17 Dec 2020 22:51:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BHMp9F2008307 for ; Thu, 17 Dec 2020 17:51:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id A82F01ACC7; Thu, 17 Dec 2020 22:51:09 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EE8A1B5B9; Thu, 17 Dec 2020 22:51:09 +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 0BHMp87u001869; Thu, 17 Dec 2020 16:51:08 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHMp8Xj001868; Thu, 17 Dec 2020 16:51:08 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 17 Dec 2020 16:51:02 -0600 Message-Id: <1608245463-1746-5-git-send-email-bmarzins@redhat.com> In-Reply-To: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> References: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH v3 4/5] libmultipath: factor out code to get vpd page data 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.16 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 A future patch will reuse the code to get the vpd page data, so factor it out from get_vpd_sgio(). Signed-off-by: Benjamin Marzinski --- libmultipath/discovery.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index add7bb97..f901e9ff 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -1321,14 +1321,13 @@ get_vpd_sysfs (struct udev_device *parent, int pg, char * str, int maxlen) return len; } -int -get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen) +static int +fetch_vpd_page(int fd, int pg, unsigned char *buff, int maxlen) { - int len, buff_len; - unsigned char buff[4096]; + int buff_len; - memset(buff, 0x0, 4096); - if (sgio_get_vpd(buff, 4096, fd, pg) < 0) { + memset(buff, 0x0, maxlen); + if (sgio_get_vpd(buff, maxlen, fd, pg) < 0) { int lvl = pg == 0x80 || pg == 0x83 ? 3 : 4; condlog(lvl, "failed to issue vpd inquiry for pg%02x", @@ -1342,10 +1341,22 @@ get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen) return -ENODATA; } buff_len = get_unaligned_be16(&buff[2]) + 4; - if (buff_len > 4096) { + if (buff_len > maxlen) { condlog(3, "vpd pg%02x page truncated", pg); - buff_len = 4096; + buff_len = maxlen; } + return buff_len; +} + +int +get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen) +{ + int len, buff_len; + unsigned char buff[4096]; + + buff_len = fetch_vpd_page(fd, pg, buff, sizeof(buff)); + if (buff_len < 0) + return buff_len; if (pg == 0x80) len = parse_vpd_pg80(buff, str, maxlen); else if (pg == 0x83) From patchwork Thu Dec 17 22:51:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11980957 X-Patchwork-Delegate: snitzer@redhat.com 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 8CA9DC2BBCD for ; Thu, 17 Dec 2020 22:51:39 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3402B23A31 for ; Thu, 17 Dec 2020 22:51:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3402B23A31 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608245498; 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=5zAw5CSrGf1YNt19Sbe074FrqlK6RNICq/8UoqA2Nas=; b=A9CEJVYNxQighat6z8PdGWh+QhyYEdp38V/7uY76ofq/MaFb4mbxWPBg/nPA1mUDvaXQwN llgn2hqufWqK2ywODQxNZW2LDKtRnqWpfTZfWq+kCPSYWlvximGj7kZl7Iz1mRZmBjqBSQ zXNHVR3FUxT62Nlo/qa/wxR1hB/tGo0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-ExMyYnyuMea9ox6uueUn2w-1; Thu, 17 Dec 2020 17:51:36 -0500 X-MC-Unique: ExMyYnyuMea9ox6uueUn2w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA7A5802B4B; Thu, 17 Dec 2020 22:51:31 +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 CF6001ACC7; Thu, 17 Dec 2020 22:51:31 +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 A1C9D1809CA1; Thu, 17 Dec 2020 22:51:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BHMpDD2008359 for ; Thu, 17 Dec 2020 17:51:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id C58CE60C5F; Thu, 17 Dec 2020 22:51:13 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7BF8B60C15; Thu, 17 Dec 2020 22:51:10 +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 0BHMp9gO001877; Thu, 17 Dec 2020 16:51:09 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHMp8oP001876; Thu, 17 Dec 2020 16:51:08 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 17 Dec 2020 16:51:03 -0600 Message-Id: <1608245463-1746-6-git-send-email-bmarzins@redhat.com> In-Reply-To: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> References: <1608245463-1746-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH v3 5/5] libmultipath: limit reading 0xc9 vpd page 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.16 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 Only rdac arrays support 0xC9 vpd page inquiries. All other arrays will return a failure. Only do the rdac inquiry when detecting array capabilities if the array's path checker is explicitly set to rdac, or the path checker is not set, and the array reports that it supports vpd page 0xC9 in the Supported VPD Pages (0x00) vpd page. Multipath was doing the check if either the path checker was set to rdac, or no path checker was set. This means that for almost all non-rdac arrays, multipath was issuing a bad inquiry. This was annoying users. Signed-off-by: Benjamin Marzinski --- libmultipath/discovery.c | 17 +++++++++++++++++ libmultipath/discovery.h | 1 + libmultipath/propsel.c | 10 ++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index f901e9ff..e818585a 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -1348,6 +1348,23 @@ fetch_vpd_page(int fd, int pg, unsigned char *buff, int maxlen) return buff_len; } +/* based on sg_inq.c from sg3_utils */ +bool +is_vpd_page_supported(int fd, int pg) +{ + int i, len; + unsigned char buff[4096]; + + len = fetch_vpd_page(fd, 0x00, buff, sizeof(buff)); + if (len < 0) + return false; + + for (i = 4; i < len; ++i) + if (buff[i] == pg) + return true; + return false; +} + int get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen) { diff --git a/libmultipath/discovery.h b/libmultipath/discovery.h index 6444887d..d3193daf 100644 --- a/libmultipath/discovery.h +++ b/libmultipath/discovery.h @@ -56,6 +56,7 @@ int sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen); int get_uid(struct path * pp, int path_state, struct udev_device *udev, int allow_fallback); +bool is_vpd_page_supported(int fd, int pg); /* * discovery bitmask diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index fa4ac5d9..f771a830 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -496,13 +496,15 @@ check_rdac(struct path * pp) { int len; char buff[44]; - const char *checker_name; + const char *checker_name = NULL; if (pp->bus != SYSFS_BUS_SCSI) return 0; - /* Avoid ioctl if this is likely not an RDAC array */ - if (__do_set_from_hwe(checker_name, pp, checker_name) && - strcmp(checker_name, RDAC)) + /* Avoid checking 0xc9 if this is likely not an RDAC array */ + if (!__do_set_from_hwe(checker_name, pp, checker_name) && + !is_vpd_page_supported(pp->fd, 0xC9)) + return 0; + if (checker_name && strcmp(checker_name, RDAC)) return 0; len = get_vpd_sgio(pp->fd, 0xC9, 0, buff, 44); if (len <= 0)