From nobody Sun Sep 17 15:04:19 2023 X-Original-To: dev-commits-src-all@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 4RpWRR6NmGz4t1gC; Sun, 17 Sep 2023 15:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWRR5KBXz4Fjs; Sun, 17 Sep 2023 15:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SSU+zmlP1Tw1jB+mFIxZ1FZg1LyKsdHlSY+etT0e6D0=; b=U2aCRhRyP0Uv75FDukDsZVi6gIto301YerGF0Vl+p5Rw2F+38F3gPmiQxJf5+8niIx4X9e skBvizWRBnhOzHS7bFXo5qNoye+359zY5A+tp9wRsn3wpqxPeQ02uvld8I/9JhodOVPxMO 8sESk4lTltcY+GI85as9kEUp+0BeGE9U8EpQnJhGr3ziGB5l0SShuy50wxa84gpaNl9DRc dYY7EKiS52rzcx2EEPThYGd0kHDk06wbIfcvUj+0R5LTim2Gou/FRFJDqfUW2vvsozPHrS lbrQCpZ9YPtUnh3SV96iF3KH8iUGfOFMX20WnAebWK1xBjDn6tOE0kBUtpYQOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963059; a=rsa-sha256; cv=none; b=W3h/s2Fv7FZm6wk1IpDxN9rsM3bAiLBTpIf7bxHtyOSL3JxmP4Glyzt3fi7HwFIC+Eoujb dmVdNsNQ+Gz2sqf2qNYvo9eRMZe8HKjpsWmbj70ylNq9jUDYbcOHOhb30kncJpnxCdECDT JOsQzsNjLJV00S93Tgb7QQG/l2fFYeHExPORWEQpwOBGEJbiMF7uXupL7phstqs8MzVzrM 55Tq3bUWUJWoumVrLgE456Ta3wCXGJN0WAX67V+YELfLMIAIeQsLKg63fs55TPYO+aheSU fejKEl/rL61DJTfNgR1hcTPaHIc3bDm1X8cL2vNW7z6T9vOS0g6kAMar5lS3OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SSU+zmlP1Tw1jB+mFIxZ1FZg1LyKsdHlSY+etT0e6D0=; b=VZxGNTRd8f67uXR8E40nmFGzooE2gXWzP5pzxXufPu8WRr1mqEiTgixqF+LQTbIJmXTZx/ wi9CEOYsHZf65Cssrj5LulIOsSaVNln317zfbX0U+l/EGLM1vqyZsliXjMqT4d3sTx2ghF /WW8FrO0dn5CxKFnzYA12DPsV8xacibz5jHbeV5uIYfhx5rNLHelxU+dicKDXOjcO2XnnM YwJRu5EszI5gj87z8vZz7rZic/eiplmnDfYyCdbIMxiGG30Un9TsmG//vp5Eq27m2ogWZh 8jx7ApIq4KPEy77yz8s1oBfwUb9Vajgbex+kkr0ga8w85/QihZXPBwFWtc+5Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWRR4CY3ztb9; Sun, 17 Sep 2023 15:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HF4JU4072345; Sun, 17 Sep 2023 15:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HF4J3R072342; Sun, 17 Sep 2023 15:04:19 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:04:19 GMT Message-Id: <202309171504.38HF4J3R072342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8bcf9a87c79d - stable/14 - timerfd: Namespace pollution adjustments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8bcf9a87c79d8de05bc79ff2f8530bf4a52162ca Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bcf9a87c79d8de05bc79ff2f8530bf4a52162ca commit 8bcf9a87c79d8de05bc79ff2f8530bf4a52162ca Author: Jake Freeland AuthorDate: 2023-09-17 15:02:09 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:02:09 +0000 timerfd: Namespace pollution adjustments Do not pollute userspace with , instead declare struct thread when _KERNEL is defined. Include instead of . This causes intentional namespace pollution that mimics Linux. g/musl libcs include in their , exposing clock gettime, settime functions and CLOCK_ macro constants. Ports like Chromium expect this namespace pollution and fail without it. MFC After: 3 days Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D41641 (cherry picked from commit fb5daae920bae84e3eec8175bf9e46304c3b2ae6) --- sys/sys/timerfd.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/sys/timerfd.h b/sys/sys/timerfd.h index 8cb9939ba60f..cace3b71498c 100644 --- a/sys/sys/timerfd.h +++ b/sys/sys/timerfd.h @@ -30,8 +30,12 @@ #include #include -#include -#include +/* + * We only need , but glibc pollutes the namespace + * with . This pollution is expected by most programs, so + * reproduce it by including here. + */ +#include typedef uint64_t timerfd_t; @@ -54,6 +58,8 @@ __END_DECLS #else /* _KERNEL */ +struct thread; + int kern_timerfd_create(struct thread *td, int clockid, int flags); int kern_timerfd_gettime(struct thread *td, int fd, struct itimerspec *curr_value);