Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1591207ybz; Sat, 25 Apr 2020 23:40:39 -0700 (PDT) X-Google-Smtp-Source: APiQypL4tkLxdN6Zfo0KazOYHebwN6TJJVsQhGDt8LJQfOcP+m94sBD/dhhoNk2EVM1av67jSKFM X-Received: by 2002:a17:906:cec5:: with SMTP id si5mr14513003ejb.267.1587883239420; Sat, 25 Apr 2020 23:40:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587883239; cv=none; d=google.com; s=arc-20160816; b=Rmss61kqP6GenEZJGKNRsNxUFxv0MwArSWBUw958kpyv/E7mSNfAGCrOHouuXYDMeL AfbabxnGXV6i7D2x+q8AngJtDjQuC/E0CCKk4Ihe4quNMxUj+ijpZZoU7tXcK6fabCC9 TfWRp4MQ1fh3l9t1FbQQtQsgQIAo/psOY8gn+GkijLFWxpbqigsvwbK76PWjL5Y1HSTn SR5/acc2AW6TtX7qO7CYk21F9SMIDBH9YO4L7lsBwFSEgqJVL0rmk8rLDOV5PM4NLD2A k1HHcPXdP7a+J/GjF9zrzYi44r7D2jXZT/x1ZPSKIUdo1TQRbUdZruyjOVcFRp5ZGLXE AIVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=M0ltXYi1eP0lyfORy8dKtdDhUmS6dktTeCCKoqX5Z2Q=; b=lW764x4A32ccXhbyAkqYMdCw2A0HdgbMk8HDZDURkIQAeoxawkqJV9rTjV9JS7OzZO 9ifTC1W3E15S6b8wp68gK70D7VJJmqTDrasHg2Zy0kmP8qSE0lYVCiQMIYaIF1YCLl5R hWVh8xJp31/DZ+mifqm+slHIReSVwDeWHfI63F17A4arsueFELQk9nfEyQ4CU+JDijWR KIqLR2vOmtLCLcYC0aOit6xmIS2lTsmC0K+SNT4uFZjlxgprIUdmh391Dwl5o/VqoiC3 TXsFEBHxZKDNCgJaV95aOEN3db67MCCSb8bYtNZEtj2Iy/UagctxifED0sBxqTNgrlDB BeeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p8si3081949ejz.441.2020.04.25.23.40.16; Sat, 25 Apr 2020 23:40:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbgDZFy3 (ORCPT + 99 others); Sun, 26 Apr 2020 01:54:29 -0400 Received: from mga05.intel.com ([192.55.52.43]:34948 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbgDZFyY (ORCPT ); Sun, 26 Apr 2020 01:54:24 -0400 IronPort-SDR: yik+lW6jLFww72iGqqtV+gwEW5b2Cqu5v2V0GfswzYKOLd/cbabjIXUiUpwElsrf0zdAY3TKG9 4Adxy+Os6HYA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2020 22:54:23 -0700 IronPort-SDR: JbrFxZQOg4mMIuwtoATzRdij1dRliQGnUgWcjgmHA5TRHF3mzGglJEjgI5nDw5LX1Vgmb6bj/B U1DQQme6oOjQ== X-IronPort-AV: E=Sophos;i="5.73,319,1583222400"; d="scan'208";a="302014809" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2020 22:54:23 -0700 From: ira.weiny@intel.com To: linux-kernel@vger.kernel.org, Andrew Morton Cc: Ira Weiny , Dan Williams , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Chris Zankel , Max Filippov , linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org Subject: [PATCH 4/5] arch/kmap_atomic: Consolidate duplicate code Date: Sat, 25 Apr 2020 22:54:05 -0700 Message-Id: <20200426055406.134198-5-ira.weiny@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200426055406.134198-1-ira.weiny@intel.com> References: <20200426055406.134198-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny Every arch has the same check for a not HIGHMEM page. Define kmap_atomic_fast() to quickly return already mapped pages and reduce the code duplication by lifting this check to the core. Reviewed-by: Dan Williams Signed-off-by: Ira Weiny --- arch/arc/mm/highmem.c | 7 +++---- arch/arm/mm/highmem.c | 8 +++----- arch/csky/mm/highmem.c | 7 +++---- arch/microblaze/mm/highmem.c | 8 +++----- arch/mips/mm/highmem.c | 7 +++---- arch/nds32/mm/highmem.c | 7 +++---- arch/powerpc/mm/highmem.c | 7 +++---- arch/sparc/mm/highmem.c | 7 +++---- arch/x86/mm/highmem_32.c | 8 +++----- arch/xtensa/mm/highmem.c | 7 +++---- include/linux/highmem.h | 9 +++++++++ 11 files changed, 39 insertions(+), 43 deletions(-) diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index 4db13a6b9f3b..1cae4b911a33 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c @@ -53,11 +53,10 @@ void *kmap_atomic(struct page *page) { int idx, cpu_idx; unsigned long vaddr; + void *addr = kmap_atomic_fast(page); - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; cpu_idx = kmap_atomic_idx_push(); idx = cpu_idx + KM_TYPE_NR * smp_processor_id(); diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index c700b32350ee..4a629f616a6a 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c @@ -35,13 +35,11 @@ void *kmap_atomic(struct page *page) { unsigned int idx; unsigned long vaddr; - void *kmap; + void *kmap = kmap_atomic_fast(page); int type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (kmap) + return kmap; #ifdef CONFIG_DEBUG_HIGHMEM /* diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c index 69b1931986ae..1191f57f53ae 100644 --- a/arch/csky/mm/highmem.c +++ b/arch/csky/mm/highmem.c @@ -25,12 +25,11 @@ EXPORT_SYMBOL(kmap); void *kmap_atomic(struct page *page) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); int idx, type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c index d7569f77fa15..99fdf826edc2 100644 --- a/arch/microblaze/mm/highmem.c +++ b/arch/microblaze/mm/highmem.c @@ -36,13 +36,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); int idx, type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); - + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c index c3c9fe962f0f..ba03ca75d4a1 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c @@ -33,12 +33,11 @@ EXPORT_SYMBOL(kmap); void *kmap_atomic(struct page *page) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); int idx, type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/nds32/mm/highmem.c b/arch/nds32/mm/highmem.c index f9348bec0ecb..4aabde586489 100644 --- a/arch/nds32/mm/highmem.c +++ b/arch/nds32/mm/highmem.c @@ -14,13 +14,12 @@ void *kmap_atomic(struct page *page) { unsigned int idx; unsigned long vaddr, pte; + void *addr = kmap_atomic_fast(page); int type; pte_t *ptep; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); diff --git a/arch/powerpc/mm/highmem.c b/arch/powerpc/mm/highmem.c index 320c1672b2ae..cdf5b716801a 100644 --- a/arch/powerpc/mm/highmem.c +++ b/arch/powerpc/mm/highmem.c @@ -33,12 +33,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); int idx, type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c index d4a80adea7e5..178641805567 100644 --- a/arch/sparc/mm/highmem.c +++ b/arch/sparc/mm/highmem.c @@ -56,12 +56,11 @@ void __init kmap_init(void) void *kmap_atomic(struct page *page) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); long idx, type; - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index c4ebfd0ae401..34770499b0ff 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -15,13 +15,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { unsigned long vaddr; + void *addr = kmap_atomic_fast(page); int idx, type; - preempt_disable(); - pagefault_disable(); - - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/arch/xtensa/mm/highmem.c b/arch/xtensa/mm/highmem.c index 184ceadccc1a..38c14e0b578c 100644 --- a/arch/xtensa/mm/highmem.c +++ b/arch/xtensa/mm/highmem.c @@ -41,11 +41,10 @@ void *kmap_atomic(struct page *page) { enum fixed_addresses idx; unsigned long vaddr; + void *addr = kmap_atomic_fast(page); - preempt_disable(); - pagefault_disable(); - if (!PageHighMem(page)) - return page_address(page); + if (addr) + return addr; idx = kmap_idx(kmap_atomic_idx_push(), DCACHE_ALIAS(page_to_phys(page))); diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 1a3b7690c78c..eee53e151900 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -60,6 +60,15 @@ static inline void kunmap(struct page *page) kunmap_high(page); } +static inline void *kmap_atomic_fast(struct page *page) +{ + preempt_disable(); + pagefault_disable(); + if (!PageHighMem(page)) + return page_address(page); + return NULL; +} + /* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages(void); extern atomic_long_t _totalhigh_pages; -- 2.25.1