Message ID | 20230812004146.30980-7-krisman@suse.de (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Support negative dentries on case-insensitive ext4 and f2fs | expand |
On Fri, Aug 11, 2023 at 08:41:42PM -0400, Gabriel Krisman Bertazi wrote: > + /* > + * Filesystems will call into d_revalidate without setting > + * LOOKUP_ flags even for file creation (see lookup_one* > + * variants). Reject negative dentries in this case, since we > + * can't know for sure it won't be used for creation. > + */ > + if (!flags) > + return 0; > + > + /* > + * If the lookup is for creation, then a negative dentry can > + * only be reused if it's a case-sensitive match, not just a > + * case-insensitive one. This is needed to make the new file be > + * created with the name the user specified, preserving case. > + */ > + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > + /* > + * ->d_name won't change from under us in the creation > + * path only, since d_revalidate during creation and > + * renames is always called with the parent inode > + * locked. It isn't the case for all lookup callpaths, > + * so ->d_name must not be touched outside > + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. > + */ > + if (dentry->d_name.len != name->len || > + memcmp(dentry->d_name.name, name->name, name->len)) > + return 0; > + } This is still really confusing to me. Can you consider the below? The code is the same except for the reordering, but the explanation is reworked to be much clearer (IMO). Anything I am misunderstanding? /* * If the lookup is for creation, then a negative dentry can only be * reused if it's a case-sensitive match, not just a case-insensitive * one. This is needed to make the new file be created with the name * the user specified, preserving case. * * LOOKUP_CREATE or LOOKUP_RENAME_TARGET cover most creations. In these * cases, ->d_name is stable and can be compared to 'name' without * taking ->d_lock because the caller holds dir->i_rwsem for write. * (This is because the directory lock blocks the dentry from being * concurrently instantiated, and negative dentries are never moved.) * * All other creations actually use flags==0. These come from the edge * case of filesystems calling functions like lookup_one() that do a * lookup without setting the lookup flags at all. Such lookups might * or might not be for creation, and if not don't guarantee stable * ->d_name. Therefore, invalidate all negative dentries when flags==0. */ if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { if (dentry->d_name.len != name->len || memcmp(dentry->d_name.name, name->name, name->len)) return 0; } if (!flags) return 0;
Eric Biggers <ebiggers@kernel.org> writes: > On Fri, Aug 11, 2023 at 08:41:42PM -0400, Gabriel Krisman Bertazi wrote: >> + /* >> + * Filesystems will call into d_revalidate without setting >> + * LOOKUP_ flags even for file creation (see lookup_one* >> + * variants). Reject negative dentries in this case, since we >> + * can't know for sure it won't be used for creation. >> + */ >> + if (!flags) >> + return 0; >> + >> + /* >> + * If the lookup is for creation, then a negative dentry can >> + * only be reused if it's a case-sensitive match, not just a >> + * case-insensitive one. This is needed to make the new file be >> + * created with the name the user specified, preserving case. >> + */ >> + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { >> + /* >> + * ->d_name won't change from under us in the creation >> + * path only, since d_revalidate during creation and >> + * renames is always called with the parent inode >> + * locked. It isn't the case for all lookup callpaths, >> + * so ->d_name must not be touched outside >> + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. >> + */ >> + if (dentry->d_name.len != name->len || >> + memcmp(dentry->d_name.name, name->name, name->len)) >> + return 0; >> + } > > This is still really confusing to me. Can you consider the below? The code is > the same except for the reordering, but the explanation is reworked to be much > clearer (IMO). Anything I am misunderstanding? > > /* > * If the lookup is for creation, then a negative dentry can only be > * reused if it's a case-sensitive match, not just a case-insensitive > * one. This is needed to make the new file be created with the name > * the user specified, preserving case. > * > * LOOKUP_CREATE or LOOKUP_RENAME_TARGET cover most creations. In these > * cases, ->d_name is stable and can be compared to 'name' without > * taking ->d_lock because the caller holds dir->i_rwsem for write. > * (This is because the directory lock blocks the dentry from being > * concurrently instantiated, and negative dentries are never moved.) > * > * All other creations actually use flags==0. These come from the edge > * case of filesystems calling functions like lookup_one() that do a > * lookup without setting the lookup flags at all. Such lookups might > * or might not be for creation, and if not don't guarantee stable > * ->d_name. Therefore, invalidate all negative dentries when flags==0. > */ > if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > if (dentry->d_name.len != name->len || > memcmp(dentry->d_name.name, name->name, name->len)) > return 0; > } > if (!flags) > return 0; I don't see it as particularly better or less confusing than the original. but I also don't mind taking it into the next iteration.
On Mon, Aug 14, 2023 at 10:50:13AM -0400, Gabriel Krisman Bertazi wrote: > Eric Biggers <ebiggers@kernel.org> writes: > > > On Fri, Aug 11, 2023 at 08:41:42PM -0400, Gabriel Krisman Bertazi wrote: > >> + /* > >> + * Filesystems will call into d_revalidate without setting > >> + * LOOKUP_ flags even for file creation (see lookup_one* > >> + * variants). Reject negative dentries in this case, since we > >> + * can't know for sure it won't be used for creation. > >> + */ > >> + if (!flags) > >> + return 0; > >> + > >> + /* > >> + * If the lookup is for creation, then a negative dentry can > >> + * only be reused if it's a case-sensitive match, not just a > >> + * case-insensitive one. This is needed to make the new file be > >> + * created with the name the user specified, preserving case. > >> + */ > >> + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > >> + /* > >> + * ->d_name won't change from under us in the creation > >> + * path only, since d_revalidate during creation and > >> + * renames is always called with the parent inode > >> + * locked. It isn't the case for all lookup callpaths, > >> + * so ->d_name must not be touched outside > >> + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. > >> + */ > >> + if (dentry->d_name.len != name->len || > >> + memcmp(dentry->d_name.name, name->name, name->len)) > >> + return 0; > >> + } > > > > This is still really confusing to me. Can you consider the below? The code is > > the same except for the reordering, but the explanation is reworked to be much > > clearer (IMO). Anything I am misunderstanding? > > > > /* > > * If the lookup is for creation, then a negative dentry can only be > > * reused if it's a case-sensitive match, not just a case-insensitive > > * one. This is needed to make the new file be created with the name > > * the user specified, preserving case. > > * > > * LOOKUP_CREATE or LOOKUP_RENAME_TARGET cover most creations. In these > > * cases, ->d_name is stable and can be compared to 'name' without > > * taking ->d_lock because the caller holds dir->i_rwsem for write. > > * (This is because the directory lock blocks the dentry from being > > * concurrently instantiated, and negative dentries are never moved.) > > * > > * All other creations actually use flags==0. These come from the edge > > * case of filesystems calling functions like lookup_one() that do a > > * lookup without setting the lookup flags at all. Such lookups might > > * or might not be for creation, and if not don't guarantee stable > > * ->d_name. Therefore, invalidate all negative dentries when flags==0. > > */ > > if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > > if (dentry->d_name.len != name->len || > > memcmp(dentry->d_name.name, name->name, name->len)) > > return 0; > > } > > if (!flags) > > return 0; > > I don't see it as particularly better or less confusing than the > original. but I also don't mind taking it into the next iteration. > Your commit message is still much longer and covers some quite different details which seem irrelevant to me. So if you don't see my explanation as being much different, I think we're still not on the same page. I hope that I'm not misunderstanding anything, in which I believe that what I wrote above is a good explanation and your commit message should be substantially simplified. Remember, longer != better. Keep things as simple as possible. - Eric
Eric Biggers <ebiggers@kernel.org> writes: > On Mon, Aug 14, 2023 at 10:50:13AM -0400, Gabriel Krisman Bertazi wrote: >> Eric Biggers <ebiggers@kernel.org> writes: >> >> > On Fri, Aug 11, 2023 at 08:41:42PM -0400, Gabriel Krisman Bertazi wrote: >> >> + /* >> >> + * Filesystems will call into d_revalidate without setting >> >> + * LOOKUP_ flags even for file creation (see lookup_one* >> >> + * variants). Reject negative dentries in this case, since we >> >> + * can't know for sure it won't be used for creation. >> >> + */ >> >> + if (!flags) >> >> + return 0; >> >> + >> >> + /* >> >> + * If the lookup is for creation, then a negative dentry can >> >> + * only be reused if it's a case-sensitive match, not just a >> >> + * case-insensitive one. This is needed to make the new file be >> >> + * created with the name the user specified, preserving case. >> >> + */ >> >> + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { >> >> + /* >> >> + * ->d_name won't change from under us in the creation >> >> + * path only, since d_revalidate during creation and >> >> + * renames is always called with the parent inode >> >> + * locked. It isn't the case for all lookup callpaths, >> >> + * so ->d_name must not be touched outside >> >> + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. >> >> + */ >> >> + if (dentry->d_name.len != name->len || >> >> + memcmp(dentry->d_name.name, name->name, name->len)) >> >> + return 0; >> >> + } >> > >> > This is still really confusing to me. Can you consider the below? The code is >> > the same except for the reordering, but the explanation is reworked to be much >> > clearer (IMO). Anything I am misunderstanding? >> > >> > /* >> > * If the lookup is for creation, then a negative dentry can only be >> > * reused if it's a case-sensitive match, not just a case-insensitive >> > * one. This is needed to make the new file be created with the name >> > * the user specified, preserving case. >> > * >> > * LOOKUP_CREATE or LOOKUP_RENAME_TARGET cover most creations. In these >> > * cases, ->d_name is stable and can be compared to 'name' without >> > * taking ->d_lock because the caller holds dir->i_rwsem for write. >> > * (This is because the directory lock blocks the dentry from being >> > * concurrently instantiated, and negative dentries are never moved.) >> > * >> > * All other creations actually use flags==0. These come from the edge >> > * case of filesystems calling functions like lookup_one() that do a >> > * lookup without setting the lookup flags at all. Such lookups might >> > * or might not be for creation, and if not don't guarantee stable >> > * ->d_name. Therefore, invalidate all negative dentries when flags==0. >> > */ >> > if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { >> > if (dentry->d_name.len != name->len || >> > memcmp(dentry->d_name.name, name->name, name->len)) >> > return 0; >> > } >> > if (!flags) >> > return 0; >> >> I don't see it as particularly better or less confusing than the >> original. but I also don't mind taking it into the next iteration. >> > > Your commit message is still much longer and covers some quite different details > which seem irrelevant to me. So if you don't see my explanation as being much > different, I think we're still not on the same page. I hope that I'm not > misunderstanding anything, in which I believe that what I wrote above is a good > explanation and your commit message should be substantially simplified. > Remember, longer != better. Keep things as simple as possible. I think we are on the same page regarding the code. I was under the impression your suggestion was regarding the *code comment* you proposed to replace, and not the commit message. I don't see your code comment to be much different than the original. The commit message has information accumulated on previous discussions, including the conclusions from the locking discussion Viro requested. I'll reword it too for the next iteration to see if I can make it more concise. Thx
On Mon, Aug 14, 2023 at 03:21:33PM -0400, Gabriel Krisman Bertazi wrote: > Eric Biggers <ebiggers@kernel.org> writes: > > > On Mon, Aug 14, 2023 at 10:50:13AM -0400, Gabriel Krisman Bertazi wrote: > >> Eric Biggers <ebiggers@kernel.org> writes: > >> > >> > On Fri, Aug 11, 2023 at 08:41:42PM -0400, Gabriel Krisman Bertazi wrote: > >> >> + /* > >> >> + * Filesystems will call into d_revalidate without setting > >> >> + * LOOKUP_ flags even for file creation (see lookup_one* > >> >> + * variants). Reject negative dentries in this case, since we > >> >> + * can't know for sure it won't be used for creation. > >> >> + */ > >> >> + if (!flags) > >> >> + return 0; > >> >> + > >> >> + /* > >> >> + * If the lookup is for creation, then a negative dentry can > >> >> + * only be reused if it's a case-sensitive match, not just a > >> >> + * case-insensitive one. This is needed to make the new file be > >> >> + * created with the name the user specified, preserving case. > >> >> + */ > >> >> + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > >> >> + /* > >> >> + * ->d_name won't change from under us in the creation > >> >> + * path only, since d_revalidate during creation and > >> >> + * renames is always called with the parent inode > >> >> + * locked. It isn't the case for all lookup callpaths, > >> >> + * so ->d_name must not be touched outside > >> >> + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. > >> >> + */ > >> >> + if (dentry->d_name.len != name->len || > >> >> + memcmp(dentry->d_name.name, name->name, name->len)) > >> >> + return 0; > >> >> + } > >> > > >> > This is still really confusing to me. Can you consider the below? The code is > >> > the same except for the reordering, but the explanation is reworked to be much > >> > clearer (IMO). Anything I am misunderstanding? > >> > > >> > /* > >> > * If the lookup is for creation, then a negative dentry can only be > >> > * reused if it's a case-sensitive match, not just a case-insensitive > >> > * one. This is needed to make the new file be created with the name > >> > * the user specified, preserving case. > >> > * > >> > * LOOKUP_CREATE or LOOKUP_RENAME_TARGET cover most creations. In these > >> > * cases, ->d_name is stable and can be compared to 'name' without > >> > * taking ->d_lock because the caller holds dir->i_rwsem for write. > >> > * (This is because the directory lock blocks the dentry from being > >> > * concurrently instantiated, and negative dentries are never moved.) > >> > * > >> > * All other creations actually use flags==0. These come from the edge > >> > * case of filesystems calling functions like lookup_one() that do a > >> > * lookup without setting the lookup flags at all. Such lookups might > >> > * or might not be for creation, and if not don't guarantee stable > >> > * ->d_name. Therefore, invalidate all negative dentries when flags==0. > >> > */ > >> > if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > >> > if (dentry->d_name.len != name->len || > >> > memcmp(dentry->d_name.name, name->name, name->len)) > >> > return 0; > >> > } > >> > if (!flags) > >> > return 0; > >> > >> I don't see it as particularly better or less confusing than the > >> original. but I also don't mind taking it into the next iteration. > >> > > > > Your commit message is still much longer and covers some quite different details > > which seem irrelevant to me. So if you don't see my explanation as being much > > different, I think we're still not on the same page. I hope that I'm not > > misunderstanding anything, in which I believe that what I wrote above is a good > > explanation and your commit message should be substantially simplified. > > Remember, longer != better. Keep things as simple as possible. > > I think we are on the same page regarding the code. I was under the > impression your suggestion was regarding the *code comment* you proposed > to replace, and not the commit message. I don't see your code comment > to be much different than the original. > > The commit message has information accumulated on previous discussions, > including the conclusions from the locking discussion Viro requested. > I'll reword it too for the next iteration to see if I can make it more > concise. > Yes, I was talking about the code comment, but the commit message is explaining the same thing so it needs to be consistent (or have the commit message just reference the code). As-is they seem to be in contradiction. - Eric
diff --git a/fs/libfs.c b/fs/libfs.c index 8d0b64cfd5da..cb98c4721327 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1452,9 +1452,66 @@ static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str) return 0; } +static int generic_ci_d_revalidate(struct dentry *dentry, + const struct qstr *name, + unsigned int flags) +{ + const struct dentry *parent; + const struct inode *dir; + + if (!d_is_negative(dentry)) + return 1; + + parent = READ_ONCE(dentry->d_parent); + dir = READ_ONCE(parent->d_inode); + + if (!dir || !dir_is_casefolded(dir)) + return 1; + + /* + * Negative dentries created prior to turning the directory + * case-insensitive cannot be trusted, since they don't ensure + * any possible case version of the filename doesn't exist. + */ + if (!d_is_casefolded_name(dentry)) + return 0; + + /* + * Filesystems will call into d_revalidate without setting + * LOOKUP_ flags even for file creation (see lookup_one* + * variants). Reject negative dentries in this case, since we + * can't know for sure it won't be used for creation. + */ + if (!flags) + return 0; + + /* + * If the lookup is for creation, then a negative dentry can + * only be reused if it's a case-sensitive match, not just a + * case-insensitive one. This is needed to make the new file be + * created with the name the user specified, preserving case. + */ + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { + /* + * ->d_name won't change from under us in the creation + * path only, since d_revalidate during creation and + * renames is always called with the parent inode + * locked. It isn't the case for all lookup callpaths, + * so ->d_name must not be touched outside + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. + */ + if (dentry->d_name.len != name->len || + memcmp(dentry->d_name.name, name->name, name->len)) + return 0; + } + + return 1; +} + static const struct dentry_operations generic_ci_dentry_ops = { .d_hash = generic_ci_d_hash, .d_compare = generic_ci_d_compare, + .d_revalidate = generic_ci_d_revalidate, }; #endif