From patchwork Thu Jan 16 13:22:24 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: 11336861 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 1A1BD6C1 for ; Thu, 16 Jan 2020 13:22:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC265206D5 for ; Thu, 16 Jan 2020 13:22:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="A5+wcdgj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729035AbgAPNWr (ORCPT ); Thu, 16 Jan 2020 08:22:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33729 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729022AbgAPNWc (ORCPT ); Thu, 16 Jan 2020 08:22:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579180951; 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=xYGxxZgSLFtlH8jcI3Nu4qoKg9CPPVXnWephfx6aPc4=; b=A5+wcdgja+B+2fGgSHlowJY9nG9BKOo3PYK8f7SwW2oMwo0oQ66KMgTEjpyC8AKhSjm8bV zzQu5KduGzLIfg8gFYEM1BAfhb9CvPG6T6sqTGMx+P6CqGDktegEprDIlhF0QLl80FSdDl cVFkgR9Fc2zVKcyuoDBmMHj0D96eJHU= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-59-0_fH1OO-NOW5hRz-fnEhIQ-1; Thu, 16 Jan 2020 08:22:28 -0500 X-MC-Unique: 0_fH1OO-NOW5hRz-fnEhIQ-1 Received: by mail-lj1-f197.google.com with SMTP id z17so5132179ljz.2 for ; Thu, 16 Jan 2020 05:22:28 -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=xYGxxZgSLFtlH8jcI3Nu4qoKg9CPPVXnWephfx6aPc4=; b=R0Ta0rPD8QxOG67VG6F6EiFgvqwGNCBVEU9j5G76vb2P5+f9agX1EoV/1llvpJGohE NCMpyQFsJXAEmT9NUlttzrJCgrLt3Sna6kpzUx4H1FbyYcl4sbBg1LqClVlYr7M74ZJq ny9GoFI2T9E5/2+JBgqTWHDOiPUTGLgJ/wohmNlPWXOegvumFTqCbAAjTcGS5KtrR3ZE RL31a7QJd/VLJXLDQQSWMJn0FrAU8U04j29h0gHUcdxdVHttpZkxWw+3XkYJ8HSMwHrq tndOGh2oI+vWjy4Lw5MclTsWGZz8wGzUT1r/EHosqQCo4abd23upPeuYGH7TtXtelkpQ 45Gg== X-Gm-Message-State: APjAAAVu68BKuxp3Pmt8AvligoY2RHBOQXTFNC+YS6azCUv6yuEaf2zE VoW2FNZ17ty6v2AI2gZL7sKHrsjx+h3XYORjVYmkoaoFFaiLqlVdU+wUTVN7osJkGt9J8M27WFe 38JmwkhOVSYE8wneXaTYs1g== X-Received: by 2002:a2e:b52b:: with SMTP id z11mr2348627ljm.155.1579180947071; Thu, 16 Jan 2020 05:22:27 -0800 (PST) X-Google-Smtp-Source: APXvYqxfmdIbBJX76Kqg7+Yyy3+Jb6vlAiz8KLU+B3P9UXhqphkNxoSBonQsyrf+47I652QC3NESmg== X-Received: by 2002:a2e:b52b:: with SMTP id z11mr2348613ljm.155.1579180946842; Thu, 16 Jan 2020 05:22:26 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id s22sm10945565ljm.41.2020.01.16.05.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 05:22:25 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 19EEE1808D8; Thu, 16 Jan 2020 14:22:24 +0100 (CET) Subject: [PATCH bpf-next v3 11/11] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system 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: Thu, 16 Jan 2020 14:22:24 +0100 Message-ID: <157918094400.1357254.5646603555325507261.stgit@toke.dk> In-Reply-To: <157918093154.1357254.7616059374996162336.stgit@toke.dk> References: <157918093154.1357254.7616059374996162336.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 The change to use angled includes for bpf_helper_defs.h breaks compilation against libbpf when it is installed in the include path, since the file is installed in the bpf/ subdirectory of $INCLUDE_PATH. Since we've now fixed the selftest Makefile to not require this anymore, revert back to double-quoted include so bpf_helpers.h works regardless of include path. Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") Signed-off-by: Toke Høiland-Jørgensen Acked-by: Andrii Nakryiko --- tools/lib/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h index 050bb7bf5be6..f69cc208778a 100644 --- a/tools/lib/bpf/bpf_helpers.h +++ b/tools/lib/bpf/bpf_helpers.h @@ -2,7 +2,7 @@ #ifndef __BPF_HELPERS__ #define __BPF_HELPERS__ -#include +#include "bpf_helper_defs.h" #define __uint(name, val) int (*name)[val] #define __type(name, val) typeof(val) *name