From patchwork Tue May 15 05:35:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 913431 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="ASuIaUME"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lRBQ1GDNz9s1w for ; Tue, 15 May 2018 15:36:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752472AbeEOFgK (ORCPT ); Tue, 15 May 2018 01:36:10 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:38377 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752170AbeEOFfd (ORCPT ); Tue, 15 May 2018 01:35:33 -0400 Received: by mail-qt0-f193.google.com with SMTP id m9-v6so19316017qtb.5 for ; Mon, 14 May 2018 22:35:33 -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=ZxMwLEyWVLvwb7hUQ1WGpamMhCOuAu27IiSj1+YH4bc=; b=ASuIaUMECA+EtMsNPzEflMbmoVPaYQxJx40Ar+Cgl1rwI4/wPygRYbmS4jphsxMFRH zOoBuXnQmp85zFB+msS9am7g4dnvpA3pJuehZvcfPRQya18hnUqK40gWGFRwMqiOP2pU KtL4603F8o4GEM1flqcmV4AyYrS/SwYiK5DICen4+f4eHc+wWmOC/gEbNyWwa0dfg2Y4 oVN5WUCWZ/q6eX+J1a+Qy7P/T/mHZN1s0K7NzjpTOcchAjj6QTK/dBK+1PvMgLESwEtf WECbVQkLp/WVU5pYthk1UjO7xuMSgXsE42ycABG/T0Jp+yMYp/MaxC38zrWc4CoKy/VH bitg== 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=ZxMwLEyWVLvwb7hUQ1WGpamMhCOuAu27IiSj1+YH4bc=; b=DNS0d1MAGjiBSSgqox6F140BSZI7WZde5d3DoKBTvCybxjHPkPXgmizjalu/h4lty3 5RAnNChth70JpQ8OiGtozPIqPMiILhQWQ1SCFspZMGjtqIji3ev5Iu1OWnUTbGsWwkKr u5BkuaDJhTS/cK4AaX58ujy5S4PXQa4b96kf5AmMDyYx+cHKldvd0YaBpffi0fLN+4Bv TBQUPvJ3fNSqPoKTI3qkjAWOSzTniZ25rMSl2LDu/JFa3Cr9IVfeEW9G3tXbKTzZj/mm 8ajdXqIChX4A40K5mC7BwfDpAT9+SiOqIH7TsezciEiz6myRf/d4BgicN4GwZi3vJ5w6 rHRw== X-Gm-Message-State: ALKqPwcxqWwF0STsLGvWYezX8G2rPbwaenmV/ApTrV+ZuHQiOBm5jPsA mtHjcFkc4zzMaiyq9qfkRF2ULA== X-Google-Smtp-Source: AB8JxZpyFCVeSS07uqUkqNJVUIw0bd9rlWqpCigw4EcfU3D0HzqfkA8jC/hpoftGd3PG91ajJ7K1Mw== X-Received: by 2002:ac8:161b:: with SMTP id p27-v6mr11868377qtj.135.1526362533026; Mon, 14 May 2018 22:35:33 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id j12-v6sm8976133qtf.10.2018.05.14.22.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 22:35:32 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, =?utf-8?b?QmrDtnJu?= =?utf-8?q?_T=C3=B6pel?= , Y Song , Jesper Dangaard Brouer , Jakub Kicinski Subject: [PATCH bpf-next v2 2/5] samples: bpf: rename libbpf.h to bpf_insn.h Date: Mon, 14 May 2018 22:35:03 -0700 Message-Id: <20180515053506.4345-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515053506.4345-1-jakub.kicinski@netronome.com> References: <20180515053506.4345-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The libbpf.h file in samples is clashing with libbpf's header. Since it only includes a subset of filter.h instruction helpers rename it to bpf_insn.h. Drop the unnecessary include of bpf/bpf.h. Signed-off-by: Jakub Kicinski Acked-by: Jesper Dangaard Brouer --- samples/bpf/{libbpf.h => bpf_insn.h} | 8 +++----- samples/bpf/cookie_uid_helper_example.c | 2 +- samples/bpf/fds_example.c | 4 +++- samples/bpf/sock_example.c | 3 ++- samples/bpf/test_cgrp2_attach.c | 3 ++- samples/bpf/test_cgrp2_attach2.c | 3 ++- samples/bpf/test_cgrp2_sock.c | 3 ++- samples/bpf/test_cgrp2_sock2.c | 3 ++- 8 files changed, 17 insertions(+), 12 deletions(-) rename samples/bpf/{libbpf.h => bpf_insn.h} (98%) diff --git a/samples/bpf/libbpf.h b/samples/bpf/bpf_insn.h similarity index 98% rename from samples/bpf/libbpf.h rename to samples/bpf/bpf_insn.h index 18bfee5aab6b..20dc5cefec84 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/bpf_insn.h @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* eBPF mini library */ -#ifndef __LIBBPF_H -#define __LIBBPF_H - -#include +/* eBPF instruction mini library */ +#ifndef __BPF_INSN_H +#define __BPF_INSN_H struct bpf_insn; diff --git a/samples/bpf/cookie_uid_helper_example.c b/samples/bpf/cookie_uid_helper_example.c index 8eca27e595ae..deb0e3e0324d 100644 --- a/samples/bpf/cookie_uid_helper_example.c +++ b/samples/bpf/cookie_uid_helper_example.c @@ -51,7 +51,7 @@ #include #include #include -#include "libbpf.h" +#include "bpf_insn.h" #define PORT 8888 diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index e29bd52ff9e8..9854854f05d1 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -12,8 +12,10 @@ #include #include +#include + +#include "bpf_insn.h" #include "bpf_load.h" -#include "libbpf.h" #include "sock_example.h" #define BPF_F_PIN (1 << 0) diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 33a637507c00..60ec467c78ab 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -26,7 +26,8 @@ #include #include #include -#include "libbpf.h" +#include +#include "bpf_insn.h" #include "sock_example.h" char bpf_log_buf[BPF_LOG_BUF_SIZE]; diff --git a/samples/bpf/test_cgrp2_attach.c b/samples/bpf/test_cgrp2_attach.c index 4bfcaf93fcf3..20fbd1241db3 100644 --- a/samples/bpf/test_cgrp2_attach.c +++ b/samples/bpf/test_cgrp2_attach.c @@ -28,8 +28,9 @@ #include #include +#include -#include "libbpf.h" +#include "bpf_insn.h" enum { MAP_KEY_PACKETS, diff --git a/samples/bpf/test_cgrp2_attach2.c b/samples/bpf/test_cgrp2_attach2.c index 1af412ec6007..b453e6a161be 100644 --- a/samples/bpf/test_cgrp2_attach2.c +++ b/samples/bpf/test_cgrp2_attach2.c @@ -24,8 +24,9 @@ #include #include +#include -#include "libbpf.h" +#include "bpf_insn.h" #include "cgroup_helpers.h" #define FOO "/foo" diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c index e79594dd629b..b0811da5a00f 100644 --- a/samples/bpf/test_cgrp2_sock.c +++ b/samples/bpf/test_cgrp2_sock.c @@ -21,8 +21,9 @@ #include #include #include +#include -#include "libbpf.h" +#include "bpf_insn.h" char bpf_log_buf[BPF_LOG_BUF_SIZE]; diff --git a/samples/bpf/test_cgrp2_sock2.c b/samples/bpf/test_cgrp2_sock2.c index e53f1f6f0867..3b5be2364975 100644 --- a/samples/bpf/test_cgrp2_sock2.c +++ b/samples/bpf/test_cgrp2_sock2.c @@ -19,8 +19,9 @@ #include #include #include +#include -#include "libbpf.h" +#include "bpf_insn.h" #include "bpf_load.h" static int usage(const char *argv0)