History

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas: - The alternatives patching code uses flush_icache_range() which itself uses alternatives. Change the code to use an unpatched variant of cache maintenance - Remove unnecessary ISBs from set_{pte,pmd,pud} - perf: xgene_pmu: Fix IOB SLOW PMU parser error * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Remove unnecessary ISBs from set_{pte,pmd,pud} arm64: Avoid flush_icache_range() in alternatives patching code drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error

Linus Torvalds committed 8 years ago

Commit 0d55ec62 parents 44813aa 24fe1b05 files · +54 −17Browse files

Unified · Split

5 files
  1. arch/arm64/include/asm/alternative.h +6 −1
  2. arch/arm64/include/asm/pgtable.h +1 −5
  3. arch/arm64/kernel/alternative.c +44 −7
  4. arch/arm64/kernel/module.c +2 −3
  5. drivers/perf/xgene_pmu.c +1 −1
arch/arm64/include/asm/alternative.h+6−1
@@ -28,7 +28,12 @@ typedef void (*alternative_cb_t)(struct alt_instr *alt, · 27 unmodified lines
2828 __le32 *origptr, __le32 *updptr, int nr_inst);
2929
3030 void __init apply_alternatives_all(void);
31−void apply_alternatives(void *start, size_t length);
31+
32+#ifdef CONFIG_MODULES
33+void apply_alternatives_module(void *start, size_t length);
34+#else
35+static inline void apply_alternatives_module(void *start, size_t length) { }
36+#endif
3237
3338 #define ALTINSTR_ENTRY(feature,cb) \
3439 " .word 661b - .\n" /* label */ \
arch/arm64/include/asm/pgtable.h+1−5
@@ -224,10 +224,8 @@ static inline void set_pte(pte_t *ptep, pte_t pte) · 223 unmodified lines
224224 * Only if the new pte is valid and kernel, otherwise TLB maintenance
225225 * or update_mmu_cache() have the necessary barriers.
226226 */
227− if (pte_valid_not_user(pte)) {
227+ if (pte_valid_not_user(pte))
228228 dsb(ishst);
229− isb();
230− }
231229 }
232230
233231 extern void __sync_icache_dcache(pte_t pteval);
@@ -434,7 +432,6 @@ static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) · 200 unmodified lines
434432 {
435433 WRITE_ONCE(*pmdp, pmd);
436434 dsb(ishst);
437− isb();
438435 }
439436
440437 static inline void pmd_clear(pmd_t *pmdp)
@@ -485,7 +482,6 @@ static inline void set_pud(pud_t *pudp, pud_t pud) · 44 unmodified lines
485482 {
486483 WRITE_ONCE(*pudp, pud);
487484 dsb(ishst);
488− isb();
489485 }
490486
491487 static inline void pud_clear(pud_t *pudp)
arch/arm64/kernel/alternative.c+44−7
@@ -122,7 +122,30 @@ static void patch_alternative(struct alt_instr *alt, · 121 unmodified lines
122122 }
123123 }
124124
125−static void __apply_alternatives(void *alt_region, bool use_linear_alias)
125+/*
126+ * We provide our own, private D-cache cleaning function so that we don't
127+ * accidentally call into the cache.S code, which is patched by us at
128+ * runtime.
129+ */
130+static void clean_dcache_range_nopatch(u64 start, u64 end)
131+{
132+ u64 cur, d_size, ctr_el0;
133+
134+ ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0);
135+ d_size = 4 << cpuid_feature_extract_unsigned_field(ctr_el0,
136+ CTR_DMINLINE_SHIFT);
137+ cur = start & ~(d_size - 1);
138+ do {
139+ /*
140+ * We must clean+invalidate to the PoC in order to avoid
141+ * Cortex-A53 errata 826319, 827319, 824069 and 819472
142+ * (this corresponds to ARM64_WORKAROUND_CLEAN_CACHE)
143+ */
144+ asm volatile("dc civac, %0" : : "r" (cur) : "memory");
145+ } while (cur += d_size, cur < end);
146+}
147+
148+static void __apply_alternatives(void *alt_region, bool is_module)
126149 {
127150 struct alt_instr *alt;
128151 struct alt_region *region = alt_region;
@@ -145,7 +168,7 @@ static void __apply_alternatives(void *alt_region, bool use_linear_alias) · 16 unmodified lines
145168 pr_info_once("patching kernel code\n");
146169
147170 origptr = ALT_ORIG_PTR(alt);
148− updptr = use_linear_alias ? lm_alias(origptr) : origptr;
171+ updptr = is_module ? origptr : lm_alias(origptr);
149172 nr_inst = alt->orig_len / AARCH64_INSN_SIZE;
150173
151174 if (alt->cpufeature < ARM64_CB_PATCH)
@@ -155,8 +178,20 @@ static void __apply_alternatives(void *alt_region, bool use_linear_alias) · 3 unmodified lines
155178
156179 alt_cb(alt, origptr, updptr, nr_inst);
157180
158− flush_icache_range((uintptr_t)origptr,
159− (uintptr_t)(origptr + nr_inst));
181+ if (!is_module) {
182+ clean_dcache_range_nopatch((u64)origptr,
183+ (u64)(origptr + nr_inst));
184+ }
185+ }
186+
187+ /*
188+ * The core module code takes care of cache maintenance in
189+ * flush_module_icache().
190+ */
191+ if (!is_module) {
192+ dsb(ish);
193+ __flush_icache_all();
194+ isb();
160195 }
161196 }
162197
@@ -178,7 +213,7 @@ static int __apply_alternatives_multi_stop(void *unused) · 15 unmodified lines
178213 isb();
179214 } else {
180215 BUG_ON(alternatives_applied);
181− __apply_alternatives(&region, true);
216+ __apply_alternatives(&region, false);
182217 /* Barriers provided by the cache flushing */
183218 WRITE_ONCE(alternatives_applied, 1);
184219 }
@@ -192,12 +227,14 @@ void __init apply_alternatives_all(void) · 7 unmodified lines
192227 stop_machine(__apply_alternatives_multi_stop, NULL, cpu_online_mask);
193228 }
194229
195−void apply_alternatives(void *start, size_t length)
230+#ifdef CONFIG_MODULES
231+void apply_alternatives_module(void *start, size_t length)
196232 {
197233 struct alt_region region = {
198234 .begin = start,
199235 .end = start + length,
200236 };
201237
202− __apply_alternatives(&region, false);
238+ __apply_alternatives(&region, true);
203239 }
240+#endif
arch/arm64/kernel/module.c+2−3
@@ -448,9 +448,8 @@ int module_finalize(const Elf_Ehdr *hdr, · 447 unmodified lines
448448 const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
449449
450450 for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
451− if (strcmp(".altinstructions", secstrs + s->sh_name) == 0) {
452− apply_alternatives((void *)s->sh_addr, s->sh_size);
453− }
451+ if (strcmp(".altinstructions", secstrs + s->sh_name) == 0)
452+ apply_alternatives_module((void *)s->sh_addr, s->sh_size);
454453 #ifdef CONFIG_ARM64_MODULE_PLTS
455454 if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE) &&
456455 !strcmp(".text.ftrace_trampoline", secstrs + s->sh_name))
drivers/perf/xgene_pmu.c+1−1
@@ -1463,7 +1463,7 @@ static char *xgene_pmu_dev_name(struct device *dev, u32 type, int id) · 1462 unmodified lines
14631463 case PMU_TYPE_IOB:
14641464 return devm_kasprintf(dev, GFP_KERNEL, "iob%d", id);
14651465 case PMU_TYPE_IOB_SLOW:
1466− return devm_kasprintf(dev, GFP_KERNEL, "iob-slow%d", id);
1466+ return devm_kasprintf(dev, GFP_KERNEL, "iob_slow%d", id);
14671467 case PMU_TYPE_MCB:
14681468 return devm_kasprintf(dev, GFP_KERNEL, "mcb%d", id);
14691469 case PMU_TYPE_MC:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t