From 991986992f77dda7e8e4cd9c9101622ba7557126 Mon Sep 17 00:00:00 2001 From: Marcelo Guerrero Date: Tue, 13 Jun 2023 15:51:09 +0200 Subject: [PATCH] Delete VF interface names length check Only a single VF interface name is used by the plugin. The ReleaseVF funtion incorrectly tries to verify that the incontainer and original interface names match. The variables are string, not slices. Signed-off-by: Marcelo Guerrero --- pkg/config/config.go | 10 +++--- pkg/sriov/sriov.go | 6 +--- pkg/sriov/sriov_test.go | 70 ++++++++++++++++++++--------------------- pkg/types/types.go | 2 +- pkg/utils/utils.go | 4 +-- pkg/utils/utils_test.go | 2 +- 6 files changed, 45 insertions(+), 49 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index b2b6f706e..5ba1b88ce 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -51,8 +51,8 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) { } // Assuming VF is netdev interface; Get interface name(s) - hostIFNames, err := utils.GetVFLinkNames(n.DeviceID) - if err != nil || hostIFNames == "" { + hostIFName, err := utils.GetVFLinkName(n.DeviceID) + if err != nil || hostIFName == "" { // VF interface not found; check if VF has dpdk driver hasDpdkDriver, err := utils.HasDpdkDriver(n.DeviceID) if err != nil { @@ -61,11 +61,11 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) { n.DPDKMode = hasDpdkDriver } - if hostIFNames != "" { - n.OrigVfState.HostIFName = hostIFNames + if hostIFName != "" { + n.OrigVfState.HostIFName = hostIFName } - if hostIFNames == "" && !n.DPDKMode { + if hostIFName == "" && !n.DPDKMode { return nil, fmt.Errorf("LoadConf(): the VF %s does not have a interface name or a dpdk driver", n.DeviceID) } diff --git a/pkg/sriov/sriov.go b/pkg/sriov/sriov.go index dbd007ab0..60cb3b4cc 100644 --- a/pkg/sriov/sriov.go +++ b/pkg/sriov/sriov.go @@ -115,7 +115,7 @@ func (s *sriovManager) SetupVF(conf *sriovtypes.NetConf, podifName string, netns }); err != nil { return "", fmt.Errorf("error setting up interface in container namespace: %q", err) } - conf.ContIFNames = podifName + conf.ContIFName = podifName return macAddress, nil } @@ -127,10 +127,6 @@ func (s *sriovManager) ReleaseVF(conf *sriovtypes.NetConf, podifName string, net return fmt.Errorf("failed to get init netns: %v", err) } - if len(conf.ContIFNames) < 1 && len(conf.ContIFNames) != len(conf.OrigVfState.HostIFName) { - return fmt.Errorf("number of interface names mismatch ContIFNames: %d HostIFNames: %d", len(conf.ContIFNames), len(conf.OrigVfState.HostIFName)) - } - return netns.Do(func(_ ns.NetNS) error { // get VF device linkObj, err := s.nLink.LinkByName(podifName) diff --git a/pkg/sriov/sriov_test.go b/pkg/sriov/sriov_test.go index 73b0eacce..f4820e427 100644 --- a/pkg/sriov/sriov_test.go +++ b/pkg/sriov/sriov_test.go @@ -32,10 +32,10 @@ var _ = Describe("Sriov", func() { BeforeEach(func() { podifName = "net1" netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", }, @@ -132,10 +132,10 @@ var _ = Describe("Sriov", func() { BeforeEach(func() { podifName = "net1" netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", EffectiveMAC: "6e:16:06:0e:b7:e9", @@ -157,7 +157,7 @@ var _ = Describe("Sriov", func() { fakeLink := &utils.FakeLink{LinkAttrs: netlink.LinkAttrs{Index: 1000, Name: "dummylink", HardwareAddr: fakeMac}} - mocked.On("LinkByName", netconf.ContIFNames).Return(fakeLink, nil) + mocked.On("LinkByName", netconf.ContIFName).Return(fakeLink, nil) mocked.On("LinkSetDown", fakeLink).Return(nil) mocked.On("LinkSetName", fakeLink, netconf.OrigVfState.HostIFName).Return(nil) mocked.On("LinkSetNsFd", fakeLink, mock.AnythingOfType("int")).Return(nil) @@ -176,10 +176,10 @@ var _ = Describe("Sriov", func() { BeforeEach(func() { podifName = "net1" netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", EffectiveMAC: "c6:c8:7f:1f:21:90", @@ -198,7 +198,7 @@ var _ = Describe("Sriov", func() { fakeLink := &utils.FakeLink{LinkAttrs: netlink.LinkAttrs{Index: 1000, Name: "dummylink"}} mocked := &mocks_utils.NetlinkManager{} - mocked.On("LinkByName", netconf.ContIFNames).Return(fakeLink, nil) + mocked.On("LinkByName", netconf.ContIFName).Return(fakeLink, nil) mocked.On("LinkSetDown", fakeLink).Return(nil) mocked.On("LinkSetName", fakeLink, netconf.OrigVfState.HostIFName).Return(nil) mocked.On("LinkSetNsFd", fakeLink, mock.AnythingOfType("int")).Return(nil) @@ -229,7 +229,7 @@ var _ = Describe("Sriov", func() { HardwareAddr: fakeMac, }} - mocked.On("LinkByName", netconf.ContIFNames).Return(fakeLink, nil) + mocked.On("LinkByName", netconf.ContIFName).Return(fakeLink, nil) mocked.On("LinkByName", netconf.OrigVfState.HostIFName).Return(tempLink, nil) mocked.On("LinkSetDown", fakeLink).Return(nil) mocked.On("LinkSetHardwareAddr", tempLink, fakeMac).Return(nil) @@ -248,10 +248,10 @@ var _ = Describe("Sriov", func() { BeforeEach(func() { netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", }, @@ -288,10 +288,10 @@ var _ = Describe("Sriov", func() { BeforeEach(func() { netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", }, @@ -320,18 +320,18 @@ var _ = Describe("Sriov", func() { minTxRate := 1000 netconf = &sriovtypes.NetConf{ - Master: "enp175s0f1", - DeviceID: "0000:af:06.0", - VFID: 0, - ContIFNames: "net1", - MAC: "d2:fc:22:a7:0d:e8", - Vlan: &vlan, - VlanQoS: &vlanQos, - SpoofChk: "on", - MaxTxRate: &maxTxRate, - MinTxRate: &minTxRate, - Trust: "on", - LinkState: "enable", + Master: "enp175s0f1", + DeviceID: "0000:af:06.0", + VFID: 0, + ContIFName: "net1", + MAC: "d2:fc:22:a7:0d:e8", + Vlan: &vlan, + VlanQoS: &vlanQos, + SpoofChk: "on", + MaxTxRate: &maxTxRate, + MinTxRate: &minTxRate, + Trust: "on", + LinkState: "enable", OrigVfState: sriovtypes.VfState{ HostIFName: "enp175s6", SpoofChk: false, diff --git a/pkg/types/types.go b/pkg/types/types.go index 75e08845c..ad0efa882 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -42,7 +42,7 @@ type NetConf struct { VlanQoS *int `json:"vlanQoS"` DeviceID string `json:"deviceID"` // PCI address of a VF in valid sysfs format VFID int - ContIFNames string // VF names after in the container; used during deletion + ContIFName string // VF name after in the container; used during deletion MinTxRate *int `json:"min_tx_rate"` // Mbps, 0 = disable rate limiting MaxTxRate *int `json:"max_tx_rate"` // Mbps, 0 = disable rate limiting SpoofChk string `json:"spoofchk,omitempty"` // on|off diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index fa5780fef..81bcf70f3 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -170,8 +170,8 @@ func GetSharedPF(ifName string) (string, error) { return pfName, fmt.Errorf("Shared PF not found") } -// GetVFLinkNames returns VF's network interface name given it's PCI addr -func GetVFLinkNames(pciAddr string) (string, error) { +// GetVFLinkName returns VF's network interface name given it's PCI addr +func GetVFLinkName(pciAddr string) (string, error) { var names []string vfDir := filepath.Join(SysBusPci, pciAddr, "net") if _, err := os.Lstat(vfDir); err != nil { diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index d77cb62d7..273f02e91 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -75,7 +75,7 @@ var _ = Describe("Utils", func() { // Expect(err).To(HaveOccurred(), "Looking for shared PF for not supported NIC should return an error") // }) }) - Context("Checking GetVFLinkNames function", func() { + Context("Checking GetVFLinkName function", func() { It("Assuming existing vf", func() { result, err := GetVFLinkNamesFromVFID("enp175s0f1", 0) Expect(result).To(ContainElement("enp175s6"), "Existing PF should have at least one VF")