From patchwork Tue Jan 14 16:42:50 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: 1222923 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 (no SPF record) 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=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ULBwI69V; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47xx8n30M1z9sP6 for ; Wed, 15 Jan 2020 03:43:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727014AbgANQnE (ORCPT ); Tue, 14 Jan 2020 11:43:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:41608 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726379AbgANQnD (ORCPT ); Tue, 14 Jan 2020 11:43:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579020182; 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; bh=gDOl5oOf2cpVq2YFw06OX+4Yf7QXZq+3GEoWn2wy/eA=; b=ULBwI69Vl9J0xKOr+AK79Y8LRi8Lgrzhkk5wIO2lGT3WimTUXhm4eYPEj3jm6kKxIbZuFg JfBO+vaC3oh2N+cHXZBmofj5DdKwpD0VOu48CR7PSlwSppbVBW+0V91bjzJLtWx4isOeiW ktnpUUgD79jJ3w7lPMFi9HCM1DbnsSc= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-1LJNeMwaPPiDI6tCWP5j-w-1; Tue, 14 Jan 2020 11:43:00 -0500 X-MC-Unique: 1LJNeMwaPPiDI6tCWP5j-w-1 Received: by mail-lj1-f198.google.com with SMTP id m1so3127579lji.5 for ; Tue, 14 Jan 2020 08:43:00 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=gDOl5oOf2cpVq2YFw06OX+4Yf7QXZq+3GEoWn2wy/eA=; b=XS37MM+gJYVPOmRfqqz/Y7z1G01a8NauZNAzB7ihdN44pn1eXkLruAITfhN/7+lhIq aBXBkPOxoPFeB30prdQp/PgJvZEMa9n5qXeJHPQAVH5VAzbubCzJSkBA1PqEXfmPQNbW 6X7jHUvCriAjX68Y5lubQTpjn0dN4U+Ffw8ZenmN2jF7Kq48OMsLdz+LAYms0ho03Qzn kn+r3oSfw/KrUqjtNIhTxKNcAdIU2lUTW9DOernai+OEDTfQLBGuVsoRt6yWAjsZigtk u/dYG3Y/+KwvHoxUnfNbLFMl/s1bSmXbzmUntZdsf5U+sLTJ/1jnwbHA2v9lxCf0qhNA /ddA== X-Gm-Message-State: APjAAAV0I0DBlj4vyeCQS4nOb47oszt05mYi2FYSVroZSY+up5BCk0E6 6LjJY13/G2cmb6KB4hINoFg95HLBjz7M0q6vtlmRcv/fKWn04jPy5di9YXe8kf4coBAtI2H9dqv ycr3Z3XjJkoCu1/rY X-Received: by 2002:a05:6512:40e:: with SMTP id u14mr2277060lfk.161.1579020179299; Tue, 14 Jan 2020 08:42:59 -0800 (PST) X-Google-Smtp-Source: APXvYqzfpQ0TbloNrejHB7aTPs3vqYhNyYGz8aXpQBBk+AqMb7yu1+Uh487I+uLHWk7n92xlo/xlbg== X-Received: by 2002:a05:6512:40e:: with SMTP id u14mr2277015lfk.161.1579020177990; Tue, 14 Jan 2020 08:42:57 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id d20sm7773851ljg.95.2020.01.14.08.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2020 08:42:57 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 7BB4B1804D6; Tue, 14 Jan 2020 17:42:56 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system Date: Tue, 14 Jan 2020 17:42:50 +0100 Message-Id: <20200114164250.922192-1-toke@redhat.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Fix this by adding the bpf/ prefix to the #include directive. Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") Signed-off-by: Toke Høiland-Jørgensen --- Not actually sure this fix works for all the cases you originally tried to fix with the referred commit; please check. Also, could we please stop breaking libbpf builds? :) 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..fa43d649e7a2 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 #define __uint(name, val) int (*name)[val] #define __type(name, val) typeof(val) *name