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

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

Pull arm64 fixes from Catalin Marinas:

 - Handle probe on hinted conditional branch instructions.

   BC.cond instructions can be simulated in the same way as B.cond
   instructions, so extend the decode mask for B.cond to cover BC.cond

 - Flush the walk cache when unsharing PMD tables. Recent changes to
   huge_pmd_unshare() introduced mmu_gather::unshared_tables but the
   arm64 code was still treating the TLB flushing as only targeting leaf
   entries (TLBI VALE1IS).

   Fix it by using non-leaf-only instructions (TLBI VAE1IS) when
   tlb->unshared_tables is set

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: tlb: Flush walk cache when unsharing PMD tables
  arm64: probes: Handle probes on hinted conditional branch instructions
parents cbadb98b c2ff4764

arch/arm64/include/asm/insn.h

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ __AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x34000000) 
__AARCH64_INSN_FUNCS(cbnz,	0x7F000000, 0x35000000)

__AARCH64_INSN_FUNCS(tbz,	0x7F000000, 0x36000000)

__AARCH64_INSN_FUNCS(tbnz,	0x7F000000, 0x37000000)

__AARCH64_INSN_FUNCS(bcond,	0xFF000010, 0x54000000)

__AARCH64_INSN_FUNCS(bcond,	0xFF000000, 0x54000000)

__AARCH64_INSN_FUNCS(svc,	0xFFE0001F, 0xD4000001)

__AARCH64_INSN_FUNCS(hvc,	0xFFE0001F, 0xD4000002)

__AARCH64_INSN_FUNCS(smc,	0xFFE0001F, 0xD4000003)

arch/arm64/include/asm/tlb.h

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static inline int tlb_get_level(struct mmu_gather *tlb) 
static inline void tlb_flush(struct mmu_gather *tlb)

{

	struct vm_area_struct vma = TLB_FLUSH_VMA(tlb->mm, 0);

	tlbf_t flags = tlb->freed_tables ? TLBF_NONE : TLBF_NOWALKCACHE;

	tlbf_t flags = (tlb->freed_tables || tlb->unshared_tables) ?

			TLBF_NONE : TLBF_NOWALKCACHE;

	unsigned long stride = tlb_get_unmap_size(tlb);

	int tlb_level = tlb_get_level(tlb);