3 files changed, 10 insertions, 120 deletions

diff --git a/sevstep/sevstep.c b/sevstep/sevstep.c
index 552b8e0..ffc6c7e 100644
--- a/sevstep/sevstep.c
+++ b/sevstep/sevstep.c
@@ -1,4 +1,5 @@
 #include "sevstep.h"
+#include "svm/cachepc/cachepc.h"
 
 #include "mmu/mmu_internal.h"
 #include "mmu.h"
@@ -43,77 +44,14 @@
 struct kvm* main_vm;
 EXPORT_SYMBOL(main_vm);
 
-static perf_ctl_config_t perf_configs[6];
-
-uint64_t
-perf_ctl_to_u64(perf_ctl_config_t * config)
-{
-	uint64_t result;
-
-	result = 0;
-	result |= config->EventSelect & 0xffULL;
-	result |= (config->UintMask & 0xffULL) << 8;
-	result |= (config->OsUserMode & 0x3ULL) << 16;
-	result |= (config->Edge & 0x1ULL) << 18;
-	result |= (config->Int & 0x1ULL) << 20;
-	result |= (config->En & 0x1ULL) << 22;
-	result |= (config->Inv & 0x1ULL) << 23;
-	result |= (config->CntMask & 0xffULL) << 24;
-	result |= ((config->EventSelect & 0xf00ULL) >> 8) << 32;
-	result |= (config->HostGuestOnly & 0x3ULL) << 40;
-
-	return result;
-
-}
-
-void
-write_ctl(perf_ctl_config_t * config, int cpu, uint64_t ctl_msr)
-{
-	wrmsrl_on_cpu(cpu, ctl_msr, perf_ctl_to_u64(config));
-}
-
-void
-read_ctr(uint64_t ctr_msr, int cpu, uint64_t* result)
-{
-	uint64_t tmp;
-
-	rdmsrl_on_cpu(cpu, ctr_msr, &tmp);
-	*result = tmp & ( (0x1ULL << 48) - 1);
-}
-
 void
 sevstep_setup_pmcs(void)
 {
-	int perf_cpu;
-	int i;
-
-	perf_cpu = smp_processor_id();
-
-	for (i = 0; i < 6; i++) {
-		perf_configs[i].HostGuestOnly = 0x1; /* count only guest */
-		perf_configs[i].CntMask = 0x0;
-		perf_configs[i].Inv = 0x0;
-		perf_configs[i].En = 0x0;
-		perf_configs[i].Int = 0x0;
-		perf_configs[i].Edge = 0x0;
-		perf_configs[i].OsUserMode = 0x3; /* count userland and kernel events */
-	}
-
-	perf_configs[0].EventSelect = 0x0c0;
-	perf_configs[0].UintMask = 0x0;
-	perf_configs[0].En = 0x1;
-	write_ctl(&perf_configs[0], perf_cpu, CTL_MSR_0);
+	/* retired instructions */
+	cachepc_init_pmc(0, 0xc0, 0x00, PMC_GUEST, PMC_KERNEL | PMC_USER);
 
-	/*
-	 * programm l2d hit from data cache miss perf for
-	 * cpu_probe_pointer_chasing_inplace without counting thread.
-	 * N.B. that this time we count host events
-	 */
-	perf_configs[1].EventSelect = 0x064;
-	perf_configs[1].UintMask = 0x70;
-	perf_configs[1].En = 0x1;
-	perf_configs[1].HostGuestOnly = 0x2; /* count only host events */
-	write_ctl(&perf_configs[1], perf_cpu, CTL_MSR_1);
+	/* l2 data cache hit & miss */
+	cachepc_init_pmc(1, 0x64, 0x70, PMC_HOST, PMC_KERNEL);
 }
 EXPORT_SYMBOL(sevstep_setup_pmcs);
 
diff --git a/sevstep/sevstep.h b/sevstep/sevstep.h
index 223dafe..e8013f9 100644
--- a/sevstep/sevstep.h
+++ b/sevstep/sevstep.h
@@ -10,33 +10,6 @@
 #include <linux/pid.h>
 #include <linux/psp-sev.h>
 
