jenna
/
kernel_samsung_sm7125
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpf samples: fix compiler errors with sockex2 and sockex3

Browse Source 
These samples fail to compile as 'struct flow_keys' conflicts with
definition in net/flow_dissector.h. Fix the same by renaming the
structure used in the sample.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
tirimbino
Naveen N. Rao 9 years ago committed by David S. Miller
parent b6f5be2873
commit 2b064fff85
3 changed files with 11 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      samples/bpf/sockex2_kern.c
  2. 8
      samples/bpf/sockex3_kern.c
  3. 4
      samples/bpf/sockex3_user.c

10
samples/bpf/sockex2_kern.c
Unescape View File

@ -14,7 +14,7 @@ struct vlan_hdr {
__be16 h_vlan_encapsulated_proto;
};
struct flow_keys {
struct bpf_flow_keys {
__be32 src;
__be32 dst;
union {
@ -59,7 +59,7 @@ static inline __u32 ipv6_addr_hash(struct __sk_buff *ctx, __u64 off)
}
static inline __u64 parse_ip(struct __sk_buff *skb, __u64 nhoff, __u64 *ip_proto,
struct flow_keys *flow)
struct bpf_flow_keys *flow)
{
__u64 verlen;
@ -83,7 +83,7 @@ static inline __u64 parse_ip(struct __sk_buff *skb, __u64 nhoff, __u64 *ip_proto
}
static inline __u64 parse_ipv6(struct __sk_buff *skb, __u64 nhoff, __u64 *ip_proto,
struct flow_keys *flow)
struct bpf_flow_keys *flow)
{
*ip_proto = load_byte(skb,
nhoff + offsetof(struct ipv6hdr, nexthdr));
@ -96,7 +96,7 @@ static inline __u64 parse_ipv6(struct __sk_buff *skb, __u64 nhoff, __u64 *ip_pro
return nhoff;
}
static inline bool flow_dissector(struct __sk_buff *skb, struct flow_keys *flow)
static inline bool flow_dissector(struct __sk_buff *skb, struct bpf_flow_keys *flow)
{
__u64 nhoff = ETH_HLEN;
__u64 ip_proto;
@ -198,7 +198,7 @@ struct bpf_map_def SEC("maps") hash_map = {
SEC("socket2")
int bpf_prog2(struct __sk_buff *skb)
{
struct flow_keys flow;
struct bpf_flow_keys flow;
struct pair *value;
u32 key;

8
samples/bpf/sockex3_kern.c
Unescape View File

@ -61,7 +61,7 @@ struct vlan_hdr {
__be16 h_vlan_encapsulated_proto;
};
struct flow_keys {
struct bpf_flow_keys {
__be32 src;
__be32 dst;
union {
@ -88,7 +88,7 @@ static inline __u32 ipv6_addr_hash(struct __sk_buff *ctx, __u64 off)
}
struct globals {
struct flow_keys flow;
struct bpf_flow_keys flow;
};
struct bpf_map_def SEC("maps") percpu_map = {
@ -114,14 +114,14 @@ struct pair {
struct bpf_map_def SEC("maps") hash_map = {
.type = BPF_MAP_TYPE_HASH,
.key_size = sizeof(struct flow_keys),
.key_size = sizeof(struct bpf_flow_keys),
.value_size = sizeof(struct pair),
.max_entries = 1024,
};
static void update_stats(struct __sk_buff *skb, struct globals *g)
{
struct flow_keys key = g->flow;
struct bpf_flow_keys key = g->flow;
struct pair *value;
value = bpf_map_lookup_elem(&hash_map, &key);

4
samples/bpf/sockex3_user.c
Unescape View File

@ -7,7 +7,7 @@
#include <arpa/inet.h>
#include <sys/resource.h>
struct flow_keys {
struct bpf_flow_keys {
__be32 src;
__be32 dst;
union {
@ -49,7 +49,7 @@ int main(int argc, char **argv)
(void) f;
for (i = 0; i < 5; i++) {
struct flow_keys key = {}, next_key;
struct bpf_flow_keys key = {}, next_key;
struct pair value;
sleep(1);

Write Preview
Loading…
Cancel
Save