public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] Block IO core changes for 3.10
@ 2013-05-08 14:50 Jens Axboe
  2013-05-08 15:04 ` Linus Torvalds
  0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2013-05-08 14:50 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel

Hi Linus,

Below are the block layer core changes for 3.10. The pull request
contains:

- Major bit is Kents prep work for immutable bio vecs.

- Stable candidate fix for a scheduling-while-atomic in the queue bypass
  operation.

- Fix for the hang on exceeded rq->datalen 32-bit unsigned when merging
  discard bios.

- Tejuns changes to convert the writeback thread pool to the generic
  workqueue mechanism.

- Runtime PM framework, SCSI patches exists on top of these in James'
  tree.

- A few random fixes.

Please pull! Should satisfy your merge cravings too.


  git://git.kernel.dk/linux-block.git for-3.10/core

----------------------------------------------------------------
Dmitry Monakhov (1):
      relay: move remove_buf_file inside relay_close_buf

Gu Zheng (1):
      fs/block_dev.c: fix iov_shorten() criteria in blkdev_aio_read()

James Bottomley (1):
      block: fix max discard sectors limit

Jens Axboe (2):
      Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core
      Merge branch 'writeback-workqueue' of git://git.kernel.org/.../tj/wq into for-3.10/core

Jun'ichi Nomura (1):
      blkcg: fix "scheduling while atomic" in blk_queue_bypass_start

Kent Overstreet (28):
      block: Reorder struct bio_set
      block: Avoid deadlocks with bio allocation by stacking drivers
      block: Fix a buffer overrun in bio_integrity_split()
      block: Convert integrity to bvec_alloc_bs()
      block: Add bio_advance()
      block: Refactor blk_update_request()
      md: Convert md_trim_bio() to use bio_advance()
      block: Add bio_end_sector()
      block: Use bio_sectors() more consistently
      block: Change bio_split() to respect the current value of bi_idx
      block: Remove bi_idx references
      block: Remove some unnecessary bi_vcnt usage
      block: Add submit_bio_wait(), remove from md
      raid10: Use bio_reset()
      raid1: use bio_reset()
      raid5: use bio_reset()
      raid1: Refactor narrow_write_error() to not use bi_idx
      block: Add bio_copy_data()
      pktcdvd: use bio_copy_data()
      pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage
      raid1: use bio_copy_data()
      bounce: Refactor __blk_queue_bounce to not use bi_io_vec
      block: Add bio_for_each_segment_all()
      block: Convert some code to bio_for_each_segment_all()
      block: Add bio_alloc_pages()
      block: Add an explicit bio flag for bios that own their bvec
      bio-integrity: Add explicit field for owner of bip_buf
      aoe: Fix unitialized var usage

Lin Ming (3):
      block: add a flag to identify PM request
      block: add runtime pm helpers
      block: implement runtime pm strategy

Namjae Jeon (1):
      Documentation: cfq-iosched: update documentation help for cfq tunables

Philippe De Muyter (1):
      partitions/efi.c: replace useless kzalloc's by kmalloc's

Tejun Heo (3):
      writeback: remove unused bdi_pending_list
      writeback: replace custom worker pool implementation with unbound workqueue
      writeback: expose the bdi_wq workqueue

 Documentation/block/cfq-iosched.txt      |  47 +++-
 block/blk-cgroup.c                       |   4 +-
 block/blk-core.c                         | 265 ++++++++++++++++------
 block/cfq-iosched.c                      |   7 +-
 block/deadline-iosched.c                 |   2 +-
 block/elevator.c                         |  26 +++
 block/partitions/efi.c                   |   4 +-
 drivers/block/aoe/aoecmd.c               |   2 +-
 drivers/block/brd.c                      |   3 +-
 drivers/block/floppy.c                   |   1 -
 drivers/block/pktcdvd.c                  | 102 ++-------
 drivers/block/rbd.c                      |   2 +-
 drivers/md/dm-crypt.c                    |   3 +-
 drivers/md/dm-raid1.c                    |   2 +-
 drivers/md/dm-stripe.c                   |   2 +-
 drivers/md/dm-verity.c                   |   4 +-
 drivers/md/faulty.c                      |   6 +-
 drivers/md/linear.c                      |   3 +-
 drivers/md/md.c                          |  17 +-
 drivers/md/raid0.c                       |   9 +-
 drivers/md/raid1.c                       | 133 ++++-------
 drivers/md/raid10.c                      |  78 ++-----
 drivers/md/raid5.c                       |  49 ++---
 drivers/message/fusion/mptsas.c          |   6 +-
 drivers/s390/block/dcssblk.c             |   3 +-
 drivers/scsi/libsas/sas_expander.c       |   6 +-
 drivers/scsi/mpt2sas/mpt2sas_transport.c |  10 +-
 fs/bio-integrity.c                       | 144 +++++-------
 fs/bio.c                                 | 366 +++++++++++++++++++++++++++----
 fs/block_dev.c                           |   2 +-
 fs/btrfs/extent_io.c                     |   3 +-
 fs/btrfs/volumes.c                       |   2 +-
 fs/buffer.c                              |   1 -
 fs/direct-io.c                           |   8 +-
 fs/exofs/ore.c                           |   2 +-
 fs/exofs/ore_raid.c                      |   2 +-
 fs/fs-writeback.c                        | 102 +++------
 fs/gfs2/lops.c                           |   2 +-
 fs/jfs/jfs_logmgr.c                      |   2 -
 fs/logfs/dev_bdev.c                      |   5 -
 include/linux/backing-dev.h              |  16 +-
 include/linux/bio.h                      | 115 ++++++----
 include/linux/blk_types.h                |   5 +
 include/linux/blkdev.h                   |  29 ++-
 include/trace/events/block.h             |  12 +-
 include/trace/events/writeback.h         |   5 -
 kernel/relay.c                           |   2 +-
 mm/backing-dev.c                         | 259 +++-------------------
 mm/bounce.c                              |  75 ++-----
 mm/page_io.c                             |   1 -
 50 files changed, 1000 insertions(+), 956 deletions(-)

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 14:50 [GIT PULL] Block IO core changes for 3.10 Jens Axboe
@ 2013-05-08 15:04 ` Linus Torvalds
  2013-05-08 15:11   ` Jens Axboe
  0 siblings, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2013-05-08 15:04 UTC (permalink / raw)
  To: Jens Axboe; +Cc: Linux Kernel Mailing List

On Wed, May 8, 2013 at 7:50 AM, Jens Axboe <axboe@kernel.dk> wrote:
>
> Below are the block layer core changes for 3.10. The pull request
> contains:

This is late in the game. I'm assuming this does *not* contain the
stuff that you talked on on G+ that you were still working on at the
beginning of the merge window?

Quite frankly, I'm not at all interested in pulling stuff that wasn't
ready when the merge window opened, and I'm not at all happy with
getting this pull request in what is essentially the end of the merge
window.

                Linus

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 15:04 ` Linus Torvalds
@ 2013-05-08 15:11   ` Jens Axboe
  2013-05-08 16:03     ` Linus Torvalds
  0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2013-05-08 15:11 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List

