From patchwork Fri Nov 1 12:55:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1187996 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 474MdD38b2z9sPj for ; Fri, 1 Nov 2019 23:56:09 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E4AD63C23FA for ; Fri, 1 Nov 2019 13:56:06 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 1358F3C23FA for ; Fri, 1 Nov 2019 13:55:53 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-6.smtp.seeweb.it (Postfix) with ESMTP id B14711400524 for ; Fri, 1 Nov 2019 13:55:51 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.68,254,1569254400"; d="scan'208";a="77795795" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 01 Nov 2019 20:55:45 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A00534CE1508; Fri, 1 Nov 2019 20:47:43 +0800 (CST) Received: from localhost.localdomain (10.167.220.84) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 1 Nov 2019 20:55:43 +0800 From: Yang Xu To: Date: Fri, 1 Nov 2019 20:55:57 +0800 Message-ID: <1572612959-20577-4-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1572612959-20577-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> References: <20191031152646.GA7078@dell5510> <1572612959-20577-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-yoursite-MailScanner-ID: A00534CE1508.AAC76 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.4 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v3 3/5] syscalls/quotactl04: add project quota test for non-xfs filesystem X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ltp@lists.linux.it Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" This is a variant about quotactl01. It is used to test project quota. I split it into a new case instead of adding it in quotaclt01 because two points: 1)before linux 4.10, ext4 doesn't support project quota 2)on old kernel, kernel doesn't permit mount both prjquota and grpquota together Signed-off-by: Yang Xu --- include/lapi/quotactl.h | 4 + runtest/syscalls | 1 + testcases/kernel/syscalls/quotactl/.gitignore | 1 + .../kernel/syscalls/quotactl/quotactl04.c | 155 ++++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 testcases/kernel/syscalls/quotactl/quotactl04.c diff --git a/include/lapi/quotactl.h b/include/lapi/quotactl.h index 787f4691e..b9ab54483 100644 --- a/include/lapi/quotactl.h +++ b/include/lapi/quotactl.h @@ -13,6 +13,10 @@ #endif #include +#ifndef PRJQUOTA +# define PRJQUOTA 2 +#endif + # ifndef Q_XGETQSTATV # define Q_XGETQSTATV XQM_CMD(8) # endif diff --git a/runtest/syscalls b/runtest/syscalls index 12d3e0d3b..c30e9e620 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -953,6 +953,7 @@ pwritev202_64 pwritev202_64 quotactl01 quotactl01 quotactl02 quotactl02 quotactl03 quotactl03 +quotactl04 quotactl04 read01 read01 read02 read02 diff --git a/testcases/kernel/syscalls/quotactl/.gitignore b/testcases/kernel/syscalls/quotactl/.gitignore index b0ef075e7..1db7c5d98 100644 --- a/testcases/kernel/syscalls/quotactl/.gitignore +++ b/testcases/kernel/syscalls/quotactl/.gitignore @@ -1,3 +1,4 @@ /quotactl01 /quotactl02 /quotactl03 +/quotactl04 diff --git a/testcases/kernel/syscalls/quotactl/quotactl04.c b/testcases/kernel/syscalls/quotactl/quotactl04.c new file mode 100644 index 000000000..25ab016cf --- /dev/null +++ b/testcases/kernel/syscalls/quotactl/quotactl04.c @@ -0,0 +1,155 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu + * + * This testcase checks the basic flag of quotactl(2) for project quota on + * non-XFS filesystems. + * + * 1) quotactl(2) succeeds to turn on quota with Q_QUOTAON flag for project. + * 2) quotactl(2) succeeds to set disk quota limits with Q_SETQUOTA flag + * for project. + * 3) quotactl(2) succeeds to get disk quota limits with Q_GETQUOTA flag + * for project. + * 4) quotactl(2) succeeds to set information about quotafile with Q_SETINFO + * flag for project. + * 5) quotactl(2) succeeds to get information about quotafile with Q_GETINFO + * flag for project. + * 6) quotactl(2) succeeds to get quota format with Q_GETFMT flag for project. + * 7) quotactl(2) succeeds to get disk quota limit greater than or equal to + * ID with Q_GETNEXTQUOTA flag for project. + * 8) quotactl(2) succeeds to turn off quota with Q_QUOTAOFF flag for project. + */ + +#include +#include +#include +#include +#include +#include "config.h" +#include "lapi/quotactl.h" +#include "tst_test.h" + +#ifndef QFMT_VFS_V1 +# define QFMT_VFS_V1 4 +#endif +#define FMTID QFMT_VFS_V1 +#define MNTPOINT "mntpoint" +static int32_t fmt_id = FMTID; +static int test_id, mount_flag; +static struct dqblk set_dq = { + .dqb_bsoftlimit = 100, + .dqb_valid = QIF_BLIMITS +}; +static struct dqblk res_dq; +static struct dqinfo set_qf = { + .dqi_bgrace = 80, + .dqi_valid = IIF_BGRACE +}; + +static struct dqinfo res_qf; +static int32_t fmt_buf; + +#if defined(HAVE_STRUCT_IF_NEXTDQBLK) +static struct if_nextdqblk res_ndq; +#endif + +static struct tcase { + int cmd; + int *id; + void *addr; + void *set_data; + void *res_data; + int sz; + char *des; +} tcases[] = { + {QCMD(Q_QUOTAON, PRJQUOTA), &fmt_id, NULL, + NULL, NULL, 0, "turn on quota for project"}, + + {QCMD(Q_SETQUOTA, PRJQUOTA), &test_id, &set_dq, + NULL, NULL, 0, "set disk quota limit for project"}, + + {QCMD(Q_GETQUOTA, PRJQUOTA), &test_id, &res_dq, + &set_dq.dqb_bsoftlimit, &res_dq.dqb_bsoftlimit, + sizeof(res_dq.dqb_bsoftlimit), "get disk quota limit for project"}, + + {QCMD(Q_SETINFO, PRJQUOTA), &test_id, &set_qf, + NULL, NULL, 0, "set information about quotafile for project"}, + + {QCMD(Q_GETINFO, PRJQUOTA), &test_id, &res_qf, + &set_qf.dqi_bgrace, &res_qf.dqi_bgrace, sizeof(res_qf.dqi_bgrace), + "get information about quotafile for project"}, + + {QCMD(Q_GETFMT, PRJQUOTA), &test_id, &fmt_buf, + &fmt_id, &fmt_buf, sizeof(fmt_buf), + "get quota format for project"}, + +#if defined(HAVE_STRUCT_IF_NEXTDQBLK) + {QCMD(Q_GETNEXTQUOTA, PRJQUOTA), &test_id, &res_ndq, + &test_id, &res_ndq.dqb_id, sizeof(res_ndq.dqb_id), + "get next disk quota limit for project"}, +#endif + + {QCMD(Q_QUOTAOFF, PRJQUOTA), &test_id, NULL, + NULL, NULL, 0, "turn off quota for project"}, + +}; + +static void setup(void) +{ + const char *const extra_opts[] = {"-O quota,project", NULL}; + + test_id = geteuid(); + SAFE_MKFS(tst_device->dev, tst_device->fs_type, NULL, extra_opts); + SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, "quota"); + mount_flag = 1; +} + +static void cleanup(void) +{ + if (mount_flag && tst_umount(MNTPOINT)) + tst_res(TWARN | TERRNO, "umount(%s)", MNTPOINT); +} + +static void verify_quota(unsigned int n) +{ + struct tcase *tc = &tcases[n]; + + res_dq.dqb_bsoftlimit = 0; + res_qf.dqi_igrace = 0; + fmt_buf = 0; + + TEST(quotactl(tc->cmd, tst_device->dev, *tc->id, tc->addr)); + if (TST_RET == -1) { + tst_res(TFAIL | TTERRNO, "quotactl failed to %s", tc->des); + return; + } + + if (memcmp(tc->res_data, tc->set_data, tc->sz)) { + tst_res(TFAIL, "quotactl failed to %s", tc->des); + tst_res_hexd(TINFO, tc->res_data, tc->sz, "retval: "); + tst_res_hexd(TINFO, tc->set_data, tc->sz, "expected: "); + return; + } + + tst_res(TPASS, "quotactl succeeded to %s", tc->des); +} + +static const char *kconfigs[] = { + "CONFIG_QFMT_V2", + NULL +}; + +static struct tst_test test = { + .needs_tmpdir = 1, + .needs_root = 1, + .needs_kconfigs = kconfigs, + .min_kver = "4.10", /* commit 689c958cbe6b (ext4: add project quota support) */ + .test = verify_quota, + .tcnt = ARRAY_SIZE(tcases), + .setup = setup, + .cleanup = cleanup, + .needs_device = 1, + .dev_fs_type = "ext4", + .mntpoint = MNTPOINT, +};