From patchwork Tue Dec 4 04:00:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1007426 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="PQJGHQ+R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4387T13HjMz9s55 for ; Tue, 4 Dec 2018 15:01:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726061AbeLDEBI (ORCPT ); Mon, 3 Dec 2018 23:01:08 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:55530 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725971AbeLDEBH (ORCPT ); Mon, 3 Dec 2018 23:01:07 -0500 Received: by mail-pl1-f201.google.com with SMTP id d23so11594329plj.22 for ; Mon, 03 Dec 2018 20:01:07 -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=itHxf3aV5bxPutWjVC3NiDDNkgVlPylB2d4cWevFOn4=; b=PQJGHQ+RNCit+Rw3ohvHg1QMiA0IsPdhw5fHQFmSfdpdK6aD6xHB8Z5ysZPRCsykc+ ukqTdzxQE1IJrK3ok9Z+/BjgBYVZ2agOiYDJHLx+050fnCNiwpEApJ/c8DFzZnxxCkI6 PQrYQa2w1w327FuYQdVk1kckjT//6MlAByd9TIyD1BsQWuUStov5W/XGN8SnoQuIIJvt RrJgDk1ed+oHF3mMjRLYtN80DptaGPnIovkhA+DtZyYyeV/+jGfQr0OnUgf0lwovl5e9 y/7Eq7HhUiMs1iKxHrCXx6I1+WB8KsyPukTJaY1QUE46U8QwFt+kQpqjwESixqdNXG8S 2q9A== 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=itHxf3aV5bxPutWjVC3NiDDNkgVlPylB2d4cWevFOn4=; b=tfoW8s/93oiYchcF4Sk9aoulDtkZGfqUjujyp2AJ28F9io8xDnYdIsymbUNJ3qNqVT q3mX3KX2Wrv2YRPgNluCyqOSrYdPaU+JwmM0U5yjNBlAXtWWcDiBGjXZPoTdBkKHg6Th 4ovlgzqDbWBFbkZTnT78luq3LrtcXecoZRJJ7D4D6e1oeUTl/wZg2Br7r15G+tDhHAru ojY2wYEfjO2OivkH+JxUUjk/VV1+lrehvzjn2DfnXHrnAMFCAtVL4RGSXwgS9cCdWgQi 38jTFtKT1kH3uzfsjCGCgOi/3RJqgKWPMJ375IvW1WJqVX2NQPH6fBf8aMTPPbUs1IGd nksA== X-Gm-Message-State: AA+aEWZiG8e95rqZv7wHFW5puisx1lbFJE0rJ7DTEVdp1yQvCHuG20t6 DRpx57I3Iazjxq5ln2HxwBTGL9XkQ5xDQXFpimy6Tgs6bPGdph056khRwmsh/8DQ8pTjEIiT4kV fVmZICR4yMGtVc0oB/LQoJUw/coU4HBayDP/QJrgR0Nu9bClXGD5IwA== X-Google-Smtp-Source: AFSGD/U/Pf03hJUxq9H6yKF5uEblA9woe2hLGDDsCiOh/ONDNizs/MdI5S81NUAEbN8h7gpMrsa6nRE= X-Received: by 2002:a63:8c6:: with SMTP id 189mr8380258pgi.98.1543896066594; Mon, 03 Dec 2018 20:01:06 -0800 (PST) Date: Mon, 3 Dec 2018 20:00:56 -0800 In-Reply-To: <20181204040100.243614-1-sdf@google.com> Message-Id: <20181204040100.243614-2-sdf@google.com> Mime-Version: 1.0 References: <20181204040100.243614-1-sdf@google.com> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog Subject: [PATCH bpf-next v2 1/5] net/flow_dissector: move bpf case into __skb_flow_bpf_dissect From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, simon.horman@netronome.com, liu.song.a23@gmail.com, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This way, we can reuse it for flow dissector in BPF_PROG_TEST_RUN. No functional changes. Signed-off-by: Stanislav Fomichev --- include/linux/skbuff.h | 5 +++ net/core/flow_dissector.c | 85 +++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 73902acf2b71..c10b27bb0cab 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1215,6 +1215,11 @@ static inline int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr) } #endif +struct bpf_flow_keys; +bool __skb_flow_bpf_dissect(struct bpf_prog *prog, + const struct sk_buff *skb, + struct flow_dissector *flow_dissector, + struct bpf_flow_keys *flow_keys); bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector *flow_dissector, void *target_container, diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 2e8d91e54179..3c8a78decbc0 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -683,6 +683,41 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys, } } +bool __skb_flow_bpf_dissect(struct bpf_prog *prog, + const struct sk_buff *skb, + struct flow_dissector *flow_dissector, + struct bpf_flow_keys *flow_keys) +{ + struct bpf_skb_data_end cb_saved; + struct bpf_skb_data_end *cb; + u32 result; + + /* Note that even though the const qualifier is discarded + * throughout the execution of the BPF program, all changes(the + * control block) are reverted after the BPF program returns. + * Therefore, __skb_flow_dissect does not alter the skb. + */ + + cb = (struct bpf_skb_data_end *)skb->cb; + + /* Save Control Block */ + memcpy(&cb_saved, cb, sizeof(cb_saved)); + memset(cb, 0, sizeof(*cb)); + + /* Pass parameters to the BPF program */ + memset(flow_keys, 0, sizeof(*flow_keys)); + cb->qdisc_cb.flow_keys = flow_keys; + flow_keys->nhoff = skb_network_offset(skb); + + bpf_compute_data_pointers((struct sk_buff *)skb); + result = BPF_PROG_RUN(prog, skb); + + /* Restore state */ + memcpy(cb, &cb_saved, sizeof(cb_saved)); + + return result == BPF_OK; +} + /** * __skb_flow_dissect - extract the flow_keys struct and return it * @skb: sk_buff to extract the flow from, can be NULL if the rest are specified @@ -714,7 +749,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector_key_vlan *key_vlan; enum flow_dissect_ret fdret; enum flow_dissector_key_id dissector_vlan = FLOW_DISSECTOR_KEY_MAX; - struct bpf_prog *attached = NULL; int num_hdrs = 0; u8 ip_proto = 0; bool ret; @@ -754,49 +788,32 @@ bool __skb_flow_dissect(const struct sk_buff *skb, FLOW_DISSECTOR_KEY_BASIC, target_container); - rcu_read_lock(); if (skb) { + struct bpf_flow_keys flow_keys; + struct bpf_prog *attached = NULL; + + rcu_read_lock(); + if (skb->dev) attached = rcu_dereference(dev_net(skb->dev)->flow_dissector_prog); else if (skb->sk) attached = rcu_dereference(sock_net(skb->sk)->flow_dissector_prog); else WARN_ON_ONCE(1); - } - if (attached) { - /* Note that even though the const qualifier is discarded - * throughout the execution of the BPF program, all changes(the - * control block) are reverted after the BPF program returns. - * Therefore, __skb_flow_dissect does not alter the skb. - */ - struct bpf_flow_keys flow_keys = {}; - struct bpf_skb_data_end cb_saved; - struct bpf_skb_data_end *cb; - u32 result; - - cb = (struct bpf_skb_data_end *)skb->cb; - - /* Save Control Block */ - memcpy(&cb_saved, cb, sizeof(cb_saved)); - memset(cb, 0, sizeof(cb_saved)); - /* Pass parameters to the BPF program */ - cb->qdisc_cb.flow_keys = &flow_keys; - flow_keys.nhoff = nhoff; - - bpf_compute_data_pointers((struct sk_buff *)skb); - result = BPF_PROG_RUN(attached, skb); - - /* Restore state */ - memcpy(cb, &cb_saved, sizeof(cb_saved)); - - __skb_flow_bpf_to_target(&flow_keys, flow_dissector, - target_container); - key_control->thoff = min_t(u16, key_control->thoff, skb->len); + if (attached) { + ret = __skb_flow_bpf_dissect(attached, skb, + flow_dissector, + &flow_keys); + __skb_flow_bpf_to_target(&flow_keys, flow_dissector, + target_container); + key_control->thoff = min_t(u16, key_control->thoff, + skb->len); + rcu_read_unlock(); + return ret; + } rcu_read_unlock(); - return result == BPF_OK; } - rcu_read_unlock(); if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {