From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net,
simon.horman@netronome.com, willemb@google.com,
peterpenkov96@gmail.com, Stanislav Fomichev <sdf@google.com>
Subject: [RFC bpf-next v3 6/8] flow_dissector: handle no-skb use case
Date: Fri, 22 Mar 2019 12:59:01 -0700 [thread overview]
Message-ID: <20190322195903.162516-7-sdf@google.com> (raw)
In-Reply-To: <20190322195903.162516-1-sdf@google.com>
When called without skb, gather all required data from the
__skb_flow_dissect's arguments and use recently introduces
no-skb mode of bpf flow dissector.
Note: WARN_ON_ONCE(!net) will now trigger for eth_get_headlen users.
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
net/core/flow_dissector.c | 54 +++++++++++++++++----------------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 1e2e4a9330af..ec8ebafe333f 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -683,26 +683,6 @@ 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_flow_dissector ctx = {
- .flow_keys = flow_keys,
- .skb = skb,
- .protocol = skb->protocol,
- .vlan_tci = skb->vlan_tci,
- .vlan_proto = skb->vlan_proto,
- .vlan_present = skb->vlan_present,
- .data = skb->data,
- .data_end = skb->data + skb_headlen(skb),
- };
-
- return bpf_flow_dissect(prog, &ctx, skb_network_offset(skb),
- skb_headlen(skb));
-}
-
bool bpf_flow_dissect(struct bpf_prog *prog, struct bpf_flow_dissector *ctx,
int nhoff, int hlen)
{
@@ -754,6 +734,7 @@ bool __skb_flow_dissect(const struct net *net,
struct flow_dissector_key_icmp *key_icmp;
struct flow_dissector_key_tags *key_tags;
struct flow_dissector_key_vlan *key_vlan;
+ struct bpf_prog *attached = NULL;
enum flow_dissect_ret fdret;
enum flow_dissector_key_id dissector_vlan = FLOW_DISSECTOR_KEY_MAX;
int num_hdrs = 0;
@@ -796,26 +777,37 @@ bool __skb_flow_dissect(const struct net *net,
target_container);
if (skb) {
- struct bpf_flow_keys flow_keys;
- struct bpf_prog *attached = NULL;
-
- rcu_read_lock();
if (!net) {
if (skb->dev)
net = dev_net(skb->dev);
else if (skb->sk)
net = sock_net(skb->sk);
- else
- WARN_ON_ONCE(1);
}
+ }
- if (net)
- attached = rcu_dereference(net->flow_dissector_prog);
+ WARN_ON_ONCE(!net);
+ if (net) {
+ rcu_read_lock();
+ attached = rcu_dereference(net->flow_dissector_prog);
if (attached) {
- ret = __skb_flow_bpf_dissect(attached, skb,
- flow_dissector,
- &flow_keys);
+ struct bpf_flow_keys flow_keys;
+ struct bpf_flow_dissector ctx = {
+ .flow_keys = &flow_keys,
+ .data = data,
+ .data_end = data + hlen,
+ .protocol = proto,
+ };
+
+ if (skb) {
+ ctx.skb = skb;
+ ctx.protocol = skb->protocol;
+ ctx.vlan_tci = skb->vlan_tci;
+ ctx.vlan_proto = skb->vlan_proto;
+ ctx.vlan_present = skb->vlan_present;
+ }
+
+ ret = bpf_flow_dissect(attached, &ctx, nhoff, hlen);
__skb_flow_bpf_to_target(&flow_keys, flow_dissector,
target_container);
rcu_read_unlock();
--
2.21.0.392.gf8f6787159e-goog
next prev parent reply other threads:[~2019-03-22 19:59 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 19:58 [RFC bpf-next v3 0/8] net: flow_dissector: trigger BPF hook when called from eth_get_headlen Stanislav Fomichev
2019-03-22 19:58 ` [RFC bpf-next v3 1/8] flow_dissector: allow access only to a subset of __sk_buff fields Stanislav Fomichev
2019-03-22 19:58 ` [RFC bpf-next v3 2/8] flow_dissector: switch kernel context to struct bpf_flow_dissector Stanislav Fomichev
2019-03-22 19:58 ` [RFC bpf-next v3 3/8] flow_dissector: fix clamping of BPF flow_keys for non-zero nhoff Stanislav Fomichev
2019-03-22 19:58 ` [RFC bpf-next v3 4/8] bpf: when doing BPF_PROG_TEST_RUN for flow dissector use no-skb mode Stanislav Fomichev
2019-03-22 19:59 ` [RFC bpf-next v3 5/8] net: plumb network namespace into __skb_flow_dissect Stanislav Fomichev
2019-03-22 19:59 ` Stanislav Fomichev [this message]
2019-03-23 1:00 ` [RFC bpf-next v3 6/8] flow_dissector: handle no-skb use case Alexei Starovoitov
2019-03-23 1:19 ` Stanislav Fomichev
2019-03-23 1:41 ` Alexei Starovoitov
2019-03-23 16:05 ` Stanislav Fomichev
2019-03-26 0:35 ` Alexei Starovoitov
2019-03-26 16:45 ` Stanislav Fomichev
2019-03-26 17:48 ` Alexei Starovoitov
2019-03-26 17:51 ` Willem de Bruijn
2019-03-26 18:08 ` Alexei Starovoitov
2019-03-26 18:17 ` Stanislav Fomichev
2019-03-26 18:30 ` Alexei Starovoitov
2019-03-26 18:54 ` Stanislav Fomichev
2019-03-27 1:41 ` Alexei Starovoitov
2019-03-27 2:44 ` Stanislav Fomichev
2019-03-27 17:55 ` Alexei Starovoitov
2019-03-27 19:58 ` Stanislav Fomichev
2019-03-28 1:26 ` Alexei Starovoitov
2019-03-28 3:14 ` Willem de Bruijn
2019-03-28 3:32 ` Alexei Starovoitov
2019-03-28 4:17 ` Stanislav Fomichev
2019-03-28 12:58 ` Willem de Bruijn
2019-04-01 16:30 ` Stanislav Fomichev
2019-03-22 19:59 ` [RFC bpf-next v3 7/8] net: pass net argument to the eth_get_headlen Stanislav Fomichev
2019-03-22 19:59 ` [RFC bpf-next v3 8/8] selftests/bpf: add flow dissector bpf_skb_load_bytes helper test Stanislav Fomichev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190322195903.162516-7-sdf@google.com \
--to=sdf@google.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=peterpenkov96@gmail.com \
--cc=simon.horman@netronome.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).