From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04993C33CB7 for ; Thu, 16 Jan 2020 22:44:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC49220728 for ; Thu, 16 Jan 2020 22:44:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n2OjqhSJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388744AbgAPWnz (ORCPT ); Thu, 16 Jan 2020 17:43:55 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:40943 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732417AbgAPWny (ORCPT ); Thu, 16 Jan 2020 17:43:54 -0500 Received: by mail-qt1-f194.google.com with SMTP id v25so20322462qto.7; Thu, 16 Jan 2020 14:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=6V4rDJ8GQ9BDhz/SQaLpqohATNzavITKDId73kmv48o=; b=n2OjqhSJc8YoIFY9twmO5Z5tXsxdcAZh5Qi6fB3j43J3mTV128YZjiL0eGIudHd4d6 Ki1uHthOo53TfRpXzq+CASThGj17ABxGtQv7g+CIWOTiI2ap6c6wgFpe6GqtRaZDbvjd IwRHkx0wrLFBV7X4cURvaZXykCQb4ajm+OdLusPqa7zhe2aEucczFNw4TGNZl9Ra4+V7 o/NwphiUivETpcDOvRLsGjyv9PQg6HKoogNx4vtI/gQxyk2/wIGt4d8wG6uga6urD+EC 36C/t+RYhZ7LK+g/0G11g2YfoadULNmV9hIK1d7Kpld7KxhAJbu7Q8WAlEJc07H0i7zB o5WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=6V4rDJ8GQ9BDhz/SQaLpqohATNzavITKDId73kmv48o=; b=DVpbPx6LCq0rTeE1yQzzKRBsvQ1onUexU54SseEk3BdOv5/SMNnT1G6d5VICyXlX2S DU+KOayFumfAZcLxwFKFvNND/Qmu1/3rqvKmQC4GFQW8NFf2ImR11tpHt8OIGOrRqGqa J5BTRq/W57nEQ2pQZYE/Wc+Lnujd26TU/KKLP+UmevOGlxURwYHg8ppw2kTC/QnKg/lR h5eX62mOaOvOeJlX4vaOcPLjE+PLjTuu/44LZoiBR9B4oLZr7B2XGyZdmZJFslLZJRnR no1lc0fwSTghuHufIBHf1gShDihKrixcMV8HxfJZ9t4TV0hAIujqHJmvf/Z0LKZt2GoB JWBA== X-Gm-Message-State: APjAAAVcYfmT1mlP77n1Sh9rIMtSUgbJmqiEwSPS/XOSVRsiWwaYimR3 G+u+JIaqDtxUooavJNGwsjqgLCgibHSTq0+PBXk= X-Google-Smtp-Source: APXvYqyRayvo4tT12kkQjmEE+9/BQV1hXR5rtzKk0t7oWHkLzEunvItYZ+Yg7d7QGOKguy9IFk/alBlDIDWiuD51Vzk= X-Received: by 2002:ac8:140c:: with SMTP id k12mr4780186qtj.117.1579214633217; Thu, 16 Jan 2020 14:43:53 -0800 (PST) MIME-Version: 1.0 References: <157918093154.1357254.7616059374996162336.stgit@toke.dk> <157918094400.1357254.5646603555325507261.stgit@toke.dk> In-Reply-To: <157918094400.1357254.5646603555325507261.stgit@toke.dk> From: Andrii Nakryiko Date: Thu, 16 Jan 2020 14:43:42 -0800 Message-ID: Subject: Re: [PATCH bpf-next v3 11/11] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: Alexei Starovoitov , 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 , Networking , bpf , open list , linux-rdma@vger.kernel.org, "open list:KERNEL SELFTEST FRAMEWORK" , clang-built-linux@googlegroups.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Thu, Jan 16, 2020 at 5:23 AM Toke H=C3=B8iland-J=C3=B8rgensen wrote: > > From: Toke H=C3=B8iland-J=C3=B8rgensen > > The change to use angled includes for bpf_helper_defs.h breaks compilatio= n > against libbpf when it is installed in the include path, since the file i= s > installed in the bpf/ subdirectory of $INCLUDE_PATH. Since we've now fixe= d > 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 f= rom selftests dir") > Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen > --- 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 >