github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-31 16:36:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #861 from likebreath/clh_vfio_unplug

Browse Source 
clh: Support VFIO device unplug
This commit is contained in:
James O. D. Hunt
2020-10-06 09:47:19 +01:00
committed by GitHub
parent 4657983d80 c33ee54a21
commit 13e260a864
8 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/runtime/virtcontainers/clh.go
View File

@@ -429,15 +429,12 @@ func (clh *cloudHypervisor) hotplugAddBlockDevice(drive *config.BlockDrive) erro
" using '%v' but only support '%v'", clh.config.BlockDeviceDriver, config.VirtioBlock)
}
var err error
cl := clh.client()
ctx, cancel := context.WithTimeout(context.Background(), clhHotPlugAPITimeout*time.Second)
defer cancel()
_, _, err := cl.VmmPingGet(ctx)
if err != nil {
return openAPIClientError(err)
}
driveID := clhDriveIndexToID(drive.Index)
//Explicitly set PCIAddr to NULL, so that VirtPath can be used
@@ -466,12 +463,7 @@ func (clh *cloudHypervisor) hotPlugVFIODevice(device config.VFIODev) error {
ctx, cancel := context.WithTimeout(context.Background(), clhHotPlugAPITimeout*time.Second)
defer cancel()
_, _, err := cl.VmmPingGet(ctx)
if err != nil {
return openAPIClientError(err)
}
_, _, err = cl.VmAddDevicePut(ctx, chclient.VmAddDevice{Path: device.SysfsDev})
_, _, err := cl.VmAddDevicePut(ctx, chclient.VmAddDevice{Path: device.SysfsDev, Id: device.ID})
if err != nil {
err = fmt.Errorf("Failed to hotplug device %+v %s", device, openAPIClientError(err))
}
@@ -515,6 +507,20 @@ func (clh *cloudHypervisor) hotplugRemoveBlockDevice(drive *config.BlockDrive) e
return err
}
func (clh *cloudHypervisor) hotplugRemoveVfioDevice(device *config.VFIODev) error {
cl := clh.client()
ctx, cancel := context.WithTimeout(context.Background(), clhHotPlugAPITimeout*time.Second)
defer cancel()
_, err := cl.VmRemoveDevicePut(ctx, chclient.VmRemoveDevice{Id: device.ID})
if err != nil {
err = fmt.Errorf("failed to hotplug remove vfio device %+v %s", device, openAPIClientError(err))
}
return err
}
func (clh *cloudHypervisor) hotplugRemoveDevice(devInfo interface{}, devType deviceType) (interface{}, error) {
span, _ := clh.trace("hotplugRemoveDevice")
defer span.Finish()
@@ -522,6 +528,8 @@ func (clh *cloudHypervisor) hotplugRemoveDevice(devInfo interface{}, devType dev
switch devType {
case blockDev:
return nil, clh.hotplugRemoveBlockDevice(devInfo.(*config.BlockDrive))
case vfioDev:
return nil, clh.hotplugRemoveVfioDevice(devInfo.(*config.VFIODev))
default:
clh.Logger().WithFields(log.Fields{"devInfo": devInfo,
"deviceType": devType}).Error("hotplugRemoveDevice: unsupported device")

19
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
View File

@@ -828,7 +828,7 @@ components:
default: false
type: boolean
host_numa_node:
format: uint32
format: int32
type: integer
hotplug_size:
format: int64
@@ -896,7 +896,7 @@ components:
default: false
type: boolean
balloon_size:
format: uint64
format: int64
type: integer
zones:
items:
@@ -1172,10 +1172,10 @@ components:
destination: 3
properties:
destination:
format: uint32
format: int32
type: integer
distance:
format: uint8
format: int32
type: integer
required:
- destination
@@ -1197,11 +1197,11 @@ components:
guest_numa_id: 9
properties:
guest_numa_id:
format: uint32
format: int32
type: integer
cpus:
items:
format: uint8
format: int32
type: integer
type: array
distances:
@@ -1248,9 +1248,16 @@ components:
VmAddDevice:
example:
path: path
iommu: false
id: id
properties:
path:
type: string
iommu:
default: false
type: boolean
id:
type: string
type: object
VmRemoveDevice:
example:

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/MemoryConfig.md
View File

@@ -12,7 +12,7 @@ Name | Type | Description | Notes
**Shared** | **bool** | | [optional] [default to false]
**Hugepages** | **bool** | | [optional] [default to false]
**Balloon** | **bool** | | [optional] [default to false]
**BalloonSize** | **int32** | | [optional]
**BalloonSize** | **int64** | | [optional]
**Zones** | [**[]MemoryZoneConfig**](MemoryZoneConfig.md) | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/VmAddDevice.md
View File

@@ -5,6 +5,8 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**Path** | **string** | | [optional]
**Iommu** | **bool** | | [optional] [default to false]
**Id** | **string** | | [optional]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go
View File

@@ -18,6 +18,6 @@ type MemoryConfig struct {
Shared bool `json:"shared,omitempty"`
Hugepages bool `json:"hugepages,omitempty"`
Balloon bool `json:"balloon,omitempty"`
BalloonSize int32 `json:"balloon_size,omitempty"`
BalloonSize int64 `json:"balloon_size,omitempty"`
Zones []MemoryZoneConfig `json:"zones,omitempty"`
}

2
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go
View File

@@ -11,4 +11,6 @@ package openapi
// VmAddDevice struct for VmAddDevice
type VmAddDevice struct {
Path string `json:"path,omitempty"`
Iommu bool `json:"iommu,omitempty"`
Id string `json:"id,omitempty"`
}

17
src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
View File

@@ -492,7 +492,7 @@ components:
default: false
host_numa_node:
type: integer
format: uint32
format: int32
hotplug_size:
type: integer
format: int64
@@ -532,7 +532,7 @@ components:
default: false
balloon_size:
type: integer
format: uint64
format: int64
zones:
type: array
items:
@@ -754,10 +754,10 @@ components:
properties:
destination:
type: integer
format: uint32
format: int32
distance:
type: integer
format: uint8
format: int32
NumaConfig:
required:
@@ -766,12 +766,12 @@ components:
properties:
guest_numa_id:
type: integer
format: uint32
format: int32
cpus:
type: array
items:
type: integer
format: uint8
format: int32
distances:
type: array
items:
@@ -811,6 +811,11 @@ components:
properties:
path:
type: string
iommu:
type: boolean
default: false
id:
type: string
VmRemoveDevice:
type: object

2
versions.yaml
View File

@@ -75,7 +75,7 @@ assets:
url: "https://github.com/cloud-hypervisor/cloud-hypervisor"
uscan-url: >-
https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz
version: "c54452c08a467a3e35d8d72f2a91d424e9718c57"
version: "6d30fe05e4febd930d91bb36294f0219faf2254c"
firecracker:
description: "Firecracker micro-VMM"