From patchwork Mon Jan 20 16:39:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11342577 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 16085921 for ; Mon, 20 Jan 2020 16:39:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D6C0622314 for ; Mon, 20 Jan 2020 16:39:24 +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="q/z6+Bde" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6C0622314 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 1798A6B0690; Mon, 20 Jan 2020 11:39:24 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 12B696B0691; Mon, 20 Jan 2020 11:39:24 -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 018986B0692; Mon, 20 Jan 2020 11:39:23 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id DD06D6B0690 for ; Mon, 20 Jan 2020 11:39:23 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id AA9AF180AD807 for ; Mon, 20 Jan 2020 16:39:23 +0000 (UTC) X-FDA: 76398573006.05.pies10_34db9e30d8831 X-Spam-Summary: 2,0,0,bfe560a94cc9f751,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org:mhocko@kernel.org:david@redhat.com::linux-kernel@vger.kernel.org:cai@lca.pw,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1437:1515:1535:1543:1711:1730:1747:1777:1792:2393:2559:2562:2693:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3871:3872:4321:5007:6119:6261:6653:6691:7875:7903:8660:8957:10004:11026:11232:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12663:12679:12895:12986:13148:13161:13229:13230:13894:14018:14096:14181:14394:14721:21080:21444:21451:21627:21795:21990:30012:30051:30054:30065:30070,0,RBL:209.85.222.195:@lca.pw:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:39,LUA_SUMMARY:none X-HE-Tag: pies10_34db9e30d8831 X-Filterd-Recvd-Size: 5808 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Jan 2020 16:39:23 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id c16so30672525qko.6 for ; Mon, 20 Jan 2020 08:39:22 -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=bjYtDUvLvMYlhIvuD1xMxndqXr35/jOrhQJr+DWUbRw=; b=q/z6+Bdex6ZDtkJAAhBIZaTdS8LZpO0r7h1LGwU22odEOD4YPNUzHhYmUEUm51DrrX fQ5OkfN/REx9CwH/khr/P8qOLs9o2qQgzHWbHPuOEgHwTJkY6/7A9WtBRlgA9J+eB6pg sUet/WbHIwgWWyZPTSL/wCQyXV9ajt3QP0jHHUfO+T0Xa5L5SLqj7vWMcAUD7BTtUnNo TmYgBWYG0ERAjmACwRIz7c2cUsVqtrEoPix2WcrGQP7/ceG+sukv2uRrq+79HBB6z+ji j1Ruxsmeu9laRNX99RFj9vAsDfDeH5PLaXV1H8LPUGYqYh+0NTDqwntN/NcPJ9bKL/Fg evWA== 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=bjYtDUvLvMYlhIvuD1xMxndqXr35/jOrhQJr+DWUbRw=; b=m/dTN71ugV8FgldVKh1MrlSMxa3GK60OAEKx1WbhdNb5uwldN2zwFBi+B9/wdo8vcg LbPao9KU/MWdav2Fewv6DHoNXaadi9JP/rsG7T5isW2tDfIutRf06yS4X+QT26lCE5Hl t+MZP8vAI2Ldqqd4wrqI3xpbKZ9fXmwNpMIqDONFpzCAcG74ZXsHqxvnPkXq0n8PRqQY gclUziPry6gl/xd4yIaYFNx+pyy5BBDzhQanAGU/u8St+M4MfYsuQITEHqRkRivK+Eg9 /3sqKdq64u/2C+oY8Gm8gqvVosIzBNgwtsGUGYyHJlgZ2MJWiXe8Zgmd/3ShscgDVXMZ JvXQ== X-Gm-Message-State: APjAAAX6DtOnuf+6/xInp1KIKwD0bpQSveR2pOYGVJR7C1v9NHje2F5x C4o3MlSbedrXC2IJHGP2rb2b5Q== X-Google-Smtp-Source: APXvYqz0GHpFOA+3eQ0vNIS6wz4J7l778/zehWDFokXO4lRATb+gC65IN8Rol5K3TJPnkqzPy7cLXA== X-Received: by 2002:a37:a54b:: with SMTP id o72mr332538qke.313.1579538362344; Mon, 20 Jan 2020 08:39:22 -0800 (PST) Received: from ovpn-123-97.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id g62sm15877601qkd.25.2020.01.20.08.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2020 08:39:21 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: mhocko@kernel.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -mm v3] mm/page_isolation: fix potential warning from user Date: Mon, 20 Jan 2020 11:39:15 -0500 Message-Id: <20200120163915.1469-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.000004, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: It makes sense to call the WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE) from start_isolate_page_range(), but should avoid triggering it from userspace, i.e, from is_mem_section_removable() because it could crash the system by a non-root user if warn_on_panic is set. While at it, simplify the code a bit by removing an unnecessary jump label. Suggested-by: Michal Hocko Signed-off-by: Qian Cai Reviewed-by: David Hildenbrand Acked-by: Michal Hocko --- v3: Drop the page_isolation.c cleanup change. v2: Improve the commit log. Warn for all start_isolate_page_range() users not just offlining. mm/page_alloc.c | 11 ++++------- mm/page_isolation.c | 18 +++++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 621716a25639..3c4eb750a199 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8231,7 +8231,7 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, if (is_migrate_cma(migratetype)) return NULL; - goto unmovable; + return page; } for (; iter < pageblock_nr_pages; iter++) { @@ -8241,7 +8241,7 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, page = pfn_to_page(pfn + iter); if (PageReserved(page)) - goto unmovable; + return page; /* * If the zone is movable and we have ruled out all reserved @@ -8261,7 +8261,7 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, unsigned int skip_pages; if (!hugepage_migration_supported(page_hstate(head))) - goto unmovable; + return page; skip_pages = compound_nr(head) - (page - head); iter += skip_pages - 1; @@ -8303,12 +8303,9 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, * is set to both of a memory hole page and a _used_ kernel * page at boot. */ - goto unmovable; + return page; } return NULL; -unmovable: - WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE); - return pfn_to_page(pfn + iter); } #ifdef CONFIG_CONTIG_ALLOC diff --git a/mm/page_isolation.c b/mm/page_isolation.c index e70586523ca3..a9fd7c740c23 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -54,14 +54,18 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_ out: spin_unlock_irqrestore(&zone->lock, flags); - if (!ret) + if (!ret) { drain_all_pages(zone); - else if ((isol_flags & REPORT_FAILURE) && unmovable) - /* - * printk() with zone->lock held will guarantee to trigger a - * lockdep splat, so defer it here. - */ - dump_page(unmovable, "unmovable page"); + } else { + WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE); + + if ((isol_flags & REPORT_FAILURE) && unmovable) + /* + * printk() with zone->lock held will likely trigger a + * lockdep splat, so defer it here. + */ + dump_page(unmovable, "unmovable page"); + } return ret; }