> +#ifdef ARCH_HAS_NOCACHE_UACCESS
Seems like this is always define for x86 anyway?
> +/**
> + * arch_memcpy_to_pmem - copy data to persistent memory
> + * @dst: destination buffer for the copy
> + * @src: source buffer for the copy
> + * @n: length of the copy in bytes
> + *
> + * Copy data to persistent memory media via non-temporal stores so that
> + * a subsequent arch_wmb_pmem() can flush cpu and memory controller
> + * write buffers to guarantee durability.
> + */
static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
size_t n)
Too long line. Also why not simply arch_copy_{from,to}_pmem?
> +#else /* ARCH_HAS_NOCACHE_UACCESS i.e. ARCH=um */
Oh, UM. I'd rather see UM fixed to provide these.
Richard, any chance you could look into it?
> diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
> index 97ae3b748d9e..0d3e43f679aa 100644
> --- a/arch/x86/include/asm/io.h
> +++ b/arch/x86/include/asm/io.h
> @@ -249,6 +249,12 @@ static inline void flush_write_buffers(void)
> #endif
> }
>
> +static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
> + unsigned long size)
> +{
> + return (void __force __pmem *) ioremap_cache(offset, size);
> +}
Now with my ioremap_flags proposal we'd just add an IOREMAP_PMEM
flag, which architectures could implement (usually as no-op), and move
the cast into memremap_pmem.
> + * These defaults seek to offer decent performance and minimize the
> + * window between i/o completion and writes being durable on media.
> + * However, it is undefined / architecture specific whether
> + * default_memremap_pmem + default_memcpy_to_pmem is sufficient for
> + * making data durable relative to i/o completion.
> + */
> +static void default_memcpy_to_pmem(void __pmem *dst, const void *src, size_t
> size)
> +{
> + memcpy((void __force *) dst, src, size);
> +}
This should really be in asm-generic (or at least your linux/pmem.h for now).
> +static void __pmem *default_memremap_pmem(resource_size_t offset, unsigned
> long size)
> +{
> + return (void __pmem *)memremap_wt(offset, size);
> +}
And this as well, unless we can get rid of it entirely with ioremap_flags().
> if (rw == READ) {
> - memcpy(mem + off, pmem->virt_addr + pmem_off, len);
> + memcpy_from_pmem(mem + off, pmem_addr, len);
> flush_dcache_page(page);
> } else {
> flush_dcache_page(page);
> - memcpy(pmem->virt_addr + pmem_off, mem + off, len);
> + if (arch_has_pmem_api())
> + memcpy_to_pmem(pmem_addr, mem + off, len);
> + else
> + default_memcpy_to_pmem(pmem_addr, mem + off, len);
So memcpy_from_pmem hides the different but memcpy_to_pmem doesn't?
That seems pretty awkward. Please move the check into the helper.
> + if (rw && arch_has_pmem_api())
> + wmb_pmem();
And here again make sure wmb_pmem is always available and a no-op if
not supported.
> + if (arch_has_pmem_api())
> + pmem->virt_addr = memremap_pmem(pmem->phys_addr, pmem->size);
> + else
> + pmem->virt_addr = default_memremap_pmem(pmem->phys_addr,
> + pmem->size);
All of this should be hidden in memremap_pmem.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
