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 From patchwork Thu Mar 28 03:34:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hubbard X-Patchwork-Id: 13607943 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 683C9C54E67 for ; Thu, 28 Mar 2024 03:34:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77B7D6B008A; Wed, 27 Mar 2024 23:34:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B6206B008C; Wed, 27 Mar 2024 23:34:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4960C6B0092; Wed, 27 Mar 2024 23:34:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1F57D6B008A for ; Wed, 27 Mar 2024 23:34:35 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EA5FEA141E for ; Thu, 28 Mar 2024 03:34:34 +0000 (UTC) X-FDA: 81945030468.15.A191DCE Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2076.outbound.protection.outlook.com [40.107.101.76]) by imf29.hostedemail.com (Postfix) with ESMTP id EECD6120011 for ; Thu, 28 Mar 2024 03:34:31 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Yzgyxwir; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf29.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.101.76 as permitted sender) smtp.mailfrom=jhubbard@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=1711596872; 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=wZrh6YSD7uNTj7TV3XRmzbBOFgFmdcgSko+aQNsQbIw=; b=zKRme0DJjKhZkYMmbuJSIl9ebp2Fny2daFypy6eLStXIGbELb+AdO+qGBTCoHLrRj2rBgL /ZlJ3VZOSpUrAMrxYER6JyZAyEOtXfdxCov+Tiiinuy/qnnbr0rgr6LPz4lYfjDjoY8UjS vDu+y+BNsn5sex1QUmIhx3NNW2oZzsY= ARC-Authentication-Results: i=2; imf29.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Yzgyxwir; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf29.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.101.76 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1711596872; a=rsa-sha256; cv=pass; b=WSoT6Zt/2fvM8/QTIVBNxxbw5EQYcbr5G0qKoaNl3Ur0V6ZiSynSfJtPnEeYR3k0DKWIH/ mT9nZiXmmzr/TkAz9pfeJiTV7ThJUlFNzIQ0v8b8L2A836y/X6qhQlYCE2conYnlTbPm33 7ho//QOiRTS4LIBA6+iqHxHnmgpssCY= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z2ym/S2bH0EfCw5rUZRMf7P/a031nAjNGMsRJoX2Z89FdXD2AiM4RwesFXnDsxu5SW73eHXOPDOlArZf5zY216L17AExsZ4IilUncf2HsX5Pqb0BVB6+4W6u3hzRCDZAkC/KwyXX9k4iAaeaoSanryT4iDJucCnV6ebjCt2VGdTxndezeRBDEw4fINufPCZDx1KrXI1/AU65OMlzFCrSzmUnP7T8yvCEGNsOnYdqYFmqGbHDILuCb2c9GZddSDaMpjbOpXcMxhPtIz3VslTd0wfLMRB87F2S3PnV6uEEGHa3qEhWhy4gyLZhsMJMX8+1hqYPs6NRQYkYEck+YrnmXQ== 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=wZrh6YSD7uNTj7TV3XRmzbBOFgFmdcgSko+aQNsQbIw=; b=jP4ldwRvUMf2OmEp9DZIu7psiwxdGSlsOIImV4rF9rkgbRbeKbJqSL5g9fQtB5df/zPd8TQ12rLhjVwATkqmyekBWA17+isO2IBGgKfXejJ7EKhSY6Oi6rbBkp3nxtvSxsV42xSAE0qpXNYS4e3+LnhBr2rzXhqDidUScM9JyJdDZfX78Lq/Uy4MozddQoc05GvpQSQupPUEXdgWlRebaRwKzbIna6TpelQ5lphuFw6CeE7pxgs+foc36EmuBLKhB33JP0uPTBRnlU/LRkNDHcbcaCP9MIhEnwdbEm0DEeFtECcYDcc0UDNsHD3ZklHHl0boh2WDraDReKf4I/yPIQ== 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=wZrh6YSD7uNTj7TV3XRmzbBOFgFmdcgSko+aQNsQbIw=; b=Yzgyxwirkvahg6hRjTOQiHxPbsKHKHRAPqVM7hMCTliWdrzQPRiKkHlpUOQuBfqK+pQ9HhAqA68nBgmHfp0nxrDAAsIhV5ez3X0oTaTURkC/WuBITypwlf/aDnIZkgOtKnuf3We6sb9CF0LDIQxomZXRlQcCO7D/108tVpihi9VkB28RzDMCSgsseTji3se2vwytqt0qTCxh2KbrcdiPvh9xGuzfGfQKeU5zO3oCOtx4pQ99ziR1+RQ2dHmkMlpeyzL7hJbGZ0yl0QzLswlTvR7c4ormPWy+PtY+kNMsVCmzjbkmhNEoJG6SSa7913HHnkDYOq4jnGZkxjuoAMZVGQ== Received: from SN7P220CA0008.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::13) by CH3PR12MB7642.namprd12.prod.outlook.com (2603:10b6:610:14a::14) 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:26 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:806:123:cafe::59) by SN7P220CA0008.outlook.office365.com (2603:10b6:806:123::13) 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:26 +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:26 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) 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 drhqmail203.nvidia.com (10.126.190.182) 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:20 -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:20 -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 2/2] selftests/mm: fix additional build errors for selftests Date: Wed, 27 Mar 2024 20:34:18 -0700 Message-ID: <20240328033418.203790-3-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_|CH3PR12MB7642:EE_ X-MS-Office365-Filtering-Correlation-Id: 511b17ad-89b5-4da8-364d-08dc4ed7f7c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QcFfmdjxLphQyzLrIUnvSftG78yFLqf+PJg+s0n8sWRQTjzVj2z/Hs6NTtpyW+I7vu39sg+qVRh6OF9rd8WgToyx/uHxcK3PCaGHDSEu8L9VxXKDn6NcPPZl5tOJmRdItSSBwwwePtCx+gz/JRCJovuwaYsrxLxjee5W+mscpK6vrAMPGlDsHXbKCCsM4SiB4JnTcTS38ott4XhpbxNNGa1erYjELPQ+CrzxEDprQTaIxrMXLW78JbDI6CJy5mC/4EH9O3hHhSfbPsNl5b9I9G1mqryEaERQjTQw6X10gOaIHD9oaKquUURY4ywNQo2CCWqtwwFPHSAu538UAAeulGAdDlGYz7pTrfT2RApHzV94B1ERMnLy11Zdbe+KPJqy4mpjeMVOtoPJKd24fmws33rEaU9V4ujnGg7igcQxpn0jf9OeMD1vnaXIj84ixMzTgCXJ+f1dJGEkzSfOPh+5vrCgDuWJbSATe/znKYSmDdt1MhEP7z4JecFeDfuKZV0U3VtwaUGEwJI+cVqps0XgcK3vWVf6CNWk4DQa5gxasao2WlEOYVErgO8xzfmV9LWIqmQUKZert9K00gDUHZjWps3g1C8IOUcDWgSn5E4Cj1wRZPvwCLh0cwo9VkQk9bTecl1w2XU2mphb8OzDta3uCwb15IxjMV4B2uMDTTEo76A+N/KLGVk0Ur0v6nGfmtq0qyMU6DgetzOpX9HLvWp2dEEf/I3qOWf3xQuGIC4J6kjaDY0FioGRiHMnqhoZkOQk 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)(1800799015)(7416005)(82310400014)(376005)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 03:34:26.0087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 511b17ad-89b5-4da8-364d-08dc4ed7f7c1 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: CH3PR12MB7642 X-Rspamd-Queue-Id: EECD6120011 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: tijet3st8t3fqm1iez14bu3qsr81t1ng X-HE-Tag: 1711596871-839158 X-HE-Meta: U2FsdGVkX1/5ahEQXjbesS6CkeIbiPEC7aNtBDKtpPyIucMkIhrAzDinsR0YO6UxnQ+9ap17TeG3TZ18SLcqnlYAAatXTVPaMivIyZfQSjwKXfEQrc8/TKyt8Up71DS/61N0NV1fcLVSD1YY1v0XYbC9LzZAwizdA7IgqA1TF8p2QkU90GTWN8t93sTthetJxdzt4WOlnbHxS1ANifDSFF4qxXIRoeTmszLpQRJjoJj6rdQOiB4ujyn7yjEN7CGJQYCnOvNzC0dWELyI+CCUMVv8IBzjYU/8wDVg/HA9Pa30vhi3yhB2ybT1TR5YFXn8guHMSmD+RpP8LPXrr7Tnzyx5iC9EtRkWRkKADEGDcyeY589Li+nw/hkMR7doCgIeUrOi4eZgtgiJON0DizFgkjS5hYwYFDzHb1U3moUOKszWNWSA2wKJfcp/8ckgQOqZlLdl/I+79BymfniukYHHlGZB+TALSKDcl5IDnsaCD85vyS9C2+pCaERtO3nXy5ZB9mcqTgVUOsfP5e8mnnvNkUwOYixER6YrPbSikDAOoRnMKbt5vuQeg2bpVeWZaam9Rxr+NXZV1+X9T/M0bA8j1f41FTziYYgu8acmBuMmo0Aw89SjfU8wKJZwfyDlBxpbm5aFXUpMcV0eeoIHe55IWVn2KZOvEOntPVMQA1yo/sTMpac5Na5Caw98tToQ6z2QEEXz3UbUmrqv8b+oLPl0LRO+KkAtMRZbgDWnuQuSFExY+ncESeNaEZ7xYfbe7J8Oz3s2LjLS6W1dfWe80z7fUe6kFD8miD5sPuvyUq/bpHLVVW2a95OJ/u167gNAGdhEpkPnt8bGS418Nm4VL6bTpduJ+iP5LC8ojCc7xeqNp2H7E8C3z1vJIty6DMACT+27hQlZwGi5KZo3HPzHkC6iuKj7aBy3ZqwTcKHlt3NDGObnkjcUt1DCrQRgiqO4rGNL 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: These build errors only occur if one fails to first run "make headers". However, that is a non-obvious and instrusive requirement, and so there was a discussion on how to get rid of it [1]. This uses that solution. These two files were created by taking a snapshot of the generated header files that are created via "make headers". These two files were copied from ./usr/include/linux/ to ./tools/include/uapi/linux/ . That fixes the selftests/mm build on today's Arch Linux (which required the userfaultfd.h) and Ubuntu 23.04 (which additionally required memfd.h). [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/include/uapi/linux/memfd.h | 39 +++ tools/include/uapi/linux/userfaultfd.h | 386 +++++++++++++++++++++++++ 2 files changed, 425 insertions(+) create mode 100644 tools/include/uapi/linux/memfd.h create mode 100644 tools/include/uapi/linux/userfaultfd.h diff --git a/tools/include/uapi/linux/memfd.h b/tools/include/uapi/linux/memfd.h new file mode 100644 index 000000000000..01c0324e7733 --- /dev/null +++ b/tools/include/uapi/linux/memfd.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_MEMFD_H +#define _LINUX_MEMFD_H + +#include + +/* flags for memfd_create(2) (unsigned int) */ +#define MFD_CLOEXEC 0x0001U +#define MFD_ALLOW_SEALING 0x0002U +#define MFD_HUGETLB 0x0004U +/* not executable and sealed to prevent changing to executable. */ +#define MFD_NOEXEC_SEAL 0x0008U +/* executable */ +#define MFD_EXEC 0x0010U + +/* + * Huge page size encoding when MFD_HUGETLB is specified, and a huge page + * size other than the default is desired. See hugetlb_encode.h. + * All known huge page size encodings are provided here. It is the + * responsibility of the application to know which sizes are supported on + * the running system. See mmap(2) man page for details. + */ +#define MFD_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT +#define MFD_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK + +#define MFD_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB +#define MFD_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB +#define MFD_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB +#define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB +#define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB +#define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB +#define MFD_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB +#define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB +#define MFD_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB +#define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB +#define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB +#define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB + +#endif /* _LINUX_MEMFD_H */ diff --git a/tools/include/uapi/linux/userfaultfd.h b/tools/include/uapi/linux/userfaultfd.h new file mode 100644 index 000000000000..4283de22d5b6 --- /dev/null +++ b/tools/include/uapi/linux/userfaultfd.h @@ -0,0 +1,386 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * include/linux/userfaultfd.h + * + * Copyright (C) 2007 Davide Libenzi + * Copyright (C) 2015 Red Hat, Inc. + * + */ + +#ifndef _LINUX_USERFAULTFD_H +#define _LINUX_USERFAULTFD_H + +#include + +/* ioctls for /dev/userfaultfd */ +#define USERFAULTFD_IOC 0xAA +#define USERFAULTFD_IOC_NEW _IO(USERFAULTFD_IOC, 0x00) + +/* + * If the UFFDIO_API is upgraded someday, the UFFDIO_UNREGISTER and + * UFFDIO_WAKE ioctls should be defined as _IOW and not as _IOR. In + * userfaultfd.h we assumed the kernel was reading (instead _IOC_READ + * means the userland is reading). + */ +#define UFFD_API ((__u64)0xAA) +#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | \ + UFFDIO_REGISTER_MODE_WP | \ + UFFDIO_REGISTER_MODE_MINOR) +#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | \ + UFFD_FEATURE_EVENT_FORK | \ + UFFD_FEATURE_EVENT_REMAP | \ + UFFD_FEATURE_EVENT_REMOVE | \ + UFFD_FEATURE_EVENT_UNMAP | \ + UFFD_FEATURE_MISSING_HUGETLBFS | \ + UFFD_FEATURE_MISSING_SHMEM | \ + UFFD_FEATURE_SIGBUS | \ + UFFD_FEATURE_THREAD_ID | \ + UFFD_FEATURE_MINOR_HUGETLBFS | \ + UFFD_FEATURE_MINOR_SHMEM | \ + UFFD_FEATURE_EXACT_ADDRESS | \ + UFFD_FEATURE_WP_HUGETLBFS_SHMEM | \ + UFFD_FEATURE_WP_UNPOPULATED | \ + UFFD_FEATURE_POISON | \ + UFFD_FEATURE_WP_ASYNC | \ + UFFD_FEATURE_MOVE) +#define UFFD_API_IOCTLS \ + ((__u64)1 << _UFFDIO_REGISTER | \ + (__u64)1 << _UFFDIO_UNREGISTER | \ + (__u64)1 << _UFFDIO_API) +#define UFFD_API_RANGE_IOCTLS \ + ((__u64)1 << _UFFDIO_WAKE | \ + (__u64)1 << _UFFDIO_COPY | \ + (__u64)1 << _UFFDIO_ZEROPAGE | \ + (__u64)1 << _UFFDIO_MOVE | \ + (__u64)1 << _UFFDIO_WRITEPROTECT | \ + (__u64)1 << _UFFDIO_CONTINUE | \ + (__u64)1 << _UFFDIO_POISON) +#define UFFD_API_RANGE_IOCTLS_BASIC \ + ((__u64)1 << _UFFDIO_WAKE | \ + (__u64)1 << _UFFDIO_COPY | \ + (__u64)1 << _UFFDIO_WRITEPROTECT | \ + (__u64)1 << _UFFDIO_CONTINUE | \ + (__u64)1 << _UFFDIO_POISON) + +/* + * Valid ioctl command number range with this API is from 0x00 to + * 0x3F. UFFDIO_API is the fixed number, everything else can be + * changed by implementing a different UFFD_API. If sticking to the + * same UFFD_API more ioctl can be added and userland will be aware of + * which ioctl the running kernel implements through the ioctl command + * bitmask written by the UFFDIO_API. + */ +#define _UFFDIO_REGISTER (0x00) +#define _UFFDIO_UNREGISTER (0x01) +#define _UFFDIO_WAKE (0x02) +#define _UFFDIO_COPY (0x03) +#define _UFFDIO_ZEROPAGE (0x04) +#define _UFFDIO_MOVE (0x05) +#define _UFFDIO_WRITEPROTECT (0x06) +#define _UFFDIO_CONTINUE (0x07) +#define _UFFDIO_POISON (0x08) +#define _UFFDIO_API (0x3F) + +/* userfaultfd ioctl ids */ +#define UFFDIO 0xAA +#define UFFDIO_API _IOWR(UFFDIO, _UFFDIO_API, \ + struct uffdio_api) +#define UFFDIO_REGISTER _IOWR(UFFDIO, _UFFDIO_REGISTER, \ + struct uffdio_register) +#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, \ + struct uffdio_range) +#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, \ + struct uffdio_range) +#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, \ + struct uffdio_copy) +#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, \ + struct uffdio_zeropage) +#define UFFDIO_MOVE _IOWR(UFFDIO, _UFFDIO_MOVE, \ + struct uffdio_move) +#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \ + struct uffdio_writeprotect) +#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, \ + struct uffdio_continue) +#define UFFDIO_POISON _IOWR(UFFDIO, _UFFDIO_POISON, \ + struct uffdio_poison) + +/* read() structure */ +struct uffd_msg { + __u8 event; + + __u8 reserved1; + __u16 reserved2; + __u32 reserved3; + + union { + struct { + __u64 flags; + __u64 address; + union { + __u32 ptid; + } feat; + } pagefault; + + struct { + __u32 ufd; + } fork; + + struct { + __u64 from; + __u64 to; + __u64 len; + } remap; + + struct { + __u64 start; + __u64 end; + } remove; + + struct { + /* unused reserved fields */ + __u64 reserved1; + __u64 reserved2; + __u64 reserved3; + } reserved; + } arg; +} __attribute__((packed)); + +/* + * Start at 0x12 and not at 0 to be more strict against bugs. + */ +#define UFFD_EVENT_PAGEFAULT 0x12 +#define UFFD_EVENT_FORK 0x13 +#define UFFD_EVENT_REMAP 0x14 +#define UFFD_EVENT_REMOVE 0x15 +#define UFFD_EVENT_UNMAP 0x16 + +/* flags for UFFD_EVENT_PAGEFAULT */ +#define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ +#define UFFD_PAGEFAULT_FLAG_WP (1<<1) /* If reason is VM_UFFD_WP */ +#define UFFD_PAGEFAULT_FLAG_MINOR (1<<2) /* If reason is VM_UFFD_MINOR */ + +struct uffdio_api { + /* userland asks for an API number and the features to enable */ + __u64 api; + /* + * Kernel answers below with the all available features for + * the API, this notifies userland of which events and/or + * which flags for each event are enabled in the current + * kernel. + * + * Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE + * are to be considered implicitly always enabled in all kernels as + * long as the uffdio_api.api requested matches UFFD_API. + * + * UFFD_FEATURE_MISSING_HUGETLBFS means an UFFDIO_REGISTER + * with UFFDIO_REGISTER_MODE_MISSING mode will succeed on + * hugetlbfs virtual memory ranges. Adding or not adding + * UFFD_FEATURE_MISSING_HUGETLBFS to uffdio_api.features has + * no real functional effect after UFFDIO_API returns, but + * it's only useful for an initial feature set probe at + * UFFDIO_API time. There are two ways to use it: + * + * 1) by adding UFFD_FEATURE_MISSING_HUGETLBFS to the + * uffdio_api.features before calling UFFDIO_API, an error + * will be returned by UFFDIO_API on a kernel without + * hugetlbfs missing support + * + * 2) the UFFD_FEATURE_MISSING_HUGETLBFS can not be added in + * uffdio_api.features and instead it will be set by the + * kernel in the uffdio_api.features if the kernel supports + * it, so userland can later check if the feature flag is + * present in uffdio_api.features after UFFDIO_API + * succeeded. + * + * UFFD_FEATURE_MISSING_SHMEM works the same as + * UFFD_FEATURE_MISSING_HUGETLBFS, but it applies to shmem + * (i.e. tmpfs and other shmem based APIs). + * + * UFFD_FEATURE_SIGBUS feature means no page-fault + * (UFFD_EVENT_PAGEFAULT) event will be delivered, instead + * a SIGBUS signal will be sent to the faulting process. + * + * UFFD_FEATURE_THREAD_ID pid of the page faulted task_struct will + * be returned, if feature is not requested 0 will be returned. + * + * UFFD_FEATURE_MINOR_HUGETLBFS indicates that minor faults + * can be intercepted (via REGISTER_MODE_MINOR) for + * hugetlbfs-backed pages. + * + * UFFD_FEATURE_MINOR_SHMEM indicates the same support as + * UFFD_FEATURE_MINOR_HUGETLBFS, but for shmem-backed pages instead. + * + * UFFD_FEATURE_EXACT_ADDRESS indicates that the exact address of page + * faults would be provided and the offset within the page would not be + * masked. + * + * UFFD_FEATURE_WP_HUGETLBFS_SHMEM indicates that userfaultfd + * write-protection mode is supported on both shmem and hugetlbfs. + * + * UFFD_FEATURE_WP_UNPOPULATED indicates that userfaultfd + * write-protection mode will always apply to unpopulated pages + * (i.e. empty ptes). This will be the default behavior for shmem + * & hugetlbfs, so this flag only affects anonymous memory behavior + * when userfault write-protection mode is registered. + * + * UFFD_FEATURE_WP_ASYNC indicates that userfaultfd write-protection + * asynchronous mode is supported in which the write fault is + * automatically resolved and write-protection is un-set. + * It implies UFFD_FEATURE_WP_UNPOPULATED. + * + * UFFD_FEATURE_MOVE indicates that the kernel supports moving an + * existing page contents from userspace. + */ +#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0) +#define UFFD_FEATURE_EVENT_FORK (1<<1) +#define UFFD_FEATURE_EVENT_REMAP (1<<2) +#define UFFD_FEATURE_EVENT_REMOVE (1<<3) +#define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4) +#define UFFD_FEATURE_MISSING_SHMEM (1<<5) +#define UFFD_FEATURE_EVENT_UNMAP (1<<6) +#define UFFD_FEATURE_SIGBUS (1<<7) +#define UFFD_FEATURE_THREAD_ID (1<<8) +#define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9) +#define UFFD_FEATURE_MINOR_SHMEM (1<<10) +#define UFFD_FEATURE_EXACT_ADDRESS (1<<11) +#define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<12) +#define UFFD_FEATURE_WP_UNPOPULATED (1<<13) +#define UFFD_FEATURE_POISON (1<<14) +#define UFFD_FEATURE_WP_ASYNC (1<<15) +#define UFFD_FEATURE_MOVE (1<<16) + __u64 features; + + __u64 ioctls; +}; + +struct uffdio_range { + __u64 start; + __u64 len; +}; + +struct uffdio_register { + struct uffdio_range range; +#define UFFDIO_REGISTER_MODE_MISSING ((__u64)1<<0) +#define UFFDIO_REGISTER_MODE_WP ((__u64)1<<1) +#define UFFDIO_REGISTER_MODE_MINOR ((__u64)1<<2) + __u64 mode; + + /* + * kernel answers which ioctl commands are available for the + * range, keep at the end as the last 8 bytes aren't read. + */ + __u64 ioctls; +}; + +struct uffdio_copy { + __u64 dst; + __u64 src; + __u64 len; +#define UFFDIO_COPY_MODE_DONTWAKE ((__u64)1<<0) + /* + * UFFDIO_COPY_MODE_WP will map the page write protected on + * the fly. UFFDIO_COPY_MODE_WP is available only if the + * write protected ioctl is implemented for the range + * according to the uffdio_register.ioctls. + */ +#define UFFDIO_COPY_MODE_WP ((__u64)1<<1) + __u64 mode; + + /* + * "copy" is written by the ioctl and must be at the end: the + * copy_from_user will not read the last 8 bytes. + */ + __s64 copy; +}; + +struct uffdio_zeropage { + struct uffdio_range range; +#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + + /* + * "zeropage" is written by the ioctl and must be at the end: + * the copy_from_user will not read the last 8 bytes. + */ + __s64 zeropage; +}; + +struct uffdio_writeprotect { + struct uffdio_range range; +/* + * UFFDIO_WRITEPROTECT_MODE_WP: set the flag to write protect a range, + * unset the flag to undo protection of a range which was previously + * write protected. + * + * UFFDIO_WRITEPROTECT_MODE_DONTWAKE: set the flag to avoid waking up + * any wait thread after the operation succeeds. + * + * NOTE: Write protecting a region (WP=1) is unrelated to page faults, + * therefore DONTWAKE flag is meaningless with WP=1. Removing write + * protection (WP=0) in response to a page fault wakes the faulting + * task unless DONTWAKE is set. + */ +#define UFFDIO_WRITEPROTECT_MODE_WP ((__u64)1<<0) +#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64)1<<1) + __u64 mode; +}; + +struct uffdio_continue { + struct uffdio_range range; +#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64)1<<0) + /* + * UFFDIO_CONTINUE_MODE_WP will map the page write protected on + * the fly. UFFDIO_CONTINUE_MODE_WP is available only if the + * write protected ioctl is implemented for the range + * according to the uffdio_register.ioctls. + */ +#define UFFDIO_CONTINUE_MODE_WP ((__u64)1<<1) + __u64 mode; + + /* + * Fields below here are written by the ioctl and must be at the end: + * the copy_from_user will not read past here. + */ + __s64 mapped; +}; + +struct uffdio_poison { + struct uffdio_range range; +#define UFFDIO_POISON_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + + /* + * Fields below here are written by the ioctl and must be at the end: + * the copy_from_user will not read past here. + */ + __s64 updated; +}; + +struct uffdio_move { + __u64 dst; + __u64 src; + __u64 len; + /* + * Especially if used to atomically remove memory from the + * address space the wake on the dst range is not needed. + */ +#define UFFDIO_MOVE_MODE_DONTWAKE ((__u64)1<<0) +#define UFFDIO_MOVE_MODE_ALLOW_SRC_HOLES ((__u64)1<<1) + __u64 mode; + /* + * "move" is written by the ioctl and must be at the end: the + * copy_from_user will not read the last 8 bytes. + */ + __s64 move; +}; + +/* + * Flags for the userfaultfd(2) system call itself. + */ + +/* + * Create a userfaultfd that can handle page faults only in user mode. + */ +#define UFFD_USER_MODE_ONLY 1 + +#endif /* _LINUX_USERFAULTFD_H */