From 123c867172cecbcfe64decd5f8aae62b07c3b5a4 Mon Sep 17 00:00:00 2001 From: Larry Dewey Date: Thu, 25 Aug 2022 13:43:05 -0500 Subject: [PATCH] SEV: Update ReducedPhysBits Updating this field, as `cpuid` provides host level data, which is not what a guest would expect for Reduced Phsycial Bits. In almost all cases, we should be using `1` for the value here. Amend: Adding unit test change. Fixes: #5006 Signed-off-by: Larry Dewey (cherry picked from commit 67b8f0773fb8ee6b9aeae02e5feaaa9a3b9825a0) --- src/runtime/virtcontainers/qemu_amd64.go | 2 +- src/runtime/virtcontainers/qemu_amd64_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index b7680a318..b45e26a78 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -261,7 +261,7 @@ func (q *qemuAmd64) appendProtectionDevice(devices []govmmQemu.Device, firmware, Debug: false, File: firmware, CBitPos: cpuid.AMDMemEncrypt.CBitPosition, - ReducedPhysBits: cpuid.AMDMemEncrypt.PhysAddrReduction, + ReducedPhysBits: 1, }), "", nil case noneProtection: return devices, firmware, nil diff --git a/src/runtime/virtcontainers/qemu_amd64_test.go b/src/runtime/virtcontainers/qemu_amd64_test.go index 740cb6460..5735b96a5 100644 --- a/src/runtime/virtcontainers/qemu_amd64_test.go +++ b/src/runtime/virtcontainers/qemu_amd64_test.go @@ -287,7 +287,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) { Debug: false, File: firmware, CBitPos: cpuid.AMDMemEncrypt.CBitPosition, - ReducedPhysBits: cpuid.AMDMemEncrypt.PhysAddrReduction, + ReducedPhysBits: 1, }, }