Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-9
+5
-7
arch/s390/include/asm/pgtable.h
+5
-7
arch/s390/include/asm/pgtable.h
···
1154
1154
#define IPTE_NODAT 0x400
1155
1155
#define IPTE_GUEST_ASCE 0x800
1156
1156
1157
-
static __always_inline void __ptep_rdp(unsigned long addr, pte_t *ptep,
1158
-
unsigned long opt, unsigned long asce,
1159
-
int local)
1157
+
static __always_inline void __ptep_rdp(unsigned long addr, pte_t *ptep, int local)
1160
1158
{
1161
1159
unsigned long pto;
1162
1160
1163
1161
pto = __pa(ptep) & ~(PTRS_PER_PTE * sizeof(pte_t) - 1);
1164
-
asm volatile(".insn rrf,0xb98b0000,%[r1],%[r2],%[asce],%[m4]"
1162
+
asm volatile(".insn rrf,0xb98b0000,%[r1],%[r2],%%r0,%[m4]"
1165
1163
: "+m" (*ptep)
1166
-
: [r1] "a" (pto), [r2] "a" ((addr & PAGE_MASK) | opt),
1167
-
[asce] "a" (asce), [m4] "i" (local));
1164
+
: [r1] "a" (pto), [r2] "a" (addr & PAGE_MASK),
1165
+
[m4] "i" (local));
1168
1166
}
1169
1167
1170
1168
static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
···
1346
1348
* A local RDP can be used to do the flush.
1347
1349
*/
1348
1350
if (cpu_has_rdp() && !(pte_val(*ptep) & _PAGE_PROTECT))
1349
-
__ptep_rdp(address, ptep, 0, 0, 1);
1351
+
__ptep_rdp(address, ptep, 1);
1350
1352
}
1351
1353
#define flush_tlb_fix_spurious_fault flush_tlb_fix_spurious_fault
1352
1354
+2
-2
arch/s390/mm/pgtable.c
+2
-2
arch/s390/mm/pgtable.c
···
274
274
preempt_disable();
275
275
atomic_inc(&mm->context.flush_count);
276
276
if (cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))
277
-
__ptep_rdp(addr, ptep, 0, 0, 1);
277
+
__ptep_rdp(addr, ptep, 1);
278
278
else
279
-
__ptep_rdp(addr, ptep, 0, 0, 0);
279
+
__ptep_rdp(addr, ptep, 0);
280
280
/*
281
281
* PTE is not invalidated by RDP, only _PAGE_PROTECT is cleared. That
282
282
* means it is still valid and active, and must not be changed according