[GIT PULL] nvme patches for 4.11

[GIT PULL] nvme patches for 4.11

[Sagi Grimberg]

Hey Jens,

This pull-request includes:
- autonomous power state transitions from Andy
- nvme-rdma support for connecting via configurable source ip
- nvmet-rdma cleanups from Max
- nvme-fc cleanups from James
- quirk fixup for apple from Daniel
- various nvme-pci fixes from Keith
- expose nvme controller state via sysfs
- identify CNS fixup from Parav
- enforce fabrics implement ->create_ctrl callout from Johannes
- nvme-rdma fix goto tag from Christophe
- spelling fixup from Colin

Please pull from:

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

----------------------------------------------------------------
Andy Lutomirski (2):
      nvme: Add a quirk mechanism that uses identify_ctrl
      nvme: Enable autonomous power state transitions

Christophe JAILLET (1):
      nvmet-rdma: Fix error handling

Colin Ian King (1):
      nvme: admin-cmd: fix spelling mistake: "Counld" -> "Could"

Daniel Roschka (1):
      Detect NVMe controller in recent MacBooks

James Smart (2):
      nvmet_fc: cleanup of abort flag processing in fcp_op_done
      nvme-fc: don't bother to validate ioccsz and iorcsz

Johannes Thumshirn (1):
      nvme: make nvmf_register_transport require a create_ctrl callback

Keith Busch (5):
      nvme/pci: Disable on removal when disconnected
      nvme/core: Fix race kicking freed request_queue
      nvme/pci: No special case for queue busy on IO
      nvme/pci: Cancel work after watchdog disabled
      Revert "nvme/pci: Cancel work after watchdog disabled"

Max Gurtovoy (5):
      nvmet: avoid dereferencing nvmet_req
      nvme: add semicolon in nvme_command setting
      nvme-rdma: move nvme cm status helper to .h file
      nvmet-rdma: use nvme cm status helper
      nvme-rdma: add support for host_traddr

Parav Pandit (1):
      nvme: Use CNS as 8-bit field and avoid endianness conversion

Sagi Grimberg (2):
      nvmet: Make cntlid globally unique
      nvme: Make controller state visible via sysfs

 drivers/nvme/host/core.c          | 257 ++++++++++++++++++++++++++++++++++++--
 drivers/nvme/host/fabrics.c       |   7 +-
 drivers/nvme/host/fabrics.h       |   2 +-
 drivers/nvme/host/fc.c            |  15 +--
 drivers/nvme/host/nvme.h          |  12 ++
 drivers/nvme/host/pci.c           |  11 +-
 drivers/nvme/host/rdma.c          |  48 ++++---
 drivers/nvme/target/admin-cmd.c   |   4 +-
 drivers/nvme/target/core.c        |  10 +-
 drivers/nvme/target/discovery.c   |   4 +-
 drivers/nvme/target/fabrics-cmd.c |   6 +-
 drivers/nvme/target/fc.c          |   8 +-
 drivers/nvme/target/loop.c        |   3 +-
 drivers/nvme/target/nvmet.h       |   1 -
 drivers/nvme/target/rdma.c        |   7 +-
 include/linux/nvme-rdma.h         |  24 ++++
 include/linux/nvme.h              |  10 +-
 17 files changed, 349 insertions(+), 80 deletions(-)

[GIT PULL] nvme patches for 4.11

[Jens Axboe]

On 02/22/2017 12:31 PM, Sagi Grimberg wrote:
> Hey Jens,
> 
> This pull-request includes:
> - autonomous power state transitions from Andy
> - nvme-rdma support for connecting via configurable source ip
> - nvmet-rdma cleanups from Max
> - nvme-fc cleanups from James
> - quirk fixup for apple from Daniel
> - various nvme-pci fixes from Keith
> - expose nvme controller state via sysfs
> - identify CNS fixup from Parav
> - enforce fabrics implement ->create_ctrl callout from Johannes
> - nvme-rdma fix goto tag from Christophe
> - spelling fixup from Colin
> 
> Please pull from:
> 
>   git://git.infradead.org/nvme.git nvme-4.11

Pulled, but this really should have been sent in at least a
week earlier...

-- 
Jens Axboe

[GIT PULL] nvme patches for 4.11

[Jens Axboe]

