Commit bb9b4dbe authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-fixes-for-v4.16-2' of... 

Merge tag 'kvm-arm-fixes-for-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

kvm/arm fixes for 4.16, take 2

- Peace of mind locking fix in vgic_mmio_read_pending
- Allow hw-mapped interrupts to be reset when the VM resets
- Fix GICv2 multi-source SGI injection
- Fix MMIO synchronization for GICv2 on v3 emulation
- Remove excess verbosity on the console
parents e2c15aff 27e91ad1

arch/arm64/kvm/guest.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -363,8 +363,6 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
{

{

	int ret = 0;

	int ret = 0;





	vcpu_load(vcpu);



	trace_kvm_set_guest_debug(vcpu, dbg->control);

	trace_kvm_set_guest_debug(vcpu, dbg->control);





	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK) {

	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK) {
@@ -386,7 +384,6 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
	}

	}





out:

out:

	vcpu_put(vcpu);

	return ret;

	return ret;

}

}

include/kvm/arm_vgic.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -360,6 +360,7 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu); 
bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);

bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);

void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid);





void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg);

void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg);

include/linux/irqchip/arm-gic-v3.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -503,6 +503,7 @@ 




#define ICH_HCR_EN			(1 << 0)

#define ICH_HCR_EN			(1 << 0)

#define ICH_HCR_UIE			(1 << 1)

#define ICH_HCR_UIE			(1 << 1)

#define ICH_HCR_NPIE			(1 << 3)

#define ICH_HCR_TC			(1 << 10)

#define ICH_HCR_TC			(1 << 10)

#define ICH_HCR_TALL0			(1 << 11)

#define ICH_HCR_TALL0			(1 << 11)

#define ICH_HCR_TALL1			(1 << 12)

#define ICH_HCR_TALL1			(1 << 12)

include/linux/irqchip/arm-gic.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ 




#define GICH_HCR_EN			(1 << 0)

#define GICH_HCR_EN			(1 << 0)

#define GICH_HCR_UIE			(1 << 1)

#define GICH_HCR_UIE			(1 << 1)

#define GICH_HCR_NPIE			(1 << 3)





#define GICH_LR_VIRTUALID		(0x3ff << 0)

#define GICH_LR_VIRTUALID		(0x3ff << 0)

#define GICH_LR_PHYSID_CPUID_SHIFT	(10)

#define GICH_LR_PHYSID_CPUID_SHIFT	(10)

virt/kvm/arm/arch_timer.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -581,6 +581,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) 




int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)

{

{

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);
@@ -594,6 +595,9 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu) 
	ptimer->cnt_ctl = 0;

	ptimer->cnt_ctl = 0;

	kvm_timer_update_state(vcpu);

	kvm_timer_update_state(vcpu);





	if (timer->enabled && irqchip_in_kernel(vcpu->kvm))

		kvm_vgic_reset_mapped_irq(vcpu, vtimer->irq.irq);



	return 0;

	return 0;

}

}
@@ -767,7 +771,7 @@ int kvm_timer_hyp_init(bool has_gic) 
		static_branch_enable(&has_gic_active_state);

		static_branch_enable(&has_gic_active_state);

	}

	}





	kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);

	kvm_debug("virtual timer IRQ%d\n", host_vtimer_irq);





	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,

	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,

			  "kvm/arm/timer:starting", kvm_timer_starting_cpu,

			  "kvm/arm/timer:starting", kvm_timer_starting_cpu,

CRA Git | Maintained and supported by SUSTech CRA and CCSE