arch-kunmap_atomic-consolidate-duplicate-code.patch removed from -mm tree
The patch titled
Subject: arch/kunmap_atomic: consolidate duplicate code
has been removed from the -mm tree. Its filename was
arch-kunmap_atomic-consolidate-duplicate-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: 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.
[[email protected]: don't enable pagefault/preempt twice]
[[email protected]: coding style fixes]
Signed-off-by Ira Weiny <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Cc Al Viro <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Christian König <[email protected]>
Cc Chris Zankel <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Helge Deller <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Max Filippov <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Guenter Roeck <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arc/include/asm/highmem.h | 2 -- arch/arc/mm/highmem.c | 7 ++----- arch/arm/include/asm/highmem.h | 1 - arch/arm/mm/highmem.c | 6 ++---- arch/csky/include/asm/highmem.h | 1 - arch/csky/mm/highmem.c | 9 +++------ arch/microblaze/include/asm/highmem.h | 1 - arch/microblaze/mm/highmem.c | 11 +++-------- arch/mips/include/asm/highmem.h | 1 - arch/mips/mm/cache.c | 4 ++-- arch/mips/mm/highmem.c | 11 +++-------- arch/nds32/include/asm/highmem.h | 1 - arch/nds32/mm/highmem.c | 6 ++---- arch/parisc/include/asm/cacheflush.h | 4 +--- arch/powerpc/include/asm/highmem.h | 1 - arch/powerpc/mm/highmem.c | 11 +++-------- arch/sparc/include/asm/highmem.h | 2 -- arch/sparc/mm/highmem.c | 11 +++-------- arch/x86/include/asm/highmem.h | 1 - arch/x86/mm/highmem_32.c | 7 ++----- arch/xtensa/include/asm/highmem.h | 2 -- arch/xtensa/mm/highmem.c | 7 ++----- include/linux/highmem.h | 13 +++++++++---- 23 files changed, 37 insertions(+), 83 deletions(-)
arch/arc/include/asm/highmem.h renamed from arch/arc/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -2
@@ -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 renamed from arch/arc/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -5
@@ -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 renamed from arch/arm/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -60,7 +60,6 @@ static inline void *kmap_high_get(struct* 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 renamed from arch/arm/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -4
@@ -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 renamed from arch/csky/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -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);
arch/csky/mm/highmem.c renamed from arch/csky/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +3 -6
@@ -39,13 +39,13 @@ 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;if (vaddr <FIXADDR_START ) - goto out; +return ;#ifdef CONFIG_DEBUG_HIGHMEM idx =KM_TYPE_NR *smp_processor_id () +kmap_atomic_idx ();
@@ -58,11 +58,8 @@ void __kunmap_atomic(void *kvaddr) (void ) idx;/* to kill a warning */ #endif kmap_atomic_idx_pop (); -out: -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);/* * This is the same as kmap_atomic() but can map memory that doesn't
arch/microblaze/include/asm/highmem.h renamed from arch/microblaze/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -61,7 +61,6 @@ static inline void *kmap_atomic_prot(strreturn kmap_atomic_high_prot (page, prot); } -extern void __kunmap_atomic (void *kvaddr);static inline void *kmap_atomic_high (struct page *page) {
arch/microblaze/mm/highmem.c renamed from arch/microblaze/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +3 -8
@@ -51,17 +51,14 @@ void *kmap_atomic_high_prot(struct page }EXPORT_SYMBOL (kmap_atomic_high_prot); -void __kunmap_atomic (void *kvaddr) +void kunmap_atomic_high (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;int type;unsigned int idx; -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 ();
@@ -77,7 +74,5 @@ void __kunmap_atomic(void *kvaddr)local_flush_tlb_page (NULL , vaddr);kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);
arch/mips/include/asm/highmem.h renamed from arch/mips/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -48,7 +48,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);#define flush_cache_kmaps () BUG_ON(cpu_has_dc_aliases)
arch/mips/mm/cache.c renamed from arch/mips/mm/cache.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -2
@@ -103,7 +103,7 @@ void __flush_dcache_page(struct page *paflush_data_cache_page (addr);if (PageHighMem (page)) -__kunmap_atomic ((void *)addr); +kunmap_atomic ((void *)addr); }EXPORT_SYMBOL (__flush_dcache_page);
@@ -146,7 +146,7 @@ void __update_cache(unsigned long addresflush_data_cache_page (addr);if (PageHighMem (page)) -__kunmap_atomic ((void *)addr); +kunmap_atomic ((void *)addr);ClearPageDcacheDirty (page); }
arch/mips/mm/highmem.c renamed from arch/mips/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +3 -8
@@ -36,16 +36,13 @@ 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 type__maybe_unused ; -if (vaddr <FIXADDR_START ) {// FIXME -pagefault_enable (); -preempt_enable (); +if (vaddr <FIXADDR_START )return ; - } type =kmap_atomic_idx ();#ifdef CONFIG_DEBUG_HIGHMEM
@@ -63,10 +60,8 @@ void __kunmap_atomic(void *kvaddr) }#endif kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);/* * This is the same as kmap_atomic() but can map memory that doesn't
arch/nds32/include/asm/highmem.h renamed from arch/nds32/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -51,7 +51,6 @@ extern void kmap_init(void);* 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 (void *ptr);#endif
arch/nds32/mm/highmem.c renamed from arch/nds32/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -4
@@ -33,7 +33,7 @@ void *kmap_atomic_high(struct page *page }EXPORT_SYMBOL (kmap_atomic_high); -void __kunmap_atomic (void *kvaddr) +void kunmap_atomic_high (void *kvaddr) {if (kvaddr >= (void *)FIXADDR_START ) {unsigned long vaddr = (unsigned long )kvaddr;
@@ -44,7 +44,5 @@ void __kunmap_atomic(void *kvaddr) ptep =pte_offset_kernel (pmd_off_k (vaddr), vaddr);set_pte (ptep,0 ); } -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);
arch/parisc/include/asm/cacheflush.h renamed from arch/parisc/include/asm/cacheflush.h~arch-kunmap_atomic-consolidate-duplicate-code +1 -3
@@ -122,11 +122,9 @@ static inline void *kmap_atomic(struct preturn page_address (page); } -static inline void __kunmap_atomic (void *addr) +static inline void kunmap_atomic_high (void *addr) {flush_kernel_dcache_page_addr (addr); -pagefault_enable (); -preempt_enable (); }#define kmap_atomic_prot (page, prot) kmap_atomic(page)
arch/powerpc/include/asm/highmem.h renamed from arch/powerpc/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -69,7 +69,6 @@ static inline void *kmap_atomic_prot(strreturn kmap_atomic_high_prot (page, prot); } -extern void __kunmap_atomic (void *kvaddr);static inline void *kmap_atomic_high (struct page *page) {
arch/powerpc/mm/highmem.c renamed from arch/powerpc/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +3 -8
@@ -40,15 +40,12 @@ void *kmap_atomic_high_prot(struct page }EXPORT_SYMBOL (kmap_atomic_high_prot); -void __kunmap_atomic (void *kvaddr) +void kunmap_atomic_high (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -if (vaddr <__fix_to_virt (FIX_KMAP_END )) { -pagefault_enable (); -preempt_enable (); +if (vaddr <__fix_to_virt (FIX_KMAP_END ))return ; - }if (IS_ENABLED (CONFIG_DEBUG_HIGHMEM )) {int type =kmap_atomic_idx ();
@@ -66,7 +63,5 @@ void __kunmap_atomic(void *kvaddr) }kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);
arch/sparc/include/asm/highmem.h renamed from arch/sparc/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -2
@@ -50,8 +50,6 @@ void kmap_init(void) __init;#define PKMAP_END (PKMAP_ADDR(LAST_PKMAP)) -void __kunmap_atomic (void *kvaddr); -#define flush_cache_kmaps () flush_cache_all()#endif /* __KERNEL__ */
arch/sparc/mm/highmem.c renamed from arch/sparc/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +3 -8
@@ -84,16 +84,13 @@ 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 type; -if (vaddr <FIXADDR_START ) {// FIXME -pagefault_enable (); -preempt_enable (); +if (vaddr <FIXADDR_START )return ; - } type =kmap_atomic_idx ();
@@ -126,7 +123,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/x86/include/asm/highmem.h renamed from arch/x86/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -1
@@ -72,7 +72,6 @@ static inline void *kmap_atomic_high(str {return kmap_atomic_high_prot (page, kmap_prot); } -void __kunmap_atomic (void *kvaddr);void *kmap_atomic_pfn (unsigned long pfn);void *kmap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot);
arch/x86/mm/highmem_32.c renamed from arch/x86/mm/highmem_32.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -5
@@ -30,7 +30,7 @@ void *kmap_atomic_pfn(unsigned long pfn) }EXPORT_SYMBOL_GPL (kmap_atomic_pfn); -void __kunmap_atomic (void *kvaddr) +void kunmap_atomic_high (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;
@@ -60,11 +60,8 @@ void __kunmap_atomic(void *kvaddr) BUG_ON(vaddr >= (unsigned long)high_memory); }#endif - -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);void __init set_highmem_pages_init (void ) {
arch/xtensa/include/asm/highmem.h renamed from arch/xtensa/include/asm/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +0 -2
@@ -68,8 +68,6 @@ static inline void flush_cache_kmaps(voi flush_cache_all(); } -void __kunmap_atomic (void *kvaddr); -void kmap_init (void );#endif
arch/xtensa/mm/highmem.c renamed from arch/xtensa/mm/highmem.c~arch-kunmap_atomic-consolidate-duplicate-code +2 -5
@@ -54,7 +54,7 @@ void *kmap_atomic_high(struct page *page }EXPORT_SYMBOL (kmap_atomic_high); -void __kunmap_atomic (void *kvaddr) +void kunmap_atomic_high (void *kvaddr) {if (kvaddr >= (void *)FIXADDR_START && kvaddr < (void *)FIXADDR_TOP ) {
@@ -73,11 +73,8 @@ void __kunmap_atomic(void *kvaddr)kmap_atomic_idx_pop (); } - -pagefault_enable (); -preempt_enable (); } -EXPORT_SYMBOL (__kunmap_atomic); +EXPORT_SYMBOL (kunmap_atomic_high);void __init kmap_init (void ) {
include/linux/highmem.h renamed from include/linux/highmem.h~arch-kunmap_atomic-consolidate-duplicate-code +9 -4
@@ -33,6 +33,7 @@ static inline void invalidate_kernel_vma#ifdef CONFIG_HIGHMEM extern void *kmap_atomic_high (struct page *page); +extern void kunmap_atomic_high (void *kvaddr);#include <asm/highmem.h> #ifndef ARCH_HAS_KMAP_FLUSH_TLB
@@ -151,10 +152,12 @@ static inline void *kmap_atomic(struct p }#define kmap_atomic_prot (page, prot) kmap_atomic(page) -static inline void __kunmap_atomic (void *addr) +static inline void kunmap_atomic_high (void *addr) { -pagefault_enable (); -preempt_enable (); +/* +* Nothing to do in the CONFIG_HIGHMEM=n case as kunmap_atomic() +* handles re-enabling faults + preemption +*/ }#define kmap_atomic_pfn (pfn) kmap_atomic(pfn_to_page(pfn))
@@ -204,7 +207,9 @@ static inline void kmap_atomic_idx_pop(v#define kunmap_atomic (addr) \ do { \ BUILD_BUG_ON(__same_type((addr), struct page *)); \ - __kunmap_atomic(addr); \ + kunmap_atomic_high(addr); \ + pagefault_enable(); \ + preempt_enable(); \ } while (0)
_
Patches currently in -mm which might be from [email protected] are