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.8 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=ham 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 82B96C7618F for ; Thu, 18 Jul 2019 17:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 174DE2083B for ; Thu, 18 Jul 2019 17:27:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WHn2g0SE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732457AbfGRR1B (ORCPT ); Thu, 18 Jul 2019 13:27:01 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:33135 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728279AbfGRR1B (ORCPT ); Thu, 18 Jul 2019 13:27:01 -0400 Received: by mail-qt1-f195.google.com with SMTP id r6so23846864qtt.0; Thu, 18 Jul 2019 10:27:00 -0700 (PDT) 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; bh=cDq0jlOaaqXB8MtjadL1ZALSmY3trdskBEz5Or/556U=; b=WHn2g0SEdhD+d/7M85HvLN7gxwEas23PTjaYDoBhGWGdlxuwotYTOreCJZHFHux7Jn 4Tk13E3NKBK4QdxKw/mO0psEEfOoIgGJFz1jtUIOTdC3Lhp3lBpPgcgrR2UpH+jJLukr zy8UxAt/3t3c356p12kuBaSbz3U8025bJA8blqVG1gKmWlyif53g03Z5S3a6PTfyGb3i HubL4PG0i0H/tyOsKW4/RwySjSEF15uVaamm2G0L0+C/V+amG7nAhnqiQgxU9miYymOB fz7WdGBtxEzrWoLh/81Y90qx+p3dEg1wMh5YzKlB614KwbOO28Mo9Q8jeWbfotXuFlyG R88A== 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; bh=cDq0jlOaaqXB8MtjadL1ZALSmY3trdskBEz5Or/556U=; b=PbpJ08FNQl3KcwbA0uveL/w6CrkZprctk5Ku3usLEST5noBDY8lSA+Xzdq5x0cr3Qx 3RrFgUr1pjYl/tGdt2BuCh2+71vZ38ETwN8dJPnxJkiwO/Ooe7y/hazyvUg5y9Kes3E2 8JoYMyjRQkaToHVDYBN0dymAn+7yQqdbJ+9LgPy7Wj9cUzT1yyUEu4g9veMi217WM8pU NGJt0mrVxpmTe239Vxv7UCWK4OFwWCC7m4s657cylN4nEdS9ab5PFSyu88qbxmLK157e Na/nVfrsqUGCpRUsglojsahUtDtk4HHP+p0n7MxWCPlXZ4yR4gf2PwWjBbrUtpqohO7x RlKQ== X-Gm-Message-State: APjAAAVfBXkmGQRkfeiukSfqM7gOqjAJl8UOI1R9cgbKeYBYna08phTx TkvzsC3MSEt4mkms64aPsG6UWqkA1H60NVzVo8E= X-Google-Smtp-Source: APXvYqyg+dnFA4IHKr/EGA4IPVODmVmLSZlCb+7auZQTm545YHixAZb5uCn58q4n4uyOl4jnsJJahEWFY0NuNs5Xvnk= X-Received: by 2002:a05:6214:1306:: with SMTP id a6mr34568735qvv.38.1563470820141; Thu, 18 Jul 2019 10:27:00 -0700 (PDT) MIME-Version: 1.0 References: <20190718172513.2394157-1-andriin@fb.com> In-Reply-To: <20190718172513.2394157-1-andriin@fb.com> From: Andrii Nakryiko Date: Thu, 18 Jul 2019 10:26:48 -0700 Message-ID: Subject: Re: [PATCH bpf] libbpf: fix missing __WORDSIZE definition To: Andrii Nakryiko Cc: Arnaldo Carvalho de Melo , bpf , Networking , Daniel Borkmann , Alexei Starovoitov , Kernel Team Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Thu, Jul 18, 2019 at 10:25 AM Andrii Nakryiko wrote: > > hashmap.h depends on __WORDSIZE being defined. It is defined by > glibc/musl in different headers. It's an explicit goal for musl to be > "non-detectable" at compilation time, so instead include glibc header if > glibc is explicitly detected and fall back to musl header otherwise. > > Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap") > Reported-by: Arnaldo Carvalho de Melo > Signed-off-by: Andrii Nakryiko > --- > tools/lib/bpf/hashmap.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h > index 03748a742146..46a8cb667994 100644 > --- a/tools/lib/bpf/hashmap.h > +++ b/tools/lib/bpf/hashmap.h > @@ -10,7 +10,12 @@ > > #include > #include > +#ifdef __GLIBC__ > +#include > +#else > +#include > #include "libbpf_internal.h" > +#endif Disregard this version, #endif on the wrong line. Fixing in v2. > > static inline size_t hash_bits(size_t h, int bits) > { > -- > 2.17.1 >