464bc0fd62
In the initial sockmap API we provided strparser and verdict programs
using a single attach command by extending the attach API with a the
attach_bpf_fd2 field.
However, if we add other programs in the future we will be adding a
field for every new possible type, attach_bpf_fd(3,4,..). This
seems a bit clumsy for an API. So lets push the programs using two
new type fields.
BPF_SK_SKB_STREAM_PARSER
BPF_SK_SKB_STREAM_VERDICT
This has the advantage of having a readable name and can easily be
extended in the future.
Updates to samples and sockmap included here also generalize tests
slightly to support upcoming patch for multiple map support.
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support")
Suggested-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
49 lines
1023 B
C
49 lines
1023 B
C
#include <linux/bpf.h>
|
|
#include "bpf_helpers.h"
|
|
#include "bpf_util.h"
|
|
#include "bpf_endian.h"
|
|
|
|
int _version SEC("version") = 1;
|
|
|
|
#define bpf_printk(fmt, ...) \
|
|
({ \
|
|
char ____fmt[] = fmt; \
|
|
bpf_trace_printk(____fmt, sizeof(____fmt), \
|
|
##__VA_ARGS__); \
|
|
})
|
|
|
|
struct bpf_map_def SEC("maps") sock_map = {
|
|
.type = BPF_MAP_TYPE_SOCKMAP,
|
|
.key_size = sizeof(int),
|
|
.value_size = sizeof(int),
|
|
.max_entries = 20,
|
|
};
|
|
|
|
SEC("sk_skb2")
|
|
int bpf_prog2(struct __sk_buff *skb)
|
|
{
|
|
void *data_end = (void *)(long) skb->data_end;
|
|
void *data = (void *)(long) skb->data;
|
|
__u32 lport = skb->local_port;
|
|
__u32 rport = skb->remote_port;
|
|
char *d = data;
|
|
|
|
if (data + 8 > data_end)
|
|
return SK_DROP;
|
|
|
|
d[0] = 0xd;
|
|
d[1] = 0xe;
|
|
d[2] = 0xa;
|
|
d[3] = 0xd;
|
|
d[4] = 0xb;
|
|
d[5] = 0xe;
|
|
d[6] = 0xe;
|
|
d[7] = 0xf;
|
|
|
|
bpf_printk("verdict: data[0] = (%u): local_port %i remote %i redirect 5\n",
|
|
d[0], lport, bpf_ntohl(rport));
|
|
return bpf_sk_redirect_map(&sock_map, 5, 0);
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|