Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

virtcontainers: network: Add VFIO hotplug support #620

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 26 additions & 2 deletions virtcontainers/physical_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package virtcontainers

import (
"encoding/hex"
"fmt"
"io/ioutil"
"os"
Expand All @@ -14,6 +15,7 @@ import (

"github.com/kata-containers/runtime/virtcontainers/device/config"
"github.com/kata-containers/runtime/virtcontainers/device/drivers"
"github.com/kata-containers/runtime/virtcontainers/utils"
"github.com/safchain/ethtool"
)

Expand Down Expand Up @@ -98,9 +100,31 @@ func (endpoint *PhysicalEndpoint) Detach(netNsCreated bool, netNsPath string) er
return bindNICToHost(endpoint)
}

// HotAttach for physical endpoint not supported yet
// HotAttach for physical endpoint
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about HotDetach()?

func (endpoint *PhysicalEndpoint) HotAttach(h hypervisor) error {
return fmt.Errorf("PhysicalEndpoint does not support Hot attach")
networkLogger().WithField("endpoint-type", "physical").Info("Attaching endpoint (hotplug)")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion:

Suggested change
networkLogger().WithField("endpoint-type", "physical").Info("Attaching endpoint (hotplug)")
networkLogger().WithField("endpoint-type", "physical").Info("Hot attaching endpoint")

Alternatively, add a field for hotplug.


// Unbind physical interface from host driver and bind to vfio
// so that it can be passed to qemu.
if err := bindNICToVFIO(endpoint); err != nil {
return err
}

// Generate a unique ID to be used for hypervisor commandline fields
randBytes, err := utils.GenerateRandomBytes(8)
if err != nil {
return err
}
id := hex.EncodeToString(randBytes)

// TODO: use device manager as general device management entrance
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you remove, or add an issue URL here maybe?

d := config.VFIODev{
ID: id,
BDF: endpoint.BDF,
}

_, err = h.hotplugAddDevice(d, vfioDev)
return err
}

// HotDetach for physical endpoint not supported yet
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/physical_endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestPhysicalEndpoint_HotAttach(t *testing.T) {
h := &mockHypervisor{}

err := v.HotAttach(h)
assert.Error(err)
assert.NoError(err)
}

func TestPhysicalEndpoint_HotDetach(t *testing.T) {
Expand Down