Merge tag 'libnvdimm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Dan Williams:
 "libnvdimm updates for the latest ACPI and UEFI specifications. This
  pull request also includes new 'struct dax_operations' enabling to
  undo the abuse of copy_user_nocache() for copy operations to pmem.

  The dax work originally missed 4.12 to address concerns raised by Al.

  Summary:

   - Introduce the _flushcache() family of memory copy helpers and use
     them for persistent memory write operations on x86. The
     _flushcache() semantic indicates that the cache is either bypassed
     for the copy operation (movnt) or any lines dirtied by the copy
     operation are written back (clwb, clflushopt, or clflush).

   - Extend dax_operations with ->copy_from_iter() and ->flush()
     operations. These operations and other infrastructure updates allow
     all persistent memory specific dax functionality to be pushed into
     libnvdimm and the pmem driver directly. It also allows dax-specific
     sysfs attributes to be linked to a host device, for example:
     /sys/block/pmem0/dax/write_cache

   - Add support for the new NVDIMM platform/firmware mechanisms
     introduced in ACPI 6.2 and UEFI 2.7. This support includes the v1.2
     namespace label format, extensions to the address-range-scrub
     command set, new error injection commands, and a new BTT
     (block-translation-table) layout. These updates support inter-OS
     and pre-OS compatibility.

   - Fix a longstanding memory corruption bug in nfit_test.

   - Make the pmem and nvdimm-region 'badblocks' sysfs files poll(2)
     capable.

   - Miscellaneous fixes and small updates across libnvdimm and the nfit
     driver.

  Acknowledgements that came after the branch was pushed: commit
  6aa734a2f38e ("libnvdimm, region, pmem: fix 'badblocks'
  sysfs_get_dirent() reference lifetime") was reviewed by Toshi Kani
  <toshi.kani@hpe.com>"

* tag 'libnvdimm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (42 commits)
  libnvdimm, namespace: record 'lbasize' for pmem namespaces
  acpi/nfit: Issue Start ARS to retrieve existing records
  libnvdimm: New ACPI 6.2 DSM functions
  acpi, nfit: Show bus_dsm_mask in sysfs
  libnvdimm, acpi, nfit: Add bus level dsm mask for pass thru.
  acpi, nfit: Enable DSM pass thru for root functions.
  libnvdimm: passthru functions clear to send
  libnvdimm, btt: convert some info messages to warn/err
  libnvdimm, region, pmem: fix 'badblocks' sysfs_get_dirent() reference lifetime
  libnvdimm: fix the clear-error check in nsio_rw_bytes
  libnvdimm, btt: fix btt_rw_page not returning errors
  acpi, nfit: quiet invalid block-aperture-region warnings
  libnvdimm, btt: BTT updates for UEFI 2.7 format
  acpi, nfit: constify *_attribute_group
  libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region
  libnvdimm, pmem, dax: export a cache control attribute
  dax: convert to bitmask for flags
  dax: remove default copy_from_iter fallback
  libnvdimm, nfit: enable support for volatile ranges
  libnvdimm, pmem: fix persistence warning
  ...

1 files changed, 41 insertions, 1 deletions

diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 7ad3863cb88b..6d3c54264d8e 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -105,7 +105,8 @@ struct nd_cmd_ars_cap {
         __u32 status;
         __u32 max_ars_out;
         __u32 clear_err_unit;
-        __u32 reserved;
+        __u16 flags;
+        __u16 reserved;
 } __packed;
 
 struct nd_cmd_ars_start {
@@ -144,6 +145,43 @@ struct nd_cmd_clear_error {
         __u64 cleared;
 } __packed;
 
+struct nd_cmd_trans_spa {
+        __u64 spa;
+        __u32 status;
+        __u8  flags;
+        __u8  _reserved[3];
+        __u64 trans_length;
+        __u32 num_nvdimms;
+        struct nd_nvdimm_device {
+                __u32 nfit_device_handle;
+                __u32 _reserved;
+                __u64 dpa;
+        } __packed devices[0];
+
+} __packed;
+
+struct nd_cmd_ars_err_inj {
+        __u64 err_inj_spa_range_base;
+        __u64 err_inj_spa_range_length;
+        __u8  err_inj_options;
+        __u32 status;
+} __packed;
+
+struct nd_cmd_ars_err_inj_clr {
+        __u64 err_inj_clr_spa_range_base;
+        __u64 err_inj_clr_spa_range_length;
+        __u32 status;
+} __packed;
+
+struct nd_cmd_ars_err_inj_stat {
+        __u32 status;
+        __u32 inj_err_rec_count;
+        struct nd_error_stat_query_record {
+                __u64 err_inj_stat_spa_range_base;
+                __u64 err_inj_stat_spa_range_length;
+        } __packed record[0];
+} __packed;
+
 enum {
         ND_CMD_IMPLEMENTED = 0,
 
@@ -169,6 +207,7 @@ enum {
 enum {
         ND_ARS_VOLATILE = 1,
         ND_ARS_PERSISTENT = 2,
+        ND_ARS_RETURN_PREV_DATA = 1 << 1,
         ND_CONFIG_LOCKED = 1,
 };
 
@@ -179,6 +218,7 @@ static inline const char *nvdimm_bus_cmd_name(unsigned cmd)
                 [ND_CMD_ARS_START] = "ars_start",
                 [ND_CMD_ARS_STATUS] = "ars_status",
                 [ND_CMD_CLEAR_ERROR] = "clear_error",
+                [ND_CMD_CALL] = "cmd_call",
         };
 
         if (cmd < ARRAY_SIZE(names) && names[cmd])