On 02/22/2017 01:28 PM, Jens Axboe wrote:
> On 02/22/2017 12:31 PM, Sagi Grimberg wrote:
>> Hey Jens,
>>
>> This pull-request includes:
>> - autonomous power state transitions from Andy
>> - nvme-rdma support for connecting via configurable source ip
>> - nvmet-rdma cleanups from Max
>> - nvme-fc cleanups from James
>> - quirk fixup for apple from Daniel
>> - various nvme-pci fixes from Keith
>> - expose nvme controller state via sysfs
>> - identify CNS fixup from Parav
>> - enforce fabrics implement ->create_ctrl callout from Johannes
>> - nvme-rdma fix goto tag from Christophe
>> - spelling fixup from Colin
>>
>> Please pull from:
>>
>>   git://git.infradead.org/nvme.git nvme-4.11
> 
> Pulled, but this really should have been sent in at least a
> week earlier...

A few issues with this:

- It throws a merge conflict. No big deal, that was easy enough
  to fix up.

- What is this based on? Looks like some version of my for-next,
  but ends up duplicating 4 patches from me. I don't remember
  if I rebased my for-next this time around, but I often do. It's
  not a stable branch like the for-4.xx/topic branches.

- Out of 22 patches, one commit reverts another commit. That should
  just have been squashed.

I ended up simply fixing all of that up, and generating the patches
and applying. Otherwise the whole history would have been a mess.

-- 
Jens Axboe

[GIT PULL] nvme patches for 4.11

[Daniel Roschka]

On Wednesday, 22. February 2017, 20:41:11 CET you wrote:
> A few issues with this:
> 
> - It throws a merge conflict. No big deal, that was easy enough
>   to fix up.
> 
> - What is this based on? Looks like some version of my for-next,
>   but ends up duplicating 4 patches from me. I don't remember
>   if I rebased my for-next this time around, but I often do. It's
>   not a stable branch like the for-4.xx/topic branches.
> 
> - Out of 22 patches, one commit reverts another commit. That should
>   just have been squashed.
> 
> I ended up simply fixing all of that up, and generating the patches
> and applying. Otherwise the whole history would have been a mess.

Urgs, I don't know what went wrong with the pull request from Sagi, but at 
least the change in there I authored is fundamently different from what I 
submitted!

Looking at git://git.infradead.org/nvme.git nvme-4.11, instead of my original 
patch adding a device ID for another NVMe controller for MacBooks, this branch 
replaces the original entry! That'd be a regression for all MacBook8,1 out 
there!

See http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=4f6cc1c29b0b5d3a964d5ad0cbe7c48e6c44686f
vs. http://lists.infradead.org/pipermail/linux-nvme/2017-February/008323.html

How do we get that fixed?

Best,
Daniel

[GIT PULL] nvme patches for 4.11

[Jens Axboe]

On 02/22/2017 03:10 PM, Daniel Roschka wrote:
> On Wednesday, 22. February 2017, 20:41:11 CET you wrote:
>> A few issues with this:
>>
>> - It throws a merge conflict. No big deal, that was easy enough
>>   to fix up.
>>
>> - What is this based on? Looks like some version of my for-next,
>>   but ends up duplicating 4 patches from me. I don't remember
>>   if I rebased my for-next this time around, but I often do. It's
>>   not a stable branch like the for-4.xx/topic branches.
>>
>> - Out of 22 patches, one commit reverts another commit. That should
>>   just have been squashed.
>>
>> I ended up simply fixing all of that up, and generating the patches
>> and applying. Otherwise the whole history would have been a mess.
> 
> Urgs, I don't know what went wrong with the pull request from Sagi, but at 
> least the change in there I authored is fundamently different from what I 
> submitted!
> 
> Looking at git://git.infradead.org/nvme.git nvme-4.11, instead of my original 
> patch adding a device ID for another NVMe controller for MacBooks, this branch 
> replaces the original entry! That'd be a regression for all MacBook8,1 out 
> there!
> 
> See http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=4f6cc1c29b0b5d3a964d5ad0cbe7c48e6c44686f
> vs. http://lists.infradead.org/pipermail/linux-nvme/2017-February/008323.html
> 
> How do we get that fixed?

Beats me how that happened, Sagi? Sagi is the one that applied it. This
is the commit in the nvme tree:

http://git.infradead.org/nvme.git/commitdiff/918896679f5ca6ee3462aadaaee53049635769c9?hp=1792eac722b0ab651e9eb543114e929dadb1f613

