On 25/10/2016 17:08, James Hogan wrote: > A few more fixes intended for v4.9. Patches 2 & 3 are tagged for stable. > > - The first fixes lazy user ASID regeneration which was introduced in > 4.9-rc1 and still wasn't quite right for SMP hosts. > > - The second is a minor incorrect behaviour in ERET emulation when both > ERL and EXL are set (i.e. unlikely to hit in practice), which has been > wrong since MIPS KVM was added in v3.10. > > - The third fixes a slightly risky completion of an MMIO load in branch > delay slot, where it'll try and read guest code outside of the proper > context. Currently we should only be able to hit this if the MMIO load > in branch delay slot is in guest TLB mapped (i.e. kernel module) code. > > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Cc: "Radim Krčmář" <rkrcmar@xxxxxxxxxx> > Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> > Cc: linux-mips@xxxxxxxxxxxxxx > Cc: kvm@xxxxxxxxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx > > James Hogan (3): > KVM: MIPS: Fix lazy user ASID regenerate for SMP > KVM: MIPS: Make ERET handle ERL before EXL > KVM: MIPS: Precalculate MMIO load resume PC > > arch/mips/include/asm/kvm_host.h | 7 ++++--- > arch/mips/kvm/emulate.c | 32 +++++++++++++++++++------------- > arch/mips/kvm/mips.c | 5 ++++- > arch/mips/kvm/mmu.c | 4 ---- > 4 files changed, 27 insertions(+), 21 deletions(-) > Applied to kvm/master, thanks.