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

Merge tag 'kvm-x86-misc-6.18' of https://github.com/kvm-x86/linux into HEAD 

KVM x86 changes for 6.18

 - Don't (re)check L1 intercepts when completing userspace I/O to fix a flaw
   where a misbehaving usersepace (a.k.a. syzkaller) could swizzle L1's
   intercepts and trigger a variety of WARNs in KVM.

 - Emulate PERF_CNTR_GLOBAL_STATUS_SET for PerfMonV2 guests, as the MSR is
   supposed to exist for v2 PMUs.

 - Allow Centaur CPU leaves (base 0xC000_0000) for Zhaoxin CPUs.

 - Clean up KVM's vector hashing code for delivering lowest priority IRQs.

 - Clean up the fastpath handler code to only handle IPIs and WRMSRs that are
   actually "fast", as opposed to handling those that KVM _hopes_ are fast, and
   in the process of doing so add fastpath support for TSC_DEADLINE writes on
   AMD CPUs.

 - Clean up a pile of PMU code in anticipation of adding support for mediated
   vPMUs.

 - Add support for the immediate forms of RDMSR and WRMSRNS, sans full
   emulator support (KVM should never need to emulate the MSRs outside of
   forced emulation and other contrived testing scenarios).

 - Clean up the MSR APIs in preparation for CET and FRED virtualization, as
   well as mediated vPMU support.

 - Rejecting a fully in-kernel IRQCHIP if EOIs are protected, i.e. for TDX VMs,
   as KVM can't faithfully emulate an I/O APIC for such guests.

 - KVM_REQ_MSR_FILTER_CHANGED into a generic RECALC_INTERCEPTS in preparation
   for mediated vPMU support, as KVM will need to recalculate MSR intercepts in
   response to PMU refreshes for guests with mediated vPMUs.

 - Misc cleanups and minor fixes.
parents 10ef74c0 86bcd23d

Documentation/virt/kvm/api.rst

+6 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,12 @@ This IOCTL replaces the obsolete KVM_GET_PIT. 
Sets the state of the in-kernel PIT model. Only valid after KVM_CREATE_PIT2.

See KVM_GET_PIT2 for details on struct kvm_pit_state2.



.. Tip::

  ``KVM_SET_PIT2`` strictly adheres to the spec of Intel 8254 PIT.  For example,

  a ``count`` value of 0 in ``struct kvm_pit_channel_state`` is interpreted as

  65536, which is the maximum count value. Refer to `Intel 8254 programmable

  interval timer <https://www.scs.stanford.edu/10wi-cs140/pintos/specs/8254.pdf>`_.



This IOCTL replaces the obsolete KVM_SET_PIT.

Documentation/virt/kvm/x86/hypercalls.rst

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ compute the CLOCK_REALTIME for its clock, at the same instant. 
Returns KVM_EOPNOTSUPP if the host does not use TSC clocksource,

or if clock type is different than KVM_CLOCK_PAIRING_WALLCLOCK.



6. KVM_HC_SEND_IPI

7. KVM_HC_SEND_IPI

------------------



:Architecture: x86
@@ -158,7 +158,7 @@ corresponds to the APIC ID a2+1, and so on. 


Returns the number of CPUs to which the IPIs were delivered successfully.



7. KVM_HC_SCHED_YIELD

8. KVM_HC_SCHED_YIELD

---------------------



:Architecture: x86
@@ -170,7 +170,7 @@ a0: destination APIC ID 
:Usage example: When sending a call-function IPI-many to vCPUs, yield if

	        any of the IPI target vCPUs was preempted.



8. KVM_HC_MAP_GPA_RANGE

9. KVM_HC_MAP_GPA_RANGE

-------------------------

:Architecture: x86

:Status: active

arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ 
#define X86_FEATURE_TSA_L1_NO		(21*32+12) /* AMD CPU not vulnerable to TSA-L1 */

#define X86_FEATURE_CLEAR_CPU_BUF_VM	(21*32+13) /* Clear CPU buffers using VERW before VMRUN */

#define X86_FEATURE_IBPB_EXIT_TO_USER	(21*32+14) /* Use IBPB on exit-to-userspace, see VMSCAPE bug */

#define X86_FEATURE_MSR_IMM		(21*32+15) /* MSR immediate form instructions */



