x86/cr4: Sanitize CR4.PCE update

load_mm_cr4_irqsoff() is really a strange name for a function which has
only one purpose: Update the CR4.PCE bit depending on the perf state.

Rename it to update_cr4_pce_mm(), move it into the tlb code and provide a
function which can be invoked by the perf smp function calls.

Another step to remove exposure of cpu_tlbstate.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200421092559.049499158@linutronix.de

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index a619763e96e16fdc2ce77a1143813333f2c3f67e..30d2b1d3e94cd43412d3dacad9af9b79c7b7c2b1 100644 (file)
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -2162,11 +2162,6 @@ static int x86_pmu_event_init(struct perf_event *event)
        return err;
 }
 
-static void refresh_pce(void *ignored)
-{
-       load_mm_cr4_irqsoff(this_cpu_read(cpu_tlbstate.loaded_mm));
-}
-
 static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm)
 {
        if (!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED))
@@ -2185,7 +2180,7 @@ static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm)
        lockdep_assert_held_write(&mm->mmap_sem);
 
        if (atomic_inc_return(&mm->context.perf_rdpmc_allowed) == 1)
-               on_each_cpu_mask(mm_cpumask(mm), refresh_pce, NULL, 1);
+               on_each_cpu_mask(mm_cpumask(mm), cr4_update_pce, NULL, 1);
 }
 
 static void x86_pmu_event_unmapped(struct perf_event *event, struct mm_struct *mm)
@@ -2195,7 +2190,7 @@ static void x86_pmu_event_unmapped(struct perf_event *event, struct mm_struct *m
                return;
 
        if (atomic_dec_and_test(&mm->context.perf_rdpmc_allowed))
-               on_each_cpu_mask(mm_cpumask(mm), refresh_pce, NULL, 1);
+               on_each_cpu_mask(mm_cpumask(mm), cr4_update_pce, NULL, 1);
 }
 
 static int x86_pmu_event_idx(struct perf_event *event)
@@ -2253,7 +2248,7 @@ static ssize_t set_attr_rdpmc(struct device *cdev,
                else if (x86_pmu.attr_rdpmc == 2)
                        static_branch_dec(&rdpmc_always_available_key);
 
-               on_each_cpu(refresh_pce, NULL, 1);
+               on_each_cpu(cr4_update_pce, NULL, 1);
                x86_pmu.attr_rdpmc = val;
        }
 

diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 9608536b9c8556ee7cc2519fa5e581aa8cd20a73..2985d06660aa1a45953a10d502f1f770b9482f58 100644 (file)
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -24,21 +24,9 @@ static inline void paravirt_activate_mm(struct mm_struct *prev,
 #endif /* !CONFIG_PARAVIRT_XXL */
 
 #ifdef CONFIG_PERF_EVENTS
-
 DECLARE_STATIC_KEY_FALSE(rdpmc_never_available_key);
 DECLARE_STATIC_KEY_FALSE(rdpmc_always_available_key);
-
-static inline void load_mm_cr4_irqsoff(struct mm_struct *mm)
-{
-       if (static_branch_unlikely(&rdpmc_always_available_key) ||
-           (!static_branch_unlikely(&rdpmc_never_available_key) &&
-            atomic_read(&mm->context.perf_rdpmc_allowed)))
-               cr4_set_bits_irqsoff(X86_CR4_PCE);
-       else
-               cr4_clear_bits_irqsoff(X86_CR4_PCE);
-}
-#else
-static inline void load_mm_cr4_irqsoff(struct mm_struct *mm) {}
+void cr4_update_pce(void *ignored);
 #endif
 
 #ifdef CONFIG_MODIFY_LDT_SYSCALL

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index ea6f98a7ec06e70d4662f8ce5d8c3315be08fc20..3d9d81951962d0de2e8517047d2f44bbb7280ecb 100644 (file)
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -272,6 +272,26 @@ static void cond_ibpb(struct task_struct *next)
        }
 }
 
+#ifdef CONFIG_PERF_EVENTS
+static inline void cr4_update_pce_mm(struct mm_struct *mm)
+{
+       if (static_branch_unlikely(&rdpmc_always_available_key) ||
+           (!static_branch_unlikely(&rdpmc_never_available_key) &&
+            atomic_read(&mm->context.perf_rdpmc_allowed)))
+               cr4_set_bits_irqsoff(X86_CR4_PCE);
+       else
+               cr4_clear_bits_irqsoff(X86_CR4_PCE);
+}
+
+void cr4_update_pce(void *ignored)
+{
+       cr4_update_pce_mm(this_cpu_read(cpu_tlbstate.loaded_mm));
+}
+
+#else
+static inline void cr4_update_pce_mm(struct mm_struct *mm) { }
+#endif
+
 void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
                        struct task_struct *tsk)
 {
@@ -440,7 +460,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
        this_cpu_write(cpu_tlbstate.loaded_mm_asid, new_asid);
 
        if (next != real_prev) {
-               load_mm_cr4_irqsoff(next);
+               cr4_update_pce_mm(next);
                switch_ldt(real_prev, next);
        }
 }