From patchwork Tue Apr 11 17:42:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 749582 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2ZV33hk5z9sN6 for ; Wed, 12 Apr 2017 03:55:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n93bXK0T"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3w2ZV324XbzDq8W for ; Wed, 12 Apr 2017 03:55:55 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n93bXK0T"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3w2ZCK30PWzDq7h for ; Wed, 12 Apr 2017 03:43:09 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n93bXK0T"; dkim-atps=neutral Received: by mail-pg0-x241.google.com with SMTP id 79so696146pgf.0 for ; Tue, 11 Apr 2017 10:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nHZ416Y4hyhuktNm3QTm7VPfAHHX5tX8H9mQKUmjZ4c=; b=n93bXK0TlBuY1OK8CGbd15FC3FKpFaUf03hotrTmUkjG5WR/RxM2kCfDVZ78gmQm4D cHVP0tK74cmxloeLUGkV20aKLqKhsH83K5Vpj3In+OmKzph/HEgCESnvI+dF4hOOZPz+ i+POZEtvwD7BoGCjJjlQXeNVK8Eh3z+THTrg8O5YmV1qvCaaf+3gFICBk+y12FucdFhg bdPTJFXQLycwwPC9KCswXitf/aU1NOSdpIADFbOtwqAi43XuLCIJ+dmy/umPzKCUHWrU QcUweMf18YDiqO75xvbDXYVPbV15M+EqVyzO/bJPDfdvRxBHHIlXLZ5Js28azPW6bJ9h M5/Q== 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:in-reply-to :references; bh=nHZ416Y4hyhuktNm3QTm7VPfAHHX5tX8H9mQKUmjZ4c=; b=N5mANXsKSgJfCOplMA+oaK/aLT2c+CiEK0oVyBO5LMuDl9Z+1rxtgistUgg7kRMn+2 Q8fmMHUkIFRVzMxx61phVNfpW4Jm0TJNJFph4nQVJfoV+63Xh8TUGWHUKvT1lFiUFSxF dCohcKOHQVwQlH3rckTyP10Rd/CF0L8ieuueZRIxT9rK67JOL9OLk39qgBNYwTIS3I3c 5+zDEb5gq01f572iXAdjH6QrlwYXhwG6gS1m5sHuV39UcAnMr1nc4D3ruKrfTXzXI3vm Tdqlyg0qxQKQXgXSArySVwK6kHWgxf2lQCZIhUa15dToJPrslA1e7JTSbwFHY/cEQtui b1ig== X-Gm-Message-State: AFeK/H2NALWI/FWgWB3pUdVQc0R3YmjRnCi8dJ4HO1cPpje6zWMiEn5ruvOBF9qaezudHA== X-Received: by 10.98.130.70 with SMTP id w67mr61491344pfd.173.1491932587811; Tue, 11 Apr 2017 10:43:07 -0700 (PDT) Received: from localhost.localdomain ([103.57.0.128]) by smtp.gmail.com with ESMTPSA id r185sm20182582pfr.72.2017.04.11.10.43.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 10:43:07 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 5/9] powerpc/vmemmap: Add altmap support Date: Wed, 12 Apr 2017 03:42:29 +1000 Message-Id: <20170411174233.21902-6-oohall@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170411174233.21902-1-oohall@gmail.com> References: <20170411174233.21902-1-oohall@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran , arbab@linux.vnet.ibm.com, linux-nvdimm@lists.01.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Adds support to powerpc for the altmap feature of ZONE_DEVICE memory. An altmap is a driver provided region that is used to provide the backing storage for the struct pages of ZONE_DEVICE memory. In situations where large amount of ZONE_DEVICE memory is being added to the system the altmap reduces pressure on main system memory by allowing the mm/ metadata to be stored on the device itself rather in main memory. Signed-off-by: Oliver O'Halloran Reviewed-by: Balbir Singh --- arch/powerpc/mm/init_64.c | 20 +++++++++++++++----- arch/powerpc/mm/mem.c | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index f8124edb6ffa..225fbb8034e6 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -171,13 +172,17 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node); for (; start < end; start += page_size) { + struct vmem_altmap *altmap; void *p; int rc; if (vmemmap_populated(start, page_size)) continue; - p = vmemmap_alloc_block(page_size, node); + /* altmap lookups only work at section boundaries */ + altmap = to_vmem_altmap(SECTION_ALIGN_DOWN(start)); + + p = __vmemmap_alloc_block_buf(page_size, node, altmap); if (!p) return -ENOMEM; @@ -241,9 +246,10 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) pr_debug("vmemmap_free %lx...%lx\n", start, end); for (; start < end; start += page_size) { - struct page *page = pfn_to_page(addr >> PAGE_SHIFT); - unsigned int nr_pages; - unsigned long addr; + unsigned long nr_pages, addr; + struct vmem_altmap *altmap; + struct page *section_base; + struct page *page; /* * the section has already be marked as invalid, so @@ -258,9 +264,13 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) continue; page = pfn_to_page(addr >> PAGE_SHIFT); + section_base = pfn_to_page(vmemmap_section_start(start)); nr_pages = 1 << page_order; - if (PageReserved(page)) { + altmap = to_vmem_altmap((unsigned long) section_base); + if (altmap) { + vmem_altmap_free(altmap, nr_pages); + } else if (PageReserved(page)) { /* allocated from bootmem */ if (page_size < PAGE_SIZE) { /* diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 3bbba178b464..6f7b64eaa9d8 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -176,7 +177,8 @@ int arch_remove_memory(u64 start, u64 size, enum memory_type type) { unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; - struct zone *zone; + struct vmem_altmap *altmap; + struct page *page; int ret; /* @@ -193,8 +195,16 @@ int arch_remove_memory(u64 start, u64 size, enum memory_type type) return -EINVAL; } - zone = page_zone(pfn_to_page(start_pfn)); - ret = __remove_pages(zone, start_pfn, nr_pages); + /* + * If we have an altmap then we need to skip over any reserved PFNs + * when querying the zone. + */ + page = pfn_to_page(start_pfn); + altmap = to_vmem_altmap((unsigned long) page); + if (altmap) + page += vmem_altmap_offset(altmap); + + ret = __remove_pages(page_zone(page), start_pfn, nr_pages); if (ret) return ret;