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=-12.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,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 5F50CC432BE for ; Sun, 8 Aug 2021 17:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EE9860F11 for ; Sun, 8 Aug 2021 17:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231963AbhHHRUJ (ORCPT ); Sun, 8 Aug 2021 13:20:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230049AbhHHRUE (ORCPT ); Sun, 8 Aug 2021 13:20:04 -0400 Received: from mail-vs1-xe36.google.com (mail-vs1-xe36.google.com [IPv6:2607:f8b0:4864:20::e36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86FE1C061760; Sun, 8 Aug 2021 10:19:44 -0700 (PDT) Received: by mail-vs1-xe36.google.com with SMTP id k24so8633641vsg.9; Sun, 08 Aug 2021 10:19:44 -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=vtiBarJA2O3XYt1tUFE/I5LovrEOojrmK31AlVK6Ol0=; b=a/kOWvI/nFqESMGbUxe4awyrXxSG9AUxnJLkwfbc/53URjXKXCluX48sji/6H+xGRd go6ijFKp4j0Dx9F3qi9p8TmQHMlAskeJJV/v323S6EjPrEgR2IU7FxoJNQdb6VMXADdD x575/rsA2+xNVEsrIBBvOQrl/Yi0Fxz15Xj0RC+mMfKNwcNGSlmb+uzf6te3FedrfZmP 5ffwidlhwiLn3LWYC+jJz+9GL5T8s/kGftz+7xQTeAjrkCPrwH2ZeBbwZXCMWvErQp4n 77VtXTH8740S2reUZN9dPLuLv9ebuFTU+Fq17YzJA+BqPfd/+ybuBo7cGMChpfuuKdlE vJrQ== 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=vtiBarJA2O3XYt1tUFE/I5LovrEOojrmK31AlVK6Ol0=; b=kOffy/+xBxbFyF0ICDv2qRvvriOl0dyUkPXLzIGV1sOFje2CR73EBLxgJSZCEfR4bp eS6mymN18xupINcy2ho0Gdt2JpJZkG/d0iPOZa6AHgF0USQYJRQZ8fKRMRC1C6pZ8+1Z 1G20AzwsEN3FPnoGJni7EyVKjuPdFqP149sLha/I9NQwzjtDmVEIfd8yWJA2KLFTWYim QfOCKWqLG92tESZ9K9TFULBUflWGFVwabg3L10xZrzhFNXq59tLJQa30AhDYrOObDIQa xOa2+ujpKsfzvz8uM8RCdT3cVZBGs3ONUpQqjpqSKulquyPD4KHmVVzfbhyJhaR18Dvv c5LA== X-Gm-Message-State: AOAM530DeMAjws9OydGiaak/jKZVHKtQcH8v8vaa+JWssJTBuIoN/GWM dDPtRVWp/JDG+iXSzjrj5tUjbomkoAcdNodJjOE= X-Google-Smtp-Source: ABdhPJxhh2JbB4V5du3GdOf5QgIqy4FLdeN4oyYjSTKkP/oHzfFW7y7jtyugIiNqZVzh0/OJMlCSGT/Yqg+RZhz524s= X-Received: by 2002:a67:16c1:: with SMTP id 184mr14134320vsw.14.1628443183656; Sun, 08 Aug 2021 10:19:43 -0700 (PDT) MIME-Version: 1.0 References: <20210808122411.10980-1-falakreyaz@gmail.com> In-Reply-To: From: Muhammad Falak Reyaz Date: Sun, 8 Aug 2021 22:49:32 +0530 Message-ID: Subject: Re: [PATCH] samples: bpf: xdp1: remove duplicate code to find protocol To: Yonghong Song Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, "open list:NETWORKING DRIVERS" , KP Singh , Song Liu , Martin KaFai Lau , John Fastabend , Jesper Dangaard Brouer , Jakub Kicinski , "David S . Miller" , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Aug 8, 2021 at 10:23 PM Yonghong Song wrote: > > > > On 8/8/21 5:24 AM, Muhammad Falak R Wani wrote: > > The code to find h_vlan_encapsulated_proto is duplicated. > > Remove the extra block. > > > > Signed-off-by: Muhammad Falak R Wani > > --- > > samples/bpf/xdp1_kern.c | 9 --------- > > 1 file changed, 9 deletions(-) > > > > diff --git a/samples/bpf/xdp1_kern.c b/samples/bpf/xdp1_kern.c > > index 34b64394ed9c..a35e064d7726 100644 > > --- a/samples/bpf/xdp1_kern.c > > +++ b/samples/bpf/xdp1_kern.c > > @@ -57,15 +57,6 @@ int xdp_prog1(struct xdp_md *ctx) > > > > h_proto = eth->h_proto; > > > > - if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) { > > - struct vlan_hdr *vhdr; > > - > > - vhdr = data + nh_off; > > - nh_off += sizeof(struct vlan_hdr); > > - if (data + nh_off > data_end) > > - return rc; > > - h_proto = vhdr->h_vlan_encapsulated_proto; > > No. This is not a duplicate. The h_proto in the above line will be used > in the below "if" condition. > > > - } > > if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) { > > struct vlan_hdr *vhdr; > > > > Apologies :( I now realize, it could be double vlan encapsulated. Would it make sense to add an explicit comment for newbies like me ? I can send a patch, if it is okay. -mfrw