From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADAA1C04EB9 for ; Mon, 3 Dec 2018 23:36:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7521B2145D for ; Mon, 3 Dec 2018 23:36:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7521B2145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726211AbeLCXgI (ORCPT ); Mon, 3 Dec 2018 18:36:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23940 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726202AbeLCXgG (ORCPT ); Mon, 3 Dec 2018 18:36:06 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A90E4312E9FB; Mon, 3 Dec 2018 23:36:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-188.rdu2.redhat.com [10.10.120.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42AE2600C7; Mon, 3 Dec 2018 23:36:02 +0000 (UTC) From: jglisse@redhat.com To: linux-mm@kvack.org Cc: Andrew Morton , linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , "Rafael J . Wysocki" , Ross Zwisler , Dan Williams , Dave Hansen , Haggai Eran , Balbir Singh , "Aneesh Kumar K . V" , Benjamin Herrenschmidt , Felix Kuehling , Philip Yang , =?UTF-8?q?Christian=20K=C3=B6nig?= , Paul Blinzer , Logan Gunthorpe , John Hubbard , Ralph Campbell , Michal Hocko , Jonathan Cameron , Mark Hairgrove , Vivek Kini , Mel Gorman , Dave Airlie , Ben Skeggs , Andrea Arcangeli Subject: [RFC PATCH 07/14] mm/hms: register main memory with heterogenenous memory system Date: Mon, 3 Dec 2018 18:35:02 -0500 Message-Id: <20181203233509.20671-8-jglisse@redhat.com> In-Reply-To: <20181203233509.20671-1-jglisse@redhat.com> References: <20181203233509.20671-1-jglisse@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 03 Dec 2018 23:36:06 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jérôme Glisse Register main memory as target under HMS scheme. Memory is registered per node (one target device per node). We also create a default link to connect main memory and CPU that are in the same node. For details see Documentation/vm/hms.rst. This is done to allow application to use one API for regular memory or device memory. Signed-off-by: Jérôme Glisse Cc: Rafael J. Wysocki Cc: Ross Zwisler Cc: Dan Williams Cc: Dave Hansen Cc: Haggai Eran Cc: Balbir Singh Cc: Aneesh Kumar K.V Cc: Benjamin Herrenschmidt Cc: Felix Kuehling Cc: Philip Yang Cc: Christian König Cc: Paul Blinzer Cc: Logan Gunthorpe Cc: John Hubbard Cc: Ralph Campbell Cc: Michal Hocko Cc: Jonathan Cameron Cc: Mark Hairgrove Cc: Vivek Kini Cc: Mel Gorman Cc: Dave Airlie Cc: Ben Skeggs Cc: Andrea Arcangeli --- drivers/base/node.c | 65 +++++++++++++++++++++++++++++++++++++++++++- include/linux/node.h | 6 ++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 86d6cd92ce3d..05621ba3cf13 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -323,6 +323,11 @@ static int register_node(struct node *node, int num) if (error) put_device(&node->dev); else { + hms_link_register(&node->link, &node->dev, 0); + hms_target_register(&node->target, &node->dev, + num, NULL, 0, 0); + hms_link_target(node->link, node->target); + hugetlb_register_node(node); compaction_register_node(node); @@ -339,6 +344,9 @@ static int register_node(struct node *node, int num) */ void unregister_node(struct node *node) { + hms_target_unregister(&node->target); + hms_link_unregister(&node->link); + hugetlb_unregister_node(node); /* no-op, if memoryless node */ device_unregister(&node->dev); @@ -415,6 +423,9 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr); sect_end_pfn += PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { +#if defined(CONFIG_HMS) + unsigned long size = PAGE_SIZE; +#endif int page_nid; /* @@ -445,9 +456,35 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) if (ret) return ret; - return sysfs_create_link_nowarn(&mem_blk->dev.kobj, + ret = sysfs_create_link_nowarn(&mem_blk->dev.kobj, &node_devices[nid]->dev.kobj, kobject_name(&node_devices[nid]->dev.kobj)); + if (ret) + return ret; + +#if defined(CONFIG_HMS) + /* + * Right now here i do not see any easier way to get the size + * in bytes of valid memory that is added to this node. + */ + for (++pfn; pfn <= sect_end_pfn; pfn++) { + if (!pfn_present(pfn)) { + pfn = round_down(pfn + PAGES_PER_SECTION, + PAGES_PER_SECTION) - 1; + continue; + } + page_nid = get_nid_for_pfn(pfn); + if (page_nid < 0) + continue; + if (page_nid != nid) + continue; + size += PAGE_SIZE; + } + + hms_target_add_memory(node_devices[nid]->target, size); +#endif + + return 0; } /* mem section does not span the specified node */ return 0; @@ -471,6 +508,10 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, sect_start_pfn = section_nr_to_pfn(phys_index); sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { +#if defined(CONFIG_HMS) + unsigned long size = 0; + int page_nid; +#endif int nid; nid = get_nid_for_pfn(pfn); @@ -484,6 +525,28 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, kobject_name(&mem_blk->dev.kobj)); sysfs_remove_link(&mem_blk->dev.kobj, kobject_name(&node_devices[nid]->dev.kobj)); + +#if defined(CONFIG_HMS) + /* + * Right now here i do not see any easier way to get the size + * in bytes of valid memory that is added to this node. + */ + for (; pfn <= sect_end_pfn; pfn++) { + if (!pfn_present(pfn)) { + pfn = round_down(pfn + PAGES_PER_SECTION, + PAGES_PER_SECTION) - 1; + continue; + } + page_nid = get_nid_for_pfn(pfn); + if (page_nid < 0) + continue; + if (page_nid != nid) + break; + size += PAGE_SIZE; + } + + hms_target_remove_memory(node_devices[nid]->target, size); +#endif } NODEMASK_FREE(unlinked_nodes); return 0; diff --git a/include/linux/node.h b/include/linux/node.h index 257bb3d6d014..297b01d3c1ed 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -15,6 +15,7 @@ #ifndef _LINUX_NODE_H_ #define _LINUX_NODE_H_ +#include #include #include #include @@ -22,6 +23,11 @@ struct node { struct device dev; +#if defined(CONFIG_HMS) + struct hms_target *target; + struct hms_link *link; +#endif + #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS) struct work_struct node_work; #endif -- 2.17.2