From: Michal Hocko <mhocko@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Dan Williams <dan.j.williams@gmail.com>, LKML <linux-kernel@vger.kernel.org>, linux-mm@kvack.org, Michal Hocko <mhocko@suse.com>, Johannes Thumshirn <jthumshirn@suse.de> Subject: [PATCH 3/3] memremap: add scheduling point to devm_memremap_pages Date: Mon, 18 Sep 2017 14:14:10 +0200 Message-ID: <20170918121410.24466-4-mhocko@kernel.org> (raw) In-Reply-To: <20170918121410.24466-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> devm_memremap_pages is initializing struct pages in for_each_device_pfn and that can take quite some time. We have even seen a soft lockup trigerring on a non preemptive kernel [ 125.583233] NMI watchdog: BUG: soft lockup - CPU#61 stuck for 22s! [kworker/u641:11:1808] [...] [ 125.583467] RIP: 0010:[<ffffffff8118b6b7>] [<ffffffff8118b6b7>] devm_memremap_pages+0x327/0x430 [...] [ 125.583488] Call Trace: [ 125.583496] [<ffffffffa016550d>] pmem_attach_disk+0x2fd/0x3f0 [nd_pmem] [ 125.583528] [<ffffffffa14ae984>] nvdimm_bus_probe+0x64/0x110 [libnvdimm] [ 125.583536] [<ffffffff8146b257>] driver_probe_device+0x1f7/0x420 [ 125.583540] [<ffffffff81469212>] bus_for_each_drv+0x52/0x80 [ 125.583543] [<ffffffff8146af40>] __device_attach+0xb0/0x130 [ 125.583546] [<ffffffff8146a367>] bus_probe_device+0x87/0xa0 [ 125.583548] [<ffffffff814682fc>] device_add+0x3fc/0x5f0 [ 125.583553] [<ffffffffa14adffe>] nd_async_device_register+0xe/0x40 [libnvdimm] [ 125.583556] [<ffffffff8109e413>] async_run_entry_fn+0x43/0x150 [ 125.583561] [<ffffffff81095b8e>] process_one_work+0x14e/0x410 [ 125.583563] [<ffffffff810963f6>] worker_thread+0x116/0x490 [ 125.583565] [<ffffffff8109b8c7>] kthread+0xc7/0xe0 [ 125.583569] [<ffffffff8160a57f>] ret_from_fork+0x3f/0x70 fix this by adding cond_resched every 1024 pages. Reported-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Michal Hocko <mhocko@suse.com> --- kernel/memremap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index 6bcbfbf1a8fd..403ab9cdb949 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -350,7 +350,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, pgprot_t pgprot = PAGE_KERNEL; struct dev_pagemap *pgmap; struct page_map *page_map; - int error, nid, is_ram; + int error, nid, is_ram, i = 0; align_start = res->start & ~(SECTION_SIZE - 1); align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE) @@ -448,6 +448,8 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, list_del(&page->lru); page->pgmap = pgmap; percpu_ref_get(ref); + if (!(++i % 1024)) + cond_resched(); } devres_add(dev, page_map); return __va(res->start); -- 2.14.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply index Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-18 12:14 [PATCH 0/3] mm, memory_hotplug: fix few soft lockups in memory hotadd Michal Hocko 2017-09-18 12:14 ` [PATCH 1/3] mm, memory_hotplug: add scheduling point to __add_pages Michal Hocko 2017-09-18 12:16 ` Johannes Thumshirn 2017-09-18 12:14 ` [PATCH 2/3] mm, page_alloc: add scheduling point to memmap_init_zone Michal Hocko 2017-09-18 12:17 ` Johannes Thumshirn 2017-09-18 12:14 ` Michal Hocko [this message] 2017-09-18 12:17 ` [PATCH 3/3] memremap: add scheduling point to devm_memremap_pages Johannes Thumshirn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170918121410.24466-4-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=dan.j.williams@gmail.com \ --cc=jthumshirn@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-mm Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-mm/0 linux-mm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-mm linux-mm/ https://lore.kernel.org/linux-mm \ linux-mm@kvack.org public-inbox-index linux-mm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kvack.linux-mm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git