2018-03-29 20:07:13 -06:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
/* Copyright(c) 2015 Intel Corporation. All rights reserved. */
|
2016-01-15 17:56:19 -07:00
|
|
|
#include <linux/radix-tree.h>
|
2015-08-10 21:07:07 -06:00
|
|
|
#include <linux/device.h>
|
2015-08-10 21:07:06 -06:00
|
|
|
#include <linux/types.h>
|
2016-01-15 17:56:14 -07:00
|
|
|
#include <linux/pfn_t.h>
|
2015-08-10 21:07:06 -06:00
|
|
|
#include <linux/io.h>
|
2018-08-17 16:47:04 -06:00
|
|
|
#include <linux/kasan.h>
|
2015-08-10 21:07:06 -06:00
|
|
|
#include <linux/mm.h>
|
2015-08-17 08:00:35 -06:00
|
|
|
#include <linux/memory_hotplug.h>
|
2017-09-08 17:11:43 -06:00
|
|
|
#include <linux/swap.h>
|
|
|
|
#include <linux/swapops.h>
|
2018-05-16 12:46:08 -06:00
|
|
|
#include <linux/wait_bit.h>
|
2015-08-10 21:07:06 -06:00
|
|
|
|
2016-01-15 17:56:19 -07:00
|
|
|
static DEFINE_MUTEX(pgmap_lock);
|
|
|
|
static RADIX_TREE(pgmap_radix, GFP_KERNEL);
|
|
|
|
#define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1)
|
|
|
|
#define SECTION_SIZE (1UL << PA_SECTION_SHIFT)
|
|
|
|
|
2017-09-06 17:24:13 -06:00
|
|
|
static unsigned long order_at(struct resource *res, unsigned long pgoff)
|
2016-01-15 17:56:19 -07:00
|
|
|
{
|
2017-09-06 17:24:13 -06:00
|
|
|
unsigned long phys_pgoff = PHYS_PFN(res->start) + pgoff;
|
|
|
|
unsigned long nr_pages, mask;
|
2016-01-29 22:48:34 -07:00
|
|
|
|
2017-09-06 17:24:13 -06:00
|
|
|
nr_pages = PHYS_PFN(resource_size(res));
|
|
|
|
if (nr_pages == pgoff)
|
|
|
|
return ULONG_MAX;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* What is the largest aligned power-of-2 range available from
|
|
|
|
* this resource pgoff to the end of the resource range,
|
|
|
|
* considering the alignment of the current pgoff?
|
|
|
|
*/
|
|
|
|
mask = phys_pgoff | rounddown_pow_of_two(nr_pages - pgoff);
|
|
|
|
if (!mask)
|
|
|
|
return ULONG_MAX;
|
|
|
|
|
|
|
|
return find_first_bit(&mask, BITS_PER_LONG);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define foreach_order_pgoff(res, order, pgoff) \
|
|
|
|
for (pgoff = 0, order = order_at((res), pgoff); order < ULONG_MAX; \
|
|
|
|
pgoff += 1UL << order, order = order_at((res), pgoff))
|
|
|
|
|
2017-09-08 17:11:43 -06:00
|
|
|
#if IS_ENABLED(CONFIG_DEVICE_PRIVATE)
|
2018-08-23 18:01:36 -06:00
|
|
|
vm_fault_t device_private_entry_fault(struct vm_area_struct *vma,
|
2017-09-08 17:11:43 -06:00
|
|
|
unsigned long addr,
|
|
|
|
swp_entry_t entry,
|
|
|
|
unsigned int flags,
|
|
|
|
pmd_t *pmdp)
|
|
|
|
{
|
|
|
|
struct page *page = device_private_entry_to_page(entry);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The page_fault() callback must migrate page back to system memory
|
|
|
|
* so that CPU can access it. This might fail for various reasons
|
|
|
|
* (device issue, device was unsafely unplugged, ...). When such
|
|
|
|
* error conditions happen, the callback must return VM_FAULT_SIGBUS.
|
|
|
|
*
|
|
|
|
* Note that because memory cgroup charges are accounted to the device
|
|
|
|
* memory, this should never fail because of memory restrictions (but
|
|
|
|
* allocation of regular system page might still fail because we are
|
|
|
|
* out of memory).
|
|
|
|
*
|
|
|
|
* There is a more in-depth description of what that callback can and
|
|
|
|
* cannot do, in include/linux/memremap.h
|
|
|
|
*/
|
|
|
|
return page->pgmap->page_fault(vma, addr, page, flags, pmdp);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(device_private_entry_fault);
|
|
|
|
#endif /* CONFIG_DEVICE_PRIVATE */
|
|
|
|
|
2018-01-19 17:26:33 -07:00
|
|
|
static void pgmap_radix_release(struct resource *res, unsigned long end_pgoff)
|
2017-09-06 17:24:13 -06:00
|
|
|
{
|
|
|
|
unsigned long pgoff, order;
|
2016-01-15 17:56:19 -07:00
|
|
|
|
|
|
|
mutex_lock(&pgmap_lock);
|
2018-01-19 17:26:33 -07:00
|
|
|
foreach_order_pgoff(res, order, pgoff) {
|
|
|
|
if (pgoff >= end_pgoff)
|
|
|
|
break;
|
2017-09-06 17:24:13 -06:00
|
|
|
radix_tree_delete(&pgmap_radix, PHYS_PFN(res->start) + pgoff);
|
2018-01-19 17:26:33 -07:00
|
|
|
}
|
2016-01-15 17:56:19 -07:00
|
|
|
mutex_unlock(&pgmap_lock);
|
2017-09-06 17:24:13 -06:00
|
|
|
|
|
|
|
synchronize_rcu();
|
2016-01-15 17:56:19 -07:00
|
|
|
}
|
|
|
|
|
2017-12-29 00:54:04 -07:00
|
|
|
static unsigned long pfn_first(struct dev_pagemap *pgmap)
|
2016-01-15 17:56:49 -07:00
|
|
|
{
|
2017-12-29 00:54:04 -07:00
|
|
|
const struct resource *res = &pgmap->res;
|
|
|
|
struct vmem_altmap *altmap = &pgmap->altmap;
|
2016-01-15 17:56:49 -07:00
|
|
|
unsigned long pfn;
|
|
|
|
|
|
|
|
pfn = res->start >> PAGE_SHIFT;
|
2017-12-29 00:54:04 -07:00
|
|
|
if (pgmap->altmap_valid)
|
2016-01-15 17:56:49 -07:00
|
|
|
pfn += vmem_altmap_offset(altmap);
|
|
|
|
return pfn;
|
|
|
|
}
|
|
|
|
|
2017-12-29 00:54:04 -07:00
|
|
|
static unsigned long pfn_end(struct dev_pagemap *pgmap)
|
2016-01-15 17:56:49 -07:00
|
|
|
{
|
2017-12-29 00:54:04 -07:00
|
|
|
const struct resource *res = &pgmap->res;
|
2016-01-15 17:56:49 -07:00
|
|
|
|
|
|
|
return (res->start + resource_size(res)) >> PAGE_SHIFT;
|
|
|
|
}
|
|
|
|
|
2018-02-06 20:34:11 -07:00
|
|
|
static unsigned long pfn_next(unsigned long pfn)
|
|
|
|
{
|
|
|
|
if (pfn % 1024 == 0)
|
|
|
|
cond_resched();
|
|
|
|
return pfn + 1;
|
|
|
|
}
|
|
|
|
|
2016-01-15 17:56:49 -07:00
|
|
|
#define for_each_device_pfn(pfn, map) \
|
2018-02-06 20:34:11 -07:00
|
|
|
for (pfn = pfn_first(map); pfn < pfn_end(map); pfn = pfn_next(pfn))
|
2016-01-15 17:56:49 -07:00
|
|
|
|
2017-12-29 00:54:05 -07:00
|
|
|
static void devm_memremap_pages_release(void *data)
|
2015-08-17 08:00:35 -06:00
|
|
|
{
|
2017-12-29 00:54:04 -07:00
|
|
|
struct dev_pagemap *pgmap = data;
|
2017-12-29 00:54:05 -07:00
|
|
|
struct device *dev = pgmap->dev;
|
2017-12-29 00:54:04 -07:00
|
|
|
struct resource *res = &pgmap->res;
|
2016-01-15 17:56:19 -07:00
|
|
|
resource_size_t align_start, align_size;
|
mm/memunmap: don't access uninitialized memmap in memunmap_pages()
commit 77e080e7680e1e615587352f70c87b9e98126d03 upstream.
-- snip --
- Missing mm/hmm.c and kernel/memremap.c unification.
-- hmm code does not need fixes (no altmap)
- Missing 7cc7867fb061 ("mm/devm_memremap_pages: enable sub-section remap")
-- snip --
Patch series "mm/memory_hotplug: Shrink zones before removing memory",
v6.
This series fixes the access of uninitialized memmaps when shrinking
zones/nodes and when removing memory. Also, it contains all fixes for
crashes that can be triggered when removing certain namespace using
memunmap_pages() - ZONE_DEVICE, reported by Aneesh.
We stop trying to shrink ZONE_DEVICE, as it's buggy, fixing it would be
more involved (we don't have SECTION_IS_ONLINE as an indicator), and
shrinking is only of limited use (set_zone_contiguous() cannot detect
the ZONE_DEVICE as contiguous).
We continue shrinking !ZONE_DEVICE zones, however, I reduced the amount
of code to a minimum. Shrinking is especially necessary to keep
zone->contiguous set where possible, especially, on memory unplug of
DIMMs at zone boundaries.
--------------------------------------------------------------------------
Zones are now properly shrunk when offlining memory blocks or when
onlining failed. This allows to properly shrink zones on memory unplug
even if the separate memory blocks of a DIMM were onlined to different
zones or re-onlined to a different zone after offlining.
Example:
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0
:/# echo "online_movable" > /sys/devices/system/memory/memory41/state
:/# echo "online_movable" > /sys/devices/system/memory/memory43/state
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 98304
present 65536
managed 65536
:/# echo 0 > /sys/devices/system/memory/memory43/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 32768
present 32768
managed 32768
:/# echo 0 > /sys/devices/system/memory/memory41/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0
This patch (of 10):
With an altmap, the memmap falling into the reserved altmap space are not
initialized and, therefore, contain a garbage NID and a garbage zone.
Make sure to read the NID/zone from a memmap that was initialized.
This fixes a kernel crash that is observed when destroying a namespace:
kernel BUG at include/linux/mm.h:1107!
cpu 0x1: Vector: 700 (Program Check) at [c000000274087890]
pc: c0000000004b9728: memunmap_pages+0x238/0x340
lr: c0000000004b9724: memunmap_pages+0x234/0x340
...
pid = 3669, comm = ndctl
kernel BUG at include/linux/mm.h:1107!
devm_action_release+0x30/0x50
release_nodes+0x268/0x2d0
device_release_driver_internal+0x174/0x240
unbind_store+0x13c/0x190
drv_attr_store+0x44/0x60
sysfs_kf_write+0x70/0xa0
kernfs_fop_write+0x1ac/0x290
__vfs_write+0x3c/0x70
vfs_write+0xe4/0x200
ksys_write+0x7c/0x140
system_call+0x5c/0x68
The "page_zone(pfn_to_page(pfn)" was introduced by 69324b8f4833 ("mm,
devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support"), however, I
think we will never have driver reserved memory with
MEMORY_DEVICE_PRIVATE (no altmap AFAIKS).
[david@redhat.com: minimze code changes, rephrase description]
Link: http://lkml.kernel.org/r/20191006085646.5768-2-david@redhat.com
Fixes: 2c2a5af6fed2 ("mm, memory_hotplug: add nid parameter to arch_remove_memory")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Damian Tometzki <damian.tometzki@gmail.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jun Yao <yaojun8558363@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pankaj Gupta <pagupta@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Qian Cai <cai@lca.pw>
Cc: Rich Felker <dalias@libc.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Steve Capper <steve.capper@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Wei Yang <richardw.yang@linux.intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Yu Zhao <yuzhao@google.com>
Cc: <stable@vger.kernel.org> [5.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-01-28 02:50:19 -07:00
|
|
|
struct page *first_page;
|
2017-04-28 11:23:37 -06:00
|
|
|
unsigned long pfn;
|
2020-01-28 02:50:02 -07:00
|
|
|
int nid;
|
2017-04-28 11:23:37 -06:00
|
|
|
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
pgmap->kill(pgmap->ref);
|
2017-12-29 00:54:04 -07:00
|
|
|
for_each_device_pfn(pfn, pgmap)
|
2017-04-28 11:23:37 -06:00
|
|
|
put_page(pfn_to_page(pfn));
|
2016-01-15 17:56:19 -07:00
|
|
|
|
2015-08-17 08:00:35 -06:00
|
|
|
/* pages are dead and unused, undo the arch mapping */
|
2016-01-15 17:56:19 -07:00
|
|
|
align_start = res->start & ~(SECTION_SIZE - 1);
|
2018-01-19 17:27:54 -07:00
|
|
|
align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
|
|
|
|
- align_start;
|
2017-02-24 15:55:45 -07:00
|
|
|
|
mm/memunmap: don't access uninitialized memmap in memunmap_pages()
commit 77e080e7680e1e615587352f70c87b9e98126d03 upstream.
-- snip --
- Missing mm/hmm.c and kernel/memremap.c unification.
-- hmm code does not need fixes (no altmap)
- Missing 7cc7867fb061 ("mm/devm_memremap_pages: enable sub-section remap")
-- snip --
Patch series "mm/memory_hotplug: Shrink zones before removing memory",
v6.
This series fixes the access of uninitialized memmaps when shrinking
zones/nodes and when removing memory. Also, it contains all fixes for
crashes that can be triggered when removing certain namespace using
memunmap_pages() - ZONE_DEVICE, reported by Aneesh.
We stop trying to shrink ZONE_DEVICE, as it's buggy, fixing it would be
more involved (we don't have SECTION_IS_ONLINE as an indicator), and
shrinking is only of limited use (set_zone_contiguous() cannot detect
the ZONE_DEVICE as contiguous).
We continue shrinking !ZONE_DEVICE zones, however, I reduced the amount
of code to a minimum. Shrinking is especially necessary to keep
zone->contiguous set where possible, especially, on memory unplug of
DIMMs at zone boundaries.
--------------------------------------------------------------------------
Zones are now properly shrunk when offlining memory blocks or when
onlining failed. This allows to properly shrink zones on memory unplug
even if the separate memory blocks of a DIMM were onlined to different
zones or re-onlined to a different zone after offlining.
Example:
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0
:/# echo "online_movable" > /sys/devices/system/memory/memory41/state
:/# echo "online_movable" > /sys/devices/system/memory/memory43/state
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 98304
present 65536
managed 65536
:/# echo 0 > /sys/devices/system/memory/memory43/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 32768
present 32768
managed 32768
:/# echo 0 > /sys/devices/system/memory/memory41/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0
This patch (of 10):
With an altmap, the memmap falling into the reserved altmap space are not
initialized and, therefore, contain a garbage NID and a garbage zone.
Make sure to read the NID/zone from a memmap that was initialized.
This fixes a kernel crash that is observed when destroying a namespace:
kernel BUG at include/linux/mm.h:1107!
cpu 0x1: Vector: 700 (Program Check) at [c000000274087890]
pc: c0000000004b9728: memunmap_pages+0x238/0x340
lr: c0000000004b9724: memunmap_pages+0x234/0x340
...
pid = 3669, comm = ndctl
kernel BUG at include/linux/mm.h:1107!
devm_action_release+0x30/0x50
release_nodes+0x268/0x2d0
device_release_driver_internal+0x174/0x240
unbind_store+0x13c/0x190
drv_attr_store+0x44/0x60
sysfs_kf_write+0x70/0xa0
kernfs_fop_write+0x1ac/0x290
__vfs_write+0x3c/0x70
vfs_write+0xe4/0x200
ksys_write+0x7c/0x140
system_call+0x5c/0x68
The "page_zone(pfn_to_page(pfn)" was introduced by 69324b8f4833 ("mm,
devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support"), however, I
think we will never have driver reserved memory with
MEMORY_DEVICE_PRIVATE (no altmap AFAIKS).
[david@redhat.com: minimze code changes, rephrase description]
Link: http://lkml.kernel.org/r/20191006085646.5768-2-david@redhat.com
Fixes: 2c2a5af6fed2 ("mm, memory_hotplug: add nid parameter to arch_remove_memory")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Damian Tometzki <damian.tometzki@gmail.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jun Yao <yaojun8558363@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pankaj Gupta <pagupta@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Qian Cai <cai@lca.pw>
Cc: Rich Felker <dalias@libc.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Steve Capper <steve.capper@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Wei Yang <richardw.yang@linux.intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Yu Zhao <yuzhao@google.com>
Cc: <stable@vger.kernel.org> [5.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-01-28 02:50:19 -07:00
|
|
|
/* make sure to access a memmap that was actually initialized */
|
|
|
|
first_page = pfn_to_page(pfn_first(pgmap));
|
|
|
|
|
|
|
|
nid = page_to_nid(first_page);
|
2020-01-28 02:50:02 -07:00
|
|
|
|
mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
Both arch_add_memory() and arch_remove_memory() expect a single threaded
context.
For example, arch/x86/mm/init_64.c::kernel_physical_mapping_init() does
not hold any locks over this check and branch:
if (pgd_val(*pgd)) {
pud = (pud_t *)pgd_page_vaddr(*pgd);
paddr_last = phys_pud_init(pud, __pa(vaddr),
__pa(vaddr_end),
page_size_mask);
continue;
}
pud = alloc_low_page();
paddr_last = phys_pud_init(pud, __pa(vaddr), __pa(vaddr_end),
page_size_mask);
The result is that two threads calling devm_memremap_pages()
simultaneously can end up colliding on pgd initialization. This leads
to crash signatures like the following where the loser of the race
initializes the wrong pgd entry:
BUG: unable to handle kernel paging request at ffff888ebfff0000
IP: memcpy_erms+0x6/0x10
PGD 2f8e8fc067 PUD 0 /* <---- Invalid PUD */
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
CPU: 54 PID: 3818 Comm: systemd-udevd Not tainted 4.6.7+ #13
task: ffff882fac290040 ti: ffff882f887a4000 task.ti: ffff882f887a4000
RIP: memcpy_erms+0x6/0x10
[..]
Call Trace:
? pmem_do_bvec+0x205/0x370 [nd_pmem]
? blk_queue_enter+0x3a/0x280
pmem_rw_page+0x38/0x80 [nd_pmem]
bdev_read_page+0x84/0xb0
Hold the standard memory hotplug mutex over calls to
arch_{add,remove}_memory().
Fixes: 41e94a851304 ("add devm_memremap_pages")
Link: http://lkml.kernel.org/r/148357647831.9498.12606007370121652979.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-01-10 17:57:36 -07:00
|
|
|
mem_hotplug_begin();
|
2018-12-28 01:35:01 -07:00
|
|
|
if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
|
|
|
|
pfn = align_start >> PAGE_SHIFT;
|
2020-01-28 02:50:21 -07:00
|
|
|
__remove_pages(pfn, align_size >> PAGE_SHIFT, NULL);
|
2018-12-28 01:35:01 -07:00
|
|
|
} else {
|
2020-01-28 02:50:02 -07:00
|
|
|
arch_remove_memory(nid, align_start, align_size,
|
2018-12-28 01:35:01 -07:00
|
|
|
pgmap->altmap_valid ? &pgmap->altmap : NULL);
|
|
|
|
kasan_remove_zero_shadow(__va(align_start), align_size);
|
|
|
|
}
|
mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
Both arch_add_memory() and arch_remove_memory() expect a single threaded
context.
For example, arch/x86/mm/init_64.c::kernel_physical_mapping_init() does
not hold any locks over this check and branch:
if (pgd_val(*pgd)) {
pud = (pud_t *)pgd_page_vaddr(*pgd);
paddr_last = phys_pud_init(pud, __pa(vaddr),
__pa(vaddr_end),
page_size_mask);
continue;
}
pud = alloc_low_page();
paddr_last = phys_pud_init(pud, __pa(vaddr), __pa(vaddr_end),
page_size_mask);
The result is that two threads calling devm_memremap_pages()
simultaneously can end up colliding on pgd initialization. This leads
to crash signatures like the following where the loser of the race
initializes the wrong pgd entry:
BUG: unable to handle kernel paging request at ffff888ebfff0000
IP: memcpy_erms+0x6/0x10
PGD 2f8e8fc067 PUD 0 /* <---- Invalid PUD */
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
CPU: 54 PID: 3818 Comm: systemd-udevd Not tainted 4.6.7+ #13
task: ffff882fac290040 ti: ffff882f887a4000 task.ti: ffff882f887a4000
RIP: memcpy_erms+0x6/0x10
[..]
Call Trace:
? pmem_do_bvec+0x205/0x370 [nd_pmem]
? blk_queue_enter+0x3a/0x280
pmem_rw_page+0x38/0x80 [nd_pmem]
bdev_read_page+0x84/0xb0
Hold the standard memory hotplug mutex over calls to
arch_{add,remove}_memory().
Fixes: 41e94a851304 ("add devm_memremap_pages")
Link: http://lkml.kernel.org/r/148357647831.9498.12606007370121652979.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-01-10 17:57:36 -07:00
|
|
|
mem_hotplug_done();
|
2017-02-24 15:55:45 -07:00
|
|
|
|
2016-09-07 09:51:21 -06:00
|
|
|
untrack_pfn(NULL, PHYS_PFN(align_start), align_size);
|
2018-01-19 17:26:33 -07:00
|
|
|
pgmap_radix_release(res, -1);
|
2017-12-29 00:54:04 -07:00
|
|
|
dev_WARN_ONCE(dev, pgmap->altmap.alloc,
|
|
|
|
"%s: failed to free all reserved pages\n", __func__);
|
2016-01-15 17:56:19 -07:00
|
|
|
}
|
|
|
|
|
2016-01-15 17:56:22 -07:00
|
|
|
/**
|
|
|
|
* devm_memremap_pages - remap and provide memmap backing for the given resource
|
|
|
|
* @dev: hosting device for @res
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
* @pgmap: pointer to a struct dev_pagemap
|
2016-01-15 17:56:22 -07:00
|
|
|
*
|
2016-01-15 17:56:49 -07:00
|
|
|
* Notes:
|
2017-12-29 00:54:05 -07:00
|
|
|
* 1/ At a minimum the res, ref and type members of @pgmap must be initialized
|
|
|
|
* by the caller before passing it to this function
|
|
|
|
*
|
|
|
|
* 2/ The altmap field may optionally be initialized, in which case altmap_valid
|
|
|
|
* must be set to true
|
|
|
|
*
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
* 3/ pgmap->ref must be 'live' on entry and will be killed at
|
|
|
|
* devm_memremap_pages_release() time, or if this routine fails.
|
2016-01-15 17:56:49 -07:00
|
|
|
*
|
2017-12-29 00:54:05 -07:00
|
|
|
* 4/ res is expected to be a host memory range that could feasibly be
|
2016-01-15 17:56:49 -07:00
|
|
|
* treated as a "System RAM" range, i.e. not a device mmio range, but
|
|
|
|
* this is not enforced.
|
2016-01-15 17:56:22 -07:00
|
|
|
*/
|
2017-12-29 00:54:05 -07:00
|
|
|
void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)
|
2015-08-17 08:00:35 -06:00
|
|
|
{
|
2017-09-06 17:24:13 -06:00
|
|
|
resource_size_t align_start, align_size, align_end;
|
2017-12-29 00:54:05 -07:00
|
|
|
struct vmem_altmap *altmap = pgmap->altmap_valid ?
|
|
|
|
&pgmap->altmap : NULL;
|
2018-02-06 20:34:11 -07:00
|
|
|
struct resource *res = &pgmap->res;
|
2017-09-06 17:24:13 -06:00
|
|
|
unsigned long pfn, pgoff, order;
|
2016-09-07 09:51:21 -06:00
|
|
|
pgprot_t pgprot = PAGE_KERNEL;
|
2018-02-06 20:34:11 -07:00
|
|
|
int error, nid, is_ram;
|
2018-07-26 17:37:15 -06:00
|
|
|
struct dev_pagemap *conflict_pgmap;
|
2016-03-09 15:08:13 -07:00
|
|
|
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
if (!pgmap->ref || !pgmap->kill)
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
|
2016-03-09 15:08:13 -07:00
|
|
|
align_start = res->start & ~(SECTION_SIZE - 1);
|
|
|
|
align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
|
|
|
|
- align_start;
|
2018-07-26 17:37:15 -06:00
|
|
|
align_end = align_start + align_size - 1;
|
|
|
|
|
|
|
|
conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_start), NULL);
|
|
|
|
if (conflict_pgmap) {
|
|
|
|
dev_WARN(dev, "Conflicting mapping in same section\n");
|
|
|
|
put_dev_pagemap(conflict_pgmap);
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
|
|
|
|
|
|
|
conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_end), NULL);
|
|
|
|
if (conflict_pgmap) {
|
|
|
|
dev_WARN(dev, "Conflicting mapping in same section\n");
|
|
|
|
put_dev_pagemap(conflict_pgmap);
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
|
|
|
|
2016-03-14 16:15:51 -06:00
|
|
|
is_ram = region_intersects(align_start, align_size,
|
|
|
|
IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
|
2015-08-17 08:00:35 -06:00
|
|
|
|
2018-12-28 01:34:54 -07:00
|
|
|
if (is_ram != REGION_DISJOINT) {
|
|
|
|
WARN_ONCE(1, "%s attempted on %s region %pr\n", __func__,
|
|
|
|
is_ram == REGION_MIXED ? "mixed" : "ram", res);
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
error = -ENXIO;
|
|
|
|
goto err_array;
|
2015-08-17 08:00:35 -06:00
|
|
|
}
|
|
|
|
|
2016-01-15 17:56:22 -07:00
|
|
|
pgmap->dev = dev;
|
|
|
|
|
2016-01-15 17:56:19 -07:00
|
|
|
mutex_lock(&pgmap_lock);
|
|
|
|
error = 0;
|
2017-09-06 17:24:13 -06:00
|
|
|
|
|
|
|
foreach_order_pgoff(res, order, pgoff) {
|
|
|
|
error = __radix_tree_insert(&pgmap_radix,
|
2017-12-29 00:54:04 -07:00
|
|
|
PHYS_PFN(res->start) + pgoff, order, pgmap);
|
2016-01-15 17:56:19 -07:00
|
|
|
if (error) {
|
|
|
|
dev_err(dev, "%s: failed: %d\n", __func__, error);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&pgmap_lock);
|
|
|
|
if (error)
|
|
|
|
goto err_radix;
|
|
|
|
|
2015-08-17 08:00:35 -06:00
|
|
|
nid = dev_to_node(dev);
|
|
|
|
if (nid < 0)
|
2015-10-05 18:35:55 -06:00
|
|
|
nid = numa_mem_id();
|
2015-08-17 08:00:35 -06:00
|
|
|
|
2016-09-07 09:51:21 -06:00
|
|
|
error = track_pfn_remap(NULL, &pgprot, PHYS_PFN(align_start), 0,
|
|
|
|
align_size);
|
|
|
|
if (error)
|
|
|
|
goto err_pfn_remap;
|
|
|
|
|
mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
Both arch_add_memory() and arch_remove_memory() expect a single threaded
context.
For example, arch/x86/mm/init_64.c::kernel_physical_mapping_init() does
not hold any locks over this check and branch:
if (pgd_val(*pgd)) {
pud = (pud_t *)pgd_page_vaddr(*pgd);
paddr_last = phys_pud_init(pud, __pa(vaddr),
__pa(vaddr_end),
page_size_mask);
continue;
}
pud = alloc_low_page();
paddr_last = phys_pud_init(pud, __pa(vaddr), __pa(vaddr_end),
page_size_mask);
The result is that two threads calling devm_memremap_pages()
simultaneously can end up colliding on pgd initialization. This leads
to crash signatures like the following where the loser of the race
initializes the wrong pgd entry:
BUG: unable to handle kernel paging request at ffff888ebfff0000
IP: memcpy_erms+0x6/0x10
PGD 2f8e8fc067 PUD 0 /* <---- Invalid PUD */
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
CPU: 54 PID: 3818 Comm: systemd-udevd Not tainted 4.6.7+ #13
task: ffff882fac290040 ti: ffff882f887a4000 task.ti: ffff882f887a4000
RIP: memcpy_erms+0x6/0x10
[..]
Call Trace:
? pmem_do_bvec+0x205/0x370 [nd_pmem]
? blk_queue_enter+0x3a/0x280
pmem_rw_page+0x38/0x80 [nd_pmem]
bdev_read_page+0x84/0xb0
Hold the standard memory hotplug mutex over calls to
arch_{add,remove}_memory().
Fixes: 41e94a851304 ("add devm_memremap_pages")
Link: http://lkml.kernel.org/r/148357647831.9498.12606007370121652979.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-01-10 17:57:36 -07:00
|
|
|
mem_hotplug_begin();
|
2018-12-28 01:35:01 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* For device private memory we call add_pages() as we only need to
|
|
|
|
* allocate and initialize struct page for the device memory. More-
|
|
|
|
* over the device memory is un-accessible thus we do not want to
|
|
|
|
* create a linear mapping for the memory like arch_add_memory()
|
|
|
|
* would do.
|
|
|
|
*
|
|
|
|
* For all other device memory types, which are accessible by
|
|
|
|
* the CPU, we do want the linear mapping and thus use
|
|
|
|
* arch_add_memory().
|
|
|
|
*/
|
|
|
|
if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
|
|
|
|
error = add_pages(nid, align_start >> PAGE_SHIFT,
|
|
|
|
align_size >> PAGE_SHIFT, NULL, false);
|
|
|
|
} else {
|
|
|
|
error = kasan_add_zero_shadow(__va(align_start), align_size);
|
|
|
|
if (error) {
|
|
|
|
mem_hotplug_done();
|
|
|
|
goto err_kasan;
|
|
|
|
}
|
|
|
|
|
|
|
|
error = arch_add_memory(nid, align_start, align_size, altmap,
|
|
|
|
false);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!error) {
|
|
|
|
struct zone *zone;
|
|
|
|
|
|
|
|
zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE];
|
|
|
|
move_pfn_range_to_zone(zone, align_start >> PAGE_SHIFT,
|
|
|
|
align_size >> PAGE_SHIFT, altmap);
|
2018-08-17 16:47:04 -06:00
|
|
|
}
|
|
|
|
|
mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
Both arch_add_memory() and arch_remove_memory() expect a single threaded
context.
For example, arch/x86/mm/init_64.c::kernel_physical_mapping_init() does
not hold any locks over this check and branch:
if (pgd_val(*pgd)) {
pud = (pud_t *)pgd_page_vaddr(*pgd);
paddr_last = phys_pud_init(pud, __pa(vaddr),
__pa(vaddr_end),
page_size_mask);
continue;
}
pud = alloc_low_page();
paddr_last = phys_pud_init(pud, __pa(vaddr), __pa(vaddr_end),
page_size_mask);
The result is that two threads calling devm_memremap_pages()
simultaneously can end up colliding on pgd initialization. This leads
to crash signatures like the following where the loser of the race
initializes the wrong pgd entry:
BUG: unable to handle kernel paging request at ffff888ebfff0000
IP: memcpy_erms+0x6/0x10
PGD 2f8e8fc067 PUD 0 /* <---- Invalid PUD */
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
CPU: 54 PID: 3818 Comm: systemd-udevd Not tainted 4.6.7+ #13
task: ffff882fac290040 ti: ffff882f887a4000 task.ti: ffff882f887a4000
RIP: memcpy_erms+0x6/0x10
[..]
Call Trace:
? pmem_do_bvec+0x205/0x370 [nd_pmem]
? blk_queue_enter+0x3a/0x280
pmem_rw_page+0x38/0x80 [nd_pmem]
bdev_read_page+0x84/0xb0
Hold the standard memory hotplug mutex over calls to
arch_{add,remove}_memory().
Fixes: 41e94a851304 ("add devm_memremap_pages")
Link: http://lkml.kernel.org/r/148357647831.9498.12606007370121652979.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-01-10 17:57:36 -07:00
|
|
|
mem_hotplug_done();
|
2016-01-15 17:56:19 -07:00
|
|
|
if (error)
|
|
|
|
goto err_add_memory;
|
2015-08-17 08:00:35 -06:00
|
|
|
|
2017-12-29 00:54:04 -07:00
|
|
|
for_each_device_pfn(pfn, pgmap) {
|
2016-01-15 17:56:49 -07:00
|
|
|
struct page *page = pfn_to_page(pfn);
|
|
|
|
|
2016-03-09 15:08:10 -07:00
|
|
|
/*
|
|
|
|
* ZONE_DEVICE pages union ->lru with a ->pgmap back
|
|
|
|
* pointer. It is a bug if a ZONE_DEVICE page is ever
|
|
|
|
* freed or placed on a driver-private list. Seed the
|
|
|
|
* storage with LIST_POISON* values.
|
|
|
|
*/
|
|
|
|
list_del(&page->lru);
|
2016-01-15 17:56:49 -07:00
|
|
|
page->pgmap = pgmap;
|
2017-12-29 00:54:05 -07:00
|
|
|
percpu_ref_get(pgmap->ref);
|
2016-01-15 17:56:49 -07:00
|
|
|
}
|
2017-12-29 00:54:05 -07:00
|
|
|
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
error = devm_add_action_or_reset(dev, devm_memremap_pages_release,
|
|
|
|
pgmap);
|
|
|
|
if (error)
|
|
|
|
return ERR_PTR(error);
|
2017-12-29 00:54:05 -07:00
|
|
|
|
2015-08-17 08:00:35 -06:00
|
|
|
return __va(res->start);
|
2016-01-15 17:56:19 -07:00
|
|
|
|
|
|
|
err_add_memory:
|
2018-08-17 16:47:04 -06:00
|
|
|
kasan_remove_zero_shadow(__va(align_start), align_size);
|
|
|
|
err_kasan:
|
2016-09-07 09:51:21 -06:00
|
|
|
untrack_pfn(NULL, PHYS_PFN(align_start), align_size);
|
|
|
|
err_pfn_remap:
|
2016-01-15 17:56:19 -07:00
|
|
|
err_radix:
|
2018-01-19 17:26:33 -07:00
|
|
|
pgmap_radix_release(res, pgoff);
|
mm, devm_memremap_pages: fix shutdown handling
commit a95c90f1e2c253b280385ecf3d4ebfe476926b28 upstream.
The last step before devm_memremap_pages() returns success is to allocate
a release action, devm_memremap_pages_release(), to tear the entire setup
down. However, the result from devm_add_action() is not checked.
Checking the error from devm_add_action() is not enough. The api
currently relies on the fact that the percpu_ref it is using is killed by
the time the devm_memremap_pages_release() is run. Rather than continue
this awkward situation, offload the responsibility of killing the
percpu_ref to devm_memremap_pages_release() directly. This allows
devm_memremap_pages() to do the right thing relative to init failures and
shutdown.
Without this change we could fail to register the teardown of
devm_memremap_pages(). The likelihood of hitting this failure is tiny as
small memory allocations almost always succeed. However, the impact of
the failure is large given any future reconfiguration, or disable/enable,
of an nvdimm namespace will fail forever as subsequent calls to
devm_memremap_pages() will fail to setup the pgmap_radix since there will
be stale entries for the physical address range.
An argument could be made to require that the ->kill() operation be set in
the @pgmap arg rather than passed in separately. However, it helps code
readability, tracking the lifetime of a given instance, to be able to grep
the kill routine directly at the devm_memremap_pages() call site.
Link: http://lkml.kernel.org/r/154275558526.76910.7535251937849268605.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Reviewed-by: "Jérôme Glisse" <jglisse@redhat.com>
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-28 01:34:57 -07:00
|
|
|
err_array:
|
|
|
|
pgmap->kill(pgmap->ref);
|
2016-01-15 17:56:19 -07:00
|
|
|
return ERR_PTR(error);
|
2015-08-17 08:00:35 -06:00
|
|
|
}
|
2018-12-28 01:34:50 -07:00
|
|
|
EXPORT_SYMBOL_GPL(devm_memremap_pages);
|
2016-01-15 17:56:22 -07:00
|
|
|
|
|
|
|
unsigned long vmem_altmap_offset(struct vmem_altmap *altmap)
|
|
|
|
{
|
|
|
|
/* number of pfns from base where pfn_to_page() is valid */
|
|
|
|
return altmap->reserve + altmap->free;
|
|
|
|
}
|
|
|
|
|
|
|
|
void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns)
|
|
|
|
{
|
|
|
|
altmap->alloc -= nr_pfns;
|
|
|
|
}
|
|
|
|
|
2017-12-29 00:54:00 -07:00
|
|
|
/**
|
|
|
|
* 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
|
|
|
|
*
|
2017-12-29 00:54:01 -07:00
|
|
|
* 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.
|
2017-12-29 00:54:00 -07:00
|
|
|
*/
|
|
|
|
struct dev_pagemap *get_dev_pagemap(unsigned long pfn,
|
|
|
|
struct dev_pagemap *pgmap)
|
|
|
|
{
|
|
|
|
resource_size_t phys = PFN_PHYS(pfn);
|
|
|
|
|
|
|
|
/*
|
2017-12-29 00:54:01 -07:00
|
|
|
* In the cached case we're already holding a live reference.
|
2017-12-29 00:54:00 -07:00
|
|
|
*/
|
2017-12-29 00:54:01 -07:00
|
|
|
if (pgmap) {
|
2017-12-29 00:54:04 -07:00
|
|
|
if (phys >= pgmap->res.start && phys <= pgmap->res.end)
|
2017-12-29 00:54:01 -07:00
|
|
|
return pgmap;
|
|
|
|
put_dev_pagemap(pgmap);
|
2017-12-29 00:54:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* fall back to slow path lookup */
|
|
|
|
rcu_read_lock();
|
2017-12-29 00:54:06 -07:00
|
|
|
pgmap = radix_tree_lookup(&pgmap_radix, PHYS_PFN(phys));
|
2017-12-29 00:54:00 -07:00
|
|
|
if (pgmap && !percpu_ref_tryget_live(pgmap->ref))
|
|
|
|
pgmap = NULL;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return pgmap;
|
|
|
|
}
|
2018-05-16 12:46:08 -06:00
|
|
|
EXPORT_SYMBOL_GPL(get_dev_pagemap);
|
2017-09-08 17:11:46 -06:00
|
|
|
|
2018-05-16 12:46:08 -06:00
|
|
|
#ifdef CONFIG_DEV_PAGEMAP_OPS
|
|
|
|
DEFINE_STATIC_KEY_FALSE(devmap_managed_key);
|
2018-07-26 17:37:22 -06:00
|
|
|
EXPORT_SYMBOL(devmap_managed_key);
|
2018-05-16 12:46:08 -06:00
|
|
|
static atomic_t devmap_enable;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Toggle the static key for ->page_free() callbacks when dev_pagemap
|
|
|
|
* pages go idle.
|
|
|
|
*/
|
|
|
|
void dev_pagemap_get_ops(void)
|
|
|
|
{
|
|
|
|
if (atomic_inc_return(&devmap_enable) == 1)
|
|
|
|
static_branch_enable(&devmap_managed_key);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(dev_pagemap_get_ops);
|
|
|
|
|
|
|
|
void dev_pagemap_put_ops(void)
|
|
|
|
{
|
|
|
|
if (atomic_dec_and_test(&devmap_enable))
|
|
|
|
static_branch_disable(&devmap_managed_key);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(dev_pagemap_put_ops);
|
|
|
|
|
|
|
|
void __put_devmap_managed_page(struct page *page)
|
2017-09-08 17:11:46 -06:00
|
|
|
{
|
|
|
|
int count = page_ref_dec_return(page);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If refcount is 1 then page is freed and refcount is stable as nobody
|
|
|
|
* holds a reference on the page.
|
|
|
|
*/
|
|
|
|
if (count == 1) {
|
|
|
|
/* Clear Active bit in case of parallel mark_page_accessed */
|
|
|
|
__ClearPageActive(page);
|
|
|
|
__ClearPageWaiters(page);
|
|
|
|
|
2017-09-08 17:11:54 -06:00
|
|
|
mem_cgroup_uncharge(page);
|
2017-09-08 17:11:46 -06:00
|
|
|
|
|
|
|
page->pgmap->page_free(page, page->pgmap->data);
|
|
|
|
} else if (!count)
|
|
|
|
__put_page(page);
|
|
|
|
}
|
2018-07-26 17:37:22 -06:00
|
|
|
EXPORT_SYMBOL(__put_devmap_managed_page);
|
2018-05-16 12:46:08 -06:00
|
|
|
#endif /* CONFIG_DEV_PAGEMAP_OPS */
|