From patchwork Wed Jul 17 17:12:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 11048117 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 74CC9138B for ; Wed, 17 Jul 2019 17:13:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63CC128821 for ; Wed, 17 Jul 2019 17:13:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 585CC287E9; Wed, 17 Jul 2019 17:13:20 +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 CA22928761 for ; Wed, 17 Jul 2019 17:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731255AbfGQRNS (ORCPT ); Wed, 17 Jul 2019 13:13:18 -0400 Received: from ale.deltatee.com ([207.54.116.67]:60238 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731243AbfGQRNR (ORCPT ); Wed, 17 Jul 2019 13:13:17 -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-00012q-Uz; Wed, 17 Jul 2019 11:13:17 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1hnnUK-0000sR-CH; 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:50 -0600 Message-Id: <20190717171259.3311-4-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 03/12] nvme: Add new test to verify the generation counter 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 Now that the other discovery tests ignore the generation counter value, create a new test to specifically check that it increments when subsystems are added or removed from ports and when allow_any_host is set/unset. Signed-off-by: Logan Gunthorpe --- tests/nvme/030 | 76 ++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/030.out | 2 ++ tests/nvme/rc | 5 +++ 3 files changed, 83 insertions(+) create mode 100755 tests/nvme/030 create mode 100644 tests/nvme/030.out diff --git a/tests/nvme/030 b/tests/nvme/030 new file mode 100755 index 000000000000..963e1ad7118c --- /dev/null +++ b/tests/nvme/030 @@ -0,0 +1,76 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2019 Logan Gunthorpe +# +# Test nvme discovery generation counter + +. tests/nvme/rc + +DESCRIPTION="ensure the discovery generation counter is updated appropriately" +QUICK=1 + +requires() { + _have_program nvme && + _have_modules loop nvme-loop nvmet && + _have_configfs +} + + +checkgenctr() { + local last=$1 + local msg=$2 + local genctr + + genctr=$(_discovery_genctr) + if (( "${genctr}" <= "${last}" )); then + echo "Generation counter not incremented when ${msg} (${genctr} <= ${last})" + fi + + echo "${genctr}" +} + +test() { + local port + local genctr + local subsys="blktests-subsystem-" + + echo "Running ${TEST_NAME}" + + modprobe nvmet + modprobe nvme-loop + + port="$(_create_nvmet_port "loop")" + + _create_nvmet_subsystem "${subsys}1" "$(losetup -f)" + _add_nvmet_subsys_to_port "${port}" "${subsys}1" + + genctr=$(_discovery_genctr) + + _create_nvmet_subsystem "${subsys}2" "$(losetup -f)" + _add_nvmet_subsys_to_port "${port}" "${subsys}2" + + genctr=$(checkgenctr "${genctr}" "adding a subsystem to a port") + + echo 0 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host" + + genctr=$(checkgenctr "${genctr}" "clearing attr_allow_any_host") + + echo 1 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host" + + genctr=$(checkgenctr "${genctr}" "setting attr_allow_any_host") + + _remove_nvmet_subsystem_from_port "${port}" "${subsys}2" + _remove_nvmet_subsystem "${subsys}2" + + genctr=$(checkgenctr "${genctr}" "removing a subsystem from a port") + + _remove_nvmet_subsystem_from_port "${port}" "${subsys}1" + _remove_nvmet_subsystem "${subsys}1" + + _remove_nvmet_port "${port}" + + modprobe -r nvme-loop + modprobe -r nvmet + + echo "Test complete" +} diff --git a/tests/nvme/030.out b/tests/nvme/030.out new file mode 100644 index 000000000000..93e51905b5d4 --- /dev/null +++ b/tests/nvme/030.out @@ -0,0 +1,2 @@ +Running nvme/030 +Test complete diff --git a/tests/nvme/rc b/tests/nvme/rc index 74e316248ef5..7be6c903611b 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -124,3 +124,8 @@ _filter_discovery() { -e '/Discovery Log Number|Log Entry|trtype|subnqn/p' } + +_discovery_genctr() { + nvme discover -t loop | + sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p' +}