netfilter: flowtable: reduce calls to pskb_may_pull()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: flowtable: reduce calls to pskb_may_pull()
Make two unfront calls to pskb_may_pull() to linearize the network and transport header.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_flow_table_core.c | 12 +++----- net/netfilter/nf_flow_table_ip.c | 45 +++++++++++++++++------------- 2 files changed, 30 insertions(+), 27 deletions(-)
net/netfilter/nf_flow_table_core.c +4 -8
@@ -395,8 +395,7 @@ static int nf_flow_nat_port_tcp(struct sk_buff *skb, unsigned int thoff, {struct tcphdr *tcph; -if (!pskb_may_pull (skb, thoff +sizeof (*tcph)) || -skb_try_make_writable (skb, thoff +sizeof (*tcph))) +if (skb_try_make_writable (skb, thoff +sizeof (*tcph)))return -1 ; tcph = (void *)(skb_network_header (skb) + thoff);
@@ -410,8 +409,7 @@ static int nf_flow_nat_port_udp(struct sk_buff *skb, unsigned int thoff, {struct udphdr *udph; -if (!pskb_may_pull (skb, thoff +sizeof (*udph)) || -skb_try_make_writable (skb, thoff +sizeof (*udph))) +if (skb_try_make_writable (skb, thoff +sizeof (*udph)))return -1 ; udph = (void *)(skb_network_header (skb) + thoff);
@@ -449,8 +447,7 @@ int nf_flow_snat_port(const struct flow_offload *flow,struct flow_ports *hdr;__be16 port, new_port; -if (!pskb_may_pull (skb, thoff +sizeof (*hdr)) || -skb_try_make_writable (skb, thoff +sizeof (*hdr))) +if (skb_try_make_writable (skb, thoff +sizeof (*hdr)))return -1 ; hdr = (void *)(skb_network_header (skb) + thoff);
@@ -481,8 +478,7 @@ int nf_flow_dnat_port(const struct flow_offload *flow,struct flow_ports *hdr;__be16 port, new_port; -if (!pskb_may_pull (skb, thoff +sizeof (*hdr)) || -skb_try_make_writable (skb, thoff +sizeof (*hdr))) +if (skb_try_make_writable (skb, thoff +sizeof (*hdr)))return -1 ; hdr = (void *)(skb_network_header (skb) + thoff);
net/netfilter/nf_flow_table_ip.c +26 -19
114 lines not on this page · raw message
Signature · 1 line
2.20.1