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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 2C8FDC73C50 for ; Tue, 9 Jul 2019 14:59:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0277B21537 for ; Tue, 9 Jul 2019 14:59:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0277B21537 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkraf-0005Px-9I for qemu-devel@archiver.kernel.org; Tue, 09 Jul 2019 10:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36121) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkrTI-0001tq-8H for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:51:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkrTD-0007VT-AJ for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:51:53 -0400 Received: from mga07.intel.com ([134.134.136.100]:56002) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkrTC-0006C2-O0 for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:51:51 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 07:48:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,470,1557212400"; d="scan'208";a="156198850" Received: from txu2-mobl.ccr.corp.intel.com (HELO [10.255.30.194]) ([10.255.30.194]) by orsmga007.jf.intel.com with ESMTP; 09 Jul 2019 07:48:28 -0700 To: Jonathan Cameron References: <20190707142958.31316-1-tao3.xu@intel.com> <20190707142958.31316-9-tao3.xu@intel.com> <20190709162459.00004032@huawei.com> From: Tao Xu Message-ID: Date: Tue, 9 Jul 2019 22:48:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190709162459.00004032@huawei.com> Content-Type: text/plain; charset=gb18030; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: Re: [Qemu-devel] [PATCH v6 08/14] hmat acpi: Build Memory Side Cache Information Structure(s) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, jingqi.liu@intel.com, fan.du@intel.com, qemu-devel@nongnu.org, imammedo@redhat.com, dan.j.williams@intel.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/9/2019 4:24 PM, Jonathan Cameron wrote: > On Sun, 7 Jul 2019 22:29:52 +0800 > Tao Xu wrote: > >> From: Liu Jingqi >> >> This structure describes memory side cache information for memory >> proximity domains if the memory side cache is present and the >> physical device forms the memory side cache. >> The software could use this information to effectively place >> the data in memory to maximize the performance of the system >> memory that use the memory side cache. >> >> Signed-off-by: Liu Jingqi >> Signed-off-by: Tao Xu > > There is what I'll call a paste 'splurge' inline. > > Otherwise looks good. > > Reviewed-by: Jonathan Cameron > >> --- >> >> Changes in v6: >> - Add descriptions from ACPI 6.3 spec >> --- >> hw/acpi/hmat.c | 64 ++++++++++++++++++++++++++++++++++++++++- >> hw/acpi/hmat.h | 20 +++++++++++++ >> include/qemu/typedefs.h | 1 + >> include/sysemu/numa.h | 3 ++ >> include/sysemu/sysemu.h | 2 ++ >> 5 files changed, 89 insertions(+), 1 deletion(-) >> >> diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c >> index 6dd39b0c85..a207581f11 100644 >> --- a/hw/acpi/hmat.c >> +++ b/hw/acpi/hmat.c >> @@ -133,14 +133,63 @@ static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *numa_hmat_lb, >> } >> } >> >> +/* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: Table 5-143 */ >> +static void build_hmat_cache(GArray *table_data, HMAT_Cache_Info *hmat_cache) >> +{ >> + /* >> + * Cache Attributes: Bits [3:0] ¨C Total Cache Levels >> + * for this Memory Proximity Domain >> + */ >> + uint32_t cache_attr = hmat_cache->total_levels & 0xF; >> + >> + /* Bits [7:4] : Cache Level described in this structure */ >> + cache_attr |= (hmat_cache->level & 0xF) << 4; >> + >> + /* Bits [11:8] - Cache Associativity */ >> + cache_attr |= (hmat_cache->associativity & 0xF) << 8; >> + >> + /* Bits [15:12] - Write Policy */ >> + cache_attr |= (hmat_cache->write_policy & 0xF) << 12; >> + >> + /* Bits [31:16] - Cache Line size in bytes */ >> + cache_attr |= (hmat_cache->line_size & 0xFFFF) << 16; >> + >> + cache_attr = cpu_to_le32(cache_attr); >> + >> + /* Type */ >> + build_append_int_noprefix(table_data, 2, 2); >> + /* Reserved */ >> + build_append_int_noprefix(table_data, 0, 2); >> + /* Length */ >> + build_append_int_noprefix(table_data, 32, 4); >> + /* Proximity Domain for the Memory */ >> + build_append_int_noprefix(table_data, hmat_cache->mem_proximity, 4); >> + /* Reserved */ >> + build_append_int_noprefix(table_data, 0, 4); >> + /* Memory Side Cache Size */ >> + build_append_int_noprefix(table_data, hmat_cache->size, 8); >> + /* Cache Attributes */ >> + build_append_int_noprefix(table_data, cache_attr, 4); >> + /* Reserved */ >> + build_append_int_noprefix(table_data, 0, 2); >> + /* >> + * Number of SMBIOS handles (n) >> + * Linux kernel uses Memory Side Cache Information Structure >> + * without SMBIOS entries for now, so set Number of SMBIOS handles >> + * as 0. >> + */ >> + build_append_int_noprefix(table_data, 0, 2); >> +} >> + >> /* Build HMAT sub table structures */ >> static void hmat_build_table_structs(GArray *table_data, NumaState *nstat) >> { >> uint16_t flags; >> uint32_t num_initiator = 0; >> uint32_t initiator_pxm[MAX_NODES]; >> - int i, hrchy, type; >> + int i, hrchy, type, level; >> HMAT_LB_Info *numa_hmat_lb; >> + HMAT_Cache_Info *numa_hmat_cache; >> >> for (i = 0; i < nstat->num_nodes; i++) { >> flags = 0; >> @@ -174,6 +223,19 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *nstat) >> } >> } >> } >> + >> + /* >> + * ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: >> + * Table 5-143 >> + */ >> + for (i = 0; i < nstat->num_nodes; i++) { >> + for (level = 0; level <= MAX_HMAT_CACHE_LEVEL; level++) { >> + numa_hmat_cache = nstat->hmat_cache[i][level]; >> + if (numa_hmat_cache) { >> + build_hmat_cache(table_data, numa_hmat_cache); >> + } >> + } >> + } >> } >> >> void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat) >> diff --git a/hw/acpi/hmat.h b/hw/acpi/hmat.h >> index 9d5f407b8a..ba655281cc 100644 >> --- a/hw/acpi/hmat.h >> +++ b/hw/acpi/hmat.h >> @@ -79,6 +79,26 @@ struct HMAT_LB_Info { >> uint16_t bandwidth[MAX_NODES][MAX_NODES]; >> }; >> >> +struct HMAT_Cache_Info { >> + /* The memory proximity domain to which the memory belongs. */ >> + uint32_t mem_proximity; >> + /* Size of memory side cache in bytes. */ >> + uint64_t size; >> + /* >> + * Total cache levels for this memory >> + * pr#include "hw/acpi/aml-build.h"oximity domain. > > :) Happens to us all. (I went back and checked original email in case > I'd just inserted that. > Thank you for pointing it. Maybe I make a mistake here when I rebase it. I will correct it. >> + */ >> + uint8_t total_levels; >> + /* Cache level described in this structure. */ >> + uint8_t level; >> + /* Cache Associativity: None/Direct Mapped/Comple Cache Indexing */ >> + uint8_t associativity; >> + /* Write Policy: None/Write Back(WB)/Write Through(WT) */ >> + uint8_t write_policy; >> + /* Cache Line size in bytes. */ >> + uint16_t line_size; >> +}; >> + >> void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat); >> >> #endif >> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h >> index c0257e936b..d971f5109e 100644 >> --- a/include/qemu/typedefs.h >> +++ b/include/qemu/typedefs.h >> @@ -33,6 +33,7 @@ typedef struct FWCfgEntry FWCfgEntry; >> typedef struct FWCfgIoState FWCfgIoState; >> typedef struct FWCfgMemState FWCfgMemState; >> typedef struct FWCfgState FWCfgState; >> +typedef struct HMAT_Cache_Info HMAT_Cache_Info; >> typedef struct HMAT_LB_Info HMAT_LB_Info; >> typedef struct HVFX86EmulatorState HVFX86EmulatorState; >> typedef struct I2CBus I2CBus; >> diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h >> index 0b80bc2fa2..2e5bdcbd19 100644 >> --- a/include/sysemu/numa.h >> +++ b/include/sysemu/numa.h >> @@ -35,6 +35,9 @@ struct NumaState { >> >> /* NUMA modes HMAT Locality Latency and Bandwidth Information */ >> HMAT_LB_Info *hmat_lb[HMAT_LB_LEVELS][HMAT_LB_TYPES]; >> + >> + /* Memory Side Cache Information Structure */ >> + HMAT_Cache_Info *hmat_cache[MAX_NODES][MAX_HMAT_CACHE_LEVEL + 1]; >> }; >> typedef struct NumaState NumaState; >> >> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h >> index 3f83fc0d58..85c584c531 100644 >> --- a/include/sysemu/sysemu.h >> +++ b/include/sysemu/sysemu.h >> @@ -143,6 +143,8 @@ enum { >> HMAT_LB_DATA_WRITE_BANDWIDTH = 5, >> }; >> >> +#define MAX_HMAT_CACHE_LEVEL 3 >> + >> #define HMAT_LB_LEVELS (HMAT_LB_MEM_CACHE_3RD_LEVEL + 1) >> #define HMAT_LB_TYPES (HMAT_LB_DATA_WRITE_BANDWIDTH + 1) >> > >