I will fix it up in my tree...

-- 
Jens Axboe

[GIT PULL] nvme patches for 4.11

[Jens Axboe]

On 02/22/2017 03:16 PM, Jens Axboe wrote:
> On 02/22/2017 03:10 PM, Daniel Roschka wrote:
>> On Wednesday, 22. February 2017, 20:41:11 CET you wrote:
>>> A few issues with this:
>>>
>>> - It throws a merge conflict. No big deal, that was easy enough
>>>   to fix up.
>>>
>>> - What is this based on? Looks like some version of my for-next,
>>>   but ends up duplicating 4 patches from me. I don't remember
>>>   if I rebased my for-next this time around, but I often do. It's
>>>   not a stable branch like the for-4.xx/topic branches.
>>>
>>> - Out of 22 patches, one commit reverts another commit. That should
>>>   just have been squashed.
>>>
>>> I ended up simply fixing all of that up, and generating the patches
>>> and applying. Otherwise the whole history would have been a mess.
>>
>> Urgs, I don't know what went wrong with the pull request from Sagi, but at 
>> least the change in there I authored is fundamently different from what I 
>> submitted!
>>
>> Looking at git://git.infradead.org/nvme.git nvme-4.11, instead of my original 
>> patch adding a device ID for another NVMe controller for MacBooks, this branch 
>> replaces the original entry! That'd be a regression for all MacBook8,1 out 
>> there!
>>
>> See http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=4f6cc1c29b0b5d3a964d5ad0cbe7c48e6c44686f
>> vs. http://lists.infradead.org/pipermail/linux-nvme/2017-February/008323.html
>>
>> How do we get that fixed?
> 
> Beats me how that happened, Sagi? Sagi is the one that applied it. This
> is the commit in the nvme tree:
> 
> http://git.infradead.org/nvme.git/commitdiff/918896679f5ca6ee3462aadaaee53049635769c9?hp=1792eac722b0ab651e9eb543114e929dadb1f613
> 
> I will fix it up in my tree...

http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=124298bd03acebd9c9da29a794718aca31bec1f7

-- 
Jens Axboe

[GIT PULL] nvme patches for 4.11

[Sagi Grimberg]

> Pulled, but this really should have been sent in at least a
> week earlier...

Sorry, I'll make sure to send it earlier next time.

Thanks.

[GIT PULL] nvme patches for 4.11

[Sagi Grimberg]

> A few issues with this:
>
> - It throws a merge conflict. No big deal, that was easy enough
>   to fix up.
>
> - What is this based on? Looks like some version of my for-next,
>   but ends up duplicating 4 patches from me. I don't remember
>   if I rebased my for-next this time around, but I often do. It's
>   not a stable branch like the for-4.xx/topic branches.

I rebased on top of for-4.11/block, although looking again git log
--decorate shows its on top of for-4.11/review. Looks like I typo'ed
git rebase...

> - Out of 22 patches, one commit reverts another commit. That should
>   just have been squashed.

Correct, missed that.

> I ended up simply fixing all of that up, and generating the patches
> and applying. Otherwise the whole history would have been a mess.

Thanks Jens, sorry for the extra work.

[GIT PULL] nvme patches for 4.11

[Sagi Grimberg]

>> Urgs, I don't know what went wrong with the pull request from Sagi, but at
>> least the change in there I authored is fundamently different from what I
>> submitted!
>>
>> Looking at git://git.infradead.org/nvme.git nvme-4.11, instead of my original
>> patch adding a device ID for another NVMe controller for MacBooks, this branch
>> replaces the original entry! That'd be a regression for all MacBook8,1 out
>> there!
>>
>> See http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=4f6cc1c29b0b5d3a964d5ad0cbe7c48e6c44686f
>> vs. http://lists.infradead.org/pipermail/linux-nvme/2017-February/008323.html
>>
>> How do we get that fixed?
>
> Beats me how that happened, Sagi? Sagi is the one that applied it. This
> is the commit in the nvme tree:
>
> http://git.infradead.org/nvme.git/commitdiff/918896679f5ca6ee3462aadaaee53049635769c9?hp=1792eac722b0ab651e9eb543114e929dadb1f613

Thats odd, not sure how that happened. it applied cleanly for me.

I'll do it again just to understand if something went wrong.

Thanks for catching this Daniel.

> I will fix it up in my tree...

Thanks Jens.