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 9859EC282C8 for ; Mon, 28 Jan 2019 16:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A96D21741 for ; Mon, 28 Jan 2019 16:54:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pjszy4kA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388784AbfA1QyF (ORCPT ); Mon, 28 Jan 2019 11:54:05 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:42187 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388011AbfA1QyD (ORCPT ); Mon, 28 Jan 2019 11:54:03 -0500 Received: by mail-qt1-f201.google.com with SMTP id n50so21321772qtb.9 for ; Mon, 28 Jan 2019 08:54:03 -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=KqMkg6c8wZibDK8hRKj8vad6vcDX+WNhXtBSzvyi/a4=; b=Pjszy4kAdWjUxWBUFutkrAnpkLRxoVyHsNXLd/OAnYqPxImMgxl6C8k3KBz85Y7egZ rCAjewBJA+WtRlwSCfmJjn1qGvK3BlE0y0M6CD0mPg5yBqNtHmsPur+7OD2Nx0k6x2mR qZ8lziKwNqwI8yQgO7XYjnABOGQZtsy+ESelvytiMTGBBRQ18YQQvKPG5ZvbnJ2OTHxg Gd3o4KMjYfR/PLfDiYtoaZ+d4S6G8RY2U8q1L3BA5ZlplJmDL5JSoAJi9sOsjn8MIQ4X XhVDXsIGA6IH+PWLhDN+T4xnt+QNA2S0wMhbLm+1olsIVAnSkdEBlWcUe4GwOHza0+lt +TTA== 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=KqMkg6c8wZibDK8hRKj8vad6vcDX+WNhXtBSzvyi/a4=; b=L6lLI/PfYhTYf7rtbv5MHg2gsVjfZ86e+iNctZ/VxRomveUj3YR1I3zIACkmrLo6WN ZdNSNCRuLywr5zjm/nkxgYMlgPSA5xMOrXYCKo3ZA11QgRE7MCw9/WvODaU8a24F6CgQ Grgp1kpnB0lY9DvZPFPqDK+DxzKTznQeBkbFHxhw/U4pkCgsGRAN+krSS40UIA73J0Q6 jBogd10fWmeDtO+DTyXgk4QazutKtxpca8T1YQMpw72xGA+96jKHqqMc8dPYvUSKsAkF l58L4UyMRCsce0RsHWqnA4w5uyCyzKduAu2/QUyD3AsSjisoklUreXIEmSDBjnTabdif H/GQ== X-Gm-Message-State: AJcUukfdqpnHL4JV+TWtGAEREcW0Tqfv7R7NIpmK0w4Ps3qBiE+CiuzI 8JXxxIDrKZJ6kfLVqKh4jiVtkn9pjnv/UDE2TKCanCX128kle9l8rBSYEMFwQt+0hK+goD9EQx8 YrRlNHgQVN3dP8uU3EPggYIRM2dIhDnk74l5++2ZOA0JyZny0vta5Rg== X-Google-Smtp-Source: ALg8bN4/Q7Avc9KnuQySPqalKua6cQWBUaHWbdE8DnvGaVkWsPk2wmZ8cf+2Blf4eyOuwBqSoUVJfFY= X-Received: by 2002:ac8:7244:: with SMTP id l4mr370439qtp.21.1548694442987; Mon, 28 Jan 2019 08:54:02 -0800 (PST) Date: Mon, 28 Jan 2019 08:53:54 -0800 In-Reply-To: <20190128165355.229403-1-sdf@google.com> Message-Id: <20190128165355.229403-3-sdf@google.com> Mime-Version: 1.0 References: <20190128165355.229403-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog Subject: [PATCH bpf-next v3 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 3851529062ec..0394f1f9213b 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -404,6 +404,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 8e587dd1da20..8ce421796ac6 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7711,6 +7711,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.495.gaa96b0ce6b-goog