16 Dec, 2009
2 commits
-
Commit 86b37281411cf1e9bc0a6b5406c45edb7bd9ea5d adds a check for
misaligned stacking offsets, but it's buggy since the defaults are 0.
Hence all dm devices that pass in a non-zero starting offset will
be marked as misaligned amd dm will complain.A real fix is coming, in the mean time disable the discard granularity
check so that users don't worry about dm reporting about misaligned
devices.Signed-off-by: Jens Axboe
-
* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block:
cfq: set workload as expired if it doesn't have any slice left
Fix a CFQ crash in "for-2.6.33" branch of block tree
cfq: Remove wait_request flag when idle time is being deleted
cfq-iosched: commenting non-obvious initialization
cfq-iosched: Take care of corner cases of group losing share due to deletion
cfq-iosched: Get rid of cfqq wait_busy_done flag
cfq: Optimization for close cooperating queue searching
block,xd: Delay allocation of DMA buffers until device is known
drbd: Following the hmac change to SHASH (see linux commit 8bd1209cfff)
cfq-iosched: reduce write depth only if sync was delayed
15 Dec, 2009
1 commit
-
When a group is resumed, if it doesn't have workload slice left,
we should set workload_expires as expired. Otherwise, we might
start from where we left in previous group by error.
Thanks the idea from Corrado.Signed-off-by: Gui Jianfeng
Signed-off-by: Jens Axboe
11 Dec, 2009
1 commit
-
I think my previous patch introduced a bug which can lead to CFQ hitting
BUG_ON().The offending commit in for-2.6.33 branch is.
commit 7667aa0630407bc07dc38dcc79d29cc0a65553c1
Author: Vivek Goyal
Date: Tue Dec 8 17:52:58 2009 -0500cfq-iosched: Take care of corner cases of group losing share due to deletion
While doing some stress testing on my box, I enountered following.
login: [ 3165.148841] BUG: scheduling while
atomic: swapper/0/0x10000100
[ 3165.149821] Modules linked in: cfq_iosched dm_multipath qla2xxx igb
scsi_transport_fc dm_snapshot [last unloaded: scsi_wait_scan]
[ 3165.149821] Pid: 0, comm: swapper Not tainted
2.6.32-block-for-33-merged-new #3
[ 3165.149821] Call Trace:
[ 3165.149821] [] __schedule_bug+0x5c/0x60
[ 3165.149821] [] ? __wake_up+0x44/0x4d
[ 3165.149821] [] schedule+0xe3/0x7bc
[ 3165.149821] [] ? cpumask_next+0x1d/0x1f
[ 3165.149821] [] ? cfq_dispatch_requests+0x6ba/0x93e
[cfq_iosched]
[ 3165.149821] [] __cond_resched+0x2a/0x35
[ 3165.149821] [] ? cfq_dispatch_requests+0x6ba/0x93e
[cfq_iosched]
[ 3165.149821] [] _cond_resched+0x2c/0x37
[ 3165.149821] [] is_valid_bugaddr+0x16/0x2f
[ 3165.149821] [] report_bug+0x18/0xac
[ 3165.149821] [] die+0x39/0x63
[ 3165.149821] [] do_trap+0x11a/0x129
[ 3165.149821] [] do_invalid_op+0x96/0x9f
[ 3165.149821] [] ? cfq_dispatch_requests+0x6ba/0x93e
[cfq_iosched]
[ 3165.149821] [] ? enqueue_task+0x5c/0x67
[ 3165.149821] [] ? task_rq_unlock+0x11/0x13
[ 3165.149821] [] ? try_to_wake_up+0x292/0x2a4
[ 3165.149821] [] invalid_op+0x15/0x20
[ 3165.149821] [] ? cfq_dispatch_requests+0x6ba/0x93e
[cfq_iosched]
[ 3165.149821] [] ? virt_to_head_page+0xe/0x2f
[ 3165.149821] [] blk_peek_request+0x191/0x1a7
[ 3165.149821] [] ? kobject_get+0x1a/0x21
[ 3165.149821] [] scsi_request_fn+0x82/0x3df
[ 3165.149821] [] ? bio_fs_destructor+0x15/0x17
[ 3165.149821] [] ? virt_to_head_page+0xe/0x2f
[ 3165.149821] [] __blk_run_queue+0x42/0x71
[ 3165.149821] [] blk_run_queue+0x26/0x3a
[ 3165.149821] [] scsi_run_queue+0x2de/0x375
[ 3165.149821] [] ? put_device+0x17/0x19
[ 3165.149821] [] scsi_next_command+0x3b/0x4b
[ 3165.149821] [] scsi_io_completion+0x1c9/0x3f5
[ 3165.149821] [] scsi_finish_command+0xb5/0xbeI think I have hit following BUG_ON() in cfq_dispatch_request().
BUG_ON(RB_EMPTY_ROOT(&cfqq->sort_list));
Please find attached the patch to fix it. I have done some stress testing
with it and have not seen it happening again.o We should wait on a queue even after slice expiry only if it is empty. If
queue is not empty then continue to expire it.o If we decide to keep the queue then make cfqq=NULL. Otherwise select_queue()
will return a valid cfqq and cfq_dispatch_request() can hit following
BUG_ON().BUG_ON(RB_EMPTY_ROOT(&cfqq->sort_list))
Reviewed-by: Jeff Moyer
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe
10 Dec, 2009
3 commits
-
Remove wait_request flag when idle time is being deleted, otherwise
it'll hit this path every time when a request is enqueued.Signed-off-by: Gui Jianfeng
Signed-off-by: Jens Axboe -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
... -
Added a comment to explain the initialization of last_delayed_sync.
Signed-off-by: Corrado Zoccolo
Acked-by: Jeff Moyer
Signed-off-by: Jens Axboe
09 Dec, 2009
4 commits
-
If there is a sequential reader running in a group, we wait for next request
to come in that group after slice expiry and once new request is in, we expire
the queue. Otherwise we delete the group from service tree and group looses
its fair share.So far I was marking a queue as wait_busy if it had consumed its slice and
it was last queue in the group. But this condition did not cover following
two cases.1.If a request completed and slice has not expired yet. Next request comes
in and is dispatched to disk. Now select_queue() hits and slice has expired.
This group will be deleted. Because request is still in the disk, this queue
will never get a chance to wait_busy.2.If request completed and slice has not expired yet. Before next request
comes in (delay due to think time), select_queue() hits and expires the
queue hence group. This queue never got a chance to wait busy.Gui was hitting the boundary condition 1 and not getting fairness numbers
proportional to weight.This patch puts the checks for above two conditions and improves the fairness
numbers for sequential workload on rotational media. Check in select_queue()
takes care of case 1 and additional check in should_wait_busy() takes care
of case 2.Reported-by: Gui Jianfeng
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Get rid of wait_busy_done flag. This flag only tells we were doing wait
busy on a queue and that queue got request so expire it. That information
can easily be obtained by (cfq_cfqq_wait_busy() && queue_is_not_empty). So
remove this flag and keep code simple.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
It doesn't make any sense to try to find out a close cooperating
queue if current cfqq is the only one in the group.Signed-off-by: Gui Jianfeng
Signed-off-by: Jens Axboe -
The introduction of ramp-up formula for async queue depths has
slowed down dirty page reclaim, by reducing async write performance.
This patch makes sure the formula kicks in only when sync request
was recently delayed.Signed-off-by: Corrado Zoccolo
Signed-off-by: Jens Axboe
08 Dec, 2009
1 commit
-
Fix a crash during boot reported by Jeff Moyer. Fix the issue of accessing
cfqq after freeing it.Reported-by: Jeff Moyer
Signed-off-by: Vivek Goyal
Reviewed-by: Jeff Moyer
Signed-off-by: Jens Axboe
07 Dec, 2009
1 commit
-
Signed-off-by: Stephen Rothwell
Signed-off-by: Jens Axboe
06 Dec, 2009
1 commit
-
After the merge of the IO controller patches, booting on my megaraid
box ran much slower. Vivek Goyal traced it down to megaraid discovery
creating tons of devices, each suffering a grace period when they later
kill that queue (if no device is found).So lets use call_rcu() to batch these deferred frees, instead of taking
the grace period hit for each one.Signed-off-by: Jens Axboe
04 Dec, 2009
26 commits
-
o Now issues of blkio controller and CFQ in module mode should be fixed.
Enable the cfq group scheduling support in module mode.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o One of the goals of block IO controller is that it should be able to
support mulitple io control policies, some of which be operational at
higher level in storage hierarchy.o To begin with, we had one io controlling policy implemented by CFQ, and
I hard coded the CFQ functions called by blkio. This created issues when
CFQ is compiled as module.o This patch implements a basic dynamic io controlling policy registration
functionality in blkio. This is similar to elevator functionality where
ioschedulers register the functions dynamically.o Now in future, when more IO controlling policies are implemented, these
can dynakically register with block IO controller.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o blkio controller is inside the kernel and cfq makes use of interfaces
exported by blkio. CFQ can be a module too, hence export symbols used
by CFQ.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
With CLONE_IO, parent's io_context->nr_tasks is incremented, but never
decremented whenever copy_process() fails afterwards, which prevents
exit_io_context() from calling IO schedulers exit functions.Give a task_struct to exit_io_context(), and call exit_io_context() instead of
put_io_context() in copy_process() cleanup path.Signed-off-by: Louis Rilling
Signed-off-by: Jens Axboe -
With CLONE_IO, copy_io() increments both ioc->refcount and ioc->nr_tasks.
However exit_io_context() only decrements ioc->refcount if ioc->nr_tasks
reaches 0.Always call put_io_context() in exit_io_context().
Signed-off-by: Louis Rilling
Signed-off-by: Jens Axboe -
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.Signed-off-by: André Goddard Rosa
Signed-off-by: Jiri Kosina -
cfq_arm_slice_timer() has logic to disable idle window for SSD device. The same
thing should be done at cfq_select_queue() too, otherwise we will still see
idle window. This makes the nonrot check logic consistent in cfq.
Tests in a intel SSD with low_latency knob close, below patch can triple disk
thoughput for muti-thread sequential read.Signed-off-by: Shaohua Li
Signed-off-by: Jens Axboe -
It's currently not an allowed configuration, so express that in Kconfig.
Signed-off-by: Jens Axboe
-
They should not be declared inside some other file that's not related
to CFQ.Signed-off-by: Jens Axboe
-
Signed-off-by: Jens Axboe
-
o rq_noidle() is supposed to tell cfq that do not expect a request after this
one, hence don't idle. But this does not seem to work very well. For example
for direct random readers, rq_noidle = 1 but there is next request coming
after this. Not idling, leads to a group not getting its share even if
group_isolation=1.o The right solution for this issue is to scan the higher layers and set
right flag (WRITE_SYNC or WRITE_ODIRECT). For the time being, this single
line fix helps. This should not have any significant impact when we are
not using cgroups. I will later figure out IO paths in higher layer and
fix it.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o If a group is running only a random reader, then it will not have enough
traffic to keep disk busy and we will reduce overall throughput. This
should result in better latencies for random reader though. If we don't
idle on random reader service tree, then this random reader will experience
large latencies if there are other groups present in system with sequential
readers running in these.o One solution suggested by corrado is that by default keep the random readers
or sync-noidle workload in root group so that during one dispatch round
we idle only once on sync-noidle tree. This means that all the sync-idle
workload queues will be in their respective group and we will see service
differentiation in those but not on sync-noidle workload.o Provide a tunable group_isolation. If set, this will make sure that even
sync-noidle queues go in their respective group and we wait on these. This
provides stronger isolation between groups but at the expense of throughput
if group does not have enough traffic to keep the disk busy.o By default group_isolation = 0
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Async queues are not per group. Instead these are system wide and maintained
in root group. Hence their workload slice length should be calculated
based on total number of queues in the system and not just queues in the
root group.o As root group's default weight is 1000, make sure to charge async queue
more in terms of vtime so that it does not get more time on disk because
root group has higher weight.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o If a queue consumes its slice and then gets deleted from service tree, its
associated group will also get deleted from service tree if this was the
only queue in the group. That will make group loose its share.o For the queues on which we have idling on and if these have used their
slice, wait a bit for these queues to get backlogged again and then
expire these queues so that group does not loose its share.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Propagate blkio cgroup weight updation to associated cfq groups.
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o If a task changes cgroup, drop reference to the cfqq associated with io
context and set cfqq pointer stored in ioc to NULL so that upon next request
arrival we will allocate a new queue in new group.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Do not allow following three operations across groups for isolation.
- selection of co-operating queues
- preemtpions across groups
- request merging across groups.o Async queues are currently global and not per group. Allow preemption of
an async queue if a sync queue in other group gets backlogged.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Export disk time and sector used by a group to user space through cgroup
interface.o Also export a "dequeue" interface to cgroup which keeps track of how many
a times a group was deleted from service tree. Helps in debugging.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Some debugging aids for CFQ.
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o One can choose to change elevator or delete a cgroup. Implement group
reference counting so that both elevator exit and cgroup deletion can
take place gracefully.Signed-off-by: Vivek Goyal
Signed-off-by: Nauman Rafique
Signed-off-by: Jens Axboe -
o Determine the cgroup IO submitting task belongs to and create the cfq
group if it does not exist already.o Also link cfqq and associated cfq group.
o Currently all async IO is mapped to root group.
Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o This patch introduces the functionality to do the accounting of group time
when a queue expires. This time used decides which is the group to go
next.o Also introduce the functionlity to save and restore the workload type
context with-in group. It might happen that once we expire the cfq queue
and group, a different group will schedule in and we will lose the context
of the workload type. Hence save and restore it upon queue expiry.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o So far we had 300ms soft target latency system wide. Now with the
introduction of cfq groups, divide that latency by number of groups so
that one can come up with group target latency which will be helpful
in determining the workload slice with-in group and also the dynamic
slice length of the cfq queue.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o Bring in the per cfq group weight and how vdisktime is calculated for the
group. Also bring in the functionality of updating the min_vdisktime of
the group service tree.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o This is basic implementation of blkio controller cgroup interface. This is
the common interface visible to user space and should be used by different
IO control policies as we implement those.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe -
o So far we just had one cfq_group in cfq_data. To create space for more than
one cfq_group, we need to have a service tree of groups where all the groups
can be queued if they have active cfq queues backlogged in these.Signed-off-by: Vivek Goyal
Signed-off-by: Jens Axboe
