From patchwork Fri Oct 25 13:42:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 1184178 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=metanetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=metanetworks.com header.i=@metanetworks.com header.b="DCTyf7cV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47050D48Fjz9sPZ for ; Sat, 26 Oct 2019 00:42:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504882AbfJYNmt (ORCPT ); Fri, 25 Oct 2019 09:42:49 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42987 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504861AbfJYNmq (ORCPT ); Fri, 25 Oct 2019 09:42:46 -0400 Received: by mail-wr1-f67.google.com with SMTP id r1so2387015wrs.9 for ; Fri, 25 Oct 2019 06:42:44 -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; bh=1OsxlGx4dpojTzUak80H04gkaR1TDJmd4W+iyvcK8C0=; b=DCTyf7cVC3ZlsaT0xU4JJZNVB5j2W+8BRagzbQFGHC1N74b1Jgxs8GU3H2aiAGCGKG GEfUbqHkqiJ3XtOUbHhZQGP1MS8lpSTh4DEtcdHQvULR1GKN8jjYB1doQxiF1Tnk5DZx 0QyONEv1h+r+Dcj8DO/+M60EhzbXWp+bUBFwA= 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; bh=1OsxlGx4dpojTzUak80H04gkaR1TDJmd4W+iyvcK8C0=; b=n1FbC0RRy2cy5vrPSvquOsRpxMUdtB8YNK3ES/EY08fubzyrYfR+5yYUq/qK+R8+4U HHBj12u9lftThnxJgp3wTevaTCXE0KYoQIuErXDk8J0gKWR2u38DY/cUwYfaeUitcVs2 d10LRd5r5ZFe729XkqYG5z9fJqTNtz31wZnNlsZR25bhNzYqmchtsxI0xfdkoOhHz8X4 6u7r+Hi4jIdtHDb0ldVkoiWM2o3HJefRrdWpuK3auWFrQsTiElSWzEI6gNFmKLY90pOl tZAOk/+MZRX8T12JUDShe1qnrolTYcKQXRJDKH3GbGH/1ysrsDAZoBMRs3D9s4NSr4KG BtAg== X-Gm-Message-State: APjAAAWuZwXcc6sRH51Tba1vLi7lPgHh9vTje9XDv8uqYoK4kYG2l1Lu xM8OvrYKwppkRzJd2xS1g9zRIg== X-Google-Smtp-Source: APXvYqw9u7FIiY+/mm0Eou36Py5qQCsmqyinqQ4wF6cZc02EYCfLvNR7pc4IxcvUI7Wz5Heu9lKAQQ== X-Received: by 2002:a05:6000:1051:: with SMTP id c17mr3050469wrx.124.1572010963665; Fri, 25 Oct 2019 06:42:43 -0700 (PDT) Received: from localhost.localdomain ([94.230.83.169]) by smtp.gmail.com with ESMTPSA id v11sm2194730wrw.97.2019.10.25.06.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 06:42:43 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Shmulik Ladkani Subject: [PATCH bpf-next 1/2] test_bpf: Refactor test_skb_segment() to allow testing skb_segment() on numerous different skbs Date: Fri, 25 Oct 2019 16:42:22 +0300 Message-Id: <20191025134223.2761-2-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025134223.2761-1-shmulik.ladkani@gmail.com> References: <20191025134223.2761-1-shmulik.ladkani@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, test_skb_segment() builds a single test skb and runs skb_segment() on it. Extend test_skb_segment() so it processes an array of numerous skb/feature pairs to test. Signed-off-by: Shmulik Ladkani --- lib/test_bpf.c | 51 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 5ef3eccee27c..c952df82b515 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -6859,34 +6859,65 @@ static __init struct sk_buff *build_test_skb(void) return NULL; } -static __init int test_skb_segment(void) -{ +struct skb_segment_test { + const char *descr; + struct sk_buff *(*build_skb)(void); netdev_features_t features; +}; + +static struct skb_segment_test skb_segment_tests[] __initconst = { + { + .descr = "gso_with_rx_frags", + .build_skb = build_test_skb, + .features = NETIF_F_SG | NETIF_F_GSO_PARTIAL | NETIF_F_IP_CSUM | + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM + } +}; + +static __init int test_skb_segment_single(const struct skb_segment_test *test) +{ struct sk_buff *skb, *segs; int ret = -1; - features = NETIF_F_SG | NETIF_F_GSO_PARTIAL | NETIF_F_IP_CSUM | - NETIF_F_IPV6_CSUM; - features |= NETIF_F_RXCSUM; - skb = build_test_skb(); + skb = test->build_skb(); if (!skb) { pr_info("%s: failed to build_test_skb", __func__); goto done; } - segs = skb_segment(skb, features); + segs = skb_segment(skb, test->features); if (!IS_ERR(segs)) { kfree_skb_list(segs); ret = 0; - pr_info("%s: success in skb_segment!", __func__); - } else { - pr_info("%s: failed in skb_segment!", __func__); } kfree_skb(skb); done: return ret; } +static __init int test_skb_segment(void) +{ + int i, err_cnt = 0, pass_cnt = 0; + + for (i = 0; i < ARRAY_SIZE(skb_segment_tests); i++) { + const struct skb_segment_test *test = &skb_segment_tests[i]; + + pr_info("#%d %s ", i, test->descr); + + if (test_skb_segment_single(test)) { + pr_cont("FAIL\n"); + err_cnt++; + } else { + pr_cont("PASS\n"); + pass_cnt++; + } + } + + pr_info("%s: Summary: %d PASSED, %d FAILED\n", __func__, + pass_cnt, err_cnt); + return err_cnt ? -EINVAL : 0; +} + static __init int test_bpf(void) { int i, err_cnt = 0, pass_cnt = 0; From patchwork Fri Oct 25 13:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 1184177 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=metanetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=metanetworks.com header.i=@metanetworks.com header.b="Li6TPKlS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47050C2qMYz9sPL for ; Sat, 26 Oct 2019 00:42:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504886AbfJYNmt (ORCPT ); Fri, 25 Oct 2019 09:42:49 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36495 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504875AbfJYNms (ORCPT ); Fri, 25 Oct 2019 09:42:48 -0400 Received: by mail-wr1-f65.google.com with SMTP id w18so2419697wrt.3 for ; Fri, 25 Oct 2019 06:42:47 -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; bh=0mnmJjgSlbBJ30kBXAxihFKleD83aqV+FTUAUtrG3yA=; b=Li6TPKlS1dN7+hG4fVg7M1mBLXyZSf07oSkHnNQubaNALerMXZKLDxK7R9u+lzqxCy ogprTCWDbICgJw0yomR4qlKWK64bTcZ7INGxfNig4hcYRHNrTzDv69+wbwZzcR6lhuf7 fyzfxPa1PjHRBK+jFpQ/Gv7TKnU4DXkigWg+0= 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; bh=0mnmJjgSlbBJ30kBXAxihFKleD83aqV+FTUAUtrG3yA=; b=M6LCuu4+TbVfrD4uDkQ9fH4476dSmsjBiiQEMg3Ujp/nBf7nGGZ6jQoUcViG41dkzz h43KeuwYvdFBriRrbV3uMt2bKqmK1fXK4QD79NNqyUNexgmxC/OBz1fj2Zrxlea6Coes GHwddQoNlaKfPdmsALN3/pv/lS2QZ/r0i1E/gGNZktBJhI0IcubEjtrCHLZwqguletxY QqgOhrYl/i5GAIqHMMbKGi5LvIRKZ/t8e5fkWFooySapidIO6PNX9er1YrCpcsXUbvFu +pit1Ngco8wrLIh/GQH/ORhQROM3TnSRJekryOQsptLI8zpZRxV9aXVXRDOttlsdp8AR TXjw== X-Gm-Message-State: APjAAAX61D9/JaikMBjjKtye1t61ictCt0HGuKpXq6sN/86ha9Yp6orX ktcMRPZi9VhOv1LWfysqC84Nxw== X-Google-Smtp-Source: APXvYqwupdv7Fh2oROTvgM21NgJagri/TBE8LfHiqS9h+SXH5+3S+USNhdGzYSHXAQdz0PZWE1FJkQ== X-Received: by 2002:adf:e585:: with SMTP id l5mr3085728wrm.156.1572010966360; Fri, 25 Oct 2019 06:42:46 -0700 (PDT) Received: from localhost.localdomain ([94.230.83.169]) by smtp.gmail.com with ESMTPSA id v11sm2194730wrw.97.2019.10.25.06.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 06:42:45 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Shmulik Ladkani Subject: [PATCH bpf-next 2/2] test_bpf: Introduce 'gso_linear_no_head_frag' skb_segment test Date: Fri, 25 Oct 2019 16:42:23 +0300 Message-Id: <20191025134223.2761-3-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025134223.2761-1-shmulik.ladkani@gmail.com> References: <20191025134223.2761-1-shmulik.ladkani@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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] and validates the fix submitted in [2]. [1] https://lists.openwall.net/netdev/2019/08/26/110 [2] commit 3dcbdb134f32 ("net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list") 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 c952df82b515..cecb230833be 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 } };