From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C313C18E5C for ; Tue, 10 Mar 2020 23:27:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BC6E2146E for ; Tue, 10 Mar 2020 23:27:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gzc9ADJK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727782AbgCJX1L (ORCPT ); Tue, 10 Mar 2020 19:27:11 -0400 Received: from mail-pj1-f66.google.com ([209.85.216.66]:36130 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727642AbgCJX1K (ORCPT ); Tue, 10 Mar 2020 19:27:10 -0400 Received: by mail-pj1-f66.google.com with SMTP id l41so9910pjb.1; Tue, 10 Mar 2020 16:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2xRCGhiy9mvouAH6vDNXrKkEeCqjyUeKjXpXUQeZCQs=; b=Gzc9ADJKYtQa3icwh8upZJzLIgx2/UNDmhZpo5NpycZuyG2VGeNUcZ1/cejndl3QYW cLLDnYHXNzjJp6UmdnrKBJ8jWKCQIfGZ6TFRYBlZHHIUYl8Sq0ACrWrOwkSMUYJ14OIZ m/D3wG+zKhCbU65ZHwCCvrqqibOO7BynyhEEv0g5bYTf1TOqZuTLc45QfuksApMG1OgX K2c7+Ws+npgEl+wSUXzfzwyGW7SSam0mfBoslHt++8gBXNmCrwtS2aoyDQorLK37YANN UopLKxnKDXN18o7YFnXSj60ybtPSOrDZx6nH1x24AO87X5Yi4o7RawoKQOJSWZlf9xKP oVzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2xRCGhiy9mvouAH6vDNXrKkEeCqjyUeKjXpXUQeZCQs=; b=EaRYttVPqFTAPL9UgbPrPrEZSAccVjaWO4C71PPiajcqrpn7w5poPdzzqSGqWdCYYv Lpoh8k9wkt+JltIrTCUGIJ28ZZWMMWq55LNDWB616v4BzWHPyZ3JuznxDL1b2auMTI3j ro4tIzSuTe29b9XSSJ1Z5wynx6nO/Pgfq/ZfDsVxOkuVPZu80gCeVs3DOf75N2oRta7E QGYMSGxltzgw5+D39LgXwN8D3PDFSFHQdqYJicXYzjRSC7fB+OS38EyGCFv9Kh4USmuL Umnbi1NCIXpBkdnzwMR/bliRmwIX9A809o6EkDqhkKHQHNl+QzwCihlujpUvOkBgkOFg TnqA== X-Gm-Message-State: ANhLgQ1nT4aUZXplf9UXB4/YPQS5OKIIGr5fUcTJI2yQzUh+qNNPEqw/ zQh86jAGQ1hjs5Id3A0/Cw== X-Google-Smtp-Source: ADFU+vs7fqYNxo42c9GJ9tCuu+1waPygQ0x8ao4g7TrI+etwSwXUnE0RtmdmI0jLbEo+QP1LfNgwHA== X-Received: by 2002:a17:90a:22a9:: with SMTP id s38mr350045pjc.3.1583882828905; Tue, 10 Mar 2020 16:27:08 -0700 (PDT) Received: from localhost.localdomain ([110.35.161.54]) by smtp.gmail.com with ESMTPSA id x6sm48263668pfi.83.2020.03.10.16.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 16:27:08 -0700 (PDT) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov Cc: John Fastabend , Andrii Nakryiko , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next v2 2/2] samples: bpf: refactor perf_event user program with libbpf bpf_link Date: Wed, 11 Mar 2020 08:26:47 +0900 Message-Id: <20200310232647.27777-3-danieltimlee@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310232647.27777-1-danieltimlee@gmail.com> References: <20200310232647.27777-1-danieltimlee@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The bpf_program__attach of libbpf(using bpf_link) is much more intuitive than the previous method using ioctl. bpf_program__attach_perf_event manages the enable of perf_event and attach of BPF programs to it, so there's no neeed to do this directly with ioctl. In addition, bpf_link provides consistency in the use of API because it allows disable (detach, destroy) for multiple events to be treated as one bpf_link__destroy. This commit refactors samples that attach the bpf program to perf_event by using libbbpf instead of ioctl. Also the bpf_load in the samples were removed and migrated to use libbbpf API. Signed-off-by: Daniel T. Lee --- Changes in v2: - check memory allocation is successful - clean up allocated memory on error samples/bpf/Makefile | 4 +- samples/bpf/sampleip_user.c | 76 ++++++++++++++++++++++------------ samples/bpf/trace_event_user.c | 63 ++++++++++++++++++++-------- 3 files changed, 97 insertions(+), 46 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index ff0061467dd3..424f6fe7ce38 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -88,8 +88,8 @@ xdp2-objs := xdp1_user.o xdp_router_ipv4-objs := xdp_router_ipv4_user.o test_current_task_under_cgroup-objs := bpf_load.o $(CGROUP_HELPERS) \ test_current_task_under_cgroup_user.o -trace_event-objs := bpf_load.o trace_event_user.o $(TRACE_HELPERS) -sampleip-objs := bpf_load.o sampleip_user.o $(TRACE_HELPERS) +trace_event-objs := trace_event_user.o $(TRACE_HELPERS) +sampleip-objs := sampleip_user.o $(TRACE_HELPERS) tc_l2_redirect-objs := bpf_load.o tc_l2_redirect_user.o lwt_len_hist-objs := bpf_load.o lwt_len_hist_user.o xdp_tx_iptunnel-objs := xdp_tx_iptunnel_user.o diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index b0f115f938bc..fd763a49c913 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -10,13 +10,11 @@ #include #include #include -#include #include #include #include -#include +#include #include -#include "bpf_load.h" #include "perf-sys.h" #include "trace_helpers.h" @@ -25,6 +23,7 @@ #define MAX_IPS 8192 #define PAGE_OFFSET 0xffff880000000000 +static int map_fd; static int nr_cpus; static void usage(void) @@ -34,7 +33,8 @@ static void usage(void) printf(" duration # sampling duration (seconds), default 5\n"); } -static int sampling_start(int *pmu_fd, int freq) +static int sampling_start(int *pmu_fd, int freq, struct bpf_program *prog, + struct bpf_link **link) { int i; @@ -53,20 +53,22 @@ static int sampling_start(int *pmu_fd, int freq) fprintf(stderr, "ERROR: Initializing perf sampling\n"); return 1; } - assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, - prog_fd[0]) == 0); - assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_ENABLE, 0) == 0); + link[i] = bpf_program__attach_perf_event(prog, pmu_fd[i]); + if (link[i] < 0) { + fprintf(stderr, "ERROR: Attach perf event\n"); + return 1; + } } return 0; } -static void sampling_end(int *pmu_fd) +static void sampling_end(struct bpf_link **link) { int i; for (i = 0; i < nr_cpus; i++) - close(pmu_fd[i]); + bpf_link__destroy(link[i]); } struct ipcount { @@ -128,14 +130,18 @@ static void print_ip_map(int fd) static void int_exit(int sig) { printf("\n"); - print_ip_map(map_fd[0]); + print_ip_map(map_fd); exit(0); } int main(int argc, char **argv) { + int prog_fd, *pmu_fd, opt, freq = DEFAULT_FREQ, secs = DEFAULT_SECS; + struct bpf_program *prog; + struct bpf_object *obj; + struct bpf_link **link; char filename[256]; - int *pmu_fd, opt, freq = DEFAULT_FREQ, secs = DEFAULT_SECS; + int error = 0; /* process arguments */ while ((opt = getopt(argc, argv, "F:h")) != -1) { @@ -165,36 +171,54 @@ int main(int argc, char **argv) /* create perf FDs for each CPU */ nr_cpus = sysconf(_SC_NPROCESSORS_CONF); pmu_fd = malloc(nr_cpus * sizeof(int)); - if (pmu_fd == NULL) { - fprintf(stderr, "ERROR: malloc of pmu_fd\n"); - return 1; + link = malloc(nr_cpus * sizeof(struct bpf_link *)); + if (pmu_fd == NULL || link == NULL) { + fprintf(stderr, "ERROR: malloc of pmu_fd/link\n"); + error = 1; + goto cleanup; } /* load BPF program */ snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); - if (load_bpf_file(filename)) { + if (bpf_prog_load(filename, BPF_PROG_TYPE_PERF_EVENT, &obj, &prog_fd)) { fprintf(stderr, "ERROR: loading BPF program (errno %d):\n", errno); - if (strcmp(bpf_log_buf, "") == 0) - fprintf(stderr, "Try: ulimit -l unlimited\n"); - else - fprintf(stderr, "%s", bpf_log_buf); - return 1; + error = 1; + goto cleanup; + } + + prog = bpf_program__next(NULL, obj); + if (!prog) { + fprintf(stderr, "ERROR: finding a prog in obj file failed\n"); + error = 1; + goto cleanup; + } + + map_fd = bpf_object__find_map_fd_by_name(obj, "ip_map"); + if (map_fd < 0) { + fprintf(stderr, "ERROR: finding a map in obj file failed\n"); + error = 1; + goto cleanup; } + signal(SIGINT, int_exit); signal(SIGTERM, int_exit); /* do sampling */ printf("Sampling at %d Hertz for %d seconds. Ctrl-C also ends.\n", freq, secs); - if (sampling_start(pmu_fd, freq) != 0) - return 1; + if (sampling_start(pmu_fd, freq, prog, link) != 0) { + error = 1; + goto cleanup; + } sleep(secs); - sampling_end(pmu_fd); - free(pmu_fd); + sampling_end(link); /* output sample counts */ - print_ip_map(map_fd[0]); + print_ip_map(map_fd); - return 0; +cleanup: + free(pmu_fd); + free(link); + return error; } diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index 356171bc392b..30c25ef99fc5 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -6,22 +6,21 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include #include +#include #include -#include "bpf_load.h" #include "perf-sys.h" #include "trace_helpers.h" #define SAMPLE_FREQ 50 +/* counts, stackmap */ +static int map_fd[2]; +struct bpf_program *prog; static bool sys_read_seen, sys_write_seen; static void print_ksym(__u64 addr) @@ -137,9 +136,16 @@ static inline int generate_load(void) static void test_perf_event_all_cpu(struct perf_event_attr *attr) { int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); + struct bpf_link **link = malloc(nr_cpus * sizeof(struct bpf_link *)); int *pmu_fd = malloc(nr_cpus * sizeof(int)); int i, error = 0; + if (pmu_fd == NULL || link == NULL) { + printf("malloc of pmu_fd/link failed\n"); + error = 1; + goto err; + } + /* system wide perf event, no need to inherit */ attr->inherit = 0; @@ -151,8 +157,12 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) error = 1; goto all_cpu_err; } - assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); - assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_ENABLE) == 0); + link[i] = bpf_program__attach_perf_event(prog, pmu_fd[i]); + if (link[i] < 0) { + printf("bpf_program__attach_perf_event failed\n"); + error = 1; + goto all_cpu_err; + } } if (generate_load() < 0) { @@ -161,11 +171,11 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) } print_stacks(); all_cpu_err: - for (i--; i >= 0; i--) { - ioctl(pmu_fd[i], PERF_EVENT_IOC_DISABLE); - close(pmu_fd[i]); - } + for (i--; i >= 0; i--) + bpf_link__destroy(link[i]); +err: free(pmu_fd); + free(link); if (error) int_exit(0); } @@ -173,6 +183,7 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) static void test_perf_event_task(struct perf_event_attr *attr) { int pmu_fd, error = 0; + struct bpf_link *link; /* per task perf event, enable inherit so the "dd ..." command can be traced properly. * Enabling inherit will cause bpf_perf_prog_read_time helper failure. @@ -185,8 +196,12 @@ static void test_perf_event_task(struct perf_event_attr *attr) printf("sys_perf_event_open failed\n"); int_exit(0); } - assert(ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); - assert(ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE) == 0); + link = bpf_program__attach_perf_event(prog, pmu_fd); + if (link < 0) { + printf("bpf_program__attach_perf_event failed\n"); + close(pmu_fd); + int_exit(0); + } if (generate_load() < 0) { error = 1; @@ -194,8 +209,7 @@ static void test_perf_event_task(struct perf_event_attr *attr) } print_stacks(); err: - ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE); - close(pmu_fd); + bpf_link__destroy(link); if (error) int_exit(0); } @@ -282,7 +296,9 @@ static void test_bpf_perf_event(void) int main(int argc, char **argv) { struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; + struct bpf_object *obj; char filename[256]; + int prog_fd; snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); setrlimit(RLIMIT_MEMLOCK, &r); @@ -295,9 +311,20 @@ int main(int argc, char **argv) return 1; } - if (load_bpf_file(filename)) { - printf("%s", bpf_log_buf); - return 2; + if (bpf_prog_load(filename, BPF_PROG_TYPE_PERF_EVENT, &obj, &prog_fd)) + return 1; + + prog = bpf_program__next(NULL, obj); + if (!prog) { + printf("finding a prog in obj file failed\n"); + return 1; + } + + map_fd[0] = bpf_object__find_map_fd_by_name(obj, "counts"); + map_fd[1] = bpf_object__find_map_fd_by_name(obj, "stackmap"); + if (map_fd[0] < 0 || map_fd[1] < 0) { + printf("finding a counts/stackmap map in obj file failed\n"); + return 1; } if (fork() == 0) { -- 2.25.1