Commit 7f20fd23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Bugfixes (arm and x86) and cleanups"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  selftests: kvm: Adding config fragments
  KVM: selftests: Update gitignore file for latest changes
  kvm: remove unnecessary PageReserved check
  KVM: arm/arm64: vgic: Reevaluate level sensitive interrupts on enable
  KVM: arm: Don't write junk to CP15 registers on reset
  KVM: arm64: Don't write junk to sysregs on reset
  KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block
  x86: kvm: remove useless calls to kvm_para_available
  KVM: no need to check return value of debugfs_create functions
  KVM: remove kvm_arch_has_vcpu_debugfs()
  KVM: Fix leak vCPU's VMCS value into other pCPU
  KVM: Check preempted_in_kernel for involuntary preemption
  KVM: LAPIC: Don't need to wakeup vCPU twice afer timer fire
  arm64: KVM: hyp: debug-sr: Mark expected switch fall-through
  KVM: arm64: Update kvm_arm_exception_class and esr_class_str for new EC
  KVM: arm: vgic-v3: Mark expected switch fall-through
  arm64: KVM: regmap: Fix unexpected switch fall-through
  KVM: arm/arm64: Introduce kvm_pmu_vcpu_init() to setup PMU counter index
parents 15abf142 a738b5e7

arch/arm/kvm/coproc.c

+15 −8
Original line number Diff line number Diff line
@@ -651,13 +651,22 @@ int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run) 
}



static void reset_coproc_regs(struct kvm_vcpu *vcpu,

			      const struct coproc_reg *table, size_t num)

			      const struct coproc_reg *table, size_t num,

			      unsigned long *bmap)

{

	unsigned long i;



	for (i = 0; i < num; i++)

		if (table[i].reset)

		if (table[i].reset) {

			int reg = table[i].reg;



			table[i].reset(vcpu, &table[i]);

			if (reg > 0 && reg < NR_CP15_REGS) {

				set_bit(reg, bmap);

				if (table[i].is_64bit)

					set_bit(reg + 1, bmap);

			}

		}

}



