2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* include/linux/backing-dev.h
|
|
|
|
*
|
|
|
|
* low-level device information and state which is propagated up through
|
|
|
|
* to high-level code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _LINUX_BACKING_DEV_H
|
|
|
|
#define _LINUX_BACKING_DEV_H
|
|
|
|
|
2008-04-30 14:54:32 +07:00
|
|
|
#include <linux/kernel.h>
|
2008-04-30 14:54:37 +07:00
|
|
|
#include <linux/fs.h>
|
2009-09-09 14:08:54 +07:00
|
|
|
#include <linux/sched.h>
|
2015-05-23 04:13:33 +07:00
|
|
|
#include <linux/blkdev.h>
|
2009-09-09 14:08:54 +07:00
|
|
|
#include <linux/writeback.h>
|
2015-05-23 04:13:37 +07:00
|
|
|
#include <linux/blk-cgroup.h>
|
2015-05-23 04:13:32 +07:00
|
|
|
#include <linux/backing-dev-defs.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-10-14 23:14:13 +07:00
|
|
|
int __must_check bdi_init(struct backing_dev_info *bdi);
|
2007-10-17 13:25:47 +07:00
|
|
|
void bdi_destroy(struct backing_dev_info *bdi);
|
|
|
|
|
2012-11-29 21:37:03 +07:00
|
|
|
__printf(3, 4)
|
2008-04-30 14:54:32 +07:00
|
|
|
int bdi_register(struct backing_dev_info *bdi, struct device *parent,
|
|
|
|
const char *fmt, ...);
|
|
|
|
int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
|
|
|
|
void bdi_unregister(struct backing_dev_info *bdi);
|
2015-01-14 16:42:32 +07:00
|
|
|
int __must_check bdi_setup_and_register(struct backing_dev_info *, char *);
|
2015-05-23 04:13:51 +07:00
|
|
|
void wb_start_writeback(struct bdi_writeback *wb, long nr_pages,
|
|
|
|
bool range_cyclic, enum wb_reason reason);
|
2010-06-08 23:15:15 +07:00
|
|
|
void bdi_start_background_writeback(struct backing_dev_info *bdi);
|
writeback: move backing_dev_info->wb_lock and ->worklist into bdi_writeback
Currently, a bdi (backing_dev_info) embeds single wb (bdi_writeback)
and the role of the separation is unclear. For cgroup support for
writeback IOs, a bdi will be updated to host multiple wb's where each
wb serves writeback IOs of a different cgroup on the bdi. To achieve
that, a wb should carry all states necessary for servicing writeback
IOs for a cgroup independently.
This patch moves bdi->wb_lock and ->worklist into wb.
* The lock protects bdi->worklist and bdi->wb.dwork scheduling. While
moving, rename it to wb->work_lock as wb->wb_lock is confusing.
Also, move wb->dwork downwards so that it's colocated with the new
->work_lock and ->work_list fields.
* bdi_writeback_workfn() -> wb_workfn()
bdi_wakeup_thread_delayed(bdi) -> wb_wakeup_delayed(wb)
bdi_wakeup_thread(bdi) -> wb_wakeup(wb)
bdi_queue_work(bdi, ...) -> wb_queue_work(wb, ...)
__bdi_start_writeback(bdi, ...) -> __wb_start_writeback(wb, ...)
get_next_work_item(bdi) -> get_next_work_item(wb)
* bdi_wb_shutdown() is renamed to wb_shutdown() and now takes @wb.
The function contained parts which belong to the containing bdi
rather than the wb itself - testing cap_writeback_dirty and
bdi_remove_from_list() invocation. Those are moved to
bdi_unregister().
* bdi_wb_{init|exit}() are renamed to wb_{init|exit}().
Initializations of the moved bdi->wb_lock and ->work_list are
relocated from bdi_init() to wb_init().
* As there's still only one bdi_writeback per backing_dev_info, all
uses of bdi->state are mechanically replaced with bdi->wb.state
introducing no behavior changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
2015-05-23 04:13:30 +07:00
|
|
|
void wb_workfn(struct work_struct *work);
|
|
|
|
void wb_wakeup_delayed(struct bdi_writeback *wb);
|
2008-04-30 14:54:32 +07:00
|
|
|
|
2009-09-09 14:08:54 +07:00
|
|
|
extern spinlock_t bdi_lock;
|
2009-09-02 14:19:46 +07:00
|
|
|
extern struct list_head bdi_list;
|
|
|
|
|
writeback: replace custom worker pool implementation with unbound workqueue
Writeback implements its own worker pool - each bdi can be associated
with a worker thread which is created and destroyed dynamically. The
worker thread for the default bdi is always present and serves as the
"forker" thread which forks off worker threads for other bdis.
there's no reason for writeback to implement its own worker pool when
using unbound workqueue instead is much simpler and more efficient.
This patch replaces custom worker pool implementation in writeback
with an unbound workqueue.
The conversion isn't too complicated but the followings are worth
mentioning.
* bdi_writeback->last_active, task and wakeup_timer are removed.
delayed_work ->dwork is added instead. Explicit timer handling is
no longer necessary. Everything works by either queueing / modding
/ flushing / canceling the delayed_work item.
* bdi_writeback_thread() becomes bdi_writeback_workfn() which runs off
bdi_writeback->dwork. On each execution, it processes
bdi->work_list and reschedules itself if there are more things to
do.
The function also handles low-mem condition, which used to be
handled by the forker thread. If the function is running off a
rescuer thread, it only writes out limited number of pages so that
the rescuer can serve other bdis too. This preserves the flusher
creation failure behavior of the forker thread.
* INIT_LIST_HEAD(&bdi->bdi_list) is used to tell
bdi_writeback_workfn() about on-going bdi unregistration so that it
always drains work_list even if it's running off the rescuer. Note
that the original code was broken in this regard. Under memory
pressure, a bdi could finish unregistration with non-empty
work_list.
* The default bdi is no longer special. It now is treated the same as
any other bdi and bdi_cap_flush_forker() is removed.
* BDI_pending is no longer used. Removed.
* Some tracepoints become non-applicable. The following TPs are
removed - writeback_nothread, writeback_wake_thread,
writeback_wake_forker_thread, writeback_thread_start,
writeback_thread_stop.
Everything, including devices coming and going away and rescuer
operation under simulated memory pressure, seems to work fine in my
test setup.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
2013-04-02 09:08:06 +07:00
|
|
|
extern struct workqueue_struct *bdi_wq;
|
|
|
|
|
2015-05-23 04:13:45 +07:00
|
|
|
static inline bool wb_has_dirty_io(struct bdi_writeback *wb)
|
2009-09-09 14:08:54 +07:00
|
|
|
{
|
2015-05-23 04:13:45 +07:00
|
|
|
return test_bit(WB_has_dirty_io, &wb->state);
|
2009-09-09 14:08:54 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:47 +07:00
|
|
|
static inline bool bdi_has_dirty_io(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* @bdi->tot_write_bandwidth is guaranteed to be > 0 if there are
|
|
|
|
* any dirty wbs. See wb_update_write_bandwidth().
|
|
|
|
*/
|
|
|
|
return atomic_long_read(&bdi->tot_write_bandwidth);
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline void __add_wb_stat(struct bdi_writeback *wb,
|
|
|
|
enum wb_stat_item item, s64 amount)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
2015-05-23 04:13:27 +07:00
|
|
|
__percpu_counter_add(&wb->stat[item], amount, WB_STAT_BATCH);
|
2007-10-17 13:25:47 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline void __inc_wb_stat(struct bdi_writeback *wb,
|
|
|
|
enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
2015-05-23 04:13:27 +07:00
|
|
|
__add_wb_stat(wb, item, 1);
|
2007-10-17 13:25:47 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline void inc_wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
2015-05-23 04:13:27 +07:00
|
|
|
__inc_wb_stat(wb, item);
|
2007-10-17 13:25:47 +07:00
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline void __dec_wb_stat(struct bdi_writeback *wb,
|
|
|
|
enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
2015-05-23 04:13:27 +07:00
|
|
|
__add_wb_stat(wb, item, -1);
|
2007-10-17 13:25:47 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline void dec_wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
2015-05-23 04:13:27 +07:00
|
|
|
__dec_wb_stat(wb, item);
|
2007-10-17 13:25:47 +07:00
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline s64 wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
2015-05-23 04:13:27 +07:00
|
|
|
return percpu_counter_read_positive(&wb->stat[item]);
|
2007-10-17 13:25:47 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline s64 __wb_stat_sum(struct bdi_writeback *wb,
|
|
|
|
enum wb_stat_item item)
|
2007-10-17 13:25:47 +07:00
|
|
|
{
|
2015-05-23 04:13:27 +07:00
|
|
|
return percpu_counter_sum_positive(&wb->stat[item]);
|
2007-10-17 13:25:47 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline s64 wb_stat_sum(struct bdi_writeback *wb, enum wb_stat_item item)
|
2007-10-17 13:25:46 +07:00
|
|
|
{
|
2007-10-17 13:25:47 +07:00
|
|
|
s64 sum;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
2015-05-23 04:13:27 +07:00
|
|
|
sum = __wb_stat_sum(wb, item);
|
2007-10-17 13:25:47 +07:00
|
|
|
local_irq_restore(flags);
|
|
|
|
|
|
|
|
return sum;
|
2007-10-17 13:25:46 +07:00
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:27 +07:00
|
|
|
extern void wb_writeout_inc(struct bdi_writeback *wb);
|
2008-04-30 14:54:37 +07:00
|
|
|
|
2007-10-17 13:25:47 +07:00
|
|
|
/*
|
|
|
|
* maximal error of a stat counter.
|
|
|
|
*/
|
2015-05-23 04:13:27 +07:00
|
|
|
static inline unsigned long wb_stat_error(struct bdi_writeback *wb)
|
2007-10-17 13:25:46 +07:00
|
|
|
{
|
2007-10-17 13:25:47 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2015-05-23 04:13:27 +07:00
|
|
|
return nr_cpu_ids * WB_STAT_BATCH;
|
2007-10-17 13:25:47 +07:00
|
|
|
#else
|
|
|
|
return 1;
|
|
|
|
#endif
|
2007-10-17 13:25:46 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:54:35 +07:00
|
|
|
int bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_ratio);
|
2008-04-30 14:54:36 +07:00
|
|
|
int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
|
2008-04-30 14:54:35 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Flags in backing_dev_info::capability
|
2008-04-30 14:54:37 +07:00
|
|
|
*
|
|
|
|
* The first three flags control whether dirty pages will contribute to the
|
|
|
|
* VM's accounting and whether writepages() should be called for dirty pages
|
|
|
|
* (something that would not, for example, be appropriate for ramfs)
|
|
|
|
*
|
|
|
|
* WARNING: these flags are closely related and should not normally be
|
|
|
|
* used separately. The BDI_CAP_NO_ACCT_AND_WRITEBACK combines these
|
|
|
|
* three flags into a single convenience macro.
|
|
|
|
*
|
|
|
|
* BDI_CAP_NO_ACCT_DIRTY: Dirty pages shouldn't contribute to accounting
|
|
|
|
* BDI_CAP_NO_WRITEBACK: Don't write pages back
|
|
|
|
* BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages
|
mm/page-writeback.c: add strictlimit feature
The feature prevents mistrusted filesystems (ie: FUSE mounts created by
unprivileged users) to grow a large number of dirty pages before
throttling. For such filesystems balance_dirty_pages always check bdi
counters against bdi limits. I.e. even if global "nr_dirty" is under
"freerun", it's not allowed to skip bdi checks. The only use case for now
is fuse: it sets bdi max_ratio to 1% by default and system administrators
are supposed to expect that this limit won't be exceeded.
The feature is on if a BDI is marked by BDI_CAP_STRICTLIMIT flag. A
filesystem may set the flag when it initializes its BDI.
The problematic scenario comes from the fact that nobody pays attention to
the NR_WRITEBACK_TEMP counter (i.e. number of pages under fuse
writeback). The implementation of fuse writeback releases original page
(by calling end_page_writeback) almost immediately. A fuse request queued
for real processing bears a copy of original page. Hence, if userspace
fuse daemon doesn't finalize write requests in timely manner, an
aggressive mmap writer can pollute virtually all memory by those temporary
fuse page copies. They are carefully accounted in NR_WRITEBACK_TEMP, but
nobody cares.
To make further explanations shorter, let me use "NR_WRITEBACK_TEMP
problem" as a shortcut for "a possibility of uncontrolled grow of amount
of RAM consumed by temporary pages allocated by kernel fuse to process
writeback".
The problem was very easy to reproduce. There is a trivial example
filesystem implementation in fuse userspace distribution: fusexmp_fh.c. I
added "sleep(1);" to the write methods, then recompiled and mounted it.
Then created a huge file on the mount point and run a simple program which
mmap-ed the file to a memory region, then wrote a data to the region. An
hour later I observed almost all RAM consumed by fuse writeback. Since
then some unrelated changes in kernel fuse made it more difficult to
reproduce, but it is still possible now.
Putting this theoretical happens-in-the-lab thing aside, there is another
thing that really hurts real world (FUSE) users. This is write-through
page cache policy FUSE currently uses. I.e. handling write(2), kernel
fuse populates page cache and flushes user data to the server
synchronously. This is excessively suboptimal. Pavel Emelyanov's patches
("writeback cache policy") solve the problem, but they also make resolving
NR_WRITEBACK_TEMP problem absolutely necessary. Otherwise, simply copying
a huge file to a fuse mount would result in memory starvation. Miklos,
the maintainer of FUSE, believes strictlimit feature the way to go.
And eventually putting FUSE topics aside, there is one more use-case for
strictlimit feature. Using a slow USB stick (mass storage) in a machine
with huge amount of RAM installed is a well-known pain. Let's make simple
computations. Assuming 64GB of RAM installed, existing implementation of
balance_dirty_pages will start throttling only after 9.6GB of RAM becomes
dirty (freerun == 15% of total RAM). So, the command "cp 9GB_file
/media/my-usb-storage/" may return in a few seconds, but subsequent
"umount /media/my-usb-storage/" will take more than two hours if effective
throughput of the storage is, to say, 1MB/sec.
After inclusion of strictlimit feature, it will be trivial to add a knob
(e.g. /sys/devices/virtual/bdi/x:y/strictlimit) to enable it on demand.
Manually or via udev rule. May be I'm wrong, but it seems to be quite a
natural desire to limit the amount of dirty memory for some devices we are
not fully trust (in the sense of sustainable throughput).
[akpm@linux-foundation.org: fix warning in page-writeback.c]
Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-09-12 04:22:46 +07:00
|
|
|
* BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold.
|
2015-05-23 04:13:36 +07:00
|
|
|
*
|
|
|
|
* BDI_CAP_CGROUP_WRITEBACK: Supports cgroup-aware writeback.
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2008-04-30 14:54:37 +07:00
|
|
|
#define BDI_CAP_NO_ACCT_DIRTY 0x00000001
|
|
|
|
#define BDI_CAP_NO_WRITEBACK 0x00000002
|
2015-01-14 16:42:32 +07:00
|
|
|
#define BDI_CAP_NO_ACCT_WB 0x00000004
|
|
|
|
#define BDI_CAP_STABLE_WRITES 0x00000008
|
|
|
|
#define BDI_CAP_STRICTLIMIT 0x00000010
|
2015-05-23 04:13:36 +07:00
|
|
|
#define BDI_CAP_CGROUP_WRITEBACK 0x00000020
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:54:37 +07:00
|
|
|
#define BDI_CAP_NO_ACCT_AND_WRITEBACK \
|
|
|
|
(BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB)
|
|
|
|
|
2010-04-25 13:54:42 +07:00
|
|
|
extern struct backing_dev_info noop_backing_dev_info;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
int writeback_in_progress(struct backing_dev_info *bdi);
|
|
|
|
|
2015-05-23 04:13:33 +07:00
|
|
|
static inline struct backing_dev_info *inode_to_bdi(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct super_block *sb;
|
|
|
|
|
|
|
|
if (!inode)
|
|
|
|
return &noop_backing_dev_info;
|
|
|
|
|
|
|
|
sb = inode->i_sb;
|
|
|
|
#ifdef CONFIG_BLOCK
|
|
|
|
if (sb_is_blkdev_sb(sb))
|
|
|
|
return blk_get_backing_dev_info(I_BDEV(inode));
|
|
|
|
#endif
|
|
|
|
return sb->s_bdi;
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:41 +07:00
|
|
|
static inline int wb_congested(struct bdi_writeback *wb, int cong_bits)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2015-05-23 04:13:41 +07:00
|
|
|
struct backing_dev_info *bdi = wb->bdi;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2015-05-23 04:13:41 +07:00
|
|
|
if (bdi->congested_fn)
|
|
|
|
return bdi->congested_fn(bdi->congested_data, cong_bits);
|
|
|
|
return wb->congested->state & cong_bits;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2009-07-09 19:52:32 +07:00
|
|
|
long congestion_wait(int sync, long timeout);
|
2010-10-27 04:21:45 +07:00
|
|
|
long wait_iff_congested(struct zone *zone, int sync, long timeout);
|
2012-08-01 06:41:52 +07:00
|
|
|
int pdflush_proc_obsolete(struct ctl_table *table, int write,
|
|
|
|
void __user *buffer, size_t *lenp, loff_t *ppos);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
bdi: allow block devices to say that they require stable page writes
This patchset ("stable page writes, part 2") makes some key
modifications to the original 'stable page writes' patchset. First, it
provides creators (devices and filesystems) of a backing_dev_info a flag
that declares whether or not it is necessary to ensure that page
contents cannot change during writeout. It is no longer assumed that
this is true of all devices (which was never true anyway). Second, the
flag is used to relaxed the wait_on_page_writeback calls so that wait
only occurs if the device needs it. Third, it fixes up the remaining
disk-backed filesystems to use this improved conditional-wait logic to
provide stable page writes on those filesystems.
It is hoped that (for people not using checksumming devices, anyway)
this patchset will give back unnecessary performance decreases since the
original stable page write patchset went into 3.0. Sorry about not
fixing it sooner.
Complaints were registered by several people about the long write
latencies introduced by the original stable page write patchset.
Generally speaking, the kernel ought to allocate as little extra memory
as possible to facilitate writeout, but for people who simply cannot
wait, a second page stability strategy is (re)introduced: snapshotting
page contents. The waiting behavior is still the default strategy; to
enable page snapshotting, a superblock flag (MS_SNAP_STABLE) must be
set. This flag is used to bandaid^Henable stable page writeback on
ext3[1], and is not used anywhere else.
Given that there are already a few storage devices and network FSes that
have rolled their own page stability wait/page snapshot code, it would
be nice to move towards consolidating all of these. It seems possible
that iscsi and raid5 may wish to use the new stable page write support
to enable zero-copy writeout.
Thank you to Jan Kara for helping fix a couple more filesystems.
Per Andrew Morton's request, here are the result of using dbench to measure
latencies on ext2:
3.8.0-rc3:
Operation Count AvgLat MaxLat
----------------------------------------
WriteX 109347 0.028 59.817
ReadX 347180 0.004 3.391
Flush 15514 29.828 287.283
Throughput 57.429 MB/sec 4 clients 4 procs max_latency=287.290 ms
3.8.0-rc3 + patches:
WriteX 105556 0.029 4.273
ReadX 335004 0.005 4.112
Flush 14982 30.540 298.634
Throughput 55.4496 MB/sec 4 clients 4 procs max_latency=298.650 ms
As you can see, for ext2 the maximum write latency decreases from ~60ms
on a laptop hard disk to ~4ms. I'm not sure why the flush latencies
increase, though I suspect that being able to dirty pages faster gives
the flusher more work to do.
On ext4, the average write latency decreases as well as all the maximum
latencies:
3.8.0-rc3:
WriteX 85624 0.152 33.078
ReadX 272090 0.010 61.210
Flush 12129 36.219 168.260
Throughput 44.8618 MB/sec 4 clients 4 procs max_latency=168.276 ms
3.8.0-rc3 + patches:
WriteX 86082 0.141 30.928
ReadX 273358 0.010 36.124
Flush 12214 34.800 165.689
Throughput 44.9941 MB/sec 4 clients 4 procs max_latency=165.722 ms
XFS seems to exhibit similar latency improvements as ext2:
3.8.0-rc3:
WriteX 125739 0.028 104.343
ReadX 399070 0.005 4.115
Flush 17851 25.004 131.390
Throughput 66.0024 MB/sec 4 clients 4 procs max_latency=131.406 ms
3.8.0-rc3 + patches:
WriteX 123529 0.028 6.299
ReadX 392434 0.005 4.287
Flush 17549 25.120 188.687
Throughput 64.9113 MB/sec 4 clients 4 procs max_latency=188.704 ms
...and btrfs, just to round things out, also shows some latency
decreases:
3.8.0-rc3:
WriteX 67122 0.083 82.355
ReadX 212719 0.005 2.828
Flush 9547 47.561 147.418
Throughput 35.3391 MB/sec 4 clients 4 procs max_latency=147.433 ms
3.8.0-rc3 + patches:
WriteX 64898 0.101 71.631
ReadX 206673 0.005 7.123
Flush 9190 47.963 219.034
Throughput 34.0795 MB/sec 4 clients 4 procs max_latency=219.044 ms
Before this patchset, all filesystems would block, regardless of whether
or not it was necessary. ext3 would wait, but still generate occasional
checksum errors. The network filesystems were left to do their own
thing, so they'd wait too.
After this patchset, all the disk filesystems except ext3 and btrfs will
wait only if the hardware requires it. ext3 (if necessary) snapshots
pages instead of blocking, and btrfs provides its own bdi so the mm will
never wait. Network filesystems haven't been touched, so either they
provide their own wait code, or they don't block at all. The blocking
behavior is back to what it was before 3.0 if you don't have a disk
requiring stable page writes.
This patchset has been tested on 3.8.0-rc3 on x64 with ext3, ext4, and
xfs. I've spot-checked 3.8.0-rc4 and seem to be getting the same
results as -rc3.
[1] The alternative fixes to ext3 include fixing the locking order and
page bit handling like we did for ext4 (but then why not just use
ext4?), or setting PG_writeback so early that ext3 becomes extremely
slow. I tried that, but the number of write()s I could initiate dropped
by nearly an order of magnitude. That was a bit much even for the
author of the stable page series! :)
This patch:
Creates a per-backing-device flag that tracks whether or not pages must
be held immutable during writeout. Eventually it will be used to waive
wait_for_page_writeback() if nothing requires stable pages.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-22 07:42:48 +07:00
|
|
|
static inline bool bdi_cap_stable_pages_required(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return bdi->capabilities & BDI_CAP_STABLE_WRITES;
|
|
|
|
}
|
|
|
|
|
2008-04-30 14:54:37 +07:00
|
|
|
static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return !(bdi->capabilities & BDI_CAP_NO_WRITEBACK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool bdi_cap_account_dirty(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return !(bdi->capabilities & BDI_CAP_NO_ACCT_DIRTY);
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:54:37 +07:00
|
|
|
static inline bool bdi_cap_account_writeback(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
/* Paranoia: BDI_CAP_NO_WRITEBACK implies BDI_CAP_NO_ACCT_WB */
|
|
|
|
return !(bdi->capabilities & (BDI_CAP_NO_ACCT_WB |
|
|
|
|
BDI_CAP_NO_WRITEBACK));
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:54:37 +07:00
|
|
|
static inline bool mapping_cap_writeback_dirty(struct address_space *mapping)
|
|
|
|
{
|
2015-01-14 16:42:36 +07:00
|
|
|
return bdi_cap_writeback_dirty(inode_to_bdi(mapping->host));
|
2008-04-30 14:54:37 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-04-30 14:54:37 +07:00
|
|
|
static inline bool mapping_cap_account_dirty(struct address_space *mapping)
|
|
|
|
{
|
2015-01-14 16:42:36 +07:00
|
|
|
return bdi_cap_account_dirty(inode_to_bdi(mapping->host));
|
2008-04-30 14:54:37 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2009-09-09 14:08:54 +07:00
|
|
|
static inline int bdi_sched_wait(void *word)
|
|
|
|
{
|
|
|
|
schedule();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:36 +07:00
|
|
|
#ifdef CONFIG_CGROUP_WRITEBACK
|
|
|
|
|
2015-05-23 04:13:37 +07:00
|
|
|
struct bdi_writeback_congested *
|
|
|
|
wb_congested_get_create(struct backing_dev_info *bdi, int blkcg_id, gfp_t gfp);
|
|
|
|
void wb_congested_put(struct bdi_writeback_congested *congested);
|
|
|
|
struct bdi_writeback *wb_get_create(struct backing_dev_info *bdi,
|
|
|
|
struct cgroup_subsys_state *memcg_css,
|
|
|
|
gfp_t gfp);
|
|
|
|
void __inode_attach_wb(struct inode *inode, struct page *page);
|
|
|
|
void wb_memcg_offline(struct mem_cgroup *memcg);
|
|
|
|
void wb_blkcg_offline(struct blkcg *blkcg);
|
2015-05-23 04:13:44 +07:00
|
|
|
int inode_congested(struct inode *inode, int cong_bits);
|
2015-05-23 04:13:37 +07:00
|
|
|
|
2015-05-23 04:13:36 +07:00
|
|
|
/**
|
|
|
|
* inode_cgwb_enabled - test whether cgroup writeback is enabled on an inode
|
|
|
|
* @inode: inode of interest
|
|
|
|
*
|
|
|
|
* cgroup writeback requires support from both the bdi and filesystem.
|
|
|
|
* Test whether @inode has both.
|
|
|
|
*/
|
|
|
|
static inline bool inode_cgwb_enabled(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct backing_dev_info *bdi = inode_to_bdi(inode);
|
|
|
|
|
|
|
|
return bdi_cap_account_dirty(bdi) &&
|
|
|
|
(bdi->capabilities & BDI_CAP_CGROUP_WRITEBACK) &&
|
|
|
|
(inode->i_sb->s_type->fs_flags & FS_CGROUP_WRITEBACK);
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:37 +07:00
|
|
|
/**
|
|
|
|
* wb_tryget - try to increment a wb's refcount
|
|
|
|
* @wb: bdi_writeback to get
|
|
|
|
*/
|
|
|
|
static inline bool wb_tryget(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
if (wb != &wb->bdi->wb)
|
|
|
|
return percpu_ref_tryget(&wb->refcnt);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wb_get - increment a wb's refcount
|
|
|
|
* @wb: bdi_writeback to get
|
|
|
|
*/
|
|
|
|
static inline void wb_get(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
if (wb != &wb->bdi->wb)
|
|
|
|
percpu_ref_get(&wb->refcnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wb_put - decrement a wb's refcount
|
|
|
|
* @wb: bdi_writeback to put
|
|
|
|
*/
|
|
|
|
static inline void wb_put(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
if (wb != &wb->bdi->wb)
|
|
|
|
percpu_ref_put(&wb->refcnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wb_find_current - find wb for %current on a bdi
|
|
|
|
* @bdi: bdi of interest
|
|
|
|
*
|
|
|
|
* Find the wb of @bdi which matches both the memcg and blkcg of %current.
|
|
|
|
* Must be called under rcu_read_lock() which protects the returend wb.
|
|
|
|
* NULL if not found.
|
|
|
|
*/
|
|
|
|
static inline struct bdi_writeback *wb_find_current(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
struct cgroup_subsys_state *memcg_css;
|
|
|
|
struct bdi_writeback *wb;
|
|
|
|
|
|
|
|
memcg_css = task_css(current, memory_cgrp_id);
|
|
|
|
if (!memcg_css->parent)
|
|
|
|
return &bdi->wb;
|
|
|
|
|
|
|
|
wb = radix_tree_lookup(&bdi->cgwb_tree, memcg_css->id);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* %current's blkcg equals the effective blkcg of its memcg. No
|
|
|
|
* need to use the relatively expensive cgroup_get_e_css().
|
|
|
|
*/
|
|
|
|
if (likely(wb && wb->blkcg_css == task_css(current, blkio_cgrp_id)))
|
|
|
|
return wb;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wb_get_create_current - get or create wb for %current on a bdi
|
|
|
|
* @bdi: bdi of interest
|
|
|
|
* @gfp: allocation mask
|
|
|
|
*
|
|
|
|
* Equivalent to wb_get_create() on %current's memcg. This function is
|
|
|
|
* called from a relatively hot path and optimizes the common cases using
|
|
|
|
* wb_find_current().
|
|
|
|
*/
|
|
|
|
static inline struct bdi_writeback *
|
|
|
|
wb_get_create_current(struct backing_dev_info *bdi, gfp_t gfp)
|
|
|
|
{
|
|
|
|
struct bdi_writeback *wb;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
wb = wb_find_current(bdi);
|
|
|
|
if (wb && unlikely(!wb_tryget(wb)))
|
|
|
|
wb = NULL;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (unlikely(!wb)) {
|
|
|
|
struct cgroup_subsys_state *memcg_css;
|
|
|
|
|
|
|
|
memcg_css = task_get_css(current, memory_cgrp_id);
|
|
|
|
wb = wb_get_create(bdi, memcg_css, gfp);
|
|
|
|
css_put(memcg_css);
|
|
|
|
}
|
|
|
|
return wb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* inode_attach_wb - associate an inode with its wb
|
|
|
|
* @inode: inode of interest
|
|
|
|
* @page: page being dirtied (may be NULL)
|
|
|
|
*
|
|
|
|
* If @inode doesn't have its wb, associate it with the wb matching the
|
|
|
|
* memcg of @page or, if @page is NULL, %current. May be called w/ or w/o
|
|
|
|
* @inode->i_lock.
|
|
|
|
*/
|
|
|
|
static inline void inode_attach_wb(struct inode *inode, struct page *page)
|
|
|
|
{
|
|
|
|
if (!inode->i_wb)
|
|
|
|
__inode_attach_wb(inode, page);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* inode_detach_wb - disassociate an inode from its wb
|
|
|
|
* @inode: inode of interest
|
|
|
|
*
|
|
|
|
* @inode is being freed. Detach from its wb.
|
|
|
|
*/
|
|
|
|
static inline void inode_detach_wb(struct inode *inode)
|
|
|
|
{
|
|
|
|
if (inode->i_wb) {
|
|
|
|
wb_put(inode->i_wb);
|
|
|
|
inode->i_wb = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* inode_to_wb - determine the wb of an inode
|
|
|
|
* @inode: inode of interest
|
|
|
|
*
|
|
|
|
* Returns the wb @inode is currently associated with.
|
|
|
|
*/
|
|
|
|
static inline struct bdi_writeback *inode_to_wb(struct inode *inode)
|
|
|
|
{
|
|
|
|
return inode->i_wb;
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:50 +07:00
|
|
|
struct wb_iter {
|
|
|
|
int start_blkcg_id;
|
|
|
|
struct radix_tree_iter tree_iter;
|
|
|
|
void **slot;
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline struct bdi_writeback *__wb_iter_next(struct wb_iter *iter,
|
|
|
|
struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
struct radix_tree_iter *titer = &iter->tree_iter;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
|
|
|
|
|
|
if (iter->start_blkcg_id >= 0) {
|
|
|
|
iter->slot = radix_tree_iter_init(titer, iter->start_blkcg_id);
|
|
|
|
iter->start_blkcg_id = -1;
|
|
|
|
} else {
|
|
|
|
iter->slot = radix_tree_next_slot(iter->slot, titer, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!iter->slot)
|
|
|
|
iter->slot = radix_tree_next_chunk(&bdi->cgwb_tree, titer, 0);
|
|
|
|
if (iter->slot)
|
|
|
|
return *iter->slot;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct bdi_writeback *__wb_iter_init(struct wb_iter *iter,
|
|
|
|
struct backing_dev_info *bdi,
|
|
|
|
int start_blkcg_id)
|
|
|
|
{
|
|
|
|
iter->start_blkcg_id = start_blkcg_id;
|
|
|
|
|
|
|
|
if (start_blkcg_id)
|
|
|
|
return __wb_iter_next(iter, bdi);
|
|
|
|
else
|
|
|
|
return &bdi->wb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* bdi_for_each_wb - walk all wb's of a bdi in ascending blkcg ID order
|
|
|
|
* @wb_cur: cursor struct bdi_writeback pointer
|
|
|
|
* @bdi: bdi to walk wb's of
|
|
|
|
* @iter: pointer to struct wb_iter to be used as iteration buffer
|
|
|
|
* @start_blkcg_id: blkcg ID to start iteration from
|
|
|
|
*
|
|
|
|
* Iterate @wb_cur through the wb's (bdi_writeback's) of @bdi in ascending
|
|
|
|
* blkcg ID order starting from @start_blkcg_id. @iter is struct wb_iter
|
|
|
|
* to be used as temp storage during iteration. rcu_read_lock() must be
|
|
|
|
* held throughout iteration.
|
|
|
|
*/
|
|
|
|
#define bdi_for_each_wb(wb_cur, bdi, iter, start_blkcg_id) \
|
|
|
|
for ((wb_cur) = __wb_iter_init(iter, bdi, start_blkcg_id); \
|
|
|
|
(wb_cur); (wb_cur) = __wb_iter_next(iter, bdi))
|
|
|
|
|
2015-05-23 04:13:36 +07:00
|
|
|
#else /* CONFIG_CGROUP_WRITEBACK */
|
|
|
|
|
|
|
|
static inline bool inode_cgwb_enabled(struct inode *inode)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:37 +07:00
|
|
|
static inline struct bdi_writeback_congested *
|
|
|
|
wb_congested_get_create(struct backing_dev_info *bdi, int blkcg_id, gfp_t gfp)
|
|
|
|
{
|
|
|
|
return bdi->wb.congested;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void wb_congested_put(struct bdi_writeback_congested *congested)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool wb_tryget(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void wb_get(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void wb_put(struct bdi_writeback *wb)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct bdi_writeback *wb_find_current(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return &bdi->wb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct bdi_writeback *
|
|
|
|
wb_get_create_current(struct backing_dev_info *bdi, gfp_t gfp)
|
|
|
|
{
|
|
|
|
return &bdi->wb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void inode_attach_wb(struct inode *inode, struct page *page)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void inode_detach_wb(struct inode *inode)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct bdi_writeback *inode_to_wb(struct inode *inode)
|
|
|
|
{
|
|
|
|
return &inode_to_bdi(inode)->wb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void wb_memcg_offline(struct mem_cgroup *memcg)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void wb_blkcg_offline(struct blkcg *blkcg)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:50 +07:00
|
|
|
struct wb_iter {
|
|
|
|
int next_id;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define bdi_for_each_wb(wb_cur, bdi, iter, start_blkcg_id) \
|
|
|
|
for ((iter)->next_id = (start_blkcg_id); \
|
|
|
|
({ (wb_cur) = !(iter)->next_id++ ? &(bdi)->wb : NULL; }); )
|
|
|
|
|
2015-05-23 04:13:44 +07:00
|
|
|
static inline int inode_congested(struct inode *inode, int cong_bits)
|
|
|
|
{
|
|
|
|
return wb_congested(&inode_to_bdi(inode)->wb, cong_bits);
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:36 +07:00
|
|
|
#endif /* CONFIG_CGROUP_WRITEBACK */
|
|
|
|
|
2015-05-23 04:13:44 +07:00
|
|
|
static inline int inode_read_congested(struct inode *inode)
|
|
|
|
{
|
|
|
|
return inode_congested(inode, 1 << WB_sync_congested);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int inode_write_congested(struct inode *inode)
|
|
|
|
{
|
|
|
|
return inode_congested(inode, 1 << WB_async_congested);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int inode_rw_congested(struct inode *inode)
|
|
|
|
{
|
|
|
|
return inode_congested(inode, (1 << WB_sync_congested) |
|
|
|
|
(1 << WB_async_congested));
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:41 +07:00
|
|
|
static inline int bdi_congested(struct backing_dev_info *bdi, int cong_bits)
|
|
|
|
{
|
|
|
|
return wb_congested(&bdi->wb, cong_bits);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int bdi_read_congested(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return bdi_congested(bdi, 1 << WB_sync_congested);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int bdi_write_congested(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return bdi_congested(bdi, 1 << WB_async_congested);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int bdi_rw_congested(struct backing_dev_info *bdi)
|
|
|
|
{
|
|
|
|
return bdi_congested(bdi, (1 << WB_sync_congested) |
|
|
|
|
(1 << WB_async_congested));
|
|
|
|
}
|
|
|
|
|
2015-05-23 04:13:36 +07:00
|
|
|
#endif /* _LINUX_BACKING_DEV_H */
|