From: Jeffrey Mitchell <jeffrey.mitchell@starlab.io>
To: Tyler Hicks <code@tyhicks.com>
Cc: ecryptfs@vger.kernel.org, linux-kernel@vger.kernel.org,
daniel.robertson@starlab.io
Subject: Re: [PATCH] ecryptfs: Fix inodes not being evicted until unmount
Date: Fri, 8 May 2020 09:32:58 -0500 [thread overview]
Message-ID: <20200508143257.GA7181@jeffrey-work> (raw)
In-Reply-To: <20200508143131.GA7116@jeffrey-work>
Steps to reproduce issue:
Mount nfs
Inside the nfs mount, create back and front directories for ecryptfs
Use ecryptfs to mount one directory onto the other
Create a few files inside the ecryptfs mount
Set ftrace to monitor ecryptfs_do_unlink() and ecryptfs_evict_inode()
Delete files
Unmount ecryptfs
ftrace output before patch:
# tracer: function_graph
#
# CPU DURATION FUNCTION CALLS
# | | | | | | |
1) | /* Tracing enabled */
1) | /* Writing to files */
1) | /* Unlinking first file */
0) * 27804.34 us | ecryptfs_do_unlink();
1) | /* rm'ing second file */
------------------------------------------
0) unlink-1384 => rm-1385
------------------------------------------
0) * 32828.63 us | ecryptfs_do_unlink();
1) | /* Unmounting eCryptFS */
------------------------------------------
1) trace-a-1365 => umount-1387
------------------------------------------
1) 2.408 us | ecryptfs_evict_inode();
1) 8.914 us | ecryptfs_evict_inode();
1) 3.344 us | ecryptfs_evict_inode();
ftrace output after patch:
# tracer: function_graph
#
# CPU DURATION FUNCTION CALLS
# | | | | | | |
0) | /* Tracing enabled */
0) | /* Writing to files */
0) | /* Unlinking first file */
1) * 24728.81 us | ecryptfs_do_unlink();
1) + 20.923 us | ecryptfs_evict_inode();
0) | /* rm'ing second file */
------------------------------------------
1) unlink-1333 => rm-1334
------------------------------------------
1) * 41093.71 us | ecryptfs_do_unlink();
1) + 11.384 us | ecryptfs_evict_inode();
0) | /* Unmounting eCryptFS */
------------------------------------------
0) trace-a-1314 => umount-1336
------------------------------------------
0) 2.986 us | ecryptfs_evict_inode();
On Fri, May 08, 2020 at 09:31:33AM -0500, Jeffrey Mitchell wrote:
> On asynchronous base filesystems like NFS, eCryptFS leaves inodes for
> deleted files in the cache until unmounting. Change call in
> ecryptfs_do_unlink() from set_nlink() to drop_nlink() in order to reliably
> evict inodes from the cache even on top of NFS.
>
> Signed-off-by: Dan Robertson <daniel.robertson@starlab.io>
> Signed-off-by: Jeffrey Mitchell <jeffrey.mitchell@starlab.io>
> ---
> fs/ecryptfs/inode.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
> index e23752d..f7594b6 100644
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@ -147,7 +147,7 @@ static int ecryptfs_do_unlink(struct inode *dir, struct dentry *dentry,
> goto out_unlock;
> }
> fsstack_copy_attr_times(dir, lower_dir_inode);
> - set_nlink(inode, ecryptfs_inode_to_lower(inode)->i_nlink);
> + drop_nlink(inode);
> inode->i_ctime = dir->i_ctime;
> out_unlock:
> dput(lower_dentry);
> --
> 2.7.4
>
next prev parent reply other threads:[~2020-05-08 14:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 14:31 [PATCH] ecryptfs: Fix inodes not being evicted until unmount Jeffrey Mitchell
2020-05-08 14:32 ` Jeffrey Mitchell [this message]
2020-12-18 19:07 Jeffrey Mitchell
2020-12-18 19:10 ` Jeffrey Mitchell
2021-01-30 17:06 ` Tyler Hicks
2021-02-02 15:22 ` Jeffrey Mitchell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200508143257.GA7181@jeffrey-work \
--to=jeffrey.mitchell@starlab.io \
--cc=code@tyhicks.com \
--cc=daniel.robertson@starlab.io \
--cc=ecryptfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).