From patchwork Wed Oct 25 21:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 158307 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp257674vqb; Wed, 25 Oct 2023 14:48:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2Kkw6/9S2gaCbwOiONNcDfvQYv4aNnoL2R0MqNO7d4lvOFJIJKYtzCa4QK+T/KVAbTOaW X-Received: by 2002:a25:374f:0:b0:da0:4d4d:da6a with SMTP id e76-20020a25374f000000b00da04d4dda6amr5202856yba.42.1698270493801; Wed, 25 Oct 2023 14:48:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698270493; cv=none; d=google.com; s=arc-20160816; b=lWDkIA3u8uirGiQjDONatGT1sT48S2jpY89ii5EKb4nrs+cmF7C2tE7W5umv9pXAVM +W+qx3H7+hNUVPaOvUfP/HTIYtawfnb0ISgjPr9RRvxiNSafHMJ+SbmliKeH7L0qJBMR o2sCJ2aCCWEPrauHIlprIXYIxT9a5X8zJi/3Xvldo4a+wEGGC7E92OBVKQGMs4Yf8xsT CNccrBlLg2XT06PpEqstxq+X/g256kOHilPTdMLJfFUORUayRj6/9QZUp3xWh6WvvQMy b1HClqI1sTEYrxv4n5PkfyAKSrZ8YFQsE3TzO3fw3NPBN8V3AwlNZXDRjiE+Rs3iFzin 0zdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8tSKa0HgdWYulSoiXZKm44fXO771HcZyFUGdgFqIvd4=; fh=uEEAtRcJYtiS6DedIKKo1qno7ioKI2axq6Yg7vU01Kw=; b=fIW6IUvv+fJvSQc6IOnhm0DmpBFiOle+ujNkbrNtJk4c4ohb2NDdpg7eqZlHLOfHi5 sVmNoAXs7z20smrixBglHAD/aSj6ZAsbKu1mlRIpjtLopqEmK8k1P9o5xduYCVwO/X0Y RZQt90ioMZLb7GYxLXCDIp1C2cUhAURGP2I2Kbso4Rf6Ntz6MXjTBK9Myl4jTwb9D1P+ zmF8V0y/YlxONvs0Goy6KfElLihnH4sVuY92q3RGk7MMIrxLWKIfxnOw/+WeakBt2sNN G1O/ipK46YK0N6wpZXTYVWVVh+e4UU+nQ2Yc+znSc4ShhPo71StGsiQGRnStexqLB/wo 14DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=evucBCtL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id f17-20020a25b091000000b00d77f78ab3a7si12499932ybj.479.2023.10.25.14.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 14:48:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=evucBCtL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 627E481A43D4; Wed, 25 Oct 2023 14:48:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230139AbjJYVsJ (ORCPT + 25 others); Wed, 25 Oct 2023 17:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjJYVsI (ORCPT ); Wed, 25 Oct 2023 17:48:08 -0400 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5141A3 for ; Wed, 25 Oct 2023 14:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1698270481; bh=OBn+A/l8SxiCM8pYkWDBMu9Vbe4Ej9dhbMErkCapgFw=; h=From:To:Cc:Subject:Date:From; b=evucBCtLcRhgzcOxhGkDUg2KZQigvdnMoGnGLRA/lXtNB4Px44KjpH5/wqK5t1qqV i9JRbGmj477Ws9acTCjwBCYgagzV7aBI2kzStfkPEd1nOKzmu0xGS+ZEOusZYPnB5r YTZPX7e7rR9hVpuSBKtp6vRaJj3wfxa+NuMKrC90QtmGgrva78UQ1iDkh6ffg192us ndevKMtGwXpayEe4dxW4t979pijO7qNTa9yFyME8JQ3Ki77VMkdd54cionaDaALXC2 Bb2P8rXFuV8cOlntv3A/PP3ZF4DS1uulwZfCPoYbU1rdCYMDUYdr7yKE2TZvzz/MCy RHrjScjSh95jw== Received: from thinkos.internal.efficios.com (unknown [IPv6:2606:6d00:100:4000:582e:ab84:d98b:7516]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4SG2bj2Hg9z1ZC5; Wed, 25 Oct 2023 17:48:01 -0400 (EDT) From: Mathieu Desnoyers To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Steven Rostedt Subject: [PATCH] Fix: rseq uapi: Adapt header includes to follow glibc header changes Date: Wed, 25 Oct 2023 17:48:11 -0400 Message-Id: <20231025214811.2066376-1-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 14:48:11 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780765681469308658 X-GMAIL-MSGID: 1780765681469308658 With "recent" glibc headers, using with __GNU_SOURCE fails to have __u32 and others types needed by the rseq.h uapi header file. Include ctype.h and asm/types.h to fix this. Add a __KERNEL__ #ifdef to select the kernel vs userspace header includes. Also, remove the now unneeded asm/byteorder.h include, since it also causes its own build issues with "recent" glibc headers. I'm cautiously using the term "recent" glibc here because I don't know exactly in which glibc versions those changes happened. Steven reproduced this issue with glibc 2.37 on Debian. Signed-off-by: Mathieu Desnoyers Reported-by: Steven Rostedt (Google) Cc: Steven Rostedt (Google) Cc: Peter Zijlstra (Intel) Acked-by: Rik van Riel --- include/uapi/linux/rseq.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/rseq.h b/include/uapi/linux/rseq.h index c233aae5eac9..0f9cd8211ff0 100644 --- a/include/uapi/linux/rseq.h +++ b/include/uapi/linux/rseq.h @@ -10,8 +10,12 @@ * Copyright (c) 2015-2018 Mathieu Desnoyers */ -#include -#include +#ifdef __KERNEL__ +# include +#else +# include +# include +#endif enum rseq_cpu_id_state { RSEQ_CPU_ID_UNINITIALIZED = -1,