commit 0c0a898d2a5221561907c416757f6240b292e9c3
parent 9f603b90b8de3028791f8e487a3981ac8843c436
Author: Louis Burda <quent.burda@gmail.com>
Date: Mon, 30 Jan 2023 13:58:54 +0100
Add track config to TRACK_MODE ioctl and combine TRACK_STEPS_* modes
Diffstat:
11 files changed, 68 insertions(+), 575 deletions(-)
diff --git a/cachepc/cachepc.h b/cachepc/cachepc.h
@@ -44,14 +44,11 @@ struct cpc_track_pages {
};
struct cpc_track_steps {
- bool exec_avail;
- bool exec_gfn;
-};
-
-struct cpc_track_steps_signalled {
- bool enabled;
- bool target_avail;
- uint64_t target_gfn;
+ bool with_data;
+ bool use_target;
+ bool target_gfn;
+ bool stepping;
+ bool use_filter;
};
static_assert(sizeof(struct cpc_cl) == L1_LINESIZE, "Bad cacheline struct");
diff --git a/cachepc/event.c b/cachepc/event.c
@@ -133,7 +133,7 @@ cpc_send_track_step_event(struct list_head *list)
count = 0;
event.type = CPC_EVENT_TRACK_STEP;
list_for_each_entry(fault, list, list) {
- if (count >= 16)
+ if (count >= 8)
break;
event.step.fault_gfns[count] = fault->gfn;
event.step.fault_errs[count] = fault->err;
diff --git a/cachepc/kvm.c b/cachepc/kvm.c
@@ -74,12 +74,10 @@ EXPORT_SYMBOL(cpc_track_end_gfn);
LIST_HEAD(cpc_faults);
EXPORT_SYMBOL(cpc_faults);
-struct cpc_track_pages cpc_track_pages;
struct cpc_track_steps cpc_track_steps;
-struct cpc_track_steps_signalled cpc_track_steps_signalled;
-EXPORT_SYMBOL(cpc_track_pages);
+struct cpc_track_pages cpc_track_pages;
EXPORT_SYMBOL(cpc_track_steps);
-EXPORT_SYMBOL(cpc_track_steps_signalled);
+EXPORT_SYMBOL(cpc_track_pages);
struct cpc_cl *cpc_ds_ul = NULL;
struct cpc_cl *cpc_ds = NULL;
@@ -453,11 +451,11 @@ int
cpc_track_mode_ioctl(void __user *arg_user)
{
struct kvm_vcpu *vcpu;
- uint32_t mode;
+ struct cpc_track_cfg cfg;
if (!arg_user) return -EINVAL;
- if (copy_from_user(&mode, arg_user, sizeof(mode)))
+ if (copy_from_user(&cfg, arg_user, sizeof(cfg)))
return -EFAULT;
if (!main_vm || xa_empty(&main_vm->vcpu_array))
@@ -476,7 +474,7 @@ cpc_track_mode_ioctl(void __user *arg_user)
cpc_singlestep_reset = false;
cpc_long_step = false;
- switch (mode) {
+ switch (cfg.mode) {
case CPC_TRACK_FAULT_NO_RUN:
cpc_prime_probe = true;
cpc_track_all(vcpu, KVM_PAGE_TRACK_ACCESS);
@@ -490,16 +488,25 @@ cpc_track_mode_ioctl(void __user *arg_user)
cpc_track_all(vcpu, KVM_PAGE_TRACK_EXEC);
break;
case CPC_TRACK_STEPS:
- memset(&cpc_track_steps, 0, sizeof(cpc_track_steps));
- break;
- case CPC_TRACK_STEPS_AND_FAULTS:
- cpc_prime_probe = true;
- cpc_track_all(vcpu, KVM_PAGE_TRACK_ACCESS);
- cpc_singlestep_reset = true;
- break;
- case CPC_TRACK_STEPS_SIGNALLED:
- memset(&cpc_track_steps_signalled, 0,
- sizeof(cpc_track_steps_signalled));
+ cpc_track_steps.use_target = cfg.steps.use_target;
+ cpc_track_steps.target_gfn = cfg.steps.target_gfn;
+ cpc_track_steps.with_data = cfg.steps.with_data;
+ cpc_track_steps.use_filter = cfg.steps.use_filter;
+ if (!cpc_track_steps.use_target
+ && cpc_track_steps.with_data) {
+ cpc_track_all(vcpu, KVM_PAGE_TRACK_ACCESS);
+ cpc_prime_probe = true;
+ cpc_singlestep_reset = true;
+ cpc_track_steps.stepping = true;
+ } else if (!cpc_track_steps.use_target
+ && !cpc_track_steps.with_data) {
+ cpc_track_all(vcpu, KVM_PAGE_TRACK_EXEC);
+ cpc_singlestep_reset = true;
+ cpc_track_steps.stepping = true;
+ } else {
+ cpc_track_all(vcpu, KVM_PAGE_TRACK_EXEC);
+ cpc_track_steps.stepping = false;
+ }
break;
case CPC_TRACK_NONE:
break;
@@ -507,7 +514,7 @@ cpc_track_mode_ioctl(void __user *arg_user)
return -EINVAL;
}
- cpc_track_mode = mode;
+ cpc_track_mode = cfg.mode;
return 0;
}
diff --git a/cachepc/uapi.h b/cachepc/uapi.h
@@ -56,22 +56,27 @@ enum {
CPC_TRACK_EXIT_EVICTIONS,
CPC_TRACK_PAGES,
CPC_TRACK_STEPS,
- CPC_TRACK_STEPS_AND_FAULTS,
- CPC_TRACK_STEPS_SIGNALLED,
};
enum {
SEV_CPC_GET_RIP
};
-struct cpc_track_config {
- __u64 gfn;
+struct cpc_track_cfg {
__s32 mode;
+ union {
+ struct {
+ __u64 target_gfn;
+ __u8 use_target;
+ __u8 use_filter;
+ __u8 with_data;
+ } steps;
+ };
};
struct cpc_track_step_event {
- __u64 fault_gfns[16];
- __u32 fault_errs[16];
+ __u64 fault_gfns[8];
+ __u32 fault_errs[8];
__u64 fault_count;
__u64 inst_gfn;
__u64 retinst;
diff --git a/test/kvm-eviction.c b/test/kvm-eviction.c
@@ -42,7 +42,7 @@ main(int argc, const char **argv)
struct guest guests[2];
uint8_t counts[2][SAMPLE_COUNT][L1_SETS];
uint8_t baseline[L1_SETS];
- uint32_t arg;
+ struct cpc_track_cfg cfg;
int i, k, ret;
vmtype = "kvm";
@@ -70,8 +70,9 @@ main(int argc, const char **argv)
ret = ioctl(kvm_dev, KVM_CPC_RESET);
if (ret == -1) err(1, "KVM_CPC_RESET");
- arg = CPC_TRACK_EXIT_EVICTIONS;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.mode = CPC_TRACK_EXIT_EVICTIONS;
+ ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &cfg);
if (ret == -1) err(1, "KVM_CPC_TRACK_MODE");
/* resolve page faults in advance (code only covers 1 page)..
diff --git a/test/kvm-pagestep.c b/test/kvm-pagestep.c
@@ -47,8 +47,8 @@ main(int argc, const char **argv)
struct ipc *ipc;
struct guest guest;
struct kvm kvm;
+ struct cpc_track_cfg cfg;
uint64_t eventcnt;
- uint32_t arg;
int ret;
vmtype = "kvm";
@@ -100,8 +100,9 @@ main(int argc, const char **argv)
printf("Monitor start\n");
- arg = CPC_TRACK_PAGES;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.mode = CPC_TRACK_PAGES;
+ ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &cfg);
if (ret) err(1, "KVM_CPC_TRACK_MODE");
ipc_signal_child(ipc);
diff --git a/test/kvm-step.c b/test/kvm-step.c
@@ -63,6 +63,7 @@ main(int argc, const char **argv)
struct guest guest;
struct kvm kvm;
uint8_t baseline[L1_SETS];
+ struct cpc_track_cfg cfg;
uint64_t eventcnt;
uint32_t arg;
int ret;
@@ -119,9 +120,10 @@ main(int argc, const char **argv)
printf("Monitor start\n");
- /* single step and log all accessed pages */
- arg = CPC_TRACK_STEPS_AND_FAULTS;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.mode = CPC_TRACK_STEPS;
+ cfg.steps.with_data = true;
+ ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &cfg);
if (ret) err(1, "KVM_CPC_TRACK_MODE");
arg = true;
diff --git a/test/qemu-aes.c b/test/qemu-aes.c
@@ -1,527 +0,0 @@
-#define _GNU_SOURCE
-
-#include "cachepc/uapi.h"
-
-#include <linux/psp-sev.h>
-#include <linux/kvm.h>
-#include <sys/syscall.h>
-#include <sys/ioctl.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-#include <assert.h>
-#include <errno.h>
-#include <err.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#define ARRLEN(x) (sizeof(x) / sizeof((x)[0]))
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-
-#define SAMPLE_COUNT 100
-
-#define TARGET_CORE 2
-#define SECONDARY_CORE 3
-
-#define TARGET_CACHE_LINESIZE 64
-#define TARGET_SET 15
-
-struct kvm {
- int vmfd, vcpufd;
- void *mem;
- size_t memsize;
- struct kvm_run *run;
-};
-
-/* start and end for guest assembly */
-extern uint8_t __start_guest_with[];
-extern uint8_t __stop_guest_with[];
-
-/* ioctl dev fds */
-static int kvm_dev, sev_dev, kvm_dev;
-static int faultcnt;
-
-enum {
- GSTATE_UNINIT,
- GSTATE_LUPDATE,
- GSTATE_LSECRET,
- GSTATE_RUNNING,
- GSTATE_SUPDATE,
- GSTATE_RUPDATE,
- GSTATE_SENT
-};
-
-const char *sev_fwerr_strs[] = {
- "Success",
- "Platform state is invalid",
- "Guest state is invalid",
- "Platform configuration is invalid",
- "Buffer too small",
- "Platform is already owned",
- "Certificate is invalid",
- "Policy is not allowed",
- "Guest is not active",
- "Invalid address",
- "Bad signature",
- "Bad measurement",
- "Asid is already owned",
- "Invalid ASID",
- "WBINVD is required",
- "DF_FLUSH is required",
- "Guest handle is invalid",
- "Invalid command",
- "Guest is active",
- "Hardware error",
- "Hardware unsafe",
- "Feature not supported",
- "Invalid parameter",
- "Out of resources",
- "Integrity checks failed"
-};
-
-const char *sev_gstate_strs[] = {
- "UNINIT",
- "LUPDATE",
- "LSECRET",
- "RUNNING",
- "SUPDATE",
- "RUPDATE",
- "SEND"
-};
-
-void
-hexdump(void *data, int len)
-{
- int i;
-
- for (i = 0; i < len; i++) {
- if (i % 16 == 0 && i)
- printf("\n");
- printf("%02X ", *(uint8_t *)(data + i));
- }
- printf("\n");
-}
-
-__attribute__((section("guest_with"))) void
-vm_guest_with(void)
-{
- asm volatile("hlt");
- while (1) {
- asm volatile("mov (%[v]), %%bl"
- : : [v] "r" (TARGET_CACHE_LINESIZE * TARGET_SET));
- }
-}
-
-bool
-pin_process(pid_t pid, int cpu, bool assert)
-{
- cpu_set_t cpuset;
- int ret;
-
- CPU_ZERO(&cpuset);
- CPU_SET(cpu, &cpuset);
- ret = sched_setaffinity(pid, sizeof(cpu_set_t), &cpuset);
- if (ret < 0) {
- if (assert) err(1, "sched_setaffinity");
- return false;
- }
-
- return true;
-}
-
-int
-read_stat_core(pid_t pid)
-{
- char path[256];
- char line[2048];
- FILE *file;
- char *p;
- int i, cpu;
-
- snprintf(path, sizeof(path), "/proc/%u/stat", pid);
- file = fopen(path, "r");
- if (!file) return -1;
-
- if (!fgets(line, sizeof(line), file))
- err(1, "read stat");
-
- p = line;
- for (i = 0; i < 38 && (p = strchr(p, ' ')); i++)
- p += 1;
-
- if (!p) errx(1, "stat format");
- cpu = atoi(p);
-
- fclose(file);
-
- return cpu;
-}
-
-const char *
-sev_fwerr_str(int code)
-{
- if (code < 0 || code >= ARRLEN(sev_fwerr_strs))
- return "Unknown error";
-
- return sev_fwerr_strs[code];
-}
-
-const char *
-sev_gstate_str(int code)
-{
- if (code < 0 || code >= ARRLEN(sev_gstate_strs))
- return "Unknown gstate";
-
- return sev_gstate_strs[code];
-}
-
-int
-sev_ioctl(int vmfd, int cmd, void *data, int *error)
-{
- struct kvm_sev_cmd input;
- int ret;
-
- memset(&input, 0, sizeof(input));
- input.id = cmd;
- input.sev_fd = sev_dev;
- input.data = (uintptr_t) data;
-
- ret = ioctl(vmfd, KVM_MEMORY_ENCRYPT_OP, &input);
- if (error) *error = input.error;
-
- return ret;
-}
-
-uint8_t *
-sev_get_measure(int vmfd)
-{
- struct kvm_sev_launch_measure msrmt;
- int ret, fwerr;
- uint8_t *data;
-
- memset(&msrmt, 0, sizeof(msrmt));
- ret = sev_ioctl(vmfd, KVM_SEV_LAUNCH_MEASURE, &msrmt, &fwerr);
- if (ret < 0 && fwerr != SEV_RET_INVALID_LEN)
- errx(1, "LAUNCH_MEASURE: (%s) %s", strerror(errno), sev_fwerr_str(fwerr));
-
- data = malloc(msrmt.len);
- msrmt.uaddr = (uintptr_t) data;
-
- ret = sev_ioctl(vmfd, KVM_SEV_LAUNCH_MEASURE, &msrmt, &fwerr);
- if (ret < 0)
- errx(1, "LAUNCH_MEASURE: (%s) %s", strerror(errno), sev_fwerr_str(fwerr));
-
- return data;
-}
-
-uint8_t
-sev_guest_state(int vmfd, uint32_t handle)
-{
- struct kvm_sev_guest_status status;
- int ret, fwerr;
-
- status.handle = handle;
- ret = sev_ioctl(vmfd, KVM_SEV_GUEST_STATUS, &status, &fwerr);
- if (ret < 0) {
- errx(1, "KVM_SEV_GUEST_STATUS: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
- }
-
- return status.state;
-}
-
-void
-sev_dbg_encrypt(int vmfd, void *dst, void *src, size_t size)
-{
- struct kvm_sev_dbg enc;
- int ret, fwerr;
-
- enc.src_uaddr = (uintptr_t) src;
- enc.dst_uaddr = (uintptr_t) dst;
- enc.len = size;
- ret = sev_ioctl(vmfd, KVM_SEV_DBG_ENCRYPT, &enc, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_DBG_ENCRYPT: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-}
-
-void
-sev_dbg_decrypt(int vmfd, void *dst, void *src, size_t size)
-{
- struct kvm_sev_dbg enc;
- int ret, fwerr;
-
- enc.src_uaddr = (uintptr_t) src;
- enc.dst_uaddr = (uintptr_t) dst;
- enc.len = size;
- ret = sev_ioctl(vmfd, KVM_SEV_DBG_DECRYPT, &enc, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_DBG_DECRYPT: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-}
-
-void
-sev_kvm_init(struct kvm *kvm, size_t ramsize, void *code_start, void *code_stop)
-{
- // REF: https://www.amd.com/system/files/TechDocs/55766_SEV-KM_API_Specification.pdf
- struct kvm_sev_launch_update_data update;
- struct kvm_sev_launch_start start;
- struct kvm_userspace_memory_region region;
- struct kvm_regs regs;
- struct kvm_sregs sregs;
- uint8_t *msrmt;
- int ret, fwerr;
-
- /* Create a kvm instance */
- kvm->vmfd = ioctl(kvm_dev, KVM_CREATE_VM, 0);
- if (kvm->vmfd < 0) err(1, "KVM_CREATE_VM");
-
- /* Allocate guest memory */
- kvm->memsize = ramsize;
- kvm->mem = mmap(NULL, kvm->memsize, PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_ANONYMOUS, -1, 0);
- if (!kvm->mem) err(1, "Allocating guest memory");
- assert(code_stop - code_start <= kvm->memsize);
- memcpy(kvm->mem, code_start, code_stop - code_start);
-
- /* Map it into the vm */
- memset(®ion, 0, sizeof(region));
- region.slot = 0;
- region.memory_size = kvm->memsize;
- region.guest_phys_addr = 0;
- region.userspace_addr = (uintptr_t) kvm->mem;
- ret = ioctl(kvm->vmfd, KVM_SET_USER_MEMORY_REGION, ®ion);
- if (ret < 0) err(1, "KVM_SET_USER_MEMORY_REGION");
-
- /* Enable SEV for vm */
- ret = sev_ioctl(kvm->vmfd, KVM_SEV_ES_INIT, NULL, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_ES_INIT: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-
- /* Create virtual cpu */
- kvm->vcpufd = ioctl(kvm->vmfd, KVM_CREATE_VCPU, 0);
- if (kvm->vcpufd < 0) err(1, "KVM_CREATE_VCPU");
-
- /* Map the shared kvm_run structure and following data */
- ret = ioctl(kvm_dev, KVM_GET_VCPU_MMAP_SIZE, NULL);
- if (ret < 0) err(1, "KVM_GET_VCPU_MMAP_SIZE");
- if (ret < sizeof(struct kvm_run))
- errx(1, "KVM_GET_VCPU_MMAP_SIZE too small");
- kvm->run = mmap(NULL, ret, PROT_READ | PROT_WRITE,
- MAP_SHARED, kvm->vcpufd, 0);
- if (!kvm->run) err(1, "mmap vcpu");
-
- /* Initialize segment regs */
- memset(&sregs, 0, sizeof(sregs));
- ret = ioctl(kvm->vcpufd, KVM_GET_SREGS, &sregs);
- if (ret < 0) err(1, "KVM_GET_SREGS");
- sregs.cs.base = 0;
- sregs.cs.selector = 0;
- ret = ioctl(kvm->vcpufd, KVM_SET_SREGS, &sregs);
- if (ret < 0) err(1, "KVM_SET_SREGS");
-
- /* Initialize rest of registers */
- memset(®s, 0, sizeof(regs));
- regs.rip = 0;
- regs.rsp = kvm->memsize - 8;
- regs.rbp = kvm->memsize - 8;
- ret = ioctl(kvm->vcpufd, KVM_SET_REGS, ®s);
- if (ret < 0) err(1, "KVM_SET_REGS");
-
- /* Generate encryption keys and set policy */
- memset(&start, 0, sizeof(start));
- start.handle = 0;
- start.policy = 1 << 2; /* require ES */
- ret = sev_ioctl(kvm->vmfd, KVM_SEV_LAUNCH_START, &start, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_LAUNCH_START: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-
- /* Prepare the vm memory (by encrypting it) */
- memset(&update, 0, sizeof(update));
- update.uaddr = (uintptr_t) kvm->mem;
- update.len = ramsize;
- ret = sev_ioctl(kvm->vmfd, KVM_SEV_LAUNCH_UPDATE_DATA, &update, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_LAUNCH_UPDATE_DATA: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-
- /* Prepare the vm save area */
- ret = sev_ioctl(kvm->vmfd, KVM_SEV_LAUNCH_UPDATE_VMSA, NULL, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_LAUNCH_UPDATE_VMSA: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
-
- /* Collect a measurement (necessary) */
- msrmt = sev_get_measure(kvm->vmfd);
- free(msrmt);
-
- /* Finalize launch process */
- ret = sev_ioctl(kvm->vmfd, KVM_SEV_LAUNCH_FINISH, 0, &fwerr);
- if (ret < 0) errx(1, "KVM_SEV_LAUNCH_FINISH: (%s) %s",
- strerror(errno), sev_fwerr_str(fwerr));
- ret = sev_guest_state(kvm->vmfd, start.handle);
- if (ret != GSTATE_RUNNING)
- errx(1, "Bad guest state: %s", sev_gstate_str(fwerr));
-}
-
-void
-sev_kvm_deinit(struct kvm *kvm)
-{
- close(kvm->vmfd);
- close(kvm->vcpufd);
- munmap(kvm->mem, kvm->memsize);
-}
-
-uint16_t *
-read_counts()
-{
- uint16_t *counts;
- int ret;
-
- counts = malloc(64 * sizeof(uint16_t));
- if (!counts) err(1, "malloc");
- ret = ioctl(kvm_dev, KVM_CPC_READ_COUNTS, counts);
- if (ret == -1) err(1, "ioctl READ_COUNTS");
-
- return counts;
-}
-
-void
-print_counts(uint16_t *counts)
-{
- int i;
-
- for (i = 0; i < 64; i++) {
- if (i % 16 == 0 && i)
- printf("\n");
- if (counts[i] == 1)
- printf("\x1b[38;5;88m");
- else if (counts[i] > 1)
- printf("\x1b[38;5;196m");
- printf("%2i ", i);
- if (counts[i] > 0)
- printf("\x1b[0m");
- }
- printf("\n Target Set %i Count: %hu\n", TARGET_SET, counts[TARGET_SET]);
- printf("\n");
-}
-
-void
-runonce(struct kvm *kvm)
-{
- struct kvm_regs regs;
- int ret;
-
- ret = ioctl(kvm->vcpufd, KVM_RUN, NULL);
- if (ret < 0) err(1, "KVM_RUN");
- printf("VMEXIT\n");
-
- if (kvm->run->exit_reason == KVM_EXIT_MMIO) {
- memset(®s, 0, sizeof(regs));
- ret = ioctl(kvm->vcpufd, KVM_GET_REGS, ®s);
- if (ret < 0) err(1, "KVM_GET_REGS");
- errx(1, "KVM_EXTI_MMIO: Victim %s at 0x%08llx: rip=0x%08llx\n",
- kvm->run->mmio.is_write ? "write" : "read",
- kvm->run->mmio.phys_addr, regs.rip);
- } else if (kvm->run->exit_reason != KVM_EXIT_HLT) {
- errx(1, "KVM died: %i\n", kvm->run->exit_reason);
- }
-}
-
-int
-monitor(void)
-{
- struct cpc_event event;
- int ret;
-
- /* Get page fault info */
- ret = ioctl(kvm_dev, KVM_CPC_POLL_EVENT, &event);
- if (!ret) {
- printf("Got page fault! %llu retired insts\n",
- event.step.retinst);
- faultcnt++;
-
- printf("Acking event %llu\n", event.id);
- ret = ioctl(kvm_dev, KVM_CPC_ACK_EVENT, &event.id);
- if (ret == -1) err(1, "ioctl ACK_EVENT");
- } else if (errno != EAGAIN) {
- perror("ioctl POLL_EVENT");
- return 1;
- }
-
- return 0;
-}
-
-int
-main(int argc, const char **argv)
-{
- struct kvm kvm_with_access;
- uint64_t track_mode;
- pid_t ppid, pid;
- int ret;
-
- setvbuf(stdout, NULL, _IONBF, 0);
-
- pin_process(0, TARGET_CORE, true);
-
- sev_dev = open("/dev/sev", O_RDWR | O_CLOEXEC);
- if (sev_dev < 0) err(1, "open /dev/sev");
-
- kvm_dev = open("/dev/kvm", O_RDWR | O_CLOEXEC);
- if (kvm_dev < 0) err(1, "open /dev/kvm");
-
- /* Make sure we have the stable version of the API */
- ret = ioctl(kvm_dev, KVM_GET_API_VERSION, NULL);
- if (ret < 0) err(1, "KVM_GET_API_VERSION");
- if (ret != 12) errx(1, "KVM_GET_API_VERSION %d, expected 12", ret);
-
- /* Setup needed performance counters */
- ret = ioctl(kvm_dev, KVM_CPC_SETUP_PMC, NULL);
- if (ret < 0) err(1, "ioctl SETUP_PMC");
-
- sev_kvm_init(&kvm_with_access, 64 * 64 * 8 * 2,
- __start_guest_with, __stop_guest_with);
-
- /* One run to skip stack setup */
- ioctl(kvm_with_access.vcpufd, KVM_RUN, NULL);
-
- /* Page tracking init needs to happen after kvm
- * init so main_kvm is set.. */
-
- /* Reset previous tracking */
- ret = ioctl(kvm_dev, KVM_CPC_RESET_TRACKING, NULL);
- if (ret == -1) err(1, "ioctl RESET_TRACKING");
-
- /* Init page tracking */
- track_mode = KVM_PAGE_TRACK_ACCESS;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_ALL, &track_mode);
- if (ret == -1) err(1, "ioctl TRACK_ALL");
-
- ppid = getpid();
- if ((pid = fork())) {
- if (pid < 0) err(1, "fork");
- runonce(&kvm_with_access);
- } else {
- pin_process(0, SECONDARY_CORE, true);
- faultcnt = 0;
- while (faultcnt < SAMPLE_COUNT) {
- if (monitor()) break;
- }
- kill(ppid, SIGTERM);
- exit(0);
- }
-
- sev_kvm_deinit(&kvm_with_access);
-
- close(kvm_dev);
- close(sev_dev);
-}
-
diff --git a/test/qemu-eviction.c b/test/qemu-eviction.c
@@ -69,6 +69,7 @@ int
main(int argc, const char **argv)
{
uint8_t baseline[L1_SETS];
+ struct cpc_track_cfg cfg;
uint32_t eventcnt;
uint32_t arg;
int ret;
@@ -86,8 +87,10 @@ main(int argc, const char **argv)
ret = ioctl(kvm_dev, KVM_CPC_CALC_BASELINE, &arg);
if (ret) err(1, "KVM_CPC_CALC_BASELINE");
- arg = CPC_TRACK_STEPS_AND_FAULTS;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.mode = CPC_TRACK_STEPS;
+ cfg.steps.with_data = true;
+ ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &cfg);
if (ret) err(1, "KVM_CPC_RESET");
eventcnt = 0;
@@ -126,7 +129,10 @@ main(int argc, const char **argv)
print_counts_raw(baseline);
printf("\n\n");
- arg = CPC_TRACK_STEPS_SIGNALLED;
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.steps.target_gfn = 0; /* TODO */
+ cfg.steps.use_target = true;
+ cfg.mode = CPC_TRACK_STEPS;
ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
if (ret) err(1, "KVM_CPC_RESET");
diff --git a/test/qemu-pagestep b/test/qemu-pagestep
Binary files differ.
diff --git a/test/qemu-pagestep.c b/test/qemu-pagestep.c
@@ -41,7 +41,7 @@ monitor(void)
int
main(int argc, const char **argv)
{
- uint32_t arg;
+ struct cpc_track_cfg cfg;
int ret;
setvbuf(stdout, NULL, _IONBF, 0);
@@ -53,8 +53,9 @@ main(int argc, const char **argv)
ret = ioctl(kvm_dev, KVM_CPC_RESET);
if (ret) err(1, "KVM_CPC_RESET");
- arg = CPC_TRACK_PAGES;
- ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg);
+ memset(&cfg, 0, sizeof(cfg));
+ cfg.mode = CPC_TRACK_PAGES;
+ ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &cfg);
if (ret) err(1, "KVM_CPC_TRACK_MODE");
while (1) monitor();
