write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/arm/mm/highmem.c
..
..
@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * arch/arm/mm/highmem.c -- ARM highmem support
3
4
  *
4
5
  * Author:	Nicolas Pitre
5
6
  * Created:	september 8, 2008
6
7
  * Copyright:	Marvell Semiconductors Inc.
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2 as
10
- * published by the Free Software Foundation.
11
8
  */
12
9
 
13
10
 #include <linux/module.h>
..
..
@@ -21,7 +18,7 @@
21
18
 static inline void set_fixmap_pte(int idx, pte_t pte)
22
19
 {
23
20
 	unsigned long vaddr = __fix_to_virt(idx);
24
-	pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
21
+	pte_t *ptep = virt_to_kpte(vaddr);
25
22
 
26
23
 	set_pte_ext(ptep, pte, 0);
27
24
 	local_flush_tlb_kernel_page(vaddr);
..
..
@@ -29,46 +26,17 @@
29
26
 
30
27
 static inline pte_t get_fixmap_pte(unsigned long vaddr)
31
28
 {
32
-	pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
29
+	pte_t *ptep = virt_to_kpte(vaddr);
33
30
 
34
31
 	return *ptep;
35
32
 }
36
33
 
37
-static unsigned int fixmap_idx(int type)
34
+void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)
38
35
 {
39
-	return FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
40
-}
41
-
42
-void *kmap(struct page *page)
43
-{
44
-	might_sleep();
45
-	if (!PageHighMem(page))
46
-		return page_address(page);
47
-	return kmap_high(page);
48
-}
49
-EXPORT_SYMBOL(kmap);
50
-
51
-void kunmap(struct page *page)
52
-{
53
-	BUG_ON(in_interrupt());
54
-	if (!PageHighMem(page))
55
-		return;
56
-	kunmap_high(page);
57
-}
58
-EXPORT_SYMBOL(kunmap);
59
-
60
-void *kmap_atomic(struct page *page)
61
-{
62
-	pte_t pte = mk_pte(page, kmap_prot);
63
36
 	unsigned int idx;
64
37
 	unsigned long vaddr;
65
38
 	void *kmap;
66
39
 	int type;
67
-
68
-	preempt_disable_nort();
69
-	pagefault_disable();
70
-	if (!PageHighMem(page))
71
-		return page_address(page);
72
40
 
73
41
 #ifdef CONFIG_DEBUG_HIGHMEM
74
42
 	/*
..
..
@@ -85,7 +53,7 @@
85
53
 
86
54
 	type = kmap_atomic_idx_push();
87
55
 
88
-	idx = fixmap_idx(type);
56
+	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
89
57
 	vaddr = __fix_to_virt(idx);
90
58
 #ifdef CONFIG_DEBUG_HIGHMEM
91
59
 	/*
..
..
@@ -99,91 +67,55 @@
99
67
 	 * in place, so the contained TLB flush ensures the TLB is updated
100
68
 	 * with the new mapping.
101
69
 	 */
102
-#ifdef CONFIG_PREEMPT_RT_FULL
103
-	current->kmap_pte[type] = pte;
104
-#endif
105
-	set_fixmap_pte(idx, pte);
70
+	set_fixmap_pte(idx, mk_pte(page, prot));
106
71
 
107
72
 	return (void *)vaddr;
108
73
 }
109
-EXPORT_SYMBOL(kmap_atomic);
74
+EXPORT_SYMBOL(kmap_atomic_high_prot);
110
75
 
111
-void __kunmap_atomic(void *kvaddr)
76
+void kunmap_atomic_high(void *kvaddr)
112
77
 {
113
78
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
114
79
 	int idx, type;
115
80
 
116
81
 	if (kvaddr >= (void *)FIXADDR_START) {
117
82
 		type = kmap_atomic_idx();
118
-		idx = fixmap_idx(type);
83
+		idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
119
84
 
120
85
 		if (cache_is_vivt())
121
86
 			__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
122
-#ifdef CONFIG_PREEMPT_RT_FULL
123
-		current->kmap_pte[type] = __pte(0);
124
-#endif
125
87
 #ifdef CONFIG_DEBUG_HIGHMEM
126
88
 		BUG_ON(vaddr != __fix_to_virt(idx));
89
+		set_fixmap_pte(idx, __pte(0));
127
90
 #else
128
91
 		(void) idx;  /* to kill a warning */
129
92
 #endif
130
-		set_fixmap_pte(idx, __pte(0));
131
93
 		kmap_atomic_idx_pop();
132
94
 	} else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
133
95
 		/* this address was obtained through kmap_high_get() */
134
96
 		kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
135
97
 	}
136
-	pagefault_enable();
137
-	preempt_enable_nort();
138
98
 }
139
-EXPORT_SYMBOL(__kunmap_atomic);
99
+EXPORT_SYMBOL(kunmap_atomic_high);
140
100
 
141
101
 void *kmap_atomic_pfn(unsigned long pfn)
142
102
 {
143
-	pte_t pte = pfn_pte(pfn, kmap_prot);
144
103
 	unsigned long vaddr;
145
104
 	int idx, type;
146
105
 	struct page *page = pfn_to_page(pfn);
147
106
 
148
-	preempt_disable_nort();
107
+	preempt_disable();
149
108
 	pagefault_disable();
150
109
 	if (!PageHighMem(page))
151
110
 		return page_address(page);
152
111
 
153
112
 	type = kmap_atomic_idx_push();
154
-	idx = fixmap_idx(type);
113
+	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
155
114
 	vaddr = __fix_to_virt(idx);
156
115
 #ifdef CONFIG_DEBUG_HIGHMEM
157
116
 	BUG_ON(!pte_none(get_fixmap_pte(vaddr)));
158
117
 #endif
159
-#ifdef CONFIG_PREEMPT_RT_FULL
160
-	current->kmap_pte[type] = pte;
161
-#endif
162
-	set_fixmap_pte(idx, pte);
118
+	set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot));
163
119
 
164
120
 	return (void *)vaddr;
165
121
 }
166
-#if defined CONFIG_PREEMPT_RT_FULL
167
-void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
168
-{
169
-	int i;
170
-
171
-	/*
172
-	 * Clear @prev's kmap_atomic mappings
173
-	 */
174
-	for (i = 0; i < prev_p->kmap_idx; i++) {
175
-		int idx = fixmap_idx(i);
176
-
177
-		set_fixmap_pte(idx, __pte(0));
178
-	}
179
-	/*
180
-	 * Restore @next_p's kmap_atomic mappings
181
-	 */
182
-	for (i = 0; i < next_p->kmap_idx; i++) {
183
-		int idx = fixmap_idx(i);
184
-
185
-		if (!pte_none(next_p->kmap_pte[i]))
186
-			set_fixmap_pte(idx, next_p->kmap_pte[i]);
187
-	}
188
-}
189
-#endif