mbox series

[GIT,PULL] NVDIMM and DAX for 6.5

Message ID b40d43f78d320324c7a65ec0f3162524a4781c4c.camel@intel.com (mailing list archive)
State Accepted
Commit 0a1c979c6b7dfe5b6c105d0f0f9f068b5eb07e25
Headers show
Series [GIT,PULL] NVDIMM and DAX for 6.5 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-for-6.5

Message

Vishal Verma June 30, 2023, 7:17 p.m. UTC 
Hi Linus, please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-for-6.5

... to receive  the libnvdimm and DAX update for v6.5.

This is mostly small cleanups and fixes, with the biggest change being the
change to the DAX fault handler allowing it to return VM_FAULT_HWPOISON.

It has appeared in linux-next with no reported issues.

On an operational note, as Dan handed off the branch to me for this cycle, we
missed that the original few commits were inadvertently made on top of a few
CXL commits that went in in the 6.4-rc cycle via the CXL tree.

git-request-pull included these, and hence they appear in the shortlog and
diffstat below, but the actual merge correctly identifies and skips over them.
I kept it as it is to preserve the linux-next soak time, but if I should have
done it differently, please let me know.

---

The following changes since commit f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6:

  Linux 6.4-rc2 (2023-05-14 12:51:40 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-for-6.5

for you to fetch changes up to 1ea7ca1b090145519aad998679222f0a14ab8fce:

  dax: enable dax fault handler to report VM_FAULT_HWPOISON (2023-06-26 07:54:23 -0600)

----------------------------------------------------------------
libnvdimm for 6.5

- DAX fixes and cleanups including a use after free, extra references,
  and device unregistration, and a redundant variable.

- Allow the DAX fault handler to return VM_FAULT_HWPOISON

- A few libnvdimm cleanups such as making some functions and variables
static where sufficient.

- Add a few missing prototypes for wrapped functions in
tools/testing/nvdimm

----------------------------------------------------------------
Arnd Bergmann (3):
      dax: fix missing-prototype warnings
      testing: nvdimm: add missing prototypes for wrapped functions
      libnvdimm: mark 'security_show' static again

Ben Dooks (2):
      nvdimm: make nd_class variable static
      nvdimm: make security_show static

Colin Ian King (1):
      fsdax: remove redundant variable 'error'

Dan Williams (5):
      cxl/port: Enable the HDM decoder capability for switch ports
      dax: Fix dax_mapping_release() use after free
      dax: Use device_unregister() in unregister_dax_mapping()
      dax: Introduce alloc_dev_dax_id()
      dax: Cleanup extra dax_region references

Dave Jiang (2):
      cxl: Wait Memory_Info_Valid before access memory related info
      cxl: Move cxl_await_media_ready() to before capacity info retrieval

Jane Chu (1):
      dax: enable dax fault handler to report VM_FAULT_HWPOISON

Tarun Sahu (1):
      dax/kmem: Pass valid argument to memory_group_register_static

Uwe Kleine-König (1):
      tools/testing/nvdimm: Drop empty platform remove function

Vishal Verma (1):
      Merge branch 'for-6.5/dax-cleanups' into nvdimm-for-next

 include/linux/dax.h                   |  13 ++++
 include/linux/mm.h                    |   2 +
 drivers/cxl/cxl.h                     |   1 +
 drivers/cxl/cxlmem.h                  |   2 +
 drivers/cxl/cxlpci.h                  |   2 +
 drivers/dax/bus.h                     |   8 ---
 drivers/dax/dax-private.h             |  11 +++-
 tools/testing/nvdimm/test/nfit_test.h |  29 +++++++++
 drivers/cxl/core/mbox.c               |  15 +++--
 drivers/cxl/core/pci.c                | 112 ++++++++++++++++++++++++++++++----
 drivers/cxl/mem.c                     |   3 +
 drivers/cxl/pci.c                     |   6 ++
 drivers/cxl/port.c                    |  20 +++---
 drivers/dax/bus.c                     |  64 +++++++++++--------
 drivers/dax/cxl.c                     |   8 +--
 drivers/dax/device.c                  |   3 +-
 drivers/dax/hmem/hmem.c               |   8 +--
 drivers/dax/kmem.c                    |   2 +-
 drivers/dax/pmem.c                    |   7 +--
 drivers/dax/super.c                   |   5 +-
 drivers/nvdimm/bus.c                  |   2 +-
 drivers/nvdimm/dimm_devs.c            |   4 +-
 drivers/nvdimm/pmem.c                 |   2 +-
 drivers/s390/block/dcssblk.c          |   3 +-
 fs/dax.c                              |  14 ++---
 fs/fuse/virtio_fs.c                   |   3 +-
 tools/testing/cxl/test/mem.c          |   1 +
 tools/testing/cxl/test/mock.c         |  15 +++++
 tools/testing/nvdimm/test/nfit.c      |   6 --
 tools/testing/cxl/Kbuild              |   1 +
 30 files changed, 265 insertions(+), 107 deletions(-)

Comments

Linus Torvalds July 1, 2023, 3:51 p.m. UTC | #1 
On Fri, 30 Jun 2023 at 12:17, Verma, Vishal L <vishal.l.verma@intel.com> wrote:
>
> On an operational note, as Dan handed off the branch to me for this cycle, we
> missed that the original few commits were inadvertently made on top of a few
> CXL commits that went in in the 6.4-rc cycle via the CXL tree.
>
> git-request-pull included these, and hence they appear in the shortlog and
> diffstat below, but the actual merge correctly identifies and skips over them.
> I kept it as it is to preserve the linux-next soak time, but if I should have
> done it differently, please let me know.

No, this was the right thing to do. Apart from a slightly odd choice
of base for this all, the pull looks perfectly normal.

Thanks,
                Linus
pr-tracker-bot@kernel.org July 1, 2023, 4:12 p.m. UTC | #2 
The pull request you sent on Fri, 30 Jun 2023 19:17:47 +0000:

> git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git tags/libnvdimm-for-6.5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0a1c979c6b7dfe5b6c105d0f0f9f068b5eb07e25

Thank you!