kernel: backport RDMA/core route-entry loopback detection#17511
Open
AZaugg wants to merge 1 commit into
Open
Conversation
Backport upstream commit c31e4038c97f ("RDMA/core: Use route entry flag
to decide on loopback traffic") to the 6.6.139.1 AZL3 kernel.
In multi-NIC RoCE setups where the source and destination IPs live on
netdevs enslaved to a VRF, addr_resolve() picks the VRF as the next-hop
device. Because the VRF is not IFF_LOOPBACK, the existing loopback
detection misses the local route and rdma_set_src_addr_rcu() leaves the
RDMA destination MAC pointing at the VRF netdevice, causing ib_write_bw
to time out. The upstream fix replaces the IFF_LOOPBACK check with a
route-type (RTN_LOCAL / RTF_LOCAL) check so loopback is detected
correctly with or without VRF.
Adjustments for 6.6:
- dst_rtable() is not present in v6.6 yet; replaced with a direct
(const struct rtable *) cast (struct dst_entry is the first field of
struct rtable, so it is equivalent to the upstream container_of).
- Verified that the patch applies cleanly to both v6.6.121 and v6.6.139
(drivers/infiniband/core/addr.c is byte-identical between them).
Spec/manifest changes (Release 1 -> 2, matching the BBR3 / IKCONFIG_PROC
companion-bump pattern):
- SPECS/kernel/kernel.spec: add Patch1, bump Release
- SPECS/kernel/kernel-uki.spec: bump Release to match kernel
- SPECS/kernel-64k/kernel-64k.spec: bump Release to match kernel
- SPECS/kernel-headers/kernel-headers.spec: bump Release to match kernel
- SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec: bump Release to match kernel
- SPECS-SIGNED/kernel-signed/kernel-signed.spec: bump Release to match kernel
- SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec: bump Release to match kernel
- SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec: bump Release to match kernel
- toolkit/resources/manifests/package/{pkggen_core,toolchain}_{x86_64,aarch64}.txt:
bump kernel-headers / kernel-cross-headers to -2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Backport upstream commit c31e4038c97f ("RDMA/core: Use route entry flag to decide on loopback traffic") to the 6.6.139.1 AZL3 kernel.
In multi-NIC RoCE setups where the source and destination IPs live on netdevs enslaved to a VRF, addr_resolve() picks the VRF as the next-hop device. Because the VRF is not IFF_LOOPBACK, the existing loopback detection misses the local route and rdma_set_src_addr_rcu() leaves the RDMA destination MAC pointing at the VRF netdevice, causing ib_write_bw to time out. The upstream fix replaces the IFF_LOOPBACK check with a route-type (RTN_LOCAL / RTF_LOCAL) check so loopback is detected correctly with or without VRF.
Adjustments for 6.6:
Spec/manifest changes (Release 1 -> 2, matching the BBR3 / IKCONFIG_PROC companion-bump pattern):
Change Log
Does this affect the toolchain?
YES
Associated issues
Links to CVEs
Test Methodology