writeback: start-all allocation elimination
Subsystems (4)
cover writeback: start-all allocation elimination
This is on top of the parts of the previous series that have been queued up. I've posted the first patch in a reply to Jan last week, this is a more official posting. No changes, it works for me. Last patch is just a cleanup, finally killing off nr_pdflush_threads, 8 years after we deprecated it.
Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 b/fs/fs-writeback.c | 71 ++++++-------- b/include/linux/backing-dev-defs.h | 1 b/include/trace/events/writeback.h | 1 b/kernel/sysctl.c | 5 5 files changed, 35 insertions(+), 48 deletions(-)
Signature · 1 line
Jens Axboe
PATCH 1/2 writeback: eliminate work item allocation in bd_start_writeback()
Handle start-all writeback like we do periodic or kupdate style writeback - by marking the bdi_writeback as needing a full flush, and simply waking the thread. This eliminates the need to allocate and queue a specific work item just for this purpose.
After this change, we truly only ever have one of them running at any point in time. We mark the need to start all flushes, and the writeback thread will clear it once it has processed the request.
--- fs/fs-writeback.c | 71 +++++++++++++++++++--------------------- include/linux/backing-dev-defs.h | 1 + include/trace/events/writeback.h | 1 - 3 files changed, 35 insertions(+), 38 deletions(-)
fs/fs-writeback.c +34 -37
@@ -53,7 +53,6 @@ struct wb_writeback_work { unsigned int for_background:1; unsigned int for_sync:1; /* sync(2) WB_SYNC_ALL writeback */ unsigned int auto_free:1; /* free on completion */ - unsigned int start_all:1; /* nr_pages == 0 (all) writeback */enum wb_reason reason;/* why was writeback initiated? */ struct list_head list;/* pending work list */
@@ -947,8 +946,6 @@ static unsigned long get_nr_dirty_pages(void)static void wb_start_writeback (struct bdi_writeback *wb,enum wb_reason reason) { -struct wb_writeback_work *work; -if (!wb_has_dirty_io (wb))return ;
@@ -958,35 +955,14 @@ static void wb_start_writeback(struct bdi_writeback *wb, enum wb_reason reason)* high frequency, causing pointless allocations of tons of * work items and keeping the flusher threads busy retrieving * that work. Ensure that we only allow one of them pending and -* inflight at the time. It doesn't matter if we race a little -* bit on this, so use the faster separate test/set bit variants. +* inflight at the time. */ -if (test_bit (WB_start_all, &wb->state)) +if (test_bit (WB_start_all, &wb->state) || +test_and_set_bit (WB_start_all, &wb->state))return ; -set_bit (WB_start_all, &wb->state); - -/* -* This is WB_SYNC_NONE writeback, so if allocation fails just -* wakeup the thread for old dirty data writeback -*/ - work =kzalloc (sizeof (*work), -GFP_NOWAIT | __GFP_NOMEMALLOC | __GFP_NOWARN); -if (!work) { -clear_bit (WB_start_all, &wb->state); -trace_writeback_nowork (wb); -wb_wakeup (wb); -return ; - } - - work->sync_mode =WB_SYNC_NONE ; - work->nr_pages =wb_split_bdi_pages (wb,get_nr_dirty_pages ()); - work->range_cyclic =1 ; - work->reason = reason; - work->auto_free =1 ; - work->start_all =1 ; - -wb_queue_work (wb, work); + wb->start_all_reason = reason; +wb_wakeup (wb); }/**
@@ -1838,14 +1814,6 @@ static struct wb_writeback_work *get_next_work_item(struct bdi_writeback *wb)list_del_init (&work->list); }spin_unlock_bh (&wb->work_lock); - -/* -* Once we start processing a work item that had !nr_pages, -* clear the wb state bit for that so we can allow more. -*/ -if (work && work->start_all) -clear_bit (WB_start_all, &wb->state); -return work; }
@@ -1901,6 +1869,30 @@ static long wb_check_old_data_flush(struct bdi_writeback *wb)return 0 ; } +static long wb_check_start_all (struct bdi_writeback *wb) +{ +long nr_pages; + +if (!test_bit (WB_start_all, &wb->state)) +return 0 ; + + nr_pages =get_nr_dirty_pages (); +if (nr_pages) { +struct wb_writeback_work work = { + .nr_pages =wb_split_bdi_pages (wb, nr_pages), + .sync_mode =WB_SYNC_NONE , + .range_cyclic =1 , + .reason = wb->start_all_reason, + }; + + nr_pages =wb_writeback (wb, &work); + } + +clear_bit (WB_start_all, &wb->state); +return nr_pages; +} + +/* * Retrieve work items and do the writeback they describe */
@@ -1917,6 +1909,11 @@ static long wb_do_writeback(struct bdi_writeback *wb) }/* +* Check for a flush-everything request +*/ + wrote +=wb_check_start_all (wb); + +/* * Check for periodic writeback, kupdated() style */ wrote +=wb_check_old_data_flush (wb);
include/linux/backing-dev-defs.h +1 -0
@@ -116,6 +116,7 @@ struct bdi_writeback {struct fprop_local_percpu completions;int dirty_exceeded; +int start_all_reason;spinlock_t work_lock;/* protects work_list & dwork scheduling */ struct list_head work_list;
include/trace/events/writeback.h +0 -1
@@ -286,7 +286,6 @@ DEFINE_EVENT(writeback_class, name, \ TP_PROTO(struct bdi_writeback *wb), \ TP_ARGS(wb)) -DEFINE_WRITEBACK_EVENT(writeback_nowork); DEFINE_WRITEBACK_EVENT(writeback_wake_background); TRACE_EVENT(writeback_bdi_register,
Signature · 1 line
2.7.4
Re: [PATCH 1/2] writeback: eliminate work item allocation in bd_start_writeback()
Quoted 10 lines · Jens Axboe
Handle start-all writeback like we do periodic or kupdate style writeback - by marking the
bdi_writebackas needing a full flush, and simply waking the thread. This eliminates the need to allocate and queue a specific work item just for this purpose.After this change, we truly only ever have one of them running at any point in time. We mark the need to start all flushes, and the writeback thread will clear it once it has processed the request.
Signed-off-by Jens Axboe <[email protected]>
Just one nit below. You can add:
include/linux/backing-dev-defs.h struct bdi_writeback { · line 119
Quoted 9 lines
include/linux/backing-dev-defs.h +1
-0@@ -116,6 +116,7 @@ struct bdi_writeback {struct fprop_local_percpu completions;int dirty_exceeded; +int start_all_reason;
This should be 'enum wb_reason' instead of 'int'.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 1/2] writeback: eliminate work item allocation in bd_start_writeback()
Quoted 11 lines · Jan Kara
include/linux/backing-dev-defs.h struct bdi_writeback { · line 119
Quoted 9 lines
include/linux/backing-dev-defs.h +1
-0@@ -116,6 +116,7 @@ struct bdi_writeback {struct fprop_local_percpu completions;int dirty_exceeded; +int start_all_reason;This should be 'enum
wb_reason' instead of 'int'.
Yes good point, I'll move the enum and change 'start_all_reason' to be of type enum wb_reason.
Thanks for the review!
Signature · 1 line
Jens Axboe
PATCH 2/2 sysctl: remove /proc/sys/vm/nr_pdflush_threads
In reply to Jens AxboeThis tunable has been obsolete since 2.6.32, and writes to the file have been failing and complaining in dmesg since then:
nr_pdflush_threads exported in /proc is scheduled for removal
That was 8 years ago. Remove the file ABI obsolete notice, and the sysfs file.
--- Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 ----- kernel/sysctl.c | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads deleted +0 -5
@@ -1,5 +0,0 @@ -What: /proc/sys/vm/nr_pdflush_threads -Date: June 2012 -Contact: Wanpeng Li <[email protected]> -Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush - exported in /proc/sys/vm/ should be removed.
kernel/sysctl.c +0 -5
@@ -1345,11 +1345,6 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, }, { - .procname = "nr_pdflush_threads", - .mode = 0444 /* read-only */, - .proc_handler = pdflush_proc_obsolete, - }, - { .procname = "swappiness", .data = &vm_swappiness, .maxlen = sizeof(vm_swappiness),
Signature · 1 line
2.7.4
Re: [PATCH 2/2] sysctl: remove /proc/sys/vm/nr_pdflush_threads
Quoted 9 lines · Jens Axboe
This tunable has been obsolete since 2.6.32, and writes to the file have been failing and complaining in dmesg since then:
nr_pdflush_threadsexported in /proc is scheduled for removalThat was 8 years ago. Remove the file ABI obsolete notice, and the sysfs file.
Signed-off-by Jens Axboe <[email protected]>
Agreed. You can add:
Honza
Quoted 36 lines
--- Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 ----- kernel/sysctl.c | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threadsDocumentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads deleted +0
-5@@ -1,5 +0,0 @@ -What: /proc/sys/vm/nr_pdflush_threads -Date: June 2012 -Contact: Wanpeng Li <[email protected]> -Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush - exported in /proc/sys/vm/ should be removed.kernel/sysctl.c +0
-5@@ -1345,11 +1345,6 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, }, { - .procname = "nr_pdflush_threads", - .mode = 0444 /* read-only */, - .proc_handler = pdflush_proc_obsolete, - }, - { .procname = "swappiness", .data = &vm_swappiness, .maxlen = sizeof(vm_swappiness),Signature · 1 line
2.7.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 2/2] sysctl: remove /proc/sys/vm/nr_pdflush_threads
In reply to Jens AxboeHi Jens,
Quoted 31 lines · Jens Axboe
This tunable has been obsolete since 2.6.32, and writes to the file have been failing and complaining in dmesg since then:
nr_pdflush_threadsexported in /proc is scheduled for removalThat was 8 years ago. Remove the file ABI obsolete notice, and the sysfs file.
Signed-off-by Jens Axboe <[email protected]>--- Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 ----- kernel/sysctl.c | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threadsDocumentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads deleted +0
-5@@ -1,5 +0,0 @@ -What: /proc/sys/vm/nr_pdflush_threads -Date: June 2012 -Contact: Wanpeng Li <[email protected]> -Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush - exported in /proc/sys/vm/ should be removed.kernel/sysctl.c +0
-0
kernel/sysctl.c static struct ctl_table vm_table[] = { · line 1350
Quoted 6 lines
kernel/sysctl.c +0
-3@@ -1345,11 +1345,6 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, }, { - .procname = "nr_pdflush_threads", - .mode = 0444 /* read-only */, - .proc_handler = pdflush_proc_obsolete,
It seems you forgot to remove pdflush_proc_obsolete from:./include/linux/backing-dev.h./mm/backing-dev.c
Best regards,
Rakesh Pandit
Re: [PATCH 2/2] sysctl: remove /proc/sys/vm/nr_pdflush_threads
Quoted 36 lines · Rakesh Pandit
Hi Jens,
Quoted 33 lines · Jens Axboe
This tunable has been obsolete since 2.6.32, and writes to the file have been failing and complaining in dmesg since then:
nr_pdflush_threadsexported in /proc is scheduled for removalThat was 8 years ago. Remove the file ABI obsolete notice, and the sysfs file.
Signed-off-by Jens Axboe <[email protected]>--- Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 ----- kernel/sysctl.c | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threadsDocumentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads deleted +0
-5@@ -1,5 +0,0 @@ -What: /proc/sys/vm/nr_pdflush_threads -Date: June 2012 -Contact: Wanpeng Li <[email protected]> -Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush - exported in /proc/sys/vm/ should be removed.kernel/sysctl.c +0
-0@@ -1345,11 +1345,6 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, },
Quoted 8 lines
kernel/sysctl.c static struct ctl_table vm_table[] = { · line 1350
Quoted 4 lines
kernel/sysctl.c +0
-3{ - .procname = "nr_pdflush_threads", - .mode = 0444 /* read-only */, - .proc_handler = pdflush_proc_obsolete,It seems you forgot to remove
pdflush_proc_obsoletefrom:./include/linux/backing-dev.h./mm/backing-dev.c
Yeah, I missed that, thanks for letting me know. I've now removed them.
Signature · 1 line
Jens Axboe