Use Devlink when possible for NewPciNetDevice

Try to use devlink api to configure the linkType to be `ether`. If the card doesn't support this we fall back to netlink. This commit is a partial fix for k8snetworkplumbingwg#392 There are still cards the doesn't support the netlink api like intel xv710 Signed-off-by: Sebastian Sch <[email protected]>
SchSeba · Nov 23, 2021 · 05af4d4 · 05af4d4
1 parent 7488066
commit 05af4d4
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/pkg/netdevice/pciNetDevice.go b/pkg/netdevice/pciNetDevice.go
@@ -63,7 +63,6 @@ func NewPciNetDevice(dev *ghw.PCIDevice, rFactory types.ResourceFactory, rc *typ
 			}
 		}
 	}
-
 	pciDev, err := resources.NewPciDevice(dev, rFactory, infoProviders)
 	if err != nil {
 		return nil, err
@@ -82,7 +81,13 @@ func NewPciNetDevice(dev *ghw.PCIDevice, rFactory types.ResourceFactory, rc *typ
 	}
 
 	linkType := ""
-	if len(ifName) > 0 {
+	if _, err = utils.GetNetlinkProvider().GetDevLinkDevice(pciAddr); err == nil {
+		linkType = "ether"
+	}
+
+	if err != nil && len(ifName) > 0 {
+		glog.Warningf("Devlink query for device %s named %s is not supported trying netlink", pciAddr, ifName)
+
 		la, err := utils.GetNetlinkProvider().GetLinkAttrs(ifName)
 		if err != nil {
 			return nil, err

diff --git a/pkg/utils/mocks/NetlinkProvider.go b/pkg/utils/mocks/NetlinkProvider.go
diff --git a/pkg/utils/netlink_provider.go b/pkg/utils/netlink_provider.go
@@ -26,6 +26,8 @@ type NetlinkProvider interface {
 	GetLinkAttrs(ifName string) (*nl.LinkAttrs, error)
 	// GetDevLinkDeviceEswitchAttrs returns a devlink device's attributes
 	GetDevLinkDeviceEswitchAttrs(ifName string) (*nl.DevlinkDevEswitchAttr, error)
+	// GetDevLinkDevice returns a devlink device
+	GetDevLinkDevice(pfAddr string) (*nl.DevlinkDevice, error)
 }
 
 type defaultNetlinkProvider struct {
@@ -47,6 +49,15 @@ func (defaultNetlinkProvider) GetLinkAttrs(ifName string) (*nl.LinkAttrs, error)
 	return link.Attrs(), nil
 }
 
+// GetDevLinkDevice returns a devlink device
+func (defaultNetlinkProvider) GetDevLinkDevice(pfAddr string) (*nl.DevlinkDevice, error) {
+	dev, err := nl.DevLinkGetDeviceByName("pci", pfAddr)
+	if err != nil {
+		return nil, fmt.Errorf("error getting devlink device for net device %s %v", pfAddr, err)
+	}
+	return dev, nil
+}
+
 // GetDevLinkDeviceEswitchAttrs returns a devlink device's attributes
 func (defaultNetlinkProvider) GetDevLinkDeviceEswitchAttrs(pfAddr string) (*nl.DevlinkDevEswitchAttr, error) {
 	dev, err := nl.DevLinkGetDeviceByName("pci", pfAddr)

diff --git a/pkg/utils/testing.go b/pkg/utils/testing.go
@@ -86,6 +86,9 @@ func SetDefaultMockNetlinkProvider() {
 	mockProvider.
 		On("GetDevLinkDeviceEswitchAttrs", mock.AnythingOfType("string")).
 		Return(&nl.DevlinkDevEswitchAttr{Mode: "fakeMode"}, nil)
+	mockProvider.
+		On("GetDevLinkDevice", mock.AnythingOfType("string")).
+		Return(&nl.DevlinkDevice{}, nil)
 
 	SetNetlinkProviderInst(&mockProvider)
 }