bpf: nat: consistently use has_l4_header in IPv4 SNAT path #25741
Conversation
This file contains 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
We currently don't support IPv4 fragmentation in the SNAT path (or more precisely, we don't have support for loading the L4 ports of a fragment). But we already have two spots that correctly check whether the packet has a L4 header (or only requires L3 SNAT). Make this consistent across the whole flow, so that it also gets applied in the CT lookup. Passing this through to snat_v4_nat_handle_icmp_frag_needed() also avoids a revalidation of the outer header. Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
julianwiedmann
added
sig/datapath
|
/test |
gentoo-root
approved these changes
May 29, 2023
| @@ -1044,6 +1040,7 @@ snat_v4_nat(struct __ctx_buff *ctx, const struct ipv4_nat_target *target, __s8 * | |||
| return DROP_INVALID; | |||
|
|
|||
| snat_v4_init_tuple(ip4, NAT_DIR_EGRESS, &tuple); | |||
| has_l4_header = ipv4_has_l4_header(ip4); | |||
There was a problem hiding this comment.
This will be replaced by ipv4_ct_extract_l4_ports in #25340.
maintainer-s-little-helper
bot
added
ready-to-merge
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.
Clean up a redundant IPv4 header validation, and make the IPv4 SNAT code a bit more consistent.
Note that this won't help to actually fix IPv4 fragmentation vs SNAT. That's going to land via #25340.