Merge pull request #477 from TrekkieCoder/main

PR - Better IFA handling
loxilb-io · Jan 2, 2024 · 2815358 · 2815358
2 parents 2cb9c58 + f518a0d
commit 2815358
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 7 deletions.
diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go
@@ -95,6 +95,9 @@ func NlpRegister(hook cmn.NetHookInterface) {
 }
 
 func iSBlackListedIntf(name string, masterIdx int) bool {
+	if name == "lo" {
+		return true
+	}
 	filter := nNl.BLRgx.MatchString(name)
 	return filter
 }

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/loxinet/layer3.go b/loxinet/layer3.go
@@ -100,8 +100,18 @@ func (l3 *L3H) IfaAdd(Obj string, Cidr string) (int, error) {
 		ra := RtAttr{0, 0, false, ifObjID}
 		_, err = mh.zr.Rt.RtAdd(*network, RootZone, ra, nil)
 		if err != nil {
-			tk.LogIt(tk.LogDebug, "ifa add - %s:%s self-rt error\n", addr.String(), Obj)
-			return L3AddrErr, errors.New("self-route add error")
+			tk.LogIt(tk.LogDebug, "ifa add - %s:%s subnet-rt error\n", addr.String(), Obj)
+			return L3AddrErr, errors.New("subnet-route add error")
+		} else if sz, _ := net.IPMask(network.Mask).Size(); sz != 32 && sz != 128 {
+			myAddr, myNet, err := net.ParseCIDR(addr.String() + "/32")
+			if err != nil {
+				return L3AddrErr, errors.New("myip address parse error")
+			}
+			_, err = mh.zr.Rt.RtAdd(*myNet, RootZone, ra, nil)
+			if err != nil {
+				tk.LogIt(tk.LogDebug, " - %s:%s my-self-rt error\n", myAddr.String(), Obj)
+				return L3AddrErr, errors.New("my-self-route add error")
+			}
 		}
 
 		ifa.DP(DpCreate)
@@ -140,8 +150,18 @@ func (l3 *L3H) IfaAdd(Obj string, Cidr string) (int, error) {
 	ra := RtAttr{0, 0, false, ifObjID}
 	_, err = mh.zr.Rt.RtAdd(*network, RootZone, ra, nil)
 	if err != nil {
-		tk.LogIt(tk.LogDebug, " - %s:%s self-rt error\n", addr.String(), Obj)
-		return L3AddrErr, errors.New("self-route add error")
+		tk.LogIt(tk.LogDebug, " - %s:%s subnet-rt error\n", addr.String(), Obj)
+		return L3AddrErr, errors.New("subnet-route add error")
+	} else if sz, _ := net.IPMask(network.Mask).Size(); sz != 32 && sz != 128 {
+		myAddr, myNet, err := net.ParseCIDR(addr.String() + "/32")
+		if err != nil {
+			return L3AddrErr, errors.New("myip address parse error")
+		}
+		_, err = mh.zr.Rt.RtAdd(*myNet, RootZone, ra, nil)
+		if err != nil {
+			tk.LogIt(tk.LogDebug, " - %s:%s my-self-rt error\n", myAddr.String(), Obj)
+			return L3AddrErr, errors.New("my-self-route add error")
+		}
 	}
 
 	ifa.DP(DpCreate)
@@ -185,13 +205,23 @@ func (l3 *L3H) IfaDelete(Obj string, Cidr string) (int, error) {
 		}
 	}
 
-	if found == true {
+	if found {
 		// delete self-routes related to this ifa
 		_, err = mh.zr.Rt.RtDelete(*network, RootZone)
 		if err != nil {
-			tk.LogIt(tk.LogError, "ifa delete %s:%s self-rt error\n", addr.String(), Obj)
+			tk.LogIt(tk.LogError, "ifa delete %s:%s subnet-rt error\n", addr.String(), Obj)
 			// Continue after logging error because there is noway to fallback
 		}
+		if sz, _ := net.IPMask(network.Mask).Size(); sz != 32 && sz != 128 {
+			myAddr, myNet, err := net.ParseCIDR(addr.String() + "/32")
+			if err == nil {
+				_, err = mh.zr.Rt.RtDelete(*myNet, RootZone)
+				if err != nil {
+					tk.LogIt(tk.LogError, "ifa delete %s:%s my-self-rt error\n", myAddr.String(), Obj)
+					// Continue after logging error because there is noway to fallback
+				}
+			}
+		}
 		if len(ifa.Ifas) == 0 {
 			delete(l3.IfaMap, ifa.Key)
+1 −0		common/llb_dp_mdi.h
+6 −3		kernel/llb_kern_cdefs.h
+2 −2		kernel/llb_kern_devif.c
+5 −2		kernel/llb_kern_entry.c