From patchwork Tue Jan 22 21:23:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1029541 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=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="s1X1mOfr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43khH22QBkz9s4s for ; Wed, 23 Jan 2019 08:23:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726869AbfAVVXZ (ORCPT ); Tue, 22 Jan 2019 16:23:25 -0500 Received: from mail-yb1-f201.google.com ([209.85.219.201]:37596 "EHLO mail-yb1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726143AbfAVVXY (ORCPT ); Tue, 22 Jan 2019 16:23:24 -0500 Received: by mail-yb1-f201.google.com with SMTP id e14so16207ybf.4 for ; Tue, 22 Jan 2019 13:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Mkwu4TfA6WzA6k+0mNRWNp2IG5q8AL2KjQSKLbFmU2g=; b=s1X1mOfrmoVO96i99zwXQO+uH8D8gackfjEeeuFupCatlRN/Nv2ncvRGrQLKWaTzaZ 1x9c5tRPOqGbJPMvx7D6+divNH5/laiPG0wHy9+5cGoRr8qGj4EWDds4MLRvUhH7nk9K ZJ881sHabGzpKV/Aukh6SeXxiE02J2FegmIz5bR6LoCzHBHu7oBRmvL/btw74eEPOyKC 2hXPax0J3kJoZSTVjXvKlPeRNoSTHbIinC1lZhyv0gnEtlfJIgruRfD9zmB/maxaSyXG 4J3chH1ELeUss04N4fBgYkqR0o6QUQyK+qv3I+JRFRA0dRIjL+YizI7RAY2OmDUGSuGy arLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Mkwu4TfA6WzA6k+0mNRWNp2IG5q8AL2KjQSKLbFmU2g=; b=Sk2nEbc9ybdfvn2m+yaU38opcahZET/C/pQEMxPDMWnc1s0jI3kaqqEky/CWwgir1R O60LbdqD7xJnhGj5jfnOJFD9LTCMKHU5zlYRGrPYZLf6+QlVoaBidfw1LaYcO6mnEjyj qTo7CfNhqbiD7zpBudhwivh0ffB/FIJP4I6sbmtHHo+fHqOfUcwncAAT0hptXprqMEMt KhNEk3yl3AcRjzo4WDfp6/CzgZBPqh/NmJyUfn+seKwu4m2BsWLqOzbocl2Z0i5PL3HZ fJ8xSa0xRzrUsTmXkgvZ4iAIFzS8sfEKS8Y7H3IsZBDeU/zcvHqIG6TZB4bXWzZ5Gn/A fiBw== X-Gm-Message-State: AJcUukfmK6MeOPByOENuJPVUIjILYk39gIJDv7MHU2KRdv8+zKch7sBC bzLyNQHB9IscWd4YtXPpElfKCtw1RiPo87CmLfb8a/eDxPiFIfEjLlEwfaQdmBED3uhjihXqMjo +dTUCoqAZ8nL5Ov/dVzMtYR8823F7j3CetGFtVDvnuBBjzU3QaHj07A== X-Google-Smtp-Source: ALg8bN64DhZe3Qc5sof1VgBrDUysQrkClHaaaYJ1bpaiuesxHSRFCTF/aW2HjLlFkFdCr4hft5kt0rc= X-Received: by 2002:a25:b44d:: with SMTP id c13mr1401706ybg.8.1548192203123; Tue, 22 Jan 2019 13:23:23 -0800 (PST) Date: Tue, 22 Jan 2019 13:23:14 -0800 In-Reply-To: <20190122212315.137291-1-sdf@google.com> Message-Id: <20190122212315.137291-3-sdf@google.com> Mime-Version: 1.0 References: <20190122212315.137291-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH bpf-next 2/3] bpf: add BPF_PROG_TEST_RUN support for flow dissector From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The input is packet data, the output is struct bpf_flow_key. This should make it easy to test flow dissector programs without elaborate setup. Signed-off-by: Stanislav Fomichev --- include/linux/bpf.h | 3 ++ net/bpf/test_run.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- net/core/filter.c | 1 + 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index e734f163bd0b..701ef954a258 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -397,6 +397,9 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, union bpf_attr __user *uattr); int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, union bpf_attr __user *uattr); +int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog, + const union bpf_attr *kattr, + union bpf_attr __user *uattr); /* an array of programs to be executed under rcu_lock. * diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index fa2644d276ef..ecad72885f23 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -16,12 +16,26 @@ static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx, struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE]) { + struct bpf_skb_data_end *cb; + struct sk_buff *skb; u32 ret; preempt_disable(); rcu_read_lock(); bpf_cgroup_storage_set(storage); - ret = BPF_PROG_RUN(prog, ctx); + + switch (prog->type) { + case BPF_PROG_TYPE_FLOW_DISSECTOR: + skb = (struct sk_buff *)ctx; + cb = (struct bpf_skb_data_end *)skb->cb; + ret = __skb_flow_bpf_dissect(prog, ctx, &flow_keys_dissector, + cb->qdisc_cb.flow_keys); + break; + default: + ret = BPF_PROG_RUN(prog, ctx); + break; + } + rcu_read_unlock(); preempt_enable(); @@ -240,3 +254,62 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, kfree(data); return ret; } + +int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog, + const union bpf_attr *kattr, + union bpf_attr __user *uattr) +{ + u32 size = kattr->test.data_size_in; + u32 repeat = kattr->test.repeat; + struct bpf_flow_keys flow_keys; + struct bpf_skb_data_end *cb; + u32 retval, duration; + struct sk_buff *skb; + struct sock *sk; + void *data; + int ret; + + if (prog->type != BPF_PROG_TYPE_FLOW_DISSECTOR) + return -EINVAL; + + data = bpf_test_init(kattr, size, NET_SKB_PAD + NET_IP_ALIGN, + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))); + if (IS_ERR(data)) + return PTR_ERR(data); + + sk = kzalloc(sizeof(*sk), GFP_USER); + if (!sk) { + kfree(data); + return -ENOMEM; + } + sock_net_set(sk, current->nsproxy->net_ns); + sock_init_data(NULL, sk); + + skb = build_skb(data, 0); + if (!skb) { + kfree(data); + kfree(sk); + return -ENOMEM; + } + skb->sk = sk; + + skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN); + __skb_put(skb, size); + skb->protocol = eth_type_trans(skb, + current->nsproxy->net_ns->loopback_dev); + skb_reset_network_header(skb); + + cb = (struct bpf_skb_data_end *)skb->cb; + cb->qdisc_cb.flow_keys = &flow_keys; + ret = bpf_test_run(prog, skb, repeat, &retval, &duration); + if (ret) + goto out; + + ret = bpf_test_finish(kattr, uattr, &flow_keys, sizeof(flow_keys), + retval, duration); + +out: + kfree_skb(skb); + kfree(sk); + return ret; +} diff --git a/net/core/filter.c b/net/core/filter.c index 2b3b436ef545..ff4641dae2be 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7690,6 +7690,7 @@ const struct bpf_verifier_ops flow_dissector_verifier_ops = { }; const struct bpf_prog_ops flow_dissector_prog_ops = { + .test_run = bpf_prog_test_run_flow_dissector, }; int sk_detach_filter(struct sock *sk)