From patchwork Tue Nov 24 06:07:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 11927213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B12CC71156 for ; Tue, 24 Nov 2020 06:08:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 566572076C for ; Tue, 24 Nov 2020 06:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729479AbgKXGIO (ORCPT ); Tue, 24 Nov 2020 01:08:14 -0500 Received: from mga04.intel.com ([192.55.52.120]:12216 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729471AbgKXGIN (ORCPT ); Tue, 24 Nov 2020 01:08:13 -0500 IronPort-SDR: qiuAW+fuYyiLTpEe/ADkQR7jsX4DhftcycdUAqI/yKAPd+k8CyrVQ7FH6766Ssqga9MHhkZ8TW WgZqNIc44TKw== X-IronPort-AV: E=McAfee;i="6000,8403,9814"; a="169332360" X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="169332360" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:13 -0800 IronPort-SDR: ZoBwrB4JFK1e6EM9E54oD67IpZ8rD1Tv7iKjj3JBFFabN5qyxMwV+LWlqPBRk2bB7j7NfqkYON UCcWE7VVML8w== X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="546707751" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:12 -0800 From: ira.weiny@intel.com To: Andrew Morton Cc: Ira Weiny , Alexei Starovoitov , Daniel Borkmann , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Thomas Gleixner , Dave Hansen , Matthew Wilcox , Christoph Hellwig , Dan Williams , Al Viro , Eric Biggers , Luis Chamberlain , Patrik Jakobsson , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Howells , Chris Mason , Josef Bacik , David Sterba , Steve French , Jaegeuk Kim , Chao Yu , Nicolas Pitre , "Martin K. Petersen" , Brian King , Greg Kroah-Hartman , Kirti Wankhede , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 16/17] lib: Use mempcy_to/from_page() Date: Mon, 23 Nov 2020 22:07:54 -0800 Message-Id: <20201124060755.1405602-17-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20201124060755.1405602-1-ira.weiny@intel.com> References: <20201124060755.1405602-1-ira.weiny@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Ira Weiny Remove kmap/mem*()/kunmap pattern and use memcpy_to/from_page() Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: "Jérôme Glisse" Signed-off-by: Ira Weiny --- lib/test_bpf.c | 11 ++--------- lib/test_hmm.c | 10 ++-------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index ca7d635bccd9..def048bc1c48 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -6499,25 +6500,17 @@ static void *generate_test_data(struct bpf_test *test, int sub) * single fragment to the skb, filled with * test->frag_data. */ - void *ptr; - page = alloc_page(GFP_KERNEL); if (!page) goto err_kfree_skb; - ptr = kmap(page); - if (!ptr) - goto err_free_page; - memcpy(ptr, test->frag_data, MAX_DATA); - kunmap(page); + memcpy_to_page(page, 0, test->frag_data, MAX_DATA); skb_add_rx_frag(skb, 0, page, 0, MAX_DATA, MAX_DATA); } return skb; -err_free_page: - __free_page(page); err_kfree_skb: kfree_skb(skb); return NULL; diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 80a78877bd93..6a5fe7c4088b 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -321,16 +321,13 @@ static int dmirror_do_read(struct dmirror *dmirror, unsigned long start, for (pfn = start >> PAGE_SHIFT; pfn < (end >> PAGE_SHIFT); pfn++) { void *entry; struct page *page; - void *tmp; entry = xa_load(&dmirror->pt, pfn); page = xa_untag_pointer(entry); if (!page) return -ENOENT; - tmp = kmap(page); - memcpy(ptr, tmp, PAGE_SIZE); - kunmap(page); + memcpy_from_page(ptr, page, 0, PAGE_SIZE); ptr += PAGE_SIZE; bounce->cpages++; @@ -390,16 +387,13 @@ static int dmirror_do_write(struct dmirror *dmirror, unsigned long start, for (pfn = start >> PAGE_SHIFT; pfn < (end >> PAGE_SHIFT); pfn++) { void *entry; struct page *page; - void *tmp; entry = xa_load(&dmirror->pt, pfn); page = xa_untag_pointer(entry); if (!page || xa_pointer_tag(entry) != DPT_XA_TAG_WRITE) return -ENOENT; - tmp = kmap(page); - memcpy(tmp, ptr, PAGE_SIZE); - kunmap(page); + memcpy_to_page(page, 0, ptr, PAGE_SIZE); ptr += PAGE_SIZE; bounce->cpages++;