generic/233,270: unlimit the max locked memory size for io_uring

[xfstests-dev.git] / tests / generic / 233

diff --git a/tests/generic/233 b/tests/generic/233
index 579134aac252b12c36c92222c822114284784c2c..cc794c7917302b88008f0e9404c77a0deac9c4c1 100755 (executable)
--- a/tests/generic/233
+++ b/tests/generic/233
@@ -1,33 +1,15 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2006 Silicon Graphics, Inc.  All Rights Reserved.
+#
 # FSQA Test No. 233
 #
 # Run fsstress with quotas enabled and limits set low and verify accounted
 # quotas in the end
 #
 # Derived from test 231
-#-----------------------------------------------------------------------
-# Copyright (c) 2006 Silicon Graphics, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#-----------------------------------------------------------------------
-#
-
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
-seqres=$RESULT_DIR/$seq
-seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 here=`pwd`
@@ -40,9 +22,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/filter
 . ./common/quota
 
-FSX_FILE_SIZE=64000000
-FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
-
 _filter_num()
 {
        tee -a $seqres.full |\
@@ -64,7 +43,13 @@ _fsstress()
 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
 -n $count -d $out -p 7`
 
-       echo "fsstress $args" >> tee -a $seqres.full
+       # io_uring accounts memory it needs under the rlimit memlocked option,
+       # which can be quite low on some setups (especially 64K pagesize). root
+       # isn't under this restriction, but regular users are. To avoid the
+       # io_uring_queue_init fail on ENOMEM, set max locked memory to unlimited
+       # temporarily.
+       ulimit -l unlimited
+       echo "fsstress $args" >> $seqres.full
        if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $seqres.full | _filter_num
        then
                echo "    fsstress $args returned $?"
@@ -75,30 +60,19 @@ _fsstress()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os Linux
 _require_scratch
 _require_quota
 _require_user
-_need_to_be_root
 
-_scratch_mkfs >> $seqres.full 2>&1
+_scratch_mkfs > $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2>/dev/null
 quotaon -u -g $SCRATCH_MNT 2>/dev/null
 setquota -u $qa_user 32000 32000 1000 1000 $SCRATCH_MNT 2>/dev/null
 
-if ! _fsstress; then
-       umount $SCRATCH_DEV 2>/dev/null
-       exit
-fi
-
-if ! _check_quota_usage; then
-       umount $SCRATCH_DEV 2>/dev/null
-       status=1
-       exit
-fi
-
-umount $SCRATCH_DEV 2>/dev/null
+_fsstress
+_check_quota_usage
+_scratch_unmount
 status=0
 exit