runtime: Add online-kbs to kernel params

In online-kbs attestation the guest is given the location of the keybroker server to connect after launch. This patch appends the IP:Port of the online-kbs to the kernel params of the guest. Patch also simplifies the kbs config into "mode" = offline/online, and updates SEV config variable names and default values Fixes: #5661 #5715 Signed-off-by: Jim Cadden <jcadden@ibm.com>
2025-08-31 08:28:34 +00:00 · 2022-11-15 17:22:30 -05:00
parent f46da42847
commit 4eb88d6a74
11 changed files with 235 additions and 212 deletions
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -258,14 +258,13 @@ DEFBINDMOUNTS := []
 # Image Service Offload
 DEFSERVICEOFFLOAD ?= false

-# SEV Guest Pre-Attestation
+# SEV & SEV-ES Guest Pre-Attestation
 DEFGUESTPREATTESTATION ?= false
 DEFGUESTPREATTESTATIONPROXY ?= localhost:44444
+DEFGUESTPREATTESTATIONMODE ?= online
 DEFGUESTPREATTESTATIONKEYSET ?= KEYSET-1
-DEFGUESTPREATTESTATIONSECRETGUID ?= 1ee27366-0c87-43a6-af48-28543eaf7cb0
-DEFGUESTPREATTESTATIONSECRETTYPE ?= connection
 DEFSEVCERTCHAIN ?= /opt/sev/cert_chain.cert
-DEFSEVGUESTPOLICY ?= 0
+DEFSEVGUESTPOLICY ?= 3

 SED = sed

@@ -614,9 +613,8 @@ USER_VARS += BUILDFLAGS
 USER_VARS += DEFSERVICEOFFLOAD
 USER_VARS += DEFGUESTPREATTESTATION
 USER_VARS += DEFGUESTPREATTESTATIONPROXY
+USER_VARS += DEFGUESTPREATTESTATIONMODE
 USER_VARS += DEFGUESTPREATTESTATIONKEYSET
-USER_VARS += DEFGUESTPREATTESTATIONSECRETGUID
-USER_VARS += DEFGUESTPREATTESTATIONSECRETTYPE
 USER_VARS += DEFSEVCERTCHAIN
 USER_VARS += DEFSEVGUESTPOLICY

--- a/src/runtime/config/configuration-qemu-sev.toml.in
+++ b/src/runtime/config/configuration-qemu-sev.toml.in
@@ -32,24 +32,21 @@ machine_type = "@MACHINETYPE@"
 # Default false
 confidential_guest = true

-# Enable pre-attestation AMD SEV and SEV-ES confidential guests.
+# Enable pre-attestation for AMD SEV and SEV-ES guests.
 # Applies only if confidential_guest is true.
 # (default: false)
 guest_pre_attestation = true

-# Guest owner proxy that handles remote attestation
-guest_pre_attestation_proxy = "@DEFGUESTPREATTESTATIONPROXY@"
-
-# Keyset ID for injected secrets
-guest_pre_attestation_keyset = "@DEFGUESTPREATTESTATIONKEYSET@"
-
-# GUID of injected secret
-# Key Broker Server for SEV(-ES) expects secrets with this guid
+# A remote key broker server (KBS) is required to validate the attestation
+# measurement and inject a secret key.  
 # See https://github.com/confidential-containers/simple-kbs
-guest_pre_attestation_secret_guid = "@DEFGUESTPREATTESTATIONSECRETGUID@"
+guest_pre_attestation_kbs_uri = "@DEFGUESTPREATTESTATIONPROXY@"

-# Type of injected secret
-guest_pre_attestation_secret_type = "@DEFGUESTPREATTESTATIONSECRETTYPE@"
+# The simple-kbs can be run in "online" and "offline" modes
+guest_pre_attestation_kbs_mode="@DEFGUESTPREATTESTATIONMODE@" 
+
+# Keyset ID for injected secrets (offline kbs)
+guest_pre_attestation_keyset = "@DEFGUESTPREATTESTATIONKEYSET@"

 # SEV guest policy
 sev_guest_policy = @DEFSEVGUESTPOLICY@
--- a/src/runtime/config/configuration-qemu.toml.in
+++ b/src/runtime/config/configuration-qemu.toml.in
@@ -40,27 +40,24 @@ rootfs_type=@DEFROOTFSTYPE@
 # Default false
 # confidential_guest = true

-# Enable pre-attestation AMD SEV and SEV-ES confidential guests.
+# Enable pre-attestation for AMD SEV and SEV-ES guests.
 # Applies only if confidential_guest is true.
 # (default: false)
 #guest_pre_attestation = true
 #
-# Guest owner proxy that handles remote attestation
-#guest_pre_attestation_proxy="localhost:50051"
-#
-# Keyset ID for injected secrets
-#guest_pre_attestation_keyset="KEYSET-1"
-#
-# GUID of injected secret
-# Key Broker Server for SEV(-ES) expects secrets with this guid
+# A remote key broker server (KBS) is required to validate the attestation
+# measurement and inject a secret key.  
 # See https://github.com/confidential-containers/simple-kbs
-#guest_pre_attestation_secret_guid = "@DEFGUESTPREATTESTATIONSECRETGUID@"
+#guest_pre_attestation_kbs_uri = "@DEFGUESTPREATTESTATIONPROXY@"
 #
-# Type of injected secret
-#guest_pre_attestation_secret_type = "@DEFGUESTPREATTESTATIONSECRETTYPE@"
+# The simple-kbs can be run in "online" and "offline" modes
+#guest_pre_attestation_kbs_mode="@DEFGUESTPREATTESTATIONMODE@" 
+#
+# Keyset ID of the injected secret (offline kbs)
+#guest_pre_attestation_keyset = "@DEFGUESTPREATTESTATIONKEYSET@"
 #
 # SEV guest policy
-#sev_guest_policy=0
+#sev_guest_policy = @DEFSEVGUESTPOLICY@

 # SEV certificate chain path 
 #sev_cert_chain="@DEFSEVCERTCHAIN@"
--- a/src/runtime/pkg/katautils/config-settings.go.in
+++ b/src/runtime/pkg/katautils/config-settings.go.in
@@ -96,10 +96,9 @@ const defaultDisableGuestSeLinux = true
 const defaultVfioMode = "guest-kernel"
 const defaultLegacySerial = false
 const defaultGuestPreAttestation = false
-const defaultGuestPreAttestationProxy string = ""
+const defaultGuestPreAttestationURI string = ""
+const defaultGuestPreAttestationMode string = ""
 const defaultGuestPreAttestationKeyset string = ""
-const defaultGuestPreAttestationSecretGuid string = ""
-const defaultGuestPreAttestationSecretType string = ""
 const defaultSEVCertChainPath string = ""
 const defaultSEVGuestPolicy uint32 = 0
 const defaultSNPGuestPolicy uint64 = 0x30000
--- a/src/runtime/pkg/katautils/config.go
+++ b/src/runtime/pkg/katautils/config.go
@@ -101,10 +101,9 @@ type hypervisor struct {
 	GuestHookPath                  string   `toml:"guest_hook_path"`
 	GuestMemoryDumpPath            string   `toml:"guest_memory_dump_path"`
 	SeccompSandbox                 string   `toml:"seccompsandbox"`
-	GuestPreAttestationProxy       string   `toml:"guest_pre_attestation_proxy"`
+	GuestPreAttestationURI         string   `toml:"guest_pre_attestation_kbs_uri"`
+	GuestPreAttestationMode        string   `toml:"guest_pre_attestation_kbs_mode"`
 	GuestPreAttestationKeyset      string   `toml:"guest_pre_attestation_keyset"`
-	GuestPreAttestationSecretGuid  string   `toml:"guest_pre_attestation_secret_guid"`
-	GuestPreAttestationSecretType  string   `toml:"guest_pre_attestation_secret_type"`
 	SEVCertChainPath               string   `toml:"sev_cert_chain"`
 	BlockDeviceAIO                 string   `toml:"block_device_aio"`
 	RemoteHypervisorSocket         string   `toml:"remote_hypervisor_socket"`
@@ -815,81 +814,80 @@ func newQemuHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) {
 	txRateLimiterMaxRate := h.getTxRateLimiterCfg()

 	return vc.HypervisorConfig{
-		HypervisorPath:                hypervisor,
-		HypervisorPathList:            h.HypervisorPathList,
-		KernelPath:                    kernel,
-		InitrdPath:                    initrd,
-		ImagePath:                     image,
-		FirmwarePath:                  firmware,
-		FirmwareVolumePath:            firmwareVolume,
-		PFlash:                        pflashes,
-		MachineAccelerators:           machineAccelerators,
-		CPUFeatures:                   cpuFeatures,
-		KernelParams:                  vc.DeserializeParams(strings.Fields(kernelParams)),
-		HypervisorMachineType:         machineType,
-		NumVCPUs:                      h.defaultVCPUs(),
-		DefaultMaxVCPUs:               h.defaultMaxVCPUs(),
-		MemorySize:                    h.defaultMemSz(),
-		MemSlots:                      h.defaultMemSlots(),
-		MemOffset:                     h.defaultMemOffset(),
-		DefaultMaxMemorySize:          h.defaultMaxMemSz(),
-		VirtioMem:                     h.VirtioMem,
-		EntropySource:                 h.GetEntropySource(),
-		EntropySourceList:             h.EntropySourceList,
-		DefaultBridges:                h.defaultBridges(),
-		DisableBlockDeviceUse:         h.DisableBlockDeviceUse,
-		SharedFS:                      sharedFS,
-		VirtioFSDaemon:                h.VirtioFSDaemon,
-		VirtioFSDaemonList:            h.VirtioFSDaemonList,
-		VirtioFSCacheSize:             h.VirtioFSCacheSize,
-		VirtioFSCache:                 h.defaultVirtioFSCache(),
-		VirtioFSQueueSize:             h.VirtioFSQueueSize,
-		VirtioFSExtraArgs:             h.VirtioFSExtraArgs,
-		MemPrealloc:                   h.MemPrealloc,
-		HugePages:                     h.HugePages,
-		IOMMU:                         h.IOMMU,
-		IOMMUPlatform:                 h.getIOMMUPlatform(),
-		FileBackedMemRootDir:          h.FileBackedMemRootDir,
-		FileBackedMemRootList:         h.FileBackedMemRootList,
-		Debug:                         h.Debug,
-		DisableNestingChecks:          h.DisableNestingChecks,
-		BlockDeviceDriver:             blockDriver,
-		BlockDeviceAIO:                blockAIO,
-		BlockDeviceCacheSet:           h.BlockDeviceCacheSet,
-		BlockDeviceCacheDirect:        h.BlockDeviceCacheDirect,
-		BlockDeviceCacheNoflush:       h.BlockDeviceCacheNoflush,
-		EnableIOThreads:               h.EnableIOThreads,
-		Msize9p:                       h.msize9p(),
-		DisableImageNvdimm:            h.DisableImageNvdimm,
-		HotplugVFIOOnRootBus:          h.HotplugVFIOOnRootBus,
-		PCIeRootPort:                  h.PCIeRootPort,
-		DisableVhostNet:               h.DisableVhostNet,
-		EnableVhostUserStore:          h.EnableVhostUserStore,
-		VhostUserStorePath:            h.vhostUserStorePath(),
-		VhostUserStorePathList:        h.VhostUserStorePathList,
-		SeccompSandbox:                h.SeccompSandbox,
-		GuestHookPath:                 h.guestHookPath(),
-		RxRateLimiterMaxRate:          rxRateLimiterMaxRate,
-		TxRateLimiterMaxRate:          txRateLimiterMaxRate,
-		EnableAnnotations:             h.EnableAnnotations,
-		GuestMemoryDumpPath:           h.GuestMemoryDumpPath,
-		GuestMemoryDumpPaging:         h.GuestMemoryDumpPaging,
-		ConfidentialGuest:             h.ConfidentialGuest,
-		SevSnpGuest:                   h.SevSnpGuest,
-		GuestSwap:                     h.GuestSwap,
-		Rootless:                      h.Rootless,
-		LegacySerial:                  h.LegacySerial,
-		DisableSeLinux:                h.DisableSeLinux,
-		GuestPreAttestation:           h.GuestPreAttestation,
-		GuestPreAttestationProxy:      h.GuestPreAttestationProxy,
-		GuestPreAttestationKeyset:     h.GuestPreAttestationKeyset,
-		GuestPreAttestationSecretGuid: h.GuestPreAttestationSecretGuid,
-		GuestPreAttestationSecretType: h.GuestPreAttestationSecretType,
-		SEVGuestPolicy:                h.SEVGuestPolicy,
-		SNPGuestPolicy:                h.getSnpGuestPolicy(),
-		SEVCertChainPath:              h.SEVCertChainPath,
-		DisableGuestSeLinux:           h.DisableGuestSeLinux,
-		RootfsType:                    rootfsType,
+		HypervisorPath:            hypervisor,
+		HypervisorPathList:        h.HypervisorPathList,
+		KernelPath:                kernel,
+		InitrdPath:                initrd,
+		ImagePath:                 image,
+		FirmwarePath:              firmware,
+		FirmwareVolumePath:        firmwareVolume,
+		PFlash:                    pflashes,
+		MachineAccelerators:       machineAccelerators,
+		CPUFeatures:               cpuFeatures,
+		KernelParams:              vc.DeserializeParams(strings.Fields(kernelParams)),
+		HypervisorMachineType:     machineType,
+		NumVCPUs:                  h.defaultVCPUs(),
+		DefaultMaxVCPUs:           h.defaultMaxVCPUs(),
+		MemorySize:                h.defaultMemSz(),
+		MemSlots:                  h.defaultMemSlots(),
+		MemOffset:                 h.defaultMemOffset(),
+		DefaultMaxMemorySize:      h.defaultMaxMemSz(),
+		VirtioMem:                 h.VirtioMem,
+		EntropySource:             h.GetEntropySource(),
+		EntropySourceList:         h.EntropySourceList,
+		DefaultBridges:            h.defaultBridges(),
+		DisableBlockDeviceUse:     h.DisableBlockDeviceUse,
+		SharedFS:                  sharedFS,
+		VirtioFSDaemon:            h.VirtioFSDaemon,
+		VirtioFSDaemonList:        h.VirtioFSDaemonList,
+		VirtioFSCacheSize:         h.VirtioFSCacheSize,
+		VirtioFSCache:             h.defaultVirtioFSCache(),
+		VirtioFSQueueSize:         h.VirtioFSQueueSize,
+		VirtioFSExtraArgs:         h.VirtioFSExtraArgs,
+		MemPrealloc:               h.MemPrealloc,
+		HugePages:                 h.HugePages,
+		IOMMU:                     h.IOMMU,
+		IOMMUPlatform:             h.getIOMMUPlatform(),
+		FileBackedMemRootDir:      h.FileBackedMemRootDir,
+		FileBackedMemRootList:     h.FileBackedMemRootList,
+		Debug:                     h.Debug,
+		DisableNestingChecks:      h.DisableNestingChecks,
+		BlockDeviceDriver:         blockDriver,
+		BlockDeviceAIO:            blockAIO,
+		BlockDeviceCacheSet:       h.BlockDeviceCacheSet,
+		BlockDeviceCacheDirect:    h.BlockDeviceCacheDirect,
+		BlockDeviceCacheNoflush:   h.BlockDeviceCacheNoflush,
+		EnableIOThreads:           h.EnableIOThreads,
+		Msize9p:                   h.msize9p(),
+		DisableImageNvdimm:        h.DisableImageNvdimm,
+		HotplugVFIOOnRootBus:      h.HotplugVFIOOnRootBus,
+		PCIeRootPort:              h.PCIeRootPort,
+		DisableVhostNet:           h.DisableVhostNet,
+		EnableVhostUserStore:      h.EnableVhostUserStore,
+		VhostUserStorePath:        h.vhostUserStorePath(),
+		VhostUserStorePathList:    h.VhostUserStorePathList,
+		SeccompSandbox:            h.SeccompSandbox,
+		GuestHookPath:             h.guestHookPath(),
+		RxRateLimiterMaxRate:      rxRateLimiterMaxRate,
+		TxRateLimiterMaxRate:      txRateLimiterMaxRate,
+		EnableAnnotations:         h.EnableAnnotations,
+		GuestMemoryDumpPath:       h.GuestMemoryDumpPath,
+		GuestMemoryDumpPaging:     h.GuestMemoryDumpPaging,
+		ConfidentialGuest:         h.ConfidentialGuest,
+		SevSnpGuest:               h.SevSnpGuest,
+		GuestSwap:                 h.GuestSwap,
+		Rootless:                  h.Rootless,
+		LegacySerial:              h.LegacySerial,
+		DisableSeLinux:            h.DisableSeLinux,
+		GuestPreAttestation:       h.GuestPreAttestation,
+		GuestPreAttestationURI:    h.GuestPreAttestationURI,
+		GuestPreAttestationMode:   h.GuestPreAttestationMode,
+		GuestPreAttestationKeyset: h.GuestPreAttestationKeyset,
+		SEVGuestPolicy:            h.SEVGuestPolicy,
+		SNPGuestPolicy:            h.getSnpGuestPolicy(),
+		SEVCertChainPath:          h.SEVCertChainPath,
+		DisableGuestSeLinux:       h.DisableGuestSeLinux,
+		RootfsType:                rootfsType,
 	}, nil
 }

@@ -1276,63 +1274,62 @@ func updateRuntimeConfig(configPath string, tomlConf tomlConfig, config *oci.Run

 func GetDefaultHypervisorConfig() vc.HypervisorConfig {
 	return vc.HypervisorConfig{
-		HypervisorPath:                defaultHypervisorPath,
-		JailerPath:                    defaultJailerPath,
-		KernelPath:                    defaultKernelPath,
-		ImagePath:                     defaultImagePath,
-		InitrdPath:                    defaultInitrdPath,
-		FirmwarePath:                  defaultFirmwarePath,
-		FirmwareVolumePath:            defaultFirmwareVolumePath,
-		MachineAccelerators:           defaultMachineAccelerators,
-		CPUFeatures:                   defaultCPUFeatures,
-		HypervisorMachineType:         defaultMachineType,
-		NumVCPUs:                      defaultVCPUCount,
-		DefaultMaxVCPUs:               defaultMaxVCPUCount,
-		MemorySize:                    defaultMemSize,
-		MemOffset:                     defaultMemOffset,
-		VirtioMem:                     defaultVirtioMem,
-		DisableBlockDeviceUse:         defaultDisableBlockDeviceUse,
-		DefaultBridges:                defaultBridgesCount,
-		MemPrealloc:                   defaultEnableMemPrealloc,
-		HugePages:                     defaultEnableHugePages,
-		IOMMU:                         defaultEnableIOMMU,
-		IOMMUPlatform:                 defaultEnableIOMMUPlatform,
-		FileBackedMemRootDir:          defaultFileBackedMemRootDir,
-		Debug:                         defaultEnableDebug,
-		DisableNestingChecks:          defaultDisableNestingChecks,
-		BlockDeviceDriver:             defaultBlockDeviceDriver,
-		BlockDeviceAIO:                defaultBlockDeviceAIO,
-		BlockDeviceCacheSet:           defaultBlockDeviceCacheSet,
-		BlockDeviceCacheDirect:        defaultBlockDeviceCacheDirect,
-		BlockDeviceCacheNoflush:       defaultBlockDeviceCacheNoflush,
-		EnableIOThreads:               defaultEnableIOThreads,
-		Msize9p:                       defaultMsize9p,
-		HotplugVFIOOnRootBus:          defaultHotplugVFIOOnRootBus,
-		PCIeRootPort:                  defaultPCIeRootPort,
-		GuestHookPath:                 defaultGuestHookPath,
-		VhostUserStorePath:            defaultVhostUserStorePath,
-		VirtioFSCache:                 defaultVirtioFSCacheMode,
-		DisableImageNvdimm:            defaultDisableImageNvdimm,
-		RxRateLimiterMaxRate:          defaultRxRateLimiterMaxRate,
-		TxRateLimiterMaxRate:          defaultTxRateLimiterMaxRate,
-		SGXEPCSize:                    defaultSGXEPCSize,
-		ConfidentialGuest:             defaultConfidentialGuest,
-		SevSnpGuest:                   defaultSevSnpGuest,
-		GuestSwap:                     defaultGuestSwap,
-		Rootless:                      defaultRootlessHypervisor,
-		DisableSeccomp:                defaultDisableSeccomp,
-		DisableGuestSeLinux:           defaultDisableGuestSeLinux,
-		LegacySerial:                  defaultLegacySerial,
-		GuestPreAttestation:           defaultGuestPreAttestation,
-		GuestPreAttestationProxy:      defaultGuestPreAttestationProxy,
-		GuestPreAttestationKeyset:     defaultGuestPreAttestationKeyset,
-		GuestPreAttestationSecretGuid: defaultGuestPreAttestationSecretGuid,
-		GuestPreAttestationSecretType: defaultGuestPreAttestationSecretType,
-		SEVGuestPolicy:                defaultSEVGuestPolicy,
-		SNPGuestPolicy:                defaultSNPGuestPolicy,
-		SEVCertChainPath:              defaultSEVCertChainPath,
-		VhostUserDeviceReconnect:      defaultVhostUserDeviceReconnect,
-		RootfsType:                    defaultRootfsType,
+		HypervisorPath:            defaultHypervisorPath,
+		JailerPath:                defaultJailerPath,
+		KernelPath:                defaultKernelPath,
+		ImagePath:                 defaultImagePath,
+		InitrdPath:                defaultInitrdPath,
+		FirmwarePath:              defaultFirmwarePath,
+		FirmwareVolumePath:        defaultFirmwareVolumePath,
+		MachineAccelerators:       defaultMachineAccelerators,
+		CPUFeatures:               defaultCPUFeatures,
+		HypervisorMachineType:     defaultMachineType,
+		NumVCPUs:                  defaultVCPUCount,
+		DefaultMaxVCPUs:           defaultMaxVCPUCount,
+		MemorySize:                defaultMemSize,
+		MemOffset:                 defaultMemOffset,
+		VirtioMem:                 defaultVirtioMem,
+		DisableBlockDeviceUse:     defaultDisableBlockDeviceUse,
+		DefaultBridges:            defaultBridgesCount,
+		MemPrealloc:               defaultEnableMemPrealloc,
+		HugePages:                 defaultEnableHugePages,
+		IOMMU:                     defaultEnableIOMMU,
+		IOMMUPlatform:             defaultEnableIOMMUPlatform,
+		FileBackedMemRootDir:      defaultFileBackedMemRootDir,
+		Debug:                     defaultEnableDebug,
+		DisableNestingChecks:      defaultDisableNestingChecks,
+		BlockDeviceDriver:         defaultBlockDeviceDriver,
+		BlockDeviceAIO:            defaultBlockDeviceAIO,
+		BlockDeviceCacheSet:       defaultBlockDeviceCacheSet,
+		BlockDeviceCacheDirect:    defaultBlockDeviceCacheDirect,
+		BlockDeviceCacheNoflush:   defaultBlockDeviceCacheNoflush,
+		EnableIOThreads:           defaultEnableIOThreads,
+		Msize9p:                   defaultMsize9p,
+		HotplugVFIOOnRootBus:      defaultHotplugVFIOOnRootBus,
+		PCIeRootPort:              defaultPCIeRootPort,
+		GuestHookPath:             defaultGuestHookPath,
+		VhostUserStorePath:        defaultVhostUserStorePath,
+		VirtioFSCache:             defaultVirtioFSCacheMode,
+		DisableImageNvdimm:        defaultDisableImageNvdimm,
+		RxRateLimiterMaxRate:      defaultRxRateLimiterMaxRate,
+		TxRateLimiterMaxRate:      defaultTxRateLimiterMaxRate,
+		SGXEPCSize:                defaultSGXEPCSize,
+		ConfidentialGuest:         defaultConfidentialGuest,
+		SevSnpGuest:               defaultSevSnpGuest,
+		GuestSwap:                 defaultGuestSwap,
+		Rootless:                  defaultRootlessHypervisor,
+		DisableSeccomp:            defaultDisableSeccomp,
+		DisableGuestSeLinux:       defaultDisableGuestSeLinux,
+		LegacySerial:              defaultLegacySerial,
+		GuestPreAttestation:       defaultGuestPreAttestation,
+		GuestPreAttestationURI:    defaultGuestPreAttestationURI,
+		GuestPreAttestationMode:   defaultGuestPreAttestationMode,
+		GuestPreAttestationKeyset: defaultGuestPreAttestationKeyset,
+		SEVGuestPolicy:            defaultSEVGuestPolicy,
+		SNPGuestPolicy:            defaultSNPGuestPolicy,
+		SEVCertChainPath:          defaultSEVCertChainPath,
+		VhostUserDeviceReconnect:  defaultVhostUserDeviceReconnect,
+		RootfsType:                defaultRootfsType,
 	}
 }

--- a/src/runtime/pkg/sev/kbs/kbs.go
+++ b/src/runtime/pkg/sev/kbs/kbs.go
@@ -0,0 +1,33 @@
+// Copyright contributors to AMD SEV/-ES in Go
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+// Package kbs can be used interact with simple-kbs, the key broker
+// server for SEV and SEV-ES pre-attestation
+
+package kbs
+
+const (
+	Offline           = "offline"
+	OfflineSecretType = "bundle"
+	OfflineSecretGuid = "e6f5a162-d67f-4750-a67c-5d065f2a9910"
+	Online            = "online"
+	OnlineBootParam   = "online_sev_kbc"
+	OnlineSecretType  = "connection"
+	OnlineSecretGuid  = "1ee27366-0c87-43a6-af48-28543eaf7cb0"
+)
+
+type GuestPreAttestationConfig struct {
+	Proxy            string
+	Keyset           string
+	LaunchId         string
+	KernelPath       string
+	InitrdPath       string
+	FwPath           string
+	KernelParameters string
+	CertChainPath    string
+	SecretType       string
+	SecretGuid       string
+	Policy           uint32
+}
--- a/src/runtime/pkg/sev/sev.go
+++ b/src/runtime/pkg/sev/sev.go
@@ -15,20 +15,6 @@ import (
 	"os"
 )

-type GuestPreAttestationConfig struct {
-	Proxy               string
-	Keyset              string
-	LaunchId            string
-	KernelPath          string
-	InitrdPath          string
-	FwPath              string
-	KernelParameters    string
-	CertChainPath       string
-	KeyBrokerSecretType string
-	KeyBrokerSecretGuid string
-	Policy              uint32
-}
-
 type guidLE [16]byte

 // The following definitions must be identical to those in QEMU target/i386/sev.c
--- a/src/runtime/virtcontainers/hypervisor.go
+++ b/src/runtime/virtcontainers/hypervisor.go
@@ -326,7 +326,8 @@ type HypervisorConfig struct {
 	GuestPreAttestationKeyset      string
 	BlockDeviceDriver              string
 	HypervisorMachineType          string
-	GuestPreAttestationProxy       string
+	GuestPreAttestationURI         string
+	GuestPreAttestationMode        string
 	DevicesStatePath               string
 	EntropySource                  string
 	SharedFS                       string
@@ -343,8 +344,6 @@ type HypervisorConfig struct {
 	SELinuxProcessLabel            string
 	JailerPath                     string
 	MemoryPath                     string
-	GuestPreAttestationSecretGuid  string
-	GuestPreAttestationSecretType  string
 	SEVCertChainPath               string
 	BlockDeviceAIO                 string
 	User                           string
--- a/src/runtime/virtcontainers/qemu.go
+++ b/src/runtime/virtcontainers/qemu.go
@@ -41,7 +41,7 @@ import (
 	"github.com/kata-containers/kata-containers/src/runtime/pkg/device/drivers"
 	hv "github.com/kata-containers/kata-containers/src/runtime/pkg/hypervisors"
 	"github.com/kata-containers/kata-containers/src/runtime/pkg/katautils/katatrace"
-	"github.com/kata-containers/kata-containers/src/runtime/pkg/sev"
+	"github.com/kata-containers/kata-containers/src/runtime/pkg/sev/kbs"
 	pkgUtils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils"
 	"github.com/kata-containers/kata-containers/src/runtime/pkg/uuid"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
@@ -184,6 +184,13 @@ func (q *qemu) kernelParameters() string {
 		params = append(params, Param{"selinux", "1"})
 	}

+	// set the location of the online-kbs for SEV(-ES) guest attestation
+	if q.arch.guestProtection() == sevProtection &&
+		q.config.GuestPreAttestation &&
+		q.config.GuestPreAttestationMode == kbs.Online {
+		params = append(params, Param{"agent.aa_kbc_params", kbs.OnlineBootParam + "::" + q.config.GuestPreAttestationURI})
+	}
+
 	// add the params specified by the provided config. As the kernel
 	// honours the last parameter value set and since the config-provided
 	// params are added here, they will take priority over the defaults.
@@ -667,8 +674,8 @@ func (q *qemu) CreateVM(ctx context.Context, id string, network Network, hypervi
 		PidFile:        filepath.Join(q.config.VMStorePath, q.id, "pid"),
 	}
 	if q.arch.guestProtection() == sevProtection {
-		sevConfig := sev.GuestPreAttestationConfig{
-			Proxy:         q.config.GuestPreAttestationProxy,
+		sevConfig := kbs.GuestPreAttestationConfig{
+			Proxy:         q.config.GuestPreAttestationURI,
 			Policy:        q.config.SEVGuestPolicy,
 			CertChainPath: q.config.SEVCertChainPath,
 		}
@@ -883,18 +890,27 @@ func (q *qemu) AttestVM(ctx context.Context) error {

 	// Guest must be paused so that secrets can be injected.
 	// Guest will be continued by the Attestation function
-	sevConfig := sev.GuestPreAttestationConfig{
-		Proxy:               q.config.GuestPreAttestationProxy,
-		Policy:              q.config.SEVGuestPolicy,
-		Keyset:              q.config.GuestPreAttestationKeyset,
-		KeyBrokerSecretGuid: q.config.GuestPreAttestationSecretGuid,
-		KeyBrokerSecretType: q.config.GuestPreAttestationSecretType,
-		LaunchId:            launchId,
-		KernelPath:          kernelPath,
-		InitrdPath:          initrdPath,
-		FwPath:              firmwarePath,
-		KernelParameters:    kernelParameters,
+	sevConfig := kbs.GuestPreAttestationConfig{
+		Proxy:            q.config.GuestPreAttestationURI,
+		Policy:           q.config.SEVGuestPolicy,
+		Keyset:           q.config.GuestPreAttestationKeyset,
+		LaunchId:         launchId,
+		KernelPath:       kernelPath,
+		InitrdPath:       initrdPath,
+		FwPath:           firmwarePath,
+		KernelParameters: kernelParameters,
 	}
+
+	if q.config.GuestPreAttestationMode == kbs.Online {
+		sevConfig.SecretGuid = kbs.OnlineSecretGuid
+		sevConfig.SecretType = kbs.OnlineSecretType
+	} else if q.config.GuestPreAttestationMode == kbs.Offline {
+		sevConfig.SecretGuid = kbs.OfflineSecretGuid
+		sevConfig.SecretType = kbs.OfflineSecretType
+	} else {
+		return fmt.Errorf("Unsupported pre-attestation mode: %s", q.config.GuestPreAttestationMode)
+	}
+
 	if err := q.arch.sevGuestPreAttestation(
 		q.qmpMonitorCh.ctx,
 		q.qmpMonitorCh.qmp,
--- a/src/runtime/virtcontainers/qemu_amd64.go
+++ b/src/runtime/virtcontainers/qemu_amd64.go
@@ -18,6 +18,7 @@ import (
 	"time"

 	"github.com/kata-containers/kata-containers/src/runtime/pkg/sev"
+	sevKbs "github.com/kata-containers/kata-containers/src/runtime/pkg/sev/kbs"
 	pb "github.com/kata-containers/kata-containers/src/runtime/protocols/simple-kbs"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/sirupsen/logrus"
@@ -330,7 +331,7 @@ func (q *qemuAmd64) appendProtectionDevice(devices []govmmQemu.Device, firmware,
 }

 // Add the SEV Object qemu parameters for sev guest protection
-func (q *qemuAmd64) appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sev.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error) {
+func (q *qemuAmd64) appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sevKbs.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error) {
 	attestationDataPath := filepath.Join(os.TempDir(), sevAttestationTempDir, config.LaunchId)
 	sevGodhPath := filepath.Join(attestationDataPath, sevAttestationGodhName)
 	sevSessionFilePath := filepath.Join(attestationDataPath, sevAttestationSessionFileName)
@@ -367,7 +368,7 @@ func (q *qemuAmd64) appendSEVObject(devices []govmmQemu.Device, firmware, firmwa
 }

 // setup prelaunch attestation for AMD SEV guests
-func (q *qemuAmd64) setupSEVGuestPreAttestation(ctx context.Context, config sev.GuestPreAttestationConfig) (string, error) {
+func (q *qemuAmd64) setupSEVGuestPreAttestation(ctx context.Context, config sevKbs.GuestPreAttestationConfig) (string, error) {

 	logger := virtLog.WithField("subsystem", "SEV attestation")
 	logger.Info("Set up prelaunch attestation")
@@ -452,7 +453,7 @@ func calculateGuestLaunchDigest(config sev.GuestPreAttestationConfig, numVCPUs i

 // wait for prelaunch attestation to complete
 func (q *qemuAmd64) sevGuestPreAttestation(ctx context.Context,
-	qmp *govmmQemu.QMP, config sev.GuestPreAttestationConfig) error {
+	qmp *govmmQemu.QMP, config sevKbs.GuestPreAttestationConfig) error {

 	logger := virtLog.WithField("subsystem", "SEV attestation")
 	logger.Info("Processing prelaunch attestation")
@@ -480,9 +481,9 @@ func (q *qemuAmd64) sevGuestPreAttestation(ctx context.Context,
 	defer cancel()

 	requestDetails := pb.RequestDetails{
-		Guid:       config.KeyBrokerSecretGuid,
+		Guid:       config.SecretGuid,
 		Format:     "JSON",
-		SecretType: config.KeyBrokerSecretType,
+		SecretType: config.SecretType,
 		Id:         config.Keyset,
 	}

--- a/src/runtime/virtcontainers/qemu_arch_base.go
+++ b/src/runtime/virtcontainers/qemu_arch_base.go
@@ -20,7 +20,7 @@ import (
 	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"

 	"github.com/kata-containers/kata-containers/src/runtime/pkg/device/config"
-	"github.com/kata-containers/kata-containers/src/runtime/pkg/sev"
+	sevKbs "github.com/kata-containers/kata-containers/src/runtime/pkg/sev/kbs"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
 )
@@ -167,14 +167,14 @@ type qemuArch interface {
 	getBARsMaxAddressableMemory() (uint64, uint64)

 	// append SEV object type to the VM definition
-	appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sev.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error)
+	appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sevKbs.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error)

 	// setup SEV guest prelaunch attestation
-	setupSEVGuestPreAttestation(ctx context.Context, config sev.GuestPreAttestationConfig) (string, error)
+	setupSEVGuestPreAttestation(ctx context.Context, config sevKbs.GuestPreAttestationConfig) (string, error)

 	// wait for prelaunch attestation to complete
 	sevGuestPreAttestation(ctx context.Context,
-		qmp *govmmQemu.QMP, config sev.GuestPreAttestationConfig) error
+		qmp *govmmQemu.QMP, config sevKbs.GuestPreAttestationConfig) error
 }

 type qemuArchBase struct {
@@ -902,20 +902,20 @@ func (q *qemuArchBase) appendProtectionDevice(devices []govmmQemu.Device, firmwa
 }

 // AMD SEV methods
-func (q *qemuArchBase) appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sev.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error) {
+func (q *qemuArchBase) appendSEVObject(devices []govmmQemu.Device, firmware, firmwareVolume string, config sevKbs.GuestPreAttestationConfig) ([]govmmQemu.Device, string, error) {
 	hvLogger.WithField("arch", runtime.GOARCH).Warnf("Confidential Computing has not been implemented for this architecture")
 	return devices, firmware, nil
 }

 // Setup SEV guest attestation
-func (q *qemuArchBase) setupSEVGuestPreAttestation(ctx context.Context, config sev.GuestPreAttestationConfig) (string, error) {
+func (q *qemuArchBase) setupSEVGuestPreAttestation(ctx context.Context, config sevKbs.GuestPreAttestationConfig) (string, error) {
 	hvLogger.WithField("arch", runtime.GOARCH).Warnf("Confidential Computing has not been implemented for this architecture")
 	return "", nil
 }

 // Wait for SEV prelaunch attestation to complete
 func (q *qemuArchBase) sevGuestPreAttestation(ctx context.Context,
-	qmp *govmmQemu.QMP, config sev.GuestPreAttestationConfig) error {
+	qmp *govmmQemu.QMP, config sevKbs.GuestPreAttestationConfig) error {
 	hvLogger.WithField("arch", runtime.GOARCH).Warnf("Confidential Computing has not been implemented for this architecture")
 	return nil
 }