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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 7635EC04E84 for ; Sat, 18 May 2019 00:47:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51D0A21883 for ; Sat, 18 May 2019 00:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729376AbfERArb (ORCPT ); Fri, 17 May 2019 20:47:31 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35042 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726870AbfERArb (ORCPT ); Fri, 17 May 2019 20:47:31 -0400 Received: by mail-wr1-f67.google.com with SMTP id m3so8624493wrv.2 for ; Fri, 17 May 2019 17:47:30 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vSly531sOw2rwvVk7zttVUIbMVurcuy0BpNrHVMScoY=; b=RHEj0uUrjPe5aK4Txu0jwIIvKMskfbWN/8S1iQDcHmoDHwpK5USnM0OpzAD8mF05bt DfFJWvp5hQSZjgZINhFKH1m7ZE97ZRW5G9dUy/gEncwnvFZNT7Y/Sb3XuIdFXEHlpRKE +bTVH8JWAepM7J2PEj0mGj+2Gf6XQeSp5k5KbNQH5XUKUoK0DyZASC9fUTOcEdUzGQwf pQHzooWUxA7kbP+lHfjMbPW2VjQvFNOeblKixM764oymUCgg1IO9UT16OkYsjCRGgoN6 E3WxBlKVGvO9dzxVgPf9vs583GzhIvI8z0N3A/t7yrsK++kQx3qP6GawYeR6KNknVFHE k4YQ== X-Gm-Message-State: APjAAAWRuzlJ86GqkbWNOspDQv0vnkJOumi2pFLsBPy3qhkIxDvFxAeQ eP8NfKbJRfi/UHZWFVzac82Tgg== X-Google-Smtp-Source: APXvYqxlCzuyTJ2++aLbnoALR+KdYHMVcvZEv227fTudzSLzBYhEqdsJUOOkmP6PGoIRErJdBel76Q== X-Received: by 2002:adf:e908:: with SMTP id f8mr5263821wrm.124.1558140449852; Fri, 17 May 2019 17:47:29 -0700 (PDT) Received: from raver.teknoraver.net (net-47-53-225-211.cust.vodafonedsl.it. [47.53.225.211]) by smtp.gmail.com with ESMTPSA id j82sm14386099wmj.40.2019.05.17.17.47.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 May 2019 17:47:29 -0700 (PDT) From: Matteo Croce To: xdp-newbies@vger.kernel.org, bpf@vger.kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann Subject: [PATCH 5/5] samples/bpf: fix hbm build error Date: Sat, 18 May 2019 02:46:39 +0200 Message-Id: <20190518004639.20648-5-mcroce@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190518004639.20648-1-mcroce@redhat.com> References: <20190518004639.20648-1-mcroce@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following build error by declaring bpf_spin_lock in hbm.c. Including the UAPI header generates tons of redefined symbol errors, and including it in hbm.h breaks hbm_out_kern.c. make -C samples/bpf/../../tools/lib/bpf/ RM='rm -rf' LDFLAGS= srctree=samples/bpf/../../ O= HOSTCC samples/bpf/hbm.o In file included from samples/bpf/hbm.c:49: samples/bpf/hbm.h:12:23: error: field ‘lock’ has incomplete type 12 | struct bpf_spin_lock lock; | ^~~~ make[2]: *** [scripts/Makefile.host:109: samples/bpf/hbm.o] Error 1 make[1]: *** [Makefile:1763: samples/bpf/] Error 2 Signed-off-by: Matteo Croce --- samples/bpf/hbm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/samples/bpf/hbm.c b/samples/bpf/hbm.c index a79828ab273f..ca8e567b63c3 100644 --- a/samples/bpf/hbm.c +++ b/samples/bpf/hbm.c @@ -40,17 +40,22 @@ #include #include -#include #include +#include #include "bpf_load.h" #include "bpf_rlimit.h" #include "cgroup_helpers.h" -#include "hbm.h" #include "bpf_util.h" #include "bpf/bpf.h" #include "bpf/libbpf.h" +struct bpf_spin_lock { + __u32 val; +}; + +#include "hbm.h" + bool outFlag = true; int minRate = 1000; /* cgroup rate limit in Mbps */ int rate = 1000; /* can grow if rate conserving is enabled */ -- 2.21.0