Merge tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / samples / bpf / test_cgrp2_attach.c

diff --git a/samples/bpf/test_cgrp2_attach.c b/samples/bpf/test_cgrp2_attach.c
index a19484c45b79f0d600be81eadec23120e583e214..504058631ffccef319f9bc7f6a3349d6f854bdbd 100644 (file)
--- a/samples/bpf/test_cgrp2_attach.c
+++ b/samples/bpf/test_cgrp2_attach.c
@@ -36,6 +36,8 @@ enum {
        MAP_KEY_BYTES,
 };
 
+char bpf_log_buf[BPF_LOG_BUF_SIZE];
+
 static int prog_load(int map_fd, int verdict)
 {
        struct bpf_insn prog[] = {
@@ -66,9 +68,11 @@ static int prog_load(int map_fd, int verdict)
                BPF_MOV64_IMM(BPF_REG_0, verdict), /* r0 = verdict */
                BPF_EXIT_INSN(),
        };
+       size_t insns_cnt = sizeof(prog) / sizeof(struct bpf_insn);
 
-       return bpf_prog_load(BPF_PROG_TYPE_CGROUP_SKB,
-                            prog, sizeof(prog), "GPL", 0);
+       return bpf_load_program(BPF_PROG_TYPE_CGROUP_SKB,
+                               prog, insns_cnt, "GPL", 0,
+                               bpf_log_buf, BPF_LOG_BUF_SIZE);
 }
 
 static int usage(const char *argv0)
@@ -108,10 +112,10 @@ static int attach_filter(int cg_fd, int type, int verdict)
        }
        while (1) {
                key = MAP_KEY_PACKETS;
-               assert(bpf_lookup_elem(map_fd, &key, &pkt_cnt) == 0);
+               assert(bpf_map_lookup_elem(map_fd, &key, &pkt_cnt) == 0);
 
                key = MAP_KEY_BYTES;
-               assert(bpf_lookup_elem(map_fd, &key, &byte_cnt) == 0);
+               assert(bpf_map_lookup_elem(map_fd, &key, &byte_cnt) == 0);
 
                printf("cgroup received %lld packets, %lld bytes\n",
                       pkt_cnt, byte_cnt);