From patchwork Thu Jul 26 21:32:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 949881 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="v0SrUDQ4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41c50c3t4Cz9s0n for ; Fri, 27 Jul 2018 07:32:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731800AbeGZWvL (ORCPT ); Thu, 26 Jul 2018 18:51:11 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35042 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731007AbeGZWvK (ORCPT ); Thu, 26 Jul 2018 18:51:10 -0400 Received: by mail-qt0-f193.google.com with SMTP id a5-v6so3125454qtp.2 for ; Thu, 26 Jul 2018 14:32:30 -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=ijK1hGYjQ/LmT5h0yX6H/ntgBbAV6XMF/UsqXloV4gY=; b=v0SrUDQ4m82TP48tjb+rpGBiBOBnBrMZVNS70kTKV9KvsgH1lTOoWwjl8aeO63XHQo qkXHLLEK7rTtc7v9i0JAH9LdNB1XOh0cN5H7lO1X6AhuDYmCLo2PDP0hvXXKuKAqkFFK GgTfXVtSco0H7tvhkH4iVOG2IXXZX6miF7Gs0GtFvlfP6R2zJY1ickrsvm6unObOUx+M GxSWzia+Til/Op7AZGfWNYetoF5TFpKRQpF1+SISCYaEw7GzepYcIAFuo0mkb1f0cBjX u3/hQw9lrU5WATFH+dAiK//mtyIfp6yxvEeYbHyCZN7OVJDBoHjhCmong9T5XXX/TWr6 AIAw== 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=ijK1hGYjQ/LmT5h0yX6H/ntgBbAV6XMF/UsqXloV4gY=; b=HVywOPoJcSk4ek4xZSnSShdJKpWkOYt7PzCgSkBqYcwsI36Q6tS8L7o0LfwQj+LwkD aBLGSaP5HlqM64SSlEOyw8bkxEKQVaY0g4Bqm6W4Q2n7hWh1JkrIg7rsnxPveZh3Czl7 fvZcFapj3n51SLkG0MVmhXPmvfToReR7RknEyWqtoB/TFt+9J4vg+GVCkh14U1bGcoJE Svrd64EMYNvQtc5D5kNx+txyJ0e+Y/d4WiNIFg+N56BNCTvfg6YO0nEjd71Z7lXxCYuo /+aqsyhTTYO28XY0X6YlQEKeA+1oBNSiAVAeI68yzbm7KK+fpXBTzrn0BtIGg45opu3W PJgA== X-Gm-Message-State: AOUpUlGvXhpXabFtw6Zm7UneUn1gSqiDQQOY28Jk6RxUrss3EcBAqAjZ 8hWkUfKE2ZUMHPcbVabauZLr/A== X-Google-Smtp-Source: AAOMgpd5aNyzVBKKPXlC9/E5F5q4hbng9WXn5KG+Lsj1VBam78Mwp+mQfaUq7EqsfAh00EgBBGvNew== X-Received: by 2002:ac8:691:: with SMTP id f17-v6mr3624828qth.138.1532640749874; Thu, 26 Jul 2018 14:32:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 14:32:29 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH bpf-next 1/4] tools: libbpf: handle NULL program gracefully in bpf_program__nth_fd() Date: Thu, 26 Jul 2018 14:32:18 -0700 Message-Id: <20180726213221.1295-2-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 bpf_map__fd() handles NULL map gracefully and returns -EINVAL. bpf_program__fd() and bpf_program__nth_fd() crash in this case. Make the behaviour more consistent by validating prog pointer as well. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- tools/lib/bpf/libbpf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 955f8eafbf41..afa9860db755 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1991,6 +1991,9 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n) { int fd; + if (!prog) + return -EINVAL; + if (n >= prog->instances.nr || n < 0) { pr_warning("Can't get the %dth fd from program %s: only %d instances\n", n, prog->section_name, prog->instances.nr); From patchwork Thu Jul 26 21:32:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 949882 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="TH2RTOtX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41c50f442Jz9ryn for ; Fri, 27 Jul 2018 07:32:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731815AbeGZWvN (ORCPT ); Thu, 26 Jul 2018 18:51:13 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:33088 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731007AbeGZWvM (ORCPT ); Thu, 26 Jul 2018 18:51:12 -0400 Received: by mail-qt0-f193.google.com with SMTP id c15-v6so3129299qtp.0 for ; Thu, 26 Jul 2018 14:32:31 -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=Kynl3TO5HwsQG6norTRu5bkGfz8lj9yYeSXfTglddj0=; b=TH2RTOtX7UV67DSHUd2T/mR9/JI/nyS1Y6gnh4DFBkr966UN8hkxdXu6SHeyde9De2 RV0nq3svL2J9iw7eUfgX5SoebLwSUSb28Z7cjmYPyqJY0b4mQK01e/fAuRAwnLak5m5y 0kxC0xOa4RkWOj39MPkRDpFKVqjZxdBBtOMnSqoXaacfBG5szKB38d/r1n+JtQtEdHko 8FGhps0z8pDq0E+CapEEajQFvN873oAbIQ7GuhkmBkFzjK036AuF1Hpw1QdJ/1PtSp9a v+mnVdRk43PAwQHZuAOO8CWNZCXWohwtgk7o3IVkRBOMhK55HWzkGmxiMW/zEYApVa0F p5HQ== 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=Kynl3TO5HwsQG6norTRu5bkGfz8lj9yYeSXfTglddj0=; b=Ri7bzoJIIzszf1butkE4v9DuOjI/6BzTGOxGH44cRCejauqNoegAoGCQ8f9FpO0NH0 RprdED/QDs8F8bW3sZnjWrZwsdHlq7YXW2EHmz4OJdJFr93iOtfB5XYbNUZrUgW9CJFT Pi+Ij/OJeQKN3tI+6jxnPcijQeJQeifZXaoFyqV1j8FnOiicWKR5rVS0evGWgqVu0X6z 9ePMGbTqnb8yuJBC1AD3kljSk3FOxe/MPa8izOOdNmrgWK61ufJjawa1TWhoxdE/c2Ib 55jLvkvuvn2GV0nFtup9dsXfDmJUZtc5tSZxNNPRZLl7HJQNG5XGOizstbRX1v9AIROg +9Yw== X-Gm-Message-State: AOUpUlGatEBxCtZ5x+JKQlTYqEVQAOYPqkWd+Ji9VnoEOG077GSBvNAz D7CwtwUCXQYzo5NDyMg1We6YLw== X-Google-Smtp-Source: AAOMgpdUu/WfR/gI2t2O/Efu1G2AXjky20TRXvT7COr2N061rHfxrMarL3uPILyqJMhzoMLsrePS2A== X-Received: by 2002:a0c:b495:: with SMTP id c21-v6mr3284945qve.111.1532640751131; Thu, 26 Jul 2018 14:32:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 14:32:30 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH bpf-next 2/4] tools: libbpf: add bpf_object__find_program_by_title() Date: Thu, 26 Jul 2018 14:32:19 -0700 Message-Id: <20180726213221.1295-3-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 Allow users to find programs by section names. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- tools/lib/bpf/libbpf.c | 12 ++++++++++++ tools/lib/bpf/libbpf.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index afa9860db755..857d3d16968e 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -873,6 +873,18 @@ bpf_object__find_prog_by_idx(struct bpf_object *obj, int idx) return NULL; } +struct bpf_program * +bpf_object__find_program_by_title(struct bpf_object *obj, const char *title) +{ + struct bpf_program *pos; + + bpf_object__for_each_program(pos, obj) { + if (pos->section_name && !strcmp(pos->section_name, title)) + return pos; + } + return NULL; +} + static int bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr, Elf_Data *data, struct bpf_object *obj) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 1f8fc2060460..a295fe2f822b 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -86,6 +86,9 @@ const char *bpf_object__name(struct bpf_object *obj); unsigned int bpf_object__kversion(struct bpf_object *obj); int bpf_object__btf_fd(const struct bpf_object *obj); +struct bpf_program * +bpf_object__find_program_by_title(struct bpf_object *obj, const char *title); + struct bpf_object *bpf_object__next(struct bpf_object *prev); #define bpf_object__for_each_safe(pos, tmp) \ for ((pos) = bpf_object__next(NULL), \ 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; } From patchwork Thu Jul 26 21:32:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 949884 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="yADmF3ic"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41c50j1YVlz9ryn for ; Fri, 27 Jul 2018 07:32:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731853AbeGZWvP (ORCPT ); Thu, 26 Jul 2018 18:51:15 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:39179 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731007AbeGZWvP (ORCPT ); Thu, 26 Jul 2018 18:51:15 -0400 Received: by mail-qt0-f193.google.com with SMTP id q12-v6so3112783qtp.6 for ; Thu, 26 Jul 2018 14:32:34 -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 :mime-version:content-transfer-encoding; bh=wKCxeF7IXglFhglXvTdnL/JTVyJyo3vowrqTuC7W/4A=; b=yADmF3ic34GbwwtGMUZo2IL1/7AHomfLAVrs/Wrvf4xorvgn6Y4XwaYcxqDRIm1zwB xrUontIWvRxZ+yyYZQdM+XOE+XqN8ztJMT3oqfp6GqqtxbbBiGtLwrL5G0J3vfWEci1N zLseaMF1MpPl+6cSF+gdjbsNHfOma37BB7f4a9lHFHmGzkOsOrrK+SICIuyGO8IFr2J5 Yx4k8MJm4mEs9WJU02ZBzkqd7SayUyFizwLJmWR2Pa6p/eS+5wlF9nj/KQ1nc9riw1+X bDFkErjC5dWacdliA/KkRXVyC9TiCVzQ1xo6I194I2vEaSzWRCS0Watg37w2aMVUq9Yb Cq+g== 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=wKCxeF7IXglFhglXvTdnL/JTVyJyo3vowrqTuC7W/4A=; b=TZgECJRXFfmEx68boF4o8cT2pS95ULoQ2GRVxJXZDWy2nj9IpS4uPgy0qgPKBhRRcN 4RZsw3DX2SXyVrz3i1tMBfvPXzV3IYiWZbsewU+ljOBXhU8my3hWYYOzep9NNvX8liEL Z6Ti7VRNHm8LDIshLBZO6ZY1ZWBi3k0z4PwTqKAl5L6Rxvhrh66DezlP3s7/NfuKJLlR kJgzwkJoLw40+f2UVtg10GODJs0i+Pt88+iSnUsvCZ0KSYoOP+4XjOZq12KJA5LNd0pr YtbR9yDawt7Q+2LDQ1rAkTL3H74/dW9lUNuARMcQHH3SmvOYwU9vXL0NT/NEgyh5xJ86 H0Eg== X-Gm-Message-State: AOUpUlGLzOnugPFvgZSCDoQQY7aPRxXdG8iGwloB+a0SPHrDUSAkDGcE G8i29ENDGM1kfWJRBFdDXTfScw== X-Google-Smtp-Source: AAOMgpcKOpmPAHwEx8jalGn7neXnVDzojZfpRvf/bfoKRdnQ0rTHu7n8vv8qQ5lu/VjNESPT3V+NrA== X-Received: by 2002:a0c:88c2:: with SMTP id 2-v6mr3356964qvo.51.1532640753948; Thu, 26 Jul 2018 14:32:33 -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.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 14:32:33 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski , Magnus Karlsson , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH bpf-next 4/4] samples: bpf: convert xdpsock_user.c to libbpf Date: Thu, 26 Jul 2018 14:32:21 -0700 Message-Id: <20180726213221.1295-5-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> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert xdpsock_user.c to use libbpf instead of bpf_load.o. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- CC: Magnus Karlsson CC: Björn Töpel samples/bpf/Makefile | 2 +- samples/bpf/xdpsock_user.c | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 405fa6c880bb..6bfa250fc76e 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -105,7 +105,7 @@ xdp_rxq_info-objs := xdp_rxq_info_user.o 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 +xdpsock-objs := xdpsock_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/xdpsock_user.c b/samples/bpf/xdpsock_user.c index 5904b1543831..5c1fcb1a84f1 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -26,7 +26,7 @@ #include #include -#include "bpf_load.h" +#include "bpf/libbpf.h" #include "bpf_util.h" #include @@ -886,7 +886,13 @@ static void l2fwd(struct xdpsock *xsk) int main(int argc, char **argv) { struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; + struct bpf_prog_load_attr prog_load_attr = { + .prog_type = BPF_PROG_TYPE_XDP, + }; + int prog_fd, qidconf_map, xsks_map; + struct bpf_object *obj; char xdp_filename[256]; + struct bpf_map *map; int i, ret, key = 0; pthread_t pt; @@ -899,24 +905,38 @@ int main(int argc, char **argv) } snprintf(xdp_filename, sizeof(xdp_filename), "%s_kern.o", argv[0]); + prog_load_attr.file = xdp_filename; - if (load_bpf_file(xdp_filename)) { - fprintf(stderr, "ERROR: load_bpf_file %s\n", bpf_log_buf); + if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd)) + exit(EXIT_FAILURE); + if (prog_fd < 0) { + fprintf(stderr, "ERROR: no program found: %s\n", + strerror(prog_fd)); exit(EXIT_FAILURE); } - if (!prog_fd[0]) { - fprintf(stderr, "ERROR: load_bpf_file: \"%s\"\n", - strerror(errno)); + map = bpf_object__find_map_by_name(obj, "qidconf_map"); + qidconf_map = bpf_map__fd(map); + if (qidconf_map < 0) { + fprintf(stderr, "ERROR: no qidconf map found: %s\n", + strerror(qidconf_map)); + exit(EXIT_FAILURE); + } + + map = bpf_object__find_map_by_name(obj, "xsks_map"); + xsks_map = bpf_map__fd(map); + if (xsks_map < 0) { + fprintf(stderr, "ERROR: no xsks map found: %s\n", + strerror(xsks_map)); exit(EXIT_FAILURE); } - if (bpf_set_link_xdp_fd(opt_ifindex, prog_fd[0], opt_xdp_flags) < 0) { + if (bpf_set_link_xdp_fd(opt_ifindex, prog_fd, opt_xdp_flags) < 0) { fprintf(stderr, "ERROR: link set xdp fd failed\n"); exit(EXIT_FAILURE); } - ret = bpf_map_update_elem(map_fd[0], &key, &opt_queue, 0); + ret = bpf_map_update_elem(qidconf_map, &key, &opt_queue, 0); if (ret) { fprintf(stderr, "ERROR: bpf_map_update_elem qidconf\n"); exit(EXIT_FAILURE); @@ -933,7 +953,7 @@ int main(int argc, char **argv) /* ...and insert them into the map. */ for (i = 0; i < num_socks; i++) { key = i; - ret = bpf_map_update_elem(map_fd[1], &key, &xsks[i]->sfd, 0); + ret = bpf_map_update_elem(xsks_map, &key, &xsks[i]->sfd, 0); if (ret) { fprintf(stderr, "ERROR: bpf_map_update_elem %d\n", i); exit(EXIT_FAILURE);