arch/kmap_atomic: consolidate duplicate code

Every arch has the same code to ensure atomic operations and a check for !HIGHMEM page. Remove the duplicate code by defining a core kmap_atomic() which only calls the arch specific kmap_atomic_high() when the page is high memory. [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> Link: http://lkml.kernel.org/r/20200507150004.1423069-7-ira.weiny@intel.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Ira Weiny committed 6 years ago

Commit 78b6d911 parent ee9bc5f21 files · +46 −93Browse files

Unified · Split

21 files

arch/arc/include/asm/highmem.h +0 −1
arch/arc/mm/highmem.c +2 −7
arch/arm/include/asm/highmem.h +0 −1
arch/arm/mm/highmem.c +2 −7
arch/csky/include/asm/highmem.h +0 −1
arch/csky/mm/highmem.c +2 −7
arch/microblaze/include/asm/highmem.h +2 −2
arch/mips/include/asm/highmem.h +0 −1
arch/mips/mm/cache.c +1 −1
arch/mips/mm/highmem.c +2 −16
arch/nds32/include/asm/highmem.h +0 −1
arch/nds32/mm/highmem.c +2 −9
arch/powerpc/include/asm/highmem.h +2 −2
arch/powerpc/mm/highmem.c +0 −6
arch/sparc/include/asm/highmem.h +0 −1
arch/sparc/mm/highmem.c +2 −7
arch/x86/include/asm/highmem.h +4 −1
arch/x86/mm/highmem_32.c +0 −14
arch/xtensa/include/asm/highmem.h +0 −1
arch/xtensa/mm/highmem.c +2 −7
include/linux/highmem.h +23 −0

arch/arc/include/asm/highmem.h+0−1

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30
31	31	#include <asm/cacheflush.h>
32	32
33		−extern void kmap_atomic(struct page page);
34	33	extern void __kunmap_atomic(void *kvaddr);
35	34
36	35	extern void kmap_init(void);

arch/arc/mm/highmem.c+2−7

@@ -49,16 +49,11 @@ · 48 unmodified lines
49	49	extern pte_t * pkmap_page_table;
50	50	static pte_t * fixmap_page_table;
51	51
52		−void kmap_atomic(struct page page)
	52	+void kmap_atomic_high(struct page page)
53	53	{
54	54	int idx, cpu_idx;
55	55	unsigned long vaddr;
56	56
57		− preempt_disable();
58		− pagefault_disable();
59		− if (!PageHighMem(page))
60		− return page_address(page);
61		−
62	57	cpu_idx = kmap_atomic_idx_push();
63	58	idx = cpu_idx + KM_TYPE_NR * smp_processor_id();
64	59	vaddr = FIXMAP_ADDR(idx);
@@ -68,7 +63,7 @@ void kmap_atomic(struct page page) · 3 unmodified lines
68	63
69	64	return (void *)vaddr;
70	65	}
71		−EXPORT_SYMBOL(kmap_atomic);
	66	+EXPORT_SYMBOL(kmap_atomic_high);
72	67
73	68	void __kunmap_atomic(void *kv)
74	69	{

arch/arm/include/asm/highmem.h+0−1

@@ -60,7 +60,6 @@ static inline void kmap_high_get(struct page page) · 59 unmodified lines
60	60	* when CONFIG_HIGHMEM is not set.
61	61	*/
62	62	#ifdef CONFIG_HIGHMEM
63		−extern void kmap_atomic(struct page page);
64	63	extern void __kunmap_atomic(void *kvaddr);
65	64	extern void *kmap_atomic_pfn(unsigned long pfn);
66	65	#endif

arch/arm/mm/highmem.c+2−7

@@ -31,18 +31,13 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr) · 30 unmodified lines
31	31	return *ptep;
32	32	}
33	33
34		−void kmap_atomic(struct page page)
	34	+void kmap_atomic_high(struct page page)
