From patchwork Wed Sep 12 00:36:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 968784 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 (mailfrom) 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=wand.net.nz Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pmojMM8L"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4292sw61kzz9s3x for ; Wed, 12 Sep 2018 10:37:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728007AbeILFi4 (ORCPT ); Wed, 12 Sep 2018 01:38:56 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:41969 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726454AbeILFiz (ORCPT ); Wed, 12 Sep 2018 01:38:55 -0400 Received: by mail-oi0-f68.google.com with SMTP id k12-v6so300503oiw.8 for ; Tue, 11 Sep 2018 17:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0EfR89W8DPR6g6n8FvCkBsK2Dn3ZsSDnj+Ju4iny9YM=; b=pmojMM8L+XanWwt+FODHUmX/VjvvFK7O7bWUUYgBJPt/TVbTx2QVnUeck0P0ztalPb hYxg0tKK+PMKL04RU6eH+yDqlX05ggaCedxWRFZcGmSbjo3n0mW7Jjy43Ltb3KKoWrsL 6xD/3dGV+EzOoEdvFmC49zzvIT0251eSFYATAt949ij94OVDG6nsN3M8DAwxsW2a04CF mCNBLq3HTFwwrMdQf/j3bwPRHIx6Jze5fk8SX8VA+snY67jeqZSyffj9pcI8yg5q5J74 A/hwngxRbhAEfEZEoh8s0M9+ybrVUy6fo7FzDOCxFg1MDxI+pI4xKn3wmqKs66Y/eV8y M6DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=0EfR89W8DPR6g6n8FvCkBsK2Dn3ZsSDnj+Ju4iny9YM=; b=QmQMg/jEM7o32yas8LcxtESU9ln+6MV5B6an61ldUztUG/+2nPIeKwY1SpACtIGQ8T f1DLVIjGZ1bdremX0xnYM8qDIr478DS3qor7t+HyW7AL4NBTibfvjdKrDmq6JMLuvWcb y1QZrUTy8QdfgxCrSqZRYcmOb/8FrSvX3LFVcUPKpQ+0b/BB5xxgGoqX7bYWeTQmAT/s bMGqPzPF2XTbX6e7YZVjk/SfxgeLoOBNbT/KDpcWGDnPlfiygRNZKysLyquLahkrPA5a TFkstylw12z+EXNZOfoADTjOhbTboXgcvYaOGRe4lcPbdbqFRCoR0NUnSSqxCm8+I4Du XqYA== X-Gm-Message-State: APzg51CWkcmqeY1re8Y4EnpNaQVWXJ3RKxHyyHG/Qy4t6sq/uPYr2R3g wuUfTxGDMN6g0ClJpqSAqjs= X-Google-Smtp-Source: ANB0VdZmc79QDLPwYT3b5kxtwWIstj8sHXrIvC+ZrjF2F2FCHZVQf3e8UXKNcPAOiiw84l8KhLRxgg== X-Received: by 2002:aca:6541:: with SMTP id j1-v6mr1580843oiw.157.1536712625995; Tue, 11 Sep 2018 17:37:05 -0700 (PDT) Received: from allosaurus.lan ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id s145-v6sm39598850oih.16.2018.09.11.17.37.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 17:37:04 -0700 (PDT) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org, ast@kernel.org, john.fastabend@gmail.com, tgraf@suug.ch, kafai@fb.com, nitin.hande@gmail.com, mauricio.vasquez@polito.it Subject: [PATCH bpf-next 10/11] selftests/bpf: Add C tests for reference tracking Date: Tue, 11 Sep 2018 17:36:39 -0700 Message-Id: <20180912003640.28316-11-joe@wand.net.nz> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912003640.28316-1-joe@wand.net.nz> References: <20180912003640.28316-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Joe Stringer Acked-by: Alexei Starovoitov --- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/test_progs.c | 38 ++++++ .../selftests/bpf/test_sk_lookup_kern.c | 128 ++++++++++++++++++ 3 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/test_sk_lookup_kern.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index fff7fb1285fc..311b7bc9e37a 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -35,7 +35,7 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test test_get_stack_rawtp.o test_sockmap_kern.o test_sockhash_kern.o \ test_lwt_seg6local.o sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ - test_skb_cgroup_id_kern.o + test_skb_cgroup_id_kern.o test_sk_lookup_kern.o # Order correspond to 'make run_tests' order TEST_PROGS := test_kmod.sh \ diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 63a671803ed6..e8becca9c521 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -1698,6 +1698,43 @@ static void test_task_fd_query_tp(void) "sys_enter_read"); } +static void test_reference_tracking() +{ + const char *file = "./test_sk_lookup_kern.o"; + struct bpf_object *obj; + struct bpf_program *prog; + __u32 duration; + int err = 0; + + obj = bpf_object__open(file); + if (IS_ERR(obj)) { + error_cnt++; + return; + } + + bpf_object__for_each_program(prog, obj) { + const char *title; + + /* Ignore .text sections */ + title = bpf_program__title(prog, false); + if (strstr(title, ".text") != NULL) + continue; + + bpf_program__set_type(prog, BPF_PROG_TYPE_SCHED_CLS); + + /* Expect verifier failure if test name has 'fail' */ + if (strstr(title, "fail") != NULL) { + libbpf_set_print(NULL, NULL, NULL); + err = !bpf_program__load(prog, "GPL", 0); + libbpf_set_print(printf, printf, NULL); + } else { + err = bpf_program__load(prog, "GPL", 0); + } + CHECK(err, title, "\n"); + } + bpf_object__close(obj); +} + int main(void) { jit_enabled = is_jit_enabled(); @@ -1719,6 +1756,7 @@ int main(void) test_get_stack_raw_tp(); test_task_fd_query_rawtp(); test_task_fd_query_tp(); + test_reference_tracking(); printf("Summary: %d PASSED, %d FAILED\n", pass_cnt, error_cnt); return error_cnt ? EXIT_FAILURE : EXIT_SUCCESS; diff --git a/tools/testing/selftests/bpf/test_sk_lookup_kern.c b/tools/testing/selftests/bpf/test_sk_lookup_kern.c new file mode 100644 index 000000000000..321a2299a3ac --- /dev/null +++ b/tools/testing/selftests/bpf/test_sk_lookup_kern.c @@ -0,0 +1,128 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +// Copyright (c) 2018 Covalent IO, Inc. http://covalent.io + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "bpf_helpers.h" +#include "bpf_endian.h" + +int _version SEC("version") = 1; +char _license[] SEC("license") = "GPL"; + +/* Fill 'tuple' with L3 info, and attempt to find L4. On fail, return NULL. */ +static void *fill_ip(struct bpf_sock_tuple *tuple, void *data, __u64 nh_off, + void *data_end, __u16 eth_proto) +{ + __u64 ihl_len; + __u8 proto; + + if (eth_proto == bpf_htons(ETH_P_IP)) { + struct iphdr *iph = (struct iphdr *)(data + nh_off); + + if (iph + 1 > data_end) + return NULL; + ihl_len = iph->ihl * 4; + proto = iph->protocol; + + tuple->family = AF_INET; + tuple->saddr.ipv4 = iph->saddr; + tuple->daddr.ipv4 = iph->daddr; + } else if (eth_proto == bpf_htons(ETH_P_IPV6)) { + struct ipv6hdr *ip6h = (struct ipv6hdr *)(data + nh_off); + + if (ip6h + 1 > data_end) + return NULL; + ihl_len = sizeof(*ip6h); + proto = ip6h->nexthdr; + + tuple->family = AF_INET6; + *((struct in6_addr *)&tuple->saddr.ipv6) = ip6h->saddr; + *((struct in6_addr *)&tuple->daddr.ipv6) = ip6h->daddr; + } + + if (proto != IPPROTO_TCP) + return NULL; + + return data + nh_off + ihl_len; +} + +SEC("sk_lookup_success") +int bpf_sk_lookup_test0(struct __sk_buff *skb) +{ + void *data_end = (void *)(long)skb->data_end; + void *data = (void *)(long)skb->data; + struct ethhdr *eth = (struct ethhdr *)(data); + struct bpf_sock_tuple tuple = {}; + struct tcphdr *tcp; + struct bpf_sock *sk; + void *l4; + + if (eth + 1 > data_end) + return TC_ACT_SHOT; + + l4 = fill_ip(&tuple, data, sizeof(*eth), data_end, eth->h_proto); + if (!l4 || l4 + sizeof *tcp > data_end) + return TC_ACT_SHOT; + + tcp = l4; + tuple.sport = tcp->source; + tuple.dport = tcp->dest; + + sk = bpf_sk_lookup_tcp(skb, &tuple, sizeof(tuple), 0, 0); + if (sk) + bpf_sk_release(sk, 0); + return sk ? TC_ACT_OK : TC_ACT_UNSPEC; +} + +SEC("fail_no_release") +int bpf_sk_lookup_test1(struct __sk_buff *skb) +{ + struct bpf_sock_tuple tuple = {}; + + bpf_sk_lookup_tcp(skb, &tuple, sizeof(tuple), 0, 0); + return 0; +} + +SEC("fail_release_twice") +int bpf_sk_lookup_test2(struct __sk_buff *skb) +{ + struct bpf_sock_tuple tuple = {}; + struct bpf_sock *sk; + + sk = bpf_sk_lookup_tcp(skb, &tuple, sizeof(tuple), 0, 0); + bpf_sk_release(sk, 0); + bpf_sk_release(sk, 0); + return 0; +} + +SEC("fail_release_unchecked") +int bpf_sk_lookup_test3(struct __sk_buff *skb) +{ + struct bpf_sock_tuple tuple = {}; + struct bpf_sock *sk; + + sk = bpf_sk_lookup_tcp(skb, &tuple, sizeof(tuple), 0, 0); + bpf_sk_release(sk, 0); + return 0; +} + +void lookup_no_release(struct __sk_buff *skb) +{ + struct bpf_sock_tuple tuple = {}; + bpf_sk_lookup_tcp(skb, &tuple, sizeof(tuple), 0, 0); +} + +SEC("fail_no_release_subcall") +int bpf_sk_lookup_test4(struct __sk_buff *skb) +{ + lookup_no_release(skb); + return 0; +}