Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp762906ybh; Wed, 11 Mar 2020 10:17:08 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsDHsYKL1J2ZFSSmw1uzCdl7IYpOp5FcM/NQiTgb6UeJM7xyLqqDlq6iboG6W5LcDvpmfrF X-Received: by 2002:a05:6830:1d6f:: with SMTP id l15mr3022397oti.299.1583947028142; Wed, 11 Mar 2020 10:17:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583947028; cv=none; d=google.com; s=arc-20160816; b=IYhkG85KNfKLlF6wdJIjQcGFP/UqZcc5I/GhPFTEExNQc/16SHXe2Yf3jqq3FOYmQy kte/zcS5nGXXhMobfM++GgVUUTLTTOlm0/eXSzFP26Yg84fsKUK89zFpHaEgzLHZcN4r H28YFmRnsGV4DhQ8GJBDtI5TJ2vdVOMAInZHqxemOVDQaVjJgSYfHovgX+XtgxqCWNsu Ko/5pFJ8xOCMfdCOPPx4AiGeTPYot6teLccOphMd8guw82YCSJeptrbS6cDYNqA3+FMH UIu3vLDGr0CN/F4LFMsnEOePTciLGP2sAS+bKJsF6rwOYAj2JNQHePlix6TtaKkMS0gW FPog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XHYlZowtvHMKK0q04IipSovrlmgZ4Y0gMBzsLQrvv8I=; b=YkS0qYnjaMQJaLcVtLRMs0VTqTviMwx/RFwnpuUSKKv4Dg6kwiGjzodKBSIVFg/zSM sSq3kd9jCYSVPZKvkaskFVZ8s4/IjhXJcFdgdFo/Zyjs7m640EO2aHIDe5r08epqTXwS kN0KJm3sUfHOQAYinzpC520rY1GgGPJZgbPFm31u5I6i3U07qjFEwPxC3rMdWqEcF/IN DSQc5risfgwMWRltrGAz/21CtnZ7ZioPlZ0HaMhKVzdsrNIT/odEizuDNiiYCvZANYga wFYfqQe5m0m766zSRlDFUQR+3wkFNmLDG2elg4ptWaHKNXKw0+/WuN9tuDJfmitjll0G fmsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Cv4JO2N6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m5si407446ooo.82.2020.03.11.10.16.55; Wed, 11 Mar 2020 10:17:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Cv4JO2N6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730059AbgCKRQK (ORCPT + 99 others); Wed, 11 Mar 2020 13:16:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57348 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730235AbgCKRQK (ORCPT ); Wed, 11 Mar 2020 13:16:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583946968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XHYlZowtvHMKK0q04IipSovrlmgZ4Y0gMBzsLQrvv8I=; b=Cv4JO2N6bF5rLbvM7LeEcH97wiykvG+kW0QPsUtlAvJq6HcFwGfiIwy5eVgUjTtWkyHj9T qQg5KRDpYz1p6ByrorQzwO5uHgkVjS/ilk/zl5qvNmK9JYKNwBGkX0rFurH4/hNISz4GXE weECBNYtxM3d6otu4x/0gSNm0WvEzYI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-fK6NGoJhOmmeuLMYaCjlhA-1; Wed, 11 Mar 2020 13:16:04 -0400 X-MC-Unique: fK6NGoJhOmmeuLMYaCjlhA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB6E518C8C00; Wed, 11 Mar 2020 17:16:01 +0000 (UTC) Received: from t480s.redhat.com (ovpn-116-132.ams2.redhat.com [10.36.116.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70A9B60BEE; Wed, 11 Mar 2020 17:15:57 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtio-dev@lists.oasis-open.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, Michal Hocko , Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Alexander Duyck , Michal Hocko , Juergen Gross , Konrad Rzeszutek Wilk , Pavel Tatashin , Vlastimil Babka , Johannes Weiner , Anthony Yznaga , Oscar Salvador , Mel Gorman , Mike Rapoport , Dan Williams , Anshuman Khandual , Qian Cai , Pingfan Liu Subject: [PATCH v2 05/10] mm: Allow to offline unmovable PageOffline() pages via MEM_GOING_OFFLINE Date: Wed, 11 Mar 2020 18:14:17 +0100 Message-Id: <20200311171422.10484-6-david@redhat.com> In-Reply-To: <20200311171422.10484-1-david@redhat.com> References: <20200311171422.10484-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org virtio-mem wants to allow to offline memory blocks of which some parts were unplugged (allocated via alloc_contig_range()), especially, to later offline and remove completely unplugged memory blocks. The important part is that PageOffline() has to remain set until the section is offline, so these pages will never get accessed (e.g., when dumping). The pages shoul= d not be handed back to the buddy (which would require clearing PageOffline= () and result in issues if offlining fails and the pages are suddenly in the buddy). Let's allow to do that by allowing to isolate any PageOffline() page when offlining. This way, we can reach the memory hotplug notifier MEM_GOING_OFFLINE, where the driver can signal that he is fine with offlining this page by dropping its reference count. PageOffline() pages with a reference count of 0 can then be skipped when offlining the pages (like if they were free, however they are not in the buddy). Anybody who uses PageOffline() pages and does not agree to offline them (e.g., Hyper-V balloon, XEN balloon, VMWare balloon for 2MB pages) will n= ot decrement the reference count and make offlining fail when trying to migrate such an unmovable page. So there should be no observable change. Same applies to balloon compaction users (movable PageOffline() pages), t= he pages will simply be migrated. Note 1: If offlining fails, a driver has to increment the reference count again in MEM_CANCEL_OFFLINE. Note 2: A driver that makes use of this has to be aware that re-onlining the memory block has to be handled by hooking into onlining code (online_page_callback_t), resetting the page PageOffline() and not giving them to the buddy. Reviewed-by: Alexander Duyck Acked-by: Michal Hocko Cc: Andrew Morton Cc: Juergen Gross Cc: Konrad Rzeszutek Wilk Cc: Pavel Tatashin Cc: Alexander Duyck Cc: Vlastimil Babka Cc: Johannes Weiner Cc: Anthony Yznaga Cc: Michal Hocko Cc: Oscar Salvador Cc: Mel Gorman Cc: Mike Rapoport Cc: Dan Williams Cc: Anshuman Khandual Cc: Qian Cai Cc: Pingfan Liu Signed-off-by: David Hildenbrand --- include/linux/page-flags.h | 10 +++++++++ mm/memory_hotplug.c | 44 +++++++++++++++++++++++++++++--------- mm/page_alloc.c | 24 +++++++++++++++++++++ mm/page_isolation.c | 9 ++++++++ 4 files changed, 77 insertions(+), 10 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 49c2697046b9..fd6d4670ccc3 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -772,6 +772,16 @@ PAGE_TYPE_OPS(Buddy, buddy) * not onlined when onlining the section). * The content of these pages is effectively stale. Such pages should no= t * be touched (read/write/dump/save) except by their owner. + * + * If a driver wants to allow to offline unmovable PageOffline() pages w= ithout + * putting them back to the buddy, it can do so via the memory notifier = by + * decrementing the reference count in MEM_GOING_OFFLINE and incrementin= g the + * reference count in MEM_CANCEL_OFFLINE. When offlining, the PageOfflin= e() + * pages (now with a reference count of zero) are treated like free page= s, + * allowing the containing memory block to get offlined. A driver that + * relies on this feature is aware that re-onlining the memory block wil= l + * require to re-set the pages PageOffline() and not giving them to the + * buddy via online_page_callback_t. */ PAGE_TYPE_OPS(Offline, offline) =20 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1a00b5a37ef6..ab1c31e67fd1 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1221,11 +1221,17 @@ struct zone *test_pages_in_a_zone(unsigned long s= tart_pfn, =20 /* * Scan pfn range [start,end) to find movable/migratable pages (LRU page= s, - * non-lru movable pages and hugepages). We scan pfn because it's much - * easier than scanning over linked list. This function returns the pfn - * of the first found movable page if it's found, otherwise 0. + * non-lru movable pages and hugepages). Will skip over most unmovable + * pages (esp., pages that can be skipped when offlining), but bail out = on + * definitely unmovable pages. + * + * Returns: + * 0 in case a movable page is found and movable_pfn was updated. + * -ENOENT in case no movable page was found. + * -EBUSY in case a definitely unmovable page was found. */ -static unsigned long scan_movable_pages(unsigned long start, unsigned lo= ng end) +static int scan_movable_pages(unsigned long start, unsigned long end, + unsigned long *movable_pfn) { unsigned long pfn; =20 @@ -1237,18 +1243,30 @@ static unsigned long scan_movable_pages(unsigned = long start, unsigned long end) continue; page =3D pfn_to_page(pfn); if (PageLRU(page)) - return pfn; + goto found; if (__PageMovable(page)) - return pfn; + goto found; + + /* + * PageOffline() pages that are not marked __PageMovable() and + * have a reference count > 0 (after MEM_GOING_OFFLINE) are + * definitely unmovable. If their reference count would be 0, + * they could at least be skipped when offlining memory. + */ + if (PageOffline(page) && page_count(page)) + return -EBUSY; =20 if (!PageHuge(page)) continue; head =3D compound_head(page); if (page_huge_active(head)) - return pfn; + goto found; skip =3D compound_nr(head) - (page - head); pfn +=3D skip - 1; } + return -ENOENT; +found: + *movable_pfn =3D pfn; return 0; } =20 @@ -1515,7 +1533,8 @@ static int __ref __offline_pages(unsigned long star= t_pfn, } =20 do { - for (pfn =3D start_pfn; pfn;) { + pfn =3D start_pfn; + do { if (signal_pending(current)) { ret =3D -EINTR; reason =3D "signal backoff"; @@ -1525,14 +1544,19 @@ static int __ref __offline_pages(unsigned long st= art_pfn, cond_resched(); lru_add_drain_all(); =20 - pfn =3D scan_movable_pages(pfn, end_pfn); - if (pfn) { + ret =3D scan_movable_pages(pfn, end_pfn, &pfn); + if (!ret) { /* * TODO: fatal migration failures should bail * out */ do_migrate_range(pfn, end_pfn); } + } while (!ret); + + if (ret !=3D -ENOENT) { + reason =3D "unmovable page"; + goto failed_removal_isolated; } =20 /* diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8d7be3f33e26..baa60222215f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8366,6 +8366,19 @@ struct page *has_unmovable_pages(struct zone *zone= , struct page *page, if ((flags & MEMORY_OFFLINE) && PageHWPoison(page)) continue; =20 + /* + * We treat all PageOffline() pages as movable when offlining + * to give drivers a chance to decrement their reference count + * in MEM_GOING_OFFLINE in order to indicate that these pages + * can be offlined as there are no direct references anymore. + * For actually unmovable PageOffline() where the driver does + * not support this, we will fail later when trying to actually + * move these pages that still have a reference count > 0. + * (false negatives in this function only) + */ + if ((flags & MEMORY_OFFLINE) && PageOffline(page)) + continue; + if (__PageMovable(page) || PageLRU(page)) continue; =20 @@ -8786,6 +8799,17 @@ __offline_isolated_pages(unsigned long start_pfn, = unsigned long end_pfn) offlined_pages++; continue; } + /* + * At this point all remaining PageOffline() pages have a + * reference count of 0 and can simply be skipped. + */ + if (PageOffline(page)) { + BUG_ON(page_count(page)); + BUG_ON(PageBuddy(page)); + pfn++; + offlined_pages++; + continue; + } =20 BUG_ON(page_count(page)); BUG_ON(!PageBuddy(page)); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 2c11a38d6e87..f6d07c5f0d34 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -151,6 +151,7 @@ __first_valid_page(unsigned long pfn, unsigned long n= r_pages) * a bit mask) * MEMORY_OFFLINE - isolate to offline (!allocate) memory * e.g., skip over PageHWPoison() pages + * and PageOffline() pages. * REPORT_FAILURE - report details about the failure to * isolate the range * @@ -259,6 +260,14 @@ __test_page_isolated_in_pageblock(unsigned long pfn,= unsigned long end_pfn, else if ((flags & MEMORY_OFFLINE) && PageHWPoison(page)) /* A HWPoisoned page cannot be also PageBuddy */ pfn++; + else if ((flags & MEMORY_OFFLINE) && PageOffline(page) && + !page_count(page)) + /* + * The responsible driver agreed to skip PageOffline() + * pages when offlining memory by dropping its + * reference in MEM_GOING_OFFLINE. + */ + pfn++; else break; } --=20 2.24.1