From patchwork Wed Apr 26 10:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13224376 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5A4EC77B78 for ; Wed, 26 Apr 2023 10:20:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D13E6B00BB; Wed, 26 Apr 2023 06:20:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15A2C6B00BC; Wed, 26 Apr 2023 06:20:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F14CE6B00BD; Wed, 26 Apr 2023 06:20:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DA3F16B00BB for ; Wed, 26 Apr 2023 06:20:27 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9AFB7C0242 for ; Wed, 26 Apr 2023 10:20:27 +0000 (UTC) X-FDA: 80723147694.10.B4BD972 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id E086680006 for ; Wed, 26 Apr 2023 10:20:25 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tgoTSov1; spf=pass (imf02.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682504426; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=i29nbLTD7VUPnvYBUWlCyjQJ7Rua+7re6Ffsnvy7qbU=; b=5lkHHp3EVyX+wCrNEv1nRRxqxv/tGT7aqM85n0YAu1F/itTt5VjClwBcN0QGCkSSGiVYUS nDlf4e9wkuPIy0uZttWWyNFMy3OOedyDdasAgX+qaTAy6sA5bs0FrPbzo2ukGKXC3CwlKX NS6oz5eXdfZRQlephlk4AqeodpxKTZg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682504426; a=rsa-sha256; cv=none; b=R4euUdRk+Ery3yasrqoWSyquESGFFclLzrKRNZ2R3xaJn+Md2POJR7M2fESkf3r1FsgzLG AAcwAnTSasmtYJ8Np9yE29YaKDcp3Hqn5hnbnz8cMs6j2IPlrIzBqP5c2F0seooXNFuLjn nkkFNdcGFJ8tlLCDZIQolIREH1G2vw8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tgoTSov1; spf=pass (imf02.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EA86D634D4; Wed, 26 Apr 2023 10:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32DE3C4339B; Wed, 26 Apr 2023 10:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682504424; bh=sTQFN1wAbKVSo99SrbidiVoxbcHbXA+5l/p0lvKIk1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tgoTSov1mXjb7MsizAum60HLX/TOT8KM5xQuWsVVlAkdvQs2RqC/0GvQyi7tmtshc wOEE+hsQa/5VBr2Lz1LM1ewEh/emma1LXTSZxGtcnlIA9Hi9LUFvAyenMyQD82NJSj r63KdOQyk37weFVxvaO3YZWNG/bM0BDMh7obf+n/rYL5DIK2s8GurAxCz00wShXmSq lLl2zIwmGPey4UbyV+qchGFIdJPnTiQsER4q3B14MHkoEaqEnDGRXsTv4PClUHmgok FO6yF7rdCxmOYZRtHjkO0WOORG6NnBqm9/Mn8dN+snLTda8Htf+7KRTPDYQur2fNDW MPqYaQ7uWD4rQ== From: cem@kernel.org To: hughd@google.com Cc: jack@suse.cz, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, djwong@kernel.org Subject: [PATCH 6/6] Add default quota limit mount options Date: Wed, 26 Apr 2023 12:20:08 +0200 Message-Id: <20230426102008.2930932-7-cem@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230426102008.2930932-1-cem@kernel.org> References: <20230426102008.2930932-1-cem@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: E086680006 X-Rspamd-Server: rspam09 X-Stat-Signature: w9psbbozux5wabdtonir8i8p9f1jz8d5 X-HE-Tag: 1682504425-689114 X-HE-Meta: U2FsdGVkX1/vEBbkY88h/z6fSxRRJTHxviMT00d0RBtcq70hC7kgUYoH+FTfG9/zC18KfuSKYhDjLtPfmHtjOSu0OaPtTj82GzYRo17Ah+E2X5hVbzmQyBx38PPVTWgcugOvlxKkrk3KoaLk1OJyrbJMZezsp3KnDZ0otco6lq4BZLsyyIXDPGr1rFXVA5vJDAzMInTYz2+s9p9JCu3FKmmTs7q+UIM8pflicYjrdWinL1/sHAktUg4sTs0kuNaCor/MJRh6orOccAqeriLfJEcJIqnA0VjTcTlaH7axR+ODquQEUmC1hs7tR0h5AieIzOqG5E+xUFbwrBVFbaTqhFOekSkiZfqa0yR1GQpMraJStrRTXdcpGY9l99qooyPQ2qYmY0GG1yETXt2v6ya3gilST2ldKEtyx3djik71rI0wcu9lPNWXq/djwU9WltrvPJvP+651uaxNucnTlXtp++J5QHnxCM7DJfUji8fMmNnYH8txDbQm9FQoUdfPEdt7gLZw9vl+7JfGkInAEs5c2td3A/wspEhch++1LgHt7Fzgn95KLhngbfpqNdNPf2jDy5HQfvyqi8cR4np+PuU3oKHZk9+aIvt9KkaEi1sMN4S1Fr340oY2IvF+TZIO4i5LZFgGhfupW+OZUV4XF4LM+CNuhF6Wnpee7rs1LtWsNaAZgFQXAYO+guHLyxdpq6MhieLwzTpnOSVFKuJ8u3ZnjqIGwkHVQt11Z3ULlXevZItW8aLyucBFseVGijuieS+W85nR/iQ7d0RIHONgaKjp/EjzNbtPHHqCF67xpDhEGB0HryIg8v1r83iKKl8S/v2WhITjYo/WGfU2ZFyZaEwWF0F5UCE5LueIkC7xqe2xPkIC9PmK1WF4rFOQ/q4u8kWr8InYRuOBPKPYTwej8OguTPXcbF/6vRyCvm6O/cn6F2brKNY5Cn59qkX0F43VtSPrRGtBwkFDmLnxFbzMb8l aBCIBz5U wFjWCpQVh+Zqp4w5LRpVGckE1G0zHc0ZhjVx9cET2ygv7DOjKIFz6oq8yyMf5xn85u8ZDfPp5SHkopk0s11C7IpNzehd9NqI+bTlpWfo6lOtoHpnJjfuzfjq7qR2Lu8MqcwXnjZ6qjmGmvG5WHf3T/PZY08BURPC2tsIXaBCWVi8x8Hn6DUrdekmpnZzrCBnnWTYZxs5exXrob5KdhtaJJukXNGBV05YOz/t5MjDMWNyNF0kykNe9Tp8EQe+0HgM4zh9Y5v+eY3PanXi1kHlCIn1aRRlMNAxgjDPVXroPdH7+W3s= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Lukas Czerner Allow system administrator to set default global quota limits at tmpfs mount time. Signed-off-by: Lukas Czerner Signed-off-by: Carlos Maiolino Reviewed-by: Jan Kara --- Documentation/filesystems/tmpfs.rst | 34 +++++++++++----- include/linux/shmem_fs.h | 8 ++++ mm/shmem.c | 61 +++++++++++++++++++++++++++++ mm/shmem_quota.c | 34 +++++++++++++++- 4 files changed, 127 insertions(+), 10 deletions(-) diff --git a/Documentation/filesystems/tmpfs.rst b/Documentation/filesystems/tmpfs.rst index 595e607274afb..0c7bfba34baa6 100644 --- a/Documentation/filesystems/tmpfs.rst +++ b/Documentation/filesystems/tmpfs.rst @@ -88,15 +88,31 @@ that instance in a system with many CPUs making intensive use of it. tmpfs also supports quota with the following mount options -======== ============================================================= -quota User and group quota accounting and enforcement is enabled on - the mount. Tmpfs is using hidden system quota files that are - initialized on mount. -usrquota User quota accounting and enforcement is enabled on the - mount. -grpquota Group quota accounting and enforcement is enabled on the - mount. -======== ============================================================= +======================== ================================================= +quota User and group quota accounting and enforcement + is enabled on the mount. Tmpfs is using hidden + system quota files that are initialized on mount. +usrquota User quota accounting and enforcement is enabled + on the mount. +grpquota Group quota accounting and enforcement is enabled + on the mount. +usrquota_block_hardlimit Set global user quota block hard limit. +usrquota_inode_hardlimit Set global user quota inode hard limit. +grpquota_block_hardlimit Set global group quota block hard limit. +grpquota_inode_hardlimit Set global group quota inode hard limit. +======================== ================================================= + +None of the quota related mount options can be set or changed on remount. + +Quota limit parameters accept a suffix k, m or g for kilo, mega and giga +and can't be changed on remount. Default global quota limits are taking +effect for any and all user/group/project except root the first time the +quota entry for user/group/project id is being accessed - typically the +first time an inode with a particular id ownership is being created after +the mount. In other words, instead of the limits being initialized to zero, +they are initialized with the particular value provided with these mount +options. The limits can be changed for any user/group id at any time as they +normally can be. Note that tmpfs quotas do not support user namespaces so no uid/gid translation is done if quotas are enabled inside user namespaces. diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index b8e421e349868..8ca5e969f00fc 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -41,6 +41,13 @@ struct shmem_inode_info { (FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL) #define SHMEM_FL_INHERITED (FS_NODUMP_FL | FS_NOATIME_FL) +struct shmem_quota_limits { + qsize_t usrquota_bhardlimit; /* Default user quota block hard limit */ + qsize_t usrquota_ihardlimit; /* Default user quota inode hard limit */ + qsize_t grpquota_bhardlimit; /* Default group quota block hard limit */ + qsize_t grpquota_ihardlimit; /* Default group quota inode hard limit */ +}; + struct shmem_sb_info { unsigned long max_blocks; /* How many blocks are allowed */ struct percpu_counter used_blocks; /* How many are allocated */ @@ -58,6 +65,7 @@ struct shmem_sb_info { spinlock_t shrinklist_lock; /* Protects shrinklist */ struct list_head shrinklist; /* List of shinkable inodes */ unsigned long shrinklist_len; /* Length of shrinklist */ + struct shmem_quota_limits qlimits; /* Default quota limits */ }; static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) diff --git a/mm/shmem.c b/mm/shmem.c index 623d258af39f8..24bcb374ad27b 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -118,6 +118,7 @@ struct shmem_options { int huge; int seen; unsigned short quota_types; + struct shmem_quota_limits qlimits; #define SHMEM_SEEN_BLOCKS 1 #define SHMEM_SEEN_INODES 2 #define SHMEM_SEEN_HUGE 4 @@ -3593,6 +3594,10 @@ enum shmem_param { Opt_quota, Opt_usrquota, Opt_grpquota, + Opt_usrquota_block_hardlimit, + Opt_usrquota_inode_hardlimit, + Opt_grpquota_block_hardlimit, + Opt_grpquota_inode_hardlimit, }; static const struct constant_table shmem_param_enums_huge[] = { @@ -3618,6 +3623,10 @@ const struct fs_parameter_spec shmem_fs_parameters[] = { fsparam_flag ("quota", Opt_quota), fsparam_flag ("usrquota", Opt_usrquota), fsparam_flag ("grpquota", Opt_grpquota), + fsparam_string("usrquota_block_hardlimit", Opt_usrquota_block_hardlimit), + fsparam_string("usrquota_inode_hardlimit", Opt_usrquota_inode_hardlimit), + fsparam_string("grpquota_block_hardlimit", Opt_grpquota_block_hardlimit), + fsparam_string("grpquota_inode_hardlimit", Opt_grpquota_inode_hardlimit), #endif {} }; @@ -3714,6 +3723,42 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) ctx->seen |= SHMEM_SEEN_QUOTA; ctx->quota_types |= QTYPE_MASK_GRP; break; + case Opt_usrquota_block_hardlimit: + size = memparse(param->string, &rest); + if (*rest || !size) + goto bad_value; + if (size > SHMEM_QUOTA_MAX_SPC_LIMIT) + return invalfc(fc, + "User quota block hardlimit too large."); + ctx->qlimits.usrquota_bhardlimit = size; + break; + case Opt_grpquota_block_hardlimit: + size = memparse(param->string, &rest); + if (*rest || !size) + goto bad_value; + if (size > SHMEM_QUOTA_MAX_SPC_LIMIT) + return invalfc(fc, + "Group quota block hardlimit too large."); + ctx->qlimits.grpquota_bhardlimit = size; + break; + case Opt_usrquota_inode_hardlimit: + size = memparse(param->string, &rest); + if (*rest || !size) + goto bad_value; + if (size > SHMEM_QUOTA_MAX_INO_LIMIT) + return invalfc(fc, + "User quota inode hardlimit too large."); + ctx->qlimits.usrquota_ihardlimit = size; + break; + case Opt_grpquota_inode_hardlimit: + size = memparse(param->string, &rest); + if (*rest || !size) + goto bad_value; + if (size > SHMEM_QUOTA_MAX_INO_LIMIT) + return invalfc(fc, + "Group quota inode hardlimit too large."); + ctx->qlimits.grpquota_ihardlimit = size; + break; } return 0; @@ -3819,6 +3864,18 @@ static int shmem_reconfigure(struct fs_context *fc) goto out; } +#ifdef CONFIG_TMPFS_QUOTA +#define CHANGED_LIMIT(name) \ + (ctx->qlimits.name## hardlimit && \ + (ctx->qlimits.name## hardlimit != sbinfo->qlimits.name## hardlimit)) + + if (CHANGED_LIMIT(usrquota_b) || CHANGED_LIMIT(usrquota_i) || + CHANGED_LIMIT(grpquota_b) || CHANGED_LIMIT(grpquota_i)) { + err = "Cannot change global quota limit on remount"; + goto out; + } +#endif /* CONFIG_TMPFS_QUOTA */ + if (ctx->seen & SHMEM_SEEN_HUGE) sbinfo->huge = ctx->huge; if (ctx->seen & SHMEM_SEEN_INUMS) @@ -3988,6 +4045,10 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_qcop = &dquot_quotactl_sysfile_ops; sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP; + /* Copy the default limits from ctx into sbinfo */ + memcpy(&sbinfo->qlimits, &ctx->qlimits, + sizeof(struct shmem_quota_limits)); + if (shmem_enable_quotas(sb, ctx->quota_types)) goto failed; } diff --git a/mm/shmem_quota.c b/mm/shmem_quota.c index c0b531e2ef688..e349c0901bced 100644 --- a/mm/shmem_quota.c +++ b/mm/shmem_quota.c @@ -166,6 +166,7 @@ static int shmem_acquire_dquot(struct dquot *dquot) { struct mem_dqinfo *info = sb_dqinfo(dquot->dq_sb, dquot->dq_id.type); struct rb_node **n = &((struct rb_root *)info->dqi_priv)->rb_node; + struct shmem_sb_info *sbinfo = dquot->dq_sb->s_fs_info; struct rb_node *parent = NULL, *new_node = NULL; struct quota_id *new_entry, *entry; qid_t id = from_kqid(&init_user_ns, dquot->dq_id); @@ -195,6 +196,14 @@ static int shmem_acquire_dquot(struct dquot *dquot) } new_entry->id = id; + if (dquot->dq_id.type == USRQUOTA) { + new_entry->bhardlimit = sbinfo->qlimits.usrquota_bhardlimit; + new_entry->ihardlimit = sbinfo->qlimits.usrquota_ihardlimit; + } else if (dquot->dq_id.type == GRPQUOTA) { + new_entry->bhardlimit = sbinfo->qlimits.grpquota_bhardlimit; + new_entry->ihardlimit = sbinfo->qlimits.grpquota_ihardlimit; + } + new_node = &new_entry->node; rb_link_node(new_node, parent, n); rb_insert_color(new_node, (struct rb_root *)info->dqi_priv); @@ -224,6 +233,29 @@ static int shmem_acquire_dquot(struct dquot *dquot) return ret; } +static bool shmem_is_empty_dquot(struct dquot *dquot) +{ + struct shmem_sb_info *sbinfo = dquot->dq_sb->s_fs_info; + qsize_t bhardlimit; + qsize_t ihardlimit; + + if (dquot->dq_id.type == USRQUOTA) { + bhardlimit = sbinfo->qlimits.usrquota_bhardlimit; + ihardlimit = sbinfo->qlimits.usrquota_ihardlimit; + } else if (dquot->dq_id.type == GRPQUOTA) { + bhardlimit = sbinfo->qlimits.grpquota_bhardlimit; + ihardlimit = sbinfo->qlimits.grpquota_ihardlimit; + } + + if (test_bit(DQ_FAKE_B, &dquot->dq_flags) || + (dquot->dq_dqb.dqb_curspace == 0 && + dquot->dq_dqb.dqb_curinodes == 0 && + dquot->dq_dqb.dqb_bhardlimit == bhardlimit && + dquot->dq_dqb.dqb_ihardlimit == ihardlimit)) + return true; + + return false; +} /* * Store limits from dquot in the tree unless it's fake. If it is fake * remove the id from the tree since there is no useful information in @@ -261,7 +293,7 @@ static int shmem_release_dquot(struct dquot *dquot) return -ENOENT; found: - if (test_bit(DQ_FAKE_B, &dquot->dq_flags)) { + if (shmem_is_empty_dquot(dquot)) { /* Remove entry from the tree */ rb_erase(&entry->node, info->dqi_priv); kfree(entry);