add ioctl/sysfs to donate file-backed pages
Jaegeuk Kim
maintainerv7 cover add ioctl/sysfs to donate file-backed pages
Note, let me keep improving this patch set, while trying to get some feedbacks from MM and API folks from [1].
If users clearly know which file-backed pages to reclaim in system view, they can use this ioctl() to register in advance and reclaim all at once later.
I'd like to propose this API in F2FS only, since
1) the use-case is quite limited in Android at the moment. Once it's generall accepted with more use-cases, happy to propose a generic API such as fadvise. Please chime in, if there's any needs.
2) it's file-backed pages which requires to maintain the list of inode objects. I'm not sure this fits in MM tho, also happy to listen to any feedback.
[1] https://lore.kernel.org/lkml/[email protected]/
Change log from v6:
- change sysfs entry name to reclaim_caches_kb
Jaegeuk Kim (2):
f2fs: register inodes which is able to donate pages
f2fs: add a sysfs entry to request donate file-backed pages
Documentation/ABI/testing/sysfs-fs-f2fs | 7 +++ fs/f2fs/debug.c | 3 ++ fs/f2fs/f2fs.h | 14 +++++- fs/f2fs/file.c | 65 +++++++++++++++++++++++++ fs/f2fs/inode.c | 14 ++++++ fs/f2fs/shrinker.c | 33 +++++++++++++ fs/f2fs/super.c | 1 + fs/f2fs/sysfs.c | 8 +++ include/uapi/linux/f2fs.h | 7 +++ 9 files changed, 151 insertions(+), 1 deletion(-)
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
Jaegeuk Kim
maintainerPATCH v7 1/2 f2fs: register inodes which is able to donate pages
This patch introduces an inode list to keep the page cache ranges that users can donate pages together.
#define F2FS_IOC_DONATE_RANGE _IOW(F2FS_IOCTL_MAGIC, 27, \
struct f2fs_donate_range)
struct f2fs_donate_range {
__u64 start;
__u64 len;};
e.g., ioctl(F2FS_IOC_DONATE_RANGE, &range);
--- fs/f2fs/debug.c | 3 ++ fs/f2fs/f2fs.h | 12 +++++++- fs/f2fs/file.c | 65 +++++++++++++++++++++++++++++++++++++++ fs/f2fs/inode.c | 14 +++++++++ fs/f2fs/super.c | 1 + include/uapi/linux/f2fs.h | 7 +++++ 6 files changed, 101 insertions(+), 1 deletion(-)
fs/f2fs/debug.c +3 -0
@@ -164,6 +164,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->ndirty_imeta =get_pages (sbi,F2FS_DIRTY_IMETA ); si->ndirty_dirs = sbi->ndirty_inode[DIR_INODE ]; si->ndirty_files = sbi->ndirty_inode[FILE_INODE ]; + si->ndonate_files = sbi->donate_files; si->nquota_files = sbi->nquota_files; si->ndirty_all = sbi->ndirty_inode[DIRTY_META ]; si->aw_cnt =atomic_read (&sbi->atomic_files);
@@ -501,6 +502,8 @@ static int stat_show(struct seq_file *s, void *v) si->compr_inode, si->compr_blocks);seq_printf (s," - Swapfile Inode: %u\n" , si->swapfile_inode); +seq_printf (s," - Donate Inode: %u\n" , + si->ndonate_files);seq_printf (s," - Orphan/Append/Update Inode: %u, %u, %u\n" , si->orphans, si->append, si->update); seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",
fs/f2fs/f2fs.h +11 -1
@@ -850,6 +850,11 @@ struct f2fs_inode_info {#endif struct list_head dirty_list;/* dirty list for dirs and files */ struct list_head gdirty_list;/* linked in global dirty list */ + +/* linked in global inode list for cache donation */ +struct list_head gdonate_list; +pgoff_t donate_start, donate_end;/* inclusive */ +struct task_struct *atomic_write_task;/* store atomic write task */ struct extent_tree *extent_tree[NR_EXTENT_CACHES ];/* cached extent_tree entry */
@@ -1274,6 +1279,7 @@ enum inode_type {DIR_INODE ,/* for dirty dir inode */ FILE_INODE ,/* for dirty regular/symlink inode */ DIRTY_META ,/* for all dirtied inode metadata */ +DONATE_INODE ,/* for all inode to donate pages */ NR_INODE_TYPE, };
@@ -1629,6 +1635,9 @@ struct f2fs_sb_info {unsigned int warm_data_age_threshold;unsigned int last_age_weight; +/* control donate caches */ +unsigned int donate_files; +/* basic filesystem units */ unsigned int log_sectors_per_block;/* log2 sectors per block */ unsigned int log_blocksize;/* log2 block size */
@@ -3984,7 +3993,8 @@ struct f2fs_stat_info {unsigned long long allocated_data_blocks;int ndirty_node, ndirty_dent, ndirty_meta, ndirty_imeta;int ndirty_data, ndirty_qdata; -unsigned int ndirty_dirs, ndirty_files, nquota_files, ndirty_all; +unsigned int ndirty_dirs, ndirty_files, ndirty_all; +unsigned int nquota_files, ndonate_files;int nats, dirty_nats, sits, dirty_sits;int free_nids, avail_nids, alloc_nids;int total_count, utilization;
fs/f2fs/file.c +65 -0
83 lines not on this page · raw message
fs/f2fs/inode.c +14 -0
@@ -804,6 +804,19 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)return 0 ; } +static void f2fs_remove_donate_inode (struct inode *inode) +{ +struct f2fs_sb_info *sbi =F2FS_I_SB (inode); + +if (list_empty (&F2FS_I (inode)->gdonate_list)) +return ; + +spin_lock (&sbi->inode_lock[DONATE_INODE ]); +list_del_init (&F2FS_I (inode)->gdonate_list); + sbi->donate_files--; +spin_unlock (&sbi->inode_lock[DONATE_INODE ]); +} +/* * Called at the last iput() if i_nlink is zero */
@@ -838,6 +851,7 @@ void f2fs_evict_inode(struct inode *inode)f2fs_bug_on (sbi,get_dirty_pages (inode));f2fs_remove_dirty_inode (inode); +f2fs_remove_donate_inode (inode);if (!IS_DEVICE_ALIASING (inode))f2fs_destroy_extent_tree (inode);
fs/f2fs/super.c +1 -0
@@ -1441,6 +1441,7 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)spin_lock_init (&fi->i_size_lock);INIT_LIST_HEAD (&fi->dirty_list);INIT_LIST_HEAD (&fi->gdirty_list); +INIT_LIST_HEAD (&fi->gdonate_list);init_f2fs_rwsem (&fi->i_gc_rwsem[READ ]);init_f2fs_rwsem (&fi->i_gc_rwsem[WRITE ]);init_f2fs_rwsem (&fi->i_xattr_sem);
include/uapi/linux/f2fs.h +7 -0
@@ -44,6 +44,8 @@#define F2FS_IOC_COMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 24)#define F2FS_IOC_START_ATOMIC_REPLACE _IO(F2FS_IOCTL_MAGIC, 25)#define F2FS_IOC_GET_DEV_ALIAS_FILE _IOR(F2FS_IOCTL_MAGIC, 26, __u32) +#define F2FS_IOC_DONATE_RANGE _IOW(F2FS_IOCTL_MAGIC, 27, \ + struct f2fs_donate_range)/* * should be same as XFS_IOC_GOINGDOWN.
@@ -97,4 +99,9 @@ struct f2fs_comp_option { __u8 log_cluster_size; }; +struct f2fs_donate_range { +__u64 start; +__u64 len; +}; +#endif /* _UAPI_LINUX_F2FS_H */
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
Re: [f2fs-dev] [PATCH 1/2] f2fs: register inodes which is able to donate pages
Quoted 5 lines · On 1/23/25 05:10, Jaegeuk Kim via Linux-f2fs-devel wrote:
This patch introduces an inode list to keep the page cache ranges that users can donate pages together.
#define
F2FS_IOC_DONATE_RANGE_IOW(F2FS_IOCTL_MAGIC, 27, \
structf2fs_donate_range)
Quoted 8 lines
struct f2fs_donate_range { __u64 start; __u64 len;};
e.g.,
ioctl(F2FS_IOC_DONATE_RANGE, &range);Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Jaegeuk Kim
maintainerPATCH v7 2/2 f2fs: add a sysfs entry to request donate file-backed pages
In reply to Jaegeuk Kim1. ioctl(fd1, F2FS_IOC_DONATE_RANGE, {0,3});
2. ioctl(fd2, F2FS_IOC_DONATE_RANGE, {1,2});
3. ioctl(fd3, F2FS_IOC_DONATE_RANGE, {3,1});
4. echo 1024 > /sys/fs/f2fs/blk/reclaim_caches_kb
will reclaim 4MB page cache ranges, registered by #1, #2, and #3.
--- Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++++++ fs/f2fs/f2fs.h | 2 ++ fs/f2fs/shrinker.c | 33 +++++++++++++++++++++++++ fs/f2fs/sysfs.c | 8 ++++++ 4 files changed, 50 insertions(+)
Documentation/ABI/testing/sysfs-fs-f2fs +7 -0
@@ -828,3 +828,10 @@ Date: November 2024 Contact: "Chao Yu" <[email protected]> Description: It controls max read extent count for per-inode, the value of threshold is 10240 by default. + +What: /sys/fs/f2fs/<disk>/reclaim_caches_kb +Date: December 2024 +Contact: "Jaegeuk Kim" <[email protected]> +Description: It reclaims the given KBs of file-backed pages registered by + ioctl(F2FS_IOC_DONATE_RANGE). + For example, writing N tries to drop N KBs spaces in LRU.
fs/f2fs/f2fs.h +2 -0
@@ -1637,6 +1637,7 @@ struct f2fs_sb_info {/* control donate caches */ unsigned int donate_files; +unsigned int reclaim_caches_kb;/* basic filesystem units */ unsigned int log_sectors_per_block;/* log2 sectors per block */
@@ -4259,6 +4260,7 @@ unsigned long f2fs_shrink_count(struct shrinker *shrink, struct shrink_control *sc);unsigned long f2fs_shrink_scan (struct shrinker *shrink,struct shrink_control *sc); +void f2fs_reclaim_caches (struct f2fs_sb_info *sbi);void f2fs_join_shrinker (struct f2fs_sb_info *sbi);void f2fs_leave_shrinker (struct f2fs_sb_info *sbi);
fs/f2fs/shrinker.c +33 -0
@@ -130,6 +130,39 @@ unsigned long f2fs_shrink_scan(struct shrinker *shrink,return freed; } +void f2fs_reclaim_caches (struct f2fs_sb_info *sbi) +{ +struct inode *inode; +struct f2fs_inode_info *fi; +unsigned int nfiles = sbi->donate_files; +pgoff_t npages = sbi->reclaim_caches_kb >> (PAGE_SHIFT -10 ); + +while (npages && nfiles--) { +pgoff_t len; + +spin_lock (&sbi->inode_lock[DONATE_INODE ]); +if (list_empty (&sbi->inode_list[DONATE_INODE ])) { +spin_unlock (&sbi->inode_lock[DONATE_INODE ]); +break ; + } + fi =list_first_entry (&sbi->inode_list[DONATE_INODE ], + struct f2fs_inode_info, gdonate_list); +list_move_tail (&fi->gdonate_list, &sbi->inode_list[DONATE_INODE ]); + inode =igrab (&fi->vfs_inode); +spin_unlock (&sbi->inode_lock[DONATE_INODE ]); + +if (!inode) +continue ; + + len = fi->donate_end - fi->donate_start +1 ; + npages = npages < len ?0 : npages - len; +invalidate_inode_pages2_range (inode->i_mapping, + fi->donate_start, fi->donate_end); +iput (inode); +cond_resched (); + } +} +void f2fs_join_shrinker (struct f2fs_sb_info *sbi) {spin_lock (&f2fs_list_lock);
fs/f2fs/sysfs.c +8 -0
@@ -811,6 +811,12 @@ static ssize_t __sbi_store(struct f2fs_attr *a,return count; } +if (!strcmp (a->attr.name,"reclaim_caches_kb" )) { + sbi->reclaim_caches_kb = t; +f2fs_reclaim_caches (sbi); +return count; + } + *ui = (unsigned int )t;return count;
@@ -1030,6 +1036,7 @@ F2FS_SBI_GENERAL_RW_ATTR(max_victim_search);F2FS_SBI_GENERAL_RW_ATTR (migration_granularity);F2FS_SBI_GENERAL_RW_ATTR (migration_window_granularity);F2FS_SBI_GENERAL_RW_ATTR (dir_level); +F2FS_SBI_GENERAL_RW_ATTR (reclaim_caches_kb);#ifdef CONFIG_F2FS_IOSTAT F2FS_SBI_GENERAL_RW_ATTR (iostat_enable);F2FS_SBI_GENERAL_RW_ATTR (iostat_period_ms);
@@ -1178,6 +1185,7 @@ static struct attribute *f2fs_attrs[] = {ATTR_LIST (migration_granularity),ATTR_LIST (migration_window_granularity),ATTR_LIST (dir_level), +ATTR_LIST (reclaim_caches_kb),ATTR_LIST (ram_thresh),ATTR_LIST (ra_nid_pages), ATTR_LIST(dirty_nats_ratio),
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: add a sysfs entry to request donate file-backed pages
Quoted 6 lines · On 1/23/25 05:10, Jaegeuk Kim via Linux-f2fs-devel wrote:
1.
ioctl(fd1, F2FS_IOC_DONATE_RANGE, {0,3});
2.ioctl(fd2, F2FS_IOC_DONATE_RANGE, {1,2});
3.ioctl(fd3, F2FS_IOC_DONATE_RANGE, {3,1});
4. echo 1024 >/sys/fs/f2fs/blk/reclaim_caches_kbwill reclaim 4MB page cache ranges, registered by #1, #2, and #3.
4MB -> 1MB?
Quoted 2 lines
Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,