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

libnvdimm, pmem: allow nfit_test to override pmem_direct_access() 



Currently phys_to_pfn_t() is an exported symbol to allow nfit_test to
override it and indicate that nfit_test-pmem is not device-mapped.  Now,
we want to enable nfit_test to operate without DMA_CMA and the pmem it
provides will no longer be physically contiguous, i.e. won't be capable
of supporting direct_access requests larger than a page.  Make
pmem_direct_access() a weak symbol so that it can be replaced by the
tools/testing/nvdimm/ version, and move phys_to_pfn_t() to a static
inline now that it no longer needs to be overridden.

Acked-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e02fb726

drivers/nvdimm/pmem.c

+3 −15
Original line number Diff line number Diff line
@@ -29,23 +29,10 @@ 
#include <linux/slab.h>

#include <linux/pmem.h>

#include <linux/nd.h>

#include "pmem.h"

#include "pfn.h"

#include "nd.h"



struct pmem_device {

	/* One contiguous memory region per device */

	phys_addr_t		phys_addr;

	/* when non-zero this device is hosting a 'pfn' instance */

	phys_addr_t		data_offset;

	u64			pfn_flags;

	void __pmem		*virt_addr;

	/* immutable base size of the namespace */

	size_t			size;

	/* trim size when namespace capacity has been section aligned */

	u32			pfn_pad;

	struct badblocks	bb;

};



static void pmem_clear_poison(struct pmem_device *pmem, phys_addr_t offset,

		unsigned int len)

{
@@ -163,7 +150,8 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector, 
	return rc;

}



static long pmem_direct_access(struct block_device *bdev, sector_t sector,

/* see "strong" declaration in tools/testing/nvdimm/pmem-dax.c */

__weak long pmem_direct_access(struct block_device *bdev, sector_t sector,

		      void __pmem **kaddr, pfn_t *pfn, long size)

{

	struct pmem_device *pmem = bdev->bd_queue->queuedata;

drivers/nvdimm/pmem.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#ifndef __NVDIMM_PMEM_H__

#define __NVDIMM_PMEM_H__

#include <linux/badblocks.h>

#include <linux/types.h>

#include <linux/pfn_t.h>

#include <linux/fs.h>



long pmem_direct_access(struct block_device *bdev, sector_t sector,

		      void __pmem **kaddr, pfn_t *pfn, long size);

/* this definition is in it's own header for tools/testing/nvdimm to consume */

struct pmem_device {

	/* One contiguous memory region per device */

	phys_addr_t		phys_addr;

	/* when non-zero this device is hosting a 'pfn' instance */

	phys_addr_t		data_offset;

	u64			pfn_flags;

	void __pmem		*virt_addr;

	/* immutable base size of the namespace */

	size_t			size;

	/* trim size when namespace capacity has been section aligned */

	u32			pfn_pad;

	struct badblocks	bb;

};

#endif /* __NVDIMM_PMEM_H__ */

include/linux/pfn_t.h

+4 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ static inline pfn_t pfn_to_pfn_t(unsigned long pfn) 
	return __pfn_to_pfn_t(pfn, 0);

}



extern pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags);

static inline pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags)

{

	return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags);

}



static inline bool pfn_t_has_page(pfn_t pfn)

{

kernel/memremap.c

+0 −6
Original line number Diff line number Diff line
@@ -169,12 +169,6 @@ void devm_memunmap(struct device *dev, void *addr) 
}

EXPORT_SYMBOL(devm_memunmap);



pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags)

{

	return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags);

}

EXPORT_SYMBOL(phys_to_pfn_t);



#ifdef CONFIG_ZONE_DEVICE

static DEFINE_MUTEX(pgmap_lock);

static RADIX_TREE(pgmap_radix, GFP_KERNEL);

tools/testing/nvdimm/Kbuild

+2 −1
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ ldflags-y += --wrap=__devm_release_region 
ldflags-y += --wrap=__request_region

ldflags-y += --wrap=__release_region

ldflags-y += --wrap=devm_memremap_pages

ldflags-y += --wrap=phys_to_pfn_t



DRIVERS := ../../../drivers

NVDIMM_SRC := $(DRIVERS)/nvdimm

ACPI_SRC := $(DRIVERS)/acpi

DAX_SRC := $(DRIVERS)/dax

ccflags-y := -I$(src)/$(NVDIMM_SRC)/



obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o

obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
@@ -31,6 +31,7 @@ nfit-y := $(ACPI_SRC)/nfit.o 
nfit-y += config_check.o



nd_pmem-y := $(NVDIMM_SRC)/pmem.o

nd_pmem-y += pmem-dax.o

nd_pmem-y += config_check.o



nd_btt-y := $(NVDIMM_SRC)/btt.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE