From patchwork Tue Jan 12 21:16:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 12014831 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DA7CC433E0 for ; Tue, 12 Jan 2021 21:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 366CB23122 for ; Tue, 12 Jan 2021 21:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438172AbhALViQ (ORCPT ); Tue, 12 Jan 2021 16:38:16 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:18394 "EHLO mail-40134.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437135AbhALVRK (ORCPT ); Tue, 12 Jan 2021 16:17:10 -0500 Date: Tue, 12 Jan 2021 21:16:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1610486185; bh=u3+4dtI12OmkQzaD7GjfxNXM1iUxv1TVQoI7JU869+E=; h=Date:To:From:Cc:Reply-To:Subject:From; b=AU3JUpGUyjwX/rK4G8Gl0j95eog5GBxUw8OsqyF60R0HDEAf/Eczl2QEWG2ymKaYE 8/wFdVe7AsEADbDH+jA5CTk2rzsERtj7ZDwMVwV+zCYZn37sNOE5dcVa+Yd+kmA7kc 56Kb3GIlJiPPPOAEtkzm+idAeZQTQ6HrxngOzogKFnzNrgX3ds3D+Mqc2RoCunJIEv r1RRwmJSNdlfa7WGxpPhCR9IWWqZ5FznmMmYZxVP+vM6fnClGEeEx1UAElPCk+IHf6 cCkEn7Ria8I/p3+bkcSidM3qN5zQ2AAS6XDpNI5BZssUd65/JfSQTo7yEBYj7SFObm +QRk+z8TPtpwQ== To: "David S. Miller" , Jakub Kicinski From: Alexander Lobakin Cc: Eric Dumazet , Edward Cree , Willem de Bruijn , Steffen Klassert , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Lobakin Reply-To: Alexander Lobakin Subject: [PATCH net-next] udp: allow forwarding of plain (non-fraglisted) UDP GRO packets Message-ID: <20210112211536.261172-1-alobakin@pm.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Commit 9fd1ff5d2ac7 ("udp: Support UDP fraglist GRO/GSO.") actually not only added a support for fraglisted UDP GRO, but also tweaked some logics the way that non-fraglisted UDP GRO started to work for forwarding too. Tests showed that currently forwarding and NATing of plain UDP GRO packets are performed fully correctly, regardless if the target netdevice has a support for hardware/driver GSO UDP L4 or not. Add the last element and allow to form plain UDP GRO packets if there is no socket -> we are on forwarding path. Plain UDP GRO forwarding even shows better performance than fraglisted UDP GRO in some cases due to not wasting one skbuff_head per every segment. Signed-off-by: Alexander Lobakin --- net/ipv4/udp_offload.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index ff39e94781bf..9d71df3d52ce 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -460,12 +460,13 @@ struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb, if (skb->dev->features & NETIF_F_GRO_FRAGLIST) NAPI_GRO_CB(skb)->is_flist = sk ? !udp_sk(sk)->gro_enabled: 1; - if ((sk && udp_sk(sk)->gro_enabled) || NAPI_GRO_CB(skb)->is_flist) { + if (!sk || (sk && udp_sk(sk)->gro_enabled) || + NAPI_GRO_CB(skb)->is_flist) { pp = call_gro_receive(udp_gro_receive_segment, head, skb); return pp; } - if (!sk || NAPI_GRO_CB(skb)->encap_mark || + if (NAPI_GRO_CB(skb)->encap_mark || (skb->ip_summed != CHECKSUM_PARTIAL && NAPI_GRO_CB(skb)->csum_cnt == 0 && !NAPI_GRO_CB(skb)->csum_valid) ||