-#define CTL_MSR_0  0xc0010200ULL
-#define CTL_MSR_1  0xc0010202ULL
-#define CTL_MSR_2  0xc0010204ULL
-#define CTL_MSR_3  0xc0010206ULL
-#define CTL_MSR_4  0xc0010208ULL
-#define CTL_MSR_5  0xc001020aULL
-
-#define CTR_MSR_0  0xc0010201ULL
-#define CTR_MSR_1  0xc0010203ULL
-#define CTR_MSR_2  0xc0010205ULL
-#define CTR_MSR_3  0xc0010207ULL
-#define CTR_MSR_4  0xc0010209ULL
-#define CTR_MSR_5  0xc001020bULL
-
-typedef struct {
-	uint64_t HostGuestOnly;
-	uint64_t CntMask;
-	uint64_t Inv;
-	uint64_t En;
-	uint64_t Int;
-	uint64_t Edge;
-	uint64_t OsUserMode;
-	uint64_t UintMask;
-	uint64_t EventSelect; //12 bits in total split in [11:8] and [7:0]
-
-} perf_ctl_config_t;
-
 extern struct kvm* main_vm;
 
 bool sevstep_spte_protect(u64 *sptep,
@@ -56,10 +29,6 @@ bool sevstep_clear_nx_on_page(struct kvm_vcpu *vcpu, gfn_t gfn);
 long sevstep_start_tracking(struct kvm_vcpu *vcpu, enum kvm_page_track_mode mode);
 long sevstep_stop_tracking(struct kvm_vcpu *vcpu, enum kvm_page_track_mode mode);
 
-uint64_t perf_ctl_to_u64(perf_ctl_config_t *config);
-void write_ctl(perf_ctl_config_t *config, int cpu, uint64_t ctl_msr);
-void read_ctr(uint64_t ctr_msr, int cpu, uint64_t *result);
-
 void sevstep_setup_pmcs(void);
 
 int sevstep_get_rip_kvm_vcpu(struct kvm_vcpu *vcpu, uint64_t *rip);
diff --git a/sevstep/uspt.c b/sevstep/uspt.c
index ff011a6..3a67a10 100644
--- a/sevstep/uspt.c
+++ b/sevstep/uspt.c
@@ -1,6 +1,8 @@
 #include "uspt.h"
 #include "sevstep.h"
 
+#include "svm/cachepc/cachepc.h"
+
 #include <linux/kvm.h>
 #include <linux/timekeeping.h>
 #include <linux/uaccess.h>
@@ -211,24 +213,6 @@ uspt_handle_ack_event_ioctl(ack_event_t event)
 	return _uspt_handle_ack_event(event.id);
 }
 
-// setup perf_state and program retired instruction performance counter
-void
-_perf_state_setup_retired_instructions(void)
-{
-	perf_ctl_config_t retired_instructions_perf_config;
-	retired_instructions_perf_config.HostGuestOnly = 0x1; // 0x1 means: count only guest
-	retired_instructions_perf_config.CntMask = 0x0;
-	retired_instructions_perf_config.Inv = 0x0;
-	retired_instructions_perf_config.Int = 0x0;
-	retired_instructions_perf_config.Edge = 0x0;
-	retired_instructions_perf_config.OsUserMode = 0x3; // 0x3 means: count kern and user events
-	retired_instructions_perf_config.EventSelect = 0x0c0;
-	retired_instructions_perf_config.UintMask = 0x0;
-	retired_instructions_perf_config.En = 0x1;
-	write_ctl(&retired_instructions_perf_config, batch_track_state.perf_cpu, CTL_MSR_0);
-}
-
-
 // get retired instructions between current_event_idx-1 and current_event_idx
 // value is cached for multiple calls to the same current_event_idx
 uint64_t
@@ -239,9 +223,8 @@ _perf_state_update_and_get_delta(uint64_t current_event_idx)
 	/* check if value is "cached" */
 	if (perf_state.delta_valid_idx == current_event_idx) {
 		if (current_event_idx == 0) {
-			read_ctr(CTR_MSR_0, batch_track_state.perf_cpu, &current_value);
 			perf_state.idx_for_last_perf_reading = current_event_idx;
-			perf_state.last_perf_reading = current_value;
+			perf_state.last_perf_reading = cachepc_read_pmc(0);
 		}
 		return perf_state.delta;
 	}
@@ -253,7 +236,7 @@ _perf_state_update_and_get_delta(uint64_t current_event_idx)
 			perf_state.idx_for_last_perf_reading, current_event_idx);
 	}
 
-	read_ctr(CTR_MSR_0, batch_track_state.perf_cpu, &current_value);
+	current_value = cachepc_read_pmc(0);
 	perf_state.delta = (current_value - perf_state.last_perf_reading);
 	perf_state.delta_valid_idx = current_event_idx;
 
@@ -310,7 +293,7 @@ uspt_batch_tracking_start(int tracking_type,uint64_t expected_events,
 	perf_state.last_perf_reading = 0;
 	perf_state.delta_valid_idx = 0;
 	perf_state.delta = 0;
-	_perf_state_setup_retired_instructions();
+	cachepc_init_pmc(0, 0xc0, 0x00, PMC_GUEST, PMC_KERNEL | PMC_USER);
 
 	spin_lock(&batch_track_state_lock);