Refactor sevstep kernel patch into repository

1 files changed, 17 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 5f394db..3388608 100755
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,31 @@
-KERNEL_SOURCE ?= /usr/src/linux
+LINUX ?= /usr/src/linux
 PWD := $(shell pwd)
 
-all: build test/eviction test/access test/kvm test/sev test/sev-es
+all: build test/eviction test/access test/kvm test/sev test/sev-es test/sevstep
 
 clean:
-	$(MAKE) -C $(KERNEL_SOURCE) SUBDIRS=arch/x86/kvm clean
+	$(MAKE) -C $(LINUX) SUBDIRS=arch/x86/kvm clean
 
-$(KERNEL_SOURCE)/arch/x86/kvm/svm/cachepc:
-	ln -sf $(PWD)/kmod $@
+$(LINUX)/arch/x86/kvm/svm/cachepc:
+	ln -sf $(PWD)/cachepc $@
 
-build:
-	$(MAKE) -C $(KERNEL_SOURCE) -j6 M=arch/x86/kvm
+$(LINUX)/arch/x86/kvm/sevstep:
+	ln -sf $(PWD)/sevstep $@
+
+build: $(LINUX)/arch/x86/kvm/svm/cachepc $(LINUX)/arch/x86/kvm/sevstep
+	$(MAKE) -C $(LINUX) -j6 M=arch/x86/kvm
 
 load:
 	sudo rmmod kvm_amd || true
 	sudo rmmod kvm || true
-	sudo insmod $(KERNEL_SOURCE)/arch/x86/kvm/kvm.ko
-	sudo insmod $(KERNEL_SOURCE)/arch/x86/kvm/kvm-amd.ko
+	sudo insmod $(LINUX)/arch/x86/kvm/kvm.ko
+	sudo insmod $(LINUX)/arch/x86/kvm/kvm-amd.ko
+
+test/%: test/%.c cachepc/cachepc_user.h
+	clang -o $@ $< -fsanitize=address -I . -Wunused-variable
 
-test/%: test/%.c kmod/cachepc_user.h
-#	$(CC) -o $@ $< -I kmod
-	clang -fsanitize=address -o $@ $< -I kmod -Wunused-variable
 
-update: 
-	git -C $(KERNEL_SOURCE) diff 0aaa1e599bee256b3b15643bbb95e80ce7aa9be5 -G. > patch.diff
+update:
+	git -C $(LINUX) diff 0aaa1e599bee256b3b15643bbb95e80ce7aa9be5 -G. > patch.diff
 
 .PHONY: all clean build load update