Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ed9268 authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm, dax: autodetect support 



For autodetecting a previously established dax configuration we need the
info block to indicate block-device vs device-dax mode, and we need to
have the default namespace probe hand-off the configuration to the
dax_pmem driver.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent b354aba0

drivers/nvdimm/dax_devs.c

+35 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include "nd-core.h"

#include "nd-core.h"

#include "pfn.h"

#include "nd.h"

#include "nd.h"





static void nd_dax_release(struct device *dev)

static void nd_dax_release(struct device *dev)
@@ -97,3 +98,37 @@ struct device *nd_dax_create(struct nd_region *nd_region) 
	__nd_device_register(dev);

	__nd_device_register(dev);

	return dev;

	return dev;

}

}



int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns)

{

	int rc;

	struct nd_dax *nd_dax;

	struct device *dax_dev;

	struct nd_pfn *nd_pfn;

	struct nd_pfn_sb *pfn_sb;

	struct nd_region *nd_region = to_nd_region(ndns->dev.parent);



	if (ndns->force_raw)

		return -ENODEV;



	nvdimm_bus_lock(&ndns->dev);

	nd_dax = nd_dax_alloc(nd_region);

	nd_pfn = &nd_dax->nd_pfn;

	dax_dev = nd_pfn_devinit(nd_pfn, ndns);

	nvdimm_bus_unlock(&ndns->dev);

	if (!dax_dev)

		return -ENOMEM;

	pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);

	nd_pfn->pfn_sb = pfn_sb;

	rc = nd_pfn_validate(nd_pfn, DAX_SIG);

	dev_dbg(dev, "%s: dax: %s\n", __func__,

			rc == 0 ? dev_name(dax_dev) : "<none>");

	if (rc < 0) {

		__nd_detach_ndns(dax_dev, &nd_pfn->ndns);

		put_device(dax_dev);

	} else

		__nd_device_register(dax_dev);



	return rc;

}

EXPORT_SYMBOL(nd_dax_probe);

drivers/nvdimm/nd.h

+9 −2
Original line number Original line Diff line number Diff line
@@ -232,7 +232,7 @@ bool is_nd_pfn(struct device *dev); 
struct device *nd_pfn_create(struct nd_region *nd_region);

struct device *nd_pfn_create(struct nd_region *nd_region);

struct device *nd_pfn_devinit(struct nd_pfn *nd_pfn,

struct device *nd_pfn_devinit(struct nd_pfn *nd_pfn,

		struct nd_namespace_common *ndns);

		struct nd_namespace_common *ndns);

int nd_pfn_validate(struct nd_pfn *nd_pfn);

int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig);

extern struct attribute_group nd_pfn_attribute_group;

extern struct attribute_group nd_pfn_attribute_group;

#else

#else

static inline int nd_pfn_probe(struct device *dev,

static inline int nd_pfn_probe(struct device *dev,
@@ -251,7 +251,7 @@ static inline struct device *nd_pfn_create(struct nd_region *nd_region) 
	return NULL;

	return NULL;

}

}





static inline int nd_pfn_validate(struct nd_pfn *nd_pfn)

static inline int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)

{

{

	return -ENODEV;

	return -ENODEV;

}

}
@@ -259,9 +259,16 @@ static inline int nd_pfn_validate(struct nd_pfn *nd_pfn) 




struct nd_dax *to_nd_dax(struct device *dev);

struct nd_dax *to_nd_dax(struct device *dev);

#if IS_ENABLED(CONFIG_NVDIMM_DAX)

#if IS_ENABLED(CONFIG_NVDIMM_DAX)

int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns);

bool is_nd_dax(struct device *dev);

bool is_nd_dax(struct device *dev);

struct device *nd_dax_create(struct nd_region *nd_region);

struct device *nd_dax_create(struct nd_region *nd_region);

#else

#else

static inline int nd_dax_probe(struct device *dev,

		struct nd_namespace_common *ndns)

{

	return -ENODEV;

}



static inline bool is_nd_dax(struct device *dev)

static inline bool is_nd_dax(struct device *dev)

