From: Ojaswin Mujoo <ojaswin@linux.ibm.com>
To: fstests@vger.kernel.org
Cc: zlang@redhat.com, riteshh@linux.ibm.com,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3] common/rc: Modify _require_batched_discard to improve test coverage
Date: Mon, 16 May 2022 14:15:05 +0530 [thread overview]
Message-ID: <20220516084505.97655-1-ojaswin@linux.ibm.com> (raw)
A recent ext4 patch discussed [1] that some devices (eg LVMs) can
have a discard granularity as big as 42MB which makes it larger
than the group size of ext4 FS with 1k BS. This causes the FITRIM
IOCTL to fail.
This case was not correctly handled by this test since
"_require_batched_discard" incorrectly interpreted the FITRIM
failure as SCRATCH_DEV not supporting the IOCTL. This caused the test
to report "not run" instead of "failed" in case of large discard granularity.
Fix "_require_batched_discard" to use a more accurate method
to determine if discard is supported.
[1] commit 173b6e383d2
ext4: avoid trim error on fs with small groups
Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
Changes since v2 [1]
* Eliminated redundant $ret variable
[1]
https://lore.kernel.org/all/20220516063951.87838-1-ojaswin@linux.ibm.com/
common/rc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index e2d3d72a..94344248 100644
--- a/common/rc
+++ b/common/rc
@@ -3858,7 +3858,12 @@ _require_batched_discard()
exit 1
fi
_require_fstrim
- $FSTRIM_PROG $1 > /dev/null 2>&1 || _notrun "FITRIM not supported on $1"
+
+ grep -q "not supported" <($FSTRIM_PROG $1 2>&1)
+ if [ "$?" = "0" ]
+ then
+ _notrun "FITRIM not supported on $1"
+ fi
}
_require_dumpe2fs()
--
2.27.0
next reply other threads:[~2022-05-16 8:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 8:45 Ojaswin Mujoo [this message]
2022-06-13 8:35 ` [PATCH v3] common/rc: Modify _require_batched_discard to improve test coverage Ojaswin Mujoo
2022-06-15 9:56 ` Zorro Lang
2022-06-20 5:05 ` Ojaswin Mujoo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220516084505.97655-1-ojaswin@linux.ibm.com \
--to=ojaswin@linux.ibm.com \
--cc=fstests@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riteshh@linux.ibm.com \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.