From patchwork Fri Jun 30 17:49:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13298587 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 007F3EB64D7 for ; Fri, 30 Jun 2023 17:49:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DC7F8E0041; Fri, 30 Jun 2023 13:49:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68C7D8E000F; Fri, 30 Jun 2023 13:49:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 506D68E0041; Fri, 30 Jun 2023 13:49:08 -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 3FD928E000F for ; Fri, 30 Jun 2023 13:49:08 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 005661C9048 for ; Fri, 30 Jun 2023 17:49:07 +0000 (UTC) X-FDA: 80960150376.06.62CDDAB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 2C45C40014 for ; Fri, 30 Jun 2023 17:49:05 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hYgyYYf6; spf=pass (imf11.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@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=1688147346; 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=8IeAq52f9TV+g7uDOeNt3cbWsk9ZjZk4oCc795bpX+U=; b=mNkBLhcPsguDa6Y99MYDdElPSd5tYXxVAICofhPiqz9KrUJPr9wtfIb//+CN2OwhHjNEMa 2SDeQKYC9OsqyPBAS+u73t4Fb4D0nGJXp8wQgkoAARNCJ5FQ5WMvimjeaO0AC38E5MdsJ0 1wRGv5luNvfXo+wQCHIJRk0LcNPmW7k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688147346; a=rsa-sha256; cv=none; b=vGnqPzdn397ortjtHbHyRzPeLM+rrmGTE3uo/gMVDCEK6UoyLQT1OT6UYg3jL/X93MOdfn h2H00B9awj4ULrdAfdU/2FcskfOGXUlRD+jMYk8QqtuYZiP5e2XnXhZjSGf+7l2LQzyFVa C30eyJw4urjo/8UYuVOYY5YsKnAMz60= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hYgyYYf6; spf=pass (imf11.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6325D617CB; Fri, 30 Jun 2023 17:49:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44BDEC433C8; Fri, 30 Jun 2023 17:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688147344; bh=eMmAzlgHAQ2+4ZGKGU1pc9Tr35pqzaCjMCrCctyKSSo=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=hYgyYYf6B1eksZgJh0DQQQrxHks6Q1H8QvgOjqAkEvdnpAHnQj4ZrtC5sFJdaCKJn 97/SiDzW3EdLclNQeNLaD1DXlkGX3ZFtvi6IOctIG0Ge5upz3xHF0w961+RWbge8QP BIMTaBJLlG/Q7K+slz/DZgH8HSHIeCe7lNP24FrD0FClvBPn2bPDFAEC3AkUZb4ZG8 GqkxWG+pDTs3+oyiBj4TOdjErAgmQVmRrn4DHPGRxqKk/fGTIkPoJhv1/asy8FQdHT cE/BTmC3Sw/cOeJDqxN+H9Dng4Cu0rJbieP4YZ8yNBkL3X0+Awfl75WdbHzSSu7puh xFHmZry7/MS6A== Subject: [PATCH v7 3/3] shmem: stable directory offsets From: Chuck Lever To: viro@zeniv.linux.org.uk, brauner@kernel.org, hughd@google.com, akpm@linux-foundation.org Cc: Chuck Lever , jlayton@redhat.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Date: Fri, 30 Jun 2023 13:49:03 -0400 Message-ID: <168814734331.530310.3911190551060453102.stgit@manet.1015granger.net> In-Reply-To: <168814723481.530310.17776748558242063239.stgit@manet.1015granger.net> References: <168814723481.530310.17776748558242063239.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Rspamd-Queue-Id: 2C45C40014 X-Rspam-User: X-Stat-Signature: 5tcyifpm1m41nxkazt997tq5yew783qj X-Rspamd-Server: rspam03 X-HE-Tag: 1688147345-493982 X-HE-Meta: U2FsdGVkX1+QFBZZQtchUmgP2vPsd7p1yId9cCHkHWrjOX3LQEz6mZGbBTux8qmmukHGrRNldBHNh1fdzVNUCgEEO+mrkswvePy3I6nsIECD39MqxVixcjp22nUVQ07TIK4DiQ5gVHKog+h2oz+sGlKPte6vZznDsthOlndADTbbgSQVqN1I8V1Sju+H+ACITrm4L1qKO+wyh5VPE7syCSx4/NTmlPs4HSlei68R/ZWleRbaHB7n1eiAwgsJo2bsqzpR0Ht7XIbdgg5xcinVApXz0NGx56UX73M87maL3wE8aScpxAd/iZPfLPzoaPHjpdNPBIvl9Na0qgadF4dMcn0UuQbwt4d5gm8bi86CCCraYPpOCPhlKVAwq14PoxvoijMka3Cy+UQqu80J7+EgWrbPDqI1oXzYPUnIc0buB7P1xT9gTnri1f5MuCMaeWKQjmlv7CXZiH0YMPF7ZNsuuoyJzEt5g/5CEXIitsDdXCDvZxB8FSUGpG5x4klomk2vTkEzAACyonTQ7SZa6+cIIcpGTjlmpZG2J5lkAcuvPF+RdttGbdBJ+ZMU4D51Dkys0yhGyO2gGwTrZ9PjzY2nsSNqeJ08iHYxGsxBGOcqQ9uDXCdmvo6Okv6pp21U/aJ1A1R/2cnAO/WU6aRWfrHtnXBeZV6rOI02m9VC0izaet3N+bN37I7ZlIYZ84k1KCpCKLFrtJMB0tbM134ToSpD2PHannzlzVbdUgFj9zeqqNsYyG9QEi6Lx/uIG0UiFsAErvjZbZ/dxFj5xZamzMhwE62zhwOpN6ttenkHrJrtfnFvv4Jl+go0XLIEDG+PH88mgSkCQpOZoBs7DEY5v5AV6xJXwSsiYbFVQMFni3dF33L2e2KKuAG5NNUjgcVRwY+f1l81ZXNSZ8rlmAzKOafKWH+uh7aHPU6QD+M7zgESX7dFmbWXYZtrRMClMAKlqKchk4Z8PYqZHh8oWNtrm1X iYGGWNwz KOAquoQBPzhAbtGTOA+anrrM4SWgdeY3Z/aGzU2EE23H+6+ZrcQWmZ1kUAHWeCoqQxyO4BZb/k4TbPXXdbFFR0EbVXwbv83bO0MD2/mFh7owlaHO5Aozc3GZNavIe+um5iKTaM7FGni+F50ZaCdkR8i0jNgh6yfYAStsxwX37RA5GyH0bhglqhCbyD7fF8HV9Ju+/XGGflW9K8ABqF/02x9SuHofcXmfwmJ/qs4lGNvFarFaEGrRQO7/X8pGURUj4QAkVfjdXfVbsZGYed4YOSyXt0g== 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: Chuck Lever The current cursor-based directory offset mechanism doesn't work when a tmpfs filesystem is exported via NFS. This is because NFS clients do not open directories. Each server-side READDIR operation has to open the directory, read it, then close it. The cursor state for that directory, being associated strictly with the opened struct file, is thus discarded after each NFS READDIR operation. Directory offsets are cached not only by NFS clients, but also by user space libraries on those clients. Essentially there is no way to invalidate those caches when directory offsets have changed on an NFS server after the offset-to-dentry mapping changes. Thus the whole application stack depends on unchanging directory offsets. The solution we've come up with is to make the directory offset for each file in a tmpfs filesystem stable for the life of the directory entry it represents. shmem_readdir() and shmem_dir_llseek() now use an xarray to map each directory offset (an loff_t integer) to the memory address of a struct dentry. Signed-off-by: Chuck Lever --- include/linux/shmem_fs.h | 1 + mm/shmem.c | 47 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 9029abd29b1c..a5454a80ab30 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -27,6 +27,7 @@ struct shmem_inode_info { atomic_t stop_eviction; /* hold when working on inode */ struct timespec64 i_crtime; /* file creation time */ unsigned int fsflags; /* flags for FS_IOC_[SG]ETFLAGS */ + struct offset_ctx dir_offsets; /* stable entry offsets */ struct inode vfs_inode; }; diff --git a/mm/shmem.c b/mm/shmem.c index ba3d7db90c9d..c9e6c1dd4fe8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2355,6 +2355,11 @@ static void shmem_set_inode_flags(struct inode *inode, unsigned int fsflags) #define shmem_initxattrs NULL #endif +static struct offset_ctx *shmem_get_offset_ctx(struct inode *inode) +{ + return &SHMEM_I(inode)->dir_offsets; +} + static 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) @@ -2410,7 +2415,8 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block /* 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; + inode->i_fop = &simple_offset_dir_operations; + simple_offset_init(shmem_get_offset_ctx(inode)); break; case S_IFLNK: /* @@ -3082,7 +3088,10 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, if (error && error != -EOPNOTSUPP) goto out_iput; - error = 0; + error = simple_offset_add(shmem_get_offset_ctx(dir), dentry); + if (error) + goto out_iput; + dir->i_size += BOGO_DIRENT_SIZE; dir->i_ctime = dir->i_mtime = current_time(dir); inode_inc_iversion(dir); @@ -3159,6 +3168,13 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr goto out; } + ret = simple_offset_add(shmem_get_offset_ctx(dir), dentry); + if (ret) { + if (inode->i_nlink) + shmem_free_inode(inode->i_sb); + goto out; + } + dir->i_size += BOGO_DIRENT_SIZE; inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); inode_inc_iversion(dir); @@ -3177,6 +3193,8 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) if (inode->i_nlink > 1 && !S_ISDIR(inode->i_mode)) shmem_free_inode(inode->i_sb); + simple_offset_remove(shmem_get_offset_ctx(dir), dentry); + dir->i_size -= BOGO_DIRENT_SIZE; inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); inode_inc_iversion(dir); @@ -3235,24 +3253,29 @@ static int shmem_rename2(struct mnt_idmap *idmap, { struct inode *inode = d_inode(old_dentry); int they_are_dirs = S_ISDIR(inode->i_mode); + int error; if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) return -EINVAL; if (flags & RENAME_EXCHANGE) - return simple_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); + return simple_offset_rename_exchange(old_dir, old_dentry, + new_dir, new_dentry); if (!simple_empty(new_dentry)) return -ENOTEMPTY; if (flags & RENAME_WHITEOUT) { - int error; - error = shmem_whiteout(idmap, old_dir, old_dentry); if (error) return error; } + simple_offset_remove(shmem_get_offset_ctx(old_dir), old_dentry); + error = simple_offset_add(shmem_get_offset_ctx(new_dir), old_dentry); + if (error) + return error; + if (d_really_is_positive(new_dentry)) { (void) shmem_unlink(new_dir, new_dentry); if (they_are_dirs) { @@ -3296,19 +3319,23 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, if (error && error != -EOPNOTSUPP) goto out_iput; + error = simple_offset_add(shmem_get_offset_ctx(dir), dentry); + if (error) + goto out_iput; + inode->i_size = len-1; if (len <= SHORT_SYMLINK_LEN) { inode->i_link = kmemdup(symname, len, GFP_KERNEL); if (!inode->i_link) { error = -ENOMEM; - goto out_iput; + goto out_remove_offset; } inode->i_op = &shmem_short_symlink_operations; } else { inode_nohighmem(inode); error = shmem_get_folio(inode, 0, &folio, SGP_WRITE); if (error) - goto out_iput; + goto out_remove_offset; inode->i_mapping->a_ops = &shmem_aops; inode->i_op = &shmem_symlink_inode_operations; memcpy(folio_address(folio), symname, len); @@ -3323,6 +3350,9 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, d_instantiate(dentry, inode); dget(dentry); return 0; + +out_remove_offset: + simple_offset_remove(shmem_get_offset_ctx(dir), dentry); out_iput: iput(inode); return error; @@ -4055,6 +4085,8 @@ static void shmem_destroy_inode(struct inode *inode) { if (S_ISREG(inode->i_mode)) mpol_free_shared_policy(&SHMEM_I(inode)->policy); + if (S_ISDIR(inode->i_mode)) + simple_offset_destroy(shmem_get_offset_ctx(inode)); } static void shmem_init_inode(void *foo) @@ -4135,6 +4167,7 @@ static const struct inode_operations shmem_dir_inode_operations = { .mknod = shmem_mknod, .rename = shmem_rename2, .tmpfile = shmem_tmpfile, + .get_offset_ctx = shmem_get_offset_ctx, #endif #ifdef CONFIG_TMPFS_XATTR .listxattr = shmem_listxattr,