From patchwork Tue Feb 4 22:48:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960098 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 1D724C02193 for ; Tue, 4 Feb 2025 22:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABCBA280006; Tue, 4 Feb 2025 17:50:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A6C77280001; Tue, 4 Feb 2025 17:50:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86F81280006; Tue, 4 Feb 2025 17:50:45 -0500 (EST) 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 66600280001 for ; Tue, 4 Feb 2025 17:50:45 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2056D16046A for ; Tue, 4 Feb 2025 22:50:45 +0000 (UTC) X-FDA: 83083758450.08.0E9057E Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2046.outbound.protection.outlook.com [40.107.244.46]) by imf06.hostedemail.com (Postfix) with ESMTP id 36D20180002 for ; Tue, 4 Feb 2025 22:50:41 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=SxUjUeXC; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.46 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=1738709442; 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=o8l3MbO8ej5FdqBQqdSi9qO/pDD7aeg4y4qWYi/wTf0FnVtCokCtciad6a7uey2R35ZgrG Kg+JvfIz8cw1lnGuMgUiv7fjFvxf+DaDaLkIRcfnK9EjcCY7vgfjBXGU7MstFsR9EUd6R8 rnLxPWE2uZnWWL0HvZR0mGAFLOWsuxE= ARC-Authentication-Results: i=2; imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=SxUjUeXC; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.46 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=1738709442; a=rsa-sha256; cv=pass; b=AcYVXr9FaFUiGFdd5o153EENrq03orAK3W3BrR64Kqubm76m52y2bxXynI+wXX6s5NurJd AO8hirV1kjGsTt60WbCvvISjS9VX2QVd5VQFYQgrZ9qfx2FZ6bjfYgknjaC9g27bBGmS2z PCwezNdowCeFdEaJhNtFn6sIYoCp93U= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KA6pstqnBz8KPcq4bHrfj4OQqpMq5SyvP+KuEWvM00c0uqxrXPbepG9YEvCCjS125ndEUIG5GPZXvJ++Yu0NlrirtNekgDhogcM+VnAsYPbLqFNagIq0OXmin0um0b4rvUSHlKY8mW1dDc1guTd3qHU1kb932WTztbU4mErCjiZIoAg6Q42UN9AJeRtw3ia24vpH3mJwqgNH+zBcXgii9mrcmJBCMjYB/8RvIk8kS7oyszdzQPI7/KEm9axaailgVYq263Xn+jegUkdYUzrAHHxduvpwu3fc2ZB3EKrbMLDf6yhqOS7H9fjUQQk6fSFarqSH0c0fEjU3ZX8qxbJkbQ== 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=ocjtj7FG6EwOArYQ6rRPkBr5eB1MxmxLc/PqyYLil+2pHkdWoMcgs3cs9gVQZ/1RJ1EGQB+Vuc5LfrrKK1isxIFbGLJFOtlUmucWnvrMiIy58bkTniPsQHcpcTDFcI1g1HsQexPDebj1zNQIBZniUTuQMzXFjp2Q4Er4iSirw+4u39nrRyQnFsE2CR4gdN9SkHr1osuVw5Zn/nVHV5xno/6QYamcYlsmOZ9fCy2o+U+gMPMPQJaLCDSuWV144uBYcjHQPkdIfI8sRKh8T/dX58Smb34rvhsECxsE6GEeRk70degPgBG3MOEMTHI26VJpf7zOq8C8PAY3Wpts/YVO8Q== 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=SxUjUeXCJpbbEKTS/gK720xO9723y3ye6czfLwXIdQ9IShtUdvPsFpj3HoufKk71GwtVixWjK6IAU0WleDWFQBnq9ucc7VpzY+LZsE2KudmgbdmLKc8jAMtFUzJJaHjeI4+0fX1zWfr0vS6nApFjLBHzeU7SUy7tUSYkhuJnPkgEgNSeRoGQG8LH6KjXTf/xIwai3qTwvr+aJh+8PMlnxWD+PmR6uU4nHX+tYOnGOmnsW4auuKstd0nfHcUidge8EhdP3gO75cTM6VhtJRM2t9X++wvxJn8XuH8CsD3XAZM7llxfP9opWTvDJ4uekglQrvRM18qRaYkt6KojGBd//Q== 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:24 +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:24 +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 10/20] mm/mm_init: Move p2pdma page refcount initialisation to p2pdma Date: Wed, 5 Feb 2025 09:48:07 +1100 Message-ID: <10388bef4c6e71dea2536ae44ba304c7416456b7.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0074.ausprd01.prod.outlook.com (2603:10c6:10:1f4::18) 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: 692cdeab-83ed-4757-5376-08dd456e2b62 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: WsXk8tYqzJY3wKJaTLGTLb0NMVWIhoZUOZLbQdE0aHTEZxOMjBHdau9uKx4ZFb5ov0p01CNx1qe1xM8F0AAajtYqs4efVJZWP5ZBmIBEvXfXeaYP1cvd5HNz2PSp8aRAqD5l5JCgMp3Nm0Z/fGO6P+od0EJom5fyIwbdFeZcrvc1IN77RUAjKCqEo8kUnX1+y4T2GVcevLnKdClenEwY3cgm0hGQsbhrNkJortq1nzXN60AyFFiNg63vREzxi4MhLjjRWDsmEKeTZq6zCNyHWezNxvBPsiK/5hzINNqZUfBvOUTTfnnbBDMgSyUmWMRskwAvfKOilY7A0NffdkgZo2HDm4ngEOpKRLQcpOvo5n3I8/YCsJ+q0QQ+OOEKZ+4GI1VhAvP+n9KuZu18iWbawxv8gsm7M5y1cBSn4vl0CU2HeoY/JvnNWBe2A5Qitj3KXGokSBeL+x6ygsSX4bOhgwJfIGUTEtXrTs+UVj2Dow888k6jQQfJ7je3sAhOk9Qe790n9iV8XIwRd+XGHaXmxByh+L4IPa3AbMz2OHYpfFwspPQ0K/4NCzo7F8ZyNqXn21eQtzj1+r+TlZ7C3V6oFvWcRgrrAwM0l/irzEikKWgvEA6nB6YBRb8VNFzPy4qXPxv46rdk3+bwezQ9S72H6MGfWarur+gmKXY61nHyxA1+4lOh+Ne33lkqUpSszSf9NucrxR46uios2iH/f7LXOEL5QJgKyNWeJ8414ATUl4Ysk6A8BBteX71ILWe5WNLVKvnqMSdkXP78znoLng2Ioj6lFSQ70QqWP8lt4qCIlpWVbH/YUro0Xe9I32jAIFhjlxdjMak4cHTqbtlBLanbYVMdMJ54n/9RwGk+dtnCS4e0uEAYZ9z2fTSnNpaxaJo2NtLY2g55eJ9bS37VkixFZ2lp283u8JkKw0MOMen+b9xNHG5Ft4oBCyj7rah+clS5y0AnFlrpR/If9gT25rzf4hzFVllNAsXBUW/ryAuOXIMlTP43XkUNwc2HpUPrNF8KsQCzl4WaKI3EswL8Rh3KbSjy3CeCEERQuIy+5JNfa3XSUeXKPPNK6wAboNBF/nz+TfO5IXMAEKsmxMnzU46vD6q1K6JhnYXa/1hqhb5nQBxoEsvibFtS0LIy0dpL5vRBMm+IdhCjgywp5WVrBRi+5Be41Ja5PFhGupdwGi2nfmUf61s4J0s5WmRd5//0IVAwOx5BcsoXEJ0YoTfOdD3otWjR8YE/rkYBK2Y9/Yhk5qpGyWc/keb3JfZZVbc1YdYLYG7r5ynE3wMYnz3ltzzfry0DEotv//JqV4d1WtH36PUeN8TcY0S0QtEmWNw+imBuXgwidovqAU5dDfLpywE63qQW8Zt9qdFY1AjZwsf44E/lUc86Z8RVJBs/J6FO0F8o 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: sX7jaKz+x7NjB2WVoAldLA85q/jdMWUIugXvBvgR4B+adnMlkA1silPBjq6aslypQc8XQ3My9NLlqhmH20h+RVMGMFVCnILpWQXxdqMuy3DC5JXXT4Aaef5i3hvyF/XJks1lEA0kL5nAaGhmwEZEj7x2/Fe4sdDv7w4+GYsiZt9vZweJzIdl4nZlpIusG/n50xrfdHYbF0e0gUYnRq3vZwHKRIAA6h0QFhyMo7BjW7sWlgumqRdvdR1Ki2x9nry7QrVhzYgdapY/pcudegva0dj50NK2OYo4+4zlD4CCQ3F+3MVp6h611rANYGsoQg3yNggNcjVgSofBZrfUKEZKeS7tHpVQ4ppA6lRsii8kU8KuUd1gPDwL12TwuMuP5JR+gAu4kaodxK3itk8OEl6+sdpU12OzV9LnygQKk62EVtMzNGlxDO8EU1cGhQvRokv50eC3qe69T0ZPPK4Q22WC1lqatOcAfJH5CgDum+5zyAL5X77F0gpCk97nGsR+Blf8XnK8AN0SNiTVvSQvZkJ3aKpSBVUPKe6thrC9p4YAGpDqQc2e5W/zNqaCe9ygIQpDcffKilGlMkzGgdBXfLNPlz7VTK/HVm2TaIkjyh1/c8jCAJizZLlEys+3VeszHPAiRhufOcu7y1ShIY2bUWPKrYirGf2GEbafrKFcWkzE0YVMmZkacQowgTCC/2H8IVXA05RRcSQgGTLCHXFx1xhqMR/T/+TPM1GqOFCMu525AjsewolcHJA2sUnZUz8ndayERW4U4xV3Hq/rKUW0eIWFGzF3KjNRu5IwU7fda38oi9cXTP4pGa3QONVb2J2kPe6oNbUiRQJHu52N3NXEPbb0eB3j3a9HVyu8ErfyfwiTnVFgjXUqPSIQlfkkBTX+SGovNw+kVzTzpZBSfNPSap9uMw1cdyuFlq80CDlroyUSvV72yVpZXt4BOeWj2/ix4Wwc17s58apZ+Fpaib/9Q0yMAN4ha3E9LS4eCYJ7hs+dH5Hj1QXRYyWxSzd0fvHqs9K2PFYR3CB/5W7HYyoxrwQyroBaOfNPkBviIwi5hQ0pbl0o+x36i567UyP9iNSRx5lNW4HsLzfesbeHG5aAN9UEKRCEN8rYOt/xpSXjXC7aCsSKBKTeaV8t5aUzUFky8kGtaCN+VtHvDQoZnfsP23Sk3oSSBHm8HvO6l/Sl29Sp0M4FKzIyIAI8BiSFjxgSFg1iFsZUyNyshCRW/F7YUGYe98Pa9+XtTU4ZIC1Jh/QJVlRto27xQFLJOL4qNI7VSIqBT/qQfTjX9i6//EMqPoZ5Wnm8ZfpoBAkBxSI3iaRtE7tWO2+IDRzHC6NG510YmBNkPmxwglcOGj6qItK/W3pgc6V1DbJ9vyWHLqOl1d+yu+8AxdDpxy0NHYrnJKuB2z4822NHa9Z3OJvpVLIspgPNloNw9LygsPWOethKbqgy7oAdGTxmCbZ91d6h3ms4uPTVY6zIiJPM2FE3s4i7Iqyp9NhRHOiVEHg/5ccekjjMnEexyQBqRTgjfGkbRPd3ycacoMqc0tD/MXdSi4ckvxrvgtn4XXlTb9l7O8F4bJfjHf+bkS371wV1RYwXvf8EjrKx X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 692cdeab-83ed-4757-5376-08dd456e2b62 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:23.6236 (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: +FgAy6aTzl/DqxmywZ05fYJjMvjZa9WZ6Ib6y63mKfSeR1jiTitp689qyJdsByg0oEwnVJgD3lCg6TIj4wNuJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 36D20180002 X-Stat-Signature: n6f9gtz1utbkzpp3t6xjs48ww7exe9a5 X-HE-Tag: 1738709441-350466 X-HE-Meta: U2FsdGVkX1+/DEsvmoIi7q4N+jSzNYmF6WwDEcPbaDt8vCbSMQQ+S0Qa3ilhY8NZ6EXNB7JyqA1QrR2hPD+2kvXpp3wWryRYsxry3Vt9s01i+OpKnCuwiLyxvVoduR6+axOQ5BX23p9TVdx8JEDwt8Z63LaN8bIi9cQHUwYi9AlcvPqrFWoF0x5LY/1uyTLT+iQl+qxptBGDO5GzT2h/MMZC/ARIRQogDyn6M9wmQIkFghju7NOIfQ2TAA1FJVyXrnsXfCbsKG6j1O9futAx7qvJfLUvw7eX09GyLp/JA+xTlLJPOcfuCVDpNRhaz/czHzYUkN30z0xOGt4xlfnGK7gx0GsNztdIRBHkkPkTGc5umMZPxgg3kURnrihGpsJRIL4YH3h95c69CBj/aDk3jwor5eL2u9rh/xjb3VWOEAynJy4zx2FHp1C1nzMsP6mq1stsnp8ZjHVBLTf5YuZLAANxfirHuQOVCaAEFiIcUqbFQO9LIEY4hgpuILM2SLQJtzlrRL27h9F8OeBgNnM5TXgdKxVg4JpSwbx9d26uSYCq7Sz01TyWA21dC1imjqO4AhpCAFWTVu8KyIoeTPmxce0P3KjIubxnXEQpaARrY05fRfbW5c4XjwtsXZ5i1tKORxSuEUroClUsibOnJtyOTA1xOGAFKhmj9zbtFR8a/xX01m4FG7YkMI+ZZvKcBQuK1UFDQZwwRKcjztbDsKsW5XANRQOAfDmQBOBtlXYfxPcN8jLlIypXMCDcBjQPuma5XcJyjfywrjNBrOMyCzbJINDNyxHEfPCVfYnjE+of0q1lhb/kYbpX1OJ5FelpT/C8GwNv162hbSVFuhvgi/PvnzspgkJ/IrR+mHURTV/s3Mgntj5dIGiuy78L2EQU24xOlJJh66YYYIz/gd5Vbc5wBSO15td83X7l2Gulz/epAnz2JGEQgws4g5lfxFmwzoV5+iPu9/BZ0jA/DVXY5z3 tkv3htOT l8588JPTQVP0ot2Hd1shunVAJL6dmIKgtif5MbMPBCFvVTTyXx8S/vkdHgBLYS0HuHe3OgUcn6O+BxFQrmVpycmmUWri75YK7UsuuPnaW9RWQUnmToUHMxGk0rPVfW/WtdNn6n5jLAKzdnju4uiaeaTUgPIh56gBkbDp3cv/bWBtZ660kJH+OkKOLPL8Nv9x2pSgSnWqfzl0WPdvb8U+F02hFZd44NDtQUUa9fvfYqsurUdTqPxhLvfPsRJDxYxAtNFd5jaNkd2DZ4Z69EOt9YTs9Y/fGQTl1H+/9ssyJDYCoEC9O3ny6F3Dq+lFCG0koPFsXkeFBBEfVgZABhH2M2XKj37pIjOe5yEIfHHBtkCXMbE58a6vB2aoDUVW+5HcOUPZdbopa8fa4cfCimECFQTW1BVmtVzYjFxQxPxOOOlwKEB3qFbVVqUKddx7mMjjW8zwuBdM4PgQUNdr7ylENnZRHkZWyyJj5+N1vo+HwuzCgjTxlEEbiPvewERb1blqZr3rS 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: Currently ZONE_DEVICE page reference counts are initialised by core memory management code in __init_zone_device_page() as part of the memremap() call which driver modules make to obtain ZONE_DEVICE pages. This initialises page refcounts to 1 before returning them to the driver. This was presumably done because it drivers had a reference of sorts on the page. It also ensured the page could always be mapped with vm_insert_page() for example and would never get freed (ie. have a zero refcount), freeing drivers of manipulating page reference counts. However it complicates figuring out whether or not a page is free from the mm perspective because it is no longer possible to just look at the refcount. Instead the page type must be known and if GUP is used a secondary pgmap reference is also sometimes needed. To simplify this it is desirable to remove the page reference count for the driver, so core mm can just use the refcount without having to account for page type or do other types of tracking. This is possible because drivers can always assume the page is valid as core kernel will never offline or remove the struct page. This means it is now up to drivers to initialise the page refcount as required. P2PDMA uses vm_insert_page() to map the page, and that requires a non-zero reference count when initialising the page so set that when the page is first mapped. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- Changes since v2: - Initialise the page refcount for all pages covered by the kaddr --- drivers/pci/p2pdma.c | 13 +++++++++++-- mm/memremap.c | 17 +++++++++++++---- mm/mm_init.c | 22 ++++++++++++++++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 0cb7e0a..04773a8 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -140,13 +140,22 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, rcu_read_unlock(); for (vaddr = vma->vm_start; vaddr < vma->vm_end; vaddr += PAGE_SIZE) { - ret = vm_insert_page(vma, vaddr, virt_to_page(kaddr)); + struct page *page = virt_to_page(kaddr); + + /* + * Initialise the refcount for the freshly allocated page. As + * we have just allocated the page no one else should be + * using it. + */ + VM_WARN_ON_ONCE_PAGE(!page_ref_count(page), page); + set_page_count(page, 1); + ret = vm_insert_page(vma, vaddr, page); if (ret) { gen_pool_free(p2pdma->pool, (uintptr_t)kaddr, len); return ret; } percpu_ref_get(ref); - put_page(virt_to_page(kaddr)); + put_page(page); kaddr += PAGE_SIZE; len -= PAGE_SIZE; } diff --git a/mm/memremap.c b/mm/memremap.c index 40d4547..07bbe0e 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -488,15 +488,24 @@ void free_zone_device_folio(struct folio *folio) folio->mapping = NULL; folio->page.pgmap->ops->page_free(folio_page(folio, 0)); - if (folio->page.pgmap->type != MEMORY_DEVICE_PRIVATE && - folio->page.pgmap->type != MEMORY_DEVICE_COHERENT) + switch (folio->page.pgmap->type) { + case MEMORY_DEVICE_PRIVATE: + case MEMORY_DEVICE_COHERENT: + put_dev_pagemap(folio->page.pgmap); + break; + + case MEMORY_DEVICE_FS_DAX: + case MEMORY_DEVICE_GENERIC: /* * Reset the refcount to 1 to prepare for handing out the page * again. */ folio_set_count(folio, 1); - else - put_dev_pagemap(folio->page.pgmap); + break; + + case MEMORY_DEVICE_PCI_P2PDMA: + break; + } } void zone_device_page_init(struct page *page) diff --git a/mm/mm_init.c b/mm/mm_init.c index 2630cc3..359734b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1017,12 +1017,26 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, } /* - * ZONE_DEVICE pages are released directly to the driver page allocator - * which will set the page count to 1 when allocating the page. + * ZONE_DEVICE pages other than MEMORY_TYPE_GENERIC and + * MEMORY_TYPE_FS_DAX pages are released directly to the driver page + * allocator which will set the page count to 1 when allocating the + * page. + * + * MEMORY_TYPE_GENERIC and MEMORY_TYPE_FS_DAX pages automatically have + * their refcount reset to one whenever they are freed (ie. after + * their refcount drops to 0). */ - if (pgmap->type == MEMORY_DEVICE_PRIVATE || - pgmap->type == MEMORY_DEVICE_COHERENT) + switch (pgmap->type) { + case MEMORY_DEVICE_PRIVATE: + case MEMORY_DEVICE_COHERENT: + case MEMORY_DEVICE_PCI_P2PDMA: set_page_count(page, 0); + break; + + case MEMORY_DEVICE_FS_DAX: + case MEMORY_DEVICE_GENERIC: + break; + } } /*