diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
| commit | 9d92573fff3ec70785ef1815cc80573f70e7a921 (patch) | |
| tree | bce6e6bbad56f805d1adcebddabf9dd9e8072ce4 /lib | |
| parent | libnvdimm, namespace: record 'lbasize' for pmem namespaces (diff) | |
| parent | libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region (diff) | |
| download | linux-9d92573fff3ec70785ef1815cc80573f70e7a921.tar.xz linux-9d92573fff3ec70785ef1815cc80573f70e7a921.zip | |
Merge branch 'for-4.13/dax' into libnvdimm-for-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 3 | ||||
| -rw-r--r-- | lib/iov_iter.c | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 0c8b78a9ae2e..2d1c4b3a085c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -548,6 +548,9 @@ config ARCH_HAS_SG_CHAIN config ARCH_HAS_PMEM_API bool +config ARCH_HAS_UACCESS_FLUSHCACHE + bool + config ARCH_HAS_MMIO_FLUSH bool diff --git a/lib/iov_iter.c b/lib/iov_iter.c index f835964c9485..c9a69064462f 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -615,6 +615,28 @@ size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i) } EXPORT_SYMBOL(copy_from_iter_nocache); +#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE +size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i) +{ + char *to = addr; + if (unlikely(i->type & ITER_PIPE)) { + WARN_ON(1); + return 0; + } + iterate_and_advance(i, bytes, v, + __copy_from_user_flushcache((to += v.iov_len) - v.iov_len, + v.iov_base, v.iov_len), + memcpy_page_flushcache((to += v.bv_len) - v.bv_len, v.bv_page, + v.bv_offset, v.bv_len), + memcpy_flushcache((to += v.iov_len) - v.iov_len, v.iov_base, + v.iov_len) + ) + + return bytes; +} +EXPORT_SYMBOL_GPL(copy_from_iter_flushcache); +#endif + bool copy_from_iter_full_nocache(void *addr, size_t bytes, struct iov_iter *i) { char *to = addr; |