aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-09 09:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1513 from Pennyzct/vsock

Browse Source 
support-vsock: load vhost_vsock module if it isn't built-in
This commit is contained in:
James O. D. Hunt
2019-05-14 11:08:48 +01:00
committed by GitHub
parent bce1167c33 bce0d604e1
commit 576b8a510c
10 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cli/kata-check.go
View File

@@ -35,6 +35,9 @@ type kernelModule struct {
// maps parameter names to values
parameters map[string]string
// if it is definitely required
required bool
}
type vmContainerCapableDetails struct {
@@ -124,8 +127,11 @@ func haveKernelModule(module string) bool {
// Now, check if the module is unloaded, but available.
// And modprobe it if so.
cmd := exec.Command(modProbeCmd, module)
err := cmd.Run()
return err == nil
if output, err := cmd.CombinedOutput(); err != nil {
kataLog.WithField("module", module).WithError(err).Warnf("modprobe insert module failed: %s", string(output))
return false
}
return true
}
// checkCPU checks all required CPU attributes modules and returns a count of
@@ -200,7 +206,9 @@ func checkKernelModules(modules map[string]kernelModule, handler kernelParamHand
if !haveKernelModule(module) {
kataLog.WithFields(fields).Error("kernel property not found")
count++
if details.required {
count++
}
continue
}

47
cli/kata-check_amd64.go
View File

@@ -15,14 +15,15 @@ import (
)
const (
cpuFlagsTag = genericCPUFlagsTag
archCPUVendorField = genericCPUVendorField
archCPUModelField = genericCPUModelField
archGenuineIntel = "GenuineIntel"
archAuthenticAMD = "AuthenticAMD"
msgKernelVM = "Kernel-based Virtual Machine"
msgKernelVirtio = "Host kernel accelerator for virtio"
msgKernelVirtioNet = "Host kernel accelerator for virtio network"
cpuFlagsTag = genericCPUFlagsTag
archCPUVendorField = genericCPUVendorField
archCPUModelField = genericCPUModelField
archGenuineIntel = "GenuineIntel"
archAuthenticAMD = "AuthenticAMD"
msgKernelVM = "Kernel-based Virtual Machine"
msgKernelVirtio = "Host kernel accelerator for virtio"
msgKernelVirtioNet = "Host kernel accelerator for virtio network"
msgKernelVirtioVhostVsock = "Host Support for Linux VM Sockets"
)
// CPU types
@@ -75,17 +76,25 @@ func setCPUtype() error {
}
archRequiredKernelModules = map[string]kernelModule{
"kvm": {
desc: msgKernelVM,
desc: msgKernelVM,
required: true,
},
"kvm_intel": {
desc: "Intel KVM",
parameters: kvmIntelParams,
required: true,
},
"vhost": {
desc: msgKernelVirtio,
desc: msgKernelVirtio,
required: true,
},
"vhost_net": {
desc: msgKernelVirtioNet,
desc: msgKernelVirtioNet,
required: true,
},
"vhost_vsock": {
desc: msgKernelVirtioVhostVsock,
required: false,
},
}
} else if cpuType == cpuTypeAMD {
@@ -99,16 +108,24 @@ func setCPUtype() error {
}
archRequiredKernelModules = map[string]kernelModule{
"kvm": {
desc: msgKernelVM,
desc: msgKernelVM,
required: true,
},
"kvm_amd": {
desc: "AMD KVM",
desc: "AMD KVM",
required: true,
},
"vhost": {
desc: msgKernelVirtio,
desc: msgKernelVirtio,
required: true,
},
"vhost_net": {
desc: msgKernelVirtioNet,
desc: msgKernelVirtioNet,
required: true,
},
"vhost_vsock": {
desc: msgKernelVirtioVhostVsock,
required: false,
},
}
}

2
cli/kata-check_amd64_test.go
View File

@@ -171,6 +171,7 @@ func TestCheckCheckKernelModulesNoNesting(t *testing.T) {
"nested": "Y",
"unrestricted_guest": "Y",
},
required: true,
},
}
@@ -255,6 +256,7 @@ func TestCheckCheckKernelModulesNoUnrestrictedGuest(t *testing.T) {
"nested": "Y",
"unrestricted_guest": "Y",
},
required: true,
},
}

13
cli/kata-check_arm64.go
View File

@@ -30,13 +30,20 @@ var archRequiredCPUAttribs = map[string]string{}
// required module parameters.
var archRequiredKernelModules = map[string]kernelModule{
"kvm": {
desc: "Kernel-based Virtual Machine",
desc: "Kernel-based Virtual Machine",
required: true,
},
"vhost": {
desc: "Host kernel accelerator for virtio",
desc: "Host kernel accelerator for virtio",
required: true,
},
"vhost_net": {
desc: "Host kernel accelerator for virtio network",
desc: "Host kernel accelerator for virtio network",
required: true,
},
"vhost_vsock": {
desc: "Host Support for Linux VM Sockets",
required: false,
},
}

10
cli/kata-check_ppc64le.go
View File

@@ -42,10 +42,16 @@ var archRequiredCPUAttribs = map[string]string{}
// required module parameters.
var archRequiredKernelModules = map[string]kernelModule{
"kvm": {
desc: "Kernel-based Virtual Machine",
desc: "Kernel-based Virtual Machine",
required: true,
},
"kvm_hv": {
desc: "Kernel-based Virtual Machine hardware virtualization",
desc: "Kernel-based Virtual Machine hardware virtualization",
required: true,
},
"vhost_vsock": {
desc: "Host Support for Linux VM Sockets",
required: false,
},
}

7
cli/kata-check_s390x.go
View File

@@ -33,7 +33,12 @@ var archRequiredCPUAttribs = map[string]string{}
// required module parameters.
var archRequiredKernelModules = map[string]kernelModule{
"kvm": {
desc: "Kernel-based Virtual Machine",
desc: "Kernel-based Virtual Machine",
required: true,
},
"vhost_vsock": {
desc: "Host Support for Linux VM Sockets",
required: false,
},
}

8
cli/kata-check_test.go
View File

@@ -502,6 +502,7 @@ func TestCheckCheckKernelModules(t *testing.T) {
"foo": {
desc: "desc",
parameters: map[string]string{},
required: true,
},
"bar": {
desc: "desc",
@@ -511,6 +512,7 @@ func TestCheckCheckKernelModules(t *testing.T) {
"param3": "a",
"param4": ".",
},
required: true,
},
}
@@ -570,6 +572,7 @@ func TestCheckCheckKernelModulesUnreadableFile(t *testing.T) {
parameters: map[string]string{
"param1": "wibble",
},
required: true,
},
}
@@ -617,6 +620,7 @@ func TestCheckCheckKernelModulesInvalidFileContents(t *testing.T) {
parameters: map[string]string{
"param1": "wibble",
},
required: true,
},
}
@@ -713,6 +717,7 @@ func TestCheckKernelParamHandler(t *testing.T) {
"foo": {
desc: "desc",
parameters: map[string]string{},
required: true,
},
"bar": {
desc: "desc",
@@ -720,6 +725,7 @@ func TestCheckKernelParamHandler(t *testing.T) {
"param1": "hello",
"param2": "world",
},
required: true,
},
}
@@ -731,6 +737,7 @@ func TestCheckKernelParamHandler(t *testing.T) {
parameters: map[string]string{
"param1": "moo",
},
required: true,
},
}
@@ -740,6 +747,7 @@ func TestCheckKernelParamHandler(t *testing.T) {
parameters: map[string]string{
"param1": "bar",
},
required: true,
},
}

7
pkg/katautils/config_test.go
View File

@@ -719,13 +719,10 @@ func TestMinimalRuntimeConfigWithVsock(t *testing.T) {
[agent.kata]
`
orgVHostVSockDevicePath := utils.VHostVSockDevicePath
orgVSockDevicePath := utils.VSockDevicePath
defer func() {
utils.VHostVSockDevicePath = orgVHostVSockDevicePath
utils.VSockDevicePath = orgVSockDevicePath
}()
utils.VHostVSockDevicePath = "/dev/null"
utils.VSockDevicePath = "/dev/null"
configPath := path.Join(dir, "runtime.toml")
err = createConfig(configPath, runtimeMinimalConfig)
@@ -765,13 +762,10 @@ func TestNewQemuHypervisorConfig(t *testing.T) {
disableBlock := true
enableIOThreads := true
hotplugVFIOOnRootBus := true
orgVSockDevicePath := utils.VSockDevicePath
orgVHostVSockDevicePath := utils.VHostVSockDevicePath
defer func() {
utils.VSockDevicePath = orgVSockDevicePath
utils.VHostVSockDevicePath = orgVHostVSockDevicePath
}()
utils.VSockDevicePath = "/dev/abc/xyz"
utils.VHostVSockDevicePath = "/dev/abc/xyz"
hypervisor := hypervisor{
@@ -808,7 +802,6 @@ func TestNewQemuHypervisorConfig(t *testing.T) {
t.Fatal(err)
}
utils.VSockDevicePath = "/dev/null"
utils.VHostVSockDevicePath = "/dev/null"
// all paths exist now

7
virtcontainers/utils/utils.go
View File

@@ -29,9 +29,6 @@ const MibToBytesShift = 20
// See unix(7).
const MaxSocketPathLen = 107
// VSockDevicePath path to vsock device
var VSockDevicePath = "/dev/vsock"
// VHostVSockDevicePath path to vhost-vsock device
var VHostVSockDevicePath = "/dev/vhost-vsock"
@@ -234,10 +231,6 @@ func BuildSocketPath(elements ...string) (string, error) {
// SupportsVsocks returns true if vsocks are supported, otherwise false
func SupportsVsocks() bool {
if _, err := os.Stat(VSockDevicePath); err != nil {
return false
}
if _, err := os.Stat(VHostVSockDevicePath); err != nil {
return false
}

11
virtcontainers/utils/utils_test.go
View File

@@ -298,25 +298,14 @@ func TestBuildSocketPath(t *testing.T) {
func TestSupportsVsocks(t *testing.T) {
assert := assert.New(t)
orgVSockDevicePath := VSockDevicePath
orgVHostVSockDevicePath := VHostVSockDevicePath
defer func() {
VSockDevicePath = orgVSockDevicePath
VHostVSockDevicePath = orgVHostVSockDevicePath
}()
VSockDevicePath = "/abc/xyz/123"
VHostVSockDevicePath = "/abc/xyz/123"
assert.False(SupportsVsocks())
vSockDeviceFile, err := ioutil.TempFile("", "vsock")
assert.NoError(err)
defer os.Remove(vSockDeviceFile.Name())
defer vSockDeviceFile.Close()
VSockDevicePath = vSockDeviceFile.Name()
assert.False(SupportsVsocks())
vHostVSockFile, err := ioutil.TempFile("", "vhost-vsock")
assert.NoError(err)
defer os.Remove(vHostVSockFile.Name())