Merge pull request #9093 from sridhartigera/cherry-pick-host-ip-ebpf

[v3.27]Fix host IP parsing in eBPF and re-attach programs when host IP changes

felix/dataplane/linux/bpf_ep_mgr.go

@@ -652,14 +652,21 @@ func (m *bpfEndpointManager) GetIfaceQDiscInfo(ifaceName string) (bool, int, int
 	return qdisc.valid, qdisc.prio, qdisc.handle
 }
 
-func (m *bpfEndpointManager) updateHostIP(ip net.IP) {
+func (m *bpfEndpointManager) updateHostIP(ipAddr string) {
+	ip, _, err := net.ParseCIDR(ipAddr)
+	if err != nil {
+		ip = net.ParseIP(ipAddr)
+	}
 	if ip != nil {
 		m.hostIP = ip
 		// Should be safe without the lock since there shouldn't be any active background threads
 		// but taking it now makes us robust to refactoring.
 		m.ifacesLock.Lock()
 		for ifaceName := range m.nameToIface {
-			m.dirtyIfaceNames.Add(ifaceName)
+			m.withIface(ifaceName, func(iface *bpfInterface) (forceDirty bool) {
+				iface.dpState.readiness = ifaceNotReady
+				return true
+			})
 		}
 		m.ifacesLock.Unlock()
 	} else {
@@ -697,23 +704,23 @@ func (m *bpfEndpointManager) OnUpdate(msg interface{}) {
 	case *proto.HostMetadataUpdate:
 		if !m.ipv6Enabled && msg.Hostname == m.hostname {
 			log.WithField("HostMetadataUpdate", msg).Infof("Host IP changed: %s", msg.Ipv4Addr)
-			m.updateHostIP(net.ParseIP(msg.Ipv4Addr))
+			m.updateHostIP(msg.Ipv4Addr)
 		}
 	case *proto.HostMetadataV6Update:
 		if m.ipv6Enabled && msg.Hostname == m.hostname {
 			log.WithField("HostMetadataV6Update", msg).Infof("Host IPv6 changed: %s", msg.Ipv6Addr)
-			m.updateHostIP(net.ParseIP(msg.Ipv6Addr))
+			m.updateHostIP(msg.Ipv6Addr)
 		}
 	case *proto.HostMetadataV4V6Update:
 		if msg.Hostname != m.hostname {
 			break
 		}
 		if m.ipv6Enabled {
 			log.WithField("HostMetadataV4V6Update", msg).Infof("Host IPv6 changed: %s", msg.Ipv6Addr)
-			m.updateHostIP(net.ParseIP(msg.Ipv6Addr))
+			m.updateHostIP(msg.Ipv6Addr)
 		} else {
 			log.WithField("HostMetadataV4V6Update", msg).Infof("Host IP changed: %s", msg.Ipv4Addr)
-			m.updateHostIP(net.ParseIP(msg.Ipv4Addr))
+			m.updateHostIP(msg.Ipv4Addr)
 		}
 	case *proto.ServiceUpdate:
 		m.onServiceUpdate(msg)

felix/dataplane/linux/bpf_ep_mgr_test.go

@@ -58,11 +58,12 @@ import (
 )
 
 type mockDataplane struct {
-	mutex      sync.Mutex
-	lastProgID int
-	progs      map[string]int
-	policy     map[string]polprog.Rules
-	routes     map[ip.CIDR]struct{}
+	mutex       sync.Mutex
+	lastProgID  int
+	progs       map[string]int
+	numAttaches map[string]int
+	policy      map[string]polprog.Rules
+	routes      map[ip.CIDR]struct{}
 
 	ensureStartedFn    func()
 	ensureQdiscFn      func(string) (bool, error)
@@ -71,10 +72,11 @@ type mockDataplane struct {
 
 func newMockDataplane() *mockDataplane {
 	return &mockDataplane{
-		lastProgID: 5,
-		progs:      map[string]int{},
-		policy:     map[string]polprog.Rules{},
-		routes:     map[ip.CIDR]struct{}{},
+		lastProgID:  5,
+		progs:       map[string]int{},
+		numAttaches: map[string]int{},
+		policy:      map[string]polprog.Rules{},
+		routes:      map[ip.CIDR]struct{}{},
 	}
 }
 
@@ -114,6 +116,7 @@ func (m *mockDataplane) ensureProgramAttached(ap attachPoint) (bpf.AttachResult,
 	}
 
 	key := ap.IfaceName() + ":" + ap.HookName().String()
+	m.numAttaches[key] = m.numAttaches[key] + 1
 	if _, exists := m.progs[key]; exists {
 		return res, nil
 	}
@@ -189,6 +192,12 @@ func (m *mockDataplane) programAttached(key string) bool {
 	return m.progs[key] != 0
 }
 
+func (m *mockDataplane) numOfAttaches(key string) int {
+	m.mutex.Lock()
+	defer m.mutex.Unlock()
+	return m.numAttaches[key]
+}
+
 func (m *mockDataplane) setRoute(cidr ip.CIDR) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -439,6 +448,17 @@ var _ = Describe("BPF Endpoint Manager", func() {
 		}
 	}
 
+	genHostMetadataUpdate := func(ip string) func() {
+		return func() {
+			bpfEpMgr.OnUpdate(&proto.HostMetadataUpdate{
+				Hostname: "uthost",
+				Ipv4Addr: ip,
+			})
+			err := bpfEpMgr.CompleteDeferredWork()
+			Expect(err).NotTo(HaveOccurred())
+		}
+	}
+
 	hostEp := proto.HostEndpoint{
 		Name: "uthost-eth0",
 		PreDnatTiers: []*proto.TierInfo{
@@ -537,6 +557,26 @@ var _ = Describe("BPF Endpoint Manager", func() {
 		})
 	})
 
+	Context("with workload endpoints", func() {
+		JustBeforeEach(func() {
+			genWLUpdate("cali12345")()
+			genIfaceUpdate("cali12345", ifacemonitor.StateUp, 15)()
+		})
+
+		It("must re-attach programs when hostIP changes", func() {
+			Expect(dp.programAttached("cali12345:ingress")).To(BeTrue())
+			Expect(dp.programAttached("cali12345:egress")).To(BeTrue())
+			Expect(dp.numOfAttaches("cali12345:ingress")).To(Equal(1))
+			Expect(dp.numOfAttaches("cali12345:egress")).To(Equal(1))
+			genHostMetadataUpdate("5.6.7.8/32")()
+			Expect(dp.numOfAttaches("cali12345:ingress")).To(Equal(2))
+			Expect(dp.numOfAttaches("cali12345:egress")).To(Equal(2))
+			genHostMetadataUpdate("1.2.3.4")()
+			Expect(dp.numOfAttaches("cali12345:ingress")).To(Equal(3))
+			Expect(dp.numOfAttaches("cali12345:egress")).To(Equal(3))
+		})
+	})
+
 	Context("with eth0 up", func() {
 		JustBeforeEach(func() {
 			genPolicy("default", "mypolicy")()