Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gpu: Add NVIDIA GPU Confidential kernel target #8872

Merged
merged 1 commit into from
Jan 23, 2024
+22 −3
Merged

gpu: Add NVIDIA GPU Confidential kernel target #8872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-kata-static-tarball-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
- kernel-dragonball-experimental
- kernel-tdx-experimental
- kernel-nvidia-gpu
- kernel-nvidia-gpu-confidential
- kernel-nvidia-gpu-snp
- kernel-nvidia-gpu-tdx-experimental
- nydus
Expand Down
4 changes: 4 additions & 0 deletions tools/packaging/kata-deploy/local-build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ BASE_TARBALLS = serial-targets \
kernel-confidential-tarball \
kernel-dragonball-experimental-tarball \
kernel-nvidia-gpu-tarball \
kernel-nvidia-gpu-confidential-tarball \
kernel-nvidia-gpu-snp-tarball \
kernel-nvidia-gpu-tdx-experimental-tarball \
kernel-tarball \
Expand Down Expand Up @@ -105,6 +106,9 @@ kernel-dragonball-experimental-tarball:
kernel-nvidia-gpu-tarball:
${MAKE} $@-build

kernel-nvidia-gpu-confidential-tarball:
${MAKE} $@-build

kernel-nvidia-gpu-snp-tarball:
${MAKE} $@-build

Expand Down
15 changes: 14 additions & 1 deletion tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ options:
kernel-nvidia-gpu
kernel-nvidia-gpu-snp
kernel-nvidia-gpu-tdx-experimental
kernel-nvidia-gpu-confidential
kernel-sev-tarball
kernel-tdx-experimental
nydus
Expand Down Expand Up @@ -317,7 +318,7 @@ install_kernel_helper() {
kernel_version="$(get_from_kata_deps assets.kernel.sev.version)"
default_patches_dir="${repo_root_dir}/tools/packaging/kernel/patches"
module_dir="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kernel-sev/builddir/kata-linux-${kernel_version#v}-${kernel_kata_config_version}/lib/modules/${kernel_version#v}"
elif [[ "${kernel_name}" == "kernel-confidential" ]]; then
elif [[ "${kernel_name}" == "kernel"*"-confidential" ]]; then
kernel_version="$(get_from_kata_deps assets.kernel.confidential.version)"
default_patches_dir="${repo_root_dir}/tools/packaging/kernel/patches"
module_dir="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kernel-confidential/builddir/kata-linux-${kernel_version#v}-${kernel_kata_config_version}/lib/modules/${kernel_version#v}"
Expand Down Expand Up @@ -364,6 +365,16 @@ install_kernel_nvidia_gpu() {
"-g nvidia -u ${kernel_url} -H deb"
}

#Install GPU and TEE enabled kernel asset
install_kernel_nvidia_gpu_confidential() {
local kernel_url="$(get_from_kata_deps assets.kernel.confidential.url)"

install_kernel_helper \
"assets.kernel.confidential.version" \
"kernel-nvidia-gpu-confidential" \
"-x confidential -g nvidia -u ${kernel_url} -H deb"
}

#Install GPU and SNP enabled kernel asset
install_kernel_nvidia_gpu_snp() {
local kernel_url="$(get_from_kata_deps assets.kernel.sev.url)"
Expand Down Expand Up @@ -811,6 +822,8 @@ handle_build() {

kernel-nvidia-gpu) install_kernel_nvidia_gpu ;;

kernel-nvidia-gpu-confidential) install_kernel_nvidia_gpu_confidential ;;

kernel-nvidia-gpu-snp) install_kernel_nvidia_gpu_snp;;

kernel-nvidia-gpu-tdx-experimental) install_kernel_nvidia_gpu_tdx_experimental;;
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/kernel/build-kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ build_kernel_headers() {
pushd "${kernel_path}" >>/dev/null

if [ "$linux_headers" == "deb" ]; then
make -j $(nproc ${CI:+--ignore 1}) deb-pkg ARCH="${arch_target}"
make -j $(nproc ${CI:+--ignore 1}) bindeb-pkg ARCH="${arch_target}"
fi
if [ "$linux_headers" == "rpm" ]; then
make -j $(nproc ${CI:+--ignore 1}) rpm-pkg ARCH="${arch_target}"
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/kernel/kata_config_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
121
122
1 change: 1 addition & 0 deletions tools/packaging/static-build/kernel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN apt-get update && \
build-essential \
ca-certificates \
curl \
debhelper \
flex \
git \
iptables \
Expand Down