Skip to content

Adding support for ARM64 LCOW #2606

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

Open
marma-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −4
Open

Adding support for ARM64 LCOW #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions cmd/runhcs/create-scratch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package main

import (
gcontext "context"
"runtime"

"github.com/Microsoft/hcsshim/internal/appargs"
"github.com/Microsoft/hcsshim/internal/lcow"
Expand Down Expand Up @@ -72,6 +73,13 @@ var createScratchCommand = cli.Command{
sizeGB = lcow.DefaultScratchSizeGB
}

if runtime.GOARCH == "arm64" {
// Direct-boot is not supported on ARM64, so disable KernelDirect even if the flag is set.
opts.KernelDirect = false
// ARM64 doesn't support VPMem yet, so disable it even if the flag is set.
opts.VPMemDeviceCount = 0
}

convertUVM, err := uvm.CreateLCOW(ctx, opts)
if err != nil {
return errors.Wrapf(err, "failed to create '%s'", opts.ID)
Expand Down
28 changes: 24 additions & 4 deletions internal/uvm/create_lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net"
"os"
"path/filepath"
"runtime"
"strings"

"github.com/Microsoft/go-winio"
Expand Down Expand Up @@ -181,6 +182,12 @@ func NewDefaultOptionsLCOW(id, owner string) *OptionsLCOW {

opts.UpdateBootFilesPath(context.TODO(), defaultLCOWOSBootFilesPath())

if runtime.GOARCH == "arm64" {
// ARM64 doesn't support KernelDirect, so disable it even if the flag is set.
opts.KernelDirect = false
// ARM64 doesn't support VPMem yet, so disable it even if the flag is set.
opts.VPMemDeviceCount = 0
}
return opts
}

Expand Down Expand Up @@ -218,11 +225,12 @@ func (opts *OptionsLCOW) UpdateBootFilesPath(ctx context.Context, path string) {
}).Debug("updated LCOW root filesystem to " + VhdFile)
}

if opts.KernelDirect {
if opts.KernelDirect && runtime.GOARCH != "arm64" {
// KernelDirect supports uncompressed kernel if the kernel is present.
// Default to uncompressed if on box. NOTE: If `kernel` is already
// uncompressed and simply named 'kernel' it will still be used
// uncompressed automatically.
// ARM64 doesn't support KernelDirect, so skip this logic in that case.
if _, err := os.Stat(filepath.Join(opts.BootFilesPath, UncompressedKernelFile)); err == nil {
opts.KernelFile = UncompressedKernelFile

Expand Down Expand Up @@ -807,14 +815,20 @@ func makeLCOWDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_ *hcs
vmDebugging := false
if opts.ConsolePipe != "" {
vmDebugging = true
kernelArgs += " 8250_core.nr_uarts=1 8250_core.skip_txen_test=1 console=ttyS0,115200"
if runtime.GOARCH == "arm64" {
kernelArgs += " console=ttyAMA0,115200"
} else {
kernelArgs += " 8250_core.nr_uarts=1 8250_core.skip_txen_test=1 console=ttyS0,115200"
}
doc.VirtualMachine.Devices.ComPorts = map[string]hcsschema.ComPort{
"0": { // Which is actually COM1
NamedPipe: opts.ConsolePipe,
},
}
} else {
kernelArgs += " 8250_core.nr_uarts=0"
if runtime.GOARCH != "arm64" {
kernelArgs += " 8250_core.nr_uarts=0"
}
}

if opts.EnableGraphicsConsole {
Expand All @@ -835,7 +849,7 @@ func makeLCOWDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_ *hcs
kernelArgs += " " + opts.KernelBootOptions
}

if !opts.VPCIEnabled {
if runtime.GOARCH != "arm64" && !opts.VPCIEnabled {
kernelArgs += ` pci=off`
}

Expand Down Expand Up @@ -967,6 +981,12 @@ func CreateLCOW(ctx context.Context, opts *OptionsLCOW) (_ *UtilityVM, err error
return nil, errors.Wrap(err, errBadUVMOpts.Error())
}

// KernelDirect and VPMem devices are not supported by Hyper-V on ARM64.
if runtime.GOARCH == "arm64" {
opts.KernelDirect = false
opts.VPMemDeviceCount = 0
}

// HCS config for SNP isolated vm is quite different to the usual case
var doc *hcsschema.ComputeSystem
if opts.SecurityPolicyEnabled {
Expand Down