Linux-NVME Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] nvme updates for 4.12
@ 2017-04-21 17:02 Christoph Hellwig
  2017-04-21 17:15 ` Jens Axboe
  0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2017-04-21 17:02 UTC (permalink / raw)


Hi Jens,

this is the current NVMe pile: virtualization extensions, lots of FC
updates and various misc bits.  There are a few more FC bits that didn't
make the cut, but we'd like to get this request out before the merge
window for sure.


The following changes since commit 99c749a4c4f4ea2c9eee01f81f79bdbf26c3914e:

  blk-stat: kill blk_stat_rq_ddir() (2017-04-21 07:56:23 -0600)

are available in the git repository at:

  git://git.infradead.org/nvme.git nvme-4.12

for you to fetch changes up to e02ab0230489461fd9fdd8028841dae6f03a4874:

  nvme: let dm-mpath distinguish nvme error codes (2017-04-21 16:41:56 +0200)

----------------------------------------------------------------
Helen Koike (1):
      nvme: improve performance for virtual NVMe devices

James Smart (8):
      nvmet_fc: add target feature flags for upcall isr contexts
      nvmet_fc: add req_release to lldd api
      nvme_fcloop: split job struct from transport for req_release
      nvmet_fc: Rework target side abort handling
      nvmet_fc: add missing reference in add_port
      nvme_fc: Move LS's to rport
      nvme_fc: Add ls aborts on remote port teardown
      nvmet_fc: Change traddr field separator to a colon

Junxiong Guan (1):
      nvme: let dm-mpath distinguish nvme error codes

Keith Busch (2):
      nvme/pci: Don't set reserved SQ create flags
      nvme/pci: Poll CQ on timeout

Logan Gunthorpe (1):
      nvmet: convert from kmap to nvmet_copy_from_sgl

 drivers/nvme/host/core.c          |  14 +++
 drivers/nvme/host/fc.c            | 152 +++++++++++++++--------
 drivers/nvme/host/pci.c           | 166 ++++++++++++++++++++++++-
 drivers/nvme/target/fabrics-cmd.c |  32 +++--
 drivers/nvme/target/fc.c          | 253 +++++++++++++++++++++++++++++---------
 drivers/nvme/target/fcloop.c      | 197 +++++++++++++++++++++++------
 drivers/scsi/lpfc/lpfc_nvmet.c    | 126 +++++++++++++++----
 drivers/scsi/lpfc/lpfc_nvmet.h    |   7 +-
 include/linux/nvme-fc-driver.h    |  98 ++++++++++-----
 include/linux/nvme.h              |  13 ++
 10 files changed, 834 insertions(+), 224 deletions(-)

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

* [GIT PULL] nvme updates for 4.12
  2017-04-21 17:02 Christoph Hellwig
@ 2017-04-21 17:15 ` Jens Axboe
  0 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2017-04-21 17:15 UTC (permalink / raw)


On 04/21/2017 11:02 AM, Christoph Hellwig wrote:
> Hi Jens,
> 
> this is the current NVMe pile: virtualization extensions, lots of FC
> updates and various misc bits.  There are a few more FC bits that didn't
> make the cut, but we'd like to get this request out before the merge
> window for sure.
> 
> 
> The following changes since commit 99c749a4c4f4ea2c9eee01f81f79bdbf26c3914e:
> 
>   blk-stat: kill blk_stat_rq_ddir() (2017-04-21 07:56:23 -0600)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/nvme.git nvme-4.12
> 
> for you to fetch changes up to e02ab0230489461fd9fdd8028841dae6f03a4874:
> 
>   nvme: let dm-mpath distinguish nvme error codes (2017-04-21 16:41:56 +0200)
> 
> ----------------------------------------------------------------
> Helen Koike (1):
>       nvme: improve performance for virtual NVMe devices
> 
> James Smart (8):
>       nvmet_fc: add target feature flags for upcall isr contexts
>       nvmet_fc: add req_release to lldd api
>       nvme_fcloop: split job struct from transport for req_release
>       nvmet_fc: Rework target side abort handling
>       nvmet_fc: add missing reference in add_port
>       nvme_fc: Move LS's to rport
>       nvme_fc: Add ls aborts on remote port teardown
>       nvmet_fc: Change traddr field separator to a colon
> 
> Junxiong Guan (1):
>       nvme: let dm-mpath distinguish nvme error codes
> 
> Keith Busch (2):
>       nvme/pci: Don't set reserved SQ create flags
>       nvme/pci: Poll CQ on timeout
> 
> Logan Gunthorpe (1):
>       nvmet: convert from kmap to nvmet_copy_from_sgl

