Look for NLM_F_DUMP_INTR in more places

linkSubscribeAt, neighSubscribeAt, routeSubscribeAt - can do an initial dump, which may report inconsistent results -> if there's an error callback, call it with ErrNlmFDumpIntr socketDiagXDPExecutor - makes an NLM_F_DUMP request, without using Execute() -> give it the same behaviour as functions that do use Execute() Signed-off-by: Rob Murray <[email protected]>
vishvananda · Sep 9, 2024 · f04458f · f04458f
1 parent cf56f66
commit f04458f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/link_linux.go b/link_linux.go
@@ -2441,6 +2441,9 @@ func linkSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- LinkUpdate, done <-c
 				continue
 			}
 			for _, m := range msgs {
+				if m.Header.Flags&unix.NLM_F_DUMP_INTR != 0 && cberr != nil {
+					cberr(ErrNlmFDumpIntr)
+				}
 				if m.Header.Type == unix.NLMSG_DONE {
 					continue
 				}

diff --git a/neigh_linux.go b/neigh_linux.go
@@ -429,6 +429,9 @@ func neighSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- NeighUpdate, done <
 				continue
 			}
 			for _, m := range msgs {
+				if m.Header.Flags&unix.NLM_F_DUMP_INTR != 0 && cberr != nil {
+					cberr(ErrNlmFDumpIntr)
+				}
 				if m.Header.Type == unix.NLMSG_DONE {
 					if listExisting {
 						// This will be called after handling AF_UNSPEC

diff --git a/route_linux.go b/route_linux.go
@@ -1744,6 +1744,9 @@ func routeSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- RouteUpdate, done <
 				continue
 			}
 			for _, m := range msgs {
+				if m.Header.Flags&unix.NLM_F_DUMP_INTR != 0 && cberr != nil {
+					cberr(ErrNlmFDumpIntr)
+				}
 				if m.Header.Type == unix.NLMSG_DONE {
 					continue
 				}

diff --git a/socket_xdp_linux.go b/socket_xdp_linux.go
@@ -105,10 +105,10 @@ func SocketDiagXDP() ([]*XDPDiagInfoResp, error) {
 		result = append(result, res)
 		return nil
 	})
-	if err != nil {
+	if err != nil && !errors.Is(err, ErrNlmFDumpIntr) {
 		return nil, err
 	}
-	return result, nil
+	return result, err
 }
 
 // socketDiagXDPExecutor requests XDP_DIAG_INFO for XDP family sockets.
@@ -128,6 +128,7 @@ func socketDiagXDPExecutor(receiver func(syscall.NetlinkMessage) error) error {
 		return err
 	}
 
+	dumpIntr := false
 loop:
 	for {
 		msgs, from, err := s.Receive()
@@ -142,6 +143,9 @@ loop:
 		}
 
 		for _, m := range msgs {
+			if m.Header.Flags&unix.NLM_F_DUMP_INTR != 0 {
+				dumpIntr = true
+			}
 			switch m.Header.Type {
 			case unix.NLMSG_DONE:
 				break loop
@@ -154,6 +158,9 @@ loop:
 			}
 		}
 	}
+	if dumpIntr {
+		return ErrNlmFDumpIntr
+	}
 	return nil
 }