From patchwork Thu Apr 20 08:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13218087 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 90C44C7EE21 for ; Thu, 20 Apr 2023 08:04:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20317280002; Thu, 20 Apr 2023 04:04:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B2B9280001; Thu, 20 Apr 2023 04:04:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E82A7280002; Thu, 20 Apr 2023 04:04:11 -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 DB561280001 for ; Thu, 20 Apr 2023 04:04:11 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B1BA3ABE60 for ; Thu, 20 Apr 2023 08:04:11 +0000 (UTC) X-FDA: 80701031502.14.868D33F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id D5B9EA001B for ; Thu, 20 Apr 2023 08:04:09 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Mdwpddx6; spf=pass (imf25.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=1681977850; 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=AjpifMXVrTe0UJjE9dYjTSsTVNLs1S21Yj4eNVJSAVA=; b=HymzHJ5AFKNi/xfy7Sg+p3MKsE8pUAAViKOTFthmnjQakmCq32fHLgGYEl8M5Zv1OJKUyw dfX8OjQMTMLN5y3m7Mf4qP/VPbZbGhGs5HRPr4PXFdt1y+EEyC5pRg4EOeVO3g5Z7H7zKh EuOwK8udqWciHhtCR/o67xMVGCrGwx4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Mdwpddx6; spf=pass (imf25.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=1681977850; a=rsa-sha256; cv=none; b=1slqt9Z55EJueq5T7KG+wwdyg1gbt2xmRF61U+c+1+KA9q33UmZifVN7XRUPxgPEowS3l+ 733SPD6+yeDsERbn6La/qK3NVY5O+rEn7GceJqAk70/kxsbkp8Xyxxujyv+EbKCj/JSCON OR5wyYaQSHs1xXj6IZJ+34/g/F9sFpc= 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 02A1F645CB; Thu, 20 Apr 2023 08:04:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C264C433A4; Thu, 20 Apr 2023 08:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681977848; bh=9rk3qzi0LCLvNlotHj311TU2VhsyZ4IZ0t7XLl4Pciw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mdwpddx6Sa0KMlLeUc+DKrn45oW7U6l7VoKU6Z16FUL9TmeMbJhwK8aCgGqd8f7SR qtlt/fO/ZP0u4GG02IIWrRhZmnh96+14qgPhA1+6kEnfMFz+QCb3uRorHLC+ve/Iq7 s06X/nxRPwwzVEPurhdigulbEpQ31Ikz5muxCyXKEo3CFWQh+Th0yiMswYkDHj2A8f e2QNfotAxLZIyDBT6HBTZK8NHBiPgp/SFtFZc9FXd5qJDSsYEj8/DZwkxSf1R9ZLDn hWgaciGCgJHfcORviAD87emyocxXWC0IJTHIf/axCr67AN6/TCc5B8OlHMVYhpo7zw EK44hbFcHEyYQ== 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 V2 2/6] shmem: make shmem_get_inode() return ERR_PTR instead of NULL Date: Thu, 20 Apr 2023 10:03:55 +0200 Message-Id: <20230420080359.2551150-3-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: rspam05 X-Rspamd-Queue-Id: D5B9EA001B X-Stat-Signature: aazo685n775k64pjhocnga6wooyqfzgq X-Rspam-User: X-HE-Tag: 1681977849-456 X-HE-Meta: U2FsdGVkX19e0XbqR/I047Qf2cV0yXAwow64q1UCvNLSgvIJuYXTWX8j/tPwvSoAWZd6dAcXR9u2Q8viXZ4fiA9g1WDbz6ITtuwmf4ids8OhnjJgMvF83JFh7fMrCKkAq09FAZE5CBtYxW2knQjgB3+HJ5v8iPYazsIpP5vAUf0wVTnmIyFbH39QYTl0dBeezLLI4TJ9wYHouejhfi8l57dCf3suguksmM1T+jQSy4oINlu7ne7KLHlDYxvyd/MmE9O0Sn9f4R7l1gZV5YPXOncVSZc85nU0eeuChqbkZaWgVhrzLoaYBDptplGqfN5Tpxefiit6b/pQZlDGHFkX2kKzSXv233j7y8WifHbUEES2YUFdgqTWb3vcpksgZEhhKP7QhFr47Bf01S0f+sR01GB47C2fKpo9zq//tudyXoMiSdETKLymGX+nSz1khQFfKQUUEMjLw6AnDSiXp89h1vkeHGvnygmVSbeD58Aaed4mpy46asPYx0sdovigQbOyZyADPHM5iG+Uf8g2OVTiNpYI9ItwdCwqgSSyM2L7Xm1QWjOJzDL9JRm1U3pIu5STjJ+dpv18tHnRmVTcsDcc5BJcTqzP++9M0jyajRsZyPw8kDVnGzyIzW4wvNK95z44D99au3EiXAFYGJqNjO0U2N5+wCVTMLSuZ+WZPSaxM5QCmNQNFlCVc+VD5hYhLpF0LPlCarlJdYYfasHwDShpWwQIWQRRc/IO9fe6uCJF9BKA/224D/yGYz9KXUKfMLaoAvxFXkIbZuVMizqYTzc7h7t3j6jZIQPohryX86pCiquj8lHd43R10LwSiZ4xOeETd7omT7Yashj504z8z/Za7I/J0reVQixStj+K/zmSBPkxzOJd9wzNVU/LV632mDwaTbgs+lOPIEANA2ZmYq1vMvfHya8bgoi165wwdllIoGJ5kqKuYLxkY520DoOfNTWQlS1pU/mVK31ofkWFRAt lheWcHnj FfDvFjFm44RXhdWoeRwv+LqqygKza4Ljaqg/DK1YK2rY+3nn1EqRu4/JSVUhkP6uDfgoTWevarU7vQMmVu0WLRp2LlAURn+NBbyRQbnUdipFTCXUyj8jSDa5ux1/QrMtfK8r7oDv9f9DvcGtqxjwiAUYsC6pRf95X2sYaUOEGLBlTZt7DGLMiYZVtqI9L53xAeQ3W2Zsc2vVy+xglswYP+9526AhmcbEbe9LFkOoJQuCIP8I4oE4wyBwHsTYFXPmgUvL32Nyfixc8uSlWfyQq1VM8pFaTUxl4zQ7DwO37ZBKw6H1Oaefug1pAQBf0/4B6N34jNddoJQ38iMXdAvpSkFUwoa43yAknMWjiPrCwVMhk8Ivp+Tk630x45gK5yu7jpXKh 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 --- V2: - Fix error handling logic in shmem_tmpfile() - Add missing idmap argument to the ramfs version of shmem_get_inode(), reported by Intel's kernel test robot mm/shmem.c | 206 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 90 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b1b3b826f6189..afa1985230166 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, 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;