1 files changed, 6 insertions, 7 deletions

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 1ab3821f9e26..49d9778376d7 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -126,8 +126,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
          * isn't free.
          */
 #ifdef CONFIG_DEBUG_VM
-        if (WARN_ON_ONCE(__read_cr3() !=
-                         (__sme_pa(real_prev->pgd) | prev_asid))) {
+        if (WARN_ON_ONCE(__read_cr3() != build_cr3(real_prev, prev_asid))) {
                 /*
                  * If we were to BUG here, we'd be very likely to kill
                  * the system so hard that we don't see the call trace.
@@ -172,7 +171,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
                          */
                         this_cpu_write(cpu_tlbstate.ctxs[prev_asid].tlb_gen,
                                        next_tlb_gen);
-                        write_cr3(__sme_pa(next->pgd) | prev_asid);
+                        write_cr3(build_cr3(next, prev_asid));
                         trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH,
                                         TLB_FLUSH_ALL);
                 }
@@ -192,7 +191,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
                          * mapped in the new pgd, we'll double-fault.  Forcibly
                          * map it.
                          */
-                        unsigned int index = pgd_index(current_stack_pointer());
+                        unsigned int index = pgd_index(current_stack_pointer);
                         pgd_t *pgd = next->pgd + index;
 
                         if (unlikely(pgd_none(*pgd)))
@@ -216,12 +215,12 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
                 if (need_flush) {
                         this_cpu_write(cpu_tlbstate.ctxs[new_asid].ctx_id, next->context.ctx_id);
                         this_cpu_write(cpu_tlbstate.ctxs[new_asid].tlb_gen, next_tlb_gen);
-                        write_cr3(__sme_pa(next->pgd) | new_asid);
+                        write_cr3(build_cr3(next, new_asid));
                         trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH,
                                         TLB_FLUSH_ALL);
                 } else {
                         /* The new ASID is already up to date. */
-                        write_cr3(__sme_pa(next->pgd) | new_asid | CR3_NOFLUSH);
+                        write_cr3(build_cr3_noflush(next, new_asid));
                         trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, 0);
                 }
 
@@ -265,7 +264,7 @@ void initialize_tlbstate_and_flush(void)
                 !(cr4_read_shadow() & X86_CR4_PCIDE));
 
         /* Force ASID 0 and force a TLB flush. */
-        write_cr3(cr3 & ~CR3_PCID_MASK);
+        write_cr3(build_cr3(mm, 0));
 
         /* Reinitialize tlbstate. */
         this_cpu_write(cpu_tlbstate.loaded_mm_asid, 0);