diff options
Diffstat (limited to 'patch.diff')
| -rwxr-xr-x | patch.diff | 76 |
1 files changed, 31 insertions, 45 deletions
@@ -32,7 +32,7 @@ index b804444e16d4..17167ccfca22 100644 obj-$(CONFIG_KVM) += kvm.o obj-$(CONFIG_KVM_INTEL) += kvm-intel.o diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c -index 7b3cfbe8f7e3..71697d08e9e4 100644 +index 7b3cfbe8f7e3..16dfd9b2938e 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2,6 +2,8 @@ @@ -44,31 +44,29 @@ index 7b3cfbe8f7e3..71697d08e9e4 100644 #include "irq.h" #include "mmu.h" #include "kvm_cache_regs.h" -@@ -3785,8 +3787,18 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, +@@ -3785,8 +3787,13 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) { - struct vcpu_svm *svm = to_svm(vcpu); -+ static struct cache_ctx *ctx = NULL; -+ static struct cacheline *ds = NULL; -+ static struct cacheline *head = NULL; -+ static int run_index = 0; ++ struct cacheline *head; + struct vcpu_svm *svm; ++ int cpu; + + printk(KERN_WARNING "CachePC: svm_cpu_enter_exit()\n"); -+ -+ if (!ctx) ctx = cachepc_get_ctx(L1); -+ if (!ds) ds = cachepc_prepare_ds(ctx); + svm = to_svm(vcpu); svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX]; svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP]; svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP]; -@@ -3835,8 +3847,14 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) +@@ -3835,8 +3842,19 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) */ x86_spec_ctrl_set_guest(svm->spec_ctrl, svm->virt_spec_ctrl); -+ head = cachepc_prime(ds); ++ cpu = get_cpu(); ++ WARN_ON(cpu != 2); ++ ++ head = cachepc_prime(cachepc_ds); + svm_vcpu_enter_exit(vcpu, svm); @@ -76,20 +74,13 @@ index 7b3cfbe8f7e3..71697d08e9e4 100644 + //cachepc_print_msrmts(head); + cachepc_save_msrmts(head); + ++ put_cpu(); ++ /* * We do not use IBRS in the kernel. If this vCPU has used the * SPEC_CTRL MSR it may have left it on; save the value and -@@ -3912,6 +3930,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) - if (is_guest_mode(vcpu)) - return EXIT_FASTPATH_NONE; - -+ run_index += 1; -+ - return svm_exit_handlers_fastpath(vcpu); - } - diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 2541a17ff1c4..a84a99f4b182 100644 +index 2541a17ff1c4..8c46d509bd13 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -51,6 +51,9 @@ @@ -130,7 +121,7 @@ index 2541a17ff1c4..a84a99f4b182 100644 __visible bool kvm_rebooting; EXPORT_SYMBOL_GPL(kvm_rebooting); -@@ -4765,12 +4782,245 @@ static void check_processor_compat(void *data) +@@ -4765,12 +4782,240 @@ static void check_processor_compat(void *data) *c->ret = kvm_arch_check_processor_compat(c->opaque); } @@ -189,10 +180,15 @@ index 2541a17ff1c4..a84a99f4b182 100644 + uint32_t *user; + + /* l2 prefetches, hit or miss */ -+ cachepc_init_pmc(0, 0x60, 0x01); ++ // cachepc_init_pmc(0, 0x60, 0x01); ++ ++ /* l2 data cache, hit or miss */ ++ cachepc_init_pmc(0, 0x64, 0xD8); + + user = p; + ++ WARN_ON(user && *user >= L1_SETS); ++ if (user && *user >= L1_SETS) return; + ptr = cachepc_prepare_victim(cachepc_ctx, user ? *user : 48); + + cachepc_mfence(); @@ -210,16 +206,6 @@ index 2541a17ff1c4..a84a99f4b182 100644 + + pre = cachepc_read_pmc(0); + -+ //cachepc_mfence(); -+ //cachepc_cpuid(); -+ -+ //pre += cachepc_read_pmc(1); -+ -+ //cachepc_mfence(); -+ //cachepc_cpuid(); -+ -+ //pre += cachepc_read_pmc(2); -+ + cachepc_mfence(); + cachepc_cpuid(); + @@ -235,16 +221,6 @@ index 2541a17ff1c4..a84a99f4b182 100644 + + post = cachepc_read_pmc(0); + -+ //cachepc_mfence(); -+ //cachepc_cpuid(); -+ -+ //post += cachepc_read_pmc(1); -+ -+ //cachepc_mfence(); -+ //cachepc_cpuid(); -+ -+ //post += cachepc_read_pmc(2); -+ + cachepc_mfence(); + cachepc_cpuid(); + @@ -267,7 +243,10 @@ index 2541a17ff1c4..a84a99f4b182 100644 + /* l2 data cache, hit or miss */ + cachepc_init_pmc(0, 0x64, 0xD8); + ++ WARN_ON(user && *user >= L1_SETS); ++ if (user && *user >= L1_SETS) return; + ptr = cachepc_prepare_victim(cachepc_ctx, user ? *user : 48); ++ + head = cachepc_prime(cachepc_ds); + cachepc_victim(ptr); + cachepc_probe(head); @@ -281,6 +260,7 @@ index 2541a17ff1c4..a84a99f4b182 100644 +void +kvm_cachepc_init(void *p) +{ ++ cacheline *cl, *head; + int cpu; + + local_irq_disable(); @@ -292,6 +272,12 @@ index 2541a17ff1c4..a84a99f4b182 100644 + cachepc_ctx = cachepc_get_ctx(L1); + cachepc_ds = cachepc_prepare_ds(cachepc_ctx); + ++ head = cl = cachepc_ds; ++ do { ++ cl = cl->next; ++ printk(KERN_WARNING "%i:%i\n", cl->cache_set, cl->cache_line); ++ } while (cl != head); ++ + kvm_cachepc_single_access_test(p); + kvm_cachepc_single_eviction_test(p); + @@ -378,7 +364,7 @@ index 2541a17ff1c4..a84a99f4b182 100644 r = kvm_arch_init(opaque); if (r) -@@ -4848,6 +5098,21 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -4848,6 +5093,21 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, r = kvm_vfio_ops_init(); WARN_ON(r); @@ -400,7 +386,7 @@ index 2541a17ff1c4..a84a99f4b182 100644 return 0; out_unreg: -@@ -4872,6 +5137,12 @@ EXPORT_SYMBOL_GPL(kvm_init); +@@ -4872,6 +5132,12 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { |