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=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 6CEB3C282C5 for ; Thu, 24 Jan 2019 16:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B547218AF for ; Thu, 24 Jan 2019 16:50:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bnyRETCB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728916AbfAXQuE (ORCPT ); Thu, 24 Jan 2019 11:50:04 -0500 Received: from mail-yw1-f73.google.com ([209.85.161.73]:50658 "EHLO mail-yw1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726252AbfAXQuB (ORCPT ); Thu, 24 Jan 2019 11:50:01 -0500 Received: by mail-yw1-f73.google.com with SMTP id b8so3336134ywb.17 for ; Thu, 24 Jan 2019 08:50:00 -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=pWWVD6u7NC4lQLHndTufjEAeCtb3Ox/KABwUvTpHrP0=; b=bnyRETCB+li5YJKRxlT9SUNQ/4PaYmHDIcG3jNAguSvPK0kJAg9wiV3i/ddFSk579n FhFi8HpjNdpA6t3TZG/+AwOX9GSQ1A/waIgKHtuLKrDsbqb4nkeyR6YKtAVrSB5xJ24s ODBNfo67lVwHcBjl4peFRcFwo+CyXYJAkyinTu+wzhzs4rG//wZjqZ0mig2atqxRW1G6 7iHFRp4mQJkuhUifgelonrA/ti2yJBxO+NFMU6cXcNCFJoVjIGJRSxnbFslqhhSXYI4S V2lQNKUfetCyfNtEnRIZpcRaKWuAjThJgeKDEzhUcQMp9bLgVKMrK4R9KYXzR/PmGie9 cBYA== 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=pWWVD6u7NC4lQLHndTufjEAeCtb3Ox/KABwUvTpHrP0=; b=LXrxHwVZhAN6+qabwNu/9gr3swgjAX8QXMIM3vz1wRfUZpNeoR8CWas/FO+w0dJV58 yvU7/Yg6O86XZQpjE6hpGDcn22iLFbsD8VTQSIcEErO/v/HSWr+e1idjxrWi/CWX27C4 lxOP0Z4RX1nR4nMchLq2oPDQzBbOXVr/QH8L+T1FFvR/yhPHdZnvR1ts6Q2KVkrh2/il wAsBeJ/OjCqim0b/UGyqc9RSnyqmvjJMCM2boe03iZfwGjyX4+Tfk0YMO8hFHx8GAQUC veaOdqXuTblgbGMCzBjJlV53zfI3ieF9Jag2qa7FEz3D6xDt/zpXKk0hbJG75T5gTqQY gxYA== X-Gm-Message-State: AJcUukfhLP6Za+GIqJAVsXJ/Nzb/7G654YKDZfbb2PRyCJgFXcJIk2iy caaaOFn56lk/HAdJzOz2Bukj1i6zUxputSVs4vTBmWderVy7Jj1/ewOtOP3nA7XbHFIX58ECK4K OS/zLJLK3X9txF8yDM2MNF+BMmYqKmfTtCsUeiL+5DX4Rx0auHtdx0w== X-Google-Smtp-Source: ALg8bN7u706613ZRsUVhO3EnG802Kg94ebt10ZZz0W9dUvozA8BI/7wAumD9jW9ckXsj5MVceEl1nKM= X-Received: by 2002:a25:ed0c:: with SMTP id k12mr3707744ybh.74.1548348600485; Thu, 24 Jan 2019 08:50:00 -0800 (PST) Date: Thu, 24 Jan 2019 08:49:52 -0800 In-Reply-To: <20190124164953.29740-1-sdf@google.com> Message-Id: <20190124164953.29740-3-sdf@google.com> Mime-Version: 1.0 References: <20190124164953.29740-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH bpf-next v2 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 Content-Type: text/plain; charset="UTF-8" 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 | 82 +++++++++++++++++++++++++++++++++++++++++++++ net/core/filter.c | 1 + 3 files changed, 86 insertions(+) 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..2c5172b33209 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -240,3 +240,85 @@ 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; + u64 time_start, time_spent = 0; + struct bpf_skb_data_end *cb; + u32 retval, duration; + struct sk_buff *skb; + struct sock *sk; + void *data; + int ret; + u32 i; + + 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; + + if (!repeat) + repeat = 1; + + time_start = ktime_get_ns(); + for (i = 0; i < repeat; i++) { + preempt_disable(); + rcu_read_lock(); + retval = __skb_flow_bpf_dissect(prog, skb, + &flow_keys_dissector, + &flow_keys); + rcu_read_unlock(); + preempt_enable(); + + if (need_resched()) { + if (signal_pending(current)) + break; + time_spent += ktime_get_ns() - time_start; + cond_resched(); + time_start = ktime_get_ns(); + } + } + time_spent += ktime_get_ns() - time_start; + do_div(time_spent, repeat); + duration = time_spent > U32_MAX ? U32_MAX : (u32)time_spent; + + ret = bpf_test_finish(kattr, uattr, &flow_keys, sizeof(flow_keys), + retval, duration); + + 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) -- 2.20.1.321.g9e740568ce-goog