From patchwork Tue Jan 14 20:11:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11332855 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 285F1109A for ; Tue, 14 Jan 2020 20:11:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DB81124658 for ; Tue, 14 Jan 2020 20:11:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="pk6gO3ry" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB81124658 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0D6E38E0005; Tue, 14 Jan 2020 15:11:30 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0881B8E0003; Tue, 14 Jan 2020 15:11:30 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB9648E0005; Tue, 14 Jan 2020 15:11:29 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0168.hostedemail.com [216.40.44.168]) by kanga.kvack.org (Postfix) with ESMTP id D7DA58E0003 for ; Tue, 14 Jan 2020 15:11:29 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 5F54B40CA for ; Tue, 14 Jan 2020 20:11:29 +0000 (UTC) X-FDA: 76377334698.12.line12_643cc784aa24c X-Spam-Summary: 2,0,0,fcaee91861530ded,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org:mhocko@kernel.org:sergey.senozhatsky.work@gmail.com:pmladek@suse.com:rostedt@goodmis.org:peterz@infradead.org:david@redhat.com::linux-kernel@vger.kernel.org:cai@lca.pw,RULES_HIT:41:355:379:541:800:960:966:967:968:973:988:989:1260:1311:1314:1345:1437:1515:1535:1544:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2563:2682:2685:2689:2693:2731:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:3872:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4250:4321:4385:4605:5007:6119:6261:6653:7903:8660:8957:9010:9025:9391:10004:11026:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12679:12895:12986:13148:13230:13894:14018:14096:14181:14394:14721:21080:21433:21444:21451:21627:21819:21990:30054:30065:30070,0,RBL:209.85.219.66:@lca.pw:.lbl8.mailshell.net-62.14.0.100 66.201.201.201,CacheIP:none,Bayesian:0 .5,0.5,0 X-HE-Tag: line12_643cc784aa24c X-Filterd-Recvd-Size: 7198 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Jan 2020 20:11:28 +0000 (UTC) Received: by mail-qv1-f66.google.com with SMTP id p2so6288988qvo.10 for ; Tue, 14 Jan 2020 12:11:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qBp3Gt/C+a/mHRpipU20c3QaHKvIEsS9ocruCJDZZhE=; b=pk6gO3ry5wNUzd/t243vbBkeE+MDmMeF+1KrIkjJBT/AhgL4JEKmh4UN3hSngT6aG3 s4YyCYSJR48wyozqNncYg3yc3kFwVQ85HD8EEyz65dIgFlIkNrm24+JwhhJeVLQqn0R9 5eWxKX5YjIymf+FI6ozamFVtZ216TCUKUOKwQyyavzhz3tlwtNS88w3UCNRUKKB/vbN2 IBeu/o+ArE6aCPZyeA2Vluva4jEfnQX/dC34VXRf5XfjNSIQnCMlutDeuLABBSm3L2W6 c7vhVZsf1gSRjij4tRPuLyNVkhHUMAcFPrCalN1BqrWeTJc38vo2XsusRoB8/jbJiNKF 4lZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qBp3Gt/C+a/mHRpipU20c3QaHKvIEsS9ocruCJDZZhE=; b=L8hIuFenFO8pnBHOFKpU6AAwBFe5yMcin/YUPsDGcSE4Ziy9YlUbQWmvDEWGbeG+lE M4TizUijl5wYxU1BeAuBCgYUvPZVhkMVVnuLauPKj5U1GfI9zBeCqxJccNc3IYoMrFW8 XBDeGYooMFTUS62JiplnOCwRBZlRLIv5lV0wL1TLnlJUlPAGrcZg7Q18SJg6AXNpCMOr dX0p6fSHPtemyWDqNt2MqdbHsM3IgqoG4qgOshzVOS61Cpasy4bLUV8dfgT7/bxMi87H GVK+L0kElmAjgCmJRgZF6lnBhhl8A2fhMnTQ8nllR8ObRdjOo4Bv2AxkszVNyKzFuFGS VdeA== X-Gm-Message-State: APjAAAVF+gBeZpuhTp++T/KMGPTqnPFT9y8AhRlvGumXg8/A05w+C9do MCgG/8ZnZm616h9PAhB++gg/oQ== X-Google-Smtp-Source: APXvYqzxZ8pgPcoyA9hDnr6J0eUQT4XcUQ6l54zl8N2EkmcgtTpRJuaSSDwK+/DZmuoelSC7OCcxrw== X-Received: by 2002:a0c:e28e:: with SMTP id r14mr18896392qvl.234.1579032688196; Tue, 14 Jan 2020 12:11:28 -0800 (PST) Received: from ovpn-120-31.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id j15sm7912023qtn.37.2020.01.14.12.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jan 2020 12:11:27 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: mhocko@kernel.org, sergey.senozhatsky.work@gmail.com, pmladek@suse.com, rostedt@goodmis.org, peterz@infradead.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] mm/hotplug: silence a lockdep splat with printk() Date: Tue, 14 Jan 2020 15:11:14 -0500 Message-Id: <20200114201114.14696-1-cai@lca.pw> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 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: Similar to the recent commit [1] merged into the random and -next trees, it is not a good idea to call printk() with zone->lock held. The standard fix is to use printk_deferred() in those places, but memory offline will call dump_page() which need to defer after the lock. While at it, remove a similar but unnecessary debug printk() as well. [1] https://lore.kernel.org/lkml/1573679785-21068-1-git-send-email-cai@lca.pw/ Signed-off-by: Qian Cai --- include/linux/page-isolation.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 12 +++++------- mm/page_isolation.c | 10 +++++++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 148e65a9c606..5d8ba078006f 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -34,7 +34,7 @@ static inline bool is_migrate_isolate(int migratetype) #define REPORT_FAILURE 0x2 bool has_unmovable_pages(struct zone *zone, struct page *page, int migratetype, - int flags); + int flags, char *dump); void set_pageblock_migratetype(struct page *page, int migratetype); int move_freepages_block(struct zone *zone, struct page *page, int migratetype, int *num_movable); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7a6de9b0dcab..f10928538fa3 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1149,7 +1149,7 @@ static bool is_pageblock_removable_nolock(unsigned long pfn) return false; return !has_unmovable_pages(zone, page, MIGRATE_MOVABLE, - MEMORY_OFFLINE); + MEMORY_OFFLINE, NULL); } /* Checks if this range of memory is likely to be hot-removable. */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e56cd1f33242..b6bec3925e80 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8204,7 +8204,7 @@ void *__init alloc_large_system_hash(const char *tablename, * race condition. So you can't expect this function should be exact. */ bool has_unmovable_pages(struct zone *zone, struct page *page, int migratetype, - int flags) + int flags, char *dump) { unsigned long iter = 0; unsigned long pfn = page_to_pfn(page); @@ -8305,8 +8305,10 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int migratetype, return false; unmovable: WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE); - if (flags & REPORT_FAILURE) - dump_page(pfn_to_page(pfn + iter), reason); + if (flags & REPORT_FAILURE) { + page = pfn_to_page(pfn + iter); + strscpy(dump, reason, 64); + } return true; } @@ -8711,10 +8713,6 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn) BUG_ON(!PageBuddy(page)); order = page_order(page); offlined_pages += 1 << order; -#ifdef CONFIG_DEBUG_VM - pr_info("remove from free list %lx %d %lx\n", - pfn, 1 << order, end_pfn); -#endif del_page_from_free_area(page, &zone->free_area[order]); pfn += (1 << order); } diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 1f8b9dfecbe8..ce0fe3c1ceff 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -20,6 +20,7 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_ struct zone *zone; unsigned long flags; int ret = -EBUSY; + char dump[64]; zone = page_zone(page); @@ -37,7 +38,8 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_ * FIXME: Now, memory hotplug doesn't call shrink_slab() by itself. * We just check MOVABLE pages. */ - if (!has_unmovable_pages(zone, page, migratetype, isol_flags)) { + if (!has_unmovable_pages(zone, page, migratetype, isol_flags, + dump)) { unsigned long nr_pages; int mt = get_pageblock_migratetype(page); @@ -54,6 +56,12 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_ spin_unlock_irqrestore(&zone->lock, flags); if (!ret) drain_all_pages(zone); + else if (isol_flags & REPORT_FAILURE) + /* + * printk() with zone->lock held will guarantee to trigger a + * lockdep splat, so defer it here. + */ + dump_page(page, dump); return ret; }