This repository has been archived by the owner on May 12, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 374
virtcontainers: network: Add VFIO hotplug support #620
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -6,6 +6,7 @@ | |||||
package virtcontainers | ||||||
|
||||||
import ( | ||||||
"encoding/hex" | ||||||
"fmt" | ||||||
"io/ioutil" | ||||||
"os" | ||||||
|
@@ -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" | ||||||
) | ||||||
|
||||||
|
@@ -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 | ||||||
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)") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggestion:
Suggested change
Alternatively, add a field for |
||||||
|
||||||
// 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 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about
HotDetach()
?