static struct coproc_params decode_32bit_hsr(struct kvm_vcpu *vcpu)
@@ -1432,17 +1441,15 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu) 
{

	size_t num;

	const struct coproc_reg *table;



	/* Catch someone adding a register without putting in reset entry. */

	memset(vcpu->arch.ctxt.cp15, 0x42, sizeof(vcpu->arch.ctxt.cp15));

	DECLARE_BITMAP(bmap, NR_CP15_REGS) = { 0, };



	/* Generic chip reset first (so target could override). */

	reset_coproc_regs(vcpu, cp15_regs, ARRAY_SIZE(cp15_regs));

	reset_coproc_regs(vcpu, cp15_regs, ARRAY_SIZE(cp15_regs), bmap);



	table = get_target_table(vcpu->arch.target, &num);

	reset_coproc_regs(vcpu, table, num);

	reset_coproc_regs(vcpu, table, num, bmap);



	for (num = 1; num < NR_CP15_REGS; num++)

		WARN(vcpu_cp15(vcpu, num) == 0x42424242,

		WARN(!test_bit(num, bmap),

		     "Didn't reset vcpu_cp15(vcpu, %zi)", num);

}

arch/arm64/include/asm/kvm_arm.h

+4 −3
Original line number Diff line number Diff line
@@ -316,9 +316,10 @@ 


#define kvm_arm_exception_class \

	ECN(UNKNOWN), ECN(WFx), ECN(CP15_32), ECN(CP15_64), ECN(CP14_MR), \

	ECN(CP14_LS), ECN(FP_ASIMD), ECN(CP10_ID), ECN(CP14_64), ECN(SVC64), \

	ECN(HVC64), ECN(SMC64), ECN(SYS64), ECN(IMP_DEF), ECN(IABT_LOW), \

	ECN(IABT_CUR), ECN(PC_ALIGN), ECN(DABT_LOW), ECN(DABT_CUR), \

	ECN(CP14_LS), ECN(FP_ASIMD), ECN(CP10_ID), ECN(PAC), ECN(CP14_64), \

	ECN(SVC64), ECN(HVC64), ECN(SMC64), ECN(SYS64), ECN(SVE), \

	ECN(IMP_DEF), ECN(IABT_LOW), ECN(IABT_CUR), \

	ECN(PC_ALIGN), ECN(DABT_LOW), ECN(DABT_CUR), \

	ECN(SP_ALIGN), ECN(FP_EXC32), ECN(FP_EXC64), ECN(SERROR), \

	ECN(BREAKPT_LOW), ECN(BREAKPT_CUR), ECN(SOFTSTP_LOW), \

	ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \

arch/arm64/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ static const char *esr_class_str[] = { 
	[ESR_ELx_EC_CP14_LS]		= "CP14 LDC/STC",

	[ESR_ELx_EC_FP_ASIMD]		= "ASIMD",

	[ESR_ELx_EC_CP10_ID]		= "CP10 MRC/VMRS",

	[ESR_ELx_EC_PAC]		= "PAC",

	[ESR_ELx_EC_CP14_64]		= "CP14 MCRR/MRRC",

	[ESR_ELx_EC_ILL]		= "PSTATE.IL",

	[ESR_ELx_EC_SVC32]		= "SVC (AArch32)",

arch/arm64/kvm/hyp/debug-sr.c

+30 −0
Original line number Diff line number Diff line
@@ -18,40 +18,70 @@ 
#define save_debug(ptr,reg,nr)						\

	switch (nr) {							\

	case 15:	ptr[15] = read_debug(reg, 15);			\

			/* Fall through */				\

	case 14:	ptr[14] = read_debug(reg, 14);			\

			/* Fall through */				\

	case 13:	ptr[13] = read_debug(reg, 13);			\

			/* Fall through */				\

	case 12:	ptr[12] = read_debug(reg, 12);			\

			/* Fall through */				\

	case 11:	ptr[11] = read_debug(reg, 11);			\

			/* Fall through */				\

	case 10:	ptr[10] = read_debug(reg, 10);			\

			/* Fall through */				\

	case 9:		ptr[9] = read_debug(reg, 9);			\

			/* Fall through */				\

	case 8:		ptr[8] = read_debug(reg, 8);			\

			/* Fall through */				\

	case 7:		ptr[7] = read_debug(reg, 7);			\

			/* Fall through */				\

	case 6:		ptr[6] = read_debug(reg, 6);			\

			/* Fall through */				\

	case 5:		ptr[5] = read_debug(reg, 5);			\

			/* Fall through */				\

	case 4:		ptr[4] = read_debug(reg, 4);			\

			/* Fall through */				\

	case 3:		ptr[3] = read_debug(reg, 3);			\

			/* Fall through */				\

	case 2:		ptr[2] = read_debug(reg, 2);			\

			/* Fall through */				\

	case 1:		ptr[1] = read_debug(reg, 1);			\

			/* Fall through */				\

	default:	ptr[0] = read_debug(reg, 0);			\

	}



#define restore_debug(ptr,reg,nr)					\

	switch (nr) {							\

	case 15:	write_debug(ptr[15], reg, 15);			\

			/* Fall through */				\

	case 14:	write_debug(ptr[14], reg, 14);			\

			/* Fall through */				\

	case 13:	write_debug(ptr[13], reg, 13);			\

			/* Fall through */				\

	case 12:	write_debug(ptr[12], reg, 12);			\

			/* Fall through */				\

	case 11:	write_debug(ptr[11], reg, 11);			\

			/* Fall through */				\

	case 10:	write_debug(ptr[10], reg, 10);			\

			/* Fall through */				\

	case 9:		write_debug(ptr[9], reg, 9);			\

			/* Fall through */				\

	case 8:		write_debug(ptr[8], reg, 8);			\

			/* Fall through */				\

	case 7:		write_debug(ptr[7], reg, 7);			\

			/* Fall through */				\

	case 6:		write_debug(ptr[6], reg, 6);			\

			/* Fall through */				\

	case 5:		write_debug(ptr[5], reg, 5);			\

			/* Fall through */				\

	case 4:		write_debug(ptr[4], reg, 4);			\

			/* Fall through */				\

	case 3:		write_debug(ptr[3], reg, 3);			\

			/* Fall through */				\

	case 2:		write_debug(ptr[2], reg, 2);			\

			/* Fall through */				\

	case 1:		write_debug(ptr[1], reg, 1);			\

			/* Fall through */				\

	default:	write_debug(ptr[0], reg, 0);			\

	}

arch/arm64/kvm/regmap.c

+5 −0
Original line number Diff line number Diff line
@@ -178,13 +178,18 @@ void vcpu_write_spsr32(struct kvm_vcpu *vcpu, unsigned long v) 
	switch (spsr_idx) {

	case KVM_SPSR_SVC:

		write_sysreg_el1(v, SYS_SPSR);

		break;

	case KVM_SPSR_ABT:

		write_sysreg(v, spsr_abt);

		break;

	case KVM_SPSR_UND:

		write_sysreg(v, spsr_und);

		break;

	case KVM_SPSR_IRQ:

		write_sysreg(v, spsr_irq);

		break;

	case KVM_SPSR_FIQ:

		write_sysreg(v, spsr_fiq);

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE