From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCF1B1F4CBB for ; Sun, 21 Sep 2025 21:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758489927; cv=none; b=rs8mhjNKZG7eZW+6QWC5Y3ivEKEynh3uUKxo7OSCicWJr2eYNKT3mPqbF8cpyhdrzGJ5uxes19iRS6dr2i88gmSfvmWogGRn1f477V/EaNYqm5GaTSzqdiOdID60DWWtloPyozpyt619+53XGWml3L4nQMOskGBbMxv82LY6DZE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758489927; c=relaxed/simple; bh=LUa7/nl82XVRIMMDazz+Zgm/SQ5Cq4JmkJiX632WPhY=; h=Date:To:From:Subject:Message-Id; b=OPBgZXPEYy+vPOPhByIrA6x769mla+aoiX4JqhEBe4n64+mg0th6VUrwu9t6G1vv/njJ4m6bN3qHYwya8M76i0wMus3etzC7PGtQcGrWFzsqMw3RmTaVvvf17lU++NLR8xikU9z8YrDF2FGk7gMcIpkLsf8UlBtlPkMTRxijfvU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=1B6d8LNc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="1B6d8LNc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2F6BC4CEE7; Sun, 21 Sep 2025 21:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1758489927; bh=LUa7/nl82XVRIMMDazz+Zgm/SQ5Cq4JmkJiX632WPhY=; h=Date:To:From:Subject:From; b=1B6d8LNc8CjQMdAeZFFNlFefa/SZQNtWUiGA46KAh2LWUmGh9WVAAnUDCkkKu1p3S T2B31583cOsBKkpoL/9ACk+Q3hg19PxqTsoFfgIapaoI6x0U305LXhXUOspaGwUxNh Q94Wt5yiTpoSu9BRXm5T43PuTMF3BTID4YIrDNgs= Date: Sun, 21 Sep 2025 14:25:27 -0700 To: mm-commits@vger.kernel.org,peterx@redhat.com,osalvador@suse.de,jhubbard@nvidia.com,jgg@nvidia.com,david@redhat.com,dan.j.williams@intel.com,apopple@nvidia.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-memremap-remove-unused-get_dev_pagemap-parameter.patch removed from -mm tree Message-Id: <20250921212527.B2F6BC4CEE7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/memremap: remove unused get_dev_pagemap() parameter has been removed from the -mm tree. Its filename was mm-memremap-remove-unused-get_dev_pagemap-parameter.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Alistair Popple Subject: mm/memremap: remove unused get_dev_pagemap() parameter Date: Thu, 4 Sep 2025 08:59:26 +1000 GUP no longer uses get_dev_pagemap(). As it was the only user of the get_dev_pagemap() pgmap caching feature it can be removed. Link: https://lkml.kernel.org/r/20250903225926.34702-2-apopple@nvidia.com Signed-off-by: Alistair Popple Acked-by: David Hildenbrand Reviewed-by: Jason Gunthorpe Reviewed-by: Dan Williams Cc: John Hubbard Cc: Oscar Salvador Cc: Peter Xu Signed-off-by: Andrew Morton --- include/linux/memremap.h | 6 ++---- mm/memory-failure.c | 2 +- mm/memory_hotplug.c | 2 +- mm/memremap.c | 22 ++++------------------ 4 files changed, 8 insertions(+), 24 deletions(-) --- a/include/linux/memremap.h~mm-memremap-remove-unused-get_dev_pagemap-parameter +++ a/include/linux/memremap.h @@ -211,8 +211,7 @@ void *memremap_pages(struct dev_pagemap void memunmap_pages(struct dev_pagemap *pgmap); void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap); void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap); -struct dev_pagemap *get_dev_pagemap(unsigned long pfn, - struct dev_pagemap *pgmap); +struct dev_pagemap *get_dev_pagemap(unsigned long pfn); bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn); unsigned long memremap_compat_align(void); @@ -234,8 +233,7 @@ static inline void devm_memunmap_pages(s { } -static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn, - struct dev_pagemap *pgmap) +static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn) { return NULL; } --- a/mm/memory-failure.c~mm-memremap-remove-unused-get_dev_pagemap-parameter +++ a/mm/memory-failure.c @@ -2194,7 +2194,7 @@ int memory_failure(unsigned long pfn, in goto unlock_mutex; if (pfn_valid(pfn)) { - pgmap = get_dev_pagemap(pfn, NULL); + pgmap = get_dev_pagemap(pfn); put_ref_page(pfn, flags); if (pgmap) { res = memory_failure_dev_pagemap(pfn, flags, --- a/mm/memory_hotplug.c~mm-memremap-remove-unused-get_dev_pagemap-parameter +++ a/mm/memory_hotplug.c @@ -375,7 +375,7 @@ struct page *pfn_to_online_page(unsigned * the section may be 'offline' but 'valid'. Only * get_dev_pagemap() can determine sub-section online status. */ - pgmap = get_dev_pagemap(pfn, NULL); + pgmap = get_dev_pagemap(pfn); put_dev_pagemap(pgmap); /* The presence of a pgmap indicates ZONE_DEVICE offline pfn */ --- a/mm/memremap.c~mm-memremap-remove-unused-get_dev_pagemap-parameter +++ a/mm/memremap.c @@ -153,14 +153,14 @@ static int pagemap_range(struct dev_page "altmap not supported for multiple ranges\n")) return -EINVAL; - conflict_pgmap = get_dev_pagemap(PHYS_PFN(range->start), NULL); + conflict_pgmap = get_dev_pagemap(PHYS_PFN(range->start)); if (conflict_pgmap) { WARN(1, "Conflicting mapping in same section\n"); put_dev_pagemap(conflict_pgmap); return -ENOMEM; } - conflict_pgmap = get_dev_pagemap(PHYS_PFN(range->end), NULL); + conflict_pgmap = get_dev_pagemap(PHYS_PFN(range->end)); if (conflict_pgmap) { WARN(1, "Conflicting mapping in same section\n"); put_dev_pagemap(conflict_pgmap); @@ -397,26 +397,12 @@ EXPORT_SYMBOL_GPL(devm_memunmap_pages); /** * get_dev_pagemap() - take a new live reference on the dev_pagemap for @pfn * @pfn: page frame number to lookup page_map - * @pgmap: optional known pgmap that already has a reference - * - * If @pgmap is non-NULL and covers @pfn it will be returned as-is. If @pgmap - * is non-NULL but does not cover @pfn the reference to it will be released. */ -struct dev_pagemap *get_dev_pagemap(unsigned long pfn, - struct dev_pagemap *pgmap) +struct dev_pagemap *get_dev_pagemap(unsigned long pfn) { + struct dev_pagemap *pgmap; resource_size_t phys = PFN_PHYS(pfn); - /* - * In the cached case we're already holding a live reference. - */ - if (pgmap) { - if (phys >= pgmap->range.start && phys <= pgmap->range.end) - return pgmap; - put_dev_pagemap(pgmap); - } - - /* fall back to slow path lookup */ rcu_read_lock(); pgmap = xa_load(&pgmap_array, PHYS_PFN(phys)); if (pgmap && !percpu_ref_tryget_live_rcu(&pgmap->ref)) _ Patches currently in -mm which might be from apopple@nvidia.com are