From patchwork Wed Jul 17 17:12:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 11048099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 683081510 for ; Wed, 17 Jul 2019 17:13:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55D6B287E5 for ; Wed, 17 Jul 2019 17:13:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 485B3287C9; Wed, 17 Jul 2019 17:13:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8AB3287E5 for ; Wed, 17 Jul 2019 17:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731162AbfGQRNO (ORCPT ); Wed, 17 Jul 2019 13:13:14 -0400 Received: from ale.deltatee.com ([207.54.116.67]:60180 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731098AbfGQRNO (ORCPT ); Wed, 17 Jul 2019 13:13:14 -0400 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hnnUM-00012s-Uz; Wed, 17 Jul 2019 11:13:13 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1hnnUK-0000sX-Hx; Wed, 17 Jul 2019 11:13:08 -0600 From: Logan Gunthorpe To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Omar Sandoval Cc: Chaitanya Kulkarni , Michael Moese , Theodore Ts'o , Johannes Thumshirn , Stephen Bates , Logan Gunthorpe Date: Wed, 17 Jul 2019 11:12:52 -0600 Message-Id: <20190717171259.3311-6-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717171259.3311-1-logang@deltatee.com> References: <20190717171259.3311-1-logang@deltatee.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, osandov@fb.com, chaitanya.kulkarni@wdc.com, tytso@mit.edu, mmoese@suse.de, jthumshirn@suse.de, sbates@raithlin.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH blktests v2 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On test systems with existing nvme drives or built-in modules it may not be possible to remove nvme-core in order to re-probe it with multipath=1. Instead, skip the test if the multipath parameter is not already set ahead of time. Note: the multipath parameter of nvme-core is set by default if CONFIG_NVME_MULTIPATH is set so this will only affect systems that explicitly disable it via the module parameter. Signed-off-by: Logan Gunthorpe --- common/rc | 18 ++++++++++++++++++ tests/nvme/005 | 10 ++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/common/rc b/common/rc index 5dd2c9512fd2..a487cc69026c 100644 --- a/common/rc +++ b/common/rc @@ -55,6 +55,24 @@ _have_module_param() { return 0 } +_have_module_param_value() { + local value + + modprobe "$1" + + if ! _have_module_param "$1" "$2"; then + return 1 + fi + + value=$(cat "/sys/module/$1/parameters/$2") + if [[ "${value}" != "$3" ]]; then + SKIP_REASON="$1 module parameter $2 must be set to $3" + return 1 + fi + + return 0 +} + _have_program() { if command -v "$1" >/dev/null 2>&1; then return 0 diff --git a/tests/nvme/005 b/tests/nvme/005 index e72fc809c936..91c164de73e6 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -12,18 +12,13 @@ QUICK=1 requires() { _have_modules loop nvme-core nvme-loop nvmet && \ - _have_module_param nvme-core multipath && _have_configfs + _have_module_param_value nvme_core multipath Y && \ + _have_configfs } test() { echo "Running ${TEST_NAME}" - # Clean up all stale modules - modprobe -r nvme-loop - modprobe -r nvme-core - modprobe -r nvmet - - modprobe nvme-core multipath=1 modprobe nvmet modprobe nvme-loop @@ -57,7 +52,6 @@ test() { rm "$TMPDIR/img" modprobe -r nvme-loop - modprobe -r nvme-core modprobe -r nvmet echo "Test complete"