diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:44 -0700 |
| commit | 930218affeadd1325ea17e053f0dcecf218f5a4f (patch) | |
| tree | 203c293668a88e03b9f292cf4d5a294ca8a4275a /drivers/nvdimm | |
| parent | b56845794e1e93121acb74ca325db965035d5545 (diff) | |
| parent | 5d8beee20d89e34ff1dcb0da84adf7607858c59d (diff) | |
| download | linux-next-930218affeadd1325ea17e053f0dcecf218f5a4f.tar.gz | |
Merge branch 'for-4.18/mcsafe' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/claim.c | 3 | ||||
| -rw-r--r-- | drivers/nvdimm/pmem.c | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 30852270484f..2e96b34bc936 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -276,7 +276,8 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, if (rw == READ) { if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) return -EIO; - return memcpy_mcsafe(buf, nsio->addr + offset, size); + if (memcpy_mcsafe(buf, nsio->addr + offset, size) != 0) + return -EIO; } if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) { diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index bf2dd2a4a5e6..68940356cad3 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -101,15 +101,15 @@ static blk_status_t read_pmem(struct page *page, unsigned int off, void *pmem_addr, unsigned int len) { unsigned int chunk; - int rc; + unsigned long rem; void *mem; while (len) { mem = kmap_atomic(page); chunk = min_t(unsigned int, len, PAGE_SIZE); - rc = memcpy_mcsafe(mem + off, pmem_addr, chunk); + rem = memcpy_mcsafe(mem + off, pmem_addr, chunk); kunmap_atomic(mem); - if (rc) + if (rem) return BLK_STS_IOERR; len -= chunk; off = 0; @@ -259,9 +259,16 @@ static size_t pmem_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, return copy_from_iter_flushcache(addr, bytes, i); } +static size_t pmem_copy_to_iter(struct dax_device *dax_dev, pgoff_t pgoff, + void *addr, size_t bytes, struct iov_iter *i) +{ + return copy_to_iter_mcsafe(addr, bytes, i); +} + static const struct dax_operations pmem_dax_ops = { .direct_access = pmem_dax_direct_access, .copy_from_iter = pmem_copy_from_iter, + .copy_to_iter = pmem_copy_to_iter, }; static const struct attribute_group *pmem_attribute_groups[] = { |