On Tue, Mar 19, 2024 at 4:35 AM Amir Goldstein <amir73il@xxxxxxxxx> wrote: > > Sasha, > > Sorry for repeating myself, just want to highlight all the backported new features / uapi changes in this large backports batch for 5.15. > > Something is off. > This is a new feature. > Not sure how it got selected for stable and dragged a *lot* of infrastructure code changes with it. > Can you explain why triggered this backports or is it just "AI"? > Chuck, Please follow up with man page update of fanotify_mark(2) once this is merged: FAN_MARK_EVICTABLE (since Linux 5.19) Thanks, Amir. > > On Tue, Mar 19, 2024, 1:16 AM Sasha Levin <sashal@xxxxxxxxxx> wrote: >> >> This is a note to let you know that I've just added the patch titled >> >> fanotify: enable "evictable" inode marks >> >> to the 5.15-stable tree which can be found at: >> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary >> >> The filename of the patch is: >> fanotify-enable-evictable-inode-marks.patch >> and it can be found in the queue-5.15 subdirectory. >> >> If you, or anyone else, feels it should not be added to the stable tree, >> please let <stable@xxxxxxxxxxxxxxx> know about it. >> >> >> >> commit eb2f75d3c970346af15fa25c2cd03e6aa1d8e59d >> Author: Amir Goldstein <amir73il@xxxxxxxxx> >> Date: Fri Apr 22 15:03:27 2022 +0300 >> >> fanotify: enable "evictable" inode marks >> >> [ Upstream commit 5f9d3bd520261fd7a850818c71809fd580e0f30c ] >> >> Now that the direct reclaim path is handled we can enable evictable >> inode marks. >> >> Link: https://lore.kernel.org/r/20220422120327.3459282-17-amir73il@xxxxxxxxx >> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> >> Signed-off-by: Jan Kara <jack@xxxxxxx> >> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> >> >> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c >> index b4d16caa98d80..4471043955f87 100644 >> --- a/fs/notify/fanotify/fanotify_user.c >> +++ b/fs/notify/fanotify/fanotify_user.c >> @@ -1814,7 +1814,7 @@ static int __init fanotify_user_setup(void) >> >> BUILD_BUG_ON(FANOTIFY_INIT_FLAGS & FANOTIFY_INTERNAL_GROUP_FLAGS); >> BUILD_BUG_ON(HWEIGHT32(FANOTIFY_INIT_FLAGS) != 12); >> - BUILD_BUG_ON(HWEIGHT32(FANOTIFY_MARK_FLAGS) != 9); >> + BUILD_BUG_ON(HWEIGHT32(FANOTIFY_MARK_FLAGS) != 10); >> >> fanotify_mark_cache = KMEM_CACHE(fsnotify_mark, >> SLAB_PANIC|SLAB_ACCOUNT); >> diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h >> index 3afdf339d53c9..81f45061c1b18 100644 >> --- a/include/linux/fanotify.h >> +++ b/include/linux/fanotify.h >> @@ -68,6 +68,7 @@ extern struct ctl_table fanotify_table[]; /* for sysctl */ >> FAN_MARK_ONLYDIR | \ >> FAN_MARK_IGNORED_MASK | \ >> FAN_MARK_IGNORED_SURV_MODIFY | \ >> + FAN_MARK_EVICTABLE | \ >> FAN_MARK_FLUSH) >> >> /*