# git rev-parse -q --verify bc1bb2a49bae915107fd58705edb1e32db92c635^{commit} bc1bb2a49bae915107fd58705edb1e32db92c635 already have revision, skipping fetch # git checkout -q -f -B kisskb bc1bb2a49bae915107fd58705edb1e32db92c635 # git clean -qxdf # < git log -1 # commit bc1bb2a49bae915107fd58705edb1e32db92c635 # Merge: c42b59bfaa00 812b0597fb40 # Author: Linus Torvalds # Date: Tue Apr 25 10:48:08 2023 -0700 # # Merge tag 'x86_sev_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 SEV updates from Borislav Petkov: # # - Add the necessary glue so that the kernel can run as a confidential # SEV-SNP vTOM guest on Hyper-V. A vTOM guest basically splits the # address space in two parts: encrypted and unencrypted. The use case # being running unmodified guests on the Hyper-V confidential computing # hypervisor # # - Double-buffer messages between the guest and the hardware PSP device # so that no partial buffers are copied back'n'forth and thus potential # message integrity and leak attacks are possible # # - Name the return value the sev-guest driver returns when the hw PSP # device hasn't been called, explicitly # # - Cleanups # # * tag 'x86_sev_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/hyperv: Change vTOM handling to use standard coco mechanisms # init: Call mem_encrypt_init() after Hyper-V hypercall init is done # x86/mm: Handle decryption/re-encryption of bss_decrypted consistently # Drivers: hv: Explicitly request decrypted in vmap_pfn() calls # x86/hyperv: Reorder code to facilitate future work # x86/ioremap: Add hypervisor callback for private MMIO mapping in coco VM # x86/sev: Change snp_guest_issue_request()'s fw_err argument # virt/coco/sev-guest: Double-buffer messages # crypto: ccp: Get rid of __sev_platform_init_locked()'s local function pointer # crypto: ccp - Name -1 return value as SEV_RET_NO_FW_CALL # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 bc1bb2a49bae915107fd58705edb1e32db92c635 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12708:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12713:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12715:warning: override: reassigning to symbol UML_NET_SLIP .config:12720:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:252: arch/um/os-Linux/util.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: arch/um/os-Linux] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/fs/btrfs/send.c: In function 'get_cur_inode_state': /kisskb/src/fs/btrfs/send.c:1909:13: error: 'right_gen' may be used uninitialized in this function [-Werror=maybe-uninitialized] } else if (right_gen == gen) { ^ /kisskb/src/fs/btrfs/send.c: At top level: cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:252: fs/btrfs/send.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:494: fs/btrfs] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: fs] Error 2 /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:41: error: 'struct cpuinfo_um' has no member named 'apicid' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2161:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:2025: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:11:42.012985