From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 0A2C8C433DB for ; Fri, 26 Mar 2021 17:53:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3A7F61A27 for ; Fri, 26 Mar 2021 17:53:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbhCZRwp (ORCPT ); Fri, 26 Mar 2021 13:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbhCZRwU (ORCPT ); Fri, 26 Mar 2021 13:52:20 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524ADC0613AA for ; Fri, 26 Mar 2021 10:52:19 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id u21so9608901ejo.13 for ; Fri, 26 Mar 2021 10:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=VabkuKjLIRQQlc3i7w2ZMt66UrpEMnmCD5TRJbnvpTU=; b=R3VH+ZVQUfDS9x3Onensg1YF1qSIhYp5F7poOXsxPLs7Ykq9tr3P7xZOVFiXLnX83A m0AAZOM3JttQeBrnYlDCGJrl1yaglkL6vTZj1zo2OPLlqH3lJAXxf4WaPQEAEp75mnos loPxNLlGQE2mTS2h8mtkelPm8aGLinDPtw+fb43MebH0D+YH2fG5UPM6IeGz+Y2TQ4nz qXT/nwQzZxxUYgZ2jAbbKgewxdMxXQdZc6kOS2NV5D9I5+ODwGNak0qjaKD62+LQpMk2 EiNHAt3GfkH+7AsNvUBlyQNKtlpqNNQYI4VyocyFiLHnG0bvh+moj9KGjisXxKSytcR+ DSwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=VabkuKjLIRQQlc3i7w2ZMt66UrpEMnmCD5TRJbnvpTU=; b=NBLgGMrHlPnMYQXkfpSFwSZe8tv7/TeDy7ewj6Hv7lnPIo/ve7vDvNwPS4PQyneCCQ /9gxSGhWNIU2hvZAQ/tHeCqplgirIWZU/Lm1nrMfRikxxuObDKEf20oBxOHnfU9h9J/v /CcNmQ0Q4feLvPsOkUjfMhD7/stwtKmZMU44+4wDEzDbCD+IxBZfvLymRvrBu0pHukSr vLVexEDJ/lEjXvtwGT6S5cDAYOKZLoFRaPT/1MXK0v5pcIznafoQ6VNrAYt53lhxQqoj crAs5pCMDjgqZ6uC6vCVSxKyuz6RLzyhHHN/Wx9Txh0pK9GcV+hpLgNm/uj8DKtOWnAa kBxA== X-Gm-Message-State: AOAM533KKDRhfH07kAvsDLo0FHmBaESntg4PB2ZWfj69vDLSqGXCWcXw nezUx5TVDMRQGxF36fGt9D8ketBG+tU= X-Google-Smtp-Source: ABdhPJz1DECHdiYtD/zf+X94gJzcrF12MxcNONlB8+oOKXA7/76hRzXQedLp7xREivmOAKewCGe4TA== X-Received: by 2002:a17:906:f296:: with SMTP id gu22mr16468744ejb.20.1616781137471; Fri, 26 Mar 2021 10:52:17 -0700 (PDT) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com. [209.85.128.52]) by smtp.gmail.com with ESMTPSA id j25sm4630709edy.9.2021.03.26.10.52.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Mar 2021 10:52:16 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id g25so3439884wmh.0 for ; Fri, 26 Mar 2021 10:52:16 -0700 (PDT) X-Received: by 2002:a05:600c:4150:: with SMTP id h16mr14111788wmm.120.1616781135548; Fri, 26 Mar 2021 10:52:15 -0700 (PDT) MIME-Version: 1.0 References: <88b8993a835f87440fd875bcbb080d8b7f6ab1bb.1616692794.git.pabeni@redhat.com> In-Reply-To: <88b8993a835f87440fd875bcbb080d8b7f6ab1bb.1616692794.git.pabeni@redhat.com> From: Willem de Bruijn Date: Fri, 26 Mar 2021 13:51:38 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH net-next v2 3/8] udp: properly complete L4 GRO over UDP tunnel packet To: Paolo Abeni Cc: Network Development , "David S. Miller" , Jakub Kicinski , Steffen Klassert , Alexander Lobakin Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Mar 25, 2021 at 1:24 PM Paolo Abeni wrote: > > After the previous patch, the stack can do L4 UDP aggregation > on top of a UDP tunnel. > > In such scenario, udp{4,6}_gro_complete will be called twice. This function > will enter its is_flist branch immediately, even though that is only > correct on the second call, as GSO_FRAGLIST is only relevant for the > inner packet. > > Instead, we need to try first UDP tunnel-based aggregation, if the GRO > packet requires that. > > This patch changes udp{4,6}_gro_complete to skip the frag list processing > when while encap_mark == 1, identifying processing of the outer tunnel > header. > Additionally, clears the field in udp_gro_complete() so that we can enter > the frag list path on the next round, for the inner header. > > v1 -> v2: > - hopefully clarified the commit message > > Signed-off-by: Paolo Abeni Reviewed-by: Willem de Bruijn