arch/kunmap_atomic: consolidate duplicate code (abca2500) · Commits · 戴 / test

Every single architecture (including !CONFIG_HIGHMEM) calls... pagefault_enable(); preempt_enable(); ... before returning from __kunmap_atomic(). Lift this code into the kunmap_atomic() macro. While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to be consistent. [ira.weiny@intel.com: don't enable pagefault/preempt twice] Link: http://lkml.kernel.org/r/20200518184843.3029640-1-ira.weiny@intel.com [akpm@linux-foundation.org: coding style fixes] Signed-off-by:

Ira Weiny <ira.weiny@intel.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Christian König <christian.koenig@amd.com> Cc: Chris Zankel <chris@zankel.net> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Helge Deller <deller@gmx.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Guenter Roeck <linux@roeck-us.net> Link: http://lkml.kernel.org/r/20200507150004.1423069-8-ira.weiny@intel.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/arc/include/asm/highmem.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@

		#include <asm/cacheflush.h>

		extern void __kunmap_atomic(void *kvaddr);

		extern void kmap_init(void);

		static inline void flush_cache_kmaps(void)

arch/arc/mm/highmem.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ void kmap_atomic_high(struct page page)
		}
		EXPORT_SYMBOL(kmap_atomic_high);

		void __kunmap_atomic(void *kv)
		void kunmap_atomic_high(void *kv)
		{
		unsigned long kvaddr = (unsigned long)kv;

		@@ -87,11 +87,8 @@ void __kunmap_atomic(void *kv)

		kmap_atomic_idx_pop();
		}

		pagefault_enable();
		preempt_enable();
		}
		EXPORT_SYMBOL(__kunmap_atomic);
		EXPORT_SYMBOL(kunmap_atomic_high);

		static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr)
		{

arch/arm/include/asm/highmem.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ static inline void kmap_high_get(struct page page)
		* when CONFIG_HIGHMEM is not set.
		*/
		#ifdef CONFIG_HIGHMEM
		extern void __kunmap_atomic(void *kvaddr);
		extern void *kmap_atomic_pfn(unsigned long pfn);
		#endif

arch/arm/mm/highmem.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ void kmap_atomic_high(struct page page)
		}
		EXPORT_SYMBOL(kmap_atomic_high);

		void __kunmap_atomic(void *kvaddr)
		void kunmap_atomic_high(void *kvaddr)
		{
		unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
		int idx, type;
		@@ -95,10 +95,8 @@ void __kunmap_atomic(void *kvaddr)
		/* this address was obtained through kmap_high_get() */
		kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
		}
		pagefault_enable();
		preempt_enable();
		}
		EXPORT_SYMBOL(__kunmap_atomic);
		EXPORT_SYMBOL(kunmap_atomic_high);

		void *kmap_atomic_pfn(unsigned long pfn)
		{

arch/csky/include/asm/highmem.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ extern pte_t *pkmap_page_table;

		#define ARCH_HAS_KMAP_FLUSH_TLB
		extern void kmap_flush_tlb(unsigned long addr);
		extern void __kunmap_atomic(void *kvaddr);
		extern void *kmap_atomic_pfn(unsigned long pfn);
		extern struct page kmap_atomic_to_page(void ptr);

Admin message