Commit 3913a2bc 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:
 "ARM:
   - Fix alignment of the new HYP sections
   - Fix GICR_TYPER access from userspace

  S390:
   - do not reset the global diag318 data for per-cpu reset
   - do not mark memory as protected too early
   - fix for destroy page ultravisor call

  x86:
   - fix for SEV debugging
   - fix incorrect return code
   - fix for 'noapic' with PIC in userspace and LAPIC in kernel
   - fix for 5-level paging"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86/mmu: Fix get_mmio_spte() on CPUs supporting 5-level PT
  KVM: x86: Fix split-irqchip vs interrupt injection window request
  KVM: x86: handle !lapic_in_kernel case in kvm_cpu_*_extint
  MAINTAINERS: Update email address for Sean Christopherson
  MAINTAINERS: add uv.c also to KVM/s390
  s390/uv: handle destroy page legacy interface
  KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace
  KVM: SVM: fix error return code in svm_create_vcpu()
  KVM: SVM: Fix offset computation bug in __sev_dbg_decrypt().
  KVM: arm64: Correctly align nVHE percpu data
  KVM: s390: remove diag318 reset code
  KVM: s390: pv: Mark mm as protected after the set secure parameters and improve cleanup
parents 95e1c7b1 9a2a0d3c

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org> 
Sarangdhar Joshi <spjoshi@codeaurora.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>

Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9646,6 +9646,7 @@ F: Documentation/virt/kvm/s390* 
F:	arch/s390/include/asm/gmap.h

F:	arch/s390/include/asm/kvm*

F:	arch/s390/include/uapi/asm/kvm*

F:	arch/s390/kernel/uv.c

F:	arch/s390/kvm/

F:	arch/s390/mm/gmap.c

F:	tools/testing/selftests/kvm/*/s390x/

arch/arm64/kvm/hyp/nvhe/hyp.lds.S

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 


SECTIONS {

	HYP_SECTION(.text)

	/*

	 * .hyp..data..percpu needs to be page aligned to maintain the same

	 * alignment for when linking into vmlinux.

	 */

	. = ALIGN(PAGE_SIZE);

	HYP_SECTION_NAME(.data..percpu) : {

		PERCPU_INPUT(L1_CACHE_BYTES)

	}

arch/arm64/kvm/vgic/vgic-mmio-v3.c

+20 −2
Original line number Diff line number Diff line
@@ -273,6 +273,23 @@ static unsigned long vgic_mmio_read_v3r_typer(struct kvm_vcpu *vcpu, 
	return extract_bytes(value, addr & 7, len);

}



static unsigned long vgic_uaccess_read_v3r_typer(struct kvm_vcpu *vcpu,

						 gpa_t addr, unsigned int len)

{

	unsigned long mpidr = kvm_vcpu_get_mpidr_aff(vcpu);

	int target_vcpu_id = vcpu->vcpu_id;

	u64 value;



	value = (u64)(mpidr & GENMASK(23, 0)) << 32;

	value |= ((target_vcpu_id & 0xffff) << 8);



	if (vgic_has_its(vcpu->kvm))

		value |= GICR_TYPER_PLPIS;



	/* reporting of the Last bit is not supported for userspace */

	return extract_bytes(value, addr & 7, len);

}



static unsigned long vgic_mmio_read_v3r_iidr(struct kvm_vcpu *vcpu,

					     gpa_t addr, unsigned int len)

{
@@ -593,8 +610,9 @@ static const struct vgic_register_region vgic_v3_rd_registers[] = { 
	REGISTER_DESC_WITH_LENGTH(GICR_IIDR,

		vgic_mmio_read_v3r_iidr, vgic_mmio_write_wi, 4,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GICR_TYPER,

		vgic_mmio_read_v3r_typer, vgic_mmio_write_wi, 8,

	REGISTER_DESC_WITH_LENGTH_UACCESS(GICR_TYPER,

		vgic_mmio_read_v3r_typer, vgic_mmio_write_wi,

		vgic_uaccess_read_v3r_typer, vgic_mmio_uaccess_write_wi, 8,

		VGIC_ACCESS_64bit | VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GICR_WAKER,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 4,

arch/s390/kernel/uv.c

+8 −1
Original line number Diff line number Diff line
@@ -129,8 +129,15 @@ int uv_destroy_page(unsigned long paddr) 
		.paddr = paddr

	};



	if (uv_call(0, (u64)&uvcb))

	if (uv_call(0, (u64)&uvcb)) {

		/*

		 * Older firmware uses 107/d as an indication of a non secure

		 * page. Let us emulate the newer variant (no-op).

		 */

		if (uvcb.header.rc == 0x107 && uvcb.header.rrc == 0xd)

			return 0;

		return -EINVAL;

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE