 7d5936791e
			
		
	
	
		7d5936791e
		
	
	
	
	
		
			
			Use the different ways to calculate cores/threads per socket, so that
the new CPU topology levels won't be missed in these 2 helpes:
* machine_topo_get_cores_per_socket()
* machine_topo_get_threads_per_socket()
Test the commit a1d027be95bc3 ("machine: Add helpers to get cores/
threads per socket").
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231023094635.1588282-2-zhao1.liu@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
		
	
			
		
			
				
	
	
		
			791 lines
		
	
	
		
			32 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			791 lines
		
	
	
		
			32 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * SMP parsing unit-tests
 | |
|  *
 | |
|  * Copyright (c) 2021 Huawei Technologies Co., Ltd
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Yanan Wang <wangyanan55@huawei.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
 | |
|  * See the COPYING.LIB file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qom/object.h"
 | |
| #include "qemu/module.h"
 | |
| #include "qapi/error.h"
 | |
| 
 | |
| #include "hw/boards.h"
 | |
| 
 | |
| #define T true
 | |
| #define F false
 | |
| 
 | |
| #define MIN_CPUS 1   /* set the min CPUs supported by the machine as 1 */
 | |
| #define MAX_CPUS 512 /* set the max CPUs supported by the machine as 512 */
 | |
| 
 | |
| #define SMP_MACHINE_NAME "TEST-SMP"
 | |
| 
 | |
| /*
 | |
|  * Used to define the generic 3-level CPU topology hierarchy
 | |
|  *  -sockets/cores/threads
 | |
|  */
 | |
| #define SMP_CONFIG_GENERIC(ha, a, hb, b, hc, c, hd, d, he, e) \
 | |
|         {                                                     \
 | |
|             .has_cpus    = ha, .cpus    = a,                  \
 | |
|             .has_sockets = hb, .sockets = b,                  \
 | |
|             .has_cores   = hc, .cores   = c,                  \
 | |
|             .has_threads = hd, .threads = d,                  \
 | |
|             .has_maxcpus = he, .maxcpus = e,                  \
 | |
|         }
 | |
| 
 | |
| #define CPU_TOPOLOGY_GENERIC(a, b, c, d, e)                   \
 | |
|         {                                                     \
 | |
|             .cpus     = a,                                    \
 | |
|             .sockets  = b,                                    \
 | |
|             .cores    = c,                                    \
 | |
|             .threads  = d,                                    \
 | |
|             .max_cpus = e,                                    \
 | |
|         }
 | |
| 
 | |
| /*
 | |
|  * Currently a 4-level topology hierarchy is supported on PC machines
 | |
|  *  -sockets/dies/cores/threads
 | |
|  */
 | |
| #define SMP_CONFIG_WITH_DIES(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \
 | |
|         {                                                     \
 | |
|             .has_cpus    = ha, .cpus    = a,                  \
 | |
|             .has_sockets = hb, .sockets = b,                  \
 | |
|             .has_dies    = hc, .dies    = c,                  \
 | |
|             .has_cores   = hd, .cores   = d,                  \
 | |
|             .has_threads = he, .threads = e,                  \
 | |
|             .has_maxcpus = hf, .maxcpus = f,                  \
 | |
|         }
 | |
| 
 | |
| /*
 | |
|  * Currently a 4-level topology hierarchy is supported on ARM virt machines
 | |
|  *  -sockets/clusters/cores/threads
 | |
|  */
 | |
| #define SMP_CONFIG_WITH_CLUSTERS(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \
 | |
|         {                                                     \
 | |
|             .has_cpus     = ha, .cpus     = a,                \
 | |
|             .has_sockets  = hb, .sockets  = b,                \
 | |
|             .has_clusters = hc, .clusters = c,                \
 | |
|             .has_cores    = hd, .cores    = d,                \
 | |
|             .has_threads  = he, .threads  = e,                \
 | |
|             .has_maxcpus  = hf, .maxcpus  = f,                \
 | |
|         }
 | |
| 
 | |
| /**
 | |
|  * @config - the given SMP configuration
 | |
|  * @expect_prefer_sockets - the expected parsing result for the
 | |
|  * valid configuration, when sockets are preferred over cores
 | |
|  * @expect_prefer_cores - the expected parsing result for the
 | |
|  * valid configuration, when cores are preferred over sockets
 | |
|  * @expect_error - the expected error report when the given
 | |
|  * configuration is invalid
 | |
|  */
 | |
| typedef struct SMPTestData {
 | |
|     SMPConfiguration config;
 | |
|     CpuTopology expect_prefer_sockets;
 | |
|     CpuTopology expect_prefer_cores;
 | |
|     const char *expect_error;
 | |
| } SMPTestData;
 | |
| 
 | |
| /*
 | |
|  * List all the possible valid sub-collections of the generic 5
 | |
|  * topology parameters (i.e. cpus/maxcpus/sockets/cores/threads),
 | |
|  * then test the automatic calculation algorithm of the missing
 | |
|  * values in the parser.
 | |
|  */
 | |
| static const struct SMPTestData data_generic_valid[] = {
 | |
|     {
 | |
|         /* config: no configuration provided
 | |
|          * expect: cpus=1,sockets=1,cores=1,threads=1,maxcpus=1 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(1, 1, 1, 1, 1),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(1, 1, 1, 1, 1),
 | |
|     }, {
 | |
|         /* config: -smp 8
 | |
|          * prefer_sockets: cpus=8,sockets=8,cores=1,threads=1,maxcpus=8
 | |
|          * prefer_cores: cpus=8,sockets=1,cores=8,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 8, 1, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 8, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2
 | |
|          * expect: cpus=2,sockets=2,cores=1,threads=1,maxcpus=2 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(2, 2, 1, 1, 2),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(2, 2, 1, 1, 2),
 | |
|     }, {
 | |
|         /* config: -smp cores=4
 | |
|          * expect: cpus=4,sockets=1,cores=4,threads=1,maxcpus=4 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(4, 1, 4, 1, 4),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(4, 1, 4, 1, 4),
 | |
|     }, {
 | |
|         /* config: -smp threads=2
 | |
|          * expect: cpus=2,sockets=1,cores=1,threads=2,maxcpus=2 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(2, 1, 1, 2, 2),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(2, 1, 1, 2, 2),
 | |
|     }, {
 | |
|         /* config: -smp maxcpus=16
 | |
|          * prefer_sockets: cpus=16,sockets=16,cores=1,threads=1,maxcpus=16
 | |
|          * prefer_cores: cpus=16,sockets=1,cores=16,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 16, 1, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 1, 16, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,cores=4
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,threads=2
 | |
|          * prefer_sockets: cpus=8,sockets=4,cores=1,threads=2,maxcpus=8
 | |
|          * prefer_cores: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 4, 1, 2, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,maxcpus=16
 | |
|          * prefer_sockets: cpus=8,sockets=16,cores=1,threads=1,maxcpus=16
 | |
|          * prefer_cores: cpus=8,sockets=1,cores=16,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 16, 1, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 16, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,cores=4
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,threads=2
 | |
|          * expect: cpus=4,sockets=2,cores=1,threads=2,maxcpus=4 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(4, 2, 1, 2, 4),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(4, 2, 1, 2, 4),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,maxcpus=16
 | |
|          * expect: cpus=16,sockets=2,cores=8,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 8, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 8, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp cores=4,threads=2
 | |
|          * expect: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
 | |
|     }, {
 | |
|         /* config: -smp cores=4,maxcpus=16
 | |
|          * expect: cpus=16,sockets=4,cores=4,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 4, 4, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 4, 4, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp threads=2,maxcpus=16
 | |
|          * prefer_sockets: cpus=16,sockets=8,cores=1,threads=2,maxcpus=16
 | |
|          * prefer_cores: cpus=16,sockets=1,cores=8,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 8, 1, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 1, 8, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,cores=4
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, F, 0, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,threads=2
 | |
|          * expect: cpus=8,sockets=2,cores=2,threads=2,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,maxcpus=16
 | |
|          * expect: cpus=8,sockets=2,cores=8,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 8, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 8, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,cores=4,threads=2
 | |
|          * expect: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,cores=4,maxcpus=16
 | |
|          * expect: cpus=8,sockets=4,cores=4,threads=1,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 4, 4, 1, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 4, 4, 1, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,threads=2,maxcpus=16
 | |
|          * prefer_sockets: cpus=8,sockets=8,cores=1,threads=2,maxcpus=16
 | |
|          * prefer_cores: cpus=8,sockets=1,cores=8,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 8, 1, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 1, 8, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,cores=4,threads=2
 | |
|          * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, T, 2, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,cores=4,maxcpus=16
 | |
|          * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,threads=2,maxcpus=16
 | |
|          * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp cores=4,threads=2,maxcpus=16
 | |
|          * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,cores=4,threads=1
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 1, F, 0),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,cores=4,maxcpus=16
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, F, 0, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,threads=2,maxcpus=16
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,cores=4,threads=2,maxcpus=16
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp sockets=2,cores=4,threads=2,maxcpus=16
 | |
|          * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=16
 | |
|          * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 16),
 | |
|         .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|         .expect_prefer_cores   = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
 | |
|     },
 | |
| };
 | |
| 
 | |
| static const struct SMPTestData data_generic_invalid[] = {
 | |
|     {
 | |
|         /* config: -smp 2,dies=2 */
 | |
|         .config = SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
 | |
|         .expect_error = "dies not supported by this machine's CPU topology",
 | |
|     }, {
 | |
|         /* config: -smp 2,clusters=2 */
 | |
|         .config = SMP_CONFIG_WITH_CLUSTERS(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
 | |
|         .expect_error = "clusters not supported by this machine's CPU topology",
 | |
|     }, {
 | |
|         /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=8 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "product of the hierarchy must match maxcpus: "
 | |
|                         "sockets (2) * cores (4) * threads (2) "
 | |
|                         "!= maxcpus (8)",
 | |
|     }, {
 | |
|         /* config: -smp 18,sockets=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 18, T, 2, T, 4, T, 2, T, 16),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "maxcpus must be equal to or greater than smp: "
 | |
|                         "sockets (2) * cores (4) * threads (2) "
 | |
|                         "== maxcpus (16) < smp_cpus (18)",
 | |
|     }, {
 | |
|         /* config: -smp 1
 | |
|          * should tweak the supported min CPUs to 2 for testing */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 1, F, 0, F, 0, F, 0, F, 0),
 | |
|         .expect_error = "Invalid SMP CPUs 1. The min CPUs supported "
 | |
|                         "by machine '" SMP_MACHINE_NAME "' is 2",
 | |
|     }, {
 | |
|         /* config: -smp 512
 | |
|          * should tweak the supported max CPUs to 511 for testing */
 | |
|         .config = SMP_CONFIG_GENERIC(T, 512, F, 0, F, 0, F, 0, F, 0),
 | |
|         .expect_error = "Invalid SMP CPUs 512. The max CPUs supported "
 | |
|                         "by machine '" SMP_MACHINE_NAME "' is 511",
 | |
|     },
 | |
| };
 | |
| 
 | |
| static const struct SMPTestData data_with_dies_invalid[] = {
 | |
|     {
 | |
|         /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "product of the hierarchy must match maxcpus: "
 | |
|                         "sockets (2) * dies (2) * cores (4) * threads (2) "
 | |
|                         "!= maxcpus (16)",
 | |
|     }, {
 | |
|         /* config: -smp 34,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
 | |
|         .config = SMP_CONFIG_WITH_DIES(T, 34, T, 2, T, 2, T, 4, T, 2, T, 32),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "maxcpus must be equal to or greater than smp: "
 | |
|                         "sockets (2) * dies (2) * cores (4) * threads (2) "
 | |
|                         "== maxcpus (32) < smp_cpus (34)",
 | |
|     },
 | |
| };
 | |
| 
 | |
| static const struct SMPTestData data_with_clusters_invalid[] = {
 | |
|     {
 | |
|         /* config: -smp 16,sockets=2,clusters=2,cores=4,threads=2,maxcpus=16 */
 | |
|         .config = SMP_CONFIG_WITH_CLUSTERS(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "product of the hierarchy must match maxcpus: "
 | |
|                         "sockets (2) * clusters (2) * cores (4) * threads (2) "
 | |
|                         "!= maxcpus (16)",
 | |
|     }, {
 | |
|         /* config: -smp 34,sockets=2,clusters=2,cores=4,threads=2,maxcpus=32 */
 | |
|         .config = SMP_CONFIG_WITH_CLUSTERS(T, 34, T, 2, T, 2, T, 4, T, 2, T, 32),
 | |
|         .expect_error = "Invalid CPU topology: "
 | |
|                         "maxcpus must be equal to or greater than smp: "
 | |
|                         "sockets (2) * clusters (2) * cores (4) * threads (2) "
 | |
|                         "== maxcpus (32) < smp_cpus (34)",
 | |
|     },
 | |
| };
 | |
| 
 | |
| static char *smp_config_to_string(const SMPConfiguration *config)
 | |
| {
 | |
|     return g_strdup_printf(
 | |
|         "(SMPConfiguration) {\n"
 | |
|         "    .has_cpus     = %5s, cpus     = %" PRId64 ",\n"
 | |
|         "    .has_sockets  = %5s, sockets  = %" PRId64 ",\n"
 | |
|         "    .has_dies     = %5s, dies     = %" PRId64 ",\n"
 | |
|         "    .has_clusters = %5s, clusters = %" PRId64 ",\n"
 | |
|         "    .has_cores    = %5s, cores    = %" PRId64 ",\n"
 | |
|         "    .has_threads  = %5s, threads  = %" PRId64 ",\n"
 | |
|         "    .has_maxcpus  = %5s, maxcpus  = %" PRId64 ",\n"
 | |
|         "}",
 | |
|         config->has_cpus ? "true" : "false", config->cpus,
 | |
|         config->has_sockets ? "true" : "false", config->sockets,
 | |
|         config->has_dies ? "true" : "false", config->dies,
 | |
|         config->has_clusters ? "true" : "false", config->clusters,
 | |
|         config->has_cores ? "true" : "false", config->cores,
 | |
|         config->has_threads ? "true" : "false", config->threads,
 | |
|         config->has_maxcpus ? "true" : "false", config->maxcpus);
 | |
| }
 | |
| 
 | |
| /* Use the different calculation than machine_topo_get_threads_per_socket(). */
 | |
| static unsigned int cpu_topology_get_threads_per_socket(const CpuTopology *topo)
 | |
| {
 | |
|     /* Check the divisor to avoid invalid topology examples causing SIGFPE. */
 | |
|     if (!topo->sockets) {
 | |
|         return 0;
 | |
|     } else {
 | |
|         return topo->max_cpus / topo->sockets;
 | |
|     }
 | |
| }
 | |
| 
 | |
| /* Use the different calculation than machine_topo_get_cores_per_socket(). */
 | |
| static unsigned int cpu_topology_get_cores_per_socket(const CpuTopology *topo)
 | |
| {
 | |
|     /* Check the divisor to avoid invalid topology examples causing SIGFPE. */
 | |
|     if (!topo->threads) {
 | |
|         return 0;
 | |
|     } else {
 | |
|         return cpu_topology_get_threads_per_socket(topo) / topo->threads;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static char *cpu_topology_to_string(const CpuTopology *topo,
 | |
|                                     unsigned int threads_per_socket,
 | |
|                                     unsigned int cores_per_socket)
 | |
| {
 | |
|     return g_strdup_printf(
 | |
|         "(CpuTopology) {\n"
 | |
|         "    .cpus               = %u,\n"
 | |
|         "    .sockets            = %u,\n"
 | |
|         "    .dies               = %u,\n"
 | |
|         "    .clusters           = %u,\n"
 | |
|         "    .cores              = %u,\n"
 | |
|         "    .threads            = %u,\n"
 | |
|         "    .max_cpus           = %u,\n"
 | |
|         "    .threads_per_socket = %u,\n"
 | |
|         "    .cores_per_socket   = %u,\n"
 | |
|         "}",
 | |
|         topo->cpus, topo->sockets, topo->dies, topo->clusters,
 | |
|         topo->cores, topo->threads, topo->max_cpus,
 | |
|         threads_per_socket, cores_per_socket);
 | |
| }
 | |
| 
 | |
| static void check_parse(MachineState *ms, const SMPConfiguration *config,
 | |
|                         const CpuTopology *expect_topo, const char *expect_err,
 | |
|                         bool is_valid)
 | |
| {
 | |
|     g_autofree char *config_str = smp_config_to_string(config);
 | |
|     g_autofree char *expect_topo_str = NULL, *output_topo_str = NULL;
 | |
|     unsigned int expect_threads_per_socket, expect_cores_per_socket;
 | |
|     unsigned int ms_threads_per_socket, ms_cores_per_socket;
 | |
|     Error *err = NULL;
 | |
| 
 | |
|     expect_threads_per_socket =
 | |
|                         cpu_topology_get_threads_per_socket(expect_topo);
 | |
|     expect_cores_per_socket =
 | |
|                         cpu_topology_get_cores_per_socket(expect_topo);
 | |
|     expect_topo_str = cpu_topology_to_string(expect_topo,
 | |
|                                              expect_threads_per_socket,
 | |
|                                              expect_cores_per_socket);
 | |
| 
 | |
|     /* call the generic parser */
 | |
|     machine_parse_smp_config(ms, config, &err);
 | |
| 
 | |
|     ms_threads_per_socket = machine_topo_get_threads_per_socket(ms);
 | |
|     ms_cores_per_socket = machine_topo_get_cores_per_socket(ms);
 | |
|     output_topo_str = cpu_topology_to_string(&ms->smp, ms_threads_per_socket,
 | |
|                                              ms_cores_per_socket);
 | |
| 
 | |
|     /* when the configuration is supposed to be valid */
 | |
|     if (is_valid) {
 | |
|         if ((err == NULL) &&
 | |
|             (ms->smp.cpus == expect_topo->cpus) &&
 | |
|             (ms->smp.sockets == expect_topo->sockets) &&
 | |
|             (ms->smp.dies == expect_topo->dies) &&
 | |
|             (ms->smp.clusters == expect_topo->clusters) &&
 | |
|             (ms->smp.cores == expect_topo->cores) &&
 | |
|             (ms->smp.threads == expect_topo->threads) &&
 | |
|             (ms->smp.max_cpus == expect_topo->max_cpus) &&
 | |
|             (ms_threads_per_socket == expect_threads_per_socket) &&
 | |
|             (ms_cores_per_socket == expect_cores_per_socket)) {
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         if (err != NULL) {
 | |
|             g_printerr("Test smp_parse failed!\n"
 | |
|                        "Input configuration: %s\n"
 | |
|                        "Should be valid: yes\n"
 | |
|                        "Expected topology: %s\n\n"
 | |
|                        "Result is valid: no\n"
 | |
|                        "Output error report: %s\n",
 | |
|                        config_str, expect_topo_str, error_get_pretty(err));
 | |
|             goto end;
 | |
|         }
 | |
| 
 | |
|         g_printerr("Test smp_parse failed!\n"
 | |
|                    "Input configuration: %s\n"
 | |
|                    "Should be valid: yes\n"
 | |
|                    "Expected topology: %s\n\n"
 | |
|                    "Result is valid: yes\n"
 | |
|                    "Output topology: %s\n",
 | |
|                    config_str, expect_topo_str, output_topo_str);
 | |
|         goto end;
 | |
|     }
 | |
| 
 | |
|     /* when the configuration is supposed to be invalid */
 | |
|     if (err != NULL) {
 | |
|         if (expect_err == NULL ||
 | |
|             g_str_equal(expect_err, error_get_pretty(err))) {
 | |
|             error_free(err);
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         g_printerr("Test smp_parse failed!\n"
 | |
|                    "Input configuration: %s\n"
 | |
|                    "Should be valid: no\n"
 | |
|                    "Expected error report: %s\n\n"
 | |
|                    "Result is valid: no\n"
 | |
|                    "Output error report: %s\n",
 | |
|                    config_str, expect_err, error_get_pretty(err));
 | |
|         goto end;
 | |
|     }
 | |
| 
 | |
|     g_printerr("Test smp_parse failed!\n"
 | |
|                "Input configuration: %s\n"
 | |
|                "Should be valid: no\n"
 | |
|                "Expected error report: %s\n\n"
 | |
|                "Result is valid: yes\n"
 | |
|                "Output topology: %s\n",
 | |
|                config_str, expect_err, output_topo_str);
 | |
| 
 | |
| end:
 | |
|     if (err != NULL) {
 | |
|         error_free(err);
 | |
|     }
 | |
| 
 | |
|     abort();
 | |
| }
 | |
| 
 | |
| static void smp_parse_test(MachineState *ms, SMPTestData *data, bool is_valid)
 | |
| {
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(ms);
 | |
| 
 | |
|     mc->smp_props.prefer_sockets = true;
 | |
|     check_parse(ms, &data->config, &data->expect_prefer_sockets,
 | |
|                 data->expect_error, is_valid);
 | |
| 
 | |
|     mc->smp_props.prefer_sockets = false;
 | |
|     check_parse(ms, &data->config, &data->expect_prefer_cores,
 | |
|                 data->expect_error, is_valid);
 | |
| }
 | |
| 
 | |
| /* The parsed results of the unsupported parameters should be 1 */
 | |
| static void unsupported_params_init(const MachineClass *mc, SMPTestData *data)
 | |
| {
 | |
|     if (!mc->smp_props.dies_supported) {
 | |
|         data->expect_prefer_sockets.dies = 1;
 | |
|         data->expect_prefer_cores.dies = 1;
 | |
|     }
 | |
| 
 | |
|     if (!mc->smp_props.clusters_supported) {
 | |
|         data->expect_prefer_sockets.clusters = 1;
 | |
|         data->expect_prefer_cores.clusters = 1;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void machine_base_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     MachineClass *mc = MACHINE_CLASS(oc);
 | |
| 
 | |
|     mc->min_cpus = MIN_CPUS;
 | |
|     mc->max_cpus = MAX_CPUS;
 | |
| 
 | |
|     mc->name = g_strdup(SMP_MACHINE_NAME);
 | |
| }
 | |
| 
 | |
| static void machine_generic_invalid_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     MachineClass *mc = MACHINE_CLASS(oc);
 | |
| 
 | |
|     /* Force invalid min CPUs and max CPUs */
 | |
|     mc->min_cpus = 2;
 | |
|     mc->max_cpus = 511;
 | |
| }
 | |
| 
 | |
| static void machine_with_dies_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     MachineClass *mc = MACHINE_CLASS(oc);
 | |
| 
 | |
|     mc->smp_props.dies_supported = true;
 | |
| }
 | |
| 
 | |
| static void machine_with_clusters_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     MachineClass *mc = MACHINE_CLASS(oc);
 | |
| 
 | |
|     mc->smp_props.clusters_supported = true;
 | |
| }
 | |
| 
 | |
| static void test_generic_valid(const void *opaque)
 | |
| {
 | |
|     const char *machine_type = opaque;
 | |
|     Object *obj = object_new(machine_type);
 | |
|     MachineState *ms = MACHINE(obj);
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(obj);
 | |
|     SMPTestData data = {};
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
 | |
|         data = data_generic_valid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         smp_parse_test(ms, &data, true);
 | |
| 
 | |
|         /* Unsupported parameters can be provided with their values as 1 */
 | |
|         data.config.has_dies = true;
 | |
|         data.config.dies = 1;
 | |
|         smp_parse_test(ms, &data, true);
 | |
|     }
 | |
| 
 | |
|     object_unref(obj);
 | |
| }
 | |
| 
 | |
| static void test_generic_invalid(const void *opaque)
 | |
| {
 | |
|     const char *machine_type = opaque;
 | |
|     Object *obj = object_new(machine_type);
 | |
|     MachineState *ms = MACHINE(obj);
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(obj);
 | |
|     SMPTestData data = {};
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
 | |
|         data = data_generic_invalid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         smp_parse_test(ms, &data, false);
 | |
|     }
 | |
| 
 | |
|     object_unref(obj);
 | |
| }
 | |
| 
 | |
| static void test_with_dies(const void *opaque)
 | |
| {
 | |
|     const char *machine_type = opaque;
 | |
|     Object *obj = object_new(machine_type);
 | |
|     MachineState *ms = MACHINE(obj);
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(obj);
 | |
|     SMPTestData data = {};
 | |
|     unsigned int num_dies = 2;
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
 | |
|         data = data_generic_valid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         /* when dies parameter is omitted, it will be set as 1 */
 | |
|         data.expect_prefer_sockets.dies = 1;
 | |
|         data.expect_prefer_cores.dies = 1;
 | |
| 
 | |
|         smp_parse_test(ms, &data, true);
 | |
| 
 | |
|         /* when dies parameter is specified */
 | |
|         data.config.has_dies = true;
 | |
|         data.config.dies = num_dies;
 | |
|         if (data.config.has_cpus) {
 | |
|             data.config.cpus *= num_dies;
 | |
|         }
 | |
|         if (data.config.has_maxcpus) {
 | |
|             data.config.maxcpus *= num_dies;
 | |
|         }
 | |
| 
 | |
|         data.expect_prefer_sockets.dies = num_dies;
 | |
|         data.expect_prefer_sockets.cpus *= num_dies;
 | |
|         data.expect_prefer_sockets.max_cpus *= num_dies;
 | |
|         data.expect_prefer_cores.dies = num_dies;
 | |
|         data.expect_prefer_cores.cpus *= num_dies;
 | |
|         data.expect_prefer_cores.max_cpus *= num_dies;
 | |
| 
 | |
|         smp_parse_test(ms, &data, true);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_with_dies_invalid); i++) {
 | |
|         data = data_with_dies_invalid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         smp_parse_test(ms, &data, false);
 | |
|     }
 | |
| 
 | |
|     object_unref(obj);
 | |
| }
 | |
