Commits · 4050cf1674c632c73801a561689543d4887df2ef · linux / linux-davinci

30 Sep, 2006 40 commits

[PATCH] cfq-iosched: use new io context counting mechanism · 4050cf16

Jens Axboe authored Jul 19, 2006

It's ok if the read path is a lot more costly, as long as inc/dec is
really cheap. The inc/dec will happen for each created/freed io context,
while the reading only happens when a disk queue exits.
Signed-off-by: Jens Axboe <axboe@suse.de>

4050cf16

[PATCH] as-iosched: use new io context counting mechanism · e4313dd4

Jens Axboe authored Jul 19, 2006

It's ok if the read path is a lot more costly, as long as inc/dec is
really cheap. The inc/dec will happen for each created/freed io context,
while the reading only happens when a disk queue exits.
Signed-off-by: Jens Axboe <axboe@suse.de>

e4313dd4

[PATCH] elevator: define ioc counting mechanism · 4a893e83

Jens Axboe authored Jul 22, 2006

None of the in-kernel primitives for handling "atomic" counting seem
to be a good fit. We need something that is essentially free for
incrementing/decrementing, while the read side may be more expensive
as we only ever need to do that when a device is removed from the
kernel.

Use a per-cpu variable for maintaining a per-cpu ioc count and define
a reading mechanism that just sums up the values.
Signed-off-by: Jens Axboe <axboe@suse.de>

4a893e83

[PATCH] cfq-iosched: kill cfq_exit_lock · fc46379d

Jens Axboe authored Aug 29, 2006

cfq_exit_lock is protecting two things now:

- The per-ioc rbtree of cfq_io_contexts

- The per-cfqd linked list of cfq_io_contexts

The per-cfqd linked list can be protected by the queue lock, as it is (by
definition) per cfqd as the queue lock is.

The per-ioc rbtree is mainly used and updated by the process itself only.
The only outside use is the io priority changing. If we move the
priority changing to not browsing the rbtree, we can remove any locking
from the rbtree updates and lookup completely. Let the sys_ioprio syscall
just mark processes as having the iopriority changed and lazily update
the private cfq io contexts the next time io is queued, and we can
remove this locking as well.
Signed-off-by: Jens Axboe <axboe@suse.de>

fc46379d

[PATCH] cfq-iosched: cleanups, fixes, dead code removal · 89850f7e

Jens Axboe authored Jul 22, 2006

A collection of little fixes and cleanups:

- We don't use the 'queued' sysfs exported attribute, since the
  may_queue() logic was rewritten. So kill it.

- Remove dead defines.

- cfq_set_active_queue() can be rewritten cleaner with else if conditions.

- Several places had cfq_exit_cfqq() like logic, abstract that out and
  use that.

- Annotate the cfqq kmem_cache_alloc() so the allocator knows that this
  is a repeat allocation if it fails with __GFP_WAIT set. Allows the
  allocator to start freeing some memory, if needed. CFQ already loops for
  this condition, so might as well pass the hint down.

- Remove cfqd->rq_starved logic. It's not needed anymore after we dropped
  the crq allocation in cfq_set_request().

- Remove uneeded parameter passing.
Signed-off-by: Jens Axboe <axboe@suse.de>

89850f7e

[PATCH] struct request: shrink and optimize some more · e6a1c874

Jens Axboe authored Aug 10, 2006

Move some members around and unionize completion_data and rb_node since
they cannot ever be used at the same time.
Signed-off-by: Jens Axboe <axboe@suse.de>

e6a1c874

[PATCH] ll_rw_blk: cleanup __make_request() · 51da90fc

Jens Axboe authored Jul 18, 2006

- Don't assign variables that are only used once.

- Kill spin_lock() prefetching, it's opportunistic at best.
Signed-off-by: Jens Axboe <axboe@suse.de>

51da90fc

[PATCH] Drop useless bio passing in may_queue/set_request API · cb78b285
Jens Axboe authored Jul 28, 2006
```
It's not needed for anything, so kill the bio passing.
Signed-off-by: Jens Axboe <axboe@suse.de>
```
cb78b285

[PATCH] Remove ->rq_status from struct request · cdd60262

Jens Axboe authored Jul 28, 2006

After Christophs SCSI change, the only usage left is RQ_ACTIVE
and RQ_INACTIVE. The block layer sets RQ_INACTIVE right before freeing
the request, so any check for RQ_INACTIVE in a driver is a bug and
indicates use-after-free.

So kill/clean the remaining users, straight forward.
Signed-off-by: Jens Axboe <axboe@suse.de>

cdd60262

[PATCH] Remove struct request_list from struct request · 49171e5c

Jens Axboe authored Aug 10, 2006

It is always identical to &q->rq, and we only use it for detecting
whether this request came out of our mempool or not. So replace it
with an additional ->flags bit flag.
Signed-off-by: Jens Axboe <axboe@suse.de>

49171e5c

[PATCH] Remove ->waiting member from struct request · c00895ab

Jens Axboe authored Sep 30, 2006

