From: Dongseok Yi <dseok.yi@samsung.com>
To: "David S. Miller" <davem@davemloft.net>,
Steffen Klassert <steffen.klassert@secunet.com>
Cc: namkyu78.kim@samsung.com, Alexander Lobakin <alobakin@pm.me>,
Dongseok Yi <dseok.yi@samsung.com>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net] udp: ipv4: manipulate network header of NATed UDP GRO fraglist
Date: Fri, 15 Jan 2021 14:58:24 +0900 [thread overview]
Message-ID: <1610690304-167832-1-git-send-email-dseok.yi@samsung.com> (raw)
In-Reply-To: <CGME20210115061039epcas2p479bc5f3dd3dad5a250c4e0fc42896704@epcas2p4.samsung.com>
UDP/IP header of UDP GROed frag_skbs are not updated even after NAT
forwarding. Only the header of head_skb from ip_finish_output_gso ->
skb_gso_segment is updated but following frag_skbs are not updated.
A call path skb_mac_gso_segment -> inet_gso_segment ->
udp4_ufo_fragment -> __udp_gso_segment -> __udp_gso_segment_list
does not try to update UDP/IP header of the segment list.
Update dport, daddr and checksums of each skb of the segment list
after __udp_gso_segment.
Fixes: 9fd1ff5d2ac7 (udp: Support UDP fraglist GRO/GSO.)
Signed-off-by: Dongseok Yi <dseok.yi@samsung.com>
---
Steffen Klassert said, there could be 2 options.
https://lore.kernel.org/patchwork/patch/1362257/
I was trying to write a quick fix, but it was not easy to forward
segmented list. Currently, assuming DNAT only. Should we consider
SNAT too?
net/ipv4/udp_offload.c | 45 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index ff39e94..7e24928 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -309,10 +309,12 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
netdev_features_t features)
{
struct sk_buff *segs = ERR_PTR(-EINVAL);
+ struct sk_buff *seg;
unsigned int mss;
__wsum csum;
- struct udphdr *uh;
- struct iphdr *iph;
+ struct udphdr *uh, *uh2;
+ struct iphdr *iph, *iph2;
+ bool is_fraglist = false;
if (skb->encapsulation &&
(skb_shinfo(skb)->gso_type &
@@ -327,8 +329,43 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
if (!pskb_may_pull(skb, sizeof(struct udphdr)))
goto out;
- if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4)
- return __udp_gso_segment(skb, features);
+ if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) {
+ if (skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST)
+ is_fraglist = true;
+
+ segs = __udp_gso_segment(skb, features);
+ if (IS_ERR_OR_NULL(segs) || !is_fraglist)
+ return segs;
+
+ seg = segs;
+ uh = udp_hdr(seg);
+ iph = ip_hdr(seg);
+
+ while ((seg = seg->next)) {
+ uh2 = udp_hdr(seg);
+ iph2 = ip_hdr(seg);
+
+ if (uh->dest == uh2->dest && iph->daddr == iph2->daddr)
+ continue;
+
+ if (uh2->check) {
+ inet_proto_csum_replace4(&uh2->check, seg,
+ iph2->daddr,
+ iph->daddr, true);
+ inet_proto_csum_replace2(&uh2->check, seg,
+ uh2->dest, uh->dest,
+ false);
+ if (!uh2->check)
+ uh2->check = CSUM_MANGLED_0;
+ }
+ uh2->dest = uh->dest;
+
+ csum_replace4(&iph2->check, iph2->daddr, iph->daddr);
+ iph2->daddr = iph->daddr;
+ }
+
+ return segs;
+ }
mss = skb_shinfo(skb)->gso_size;
if (unlikely(skb->len <= mss))
--
2.7.4
next parent reply other threads:[~2021-01-15 6:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20210115061039epcas2p479bc5f3dd3dad5a250c4e0fc42896704@epcas2p4.samsung.com>
2021-01-15 5:58 ` Dongseok Yi [this message]
2021-01-15 8:12 ` Steffen Klassert
2021-01-15 8:55 ` Dongseok Yi
2021-01-15 9:27 ` Steffen Klassert
2021-01-15 10:51 ` Alexander Lobakin
2021-01-15 11:21 ` Dongseok Yi
2021-01-15 13:12 ` Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1610690304-167832-1-git-send-email-dseok.yi@samsung.com \
--to=dseok.yi@samsung.com \
--cc=alobakin@pm.me \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namkyu78.kim@samsung.com \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=willemb@google.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®