github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 18:04:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6778 from fidencio/topic/cache-gpu-related-kernels

Browse Source 
cache: Update the KERNEL_FLAVOUR list to include nvidia-gpu
This commit is contained in:
Fabiano Fidêncio
2023-05-11 13:14:45 +02:00
committed by GitHub
parent edfaae85cb c9bf7808b6
commit 14939d00ad
4 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-kata-static-tarball-amd64.yaml vendored
View File

@@ -22,9 +22,9 @@ jobs:
- kernel-sev - kernel-sev
- kernel-dragonball-experimental - kernel-dragonball-experimental
- kernel-tdx-experimental - kernel-tdx-experimental
- kernel-gpu - kernel-nvidia-gpu
- kernel-gpu-snp - kernel-nvidia-gpu-snp
- kernel-gpu-tdx-experimental - kernel-nvidia-gpu-tdx-experimental
- nydus - nydus
- ovmf - ovmf
- ovmf-sev - ovmf-sev

12
tools/packaging/kata-deploy/local-build/Makefile
View File

@@ -24,9 +24,9 @@ all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
all: serial-targets \ all: serial-targets \
firecracker-tarball \ firecracker-tarball \
kernel-dragonball-experimental-tarball \ kernel-dragonball-experimental-tarball \
kernel-gpu \ kernel-nvidia-gpu \
kernel-gpu-snp-tarball \ kernel-nvidia-gpu-snp-tarball \
kernel-gpu-tdx-experimental-tarball \ kernel-nvidia-gpu-tdx-experimental-tarball \
kernel-tarball \ kernel-tarball \
kernel-tdx-experimental-tarball \ kernel-tdx-experimental-tarball \
nydus-tarball \ nydus-tarball \
@@ -61,13 +61,13 @@ kernel-dragonball-experimental-tarball:
kernel-experimental-tarball: kernel-experimental-tarball:
${MAKE} $@-build ${MAKE} $@-build
kernel-gpu-tarball: kernel-nvidia-gpu-tarball:
${MAKE} $@-build ${MAKE} $@-build
kernel-gpu-snp-tarball: kernel-nvidia-gpu-snp-tarball:
${MAKE} $@-build ${MAKE} $@-build
kernel-gpu-tdx-experimental-tarball: kernel-nvidia-gpu-tdx-experimental-tarball:
${MAKE} $@-build ${MAKE} $@-build
kernel-tarball: kernel-tarball:

24
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -81,9 +81,9 @@ options:
kernel kernel
kernel-dragonball-experimental kernel-dragonball-experimental
kernel-experimental kernel-experimental
kernel-gpu kernel-nvidia-gpu
kernel-gpu-snp kernel-nvidia-gpu-snp
kernel-gpu-tdx-experimental kernel-nvidia-gpu-tdx-experimental
kernel-sev-tarball kernel-sev-tarball
kernel-tdx-experimental kernel-tdx-experimental
nydus nydus
@@ -262,32 +262,32 @@ install_kernel_dragonball_experimental() {
} }
#Install GPU enabled kernel asset #Install GPU enabled kernel asset
install_kernel_gpu() { install_kernel_nvidia_gpu() {
local kernel_url="$(get_from_kata_deps assets.kernel.url)" local kernel_url="$(get_from_kata_deps assets.kernel.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel.version" \ "assets.kernel.version" \
"kernel-gpu" \ "kernel-nvidia-gpu" \
"-g nvidia -u ${kernel_url} -H deb" "-g nvidia -u ${kernel_url} -H deb"
} }
#Install GPU and SNP enabled kernel asset #Install GPU and SNP enabled kernel asset
install_kernel_gpu_snp() { install_kernel_nvidia_gpu_snp() {
local kernel_url="$(get_from_kata_deps assets.kernel.snp.url)" local kernel_url="$(get_from_kata_deps assets.kernel.snp.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel.snp.version" \ "assets.kernel.snp.version" \
"kernel-gpu-snp" \ "kernel-nvidia-gpu-snp" \
"-x snp -g nvidia -u ${kernel_url} -H deb" "-x snp -g nvidia -u ${kernel_url} -H deb"
} }
#Install GPU and TDX experimental enabled kernel asset #Install GPU and TDX experimental enabled kernel asset
install_kernel_gpu_tdx_experimental() { install_kernel_nvidia_gpu_tdx_experimental() {
local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)" local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel-tdx-experimental.version" \ "assets.kernel-tdx-experimental.version" \
"kernel-gpu-tdx" \ "kernel-nvidia-gpu-tdx" \
"-x tdx -g nvidia -u ${kernel_url} -H deb" "-x tdx -g nvidia -u ${kernel_url} -H deb"
} }
@@ -553,11 +553,11 @@ handle_build() {
kernel-experimental) install_kernel_experimental ;; kernel-experimental) install_kernel_experimental ;;
kernel-gpu) install_kernel_gpu ;; kernel-nvidia-gpu) install_kernel_nvidia_gpu ;;
kernel-gpu-snp) install_kernel_gpu_snp;; kernel-nvidia-gpu-snp) install_kernel_nvidia_gpu_snp;;
kernel-gpu-tdx-experimental) install_kernel_gpu_tdx_experimental;; kernel-nvidia-gpu-tdx-experimental) install_kernel_nvidia_gpu_tdx_experimental;;
kernel-tdx-experimental) install_kernel_tdx_experimental ;; kernel-tdx-experimental) install_kernel_tdx_experimental ;;

