Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933459AbcJZPw1 (ORCPT ); Wed, 26 Oct 2016 11:52:27 -0400 Received: from g9t1613g.houston.hpe.com ([15.241.32.99]:48724 "EHLO g9t1613g.houston.hpe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755631AbcJZPwV (ORCPT ); Wed, 26 Oct 2016 11:52:21 -0400 From: Brian Boylston To: linux-nvdimm@ml01.01.org Cc: linux-kernel@vger.kernel.org, toshi.kani@hpe.com, oliver.moreno@hpe.com, Brian Boylston , Ross Zwisler , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Al Viro , Dan Williams Subject: [PATCH v2 2/3] use a nocache copy for bvecs and kvecs in copy_from_iter_nocache() Date: Wed, 26 Oct 2016 10:50:20 -0500 Message-Id: <20161026155021.20892-3-brian.boylston@hpe.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20161026155021.20892-1-brian.boylston@hpe.com> References: <20161026155021.20892-1-brian.boylston@hpe.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1748 Lines: 51 Update copy_from_iter_nocache() to use memcpy_nocache() for bvecs and kvecs. Cc: Ross Zwisler Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Cc: Al Viro Cc: Dan Williams Signed-off-by: Brian Boylston Reviewed-by: Toshi Kani Reported-by: Oliver Moreno --- lib/iov_iter.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 7e3138c..71e4531 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -342,6 +342,13 @@ static void memcpy_from_page(char *to, struct page *page, size_t offset, size_t kunmap_atomic(from); } +static void memcpy_from_page_nocache(char *to, struct page *page, size_t offset, size_t len) +{ + char *from = kmap_atomic(page); + memcpy_nocache(to, from + offset, len); + kunmap_atomic(from); +} + static void memcpy_to_page(struct page *page, size_t offset, const char *from, size_t len) { char *to = kmap_atomic(page); @@ -392,9 +399,10 @@ size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i) iterate_and_advance(i, bytes, v, __copy_from_user_nocache((to += v.iov_len) - v.iov_len, v.iov_base, v.iov_len), - memcpy_from_page((to += v.bv_len) - v.bv_len, v.bv_page, - v.bv_offset, v.bv_len), - memcpy((to += v.iov_len) - v.iov_len, v.iov_base, v.iov_len) + memcpy_from_page_nocache((to += v.bv_len) - v.bv_len, + v.bv_page, v.bv_offset, v.bv_len), + memcpy_nocache((to += v.iov_len) - v.iov_len, + v.iov_base, v.iov_len) ) return bytes; -- 2.8.3