fix(os): add SEV-SNP measurement artifacts

Author: kvinwang

os/mkosi/build.sh

@@ -32,7 +32,8 @@ build_one() {
     "$work/linux-$KERNEL_VERSION" "$work/kernel-build" "$stage" "$kstage"
   "$SELF/scripts/build-zfs.sh" "$work/zfs-build" \
     "$work/linux-$KERNEL_VERSION" "$work/kernel-build" "$stage" "$kstage"
-  "$SELF/scripts/build-ovmf.sh" "$work/ovmf-build" "$kstage/ovmf.fd"
+  "$SELF/scripts/build-ovmf.sh" "$work/ovmf-build" \
+    "$kstage/ovmf.fd" "$kstage/ovmf-sev.fd"
   # ExtraTrees is copied over Debian's usr-merged root where /bin, /sbin and
   # /lib are symlinks. Normalize build systems (notably OpenZFS) that install
   # into the legacy physical directories before handing the tree to mkosi.

os/mkosi/scripts/build-ovmf.sh

@@ -6,8 +6,10 @@ set -euo pipefail
 ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)
 BUILD_DIR=${1:?build directory required}
 OUT=${2:?output file required}
+SEV_OUT=${3:?SEV output file required}
 BUILD_DIR=$(realpath -m "$BUILD_DIR")
 OUT=$(realpath -m "$OUT")
+SEV_OUT=$(realpath -m "$SEV_OUT")
 REV=fbe0805b2091393406952e84724188f8c1941837
 src="$BUILD_DIR/edk2"
 if [[ ! -d $src/.git ]]; then
@@ -21,6 +23,8 @@ git -C "$src" submodule update --init --recursive --depth=1
 git -C "$src" reset -q --hard "$REV"
 patch -d "$src" -p1 --forward --fuzz=0 < \
   "$ROOT/os/yocto/layers/meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf/0004-Reproduciable.patch"
+patch -d "$src" -p1 --forward --fuzz=0 < \
+  "$ROOT/os/yocto/layers/meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf/0006-OvmfPkg-AmdSev-drop-embedded-grub.patch"
 
 make -s -C "$src/BaseTools" -j"${JOBS:-$(nproc)}"
 export WORKSPACE="$src" EDK_TOOLS_PATH="$src/BaseTools"
@@ -37,4 +41,8 @@ rm -f "$src/Conf/tools_def.txt"
   build -a X64 -t GCC5 -b RELEASE -n "${JOBS:-$(nproc)}" \
     -p OvmfPkg/IntelTdx/IntelTdxX64.dsc)
 install -Dm0644 "$src/Build/IntelTdx/RELEASE_GCC5/FV/OVMF.fd" "$OUT"
-touch -d "@${SOURCE_DATE_EPOCH:?}" "$OUT"
+(cd "$src" && set +u && source edksetup.sh BaseTools >/dev/null && \
+  build -a X64 -t GCC5 -b RELEASE -n "${JOBS:-$(nproc)}" \
+    -p OvmfPkg/AmdSev/AmdSevX64.dsc)
+install -Dm0644 "$src/Build/AmdSev/RELEASE_GCC5/FV/OVMF.fd" "$SEV_OUT"
+touch -d "@${SOURCE_DATE_EPOCH:?}" "$OUT" "$SEV_OUT"

os/mkosi/scripts/make-release-artifacts.sh

@@ -58,9 +58,13 @@ find "$ird" -print0 | xargs -0 touch -h -d "@$SOURCE_DATE_EPOCH"
 
 # OVMF is the pinned TDX build; the EFI stub comes from the Debian snapshot.
 ovmf="$KERNEL_TREE/ovmf.fd"
+ovmf_sev="$KERNEL_TREE/ovmf-sev.fd"
 stub=$(find "$TREE/usr/lib/systemd/boot/efi" -type f -name 'linuxx64.efi.stub' | head -1)
-[[ -f $ovmf && -f $stub ]] || { echo 'OVMF or systemd EFI stub missing' >&2; exit 1; }
+[[ -f $ovmf && -f $ovmf_sev && -f $stub ]] || {
+  echo 'TDX/SEV OVMF or systemd EFI stub missing' >&2; exit 1;
+}
 install -m0644 "$ovmf" "$OUT/files/ovmf.fd"
