Commit f853ed90 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:
 "More bugfixes, including a few remaining "make W=1" issues such as too
  large frame sizes on some configurations.

  On the ARM side, the compiler was messing up shadow stacks between EL1
  and EL2 code, which is easily fixed with __always_inline"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: check descriptor table exits on instruction emulation
  kvm: x86: Limit the number of "kvm: disabled by bios" messages
  KVM: x86: avoid useless copy of cpufreq policy
  KVM: allow disabling -Werror
  KVM: x86: allow compiling as non-module with W=1
  KVM: Pre-allocate 1 cpumask variable per cpu for both pv tlb and pv ipis
  KVM: Introduce pv check helpers
  KVM: let declaration of kvm_get_running_vcpus match implementation
  KVM: SVM: allocate AVIC data structures based on kvm_amd module parameter
  arm64: Ask the compiler to __always_inline functions used by KVM at HYP
  KVM: arm64: Define our own swab32() to avoid a uapi static inline
  KVM: arm64: Ask the compiler to __always_inline functions used at HYP
  kvm: arm/arm64: Fold VHE entry/exit work into kvm_vcpu_run_vhe()
  KVM: arm/arm64: Fix up includes for trace.h
parents fb279f4e 86f7e90c

arch/arm/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -392,9 +392,6 @@ static inline void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) {} 
static inline void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) {}

static inline void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) {}



static inline void kvm_arm_vhe_guest_enter(void) {}

static inline void kvm_arm_vhe_guest_exit(void) {}



#define KVM_BP_HARDEN_UNKNOWN		-1

#define KVM_BP_HARDEN_WA_NEEDED		0

#define KVM_BP_HARDEN_NOT_REQUIRED	1

arch/arm64/include/asm/arch_gicv3.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline void gic_write_eoir(u32 irq) 
	isb();

}



static inline void gic_write_dir(u32 irq)

static __always_inline void gic_write_dir(u32 irq)

{

	write_sysreg_s(irq, SYS_ICC_DIR_EL1);

	isb();

arch/arm64/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static inline int icache_is_aliasing(void) 
	return test_bit(ICACHEF_ALIASING, &__icache_flags);

}



static inline int icache_is_vpipt(void)

static __always_inline int icache_is_vpipt(void)

{

	return test_bit(ICACHEF_VPIPT, &__icache_flags);

}

arch/arm64/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, 
#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1

extern void flush_dcache_page(struct page *);



static inline void __flush_icache_all(void)

static __always_inline void __flush_icache_all(void)

{

	if (cpus_have_const_cap(ARM64_HAS_CACHE_DIC))

		return;

arch/arm64/include/asm/cpufeature.h

+5 −5
Original line number Diff line number Diff line
@@ -435,13 +435,13 @@ cpuid_feature_extract_signed_field(u64 features, int field) 
	return cpuid_feature_extract_signed_field_width(features, field, 4);

}



static inline unsigned int __attribute_const__

static __always_inline unsigned int __attribute_const__

cpuid_feature_extract_unsigned_field_width(u64 features, int field, int width)

{

	return (u64)(features << (64 - width - field)) >> (64 - width);

}



static inline unsigned int __attribute_const__

static __always_inline unsigned int __attribute_const__

cpuid_feature_extract_unsigned_field(u64 features, int field)

{

	return cpuid_feature_extract_unsigned_field_width(features, field, 4);
@@ -564,7 +564,7 @@ static inline bool system_supports_mixed_endian(void) 
	return val == 0x1;

}



static inline bool system_supports_fpsimd(void)

static __always_inline bool system_supports_fpsimd(void)

{

	return !cpus_have_const_cap(ARM64_HAS_NO_FPSIMD);

}
@@ -575,13 +575,13 @@ static inline bool system_uses_ttbr0_pan(void) 
		!cpus_have_const_cap(ARM64_HAS_PAN);

}



static inline bool system_supports_sve(void)

static __always_inline bool system_supports_sve(void)

{

	return IS_ENABLED(CONFIG_ARM64_SVE) &&

		cpus_have_const_cap(ARM64_SVE);

}



static inline bool system_supports_cnp(void)

static __always_inline bool system_supports_cnp(void)

{

	return IS_ENABLED(CONFIG_ARM64_CNP) &&

		cpus_have_const_cap(ARM64_HAS_CNP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE