yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-hmat-acpi-Build-Memory-Side-Cache-Information-Struct.patch

902636
From d00453667cb972dc2fe1242081d3b39313a6a925 Mon Sep 17 00:00:00 2001
902636
From: "plai@redhat.com" <plai@redhat.com>
902636
Date: Thu, 21 May 2020 23:56:52 +0100
902636
Subject: [PATCH 09/12] hmat acpi: Build Memory Side Cache Information
902636
 Structure(s)
902636
902636
RH-Author: plai@redhat.com
902636
Message-id: <20200521235655.27141-9-plai@redhat.com>
902636
Patchwork-id: 96741
902636
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH 08/11] hmat acpi: Build Memory Side Cache Information Structure(s)
902636
Bugzilla: 1600217
902636
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
902636
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
902636
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
902636
902636
From: Liu Jingqi <jingqi.liu@intel.com>
902636
902636
This structure describes memory side cache information for memory
902636
proximity domains if the memory side cache is present and the
902636
physical device forms the memory side cache.
902636
The software could use this information to effectively place
902636
the data in memory to maximize the performance of the system
902636
memory that use the memory side cache.
902636
902636
Acked-by: Markus Armbruster <armbru@redhat.com>
902636
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
902636
Reviewed-by: Daniel Black <daniel@linux.ibm.com>
902636
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
902636
Signed-off-by: Liu Jingqi <jingqi.liu@intel.com>
902636
Signed-off-by: Tao Xu <tao3.xu@intel.com>
902636
Message-Id: <20191213011929.2520-7-tao3.xu@intel.com>
902636
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
902636
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
902636
(cherry picked from commit a9c2b841af002db6e21e1297c9026b63fc22c875)
902636
Signed-off-by: Paul Lai <plai@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 hw/acpi/hmat.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
902636
 1 file changed, 68 insertions(+), 1 deletion(-)
902636
902636
diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c
902636
index 4635d45..7c24bb5 100644
902636
--- a/hw/acpi/hmat.c
902636
+++ b/hw/acpi/hmat.c
902636
@@ -143,14 +143,62 @@ static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *hmat_lb,
902636
     g_free(entry_list);
902636
 }
902636
 
902636
+/* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: Table 5-147 */
902636
+static void build_hmat_cache(GArray *table_data, uint8_t total_levels,
902636
+                             NumaHmatCacheOptions *hmat_cache)
902636
+{
902636
+    /*
902636
+     * Cache Attributes: Bits [3:0] – Total Cache Levels
902636
+     * for this Memory Proximity Domain
902636
+     */
902636
+    uint32_t cache_attr = total_levels;
902636
+
902636
+    /* Bits [7:4] : Cache Level described in this structure */
902636
+    cache_attr |= (uint32_t) hmat_cache->level << 4;
902636
+
902636
+    /* Bits [11:8] - Cache Associativity */
902636
+    cache_attr |= (uint32_t) hmat_cache->associativity << 8;
902636
+
902636
+    /* Bits [15:12] - Write Policy */
902636
+    cache_attr |= (uint32_t) hmat_cache->policy << 12;
902636
+
902636
+    /* Bits [31:16] - Cache Line size in bytes */
902636
+    cache_attr |= (uint32_t) hmat_cache->line << 16;
902636
+
902636
+    /* Type */
902636
+    build_append_int_noprefix(table_data, 2, 2);
902636
+    /* Reserved */
902636
+    build_append_int_noprefix(table_data, 0, 2);
902636
+    /* Length */
902636
+    build_append_int_noprefix(table_data, 32, 4);
902636
+    /* Proximity Domain for the Memory */
902636
+    build_append_int_noprefix(table_data, hmat_cache->node_id, 4);
902636
+    /* Reserved */
902636
+    build_append_int_noprefix(table_data, 0, 4);
902636
+    /* Memory Side Cache Size */
902636
+    build_append_int_noprefix(table_data, hmat_cache->size, 8);
902636
+    /* Cache Attributes */
902636
+    build_append_int_noprefix(table_data, cache_attr, 4);
902636
+    /* Reserved */
902636
+    build_append_int_noprefix(table_data, 0, 2);
902636
+    /*
902636
+     * Number of SMBIOS handles (n)
902636
+     * Linux kernel uses Memory Side Cache Information Structure
902636
+     * without SMBIOS entries for now, so set Number of SMBIOS handles
902636
+     * as 0.
902636
+     */
902636
+    build_append_int_noprefix(table_data, 0, 2);
902636
+}
902636
+
902636
 /* Build HMAT sub table structures */
902636
 static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state)
902636
 {
902636
     uint16_t flags;
902636
     uint32_t num_initiator = 0;
902636
     uint32_t initiator_list[MAX_NODES];
902636
-    int i, hierarchy, type;
902636
+    int i, hierarchy, type, cache_level, total_levels;
902636
     HMAT_LB_Info *hmat_lb;
902636
+    NumaHmatCacheOptions *hmat_cache;
902636
 
902636
     for (i = 0; i < numa_state->num_nodes; i++) {
902636
         flags = 0;
902636
@@ -184,6 +232,25 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state)
902636
             }
902636
         }
902636
     }
902636
+
902636
+    /*
902636
+     * ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure:
902636
+     * Table 5-147
902636
+     */
902636
+    for (i = 0; i < numa_state->num_nodes; i++) {
902636
+        total_levels = 0;
902636
+        for (cache_level = 1; cache_level < HMAT_LB_LEVELS; cache_level++) {
902636
+            if (numa_state->hmat_cache[i][cache_level]) {
902636
+                total_levels++;
902636
+            }
902636
+        }
902636
+        for (cache_level = 0; cache_level <= total_levels; cache_level++) {
902636
+            hmat_cache = numa_state->hmat_cache[i][cache_level];
902636
+            if (hmat_cache) {
902636
+                build_hmat_cache(table_data, total_levels, hmat_cache);
902636
+            }
902636
+        }
902636
+    }
902636
 }
902636
 
902636
 void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *numa_state)
902636
-- 
902636
1.8.3.1
902636