As the comments indicates in blkdev.h, we can fold it into ->end_io_data
usage as that is really what ->waiting is. Fixup the users of
blk_end_sync_rq().
Signed-off-by: Jens Axboe <axboe@kernel.dk>

c00895ab

[PATCH] as-iosched: kill arq · 8a8e674c

Jens Axboe authored Jul 18, 2006

Get rid of the as_rq request type. With the added elevator_private2, we
have enough room in struct request to get rid of any arq allocation/free
for each request.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Nick Piggin <npiggin@suse.de>

8a8e674c

[PATCH] cfq-iosched: kill crq · 5e705374

Jens Axboe authored Jul 13, 2006

Get rid of the cfq_rq request type. With the added elevator_private2, we
have enough room in struct request to get rid of any crq allocation/free
for each request.
Signed-off-by: Jens Axboe <axboe@suse.de>

5e705374

[PATCH] Add one more pointer to struct request for IO scheduler usage · ff7d145f

Jens Axboe authored Jul 12, 2006

Then we have enough room in the request to get rid of the dynamic
allocations in CFQ/AS.
Signed-off-by: Jens Axboe <axboe@suse.de>

ff7d145f

[PATCH] cfq-iosched: remove the crq flag functions/variable · 5380a101

Jens Axboe authored Jul 13, 2006

There's just one flag currently (SYNC), and that one can be grabbed from
the request.
Signed-off-by: Jens Axboe <axboe@suse.de>

5380a101

[PATCH] deadline-iosched: remove elevator private drq request type · 8840faa1

Jens Axboe authored Jul 13, 2006

A big win, we now save an allocation/free on each request! With the
previous rb/hash abstractions, we can just reuse queuelist/donelist
for the FIFO data and be done with it.
Signed-off-by: Jens Axboe <axboe@suse.de>

8840faa1

[PATCH] as-iosched: remove arq->is_sync member · 9e2585a8

Jens Axboe authored Jul 28, 2006

We can track this in struct request.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Nick Piggin <npiggin@suse.de>

9e2585a8

[PATCH] as-iosched: reuse rq for fifo · d4f2f462

Jens Axboe authored Jul 13, 2006

Saves some space in arq.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Nick Piggin <npiggin@suse.de>

d4f2f462

[PATCH] cfq-iosched: convert to using the FIFO elevator defines · 95e8810b
Jens Axboe authored Jul 11, 2006
```
Signed-off-by: Jens Axboe <axboe@suse.de>
```
95e8810b

[PATCH] elevator: introduce a way to reuse rq for internal FIFO handling · 1fbfdfcd

Jens Axboe authored Jul 11, 2006

The io schedulers can use this instead of having to allocate space for
it themselves.
Signed-off-by: Jens Axboe <axboe@suse.de>

1fbfdfcd

[PATCH] deadline-iosched: migrate to using the elevator rb functions · b8aca35a
Jens Axboe authored Jul 13, 2006
```
This removes the rbtree handling from deadline.
Signed-off-by: Jens Axboe <axboe@suse.de>
```
b8aca35a
[PATCH] cfq-iosched: migrate to using the elevator rb functions · 21183b07
Jens Axboe authored Jul 13, 2006
```
This removes the rbtree handling from CFQ.
Signed-off-by: Jens Axboe <axboe@suse.de>
```
21183b07

[PATCH] as-iosched: migrate to using the elevator rb functions · e37f346e

Jens Axboe authored Jul 18, 2006

This removes the rbtree handling from AS.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Nick Piggin <npiggin@suse.de>

e37f346e

[PATCH] elevator: abstract out the rbtree sort handling · 2e662b65

Jens Axboe authored Jul 13, 2006

The rbtree sort/lookup/reposition logic is mostly duplicated in
cfq/deadline/as, so move it to the elevator core. The io schedulers
still provide the actual rb root, as we don't want to impose any sort
of specific handling on the schedulers.

Introduce the helpers and rb_node in struct request to help migrate the
IO schedulers.
Signed-off-by: Jens Axboe <axboe@suse.de>

2e662b65

[PATCH] rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev · 10fd48f2

Jens Axboe authored Jul 11, 2006

The conditions got reserved. Also make rb_next() and rb_prev() check
for the empty condition.
Signed-off-by: Jens Axboe <axboe@suse.de>

10fd48f2

[PATCH] elevator: move the backmerging logic into the elevator core · 9817064b

Jens Axboe authored Jul 28, 2006

Right now, every IO scheduler implements its own backmerging (except for
noop, which does no merging). That results in duplicated code for
essentially the same operation, which is never a good thing. This patch
moves the backmerging out of the io schedulers and into the elevator
core. We save 1.6kb of text and as a bonus get backmerging for noop as
well. Win-win!
Signed-off-by: Jens Axboe <axboe@suse.de>

9817064b

[PATCH] Split struct request ->flags into two parts · 4aff5e23

Jens Axboe authored Aug 10, 2006

Right now ->flags is a bit of a mess: some are request types, and
others are just modifiers. Clean this up by splitting it into
->cmd_type and ->cmd_flags. This allows introduction of generic
Linux block message types, useful for sending generic Linux commands
to block devices.
Signed-off-by: Jens Axboe <axboe@suse.de>

