From mboxrd@z Thu Jan 1 00:00:00 1970 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 B074FC77B60 for ; Mon, 3 Apr 2023 08:48:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4808A900005; Mon, 3 Apr 2023 04:48:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 343EB900003; Mon, 3 Apr 2023 04:48:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12434900004; Mon, 3 Apr 2023 04:48:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C9633900002 for ; Mon, 3 Apr 2023 04:48:27 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 93089AAD8D for ; Mon, 3 Apr 2023 08:48:27 +0000 (UTC) X-FDA: 80639453454.07.850382D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id E338F20004 for ; Mon, 3 Apr 2023 08:48:25 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t2f+kQnX; spf=pass (imf13.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=1680511706; 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=rCN3sBejzmtOa6W6DCIlR2R1obTO4eESRNws2pNblqM=; b=yy5DzC5KCdD4l1cYCzzfkEDkk+Zsa9h75/iP+rlLZ42shmUuZiZTKp+/R7fjsYnIxHEEzC ZaOVU0r0fgo0MduJO/guWoSN3CqlSJ8CZ/HJgiQoBtT4avkvxf61kKrDlhzqRucQ/idDub oUtu7MG/yzQKQTXXOR7QaOGLMTYojTY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t2f+kQnX; spf=pass (imf13.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680511706; a=rsa-sha256; cv=none; b=xjkzGnUGor0Nr9mnUbjAW9EPgOXjlKJxFR291wEiXXsZeivE59qQgs38XYDsLro7QUGCDh jBEwTtDpRnTS2zpq8hvDxdwzd60ooPc/P0J69TaVyWOQUsi/tpqntZ/CADzx9DRdiJJiy1 4PWwuZqOyeA89lSnKJyxHqClZuycImw= 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 151D0616CF; Mon, 3 Apr 2023 08:48:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B4FFC433A1; Mon, 3 Apr 2023 08:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680511704; bh=LdVL5qK221tpZqXs/tk4ISbpY6XmJKeHGjUE00rYUPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2f+kQnXIc22dSP4i0ua9+2Dd4BSoYmUUWwBeL4wV9ob9hd0ByntT4GittPehhTKe O1vgdYX6jevHnHlWHtHX1mSqQFqlFZDR8r8DbCjJkuqiTf1E7ujuiUbutZffi1v4B0 xAJVwhnWRrsx46PyQrVoh2oUwMDdtd3p3P/6tOs43S6R0cC34mzJqemRzIF8+owQly ensE+2NN+zVfg2Pq5eKolZwiMKiWAydmbfV10VkfurrkwnDIqlG3HVGNkeS862oBHO zQl6mkH+9EKqYL/LHxYWgR5wx1+U7KbIaLD627zNNOq19jSnez9kg24lL1boN+vqZR 5vHPb/hIOVBrQ== 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: Mon, 3 Apr 2023 10:47:59 +0200 Message-Id: <20230403084759.884681-7-cem@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230403084759.884681-1-cem@kernel.org> References: <20230403084759.884681-1-cem@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E338F20004 X-Rspam-User: X-Stat-Signature: x439qhzmp4y5q1xa5ey84nd4na96hif1 X-HE-Tag: 1680511705-56424 X-HE-Meta: U2FsdGVkX19KrgxWcMG8rpujum91iVXFOLo8FhrFacWjuqJDg9jjSwXBYOpf+gWAf3brA+INllc0kGytCFAIj5veZ8YilaRYEds9uia0rv2J9OxUPX73FPnnPNEKtc9Hl6Ml0fFBDL5JOuwlXKHhkxZzw1fEviASiNppyFcOdWuYDI/X3btVjNCTwiKUXUe6VVabACJPRYlYb58c5vK8e7sbln7siSgCx8S9FliMkKLUVjIiecj9NAqO5cZ5sMpZ+606Nml054omCpQhROjHBrFUdAjBBqCzxu65egrXnlRi1eEtBMsOA2Kl/YtX6yZpInH8QcKMGcWNbH+2dZFzafJ53hSYB+XwG2ktVHZ2wlrwVKXbjzNnqemI4v08znTEQWILZ57n1NLIBZQHZ4F6AlV2p0YRCSMhzrKPZMxYEN7pujprbwR0TJ0UMdD7A0NYR6S9lI6GCbi1tGwd3Z/E1DrgVTGrs9UpC1DRq+vfCGlCPIo0udW+YYm65eojSMjDVTXOezBjP+EndeT8GlB19sfS4/uG0jNDHzFfAu75L0pJDiUl3nM15Bag9OASqy52Yo3wQyiT5L2RatQPUcES3w5izSmdih75ALPtNZiSFu2rBDL+OU2X60C2mQySe7XMoKGUmQpHIifO28QQbNxdJMelXIzQVuam7pCuC1Mz1Vdq3eqS2RG2Gm20WfWV/G1tELxm92/ZFO5qXVAQTtgTwtiWPLFTX5IvaaebeOjhdJ6rLrDVGghCbcHnYlrvymLeYjIgxPIhQi/JRhyy9Q1ClDZWzPMDrYDAtKQYYw//Y43fbimWy0FhXmzHMGoIemjMW0NVfTrrYGBwYSSyKayxDslc5Eq82b5/6A4ZZTK7N9PALi88i1u2v4oKftrPavaURXfTwP2WuyFy6GdkI2MNnAcug9K9x9ojQX4AqJNTEcDXO1yFY5SCv2DZrS8pZK+Jjgh/TSiyeVDJjPVeZ3v g0yvejG5 GJ5Uo6Yji7tzmu5l4XbjAOQoJ60N+jAchtKe76UGsdaWpN/HJF8Vyzb0E8YtZiW78QW6MT6szpMPGtqNZviFfkfGvOvsU5WIVxHxIbFPAFPP1zI3dZj0nnI4mlYz5ITM2vvLnEsl+sIhU8AObd4mSPl7ObXV+TPiYoSwwNvWgigUEpf8UDTss6Y57BMXAS6AEYN8t1aN0RcRuwNmCcl6odaHGhmaZQditDxWkKMNYlP4IWKOlkHM+1w64zD+Qtt17A7uma6k6TBzQjRxsYBcQOYnXJDVn0DCetJGUAlECQeB9qP+EqvF6vTz4oEJaq0waGtJ/ 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 --- Documentation/filesystems/tmpfs.rst | 34 ++++++++++---- include/linux/shmem_fs.h | 8 ++++ mm/shmem.c | 69 +++++++++++++++++++++++++++++ mm/shmem_quota.c | 9 ++++ 4 files changed, 111 insertions(+), 9 deletions(-) diff --git a/Documentation/filesystems/tmpfs.rst b/Documentation/filesystems/tmpfs.rst index 3f8d89bb7e1a5..ec442a3ef90a0 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 it +normally can. tmpfs has a mount option to set the NUMA memory allocation policy for all files in that instance (if CONFIG_NUMA is enabled) - which can be diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 3e7e18726feb5..5527bd27a429d 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -37,6 +37,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 */ @@ -54,6 +61,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 d7529c883eaf5..80270213fd012 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 @@ -3570,6 +3571,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[] = { @@ -3595,6 +3600,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 {} }; @@ -3691,6 +3700,50 @@ 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; + ctx->seen |= SHMEM_SEEN_QUOTA; + ctx->quota_types |= QTYPE_MASK_USR; + 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; + ctx->seen |= SHMEM_SEEN_QUOTA; + ctx->quota_types |= QTYPE_MASK_GRP; + 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; + ctx->seen |= SHMEM_SEEN_QUOTA; + ctx->quota_types |= QTYPE_MASK_USR; + 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; + ctx->seen |= SHMEM_SEEN_QUOTA; + ctx->quota_types |= QTYPE_MASK_GRP; + break; } return 0; @@ -3796,6 +3849,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) @@ -3965,6 +4030,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 c415043a71e67..77ba7c3494c70 100644 --- a/mm/shmem_quota.c +++ b/mm/shmem_quota.c @@ -168,6 +168,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); @@ -197,6 +198,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); -- 2.30.2