ext4: Performance scalability improvement with fast_commit
Subsystems (2)
v2 cover ext4: Performance scalability improvement with fast_commit
Hello,
Please find the v2 of this patchset after addressing review comments from Harshad.
[RFC/v1]: https://lore.kernel.org/all/[email protected]/
xfstests results(v2)
=====================
This has survived my fstests testing with -g 'auto' group for ext4_4k_fc & ext4_4k configs with CONFIG_KASAN enabled. I haven't found any regression due to this patch in my testing.
But to avoid me missing any corner slippery edges of fast_commit feature, a careful review would really help as always :)
<Original cover letter>
======================
Hello,
I have recently started playing with some filesystem performance scalability testing, mainly ext4 for now and in this patch it is with fast_commit feature.
While running fs_mark (with -s0 -S5) for scalability runs with fast_commit enabled, I noticed some heavy contention in ext4_fc_commit() -> ext4_fc_commit_dentry_updates().
Analysis
===========
This is because -
1. To commit all the dentry updates using FC, we first loop in for_each dentry entry in sbi->s_fc_dentry_q.
2. Then within that loop, for each of the above fc_dentry nodes, we again loop in for_each inode in sbi->s_fc_q. This is to get the corresponding inode entry belonging to fc_dentry->fcd_ino.
Second loop above, is mainly done to get corresponding inode so that before committing dentry updates into FC area, we first write inode data, inode and then dentry. This turns the whole ext4_fc_commit() path into quadratic time complexity.
This is fine until a multi-threaded application is making the updates to limited no. of open files and then issuing fsync for each/any of the files.
But as no. of open files (tracked in FC list) increases, we see significant performance impact with higher no. of open files (see below table for more details).
This RFC patch thus improves the performance of ext4_fc_commit() path by making it linear time for doing dentry updates (ext4_fc_commit_dentry_updates()).
Observations on perf table results
===================================
If we look at the table below, we start seeing performance problems from row 6th onwards, where the numbers actually decrease as compared to previous row (row 5). And then from row 7th onwards the numbers are significantly low. In fact, I was observing the fs_mark getting completely stuck for quite some time and progressing very slowly (with params of row 7th onwards).
Observations on perf profile
===============================
Similar observations can be seen in below perf profile which is taken with params of row-8th. Almost 87% of the time is being wasted in that O(N^2) loop to just find the right corresponding inode for fc_dentry->fcd_ino.
[Table]: Perf absolute numbers in avg file creates per sec (from fs_mark in 1K order)
=======================================================================
#no. Order without-patch(K) with-patch(K) Diff(%)
1 1 16.90 17.51 +3.60
2 2,2 32.08 31.80 -0.87
3 3,3 53.97 55.01 +1.92
4 4,4 78.94 76.90 -2.58
5 5,5 95.82 95.37 -0.46
6 6,6 87.92 103.38 +17.58
7 6,10 0.73 126.13 +17178.08
8 6,14 2.33 143.19 +6045.49
Scalability run plots with different directory ways (/ threads) and no. of dirs/file (w/o patches)
================================================================================
(Avg files/sec x1000) 'fc_perf.txt' using 3:xtic(2)
100 +--------------------------------------------------------------------+
| + + + + * + + + |
90 |-+ * * +-|
| * * |
80 |-+ * * * +-|
| * * * |
70 |-+ * * * +-|
| * * * |
60 |-+ * * * +-|
| * * * * |
50 |-+ * * * * +-|
| * * * * |
40 |-+ * * * * +-|
| * * * * |
30 |-+ * * * * * +-|
| * * * * * |
20 |-+ * * * * * +-|
| * * * * * * |
10 |-+ * * * * * * +-|
| * * * * * * + + |
0 +--------------------------------------------------------------------+
1,1 2,2 3,3 4,4 5,5 6,6 6,10 6,14 (order,dir & files)
^^^^ extremely poor numbers at higher X values (w/o patch)X-axis: 2^order dir ways, 2^dir & 2^files.
For e.g. with x coordinate of 6,10 (2^6 == 64 && 2^10 == 1024)
echo /run/riteshh/mnt/{1..64} |sed -E 's/[[:space:]]+/ -d /g' | xargs -I {} bash -c "sudo fs_mark -L 100 -D 1024 -n 1024 -s0 -S5 -d {}"Y-axis: Avg files per sec (x1000).
For e.g. a y coordinate of 100 represent 100K avg file creates per sec. with fs_mark
Perf profile
(w/o patches)
=============================
87.15% [kernel] [k] ext4_fc_commit --> Heavy contention/bottleneck 1.98% [kernel] [k] perf_event_interrupt 0.96% [kernel] [k] power_pmu_enable 0.91% [kernel] [k] update_sd_lb_stats.constprop.0 0.67% [kernel] [k] ktime_get
Scalability run plots with different directory ways (/ threads) and no. of dirs/file (with patch)
================================================================================
(Avg files/sec x1000)
160 +--------------------------------------------------------------------+
| + + + + + + + + |
140 |-+ 'fc_perf.txt' using 4:xtic(2) * +-|
| * |
| * * |
120 |-+ * * +-|
| * * |
100 |-+ * * * +-|
| * * * * |
| * * * * |
80 |-+ * * * * * +-|
| * * * * * |
60 |-+ * * * * * +-|
| * * * * * * |
| * * * * * * |
40 |-+ * * * * * * +-|
| * * * * * * * |
20 |-+ * * * * * * * +-|
| * * * * * * * * |
| * * * * * * * * |
0 +--------------------------------------------------------------------+
1,1 2,2 3,3 4,4 5,5 6,6 6,10 6,14 (order, dir & files)
^^^^ Shows linear scaling with this patch ;)Perf profile
(with patch)
===========================
21.41% [kernel] [k] snooze_loop 18.67% [kernel] [k] _raw_spin_lock 12.34% [kernel] [k] _raw_spin_lock_irq 5.02% [kernel] [k] update_sd_lb_stats.constprop.0 1.91% libc-2.31.so [.] __random 1.85% [kernel] [k] _find_next_bit
xfstests results
==================
This has survived my fstests testing with -g log,metadata,auto group. (CONFIG_KASAN disabled). I haven't found any regression due to this patch in my testing.
But to avoid me missing any corner slippery edges of fast_commit feature, a careful review would really help as always :)
[Fast-commit]: https://lwn.net/Articles/842385/
Ritesh Harjani (1):
ext4: Improve fast_commit performance and scalability
fs/ext4/ext4.h | 2 ++ fs/ext4/fast_commit.c | 74 ++++++++++++++++++++++++++++++++----------- fs/ext4/fast_commit.h | 1 + 3 files changed, 59 insertions(+), 18 deletions(-)
--
2.31.1
PATCH v2 1/1 ext4: Improve fast_commit performance and scalability
Currently ext4_fc_commit_dentry_updates() is of quadratic time complexity, which is causing performance bottlenecks with high threads/file/dir count with fs_mark.
This patch makes commit dentry updates (and hence ext4_fc_commit()) path to linear time complexity. Hence improves the performance of workloads which does fsync on multiple threads/open files one-by-one.
Absolute numbers in avg file creates per sec (from fs_mark in 1K order)
=======================================================================
no. Order without-patch(K) with-patch(K) Diff(%) 1 1 16.90 17.51 +3.60 2 2,2 32.08 31.80 -0.87 3 3,3 53.97 55.01 +1.92 4 4,4 78.94 76.90 -2.58 5 5,5 95.82 95.37 -0.46 6 6,6 87.92 103.38 +17.58 7 6,10 0.73 126.13 +17178.08 8 6,14 2.33 143.19 +6045.49
workload type
==============
For e.g. 7th row order of 6,10 (2^6 == 64 && 2^10 == 1024)
echo /run/riteshh/mnt/{1..64} |sed -E 's/[[:space:]]+/ -d /g' \
| xargs -I {} bash -c "sudo fs_mark -L 100 -D 1024 -n 1024 -s0 -S5 -d {}"
Perf profile
(w/o patches)
=============================
87.15% [kernel] [k] ext4_fc_commit --> Heavy contention/bottleneck 1.98% [kernel] [k] perf_event_interrupt 0.96% [kernel] [k] power_pmu_enable 0.91% [kernel] [k] update_sd_lb_stats.constprop.0 0.67% [kernel] [k] ktime_get
--- fs/ext4/ext4.h | 2 ++ fs/ext4/fast_commit.c | 74 ++++++++++++++++++++++++++++++++----------- fs/ext4/fast_commit.h | 1 + 3 files changed, 59 insertions(+), 18 deletions(-)
fs/ext4/ext4.h +2 -0
@@ -1046,6 +1046,8 @@ struct ext4_inode_info {/* Fast commit related info */ +/* For tracking dentry create updates */ +struct list_head i_fc_dilist;struct list_head i_fc_list;/* * inodes that need fast commit * protected by sbi->s_fc_lock.
fs/ext4/fast_commit.c +56 -18
130 lines not on this page · raw message
fs/ext4/fast_commit.h +1 -0
@@ -109,6 +109,7 @@ struct ext4_fc_dentry_update {struct qstr fcd_name;/* Dirent name */ unsigned char fcd_iname[DNAME_INLINE_LEN ];/* Dirent name string */ struct list_head fcd_list; +struct list_head fcd_dilist; };struct ext4_fc_stats {
--
2.31.1
Re: [PATCHv2 1/1] ext4: Improve fast_commit performance and scalability
Modulo a minor nit, this looks good.
One high level observation - all other dentry operations (link / unlink) require inode number (fc_dentry.fcd_ino), however create operation requires the VFS inode. So, another way to handle this could be to move int fcd_ino and struct inode *fcd_inode into a union and based on the op type, use one of the two fields. That would also handle the concern you raised on the previous version about handling corner cases wrt fcd_ino.
That said, I don't feel too strongly about it. So, I think what you have here is fine too.
- Harshad
Quoted 109 lines · Ritesh Harjani
Currently
ext4_fc_commit_dentry_updates()is of quadratic time complexity, which is causing performance bottlenecks with high threads/file/dir count withfs_mark.This patch makes commit dentry updates (and hence
ext4_fc_commit()) path to linear time complexity. Hence improves the performance of workloads which does fsync on multiple threads/open files one-by-one.Absolute numbers in avg file creates per sec (from
fs_markin 1K order)
=======================================================================no. Order without-patch(K) with-patch(K) Diff(%) 1 1 16.90 17.51 +3.60 2 2,2 32.08 31.80 -0.87 3 3,3 53.97 55.01 +1.92 4 4,4 78.94 76.90 -2.58 5 5,5 95.82 95.37 -0.46 6 6,6 87.92 103.38 +17.58 7 6,10 0.73 126.13 +17178.08 8 6,14 2.33 143.19 +6045.49workload type
==============
For e.g. 7th row order of 6,10 (2^6 == 64 && 2^10 == 1024)
echo/run/riteshh/mnt/{1..64}|sed -E 's/[[:space:]]+/ -d /g' \
| xargs -I {} bash -c "sudofs_mark-L 100 -D 1024 -n 1024 -s0 -S5 -d {}"Perf profile
(w/o patches)
=============================87.15% [kernel] [k] ext4_fc_commit --> Heavy contention/bottleneck 1.98% [kernel] [k] perf_event_interrupt 0.96% [kernel] [k] power_pmu_enable 0.91% [kernel] [k] update_sd_lb_stats.constprop.0 0.67% [kernel] [k] ktime_getSigned-off-by Ritesh Harjani <[email protected]>--- fs/ext4/ext4.h | 2 ++ fs/ext4/fast_commit.c | 74 ++++++++++++++++++++++++++++++++----------- fs/ext4/fast_commit.h | 1 + 3 files changed, 59 insertions(+), 18 deletions(-)fs/ext4/ext4.h +2
-0@@ -1046,6 +1046,8 @@ struct ext4_inode_info {/* Fast commit related info */ +/* For tracking dentry create updates */ +struct list_head i_fc_dilist;struct list_head i_fc_list;/* * inodes that need fast commit * protected by sbi->s_fc_lock. fs/ext4/fast_commit.c +21
-3@@ -199,6 +199,7 @@ void ext4_fc_init_inode(struct inode *inode)ext4_fc_reset_inode (inode);ext4_clear_inode_state (inode,EXT4_STATE_FC_COMMITTING );INIT_LIST_HEAD (&ei->i_fc_list); +INIT_LIST_HEAD (&ei->i_fc_dilist);init_waitqueue_head (&ei->i_fc_wait);atomic_set (&ei->i_fc_updates,0 ); }@@ -279,6 +280,8 @@ void ext4_fc_stop_update(struct inode *inode)void ext4_fc_del (struct inode *inode) {struct ext4_inode_info *ei =EXT4_I (inode); +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb); +struct ext4_fc_dentry_update *fc_dentry;if (!test_opt2 (inode->i_sb,JOURNAL_FAST_COMMIT ) || (EXT4_SB (inode->i_sb)->s_mount_state &EXT4_FC_REPLAY ))@@ -286,7 +289,7 @@ void ext4_fc_del(struct inode *inode) restart:spin_lock (&EXT4_SB (inode->i_sb)->s_fc_lock); -if (list_empty (&ei->i_fc_list)) { +if (list_empty (&ei->i_fc_list) &&list_empty (&ei->i_fc_dilist)) {spin_unlock (&EXT4_SB (inode->i_sb)->s_fc_lock);return ; }@@ -295,8 +298,33 @@ void ext4_fc_del(struct inode *inode)ext4_fc_wait_committing_inode (inode); goto restart; } -list_del_init (&ei->i_fc_list); -spin_unlock (&EXT4_SB (inode->i_sb)->s_fc_lock); + +if (!list_empty (&ei->i_fc_list)) +list_del_init (&ei->i_fc_list); + +/* +* Since this inode is getting removed, let's also remove all FC +* dentry create references, since it is not needed to log it anyways. +*/ +if (list_empty (&ei->i_fc_dilist)) { +spin_unlock (&sbi->s_fc_lock); +return ; + } + + fc_dentry = list_first_entry(&ei->i_fc_dilist, struct ext4_fc_dentry_update, fcd_dilist); +WARN_ON (fc_dentry->fcd_op !=EXT4_FC_TAG_CREAT ); +list_del_init (&fc_dentry->fcd_list); +list_del_init (&fc_dentry->fcd_dilist);
fs/ext4/fast_commit.c void ext4_fc_del(struct inode *inode) · line 327
Quoted 10 lines
fs/ext4/fast_commit.c +10
-0+ +WARN_ON (!list_empty (&ei->i_fc_dilist)); +spin_unlock (&sbi->s_fc_lock); + +if (fc_dentry->fcd_name.name && + fc_dentry->fcd_name.len >DNAME_INLINE_LEN ) +kfree (fc_dentry->fcd_name.name); +kmem_cache_free (ext4_fc_dentry_cachep, fc_dentry); + +return ;
(nit) Unnecessary return
Quoted 95 lines
fs/ext4/fast_commit.c +25
-15}/* @@ -427,7 +455,7 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update) node->fcd_name.name = node->fcd_iname; } node->fcd_name.len = dentry->d_name.len; - +INIT_LIST_HEAD (&node->fcd_dilist);spin_lock (&sbi->s_fc_lock);if (sbi->s_journal->j_flags &JBD2_FULL_COMMIT_ONGOING || sbi->s_journal->j_flags &JBD2_FAST_COMMIT_ONGOING )@@ -435,6 +463,20 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update) &sbi->s_fc_dentry_q[FC_Q_STAGING]); else list_add_tail(&node->fcd_list, &sbi->s_fc_dentry_q[FC_Q_MAIN]); + +/* +* This helps us keep a track of all fc_dentry updates which is part of +* this ext4 inode. So in case the inode is getting unlinked, before +* even we get a chance to fsync, we could remove all fc_dentry +* references while evicting the inode in ext4_fc_del(). +* Also with this, we don't need to loop over all the inodes in +* sbi->s_fc_q to get the corresponding inode in +* ext4_fc_commit_dentry_updates(). +*/ +if (dentry_update->op ==EXT4_FC_TAG_CREAT ) { +WARN_ON (!list_empty (&ei->i_fc_dilist)); +list_add_tail (&node->fcd_dilist, &ei->i_fc_dilist); + }spin_unlock (&sbi->s_fc_lock);mutex_lock (&ei->i_fc_lock);@@ -954,7 +996,7 @@ __releases(&sbi->s_fc_lock)struct ext4_sb_info *sbi =EXT4_SB (sb);struct ext4_fc_dentry_update *fc_dentry, *fc_dentry_n;struct inode *inode; -struct ext4_inode_info *ei, *ei_n; +struct ext4_inode_info *ei;int ret;if (list_empty (&sbi->s_fc_dentry_q[FC_Q_MAIN ]))@@ -970,21 +1012,16 @@ __releases(&sbi->s_fc_lock)spin_lock (&sbi->s_fc_lock);continue ; } - - inode =NULL ; -list_for_each_entry_safe (ei, ei_n, &sbi->s_fc_q[FC_Q_MAIN ], - i_fc_list) { -if (ei->vfs_inode.i_ino == fc_dentry->fcd_ino) { - inode = &ei->vfs_inode; -break ; - } - }/* -* If we don't find inode in our list, then it was deleted, -* in which case, we don't need to record it's create tag. +* With fcd_dilist we need not loop in sbi->s_fc_q to get the +* corresponding inode pointer */ -if (!inode) -continue ; +WARN_ON (list_empty (&fc_dentry->fcd_dilist)); + ei =list_first_entry (&fc_dentry->fcd_dilist, + struct ext4_inode_info, i_fc_dilist); + inode = &ei->vfs_inode; +WARN_ON (inode->i_ino != fc_dentry->fcd_ino); +spin_unlock (&sbi->s_fc_lock);/* @@ -1228,6 +1265,7 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid) struct ext4_fc_dentry_update, fcd_list);list_del_init (&fc_dentry->fcd_list); +list_del_init (&fc_dentry->fcd_dilist);spin_unlock (&sbi->s_fc_lock); if (fc_dentry->fcd_name.name &&fs/ext4/fast_commit.h +1
-1@@ -109,6 +109,7 @@ struct ext4_fc_dentry_update {struct qstr fcd_name;/* Dirent name */ unsigned char fcd_iname[DNAME_INLINE_LEN ];/* Dirent name string */ struct list_head fcd_list; +struct list_head fcd_dilist; };struct ext4_fc_stats { --2.31.1
Quoted 5 lines · Ritesh Harjani
Please find the v2 of this patchset after addressing review comments from Harshad.
Quoted 7 lines
xfstests results(v2)
=====================
This has survived my fstests testing with -g 'auto' group forext4_4k_fc&ext4_4kconfigs withCONFIG_KASANenabled. I haven't found any regression due to this patch in my testing.[...]
Applied, thanks!
[1/1] ext4: Improve fast_commit performance and scalability
commit: b3998b3bc658017dc36c69a8224fb11a3d1b1382
Best regards,
Signature · 1 line
Theodore Ts'o <[email protected]>