35	35	{
36	36	unsigned int idx;
37	37	unsigned long vaddr;
38	38	void *kmap;
39	39	int type;
40	40
41		− preempt_disable();
42		− pagefault_disable();
43		− if (!PageHighMem(page))
44		− return page_address(page);
45		−
46	41	#ifdef CONFIG_DEBUG_HIGHMEM
47	42	/*
48	43	* There is no cache coherency issue when non VIVT, so force the
@@ -76,7 +71,7 @@ void kmap_atomic(struct page page) · 27 unmodified lines
76	71
77	72	return (void *)vaddr;
78	73	}
79		−EXPORT_SYMBOL(kmap_atomic);
	74	+EXPORT_SYMBOL(kmap_atomic_high);
80	75
81	76	void __kunmap_atomic(void *kvaddr)
82	77	{

arch/csky/include/asm/highmem.h+0−1

@@ -32,7 +32,6 @@ extern pte_t *pkmap_page_table; · 31 unmodified lines
32	32
33	33	#define ARCH_HAS_KMAP_FLUSH_TLB
34	34	extern void kmap_flush_tlb(unsigned long addr);
35		−extern void kmap_atomic(struct page page);
36	35	extern void __kunmap_atomic(void *kvaddr);
37	36	extern void *kmap_atomic_pfn(unsigned long pfn);
38	37	extern struct page kmap_atomic_to_page(void ptr);

arch/csky/mm/highmem.c+2−7

@@ -21,16 +21,11 @@ EXPORT_SYMBOL(kmap_flush_tlb); · 20 unmodified lines
21	21
22	22	EXPORT_SYMBOL(kmap);
23	23
24		−void kmap_atomic(struct page page)
	24	+void kmap_atomic_high(struct page page)
25	25	{
26	26	unsigned long vaddr;
27	27	int idx, type;
28	28
29		− preempt_disable();
30		− pagefault_disable();
31		− if (!PageHighMem(page))
32		− return page_address(page);
33		−
34	29	type = kmap_atomic_idx_push();
35	30	idx = type + KM_TYPE_NR*smp_processor_id();
36	31	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -42,7 +37,7 @@ void kmap_atomic(struct page page) · 5 unmodified lines
42	37
43	38	return (void *)vaddr;
44	39	}
45		−EXPORT_SYMBOL(kmap_atomic);
	40	+EXPORT_SYMBOL(kmap_atomic_high);
46	41
47	42	void __kunmap_atomic(void *kvaddr)
48	43	{

arch/microblaze/include/asm/highmem.h+2−2

@@ -63,9 +63,9 @@ static inline void kmap_atomic_prot(struct page page, pgprot_t prot) · 62 unmodified lines
63	63	}
64	64	extern void __kunmap_atomic(void *kvaddr);
65	65
66		−static inline void kmap_atomic(struct page page)
	66	+static inline void kmap_atomic_high(struct page page)
67	67	{
68		− return kmap_atomic_prot(page, kmap_prot);
	68	+ return kmap_atomic_high_prot(page, kmap_prot);
69	69	}
70	70
71	71	#define flush_cache_kmaps() { flush_icache(); flush_dcache(); }

arch/mips/include/asm/highmem.h+0−1

@@ -48,7 +48,6 @@ extern pte_t *pkmap_page_table; · 47 unmodified lines
48	48
49	49	#define ARCH_HAS_KMAP_FLUSH_TLB
50	50	extern void kmap_flush_tlb(unsigned long addr);
51		−extern void kmap_atomic(struct page page);
52	51	extern void __kunmap_atomic(void *kvaddr);
53	52	extern void *kmap_atomic_pfn(unsigned long pfn);
54	53

arch/mips/mm/cache.c+1−1

@@ -14,9 +14,9 @@ · 13 unmodified lines
14	14	#include <linux/sched.h>
15	15	#include <linux/syscalls.h>
16	16	#include <linux/mm.h>
	17	+#include <linux/highmem.h>
17	18
18	19	#include <asm/cacheflush.h>
19		−#include <asm/highmem.h>
20	20	#include <asm/processor.h>
21	21	#include <asm/cpu.h>
22	22	#include <asm/cpu-features.h>

arch/mips/mm/highmem.c+2−16

@@ -18,25 +18,11 @@ void kmap_flush_tlb(unsigned long addr) · 17 unmodified lines
18	18	}
19	19	EXPORT_SYMBOL(kmap_flush_tlb);
20	20
21		−/*
22		− * kmap_atomic/kunmap_atomic is significantly faster than kmap/kunmap because
23		− * no global lock is needed and because the kmap code must perform a global TLB
24		− * invalidation when the kmap pool wraps.
25		− *
26		− * However when holding an atomic kmap is is not legal to sleep, so atomic
27		− * kmaps are appropriate for short, tight code paths only.
28		− */
29		−
30		−void kmap_atomic(struct page page)
	21	+void kmap_atomic_high(struct page page)
31	22	{
32	23	unsigned long vaddr;
33	24	int idx, type;
34	25
35		− preempt_disable();
36		− pagefault_disable();
37		− if (!PageHighMem(page))
38		− return page_address(page);
39		−
40	26	type = kmap_atomic_idx_push();
41	27	idx = type + KM_TYPE_NR*smp_processor_id();
42	28	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -48,7 +34,7 @@ void kmap_atomic(struct page page) · 5 unmodified lines
48	34
49	35	return (void*) vaddr;
50	36	}
51		−EXPORT_SYMBOL(kmap_atomic);
	37	+EXPORT_SYMBOL(kmap_atomic_high);
52	38
53	39	void __kunmap_atomic(void *kvaddr)
54	40	{

arch/nds32/include/asm/highmem.h+0−1

@@ -51,7 +51,6 @@ extern void kmap_init(void); · 50 unmodified lines
51	51	* when CONFIG_HIGHMEM is not set.
52	52	*/
53	53	#ifdef CONFIG_HIGHMEM
54		−extern void kmap_atomic(struct page page);
55	54	extern void __kunmap_atomic(void *kvaddr);
56	55	extern void *kmap_atomic_pfn(unsigned long pfn);
57	56	extern struct page kmap_atomic_to_page(void ptr);

arch/nds32/mm/highmem.c+2−9

@@ -10,18 +10,13 @@ · 9 unmodified lines
10	10	#include <asm/fixmap.h>
11	11	#include <asm/tlbflush.h>
12	12
13		−void kmap_atomic(struct page page)
	13	+void kmap_atomic_high(struct page page)
14	14	{
15	15	unsigned int idx;
16	16	unsigned long vaddr, pte;
17	17	int type;
18	18	pte_t *ptep;
19	19
20		− preempt_disable();
21		− pagefault_disable();
22		− if (!PageHighMem(page))
23		− return page_address(page);
24		−
25	20	type = kmap_atomic_idx_push();
26	21
27	22	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -36,8 +31,7 @@ void kmap_atomic(struct page page) · 8 unmodified lines
36	31	__nds32__isb();
37	32	return (void *)vaddr;
38	33	}
39		−
40		−EXPORT_SYMBOL(kmap_atomic);
	34	+EXPORT_SYMBOL(kmap_atomic_high);
41	35
42	36	void __kunmap_atomic(void *kvaddr)
43	37	{
@@ -53,5 +47,4 @@ void __kunmap_atomic(void *kvaddr) · 9 unmodified lines
53	47	pagefault_enable();
54	48	preempt_enable();
55	49	}
56		−
57	50	EXPORT_SYMBOL(__kunmap_atomic);

arch/powerpc/include/asm/highmem.h+2−2

@@ -71,9 +71,9 @@ static inline void kmap_atomic_prot(struct page page, pgprot_t prot) · 70 unmodified lines
71	71	}
72	72	extern void __kunmap_atomic(void *kvaddr);
73	73
74		−static inline void kmap_atomic(struct page page)
	74	+static inline void kmap_atomic_high(struct page page)
75	75	{
76		− return kmap_atomic_prot(page, kmap_prot);
	76	+ return kmap_atomic_high_prot(page, kmap_prot);
77	77	}
78	78
79	79

arch/powerpc/mm/highmem.c+0−6

@@ -24,12 +24,6 @@ · 23 unmodified lines
24	24	#include <linux/highmem.h>
25	25	#include <linux/module.h>
26	26
27		−/*
28		− * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
29		− * gives a more generic (and caching) interface. But kmap_atomic can
30		− * be used in IRQ contexts, so in some (very limited) cases we need
31		− * it.
32		− */
33	27	void kmap_atomic_high_prot(struct page page, pgprot_t prot)
34	28	{
35	29	unsigned long vaddr;

arch/sparc/include/asm/highmem.h+0−1

@@ -50,7 +50,6 @@ void kmap_init(void) __init; · 49 unmodified lines
50	50
51	51	#define PKMAP_END (PKMAP_ADDR(LAST_PKMAP))
52	52
53		−void kmap_atomic(struct page page);
54	53	void __kunmap_atomic(void *kvaddr);
55	54
56	55	#define flush_cache_kmaps() flush_cache_all()

arch/sparc/mm/highmem.c+2−7

@@ -53,16 +53,11 @@ void __init kmap_init(void) · 52 unmodified lines
53	53	kmap_prot = __pgprot(SRMMU_ET_PTE \| SRMMU_PRIV \| SRMMU_CACHE);
54	54	}
55	55
56		−void kmap_atomic(struct page page)
	56	+void kmap_atomic_high(struct page page)
57	57	{
58	58	unsigned long vaddr;
59	59	long idx, type;
60	60
61		− preempt_disable();
62		− pagefault_disable();
63		− if (!PageHighMem(page))
64		− return page_address(page);
65		−
66	61	type = kmap_atomic_idx_push();
67	62	idx = type + KM_TYPE_NR*smp_processor_id();
68	63	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -87,7 +82,7 @@ void kmap_atomic(struct page page) · 18 unmodified lines
87	82
88	83	return (void*) vaddr;
89	84	}
90		−EXPORT_SYMBOL(kmap_atomic);
	85	+EXPORT_SYMBOL(kmap_atomic_high);
91	86
92	87	void __kunmap_atomic(void *kvaddr)
93	88	{

arch/x86/include/asm/highmem.h+4−1

@@ -68,7 +68,10 @@ static inline void kmap_atomic_prot(struct page page, pgprot_t prot) · 67 unmodified lines
68	68
69	69	return kmap_atomic_high_prot(page, prot);
70	70	}
71		−void kmap_atomic(struct page page);
	71	+static inline void kmap_atomic_high(struct page page)
	72	+{
	73	+ return kmap_atomic_high_prot(page, kmap_prot);
	74	+}
72	75	void __kunmap_atomic(void *kvaddr);
73	76	void *kmap_atomic_pfn(unsigned long pfn);
74	77	void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot);

