| Message ID | eaa3f31541aaa09064e710e532af2ce7cf60eaa5.1611634586.git.kai.huang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM SGX virtualization support | expand |
On Tue, Jan 26, 2021 at 10:31:01PM +1300, Kai Huang wrote: > From: Sean Christopherson <sean.j.christopherson@intel.com> > > Expose SGX architectural structures, as KVM will use many of the > architectural constants and structs to virtualize SGX. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > Signed-off-by: Kai Huang <kai.huang@intel.com> Acked-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > v2->v3: > > - Added "Expose SGX architectural structures, as..." to commit message, > per Jarkko. > > --- > arch/x86/{kernel/cpu/sgx/arch.h => include/asm/sgx_arch.h} | 0 > arch/x86/kernel/cpu/sgx/encl.c | 2 +- > arch/x86/kernel/cpu/sgx/sgx.h | 2 +- > tools/testing/selftests/sgx/defines.h | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename arch/x86/{kernel/cpu/sgx/arch.h => include/asm/sgx_arch.h} (100%) > > diff --git a/arch/x86/kernel/cpu/sgx/arch.h b/arch/x86/include/asm/sgx_arch.h > similarity index 100% > rename from arch/x86/kernel/cpu/sgx/arch.h > rename to arch/x86/include/asm/sgx_arch.h > diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c > index a78b71447771..68941c349cfe 100644 > --- a/arch/x86/kernel/cpu/sgx/encl.c > +++ b/arch/x86/kernel/cpu/sgx/encl.c > @@ -7,7 +7,7 @@ > #include <linux/shmem_fs.h> > #include <linux/suspend.h> > #include <linux/sched/mm.h> > -#include "arch.h" > +#include <asm/sgx_arch.h> > #include "encl.h" > #include "encls.h" > #include "sgx.h" > diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h > index 5fa42d143feb..509f2af33e1d 100644 > --- a/arch/x86/kernel/cpu/sgx/sgx.h > +++ b/arch/x86/kernel/cpu/sgx/sgx.h > @@ -8,7 +8,7 @@ > #include <linux/rwsem.h> > #include <linux/types.h> > #include <asm/asm.h> > -#include "arch.h" > +#include <asm/sgx_arch.h> > > #undef pr_fmt > #define pr_fmt(fmt) "sgx: " fmt > diff --git a/tools/testing/selftests/sgx/defines.h b/tools/testing/selftests/sgx/defines.h > index 592c1ccf4576..4dd39a003f40 100644 > --- a/tools/testing/selftests/sgx/defines.h > +++ b/tools/testing/selftests/sgx/defines.h > @@ -14,7 +14,7 @@ > #define __aligned(x) __attribute__((__aligned__(x))) > #define __packed __attribute__((packed)) > > -#include "../../../../arch/x86/kernel/cpu/sgx/arch.h" > +#include "../../../../arch/x86/include/asm/sgx_arch.h" > #include "../../../../arch/x86/include/asm/enclu.h" > #include "../../../../arch/x86/include/uapi/asm/sgx.h" > > -- > 2.29.2 > > /Jarkko
diff --git a/arch/x86/kernel/cpu/sgx/arch.h b/arch/x86/include/asm/sgx_arch.h similarity index 100% rename from arch/x86/kernel/cpu/sgx/arch.h rename to arch/x86/include/asm/sgx_arch.h diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c index a78b71447771..68941c349cfe 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c @@ -7,7 +7,7 @@ #include <linux/shmem_fs.h> #include <linux/suspend.h> #include <linux/sched/mm.h> -#include "arch.h" +#include <asm/sgx_arch.h> #include "encl.h" #include "encls.h" #include "sgx.h" diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 5fa42d143feb..509f2af33e1d 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -8,7 +8,7 @@ #include <linux/rwsem.h> #include <linux/types.h> #include <asm/asm.h> -#include "arch.h" +#include <asm/sgx_arch.h> #undef pr_fmt #define pr_fmt(fmt) "sgx: " fmt diff --git a/tools/testing/selftests/sgx/defines.h b/tools/testing/selftests/sgx/defines.h index 592c1ccf4576..4dd39a003f40 100644 --- a/tools/testing/selftests/sgx/defines.h +++ b/tools/testing/selftests/sgx/defines.h @@ -14,7 +14,7 @@ #define __aligned(x) __attribute__((__aligned__(x))) #define __packed __attribute__((packed)) -#include "../../../../arch/x86/kernel/cpu/sgx/arch.h" +#include "../../../../arch/x86/include/asm/sgx_arch.h" #include "../../../../arch/x86/include/asm/enclu.h" #include "../../../../arch/x86/include/uapi/asm/sgx.h"