From: Xing Li lixing@loongson.cn
The code in decode_config4() of arch/mips/kernel/cpu-probe.c
asid_mask = MIPS_ENTRYHI_ASID; if (config4 & MIPS_CONF4_AE) asid_mask |= MIPS_ENTRYHI_ASIDX; set_cpu_asid_mask(c, asid_mask);
set asid_mask to cpuinfo->asid_mask.
So in order to support variable ASID_MASK, KVM_ENTRYHI_ASID should also be changed to cpu_asid_mask(&boot_cpu_data).
Cc: stable@vger.kernel.org Signed-off-by: Xing Li lixing@loongson.cn [Huacai: Change current_cpu_data to boot_cpu_data for optimization] Signed-off-by: Huacai Chen chenhc@lemote.com --- arch/mips/include/asm/kvm_host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index 2c343c3..a01cee9 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -275,7 +275,7 @@ enum emulation_result { #define MIPS3_PG_FRAME 0x3fffffc0
#define VPN2_MASK 0xffffe000 -#define KVM_ENTRYHI_ASID MIPS_ENTRYHI_ASID +#define KVM_ENTRYHI_ASID cpu_asid_mask(&boot_cpu_data) #define TLB_IS_GLOBAL(x) ((x).tlb_lo[0] & (x).tlb_lo[1] & ENTRYLO_G) #define TLB_VPN2(x) ((x).tlb_hi & VPN2_MASK) #define TLB_ASID(x) ((x).tlb_hi & KVM_ENTRYHI_ASID)
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.6.7, v5.4.35, v4.19.118, v4.14.177, v4.9.220, v4.4.220.
v5.6.7: Build OK! v5.4.35: Build OK! v4.19.118: Build OK! v4.14.177: Build OK! v4.9.220: Build OK! v4.4.220: Failed to apply! Possible dependencies: 029499b47738 ("KVM: x86: MMU: Make mmu_set_spte() return emulate value") 19d194c62b25 ("MIPS: KVM: Simplify TLB_* macros") 403015b323a2 ("MIPS: KVM: Move non-TLB handling code out of tlb.c") 7ee0e5b29d27 ("KVM: x86: MMU: Remove unused parameter of __direct_map()") 9fbfb06a4065 ("MIPS: KVM: Arrayify struct kvm_mips_tlb::tlb_lo*") ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t") bdb7ed8608f8 ("MIPS: KVM: Convert headers to kernel sized types") ca64c2beecd4 ("MIPS: KVM: Abstract guest ASID mask") caa1faa7aba6 ("MIPS: KVM: Trivial whitespace and style fixes") e6207bbea16c ("MIPS: KVM: Use MIPS_ENTRYLO_* defs from mipsregs.h")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Hi, Sasha,
On Sun, Apr 26, 2020 at 11:04 PM Sasha Levin sashal@kernel.org wrote:
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.6.7, v5.4.35, v4.19.118, v4.14.177, v4.9.220, v4.4.220.
v5.6.7: Build OK! v5.4.35: Build OK! v4.19.118: Build OK! v4.14.177: Build OK! v4.9.220: Build OK! v4.4.220: Failed to apply! Possible dependencies: 029499b47738 ("KVM: x86: MMU: Make mmu_set_spte() return emulate value") 19d194c62b25 ("MIPS: KVM: Simplify TLB_* macros") 403015b323a2 ("MIPS: KVM: Move non-TLB handling code out of tlb.c") 7ee0e5b29d27 ("KVM: x86: MMU: Remove unused parameter of __direct_map()") 9fbfb06a4065 ("MIPS: KVM: Arrayify struct kvm_mips_tlb::tlb_lo*") ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t") bdb7ed8608f8 ("MIPS: KVM: Convert headers to kernel sized types") ca64c2beecd4 ("MIPS: KVM: Abstract guest ASID mask") caa1faa7aba6 ("MIPS: KVM: Trivial whitespace and style fixes") e6207bbea16c ("MIPS: KVM: Use MIPS_ENTRYLO_* defs from mipsregs.h")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Please ignore this patch in linux-4.4 branch, thanks.
Huacai
-- Thanks Sasha
linux-stable-mirror@lists.linaro.org
-
Huacai Chen -
Sasha Levin