Commit 3acbdbf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dax and libnvdimm updates from Dan Williams:
 "The bulk of this is a rework of the dax_operations API after
  discovering the obstacles it posed to the work-in-progress DAX+reflink
  support for XFS and other copy-on-write filesystem mechanics.

  Primarily the need to plumb a block_device through the API to handle
  partition offsets was a sticking point and Christoph untangled that
  dependency in addition to other cleanups to make landing the
  DAX+reflink support easier.

  The DAX_PMEM_COMPAT option has been around for 4 years and not only
  are distributions shipping userspace that understand the current
  configuration API, but some are not even bothering to turn this option
  on anymore, so it seems a good time to remove it per the deprecation
  schedule. Recall that this was added after the device-dax subsystem
  moved from /sys/class/dax to /sys/bus/dax for its sysfs organization.
  All recent functionality depends on /sys/bus/dax.

  Some other miscellaneous cleanups and reflink prep patches are
  included as well.

  Summary:

   - Simplify the dax_operations API:

      - Eliminate bdev_dax_pgoff() in favor of the filesystem
        maintaining and applying a partition offset to all its DAX iomap
        operations.

      - Remove wrappers and device-mapper stacked callbacks for
        ->copy_from_iter() and ->copy_to_iter() in favor of moving
        block_device relative offset responsibility to the
        dax_direct_access() caller.

      - Remove the need for an @bdev in filesystem-DAX infrastructure

      - Remove unused uio helpers copy_from_iter_flushcache() and
        copy_mc_to_iter() as only the non-check_copy_size() versions are
        used for DAX.

   - Prepare XFS for the pending (next merge window) DAX+reflink support

   - Remove deprecated DEV_DAX_PMEM_COMPAT support

   - Cleanup a straggling misuse of the GUID api"

* tag 'libnvdimm-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (38 commits)
  iomap: Fix error handling in iomap_zero_iter()
  ACPI: NFIT: Import GUID before use
  dax: remove the copy_from_iter and copy_to_iter methods
  dax: remove the DAXDEV_F_SYNC flag
  dax: simplify dax_synchronous and set_dax_synchronous
  uio: remove copy_from_iter_flushcache() and copy_mc_to_iter()
  iomap: turn the byte variable in iomap_zero_iter into a ssize_t
  memremap: remove support for external pgmap refcounts
  fsdax: don't require CONFIG_BLOCK
  iomap: build the block based code conditionally
  dax: fix up some of the block device related ifdefs
  fsdax: shift partition offset handling into the file systems
  dax: return the partition offset from fs_dax_get_by_bdev
  iomap: add a IOMAP_DAX flag
  xfs: pass the mapping flags to xfs_bmbt_to_iomap
  xfs: use xfs_direct_write_iomap_ops for DAX zeroing
  xfs: move dax device handling into xfs_{alloc,free}_buftarg
  ext4: cleanup the dax handling in ext4_fill_super
  ext2: cleanup the dax handling in ext2_fill_super
  fsdax: decouple zeroing from the iomap buffered I/O code
  ...
parents 8834147f 9e05e95c

Documentation/ABI/obsolete/sysfs-class-dax

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
What:           /sys/class/dax/

Date:           May, 2016

KernelVersion:  v4.7

Contact:        nvdimm@lists.linux.dev

Description:	Device DAX is the device-centric analogue of Filesystem

		DAX (CONFIG_FS_DAX).  It allows memory ranges to be

		allocated and mapped without need of an intervening file

		system.  Device DAX is strict, precise and predictable.

		Specifically this interface:



		1. Guarantees fault granularity with respect to a given

		   page size (pte, pmd, or pud) set at configuration time.



		2. Enforces deterministic behavior by being strict about

		   what fault scenarios are supported.



		The /sys/class/dax/ interface enumerates all the

		device-dax instances in the system. The ABI is

		deprecated and will be removed after 2020. It is

		replaced with the DAX bus interface /sys/bus/dax/ where

		device-dax instances can be found under

		/sys/bus/dax/devices/

drivers/acpi/nfit/core.c

+3 −1
Original line number Diff line number Diff line
@@ -678,10 +678,12 @@ static const char *spa_type_name(u16 type) 


int nfit_spa_type(struct acpi_nfit_system_address *spa)

{

	guid_t guid;

	int i;



	import_guid(&guid, spa->range_guid);

	for (i = 0; i < NFIT_UUID_MAX; i++)

		if (guid_equal(to_nfit_uuid(i), (guid_t *)&spa->range_guid))

		if (guid_equal(to_nfit_uuid(i), &guid))

			return i;

	return -1;

}

drivers/dax/Kconfig

+0 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DAX_DRIVER

	select DAX

	bool



menuconfig DAX

	tristate "DAX: direct access to differentiated memory"

	select SRCU
@@ -70,13 +66,4 @@ config DEV_DAX_KMEM 


	  Say N if unsure.



config DEV_DAX_PMEM_COMPAT

	tristate "PMEM DAX: support the deprecated /sys/class/dax interface"

	depends on m && DEV_DAX_PMEM=m

	default DEV_DAX_PMEM

	help

	  Older versions of the libdaxctl library expect to find all

	  device-dax instances under /sys/class/dax. If libdaxctl in

	  your distribution is older than v58 say M, otherwise say N.



endif

drivers/dax/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 
obj-$(CONFIG_DAX) += dax.o

obj-$(CONFIG_DEV_DAX) += device_dax.o

obj-$(CONFIG_DEV_DAX_KMEM) += kmem.o

obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o



dax-y := super.o

dax-y += bus.o

device_dax-y := device.o

dax_pmem-y := pmem.o



obj-y += pmem/

obj-y += hmem/

drivers/dax/bus.c

+8 −22
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#include "dax-private.h"

#include "bus.h"



static struct class *dax_class;



static DEFINE_MUTEX(dax_bus_lock);



#define DAX_NAME_LEN 30
@@ -1323,14 +1321,17 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) 
	}



	/*

	 * No 'host' or dax_operations since there is no access to this

	 * device outside of mmap of the resulting character device.

	 * No dax_operations since there is no access to this device outside of

	 * mmap of the resulting character device.

	 */

	dax_dev = alloc_dax(dev_dax, NULL, NULL, DAXDEV_F_SYNC);

	dax_dev = alloc_dax(dev_dax, NULL);

	if (IS_ERR(dax_dev)) {

		rc = PTR_ERR(dax_dev);

		goto err_alloc_dax;

	}

	set_dax_synchronous(dax_dev);

	set_dax_nocache(dax_dev);

	set_dax_nomc(dax_dev);



	/* a device_dax instance is dead while the driver is not attached */

	kill_dax(dax_dev);
@@ -1343,10 +1344,7 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) 


	inode = dax_inode(dax_dev);

	dev->devt = inode->i_rdev;

	if (data->subsys == DEV_DAX_BUS)

	dev->bus = &dax_bus_type;

	else

		dev->class = dax_class;

	dev->parent = parent;

	dev->type = &dev_dax_type;
@@ -1445,22 +1443,10 @@ EXPORT_SYMBOL_GPL(dax_driver_unregister); 


int __init dax_bus_init(void)

{

	int rc;



	if (IS_ENABLED(CONFIG_DEV_DAX_PMEM_COMPAT)) {

		dax_class = class_create(THIS_MODULE, "dax");

		if (IS_ERR(dax_class))

			return PTR_ERR(dax_class);

	}



	rc = bus_register(&dax_bus_type);

	if (rc)

		class_destroy(dax_class);

	return rc;

	return bus_register(&dax_bus_type);

}



void __exit dax_bus_exit(void)

{

	bus_unregister(&dax_bus_type);

	class_destroy(dax_class);

}