From patchwork Thu Jul 26 21:32:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 949883 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="YpHhpJbj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41c50g5VWdz9ryn for ; Fri, 27 Jul 2018 07:32:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731834AbeGZWvO (ORCPT ); Thu, 26 Jul 2018 18:51:14 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:33962 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731803AbeGZWvO (ORCPT ); Thu, 26 Jul 2018 18:51:14 -0400 Received: by mail-qt0-f195.google.com with SMTP id m13-v6so3125155qth.1 for ; Thu, 26 Jul 2018 14:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Apq/+XZBTV7E8UybSapGjzfz2mCI2y7spliyy3RQcVk=; b=YpHhpJbjeZJtErH81i5JLL2u8bmp6kPbnigkmCs8y3lMAXogtaO3qm9oGwZvDohfQ8 eM1BKm5CcndAd3LLJV0o2kSOpJ+ipPvVX1v19bHpzsBWKN9KVMY5Jc9GLaj8PvBOc8Dd ejQunu1U2NaEsOY+UMb6FCclW403tcUEEc00X17QAiA31oyc4DNx0XobqZhiwOY1+edB 2QnRoOYtPgkp2WkEBuMQg9gdmyjM7dlAkKugmBEs3gdjKu4xzGxu8M8+HdH71NPb8MEZ 1+Q2GOLgN+JhwGC25qggTznF3h+JvO2FHo9FQRLvuqhW7txKCRThgaOPp4Ee4tN4ABtD FhCQ== 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; bh=Apq/+XZBTV7E8UybSapGjzfz2mCI2y7spliyy3RQcVk=; b=nbWD/AGVEHmRMu8rl5eBZGmiuCPWJsoURxT2oawFhi6tVLCmfm3EaG5BoCWjPbNNvm X6JZZ0U/DxfQRQZgjeBy4D58cvd8Ue7Gezys7WxLdI2nDwrpJkCT9A4+krNbLCnGs1Rq cRpyakjLo4LO6bK/sms8f+M726Km5t6yg34ri6M/KwnhTuEr90lY9hiZaQLdkoneIt60 e0HTL1Gv0fxcSGkzpdOJNijnKHxkMY8pN0Zqn6rT0ZdSmVvKeA12WGP4j/+Y8shseF5z Kmxm2aNh3/S0NimzOgJIzyFnRG9zROsVX+roBBqzHNOY3Xg1yeeyYFDARt83wmwVUs3w q/mA== X-Gm-Message-State: AOUpUlFyjyrXUqUEkA+MfP5qvZUyVKSbJnWZdYU5gZh3K4n897ZZBRKu BdreAHQwh8NkELccMnQsWW8W2A== X-Google-Smtp-Source: AAOMgpdlRLLj4in9DmgbzaJ3/+VHA8IyaoSYqLJaoXg0yVd/8dwyCQI9iqlqDmgJxpmvMYL8+C1pHQ== X-Received: by 2002:a0c:ba0f:: with SMTP id w15-v6mr3349339qvf.9.1532640752480; Thu, 26 Jul 2018 14:32:32 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id o124-v6sm1829990qkd.61.2018.07.26.14.32.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 14:32:32 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski , dsahern@gmail.com Subject: [PATCH bpf-next 3/4] samples: bpf: convert xdp_fwd_user.c to libbpf Date: Thu, 26 Jul 2018 14:32:20 -0700 Message-Id: <20180726213221.1295-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180726213221.1295-1-jakub.kicinski@netronome.com> References: <20180726213221.1295-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert xdp_fwd_user.c to use libbpf instead of bpf_load.o. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- CC: dsahern@gmail.com samples/bpf/Makefile | 2 +- samples/bpf/xdp_fwd_user.c | 34 +++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 9ea2f7b64869..405fa6c880bb 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -106,7 +106,7 @@ syscall_tp-objs := bpf_load.o syscall_tp_user.o cpustat-objs := bpf_load.o cpustat_user.o xdp_adjust_tail-objs := xdp_adjust_tail_user.o xdpsock-objs := bpf_load.o xdpsock_user.o -xdp_fwd-objs := bpf_load.o xdp_fwd_user.o +xdp_fwd-objs := xdp_fwd_user.o task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) diff --git a/samples/bpf/xdp_fwd_user.c b/samples/bpf/xdp_fwd_user.c index a87a2048ed32..f88e1d7093d6 100644 --- a/samples/bpf/xdp_fwd_user.c +++ b/samples/bpf/xdp_fwd_user.c @@ -24,8 +24,7 @@ #include #include -#include "bpf_load.h" -#include "bpf_util.h" +#include "bpf/libbpf.h" #include @@ -63,9 +62,15 @@ static void usage(const char *prog) int main(int argc, char **argv) { + struct bpf_prog_load_attr prog_load_attr = { + .prog_type = BPF_PROG_TYPE_XDP, + }; + const char *prog_name = "xdp_fwd"; + struct bpf_program *prog; char filename[PATH_MAX]; + struct bpf_object *obj; int opt, i, idx, err; - int prog_id = 0; + int prog_fd, map_fd; int attach = 1; int ret = 0; @@ -75,7 +80,7 @@ int main(int argc, char **argv) attach = 0; break; case 'D': - prog_id = 1; + prog_name = "xdp_fwd_direct"; break; default: usage(basename(argv[0])); @@ -90,6 +95,7 @@ int main(int argc, char **argv) if (attach) { snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); + prog_load_attr.file = filename; if (access(filename, O_RDONLY) < 0) { printf("error accessing file %s: %s\n", @@ -97,19 +103,25 @@ int main(int argc, char **argv) return 1; } - if (load_bpf_file(filename)) { - printf("%s", bpf_log_buf); + if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd)) return 1; - } - if (!prog_fd[prog_id]) { - printf("load_bpf_file: %s\n", strerror(errno)); + prog = bpf_object__find_program_by_title(obj, prog_name); + prog_fd = bpf_program__fd(prog); + if (prog_fd < 0) { + printf("program not found: %s\n", strerror(prog_fd)); + return 1; + } + map_fd = bpf_map__fd(bpf_object__find_map_by_name(obj, + "tx_port")); + if (map_fd < 0) { + printf("map not found: %s\n", strerror(map_fd)); return 1; } } if (attach) { for (i = 1; i < 64; ++i) - bpf_map_update_elem(map_fd[0], &i, &i, 0); + bpf_map_update_elem(map_fd, &i, &i, 0); } for (i = optind; i < argc; ++i) { @@ -126,7 +138,7 @@ int main(int argc, char **argv) if (err) ret = err; } else { - err = do_attach(idx, prog_fd[prog_id], argv[i]); + err = do_attach(idx, prog_fd, argv[i]); if (err) ret = err; }