From patchwork Sun Mar 15 22:13:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11439417 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22F9814B4 for ; Sun, 15 Mar 2020 22:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0878D20722 for ; Sun, 15 Mar 2020 22:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729253AbgCOWN3 (ORCPT ); Sun, 15 Mar 2020 18:13:29 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:54201 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbgCOWN3 (ORCPT ); Sun, 15 Mar 2020 18:13:29 -0400 Received: by mail-pj1-f67.google.com with SMTP id l36so7134013pjb.3 for ; Sun, 15 Mar 2020 15:13:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ASmtf6nEOj9Kr+gzM5bPTz+sdllTCVAi3rAKiYoL4g8=; b=qm+H86GWOl98eVHgIaezfyu2I0xMrc6PQt70Ryiwlcyr6ULCbOYDXWy9O5mYuVKd/B v0GOVuSUpLKBpC6FG4b8Ws0L9e6rX3sGwBnWu3dU0g5yi7O8KHSl38scIOUKp2TAhSLu VSKvFtNADBBCw/TNuq6k/jInFn0glQnuDdnIcrRH0rjs9xSVJYCIVffIEwqAEbFOn06U z5yYmwt1NzadEUzi4CxT5rd7NZoPwW/pp+AyE2M+RRwT0nXuNteFp6aYTFlhD1+VhIm7 /QXqqKHrh4+pno8GUpyoB6MLJtx0PFIiFoj3DXziJ4obpY2EqUScJX28eMUBg4oc8lpZ b6Cw== X-Gm-Message-State: ANhLgQ3NXPGUP5LGcwEk2Qc8q6MV/iD8NmS4zixarZxJfb3jFJiYSuzG aSy9x8NedYCYgvqV4StuH3Q= X-Google-Smtp-Source: ADFU+vtW3yJLAX1P6DM36OSv0BcjEeyIhrGGF6nI1U476eNxoJniJaerBHaMBZMpUhgzBgE6NTkQmg== X-Received: by 2002:a17:90a:bb92:: with SMTP id v18mr17351709pjr.54.1584310407848; Sun, 15 Mar 2020 15:13:27 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:dc50:2da4:5bd2:69ab]) by smtp.gmail.com with ESMTPSA id d1sm39192976pfn.51.2020.03.15.15.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 15:13:27 -0700 (PDT) From: Bart Van Assche To: Omar Sandoval Cc: linux-block@vger.kernel.org, Chaitanya Kulkarni , Bart Van Assche Subject: [PATCH blktests v2 1/4] Make _exit_null_blk remove all null_blk device instances Date: Sun, 15 Mar 2020 15:13:17 -0700 Message-Id: <20200315221320.613-2-bvanassche@acm.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200315221320.613-1-bvanassche@acm.org> References: <20200315221320.613-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Instead of making every test remove null_blk device instances before calling _exit_null_blk(), move the null_blk device instance removal code into _exit_null_blk(). Signed-off-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- common/null_blk | 12 ++++++++---- tests/block/022 | 3 --- tests/block/029 | 1 - 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/null_blk b/common/null_blk index 2e300c20bbc7..6a5f99aaae9d 100644 --- a/common/null_blk +++ b/common/null_blk @@ -8,11 +8,14 @@ _have_null_blk() { _have_modules null_blk } +_remove_null_blk_devices() { + local d + + for d in /sys/kernel/config/nullb/*; do [ -d "$d" ] && rmdir "$d"; done +} + _init_null_blk() { - if [[ -d /sys/kernel/config/nullb ]]; then - find /sys/kernel/config/nullb -mindepth 1 -maxdepth 1 \ - -type d -delete - fi + _remove_null_blk_devices local zoned="" if (( RUN_FOR_ZONED )); then zoned="zoned=1"; fi @@ -27,5 +30,6 @@ _init_null_blk() { _exit_null_blk() { udevadm settle + _remove_null_blk_devices modprobe -r null_blk } diff --git a/tests/block/022 b/tests/block/022 index 1404aacef295..b2c53e266d81 100755 --- a/tests/block/022 +++ b/tests/block/022 @@ -50,9 +50,6 @@ test() { wait $pid1 } 2>/dev/null - rmdir /sys/kernel/config/nullb/1 - rmdir /sys/kernel/config/nullb/0 - _exit_null_blk echo "Test complete" } diff --git a/tests/block/029 b/tests/block/029 index d298bac8db5c..0d521edb0cf6 100755 --- a/tests/block/029 +++ b/tests/block/029 @@ -58,7 +58,6 @@ test() { else echo "Skipping test because $sq cannot be modified" >>"$FULL" fi - rmdir /sys/kernel/config/nullb/nullb0 _exit_null_blk echo Passed } From patchwork Sun Mar 15 22:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11439419 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35F6F14B4 for ; Sun, 15 Mar 2020 22:13:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E2A0206E9 for ; Sun, 15 Mar 2020 22:13:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729254AbgCOWNa (ORCPT ); Sun, 15 Mar 2020 18:13:30 -0400 Received: from mail-pl1-f178.google.com ([209.85.214.178]:35815 "EHLO mail-pl1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbgCOWNa (ORCPT ); Sun, 15 Mar 2020 18:13:30 -0400 Received: by mail-pl1-f178.google.com with SMTP id g6so7053469plt.2 for ; Sun, 15 Mar 2020 15:13:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mGDJ2HZFiBdsaZGiTxTLtgDQACiWAgZfS87jWhdx3Qw=; b=dcTCTGw8owR7WJQvo27uJCvA+KFsQtmK/O39x8Ufe34Qze6JQfLuY+xNatOD+SiUyb aMzuDmHyqxYaSRl7mSk7HyixLvVofXuh+DIqRw4QQF3GXOnVd3tw8bHDQ2Lz0ZKaltU2 vyXunMwY/VKETjCpAKw3h33VX5UrMe+JpCtIWIcMMWW0bUSuCIih9A1DWtk4Dp5bUJw6 Iu3D+KSJkdCM3p0EOuFcLb9Qz2ZWI1MbhXz6soj3i5wF7cxYJvsyLipcA4lkPxN7oQZi oBCR14EbkUcbmyGac/zYFR5Ucag78rgnlaq+j2SUfDp00WHHi4n/rNPzDHndg4ub5sJA Rh+w== X-Gm-Message-State: ANhLgQ3c1oWCu+emOa/GfGXRF4cypaOhpzGKWfu78a6GtWEy8qyy2jLm p/oMeu3D96rATayw8EZaz28= X-Google-Smtp-Source: ADFU+vu1morvTkq7jmIXsqrtk0gXNH8oeybsZJvhGlXtk2/jni5oQn5NnGcQQTQFSeZ6JezDlw/PCw== X-Received: by 2002:a17:90a:bf17:: with SMTP id c23mr21675013pjs.17.1584310409106; Sun, 15 Mar 2020 15:13:29 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:dc50:2da4:5bd2:69ab]) by smtp.gmail.com with ESMTPSA id d1sm39192976pfn.51.2020.03.15.15.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 15:13:28 -0700 (PDT) From: Bart Van Assche To: Omar Sandoval Cc: linux-block@vger.kernel.org, Chaitanya Kulkarni , Bart Van Assche Subject: [PATCH blktests v2 2/4] Use _{init,exit}_null_blk instead of open-coding these functions Date: Sun, 15 Mar 2020 15:13:18 -0700 Message-Id: <20200315221320.613-3-bvanassche@acm.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200315221320.613-1-bvanassche@acm.org> References: <20200315221320.613-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This patch reduces code duplication. Signed-off-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- common/multipath-over-rdma | 12 +++--------- tests/nvmeof-mp/rc | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma index 40efc4b3aa2e..a56e7a8269db 100644 --- a/common/multipath-over-rdma +++ b/common/multipath-over-rdma @@ -5,6 +5,7 @@ # Functions and global variables used by both the srp and nvmeof-mp tests. . common/shellcheck +. common/null_blk debug= filesystem_type=ext4 @@ -634,13 +635,6 @@ configure_null_blk() { ls -l /dev/nullb* &>>"$FULL" } -unload_null_blk() { - local d - - for d in /sys/kernel/config/nullb/*; do [ -d "$d" ] && rmdir "$d"; done - unload_module null_blk -} - setup_rdma() { start_soft_rdma ( @@ -662,7 +656,7 @@ teardown_uncond() { rm -f /etc/multipath.conf stop_target stop_soft_rdma - unload_null_blk + _exit_null_blk } teardown() { @@ -698,7 +692,7 @@ setup_test() { [ -e "/sys/module/$m" ] || modprobe "$m" || return $? done - modprobe null_blk nr_devices=0 || return $? + _init_null_blk nr_devices=0 || return $? configure_null_blk || return $? diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc index 278843a1270d..f782bb3a02ac 100755 --- a/tests/nvmeof-mp/rc +++ b/tests/nvmeof-mp/rc @@ -278,7 +278,7 @@ stop_nvme_target() { ) unload_module nvmet_rdma && unload_module nvmet && - unload_null_blk + _exit_null_blk } start_target() { From patchwork Sun Mar 15 22:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11439421 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB38614B4 for ; Sun, 15 Mar 2020 22:13:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9397C206E9 for ; Sun, 15 Mar 2020 22:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729260AbgCOWNc (ORCPT ); Sun, 15 Mar 2020 18:13:32 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:35814 "EHLO mail-pl1-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbgCOWNb (ORCPT ); Sun, 15 Mar 2020 18:13:31 -0400 Received: by mail-pl1-f176.google.com with SMTP id g6so7053498plt.2 for ; Sun, 15 Mar 2020 15:13:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C7sM9H/oB/NtZ/k+MD4fVoE3W9QS6nyiuLjXZueeE7s=; b=tlrpfJaPrCtwJjNe/jBfrM+ygf0OqsQOhz40qO2VEsuQu8kYHetYHPXvmrAHfsrgwO Wj7nbRlsVUgkPrv0OcNLg7tnDNvpm0fBhhwjiNh24RPDXFUNj4G2mEWctVjphm8EF8WE zitWl3nSvjHZynM5gw8LlBZ1DQUT/cbii/kngM8TiGUUoubOB8QWy6YU8G71m06gfOsG gVKyatyQjKbUdG00rp3m0OB3nZvXsRCM7Np5CuL4PX1DRkfvg1Kad3eDrA8NCt8UblMZ T9/m67Tu0IlCn3jytH+Um2JgqR56bAoB/kL44gArWgf/8RNLSPQsg5zu/jfZm/Er+7ys 4ynw== X-Gm-Message-State: ANhLgQ2+CLipLmldisNYKCafQdGwykKB/8vUUaRrd/xKfIo+xFbYPwia cvKgPGLO8S3YyWOfz40eoAo= X-Google-Smtp-Source: ADFU+vtrr8b8PJwJNT1bnZtOH1FN5tQk7XYDVoxQzY4okS8K9Rsw74frgy9FdD9L4REtt7YLEAE+Qw== X-Received: by 2002:a17:90a:950f:: with SMTP id t15mr6294215pjo.133.1584310410301; Sun, 15 Mar 2020 15:13:30 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:dc50:2da4:5bd2:69ab]) by smtp.gmail.com with ESMTPSA id d1sm39192976pfn.51.2020.03.15.15.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 15:13:29 -0700 (PDT) From: Bart Van Assche To: Omar Sandoval Cc: linux-block@vger.kernel.org, Chaitanya Kulkarni , Bart Van Assche , Chaitanya Kulkarni Subject: [PATCH blktests v2 3/4] Introduce the function _configure_null_blk() Date: Sun, 15 Mar 2020 15:13:19 -0700 Message-Id: <20200315221320.613-4-bvanassche@acm.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200315221320.613-1-bvanassche@acm.org> References: <20200315221320.613-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Introduce a function for creating a null_blk device instance through configfs. Suggested-by: Chaitanya Kulkarni Signed-off-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- common/multipath-over-rdma | 17 +++++------------ common/null_blk | 14 ++++++++++++++ tests/block/029 | 16 ++-------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma index a56e7a8269db..7e610a0ccbbb 100644 --- a/common/multipath-over-rdma +++ b/common/multipath-over-rdma @@ -620,18 +620,11 @@ run_fio() { configure_null_blk() { local i - ( - cd /sys/kernel/config/nullb || return $? - for i in nullb0 nullb1; do ( - { mkdir -p $i && - cd $i && - echo 0 > completion_nsec && - echo 512 > blocksize && - echo $((ramdisk_size>>20)) > size && - echo 1 > memory_backed && - echo 1 > power; } || exit $? - ) done - ) + for i in nullb0 nullb1; do + _configure_null_blk nullb$i completion_nsec=0 blocksize=512 \ + size=$((ramdisk_size>>20)) memory_backed=1 \ + power=1 || return $? + done ls -l /dev/nullb* &>>"$FULL" } diff --git a/common/null_blk b/common/null_blk index 6a5f99aaae9d..3c31db1ed4ac 100644 --- a/common/null_blk +++ b/common/null_blk @@ -28,6 +28,20 @@ _init_null_blk() { return 0 } +# Configure one null_blk instance with name $1 and parameters $2..${$#}. +_configure_null_blk() { + local nullb=/sys/kernel/config/nullb/$1 param val + + shift + mkdir "$nullb" && + while [ -n "$1" ]; do + param="${1//=*}" + val="${1#${param}=}" + shift + echo "$val" > "$nullb/$param" || return $? + done +} + _exit_null_blk() { udevadm settle _remove_null_blk_devices diff --git a/tests/block/029 b/tests/block/029 index 0d521edb0cf6..dbb582eab473 100755 --- a/tests/block/029 +++ b/tests/block/029 @@ -14,19 +14,6 @@ requires() { _have_null_blk } -# Configure one null_blk instance. -configure_null_blk() { - local nullb0="/sys/kernel/config/nullb/nullb0" - - mkdir "$nullb0" && - echo 0 > "$nullb0/completion_nsec" && - echo 512 > "$nullb0/blocksize" && - echo 16 > "$nullb0/size" && - echo 1 > "$nullb0/memory_backed" && - echo 1 > "$nullb0/power" && - ls -l /dev/nullb* &>>"$FULL" -} - modify_nr_hw_queues() { local deadline num_cpus @@ -45,7 +32,8 @@ test() { : "${TIMEOUT:=30}" _init_null_blk nr_devices=0 queue_mode=2 && - configure_null_blk + _configure_null_blk nullb0 completion_nsec=0 blocksize=512 \ + size=16 memory_backed=1 power=1 && if { echo 1 >$sq; } 2>/dev/null; then modify_nr_hw_queues & fio --rw=randwrite --bs=4K --loops=$((10**6)) \ From patchwork Sun Mar 15 22:13:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11439423 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B4B01392 for ; Sun, 15 Mar 2020 22:13:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 741C2206BE for ; Sun, 15 Mar 2020 22:13:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729259AbgCOWNd (ORCPT ); Sun, 15 Mar 2020 18:13:33 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43066 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbgCOWNc (ORCPT ); Sun, 15 Mar 2020 18:13:32 -0400 Received: by mail-pl1-f193.google.com with SMTP id f8so7040315plt.10 for ; Sun, 15 Mar 2020 15:13:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gzt9drSq1a3M0wDqr12K6dW+/+6MWoiCVYBzeOWG8sQ=; b=UqBXo+MYhxLxmGkg3jucqlV63PBgtoQ49wy3Re71mtJsHOSBpk1SlcZXoG3fACx93i Qh+SXRoVZNuicGThmiDSukfQ99H8ntnvCzQaoJB4z7tFEBpfoMhZrkN5GruU6ZVFKH7w a3ui1ixe+X5fIr6ExJ+r/SWF+9zp1jQckDni+xmJp+aTM4wT0WuCoJERaPFw9oM9/KQb TxufFav5IdhBGLjjDPq8xgIObvrfhrs1GrlA56Ne4pv9EcCmdigirbEnKUAP/A/w6qTA 7mxEMO2NdC2QiW7J19lvcI7huFv2C/Vy4+pAiSEo0UpoSjPDwIiUk0JF0oPIWQ6SAgBt q3hw== X-Gm-Message-State: ANhLgQ2BCXD2WioM37Km95HiBqJknKfE2R085JxBvd8LclVX74nhwCxX FEZjybRV3job1XGkipF5sCU= X-Google-Smtp-Source: ADFU+vtkNIIMmhzeHO9Um76DgvI+W8GLrHpaMTDiwKEYHiMeYhfIFEDpzv84eBgUiFjqOIQzDCVW6w== X-Received: by 2002:a17:90a:bd86:: with SMTP id z6mr21935456pjr.15.1584310411643; Sun, 15 Mar 2020 15:13:31 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:dc50:2da4:5bd2:69ab]) by smtp.gmail.com with ESMTPSA id d1sm39192976pfn.51.2020.03.15.15.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 15:13:30 -0700 (PDT) From: Bart Van Assche To: Omar Sandoval Cc: linux-block@vger.kernel.org, Chaitanya Kulkarni , Bart Van Assche , Ming Lei Subject: [PATCH blktests v2 4/4] Add a test that triggers the blk_mq_realloc_hw_ctxs() error path Date: Sun, 15 Mar 2020 15:13:20 -0700 Message-Id: <20200315221320.613-5-bvanassche@acm.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200315221320.613-1-bvanassche@acm.org> References: <20200315221320.613-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Add a test that triggers the code touched by commit d0930bb8f46b ("blk-mq: Fix a recently introduced regression in blk_mq_realloc_hw_ctxs()"). This test only runs if a recently added fault injection feature is available, namely commit 596444e75705 ("null_blk: Add support for init_hctx() fault injection"). Cc: Ming Lei Signed-off-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- tests/block/030 | 42 ++++++++++++++++++++++++++++++++++++++++++ tests/block/030.out | 1 + 2 files changed, 43 insertions(+) create mode 100755 tests/block/030 create mode 100644 tests/block/030.out diff --git a/tests/block/030 b/tests/block/030 new file mode 100755 index 000000000000..861c85c27f09 --- /dev/null +++ b/tests/block/030 @@ -0,0 +1,42 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2020 Google LLC +# +# Trigger the blk_mq_realloc_hw_ctxs() error path. + +. tests/block/rc +. common/null_blk + +DESCRIPTION="trigger the blk_mq_realloc_hw_ctxs() error path" +QUICK=1 + +requires() { + _have_null_blk || return $? + _have_module_param null_blk init_hctx || return $? +} + +test() { + local i sq=/sys/kernel/config/nullb/nullb0/submit_queues + + : "${TIMEOUT:=30}" + if ! _init_null_blk nr_devices=0 queue_mode=2 "init_hctx=$(nproc),100,0,0"; then + echo "Loading null_blk failed" + return 1 + fi + if ! _configure_null_blk nullb0 completion_nsec=0 blocksize=512 size=16\ + submit_queues="$(nproc)" memory_backed=1 power=1; then + echo "Configuring null_blk failed" + return 1 + fi + if { echo "$(<"$sq")" >$sq; } 2>/dev/null; then + for ((i=0;i<100;i++)); do + echo 1 >$sq + nproc >$sq + done + else + echo "Skipping test because $sq cannot be modified" >>"$FULL" + fi + rmdir /sys/kernel/config/nullb/nullb0 + _exit_null_blk + echo Passed +} diff --git a/tests/block/030.out b/tests/block/030.out new file mode 100644 index 000000000000..863339fb8ced --- /dev/null +++ b/tests/block/030.out @@ -0,0 +1 @@ +Passed