From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6879EC10F03 for ; Wed, 13 Mar 2019 14:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E4E42087C for ; Wed, 13 Mar 2019 14:32:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="BcU3oTNs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726624AbfCMOb7 (ORCPT ); Wed, 13 Mar 2019 10:31:59 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:35523 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725888AbfCMOb7 (ORCPT ); Wed, 13 Mar 2019 10:31:59 -0400 Received: by mail-qk1-f195.google.com with SMTP id z13so1207573qki.2 for ; Wed, 13 Mar 2019 07:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=zWwvp5HYTt2UGqggycNdgQkwCt4sLo6I2UnQvia+v8Q=; b=BcU3oTNsoRMBivjqIfl5Apen1hlN23ETVuiivEbUZbV1AqcfMmLDlkuRV7W0GmpnYC Y0Gy9ZVZCLwf8RU+klZ4dx1O4vfB2rGJRMdtxFmLR9/MztzbDcUL3GfuhJWOo+PGQdOr C2K3uxfeOMgMohLKicLzru0VlnIj3CPRaDBX3DyIIopq3zOUcDWCkiN6fE76YgNQRzz6 tFKStAQOeNLqYDN49OJf9LOIeWYg42ql6agjc+H5ZrzovRSMf+u+iuZB+q8zQq89na9T e2VjMpfHim8QeXqh65QG4nxyNzseRfEsik3nbSvwcUcpViRRMmwzEpCWueLywMaO2oDU GFWw== 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; bh=zWwvp5HYTt2UGqggycNdgQkwCt4sLo6I2UnQvia+v8Q=; b=CM3OZZvLPz2u3xcWC8h4MYvaHKaMElfXWci8wDovzXn3Yw1zeAlWc9AjKJqx7CBNNL 4kTJLp7wU7Ezbp29yr3kMABNn2lVbnXRG2mAbxBeoVocS9CCfblL6sKsqEg0ZZ3Agayq ZweIKLqooW/zGS0mMsKKFtAX94c/jGD6ZjAVWYlYz0XPNd44bcpV+KbNLIh1ptOMBVdq bBnVEr62qb9U0yqIrQDlrB3XopQXGE/GMHjpF69q3vLNbCdLCshc4jPm+Qv3uNxgYHRx ppwhWOLWXkEWIt2WBYx/cCG4XV3Cry/OpZ4GvB9LlwqbvlKC8cP83niV+zKtO/S+UkfX WtcA== X-Gm-Message-State: APjAAAWOYeG8s5CoGZUmeVSIe0rLIZ7eWUceJXnKEP4CtAv9JfP3SbGe b5aP74Y0oKugsgEIGVyjByryow== X-Google-Smtp-Source: APXvYqxEzvE7apl4xb0kvGmqFkAtgk3l2CnCqVsh1tCeReWtuJN4sctxkQsBC+zoaC3x9xnte6Ua2w== X-Received: by 2002:a37:7d86:: with SMTP id y128mr23316265qkc.36.1552487517888; Wed, 13 Mar 2019 07:31:57 -0700 (PDT) Received: from ovpn-121-103.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id e2sm6147984qkd.7.2019.03.13.07.31.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 07:31:56 -0700 (PDT) From: Qian Cai To: akpm@linux-foundation.org Cc: mhocko@kernel.org, osalvador@suse.de, vbabka@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH v2] mm/hotplug: fix offline undo_isolate_page_range() Date: Wed, 13 Mar 2019 10:31:33 -0400 Message-Id: <20190313143133.46200-1-cai@lca.pw> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") introduced move_pfn_range_to_zone() which calls memmap_init_zone() during onlining a memory block. memmap_init_zone() will reset pagetype flags and makes migrate type to be MOVABLE. However, in __offline_pages(), it also call undo_isolate_page_range() after offline_isolated_pages() to do the same thing. Due to the commit 2ce13640b3f4 ("mm: __first_valid_page skip over offline pages") changed __first_valid_page() to skip offline pages, undo_isolate_page_range() here just waste CPU cycles looping around the offlining PFN range while doing nothing, because __first_valid_page() will return NULL as offline_isolated_pages() has already marked all memory sections within the pfn range as offline via offline_mem_sections(). Also, after calling the "useless" undo_isolate_page_range() here, it reaches the point of no returning by notifying MEM_OFFLINE. Those pages will be marked as MIGRATE_MOVABLE again once onlining. The only thing left to do is to decrease the number of isolated pageblocks zone counter which would make some paths of the page allocation slower that the above commit introduced. A memory block is usually at most 1GiB in size, so an "int" should be enough to represent the number of pageblocks in a block. Fix an incorrect comment along the way. Fixes: 2ce13640b3f4 ("mm: __first_valid_page skip over offline pages") Signed-off-by: Qian Cai --- v2: return the nubmer of isolated pageblocks in start_isolate_page_range() per Oscar; take the zone lock when undoing zone->nr_isolate_pageblock per Michal. mm/memory_hotplug.c | 17 +++++++++++++---- mm/page_alloc.c | 2 +- mm/page_isolation.c | 16 ++++++++++------ mm/sparse.c | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index cd23c081924d..8ffe844766da 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1580,7 +1580,7 @@ static int __ref __offline_pages(unsigned long start_pfn, { unsigned long pfn, nr_pages; long offlined_pages; - int ret, node; + int ret, node, count; unsigned long flags; unsigned long valid_start, valid_end; struct zone *zone; @@ -1606,10 +1606,11 @@ static int __ref __offline_pages(unsigned long start_pfn, ret = start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE, SKIP_HWPOISON | REPORT_FAILURE); - if (ret) { + if (ret < 0) { reason = "failure to isolate range"; goto failed_removal; } + count = ret; arg.start_pfn = start_pfn; arg.nr_pages = nr_pages; @@ -1661,8 +1662,16 @@ static int __ref __offline_pages(unsigned long start_pfn, /* Ok, all of our target is isolated. We cannot do rollback at this point. */ offline_isolated_pages(start_pfn, end_pfn); - /* reset pagetype flags and makes migrate type to be MOVABLE */ - undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); + + /* + * Onlining will reset pagetype flags and makes migrate type + * MOVABLE, so just need to decrease the number of isolated + * pageblocks zone counter here. + */ + spin_lock_irqsave(&zone->lock, flags); + zone->nr_isolate_pageblock -= count; + spin_unlock_irqrestore(&zone->lock, flags); + /* removal success */ adjust_managed_page_count(pfn_to_page(start_pfn), -offlined_pages); zone->present_pages -= offlined_pages; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 03fcf73d47da..d96ca5bc555b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8233,7 +8233,7 @@ int alloc_contig_range(unsigned long start, unsigned long end, ret = start_isolate_page_range(pfn_max_align_down(start), pfn_max_align_up(end), migratetype, 0); - if (ret) + if (ret < 0) return ret; /* diff --git a/mm/page_isolation.c b/mm/page_isolation.c index ce323e56b34d..bf67b63227ca 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -172,7 +172,8 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages) * future will not be allocated again. * * start_pfn/end_pfn must be aligned to pageblock_order. - * Return 0 on success and -EBUSY if any part of range cannot be isolated. + * Return the number of isolated pageblocks on success and -EBUSY if any part of + * range cannot be isolated. * * There is no high level synchronization mechanism that prevents two threads * from trying to isolate overlapping ranges. If this happens, one thread @@ -188,6 +189,7 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, unsigned long pfn; unsigned long undo_pfn; struct page *page; + int count = 0; BUG_ON(!IS_ALIGNED(start_pfn, pageblock_nr_pages)); BUG_ON(!IS_ALIGNED(end_pfn, pageblock_nr_pages)); @@ -196,13 +198,15 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, pfn < end_pfn; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (page && - set_migratetype_isolate(page, migratetype, flags)) { - undo_pfn = pfn; - goto undo; + if (page) { + if (set_migratetype_isolate(page, migratetype, flags)) { + undo_pfn = pfn; + goto undo; + } + count++; } } - return 0; + return count; undo: for (pfn = start_pfn; pfn < undo_pfn; diff --git a/mm/sparse.c b/mm/sparse.c index 69904aa6165b..56e057c432f9 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -567,7 +567,7 @@ void online_mem_sections(unsigned long start_pfn, unsigned long end_pfn) } #ifdef CONFIG_MEMORY_HOTREMOVE -/* Mark all memory sections within the pfn range as online */ +/* Mark all memory sections within the pfn range as offline */ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; -- 2.17.2 (Apple Git-113)