Remove duplicated kmap code
Subsystems (12)
cover Remove duplicated kmap code
From: Ira Weiny <[email protected]>
The kmap infrastructure has been copied almost verbatim to every architecture. This series consolidates obvious duplicated code. (k[un]map_atmoic has some additional duplication between some of the architectures but the differences were such to not warrant further changes.)
0day built successfully to cover all the architectures I can't readily build.
Ira Weiny (5):
arch/kmap: Remove BUG_ON()
arch/kmap: Remove redundant arch specific kmaps arch/kunmap: Remove duplicate kunmap implementations arch/kmap_atomic: Consolidate duplicate code arch/kunmap_atomic: Consolidate duplicate code
arch/arc/include/asm/highmem.h | 11 ------- arch/arc/mm/highmem.c | 20 ++----------- arch/arm/include/asm/highmem.h | 3 -- arch/arm/mm/highmem.c | 28 ++---------------- arch/csky/include/asm/highmem.h | 3 +- arch/csky/mm/highmem.c | 28 ++++-------------- arch/microblaze/include/asm/highmem.h | 17 ----------- arch/microblaze/mm/highmem.c | 10 ++----- arch/mips/include/asm/highmem.h | 3 +- arch/mips/mm/highmem.c | 25 +++------------- arch/nds32/include/asm/highmem.h | 3 -- arch/nds32/mm/highmem.c | 31 ++------------------ arch/parisc/include/asm/cacheflush.h | 2 -- arch/powerpc/include/asm/highmem.h | 17 ----------- arch/powerpc/mm/highmem.c | 9 ++---- arch/sparc/include/asm/highmem.h | 17 ----------- arch/sparc/mm/highmem.c | 9 ++---- arch/x86/include/asm/highmem.h | 4 --- arch/x86/mm/highmem_32.c | 30 ++------------------ arch/xtensa/include/asm/highmem.h | 14 +-------- arch/xtensa/mm/highmem.c | 10 ++----- include/linux/highmem.h | 41 +++++++++++++++++++++++++-- 22 files changed, 75 insertions(+), 260 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 arch/kmap: Remove BUG_ON()
From: Ira Weiny <[email protected]>
Replace the use of BUG_ON(in_interrupt()) in the kmap() and kunmap() in favor of might_sleep().
Besides the benefits of might_sleep(), this normalizes the implementations such that they can be made generic in subsequent patches.
--- arch/arc/include/asm/highmem.h | 2 +- arch/arc/mm/highmem.c | 2 +- arch/arm/mm/highmem.c | 2 +- arch/csky/mm/highmem.c | 2 +- arch/microblaze/include/asm/highmem.h | 2 +- arch/mips/mm/highmem.c | 2 +- arch/nds32/mm/highmem.c | 2 +- arch/powerpc/include/asm/highmem.h | 2 +- arch/sparc/include/asm/highmem.h | 4 ++-- arch/x86/mm/highmem_32.c | 3 +-- arch/xtensa/include/asm/highmem.h | 4 ++-- 11 files changed, 13 insertions(+), 14 deletions(-)
arch/arc/include/asm/highmem.h +1 -1
@@ -45,7 +45,7 @@ static inline void flush_cache_kmaps(void)static inline void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/arc/mm/highmem.c +1 -1
@@ -51,7 +51,7 @@ static pte_t * fixmap_page_table;void *kmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return page_address (page);
arch/arm/mm/highmem.c +1 -1
@@ -42,7 +42,7 @@ EXPORT_SYMBOL(kmap);void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/csky/mm/highmem.c +1 -1
@@ -29,7 +29,7 @@ EXPORT_SYMBOL(kmap);void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/microblaze/include/asm/highmem.h +1 -1
@@ -66,7 +66,7 @@ static inline void *kmap(struct page *page)static inline void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/mips/mm/highmem.c +1 -1
@@ -28,7 +28,7 @@ EXPORT_SYMBOL(kmap);void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/nds32/mm/highmem.c +1 -1
@@ -24,7 +24,7 @@ EXPORT_SYMBOL(kmap);void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/powerpc/include/asm/highmem.h +1 -1
@@ -74,7 +74,7 @@ static inline void *kmap(struct page *page)static inline void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/sparc/include/asm/highmem.h +2 -2
@@ -55,7 +55,7 @@ void kunmap_high(struct page *page);static inline void *kmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return page_address (page);return kmap_high (page);
@@ -63,7 +63,7 @@ static inline void *kmap(struct page *page)static inline void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/x86/mm/highmem_32.c +1 -2
@@ -15,8 +15,7 @@ EXPORT_SYMBOL(kmap);void kunmap (struct page *page) { -if (in_interrupt ()) -BUG (); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
arch/xtensa/include/asm/highmem.h +2 -2
@@ -73,7 +73,7 @@ static inline void *kmap(struct page *page)*/ BUILD_BUG_ON (PKMAP_BASE <TLBTEMP_BASE_1 +TLBTEMP_SIZE ); -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return page_address (page);return kmap_high (page);
@@ -81,7 +81,7 @@ static inline void *kmap(struct page *page)static inline void kunmap (struct page *page) { -BUG_ON (in_interrupt ()); +might_sleep ();if (!PageHighMem (page))return ;kunmap_high (page);
Signature · 1 line
2.25.1
PATCH 2/5 arch/kmap: Remove redundant arch specific kmaps
In reply to [email protected]From: Ira Weiny <[email protected]>
The kmap code for all the architectures is almost 100% identical.
Lift the common code to the core. Use ARCH_HAS_KMAP to indicate if an arch needs a special kmap.
This also has the benefit of changing kmap() on a number of architectures to be an inline call rather than an actual function.
--- arch/arc/include/asm/highmem.h | 2 -- arch/arc/mm/highmem.c | 10 ---------- arch/arm/include/asm/highmem.h | 2 -- arch/arm/mm/highmem.c | 9 --------- arch/csky/include/asm/highmem.h | 2 +- arch/csky/mm/highmem.c | 7 +------ arch/microblaze/include/asm/highmem.h | 9 --------- arch/mips/include/asm/highmem.h | 2 +- arch/mips/mm/highmem.c | 7 +------ arch/nds32/include/asm/highmem.h | 2 -- arch/nds32/mm/highmem.c | 12 ------------ arch/powerpc/include/asm/highmem.h | 9 --------- arch/sparc/include/asm/highmem.h | 9 --------- arch/x86/include/asm/highmem.h | 2 -- arch/x86/mm/highmem_32.c | 9 --------- arch/xtensa/include/asm/highmem.h | 6 +----- include/linux/highmem.h | 18 ++++++++++++++++++ 17 files changed, 23 insertions(+), 94 deletions(-)
arch/arc/include/asm/highmem.h +0 -2
@@ -30,8 +30,6 @@#include <asm/cacheflush.h> -extern void *kmap (struct page *page); -extern void *kmap_high (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void kunmap_high (struct page *page);
arch/arc/mm/highmem.c +0 -10
@@ -49,16 +49,6 @@extern pte_t * pkmap_page_table;static pte_t * fixmap_page_table; -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void *kmap_atomic (struct page *page) {int idx, cpu_idx;
arch/arm/include/asm/highmem.h +0 -2
@@ -20,7 +20,6 @@extern pte_t *pkmap_page_table; -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);/*
@@ -63,7 +62,6 @@ static inline void *kmap_high_get(struct page *page)* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/arm/mm/highmem.c +0 -9
@@ -31,15 +31,6 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)return *ptep; } -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/csky/include/asm/highmem.h +1 -1
@@ -30,9 +30,9 @@ 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_high (struct page *page);extern void kunmap_high (struct page *page); +#define ARCH_HAS_KMAP extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);
arch/csky/mm/highmem.c +1 -6
@@ -15,14 +15,9 @@ unsigned long highstart_pfn, highend_pfn;void *kmap (struct page *page) { -void *addr; +void *addr =kmap_generic (page); -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - addr =kmap_high (page);flush_tlb_one ((unsigned long )addr); -return addr; }EXPORT_SYMBOL (kmap);
arch/microblaze/include/asm/highmem.h +0 -9
@@ -51,19 +51,10 @@ 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_high (struct page *page);extern void kunmap_high (struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/mips/include/asm/highmem.h +1 -1
@@ -46,9 +46,9 @@ 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_high (struct page *page);extern void kunmap_high (struct page *page); +#define ARCH_HAS_KMAP extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);
arch/mips/mm/highmem.c +1 -6
@@ -14,14 +14,9 @@ unsigned long highstart_pfn, highend_pfn;void *kmap (struct page *page) { -void *addr; +void *addr =kmap_generic (page); -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - addr =kmap_high (page);flush_tlb_one ((unsigned long )addr); -return addr; }EXPORT_SYMBOL (kmap);
arch/nds32/include/asm/highmem.h +0 -2
@@ -44,7 +44,6 @@ extern unsigned long highstart_pfn, highend_pfn;extern pte_t *pkmap_page_table; -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page);extern void kmap_init (void );
@@ -54,7 +53,6 @@ extern void kmap_init(void);* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void *kmap (struct page *page);extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);
arch/nds32/mm/highmem.c +0 -12
@@ -10,18 +10,6 @@#include <asm/fixmap.h> #include <asm/tlbflush.h> -void *kmap (struct page *page) -{ -unsigned long vaddr; -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); - vaddr = (unsigned long )kmap_high (page); -return (void *)vaddr; -} - -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/powerpc/include/asm/highmem.h +0 -9
@@ -59,19 +59,10 @@ 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_high (struct page *page);extern void kunmap_high (struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/sparc/include/asm/highmem.h +0 -9
@@ -50,17 +50,8 @@ void kmap_init(void) __init;#define PKMAP_END (PKMAP_ADDR(LAST_PKMAP)) -void *kmap_high (struct page *page);void kunmap_high (struct page *page); -static inline void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -static inline void kunmap (struct page *page) {might_sleep ();
arch/x86/include/asm/highmem.h +0 -2
@@ -58,10 +58,8 @@ extern unsigned long highstart_pfn, highend_pfn;#define PKMAP_NR (virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)#define PKMAP_ADDR (nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); -void *kmap (struct page *page);void kunmap (struct page *page);void *kmap_atomic_prot (struct page *page,pgprot_t prot);
arch/x86/mm/highmem_32.c +0 -9
@@ -4,15 +4,6 @@#include <linux/swap.h> /* for totalram_pages */ #include <linux/memblock.h> -void *kmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); -} -EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) {might_sleep ();
arch/xtensa/include/asm/highmem.h +1 -5
@@ -63,7 +63,6 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)extern pte_t *pkmap_page_table; -void *kmap_high (struct page *page);void kunmap_high (struct page *page);static inline void *kmap (struct page *page)
@@ -73,10 +72,7 @@ static inline void *kmap(struct page *page)*/ BUILD_BUG_ON (PKMAP_BASE <TLBTEMP_BASE_1 +TLBTEMP_SIZE ); -might_sleep (); -if (!PageHighMem (page)) -return page_address (page); -return kmap_high (page); +return kmap_generic (page); }static inline void kunmap (struct page *page)
include/linux/highmem.h +18 -0
@@ -32,8 +32,26 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size)#include <asm/kmap_types.h> #ifdef CONFIG_HIGHMEM +extern void *kmap_high (struct page *page); + +/* kmap_generic: architecture independent portion of kmap calls */ +static inline void *kmap_generic (struct page *page) +{ +might_sleep (); +if (!PageHighMem (page)) +return page_address (page); +return kmap_high (page); +} +#include <asm/highmem.h> +#ifndef ARCH_HAS_KMAP +static inline void *kmap (struct page *page) +{ +return kmap_generic (page); +} +#endif +/* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages (void );extern atomic_long_t _totalhigh_pages;
Signature · 1 line
2.25.1
Re: [PATCH 2/5] arch/kmap: Remove redundant arch specific kmaps
Quoted 6 lines · On Sat, Apr 25, 2020 at 10:54:03PM -0700, [email protected] wrote:
From: Ira Weiny <[email protected]>
The kmap code for all the architectures is almost 100% identical.
Lift the common code to the core. Use
ARCH_HAS_KMAPto indicate if an arch needs a special kmap.
Can you add a kmap_flush_tlb hook that csky and mips define, and the just entirely consolidate the code instead?
Re: [PATCH 2/5] arch/kmap: Remove redundant arch specific kmaps
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines · On Sat, Apr 25, 2020 at 10:54:03PM -0700, [email protected] wrote:
From: Ira Weiny <[email protected]>
The kmap code for all the architectures is almost 100% identical.
Lift the common code to the core. Use
ARCH_HAS_KMAPto indicate if an arch needs a special kmap.Can you add a
kmap_flush_tlbhook that csky and mips define, and the just entirely consolidate the code instead?
Sure that seems to work.
Ira
PATCH 3/5 arch/kunmap: Remove duplicate kunmap implementations
In reply to [email protected]From: Ira Weiny <[email protected]>
All architectures do exactly the same thing for kunmap(); remove all the duplicate definitions and lift the call to the core.
--- arch/arc/include/asm/highmem.h | 9 --------- arch/arm/include/asm/highmem.h | 1 - arch/arm/mm/highmem.c | 9 --------- arch/csky/include/asm/highmem.h | 1 - arch/csky/mm/highmem.c | 9 --------- arch/microblaze/include/asm/highmem.h | 8 -------- arch/mips/include/asm/highmem.h | 1 - arch/mips/mm/highmem.c | 9 --------- arch/nds32/include/asm/highmem.h | 1 - arch/nds32/mm/highmem.c | 10 ---------- arch/powerpc/include/asm/highmem.h | 8 -------- arch/sparc/include/asm/highmem.h | 8 -------- arch/x86/include/asm/highmem.h | 2 -- arch/x86/mm/highmem_32.c | 9 --------- arch/xtensa/include/asm/highmem.h | 8 -------- include/linux/highmem.h | 8 ++++++++ 16 files changed, 8 insertions(+), 93 deletions(-)
arch/arc/include/asm/highmem.h +0 -9
@@ -41,15 +41,6 @@ static inline void flush_cache_kmaps(void)flush_cache_all (); } -static inline void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} - -#endif #endif
arch/arm/include/asm/highmem.h +0 -1
@@ -62,7 +62,6 @@ static inline void *kmap_high_get(struct page *page)* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void *kmap_atomic_pfn (unsigned long pfn);
arch/arm/mm/highmem.c +0 -9
@@ -31,15 +31,6 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)return *ptep; } -void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -EXPORT_SYMBOL (kunmap); -void *kmap_atomic (struct page *page) {unsigned int idx;
arch/csky/include/asm/highmem.h +0 -1
@@ -34,7 +34,6 @@ extern void kunmap_high(struct page *page);#define ARCH_HAS_KMAP extern void *kmap (struct page *page); -extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void *kmap_atomic_pfn (unsigned long pfn);
arch/csky/mm/highmem.c +0 -9
@@ -22,15 +22,6 @@ void *kmap(struct page *page) }EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -EXPORT_SYMBOL (kunmap); -void *kmap_atomic (struct page *page) {unsigned long vaddr;
arch/microblaze/include/asm/highmem.h +0 -8
@@ -55,14 +55,6 @@ extern void kunmap_high(struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -static inline void *kmap_atomic (struct page *page) {return kmap_atomic_prot (page, kmap_prot);
arch/mips/include/asm/highmem.h +0 -1
@@ -50,7 +50,6 @@ extern void kunmap_high(struct page *page);#define ARCH_HAS_KMAP extern void *kmap (struct page *page); -extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void *kmap_atomic_pfn (unsigned long pfn);
arch/mips/mm/highmem.c +0 -9
@@ -21,15 +21,6 @@ void *kmap(struct page *page) }EXPORT_SYMBOL (kmap); -void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -EXPORT_SYMBOL (kunmap); -/* * kmap_atomic/kunmap_atomic is significantly faster than kmap/kunmap because * no global lock is needed and because the kmap code must perform a global TLB
arch/nds32/include/asm/highmem.h +0 -1
@@ -53,7 +53,6 @@ extern void kmap_init(void);* when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void kunmap (struct page *page);extern void *kmap_atomic (struct page *page);extern void __kunmap_atomic (void *kvaddr);extern void *kmap_atomic_pfn (unsigned long pfn);
arch/nds32/mm/highmem.c +0 -10
@@ -10,16 +10,6 @@#include <asm/fixmap.h> #include <asm/tlbflush.h> -void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} - -EXPORT_SYMBOL (kunmap); -void *kmap_atomic (struct page *page) {unsigned int idx;
arch/powerpc/include/asm/highmem.h +0 -8
@@ -63,14 +63,6 @@ extern void kunmap_high(struct page *page);extern void *kmap_atomic_prot (struct page *page,pgprot_t prot);extern void __kunmap_atomic (void *kvaddr); -static inline void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -static inline void *kmap_atomic (struct page *page) {return kmap_atomic_prot (page, kmap_prot);
arch/sparc/include/asm/highmem.h +0 -8
@@ -52,14 +52,6 @@ void kmap_init(void) __init;void kunmap_high (struct page *page); -static inline void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -void *kmap_atomic (struct page *page);void __kunmap_atomic (void *kvaddr);
arch/x86/include/asm/highmem.h +0 -2
@@ -60,8 +60,6 @@ extern unsigned long highstart_pfn, highend_pfn;extern void kunmap_high (struct page *page); -void kunmap (struct page *page); -void *kmap_atomic_prot (struct page *page,pgprot_t prot);void *kmap_atomic (struct page *page);void __kunmap_atomic (void *kvaddr);
arch/x86/mm/highmem_32.c +0 -9
@@ -4,15 +4,6 @@#include <linux/swap.h> /* for totalram_pages */ #include <linux/memblock.h> -void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -EXPORT_SYMBOL (kunmap); -/* * kmap_atomic/kunmap_atomic is significantly faster than kmap/kunmap because * no global lock is needed and because the kmap code must perform a global TLB
arch/xtensa/include/asm/highmem.h +0 -8
@@ -75,14 +75,6 @@ static inline void *kmap(struct page *page)return kmap_generic (page); } -static inline void kunmap (struct page *page) -{ -might_sleep (); -if (!PageHighMem (page)) -return ; -kunmap_high (page); -} -static inline void flush_cache_kmaps (void ) {flush_cache_all ();
include/linux/highmem.h +8 -0
@@ -52,6 +52,14 @@ static inline void *kmap(struct page *page) }#endif +static inline void kunmap (struct page *page) +{ +might_sleep (); +if (!PageHighMem (page)) +return ; +kunmap_high (page); +} +/* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages (void );extern atomic_long_t _totalhigh_pages;
Signature · 1 line
2.25.1
PATCH 4/5 arch/kmap_atomic: Consolidate duplicate code
In reply to [email protected]From: Ira Weiny <[email protected]>
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.
--- 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(-)
arch/arc/mm/highmem.c +3 -4
@@ -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 ();
arch/arm/mm/highmem.c +3 -5
@@ -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 /*
arch/csky/mm/highmem.c +3 -4
@@ -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 ();
arch/microblaze/mm/highmem.c +3 -5
@@ -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 ();
arch/mips/mm/highmem.c +3 -4
@@ -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 ();
arch/nds32/mm/highmem.c +3 -4
@@ -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 ();
arch/powerpc/mm/highmem.c +3 -4
@@ -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 ();
arch/sparc/mm/highmem.c +3 -4
@@ -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 ();
arch/x86/mm/highmem_32.c +3 -5
@@ -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 ();
arch/xtensa/mm/highmem.c +3 -4
@@ -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)));
include/linux/highmem.h +9 -0
@@ -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;
Signature · 1 line
2.25.1
Re: [PATCH 4/5] arch/kmap_atomic: Consolidate duplicate code
Quoted 6 lines
arch/arc/mm/highmem.c +0
-0@@ -53,11 +53,10 @@ void *kmap_atomic(struct page *page) {
arch/arc/mm/highmem.c void *kmap_atomic(struct page *page) · line 59
Quoted 10 lines
arch/arc/mm/highmem.c +3
-4int 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;
Wouldn't it make sense to just move kmap_atomic itelf to common code, and call out to a kmap_atomic_high for the highmem case, following the scheme in kmap? Same for the unmap side. That might require to support kmap_atomic_prot everywhere first, which sounds like a really good idea anyway, and would avoid the need for strange workaround in drm.
Re: [PATCH 4/5] arch/kmap_atomic: Consolidate duplicate code
Quoted 10 lines · Christoph Hellwig
Quoted 10 lines
arch/arc/mm/highmem.c +1
-0@@ -53,11 +53,10 @@ void *kmap_atomic(struct page *page) {int idx, cpu_idx;unsigned long vaddr; +void *addr =kmap_atomic_fast (page);
Quoted 11 lines
arch/arc/mm/highmem.c void *kmap_atomic(struct page *page) · line 59
Quoted 6 lines
arch/arc/mm/highmem.c +2
-4-preempt_disable (); -pagefault_disable (); -if (!PageHighMem (page)) -return page_address (page); +if (addr) +return addr;Wouldn't it make sense to just move
kmap_atomicitelf to common code, and call out to akmap_atomic_highfor the highmem case, following the scheme in kmap?
Sure I do like that symmetry between the calls.
Quoted 2 lines
Same for the unmap side.
FWIW that would simply be renaming __kunmap_atomic() to kunmap_atomic_high()
Quoted 4 lines
That might require to support
kmap_atomic_proteverywhere first, which sounds like a really good idea anyway, and would avoid the need for strange workaround in drm.
Having a kmap_atomic_prot() seems like a good idea. But I'm not exactly sure why CONFIG_x86 is being called out specifically in the DRM code?
Ira
Re: [PATCH 4/5] arch/kmap_atomic: Consolidate duplicate code
Quoted 6 lines · Ira Weiny
Quoted 3 lines
That might require to support
kmap_atomic_proteverywhere first, which sounds like a really good idea anyway, and would avoid the need for strange workaround in drm.Having a
kmap_atomic_prot()seems like a good idea. But I'm not exactly sure whyCONFIG_x86is being called out specifically in the DRM code?
Probably because it only existed on x86 back then. And drm has a tendency of working around core problems with hacks instead of doing the fairly easy fixups.
PATCH 5/5 arch/kunmap_atomic: Consolidate duplicate code
In reply to [email protected]From: Ira Weiny <[email protected]>
Every single architecture (including !CONFIG_HIGHMEM) calls...
pagefault_enable(); preempt_enable();
... before returning from __kunmap_atomic(). Lift this code into the kunmap_atomic() macro.
--- arch/arc/mm/highmem.c | 3 --- arch/arm/mm/highmem.c | 2 -- arch/csky/mm/highmem.c | 5 +---- arch/microblaze/mm/highmem.c | 2 -- arch/mips/mm/highmem.c | 2 -- arch/nds32/mm/highmem.c | 2 -- arch/parisc/include/asm/cacheflush.h | 2 -- arch/powerpc/mm/highmem.c | 2 -- arch/sparc/mm/highmem.c | 2 -- arch/x86/mm/highmem_32.c | 3 --- arch/xtensa/mm/highmem.c | 3 --- include/linux/highmem.h | 6 ++++-- 12 files changed, 5 insertions(+), 29 deletions(-)
arch/arc/mm/highmem.c +0 -3
@@ -91,9 +91,6 @@ void __kunmap_atomic(void *kv)kmap_atomic_idx_pop (); } - -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/arm/mm/highmem.c +0 -2
@@ -98,8 +98,6 @@ 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);
arch/csky/mm/highmem.c +1 -4
@@ -50,7 +50,7 @@ void __kunmap_atomic(void *kvaddr)int idx;if (vaddr <FIXADDR_START ) - goto out; +return ;#ifdef CONFIG_DEBUG_HIGHMEM idx =KM_TYPE_NR *smp_processor_id () +kmap_atomic_idx ();
@@ -63,9 +63,6 @@ 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);
arch/microblaze/mm/highmem.c +0 -2
@@ -81,7 +81,5 @@ void __kunmap_atomic(void *kvaddr)local_flush_tlb_page (NULL , vaddr);kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/mips/mm/highmem.c +0 -2
@@ -79,8 +79,6 @@ void __kunmap_atomic(void *kvaddr) }#endif kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/nds32/mm/highmem.c +0 -2
@@ -49,8 +49,6 @@ 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);
arch/parisc/include/asm/cacheflush.h +0 -2
@@ -125,8 +125,6 @@ static inline void *kmap_atomic(struct page *page)static inline void __kunmap_atomic (void *addr) {flush_kernel_dcache_page_addr (addr); -pagefault_enable (); -preempt_enable (); }#define kmap_atomic_prot (page, prot) kmap_atomic(page)
arch/powerpc/mm/highmem.c +0 -2
@@ -76,7 +76,5 @@ void __kunmap_atomic(void *kvaddr) }kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/sparc/mm/highmem.c +0 -2
@@ -130,7 +130,5 @@ void __kunmap_atomic(void *kvaddr)#endif kmap_atomic_idx_pop (); -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/x86/mm/highmem_32.c +0 -3
@@ -78,9 +78,6 @@ void __kunmap_atomic(void *kvaddr) BUG_ON(vaddr >= (unsigned long)high_memory); }#endif - -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
arch/xtensa/mm/highmem.c +0 -3
@@ -77,9 +77,6 @@ void __kunmap_atomic(void *kvaddr)kmap_atomic_idx_pop (); } - -pagefault_enable (); -preempt_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
include/linux/highmem.h +4 -2
@@ -133,8 +133,8 @@ static inline void *kmap_atomic(struct page *page)static inline void __kunmap_atomic (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))
@@ -185,6 +185,8 @@ static inline void kmap_atomic_idx_pop(void)do { \ BUILD_BUG_ON(__same_type((addr), struct page *)); \__kunmap_atomic (addr); \ +pagefault_enable (); \ +preempt_enable (); \ }while (0 )
Signature · 1 line
2.25.1