From patchwork Tue Nov 20 23:13:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10691433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 88FB013AD for ; Tue, 20 Nov 2018 23:25:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74FA92AC4E for ; Tue, 20 Nov 2018 23:25:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 690A92AC59; Tue, 20 Nov 2018 23:25:41 +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=ham 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 DEA602AC4E for ; Tue, 20 Nov 2018 23:25:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CFCDA6B228E; Tue, 20 Nov 2018 18:25:39 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CD3166B2290; Tue, 20 Nov 2018 18:25:39 -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 BE8026B2291; Tue, 20 Nov 2018 18:25:39 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 785406B228E for ; Tue, 20 Nov 2018 18:25:39 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id m13so4283862pls.15 for ; Tue, 20 Nov 2018 15:25:39 -0800 (PST) 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=yyixc6IwTRlo7HnHFCbTt02hp0EiiBvQlPqautOxqSk=; b=st2TD8vLaUvfaNtrOpQ9qSDnZtAnc6V1aQlTb6+87jGKBEJwfYBDCwtWgzlhsy/IOh QHuHA0W2c+1nBq+1cVIcbf0eZ2xlKXDow5RmYZMIKNLd9ous6jNqR+e/MVupOxiy8QQV 8xrPTrPVdxLmbKI391Ai7l3VcbBArwvzvFMxbq3gb6tiDmOlp3oN0cMvCr3AUQc/66G5 1U5FKN11hY9zZPNLt3mZjomYayHhgsjy1k/vP9K8AC7Z5gW5NVtiqPgfOsyO9ZhLKcw4 Zod2/2bb6cQz03HxKw0v6ae1adx9KqLz+/7E13EjiRPAkyrE2Q8GyM5glLXGOLIsg4mQ Z/Lw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.93 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: AGRZ1gIuU1PezxZeT8UDxz7pL5pE5s+a2l/NTEq3XycJP+Eglkrhfogm E7EsyEWWqATK/nUJIlMlIIoahl04Lmeo+IzrPxdnPw79DdX4Gc/JGHEO3EXQh0VplWIQhh2qJsc 0eLZxjVmj/sZwdGiEPACj0H5uLnbtyt/omxXW8e5mzJAC3UgEz5eMP/6hVRfzYoR7WA== X-Received: by 2002:a62:d148:: with SMTP id t8mr4399645pfl.52.1542756339130; Tue, 20 Nov 2018 15:25:39 -0800 (PST) X-Google-Smtp-Source: AJdET5dX2BvcQ4QdQgb3+b2ctbSEjYwakoaHriF8hp51ObR8w6ZXG1a6je7x2/qCmAa1b5x0BpKv X-Received: by 2002:a62:d148:: with SMTP id t8mr4399603pfl.52.1542756338451; Tue, 20 Nov 2018 15:25:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542756338; cv=none; d=google.com; s=arc-20160816; b=SG+9UEO4yW6rQm7nPb7jae0OJQSAP4NQlPGXdJbX7jnlTmKWEsSZjVhvMJtCL3DhR+ fbFmxyR2CXpxeLMpQ7DR1MGOiySMZraOuUjhx1T5S+O+C7u0AZPXAK0/kR/tOfYlF9Bn zY6Tt0L+BAZtreQdcbwTU7B+wjlEzvE3ZqsrtZY1aa3BFzDi2g6i8340dGIbUc8Wn//y 4ApQL13kkyouLEtEyIq0fAAK40mMs6W642uYCBOuFVBLkrs9UucuWB33fdc7hWrO8J+1 0sHxXXMb5qP3IUokczXjWkS3V7EXUr+lqF8AC1qrvK4QPwAj2fnZHXnNP/MPYRxWhvYW +RLA== 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; bh=yyixc6IwTRlo7HnHFCbTt02hp0EiiBvQlPqautOxqSk=; b=sLvwFgIfm9PLWb4kiXrzHhQueoB+9jgemDhwl1ROHdOdDHGrJuxzeI+W9f3obYzFgo hkqC1OnB57b4HaRA2dpTuuyxfJVspmALalu+PxDHGSqVdPEBzPSpuoF7nvIU78DaYSDX ImibDXa+0U7XRrxheHsScrMO5omwkd5UG5V9Gd/7wjxex9ymNZARhLLatjUuFW8mVdOS EIJP/OW6FwPf6V3AAdPe8YMGe/j7GiM4EebBzToFijKSJEyko85/qKBrC5gyfJ9umISN mP60QT8Crqu1ppIpWQ6DTspjbkcLrcw1tGSfpvvmAqGIlZOia1yjf2QlwwfulGLznyJG pl/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id p5-v6si16818720plo.7.2018.11.20.15.25.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 15:25:38 -0800 (PST) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.93 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 orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 15:25:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,258,1539673200"; d="scan'208";a="101868625" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga003.jf.intel.com with ESMTP; 20 Nov 2018 15:25:37 -0800 Subject: [PATCH v8 4/7] mm, devm_memremap_pages: Add MEMORY_DEVICE_PRIVATE support From: Dan Williams To: akpm@linux-foundation.org Cc: =?utf-8?b?SsOpcsO0bWU=?= Glisse , Christoph Hellwig , Logan Gunthorpe , Logan Gunthorpe , torvalds@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 20 Nov 2018 15:13:10 -0800 Message-ID: <154275559036.76910.12434636179931292607.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154275556908.76910.8966087090637564219.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154275556908.76910.8966087090637564219.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 consolidating all ZONE_DEVICE enabling via devm_memremap_pages(), teach it how to handle the constraints of MEMORY_DEVICE_PRIVATE ranges. Reviewed-by: Jérôme Glisse [jglisse: call move_pfn_range_to_zone for MEMORY_DEVICE_PRIVATE] Acked-by: Christoph Hellwig Reported-by: Logan Gunthorpe Reviewed-by: Logan Gunthorpe Signed-off-by: Dan Williams --- kernel/memremap.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index 5e45f0c327a5..3eef989ef035 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -98,9 +98,15 @@ static void devm_memremap_pages_release(void *data) - align_start; mem_hotplug_begin(); - arch_remove_memory(align_start, align_size, pgmap->altmap_valid ? - &pgmap->altmap : NULL); - kasan_remove_zero_shadow(__va(align_start), align_size); + if (pgmap->type == MEMORY_DEVICE_PRIVATE) { + pfn = align_start >> PAGE_SHIFT; + __remove_pages(page_zone(pfn_to_page(pfn)), pfn, + align_size >> PAGE_SHIFT, NULL); + } else { + arch_remove_memory(align_start, align_size, + pgmap->altmap_valid ? &pgmap->altmap : NULL); + kasan_remove_zero_shadow(__va(align_start), align_size); + } mem_hotplug_done(); untrack_pfn(NULL, PHYS_PFN(align_start), align_size); @@ -187,17 +193,40 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) goto err_pfn_remap; mem_hotplug_begin(); - error = kasan_add_zero_shadow(__va(align_start), align_size); - if (error) { - mem_hotplug_done(); - goto err_kasan; + + /* + * For device private memory we call add_pages() as we only need to + * allocate and initialize struct page for the device memory. More- + * over the device memory is un-accessible thus we do not want to + * create a linear mapping for the memory like arch_add_memory() + * would do. + * + * For all other device memory types, which are accessible by + * the CPU, we do want the linear mapping and thus use + * arch_add_memory(). + */ + if (pgmap->type == MEMORY_DEVICE_PRIVATE) { + error = add_pages(nid, align_start >> PAGE_SHIFT, + align_size >> PAGE_SHIFT, NULL, false); + } else { + error = kasan_add_zero_shadow(__va(align_start), align_size); + if (error) { + mem_hotplug_done(); + goto err_kasan; + } + + error = arch_add_memory(nid, align_start, align_size, altmap, + false); + } + + if (!error) { + struct zone *zone; + + zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; + move_pfn_range_to_zone(zone, align_start >> PAGE_SHIFT, + align_size >> PAGE_SHIFT, altmap); } - error = arch_add_memory(nid, align_start, align_size, altmap, false); - if (!error) - move_pfn_range_to_zone(&NODE_DATA(nid)->node_zones[ZONE_DEVICE], - align_start >> PAGE_SHIFT, - align_size >> PAGE_SHIFT, altmap); mem_hotplug_done(); if (error) goto err_add_memory;