Pulled, thanks.

-- 
Jens Axboe

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

* [GIT PULL] nvme updates for 4.12
@ 2017-04-27 17:19 Christoph Hellwig
  2017-04-27 17:36 ` Jens Axboe
  0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2017-04-27 17:19 UTC (permalink / raw)


A couple more updates for 4.12.  The biggest pile is fc and lpfc updates
from James, but there are various small fixes and cleanups as well.

The following changes since commit a44f53faf4674d84cba79f7ee574584e18ab8744:

  lightnvm: pblk: fix erase counters on error fail (2017-04-23 16:57:52 -0600)

are available in the git repository at:

  git://git.infradead.org/nvme.git nvme-4.12

for you to fetch changes up to 7569b90a228ed7dfdc1f92f2c98d7a1b041f22eb:

  nvme-scsi: remove nvme_trans_security_protocol (2017-04-27 08:39:32 +0200)

----------------------------------------------------------------
Christoph Hellwig (8):
      nvme-fc: mark two symbols static
      nvmet-fc: mark nvmet_fc_handle_fcp_rqst static
      nvmet-fc: fix endianess annoations for nvmet_fc_format_rsp_hdr
      nvmet-fc: mark the sqhd field as __le16
      nvmet-fc: properly endian swap sq_head
      nvmet-fcloop: mark two symbols static
      nvme-lightnvm: add missing endianess conversion in nvme_nvm_end_io
      nvme-scsi: remove nvme_trans_security_protocol

Ewan D. Milne (1):
      nvme-fc: avoid memory corruption caused by calling nvmf_free_options() twice

James Smart (26):
      nvme_fc: fix command id check
      nvme_fc: add aen abort to teardown
      nvme_fc: add controller reset support
      Standardize nvme SGL segment count
      Fix nvme unregister port timeout.
      Fix rejected nvme LS Req.
      Fix log message in completion path.
      Add debug messages for nvme/fcp resource allocation.
      Fix spelling in comments.
      Remove unused defines for NVME PostBuf.
      Remove NULL ptr check before kfree.
      Fix extra line print in rqpair debug print.
      Fix PRLI ACC rsp for NVME
      Fix driver unload/reload operation.
      Fix driver usage of 128B WQEs when WQ_CREATE is V1.
      Fix nvme initiator handling when not enabled.
      Remove hba lock from NVMET issue WQE.
      Fix driver load issues when MRQ=8
      Fix crash after issuing lip reset
      Fix max_sgl_segments settings for NVME / NVMET
      Add Fabric assigned WWN support.
      Fix implicit logo and RSCN handling for NVMET
      Update ABORT processing for NVMET.
      Fix Express lane queue creation.
      lpfc revison 11.2.0.12
      lpfc: Fix memory corruption of the lpfc_ncmd->list pointers

Jon Derrick (1):
      nvme-scsi: Consider LBA format in IO splitting calculation

 drivers/nvme/host/fc.c             | 1171 ++++++++++++++++++++++++------------
 drivers/nvme/host/lightnvm.c       |    2 +-
 drivers/nvme/host/scsi.c           |   15 +-
 drivers/nvme/target/fc.c           |    8 +-
 drivers/nvme/target/fcloop.c       |    4 +-
 drivers/scsi/lpfc/lpfc.h           |    5 +-
 drivers/scsi/lpfc/lpfc_attr.c      |   10 +-
 drivers/scsi/lpfc/lpfc_bsg.c       |    4 +
 drivers/scsi/lpfc/lpfc_crtn.h      |    9 +-
 drivers/scsi/lpfc/lpfc_ct.c        |   68 ++-
 drivers/scsi/lpfc/lpfc_debugfs.c   |   67 ++-
 drivers/scsi/lpfc/lpfc_disc.h      |    1 +
 drivers/scsi/lpfc/lpfc_els.c       |   68 +--
 drivers/scsi/lpfc/lpfc_hbadisc.c   |  133 ++--
 drivers/scsi/lpfc/lpfc_hw.h        |    3 +
 drivers/scsi/lpfc/lpfc_hw4.h       |    4 +
 drivers/scsi/lpfc/lpfc_init.c      |  202 ++++---
 drivers/scsi/lpfc/lpfc_mbox.c      |    7 +-
 drivers/scsi/lpfc/lpfc_nportdisc.c |    8 +-
 drivers/scsi/lpfc/lpfc_nvme.c      |  157 +++--
 drivers/scsi/lpfc/lpfc_nvme.h      |   11 +-
 drivers/scsi/lpfc/lpfc_nvmet.c     |  377 +++++++++---
 drivers/scsi/lpfc/lpfc_nvmet.h     |   14 +-
 drivers/scsi/lpfc/lpfc_sli.c       |   22 +-
 drivers/scsi/lpfc/lpfc_sli4.h      |    2 +-
 drivers/scsi/lpfc/lpfc_version.h   |    2 +-
 drivers/scsi/lpfc/lpfc_vport.c     |    3 +-
 27 files changed, 1617 insertions(+), 760 deletions(-)

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

* [GIT PULL] nvme updates for 4.12
  2017-04-27 17:19 [GIT PULL] nvme updates for 4.12 Christoph Hellwig
@ 2017-04-27 17:36 ` Jens Axboe
  2017-04-27 17:38   ` Christoph Hellwig
  0 siblings, 1 reply; 6+ messages in thread
From: Jens Axboe @ 2017-04-27 17:36 UTC (permalink / raw)


On 04/27/2017 11:19 AM, Christoph Hellwig wrote:
> A couple more updates for 4.12.  The biggest pile is fc and lpfc updates
> from James, but there are various small fixes and cleanups as well.
> 
> The following changes since commit a44f53faf4674d84cba79f7ee574584e18ab8744:
> 
>   lightnvm: pblk: fix erase counters on error fail (2017-04-23 16:57:52 -0600)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/nvme.git nvme-4.12

Pulled, but it threw two merge issues that I fixed up. Please double
check them.

Additionally, if CONFIG_NVME_TARGET_FC isn't enabled,
lpfc_nvmet_rcv_unsol_abort() threw a warning on missing a return
statement. I caught that one, don't know if there are others...

It's queued up in the for-4.12/post-merge branch because of these
conflicts with master.

-- 
Jens Axboe

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

* [GIT PULL] nvme updates for 4.12
  2017-04-27 17:36 ` Jens Axboe
