github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-24 02:31:12 +00:00
Code Issues Projects Releases Wiki Activity

Revert "virtcontainers: Drop check for the tdx CPU flag"

Browse Source 
This reverts commit 25b3cdd38c.

As the Jenkins TDX CI is running on a system with a TDX stack called
"2022ww44", we should keep the QEMU / kernel / OVMF versions matching
what's provided in that stack.

The reason we were able to update this on `main` is because the GHA TDX
CI is running on a TDX stack called "2023ww01", but we have decided to
NOT take the bullet, NOT updating the Jenkins CI in order to avoid
unexepected breakages.

This regression was introduced as part of the last CCv0 merge to main,
and would've been caught by the CI, and should've been caught by the
reviewer (myself :-)), but CI was having a hard time to even build the
compoenents and I wrote in the PR and I'm quoting it here: "I rather
deal with possible breakages on this later on, than block this PR to get
in." ... and here we are. :-)

Fixes: #6884

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-05-18 12:43:51 +02:00
parent 2962d8db45
commit fe6e918ddc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/virtcontainers/hypervisor_linux_amd64.go
View File

@ -12,6 +12,8 @@ const (
tdxSysFirmwareDir = "/sys/firmware/tdx/" tdxSysFirmwareDir = "/sys/firmware/tdx/"
tdxCPUFlag = "tdx"
sevKvmParameterPath = "/sys/module/kvm_amd/parameters/sev" sevKvmParameterPath = "/sys/module/kvm_amd/parameters/sev"
snpKvmParameterPath = "/sys/module/kvm_amd/parameters/sev_snp" snpKvmParameterPath = "/sys/module/kvm_amd/parameters/sev_snp"
@ -19,6 +21,10 @@ const (
// TDX is supported and properly loaded when the firmware directory (either tdx or tdx_seam) exists or `tdx` is part of the CPU flag // TDX is supported and properly loaded when the firmware directory (either tdx or tdx_seam) exists or `tdx` is part of the CPU flag
func checkTdxGuestProtection(flags map[string]bool) bool { func checkTdxGuestProtection(flags map[string]bool) bool {
if flags[tdxCPUFlag] {
return true
}
if d, err := os.Stat(tdxSysFirmwareDir); err == nil && d.IsDir() { if d, err := os.Stat(tdxSysFirmwareDir); err == nil && d.IsDir() {
return true return true
} }