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

Commit 7a9eb206 authored by Dan Williams's avatar Dan Williams
Browse files

pmem: kill __pmem address space 



The __pmem address space was meant to annotate codepaths that touch
persistent memory and need to coordinate a call to wmb_pmem().  Now that
wmb_pmem() is gone, there is little need to keep this annotation.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 7c8a6a71

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ prototypes: 
	int (*release) (struct gendisk *, fmode_t);

	int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);

	int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);

	int (*direct_access) (struct block_device *, sector_t, void __pmem **,

	int (*direct_access) (struct block_device *, sector_t, void **,

				unsigned long *);

	int (*media_changed) (struct gendisk *);

	void (*unlock_native_capacity) (struct gendisk *);

arch/powerpc/sysdev/axonram.c

+2 −2
Original line number Diff line number Diff line
@@ -143,12 +143,12 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) 
 */

static long

axon_ram_direct_access(struct block_device *device, sector_t sector,

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

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

{

	struct axon_ram_bank *bank = device->bd_disk->private_data;

	loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT;



	*kaddr = (void __pmem __force *) bank->io_addr + offset;

	*kaddr = (void *) bank->io_addr + offset;

	*pfn = phys_to_pfn_t(bank->ph_addr + offset, PFN_DEV);

	return bank->size - offset;

}

arch/x86/include/asm/pmem.h

+17 −24
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ 
 * Copy data to persistent memory media via non-temporal stores so that

 * a subsequent pmem driver flush operation will drain posted write queues.

 */

static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,

		size_t n)

static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n)

{

	int unwritten;

	int rem;



	/*

	 * We are copying between two kernel buffers, if
@@ -39,19 +38,17 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src, 
	 * fault) we would have already reported a general protection fault

	 * before the WARN+BUG.

	 */

	unwritten = __copy_from_user_inatomic_nocache((void __force *) dst,

			(void __user *) src, n);

	if (WARN(unwritten, "%s: fault copying %p <- %p unwritten: %d\n",

				__func__, dst, src, unwritten))

	rem = __copy_from_user_inatomic_nocache(dst, (void __user *) src, n);

	if (WARN(rem, "%s: fault copying %p <- %p unwritten: %d\n",

				__func__, dst, src, rem))

		BUG();

}



static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,

		size_t n)

static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n)

{

	if (static_cpu_has(X86_FEATURE_MCE_RECOVERY))

		return memcpy_mcsafe(dst, (void __force *) src, n);

	memcpy(dst, (void __force *) src, n);

		return memcpy_mcsafe(dst, src, n);

	memcpy(dst, src, n);

	return 0;

}
@@ -63,15 +60,14 @@ static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src, 
 * Write back a cache range using the CLWB (cache line write back)

 * instruction.

 */

static inline void arch_wb_cache_pmem(void __pmem *addr, size_t size)

static inline void arch_wb_cache_pmem(void *addr, size_t size)

{

	u16 x86_clflush_size = boot_cpu_data.x86_clflush_size;

	unsigned long clflush_mask = x86_clflush_size - 1;

	void *vaddr = (void __force *)addr;

	void *vend = vaddr + size;

	void *vend = addr + size;

	void *p;



	for (p = (void *)((unsigned long)vaddr & ~clflush_mask);

	for (p = (void *)((unsigned long)addr & ~clflush_mask);

	     p < vend; p += x86_clflush_size)

		clwb(p);

}
@@ -93,14 +89,13 @@ static inline bool __iter_needs_pmem_wb(struct iov_iter *i) 
 *

 * Copy data from the iterator 'i' to the PMEM buffer starting at 'addr'.

 */

static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes,

static inline size_t arch_copy_from_iter_pmem(void *addr, size_t bytes,

		struct iov_iter *i)

{

	void *vaddr = (void __force *)addr;

	size_t len;



	/* TODO: skip the write-back by always using non-temporal stores */

	len = copy_from_iter_nocache(vaddr, bytes, i);

	len = copy_from_iter_nocache(addr, bytes, i);



	if (__iter_needs_pmem_wb(i))

		arch_wb_cache_pmem(addr, bytes);
@@ -115,17 +110,15 @@ static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes, 
 *

 * Write zeros into the memory range starting at 'addr' for 'size' bytes.

 */

static inline void arch_clear_pmem(void __pmem *addr, size_t size)

static inline void arch_clear_pmem(void *addr, size_t size)

{

	void *vaddr = (void __force *)addr;



	memset(vaddr, 0, size);

	memset(addr, 0, size);

	arch_wb_cache_pmem(addr, size);

}



static inline void arch_invalidate_pmem(void __pmem *addr, size_t size)

static inline void arch_invalidate_pmem(void *addr, size_t size)

{

	clflush_cache_range((void __force *) addr, size);

	clflush_cache_range(addr, size);

}

#endif /* CONFIG_ARCH_HAS_PMEM_API */

#endif /* __ASM_X86_PMEM_H__ */

drivers/acpi/nfit.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ enum nd_blk_mmio_selector { 
struct nd_blk_addr {

	union {

		void __iomem *base;

		void __pmem  *aperture;

		void *aperture;

	};

};

drivers/block/brd.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector, 


#ifdef CONFIG_BLK_DEV_RAM_DAX

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

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

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

{

	struct brd_device *brd = bdev->bd_disk->private_data;

	struct page *page;
@@ -391,7 +391,7 @@ static long brd_direct_access(struct block_device *bdev, sector_t sector, 
	page = brd_insert_page(brd, sector);

	if (!page)

		return -ENOSPC;

	*kaddr = (void __pmem *)page_address(page);

	*kaddr = page_address(page);

	*pfn = page_to_pfn_t(page);



	return PAGE_SIZE;