Add support for xfs quota tests

testcases/kernel/syscalls/quotactl/quotactl02.c new file +39 -0

+#if defined(HAVE_XFS_QUOTA)
+#include <xfs/xqm.h>
+#else
+#define BROKEN_XFS_QUOTA 1
+#endif
+
+#include "test.h"
+#include "usctest.h"
+#include "linux_syscall_numbers.h"
+#include "safe_macros.h"
+
+#define USRQCMD(cmd)	((cmd) << 8)
+#define RTBLIMIT	2000
+
+char *TCID = "quotactl02";
+int TST_TOTAL = 5;
+
+#ifndef BROKEN_XFS_QUOTA
+static void func_test(int i);
+static void setup(void);
+static void cleanup(void);
+static void help(void);
+
+static int dflag;
+static int uid = -1;
+static char dev[PATH_MAX];
+static char *block_dev;
+static struct fs_disk_quota dquota;
+static struct fs_quota_stat qstat;
+static unsigned int qflag = XFS_QUOTA_UDQ_ENFD;
+static const char mntpoint[] = "mnt_point";
+
+static option_t options[] = {
+	{"D:", &dflag, &block_dev},
+	{NULL, NULL, NULL},
+};
+
+static struct test_case_t {
+	int cmd;

testcases/kernel/syscalls/quotactl/quotactl02.c new file +119 -0

+int main(int argc, char *argv[])
+{
+	int i;
+	int lc;
+	char *msg;
+
+	msg = parse_opts(argc, argv, options, &help);
+	if (msg != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+	if (!dflag)
+		tst_brkm(TBROK, NULL,
+			 "you must specify the device used for mounting with "
+			 "the -D option");
+
+	setup();
+
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+
+		tst_count = 0;
+
+		for (i = 0; i < TST_TOTAL; i++) {
+
+			TEST(ltp_syscall(__NR_quotactl,
+					 USRQCMD(TC[i].cmd), TC[i].dev,
+					 *TC[i].id, TC[i].addr));
+
+			if (TEST_RETURN != 0)
+				tst_resm(TFAIL | TERRNO,
+					 "cmd=0x%x failed", TC[i].cmd);
+
+			if (STD_FUNCTIONAL_TEST)
+				func_test(i);
+			else
+				tst_resm(TPASS,
+					 "quotactl call succeeded");
+
+		}
+	}
+
+	cleanup();
+
+	tst_exit();
+
+}
 
 
+void func_test(int i)
+{
+	int ret;
+
+	switch (i) {
+	case 0:
+		/* Validate Q_XQUOTAOFF flag of quotactl call */
+		ret = ltp_syscall(__NR_quotactl, USRQCMD(Q_XGETQSTAT),
+				  TC[i].dev, *TC[i].id, &qstat);
+		if (ret != 0)
+			tst_brkm(TBROK | TERRNO, cleanup,
+				 "fail to get quota stat");
+
+		if (qstat.qs_flags & XFS_QUOTA_UDQ_ENFD) {
+			tst_resm(TFAIL, "enforcement is not off");
+			return;
+		}
+
+		tst_resm(TPASS, "enforcement is off");
+		break;
+
+	case 1:
+		/* Validate Q_XQUOTAON flag of quotactl call */
+		ret = ltp_syscall(__NR_quotactl, USRQCMD(Q_XGETQSTAT),
+				  TC[i].dev, *TC[i].id, &qstat);
+		if (ret != 0)
+			tst_brkm(TBROK | TERRNO, cleanup,
+				 "fail to get quota stat");
+
+		if (!(qstat.qs_flags & XFS_QUOTA_UDQ_ENFD)) {
+			tst_resm(TFAIL, "enforcement is off");
+			return;
+		}
+
+		tst_resm(TPASS, "enforcement is on");
+		break;
+
+	case 2:
+		/* Validate Q_XGETQUOTA flag of quotactl call */
+		if (!(dquota.d_flags & XFS_USER_QUOTA)) {
+			tst_resm(TFAIL, "get incorrect quota type");
+			return;
+		}
+
+		/* for case3 */
+		dquota.d_rtb_hardlimit = RTBLIMIT;
+		dquota.d_fieldmask = FS_DQ_LIMIT_MASK;
+
+		tst_resm(TPASS, "get the right quota type");
+		break;
+
+	case 3:
+		/* Validate Q_XSETQLIM flag of quotactl call */
+		ret = ltp_syscall(__NR_quotactl, USRQCMD(Q_XGETQUOTA),
+				  TC[i].dev, *TC[i].id, &dquota);
+		if (ret != 0)
+			tst_brkm(TFAIL | TERRNO, NULL,
+				 "fail to get quota information");
+
+		if (dquota.d_rtb_hardlimit != RTBLIMIT) {
+			tst_resm(TFAIL, "limit on RTB, except %lu get %lu",
+				 (uint64_t)RTBLIMIT,
+				 (uint64_t)dquota.d_rtb_hardlimit);
+			return;
+		}
+
+		tst_resm(TPASS, "quotactl works fine with Q_XSETQLIM");
+		break;
+
+	case 4:
+		/* Validate Q_XGETQSTAT flag of quotactl call */
+		if (qstat.qs_version != FS_QSTAT_VERSION) {
+			tst_resm(TFAIL, "get incorrect qstat version");
+			return;

+void setup()

testcases/kernel/syscalls/quotactl/quotactl02.c new file +7 -0

+	if (umount(mntpoint) < 0)
+		tst_resm(TFAIL | TERRNO, "umount(2) fail");
+
+	TEST_CLEANUP;
+	tst_rmdir();
+}
+

Add support for xfs quota tests:

*Create a xfs block device

*Define HAVE_XFS_QUOTA to show if xfs quota is available

Signed-off-by DAN LI <[email protected]>

---
 configure.ac        |  1 +
 m4/ltp-xfs_quota.m4 | 39 +++++++++++++++++++++++++++++++++++++
 runltp              | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 m4/ltp-xfs_quota.m4

configure.ac +1 -0

index f0fc6b0..1f95603 100644
@@ -168,5 +168,6 @@ LTP_CHECK_ACL_SUPPORT
 LTP_CHECK_FS_IOC_FLAGS
 LTP_CHECK_MREMAP_FIXED
 LTP_CHECK_KERNEL_DEVEL
+LTP_CHECK_XFS_QUOTACTL
 
 AC_OUTPUT

m4/ltp-xfs_quota.m4 new file +21 -0

new file mode 100644
index 0000000..a17d4d9
@@ -0,0 +1,39 @@
+dnl
+dnl Copyright (c) 2013 Fujitsu Ltd.
+dnl Author: DAN LI <[email protected]>
+dnl
+dnl This program is free software;  you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY;  without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+dnl the GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program;  if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+
+dnl
+dnl LTP_CHECK_XFS_QUOTACTL

m4/ltp-xfs_quota.m4 new file +8 -0

+}])],[has_xfs_quota="yes"])
+
+if test "x$has_xfs_quota" = xyes; then
+	AC_DEFINE(HAVE_XFS_QUOTA,1,[Define to 1 if you have xfs quota])
+else
+	AC_MSG_WARN(No xfs quota support)
+fi
+])

