From patchwork Tue Nov 24 01:04:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11926925 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 8AE49C6379D for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B10420721 for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HEHu8jeL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728155AbgKXBFA (ORCPT ); Mon, 23 Nov 2020 20:05:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38656 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbgKXBFA (ORCPT ); Mon, 23 Nov 2020 20:05:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606179899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9yEv/vluezzvVLg37JJarSnMNGqxRyFsGSXl71cskrY=; b=HEHu8jeLYASf4TnB1/2JS05euTo0LJo1X87mr82HBnbciGvHgZIc9A/Md83uIUNxdvf3ea XNQZl7dWCx1qSPbqRzUcb9dTrStaR24tFB07llkOjTth3DAMz+Hc+Q3WFczIDGISNrReXF VF7+ITVAzGlFR6gQPUkRcWcCkl8cMS4= 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-11-wp5qsJBXNFSx6EqkVGPoOA-1; Mon, 23 Nov 2020 20:04:55 -0500 X-MC-Unique: wp5qsJBXNFSx6EqkVGPoOA-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 61A8A3E74A; Tue, 24 Nov 2020 01:04:54 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BD366062F; Tue, 24 Nov 2020 01:04:52 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me Subject: [PATCH blktests 1/5] tests/srp/rc: update the ib_srpt module name Date: Tue, 24 Nov 2020 09:04:23 +0800 Message-Id: <20201124010427.18595-2-yi.zhang@redhat.com> In-Reply-To: <20201124010427.18595-1-yi.zhang@redhat.com> References: <20201124010427.18595-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Fix the ib_srpt module insmod failure as the module in some distros are end with .xz, like bellow on fedora: /lib/modules/$(uname -r)/kernel/drivers/infiniband/ulp/srpt/ib_srpt.ko.xz Signed-off-by: Yi Zhang --- tests/srp/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/srp/rc b/tests/srp/rc index 7fc094b..74053ba 100755 --- a/tests/srp/rc +++ b/tests/srp/rc @@ -465,7 +465,7 @@ configure_target_ports() { # Load LIO and configure the SRP target driver and LUNs. start_lio_srpt() { - local b d gid i ini_ids=() opts p target_ids=() vdev + local b d gid i ini_ids=() opts p target_ids=() for gid in $(all_primary_gids); do if [ "${gid#fe8}" != "$gid" ]; then @@ -500,7 +500,7 @@ start_lio_srpt() { if modinfo ib_srpt | grep -q '^parm:[[:blank:]]*rdma_cm_port:'; then opts+=("rdma_cm_port=${srp_rdma_cm_port}") fi - insmod "/lib/modules/$(uname -r)/kernel/drivers/infiniband/ulp/srpt/ib_srpt.ko" "${opts[@]}" || return $? + insmod "$(ls /lib/modules/"$(uname -r)"/kernel/drivers/infiniband/ulp/srpt/ib_srpt.*)" "${opts[@]}" || return $? i=0 for r in "${vdev_path[@]}"; do if [ -b "$(readlink -f "$r")" ]; then From patchwork Tue Nov 24 01:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11926927 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 C5513C2D0E4 for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88DDB2073C for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jNCilkFL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725308AbgKXBFB (ORCPT ); Mon, 23 Nov 2020 20:05:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54283 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgKXBFA (ORCPT ); Mon, 23 Nov 2020 20:05:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606179900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TXFfxOeYIvUbAbfjUJzMCqc9JxfDv2qeYc14F4EoUAs=; b=jNCilkFLrGHgO2EDmLQb0LL2/d2I8Vcf8DwrqhssiLHnK7BsAXYsUQ80xkV3sDhh6Ktj2M X4+aKsZX6M5kFGgyWGIeEM7cJdAqIwpjO/UqHpc5H4dcYy8gqZhQVWLxG8anx8GUjvWQ+Z MUa63y3B8TyizhPh3+p0s34Kt6tO7e8= 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-480-krNF9nNgO6euzu4gblZpXg-1; Mon, 23 Nov 2020 20:04:57 -0500 X-MC-Unique: krNF9nNgO6euzu4gblZpXg-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 B285B18C43C8; Tue, 24 Nov 2020 01:04:56 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC2B56062F; Tue, 24 Nov 2020 01:04:54 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me Subject: [PATCH blktests 2/5] tests/nvmeof-mp/rc: run nvmeof-mp tests if we set multipath=N Date: Tue, 24 Nov 2020 09:04:24 +0800 Message-Id: <20201124010427.18595-3-yi.zhang@redhat.com> In-Reply-To: <20201124010427.18595-1-yi.zhang@redhat.com> References: <20201124010427.18595-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org To enable it, just do bellow step before we run it: $ echo "options nvme_core multipath=N" >/etc/modprobe.d/nvme.conf Signed-off-by: Yi Zhang --- tests/nvmeof-mp/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc index d7a7c87..bc78f14 100755 --- a/tests/nvmeof-mp/rc +++ b/tests/nvmeof-mp/rc @@ -17,7 +17,7 @@ group_requires() { # Since the nvmeof-mp tests are based on the dm-mpath driver, these # tests are incompatible with the NVME_MULTIPATH kernel configuration # option. - if _have_kernel_option NVME_MULTIPATH; then + if _have_kernel_option NVME_MULTIPATH && _have_module_param_value nvme_core multipath Y; then SKIP_REASON="CONFIG_NVME_MULTIPATH has been set in .config" return fi From patchwork Tue Nov 24 01:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11926929 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 17C74C6379F for ; Tue, 24 Nov 2020 01:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADF7520721 for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NGod7eig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728193AbgKXBFD (ORCPT ); Mon, 23 Nov 2020 20:05:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51408 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgKXBFD (ORCPT ); Mon, 23 Nov 2020 20:05:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606179902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0QRgWQAgp2wbMXFshIMqSuj8+Y5bpwNzqyWYNL833Vg=; b=NGod7eigIv91mIAm0ujAz9JJaL0MGMC2yG/w6C2BN4i2g8h3oMRIXEgvIySnpTjW7dTTlA zeyH3jbBcBXiOs5TvWeeAeh251rjMZ6B/9Q+R61axJyRtaiNysxE5w2Hz9j2IwVXVxTZot Y2acKQIXOpVDIVXdH69Kr8GxySYEUcs= 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-95-M0YeAQSHMVqG5czEIDxiRw-1; Mon, 23 Nov 2020 20:05:00 -0500 X-MC-Unique: M0YeAQSHMVqG5czEIDxiRw-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 0F97980EDA9; Tue, 24 Nov 2020 01:04:59 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38DEC1346D; Tue, 24 Nov 2020 01:04:56 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me Subject: [PATCH blktests 3/5] tests/nvmeof-mp/012: fix the schedulers list Date: Tue, 24 Nov 2020 09:04:25 +0800 Message-Id: <20201124010427.18595-4-yi.zhang@redhat.com> In-Reply-To: <20201124010427.18595-1-yi.zhang@redhat.com> References: <20201124010427.18595-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org There is no cfg scheduler and new added kyber scheduler in lastest kernel, so get the scheduler from sysfs To reproduce it: $ ./check nvmeof-mp/012 nvmeof-mp/012 (dm-mpath on top of multiple I/O schedulers) [passed] runtime 5.922s ... 8.804s $ cat results/nodev/nvmeof-mp/012.full | grep -n "Changing scheduler" 31:Changing scheduler of dm-3 from mq-deadline kyber [bfq] none into cfq failed 47:Changing scheduler of dm-3 from mq-deadline kyber [bfq] none into cfq failed Signed-off-by: Yi Zhang --- tests/nvmeof-mp/012 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/nvmeof-mp/012 b/tests/nvmeof-mp/012 index ae6a92c..96adc70 100755 --- a/tests/nvmeof-mp/012 +++ b/tests/nvmeof-mp/012 @@ -8,7 +8,7 @@ DESCRIPTION="dm-mpath on top of multiple I/O schedulers" QUICK=1 test_io_schedulers() { - local dev m + local dev m dm scheds # Load all I/O scheduler kernel modules for m in "/lib/modules/$(uname -r)/kernel/block/"*.ko; do @@ -17,15 +17,17 @@ test_io_schedulers() { for mq in y n; do use_blk_mq ${mq} || return $? dev=$(get_bdev 0) || return $? - for sched in noop deadline bfq cfq; do - set_scheduler "$(basename "$(readlink -f "${dev}")")" $sched \ + dm=$(basename "$(readlink -f "${dev}")") || return $? + scheds=$(sed 's/[][]//g' /sys/block/"$dm"/queue/scheduler) || return $? + for sched in $scheds; do + set_scheduler "$dm" "$sched" \ >>"$FULL" 2>&1 || continue echo "I/O scheduler: $sched; use_blk_mq: $mq" >>"$FULL" run_fio --verify=md5 --rw=randwrite --bs=4K --size=64K \ --ioengine=libaio --iodepth=64 \ --iodepth_batch=32 --group_reporting --sync=1 \ --direct=1 --filename="$dev" \ - --name=${sched} --thread --numjobs=1 \ + --name="${sched}" --thread --numjobs=1 \ --output="${RESULTS_DIR}/nvmeof-mp/012-${sched}-${mq}.txt" \ >>"$FULL" || return $? From patchwork Tue Nov 24 01:04:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11926931 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 526FBC64E69 for ; Tue, 24 Nov 2020 01:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01B1D20758 for ; Tue, 24 Nov 2020 01:05:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P3YG0if+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728209AbgKXBFG (ORCPT ); Mon, 23 Nov 2020 20:05:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22953 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgKXBFF (ORCPT ); Mon, 23 Nov 2020 20:05:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606179905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L2hH9HMbD7m3D18dSNHVZjKe3HFdYJgzZXEL8KtrsMA=; b=P3YG0if+o2cfsmfalVqR3ZwU5PD9QJVm9x26R/4BRnlDR7nuHCLCUShdL/hWczvV6uogE3 m4rxmZml4NN5QwTbf1LNseMJpSEvVOpNhQW3dkm55C6qHi1pggC86yENeHXQPDPRVxP2A5 wxp9nFcrsa6dkcs0dWgoj4RBh1eQwOs= 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-537-LKpQkwyrP52Wrb6FHFDnSg-1; Mon, 23 Nov 2020 20:05:03 -0500 X-MC-Unique: LKpQkwyrP52Wrb6FHFDnSg-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 5E9A980EDAD; Tue, 24 Nov 2020 01:05:01 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8927E1346D; Tue, 24 Nov 2020 01:04:59 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me Subject: [PATCH blktests 4/5] common/rc: _have_iproute2 fix for "ip -V" change Date: Tue, 24 Nov 2020 09:04:26 +0800 Message-Id: <20201124010427.18595-5-yi.zhang@redhat.com> In-Reply-To: <20201124010427.18595-1-yi.zhang@redhat.com> References: <20201124010427.18595-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org With bellow commit, the version will be updated base on the tag fbef6555 replace SNAPSHOT with auto-generated version string To reproduce it: $ ./check srp/015 common/rc: line 98: [: ip utility, iproute2-5.9.0: integer expression expected Signed-off-by: Yi Zhang --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 0d7a3cd..37eb873 100644 --- a/common/rc +++ b/common/rc @@ -95,7 +95,7 @@ _have_iproute2() { SKIP_REASON="ip utility not found" return 1 fi - if [ "$snapshot" -lt "$1" ]; then + if [[ "$snapshot" =~ ^[0-9]+$ && "$snapshot" -lt "$1" ]]; then SKIP_REASON="ip utility too old" return 1 fi From patchwork Tue Nov 24 01:04:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 11926933 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 74E47C64E7B for ; Tue, 24 Nov 2020 01:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33E3320721 for ; Tue, 24 Nov 2020 01:05:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="T42L/HNd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728240AbgKXBFK (ORCPT ); Mon, 23 Nov 2020 20:05:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58061 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgKXBFK (ORCPT ); Mon, 23 Nov 2020 20:05:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606179909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Meb8VBRdNpLl6eh22OMMs7hFvb4+eceBdMv99rKjoOI=; b=T42L/HNdU4fITktVBAR53X1AK31mtNyLO7m99yQ++0vO199saKS9+nGwJFAn292q1NxbyQ P9gQkgvuzUo/Fv5C0lzMHMZWwmVZ/0i8uGEDurPMcXyxN4kYEp/dDqoIR49X59s7wa9xjS VuEzxXSH9y3cctjpV33N7Mlrm5FdLxU= 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-15-D75VfgFXM_a0uzWhw-xDLQ-1; Mon, 23 Nov 2020 20:05:04 -0500 X-MC-Unique: D75VfgFXM_a0uzWhw-xDLQ-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 AF7B718C43C7; Tue, 24 Nov 2020 01:05:03 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8AF81346D; Tue, 24 Nov 2020 01:05:01 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me Subject: [PATCH blktests 5/5] common/multipath-over-rdma: allow to set use_siw Date: Tue, 24 Nov 2020 09:04:27 +0800 Message-Id: <20201124010427.18595-6-yi.zhang@redhat.com> In-Reply-To: <20201124010427.18595-1-yi.zhang@redhat.com> References: <20201124010427.18595-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org With this change, we can change to use siw for nvme-rdma/nvmeof-mp testing from cmdline: $ use_siw=1 nvme-trtype=rdma ./check nvme/ $ use_siw=1 ./check nvmeof-mp/ Signed-off-by: Yi Zhang --- common/multipath-over-rdma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma index ebc5939..d0fec6f 100644 --- a/common/multipath-over-rdma +++ b/common/multipath-over-rdma @@ -12,7 +12,7 @@ filesystem_type=ext4 fio_aux_path=/tmp/fio-state-files memtotal=$(sed -n 's/^MemTotal:[[:blank:]]*\([0-9]*\)[[:blank:]]*kB$/\1/p' /proc/meminfo) max_ramdisk_size=$((1<<25)) -use_siw= +use_siw=${use_siw:-""} ramdisk_size=$((memtotal*(1024/16))) # in bytes if [ $ramdisk_size -gt $max_ramdisk_size ]; then ramdisk_size=$max_ramdisk_size