From patchwork Thu Mar 28 03:34:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hubbard X-Patchwork-Id: 13607942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04904C54E64 for ; Thu, 28 Mar 2024 03:34:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C8586B0089; Wed, 27 Mar 2024 23:34:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 750CA6B008A; Wed, 27 Mar 2024 23:34:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 554F76B008C; Wed, 27 Mar 2024 23:34:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 359E36B0089 for ; Wed, 27 Mar 2024 23:34:34 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EF5C6C057F for ; Thu, 28 Mar 2024 03:34:33 +0000 (UTC) X-FDA: 81945030426.30.203E485 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2075.outbound.protection.outlook.com [40.107.223.75]) by imf28.hostedemail.com (Postfix) with ESMTP id 270FCC0009 for ; Thu, 28 Mar 2024 03:34:25 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=ohDkPxPF; spf=pass (imf28.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.223.75 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711596871; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yNhHfobMEDWuzlS7JbbionFkEvqgOb/lKmGYLiqEtGw=; b=ej9DjQnyzWCaZrRswWHUaYz5rlojZ/1a36jf3+d7OXccZaBnCfdPkYnrON7uL9YP7QGl3v 0fWR13gJrLuhNx92/mPyuYHgfJg+ZQ4EB/TW9hdF74Zi8x0d34AGWJ29OybWhdSMLwpsJ+ 9fzhdTFuhOiEu/3Z5evDzCghRsPzn4s= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1711596871; a=rsa-sha256; cv=pass; b=azVSyNdmaFW2XQEHDyuSrQWKpj/F4upnsBt5OMP83qEdwBr3QOcAQR3wUNe7PDEnZ892OP 2YUHoh9HeR/OFXjyZhVtJO+P3EfCVT2xaRFOYeWg50Z9JxsdCp1Nyl7n7kYN0ob6KuriyZ aGk9Wb2s9iGw6Z9HxPVxyWEOb7uld9w= ARC-Authentication-Results: i=2; imf28.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=ohDkPxPF; spf=pass (imf28.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.223.75 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N/RM0ocJrDZdgofUAOBVWIRLzoWERNu1AthB2tqNoVf3INw7AEHA/JqEOS+9shY1P8h44zGcaFlUHK5p5s9Jq7dcKhvTswaXOimulKTW5d70K5bP6AlVj63Re6sC0VGbxjtS7+F3hzvuyIOnP4LfLOlw7seraU5oo6r33K0UuKOVCHuSDy9GMhp+qq0+kSdlQ7BQLdYDqnfvA5dWfZ6EFru0ikuYt3yBpVsh9kqlohn3Pkvg7qLq2kXxepPj60aszLOhERvd388l13uon2tgrvf8rCrb4mC9MrmdidGV5cL6Q9O+5oZCVAMBZyMSjgRYXU6mH2I0NE7BmRtvNxaOwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yNhHfobMEDWuzlS7JbbionFkEvqgOb/lKmGYLiqEtGw=; b=WZPUA7QLnE/xFOhb1ZZajoZaLs5hD9cZxdsSVeCuW4d7RiGM+hDCb5Cxx/wyA2VhoZlrC2NbaTr2TEYsCyI6pTR8baUsUzL+iHLO8hhGQuHIKLNbNo5kH8uC2+I5Nkiksx5g3hLJhvai/gCae2y/qXd5kYTl0v9LFD9QUjbeTRuPa4CbTX3R4C3yV7cWgVMPJpgO2X78oRvow8U0ZnoJ0rcrpaQ+9zVWS7/UKzED+hLfnB7vuq5GCO6WpzUxw2XgHG9USX6dvgcbvjISpo9iJ681yTDwcuT97a4EQ3IGx27KjypQ6lwkyid2RVOsAQSgrwknuxQqJC+Rf8CG8r1t9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yNhHfobMEDWuzlS7JbbionFkEvqgOb/lKmGYLiqEtGw=; b=ohDkPxPF7WMjtAcmHl5WngsoQBRkO9awPwwkT7j9a0kQhQwvBqhqmXt9HPwuSe6XgJ8sr4N+aCKnw48PJzr9J+469XKRFiEJnEn2OAlS6TapLrgvwVYbXLNB3eMdTYkctSelrbT/aTxh1Adr99RBGG9j1010Gu4vkzm/eH2nlIUmYwVZEKApvulANtQfHvC3sxzUKYqJK42r1yS2FuI+o/7WYJ90qJ0Y3Vd1gI/SUVKSOzvzmmgfVYfo7MwXN1o1lmV9AdoFKzxchfQID+swC4rmWjm4N9vAioxTS+oOM7oN330R/X4ynGE3h9w8Sv1WyiGvCy/PIv6sXOPthVGjmg== Received: from SN7P220CA0022.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::27) by DS7PR12MB8250.namprd12.prod.outlook.com (2603:10b6:8:db::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Thu, 28 Mar 2024 03:34:23 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:806:123:cafe::e6) by SN7P220CA0022.outlook.office365.com (2603:10b6:806:123::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.13 via Frontend Transport; Thu, 28 Mar 2024 03:34:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SN1PEPF00026367.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.10 via Frontend Transport; Thu, 28 Mar 2024 03:34:22 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 27 Mar 2024 20:34:20 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 27 Mar 2024 20:34:19 -0700 Received: from blueforge.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Wed, 27 Mar 2024 20:34:19 -0700 From: John Hubbard To: Andrew Morton CC: David Hildenbrand , Peter Xu , "Shuah Khan" , Axel Rasmussen , "Andrea Arcangeli" , , , LKML , "John Hubbard" , Mark Brown , "Muhammad Usama Anjum" , Suren Baghdasaryan , Peter Zijlstra Subject: [PATCH 1/2] selftests: break the dependency upon local header files Date: Wed, 27 Mar 2024 20:34:17 -0700 Message-ID: <20240328033418.203790-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240328033418.203790-1-jhubbard@nvidia.com> References: <20240328033418.203790-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026367:EE_|DS7PR12MB8250:EE_ X-MS-Office365-Filtering-Correlation-Id: deb24cf7-5bf4-44e2-75ab-08dc4ed7f5d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+3HxM5SCBfV1nnapqq89UylFlWZaGJ1LoX71iFkc4B3YPU1Bmn4+i45nj1/g5NvdGrfOJZQdTeD7Y6adhuiiShAmPkxi/f7Sx/LO6BR7rzLAopdKyx+zu79NPBflL66BGGepDBYDecd+xsHeeRbginL4XnhLlShyVqxE7MQ6iGfNcgWIxXx+rZwaBjHf8/XxB/BX0PeCq06Mj02Jfh1CtN51yyWfLzDFEo7YmlgBEzhuI0gZqbEMcxGnZv6vkDT/Bl+ZLRwJU1EaA4+coBGw4N7X9XjiyYWwp1kVV3imxdzCD40UesD/FgBZfocenl/KGRwCzO4trT+GcoCxmbyffkf34vq9YQq4CDHtsdY4+gHL+Ep2r7u/IALAhQngswZW/1LZuXfo6QXJz7HqyV2kvjiKxRaw/9ET/jFsfiGriNqZDU2RISH6XlNdWS2rdImYnOWrTfnzbWUGduoFIs65WbLTH0yWH2OYCf1j+zD4wejE7wUf/r5+TSFXcs328swen+D5BUFcWiuTg91OdxClIT2zTP4u0+Rbh2eKQAcJxIIZPL4YOn82J1qgggPPl04s3uJFYKOw0gdSCpCyCfzJoWgWBIGuV5pIGr2n3DhNeC8PYBedjJ2Wiyr5hqT/6y70wd6vtzxtrU0D5neiNLwvk59QoBtQSVEMebf2QLF0dUmSETK1jIH9R/CserGG1i/ssXFfrzAMsLXd9KkAq+XFKf+SbNwESt571XqiCZ/VufuXYWHpfJDfXe2uutPWyQi X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230031)(376005)(7416005)(36860700004)(1800799015)(82310400014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 03:34:22.8055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: deb24cf7-5bf4-44e2-75ab-08dc4ed7f5d8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026367.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8250 X-Rspamd-Queue-Id: 270FCC0009 X-Rspam-User: X-Stat-Signature: m9bbpob18rgdegzzqkrt9ab1bic8m936 X-Rspamd-Server: rspam03 X-HE-Tag: 1711596865-408606 X-HE-Meta: U2FsdGVkX19LPcq8iXDJwW2GchE5r/LlM33z2b4zyLBQYoyddxRHWy8fYG/BTnlAJ4pF3GmkYaH1ecPBj48XiRLtw/EX80hN5kDOAdS4zmjR229YoQO9cDyxqfPO1J8SOJ7NPVijB9In5+lDlhNGAJrZdKZiCkK4JiIQyEw+Hq0gQrguzHEYD9mSgQt/B2Nse/qVAZ1gAQLBrrQDr+DU7wy4fPygJx26NbLiCBzcmlrkfTZ3WHkde6vOg9GmY9P+lHDcWvXkvoEHFEBSxkB9M3QtfQ0P0wdxE+xCFEUlwb0uAnWNNgPjdcS/Qpk97fV0Yj3BugO9H7spbrNBif4wfIUfYqL5B0SjIiDUAflfmKmxyl+QHeCan0gZWGjL1ACgp9+itIYkPpF14WAVDEFOqzsWaxHUsrE+kNdClGyt7xAgr/jDpSiNj+v9Ka0NPz2BGtQnBw/mwFOrECKFYQ3KhopXs5dV2i2jpB3qITEwm/IR2GMSiaRhEB3a4I3x7BHPdUxF4rEB/H+FT/aMuO7zDwSvTR1Z5stDl19dz4EiMrc1iwj6GnQg5Dr5LTJQvDoEjczmrhfbgjn4QhIAqEs7MFNBAG3MLkOnZLqm8fXeLwTi9qmxYUWgXpVkQv+F2tRX280UH3n20EbNxj/4y79NtrHDP9kN2Q4C2NF8d7LTTsObR6bPdtTPA3C94gV6neAA+Rj2TVL/q3K/TN5X+dFspGSrs+fpDG/mwNzwOWyC0O8vy4h9nPRbG+Ojg58KjJpR/EWm5E+PellenGeTxGbdWMlUQVvS7xMk9S6z8N5tdEala3oQHgSd+rgIU8rtBbww5HNI2N5x4Yuh0+oMAChrwrUhQrvN9W6QtBD0EExmlNKAz9yisrdv+wdIZhuGfiH15H9x8fXh+mk21MiUODGDW2fnzYvDi+cxPqViTlXPDEtn87porkXpgQ0Qg6Oy4MOHjB6ZCf2KPosCjnXffvj rcaEoc5V bZ5zE/Olta0I9P3NDKyZ0dqnqZM6vmwsBWqggrjIVeNZALmDsEjpzBy5clOYsRPaNIDc0sIo/oM/al99A2DUrATzHrLRKu2RtDaCqAs6pLRaThc+7gUB2e1TG0NES6aYFBVNZzASbUzHwkov8EyPhWhYm49pgTgzES7ulSOULX09+li+gjwSV98e9jFpxXktSfxsiA3+tUSzHEt5ij5Bw+mnPPHhY2qkGT4obt6uOptIsh+Nvsam8Ggaw4TUGHqV6qsep09TV+mAQuCJd0A5Px27s9D/aqye0bUlBSFOAziZlPGR0W5dgX8n+dgJCjq6mgbNx3py7PTUPKgJ1GUcYgd4eRuRf91GlvcJFDnt6yve5OsM4v0dv6oV+SWoMIHz5TJ5mENg41cVvW/Ec2NBo82XZeT9OCbe989gvYlm5gvw3vNw6x06vVnYZ9dgTuLgPXTmzYeqdiibQbvWnY7Vvy0v4zh7YHXbpzKX77yEGBCR8rDk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Use tools/include/uapi/ files instead. These are obtained by taking a snapshot: run "make headers" at the top level, then copy the desired header file into the appropriate subdir in tools/uapi/. This was discussed and solved in [1]. However, even before copying any additional files there, there are already quite a few in tools/include/uapi already. And these will immediately fix a number of selftests/mm build failures. So this patch: a) Adds TOOLS_INCLUDES to selftests/lib.mk, so that all selftests can immediately and easily include the snapshotted header files. b) Uses $(TOOLS_INCLUDES) in the selftests/mm build. On today's Arch Linux, this already fixes all build errors except for a few userfaultfd.h (those will be addressed in a subsequent patch). [1] https://lore.kernel.org/all/783a4178-1dec-4e30-989a-5174b8176b09@redhat.com/ Cc: David Hildenbrand Cc: Mark Brown Cc: Muhammad Usama Anjum Cc: Suren Baghdasaryan Cc: Peter Zijlstra Signed-off-by: John Hubbard Acked-by: David Hildenbrand --- tools/testing/selftests/lib.mk | 9 +++++++++ tools/testing/selftests/mm/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index da2cade3bab0..1dae4a02957f 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -48,6 +48,15 @@ ifeq ($(KHDR_INCLUDES),) KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include endif +# In order to use newer items that haven't yet been added to the user's system +# header files, add $(TOOLS_INCLUDES) to the compiler invocation in each +# each selftest. +# You may need to add files to that location, or to refresh an existing file. In +# order to do that, run "make headers" from $(top_srcdir), then copy the +# header file that you want from $(top_srcdir)/usr/include/... , to the matching +# subdir in $(TOOLS_INCLUDE). +TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi + # The following are built by lib.mk common compile rules. # TEST_CUSTOM_PROGS should be used by tests that require # custom build rule and prevent common build rule use. diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index eb5f39a2668b..7ca9186a0639 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -32,7 +32,7 @@ endif # LDLIBS. MAKEFLAGS += --no-builtin-rules -CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) +CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) $(TOOLS_INCLUDES) LDLIBS = -lrt -lpthread -lm TEST_GEN_FILES = cow