Received: by 2002:ac0:8c8e:0:0:0:0:0 with SMTP id r14csp535311ima; Wed, 6 Feb 2019 04:25:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IbdpAPO6JjWbBzyF8AOy0P9/xSwzmI//Dv0kpTWncd7VJOhiOIaz7DAlHn3k7QmMHaO8vCj X-Received: by 2002:aa7:85d7:: with SMTP id z23mr10522718pfn.205.1549455914379; Wed, 06 Feb 2019 04:25:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549455914; cv=none; d=google.com; s=arc-20160816; b=RZk+yfIsnfPRmYr5/FneUMohNIhlWeADPuA3Ob1GMQEeLaxZhKg7VP/M2hqFpLniv8 HLobfSAe6ZYS1137HNLT0x8xRI2fRUIL/rDSdvjysQngEdq4j41/qV5hcu3sItyrm3dC aQccTfk7BlaPASyOlA8kFEUFhvfNfDLvRnUBQosEp9FgGRZ3X5pQTK/3mEVGJxPsKx7B CrPHA5Haol9SoPxwo+j9ftvdcmUeYvorypT5M2giO3rLJElWQzmqu/Ce4P4ocMduvJiQ qRIIbX0QFhlPQ9S9jVbstVViKY6sn0jPKf6aR1Ukc2D5BPZ2w+C11mg/8yJImfpd21QE S5Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=Ojj961/53Bcfzm76vFJhYKHHstUcsi9q5IQAvgnDjkw=; b=oQEiMtNDTgH3QlAw0IkxToGlOYUl5Hu6LeIUfMtHm4IgO/JGqGlRaEFnhdcXNAyMOM 6TOt5lyKS50I2MctHiDtr22xgUeaq0y1LVn/To+I8boZjzPU8gCJf0KWReDBKJmMT4CM WzPboZttnVPIrA3d04+n/lPO6xAlOpZEF8EkT6JVMRYLa8STIqNs5Q5cHzPIVaEEVmGz FC2H0JfUl9eYfXKZfS4fMHjtwSvQ6xxzxSAY9bIHoi65w3ZusP3yEsrYTp3NICh6q+5s jZR+xwczBt9+A7iDv2mVyb+FKtHzxfikM03K4gP5jDkQ2PZcGtmkKByP9jgtlKlsjRgB IrDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 204si6216388pfu.273.2019.02.06.04.24.58; Wed, 06 Feb 2019 04:25:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729663AbfBFMYw (ORCPT + 99 others); Wed, 6 Feb 2019 07:24:52 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:48782 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727697AbfBFMYw (ORCPT ); Wed, 6 Feb 2019 07:24:52 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C9EFFDC6DAE8CF0E7C38; Wed, 6 Feb 2019 20:24:49 +0800 (CST) Received: from localhost (10.202.226.61) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.408.0; Wed, 6 Feb 2019 20:24:46 +0800 Date: Wed, 6 Feb 2019 12:24:35 +0000 From: Jonathan Cameron To: Keith Busch CC: , , , Greg Kroah-Hartman , "Rafael Wysocki" , Dave Hansen , "Dan Williams" Subject: Re: [PATCHv5 08/10] node: Add memory caching attributes Message-ID: <20190206122435.00001f95@huawei.com> In-Reply-To: <20190124230724.10022-9-keith.busch@intel.com> References: <20190124230724.10022-1-keith.busch@intel.com> <20190124230724.10022-9-keith.busch@intel.com> Organization: Huawei X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.226.61] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 24 Jan 2019 16:07:22 -0700 Keith Busch wrote: > System memory may have side caches to help improve access speed to > frequently requested address ranges. While the system provided cache is > transparent to the software accessing these memory ranges, applications > can optimize their own access based on cache attributes. > > Provide a new API for the kernel to register these memory side caches > under the memory node that provides it. > > The new sysfs representation is modeled from the existing cpu cacheinfo > attributes, as seen from /sys/devices/system/cpu//side_cache/. /cache/? > Unlike CPU cacheinfo though, the node cache level is reported from > the view of the memory. A higher number is nearer to the CPU, while > lower levels are closer to the backing memory. Also unlike CPU cache, > it is assumed the system will handle flushing any dirty cached memory > to the last level on a power failure if the range is persistent memory. That's a design choice. A sensible one perhaps, but not a requirement of this infrastructure. Not that it really matters as who reads patch descriptions after they are applied? :) > > The attributes we export are the cache size, the line size, associativity, > and write back policy. > > Add the attributes for the system memory side caches to sysfs stable > documentation. > > Signed-off-by: Keith Busch A few minor points inline. > --- > Documentation/ABI/stable/sysfs-devices-node | 34 +++++++ > drivers/base/node.c | 153 ++++++++++++++++++++++++++++ > include/linux/node.h | 34 +++++++ > 3 files changed, 221 insertions(+) > > diff --git a/Documentation/ABI/stable/sysfs-devices-node b/Documentation/ABI/stable/sysfs-devices-node > index 41cb9345e1e0..26327279b6b6 100644 > --- a/Documentation/ABI/stable/sysfs-devices-node > +++ b/Documentation/ABI/stable/sysfs-devices-node > @@ -142,3 +142,37 @@ Contact: Keith Busch > Description: > This node's write latency in nanoseconds when access > from nodes found in this class's linked initiators. > + > +What: /sys/devices/system/node/nodeX/side_cache/indexY/associativity > +Date: December 2018 > +Contact: Keith Busch > +Description: > + The caches associativity: 0 for direct mapped, non-zero if > + indexed. > + > +What: /sys/devices/system/node/nodeX/side_cache/indexY/level > +Date: December 2018 > +Contact: Keith Busch > +Description: > + This cache's level in the memory hierarchy. Matches 'Y' in the > + directory name. Mentioned in the docs, but I'm not sure why we need this given it matches the directory name in which it is found... For the cpu caches they aren't the same (data vs instruction) for example. > + > +What: /sys/devices/system/node/nodeX/side_cache/indexY/line_size > +Date: December 2018 > +Contact: Keith Busch > +Description: > + The number of bytes accessed from the next cache level on a > + cache miss. > + > +What: /sys/devices/system/node/nodeX/side_cache/indexY/size > +Date: December 2018 > +Contact: Keith Busch > +Description: > + The size of this memory side cache in bytes. > + > +What: /sys/devices/system/node/nodeX/side_cache/indexY/write_policy > +Date: December 2018 > +Contact: Keith Busch > +Description: > + The cache write policy: 0 for write-back, 1 for write-through, > + other or unknown. > diff --git a/drivers/base/node.c b/drivers/base/node.c > index 2de546a040a5..9b4cb29863ff 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -205,6 +205,157 @@ void node_set_perf_attrs(unsigned int nid, struct node_hmem_attrs *hmem_attrs, > } > } > } > + > +/** > + * struct node_cache_info - Internal tracking for memory node caches > + * @dev: Device represeting the cache level > + * @node: List element for tracking in the node > + * @cache_attrs:Attributes for this cache level > + */ > +struct node_cache_info { > + struct device dev; > + struct list_head node; > + struct node_cache_attrs cache_attrs; > +}; > +#define to_cache_info(device) container_of(device, struct node_cache_info, dev) > + > +#define CACHE_ATTR(name, fmt) \ > +static ssize_t name##_show(struct device *dev, \ > + struct device_attribute *attr, \ > + char *buf) \ > +{ \ > + return sprintf(buf, fmt "\n", to_cache_info(dev)->cache_attrs.name);\ > +} \ > +DEVICE_ATTR_RO(name); > + > +CACHE_ATTR(size, "%llu") > +CACHE_ATTR(level, "%u") > +CACHE_ATTR(line_size, "%u") > +CACHE_ATTR(associativity, "%u") > +CACHE_ATTR(write_policy, "%u") > + > +static struct attribute *cache_attrs[] = { > + &dev_attr_level.attr, > + &dev_attr_associativity.attr, > + &dev_attr_size.attr, > + &dev_attr_line_size.attr, > + &dev_attr_write_policy.attr, > + NULL, > +}; > +ATTRIBUTE_GROUPS(cache); > + > +static void node_cache_release(struct device *dev) > +{ > + kfree(dev); > +} > + > +static void node_cacheinfo_release(struct device *dev) > +{ > + struct node_cache_info *info = to_cache_info(dev); > + kfree(info); > +} > + > +static void node_init_cache_dev(struct node *node) > +{ > + struct device *dev; > + > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > + if (!dev) > + return; > + > + dev->parent = &node->dev; > + dev->release = node_cache_release; > + if (dev_set_name(dev, "side_cache")) > + goto free_dev; > + > + if (device_register(dev)) > + goto free_name; > + > + pm_runtime_no_callbacks(dev); > + node->cache_dev = dev; > + return; > +free_name: > + kfree_const(dev->kobj.name); > +free_dev: > + kfree(dev); > +} > + > +/** > + * node_add_cache - add cache attribute to a memory node This is almost but not quite in kernel-doc. node_add_cache() - add IIRC. > + * @nid: Node identifier that has new cache attributes > + * @cache_attrs: Attributes for the cache being added > + */ > +void node_add_cache(unsigned int nid, struct node_cache_attrs *cache_attrs) > +{ > + struct node_cache_info *info; > + struct device *dev; > + struct node *node; > + > + if (!node_online(nid) || !node_devices[nid]) > + return; > + > + node = node_devices[nid]; > + list_for_each_entry(info, &node->cache_attrs, node) { > + if (info->cache_attrs.level == cache_attrs->level) { > + dev_warn(&node->dev, > + "attempt to add duplicate cache level:%d\n", > + cache_attrs->level); > + return; > + } > + } > + > + if (!node->cache_dev) > + node_init_cache_dev(node); > + if (!node->cache_dev) > + return; > + > + info = kzalloc(sizeof(*info), GFP_KERNEL); > + if (!info) > + return; > + > + dev = &info->dev; > + dev->parent = node->cache_dev; > + dev->release = node_cacheinfo_release; > + dev->groups = cache_groups; > + if (dev_set_name(dev, "index%d", cache_attrs->level)) > + goto free_cache; > + > + info->cache_attrs = *cache_attrs; > + if (device_register(dev)) { > + dev_warn(&node->dev, "failed to add cache level:%d\n", > + cache_attrs->level); > + goto free_name; > + } > + pm_runtime_no_callbacks(dev); > + list_add_tail(&info->node, &node->cache_attrs); > + return; > +free_name: > + kfree_const(dev->kobj.name); > +free_cache: > + kfree(info); > +} > + > +static void node_remove_caches(struct node *node) > +{ > + struct node_cache_info *info, *next; > + > + if (!node->cache_dev) > + return; > + > + list_for_each_entry_safe(info, next, &node->cache_attrs, node) { > + list_del(&info->node); > + device_unregister(&info->dev); > + } > + device_unregister(node->cache_dev); > +} > + > +static void node_init_caches(unsigned int nid) > +{ > + INIT_LIST_HEAD(&node_devices[nid]->cache_attrs); > +} > +#else > +static void node_init_caches(unsigned int nid) { } > +static void node_remove_caches(struct node *node) { } > #endif > > #define K(x) ((x) << (PAGE_SHIFT - 10)) > @@ -489,6 +640,7 @@ void unregister_node(struct node *node) > { > hugetlb_unregister_node(node); /* no-op, if memoryless node */ > node_remove_accesses(node); > + node_remove_caches(node); > device_unregister(&node->dev); > } > > @@ -781,6 +933,7 @@ int __register_one_node(int nid) > INIT_LIST_HEAD(&node_devices[nid]->access_list); > /* initialize work queue for memory hot plug */ > init_node_hugetlb_work(nid); > + node_init_caches(nid); > > return error; > } > diff --git a/include/linux/node.h b/include/linux/node.h > index 2db077363d9c..842e4ab2ae6d 100644 > --- a/include/linux/node.h > +++ b/include/linux/node.h > @@ -37,6 +37,36 @@ struct node_hmem_attrs { > }; > void node_set_perf_attrs(unsigned int nid, struct node_hmem_attrs *hmem_attrs, > unsigned access); > + > +enum cache_associativity { > + NODE_CACHE_DIRECT_MAP, > + NODE_CACHE_INDEXED, > + NODE_CACHE_OTHER, > +}; > + > +enum cache_write_policy { > + NODE_CACHE_WRITE_BACK, > + NODE_CACHE_WRITE_THROUGH, > + NODE_CACHE_WRITE_OTHER, > +}; > + > +/** > + * struct node_cache_attrs - system memory caching attributes > + * > + * @associativity: The ways memory blocks may be placed in cache > + * @write_policy: Write back or write through policy > + * @size: Total size of cache in bytes > + * @line_size: Number of bytes fetched on a cache miss > + * @level: Represents the cache hierarchy level > + */ > +struct node_cache_attrs { > + enum cache_associativity associativity; > + enum cache_write_policy write_policy; > + u64 size; > + u16 line_size; > + u8 level; > +}; > +void node_add_cache(unsigned int nid, struct node_cache_attrs *cache_attrs); > #endif > > struct node { > @@ -45,6 +75,10 @@ struct node { > #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS) > struct work_struct node_work; > #endif > +#ifdef CONFIG_HMEM_REPORTING > + struct list_head cache_attrs; > + struct device *cache_dev; > +#endif > }; > > struct memory_block;