History

net: plumb network namespace into __skb_flow_dissect

This new argument will be used in the next patches for the eth_get_headlen use case. eth_get_headlen calls flow dissector with only data (without skb) so there is currently no way to pull attached BPF flow dissector program. With this new argument, we can amend the callers to explicitly pass network namespace so we can use attached BPF program.

Stanislav Fomichev committed 7 years ago

Commit 3cbf4ff1 parent 7b8a1303 files · +31 −20Browse files

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

include/linux/skbuff.h+11−8
@@ -1284,7 +1284,8 @@ bool __skb_flow_bpf_dissect(struct bpf_prog *prog, · 1283 unmodified lines
1284 const struct sk_buff *skb,1284 const struct sk_buff *skb,
1285 struct flow_dissector *flow_dissector,1285 struct flow_dissector *flow_dissector,
1286 struct bpf_flow_keys *flow_keys);1286 struct bpf_flow_keys *flow_keys);
1287bool __skb_flow_dissect(const struct sk_buff *skb,1287bool __skb_flow_dissect(const struct net *net,
1288 const struct sk_buff *skb,
1288 struct flow_dissector *flow_dissector,1289 struct flow_dissector *flow_dissector,
1289 void *target_container,1290 void *target_container,
1290 void *data, __be16 proto, int nhoff, int hlen,1291 void *data, __be16 proto, int nhoff, int hlen,
@@ -1294,8 +1295,8 @@ static inline bool skb_flow_dissect(const struct sk_buff *skb, · 3 unmodified lines
1294 struct flow_dissector *flow_dissector,1295 struct flow_dissector *flow_dissector,
1295 void *target_container, unsigned int flags)1296 void *target_container, unsigned int flags)
1296{1297{
1297 return __skb_flow_dissect(skb, flow_dissector, target_container,1298 return __skb_flow_dissect(NULL, skb, flow_dissector,
1298 NULL, 0, 0, 0, flags);1299 target_container, NULL, 0, 0, 0, flags);
1299}1300}
1300 1301
1301static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb,1302static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb,
@@ -1303,18 +1304,19 @@ static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb, · 1 unmodified line
1303 unsigned int flags)1304 unsigned int flags)
1304{1305{
1305 memset(flow, 0, sizeof(*flow));1306 memset(flow, 0, sizeof(*flow));
1306 return __skb_flow_dissect(skb, &flow_keys_dissector, flow,1307 return __skb_flow_dissect(NULL, skb, &flow_keys_dissector,
1307 NULL, 0, 0, 0, flags);1308 flow, NULL, 0, 0, 0, flags);
1308}1309}
1309 1310
1310static inline bool1311static inline bool
1311skb_flow_dissect_flow_keys_basic(const struct sk_buff *skb,1312skb_flow_dissect_flow_keys_basic(const struct net *net,
1313 const struct sk_buff *skb,
1312 struct flow_keys_basic *flow, void *data,1314 struct flow_keys_basic *flow, void *data,
1313 __be16 proto, int nhoff, int hlen,1315 __be16 proto, int nhoff, int hlen,
1314 unsigned int flags)1316 unsigned int flags)
1315{1317{
1316 memset(flow, 0, sizeof(*flow));1318 memset(flow, 0, sizeof(*flow));
1317 return __skb_flow_dissect(skb, &flow_keys_basic_dissector, flow,1319 return __skb_flow_dissect(net, skb, &flow_keys_basic_dissector, flow,
1318 data, proto, nhoff, hlen, flags);1320 data, proto, nhoff, hlen, flags);
1319}1321}
1320 1322
@@ -2492,7 +2494,8 @@ static inline void skb_probe_transport_header(struct sk_buff *skb) · 1171 unmodified lines
2492 if (skb_transport_header_was_set(skb))2494 if (skb_transport_header_was_set(skb))
2493 return;2495 return;
2494 2496
2495 if (skb_flow_dissect_flow_keys_basic(skb, &keys, NULL, 0, 0, 0, 0))2497 if (skb_flow_dissect_flow_keys_basic(NULL, skb, &keys,
2498 NULL, 0, 0, 0, 0))
2496 skb_set_transport_header(skb, keys.control.thoff);2499 skb_set_transport_header(skb, keys.control.thoff);
2497}2500}
2498 2501

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t