erdma using eri mac as pod-side veth hwaddr

Signed-off-by: bingshen.wbs <[email protected]>

pkg/eni/local.go

@@ -104,6 +104,7 @@ func (l *LocalIPResource) ToRPC() []*rpc.NetConf {
 			Trunk:     false,
 			Vid:       0,
 			GatewayIP: l.ENI.GatewayIP.ToRPC(),
+			ERDMA:     l.ENI.ERdma,
 		},
 		Pod:          nil,
 		IfName:       "",

plugin/datapath/policy_router_linux.go

@@ -303,12 +303,20 @@ func generateENICfgForPolicy(cfg *types.SetupConfig, link netlink.Link, table in
 }
 
 func (d *PolicyRoute) Setup(cfg *types.SetupConfig, netNS ns.NetNS) error {
+	eni, err := netlink.LinkByIndex(cfg.ENIIndex)
+	if err != nil {
+		return err
+	}
+
 	vethCfg := &veth.Veth{
 		IfName:   cfg.ContainerIfName,
 		PeerName: cfg.HostVETHName,
 		MTU:      cfg.MTU,
 	}
-	err := veth.Setup(vethCfg, netNS)
+	if cfg.ERDMA {
+		vethCfg.HwAddr = eni.Attrs().HardwareAddr
+	}
+	err = veth.Setup(vethCfg, netNS)
 	if err != nil {
 		return err
 	}
@@ -319,6 +327,7 @@ func (d *PolicyRoute) Setup(cfg *types.SetupConfig, netNS ns.NetNS) error {
 	}
 
 	err = netNS.Do(func(_ ns.NetNS) error {
+
 		// 2. add address for container interface
 		contLink, err := netlink.LinkByName(cfg.ContainerIfName)
 		if err != nil {
@@ -339,11 +348,6 @@ func (d *PolicyRoute) Setup(cfg *types.SetupConfig, netNS ns.NetNS) error {
 		return fmt.Errorf("setup container, %w", err)
 	}
 
-	eni, err := netlink.LinkByIndex(cfg.ENIIndex)
-	if err != nil {
-		return err
-	}
-
 	if cfg.EnableNetworkPriority {
 		err = utils.SetEgressPriority(eni, cfg.NetworkPriority, cfg.ContainerIPNet)
 		if err != nil {

plugin/driver/types/types.go

@@ -87,6 +87,7 @@ type SetupConfig struct {
 	GatewayIP       *terwayTypes.IPSet
 	MTU             int
 	ENIIndex        int
+	ERDMA           bool
 	ENIGatewayIP    *terwayTypes.IPSet
 
 	// disable create peer for exclusiveENI

plugin/driver/veth/veth.go

@@ -1,6 +1,8 @@
 package veth
 
 import (
+	"net"
+
 	"github.com/AliyunContainerService/terway/plugin/driver/utils"
 
 	"github.com/containernetworking/plugins/pkg/ip"
@@ -11,6 +13,7 @@ import (
 type Veth struct {
 	IfName   string // cont in netns
 	PeerName string
+	HwAddr   net.HardwareAddr
 	MTU      int
 }
 
@@ -39,6 +42,9 @@ func Setup(cfg *Veth, netNS ns.NetNS) error {
 		},
 		PeerName: cfg.PeerName,
 	}
+	if cfg.HwAddr != nil {
+		v.HardwareAddr = cfg.HwAddr
+	}
 	err = utils.LinkAdd(v)
 	if err != nil {
 		return err

plugin/terway/cni.go

@@ -251,6 +251,7 @@ func parseSetupConf(args *skel.CmdArgs, alloc *rpc.NetConf, conf *types.CNIConf,
 		deviceID       int32
 		trunkENI       bool
 		vid            uint32
+		erdma          bool
 
 		ingress         uint64
 		egress          uint64
@@ -302,6 +303,7 @@ func parseSetupConf(args *skel.CmdArgs, alloc *rpc.NetConf, conf *types.CNIConf,
 		}
 		trunkENI = alloc.GetENIInfo().GetTrunk()
 		vid = alloc.GetENIInfo().GetVid()
+		erdma = alloc.GetENIInfo().GetERDMA()
 		if alloc.GetENIInfo().GetGatewayIP() != nil {
 			eniGatewayIP, err = terwayTypes.ToIPSet(alloc.GetENIInfo().GetGatewayIP())
 			if err != nil {
@@ -357,6 +359,7 @@ func parseSetupConf(args *skel.CmdArgs, alloc *rpc.NetConf, conf *types.CNIConf,
 		GatewayIP:             gatewayIP,
 		MTU:                   conf.MTU,
 		ENIIndex:              int(deviceID),
+		ERDMA:                 erdma,
 		ENIGatewayIP:          eniGatewayIP,
 		ServiceCIDR:           serviceCIDR,
 		HostStackCIDRs:        hostStackCIDRs,

rpc/rpc.proto

@@ -56,6 +56,7 @@ message ENIInfo {
   bool Trunk = 2; // eni is trunk
   uint32 Vid = 3; // vlan ID
   IPSet GatewayIP = 4;
+  bool eRDMA = 5; // eni is eRDMA
 }
 
 message Route {