1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index b804444e16d4..1f7d3b15cf4a 100644
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -20,7 +20,8 @@ kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \
kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \
vmx/evmcs.o vmx/nested.o vmx/posted_intr.o
-kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o
+kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o \
+ svm/cachepc/cachepc.o svm/cachepc/util.o
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..12c5ff2447a0 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -2,6 +2,8 @@
#include <linux/kvm_host.h>
+#include "cachepc/cachepc.h"
+
#include "irq.h"
#include "mmu.h"
#include "kvm_cache_regs.h"
@@ -3728,6 +3730,16 @@ void __svm_vcpu_run(unsigned long vmcb_pa, unsigned long *regs);
static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu,
struct vcpu_svm *svm)
{
+ static struct cache_ctx *ctx = NULL;
+ static struct cacheline *cache_ds = NULL;
+ static struct cacheline *curr_head = NULL;
+ static struct cacheline *next_head = NULL;
+ static int run_index = 0;
+
+ if (!ctx) ctx = cachepc_get_ctx(L1);
+ if (!cache_ds) cache_ds = cachepc_prepare_ds(ctx);
+ if (!curr_head) curr_head = cache_ds;
+
/*
* VMENTER enables interrupts (host state), but the kernel state is
* interrupts disabled when this is invoked. Also tell RCU about
@@ -3751,7 +3763,13 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu,
if (sev_es_guest(svm->vcpu.kvm)) {
__svm_sev_es_vcpu_run(svm->vmcb_pa);
} else {
+ curr_head = cachepc_prime(curr_head);
__svm_vcpu_run(svm->vmcb_pa, (unsigned long *)&svm->vcpu.arch.regs);
+ next_head = cachepc_probe(curr_head);
+ //cachepc_save_msrmts(curr_head, "/tmp/msrmt", run_index);
+ cachepc_print_msrmts(curr_head);
+ curr_head = next_head;
+ run_index += 1;
#ifdef CONFIG_X86_64
native_wrmsrl(MSR_GS_BASE, svm->host.gs_base);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 7f2e2a09ebbd..762eb35f19e5 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -35,6 +35,10 @@
#include <asm/kvm_host.h>
+extern struct proc_dir_entry *cachepc_msrmts_file;
+extern uint8_t cachepc_msrmts[1 << 20];
+extern uint64_t cachepc_msrmts_count;
+
#ifndef KVM_MAX_VCPU_ID
#define KVM_MAX_VCPU_ID KVM_MAX_VCPUS
#endif
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 2541a17ff1c4..5f001419362b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -51,6 +51,7 @@
#include <linux/io.h>
#include <linux/lockdep.h>
#include <linux/kthread.h>
+#include <linux/proc_fs.h>
#include <asm/processor.h>
#include <asm/ioctl.h>
@@ -143,6 +144,10 @@ static void hardware_disable_all(void);
static void kvm_io_bus_destroy(struct kvm_io_bus *bus);
+struct proc_dir_entry *cachepc_msrmts_file;
+uint8_t cachepc_msrmts[1 << 20];
+uint64_t cachepc_msrmts_count;
+
__visible bool kvm_rebooting;
EXPORT_SYMBOL_GPL(kvm_rebooting);
@@ -4765,10 +4770,29 @@ static void check_processor_compat(void *data)
*c->ret = kvm_arch_check_processor_compat(c->opaque);
}
+ssize_t
+kvm_cachepc_read(struct file *file, char *buf, size_t buflen, loff_t *off)
+{
+ size_t len;
+
+ printk(KERN_INFO "Reading cachepc proc file\n");
+
+ if (*off >= cachepc_msrmts_count)
+ return 0;
+
+ len = cachepc_msrmts_count - *off;
+ if (len > buflen) len = buflen;
+
+ memcpy(buf, cachepc_msrmts + *off, len);
+
+ return len;
+}
+
int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
struct module *module)
{
struct kvm_cpu_compat_check c;
+ struct proc_ops proc_ops;
int r;
int cpu;
@@ -4848,6 +4872,15 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
r = kvm_vfio_ops_init();
WARN_ON(r);
+ cachepc_msrmts_count = 0;
+
+ memset(&proc_ops, 0, sizeof(proc_ops));
+ proc_ops.proc_read = kvm_cachepc_read;
+
+ cachepc_msrmts_file = proc_create("cachepc", 0644, NULL, &proc_ops);
+ BUG_ON(cachepc_msrmts_file == NULL);
+
+
return 0;
out_unreg:
@@ -4872,6 +4905,7 @@ EXPORT_SYMBOL_GPL(kvm_init);
void kvm_exit(void)
{
+ remove_proc_entry("cachepc", cachepc_msrmts_file);
debugfs_remove_recursive(kvm_debugfs_dir);
misc_deregister(&kvm_dev);
kmem_cache_destroy(kvm_vcpu_cache);
|