{

{

	return false;

	return false;

drivers/nvdimm/pfn.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 




#define PFN_SIG_LEN 16

#define PFN_SIG_LEN 16

#define PFN_SIG "NVDIMM_PFN_INFO\0"

#define PFN_SIG "NVDIMM_PFN_INFO\0"

#define DAX_SIG "NVDIMM_DAX_INFO\0"





struct nd_pfn_sb {

struct nd_pfn_sb {

	u8 signature[PFN_SIG_LEN];

	u8 signature[PFN_SIG_LEN];

drivers/nvdimm/pfn_devs.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ struct device *nd_pfn_create(struct nd_region *nd_region) 
	return dev;

	return dev;

}

}





int nd_pfn_validate(struct nd_pfn *nd_pfn)

int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)

{

{

	u64 checksum, offset;

	u64 checksum, offset;

	struct nd_namespace_io *nsio;

	struct nd_namespace_io *nsio;
@@ -377,7 +377,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn) 
	if (nvdimm_read_bytes(ndns, SZ_4K, pfn_sb, sizeof(*pfn_sb)))

	if (nvdimm_read_bytes(ndns, SZ_4K, pfn_sb, sizeof(*pfn_sb)))

		return -ENXIO;

		return -ENXIO;





	if (memcmp(pfn_sb->signature, PFN_SIG, PFN_SIG_LEN) != 0)

	if (memcmp(pfn_sb->signature, sig, PFN_SIG_LEN) != 0)

		return -ENODEV;

		return -ENODEV;





	checksum = le64_to_cpu(pfn_sb->checksum);

	checksum = le64_to_cpu(pfn_sb->checksum);
@@ -467,7 +467,7 @@ int nd_pfn_probe(struct device *dev, struct nd_namespace_common *ndns) 
	pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);

	pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);

	nd_pfn = to_nd_pfn(pfn_dev);

	nd_pfn = to_nd_pfn(pfn_dev);

	nd_pfn->pfn_sb = pfn_sb;

	nd_pfn->pfn_sb = pfn_sb;

	rc = nd_pfn_validate(nd_pfn);

	rc = nd_pfn_validate(nd_pfn, PFN_SIG);

	dev_dbg(dev, "%s: pfn: %s\n", __func__,

	dev_dbg(dev, "%s: pfn: %s\n", __func__,

			rc == 0 ? dev_name(pfn_dev) : "<none>");

			rc == 0 ? dev_name(pfn_dev) : "<none>");

	if (rc < 0) {

	if (rc < 0) {
@@ -552,6 +552,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) 
	struct nd_pfn_sb *pfn_sb;

	struct nd_pfn_sb *pfn_sb;

	unsigned long npfns;

	unsigned long npfns;

	phys_addr_t offset;

	phys_addr_t offset;

	const char *sig;

	u64 checksum;

	u64 checksum;

	int rc;

	int rc;
@@ -560,7 +561,11 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) 
		return -ENOMEM;

		return -ENOMEM;





	nd_pfn->pfn_sb = pfn_sb;

	nd_pfn->pfn_sb = pfn_sb;

	rc = nd_pfn_validate(nd_pfn);

	if (is_nd_dax(&nd_pfn->dev))

		sig = DAX_SIG;

	else

		sig = PFN_SIG;

	rc = nd_pfn_validate(nd_pfn, sig);

	if (rc != -ENODEV)

	if (rc != -ENODEV)

		return rc;

		return rc;
@@ -628,7 +633,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) 
	pfn_sb->mode = cpu_to_le32(nd_pfn->mode);

	pfn_sb->mode = cpu_to_le32(nd_pfn->mode);

	pfn_sb->dataoff = cpu_to_le64(offset);

	pfn_sb->dataoff = cpu_to_le64(offset);

	pfn_sb->npfns = cpu_to_le64(npfns);

	pfn_sb->npfns = cpu_to_le64(npfns);

	memcpy(pfn_sb->signature, PFN_SIG, PFN_SIG_LEN);

	memcpy(pfn_sb->signature, sig, PFN_SIG_LEN);

	memcpy(pfn_sb->uuid, nd_pfn->uuid, 16);

	memcpy(pfn_sb->uuid, nd_pfn->uuid, 16);

	memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);

	memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);

	pfn_sb->version_major = cpu_to_le16(1);

	pfn_sb->version_major = cpu_to_le16(1);

drivers/nvdimm/pmem.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,8 @@ static int nd_pmem_probe(struct device *dev) 
		return pmem_attach_disk(dev, ndns);

		return pmem_attach_disk(dev, ndns);





	/* if we find a valid info-block we'll come back as that personality */

	/* if we find a valid info-block we'll come back as that personality */

	if (nd_btt_probe(dev, ndns) == 0 || nd_pfn_probe(dev, ndns) == 0)

	if (nd_btt_probe(dev, ndns) == 0 || nd_pfn_probe(dev, ndns) == 0

			|| nd_dax_probe(dev, ndns) == 0)

		return -ENXIO;

		return -ENXIO;





	/* ...otherwise we're just a raw pmem device */

	/* ...otherwise we're just a raw pmem device */