Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set MAC address after renaming the interface #280

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Set MAC address after renaming the interface #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 22 additions & 21 deletions pkg/sriov/sriov.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ func (s *sriovManager) SetupVF(conf *sriovtypes.NetConf, podifName string, netns
return fmt.Errorf("error getting VF netdevice with name %s", linkName)
}

// Save the original effective MAC address before overriding it
conf.OrigVfState.EffectiveMAC = linkObj.Attrs().HardwareAddr.String()

// tempName used as intermediary name to avoid name conflicts
tempName := fmt.Sprintf("%s%d", "temp_", linkObj.Attrs().Index)

Expand All @@ -87,23 +90,8 @@ func (s *sriovManager) SetupVF(conf *sriovtypes.NetConf, podifName string, netns
return fmt.Errorf("error setting temp IF name %s for %s", tempName, linkName)
}

// Save the original effective MAC address before overriding it
conf.OrigVfState.EffectiveMAC = linkObj.Attrs().HardwareAddr.String()
// 3. Set MAC address
if conf.MAC != "" {
logging.Debug("3. Set MAC address",
"func", "SetupVF",
"s.nLink", s.nLink,
"tempName", tempName,
"conf.MAC", conf.MAC)
err = utils.SetVFEffectiveMAC(s.nLink, tempName, conf.MAC)
if err != nil {
return fmt.Errorf("failed to set netlink MAC address to %s: %v", conf.MAC, err)
}
}

// 4. Change netns
logging.Debug("4. Change netns",
// 3. Change netns
logging.Debug("3. Change netns",
"func", "SetupVF",
"linkObj", linkObj,
"netns.Fd()", int(netns.Fd()))
Expand All @@ -112,22 +100,35 @@ func (s *sriovManager) SetupVF(conf *sriovtypes.NetConf, podifName string, netns
}

if err := netns.Do(func(_ ns.NetNS) error {
// 5. Set Pod IF name
logging.Debug("5. Set Pod IF name",
// 4. Set Pod IF name
logging.Debug("4. Set Pod IF name",
"func", "SetupVF",
"linkObj", linkObj,
"podifName", podifName)
if err := s.nLink.LinkSetName(linkObj, podifName); err != nil {
return fmt.Errorf("error setting container interface name %s for %s", linkName, tempName)
}

// 6. Enable IPv4 ARP notify and IPv6 Network Discovery notify
// 5. Enable IPv4 ARP notify and IPv6 Network Discovery notify
// Error is ignored here because enabling this feature is only a performance enhancement.
logging.Debug("6. Enable IPv4 ARP notify and IPv6 Network Discovery notify",
logging.Debug("5. Enable IPv4 ARP notify and IPv6 Network Discovery notify",
"func", "SetupVF",
"podifName", podifName)
_ = s.utils.EnableArpAndNdiscNotify(podifName)

// 6. Set MAC address
if conf.MAC != "" {
logging.Debug("6. Set MAC address",
"func", "SetupVF",
"s.nLink", s.nLink,
"podifName", podifName,
"conf.MAC", conf.MAC)
err = utils.SetVFEffectiveMAC(s.nLink, podifName, conf.MAC)
if err != nil {
return fmt.Errorf("failed to set netlink MAC address to %s: %v", conf.MAC, err)
}
}

// 7. Bring IF up in Pod netns
logging.Debug("7. Bring IF up in Pod netns",
"func", "SetupVF",
Expand Down
11 changes: 6 additions & 5 deletions pkg/sriov/sriov_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package sriov

import (
"github.com/k8snetworkplumbingwg/sriov-cni/pkg/utils"
"net"

"github.com/k8snetworkplumbingwg/sriov-cni/pkg/utils"

"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
"github.com/k8snetworkplumbingwg/sriov-cni/pkg/sriov/mocks"
Expand Down Expand Up @@ -100,17 +101,17 @@ var _ = Describe("Sriov", func() {
HardwareAddr: fakeMac,
}}

tempLink := &utils.FakeLink{LinkAttrs: netlink.LinkAttrs{
net1Link := &utils.FakeLink{LinkAttrs: netlink.LinkAttrs{
Index: 1000,
Name: "temp_1000",
Name: "net1",
HardwareAddr: expMac,
}}

mocked.On("LinkByName", "enp175s6").Return(fakeLink, nil)
mocked.On("LinkByName", "temp_1000").Return(tempLink, nil)
mocked.On("LinkByName", "net1").Return(net1Link, nil)
mocked.On("LinkSetDown", fakeLink).Return(nil)
mocked.On("LinkSetName", fakeLink, mock.Anything).Return(nil)
mocked.On("LinkSetHardwareAddr", tempLink, expMac).Return(nil)
mocked.On("LinkSetHardwareAddr", net1Link, expMac).Return(nil)
mocked.On("LinkSetNsFd", fakeLink, mock.AnythingOfType("int")).Return(nil)
mocked.On("LinkSetUp", fakeLink).Return(nil)
mockedPciUtils.On("EnableArpAndNdiscNotify", mock.AnythingOfType("string")).Return(nil)
Expand Down
Loading