Re: Question on fscrypt_d_revalidate() and fstest generic/429
From: Richard Weinberger
Date: Mon May 15 2017 - 15:51:13 EST
Eric,
Am 15.05.2017 um 21:45 schrieb Eric Biggers:
>> If a directory is encrypted, evict() is not being called although the inode has no
>> users anymore.
>> It turned out evict() is not being called because fscrypt's fscrypt_d_revalidate()
>> function.
>> When I omit fscrypt_set_d_op() in UBIFS code, the test works just fine.
>
> Well, I assume you mean the t_encrypted_d_revalidate portion of the test.
> generic/429 will still fail overall if you remove fscrypt_set_d_op() --- which
> is expected, since it's testing dentry revalidation after all.
Ah, yes.
>>
>> Can it be that fscrypt_d_revalidate() misses the case of i_nlink being 0?
>> It seem to treat unlinked inodes as already gone and they stay.
>>
>> The following change makes the problem go away here:
>>
>> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
>> index 6d6eca394d4d..d0c19838e513 100644
>> --- a/fs/crypto/crypto.c
>> +++ b/fs/crypto/crypto.c
>> @@ -327,6 +327,7 @@ EXPORT_SYMBOL(fscrypt_decrypt_page);
>> static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
>> {
>> struct dentry *dir;
>> + struct inode *inode = d_inode(dentry);
>> int dir_has_key, cached_with_key;
>>
>> if (flags & LOOKUP_RCU)
>> @@ -359,6 +360,10 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
>> (!cached_with_key && dir_has_key) ||
>> (cached_with_key && !dir_has_key))
>> return 0;
>> +
>> + if (!inode || inode->i_nlink == 0)
>> + return 0;
>> +
>> return 1;
>> }
>>
>> Does this change make sense? TBH, I'm not really an expert in this area and it is also
>> not clear to me why you don't see these issue on ext4 or f2fs.
>> Maybe UBIFS' limitations kick in much earlier. ;-)
>
> The test is repeatedly creating and removing a directory "dir" while lookups are
> being done in it. It seems the problem is that many dentries are being created
> for "dir", and they pin many different inodes, all at the same time. This
> actually happens for ext4 too; it just doesn't cause an observable error.
>
> I doubt it's the right solution to make fscrypt_d_revalidate() look at
> ->i_nlink, since ->d_revalidate() is meant to validate the filename, not the
> inode. I think there is probably a VFS bug that is causing the dentries to not
> be freed.
Not sure. Al? :-)
Thanks,
//richard