From patchwork Tue Feb 4 22:48:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960102 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 73AE9C02194 for ; Tue, 4 Feb 2025 22:52:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 034EF280008; Tue, 4 Feb 2025 17:52:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFFD2280001; Tue, 4 Feb 2025 17:52:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE11280008; Tue, 4 Feb 2025 17:52:13 -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 AA368280001 for ; Tue, 4 Feb 2025 17:52:13 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 58B6CC0192 for ; Tue, 4 Feb 2025 22:52:13 +0000 (UTC) X-FDA: 83083762146.04.5FD4C78 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by imf27.hostedemail.com (Postfix) with ESMTP id 908FE40012 for ; Tue, 4 Feb 2025 22:52:10 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UeuzUvsV; spf=pass (imf27.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709530; 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=hM04RGLGRfKxmnKhL2PfjgKAB4VGas+Jp/4sC6BCDw0ag/sJ3zbkZnq7rlIrHkBHNd8a9q njfR6zshyav1Yl1WQbLiO0zfY+bdI/iOw7OcIiegJntV99iEbWEKoensu37F5BGc8DYf30 YlFGkP54vpTkCpzN5IHdLW/6tQVj/ic= ARC-Authentication-Results: i=2; imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UeuzUvsV; spf=pass (imf27.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709530; a=rsa-sha256; cv=pass; b=Aj4u4jFz1CF12i9YfpEITvSI4bSN8pUAyOLKEb0jswTEC0XQPDg2uGEZ8mkGYJaUTjdcwF 9U+GUxhG6kJBnqRhGpm91lvnOL4R0wQh5peNV3Jz/x2oYotLqmm/Buuh8tKnea/1i7gJkk 5OAEXlQcvDYyiV2BfqeOYK0VJCc521g= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JNncDq4leDpXispeV8XgA8glYHwBncOAQ/xyxnedFCWyvWk+bTH3GvOY4dBrknn2K/Uqfrwhs5cMxl17jwgGexWTEzdFFpDgKxUIkAWHVn6UQUXPy1ZIulNKxYTnfqJbQfkK3Fo5fAdEDH4niM6myU/HXP9h9HK/5QHKYmVC3YaD8FpeiOspzYjPVP2bXcczS+eXVxK7v2Dxcg9ljbJTFzmrtyeMLBw02xm5uEqdIYku9oOVKHn0PIYsQ9nTUd4+LSkz7EOWW0cfF1ZfMh0GNsH//euNfp2xnNAbuif0eiVxwJFgFvwQ6Mh0sdCu69a58O0L0HhG27VP1HC4EtlMzw== 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=kQ1V181zScj8Diab4JrK9wxBOsBmQXUQxUUU7/OS1YjmYoQpzqE7pESeg6TmfEJKFfI11Q/tw/DyprQhyob0jQWgcEykCk5sTSRMsZUFNkakeow1VecgAoLxWA7la512/PdQ2XGntzBYCGFOMm4+yDoQbhwpPP1YPaEEBysX/EGrMoA0UKaj2D9GInFUitragKpfRc17eNU6b19Pmc5jnyfi5XuAGoa5j+dPJ1XRjw6kF4VlPzw57SDPam7FofgxYBgBv02MCtCjeHkplyZCj6URqi2eLD6QCR63V9QA2ntF/6yT4dunl2yylC4K/4TrW14DTFLrA0F86558UndP6g== 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=UeuzUvsV/FZRT4GLPdp14+mEF4Qrk/q1x6LDL3tj2x3Kw+Uu9/c1RQa89lQQUIRGceAtVmvK13UCCGdut84IQEm5koh8Gu8rkiih84vtyyLLeyF9rkefnB1BZHd08h2RFgtYoDDeuXRZ8MYx8bJ+y0GIaTXkfGAr2EBPC47WSrwzv+9j1yc6q8Uah6KWagSHth0bYRB/ppI3It3vuGxVQE7qyWEpDSm22gKs95t2zxrxa43eMSkePEnRciWlYih78m+gSgQBruRDINBn+1Ib8gDCoo/YzzopdRMhGQR4Fcj9+YbliaiFXIGiWE9uFlQD3qVAfuPpygyxB9p98q66iQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:34 +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.8398.025; Tue, 4 Feb 2025 22:49:33 +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 v7 12/20] mm/memory: Enhance insert_page_into_pte_locked() to create writable mappings Date: Wed, 5 Feb 2025 09:48:09 +1100 Message-ID: <7db953c8cc5a066b4aa23dbdf049c6f35cce7b99.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY4P282CA0016.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::26) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 14b365e0-394c-4b98-4b7f-08dd456e310a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: vn+Vix7NJ9uCFxyIiatqGQYemjDceBEvnjmgNsupA9EtWu7p4c+Fi7sGLSsd/2V2yFoqCGvm87Qquw76qGkabU9sv+Hsbgixj7RrLdOZ++MgpEafz5FjgBWqWiNu/tbOZFVlO7VWp10Jut9PNwSM2YI/EBtjQV9tIWJoq5ilB8i/vNM+eySlJbTchSwhMTHdW5NcPZk8BaG01vDiWXhBoZTFJfBy9W6sRzJsVo4FcsvwGKl3fM9Gx8V4sQ54Tw1J+Sehuo2TgLwz+QS5bdXbJrXOsrWDOU4wCbruxaTdQsLyyDPR30mbgHDYlkk8GaWi//NcKVawCyrCChlAXBFId3krXx+EbfaYOTqKhX2dKaat7Aj1+jJSXowB9g8iqiuygAisw17NRjLvg3A+Km2sndSlGYcdzcZH+H9kfwWPmk7QpatRZb/PnINak07cx5Fa9FjVQzIGVp5QroJzMhiU8AQUc7eytT3E0NlC/PGEWUHoIrOGhk+EDRTBPgVn1MgRTEh4CahyOKOHCSoCHYzwRatAree70Wa5XiRVxjd/G1eHg2+H5v+U+TPk8p/+4I6Ke1E3NQHOzFW98+bM5xxWr4K3j2e34O97dYpbRG5Zn9b7tT+/M1Q4yijZ/raKCtdE9MGzzBZ5NVUKXncVyyc55JZxvsWfMGQyOjn9u4Q7lrnssPiAOD1lePkqd6Wtf16HhqoJS2UmcBcSirN2+AV6op8R8JgKH0utqzfjkMKdDQ9bg3VI+dMeu9xDv+SzPgEwfkQpF36OVg3xgGI9eYsH+DFpgXcsw0hzn4sLlRKV9gtkl+yzc5gyUioQV9ojdCb8kaeKpWRVONvYrodUi0/zzaVSelCSuNrBDgoBOqL5N9CdZqaAgBPPnLAMO8HwZGhWCGhYEgG1WttK4byBB224Qzidd94tQAFXvFAKz4mFKzmPeQd/ItUSor+9hB6isamcRRm8avo0gBuCxJtjDYcw8E1ES4zKa050b8wZW8AoVz6hO1t8kqpWMkgUPDwXBNfUYXgr6BEfoZ1y718O5K25bGPcS+FgOnnqENU/um5Ptd+NapJMSGvBrqPiQOSCfG5EfFtk+u1DOK94eKXTJ3G0066ZMJ6baah0uJILAxp+aZhhn5EHzpYCn9tDc2weeEXxRm/yo/gWM08JNLb27oS2Csyhh1UYFaCY7AAZDKsh41X3agse+vxgxEkBu/1Iga/NlM7Gsz4olK96PrQ739SaHBsAz+zk7Q+zOJgBlC+1pl83+/6CB1V/T3KgcIF8UaClgFAWIwB1uh801gSNmj3WlPZEogqFj42LwYmNuQtvp0/YSjI75zhQLGMRG+bpYdnhsYkvqwEwSGUonR3Rk5kL7853MzosvF/riCB/HflcC6vRPKkLxsZCYb+u6eMnrBfG 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)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WUX31JjS5FYA7SYPetpnxfn3Rck8OSDHWFo9Jp9c/xDBMjhATEHr8vBjQvE8QkRN2GcUjrDNkaaACLdLy7kSb3WdpcxprTyUWgyHood6H279Bm6mmM7aDgYHyHUi19KG7Ek8hPJjSI/9Ep0M4/odxRqHEhZW3lh2YZ13ndSG1PJDq/4np/2jKzZlcC+O9d5WdQOr73zIAGVgbPHJnZKJhtNgap9Cw++0I42/qIEwqTCR8mlPoAXXUpE8jUcY1j69+ni65oECz8YbkLykQeb0k7mTEbTnXycwN+fWw0y5mP52v6aJA2rwbB50+oib5F7SVs3IRSkfmsrUIbqZkJZc0+mKgehg4w9kTIpNKbXL3HVQ2Kek0GdfqROgKNLuErxQriI9N3QzCCBmBLfHtwr2Nn6uidutwqia0sNF8d0ZLiiE/1HElOvGOWFWS13U361MGgT8CjHwKyqXtnzDK816TB1KoRkG+c4JPX2ymgJtFQ7Lh/C75NOjEdJ0IuDmWxYB5O+6BYZ11ILfzPQUc+tFU3BgnsU2rSfIvLjdOYWEJiK/mjoJQ6JqUY8DxUy3t32HCqPvSstRLrUOVJETwRj/DCJzfgwSuMtlSljEXa3qZDsu6ABcnltVhVtB5PlK7MhyjghoQvMleKJkr36zd/UOnD+jlB7XFJZsJsxSwPbkHfgxMyp4Ju/34cAHqcVaUtgj8pssLqMiDTqX9iCmi+CT/3HhhMxyBtPYhvCrowID9FPYuT0p6BCCatZYgTT/U0oR0Z4d69+rua3RHIFN72zNC9NHntiUhcEWxHPuBbSnKDjR9hkjAoPqYL0qGWtKK5fpz7LSuI0Gvot4oDPaqU/A+epHyn+3gNq/o4iZNhU6ahl486ZDRw9YTatPidqkH1DnPRkzHKDJiP1FEatJZQA/OqoOHkcDhGIryM9DPizFDUZscf8nSjvYwRd4fmWnziv+YvkKGsEQJ7E8gxw3/pYJ4QVHSLZyWlTeuLd2xgzpJDr+lmtpl9oWomROmqXi//kjo6KWQJ9TLvjftDvDYS1PhhrK7BfRDBZ1Jo6RGBBoMhhT1VOgrwu1WfBeahpB9Q26o3DBRD/XTTWVavBI6pLjDH8mRDSrO8lnn/178C0BflFTqfib5ha/f+RFveawI2P7mRh010iKvmCABoI3sb++qZ/TfXWoy10QPPLcWHlwPfojxG3UKWMKIjS+rVS7v69yBXrTPJEWnulSEklIYTdgc7+9B620pYM80jOavPckfmrKpe92pqkv3XpYGUhMtMQwG9BPRBuX7C5z4nogdY1XBe6i1r7UtOhyNvmtPIh6ABpcjJOQqh8rvpP6HDGwkhjLgBwnx2y7euivx2Ix1xdMf97CgOyKmH+OqGgAatrsiB5Y9mGsXESAcid88NmzKOHt2LvqkEIlXD/xCoDCugLbdz2fAx0NnaDuh4XMX8i41QtW/ia513RWsoXvZS9SgOQdIoXfslQ+vVQp9rHdQNjqbjpZu5Akz1mP+90zPyGzhlDD0W+ZPaVRCgIa2hWD9/SMD87Q2XufuSvHyAloGEOsIkUUkqbBe5LkKrW/mLHXcewJxQbgK6VF3wkSVrgZqEP1 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14b365e0-394c-4b98-4b7f-08dd456e310a X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:32.9407 (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: Ju/cNraWEBsYWJLoHGjgSPwdono/C91e7ntfts8uQinGtRlHMQTIoMeopjIgaXX3DxuBTMmy67rC6fvddwB8hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Queue-Id: 908FE40012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5rsjzueuwaartsdydhhwnnqtytg81b5k X-HE-Tag: 1738709530-236020 X-HE-Meta: U2FsdGVkX19F+SHbHJi+a1pIZsqzTxxEiOcUD7TR2lAp0fMCtkB5wXn3NRqut9A12qZSt+xIlI3BMFMXFNlfRIMq9KLkQX5dPqQ4OhGIU9kO6criZjym6sh3of8q6JO4JqfN5tAZH/uxYn2zXkBMXyIpOHMth/s20gk2G1BJqLItzV/F6G9mnmLQu02JswP+eFXIueQeeUEAWJQoCUNzAXWyOK3woB8yMEYPHo1/BfBgqEkKfMzuEL6r3elDt4bk3WjrgZYTGIU728tFQMSBmrY6EgfjmMlWRmGyLdMnMqF+YjrrH20OZE97TBFqrapHbDWmc+c8KSVne3G3qvMyNR8WTTv1Xaa3pmeflxxFgrUleQRa+mp/b9IH837OWIveGDVNHBi95n7+MAUkjaXHj+Ytp5F6gHvkjbzR/ti3zOxW6KV1pdcN4U8LNFfgAtwrWT7nCT/TxAU+unWZ9YxsUv70sJz3YjrV1jmK43dDk8jdbgwwrEXRadqtUvZARQ5UxOlfFiuzZd/xgl1qb/Kn9qE5a+P727xgpEIYXhLCaqIwlvQjJP3m997sriAv9ERNU3NRX7owsqmu6XTRAiDP5YermJUnQERsOhzxwvYdstVHLm0hoPcxA8wMsFeNf2GokuZQj004JBOzfmON1yW6NH5htkg6mz4oJBykr18BvCH1DTn0qru2GXfx95qPIUzUxy/YyNWffvyxCuXS3tiqwrhZ8e0240HTxhh/lQSHqF0ESQznv6MxBmYaqMPZLnWqcpxFDn90XsHcL5MuRZnwLEQBtF/IaA3MikasZkfJ9ytgAexMhC2MfoBmJoK+QH5VRE9onv7o5ngM3PpOvON/j2T/I7Ku2ZZOOVg+hYUgh8Jt3YyRUpQJml4v5M2YJVPuA7uG9TZ/gCkLkiQRwq6Rqs4JsVjpKn9LX50VBq5L5PwiAZrxazQ07Chb/YBhRtjxnWJsBblaCzPPK3UIjfC 2RciBtlS jFphCDOZVVxhrMZwMeUUQ7I/iz12PoDk4jgqqQKOhSG9fi0ZMM7DYsJt80xmdJd3mhHMdhk1bpqROYXUJ0HPGxhJF8oi+xhrMM2bU1gdPbM/ixcPRhe6NBA0NoK9shmWevseZ1yXN2cHOoZvdFxibgHMFchu9xywNvzL4O+X1ryjRcf0eMUSDZ7cW/obtjjbJwo5lrJssgHjxApXXcegAZ2iFtEcDQujzwLr2uVK+qb8JcvttUPb0ZkTNlivg4jCdiV8frqB2ims1y9t5UjG6160Kp4L5T14Hu05+QlpGwf8a4ulinZ/3NzlJQBLRk4dBGHWQPcTe//aWuNJnrOzOLE0G58563UHad5iyQE6wTDVFjW1PJ4IN57mmvAp/cSHk+ABYU1OOgbxuzbuXlnt0dcKvBGMRy9ZJSZI4IM+eER3oRWWwL0+GCgZavP0PlYFDIXaAEA9KNV/I6NJHA+SAtY6q5gerOu4eB/ZvP/IKncMJKmI= 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 --- 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 | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 17add52..41befd9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2125,19 +2125,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); } @@ -2146,7 +2166,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; @@ -2159,7 +2179,7 @@ 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; @@ -2173,7 +2193,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 @@ -2309,7 +2329,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); @@ -2589,7 +2609,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); }