/*

 * BUG word(s)

arch/x86/include/asm/kvm-x86-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ KVM_X86_OP(check_emulate_instruction) 
KVM_X86_OP(apic_init_signal_blocked)

KVM_X86_OP_OPTIONAL(enable_l2_tlb_flush)

KVM_X86_OP_OPTIONAL(migrate_timers)

KVM_X86_OP(recalc_msr_intercepts)

KVM_X86_OP(recalc_intercepts)

KVM_X86_OP(complete_emulated_msr)

KVM_X86_OP(vcpu_deliver_sipi_vector)

KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons);

arch/x86/include/asm/kvm_host.h

+20 −11
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
#define KVM_REQ_TLB_FLUSH_GUEST \

	KVM_ARCH_REQ_FLAGS(27, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_APF_READY		KVM_ARCH_REQ(28)

#define KVM_REQ_MSR_FILTER_CHANGED	KVM_ARCH_REQ(29)

#define KVM_REQ_RECALC_INTERCEPTS	KVM_ARCH_REQ(29)

#define KVM_REQ_UPDATE_CPU_DIRTY_LOGGING \

	KVM_ARCH_REQ_FLAGS(30, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_MMU_FREE_OBSOLETE_ROOTS \
@@ -545,10 +545,10 @@ struct kvm_pmc { 
#define KVM_MAX_NR_GP_COUNTERS		KVM_MAX(KVM_MAX_NR_INTEL_GP_COUNTERS, \

						KVM_MAX_NR_AMD_GP_COUNTERS)



#define KVM_MAX_NR_INTEL_FIXED_COUTNERS	3

#define KVM_MAX_NR_AMD_FIXED_COUTNERS	0

#define KVM_MAX_NR_FIXED_COUNTERS	KVM_MAX(KVM_MAX_NR_INTEL_FIXED_COUTNERS, \

						KVM_MAX_NR_AMD_FIXED_COUTNERS)

#define KVM_MAX_NR_INTEL_FIXED_COUNTERS	3

#define KVM_MAX_NR_AMD_FIXED_COUNTERS	0

#define KVM_MAX_NR_FIXED_COUNTERS	KVM_MAX(KVM_MAX_NR_INTEL_FIXED_COUNTERS, \

						KVM_MAX_NR_AMD_FIXED_COUNTERS)



struct kvm_pmu {

	u8 version;
@@ -579,6 +579,9 @@ struct kvm_pmu { 
	DECLARE_BITMAP(all_valid_pmc_idx, X86_PMC_IDX_MAX);

	DECLARE_BITMAP(pmc_in_use, X86_PMC_IDX_MAX);



	DECLARE_BITMAP(pmc_counting_instructions, X86_PMC_IDX_MAX);

	DECLARE_BITMAP(pmc_counting_branches, X86_PMC_IDX_MAX);



	u64 ds_area;

	u64 pebs_enable;

	u64 pebs_enable_rsvd;
@@ -771,6 +774,7 @@ enum kvm_only_cpuid_leafs { 
	CPUID_7_2_EDX,

	CPUID_24_0_EBX,

	CPUID_8000_0021_ECX,

	CPUID_7_1_ECX,

	NR_KVM_CPU_CAPS,



	NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS,
@@ -926,6 +930,7 @@ struct kvm_vcpu_arch { 
	bool emulate_regs_need_sync_from_vcpu;

	int (*complete_userspace_io)(struct kvm_vcpu *vcpu);

	unsigned long cui_linear_rip;

	int cui_rdmsr_imm_reg;



	gpa_t time;

	s8  pvclock_tsc_shift;
@@ -1381,6 +1386,7 @@ struct kvm_arch { 
	u8 vm_type;

	bool has_private_mem;

	bool has_protected_state;

	bool has_protected_eoi;

	bool pre_fault_allowed;

	struct hlist_head *mmu_page_hash;

	struct list_head active_mmu_pages;
@@ -1921,7 +1927,7 @@ struct kvm_x86_ops { 
	int (*enable_l2_tlb_flush)(struct kvm_vcpu *vcpu);



	void (*migrate_timers)(struct kvm_vcpu *vcpu);

	void (*recalc_msr_intercepts)(struct kvm_vcpu *vcpu);

	void (*recalc_intercepts)(struct kvm_vcpu *vcpu);

	int (*complete_emulated_msr)(struct kvm_vcpu *vcpu, int err);



	void (*vcpu_deliver_sipi_vector)(struct kvm_vcpu *vcpu, u8 vector);
@@ -2162,13 +2168,16 @@ void kvm_prepare_event_vectoring_exit(struct kvm_vcpu *vcpu, gpa_t gpa); 


void kvm_enable_efer_bits(u64);

bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer);

int kvm_get_msr_with_filter(struct kvm_vcpu *vcpu, u32 index, u64 *data);

int kvm_set_msr_with_filter(struct kvm_vcpu *vcpu, u32 index, u64 data);

int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data, bool host_initiated);

int kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data);

int kvm_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data);

int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data);

int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data);

int __kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data);

int __kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data);

int kvm_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data);

int kvm_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data);

int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu);

int kvm_emulate_rdmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg);

int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu);

int kvm_emulate_wrmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg);

int kvm_emulate_as_nop(struct kvm_vcpu *vcpu);

int kvm_emulate_invd(struct kvm_vcpu *vcpu);

int kvm_emulate_mwait(struct kvm_vcpu *vcpu);