From patchwork Tue Feb 18 03:55:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13978904 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 0269CC021A9 for ; Tue, 18 Feb 2025 03:56:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 873D72800C9; Mon, 17 Feb 2025 22:56:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 822EE2800BF; Mon, 17 Feb 2025 22:56:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64F822800C9; Mon, 17 Feb 2025 22:56:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 460862800BF for ; Mon, 17 Feb 2025 22:56:58 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0382C1618BB for ; Tue, 18 Feb 2025 03:56:57 +0000 (UTC) X-FDA: 83131704516.07.612E39A Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2047.outbound.protection.outlook.com [40.107.220.47]) by imf15.hostedemail.com (Postfix) with ESMTP id 48C78A0004 for ; Tue, 18 Feb 2025 03:56:55 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=bUSwpuUJ; spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.220.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739851015; 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=yNPEvAsPe8G2yTsS4zF2Ou6m25axDDKUOssAOYWV7/4=; b=VlRfWH/+8raXnVjfRfUY+6JsgvsC6rtKcJlF0hmAhICGF5JKPO79Av2PCWbZinObk2sIZt 8GFX63Uo6W8QSMMEnNSGM95EnwdScAtmTcwx0xNkqjnZAC8zNO6fexvXrk+H8wFVHakTah cX421+rSzGydAmFnCW76hfQBWx8rlEE= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=bUSwpuUJ; spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.220.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1739851015; a=rsa-sha256; cv=pass; b=vHuLAU7AjfEYcrgXrBGXHWbyInsdbs+BQTxEaNzyNUcQEOiyRGdax8Dythy1ycn+nIyf8s V4svf0rxmzCsUMvcJ4lQOyOzDqjDvbcYpuoqdNu5I11XSzliMJoQP9x4xepxuHoc7yiM0d ymBEwIo3mJwhhlk7pCH/32QToY4vJTQ= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NYfCw61xd+qJiKENOn3UCbhbdahW6JYJgUfKgd7HSQvmz5p84bSr1nOEqcOhh4vLXF21lsoE9x7oImsV9zdJkH+NXX6sCqJdrVcCeEy/dqno/HTZaDgvbpUzvY12CzMaELFcJ/w5/hsZG5alCIAZUOwgQuTx+XRQ5KcyS0WtzCCGv53LwTypgwjacUXdR0qp3xODG3r/dcDVzlZJdKOSxc5KBptRJLkQ37C3jlRzpOihyk82Dmgnv02nxSYmXlYGguEnIss0t8zNkqPl0LLx7SNFy96Zbg04Xzvf6DacvIGvZxOvT0Dss3QJfT6NNsFN4uBxF0LPV6IBBUFI+cEztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=yNPEvAsPe8G2yTsS4zF2Ou6m25axDDKUOssAOYWV7/4=; b=wdoG7cBgBhOIepuwoB1/vgUa0X5MEKx7MUfyt+q1McduxHAVppRccBUBTXLHyWArCyUXSGksR8tw0xAJ3L9vWMADq6Wm/CCxajw6kQKqIzM1Wjk7VhVoJpFShx6xI845zRomr0wlcoFoQZHjSsbmLOGLpJteWllbvk0S6IwOkE1CnZjyyQvJXrilthe0jQ8yttklV44PQ8Z8WAkc8X3osbMdFQH1RYYfNlZgsF9ChTdbgfwsopa5YxIeuvWlkzRKLb/Lr8hrtOQXv7RYycgklZ3AmvZVDhyXvIdenig9SsqK3y3kKFrgwj8jyMhBd9Xlq13+khmvebMbk+M369uhYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none 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=yNPEvAsPe8G2yTsS4zF2Ou6m25axDDKUOssAOYWV7/4=; b=bUSwpuUJ9FXLYygKXmN3oThkkKzlOmBOmMdpk0Mel/pyys+xzcZVamMl3Ncu5axUcfn2IyWdSLHld5zb4z+6HiBQIShVGg476aXk3iE/Kq6hjIjtTV9epfdznsr3/Gn0Th4xBh1cSS5jO3THNG2cgYM2RrBnYKeto+0C1adWcjtj3W/qoFS5Pz6ag3lqdwuaJ7lEJuBUtBxP35hhgv1TzaI1syFBN3uRZJ8hvbEkwYbetee8z1PehRNW1vp0KK9VaVQLG7Yg02EjH1UKqp+tPbpFPv2N0TYyunT+Ywu071QSXoEb3rLkZGS8aTixZRi7w5sgwX3Y6AvLfeoOdwgOOQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB7593.namprd12.prod.outlook.com (2603:10b6:610:141::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 03:56:52 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8445.017; Tue, 18 Feb 2025 03:56:52 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v8 12/20] mm/memory: Enhance insert_page_into_pte_locked() to create writable mappings Date: Tue, 18 Feb 2025 14:55:28 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0069.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:203::13) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: f3bc44ad-ed74-4b5f-5dff-08dd4fd04733 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: rJ3ImbYysslXd9HxMj76e/txIa3I7pSrc6zoHhJlmfKu8d8PolAAq5ss8l0zTK/GXRmKvdiqmbRwvCwIjtraZcYm2Y4lCHRpr3M3P+h9SWTGHweqwhILAxEeEWqfMIzglJUzeedvLilgxgrwiRoicOYR509p7eg4GraIDaH7kkp9h4k5+a/8X7SHcyUadMc5ihG9F7Y+rRctHKepvSA6/sJWYT7QH4UssTYM16neJiGahzrRnLOUBdz/TU3lal3Cqw52m7pLIWCi5bFtb+7yHcX10HLN3pRH9TYVmkTnVcjw32WIeS3hX7rIWpFlOyzyF37JpIxSeEUCFa0rhvoxsHncXU8x6kpm+2eqWUkxcObJIhaLuoZmfUszYu8dc/odDDoDXK3VAgLQpWakoj6Ruuv+AK4HHFA9ZfCJBlLRNwbFEAUjR33tlhMxf7cuFpfpbXdsgBrSa+Ad9+lICXcIzWOxv9B3xO2G64iU7YfCC5sz753U+fRz5NFtxLJo65KF6r8hNUF394SQj73YZgucL/eu7Ka1szZt7cEv4kdrfxxxEL4OnqyPDOk+sGzeMPIQ0fdZzBme5zufeD+CE6JLOOypOZW4TjYRxQkV4NQ78KG3IU78TDrwT87suw5TvZ/WGcENgBLnQc4qbliaLBcwMh0Y8Goerazt30rsZA5wMO4YlbXba0p3OvQjiMnFL+YV6V2meqJ/CekaJxycoYkXxKHNX2R/ktjyme4EBgEppwjTLFA3WxdubCQwqq/w3a7RYqD8jP+kBoI7rBTZmkk6uR/jhdtWG0QXnLdWZ76ilYrNo0rG47kMFgYhS7mzLbrcOJq9SUOZqy9UKiY34YgKJdj405pttjzJZk6wcpPKdVbazE5hU64Wn9uv8y5sjxpzKghM6p+3ZASX/Qce4mnFlCiCnKPtP1gac32ao/vhbkcvn1GCJXik2vDfW8fp+4BRknHnYl4jWNQpZ4Fmi2KEAndsQyV7k1k8zTj8t7c+horeiVOEwTk49+vNgj1qQwj8Ahk/PRI2EAv591l2wujIdIQwgUV8x4gS0EhAHDQDn8VjUJI/oSbacAORyf6vXxVSRBaETHx3ubU+mm8Uassi49uyBAlyY8UB7xOgsIqw54SEBttW85bwwLNIFkTAgupCe2whTCOD4R526U/VcJ3bZS0m/Xl7wfOGrXcxPg09vtq5L3PwkY0mOn1tMGn78wlCaLIuCHDhEli15glm+qT5Wbx4Qr2t1ITxvXLNVtj7OvpGs39rmyPYhZ5Wo3M20wO8LLn9igQiLPZu++0mqFYwhu5qhr5zUOEXKFboevKHjTC0ddgD3xIQ85mNgqJSkl63VAi8GKaX/5OckmZzrOhclTk2xnVXodr7JbifGfKEfBvuI5R2cJIqqexR6U6S6njJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lnSzF5AfJ0Lhe1w2EWsCybFKAZZTXxqdTQkvzJioFlXKo87AFLK4B39e2NPawBfkK1hA4o4rcj/pjlmvkVfuKiZ6TAsDzhXza2pMBWK5gpMngufdTJ7Dj2xBVOBDabIIYTo+trObKgqNpUUD4/DgK/SJJqpxGUAQu6Ur7t+jtWhCi11hzLGFrxKUCB0G9ns6vKbxl4slxtGTpcgHcaEXFvWiw3wqV5oKj1FylLkw06Eoljo0Cj1CwltRKrQFJ54gu3m5vgZLb9u8njBNv7Ja70hWw0JK7NVrSxuOz0mzQHFnE8mrKSfb5MnkwIaz3UrpOF+ABi3cejHmljYHkHWwsS02yILgfOo5PK/Pm5jj79Mykna1Q7UrBuc+3YjGTlM3mh2OcAE/X+1TK2jbHg5rkuInn4CN7nk7w4rEooCt9Lpy8Na5V96qkooTlFz96Qp9ZFxpxyLGtEn4JMSQ8D0DwtUxUEJIdd6j+x9hmWdpRZ4+s/DBk6ncaH78az2PNGd5SH1GXm6KeXSPC6ZFmgT+L/dVdpVGfjoeqN1ToP5yZwnQW8OFAoCJRjRZCd26TcVYaLVuaxll/IUcik7wV7qtad3flWjTcxj3UewvSYB8BlKmLNrggK34X/2OnUBwgUTRTEntB8uOcx9ZHZcV8RjzclLPCFG466P50qXIJUhDE/RE9aKe3Rwz43ifLXXocsltNkIf4lQWz+D2p5NWrCmftZ6mRtE5v5VG23WYpj6epZoHmGxWXvAG2p0f3IsS/C/nYdirdWoPXwk1b8UVBNujUwsPABUei5t/eoLS4i2yK/rF+EEqpmV2Y3w99caw8Rmpm6gBWdaoSE7Yc4NJ6qHIODKMVH6QmP9QxTUcE+P2rs4PjvWnr6DteopfOBUpcY9G6bg4K/c6oFChALz1cMVsuTHN+MxYEgewD2Gc0pTcNExBcyRnR454EnLaT3kIi+/Sc4afMHc1Pq4mkq0vjpYlNSFBTmtkjaMhYXJPk4EaPQixGzPZDa9E1n3UzbSbdBZBhah3RtZxC6EeGehHDwy5j62aPuTsawvbkJ0Wl18ZNiUfxDc8vLLMVD8u7uTv5jZ5N1yk7xotkzadBbofUCpteJLPd0ZFeWh9+d7KcbZBdfObqY6ZajBca9mMSxEEsL/uljCf/0yF7t8XoWiOowzMRrjGc5fDFx/5cK88T4TW4cve0JAPS1Swx42TnxSmm+5rQ7YXzjFsEvSvOOCf+2Up7Cv51IZy/7hNXrzFGCyKk3iGcyIEK+GsDXzXO1XIjvYAOqFHqmrshvPuJd4j9jhriXtk6Q6+PCsDbMtJig/acoV2eakjee/rwsT3YV1LIpPzfGxo/SK2Wv60GfmF6u6VIdHIxubBKna9TZKjUnzaZruH5m43p6svyKNNJ6qztEpyBbfpHdFoMbzdkyWz4pd0UoYa8ZuRFgI88nDIhP6vo+tsfCK3yQOQ2E0Py4mzaNOyY83N3pII69YWxgpu8piKl+6PGpzCCRxx4lVM6mD1l67Seepvhj+Tz1Hrt52tMCIp3DiQptLukzvpfW4n7+OUZRD4DoB38vqxXXAYLHWX3pjJTmAJBmFliogcbiBmKv28 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3bc44ad-ed74-4b5f-5dff-08dd4fd04733 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 03:56:52.6265 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ql/tmcaoeAwlY1ViqPDqSRvtTGCHk0jIizKZ60Tb7KtSdTv+yko7qiRFaq2bPAww4wKbIkKz80l9e/dU0ofkSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7593 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 48C78A0004 X-Stat-Signature: qgsg5fcgq94m7ztwk3y6ktbkhpurpwgk X-HE-Tag: 1739851015-349445 X-HE-Meta: U2FsdGVkX18g89pcNDIIYSjYlE/rxEAWvlKJ3uKlXnRIgWunubUuyRG1TXFavhtcQyVIjayHJKACxZJkEY69ugYJf6RiMLFSyRExvEL3XpY+CM9TVe3E9dMrFb+pyCSNP7OWUpAzb7eJejPhVwEak4v7ypAGEAYEe938mde+QWx/OMksfMlpbuC3DgMvlkTl8ABJbPxKZYLMsFAPvOg+cOTlIcegFFjh0Q/Rt0PrO4yfratMMX5h1u+6UcSXiNjYxl4gTXSC1F1mNCwg03Ojw/2/p8PC3QvXQMIiouiqidj2O55Gb+5CnDoaKpR8ErzGJjhZv8W06IBUk3QXr0KFzVI3/VQd3eFMujR/eTXU/+VNmkf68AQgzpzjkenpKZQm4EvRAX8ukEDfi4+k+MTdRxD9zPakce/zc9eiJ0PAcEwy9wjIYEDX4z8o3/gvwtU62uy7BkPtrWVdGWNpZSvvxzBw2HASWWlqPort+RNKnt9ftwknv9OQATmBFt4cqFSZ1gCFvPzaX3EQ065J68gsEqam+DdpoR8RCz4LjseQE0HhUev3ME8mC/eGnMI20VCeLHurmFj8t2xV71RHs7yFCagVc1BDTJy4POQKFu64yGy31MKydgtqGrpBTxyXRCmaijSeiIpyP4uw8+zuSYDUpmrJpXZ7jpuIGeY3Q9qcpnT8oXrytPusG/WQsI1xEbwZfNNFa2RYLnSYWRG0EVKd59VlGLaOEa+DtwglqkT4nTm3ycfUIhYTgJUrLmRowvUWjVgMBAzb5cW3JhD8p3lGyMnbqbeNJnB1ThFIVRyObAXfTUBXMLS6SBvI7aDQW821CG4mCyHG27N1s8wKQpWLB+jjeQA8apueullz4w1E5LWLhUb5yPaDIU6eLa66VLDMbqYUT46yxSCgGKp6VRWqknPgYqGW7+ySO9rL3s7b2CyWGJiwIJv6Mt/nvbn5+yvn/Wh0ILm3D8k1IS6C2r8 y9rIOwM1 nXyGWpXB7PxfBIUmq7EvkSGIiQJ/Nu1fNSsqXj8+7xiYR+BV7vifJog6V4jhUhvgrAWgbW5K0vNoZaeBsxnFHQQgF25mPIRCbk8VZKcdJkHMu4jFe5uadlY0dnkwSi84BvdTKLBa14kCchbSBI17ZOZztBvJXjjEVmvWA7QBgUyQ0WTMRbdW9BPGnUMdkXyh/iBjj1fuoVT6RR0Z28KTYMWliQcXZf6AgTVBelCbVE79M4N0oDdq7vMYIWNjByZ6WTsTOCMxO01jjjv0ZPWd+b+ukFiAPqjHJqeNEJ2l6+paaXCWVn7ltd39yIYr62XmEskGTitJBFc1Z4Im1Olml0fVcJMIDDBhBSCRbeA/osLDwOex0FFyxbTxEUTM+p8jWpRqaxrwuH1fozTC1w/8WQsj5gnAfqZah2u3axt3yZb/Aoa2nPz1D8feo2cXkjLemf1SqzcONQpYAbArZ5Zwfnc4UnU/UqIitxNm7/pZ1kNvtfEFURVktCCZQT6VkvRiZW7/z 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: In preparation for using insert_page() for DAX, enhance insert_page_into_pte_locked() to handle establishing writable mappings. Recall that DAX returns VM_FAULT_NOPAGE after installing a PTE which bypasses the typical set_pte_range() in finish_fault. Signed-off-by: Alistair Popple Suggested-by: Dan Williams Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- Changes for v7: - Drop entry and reuse pteval as suggested by David. Changes for v5: - Minor comment/formatting fixes suggested by David Hildenbrand Changes since v2: - New patch split out from "mm/memory: Add dax_insert_pfn" --- mm/memory.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 905ed2f..becfaf4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2126,19 +2126,39 @@ static int validate_page_before_insert(struct vm_area_struct *vma, } static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, - unsigned long addr, struct page *page, pgprot_t prot) + unsigned long addr, struct page *page, + pgprot_t prot, bool mkwrite) { struct folio *folio = page_folio(page); - pte_t pteval; + pte_t pteval = ptep_get(pte); + + if (!pte_none(pteval)) { + if (!mkwrite) + return -EBUSY; + + /* see insert_pfn(). */ + if (pte_pfn(pteval) != page_to_pfn(page)) { + WARN_ON_ONCE(!is_zero_pfn(pte_pfn(pteval))); + return -EFAULT; + } + pteval = maybe_mkwrite(pteval, vma); + pteval = pte_mkyoung(pteval); + if (ptep_set_access_flags(vma, addr, pte, pteval, 1)) + update_mmu_cache(vma, addr, pte); + return 0; + } - if (!pte_none(ptep_get(pte))) - return -EBUSY; /* Ok, finally just insert the thing.. */ pteval = mk_pte(page, prot); if (unlikely(is_zero_folio(folio))) { pteval = pte_mkspecial(pteval); } else { folio_get(folio); + pteval = mk_pte(page, prot); + if (mkwrite) { + pteval = pte_mkyoung(pteval); + pteval = maybe_mkwrite(pte_mkdirty(pteval), vma); + } inc_mm_counter(vma->vm_mm, mm_counter_file(folio)); folio_add_file_rmap_pte(folio, page, vma); } @@ -2147,7 +2167,7 @@ static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, } static int insert_page(struct vm_area_struct *vma, unsigned long addr, - struct page *page, pgprot_t prot) + struct page *page, pgprot_t prot, bool mkwrite) { int retval; pte_t *pte; @@ -2160,7 +2180,8 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, pte = get_locked_pte(vma->vm_mm, addr, &ptl); if (!pte) goto out; - retval = insert_page_into_pte_locked(vma, pte, addr, page, prot); + retval = insert_page_into_pte_locked(vma, pte, addr, page, prot, + mkwrite); pte_unmap_unlock(pte, ptl); out: return retval; @@ -2174,7 +2195,7 @@ static int insert_page_in_batch_locked(struct vm_area_struct *vma, pte_t *pte, err = validate_page_before_insert(vma, page); if (err) return err; - return insert_page_into_pte_locked(vma, pte, addr, page, prot); + return insert_page_into_pte_locked(vma, pte, addr, page, prot, false); } /* insert_pages() amortizes the cost of spinlock operations @@ -2310,7 +2331,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, BUG_ON(vma->vm_flags & VM_PFNMAP); vm_flags_set(vma, VM_MIXEDMAP); } - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, false); } EXPORT_SYMBOL(vm_insert_page); @@ -2590,7 +2611,7 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma, * result in pfn_t_has_page() == false. */ page = pfn_to_page(pfn_t_to_pfn(pfn)); - err = insert_page(vma, addr, page, pgprot); + err = insert_page(vma, addr, page, pgprot, mkwrite); } else { return insert_pfn(vma, addr, pfn, pgprot, mkwrite); }