17
tools/packaging/static-build/cache_components_main.sh
View File

@@ -12,7 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../scripts/lib.sh" source "${script_dir}/../scripts/lib.sh"
KERNEL_FLAVOUR="${KERNEL_FLAVOUR:-kernel}" # kernel | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental KERNEL_FLAVOUR="${KERNEL_FLAVOUR:-kernel}" # kernel | kernel-nvidia-gpu | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental | kernel-nvidia-gpu-tdx-experimental | kernel-nvidia-gpu-snp
OVMF_FLAVOUR="${OVMF_FLAVOUR:-x86_64}" # x86_64 | tdx OVMF_FLAVOUR="${OVMF_FLAVOUR:-x86_64}" # x86_64 | tdx
QEMU_FLAVOUR="${QEMU_FLAVOUR:-qemu}" # qemu | qemu-tdx-experimental | qemu-snp-experimental QEMU_FLAVOUR="${QEMU_FLAVOUR:-qemu}" # qemu | qemu-tdx-experimental | qemu-snp-experimental
ROOTFS_IMAGE_TYPE="${ROOTFS_IMAGE_TYPE:-image}" # image | initrd ROOTFS_IMAGE_TYPE="${ROOTFS_IMAGE_TYPE:-image}" # image | initrd
@@ -36,6 +36,19 @@ cache_kernel_artifacts() {
local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")" local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")"
local kernel_modules_tarball_path="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kata-static-kernel-sev-modules.tar.xz" local kernel_modules_tarball_path="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kata-static-kernel-sev-modules.tar.xz"
# The ${vendor}-gpu kernels are based on an already existing entry, and does not require
# adding a new entry to the versions.yaml.
#
# With this in mind, let's just make sure we get the version from correct entry in the
# versions.yaml file.
case ${KERNEL_FLAVOUR} in
*"nvidia-gpu"*)
KERNEL_FLAVOUR=${KERNEL_FLAVOUR//"-nvidia-gpu"/}
;;
*)
;;
esac
if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then
current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")" current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")"
fi fi
@@ -130,7 +143,7 @@ Usage: $0 "[options]"
-c Cloud hypervisor cache -c Cloud hypervisor cache
-F Firecracker cache -F Firecracker cache
-k Kernel cache -k Kernel cache
* Export KERNEL_FLAVOUR="kernel | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental" for a specific build * Export KERNEL_FLAVOUR="kernel | kernel-nvidia-gpu | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental | kernel-nvidia-gpu-tdx-experimental | kernel-nvidia-gpu-snp" for a specific build
The default KERNEL_FLAVOUR value is "kernel" The default KERNEL_FLAVOUR value is "kernel"
-n Nydus cache -n Nydus cache
-q QEMU cache -q QEMU cache