From 950b89ffacffc5be21b12d6829c8759f33ea1aa3 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 18 Jul 2023 10:04:21 +0200 Subject: [PATCH 1/2] versions: Update kernel to version v6.1.38 Kernel v6.1.38 is the current latest LTS version, switch to it. No patches should be necessary. Some CONFIG options have been removed: - CONFIG_MEMCG_SWAP is covered by CONFIG_SWAP and CONFIG_MEMCG - CONFIG_ARCH_RANDOM is unconditionally compiled in - CONFIG_ARM64_CRYPTO is covered by CONFIG_CRYPTO and ARCH=arm64 Fixes: #6086 Signed-off-by: Jeremi Piotrowski --- .../kernel/configs/fragments/whitelist.conf | 3 +++ tools/packaging/kernel/kata_config_version | 2 +- tools/packaging/kernel/patches/6.1.x/no_patches.txt | 0 versions.yaml | 12 ++++++------ 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 tools/packaging/kernel/patches/6.1.x/no_patches.txt diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index a9184b149c..d6e04444f6 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -1,5 +1,7 @@ # configuration options which may dropped in newer kernels # without generating an error in fragment merging +CONFIG_ARCH_RANDOM +CONFIG_ARM64_CRYPTO CONFIG_NF_NAT_IPV4 CONFIG_NF_NAT_NEEDED CONFIG_NF_NAT_PROTO_DCCP @@ -7,6 +9,7 @@ CONFIG_NF_NAT_PROTO_GRE CONFIG_NF_NAT_PROTO_SCTP CONFIG_NF_NAT_PROTO_UDPLITE CONFIG_REFCOUNT_FULL +CONFIG_MEMCG_SWAP CONFIG_MEMCG_SWAP_ENABLED CONFIG_HAVE_NET_DSA CONFIG_NF_LOG_COMMON diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index bc6298e80a..58c9bdf9d0 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -110 +111 diff --git a/tools/packaging/kernel/patches/6.1.x/no_patches.txt b/tools/packaging/kernel/patches/6.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/versions.yaml b/versions.yaml index a1ce76f9ff..519503f5d7 100644 --- a/versions.yaml +++ b/versions.yaml @@ -168,16 +168,16 @@ assets: kernel: description: "Linux kernel optimised for virtual machines" - url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" - version: "v5.19.2" + url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" + version: "v6.1.38" sev: description: "Linux kernel that supports SEV and SNP" - url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" - version: "v5.19.2" + url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" + version: "v6.1.38" snp: description: "Linux kernel that supports AMD SEV-SNP for VMs" - url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" - version: "v5.19.2" + url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" + version: "v6.1.38" kernel-experimental: description: "Linux kernel with virtio-fs support" From c09e268a1bf7367449425e52fd824dade5751e17 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 18 Jul 2023 14:16:29 +0200 Subject: [PATCH 2/2] versions: Downgrade SEV(-SNP) kernel back to v5.19.x CC-GPU seems to have issues with v6.1, so downgrade the kernels used for SEV-SNP to a known-working version. It is worth mentioning that TDX is also still on 5.19. Signed-off-by: Jeremi Piotrowski --- versions.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.yaml b/versions.yaml index 519503f5d7..2fc4fc7ea8 100644 --- a/versions.yaml +++ b/versions.yaml @@ -172,12 +172,12 @@ assets: version: "v6.1.38" sev: description: "Linux kernel that supports SEV and SNP" - url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" - version: "v6.1.38" + url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" + version: "v5.19.2" snp: description: "Linux kernel that supports AMD SEV-SNP for VMs" - url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" - version: "v6.1.38" + url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" + version: "v5.19.2" kernel-experimental: description: "Linux kernel with virtio-fs support"