public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@fb.com>
To: <torvalds@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <hch@lst.de>
Subject: [GIT PULL] Block IO changes for -rc1
Date: Wed, 11 Jun 2014 08:17:06 -0600	[thread overview]
Message-ID: <20140611141706.GA22793@kernel.dk> (raw)

Hi Linus,

Final small batch of fixes to be included before -rc1. Some general
cleanups in here as well, but some of the blk-mq fixes we need for the
NVMe conversion and/or scsi-mq. The pull request contains:

- Support for not merging across a specified "chunk size", if set by the
  driver. Some NVMe devices perform poorly for IO that crosses such a
  chunk, so we need to support it generically as part of request merging
  avoid having to do complicated split logic. From me.

- Bump max tag depth to 10Ki tags. Some scsi devices have a huge shared
  tag space. Before we failed with EINVAL if a too large tag depth was
  specified, now we truncate it and pass back the actual value. From me.

- Various blk-mq rq init fixes from me and others.

- A fix for enter on a dying queue for blk-mq from Keith. This is needed
  to prevent oopsing on hot device removal.

- Fixup for blk-mq timer addition from Ming Lei.

- Small round of performance fixes for mtip32xx from Sam Bradshaw.

- Minor stack leak fix from Rickard Strandqvist.

- Two __init annotations from Fabian Frederick.


Please pull!


  git://git.kernel.dk/linux-block.git for-linus

----------------------------------------------------------------
Fabian Frederick (2):
      block: add __init to elv_register
      block: add __init to blkcg_policy_register

Jens Axboe (6):
      block: add notion of a chunk size for request merging
      block: add blk_rq_set_block_pc()
      blk-mq: bump max tag depth to 10K tags
      blk-mq: ->timeout should be cleared in blk_mq_rq_ctx_init()
      blk-mq: always initialize request->start_time
      block: ensure that bio_add_page() always accepts a page for an empty bio

Keith Busch (1):
      blk-mq: don't allow queue entering for a dying queue

Ming Lei (1):
      blk-mq: add timer in blk_mq_start_request

Rickard Strandqvist (1):
      block: blk-exec.c: Cleaning up local variable address returnd

Sam Bradshaw (1):
      mtip32xx: minor performance enhancements

 block/bio.c                                 |  8 +++++-
 block/blk-cgroup.c                          |  2 +-
 block/blk-cgroup.h                          |  4 +--
 block/blk-core.c                            | 18 ++++++++++++
 block/blk-exec.c                            |  5 ++++
 block/blk-mq.c                              | 43 ++++++++++++++---------------
 block/blk-settings.c                        | 21 ++++++++++++++
 block/bsg.c                                 |  3 +-
 block/elevator.c                            |  2 +-
 block/scsi_ioctl.c                          |  6 ++--
 drivers/block/mtip32xx/mtip32xx.c           | 15 ++++++----
 drivers/block/mtip32xx/mtip32xx.h           |  8 +++---
 drivers/block/pktcdvd.c                     |  2 +-
 drivers/cdrom/cdrom.c                       |  2 +-
 drivers/scsi/device_handler/scsi_dh_alua.c  |  2 +-
 drivers/scsi/device_handler/scsi_dh_emc.c   |  2 +-
 drivers/scsi/device_handler/scsi_dh_hp_sw.c |  4 +--
 drivers/scsi/device_handler/scsi_dh_rdac.c  |  2 +-
 drivers/scsi/osd/osd_initiator.c            |  4 +--
 drivers/scsi/osst.c                         |  2 +-
 drivers/scsi/scsi_error.c                   |  3 +-
 drivers/scsi/scsi_lib.c                     |  2 +-
 drivers/scsi/sg.c                           |  3 +-
 drivers/scsi/st.c                           |  2 +-
 drivers/target/target_core_pscsi.c          |  3 +-
 include/linux/blk-mq.h                      |  2 +-
 include/linux/blkdev.h                      | 23 ++++++++++++++-
 include/linux/elevator.h                    |  2 +-
 28 files changed, 135 insertions(+), 60 deletions(-)

-- 
Jens Axboe


                 reply	other threads:[~2014-06-11 14:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140611141706.GA22793@kernel.dk \
    --to=axboe@fb.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox