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

Commit 73056bbc 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:
 "KVM/ARM fixes:
   - Fix per-vcpu vgic bitmap allocation
   - Do not give copy random memory on MMIO read
   - Fix GICv3 APR register restore order

  KVM/x86 fixes:
   - Fix ubsan warning
   - Fix hardware breakpoints in a guest vs. preempt notifiers
   - Fix Hurd

  Generic:
   - use __GFP_NOWARN together with GFP_NOWAIT"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: MMU: fix ubsan index-out-of-range warning
  arm64: KVM: vgic-v3: Restore ICH_APR0Rn_EL2 before ICH_APR1Rn_EL2
  KVM: async_pf: do not warn on page allocation failures
  KVM: x86: fix conversion of addresses to linear in 32-bit protected mode
  KVM: x86: fix missed hardware breakpoints
  arm/arm64: KVM: Feed initialized memory to MMIO accesses
  KVM: arm/arm64: vgic: Ensure bitmaps are long enough
parents 5882c169 0fb00d32

arch/arm/kvm/mmio.c

+2 −1
Original line number 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.phys_addr	= fault_ipa;

	run->mmio.len		= len;

	if (is_write)

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



	if (!ret) {

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

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


	switch (nr_pri_bits) {

	case 7:

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

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

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

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

	case 6:

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

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

	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) {

	case 7:

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

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

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

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

	case 6:

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

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

	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) {

arch/x86/kvm/emulate.c

+2 −2
Original line number Diff line number Diff line
@@ -650,10 +650,10 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, 
	u16 sel;



	la = seg_base(ctxt, addr.seg) + addr.ea;

	*linear = la;

	*max_size = 0;

	switch (mode) {

	case X86EMUL_MODE_PROT64:

		*linear = la;

		if (is_noncanonical_address(la))

			goto bad;
@@ -662,6 +662,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, 
			goto bad;

		break;

	default:

		*linear = la = (u32)la;

		usable = ctxt->ops->get_segment(ctxt, &sel, &desc, NULL,

						addr.seg);

		if (!usable)
@@ -689,7 +690,6 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, 
			if (size > *max_size)

				goto bad;

		}

		la &= (u32)-1;

		break;

	}

	if (insn_aligned(ctxt, size) && ((la & (size - 1)) != 0))

arch/x86/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, 
			return ret;



		kvm_vcpu_mark_page_dirty(vcpu, table_gfn);

		walker->ptes[level] = pte;

		walker->ptes[level - 1] = pte;

	}

	return 0;

}

arch/x86/kvm/x86.c

+1 −0
Original line number Diff line number Diff line
@@ -2752,6 +2752,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
	}



	kvm_make_request(KVM_REQ_STEAL_UPDATE, vcpu);

	vcpu->arch.switch_db_regs |= KVM_DEBUGREG_RELOAD;

}



void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)