linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gabriel Krisman Bertazi <krisman@suse.de>
To: ebiggers@kernel.org, viro@zeniv.linux.org.uk, jaegeuk@kernel.org,
	tytso@mit.edu
Cc: amir73il@gmail.com, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-fsdevel@vger.kernel.org,
	Gabriel Krisman Bertazi <krisman@suse.de>
Subject: [PATCH v5 06/12] fscrypt: Ignore plaintext dentries during d_move
Date: Mon, 29 Jan 2024 17:43:24 -0300	[thread overview]
Message-ID: <20240129204330.32346-7-krisman@suse.de> (raw)
In-Reply-To: <20240129204330.32346-1-krisman@suse.de>

Now that we do more than just clear the DCACHE_NOKEY_NAME in
fscrypt_handle_d_move, skip it entirely for plaintext dentries, to avoid
extra costs.

Note that VFS will call this function for any dentry, whether the volume
has fscrypt on not.  But, since we only care about DCACHE_NOKEY_NAME, we
can check for that, to avoid touching the superblock for other fields
that identify a fscrypt volume.

Note also that fscrypt_handle_d_move is hopefully inlined back into
__d_move, so the call cost is not significant.  Considering that
DCACHE_NOKEY_NAME is a fscrypt-specific flag, we do the check in fscrypt
code instead of the caller.

Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>

---
Changes since v4:
  - Check based on the dentry itself (eric)
---
 include/linux/fscrypt.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index c1e285053b3e..ab668760d63e 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -232,6 +232,15 @@ static inline bool fscrypt_needs_contents_encryption(const struct inode *inode)
  */
 static inline void fscrypt_handle_d_move(struct dentry *dentry)
 {
+	/*
+	 * VFS calls fscrypt_handle_d_move even for non-fscrypt
+	 * filesystems.  Since we only care about DCACHE_NOKEY_NAME
+	 * dentries here, check that to bail out quickly, if possible.
+	 */
+	if (!(dentry->d_flags & DCACHE_NOKEY_NAME))
+		return;
+
+	 /* Mark the dentry as a plaintext dentry. */
 	dentry->d_flags &= ~DCACHE_NOKEY_NAME;
 
 	/*
-- 
2.43.0


  parent reply	other threads:[~2024-01-29 20:43 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-29 20:43 [PATCH v5 00/12] Set casefold/fscrypt dentry operations through sb->s_d_op Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 01/12] ovl: Reject mounting over case-insensitive directories Gabriel Krisman Bertazi
2024-01-31  0:22   ` Eric Biggers
2024-01-31  0:31     ` Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 02/12] fscrypt: Factor out a helper to configure the lookup dentry Gabriel Krisman Bertazi
2024-01-31  0:29   ` Eric Biggers
2024-01-29 20:43 ` [PATCH v5 03/12] fscrypt: Call fscrypt_prepare_lookup_dentry on unencrypted dentries Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 04/12] fscrypt: Drop d_revalidate for valid dentries during lookup Gabriel Krisman Bertazi
2024-01-31  0:47   ` Eric Biggers
2024-01-31 18:35     ` Gabriel Krisman Bertazi
2024-02-01  3:24       ` Eric Biggers
2024-02-02 14:50         ` Gabriel Krisman Bertazi
2024-02-09 14:03           ` Christian Brauner
2024-02-09 14:46             ` Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 05/12] fscrypt: Drop d_revalidate once the key is added Gabriel Krisman Bertazi
2024-01-29 20:43 ` Gabriel Krisman Bertazi [this message]
2024-01-31  0:55   ` [PATCH v5 06/12] fscrypt: Ignore plaintext dentries during d_move Eric Biggers
2024-01-29 20:43 ` [PATCH v5 07/12] libfs: Merge encrypted_ci_dentry_ops and ci_dentry_ops Gabriel Krisman Bertazi
2024-01-31  1:00   ` Eric Biggers
2024-01-29 20:43 ` [PATCH v5 08/12] libfs: Add helper to choose dentry operations at mount-time Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 09/12] ext4: Configure dentry operations at dentry-creation time Gabriel Krisman Bertazi
2024-02-02 15:56   ` Theodore Ts'o
2024-01-29 20:43 ` [PATCH v5 10/12] f2fs: " Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 11/12] ubifs: " Gabriel Krisman Bertazi
2024-01-29 20:43 ` [PATCH v5 12/12] libfs: Drop generic_set_encrypted_ci_d_ops Gabriel Krisman Bertazi

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=20240129204330.32346-7-krisman@suse.de \
    --to=krisman@suse.de \
    --cc=amir73il@gmail.com \
    --cc=ebiggers@kernel.org \
    --cc=jaegeuk@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=viro@zeniv.linux.org.uk \
    /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).