| Message ID | 20240306095407.3058909-8-zhao1.liu@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup on SMP and its test | expand |
On 06/03/2024 10.54, Zhao Liu wrote: > From: Zhao Liu <zhao1.liu@intel.com> > > The q35 machine is trying to support up to 4096 vCPUs [1], so it's > necessary to bump max_cpus in test-smp-parse to 4096 to cover the > topological needs of future machines. > > [1]: https://lore.kernel.org/qemu-devel/20240228143351.3967-1-anisinha@redhat.com/ > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > Tested-by: Xiaoling Song <xiaoling.song@intel.com> > --- > tests/unit/test-smp-parse.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c > index 84e342277452..2eb9533bc505 100644 > --- a/tests/unit/test-smp-parse.c > +++ b/tests/unit/test-smp-parse.c > @@ -20,8 +20,8 @@ > #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 MIN_CPUS 1 /* set the min CPUs supported by the machine as 1 */ > +#define MAX_CPUS 4096 /* set the max CPUs supported by the machine as 4096 */ > > #define SMP_MACHINE_NAME "TEST-SMP" > > @@ -333,13 +333,13 @@ static const struct SMPTestData data_generic_invalid[] = { > "by machine '" SMP_MACHINE_NAME "' is 2", > }, { > /* > - * config: -smp 512 > + * config: -smp 4096 > * The test machine should tweak the supported max CPUs to > - * 511 (MAX_CPUS - 1) for testing. > + * 4095 (MAX_CPUS - 1) for testing. > */ > - .config = SMP_CONFIG_GENERIC(T, MAX_CPUS, 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", > + .config = SMP_CONFIG_GENERIC(T, 4096, F, 0, F, 0, F, 0, F, 0), > + .expect_error = "Invalid SMP CPUs 4096. The max CPUs supported " You could maybe use stringify(MAX_CPUS) in above line (but it won't work for the 4095 below, so it's maybe not worth the effort) > + "by machine '" SMP_MACHINE_NAME "' is 4095", > }, > }; Reviewed-by: Thomas Huth <thuth@redhat.com>
Hi Thomas, > > /* > > - * config: -smp 512 > > + * config: -smp 4096 > > * The test machine should tweak the supported max CPUs to > > - * 511 (MAX_CPUS - 1) for testing. > > + * 4095 (MAX_CPUS - 1) for testing. > > */ > > - .config = SMP_CONFIG_GENERIC(T, MAX_CPUS, 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", > > + .config = SMP_CONFIG_GENERIC(T, 4096, F, 0, F, 0, F, 0, F, 0), > > + .expect_error = "Invalid SMP CPUs 4096. The max CPUs supported " > > You could maybe use stringify(MAX_CPUS) in above line > (but it won't work for the 4095 below, so it's maybe not worth the effort) Yes, it's also because of corner cases like 4095 that I don't do such a thorough cleanup here. > > + "by machine '" SMP_MACHINE_NAME "' is 4095", > > }, > > }; > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Thanks! Zhao
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 84e342277452..2eb9533bc505 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -20,8 +20,8 @@ #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 MIN_CPUS 1 /* set the min CPUs supported by the machine as 1 */ +#define MAX_CPUS 4096 /* set the max CPUs supported by the machine as 4096 */ #define SMP_MACHINE_NAME "TEST-SMP" @@ -333,13 +333,13 @@ static const struct SMPTestData data_generic_invalid[] = { "by machine '" SMP_MACHINE_NAME "' is 2", }, { /* - * config: -smp 512 + * config: -smp 4096 * The test machine should tweak the supported max CPUs to - * 511 (MAX_CPUS - 1) for testing. + * 4095 (MAX_CPUS - 1) for testing. */ - .config = SMP_CONFIG_GENERIC(T, MAX_CPUS, 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", + .config = SMP_CONFIG_GENERIC(T, 4096, F, 0, F, 0, F, 0, F, 0), + .expect_error = "Invalid SMP CPUs 4096. The max CPUs supported " + "by machine '" SMP_MACHINE_NAME "' is 4095", }, };