github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 00:07:16 +00:00
Code Issues Projects Releases Wiki Activity

kernel: upgrade guest kernel support to 5.19.2

Browse Source 
kernel: Upgrade guest kernel support to 5.19.2

Let's update to the latest 5.19.x released kernel.

CONFIG modifications necessary:
fragments/common/dax.conf - CONFIG_DEV_PAGEMAP_OPS no longer configurable:
https://www.kernelconfig.io/CONFIG_DEV_PAGEMAP_OPS?q=CONFIG_DEV_PAGEMAP_OPS&kernelversion=5.19.2
fragments/common/dax.conf - CONFIG_ND_BLK no longer supported:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f8669f1d6a86a6b17104ceca9340ded280307ac1
fragments/x86_64/base.conf - CONFIG_SPECULATION_MITIGATIONS is a dependency for CONFIG_RETPOLINE:
https://www.kernelconfig.io/config_retpoline?q=&kernelversion=5.19.2
fragments/s390/network.conf - removed from kernel since 5.9.9:
https://www.kernelconfig.io/CONFIG_PACK_STACK?q=CONFIG_PACK_STACK&kernelversion=5.19.2

Updated vmlinux path in build-kernel.sh for arch s390

Fixes #4860

Signed-Off-By: Ryan Savino <ryan.savino@amd.com>
This commit is contained in:
Ryan Savino 2022-08-10 13:31:41 -05:00 committed by Snir Sheriber
parent 565fdf8263
commit d92ada72de
6 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snap/snapcraft.yaml
View File

@ -206,7 +206,7 @@ parts:
# Install raw kernel # Install raw kernel
vmlinux_path="vmlinux" vmlinux_path="vmlinux"
[ "${arch}" = "s390x" ] && vmlinux_path="arch/s390/boot/compressed/vmlinux" [ "${arch}" = "s390x" ] && vmlinux_path="arch/s390/boot/vmlinux"
vmlinux_name="vmlinux-${kernel_suffix}" vmlinux_name="vmlinux-${kernel_suffix}"
cp "${vmlinux_path}" "${kata_kernel_dir}/${vmlinux_name}" cp "${vmlinux_path}" "${kata_kernel_dir}/${vmlinux_name}"
ln -sf "${vmlinux_name}" "${kata_kernel_dir}/vmlinux.container" ln -sf "${vmlinux_name}" "${kata_kernel_dir}/vmlinux.container"

2
tools/packaging/kernel/build-kernel.sh
View File

@ -471,7 +471,7 @@ install_kata() {
if [ "${arch_target}" = "arm64" ]; then if [ "${arch_target}" = "arm64" ]; then
install --mode 0644 -D "arch/${arch_target}/boot/Image" "${install_path}/${vmlinux}" install --mode 0644 -D "arch/${arch_target}/boot/Image" "${install_path}/${vmlinux}"
elif [ "${arch_target}" = "s390" ]; then elif [ "${arch_target}" = "s390" ]; then
install --mode 0644 -D "arch/${arch_target}/boot/compressed/vmlinux" "${install_path}/${vmlinux}" install --mode 0644 -D "arch/${arch_target}/boot/vmlinux" "${install_path}/${vmlinux}"
else else
install --mode 0644 -D "vmlinux" "${install_path}/${vmlinux}" install --mode 0644 -D "vmlinux" "${install_path}/${vmlinux}"
fi fi

2
tools/packaging/kernel/configs/fragments/common/dax.conf
View File

@ -12,7 +12,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y
# Without these the pmem_should_map_pages() call in the kernel fails with new # Without these the pmem_should_map_pages() call in the kernel fails with new
# Related to the ARCH_HAS_HMM set in the arch files. # Related to the ARCH_HAS_HMM set in the arch files.
CONFIG_ZONE_DEVICE=y CONFIG_ZONE_DEVICE=y
CONFIG_DEV_PAGEMAP_OPS=y
CONFIG_ND_PFN=y CONFIG_ND_PFN=y
CONFIG_NVDIMM_PFN=y CONFIG_NVDIMM_PFN=y
@ -23,7 +22,6 @@ CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_PMEM=y CONFIG_BLK_DEV_PMEM=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_LIBNVDIMM=y CONFIG_LIBNVDIMM=y
CONFIG_ND_BLK=y
CONFIG_BTT=y CONFIG_BTT=y
# FIXME: Should check if this is really needed # FIXME: Should check if this is really needed
# https://github.com/kata-containers/packaging/issues/483 # https://github.com/kata-containers/packaging/issues/483

2
tools/packaging/kernel/configs/fragments/s390/network.conf
View File

@ -1,2 +0,0 @@
# Options needed by HAVE_EBPF_JIT
CONFIG_PACK_STACK=y

0
tools/packaging/kernel/patches/5.19.x/no_patches.txt Normal file
View File

2
versions.yaml
View File

@ -153,7 +153,7 @@ assets:
kernel: kernel:
description: "Linux kernel optimised for virtual machines" description: "Linux kernel optimised for virtual machines"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
version: "v5.15.63" version: "v5.19.2"
tdx: tdx:
description: "Linux kernel that supports TDX" description: "Linux kernel that supports TDX"
url: "https://github.com/intel/tdx/archive/refs/tags" url: "https://github.com/intel/tdx/archive/refs/tags"