From patchwork Wed Apr 26 10:20:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13224372 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 31E11C77B60 for ; Wed, 26 Apr 2023 10:20:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C08A26B00B7; Wed, 26 Apr 2023 06:20:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B6A4C6B00B8; Wed, 26 Apr 2023 06:20:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 995686B00B9; Wed, 26 Apr 2023 06:20:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8770D6B00B7 for ; Wed, 26 Apr 2023 06:20:21 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 20C1D120150 for ; Wed, 26 Apr 2023 10:20:21 +0000 (UTC) X-FDA: 80723147442.09.D1B55DE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 5DD93180010 for ; Wed, 26 Apr 2023 10:20:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="ckmSxZ/l"; spf=pass (imf06.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=1682504419; 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=fi266QtD7pncYx+Bdr5u2pfnyhH40cUtZh7HTIc1tVE=; b=ZyubY00Ocx0Zt0VSUIY5O4Le4+oTG9ZmVWYuE3fVQey6AaubkCm5BUZFQMNrq0LoCHA/xr Upo1bP/yqe9IxmzcUqdntwvZo0HhkDhSY2NgBQaX+H9snZjpUPOvAqIzzWQY+xTjGXNfuO 9VMpF+u1CWre2wgCjoHbV0h8xLVy3Os= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="ckmSxZ/l"; spf=pass (imf06.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=1682504419; a=rsa-sha256; cv=none; b=vs94H1rFsHGFn8ZToq9r9LQhdbtrChdMW30k0OXmhz5kYwsV8vqZmzSoK1jrYVxanyEP9t LUCFFUSnF/fCeSiOvK+J0XdiH/0tTs1fAtlPFAo1j/mIIbIiyt1kU4mYzvZoie2bxtiIsz HbcWFvypcVdm7K/346NG8t8JwNMoD/A= 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 8C22D62B5F; Wed, 26 Apr 2023 10:20:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDEAAC433D2; Wed, 26 Apr 2023 10:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682504418; bh=U5S+kRQj4gSwTfgUwNfPqcSXjoX9SHZQDONDtpUHvqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ckmSxZ/l3kSiFerT2gtrmVWp8/BpmnHwwxOGuPm6FjCYUFZ+BDgzlyLXwKEa1Zqdi Mxo6ZrgyMA04y55Ca/BFFkRVHmpoUH9zj+cupuoPEwjwlKXRV4044uAZSb1ngTsH49 VeWB7Nne27L/ISqPY6qLYaStE918bvHdB/eS+TUSJAY95S2Rz7pyZ8+Bq682G5V0dM 6TsqTRRznXmE6bJp6e6TpKziAfmysracSiVCEv1Q7o/XFi6mLSt5QNMjdy5SULRCSG FNmF9GZohi1WmbJDM58sknCjt9c4rZlzhb1hN9mKwljhQEE7q+aPx/e8YCP6Vej+/8 aizeKYgQSbxDQ== 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 2/6] shmem: make shmem_get_inode() return ERR_PTR instead of NULL Date: Wed, 26 Apr 2023 12:20:04 +0200 Message-Id: <20230426102008.2930932-3-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-Rspamd-Queue-Id: 5DD93180010 X-Stat-Signature: i33omho3wd3urazeahttfqdwyi3e47ix X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682504419-148993 X-HE-Meta: U2FsdGVkX1/2aH99lEFVMc0h5c8juDdSB+l5cs6rlo9Z6xxb34JgtH2NdbSxtVX8NyAXPKqvv5IA5DxPeFnD1/S5EtRTAAhlRhhnsTAjjZhdmOY0mGmj5JOqLgJhG8mxxEfe3NdaLh8FUHN8YfkC6DKNrkPx4jcfRiXe7HLWOxi1T1jw6LPXMtZi9Z8ybGviWoZYZjqTQPSbxrjLKUJD9htCcQH/vfy7f/jaDiQCa+8cENRKDlJGq5qT/23owzS8x9PYNjANKXX+vfSvAeeyDaszzjMZZR63R8S9xJvuJ4F5HE/5wxd0hkMRg0yDATzNPWj3rg4VfNSSJolgudenY++kPisqk1n14MJ4+h/c5+NFhTAG/mtPsOZvYs8NpNrEBx7dwzCgBJriqq7DdIWhw8jIKOUDMdY040SKoVQzcSbF2ws85scjA1SyYEMrSdCd9eGlpg2eprW2+W1y02/0EGSgO+C79Z3hOLc1BkM4/pudoIE/d9rci/lMIZOl14O0P2vJj5ccQFC7Ap9kZijr9Ww1uXweTDP8qJvD7qoDIy5eRZ6y7PCsNxyY3P/oqlG9YRpnI67aqs8ajIw91Z398N8GjO60D76rhnqQX+Czn5j7gAVOcSZNLQQ8fHy3K17E1Qij9dFoOCNBjrVqHENW/KMt1qJAtJtttRp9gMk44qbaz8Y2QQfexy+vD3x+hU514h0lNBxpCrfkH4/tS3TjNlVsdXOuwmAWEhBCQ1N1QFuQ6g9rRVImWv7iMM22UiL+68AQesZGdGg5NL5RoHJLdeHvLq3pHev667nZnreCj/jNBZqhw6qMxp/gi9/PjMpQa6/H3IouIM8ZGbQf3g1Aaj4Sc5TQAlNWMeihinraYrItZ5v4BvxJNfR9koVhqY4XFSrPO1iZkKGw5w9IyI0NfbiVzyClm2Tb53p3lEnUenihMd4fT2Toymm6W+r13fXGc6P4dPr78yetOiVAJ0Q 6rRZ1cer EzgmZcnslWcA3hrLkHOeFagktNi/w1I3Hl/wZzsRQ73/tpZaxHJYcRyQZWAUDufjrdGytQnLZnIfkDtIepOhmoDQPf8SAOHe+JwKZ0Irn8+mLWDfV4FYp7KPFSsjR3HQAmVsC8G/Tl9yOtuTVuiRJcccIc42oNWb4pg1TYD+QMcSdOqtZC1V+e+JJgnYrUwaf0ZZApqA2YmCUHYP6ix9Cvl5WzVOn7wqXbMJrt4fQB4FN5dV/yl4PZXRHy1Iy3vldQ33hIL+CMu0wKbfSzkasXA9PF9sYrHgU8p2Fg39iov+3Z0ccBGdyxXczpB0bZPFI8sqJBFtRg0wtDGXhoIbZfBC7wA== 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 Make shmem_get_inode() return ERR_PTR instead of NULL on error. This will be useful later when we introduce quota support. There should be no functional change. Signed-off-by: Lukas Czerner Signed-off-by: Carlos Maiolino Reviewed-by: Jan Kara --- mm/shmem.c | 206 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 90 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b1b3b826f6189..09a44f1b2c954 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2354,65 +2354,71 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block struct shmem_inode_info *info; struct shmem_sb_info *sbinfo = SHMEM_SB(sb); ino_t ino; + int err; + + err = shmem_reserve_inode(sb, &ino); + if (err) + return ERR_PTR(err); - if (shmem_reserve_inode(sb, &ino)) - return NULL; inode = new_inode(sb); - if (inode) { - inode->i_ino = ino; - inode_init_owner(idmap, inode, dir, mode); - inode->i_blocks = 0; - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); - inode->i_generation = get_random_u32(); - info = SHMEM_I(inode); - memset(info, 0, (char *)inode - (char *)info); - spin_lock_init(&info->lock); - atomic_set(&info->stop_eviction, 0); - info->seals = F_SEAL_SEAL; - info->flags = flags & VM_NORESERVE; - info->i_crtime = inode->i_mtime; - info->fsflags = (dir == NULL) ? 0 : - SHMEM_I(dir)->fsflags & SHMEM_FL_INHERITED; - if (info->fsflags) - shmem_set_inode_flags(inode, info->fsflags); - INIT_LIST_HEAD(&info->shrinklist); - INIT_LIST_HEAD(&info->swaplist); - simple_xattrs_init(&info->xattrs); - cache_no_acl(inode); - mapping_set_large_folios(inode->i_mapping); - - switch (mode & S_IFMT) { - default: - inode->i_op = &shmem_special_inode_operations; - init_special_inode(inode, mode, dev); - break; - case S_IFREG: - inode->i_mapping->a_ops = &shmem_aops; - inode->i_op = &shmem_inode_operations; - inode->i_fop = &shmem_file_operations; - mpol_shared_policy_init(&info->policy, - shmem_get_sbmpol(sbinfo)); - break; - case S_IFDIR: - inc_nlink(inode); - /* Some things misbehave if size == 0 on a directory */ - inode->i_size = 2 * BOGO_DIRENT_SIZE; - inode->i_op = &shmem_dir_inode_operations; - inode->i_fop = &simple_dir_operations; - break; - case S_IFLNK: - /* - * Must not load anything in the rbtree, - * mpol_free_shared_policy will not be called. - */ - mpol_shared_policy_init(&info->policy, NULL); - break; - } - lockdep_annotate_inode_mutex_key(inode); - } else + if (!inode) { shmem_free_inode(sb); + return ERR_PTR(-ENOSPC); + } + + inode->i_ino = ino; + inode_init_owner(idmap, inode, dir, mode); + inode->i_blocks = 0; + inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_generation = get_random_u32(); + info = SHMEM_I(inode); + memset(info, 0, (char *)inode - (char *)info); + spin_lock_init(&info->lock); + atomic_set(&info->stop_eviction, 0); + info->seals = F_SEAL_SEAL; + info->flags = flags & VM_NORESERVE; + info->i_crtime = inode->i_mtime; + info->fsflags = (dir == NULL) ? 0 : + SHMEM_I(dir)->fsflags & SHMEM_FL_INHERITED; + if (info->fsflags) + shmem_set_inode_flags(inode, info->fsflags); + INIT_LIST_HEAD(&info->shrinklist); + INIT_LIST_HEAD(&info->swaplist); + simple_xattrs_init(&info->xattrs); + cache_no_acl(inode); + mapping_set_large_folios(inode->i_mapping); + + switch (mode & S_IFMT) { + default: + inode->i_op = &shmem_special_inode_operations; + init_special_inode(inode, mode, dev); + break; + case S_IFREG: + inode->i_mapping->a_ops = &shmem_aops; + inode->i_op = &shmem_inode_operations; + inode->i_fop = &shmem_file_operations; + mpol_shared_policy_init(&info->policy, + shmem_get_sbmpol(sbinfo)); + break; + case S_IFDIR: + inc_nlink(inode); + /* Some things misbehave if size == 0 on a directory */ + inode->i_size = 2 * BOGO_DIRENT_SIZE; + inode->i_op = &shmem_dir_inode_operations; + inode->i_fop = &simple_dir_operations; + break; + case S_IFLNK: + /* + * Must not load anything in the rbtree, + * mpol_free_shared_policy will not be called. + */ + mpol_shared_policy_init(&info->policy, NULL); + break; + } + + lockdep_annotate_inode_mutex_key(inode); return inode; } @@ -2927,27 +2933,30 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { struct inode *inode; - int error = -ENOSPC; + int error; inode = shmem_get_inode(idmap, dir->i_sb, dir, mode, dev, VM_NORESERVE); - if (inode) { - error = simple_acl_create(dir, inode); - if (error) - goto out_iput; - error = security_inode_init_security(inode, dir, - &dentry->d_name, - shmem_initxattrs, NULL); - if (error && error != -EOPNOTSUPP) - goto out_iput; - error = 0; - dir->i_size += BOGO_DIRENT_SIZE; - dir->i_ctime = dir->i_mtime = current_time(dir); - inode_inc_iversion(dir); - d_instantiate(dentry, inode); - dget(dentry); /* Extra count - pin the dentry in core */ - } + if (IS_ERR(inode)) + return PTR_ERR(inode); + + error = simple_acl_create(dir, inode); + if (error) + goto out_iput; + error = security_inode_init_security(inode, dir, + &dentry->d_name, + shmem_initxattrs, NULL); + if (error && error != -EOPNOTSUPP) + goto out_iput; + + error = 0; + dir->i_size += BOGO_DIRENT_SIZE; + dir->i_ctime = dir->i_mtime = current_time(dir); + inode_inc_iversion(dir); + d_instantiate(dentry, inode); + dget(dentry); /* Extra count - pin the dentry in core */ return error; + out_iput: iput(inode); return error; @@ -2958,20 +2967,26 @@ shmem_tmpfile(struct mnt_idmap *idmap, struct inode *dir, struct file *file, umode_t mode) { struct inode *inode; - int error = -ENOSPC; + int error; inode = shmem_get_inode(idmap, dir->i_sb, dir, mode, 0, VM_NORESERVE); - if (inode) { - error = security_inode_init_security(inode, dir, - NULL, - shmem_initxattrs, NULL); - if (error && error != -EOPNOTSUPP) - goto out_iput; - error = simple_acl_create(dir, inode); - if (error) - goto out_iput; - d_tmpfile(file, inode); + + if (IS_ERR(inode)) { + error = PTR_ERR(inode); + goto err_out; } + + error = security_inode_init_security(inode, dir, + NULL, + shmem_initxattrs, NULL); + if (error && error != -EOPNOTSUPP) + goto out_iput; + error = simple_acl_create(dir, inode); + if (error) + goto out_iput; + d_tmpfile(file, inode); + +err_out: return finish_open_simple(file, error); out_iput: iput(inode); @@ -3146,8 +3161,9 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, inode = shmem_get_inode(idmap, dir->i_sb, dir, S_IFLNK | 0777, 0, VM_NORESERVE); - if (!inode) - return -ENOSPC; + + if (IS_ERR(inode)) + return PTR_ERR(inode); error = security_inode_init_security(inode, dir, &dentry->d_name, shmem_initxattrs, NULL); @@ -3762,12 +3778,13 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) struct shmem_options *ctx = fc->fs_private; struct inode *inode; struct shmem_sb_info *sbinfo; + int error = -ENOMEM; /* Round up to L1_CACHE_BYTES to resist false sharing */ sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL); if (!sbinfo) - return -ENOMEM; + return error; sb->s_fs_info = sbinfo; @@ -3829,8 +3846,10 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) inode = shmem_get_inode(&nop_mnt_idmap, sb, NULL, S_IFDIR | sbinfo->mode, 0, VM_NORESERVE); - if (!inode) + if (IS_ERR(inode)) { + error = PTR_ERR(inode); goto failed; + } inode->i_uid = sbinfo->uid; inode->i_gid = sbinfo->gid; sb->s_root = d_make_root(inode); @@ -3840,7 +3859,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) failed: shmem_put_super(sb); - return -ENOMEM; + return error; } static int shmem_get_tree(struct fs_context *fc) @@ -4209,10 +4228,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); #define shmem_vm_ops generic_file_vm_ops #define shmem_anon_vm_ops generic_file_vm_ops #define shmem_file_operations ramfs_file_operations -#define shmem_get_inode(idmap, sb, dir, mode, dev, flags) ramfs_get_inode(sb, dir, mode, dev) #define shmem_acct_size(flags, size) 0 #define shmem_unacct_size(flags, size) do {} while (0) +static inline struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block *sb, struct inode *dir, + umode_t mode, dev_t dev, unsigned long flags) +{ + struct inode *inode = ramfs_get_inode(sb, dir, mode, dev); + return inode ? inode : ERR_PTR(-ENOSPC); +} + #endif /* CONFIG_SHMEM */ /* common code */ @@ -4237,9 +4262,10 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l inode = shmem_get_inode(&nop_mnt_idmap, mnt->mnt_sb, NULL, S_IFREG | S_IRWXUGO, 0, flags); - if (unlikely(!inode)) { + + if (IS_ERR(inode)) { shmem_unacct_size(flags, size); - return ERR_PTR(-ENOSPC); + return ERR_CAST(inode); } inode->i_flags |= i_flags; inode->i_size = size;