Commit 4c096324 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

selftests/bpf: Extend test_pkt_access test



The test_pkt_access.o is used by multiple tests. Fix its section name so that
program type can be automatically detected by libbpf and make it call other
subprograms with skb argument.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191114185720.1641606-20-ast@kernel.org
parent e7bf94db
Loading
Loading
Loading
Loading
+36 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,38 @@
#define barrier() __asm__ __volatile__("": : :"memory")
#define barrier() __asm__ __volatile__("": : :"memory")
int _version SEC("version") = 1;
int _version SEC("version") = 1;


SEC("test1")
/* llvm will optimize both subprograms into exactly the same BPF assembly
int process(struct __sk_buff *skb)
 *
 * Disassembly of section .text:
 *
 * 0000000000000000 test_pkt_access_subprog1:
 * ; 	return skb->len * 2;
 *        0:	61 10 00 00 00 00 00 00	r0 = *(u32 *)(r1 + 0)
 *        1:	64 00 00 00 01 00 00 00	w0 <<= 1
 *        2:	95 00 00 00 00 00 00 00	exit
 *
 * 0000000000000018 test_pkt_access_subprog2:
 * ; 	return skb->len * val;
 *        3:	61 10 00 00 00 00 00 00	r0 = *(u32 *)(r1 + 0)
 *        4:	64 00 00 00 01 00 00 00	w0 <<= 1
 *        5:	95 00 00 00 00 00 00 00	exit
 *
 * Which makes it an interesting test for BTF-enabled verifier.
 */
static __attribute__ ((noinline))
int test_pkt_access_subprog1(volatile struct __sk_buff *skb)
{
	return skb->len * 2;
}

static __attribute__ ((noinline))
int test_pkt_access_subprog2(int val, volatile struct __sk_buff *skb)
{
	return skb->len * val;
}

SEC("classifier/test_pkt_access")
int test_pkt_access(struct __sk_buff *skb)
{
{
	void *data_end = (void *)(long)skb->data_end;
	void *data_end = (void *)(long)skb->data_end;
	void *data = (void *)(long)skb->data;
	void *data = (void *)(long)skb->data;
@@ -48,6 +78,10 @@ int process(struct __sk_buff *skb)
		tcp = (struct tcphdr *)((void *)(ip6h) + ihl_len);
		tcp = (struct tcphdr *)((void *)(ip6h) + ihl_len);
	}
	}


	if (test_pkt_access_subprog1(skb) != skb->len * 2)
		return TC_ACT_SHOT;
	if (test_pkt_access_subprog2(2, skb) != skb->len * 2)
		return TC_ACT_SHOT;
	if (tcp) {
	if (tcp) {
		if (((void *)(tcp) + 20) > data_end || proto != 6)
		if (((void *)(tcp) + 20) > data_end || proto != 6)
			return TC_ACT_SHOT;
			return TC_ACT_SHOT;