lkml.org 
[lkml]   [2021]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] x86/sev-es: Rename sev-es.{ch} to sev.{ch}
    Date
    The SEV-SNP builds upon the SEV-ES functionality while adding new hardware
    protection. Version 2 of the GHCB specification adds new NAE events that
    are SEV-SNP specific. Rename the sev-es.{ch} to sev.{ch} so that we can
    consolidate all the SEV-ES and SEV-SNP in a one place.

    Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
    ---
    arch/x86/boot/compressed/Makefile | 6 +++---
    arch/x86/boot/compressed/{sev-es.c => sev.c} | 4 ++--
    arch/x86/include/asm/{sev-es.h => sev.h} | 0
    arch/x86/kernel/Makefile | 6 +++---
    arch/x86/kernel/head64.c | 2 +-
    arch/x86/kernel/nmi.c | 2 +-
    arch/x86/kernel/{sev-es-shared.c => sev-shared.c} | 0
    arch/x86/kernel/{sev-es.c => sev.c} | 4 ++--
    arch/x86/mm/extable.c | 2 +-
    arch/x86/platform/efi/efi_64.c | 2 +-
    arch/x86/realmode/init.c | 2 +-
    11 files changed, 15 insertions(+), 15 deletions(-)
    rename arch/x86/boot/compressed/{sev-es.c => sev.c} (98%)
    rename arch/x86/include/asm/{sev-es.h => sev.h} (100%)
    rename arch/x86/kernel/{sev-es-shared.c => sev-shared.c} (100%)
    rename arch/x86/kernel/{sev-es.c => sev.c} (99%)

    diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
    index 6e5522aebbbd..2a2975236c9e 100644
    --- a/arch/x86/boot/compressed/Makefile
    +++ b/arch/x86/boot/compressed/Makefile
    @@ -48,10 +48,10 @@ KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
    KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h
    KBUILD_CFLAGS += $(CLANG_FLAGS)

    -# sev-es.c indirectly inludes inat-table.h which is generated during
    +# sev.c indirectly inludes inat-table.h which is generated during
    # compilation and stored in $(objtree). Add the directory to the includes so
    # that the compiler finds it even with out-of-tree builds (make O=/some/path).
    -CFLAGS_sev-es.o += -I$(objtree)/arch/x86/lib/
    +CFLAGS_sev.o += -I$(objtree)/arch/x86/lib/

    KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
    GCOV_PROFILE := n
    @@ -93,7 +93,7 @@ ifdef CONFIG_X86_64
    vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o
    vmlinux-objs-y += $(obj)/mem_encrypt.o
    vmlinux-objs-y += $(obj)/pgtable_64.o
    - vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev-es.o
    + vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o
    endif

    vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o
    diff --git a/arch/x86/boot/compressed/sev-es.c b/arch/x86/boot/compressed/sev.c
    similarity index 98%
    rename from arch/x86/boot/compressed/sev-es.c
    rename to arch/x86/boot/compressed/sev.c
    index 82041bd380e5..670e998fe930 100644
    --- a/arch/x86/boot/compressed/sev-es.c
    +++ b/arch/x86/boot/compressed/sev.c
    @@ -13,7 +13,7 @@
    #include "misc.h"

    #include <asm/pgtable_types.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>
    #include <asm/trapnr.h>
    #include <asm/trap_pf.h>
    #include <asm/msr-index.h>
    @@ -117,7 +117,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,
    #include "../../lib/insn.c"

    /* Include code for early handlers */
    -#include "../../kernel/sev-es-shared.c"
    +#include "../../kernel/sev-shared.c"

    static bool early_setup_sev_es(void)
    {
    diff --git a/arch/x86/include/asm/sev-es.h b/arch/x86/include/asm/sev.h
    similarity index 100%
    rename from arch/x86/include/asm/sev-es.h
    rename to arch/x86/include/asm/sev.h
    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    index 0704c2a94272..0f66682ac02a 100644
    --- a/arch/x86/kernel/Makefile
    +++ b/arch/x86/kernel/Makefile
    @@ -20,7 +20,7 @@ CFLAGS_REMOVE_kvmclock.o = -pg
    CFLAGS_REMOVE_ftrace.o = -pg
    CFLAGS_REMOVE_early_printk.o = -pg
    CFLAGS_REMOVE_head64.o = -pg
    -CFLAGS_REMOVE_sev-es.o = -pg
    +CFLAGS_REMOVE_sev.o = -pg
    endif

    KASAN_SANITIZE_head$(BITS).o := n
    @@ -28,7 +28,7 @@ KASAN_SANITIZE_dumpstack.o := n
    KASAN_SANITIZE_dumpstack_$(BITS).o := n
    KASAN_SANITIZE_stacktrace.o := n
    KASAN_SANITIZE_paravirt.o := n
    -KASAN_SANITIZE_sev-es.o := n
    +KASAN_SANITIZE_sev.o := n

    # With some compiler versions the generated code results in boot hangs, caused
    # by several compilation units. To be safe, disable all instrumentation.
    @@ -148,7 +148,7 @@ obj-$(CONFIG_UNWINDER_ORC) += unwind_orc.o
    obj-$(CONFIG_UNWINDER_FRAME_POINTER) += unwind_frame.o
    obj-$(CONFIG_UNWINDER_GUESS) += unwind_guess.o

    -obj-$(CONFIG_AMD_MEM_ENCRYPT) += sev-es.o
    +obj-$(CONFIG_AMD_MEM_ENCRYPT) += sev.o
    ###
    # 64 bit specific files
    ifeq ($(CONFIG_X86_64),y)
    diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
    index 18be44163a50..de01903c3735 100644
    --- a/arch/x86/kernel/head64.c
    +++ b/arch/x86/kernel/head64.c
    @@ -39,7 +39,7 @@
    #include <asm/realmode.h>
    #include <asm/extable.h>
    #include <asm/trapnr.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>

    /*
    * Manage page tables very early on.
    diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
    index bf250a339655..fea394cabfa9 100644
    --- a/arch/x86/kernel/nmi.c
    +++ b/arch/x86/kernel/nmi.c
    @@ -33,7 +33,7 @@
    #include <asm/reboot.h>
    #include <asm/cache.h>
    #include <asm/nospec-branch.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>

    #define CREATE_TRACE_POINTS
    #include <trace/events/nmi.h>
    diff --git a/arch/x86/kernel/sev-es-shared.c b/arch/x86/kernel/sev-shared.c
    similarity index 100%
    rename from arch/x86/kernel/sev-es-shared.c
    rename to arch/x86/kernel/sev-shared.c
    diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev.c
    similarity index 99%
    rename from arch/x86/kernel/sev-es.c
    rename to arch/x86/kernel/sev.c
    index 73873b007838..9578c82832aa 100644
    --- a/arch/x86/kernel/sev-es.c
    +++ b/arch/x86/kernel/sev.c
    @@ -22,7 +22,7 @@

    #include <asm/cpu_entry_area.h>
    #include <asm/stacktrace.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>
    #include <asm/insn-eval.h>
    #include <asm/fpu/internal.h>
    #include <asm/processor.h>
    @@ -459,7 +459,7 @@ static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt
    }

    /* Include code shared with pre-decompression boot stage */
    -#include "sev-es-shared.c"
    +#include "sev-shared.c"

    void noinstr __sev_es_nmi_complete(void)
    {
    diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
    index b93d6cd08a7f..121921b2927c 100644
    --- a/arch/x86/mm/extable.c
    +++ b/arch/x86/mm/extable.c
    @@ -5,7 +5,7 @@
    #include <xen/xen.h>

    #include <asm/fpu/internal.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>
    #include <asm/traps.h>
    #include <asm/kdebug.h>

    diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
    index df7b5477fc4f..7515e78ef898 100644
    --- a/arch/x86/platform/efi/efi_64.c
    +++ b/arch/x86/platform/efi/efi_64.c
    @@ -47,7 +47,7 @@
    #include <asm/realmode.h>
    #include <asm/time.h>
    #include <asm/pgalloc.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>

    /*
    * We allocate runtime services regions top-down, starting from -4G, i.e.
    diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
    index 1be71ef5e4c4..2e1c1bec0f9e 100644
    --- a/arch/x86/realmode/init.c
    +++ b/arch/x86/realmode/init.c
    @@ -9,7 +9,7 @@
    #include <asm/realmode.h>
    #include <asm/tlbflush.h>
    #include <asm/crash.h>
    -#include <asm/sev-es.h>
    +#include <asm/sev.h>

    struct real_mode_header *real_mode_header;
    u32 *trampoline_cr4_features;
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-04-27 13:18    [W:2.552 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site