From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5614C433FE for ; Thu, 14 Oct 2021 15:39:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 784AE60FDC for ; Thu, 14 Oct 2021 15:39:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 784AE60FDC Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 21633900005; Thu, 14 Oct 2021 11:39:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C826900002; Thu, 14 Oct 2021 11:39:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0D72900005; Thu, 14 Oct 2021 11:39:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0007.hostedemail.com [216.40.44.7]) by kanga.kvack.org (Postfix) with ESMTP id E0242900002 for ; Thu, 14 Oct 2021 11:39:46 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8AFF125F4B for ; Thu, 14 Oct 2021 15:39:46 +0000 (UTC) X-FDA: 78695453172.01.33511FC Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2066.outbound.protection.outlook.com [40.107.94.66]) by imf23.hostedemail.com (Postfix) with ESMTP id 2709C90000A7 for ; Thu, 14 Oct 2021 15:39:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VjgT8a9beIfCrDWqDtQlPELag29YV5HKOcJDsnglLHvSelEFJI6iVXGwKt7QyGq2i4M+dzSdDW0kt51xNufqdvMIMprOR8kBemqfDPYXpHKMZDMzTsy2ujFy0aTTIkGNF0kwedvHDbs66J1frT9aW6MB/SDNEH3Fvw7ZYZw/p0Ta9IWz0cXfK3oCV7C+F/y3R/WRsPu1Tj3YRdO4V33e94+bdvLcIrnt+p3Q/toBgZFKhfJtOJkrC2CkivRK9yJHTAKozorqoh05MQ4jXLAgu6F+P2DVfHmqLxN6k3PX6pptb0AOXOpYEh5mtWzNPHlj00iksYKjGh50QH+atM3Fdw== 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=YOpucbc/fJ96/axSQRUqL6YobnSoy0nbWQSNVNqOGY4=; b=OVtS0iyp52ag7kQQ7255gl0xIAFqvbpKFWt9TDOCcBtXPyK67gZ410lB/Et5W3Zkpcyf3KLhkfk9ZxoVN8aiE626abcQrAIMfJlIlBuLeNDjb1M7gxW2oUwngh0+jTVDn1qzgSjt9orGXROSjUwbn3ijCHB8MrcEBGM9PyGfuMIzQov9bO3meu2WTuarx1K8MRhvcXYR8KKXIKazlBMwIwMPyx2mn6l6Y6ADKeUKud3Yq4BlnRM0XbwHBCDV4QwlgvaoVmqrfT7AoAIDkn7IKvVjKBOGp7Ur2v3kJeDArNCe338H8Tf847uK8xk4Ze+HyFLJnJxsFXkv1jnaBAD+nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YOpucbc/fJ96/axSQRUqL6YobnSoy0nbWQSNVNqOGY4=; b=BfmzJaxksXfNf52cjHd1FGdVGMM6t8OSPKNEoJSpeATgE2GyoLYV8JDepmZgytL7nT1/tRr0493Msd4bxsi/F7qqjukn82qKu1WRSPSo7L475W7eIFISfEWzhPDFMOcsHOeqwOYljF4XlxkFSIo3QA7JJIChriuQpYnCKrdeEcA= Received: from CO2PR04CA0106.namprd04.prod.outlook.com (2603:10b6:104:6::32) by BL0PR12MB2561.namprd12.prod.outlook.com (2603:10b6:207:3e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Thu, 14 Oct 2021 15:39:42 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:104:6:cafe::5e) by CO2PR04CA0106.outlook.office365.com (2603:10b6:104:6::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Thu, 14 Oct 2021 15:39:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Thu, 14 Oct 2021 15:39:42 +0000 Received: from alex-MS-7B09.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Thu, 14 Oct 2021 10:39:39 -0500 From: Alex Sierra To: , , , , , CC: , , , , , , Subject: [PATCH v1 2/2] mm: remove extra ZONE_DEVICE struct page refcount Date: Thu, 14 Oct 2021 10:39:28 -0500 Message-ID: <20211014153928.16805-3-alex.sierra@amd.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211014153928.16805-1-alex.sierra@amd.com> References: <20211014153928.16805-1-alex.sierra@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5088b4c-a39b-4ca4-c449-08d98f28d75d X-MS-TrafficTypeDiagnostic: BL0PR12MB2561: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MvxSOYTMgSOaONyOeTAezx8KtNDaCyvyFaTKes5z4IPPeLTsHWBiUu78G9oYtJega6PudEPeSAFkn5TH/Fa+YzD9b/BmvLESSoJQ/LPsdPWu1wEodNmQvZFEEhaXO5/6v6DDgReU+PwTteTbA8xaQDG8TFLar4xmdunNRqiCXIV2WBxZuUZxUHoA/DYWJj3++H1kvLaw2BUWAiVYcLZ8/ZYT+WSu3tnXFkOXhkX9JX1In1qxUq6D/2b5MwD3izNUhORJQ7VRK5MFu7apeACayqkUC+1o35DVrbKWqA7YPmugI6VWIqwTRjY3h5mVqqRrKbgbn4R7M+BMg50w99jH80nWXYiQI4QN+N+pNlWqVeOASxk7ti+15Sz8X6w5ppl4vF03t5mPZZorah7cY8ucUkr5SIbgSslVDAFOAUTJtqVTKb2E4b61XVRAnxzb5M6X+kkPYjLzyVGyefXRcLaAFroOb5hOl+w9214HdHvPHOYiOllc5DhMNhpKA+YFy9YsCXh4o9Pb5oGJ+U/7eYG87FIzmecxZ2/e7W7lBqOCaWAbTxhH2NyL3OxMBhs/BNNFGRXSgiqNcEWSEDhA2sEM/jvY/bB/1h5v6mPA29zy3WSgmDGk6GgzJgesqvF9QG5aAM8uCfaC5jh1R6njGc4vTeXmbb3UBIonE3uOO6QDl2u8vAh6EyiYS9RAzVoIFUcrlBH1hrdHiuUS7JfLO1qkzttKyzZXEi9rIDV12tzKgcu3zvLA2gGTy/1zRe5VcQ7mQ3XNIEF4BJKc36sPtg51dSFd5uEoqQEi6Ur+7OluVW1kVgADuWoljx6p2M6NQOTjktsmCMy8gju+ouzvMPMRxCSSZzxfMUTUYB48ujceO9s= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(4326008)(8676002)(8936002)(110136005)(70206006)(54906003)(70586007)(356005)(7416002)(5660300002)(426003)(316002)(1076003)(36860700001)(82310400003)(86362001)(81166007)(36756003)(44832011)(47076005)(30864003)(2906002)(6666004)(966005)(2616005)(16526019)(83380400001)(186003)(7696005)(26005)(508600001)(336012)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2021 15:39:42.2737 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5088b4c-a39b-4ca4-c449-08d98f28d75d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2561 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2709C90000A7 X-Stat-Signature: 5jtg84n3k8hyq9fkijtr5czmeo49i6ng Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=BfmzJaxk; spf=pass (imf23.hostedemail.com: domain of Alex.Sierra@amd.com designates 40.107.94.66 as permitted sender) smtp.mailfrom=Alex.Sierra@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com X-HE-Tag: 1634225983-201590 Content-Transfer-Encoding: quoted-printable 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: From: Ralph Campbell ZONE_DEVICE struct pages have an extra reference count that complicates t= he code for put_page() and several places in the kernel that need to check t= he reference count to see that a page is not being used (gup, compaction, migration, etc.). Clean up the code so the reference count doesn't need t= o be treated specially for ZONE_DEVICE. Signed-off-by: Ralph Campbell Signed-off-by: Alex Sierra Reviewed-by: Christoph Hellwig --- v2: AS: merged this patch in linux 5.11 version v5: AS: add condition at try_grab_page to check for the zone device type, whi= le page ref counter is checked less/equal to zero. In case of device zone, p= ages ref counter are initialized to zero. v7: AS: fix condition at try_grab_page added at v5, is invalid. It supposed to fix xfstests/generic/413 test, however, there's a known issue on this test where DAX mapped area DIO to non-DAX expect to fail. https://patchwork.kernel.org/project/fstests/patch/1489463960-3579-1-git-= send-email-xzhou@redhat.com This condition was removed after rebase over patch series https://lore.kernel.org/r/20210813044133.1536842-4-jhubbard@nvidia.com --- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- fs/dax.c | 4 +- include/linux/dax.h | 2 +- include/linux/memremap.h | 7 +-- include/linux/mm.h | 11 ---- lib/test_hmm.c | 2 +- mm/internal.h | 8 +++ mm/memcontrol.c | 6 +-- mm/memremap.c | 69 +++++++------------------- mm/migrate.c | 5 -- mm/page_alloc.c | 3 ++ mm/swap.c | 45 ++--------------- 13 files changed, 46 insertions(+), 120 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s= _hv_uvmem.c index 84e5a2dc8be5..acee67710620 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -711,7 +711,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned lo= ng gpa, struct kvm *kvm) =20 dpage =3D pfn_to_page(uvmem_pfn); dpage->zone_device_data =3D pvt; - get_page(dpage); + init_page_count(dpage); lock_page(dpage); return dpage; out_clear: diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nou= veau/nouveau_dmem.c index 92987daa5e17..8bc7120e1216 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -324,7 +324,7 @@ nouveau_dmem_page_alloc_locked(struct nouveau_drm *dr= m) return NULL; } =20 - get_page(page); + init_page_count(page); lock_page(page); return page; } diff --git a/fs/dax.c b/fs/dax.c index c387d09e3e5a..1166630b7190 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -571,14 +571,14 @@ static void *grab_mapping_entry(struct xa_state *xa= s, =20 /** * dax_layout_busy_page_range - find first pinned page in @mapping - * @mapping: address space to scan for a page with ref count > 1 + * @mapping: address space to scan for a page with ref count > 0 * @start: Starting offset. Page containing 'start' is included. * @end: End offset. Page containing 'end' is included. If 'end' is LLON= G_MAX, * pages from 'start' till the end of file are included. * * DAX requires ZONE_DEVICE mapped pages. These pages are never * 'onlined' to the page allocator so they are considered idle when - * page->count =3D=3D 1. A filesystem uses this interface to determine i= f + * page->count =3D=3D 0. A filesystem uses this interface to determine i= f * any page in the mapping is busy, i.e. for DMA, or other * get_user_pages() usages. * diff --git a/include/linux/dax.h b/include/linux/dax.h index 8b5da1d60dbc..05fc982ce153 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -245,7 +245,7 @@ static inline bool dax_mapping(struct address_space *= mapping) =20 static inline bool dax_page_unused(struct page *page) { - return page_ref_count(page) =3D=3D 1; + return page_ref_count(page) =3D=3D 0; } =20 #define dax_wait_page(_inode, _page, _wait_cb) \ diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 45a79da89c5f..77ff5fd0685f 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -66,9 +66,10 @@ enum memory_type { =20 struct dev_pagemap_ops { /* - * Called once the page refcount reaches 1. (ZONE_DEVICE pages never - * reach 0 refcount unless there is a refcount bug. This allows the - * device driver to implement its own memory management.) + * Called once the page refcount reaches 0. The reference count + * should be reset to one with init_page_count(page) before reusing + * the page. This allows the device driver to implement its own + * memory management. */ void (*page_free)(struct page *page); =20 diff --git a/include/linux/mm.h b/include/linux/mm.h index d8f98d652164..e24c904deeec 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1220,17 +1220,6 @@ static inline void put_page(struct page *page) { page =3D compound_head(page); =20 - /* - * For devmap managed pages we need to catch refcount transition from - * 2 to 1, when refcount reach one it means the page is free and we - * need to inform the device driver through callback. See - * include/linux/memremap.h and HMM for details. - */ - if (page_is_devmap_managed(page)) { - put_devmap_managed_page(page); - return; - } - if (put_page_testzero(page)) __put_page(page); } diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 80a78877bd93..6998f10350ea 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -561,7 +561,7 @@ static struct page *dmirror_devmem_alloc_page(struct = dmirror_device *mdevice) } =20 dpage->zone_device_data =3D rpage; - get_page(dpage); + init_page_count(dpage); lock_page(dpage); return dpage; =20 diff --git a/mm/internal.h b/mm/internal.h index e8fdb531f887..5438cceca4b9 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -667,4 +667,12 @@ int vmap_pages_range_noflush(unsigned long addr, uns= igned long end, =20 void vunmap_range_noflush(unsigned long start, unsigned long end); =20 +#ifdef CONFIG_DEV_PAGEMAP_OPS +void free_zone_device_page(struct page *page); +#else +static inline void free_zone_device_page(struct page *page) +{ +} +#endif + #endif /* __MM_INTERNAL_H */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 64ada9e650a5..9a6bfb4fd36c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5350,11 +5350,7 @@ static struct page *mc_handle_swap_pte(struct vm_a= rea_struct *vma, */ if (is_device_private_entry(ent)) { page =3D device_private_entry_to_page(ent); - /* - * MEMORY_DEVICE_PRIVATE means ZONE_DEVICE page and which have - * a refcount of 1 when free (unlike normal page) - */ - if (!page_ref_add_unless(page, 1, 1)) + if (!get_page_unless_zero(page)) return NULL; return page; } diff --git a/mm/memremap.c b/mm/memremap.c index 15a074ffb8d7..ab949a571e78 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -12,6 +12,7 @@ #include #include #include +#include "internal.h" =20 static DEFINE_XARRAY(pgmap_array); =20 @@ -37,32 +38,6 @@ unsigned long memremap_compat_align(void) EXPORT_SYMBOL_GPL(memremap_compat_align); #endif =20 -#ifdef CONFIG_DEV_PAGEMAP_OPS -DEFINE_STATIC_KEY_FALSE(devmap_managed_key); -EXPORT_SYMBOL(devmap_managed_key); - -static void devmap_managed_enable_put(struct dev_pagemap *pgmap) -{ - if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE || - pgmap->type =3D=3D MEMORY_DEVICE_FS_DAX) - static_branch_dec(&devmap_managed_key); -} - -static void devmap_managed_enable_get(struct dev_pagemap *pgmap) -{ - if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE || - pgmap->type =3D=3D MEMORY_DEVICE_FS_DAX) - static_branch_inc(&devmap_managed_key); -} -#else -static void devmap_managed_enable_get(struct dev_pagemap *pgmap) -{ -} -static void devmap_managed_enable_put(struct dev_pagemap *pgmap) -{ -} -#endif /* CONFIG_DEV_PAGEMAP_OPS */ - static void pgmap_array_delete(struct range *range) { xa_store_range(&pgmap_array, PHYS_PFN(range->start), PHYS_PFN(range->en= d), @@ -102,16 +77,6 @@ static unsigned long pfn_end(struct dev_pagemap *pgma= p, int range_id) return (range->start + range_len(range)) >> PAGE_SHIFT; } =20 -static unsigned long pfn_next(unsigned long pfn) -{ - if (pfn % 1024 =3D=3D 0) - cond_resched(); - return pfn + 1; -} - -#define for_each_device_pfn(pfn, map, i) \ - for (pfn =3D pfn_first(map, i); pfn < pfn_end(map, i); pfn =3D pfn_next= (pfn)) - static void dev_pagemap_kill(struct dev_pagemap *pgmap) { if (pgmap->ops && pgmap->ops->kill) @@ -167,20 +132,18 @@ static void pageunmap_range(struct dev_pagemap *pgm= ap, int range_id) =20 void memunmap_pages(struct dev_pagemap *pgmap) { - unsigned long pfn; int i; =20 dev_pagemap_kill(pgmap); for (i =3D 0; i < pgmap->nr_range; i++) - for_each_device_pfn(pfn, pgmap, i) - put_page(pfn_to_page(pfn)); + percpu_ref_put_many(pgmap->ref, pfn_end(pgmap, i) - + pfn_first(pgmap, i)); dev_pagemap_cleanup(pgmap); =20 for (i =3D 0; i < pgmap->nr_range; i++) pageunmap_range(pgmap, i); =20 WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); - devmap_managed_enable_put(pgmap); } EXPORT_SYMBOL_GPL(memunmap_pages); =20 @@ -382,8 +345,6 @@ void *memremap_pages(struct dev_pagemap *pgmap, int n= id) } } =20 - devmap_managed_enable_get(pgmap); - /* * Clear the pgmap nr_range as it will be incremented for each * successfully processed range. This communicates how many @@ -498,16 +459,9 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pf= n, EXPORT_SYMBOL_GPL(get_dev_pagemap); =20 #ifdef CONFIG_DEV_PAGEMAP_OPS -void free_devmap_managed_page(struct page *page) +static void free_device_page(struct page *page) { - /* notify page idle for dax */ - if (!is_device_private_page(page)) { - wake_up_var(&page->_refcount); - return; - } - __ClearPageWaiters(page); - mem_cgroup_uncharge(page); =20 /* @@ -534,4 +488,19 @@ void free_devmap_managed_page(struct page *page) page->mapping =3D NULL; page->pgmap->ops->page_free(page); } + +void free_zone_device_page(struct page *page) +{ + switch (page->pgmap->type) { + case MEMORY_DEVICE_PRIVATE: + free_device_page(page); + return; + case MEMORY_DEVICE_FS_DAX: + /* notify page idle */ + wake_up_var(&page->_refcount); + return; + default: + return; + } +} #endif /* CONFIG_DEV_PAGEMAP_OPS */ diff --git a/mm/migrate.c b/mm/migrate.c index 41ff2c9896c4..e3a10e2a1bb3 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -350,11 +350,6 @@ static int expected_page_refs(struct address_space *= mapping, struct page *page) { int expected_count =3D 1; =20 - /* - * Device private pages have an extra refcount as they are - * ZONE_DEVICE pages. - */ - expected_count +=3D is_device_private_page(page); if (mapping) expected_count +=3D thp_nr_pages(page) + page_has_private(page); =20 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ef2265f86b91..1ef1f733af5b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6414,6 +6414,9 @@ void __ref memmap_init_zone_device(struct zone *zon= e, =20 __init_single_page(page, pfn, zone_idx, nid); =20 + /* ZONE_DEVICE pages start with a zero reference count. */ + set_page_count(page, 0); + /* * Mark page reserved as it will need to wait for onlining * phase for it to be fully associated with a zone. diff --git a/mm/swap.c b/mm/swap.c index dfb48cf9c2c9..9e821f1951c5 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -114,12 +114,11 @@ static void __put_compound_page(struct page *page) void __put_page(struct page *page) { if (is_zone_device_page(page)) { - put_dev_pagemap(page->pgmap); - /* * The page belongs to the device that created pgmap. Do * not return it to page allocator. */ + free_zone_device_page(page); return; } =20 @@ -917,29 +916,18 @@ void release_pages(struct page **pages, int nr) if (is_huge_zero_page(page)) continue; =20 + if (!put_page_testzero(page)) + continue; + if (is_zone_device_page(page)) { if (lruvec) { unlock_page_lruvec_irqrestore(lruvec, flags); lruvec =3D NULL; } - /* - * ZONE_DEVICE pages that return 'false' from - * page_is_devmap_managed() do not require special - * processing, and instead, expect a call to - * put_page_testzero(). - */ - if (page_is_devmap_managed(page)) { - put_devmap_managed_page(page); - continue; - } - if (put_page_testzero(page)) - put_dev_pagemap(page->pgmap); + free_zone_device_page(page); continue; } =20 - if (!put_page_testzero(page)) - continue; - if (PageCompound(page)) { if (lruvec) { unlock_page_lruvec_irqrestore(lruvec, flags); @@ -1143,26 +1131,3 @@ void __init swap_setup(void) * _really_ don't want to cluster much more */ } - -#ifdef CONFIG_DEV_PAGEMAP_OPS -void put_devmap_managed_page(struct page *page) -{ - int count; - - if (WARN_ON_ONCE(!page_is_devmap_managed(page))) - return; - - count =3D page_ref_dec_return(page); - - /* - * devmap page refcounts are 1-based, rather than 0-based: if - * refcount is 1, then the page is free and the refcount is - * stable because nobody holds a reference on the page. - */ - if (count =3D=3D 1) - free_devmap_managed_page(page); - else if (!count) - __put_page(page); -} -EXPORT_SYMBOL(put_devmap_managed_page); -#endif --=20 2.32.0