Commit f824272b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fix from Heiko Carstens:

 - Fix a bug in the __ptep_rdp() inline assembly which may lead to
   missing TLB flushes

* tag 's390-6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: Fix __ptep_rdp() inline assembly
parents b8a2c32b 31475b88

arch/s390/include/asm/pgtable.h

+5 −7
Original line number Diff line number Diff line
@@ -1154,17 +1154,15 @@ static inline pte_t pte_mkhuge(pte_t pte) 
#define IPTE_NODAT	0x400

#define IPTE_GUEST_ASCE	0x800



static __always_inline void __ptep_rdp(unsigned long addr, pte_t *ptep,

				       unsigned long opt, unsigned long asce,

				       int local)

static __always_inline void __ptep_rdp(unsigned long addr, pte_t *ptep, int local)

{

	unsigned long pto;



	pto = __pa(ptep) & ~(PTRS_PER_PTE * sizeof(pte_t) - 1);

	asm volatile(".insn rrf,0xb98b0000,%[r1],%[r2],%[asce],%[m4]"

	asm volatile(".insn	rrf,0xb98b0000,%[r1],%[r2],%%r0,%[m4]"

		     : "+m" (*ptep)

		     : [r1] "a" (pto), [r2] "a" ((addr & PAGE_MASK) | opt),

		       [asce] "a" (asce), [m4] "i" (local));

		     : [r1] "a" (pto), [r2] "a" (addr & PAGE_MASK),

		       [m4] "i" (local));

}



static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
@@ -1348,7 +1346,7 @@ static inline void flush_tlb_fix_spurious_fault(struct vm_area_struct *vma, 
	 * A local RDP can be used to do the flush.

	 */

	if (cpu_has_rdp() && !(pte_val(*ptep) & _PAGE_PROTECT))

		__ptep_rdp(address, ptep, 0, 0, 1);

		__ptep_rdp(address, ptep, 1);

}

#define flush_tlb_fix_spurious_fault flush_tlb_fix_spurious_fault

arch/s390/mm/pgtable.c

+2 −2
Original line number Diff line number Diff line
@@ -274,9 +274,9 @@ void ptep_reset_dat_prot(struct mm_struct *mm, unsigned long addr, pte_t *ptep, 
	preempt_disable();

	atomic_inc(&mm->context.flush_count);

	if (cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))

		__ptep_rdp(addr, ptep, 0, 0, 1);

		__ptep_rdp(addr, ptep, 1);

	else

		__ptep_rdp(addr, ptep, 0, 0, 0);

		__ptep_rdp(addr, ptep, 0);

	/*

	 * PTE is not invalidated by RDP, only _PAGE_PROTECT is cleared. That

	 * means it is still valid and active, and must not be changed according