netfilter: nf_nat_core: don't check if the tuple is used if there is no other choice
Subsystems (3)
PATCH RESEND 1/1 netfilter: nf_nat_core: don't check if the tuple is used if there is no other choice
Eliminate nf_nat_used_tuple() to save some CPU cycles when there is no other choice.
Signed-off-by Changli Gao <[email protected]>
----
net/ipv4/netfilter/nf_nat_core.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
net/ipv4/netfilter/nf_nat_core.c +11 -5
@@ -262,11 +262,17 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, proto =__nf_nat_proto_find (orig_tuple->dst.protonum);/* Only bother mapping if it's not already in range and unique */ -if (!(range->flags &IP_NAT_RANGE_PROTO_RANDOM ) && - (!(range->flags &IP_NAT_RANGE_PROTO_SPECIFIED ) || - proto->in_range (tuple, maniptype, &range->min, &range->max)) && - !nf_nat_used_tuple (tuple, ct)) - goto out; +if (!(range->flags &IP_NAT_RANGE_PROTO_RANDOM )) { +if (range->flags &IP_NAT_RANGE_PROTO_SPECIFIED ) { +if (proto->in_range (tuple, maniptype, &range->min, + &range->max) && + (range->min.all == range->max.all || + !nf_nat_used_tuple (tuple, ct))) + goto out; + }else if (!nf_nat_used_tuple (tuple, ct)) { + goto out; + } + }/* Last change: get protocol to try to obtain unique tuple. */ proto->unique_tuple (tuple, range, maniptype, ct);
Patrick McHardy
AppliedQuoted 2 lines · Changli Gao
Eliminate
nf_nat_used_tuple()to save some CPU cycles when there is no other choice.
Applied.