4aff5e23

[PATCH] i2c: Prevent deadlock on i2c client registration · 77ed74da

Jean Delvare authored Sep 30, 2006

Delay the call to adapter->client_register() until after we are
certain that the client registration is a success. At this point the
client is fully initialized and we no longer hold the adapter->clist
mutex, so this should prevent the deadlocks if the client_register()
callback needs to take that mutex too, as is the case for the bttv
driver.

This fixes bug #7234.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

77ed74da

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 5ffd1a6a

Linus Torvalds authored Sep 30, 2006

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
  V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
  V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
  V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
  V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
  V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
  V4L/DVB (4634): Zr36120: implement pcipci checks
  V4L/DVB (4632): Zoran: Implement pcipci failure check
  V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
  V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
  V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
  V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
  V4L/DVB (4627): Vivi crashes with mplayer
  V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
  V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
  V4L/DVB (4622): Copy-paste bug in videodev.c
  V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
  V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
  V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
  V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
  V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
  ...

5ffd1a6a

Merge branch 'upstream-linus' of... · 0cd43f83

Linus Torvalds authored Sep 30, 2006

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits)
  ieee1394: raw1394: arm functions slept in atomic context
  ieee1394: sbp2: enable auto spin-up for all SBP-2 devices
  MAINTAINERS: updates to IEEE 1394 subsystem maintainership
  ieee1394: ohci1394: check for errors in suspend or resume
  set power state of firewire host during suspend
  ieee1394: ohci1394: more obvious endianess handling
  ieee1394: ohci1394: fix endianess bug in debug message
  ieee1394: sbp2: don't prefer MODE SENSE 10
  ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne
  ieee1394: nodemgr: fix rwsem recursion
  ieee1394: sbp2: more help in Kconfig
  ieee1394: sbp2: prevent rare deadlock in shutdown
  ieee1394: sbp2: update includes
  ieee1394: sbp2: better handling of transport errors
  ieee1394: sbp2: recheck node generation in sbp2_update
  ieee1394: sbp2: safer agent reset in error handlers
  ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed"
  CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
  ieee1394: safer definition of empty macros
  video1394: add poll file operation support
  ...

0cd43f83

Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6 · db1a19b3

Linus Torvalds authored Sep 30, 2006

* 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
  intelfbhw.c: intelfbhw_get_p1p2 defined but not used
  intelfb: fix mtrr_reg signedness
  intelfb: update doc and Kconfig (supported devices)
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support

db1a19b3

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · 369aa839

Linus Torvalds authored Sep 30, 2006

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] Use early clobber in semaphores
  [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it
  [PATCH] Re-positioning the bss segment
  [PATCH] Use ARRAY_SIZE in setup.c
  [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()
  [PATCH] x86: Clean up x86 NMI sysctls
  [PATCH] Refactor some duplicated code in mpparse.c
  [PATCH] Document iommu=panic
  [PATCH] Fix broken indentation in iommu_setup
  [PATCH] Allow disabling DAC using command line options
  [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
  [PATCH] i386: Update defconfig
  [PATCH] Update defconfig

369aa839

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · bf603625

Linus Torvalds authored Sep 29, 2006

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock
  [ATM]: [lec] add reference counting to lec_arp entries
  [ATM]: [lec] use work queue instead of timer for lec arp expiry
  [ATM]: [lec] old_close is no longer used
  [ATM]: [lec] convert lec_arp_table to hlist
  [ATM]: [lec] header indent, comment and whitespace cleanup
  [ATM]: [lec] indent, comment and whitespace cleanup [continued]
  [ATM]: [lec] indent, comment and whitespace cleanup
  [SCTP]: Do not timestamp every SCTP packet.
  [SCTP]: Use correct mask when disabling PMTUD.
  [SCTP]: Include sk_buff overhead while updating the peer's receive window.
  [SCTP]: Enable Nagle algorithm by default.
  [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.
  [NetLabel]: audit fixups due to delayed feedback

bf603625

[ATM]: [lec] use refcnt to protect lec_arp_entries outside lock · 6656e3c4
Chas Williams authored Sep 29, 2006
```
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
6656e3c4

[ATM]: [lec] add reference counting to lec_arp entries · 33a9c2d4

Chas Williams authored Sep 29, 2006

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

33a9c2d4

[ATM]: [lec] use work queue instead of timer for lec arp expiry · 987e46bd
Chas Williams authored Sep 29, 2006
```
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
987e46bd

[ATM]: [lec] old_close is no longer used · edbc9b01

Chas Williams authored Sep 29, 2006

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

edbc9b01

[ATM]: [lec] convert lec_arp_table to hlist · d0732f64

Chas Williams authored Sep 29, 2006

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

d0732f64

[ATM]: [lec] header indent, comment and whitespace cleanup · 1c9d3e72

Chas Williams authored Sep 29, 2006

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

1c9d3e72

[ATM]: [lec] indent, comment and whitespace cleanup [continued] · 1fa9961d
Chas Williams authored Sep 29, 2006
```
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
1fa9961d