From nobody Mon Jan 10 19:50:53 2022 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 8DADA1954BBB; Mon, 10 Jan 2022 19:50:57 +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 4JXkvy5W3Kz3Nqh; Mon, 10 Jan 2022 19:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 039D832B3; Mon, 10 Jan 2022 19:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AJorVX009375; Mon, 10 Jan 2022 19:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AJor0m009372; Mon, 10 Jan 2022 19:50:53 GMT (envelope-from git) Date: Mon, 10 Jan 2022 19:50:53 GMT Message-Id: <202201101950.20AJor0m009372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 64dab63f3b3b - main - LinuxKPI: Use negative bit field size to trigger BUILD_BUG_ON_ZERO 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64dab63f3b3b6c6a1f8a92f43bed0aa28319d627 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641844255; 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=LBO+6SGjGcQ4cIw9SAeu/tyGfW3AmGVLr67+78qFyvs=; b=CdtFJWVSWIAaXSTHaaafDqnailWWJZ2ZC7DaSt6zikOPtwuLDEwWks8DL6dghqppAgVrII +uooapmyovtF3t/v3zGBHJqUuLblp3itfWnJ+SvI4hNmz4mwNHzZWc894WKk7JzcJ9RYLC WH6CAMs1leQcuUqEmkhqq0/Z5vK5kVUKSGIHQRMlTeXGV+t0uNrIMH00jZdHob19Sc29QO 7NIXJ3lKWABurUVLjC89Do3JydAIz09Xw3jNawUQdJcXVnhyT4zxlWtJXjmkP4CEQ+ly0O kkznhsxjgMZo8hl4pKoZy91GpO4tuC9Tz+bIOqrm7O4ltUJeUGXqYLX2UCPzRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641844255; a=rsa-sha256; cv=none; b=sJY1r3iCXoe+HZQlvJ+Eh5Fg93L+26H2TQ3JvTLTfQEYiysrxALs0h1vk1jh8t2UUaWjHR Rrd67kZ8yU1EH4JucWPk8JaMtcUqA94zG2a2MD7MMdnUu7U/ztA40eBYrE2MUFMNRoriie sNcw/R8XGCFGhPPyZq2+Xl0Xp8Y1twTBgp6Aa+IuxHkloatpkvOFC2H24z5Q2+YLGHos42 Vtf6VneXvn/MIpqlahi4ydco0vD5ugxlpuEdJAAvwYC+UVWa0j18tB7MFHU/KmfVT3Ae6S +bt90XJBhPcKaBai7Osk3fcPmUTj/lPGLGWdOYtmZkEhYXP9MCJHZlx8wkLK7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=64dab63f3b3b6c6a1f8a92f43bed0aa28319d627 commit 64dab63f3b3b6c6a1f8a92f43bed0aa28319d627 Author: Vladimir Kondratyev AuthorDate: 2021-12-25 18:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-10 19:49:38 +0000 LinuxKPI: Use negative bit field size to trigger BUILD_BUG_ON_ZERO compile time assertion on non-NULL pointers. Tests conducted show that _Static_assert, negative array size method and current code does not handle pointers well enough. Bit field method solves this problem. This change is derrived from Linux implementation of BUILD_BUG_ON_ZERO. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33674 --- sys/compat/linuxkpi/common/include/linux/kernel.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 419dae214396..a84f577dd912 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -109,9 +109,7 @@ #define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) #define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } - -extern const volatile int lkpi_build_bug_on_zero; -#define BUILD_BUG_ON_ZERO(x) ((x) ? lkpi_build_bug_on_zero : 0) +#define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) #define BUG() panic("BUG at %s:%d", __FILE__, __LINE__) #define BUG_ON(cond) do { \