Skip to content

[27.x backport] vendor: vendor: github.com/vishvananda/netlink v1.3.x (084abd93d) and fix compatibility#48938

Merged
akerouanton merged 8 commits intomoby:27.xfrom
thaJeztah:27.x_backport_update_netlink
Dec 19, 2024
Merged

[27.x backport] vendor: vendor: github.com/vishvananda/netlink v1.3.x (084abd93d) and fix compatibility#48938
akerouanton merged 8 commits intomoby:27.xfrom
thaJeztah:27.x_backport_update_netlink

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 25, 2024 •
edited
Loading

@thaJeztah thaJeztah added this to the 27.4.0 milestone Nov 25, 2024
@thaJeztah
Copy link
Member Author

thaJeztah commented Nov 25, 2024

Needed for updating buildkit v0.18

@thaJeztah
Copy link
Member Author

thaJeztah commented Nov 25, 2024 •
edited
Loading

Missed an import somewhere;

#23 38.05 libnetwork/drivers/bridge/setup_ip_tables_linux.go:572:15: undefined: netlink
#23 38.05 libnetwork/drivers/bridge/setup_ip_tables_linux.go:573:23: undefined: netlink

maybe #48515 ?

@thaJeztah thaJeztah force-pushed the 27.x_backport_update_netlink branch from e235c6c to 9bcd31a Compare November 25, 2024 10:06
@thaJeztah thaJeztah self-assigned this Nov 25, 2024
@thaJeztah
Copy link
Member Author

thaJeztah commented Nov 25, 2024

Failures are unrelated, but are more flaky since recently; likely related to the runc 1.2 update

=== FAIL: amd64.integration.build TestBuildUserNamespaceValidateCapabilitiesAreV2 (17.08s)
Loaded image: busybox:latest
Loaded image: busybox:glibc
Loaded image: debian:bookworm-slim
Loaded image: hello-world:latest
Loaded image: arm32v7/hello-world:latest
    build_userns_linux_test.go:131: run produced invalid output: "", expected "/bin/sleep cap_net_bind_service=eip"
    
    
=== RUN   TestDiff
    diff_test.go:28: assertion failed: 
        --- expected
        +++ items
          []container.FilesystemChange(
        - 	{{Kind: s"A", Path: "/foo"}, {Kind: s"A", Path: "/foo/bar"}},
        + 	nil,
          )
        
--- FAIL: TestDiff (0.57s)

@thaJeztah thaJeztah mentioned this pull request Nov 25, 2024
Merged
5 tasks
@thaJeztah thaJeztah modified the milestones: 27.4.0, 27.4.1, 27.4.2 Dec 6, 2024
thaJeztah and others added 8 commits December 19, 2024 11:26
@thaJeztah
vendor: github.com/vishvananda/netlink v1.2.1
cbe4488 
Local changes related to:

- vishvananda/netlink@c96b03b
- vishvananda/netlink@dedb7ec

full diff: vishvananda/netlink@v1.2.1-beta.2...v1.2.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 6d0a5e3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/vishvananda/netlink v1.3.0
4729e44 
full diff: vishvananda/netlink@v1.2.1...v1.3.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 2c498c6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
Add nlutil functions to retry on netlink EINTR
3ca9a3b 
A recent change to the vishvananda/netlink package exposes
NLM_F_DUMP_INTR in some netlink responses as an EINTR (with
no data).

Retry the requests when that happens, up to five times, before
returning the error. The limit of five is arbitrary, on most
systems a single retry will be rare but, there's no guarantee
that a retry will succeed. So, on a very busy or misbehaving
system the error may still be returned. In most cases, this
will lead to failure of the operation being attempted (which
may lead to daemon startup failure, network initialisation
failure etc).

Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit 00bf437)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
Fix merge problem
87fc62a 
Commit f9c0103 (WSL2 mirrored-mode loopback) uses netlink funcs
that were removed/wrapped by commit 00bf437.

Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit 333cfa6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
Add linting rules to spot use of un-wrapped netlink functions.
14b30ae 
Spot netlink functions that may return EINTR because
network configuration changed during a state dump, and
point at the nlutil wrappers.

Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit edaa0eb)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
vendor: github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd…
c5e72db 
…93d350

Particularly for:
- Preserve results when NLM_F_DUMP_INTR is set (1018).
- Fix SetSendTimeout/SetReceiveTimeout (1012).

full diff: vishvananda/netlink@v1.3.0...084abd9

Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit fd0d008)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
Fix comments
4c50153 
Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit 2f02f45)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@robmry @thaJeztah
Discard ErrDumpInterrupted and return data after maxRetries
4141379 
Returning possibly inconsistent data avoids retrying indefinitely, and
matches the behaviour of vishvananda/netlink prior to version 1.2.1, in
which the NLM_F_DUMP_INTR flag was ignored.

Signed-off-by: Rob Murray <[email protected]>
(cherry picked from commit a0a0bba)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 27.x_backport_update_netlink branch from 9bcd31a to 4141379 Compare December 19, 2024 10:28
@thaJeztah
Copy link
Member Author

thaJeztah commented Dec 19, 2024

Rebased; minor conflicts in imports due to the modprobe PR already being merged in this branch;

@thaJeztah thaJeztah marked this pull request as ready for review December 19, 2024 10:34
@akerouanton akerouanton merged commit dde37eb into moby:27.x Dec 19, 2024
@thaJeztah thaJeztah deleted the 27.x_backport_update_netlink branch December 19, 2024 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akerouanton akerouanton akerouanton approved these changes

Assignees

@thaJeztah thaJeztah

Labels

area/dependencies area/networking Networking status/2-code-review

Projects

None yet

Milestone

27.5.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @akerouanton @robmry