specs-go,cdi: implement NetDevice injection.

Implement OCI Spec (Linux) NetDevice injection.

Signed-off-by: Krisztian Litkey <[email protected]>

Author: klihub

pkg/cdi/container-edits.go

@@ -113,6 +113,16 @@ func (e *ContainerEdits) Apply(spec *oci.Spec) error {
 		}
 	}
 
+	if e.NetDevices != nil {
+		// specgen is currently missing functionality to set Linux NetDevices,
+		// so we use a locally rolled function for now.
+		for _, dev := range e.NetDevices {
+			specgenAddLinuxNetDevice(&specgen, dev.HostIf, &oci.LinuxNetDevice{
+				Name: dev.Name,
+			})
+		}
+	}
+
 	if len(e.Mounts) > 0 {
 		for _, m := range e.Mounts {
 			specgen.RemoveMount(m.ContainerPath)
@@ -162,6 +172,14 @@ func (e *ContainerEdits) Apply(spec *oci.Spec) error {
 	return nil
 }
 
+func specgenAddLinuxNetDevice(specgen *ocigen.Generator, hostIf string, netDev *oci.LinuxNetDevice) {
+	if specgen == nil || netDev == nil {
+		return
+	}
+	ensureLinuxNetDevices(specgen.Config)
+	specgen.Config.Linux.NetDevices[hostIf] = *netDev
+}
+
 // Validate container edits.
 func (e *ContainerEdits) Validate() error {
 	if e == nil || e.ContainerEdits == nil {
@@ -191,6 +209,9 @@ func (e *ContainerEdits) Validate() error {
 			return err
 		}
 	}
+	if err := ValidateNetDevices(e.NetDevices); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -210,6 +231,7 @@ func (e *ContainerEdits) Append(o *ContainerEdits) *ContainerEdits {
 
 	e.Env = append(e.Env, o.Env...)
 	e.DeviceNodes = append(e.DeviceNodes, o.DeviceNodes...)
+	e.NetDevices = append(e.NetDevices, o.NetDevices...)
 	e.Hooks = append(e.Hooks, o.Hooks...)
 	e.Mounts = append(e.Mounts, o.Mounts...)
 	if o.IntelRdt != nil {
@@ -244,6 +266,9 @@ func (e *ContainerEdits) isEmpty() bool {
 	if e.IntelRdt != nil {
 		return false
 	}
+	if e.NetDevices != nil {
+		return false
+	}
 	return true
 }
 
@@ -257,6 +282,37 @@ func ValidateEnv(env []string) error {
 	return nil
 }
 
+// ValidateNetDevices validates the given net devices.
+func ValidateNetDevices(devices []*cdi.NetDevice) error {
+	var (
+		hostSeen = map[string]string{}
+		nameSeen = map[string]string{}
+	)
+
+	for _, dev := range devices {
+		if dev.HostIf == "" {
+			return errors.New("invalid net device, empty HostIf")
+		}
+		if dev.Name == "" {
+			return errors.New("invalid net device, empty Name")
+		}
+
+		if other, ok := hostSeen[dev.HostIf]; ok {
+			return fmt.Errorf("invalid net device, duplicate HostIf %q with names %q and %q",
+				dev.HostIf, dev.Name, other)
+		}
+		hostSeen[dev.HostIf] = dev.Name
+
+		if other, ok := nameSeen[dev.Name]; ok {
+			return fmt.Errorf("invalid net device, duplicate Name %q with HostIf %q and %q",
+				dev.Name, dev.HostIf, other)
+		}
+		nameSeen[dev.Name] = dev.HostIf
+	}
+
+	return nil
+}
+
 // DeviceNode is a CDI Spec DeviceNode wrapper, used for validating DeviceNodes.
 type DeviceNode struct {
 	*cdi.DeviceNode
@@ -351,6 +407,16 @@ func ensureOCIHooks(spec *oci.Spec) {
 	}
 }
 
+// Ensure OCI Spec Linux NetDevices map is not nil.
+func ensureLinuxNetDevices(spec *oci.Spec) {
+	if spec.Linux == nil {
+		spec.Linux = &oci.Linux{}
+	}
+	if spec.Linux.NetDevices == nil {
+		spec.Linux.NetDevices = map[string]oci.LinuxNetDevice{}
+	}
+}
+
 // sortMounts sorts the mounts in the given OCI Spec.
 func sortMounts(specgen *ocigen.Generator) {
 	mounts := specgen.Mounts()

specs-go/config.go

@@ -26,6 +26,7 @@ type Device struct {
 type ContainerEdits struct {
 	Env            []string      `json:"env,omitempty"            yaml:"env,omitempty"`
 	DeviceNodes    []*DeviceNode `json:"deviceNodes,omitempty"    yaml:"deviceNodes,omitempty"`
+	NetDevices     []*NetDevice  `json:"netDevices,omitempty"     yaml:"netDevices,omitempty"` // Added in v1.1.0
 	Hooks          []*Hook       `json:"hooks,omitempty"          yaml:"hooks,omitempty"`
 	Mounts         []*Mount      `json:"mounts,omitempty"         yaml:"mounts,omitempty"`
 	IntelRdt       *IntelRdt     `json:"intelRdt,omitempty"       yaml:"intelRdt,omitempty"`       // Added in v0.7.0
@@ -70,3 +71,9 @@ type IntelRdt struct {
 	EnableCMT     bool   `json:"enableCMT,omitempty"     yaml:"enableCMT,omitempty"`
 	EnableMBM     bool   `json:"enableMBM,omitempty"     yaml:"enableMBM,omitempty"`
 }
+
+// NetDevice represents an OCI [Linux]NetDevice to be added to the OCI Spec.
+type NetDevice struct {
+	HostIf string `json:"hostIf" yaml:"hostIf"`
+	Name   string `json:"name"   yaml:"name"`
+}