From patchwork Thu Oct 17 21:14:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Almeida?= X-Patchwork-Id: 13840845 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 C4EB0D3C533 for ; Thu, 17 Oct 2024 21:15:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 565C16B0096; Thu, 17 Oct 2024 17:15:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 515CC6B0098; Thu, 17 Oct 2024 17:15:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 407736B0099; Thu, 17 Oct 2024 17:15:33 -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 232EC6B0096 for ; Thu, 17 Oct 2024 17:15:33 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8C7A012020D for ; Thu, 17 Oct 2024 21:15:22 +0000 (UTC) X-FDA: 82684350084.19.4F2B7AE Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf07.hostedemail.com (Postfix) with ESMTP id BE3A04000F for ; Thu, 17 Oct 2024 21:15:16 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=BfrFPtrw; spf=pass (imf07.hostedemail.com: domain of andrealmeid@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=andrealmeid@igalia.com; dmarc=pass (policy=none) header.from=igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729199585; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=M158mrqvZp15Xip+FLGziOKd3tlqyv88nTB1oO59vBU=; b=VfeirAcwjXWMvTA3fj++wfVrHVUlhc9yKzyRwCmclqzkvQ9LqudBnaDfOqULZlivJ8gcQo HQ270UfiJcDs3Y/6gGomOSycXzg6OWXqi3yA5F11rj72ps39X14W5NIpLCL4EZwV+gvBlC n+9GiYcjNvDfX/yyQo6gWTP39uphrWo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729199585; a=rsa-sha256; cv=none; b=k7U/VE7jCNoVt3xTaFa1EbQBA04SwUXK0i/p9nesqPI01wV4Myi4bKMANsZ5PAWfpBqpcS rjvnjWp9NI6zMwvwwgmUCQ+uvaL55UtPTQdVhGUBq7YDeoMMCiDjFT2UIIcwrPEH9P84Zf fkZwjlAfsn6PZ4+TgfGY7mOPSSjBs3o= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=BfrFPtrw; spf=pass (imf07.hostedemail.com: domain of andrealmeid@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=andrealmeid@igalia.com; dmarc=pass (policy=none) header.from=igalia.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=M158mrqvZp15Xip+FLGziOKd3tlqyv88nTB1oO59vBU=; b=BfrFPtrwxjB770vB6zSbk1PvnG CDFXS29qrDRxS9xlGnJvlhvrot8qlyg0iP/aue7DHub8FiNDvpgcimp4hLK5791W5ZZmRGspsaVzD uyNH6MhLBgoIKsQiBmkYmZQe+mmAl9n/Mrum2C5eJ/FlGIi+NrNRKS7uBamTnBz+i5OHv1o9Fmdhj JqOOSTHth4/Ct2U+y9lelQ1wQ8iTrtJTZ2zZk4xjSKwKiz71G5+pzvWJqc/bzWcnjw9lW9rqVrBlA WNjxYIYAloE140Ctu62PmHHFy7m9JoS3JEsGYEO+QAaTN8E5xFpdZQPzvo1bTd34BDg3a3i5SwaVS 0pUwz23w==; Received: from [179.118.186.49] (helo=[192.168.15.100]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1t1Xpw-00Bnlc-Vh; Thu, 17 Oct 2024 23:15:13 +0200 From: =?utf-8?q?Andr=C3=A9_Almeida?= Date: Thu, 17 Oct 2024 18:14:17 -0300 Subject: [PATCH v7 7/9] tmpfs: Add flag FS_CASEFOLD_FL support for tmpfs dirs MIME-Version: 1.0 Message-Id: <20241017-tonyk-tmpfs-v7-7-a9c056f8391f@igalia.com> References: <20241017-tonyk-tmpfs-v7-0-a9c056f8391f@igalia.com> In-Reply-To: <20241017-tonyk-tmpfs-v7-0-a9c056f8391f@igalia.com> To: Gabriel Krisman Bertazi , Alexander Viro , Christian Brauner , Jan Kara , Theodore Ts'o , Andreas Dilger , Hugh Dickins , Andrew Morton , Jonathan Corbet , smcv@collabora.com Cc: kernel-dev@igalia.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Almeid?= =?utf-8?q?a?= , Gabriel Krisman Bertazi X-Mailer: b4 0.14.2 X-Stat-Signature: d1m58k1xq7ufg77krppt48cx5fn45aty X-Rspamd-Queue-Id: BE3A04000F X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1729199716-207370 X-HE-Meta: U2FsdGVkX18MQ1bou0Bvukww+rNcuxOgBgsPCsGgV+YGeDYrPniZAwPQRrggTzO8oLO77ovtrJya2fpafG1RBrNa0xY7xnoQn/VqZFNNN1+6yg0HDVPM8ojCNJCvST7oruk1STByfcePeVrVzneVirNg0X/YpqrE/y1DH+XXuExsoWhEmDGLVwOjGgiRe85ls2zpF0GMKTCVruPuIBG8Y40vC5lY7CgNcbzZgesOb+L/Zq6yrqpZI7FE6lLMOIW7aNXybWGfxxHYHMW/WvHQ9ZGm6dK8A08kgXbV+sTSw8q7uGQt+4YCixoI9BC6uFh/1rAeJWrdRCISdvHfHoOsAzpXandiqA7bqzgPRB+5WvrmkRkae1juAZc+XU0sp2/MTb9zMQsAgm+jhepQnDaUWmEuQp14PSR8qh6Q6Cqmqu76PyStXmi2ZUyTtQaGZ+bQQxT1OMCu2i1Is251vHnFUbWNUlIMd3H7YCJKpZKO7FD2SiJfFyn9jn3XMziLYkcg4uszpSu6IjTIs9GNRfLghZrO57PhMfBdK2+Q94qZGQ0MMblhJOzxOAKKP7v1QfPFfixQ0/yBGK9DaDgsdUi9+XhIeiGBw8odv2o2b98Qfy5D73VmlNL6ptKRyJehXSjwxwY7PM586+X/LmOE9U1loV1tQGiz7O+9A+MKG157yLxp3T3yafK0alk8B1u8usCajkm5oVFCaVeRJthzHdWQcVoF+IUiaiKj19IOwcA+TqOc0UKt4kvhnt1c/SPsTesyr5vGpt+l4Pg/TeDz2DNZVUo2sg6JhZ+KTDYbE8U/oXOJOY23Ah7h2Gd7hBFepQgYUb/MNiQjg1K4tWaKIFv3BdOOIEGHAbpFgnBY9v4QeN1ILOMkSNYBsxribHxMGYuakwFH1SpdiLDe2ro8AcalQgvAQMTD7sbL0IAGdGVxRb8yB2Wz3YSEJ0XSBB6a6Tn1If4yBcreBkYB+2wjwMQ /g3sTyjl ANQB3Q2DVA2HZzYTSu/jiFAhij6P10iO/x4CJgJq1+qMdVzkHXSgTdppZb+B0N/Nw1b8d+4rJQ+CL2/c7J8uMzvGZlTBZF9CPCxiE3nYHP1FdPvMz55UI+0w1glf+6XZ95EdYOW6eRoJ0TyvFG+IJaks6JvZo8V6ltSZvGEzggBmftk9iBb+7POR09qBcNZsCYlW04hcsKtpmfLZARoWZ6W1YsYVcFuxd2XLqcqECBfnUIP8nfFlcmEEdFhVJ8B498WSRVNZbRh4nbxLuLlZ97CWPLqgHtpA37sRYU44XQG+fXz1fC5plgOQd/uhzL4vkmW46VbzYdk4ejX9+zu1DUvX3l/D8tccNp95vcVeHXedp71Eifzfk4hU0Ex4xVO6yTIUE9+kDytQjTMXm4aDuXFPpbjySvHphVjPOhkIZJbMFkNVUqiWJpx8mh/uqOUxHgyWPdkbUsielXfE= 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: List-Subscribe: List-Unsubscribe: Enable setting flag FS_CASEFOLD_FL for tmpfs directories, when tmpfs is mounted with casefold support. A special check is need for this flag, since it can't be set for non-empty directories. Signed-off-by: André Almeida Reviewed-by: Gabriel Krisman Bertazi --- Changes from v2: - Fixed bug when adding a non-casefold flag in a non-empty dir --- include/linux/shmem_fs.h | 6 ++--- mm/shmem.c | 70 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 515a9a6a3c6f82c55952d821887514217a6a00d1..018da28c01e7d71b8fb00bfb23c000248c8a83f4 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -42,10 +42,10 @@ struct shmem_inode_info { struct inode vfs_inode; }; -#define SHMEM_FL_USER_VISIBLE FS_FL_USER_VISIBLE +#define SHMEM_FL_USER_VISIBLE (FS_FL_USER_VISIBLE | FS_CASEFOLD_FL) #define SHMEM_FL_USER_MODIFIABLE \ - (FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL) -#define SHMEM_FL_INHERITED (FS_NODUMP_FL | FS_NOATIME_FL) + (FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL) +#define SHMEM_FL_INHERITED (FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL) struct shmem_quota_limits { qsize_t usrquota_bhardlimit; /* Default user quota block hard limit */ diff --git a/mm/shmem.c b/mm/shmem.c index ea4eff41eef35c9c253092f39402db142baa741b..8d206e492e7d51dad4bfe1b36426e0064b612dad 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2760,13 +2760,62 @@ static int shmem_file_open(struct inode *inode, struct file *file) #ifdef CONFIG_TMPFS_XATTR static int shmem_initxattrs(struct inode *, const struct xattr *, void *); +#if IS_ENABLED(CONFIG_UNICODE) +/* + * shmem_inode_casefold_flags - Deal with casefold file attribute flag + * + * The casefold file attribute needs some special checks. I can just be added to + * an empty dir, and can't be removed from a non-empty dir. + */ +static int shmem_inode_casefold_flags(struct inode *inode, unsigned int fsflags, + struct dentry *dentry, unsigned int *i_flags) +{ + unsigned int old = inode->i_flags; + struct super_block *sb = inode->i_sb; + + if (fsflags & FS_CASEFOLD_FL) { + if (!(old & S_CASEFOLD)) { + if (!sb->s_encoding) + return -EOPNOTSUPP; + + if (!S_ISDIR(inode->i_mode)) + return -ENOTDIR; + + if (dentry && !simple_empty(dentry)) + return -ENOTEMPTY; + } + + *i_flags = *i_flags | S_CASEFOLD; + } else if (old & S_CASEFOLD) { + if (dentry && !simple_empty(dentry)) + return -ENOTEMPTY; + } + + return 0; +} +#else +static int shmem_inode_casefold_flags(struct inode *inode, unsigned int fsflags, + struct dentry *dentry, unsigned int *i_flags) +{ + if (fsflags & FS_CASEFOLD_FL) + return -EOPNOTSUPP; + + return 0; +} +#endif + /* * chattr's fsflags are unrelated to extended attributes, * but tmpfs has chosen to enable them under the same config option. */ -static void shmem_set_inode_flags(struct inode *inode, unsigned int fsflags) +static int shmem_set_inode_flags(struct inode *inode, unsigned int fsflags, struct dentry *dentry) { unsigned int i_flags = 0; + int ret; + + ret = shmem_inode_casefold_flags(inode, fsflags, dentry, &i_flags); + if (ret) + return ret; if (fsflags & FS_NOATIME_FL) i_flags |= S_NOATIME; @@ -2777,10 +2826,12 @@ static void shmem_set_inode_flags(struct inode *inode, unsigned int fsflags) /* * But FS_NODUMP_FL does not require any action in i_flags. */ - inode_set_flags(inode, i_flags, S_NOATIME | S_APPEND | S_IMMUTABLE); + inode_set_flags(inode, i_flags, S_NOATIME | S_APPEND | S_IMMUTABLE | S_CASEFOLD); + + return 0; } #else -static void shmem_set_inode_flags(struct inode *inode, unsigned int fsflags) +static void shmem_set_inode_flags(struct inode *inode, unsigned int fsflags, struct dentry *dentry) { } #define shmem_initxattrs NULL @@ -2827,7 +2878,7 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, info->fsflags = (dir == NULL) ? 0 : SHMEM_I(dir)->fsflags & SHMEM_FL_INHERITED; if (info->fsflags) - shmem_set_inode_flags(inode, info->fsflags); + shmem_set_inode_flags(inode, info->fsflags, NULL); INIT_LIST_HEAD(&info->shrinklist); INIT_LIST_HEAD(&info->swaplist); simple_xattrs_init(&info->xattrs); @@ -3934,16 +3985,23 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap, { struct inode *inode = d_inode(dentry); struct shmem_inode_info *info = SHMEM_I(inode); + int ret, flags; if (fileattr_has_fsx(fa)) return -EOPNOTSUPP; if (fa->flags & ~SHMEM_FL_USER_MODIFIABLE) return -EOPNOTSUPP; - info->fsflags = (info->fsflags & ~SHMEM_FL_USER_MODIFIABLE) | + flags = (info->fsflags & ~SHMEM_FL_USER_MODIFIABLE) | (fa->flags & SHMEM_FL_USER_MODIFIABLE); - shmem_set_inode_flags(inode, info->fsflags); + ret = shmem_set_inode_flags(inode, flags, dentry); + + if (ret) + return ret; + + info->fsflags = flags; + inode_set_ctime_current(inode); inode_inc_iversion(inode); return 0;