+install -m0644 "$ovmf_sev" "$OUT/files/ovmf-sev.fd"
 
 cmdline="console=ttyS0 init=/init panic=1 net.ifnames=0 biosdevname=0 mce=off oops=panic pci=noearly pci=nommconf random.trust_cpu=y random.trust_bootloader=n tsc=reliable no-kvmclock dstack.rootfs_hash=$root_hash dstack.rootfs_size=$data_size"
 ukify build --efi-arch=x64 --stub="$stub" --linux="$kernel" \
@@ -80,7 +84,7 @@ data={"schema_version":1,"backend":"mkosi","image":{"name":name,"version":versio
 "boot":{"ovmf_variant":ovmf_variant},"verity":{"root_hash":root_hash,"data_size":data_size},
 "artifacts":{"initramfs":"files/initramfs.cpio.gz","kernel":"files/bzImage",
 "firmware":"files/ovmf.fd","rootfs_verity":"files/rootfs.squashfs.verity",
-"firmware_sev":None,"uki":"files/dstack-uki.efi"},
+"firmware_sev":"files/ovmf-sev.fd","uki":"files/dstack-uki.efi"},
 "backend_metadata":{"machine":"dstack","distribution":"debian"}}
 with open(path,"w") as f: json.dump(data,f,indent=2); f.write("\n")
 PY

os/mkosi/tests/acceptance.sh

@@ -23,6 +23,9 @@ grep -q 'artifact-manifest.json' "$D/scripts/make-release-artifacts.sh"
 grep -q 'image/assemble.sh' "$D/build.sh"
 grep -q 'build-ovmf.sh' "$D/build.sh"
 grep -q 'fbe0805b2091393406952e84724188f8c1941837' "$D/scripts/build-ovmf.sh"
+grep -q 'AmdSev/AmdSevX64.dsc' "$D/scripts/build-ovmf.sh"
+grep -q '"firmware_sev":"files/ovmf-sev.fd"' "$D/scripts/make-release-artifacts.sh"
+grep -q 'measurement.snp.cbor' "$D/tests/check-output.sh"
 grep -q '0001-validate-ocsp-response-freshness.patch' "$D/scripts/build-nvattest.sh"
 grep -q -- '--fuzz=0' "$D/scripts/build-nvattest.sh"
 grep -q '0001-pin-fetchcontent-inputs.patch' "$D/scripts/build-nvattest.sh"

os/mkosi/tests/check-output.sh

@@ -3,17 +3,18 @@
 set -euo pipefail
 out=${1:?assembled output directory required}
 flavor=${2:-prod}
-for file in bzImage initramfs.cpio.gz ovmf.fd rootfs.img.parted.verity \
- metadata.json measurement.tdx.cbor sha256sum.txt digest.txt; do
+for file in bzImage initramfs.cpio.gz ovmf.fd ovmf-sev.fd rootfs.img.parted.verity \
+ metadata.json measurement.tdx.cbor measurement.snp.cbor sha256sum.txt digest.txt; do
   [[ -s $out/$file ]] || { echo "missing compatible output: $file" >&2; exit 1; }
 done
 (cd "$out" && sha256sum -c sha256sum.txt)
 grep -q 'dstack-rootfs' < <(sgdisk -p "$out/rootfs.img.parted.verity")
 python3 - "$out/metadata.json" "$flavor" <<'PY'
 import json,sys
 d=json.load(open(sys.argv[1]))
-for k in ("bios","kernel","cmdline","initrd","rootfs","version","git_revision","is_dev","ovmf_variant"):
+for k in ("bios","bios-sev","kernel","cmdline","initrd","rootfs","version","git_revision","is_dev","ovmf_variant"):
     assert k in d, k
+assert d["bios-sev"] == "ovmf-sev.fd"
 assert d["is_dev"] == (sys.argv[2] == "dev")
 PY
 echo "Yocto-compatible release format accepted: $out"