Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 462964ea authored by Ira Weiny's avatar Ira Weiny Committed by Bernhard Thoben
Browse files

arch/kunmap_atomic: consolidate duplicate code 

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: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarChristoph 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit abca2500c0c1b20c3e552f259da4c4a99db3b4d1)
parent 2a5a03a3

arch/arm/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,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);

extern struct page *kmap_atomic_to_page(const void *ptr);

#endif

arch/arm/mm/highmem.c

+2 −4
Original line number Diff line number Diff line
@@ -61,7 +61,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;
@@ -83,10 +83,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/microblaze/include/asm/highmem.h

+9 −2
Original line number Diff line number Diff line
@@ -50,8 +50,15 @@ extern pte_t *pkmap_page_table; 
#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))



extern void *kmap_atomic_prot(struct page *page, pgprot_t prot);

extern void __kunmap_atomic(void *kvaddr);

static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)

{

	preempt_disable();

	pagefault_disable();

	if (!PageHighMem(page))

		return page_address(page);



	return kmap_atomic_high_prot(page, prot);

}



static inline void *kmap_atomic_high(struct page *page)

{

arch/microblaze/mm/highmem.c

+3 −8
Original line number Diff line number Diff line
@@ -56,16 +56,13 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) 
}

EXPORT_SYMBOL(kmap_atomic_prot);



void __kunmap_atomic(void *kvaddr)

void kunmap_atomic_high(void *kvaddr)

{

	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;

	int type;



	if (vaddr < __fix_to_virt(FIX_KMAP_END)) {

		pagefault_enable();

		preempt_enable();

	if (vaddr < __fix_to_virt(FIX_KMAP_END))

		return;

	}



	type = kmap_atomic_idx();

#ifdef CONFIG_DEBUG_HIGHMEM
@@ -84,7 +81,5 @@ void __kunmap_atomic(void *kvaddr) 
	}

#endif

	kmap_atomic_idx_pop();

	pagefault_enable();

	preempt_enable();

}

EXPORT_SYMBOL(__kunmap_atomic);
 
EXPORT_SYMBOL(kunmap_atomic_high);

arch/mips/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,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);