From patchwork Fri Jan 17 13:36:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 11339053 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 862531820 for ; Fri, 17 Jan 2020 13:37:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65C00214AF for ; Fri, 17 Jan 2020 13:37:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OEvp8qa1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728773AbgAQNhP (ORCPT ); Fri, 17 Jan 2020 08:37:15 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:50286 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728767AbgAQNgu (ORCPT ); Fri, 17 Jan 2020 08:36:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579268209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kZR8zX+ydWBbBu89eT3Dfy7pXd3GWbtA0n7Gp7hmhwM=; b=OEvp8qa17BiG1p8jGUe5VCdM8CFwX5uYS26do52rFG/p2wzEhzvKCOkoXZepTpMA+ajcN9 1nOWSG5/FKD8wuUejEV7y8O5uTopXYF7/udjagszBzpXMyV8UIiCVvtq59C7gtGgVihuZh mc42ijyYzlRd90mcnnWDIk4hGvEXW5I= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-12-9cEIDT7aN_WSL9rca5DJmg-1; Fri, 17 Jan 2020 08:36:48 -0500 X-MC-Unique: 9cEIDT7aN_WSL9rca5DJmg-1 Received: by mail-lf1-f72.google.com with SMTP id t3so4377286lfp.15 for ; Fri, 17 Jan 2020 05:36:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=kZR8zX+ydWBbBu89eT3Dfy7pXd3GWbtA0n7Gp7hmhwM=; b=Jh/+6nTJK1IU6pAntEjoJuullG7Tlngz13y08dTJyzp5tNl+TpX2x2qKCYUpmto9ps RCZIlmGjZF+Rm8D/7+zEH//RMwFqjZvS960xzIgxPB2v5P/Ws1UIbU52bgL5MblddWuG YAc0l+mXay6AE8OaqlGbOU2AE0zaTKd9C5pYiPeZZpTmrdAW+m+J1eeYqCUju8dLxkn7 KE2n5+fgbe4thRyzmAgIufIzyCUMf+Eag1AoG+WrDArmodWWxnoGIp+b21TCqo/v9LJe 9VueaxXyPWb3LfDGtFKxA/l6Y3YQhBBvei4a/6HuNIX1xyHj4nxT5EOJpWeFK57QGd5R iLPA== X-Gm-Message-State: APjAAAVlWjOKUkAiM4PJySfPh4yDd0nJc3MDN0IcF3L1iBT8F/WQWeT/ L6etCAg/ic1vciYpOHLKi2bbXTIYPyBPea/146JkUu/mEeOEsMJU2C0DSp0q4yRNSzg8llrAWp6 upQY38yJQ20ZNQAA2IYB2aA== X-Received: by 2002:a2e:548:: with SMTP id 69mr5667568ljf.67.1579268206512; Fri, 17 Jan 2020 05:36:46 -0800 (PST) X-Google-Smtp-Source: APXvYqzQIWgc5FT4rMwZJg2UojEuLPhGl6YnWnw7UrIB2febpdvE/LkTz0PbsJPg+98VKBuAqWMejw== X-Received: by 2002:a2e:548:: with SMTP id 69mr5667551ljf.67.1579268206336; Fri, 17 Jan 2020 05:36:46 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id h14sm12058134lfc.2.2020.01.17.05.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 05:36:45 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 9A5EF1804D6; Fri, 17 Jan 2020 14:36:44 +0100 (CET) Subject: [PATCH bpf-next v4 07/10] perf: Use consistent include paths for libbpf From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , Doug Ledford , Jason Gunthorpe , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Shuah Khan , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kselftest@vger.kernel.org, clang-built-linux@googlegroups.com Date: Fri, 17 Jan 2020 14:36:44 +0100 Message-ID: <157926820454.1555735.5332893006269327491.stgit@toke.dk> In-Reply-To: <157926819690.1555735.10756593211671752826.stgit@toke.dk> References: <157926819690.1555735.10756593211671752826.stgit@toke.dk> User-Agent: StGit/0.21 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Toke Høiland-Jørgensen Fix perf to include libbpf header files with the bpf/ prefix, to be consistent with external users of the library. Acked-by: Andrii Nakryiko Signed-off-by: Toke Høiland-Jørgensen --- tools/perf/examples/bpf/5sec.c | 2 +- tools/perf/examples/bpf/empty.c | 2 +- tools/perf/examples/bpf/sys_enter_openat.c | 2 +- tools/perf/include/bpf/pid_filter.h | 2 +- tools/perf/include/bpf/stdio.h | 2 +- tools/perf/include/bpf/unistd.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c index b9c203219691..49f4f84da485 100644 --- a/tools/perf/examples/bpf/5sec.c +++ b/tools/perf/examples/bpf/5sec.c @@ -39,7 +39,7 @@ Copyright (C) 2018 Red Hat, Inc., Arnaldo Carvalho de Melo */ -#include +#include int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec) { diff --git a/tools/perf/examples/bpf/empty.c b/tools/perf/examples/bpf/empty.c index 3776d26db9e7..7d7fb0c9fe76 100644 --- a/tools/perf/examples/bpf/empty.c +++ b/tools/perf/examples/bpf/empty.c @@ -1,3 +1,3 @@ -#include +#include license(GPL); diff --git a/tools/perf/examples/bpf/sys_enter_openat.c b/tools/perf/examples/bpf/sys_enter_openat.c index 9cd124b09392..c4481c390d23 100644 --- a/tools/perf/examples/bpf/sys_enter_openat.c +++ b/tools/perf/examples/bpf/sys_enter_openat.c @@ -14,7 +14,7 @@ * the return value. */ -#include +#include struct syscall_enter_openat_args { unsigned long long unused; diff --git a/tools/perf/include/bpf/pid_filter.h b/tools/perf/include/bpf/pid_filter.h index 6e61c4bdf548..607189a315b2 100644 --- a/tools/perf/include/bpf/pid_filter.h +++ b/tools/perf/include/bpf/pid_filter.h @@ -3,7 +3,7 @@ #ifndef _PERF_BPF_PID_FILTER_ #define _PERF_BPF_PID_FILTER_ -#include +#include #define pid_filter(name) pid_map(name, bool) diff --git a/tools/perf/include/bpf/stdio.h b/tools/perf/include/bpf/stdio.h index 316af5b2ff35..7ca6fa5463ee 100644 --- a/tools/perf/include/bpf/stdio.h +++ b/tools/perf/include/bpf/stdio.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 -#include +#include struct bpf_map SEC("maps") __bpf_stdout__ = { .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, diff --git a/tools/perf/include/bpf/unistd.h b/tools/perf/include/bpf/unistd.h index ca7877f9a976..d1a35b6c649d 100644 --- a/tools/perf/include/bpf/unistd.h +++ b/tools/perf/include/bpf/unistd.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 -#include +#include static int (*bpf_get_current_pid_tgid)(void) = (void *)BPF_FUNC_get_current_pid_tgid;