From patchwork Thu Apr 20 08:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13218090 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 94877C77B78 for ; Thu, 20 Apr 2023 08:04:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 005B9280006; Thu, 20 Apr 2023 04:04:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ECFFA280001; Thu, 20 Apr 2023 04:04:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D226C280006; Thu, 20 Apr 2023 04:04:19 -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 BE185280001 for ; Thu, 20 Apr 2023 04:04:19 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9AD861C5BA1 for ; Thu, 20 Apr 2023 08:04:19 +0000 (UTC) X-FDA: 80701031838.01.AC96E34 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id AD6574001A for ; Thu, 20 Apr 2023 08:04:17 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W0RK+FFo; spf=pass (imf01.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=1681977857; 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=ffnp+h5LLcg+I18XeFX79KGGO+eLO6b4TgfzTylvGH4=; b=IYINzmCV7qxj9+A05Rg41UgZkhhgY9YBQmPDxhE5+0zwTjfXnaVqq2tcHGHw1SyVCqr1H7 ek7IZ9xIsgA0Lsw9QZaFpBKgFgzRvjiuxMONeiuGQwiY745HcsDUN8sN0j6x92WAtw2tSF /gX1K2c7TKTTCE+wxn/cb/eDpB+zV8s= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W0RK+FFo; spf=pass (imf01.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=1681977857; a=rsa-sha256; cv=none; b=ccp3T74SlQUdmvLPge2fE56NcDfF4keRee5ReVPsU7n3l8O5YxVhxvH6FBJ13kQo1xJW7p VajCsRhXmB3UiXcliKn+KizHG+Je9gQ03yt1tpUq6FfOeovvT5RZxwXaiDcmznUTu9WGIk nSXpdskH0Xr81Kzh8/zG85aJbzjY25I= 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 C6A86645CE; Thu, 20 Apr 2023 08:04:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB3B0C433EF; Thu, 20 Apr 2023 08:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681977856; bh=cGeeh3hspmdcnn/mWZolyKdxnix61gLL5flCCHmoybE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W0RK+FFoNsOxMQe8O1aGq3Cdf04tPeacy+xr02slsRb2jKA79li/7WOHhiiCyha9K RvhKTp0/LUrNQabJTVWfqOW83H0Zq54WPvFI/6gXeiRh0b0ZQJHPwuNrdLZyjJe0MD 7v2Irm8kXS4qzrLYCWT8WF35VVV7XOkwyhwEQLDg4sk4osOmgLLXjqquwgQtNZ4RO/ xMteYxUDCckPmj1xJlWe4IKzAejMYQ3nVTdOIuy5pW5Yqng3KE9K5jawlZw1ZEO+g9 G1DOHyr2rJMfX89qvtLoFVA8nK2qDZ+v65qKQPnDHtQgGlEvsB/P7jUtYFnEkZppAT SiNYwiaOAVnIQ== 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: Thu, 20 Apr 2023 10:03:59 +0200 Message-Id: <20230420080359.2551150-7-cem@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230420080359.2551150-1-cem@kernel.org> References: <20230420080359.2551150-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AD6574001A X-Rspam-User: X-Stat-Signature: sy134exoot7onjm7qfrx8rmfjcjmwzqb X-HE-Tag: 1681977857-18912 X-HE-Meta: U2FsdGVkX18MTJIbegEPtcvYXJ5gGAv9zDW5oI4Dj4tZjResmP2R/8XLkPIVqbfJ1KylI2WS7cGCxjhFNw86UJ7FjWYixbvEFy2zOO+3rwJ2Al1Fum0glORcVVF6MNudv5J29Rp4Ki0hYI/K/VmPEWRTeo+we8Rz/Asu2/FTMWWoZ9t9kud0596ETLIUAk3OJnUnhjja5pVQd9lOMPAwf5xnEtUXweghG1t63HBVqu67dGURoFMo1jw1z1QJ5Rcu7/f7IUUHOfwa7yzpRbtFsjf4jNVNUL3Z2GtYDydVTr64rJmFxXg4ySDvJ1GWbQ0mVMtISGJ4RXHu4cIOLamhqyf80QB1mf8mMUwbnvQeJs2BLgEmm54dVcwPyMw0eBCfOeJE9IPt8mpMoQ+h37y2K4AiYgrRmBuJFYTMVeH8eTjbspyGC8H9nFp6E6B6bN5I+ZkGKiBiSGuf4oLv0mlNOOk0Xc0h6jQzCqbBet6PBk9Cb2cmo39Z/Au2foJu7S+cKwcKEmiWLF/2GXslObL2uYsWCls4Jynsj6V2TKdvQEj2ap2FY67pmrfNz4L8Y3l6vN6k/hJVi9Mm4vbTnfBTQYu5IAjPte5HezTsH98QQ2zA5vq1CA0nYrbQinTCutInQ3pTwW4njuebxjdYgTOPzEDHNK7HQKD91VZgc6e6eGy7TFuDSPWppEKNU8isP+Xzl/SqDR8+5YRlru7uIYYAOveRNP+g5Yt1b8/iMl7VVs9qTBr9iOCoGohjggvg6Nfc53Sv1RqtfvVYzkHBil9vp8GLj1cH7CC0apqk75Oc2uis+LHNyA2UxoKWFhEnqaIDvtuT75dvZiG4kOpYQab+xVJAXY9i/88axtlFekm2xZypn8i4RrZJPsqcGBrbvSv2s/uc0GQlFvoq40yO2Zfnpeu8Rt/vh2qdDtC7YVvEw40J1QJQg8xLQyuynhnJtS93Luik/jKbaKog8rxaffU 7762gnRa SZRb+NCVBfaazQDsX2DwAc3rUCh1KKswC0Y/ASD5ZUq/dF63sSKG6wSYLmTuEMwjBkcvWKtc1eRpGubR1z/+jLARRtkf15CsThtZKWWd+U9XU8pZXmt2nwnSYivjGa9Z+JQhHNIXuetF1mM1Fexq85TYqmQUdXJbwzlaNtYy+XglN3ZsTNxHY00nn9Q+3e9TF+mhr2SoMixdsLW1wHrRIGRVuxGvFRt1L+5zmxBimi4DAuXI1hmmvqvbMJUAuRWgcqA+J+Hk9tx45kWHTTeIvtjzkVyHoJM7Huam4uGDOJiLwhxWJwcpkRLYivzA/KSWYIA7A 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 1d4ef4f7cca7e..241c11f86cd73 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. Note that tmpfs quotas do not support user namespaces so no uid/gid translation is done if quotas are enable 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 dd9faf2c5c875..2832ace81515f 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,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; @@ -3819,6 +3872,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 +4053,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..3cc53f2c35e2c 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);