@ 2017-04-27 17:38   ` Christoph Hellwig
  2017-04-27 17:41     ` Jens Axboe
  0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2017-04-27 17:38 UTC (permalink / raw)


On Thu, Apr 27, 2017@11:36:00AM -0600, Jens Axboe wrote:
> Pulled, but it threw two merge issues that I fixed up. Please double
> check them.

I saw issues vs for-next, but not vs for-4.12/block, which I assumed
was ok.

> It's queued up in the for-4.12/post-merge branch because of these
> conflicts with master.

Ok, I've got another pile that will sit on top of this..

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

* [GIT PULL] nvme updates for 4.12
  2017-04-27 17:38   ` Christoph Hellwig
@ 2017-04-27 17:41     ` Jens Axboe
  0 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2017-04-27 17:41 UTC (permalink / raw)


On 04/27/2017 11:38 AM, Christoph Hellwig wrote:
> On Thu, Apr 27, 2017@11:36:00AM -0600, Jens Axboe wrote:
>> Pulled, but it threw two merge issues that I fixed up. Please double
>> check them.
> 
> I saw issues vs for-next, but not vs for-4.12/block, which I assumed
> was ok.

for-next is generally Linus master + block stuff. So if there are merge
issues with that, then Linus will see merge issues. Not always a
concern, but I prefer to resolve them, especially if they are
non-trivial.

-- 
Jens Axboe

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

end of thread, other threads:[~2017-04-27 17:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 17:19 [GIT PULL] nvme updates for 4.12 Christoph Hellwig
2017-04-27 17:36 ` Jens Axboe
2017-04-27 17:38   ` Christoph Hellwig
2017-04-27 17:41     ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2017-04-21 17:02 Christoph Hellwig
2017-04-21 17:15 ` Jens Axboe

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