From nobody Sun Jul 11 22:19:49 2021 X-Original-To: freebsd-hackers@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 738EB8D7C09 for ; Sun, 11 Jul 2021 22:20:02 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-ua1-x934.google.com (mail-ua1-x934.google.com [IPv6:2607:f8b0:4864:20::934]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GNLtV2jnKz3sDw; Sun, 11 Jul 2021 22:20:02 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: by mail-ua1-x934.google.com with SMTP id d2so6384216uan.0; Sun, 11 Jul 2021 15:20:02 -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=RAnQAKvyK5M7eccKr2F4bACeBqQvh3+RNLrQlzMuuws=; b=RZAFYKQAqMYNQXWNvXtD87znwjyAwifQmum17jhepJzaQLwMUOZs+1abuvbWx7zgb6 lZ3OBZOhSaWQF5y2JIyx59BBzSDT8NCpK6Ymyje31ny8nNfz5vezl+3cDcDcFWW4CtVX PJo5INsM26ZW1gaaXu42tQwFP6OlhHhHLdFudyi2d26vV+FiLcuj1HxrnKz5pZxH4ZR7 pvWUAJXUPm41S4cCDtiINqkxvLMvaHSxt8BEGlwCWCdOludOLhSeqVCNQPnw3YlKJvcc v6sRVFmT1EnS/ncHbVpkVlQC07I6jWwn4Tv6q6hZ5bGhj0yZl+YxcmyXE39nHb7D2V1E tsXQ== 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=RAnQAKvyK5M7eccKr2F4bACeBqQvh3+RNLrQlzMuuws=; b=jPCkBJ9Z04xFq6cb7MgBI0+B4AsS2p1DIiSVNA57k0AzTdXTurB76U3emALiP1cgNT A8ZgRYSGk4NoDo5VYrPupfbaPL7uiKjekxApeQlsqrBuWas3SrvbOXgtdApNjnSWcPeN MUmQwrl9RpWH5SQgb+GXJ5YMGbxUaNB3tF5UipCzQ+PAHCXqGT+U6OPcPCRBTReDTzLg MXZc0qwgOG97HbTCe5/D/Lnl9PbI6F9s4j6mfy7ythPlgzc0Zp2ZIonOc3tYV13p25Uu OtdgJM7E9dy29XC0xPsi0MBuxuvOUys4LX/G50o/ZtDBmeOEzdC9NOSEZdhlMrBaOSTy E2ew== X-Gm-Message-State: AOAM531Nq8fn6mo+m3N/Xbq0mDdHnewK0ufdKC5Xsh7UxFTs9C5KKD4W JpvoeSx1KOzkb/HyzdafrvMZRwn6JyL9+tKLye7K1RXEs6Q= X-Google-Smtp-Source: ABdhPJwB1gCYUBrcvM45gJMx/Dnvx5qo15MEQfadoWbIbFMrJ0IBt5IdvXNn/WrB99M/NMJzSikVowNjZWQpeWS/jEI= X-Received: by 2002:ab0:778c:: with SMTP id x12mr47677808uar.88.1626042001148; Sun, 11 Jul 2021 15:20:01 -0700 (PDT) List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Sergey Kandaurov Date: Mon, 12 Jul 2021 01:19:49 +0300 Message-ID: Subject: Re: Did something change with sys/cpuset.h in CURRENT? To: Craig Leres Cc: FreeBSD Hackers Content-Type: multipart/alternative; boundary="000000000000de502905c6e06706" X-Rspamd-Queue-Id: 4GNLtV2jnKz3sDw X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: Y --000000000000de502905c6e06706 Content-Type: text/plain; charset="UTF-8" On Sun, 11 Jul 2021 at 23:02, Craig Leres wrote: > > I've gotten a couple of pkg-fallout reports for security/zeek but I'm > not finding any mailing list chatter referencing cpusetid_t. I also did > a checkout of https://git.FreeBSD.org/src.git and don't see any recent > changes (or anything in UPDATING) that would impact the use of > sys/cpuset.h. > > Could someone please point me in the right direction? > > Craig > > Maintainer: leres@FreeBSD.org > Log URL: > > http://beefy17.nyi.freebsd.org/data/main-i386-default/pf44e1c1de734_s63ca9ea4f3/logs/zeek-4.0.3.log > Build URL: > > http://beefy17.nyi.freebsd.org/build.html?mastername=main-i386-default&build=pf44e1c1de734_s63ca9ea4f3 > Log: > > =>> Building security/zeek > build started at Sun Jul 11 05:19:11 UTC 2021 > port directory: /usr/ports/security/zeek > package name: zeek-4.0.3 > building for: FreeBSD main-i386-default-job-05 14.0-CURRENT FreeBSD > 14.0-CURRENT 1400025 i386 > maintained by: leres@FreeBSD.org > Makefile ident: > Poudriere version: 3.2.8-8-gaf08dbda > Host OSVERSION: 1400008 > Jail OSVERSION: 1400025 > Job Id: 05 > > [...] > > In file included from > > /wrkdirs/usr/ports/security/zeek/work/zeek-4.0.3/auxil/highwayhash/highwayhash/os_specific.cc:56: > /usr/include/sys/cpuset.h:153:12: error: unknown type name 'cpusetid_t' > int cpuset(cpusetid_t *); > ^ > /usr/include/sys/cpuset.h:154:18: error: unknown type name 'cpuwhich_t'; > did you mean '__cpuwhich_t'? > int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); > ^ > /usr/include/sys/_types.h:146:14: note: '__cpuwhich_t' declared here > typedef int __cpuwhich_t; /* which parameter for cpuset. */ > ^ > In zeek-4.0.3 (to which the port was recently updated from 4.0.2) the header inclusion order has changed; the relevant diff: #ifdef __FreeBSD__ #define OS_FREEBSD 1 -#include #include +#include #include #else #define OS_FREEBSD 0 - sys/cpuset.h requires sys/types.h to define cpusetid_t (and friends), - sys/params.h includes sys/types.h this is documented in cpuset(2) This works on stable versions such as FreeBSD 13.0 w/ clang 11.0.1, though. This is seemingly due to a header pollution fixed in llvmorg-12 import. Before that, sys/types were included indirectly with #include : random -> istream -> ostream -> locale -> nl_types.h -> sys/types.h With llvmorg-12 import, istream / ostream are replaced with iosfwd. --000000000000de502905c6e06706--