runltp +1 -0

index 28e6bed..210a332 100755
@@ -163,6 +163,7 @@ usage()
     -b DEVICE       Some tests require an unmounted block device
                     to run correctly.
     -B DEVICE_FS_TYPE The file system of test block devices.
+    -X XFS_DEVICE   Some tests require an unmounted xfs-format block device
 
 
     example: ${0##*/} -c 2 -i 2 -m 2,4,10240,1 -D 2,10,10240,1 -p -q  -l /tmp/result-log.$$ -o /tmp/result-output.$$ -C

/tmp/result-failed.$$ -d ${PWD}

runltp +42 -1

@@ -211,7 +212,7 @@ main()
 
     version_date=$(cat "$LTPROOT/Version")
 
-    while getopts a:c:C:d:D:f:F:ehi:K:g:l:m:M:Nno:pqr:s:S:t:T:w:x:b:B: arg
+    while getopts a:c:C:d:D:f:F:ehi:K:g:l:m:M:Nno:pqr:s:S:t:T:w:x:b:B:X: arg
     do  case $arg in
         a)  EMAIL_TO=$OPTARG
             ALT_EMAIL_OUT=1;;

@@ -424,6 +425,7 @@ main()
             INSTANCES="-x $OPTARG";;
         b) DEVICE=$OPTARG;;
         B) DEVICE_FS_TYPE=$OPTARG;;