arch/x86/mm/highmem_32.c+0−14

@@ -4,14 +4,6 @@ · 3 unmodified lines
4	4	#include <linux/swap.h> /* for totalram_pages */
5	5	#include <linux/memblock.h>
6	6
7		−/*
8		− * kmap_atomic/kunmap_atomic is significantly faster than kmap/kunmap because
9		− * no global lock is needed and because the kmap code must perform a global TLB
10		− * invalidation when the kmap pool wraps.
11		− *
12		− * However when holding an atomic kmap it is not legal to sleep, so atomic
13		− * kmaps are appropriate for short, tight code paths only.
14		− */
15	7	void kmap_atomic_high_prot(struct page page, pgprot_t prot)
16	8	{
17	9	unsigned long vaddr;
@@ -28,12 +20,6 @@ void kmap_atomic_high_prot(struct page page, pgprot_t prot) · 10 unmodified lines
28	20	}
29	21	EXPORT_SYMBOL(kmap_atomic_high_prot);
30	22
31		−void kmap_atomic(struct page page)
32		−{
33		− return kmap_atomic_prot(page, kmap_prot);
34		−}
35		−EXPORT_SYMBOL(kmap_atomic);
36		−
37	23	/*
38	24	* This is the same as kmap_atomic() but can map memory that doesn't
39	25	* have a struct page associated with it.

arch/xtensa/include/asm/highmem.h+0−1

@@ -68,7 +68,6 @@ static inline void flush_cache_kmaps(void) · 67 unmodified lines
68	68	flush_cache_all();
69	69	}
70	70
71		−void kmap_atomic(struct page page);
72	71	void __kunmap_atomic(void *kvaddr);
73	72
74	73	void kmap_init(void);

arch/xtensa/mm/highmem.c+2−7

@@ -37,16 +37,11 @@ static inline enum fixed_addresses kmap_idx(int type, unsigned long color) · 36 unmodified lines
37	37	color;
38	38	}
39	39
40		−void kmap_atomic(struct page page)
	40	+void kmap_atomic_high(struct page page)
41	41	{
42	42	enum fixed_addresses idx;
43	43	unsigned long vaddr;
44	44
45		− preempt_disable();
46		− pagefault_disable();
47		− if (!PageHighMem(page))
48		− return page_address(page);
49		−
50	45	idx = kmap_idx(kmap_atomic_idx_push(),
51	46	DCACHE_ALIAS(page_to_phys(page)));
52	47	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -57,7 +52,7 @@ void kmap_atomic(struct page page) · 4 unmodified lines
57	52
58	53	return (void *)vaddr;
59	54	}
60		−EXPORT_SYMBOL(kmap_atomic);
	55	+EXPORT_SYMBOL(kmap_atomic_high);
61	56
62	57	void __kunmap_atomic(void *kvaddr)
63	58	{

include/linux/highmem.h+23−0

@@ -32,6 +32,7 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size) · 31 unmodified lines
32	32	#include <asm/kmap_types.h>
33	33
34	34	#ifdef CONFIG_HIGHMEM
	35	+extern void kmap_atomic_high(struct page page);
35	36	#include <asm/highmem.h>
36	37
37	38	#ifndef ARCH_HAS_KMAP_FLUSH_TLB
@@ -62,6 +63,28 @@ static inline void kunmap(struct page *page) · 24 unmodified lines
62	63	kunmap_high(page);
63	64	}
64	65
	66	+/*
	67	+ * kmap_atomic/kunmap_atomic is significantly faster than kmap/kunmap because
	68	+ * no global lock is needed and because the kmap code must perform a global TLB
	69	+ * invalidation when the kmap pool wraps.
	70	+ *
	71	+ * However when holding an atomic kmap is is not legal to sleep, so atomic
	72	+ * kmaps are appropriate for short, tight code paths only.
	73	+ *
	74	+ * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
	75	+ * gives a more generic (and caching) interface. But kmap_atomic can
	76	+ * be used in IRQ contexts, so in some (very limited) cases we need
	77	+ * it.
	78	+ */
	79	+static inline void kmap_atomic(struct page page)
	80	+{
	81	+ preempt_disable();
	82	+ pagefault_disable();
	83	+ if (!PageHighMem(page))
	84	+ return page_address(page);
	85	+ return kmap_atomic_high(page);
	86	+}
	87	+
65	88	/* declarations for linux/mm/highmem.c */
66	89	unsigned int nr_free_highpages(void);
67	90	extern atomic_long_t _totalhigh_pages;