Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fb00d32 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4.5-rc6' of... 

Merge tag 'kvm-arm-for-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM fixes for 4.5-rc6

- Fix per-vcpu vgic bitmap allocation
- Do not give copy random memory on MMIO read
- Fix GICv3 APR register restore order
parents 17e4bce0 fd451b90

arch/arm/kvm/mmio.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -206,6 +206,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	run->mmio.is_write	= is_write;

	run->mmio.is_write	= is_write;

	run->mmio.phys_addr	= fault_ipa;

	run->mmio.phys_addr	= fault_ipa;

	run->mmio.len		= len;

	run->mmio.len		= len;

	if (is_write)

		memcpy(run->mmio.data, data_buf, len);

		memcpy(run->mmio.data, data_buf, len);





	if (!ret) {

	if (!ret) {

arch/arm64/kvm/hyp/vgic-v3-sr.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -149,22 +149,22 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu) 




	switch (nr_pri_bits) {

	switch (nr_pri_bits) {

	case 7:

	case 7:

		 write_gicreg(cpu_if->vgic_ap1r[3], ICH_AP1R3_EL2);

		 write_gicreg(cpu_if->vgic_ap0r[3], ICH_AP0R3_EL2);

		 write_gicreg(cpu_if->vgic_ap1r[2], ICH_AP1R2_EL2);

		 write_gicreg(cpu_if->vgic_ap0r[2], ICH_AP0R2_EL2);

	case 6:

	case 6:

		 write_gicreg(cpu_if->vgic_ap1r[1], ICH_AP1R1_EL2);

		 write_gicreg(cpu_if->vgic_ap0r[1], ICH_AP0R1_EL2);

	default:

	default:

		 write_gicreg(cpu_if->vgic_ap1r[0], ICH_AP1R0_EL2);

		 write_gicreg(cpu_if->vgic_ap0r[0], ICH_AP0R0_EL2);

	}

	}





	switch (nr_pri_bits) {

	switch (nr_pri_bits) {

	case 7:

	case 7:

		 write_gicreg(cpu_if->vgic_ap0r[3], ICH_AP0R3_EL2);

		 write_gicreg(cpu_if->vgic_ap1r[3], ICH_AP1R3_EL2);

		 write_gicreg(cpu_if->vgic_ap0r[2], ICH_AP0R2_EL2);

		 write_gicreg(cpu_if->vgic_ap1r[2], ICH_AP1R2_EL2);

	case 6:

	case 6:

		 write_gicreg(cpu_if->vgic_ap0r[1], ICH_AP0R1_EL2);

		 write_gicreg(cpu_if->vgic_ap1r[1], ICH_AP1R1_EL2);

	default:

	default:

		 write_gicreg(cpu_if->vgic_ap0r[0], ICH_AP0R0_EL2);

		 write_gicreg(cpu_if->vgic_ap1r[0], ICH_AP1R0_EL2);

	}

	}





	switch (max_lr_idx) {

	switch (max_lr_idx) {

virt/kvm/arm/vgic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1875,8 +1875,8 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) 
static int vgic_vcpu_init_maps(struct kvm_vcpu *vcpu, int nr_irqs)

static int vgic_vcpu_init_maps(struct kvm_vcpu *vcpu, int nr_irqs)

{

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;



	int nr_longs = BITS_TO_LONGS(nr_irqs - VGIC_NR_PRIVATE_IRQS);

	int sz = (nr_irqs - VGIC_NR_PRIVATE_IRQS) / 8;

	int sz = nr_longs * sizeof(unsigned long);

	vgic_cpu->pending_shared = kzalloc(sz, GFP_KERNEL);

	vgic_cpu->pending_shared = kzalloc(sz, GFP_KERNEL);

	vgic_cpu->active_shared = kzalloc(sz, GFP_KERNEL);

	vgic_cpu->active_shared = kzalloc(sz, GFP_KERNEL);

	vgic_cpu->pend_act_shared = kzalloc(sz, GFP_KERNEL);

	vgic_cpu->pend_act_shared = kzalloc(sz, GFP_KERNEL);