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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 5B2A0C3A5A6 for ; Thu, 29 Aug 2019 12:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F8BF2080F for ; Thu, 29 Aug 2019 12:14:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=metanetworks.com header.i=@metanetworks.com header.b="CbN2t8nQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfH2MOX (ORCPT ); Thu, 29 Aug 2019 08:14:23 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:32864 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727420AbfH2MOX (ORCPT ); Thu, 29 Aug 2019 08:14:23 -0400 Received: by mail-wm1-f68.google.com with SMTP id r17so4023032wme.0 for ; Thu, 29 Aug 2019 05:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metanetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2+WQjTG7da5+ibgqeaWlUW2ZOIAqoqQ7Q8Ld80/qvh4=; b=CbN2t8nQeu0lwa1IDHV6s7yjYH2NcImLdGPPsFuSLDJMebC1SJ/WN4yTZmxNHZwLVy /W3W0WhXmrnbtUIk66TTmyKG8iJHQ3UP4/dTchXgJOf1OIBxxBCALug9gZZWCiewbdfT /iiVy0bSaPOvS9kDWBXnRQMoAxJpQsDsh0EsI= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2+WQjTG7da5+ibgqeaWlUW2ZOIAqoqQ7Q8Ld80/qvh4=; b=Dl1Oiot/pC9F5h5HltPd8vuHPxCf5434VYkMg1vMWrRTm1UnAHm6jeHPpLjloP1Dlh BrW/K8H3M7xNHZX8WSzMZf1NPzXDDraLyQwgBIAftJJ02iQzipjNKF6eCri1JX+BXiWc m7RhdcNs7hYqVJVQZd5ykmoIPYx07zC1AMLuIhaCmA3APmgeEBYEEIpl1Z3ISK/HMnR+ W12J1Pv6vIupwVKCEQThzIFf3cvDpc0bPv354MmVekFTdU8zIC2Iq1ZREeY2SiVyobGR e/szrGc0ILb/LIatZ9Cv1V0iGmAqHkI9REs77TB5xhIxyfr82IbSd2w/0S8uAr0ygYto QP5g== X-Gm-Message-State: APjAAAWWZyjW72MvUAomzIoy49R556bLJaruO3y/rQEEEyJzTUKUNYhH MG5oD3L4KPlyk+UHirRLoNNfu+WB0VFnCw== X-Google-Smtp-Source: APXvYqy+4utVWCqF6xvuoTJrn/HxaKm+H5oT1jpQzOigusVx+9686p6XWc48NkZbBIJwBHpL5L/2fw== X-Received: by 2002:a7b:cbce:: with SMTP id n14mr10291601wmi.47.1567080860450; Thu, 29 Aug 2019 05:14:20 -0700 (PDT) Received: from localhost.localdomain (bzq-82-81-225-244.cablep.bezeqint.net. [82.81.225.244]) by smtp.gmail.com with ESMTPSA id b3sm3696183wrm.72.2019.08.29.05.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2019 05:14:19 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: Daniel Borkmann , Yonghong Song Cc: Eric Dumazet , Alexei Starovoitov , netdev@vger.kernel.org, bpf@vger.kernel.org, Shmulik Ladkani Subject: [RFC PATCH bpf-next 2/2] test_bpf: Introduce 'gso_linear_no_head_frag' skb_segment test Date: Thu, 29 Aug 2019 15:13:44 +0300 Message-Id: <20190829121344.20675-3-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190829121344.20675-1-shmulik.ladkani@gmail.com> References: <20190829121344.20675-1-shmulik.ladkani@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Following reports of skb_segment() hitting a BUG_ON when working on GROed skbs which have their gso_size mangled (e.g. after a bpf_skb_change_proto call), add a reproducer test that mimics the input skbs that lead to the mentioned BUG_ON as in [1]. [1] https://lists.openwall.net/netdev/2019/08/26/110 Signed-off-by: Shmulik Ladkani --- lib/test_bpf.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 5e80cb3d3ca0..2fe1e3ab3c89 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -6859,6 +6859,60 @@ static __init struct sk_buff *build_test_skb(void) return NULL; } +static __init struct sk_buff *build_test_skb_linear_no_head_frag(void) +{ + unsigned int alloc_size = 2000; + unsigned int headroom = 102, doffset = 72, data_size = 1308; + struct sk_buff *skb[2]; + int i; + + /* skbs linked in a frag_list, both with linear data, with head_frag=0 + * (data allocated by kmalloc), both have tcp data of 1308 bytes + * (total payload is 2616 bytes). + * Data offset is 72 bytes (40 ipv6 hdr, 32 tcp hdr). Some headroom. + */ + for (i = 0; i < 2; i++) { + skb[i] = alloc_skb(alloc_size, GFP_KERNEL); + if (!skb[i]) { + if (i == 0) + goto err_skb0; + else + goto err_skb1; + } + + skb[i]->protocol = htons(ETH_P_IPV6); + skb_reserve(skb[i], headroom); + skb_put(skb[i], doffset + data_size); + skb_reset_network_header(skb[i]); + if (i == 0) + skb_reset_mac_header(skb[i]); + else + skb_set_mac_header(skb[i], -ETH_HLEN); + __skb_pull(skb[i], doffset); + } + + /* setup shinfo. + * mimic bpf_skb_proto_4_to_6, which resets gso_segs and assigns a + * reduced gso_size. + */ + skb_shinfo(skb[0])->gso_size = 1288; + skb_shinfo(skb[0])->gso_type = SKB_GSO_TCPV6 | SKB_GSO_DODGY; + skb_shinfo(skb[0])->gso_segs = 0; + skb_shinfo(skb[0])->frag_list = skb[1]; + + /* adjust skb[0]'s len */ + skb[0]->len += skb[1]->len; + skb[0]->data_len += skb[1]->len; + skb[0]->truesize += skb[1]->truesize; + + return skb[0]; + +err_skb1: + kfree_skb(skb[0]); +err_skb0: + return NULL; +} + struct skb_segment_test { const char *descr; struct sk_buff *(*build_skb)(void); @@ -6871,6 +6925,15 @@ static struct skb_segment_test skb_segment_tests[] __initconst = { .build_skb = build_test_skb, .features = NETIF_F_SG | NETIF_F_GSO_PARTIAL | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM + }, + { + .descr = "gso_linear_no_head_frag", + .build_skb = build_test_skb_linear_no_head_frag, + .features = NETIF_F_SG | NETIF_F_FRAGLIST | + NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_GSO | + NETIF_F_LLTX_BIT | NETIF_F_GRO | + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | + NETIF_F_HW_VLAN_STAG_TX_BIT } }; -- 2.19.1