Commit 921d2597 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 updates from Paolo Bonzini:
 "s390:
   - implement diag318

  x86:
   - Report last CPU for debugging
   - Emulate smaller MAXPHYADDR in the guest than in the host
   - .noinstr and tracing fixes from Thomas
   - nested SVM page table switching optimization and fixes

  Generic:
   - Unify shadow MMU cache data structures across architectures"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (127 commits)
  KVM: SVM: Fix sev_pin_memory() error handling
  KVM: LAPIC: Set the TDCR settable bits
  KVM: x86: Specify max TDP level via kvm_configure_mmu()
  KVM: x86/mmu: Rename max_page_level to max_huge_page_level
  KVM: x86: Dynamically calculate TDP level from max level and MAXPHYADDR
  KVM: VXM: Remove temporary WARN on expected vs. actual EPTP level mismatch
  KVM: x86: Pull the PGD's level from the MMU instead of recalculating it
  KVM: VMX: Make vmx_load_mmu_pgd() static
  KVM: x86/mmu: Add separate helper for shadow NPT root page role calc
  KVM: VMX: Drop a duplicate declaration of construct_eptp()
  KVM: nSVM: Correctly set the shadow NPT root level in its MMU role
  KVM: Using macros instead of magic values
  MIPS: KVM: Fix build error caused by 'kvm_run' cleanup
  KVM: nSVM: remove nonsensical EXITINFO1 adjustment on nested NPF
  KVM: x86: Add a capability for GUEST_MAXPHYADDR < HOST_MAXPHYADDR support
  KVM: VMX: optimize #PF injection when MAXPHYADDR does not match
  KVM: VMX: Add guest physical address check in EPT violation and misconfig
  KVM: VMX: introduce vmx_need_pf_intercept
  KVM: x86: update exception bitmap on CPUID changes
  KVM: x86: rename update_bp_intercept to update_exception_bitmap
  ...
parents 7b4ea945 f3633c26

Documentation/admin-guide/kernel-parameters.txt

+8 −2
Original line number Diff line number Diff line
@@ -5804,8 +5804,9 @@ 
			panic() code such as dumping handler.



	xen_nopvspin	[X86,XEN]

			Disables the ticketlock slowpath using Xen PV

			optimizations.

			Disables the qspinlock slowpath using Xen PV optimizations.

			This parameter is obsoleted by "nopvspin" parameter, which

			has equivalent effect for XEN platform.



	xen_nopv	[X86]

			Disables the PV optimizations forcing the HVM guest to
@@ -5831,6 +5832,11 @@ 
			as generic guest with no PV drivers. Currently support

			XEN HVM, KVM, HYPER_V and VMWARE guest.



	nopvspin	[X86,XEN,KVM]

			Disables the qspinlock slow path using PV optimizations

			which allow the hypervisor to 'idle' the guest on lock

			contention.



	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

Documentation/virt/kvm/api.rst

+5 −0
Original line number Diff line number Diff line
@@ -669,6 +669,10 @@ MSRs that have been set successfully. 
Defines the vcpu responses to the cpuid instruction.  Applications

should use the KVM_SET_CPUID2 ioctl if available.



Note, when this IOCTL fails, KVM gives no guarantees that previous valid CPUID

configuration (if there is) is not corrupted. Userspace can get a copy of the

resulting CPUID configuration through KVM_GET_CPUID2 in case.



::



  struct kvm_cpuid_entry {
@@ -4795,6 +4799,7 @@ hardware_exit_reason. 
		/* KVM_EXIT_FAIL_ENTRY */

		struct {

			__u64 hardware_entry_failure_reason;

			__u32 cpu; /* if KVM_LAST_CPU */

		} fail_entry;



If exit_reason is KVM_EXIT_FAIL_ENTRY, the vcpu could not be run due

arch/arm64/include/asm/kvm_coproc.h

+6 −6
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ struct kvm_sys_reg_target_table { 
void kvm_register_target_sys_reg_table(unsigned int target,

				       struct kvm_sys_reg_target_table *table);



int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu);



#define kvm_coproc_table_init kvm_sys_reg_table_init

void kvm_sys_reg_table_init(void);

arch/arm64/include/asm/kvm_host.h

+4 −18
Original line number Diff line number Diff line
@@ -97,17 +97,6 @@ struct kvm_arch { 
	bool return_nisv_io_abort_to_user;

};



#define KVM_NR_MEM_OBJS     40



/*

 * We don't want allocation failures within the mmu code, so we preallocate

 * enough memory for a single page fault in a cache.

 */

struct kvm_mmu_memory_cache {

	int nobjs;

	void *objects[KVM_NR_MEM_OBJS];

};



struct kvm_vcpu_fault_info {

	u32 esr_el2;		/* Hyp Syndrom Register */

	u64 far_el2;		/* Hyp Fault Address Register */
@@ -486,18 +475,15 @@ u64 __kvm_call_hyp(void *hypfn, ...); 
void force_vm_exit(const cpumask_t *mask);

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run,

		       int exception_index);

int handle_exit(struct kvm_vcpu *vcpu, int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);



/* MMIO helpers */

void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);

int kvm_handle_mmio_return(struct kvm_vcpu *vcpu);

int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa);



int kvm_perf_init(void);

int kvm_perf_teardown(void);

arch/arm64/include/asm/kvm_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm); 
int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,

			  phys_addr_t pa, unsigned long size, bool writable);



int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_guest_abort(struct kvm_vcpu *vcpu);



void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE