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

sev-snp: add SEV device when security policy is present #1679

Merged
merged 2 commits into from
Apr 3, 2023
Merged

sev-snp: add SEV device when security policy is present #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b3760
sev-snp: add SEV device when security policy is present
anmaxvl Mar 1, 2023
a5db872
pr feedback: wrong err check
anmaxvl Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions internal/guest/runtime/hcsv2/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,24 @@ func applyAnnotationsToSpec(ctx context.Context, spec *oci.Spec) error {
return nil
}

// addDevSev adds SEV device to container spec. On 5.x kernel the device is /dev/sev,
// however this changed in 6.x where the device is /dev/sev-guest.
func addDevSev(ctx context.Context, spec *oci.Spec) error {
// try adding /dev/sev, which should be present for 5.x kernel
msscotb marked this conversation as resolved.
Show resolved Hide resolved
devSev, err := devices.DeviceFromPath("/dev/sev", "rwm")
if err != nil {
// try adding /dev/guest-sev, which should be present for 6.x kernel
sevErr := fmt.Errorf("failed to add SEV device to spec: %w", err)
var errSevGuest error
devSev, errSevGuest = devices.DeviceFromPath("/dev/sev-guest", "rwm")
if errSevGuest != nil {
return fmt.Errorf("%s: %w", sevErr, errSevGuest)
}
}
addLinuxDeviceToSpec(ctx, devSev, spec, true)
return nil
}

// devShmMountWithSize returns a /dev/shm device mount with size set to
// `sizeString` if it represents a valid size in KB, returns error otherwise.
func devShmMountWithSize(sizeString string) (*oci.Mount, error) {
Expand Down
10 changes: 10 additions & 0 deletions internal/guest/runtime/hcsv2/uvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,16 @@ func (h *Host) CreateContainer(ctx context.Context, id string, settings *prot.VM
if err := setupWorkloadContainerSpec(ctx, sid, id, settings.OCISpecification); err != nil {
return nil, err
}

// Add SEV device when security policy is not empty, except when privileged annotation is
// set to "true", in which case all UVMs devices are added.
if len(h.securityPolicyEnforcer.EncodedSecurityPolicy()) > 0 && !oci.ParseAnnotationsBool(ctx,
settings.OCISpecification.Annotations, annotations.LCOWPrivileged, false) {
if err := addDevSev(ctx, settings.OCISpecification); err != nil {
log.G(ctx).WithError(err).Debug("failed to add SEV device")
}
}

defer func() {
if err != nil {
_ = os.RemoveAll(settings.OCIBundlePath)
Expand Down