On Wed, May 08 2013, Linus Torvalds wrote:
> On Wed, May 8, 2013 at 7:50 AM, Jens Axboe <axboe@kernel.dk> wrote:
> >
> > Below are the block layer core changes for 3.10. The pull request
> > contains:
> 
> This is late in the game. I'm assuming this does *not* contain the
> stuff that you talked on on G+ that you were still working on at the
> beginning of the merge window?

No of course not, that stuff is still in development. It's in the
new-queue branch, with some luck it can make 3.11 perhaps. Or if not,
then 3.12. So it's a bit off still.

Frankly the pull is just late since I have been busy with that and
company bits. If you look at the history, there's been no changes in
more than a week.

> Quite frankly, I'm not at all interested in pulling stuff that wasn't
> ready when the merge window opened, and I'm not at all happy with
> getting this pull request in what is essentially the end of the merge
> window.

There are no new developments in that branch that haven't been done for
at least a merge window.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 15:11   ` Jens Axboe
@ 2013-05-08 16:03     ` Linus Torvalds
  2013-05-08 16:04       ` Jens Axboe
  2013-05-08 16:05       ` Linus Torvalds
  0 siblings, 2 replies; 7+ messages in thread
From: Linus Torvalds @ 2013-05-08 16:03 UTC (permalink / raw)
  To: Jens Axboe; +Cc: Linux Kernel Mailing List

