From patchwork Tue Dec 18 04:23:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10734787 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 5F5666C5 for ; Tue, 18 Dec 2018 04:36:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E2632A77F for ; Tue, 18 Dec 2018 04:36:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 426742A784; Tue, 18 Dec 2018 04:36:18 +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 8741D2A77F for ; Tue, 18 Dec 2018 04:36:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A4288E0005; Mon, 17 Dec 2018 23:36:16 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 802608E0001; Mon, 17 Dec 2018 23:36:16 -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 6CA568E0005; Mon, 17 Dec 2018 23:36:16 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 2FFC48E0001 for ; Mon, 17 Dec 2018 23:36:16 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id d3so12573827pgv.23 for ; Mon, 17 Dec 2018 20:36:16 -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=9U+5fp7gpnvA/P2KndwCzAFeQtrVaHdpqHHk+CwYpQU=; b=X+WJANj+dvHGsCiv774YBCaTMbvH6FKCtExhfn6C4KUmIkJBstpH8gkzzAdkLr7Idl LNl1BaFIgu2UW/rKf0ot2aDXhGrUAt8GR+hbIRVw9BaUMuKstfAJjbgECSRL0MndZLGA 8m0/LHZO/dUwjlDtZuXmfXw1soo3CPYSJ1RhplVAhYvrAvfgWGSYwMAhZkRUbsRN+cMs xiP1DLVJhKYkCtM+otikqvjlP30x8fDPnv1lblOVOosVAK/bmp16WoY/TVBVVhgKvZXa n92pw27WxPhTXShaJgoqFbkG0UTk4V98MBcrqB43sPxHQ5n+QcWFTj1x//e8BsXbNXct dKQg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 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: AA+aEWb6ux81jb+2BRpmzSujV+0TqF22iXssYmxe6YrnPdyfBF1OWCLn p0FWtgmewRXBpTzErfQzfQnNF4db0sr8JoIR3Ta/BBl4RI+T9MgLm3y/Zh9MyS8v6S6BdydkbrB uFF+JGHHNwZrG88+/GfCFtL6PXSIKRvatV98w5wJle/ePwfho2Q1oAXl4VnR0felzsA== X-Received: by 2002:a62:160d:: with SMTP id 13mr15189003pfw.203.1545107775845; Mon, 17 Dec 2018 20:36:15 -0800 (PST) X-Google-Smtp-Source: AFSGD/UDTloLSgZfkx+G6F2ab1Jzmk1wapaJCxxxk3waMn+i4NxKLLIhp4ECdhf+gaNVzCp2YTG6 X-Received: by 2002:a62:160d:: with SMTP id 13mr15188977pfw.203.1545107774880; Mon, 17 Dec 2018 20:36:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545107774; cv=none; d=google.com; s=arc-20160816; b=sTecNPbVD4k1L1l9/lxgXaApWJSe7eTvIrTL8kAHXvwNytf/3sNdUJXcXeE2lIUSZN mxUgqcrMiOBqSfNo6RMLbMG8zc+pANGUPQQOy+EUuX8csl/Qv6MzckdmlZsnUQ3oBNZ/ HaF8sXGFhZKHdrlJIzo19c44c7e7m64fVpWRAo/lQZQZyzqzEC9gTCX6jvDJVU57iG5r AXdWKibj+EuhIthcDKJmo4DyaC+lwVZ0tbNwyIp/vCdojW5fb6/Zort0PEwY4fQQ1ONM 4d2EmiIU+unlB561OPORvYbB9eJtKbuqzaZmKK/XnkqSFGSx8GYPaXXuJZQp7Iv5FFtw 8P0g== 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=9U+5fp7gpnvA/P2KndwCzAFeQtrVaHdpqHHk+CwYpQU=; b=BWJrO43gZJZy0PGmijTNTyId7IwOvr/pF+vsO5dth+P/7TzK/Ck1mVNgmDx0xWg3an E+ArzYTo4Jme+mllr6A66mt3wkeJ9UDT7wP7jboS0iC2qS+mDXnHIsy+8Esp485W/QC0 b8Qip8+cEIfCg8O72MoUwSH0zeGUyjdCom/DRz7Ek6MGqbKYW+YDOtD9h1M/91jVWRAr UjvuJStiT7edjfIBq+c51xVcT2rmnveUK921zEBBLxcN1oHnvZcgVdcTipnET+BdO6Vs lWAoBq1GELtICZHPq68ASX7Slbz6uVaFOM46YJKkxNpZijK3/OX5cU3plXel4ALcywBc c9Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id e37si8444892plb.172.2018.12.17.20.36.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Dec 2018 20:36:14 -0800 (PST) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.115 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 fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Dec 2018 20:36:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,367,1539673200"; d="scan'208";a="303044346" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga006.fm.intel.com with ESMTP; 17 Dec 2018 20:36:14 -0800 Subject: [PATCH v6 3/6] acpi/numa: Set the memory-side-cache size in memblocks From: Dan Williams To: akpm@linux-foundation.org Cc: x86@kernel.org, "Rafael J. Wysocki" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Mike Rapoport , Keith Busch , linux-mm@kvack.org, x86@kernel.org, linux-kernel@vger.kernel.org, mgorman@suse.de Date: Mon, 17 Dec 2018 20:23:38 -0800 Message-ID: <154510701860.1941238.2239802602407206153.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154510700291.1941238.817190985966612531.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154510700291.1941238.817190985966612531.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 From: Keith Busch Add memblock based enumeration of memory-side-cache of System RAM. Detect the capability in early init through HMAT tables, and set the size in the address range memblocks if a direct mapped side cache is present. Cc: Cc: "Rafael J. Wysocki" Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Mike Rapoport Signed-off-by: Keith Busch Signed-off-by: Dan Williams --- arch/x86/Kconfig | 1 + drivers/acpi/numa.c | 32 ++++++++++++++++++++++++++++++++ include/linux/memblock.h | 38 ++++++++++++++++++++++++++++++++++++++ mm/Kconfig | 3 +++ mm/memblock.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8689e794a43c..3f9c413d8eb5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -171,6 +171,7 @@ config X86 select HAVE_KVM select HAVE_LIVEPATCH if X86_64 select HAVE_MEMBLOCK_NODE_MAP + select HAVE_MEMBLOCK_CACHE_INFO if ACPI_NUMA select HAVE_MIXED_BREAKPOINTS_REGS select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index f5e09c39ff22..ec7e849f1c19 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -40,6 +40,12 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS] static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; +struct mem_cacheinfo { + phys_addr_t size; + bool direct_mapped; +}; +static struct mem_cacheinfo side_cached_pxms[MAX_PXM_DOMAINS] __initdata; + unsigned char acpi_srat_revision __initdata; int acpi_numa __initdata; @@ -262,6 +268,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) u64 start, end; u32 hotpluggable; int node, pxm; + u64 cache_size; + bool direct; if (srat_disabled()) goto out_err; @@ -308,6 +316,13 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) pr_warn("SRAT: Failed to mark hotplug range [mem %#010Lx-%#010Lx] in memblock\n", (unsigned long long)start, (unsigned long long)end - 1); + cache_size = side_cached_pxms[pxm].size; + direct = side_cached_pxms[pxm].direct_mapped; + if (cache_size && + memblock_set_sidecache(start, ma->length, cache_size, direct)) + pr_warn("SRAT: Failed to mark side cached range [mem %#010Lx-%#010Lx] in memblock\n", + (unsigned long long)start, (unsigned long long)end - 1); + max_possible_pfn = max(max_possible_pfn, PFN_UP(end - 1)); return 0; @@ -411,6 +426,18 @@ acpi_parse_memory_affinity(union acpi_subtable_headers * header, return 0; } +static int __init +acpi_parse_cache(union acpi_subtable_headers *header, const unsigned long end) +{ + struct acpi_hmat_cache *c = (void *)header; + u32 attrs = (c->cache_attributes & ACPI_HMAT_CACHE_ASSOCIATIVITY) >> 8; + + if (attrs == ACPI_HMAT_CA_DIRECT_MAPPED) + side_cached_pxms[c->memory_PD].direct_mapped = true; + side_cached_pxms[c->memory_PD].size += c->cache_size; + return 0; +} + static int __init acpi_parse_srat(struct acpi_table_header *table) { struct acpi_table_srat *srat = (struct acpi_table_srat *)table; @@ -460,6 +487,11 @@ int __init acpi_numa_init(void) sizeof(struct acpi_table_srat), srat_proc, ARRAY_SIZE(srat_proc), 0); + acpi_table_parse_entries(ACPI_SIG_HMAT, + sizeof(struct acpi_table_hmat), + ACPI_HMAT_TYPE_CACHE, + acpi_parse_cache, 0); + cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, 0); } diff --git a/include/linux/memblock.h b/include/linux/memblock.h index aee299a6aa76..29c3c88a5207 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -52,6 +52,8 @@ enum memblock_flags { * @size: size of the region * @flags: memory region attributes * @nid: NUMA node id + * @cache_size: size of memory side cache in bytes + * @direct_mapped: true if direct mapped cache associativity exists */ struct memblock_region { phys_addr_t base; @@ -60,6 +62,10 @@ struct memblock_region { #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int nid; #endif +#ifdef CONFIG_HAVE_MEMBLOCK_CACHE_INFO + phys_addr_t cache_size; + bool direct_mapped; +#endif }; /** @@ -317,6 +323,38 @@ static inline int memblock_get_region_node(const struct memblock_region *r) } #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ +#ifdef CONFIG_HAVE_MEMBLOCK_CACHE_INFO +int memblock_set_sidecache(phys_addr_t base, phys_addr_t size, + phys_addr_t cache_size, bool direct_mapped); + +static inline bool memblock_sidecache_direct_mapped(struct memblock_region *m) +{ + return m->direct_mapped; +} + +static inline phys_addr_t memblock_sidecache_size(struct memblock_region *m) +{ + return m->cache_size; +} +#else +static inline int memblock_set_sidecache(phys_addr_t base, phys_addr_t size, + phys_addr_t cache_size, + bool direct_mapped) +{ + return 0; +} + +static inline phys_addr_t memblock_sidecache_size(struct memblock_region *m) +{ + return 0; +} + +static inline bool memblock_sidecache_direct_mapped(struct memblock_region *m) +{ + return false; +} +#endif /* CONFIG_HAVE_MEMBLOCK_CACHE_INFO */ + /* Flags for memblock allocation APIs */ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0) #define MEMBLOCK_ALLOC_ACCESSIBLE 0 diff --git a/mm/Kconfig b/mm/Kconfig index d85e39da47ae..c7944299a89e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -142,6 +142,9 @@ config ARCH_DISCARD_MEMBLOCK config MEMORY_ISOLATION bool +config HAVE_MEMBLOCK_CACHE_INFO + bool + # # Only be set on architectures that have completely implemented memory hotplug # feature. If you are not sure, don't touch it. diff --git a/mm/memblock.c b/mm/memblock.c index 9a2d5ae81ae1..8ebbc77f20c5 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -822,6 +822,40 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); } +#ifdef CONFIG_HAVE_MEMBLOCK_CACHE_INFO +/** + * memblock_set_sidecache - set the system memory cache info + * @base: base address of the region + * @size: size of the region + * @cache_size: system side cache size in bytes + * @direct: true if the cache has direct mapped associativity + * + * This function isolates region [@base, @base + @size), and saves the cache + * information. + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_set_sidecache(phys_addr_t base, phys_addr_t size, + phys_addr_t cache_size, bool direct_mapped) +{ + struct memblock_type *type = &memblock.memory; + int i, ret, start_rgn, end_rgn; + + ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); + if (ret) + return ret; + + for (i = start_rgn; i < end_rgn; i++) { + struct memblock_region *r = &type->regions[i]; + + r->cache_size = cache_size; + r->direct_mapped = direct_mapped; + } + + return 0; +} +#endif + /** * memblock_setclr_flag - set or clear flag for a memory region * @base: base address of the region