| 
 | |
| static void test_with_clusters(const void *opaque)
 | |
| {
 | |
|     const char *machine_type = opaque;
 | |
|     Object *obj = object_new(machine_type);
 | |
|     MachineState *ms = MACHINE(obj);
 | |
|     MachineClass *mc = MACHINE_GET_CLASS(obj);
 | |
|     SMPTestData data = {};
 | |
|     unsigned int num_clusters = 2;
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
 | |
|         data = data_generic_valid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         /* when clusters parameter is omitted, it will be set as 1 */
 | |
|         data.expect_prefer_sockets.clusters = 1;
 | |
|         data.expect_prefer_cores.clusters = 1;
 | |
| 
 | |
|         smp_parse_test(ms, &data, true);
 | |
| 
 | |
|         /* when clusters parameter is specified */
 | |
|         data.config.has_clusters = true;
 | |
|         data.config.clusters = num_clusters;
 | |
|         if (data.config.has_cpus) {
 | |
|             data.config.cpus *= num_clusters;
 | |
|         }
 | |
|         if (data.config.has_maxcpus) {
 | |
|             data.config.maxcpus *= num_clusters;
 | |
|         }
 | |
| 
 | |
|         data.expect_prefer_sockets.clusters = num_clusters;
 | |
|         data.expect_prefer_sockets.cpus *= num_clusters;
 | |
|         data.expect_prefer_sockets.max_cpus *= num_clusters;
 | |
|         data.expect_prefer_cores.clusters = num_clusters;
 | |
|         data.expect_prefer_cores.cpus *= num_clusters;
 | |
|         data.expect_prefer_cores.max_cpus *= num_clusters;
 | |
| 
 | |
|         smp_parse_test(ms, &data, true);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < ARRAY_SIZE(data_with_clusters_invalid); i++) {
 | |
|         data = data_with_clusters_invalid[i];
 | |
|         unsupported_params_init(mc, &data);
 | |
| 
 | |
|         smp_parse_test(ms, &data, false);
 | |
|     }
 | |
