From patchwork Wed May 23 05:10:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10420165 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 8F15A6016C for ; Wed, 23 May 2018 05:20:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D18A2909D for ; Wed, 23 May 2018 05:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 705F62909F; Wed, 23 May 2018 05:20:40 +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 C23082909D for ; Wed, 23 May 2018 05:20:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55DE76B0008; Wed, 23 May 2018 01:20:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 50D336B000A; Wed, 23 May 2018 01:20:38 -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 3FEC06B000C; Wed, 23 May 2018 01:20:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id F0B716B0008 for ; Wed, 23 May 2018 01:20:37 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id j14-v6so12423782pfn.11 for ; Tue, 22 May 2018 22:20:37 -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=KqDs1SdZEi3yf0/95kNN/vQ2SEiMwWchHlNelSwU32w=; b=H5I/8lV2cbRILcbXPYvdxGjBD0krhjCybTO1X7A/ym8ZZIdP/zBXtAd+q5kJkyWNPf WzcyoO88WtQKcZOmjY+cWBXo5rwL0CdC2PXJlUd6oF2nhYdwpLsDi2YKIUH9NsI+UYfE sV6JTuqyRcI1hZiWl6Xsk3oRbi+eRDG6NQairnYkrZ8GUCgqtUGaRbD8FYNxN0+D9wGb LINX4FVnAnXMii47IDyC+GmWO1m8ew4za3O8glTT/jDVdQf9GWpb08CNYcVaneLpe59W beOVyTxuGtioPJ9RlOvcYjU6005JCorMgUdf94xcPM5ddorgjtUAy6E9YC0QFTw21Eu3 lFLQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 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: ALKqPweM96fwIyoz03z7uGRTvROllvMz87xQmvnKTTB8tZHtRFQPCzIz 7PhgJdzg23cuCwyAcNCtAN84r0d/nPIHPLTCnSgpsxnQox1ieRwOeyZ8g5ma7YWU8CCX+7sWEZO xOOgTQWshzbNYRYR2eTNnJLXpBglZyLft8Um30tX4Fos9L4VOBPrx8Cryj9SYK8hxTg== X-Received: by 2002:a62:4d02:: with SMTP id a2-v6mr1430698pfb.2.1527052837675; Tue, 22 May 2018 22:20:37 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqJh09qbMs1rUySGfXl0UWtybJVz/vSl36Fd7iONBUtpU/ujZQ1kcSWZIci8GkDn7SNsx6N X-Received: by 2002:a62:4d02:: with SMTP id a2-v6mr1430660pfb.2.1527052836831; Tue, 22 May 2018 22:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527052836; cv=none; d=google.com; s=arc-20160816; b=ZnFEK9ck6wnsjqkISWyyM+0UojHa8fdzQzRwptDrpQ8a3RKS3Mhgijujy74lWI6hAJ pG5OSSUSsZ0tv0l5rYohgWf5u/kzVp859dmQDmQV2zYZmSvh2GQhrtFJ6/pOzsaVcnw7 Nyrg1I4Ou0wExI213L2Nu7bYny7B9aFXxE/URIzZKvaI4WD1UeOLC4316EDsEfVxmZQg 7lFERKY3yDz15BDeV+kgInBR+UfaADL0vB126Ib7MeQ88D7WxDJCiDrMqcvF2OgBJw8p OTlOvemeqlmYiBNZiVbg3CmXF5B8OsJLZzZ5iy12oX3W7KdlVHnWoQGgSePhmsYLBgEQ fQpw== 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=KqDs1SdZEi3yf0/95kNN/vQ2SEiMwWchHlNelSwU32w=; b=aCINbAPS8waBBpL/PHXtrP3Ze9VZMKm1nqz9bp7rSnnxsr8trahRoUDDbpGZGONmGA iEskSbUCQSjz/sbYC9KiHw3W1Augw/21jeJnJInM0Wu0GqWbw8VLAYsw8MK7ha8/P3rU v1EfXNVmpBYiYTRwogHvmRdIZSRSmfQXgcVEwbFDTmluszo79d4F2u/7x5Gt9Q+Hgu7x DHpLYv3VBBPBv8zWged313+Gwcv0yyp3d80SEy8om0NBwAf3ax4n7y5bTgNpU/Rq8zkd 3GfLyEGe1v6qJiKWJLTVRsiKCXoTthMSXi26ZoM/cBcQXBTiKSVd1HofaRKnG3lMejP0 xfgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id p12-v6si14532529pgr.660.2018.05.22.22.20.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 22:20:36 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 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 orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 22:20:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,431,1520924400"; d="scan'208";a="60950340" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga002.jf.intel.com with ESMTP; 22 May 2018 22:20:35 -0700 Subject: [PATCH v2 4/7] mm, devm_memremap_pages: Add MEMORY_DEVICE_PRIVATE support From: Dan Williams To: akpm@linux-foundation.org Cc: Christoph Hellwig , =?utf-8?b?SsOpcsO0bWU=?= Glisse , Logan Gunthorpe , linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Tue, 22 May 2018 22:10:39 -0700 Message-ID: <152705223910.21414.17294372359464462569.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <152705221686.21414.771870778478134768.stgit@dwillia2-desk3.amr.corp.intel.com> References: <152705221686.21414.771870778478134768.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. Cc: Christoph Hellwig Cc: "Jérôme Glisse" Reported-by: Logan Gunthorpe Signed-off-by: Dan Williams Reviewed-by: Logan Gunthorpe --- kernel/memremap.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index dfec0801f652..89eed25e2a80 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -303,8 +303,13 @@ 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); + 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); mem_hotplug_done(); untrack_pfn(NULL, PHYS_PFN(align_start), align_size); @@ -388,11 +393,32 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap, goto err_pfn_remap; mem_hotplug_begin(); - 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, + + /* + * 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 { + struct zone *zone; + + error = arch_add_memory(nid, align_start, align_size, altmap, + false); + 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); + } + mem_hotplug_done(); if (error) goto err_add_memory;