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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6B64C19F2B for ; Fri, 29 Jul 2022 06:21:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E53E6B0071; Fri, 29 Jul 2022 02:21:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 794BC8E0001; Fri, 29 Jul 2022 02:21:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65D7A6B0073; Fri, 29 Jul 2022 02:21:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 57E886B0071 for ; Fri, 29 Jul 2022 02:21:00 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1D7491A1581 for ; Fri, 29 Jul 2022 06:21:00 +0000 (UTC) X-FDA: 79739139480.01.940373F Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf14.hostedemail.com (Postfix) with ESMTP id F3809100042 for ; Fri, 29 Jul 2022 06:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659075659; x=1690611659; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=p53zOWl9ehLCjjDCiyqYBG5Q0r1x8FuF8Dzv+TD7iFE=; b=mQdDX3PNhPiN6jvDEY6bIiLTlsfrgY7a3Gry/c1iFvq8ZsDFv7Na1Sug T0ZrnIEZhm1YodEi+kH+Ps2c/XQXibsAhBHInBBzQ04RJnpaH0hnSvqBS zZozbL9pmjZ2hBAJbKHqSaKYM6mw9wRbYpTfFqJEzBWCcEGycDOF5r3VO 2MOw3UWb/AnUAjs96iQeXzaeU5BxkeF/0nN++UZDEvbmI9dLAaFC4AD9q ojmc4zP2iHu3CLwtt3AlFzmpvIwfmoXLX5l1vnCP3RL5seAG8iKrIwTCf qDnnsZfp1XrrZiojD4cgJ8A+A+gUab6NFF9Z/Pi87Y+rtF9hDO7BadU+t w==; X-IronPort-AV: E=McAfee;i="6400,9594,10422"; a="288715765" X-IronPort-AV: E=Sophos;i="5.93,200,1654585200"; d="scan'208";a="288715765" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2022 23:20:55 -0700 X-IronPort-AV: E=Sophos;i="5.93,200,1654585200"; d="scan'208";a="928629089" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.239.13.94]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2022 23:20:51 -0700 From: "Huang, Ying" To: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org, akpm@linux-foundation.org, Wei Xu , Yang Shi , Davidlohr Bueso , Tim C Chen , Michal Hocko , Linux Kernel Mailing List , Hesham Almatary , Dave Hansen , Jonathan Cameron , Alistair Popple , Dan Williams , Johannes Weiner , jvgediya.oss@gmail.com Subject: Re: [PATCH v11 4/8] mm/demotion/dax/kmem: Set node's abstract distance to MEMTIER_ADISTANCE_PMEM References: <20220728190436.858458-1-aneesh.kumar@linux.ibm.com> <20220728190436.858458-5-aneesh.kumar@linux.ibm.com> Date: Fri, 29 Jul 2022 14:20:47 +0800 In-Reply-To: <20220728190436.858458-5-aneesh.kumar@linux.ibm.com> (Aneesh Kumar K. V.'s message of "Fri, 29 Jul 2022 00:34:32 +0530") Message-ID: <875yjgmocg.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=mQdDX3PN; spf=pass (imf14.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659075659; a=rsa-sha256; cv=none; b=B70dW5qpEIm6GGTl7+IXHkP4uqFb44Ji8w8+o0nLsXXSMYmauZIoxSdFLjSz8UhBeusBJD aEuE59WhsmwdyAu1dZN8zjb19eIn57Y4xQTGT+vqkLn9fq3GW51tSiReo+WtQAoFPbWGFk 2rPsxSSC+D21atm9OxQPQo3GEMbOtZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659075659; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/k3Pqr46bHEPOkKAt0HXn97lzhx+nJmqIWucpNpTiBo=; b=MvfrTTYcV9voYABUpSenfbb9fd6SXy5SiUaW6hy0HlZhmzLLDBRr99RbZA9Gacp+s7+DkC qP3ZECa9S57Qg4cLnJd0exkVXVztSMub4KwSOUmZRoucqUflsMLsHeNU5MBza1jdtamxfm srDT5KNKXmhmboqGkxC3xtvv4AHfeTQ= X-Rspamd-Queue-Id: F3809100042 Authentication-Results: imf14.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=mQdDX3PN; spf=pass (imf14.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Rspamd-Server: rspam01 X-Rspam-User: X-Stat-Signature: gu9153mr5i1e6gazt6qegp46mz61oh4r X-HE-Tag: 1659075658-442325 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: "Aneesh Kumar K.V" writes: > By default, all nodes are assigned to the default memory tier which > is the memory tier designated for nodes with DRAM > > Set dax kmem device node's tier to slower memory tier by assigning > abstract distance to MEMTIER_ADISTANCE_PMEM. PMEM tier > appears below the default memory tier in demotion order. > > Signed-off-by: Aneesh Kumar K.V > --- > drivers/dax/kmem.c | 9 +++++++++ > include/linux/memory-tiers.h | 19 ++++++++++++++++++- > mm/memory-tiers.c | 28 ++++++++++++++++------------ > 3 files changed, 43 insertions(+), 13 deletions(-) > > diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c > index a37622060fff..6b0d5de9a3e9 100644 > --- a/drivers/dax/kmem.c > +++ b/drivers/dax/kmem.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include "dax-private.h" > #include "bus.h" > > @@ -41,6 +42,12 @@ struct dax_kmem_data { > struct resource *res[]; > }; > > +static struct memory_dev_type default_pmem_type = { Why is this named as default_pmem_type? We will not change the memory type of a node usually. > + .adistance = MEMTIER_ADISTANCE_PMEM, > + .tier_sibiling = LIST_HEAD_INIT(default_pmem_type.tier_sibiling), > + .nodes = NODE_MASK_NONE, > +}; > + > static int dev_dax_kmem_probe(struct dev_dax *dev_dax) > { > struct device *dev = &dev_dax->dev; > @@ -62,6 +69,8 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) > return -EINVAL; > } > > + init_node_memory_type(numa_node, &default_pmem_type); > + The memory hot-add below may fail. So the error handling needs to be added. And, it appears that the memory type and memory tier of a node may be fully initialized here before NUMA hot-adding started. So I suggest to set node_memory_types[] here only. And set memory_dev_type->nodes in node hot-add callback. I think there is the proper place to complete the initialization. And, in theory dax/kmem.c can be unloaded. So we need to clear node_memory_types[] for nodes somewhere. Best Regards, Huang, Ying > for (i = 0; i < dev_dax->nr_range; i++) { > struct range range; > > diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h > index 976f43a5e3be..4f4baf0bf430 100644 > --- a/include/linux/memory-tiers.h > +++ b/include/linux/memory-tiers.h > @@ -2,6 +2,8 @@ > #ifndef _LINUX_MEMORY_TIERS_H > #define _LINUX_MEMORY_TIERS_H > > +#include > +#include > /* > * Each tier cover a abstrace distance chunk size of 128 > */ > @@ -15,12 +17,27 @@ > #define MEMTIER_ADISTANCE_PMEM (1 << MEMTIER_CHUNK_BITS) > #define MEMTIER_HOTPLUG_PRIO 100 > > +struct memory_tier; > +struct memory_dev_type { > + /* list of memory types that are are part of same tier as this type */ > + struct list_head tier_sibiling; > + /* abstract distance for this specific memory type */ > + int adistance; > + /* Nodes of same abstract distance */ > + nodemask_t nodes; > + struct memory_tier *memtier; > +}; > + > #ifdef CONFIG_NUMA > -#include > extern bool numa_demotion_enabled; > +struct memory_dev_type *init_node_memory_type(int node, struct memory_dev_type *default_type); > > #else > > #define numa_demotion_enabled false > +static inline struct memory_dev_type *init_node_memory_type(int node, struct memory_dev_type *default_type) > +{ > + return ERR_PTR(-EINVAL); > +} > #endif /* CONFIG_NUMA */ > #endif /* _LINUX_MEMORY_TIERS_H */ > diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c > index c9854a394d9b..109be75fa554 100644 > --- a/mm/memory-tiers.c > +++ b/mm/memory-tiers.c > @@ -1,6 +1,4 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include > -#include > #include > #include > #include > @@ -19,16 +17,6 @@ struct memory_tier { > int adistance_start; > }; > > -struct memory_dev_type { > - /* list of memory types that are are part of same tier as this type */ > - struct list_head tier_sibiling; > - /* abstract distance for this specific memory type */ > - int adistance; > - /* Nodes of same abstract distance */ > - nodemask_t nodes; > - struct memory_tier *memtier; > -}; > - > static DEFINE_MUTEX(memory_tier_lock); > static LIST_HEAD(memory_tiers); > struct memory_dev_type *node_memory_types[MAX_NUMNODES]; > @@ -141,6 +129,22 @@ static void clear_node_memory_tier(int node) > mutex_unlock(&memory_tier_lock); > } > > +struct memory_dev_type *init_node_memory_type(int node, struct memory_dev_type *default_type) > +{ > + struct memory_dev_type *mem_type; > + > + mutex_lock(&memory_tier_lock); > + if (node_memory_types[node]) { > + mem_type = node_memory_types[node]; > + } else { > + node_memory_types[node] = default_type; > + node_set(node, default_type->nodes); > + mem_type = default_type; > + } > + mutex_unlock(&memory_tier_lock); > + return mem_type; > +} > + > static int __meminit memtier_hotplug_callback(struct notifier_block *self, > unsigned long action, void *_arg) > {