korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem()

Browse Source 
Update the definition of memcpy_from_pmem() to return 0 or a negative
error code.  Implement x86/arch_memcpy_from_pmem() with memcpy_mcsafe().

Cc: Borislav Petkov <bp@alien8.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2016-03-08 10:30:19 -08:00
parent f55532a0c0
commit fc0c202813
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/include/asm/pmem.h
View File

@ -47,6 +47,15 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
BUG(); BUG();
} }
static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *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 0;
}
/** /**
* arch_wmb_pmem - synchronize writes to persistent memory * arch_wmb_pmem - synchronize writes to persistent memory
* *

4
drivers/nvdimm/pmem.c
View File

@ -99,7 +99,7 @@ static int pmem_do_bvec(struct pmem_device *pmem, struct page *page,
if (unlikely(bad_pmem)) if (unlikely(bad_pmem))
rc = -EIO; rc = -EIO;
else { else {
memcpy_from_pmem(mem + off, pmem_addr, len); rc = memcpy_from_pmem(mem + off, pmem_addr, len);
flush_dcache_page(page); flush_dcache_page(page);
} }
} else { } else {
@ -295,7 +295,7 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns,
if (unlikely(is_bad_pmem(&pmem->bb, offset / 512, sz_align))) if (unlikely(is_bad_pmem(&pmem->bb, offset / 512, sz_align)))
return -EIO; return -EIO;
memcpy_from_pmem(buf, pmem->virt_addr + offset, size); return memcpy_from_pmem(buf, pmem->virt_addr + offset, size);
} else { } else {
memcpy_to_pmem(pmem->virt_addr + offset, buf, size); memcpy_to_pmem(pmem->virt_addr + offset, buf, size);
wmb_pmem(); wmb_pmem();

22
include/linux/pmem.h
View File

@ -42,6 +42,13 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
BUG(); BUG();
} }
static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,
size_t n)
{
BUG();
return -EFAULT;
}
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 __pmem *addr, size_t bytes,
struct iov_iter *i) struct iov_iter *i)
{ {
@ -66,14 +73,17 @@ static inline void arch_invalidate_pmem(void __pmem *addr, size_t size)
#endif #endif
/* /*
* Architectures that define ARCH_HAS_PMEM_API must provide * memcpy_from_pmem - read from persistent memory with error handling
* implementations for arch_memcpy_to_pmem(), arch_wmb_pmem(), * @dst: destination buffer
* arch_copy_from_iter_pmem(), arch_clear_pmem(), arch_wb_cache_pmem() * @src: source buffer
* and arch_has_wmb_pmem(). * @size: transfer length
*
* Returns 0 on success negative error code on failure.
*/ */
static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t size) static inline int memcpy_from_pmem(void *dst, void __pmem const *src,
size_t size)
{ {
memcpy(dst, (void __force const *) src, size); return arch_memcpy_from_pmem(dst, src, size);
} }
static inline bool arch_has_pmem_api(void) static inline bool arch_has_pmem_api(void)