On Wed, May 8, 2013 at 8:11 AM, Jens Axboe <axboe@kernel.dk> wrote:
>
> Frankly the pull is just late since I have been busy with that and
> company bits. If you look at the history, there's been no changes in
> more than a week.

Ok, good. The timing made me nervous..

              Linus

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 16:03     ` Linus Torvalds
@ 2013-05-08 16:04       ` Jens Axboe
  2013-05-08 16:05       ` Linus Torvalds
  1 sibling, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2013-05-08 16:04 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List

On 08/05/2013, at 18.03, Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, May 8, 2013 at 8:11 AM, Jens Axboe <axboe@kernel.dk> wrote:
>> 
>> Frankly the pull is just late since I have been busy with that and
>> company bits. If you look at the history, there's been no changes in
>> more than a week.
> 
> Ok, good. The timing made me nervous..

Would be pretty stealthy to not even mention it :-)


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 16:03     ` Linus Torvalds
  2013-05-08 16:04       ` Jens Axboe
@ 2013-05-08 16:05       ` Linus Torvalds
  2013-05-08 16:38         ` Jens Axboe
  1 sibling, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2013-05-08 16:05 UTC (permalink / raw)
  To: Jens Axboe; +Cc: Linux Kernel Mailing List

On Wed, May 8, 2013 at 9:03 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Wed, May 8, 2013 at 8:11 AM, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> Frankly the pull is just late since I have been busy with that and
>> company bits. If you look at the history, there's been no changes in
>> more than a week.
>
> Ok, good. The timing made me nervous..

Oh, and should I made BIO_RESET_BITS and BIO_OWNS_VEC be 13? We have a
new BIO_SNAP_STABLE that is 12, and I'm really hoping these values
aren't exposed anywhere to users..

            Linus

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [GIT PULL] Block IO core changes for 3.10
  2013-05-08 16:05       ` Linus Torvalds
@ 2013-05-08 16:38         ` Jens Axboe
  0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2013-05-08 16:38 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List

On Wed, May 08 2013, Linus Torvalds wrote:
> On Wed, May 8, 2013 at 9:03 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> > On Wed, May 8, 2013 at 8:11 AM, Jens Axboe <axboe@kernel.dk> wrote:
> >>
> >> Frankly the pull is just late since I have been busy with that and
> >> company bits. If you look at the history, there's been no changes in
> >> more than a week.
> >
> > Ok, good. The timing made me nervous..
> 
> Oh, and should I made BIO_RESET_BITS and BIO_OWNS_VEC be 13? We have a

The numbers aren't important, as long as they are different.

> new BIO_SNAP_STABLE that is 12, and I'm really hoping these values
> aren't exposed anywhere to users..

Strictly in-kernel stuff, so no problems there. No bio flags are
propagated to user space.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-05-08 16:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-08 14:50 [GIT PULL] Block IO core changes for 3.10 Jens Axboe
2013-05-08 15:04 ` Linus Torvalds
2013-05-08 15:11   ` Jens Axboe
2013-05-08 16:03     ` Linus Torvalds
2013-05-08 16:04       ` Jens Axboe
2013-05-08 16:05       ` Linus Torvalds
2013-05-08 16:38         ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox