diff options
| author | Louis Burda <quent.burda@gmail.com> | 2022-10-05 15:33:22 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2022-10-05 15:33:32 +0200 |
| commit | da76c11f2059a8696a3df41844d49f82e6988843 (patch) | |
| tree | 908ee65da099e713b6986434472485f57d6a00ea /patch.diff | |
| parent | 58d8565f015f9e06e1e51a0fe4654b966b2c27c0 (diff) | |
| download | cachepc-da76c11f2059a8696a3df41844d49f82e6988843.tar.gz cachepc-da76c11f2059a8696a3df41844d49f82e6988843.zip | |
Fix uapi types and expose KVM_TRACK enum
Diffstat (limited to 'patch.diff')
| -rwxr-xr-x | patch.diff | 35 |
1 files changed, 16 insertions, 19 deletions
@@ -1,39 +1,34 @@ diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h -index eb186bc57f6a..cefc1589e398 100644 +index eb186bc57f6a..3f767a27045e 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h -@@ -2,8 +2,14 @@ +@@ -2,10 +2,9 @@ #ifndef _ASM_X86_KVM_PAGE_TRACK_H #define _ASM_X86_KVM_PAGE_TRACK_H +-enum kvm_page_track_mode { +- KVM_PAGE_TRACK_WRITE, +- KVM_PAGE_TRACK_MAX, +-}; +#include<linux/srcu.h> + - enum kvm_page_track_mode { - KVM_PAGE_TRACK_WRITE, -+ KVM_PAGE_TRACK_ACCESS, -+ KVM_PAGE_TRACK_RESET_ACCESSED, //TODO: hacky, as this is not really for page tracking -+ KVM_PAGE_TRACK_EXEC, -+ KVM_PAGE_TRACK_RESET_EXEC, - KVM_PAGE_TRACK_MAX, - }; ++#include "../../kvm/sevstep/uapi.h" + /* + * The notifier represented by @kvm_page_track_notifier_node is linked into diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile -index 30f244b64523..7992f8cce838 100644 +index 30f244b64523..ddfd48fbd8ca 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile -@@ -1,8 +1,10 @@ +@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -I $(srctree)/arch/x86/kvm +ccflags-y += -I $(srctree)/arch/x86/kvm -O2 ccflags-$(CONFIG_KVM_WERROR) += -Werror -+KBUILD_EXTRA_SYMBOLS := ../../../drivers/crypto/ccp/Module.symvers -+ ifeq ($(CONFIG_FRAME_POINTER),y) - OBJECT_FILES_NON_STANDARD_vmenter.o := y - endif -@@ -11,8 +13,9 @@ include $(srctree)/virt/kvm/Makefile.kvm +@@ -11,8 +11,9 @@ include $(srctree)/virt/kvm/Makefile.kvm kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \ @@ -45,7 +40,7 @@ index 30f244b64523..7992f8cce838 100644 ifdef CONFIG_HYPERV kvm-y += kvm_onhyperv.o -@@ -25,7 +28,8 @@ kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ +@@ -25,7 +26,8 @@ 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-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o @@ -400,7 +395,9 @@ index d9adf79124f9..1809b79cb6cd 100644 #include "trace.h" diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c -index e089fbf9017f..7899e1efe852 100644 +old mode 100644 +new mode 100755 +index e089fbf9017f..7899e1efe852 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -87,7 +87,7 @@ static void *sev_init_ex_buffer; |