mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/core: Check smp cache topology support for machine

Browse Source 
Add cache_supported flags in SMPCompatProps to allow machines to
configure various caches support.

And check the compatibility of the cache properties with the
machine support in machine_parse_smp_cache().

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-ID: <20241101083331.340178-5-zhao1.liu@intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Zhao Liu 2024-11-01 16:33:26 +08:00 committed by Philippe Mathieu-Daudé
parent 4e88e7e340
commit f35c0221fe
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/core/machine-smp.c
View File

@ -261,10 +261,32 @@ void machine_parse_smp_config(MachineState *ms,
}
}
static bool machine_check_topo_support(MachineState *ms,
CpuTopologyLevel topo,
Error **errp)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
if ((topo == CPU_TOPOLOGY_LEVEL_MODULE && !mc->smp_props.modules_supported) ||
(topo == CPU_TOPOLOGY_LEVEL_CLUSTER && !mc->smp_props.clusters_supported) ||
(topo == CPU_TOPOLOGY_LEVEL_DIE && !mc->smp_props.dies_supported) ||
(topo == CPU_TOPOLOGY_LEVEL_BOOK && !mc->smp_props.books_supported) ||
(topo == CPU_TOPOLOGY_LEVEL_DRAWER && !mc->smp_props.drawers_supported)) {
error_setg(errp,
"Invalid topology level: %s. "
"The topology level is not supported by this machine",
CpuTopologyLevel_str(topo));
return false;
}
return true;
}
bool machine_parse_smp_cache(MachineState *ms,
const SmpCachePropertiesList *caches,
Error **errp)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
const SmpCachePropertiesList *node;
DECLARE_BITMAP(caches_bitmap, CACHE_LEVEL_AND_TYPE__MAX);
@ -283,6 +305,25 @@ bool machine_parse_smp_cache(MachineState *ms,
set_bit(node->value->cache, caches_bitmap);
}
for (int i = 0; i < CACHE_LEVEL_AND_TYPE__MAX; i++) {
const SmpCacheProperties *props = &ms->smp_cache.props[i];
/*
* Reject non "default" topology level if the cache isn't
* supported by the machine.
*/
if (props->topology != CPU_TOPOLOGY_LEVEL_DEFAULT &&
!mc->smp_props.cache_supported[props->cache]) {
error_setg(errp,
"%s cache topology not supported by this machine",
CacheLevelAndType_str(node->value->cache));
return false;
}
if (!machine_check_topo_support(ms, props->topology, errp)) {
return false;
}
}
return true;
}

3
include/hw/boards.h
View File

@ -153,6 +153,8 @@ typedef struct {
* @books_supported - whether books are supported by the machine
* @drawers_supported - whether drawers are supported by the machine
* @modules_supported - whether modules are supported by the machine
* @cache_supported - whether cache (l1d, l1i, l2 and l3) configuration are
* supported by the machine
*/
typedef struct {
bool prefer_sockets;
@ -162,6 +164,7 @@ typedef struct {
bool books_supported;
bool drawers_supported;
bool modules_supported;
bool cache_supported[CACHE_LEVEL_AND_TYPE__MAX];
} SMPCompatProps;
/**