| 
 | |
|     object_unref(obj);
 | |
| }
 | |
| 
 | |
| /* Type info of the tested machine */
 | |
| static const TypeInfo smp_machine_types[] = {
 | |
|     {
 | |
|         .name           = TYPE_MACHINE,
 | |
|         .parent         = TYPE_OBJECT,
 | |
|         .abstract       = true,
 | |
|         .class_init     = machine_base_class_init,
 | |
|         .class_size     = sizeof(MachineClass),
 | |
|         .instance_size  = sizeof(MachineState),
 | |
|     }, {
 | |
|         .name           = MACHINE_TYPE_NAME("smp-generic-valid"),
 | |
|         .parent         = TYPE_MACHINE,
 | |
|     }, {
 | |
|         .name           = MACHINE_TYPE_NAME("smp-generic-invalid"),
 | |
|         .parent         = TYPE_MACHINE,
 | |
|         .class_init     = machine_generic_invalid_class_init,
 | |
|     }, {
 | |
|         .name           = MACHINE_TYPE_NAME("smp-with-dies"),
 | |
|         .parent         = TYPE_MACHINE,
 | |
|         .class_init     = machine_with_dies_class_init,
 | |
|     }, {
 | |
|         .name           = MACHINE_TYPE_NAME("smp-with-clusters"),
 | |
|         .parent         = TYPE_MACHINE,
 | |
|         .class_init     = machine_with_clusters_class_init,
 | |
|     }
 | |
| };
 | |
| 
 | |
| DEFINE_TYPES(smp_machine_types)
 | |
| 
 | |
| int main(int argc, char *argv[])
 | |
| {
 | |
|     module_call_init(MODULE_INIT_QOM);
 | |
| 
 | |
|     g_test_init(&argc, &argv, NULL);
 | |
| 
 | |
|     g_test_add_data_func("/test-smp-parse/generic/valid",
 | |
|                          MACHINE_TYPE_NAME("smp-generic-valid"),
 | |
|                          test_generic_valid);
 | |
|     g_test_add_data_func("/test-smp-parse/generic/invalid",
 | |
|                          MACHINE_TYPE_NAME("smp-generic-invalid"),
 | |
|                          test_generic_invalid);
 | |
|     g_test_add_data_func("/test-smp-parse/with_dies",
 | |
|                          MACHINE_TYPE_NAME("smp-with-dies"),
 | |
|                          test_with_dies);
 | |
|     g_test_add_data_func("/test-smp-parse/with_clusters",
 | |
|                          MACHINE_TYPE_NAME("smp-with-clusters"),
 | |
|                          test_with_clusters);
 | |
| 
 | |
|     g_test_run();
 | |
| 
 | |
|     return 0;
 | |
| }
 |