Commit e17f7a0b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dan Williams
Browse files

uio: remove copy_from_iter_flushcache() and copy_mc_to_iter() 



These two wrappers are never used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211215084508.435401-2-hch@lst.de


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent de291b59

drivers/nvdimm/pmem.c

+1 −3
Original line number Diff line number Diff line
@@ -302,9 +302,7 @@ static long pmem_dax_direct_access(struct dax_device *dax_dev, 
}



/*

 * Use the 'no check' versions of copy_from_iter_flushcache() and

 * copy_mc_to_iter() to bypass HARDENED_USERCOPY overhead. Bounds

 * checking, both file offset and device offset, is handled by

 * Bounds checking, both file offset and device offset, is handled by

 * dax_iomap_actor()

 */

static size_t pmem_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,

include/linux/uio.h

+1 −19
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ bool copy_from_iter_full_nocache(void *addr, size_t bytes, struct iov_iter *i) 
#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE

/*

 * Note, users like pmem that depend on the stricter semantics of

 * copy_from_iter_flushcache() than copy_from_iter_nocache() must check for

 * _copy_from_iter_flushcache() than _copy_from_iter_nocache() must check for

 * IS_ENABLED(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) before assuming that the

 * destination is flushed from the cache on return.

 */
@@ -211,24 +211,6 @@ size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i); 
#define _copy_mc_to_iter _copy_to_iter

#endif



static __always_inline __must_check

size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, false)))

		return 0;

	else

		return _copy_from_iter_flushcache(addr, bytes, i);

}



static __always_inline __must_check

size_t copy_mc_to_iter(void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, true)))

		return 0;

	else

		return _copy_mc_to_iter(addr, bytes, i);

}



size_t iov_iter_zero(size_t bytes, struct iov_iter *);

unsigned long iov_iter_alignment(const struct iov_iter *i);

unsigned long iov_iter_gap_alignment(const struct iov_iter *i);