From patchwork Fri Jan 17 13:36:41 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: 11339041 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 AD97614B7 for ; Fri, 17 Jan 2020 13:36:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BDF82087E for ; Fri, 17 Jan 2020 13:36:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KzHo9sKD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728797AbgAQNgu (ORCPT ); Fri, 17 Jan 2020 08:36:50 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:21471 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728682AbgAQNgs (ORCPT ); Fri, 17 Jan 2020 08:36:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579268206; 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=OknDVKXPzEk2i0iYFrlDPLSC26NRFKasACpxW1z9e2E=; b=KzHo9sKDLUIdMeQFdTb2y7vmYZ37+ZU+vCzF5SPmedTd+7SH5H64bYHldndq3ppSXMg8w0 TWNzqtQhAP9ZJcYPdbUxN9OyDd+YHItyvXJ7vvoZ8l1a+f0OaIFcOVStBp5i1C2zSnGYyj rDXi9lK/jlz5SgCIG3TvlT7MAA5ObFU= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-69-F2-IpknTOJaEMUNi0CEmfQ-1; Fri, 17 Jan 2020 08:36:45 -0500 X-MC-Unique: F2-IpknTOJaEMUNi0CEmfQ-1 Received: by mail-lf1-f71.google.com with SMTP id t74so4371511lff.8 for ; Fri, 17 Jan 2020 05:36:45 -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=OknDVKXPzEk2i0iYFrlDPLSC26NRFKasACpxW1z9e2E=; b=CTj2yVKEZDM7eRYM2tpCLlK0F8pAqoxXMOsnv7LfRcA6vuLzRFUpIpnmOJKUwCBehX ZK2JVxu9nH+JSJ3pCoG2LtV1qVtf5dOJ5+Hspa/GWvSr9AKl1VqDiwyoVK7WGLRhlotJ EVnYwLMsNXrQ1xNEENLb1cSVlJjD+u9ByVbOgXszwydTq2sldX1jGAFAcWIRjYtJS5I1 dJYVHYSErTp9wohTKIJ+Kvut89MmZBwWy5kWGrHjMOcZcohYdRZVWzBx2b1ZU1NcDZzc Hm9U+U5ZSHD4PFAPnP/qp7IBZo/AgrT/XyXHqe4xe1liPOMAPFwnekEqQCMhXDzGHPVE d98g== X-Gm-Message-State: APjAAAVRuNWYw5flqDHYU+d9IRi5R5uNkLIdMXBT9h0B9/l5TIaLNc9A PESI69MY0CCav0V/Jhur7a0AnEPET7JCgkGRPGTQd1Vi75fi3UTqjBBW2MaE8yEB7TkpxWxs4dp 93Rew5U9yqeVpJPjJJwx0fg== X-Received: by 2002:ac2:5c4a:: with SMTP id s10mr5379656lfp.88.1579268204093; Fri, 17 Jan 2020 05:36:44 -0800 (PST) X-Google-Smtp-Source: APXvYqyusVvlyEVdd3oS7WZRleumOv0TA50N1Au6MBvbWFLhChF/RcwKRx+cbLE29JwaFPZjnu+u7Q== X-Received: by 2002:ac2:5c4a:: with SMTP id s10mr5379639lfp.88.1579268203914; Fri, 17 Jan 2020 05:36:43 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id l64sm12147018lfd.30.2020.01.17.05.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 05:36:43 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 5BD791804D6; Fri, 17 Jan 2020 14:36:41 +0100 (CET) Subject: [PATCH bpf-next v4 04/10] tools/runqslower: 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:41 +0100 Message-ID: <157926820131.1555735.1177228853838027248.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 the runqslower tool to include libbpf header files with the bpf/ prefix, to be consistent with external users of the library. Also ensure that all includes of exported libbpf header files (those that are exported on 'make install' of the library) use bracketed includes instead of quoted. To not break the build, keep the old include path until everything has been changed to the new one; a subsequent patch will remove that. Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") Acked-by: Andrii Nakryiko Signed-off-by: Toke Høiland-Jørgensen --- tools/bpf/runqslower/Makefile | 5 +++-- tools/bpf/runqslower/runqslower.bpf.c | 2 +- tools/bpf/runqslower/runqslower.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index b62fc9646c39..9f022f7f2593 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -5,6 +5,7 @@ LLC := llc LLVM_STRIP := llvm-strip DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool BPFTOOL ?= $(DEFAULT_BPFTOOL) +INCLUDES := -I$(OUTPUT) -I$(abspath ../../lib) -I$(abspath ../../lib/bpf) LIBBPF_SRC := $(abspath ../../lib/bpf) CFLAGS := -g -Wall @@ -51,13 +52,13 @@ $(OUTPUT)/%.skel.h: $(OUTPUT)/%.bpf.o | $(BPFTOOL) $(OUTPUT)/%.bpf.o: %.bpf.c $(OUTPUT)/libbpf.a | $(OUTPUT) $(call msg,BPF,$@) - $(Q)$(CLANG) -g -O2 -target bpf -I$(OUTPUT) -I$(LIBBPF_SRC) \ + $(Q)$(CLANG) -g -O2 -target bpf $(INCLUDES) \ -c $(filter %.c,$^) -o $@ && \ $(LLVM_STRIP) -g $@ $(OUTPUT)/%.o: %.c | $(OUTPUT) $(call msg,CC,$@) - $(Q)$(CC) $(CFLAGS) -I$(LIBBPF_SRC) -I$(OUTPUT) -c $(filter %.c,$^) -o $@ + $(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $(filter %.c,$^) -o $@ $(OUTPUT): $(call msg,MKDIR,$@) diff --git a/tools/bpf/runqslower/runqslower.bpf.c b/tools/bpf/runqslower/runqslower.bpf.c index 623cce4d37f5..48a39f72fadf 100644 --- a/tools/bpf/runqslower/runqslower.bpf.c +++ b/tools/bpf/runqslower/runqslower.bpf.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2019 Facebook #include "vmlinux.h" -#include +#include #include "runqslower.h" #define TASK_RUNNING 0 diff --git a/tools/bpf/runqslower/runqslower.c b/tools/bpf/runqslower/runqslower.c index 996f0e2c560e..d89715844952 100644 --- a/tools/bpf/runqslower/runqslower.c +++ b/tools/bpf/runqslower/runqslower.c @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include "runqslower.h" #include "runqslower.skel.h"