From patchwork Thu Jul 5 06:49:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10508215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEAF460116 for ; Thu, 5 Jul 2018 06:59:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB25228DF2 for ; Thu, 5 Jul 2018 06:59:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F12828E49; Thu, 5 Jul 2018 06:59:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2072428DF2 for ; Thu, 5 Jul 2018 06:59:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31BD66B000D; Thu, 5 Jul 2018 02:59:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2CBD56B000E; Thu, 5 Jul 2018 02:59:08 -0400 (EDT) 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 1E52A6B0010; Thu, 5 Jul 2018 02:59:08 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id D10C86B000D for ; Thu, 5 Jul 2018 02:59:07 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id 39-v6so1417631ple.6 for ; Wed, 04 Jul 2018 23:59:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=hW7uJ/1zJKE6hSTxjw/bwVTgGjny+IcV40g8bbnICYs=; b=WaRDClTy1WkKkMnGZFg8A1bDR31cIHL2xtboZmlnzlgUXIQJYGAPMG0yW+XsdNUm4E GGOGSyBVrIYzHw1OnIHQTPt+3X2FVAJEUo7F7MrZTK0DEObe3JQfUZ8m3iJLzLswGMl8 CU9UxkKQGBArqbRR0ILVxtQiu5GXozNlj+hEx5aH1RoUsoBiwZqQdO2vfo5H9xbcRaKT kHWRoUe42V1tt2I/qnlXRDb2E/QcbFhFpOtNBdSiuZRF48NnFZUK/cLZ0UN7lAh6UsRB UVRnD1Pbxe3Q7yqwdtUUOS9E3gExlXPCRWJmRoUKM/M47vGb1YDNs5HKXjxvSG95YHyO FnMA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E13LXQpxtcfLaYBWxENn+Ts0y9BPVnAFx2JNSdHy09WAZjhZt60 xSSWj/pNzhItBEdZYYFDyCelKZZ2XHnxOkMWqrvx2RGF5VX7sRewWUb19JZEDPEfUvOQnK7nEs6 VegAEidSjBEsm641eSM8dlNxj1Vx/5RPm/8umkFGeVHJHMkyQ80ApdRl1B81RZiNx/A== X-Received: by 2002:a63:f919:: with SMTP id h25-v6mr4316335pgi.401.1530773947535; Wed, 04 Jul 2018 23:59:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe7sxYnEo3ChafzG1vekiFc5tlRyuye2kr7shUzCNCxDfUVkcV5CiL7y6cAVy9OsR2ftaKo X-Received: by 2002:a63:f919:: with SMTP id h25-v6mr4316296pgi.401.1530773946674; Wed, 04 Jul 2018 23:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530773946; cv=none; d=google.com; s=arc-20160816; b=CJ45OaZUtsBw1QoLEWp1IgX6WzgvS4akQily+VBbGQIkOMKY4fByraHdmFskhIWyts A2Vku+lTF6KLw7N+9axnRcP9lLhwo48i46R86fYS8HhZUKohpvSfu60ZnuQbwC6Sz7xJ fBaqbKqimQWj/87ItGdsLgjSlmW+j5d1kKFLFSs7JXKOV6ohiPx6WZqVnCTMZBoP8fCH aaoD9FUbyBMSg+O4H3epjDIh9qu6KY2uk92eo9Raz/86r/RblTnZcyaHYoIGDPIkqK/o AiDpLsrBHR8JjGIoLhbez787ZGHH7cYxLBCmSztbBt3d2CAQSXTF6/OvN+CiDVE0MwAL sdNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject :arc-authentication-results; bh=hW7uJ/1zJKE6hSTxjw/bwVTgGjny+IcV40g8bbnICYs=; b=v8ypugqs1iECg/Vx8F7RYw37yI/hawg/mPkVu+Mi+fcCfdXTao2SsyLX3c6yKkl4jK 2LWNOeaGutCrrt21q7FI8yqj00bLBsEAiK9KDC9Ug4pFJ7GG3xLNw9r2FvDh/NfzsOMz ecFNbBrlTw9Fl47N2/euuELmcqIBQXIUUCBcR0dPZlxj1j9XC2qnywf/CjEBYICGiid7 Myk1xDHRO7VA7cNUngx834IRI47pEsjzU/Ll1/4FR27RSJOT3LFkMDIBuIOZpLlYKJsV tikEOwKAGhiDjW4cAt19ae5i6bGZHLv6FllPXxpeJeW83OKRXQUPhdenblYEEHfbNVoH zOgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTPS id w16-v6si5768662pfj.144.2018.07.04.23.59.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 23:59:06 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) client-ip=134.134.136.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jul 2018 23:59:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,311,1526367600"; d="scan'208";a="54179621" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga007.jf.intel.com with ESMTP; 04 Jul 2018 23:59:04 -0700 Subject: [PATCH 01/13] mm: Plumb dev_pagemap instead of vmem_altmap to memmap_init_zone() From: Dan Williams To: akpm@linux-foundation.org Cc: Michal Hocko , Vlastimil Babka , vishal.l.verma@intel.com, hch@lst.de, linux-nvdimm@lists.01.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Wed, 04 Jul 2018 23:49:07 -0700 Message-ID: <153077334720.40830.5284059575516542524.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <153077334130.40830.2714147692560185329.stgit@dwillia2-desk3.amr.corp.intel.com> References: <153077334130.40830.2714147692560185329.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f 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: X-Virus-Scanned: ClamAV using ClamSMTP In preparation for teaching memmap_init_zone() how to initialize ZONE_DEVICE pages, pass in dev_pagemap. Cc: Michal Hocko Cc: Vlastimil Babka Cc: Andrew Morton Signed-off-by: Dan Williams --- include/linux/memory_hotplug.h | 3 ++- include/linux/mm.h | 2 +- kernel/memremap.c | 2 +- mm/memory_hotplug.c | 4 ++-- mm/page_alloc.c | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4e9828cda7a2..e60085b2824d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -14,6 +14,7 @@ struct mem_section; struct memory_block; struct resource; struct vmem_altmap; +struct dev_pagemap; #ifdef CONFIG_MEMORY_HOTPLUG /* @@ -326,7 +327,7 @@ extern int add_memory_resource(int nid, struct resource *resource, bool online); extern int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, bool want_memblock); extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap); + unsigned long nr_pages, struct dev_pagemap *pgmap); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern void remove_memory(int nid, u64 start, u64 size); diff --git a/include/linux/mm.h b/include/linux/mm.h index a0fbb9ffe380..319d01372efa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2140,7 +2140,7 @@ static inline void zero_resv_unavail(void) {} extern void set_dma_reserve(unsigned long new_dma_reserve); extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long, - enum memmap_context, struct vmem_altmap *); + enum memmap_context, struct dev_pagemap *); extern void setup_per_zone_wmarks(void); extern int __meminit init_per_zone_wmark_min(void); extern void mem_init(void); diff --git a/kernel/memremap.c b/kernel/memremap.c index ecee37b44aa1..58327259420d 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -244,7 +244,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap, zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; if (!error) move_pfn_range_to_zone(zone, align_start >> PAGE_SHIFT, - align_size >> PAGE_SHIFT, altmap); + align_size >> PAGE_SHIFT, pgmap); } mem_hotplug_done(); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7deb49f69e27..aae4e6cc65e9 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -779,7 +779,7 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon } void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap) + unsigned long nr_pages, struct dev_pagemap *pgmap) { struct pglist_data *pgdat = zone->zone_pgdat; int nid = pgdat->node_id; @@ -805,7 +805,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, * are reserved so nobody should be touching them so we should be safe */ memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, - MEMMAP_HOTPLUG, altmap); + MEMMAP_HOTPLUG, pgmap); set_zone_contiguous(zone); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1521100f1e63..545a5860cce7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5459,10 +5459,11 @@ void __ref build_all_zonelists(pg_data_t *pgdat) */ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, enum memmap_context context, - struct vmem_altmap *altmap) + struct dev_pagemap *pgmap) { unsigned long end_pfn = start_pfn + size; pg_data_t *pgdat = NODE_DATA(nid); + struct vmem_altmap *altmap = NULL; unsigned long pfn; unsigned long nr_initialised = 0; struct page *page; @@ -5477,6 +5478,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, * Honor reservation requested by the driver for this ZONE_DEVICE * memory */ + if (pgmap && pgmap->altmap_valid) + altmap = &pgmap->altmap; if (altmap && start_pfn == altmap->base_pfn) start_pfn += altmap->reserve;