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=-7.0 required=3.0 tests=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 65895C072B5 for ; Tue, 21 May 2019 23:33:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43C4A21773 for ; Tue, 21 May 2019 23:33:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728119AbfEUXdg convert rfc822-to-8bit (ORCPT ); Tue, 21 May 2019 19:33:36 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:39651 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726017AbfEUXdg (ORCPT ); Tue, 21 May 2019 19:33:36 -0400 Received: by mail-lf1-f65.google.com with SMTP id f1so224555lfl.6 for ; Tue, 21 May 2019 16:33:34 -0700 (PDT) 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=EWNs7FuLz+EBZGJHO+hMowOuxfAj3IDqhoBMiSjNTxE=; b=U2x8mNtHHU1YCz0YouI8MmHEBQizfj8dkyOZ2uExWQ4RGTsI4pWzqO87vDA8YL/itD d3OYlTu5XNOQrQJzTyiOkj/Oz/6mIQ4On6D8w6L/pgzm3GNA8aJvqOpdaphtNNYRRI8+ 8g66ENu8wWrb1b77MS5ShC0gYForX96JvcbtBwSdn+M3tr8R29UTgs4sqdK9LY+wwLaO Rac+ijzU3DcpM5+YZA514tJ10UJc3c7lXKcaDAkIG1uoh0Rcy4iYYgHHis+NahBuekMM dFgSSbaHM0Y/WgAoII/21f3BxqLLcFrnm7W0Eg0gQS3Lzepf7KME3eaBJGL6ALkKGzIQ pY3w== X-Gm-Message-State: APjAAAX5PW+OyaVUw7JqfBIt8vYEWFeVlyWNgM0jz35Gn3vzq6nWOK/b 3ybFFfQlisKxYoZSGSnYucDsjtwqJO2g2VFw+iciZw== X-Google-Smtp-Source: APXvYqxFOiQvAinejUQ5bQ+2ojPr4fXIqRhnzNKwRhVX51VwyZMoF/JudQtgNeOShJ06lSXqL67pZtMOqVe6jVwhGe0= X-Received: by 2002:a19:a50b:: with SMTP id o11mr28367269lfe.2.1558481613710; Tue, 21 May 2019 16:33:33 -0700 (PDT) MIME-Version: 1.0 References: <20190518004639.20648-1-mcroce@redhat.com> <20190520133830.1ac11fc8@cakuba.netronome.com> <20190521100648.1ce9b5be@cakuba.netronome.com> In-Reply-To: <20190521100648.1ce9b5be@cakuba.netronome.com> From: Matteo Croce Date: Wed, 22 May 2019 01:32:57 +0200 Message-ID: Subject: Re: [PATCH 1/5] samples/bpf: fix test_lru_dist build To: Jakub Kicinski Cc: Daniel Borkmann , xdp-newbies@vger.kernel.org, bpf@vger.kernel.org, LKML , netdev , Alexei Starovoitov Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Tue, May 21, 2019 at 7:07 PM Jakub Kicinski wrote: > > On Tue, 21 May 2019 17:36:17 +0200, Matteo Croce wrote: > > On Tue, May 21, 2019 at 5:21 PM Daniel Borkmann wrote: > > > > > > On 05/20/2019 10:38 PM, Jakub Kicinski wrote: > > > > On Mon, 20 May 2019 19:46:27 +0200, Matteo Croce wrote: > > > >> On Sat, May 18, 2019 at 2:46 AM Matteo Croce wrote: > > > >>> > > > >>> Fix the following error by removing a duplicate struct definition: > > > >> > > > >> Hi all, > > > >> > > > >> I forget to send a cover letter for this series, but basically what I > > > >> wanted to say is that while patches 1-3 are very straightforward, > > > >> patches 4-5 are a bit rough and I accept suggstions to make a cleaner > > > >> work. > > > > > > > > samples depend on headers being locally installed: > > > > > > > > make headers_install > > > > > > > > Are you intending to change that? > > > > > > +1, Matteo, could you elaborate? > > > > > > On latest bpf tree, everything compiles just fine: > > > > > > [root@linux bpf]# make headers_install > > > [root@linux bpf]# make -C samples/bpf/ > > > make: Entering directory '/home/darkstar/trees/bpf/samples/bpf' > > > make -C ../../ /home/darkstar/trees/bpf/samples/bpf/ BPF_SAMPLES_PATH=/home/darkstar/trees/bpf/samples/bpf > > > make[1]: Entering directory '/home/darkstar/trees/bpf' > > > CALL scripts/checksyscalls.sh > > > CALL scripts/atomic/check-atomics.sh > > > DESCEND objtool > > > make -C /home/darkstar/trees/bpf/samples/bpf/../../tools/lib/bpf/ RM='rm -rf' LDFLAGS= srctree=/home/darkstar/trees/bpf/samples/bpf/../../ O= > > > HOSTCC /home/darkstar/trees/bpf/samples/bpf/test_lru_dist > > > HOSTCC /home/darkstar/trees/bpf/samples/bpf/sock_example > > > > > > > Hi all, > > > > I have kernel-headers installed from master, but yet the samples fail to build: > > > > matteo@turbo:~/src/linux/samples/bpf$ rpm -q kernel-headers > > kernel-headers-5.2.0_rc1-38.x86_64 > > > > matteo@turbo:~/src/linux/samples/bpf$ git describe HEAD > > v5.2-rc1-97-g5bdd9ad875b6 > > > > matteo@turbo:~/src/linux/samples/bpf$ make > > make -C ../../ /home/matteo/src/linux/samples/bpf/ > > BPF_SAMPLES_PATH=/home/matteo/src/linux/samples/bpf > > make[1]: Entering directory '/home/matteo/src/linux' > > CALL scripts/checksyscalls.sh > > CALL scripts/atomic/check-atomics.sh > > DESCEND objtool > > make -C /home/matteo/src/linux/samples/bpf/../../tools/lib/bpf/ RM='rm > > -rf' LDFLAGS= srctree=/home/matteo/src/linux/samples/bpf/../../ O= > > HOSTCC /home/matteo/src/linux/samples/bpf/test_lru_dist > > /home/matteo/src/linux/samples/bpf/test_lru_dist.c:39:8: error: > > redefinition of ‘struct list_head’ > > 39 | struct list_head { > > | ^~~~~~~~~ > > In file included from /home/matteo/src/linux/samples/bpf/test_lru_dist.c:9: > > ./tools/include/linux/types.h:69:8: note: originally defined here > > 69 | struct list_head { > > | ^~~~~~~~~ > > make[2]: *** [scripts/Makefile.host:90: > > /home/matteo/src/linux/samples/bpf/test_lru_dist] Error 1 > > make[1]: *** [Makefile:1762: /home/matteo/src/linux/samples/bpf/] Error 2 > > make[1]: Leaving directory '/home/matteo/src/linux' > > make: *** [Makefile:231: all] Error 2 > > > > Am I missing something obvious? > > Yes ;) Samples use a local installation of headers in $objtree/usr (I > think, maybe $srctree/usr). So you need to do make headers_install in > your kernel source tree, otherwise the include path from tools/ takes > priority over your global /usr/include and causes these issues. I had > this path in my tree for some time, but I don't like enough to post it: > > commit 35fb614049e93d46af708c0eaae6601df54017b3 > Author: Jakub Kicinski > Date: Mon Dec 3 15:00:24 2018 -0800 > > bpf: maybe warn ppl about hrds_install > > Signed-off-by: Jakub Kicinski > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index 4f0a1cdbfe7c..f79a4ed2f9f7 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -208,6 +208,15 @@ HOSTCC = $(CROSS_COMPILE)gcc > CLANG_ARCH_ARGS = -target $(ARCH) > endif > > +HDR_PROBE := $(shell echo "\#include \n struct list_head { int a; }; int main() { return 0; }" | \ > + gcc $(KBUILD_HOSTCFLAGS) -x c - -o /dev/null 2>/dev/null && \ > + echo okay) > + > +ifeq ($(HDR_PROBE),) > +$(warning Detected possible issues with include path.) > +$(warning Please install kernel headers locally (make headers_install)) > +endif > + > BTF_LLC_PROBE := $(shell $(LLC) -march=bpf -mattr=help 2>&1 | grep dwarfris) > BTF_PAHOLE_PROBE := $(shell $(BTF_PAHOLE) --help 2>&1 | grep BTF) > BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --help 2>&1 | grep -i 'usage.*llvm') Hi Jakub, I see now, It worked, thanks. This is a bit error prone IMHO, if you ever think about sending this patch, consider it ACKed by me. Thanks, -- Matteo Croce per aspera ad upstream