nfsd: Fix a write performance regression
Subsystems (2)
[email protected]
maintainerPATCH 1/2 nfsd: Fix a write performance regression
From: Trond Myklebust <[email protected]>
The call to filemap_flush() in nfsd_file_put() is there to ensure that we clear out any writes belonging to a NFSv3 client relatively quickly and avoid situations where the file can't be evicted by the garbage collector. It also ensures that we detect write errors quickly.
The problem is this causes a regression in performance for some workloads.
So try to improve matters by deferring writeback until we're ready to close the file, and need to detect errors so that we can force the client to resend.
--- fs/nfsd/filecache.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
fs/nfsd/filecache.c +15 -3
@@ -235,6 +235,13 @@ nfsd_file_check_write_error(struct nfsd_file *nf)return filemap_check_wb_err (file->f_mapping,READ_ONCE (file->f_wb_err)); } +static void +nfsd_file_flush (struct nfsd_file *nf) +{ +if (nf->nf_file &&vfs_fsync (nf->nf_file,1 ) !=0 ) +nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id)); +} +static void nfsd_file_do_unhash (struct nfsd_file *nf) {
@@ -302,11 +309,14 @@ nfsd_file_put(struct nfsd_file *nf)return ; } -filemap_flush (nf->nf_file->f_mapping); is_hashed =test_bit (NFSD_FILE_HASHED , &nf->nf_flags) !=0 ; -nfsd_file_put_noref (nf); -if (is_hashed) +if (!is_hashed) { +nfsd_file_flush (nf); +nfsd_file_put_noref (nf); + }else { +nfsd_file_put_noref (nf);nfsd_file_schedule_laundrette (); + }if (atomic_long_read (&nfsd_filecache_count) >=NFSD_FILE_LRU_LIMIT )nfsd_file_gc (); }
@@ -327,6 +337,7 @@ nfsd_file_dispose_list(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);list_del (&nf->nf_lru); +nfsd_file_flush (nf);nfsd_file_put_noref (nf); } }
@@ -340,6 +351,7 @@ nfsd_file_dispose_list_sync(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);list_del (&nf->nf_lru); +nfsd_file_flush (nf);if (!refcount_dec_and_test (&nf->nf_ref))continue ;if (nfsd_file_free (nf))
Signature · 1 line
2.35.1
[email protected]
maintainerPATCH 2/2 nfsd: Clean up nfsd_file_put()
From: Trond Myklebust <[email protected]>
Make it a little less racy, by removing the refcount_read() test. Then remove the redundant 'is_hashed' variable.
--- fs/nfsd/filecache.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
fs/nfsd/filecache.c +3 -10
@@ -301,21 +301,14 @@ nfsd_file_put_noref(struct nfsd_file *nf)void nfsd_file_put (struct nfsd_file *nf) { -bool is_hashed; -set_bit (NFSD_FILE_REFERENCED , &nf->nf_flags); -if (refcount_read (&nf->nf_ref) >2 || !nf->nf_file) { -nfsd_file_put_noref (nf); -return ; - } - - is_hashed =test_bit (NFSD_FILE_HASHED , &nf->nf_flags) !=0 ; -if (!is_hashed) { +if (test_bit (NFSD_FILE_HASHED , &nf->nf_flags) ==0 ) {nfsd_file_flush (nf);nfsd_file_put_noref (nf); }else {nfsd_file_put_noref (nf); -nfsd_file_schedule_laundrette (); +if (nf->nf_file) +nfsd_file_schedule_laundrette (); }if (atomic_long_read (&nfsd_filecache_count) >=NFSD_FILE_LRU_LIMIT )nfsd_file_gc ();
Signature · 1 line
2.35.1
Quoted 10 lines · On Thu 31-03-22 09:54:01, [email protected] wrote:
From: Trond Myklebust <[email protected]>
The call to
filemap_flush()innfsd_file_put()is there to ensure that we clear out any writes belonging to a NFSv3 client relatively quickly and avoid situations where the file can't be evicted by the garbage collector. It also ensures that we detect write errors quickly.The problem is this causes a regression in performance for some workloads.
Quoted 7 lines
So try to improve matters by deferring writeback until we're ready to close the file, and need to detect errors so that we can force the client to resend.
Tested-by Jan Kara <[email protected]>Fixes b6669305d35a ("nfsd: Reduce the number of calls to nfsd_file_gc()")Signed-off-by Trond Myklebust <[email protected]>
Perphaps you could add:
To make life of Thorsten Leemhuis doing regression tracking simpler :) (I think his automation will close the regression once it sees a patch like that merged).
Honza
Quoted 59 lines
--- fs/nfsd/filecache.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)fs/nfsd/filecache.c +15
-3@@ -235,6 +235,13 @@ nfsd_file_check_write_error(struct nfsd_file *nf)return filemap_check_wb_err (file->f_mapping,READ_ONCE (file->f_wb_err)); } +static void +nfsd_file_flush (struct nfsd_file *nf) +{ +if (nf->nf_file &&vfs_fsync (nf->nf_file,1 ) !=0 ) +nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id)); +} +static void nfsd_file_do_unhash (struct nfsd_file *nf) {@@ -302,11 +309,14 @@ nfsd_file_put(struct nfsd_file *nf)return ; } -filemap_flush (nf->nf_file->f_mapping); is_hashed =test_bit (NFSD_FILE_HASHED , &nf->nf_flags) !=0 ; -nfsd_file_put_noref (nf); -if (is_hashed) +if (!is_hashed) { +nfsd_file_flush (nf); +nfsd_file_put_noref (nf); + }else { +nfsd_file_put_noref (nf);nfsd_file_schedule_laundrette (); + }if (atomic_long_read (&nfsd_filecache_count) >=NFSD_FILE_LRU_LIMIT )nfsd_file_gc (); }@@ -327,6 +337,7 @@ nfsd_file_dispose_list(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);list_del (&nf->nf_lru); +nfsd_file_flush (nf);nfsd_file_put_noref (nf); } }@@ -340,6 +351,7 @@ nfsd_file_dispose_list_sync(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);list_del (&nf->nf_lru); +nfsd_file_flush (nf);if (!refcount_dec_and_test (&nf->nf_ref))continue ;if (nfsd_file_free (nf))Signature · 1 line
2.35.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 23 lines · Jan Kara
Quoted 10 lines · On Thu 31-03-22 09:54:01, [email protected] wrote:
From: Trond Myklebust <[email protected]>
The call to
filemap_flush()innfsd_file_put()is there to ensure that we clear out any writes belonging to a NFSv3 client relatively quickly and avoid situations where the file can't be evicted by the garbage collector. It also ensures that we detect write errors quickly.The problem is this causes a regression in performance for some workloads.
Quoted 7 lines
So try to improve matters by deferring writeback until we're ready to close the file, and need to detect errors so that we can force the client to resend.
Tested-by Jan Kara <[email protected]>Fixes b6669305d35a ("nfsd: Reduce the number of calls to nfsd_file_gc()")Signed-off-by Trond Myklebust <[email protected]>
Quoted 7 lines
Perphaps you could add:
To make life of Thorsten Leemhuis doing regression tracking simpler :) (I think his automation will close the regression once it sees a patch like that merged).
I'll add that (no need to resend).
Quoted 54 lines
Honza
Quoted 51 lines
---
fs/nfsd/filecache.c| 18 +++++++++++++++---1 file changed, 15 insertions(+), 3 deletions(-)fs/nfsd/filecache.c +7
-0@@ -235,6 +235,13 @@ nfsd_file_check_write_error(struct nfsd_file *nf)return filemap_check_wb_err (file->f_mapping,READ_ONCE (file->f_wb_err)); } +static void +nfsd_file_flush (struct nfsd_file *nf) +{ +if (nf->nf_file &&vfs_fsync (nf->nf_file,1 ) !=0 ) +nfsd_reset_write_verifier (net_generic (nf->nf_net, nfsd_net_id)); +} +static void
nfsd_file_do_unhash(struct nfsd_file *nf)
{fs/nfsd/filecache.c +7
-3@@ -302,11 +309,14 @@ nfsd_file_put(struct nfsd_file *nf)return ; } -filemap_flush (nf->nf_file->f_mapping); is_hashed =test_bit (NFSD_FILE_HASHED , &nf->nf_flags) !=0 ; -nfsd_file_put_noref (nf); -if (is_hashed) +if (!is_hashed) { +nfsd_file_flush (nf); +nfsd_file_put_noref (nf); + }else { +nfsd_file_put_noref (nf);nfsd_file_schedule_laundrette (); + }if (atomic_long_read (&nfsd_filecache_count) >=NFSD_FILE_LRU_LIMIT )nfsd_file_gc (); }@@ -327,6 +337,7 @@ nfsd_file_dispose_list(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);list_del (&nf->nf_lru); +nfsd_file_flush (nf);nfsd_file_put_noref (nf); } }@@ -340,6 +351,7 @@ nfsd_file_dispose_list_sync(struct list_head *dispose)while (!list_empty (dispose)) { nf = list_first_entry(dispose, struct nfsd_file, nf_lru);
Quoted 11 lines
Quoted 8 lines
fs/nfsd/filecache.c +1
-0list_del (&nf->nf_lru); +nfsd_file_flush (nf);if (!refcount_dec_and_test (&nf->nf_ref))continue ;if (nfsd_file_free (nf))Signature · 1 line
2.35.1Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
--
Chuck Lever