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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A00C7C43381 for ; Wed, 6 Mar 2019 19:35:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7040720663 for ; Wed, 6 Mar 2019 19:35:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="odwTyMxm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728375AbfCFTfV (ORCPT ); Wed, 6 Mar 2019 14:35:21 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:42637 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726143AbfCFTfU (ORCPT ); Wed, 6 Mar 2019 14:35:20 -0500 Received: by mail-qk1-f196.google.com with SMTP id y140so7530651qkb.9 for ; Wed, 06 Mar 2019 11:35:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vNhHfOO0aboL3kbnndYylRCvlK6MRtnlfiXiGARSATQ=; b=odwTyMxmiLIJH5HMi4k7lEVJbiMr/b4ITvyp36t1YyShTK4GwFjrFSTl3Vm34mD/Q7 xJmPxq05C2xdRK9duARa7DK9ByvK0+YrZNY9QE3Id+lfXU+47L+qNdyjXzHJMyUNahnz 3UoEHeIYidCHkeu6S9jOWR8GJ8ZecflUKNED1aTiV/sXQnOvwb/+8QXlVDMK/IGoSQ4u nqe41m7njvKhUgzJtnzN8QptwxwDgKtB0d1Rpbw1mqk3hZmVDlBR38AeCNyWLcSE5OlI oT63THHn305J75jdwSTey3/6O1rFFkkPCvexYYYWbibzODgIkQ/f3CE50h5q9jz/YsWH yBfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vNhHfOO0aboL3kbnndYylRCvlK6MRtnlfiXiGARSATQ=; b=bbwWWuh6KXvobIcEBQ4ShqgiQJkePnPAZAYIVecxspaE5j41+T4ZniPp4FEECx7q5p zN9+g/bD094Sj6w8GdpTxlbE2HX1JV2PgA6+dHdoj6ky4+rS7WC7/JdQu8nXK0WFjQr5 xbgCPsqBmyFmuEzSM6IlKdiiPZC+Ph2AfyD7+Q7iMaz8UYdMFP6R5SL5RZYQbNOVvIdu pi5QI4YEMYRblD85Q8zZuRqq5Ldk1YZ9x/+D0OfCgxNazMX4Yzx7/3xOBpurI4VbK7mP IsgMF4TFgehvWGIRjfqXmcYPmmNXSnGQt+P/Dfbtod2BmaLjFVWD64ZsWxC2RF3IZoiV et5Q== X-Gm-Message-State: APjAAAV8KNrsojwxxfgf0VV46fw+Ipl9Hzbck0Hk3xrUGB9r2clunX9X 7oiLlKBrjKRUSRLQGusEIyLKlqLl X-Google-Smtp-Source: APXvYqy8jsUpFW2VY5g+nWIbMlzShANPB1KmF2Fil9NciAXr+r1LEOSJblA3EsTue6jgh1RfbPfa2w== X-Received: by 2002:a37:4887:: with SMTP id v129mr7346308qka.100.1551900919015; Wed, 06 Mar 2019 11:35:19 -0800 (PST) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id b10sm1709863qtb.93.2019.03.06.11.35.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 11:35:17 -0800 (PST) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, Willem de Bruijn Subject: [PATCH bpf] bpf: only test gso type on gso packets Date: Wed, 6 Mar 2019 14:35:15 -0500 Message-Id: <20190306193515.125072-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn BPF can adjust gso only for tcp bytestreams. Fail on other gso types. But only on gso packets. It does not touch this field if !gso_size. Fixes: b90efd225874 ("bpf: only adjust gso_size on bytestream protocols") Signed-off-by: Willem de Bruijn --- Stupid bug on my part. Found only when adding tests for the feature. Will try to upstream those once bpf-next opens. On a related note, also working on a flag BPF_F_ADJ_ROOM_FIXED_GSO that will allow reenabling this field for UDP (and possibly avoiding the expensive skb_cow for the TCP common case). --- include/linux/skbuff.h | 4 ++-- net/core/filter.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 27beb549ffbe1..f32f32407dc43 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -4232,10 +4232,10 @@ static inline bool skb_is_gso_sctp(const struct sk_buff *skb) return skb_shinfo(skb)->gso_type & SKB_GSO_SCTP; } +/* Note: Should be called only if skb_is_gso(skb) is true */ static inline bool skb_is_gso_tcp(const struct sk_buff *skb) { - return skb_is_gso(skb) && - skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6); + return skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6); } static inline void skb_gso_reset(struct sk_buff *skb) diff --git a/net/core/filter.c b/net/core/filter.c index 5ceba98069d46..f274620945ff0 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2804,7 +2804,7 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb) u32 off = skb_mac_header_len(skb); int ret; - if (!skb_is_gso_tcp(skb)) + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) return -ENOTSUPP; ret = skb_cow(skb, len_diff); @@ -2845,7 +2845,7 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb) u32 off = skb_mac_header_len(skb); int ret; - if (!skb_is_gso_tcp(skb)) + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) return -ENOTSUPP; ret = skb_unclone(skb, GFP_ATOMIC); @@ -2970,7 +2970,7 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 len_diff) u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb); int ret; - if (!skb_is_gso_tcp(skb)) + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) return -ENOTSUPP; ret = skb_cow(skb, len_diff); @@ -2999,7 +2999,7 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff) u32 off = skb_mac_header_len(skb) + bpf_skb_net_base_len(skb); int ret; - if (!skb_is_gso_tcp(skb)) + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) return -ENOTSUPP; ret = skb_unclone(skb, GFP_ATOMIC); -- 2.21.0.352.gf09ad66450-goog