+        X) XFS_DEVICE=$OPTARG;;
         \?) usage;;
         esac
     done

@@ -679,6 +681,24 @@ main()
     }
     }
 
+    if [ -n "$XFS_DEVICE" ]; then
+        sed -i "s|XFS_DEVICE|$XFS_DEVICE|"  ${TMP}/alltests
+        RC=$?
+    else
+        create_xfs_block
+        if [ $? -eq 0 ]; then
+            sed -i "s|XFS_DEVICE|$XFS_DEVICE|"  ${TMP}/alltests
+            RC=$?
+        else
+            echo "No xfs-format block device was specified on commandline."
+            echo "Block device could not be created using loopback device"
+            echo "Tests which require xfs block device are disabled."
+            echo "You can specify it with option -X"
+            sed -i "/XFS_DEVICE/d"  ${TMP}/alltests
+            RC=$?
+        fi
+    fi
+
     if [ -n "$DEVICE" ]; then
         sed -i "s|DEVICE|$DEVICE|"  ${TMP}/alltests
         RC=$?

@@ -1019,9 +1039,43 @@ create_block()
     fi
 }
 
+create_xfs_block()
+{
+    #create a block device with xfs filesystem.
+    dd if=/dev/zero of=${TMP}/xfstest.img bs=1kB count=20480
+    if [ $? -ne 0 ]; then
+        echo "Failed to create loopback device image, please check disk space and re-run"
+        return 1
+    else
+        ##search for an unused loop dev
+        LOOP_DEV_XFS=$(losetup -f)
+        if [ $? -ne 0 ]; then
+            echo "no unused loop device is found"
+            return 1
+        else
+            ##attach the created file to loop dev.
+            losetup $LOOP_DEV_XFS ${TMP}/xfstest.img
+            if [ $? -ne 0 ]; then
+                echo "losetup failed to create block device"
+                return 1
+            else
+                mkfs.xfs $LOOP_DEV_XFS
+                if [ $? -ne 0 ]; then

Quoted 8 lines

Now this is getting a bit out of hand.

What about we change the tests (we have) to take only device to work with and let each test prepare the filesystem it needs? This will simplify the runltp script to only prepare loop device.

If we agree on that I can write the tst_mkfs() function and convert current usages.

What about the progress of this work? :)

Quoted 8 lines

Now this is getting a bit out of hand.

What about we change the tests (we have) to take only device to work with and let each test prepare the filesystem it needs? This will simplify the runltp script to only prepare loop device.

If we agree on that I can write the tst_mkfs() function and convert current usages.

What about the progress of this work? :)

Quoted 5 lines

I've just pushed a patchset that implements this functionality. (It has been finished previous week but I hold it util I had time to test it properly)

Everybody please test this change and report any problems.

I got a little problem when using this function.

Defaultly, the command mkfs.xfs will not write to the device if it suspects that there is a filesystem or partition table on the device already.
So, i need to add the "-f" option for mkfs.xfs to force the formatting.

But, the command "mkfs dev -t xfs -f" does not work as expected. Could you please change it to "mkfs -t fs_type fs_opts dev" in tst_mkfs()?