KVM/ARM Changes for v4.6-rc1

Second round of patches for v4.6-rc1, fixing a small handful of issue:
  - disable preemption when calling smp_call_function_many
  - Make kvm_ksym_ref work on VHE systems again after KASRL breakage
  - Disable compiler instrumentation for hypervisor code that could make
    KVM/arm64 blow up.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJW8PwIAAoJEEtpOizt6ddyEFMH/RBhWA2M/+1Na6W75+283gqy
 zqBnPQcQQJ5PmD2Pm9G/+3Q7B47xuKhiEJ8bOcwh7zgBtF5SeZmrdO3YMB5r8RuL
 lj5O6q3nzEyTpy9Cl2TPK5EU+RRB8crpaQQ98o7w7mBZdsPB8SnzKsfizURxWMfy
 oqHuazktRFPf3Aa3nbBaEv8BvR0HRHErokl8BLVWEkomwqBzoJHTCCfeT7sVdc3X
 zfhLHG9q9BX5H97aJTzkVTxvPdCMei8Noko3BipaF8JLbsG5e3ssL0GlAkwwhXQn
 c0qB/lIqSaJU8N307RYfpeeGBgqIIn6IO4TpfJMqQs8Rvr7NxmgcTOmz33+OHAE=
 =whOa
 -----END PGP SIGNATURE-----

Merge tag 'kvm-arm-for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/ARM Changes for v4.6-rc1

Second round of patches for v4.6-rc1, fixing a small handful of issue:
 - disable preemption when calling smp_call_function_many
 - Make kvm_ksym_ref work on VHE systems again after KASRL breakage
 - Disable compiler instrumentation for hypervisor code that could make
   KVM/arm64 blow up.
This commit is contained in:
Paolo Bonzini 2016-03-22 09:37:02 +01:00
commit a471721828
3 changed files with 13 additions and 1 deletions

View File

@ -373,7 +373,9 @@ static void exit_vm_noop(void *info)
void force_vm_exit(const cpumask_t *mask)
{
preempt_disable();
smp_call_function_many(mask, exit_vm_noop, NULL, true);
preempt_enable();
}
/**

View File

@ -26,7 +26,13 @@
#define KVM_ARM64_DEBUG_DIRTY_SHIFT 0
#define KVM_ARM64_DEBUG_DIRTY (1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)
#define kvm_ksym_ref(sym) phys_to_virt((u64)&sym - kimage_voffset)
#define kvm_ksym_ref(sym) \
({ \
void *val = &sym; \
if (!is_kernel_in_hyp_mode()) \
val = phys_to_virt((u64)&sym - kimage_voffset); \
val; \
})
#ifndef __ASSEMBLY__
struct kvm;

View File

@ -16,3 +16,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += fpsimd.o
obj-$(CONFIG_KVM_ARM_HOST) += tlb.o
obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o
GCOV_PROFILE := n
KASAN_SANITIZE := n
UBSAN_SANITIZE := n