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>
39 lines
885 B
C
39 lines
885 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__); \
|
|
})
|
|
|
|
SEC("sk_skb1")
|
|
int bpf_prog1(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 skb->len;
|
|
|
|
/* This write/read is a bit pointless but tests the verifier and
|
|
* strparser handler for read/write pkt data and access into sk
|
|
* fields.
|
|
*/
|
|
d[0] = 1;
|
|
|
|
bpf_printk("parse: data[0] = (%u): local_port %i remote %i\n",
|
|
d[0], lport, bpf_ntohl(rport));
|
|
return skb->len;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|