Build ACPI Heterogeneous Memory Attribute Table (HMAT)
v17 cover Build ACPI Heterogeneous Memory Attribute Table (HMAT)
This series of patches will build Heterogeneous Memory Attribute Table (HMAT) according to the command line. The ACPI HMAT describes the memory attributes, such as memory side cache attributes and bandwidth and latency details, related to the Memory Proximity Domain.
The software is expected to use HMAT information as hint for optimization.
In the linux kernel, the codes in drivers/acpi/hmat/hmat.c parse and report the platform's HMAT tables.
The V16 patches link:
https://patchwork.kernel.org/cover/11245293/
Changelog:
v17:
- Add check when user input latency or bandwidth 0, the lb_info_provided should also be 0. Because in ACPI 6.3 5.2.27.4, 0 means the corresponding latency or bandwidth information is not provided.
- Fix the infinite loop when node->latency is 0.
- Use NumaHmatCacheOptions to replace HMAT_Cache_Info (Igor)
- Add check for unordered cache level input (Igor)
- Add some fail test cases (Igor)
v16:
- Add and use qemu_strtold_finite to parse size, support full 64bit precision, modify related test cases (Eduardo and Markus)
- Simplify struct HMAT_LB_Info and related code, unify latency and bandwidth (Igor)
- Add cross check with hmat_lb data (Igor)
- Fields in Cache Attributes are promoted to uint32_t before shifting (Igor)
- Add case for QMP build HMAT (Igor)
v15:
- Add a new patch to refactor do_strtosz() (Eduardo)
- Make tests without breaking CI (Michael)
v14:
- Reuse the codes of do_strtosz to build qemu_strtotime_ns (Eduardo)
- Squash patch v13 01/12 and 02/12 together (Daniel and Eduardo)
- Drop time unit picosecond (Eric)
- Use qemu ctz64 and clz64 instead of builtin function
v13:
- Modify some text description
- Drop "initiator_valid" field in struct NodeInfo
- Reuse Garray to store the raw bandwidth and bandwidth data
- Calculate common base unit using range bitmap
- Add a patch to alculate hmat latency and bandwidth entry list
- Drop the total_levels option and use readable cache size
- Remove the unnecessary head file
- Use decimal notation with appropriate suffix for cache size
v12:
- Fix a bug that a memory-only node without initiator setting doesn't report error. (reported by Danmei Wei)
- Fix a bug that if HMAT is enabled and without hmat-lb setting, QEMU will crash. (reported by Danmei Wei)
v11:
- Move numa option patches forward.
- Add num_initiator in Numa_state to record the number of initiators.
- Simplify struct HMAT_LB_Info, use uint64_t array to store data.
- Drop hmat_get_base().
- Calculate base in build_hmat_lb().
Liu Jingqi (5):
numa: Extend CLI to provide memory latency and bandwidth information
numa: Extend CLI to provide memory side cache information hmat acpi: Build Memory Proximity Domain Attributes Structure(s) hmat acpi: Build System Locality Latency and Bandwidth Information
Structure(s)
hmat acpi: Build Memory Side Cache Information Structure(s)
Tao Xu (9):
util/cutils: Add Add qemu_strtold and qemu_strtold_finite util/cutils: Use qemu_strtold_finite to parse size util/cutils: refactor do_strtosz() to support suffixes list util/cutils: Add qemu_strtotime_ns()
qapi: Add builtin type time
tests: Add test for QAPI builtin type time
numa: Extend CLI to provide initiator information for numa nodes tests/numa: Add case for QMP build HMAT tests/bios-tables-test: add test cases for ACPI HMAT
hw/acpi/Kconfig | 7 +- hw/acpi/Makefile.objs | 1 + hw/acpi/hmat.c | 268 +++++++++++++++++++++++++ hw/acpi/hmat.h | 42 ++++ hw/core/machine.c | 64 ++++++ hw/core/numa.c | 279 ++++++++++++++++++++++++++ hw/i386/acpi-build.c | 5 + include/qapi/visitor-impl.h | 4 + include/qapi/visitor.h | 8 + include/qemu/cutils.h | 4 + include/sysemu/numa.h | 63 ++++++ qapi/machine.json | 178 +++++++++++++++- qapi/opts-visitor.c | 22 ++ qapi/qapi-visit-core.c | 12 ++ qapi/qobject-input-visitor.c | 18 ++ qapi/trace-events | 1 + qemu-options.hx | 96 ++++++++- scripts/qapi/schema.py | 1 + tests/bios-tables-test-allowed-diff.h | 8 + tests/bios-tables-test.c | 44 ++++ tests/data/acpi/pc/APIC.acpihmat | 0 tests/data/acpi/pc/DSDT.acpihmat | 0 tests/data/acpi/pc/HMAT.acpihmat | 0 tests/data/acpi/pc/SRAT.acpihmat | 0 tests/data/acpi/q35/APIC.acpihmat | 0 tests/data/acpi/q35/DSDT.acpihmat | 0 tests/data/acpi/q35/HMAT.acpihmat | 0 tests/data/acpi/q35/SRAT.acpihmat | 0 tests/numa-test.c | 194 ++++++++++++++++++ tests/test-cutils.c | 214 ++++++++++++++++---- tests/test-keyval.c | 136 +++++++++---- tests/test-qemu-opts.c | 39 +--- tests/test-qobject-input-visitor.c | 29 +++ util/cutils.c | 147 ++++++++++---- 34 files changed, 1726 insertions(+), 158 deletions(-) create mode 100644 hw/acpi/hmat.c create mode 100644 hw/acpi/hmat.h create mode 100644 tests/data/acpi/pc/APIC.acpihmat create mode 100644 tests/data/acpi/pc/DSDT.acpihmat create mode 100644 tests/data/acpi/pc/HMAT.acpihmat create mode 100644 tests/data/acpi/pc/SRAT.acpihmat create mode 100644 tests/data/acpi/q35/APIC.acpihmat create mode 100644 tests/data/acpi/q35/DSDT.acpihmat create mode 100644 tests/data/acpi/q35/HMAT.acpihmat create mode 100644 tests/data/acpi/q35/SRAT.acpihmat
Signature · 1 line
2.20.1
PATCH v17 1/14 util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Work like qemu_strtod() and qemu_strtold_finite, except store long double.
---
No changes in v17.
--- include/qemu/cutils.h | 3 +++ util/cutils.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-)
include/qemu/cutils.h +3 -0
@@ -146,6 +146,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base, uint64_t *result);int qemu_strtod (const char *nptr,const char **endptr,double *result);int qemu_strtod_finite (const char *nptr,const char **endptr,double *result); +int qemu_strtold (const char *nptr,const char **endptr,long double *result); +int qemu_strtold_finite (const char *nptr,const char **endptr, +long double *result);int parse_uint (const char *s,unsigned long long *value,char **endptr,int base);
util/cutils.c +47 -1
60 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Hi Markus,
Do you have any comments on this patch and 02/14 05/14 06/14. Thank you!
Quoted 93 lines · On 11/22/2019 3:48 PM, Xu, Tao3 wrote:
Work like
qemu_strtod()andqemu_strtold_finite, except store long double.Signed-off-by Tao Xu <[email protected]>---
No changes in v17.
--- include/qemu/cutils.h | 3 +++ util/cutils.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-)include/qemu/cutils.h +3
-0@@ -146,6 +146,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base, uint64_t *result);int qemu_strtod (const char *nptr,const char **endptr,double *result);int qemu_strtod_finite (const char *nptr,const char **endptr,double *result); +int qemu_strtold (const char *nptr,const char **endptr,long double *result); +int qemu_strtold_finite (const char *nptr,const char **endptr, +long double *result);int parse_uint (const char *s,unsigned long long *value,char **endptr,int base);util/cutils.c +47
-1@@ -553,7 +553,7 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,/** * Convert string @nptr to a double. -* +* * This is a wrapper around strtod() that is harder to misuse. * Semantics of @nptr and @endptr match strtod() with differences * noted below. @@ -616,6 +616,52 @@ int qemu_strtod_finite(const char *nptr, const char **endptr, double *result)return ret; } +/* +* Convert string @nptr to a long double. +* +* Works like qemu_strtod(), except it stores long double. +*/ +int qemu_strtold (const char *nptr,const char **endptr,long double *result) +{ +char *ep; + +if (!nptr) { +if (endptr) { + *endptr = nptr; + } +return -EINVAL ; + } + + errno =0 ; + *result =strtold (nptr, &ep); +return check_strtox_error (nptr, ep, endptr, errno); +} + +/* +* Convert string @nptr to a finite long double. +* +* Works like qemu_strtod_finite(), except it stores long double. +*/ +int qemu_strtold_finite (const char *nptr,const char **endptr, +long double *result) +{ +long double tmp; +int ret; + + ret =qemu_strtold (nptr, endptr, &tmp); +if (!ret && !isfinite (tmp)) { +if (endptr) { + *endptr = nptr; + } + ret = -EINVAL ; + } + +if (ret != -EINVAL ) { + *result = tmp; + } +return ret; +} +/** * Searches for the first occurrence of 'c' in 's', and returns a pointer * to the trailing null byte if none was found.
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Quoted 4 lines · Tao Xu
Hi Markus,
Do you have any comments on this patch and 02/14 05/14 06/14. Thank you!
These provide a new QAPI built-in type 'time'. It's like 'uint64' with an implied nanoseconds unit, and additional convenience syntax in the opts visitor and the keyval qobject input visitor. Patterned after 'size'.
The only use of 'time' so far is member @latency of NumaOptions member @hmap-lb. Uses of that:
* QMP command set-numa-node
The convenience syntax does not apply, as QMP uses the regular qobject input visitor, not the keyval one.
* CLI option -numa
We first parse the option argument with QemuOpts, then convert it to NumaOptions with the opts visitor.
The new built-in type 'time' gets used in -numa hmat-lb,...,latency=T
Questions / observations:
* The keyval qobject input visitor's support for 'time' appears to be unused for now.
* What's the anticipated range of values for -numa hmat-lb,...,latency=T? I'm asking because I wonder whether we really need convenience syntax there.
* Sure you want fractions?
Supporting fractions for byte counts (e.g. 1.5G) has been a mixed blessing, to put it charitably.
Use of fractions that aren't representable as double is not advisable. For instance, 1.1G is 1181116006 bytes rounded from 1181116006.4000001. Why would anybody want that?
Use of "nice" fractions is unproblematic, but the additional convenience is rather minor. Is being able to write 1536M as 1.5G worth the trouble? Meh.
With "metric" rather than "binary" suffixes, fractions provide even less convenience: 1.5ms vs. 1500us.
The implementation is limited to 53 bits of precision, which has been a source of confusion. Even that has arguably taken far more patches than it's worth. We're now talking about more patches to lift the restriction. Meh.
What exactly are we trying to achieve by supporting fractions?
* What about all the other time-valued things in the QAPI schema?
There are many more, and some of them are also visible in CLI or HMP. By providing convenience syntax for just -numa hmat-lb,...,latency=T, we create inconsistency.
To avoid it, we'd have to hunt down all the others. But some of them aren't in nanoseconds. Your new built-in type 'time' is only applicable to the ones in nanoseconds. Do we need more built-in types?
This series is at v17. I really, really want to tell you it's ready for merging. But as you see, I can't.
Maybe the convenience syntax is a good idea, maybe it's a bad idea. But it's definitely not a must-have idea.
If you want to pursue the idea, I recommend to split this series in two:
one part without the convenience, and a second part adding it. Hopefully, we can then merge the first part without too much fuss. The second part will have to deal with the questions above.
You can also shelve the idea, i.e. do just the first part now. It's what I'd do.
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Quoted 76 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Hi Markus,
Do you have any comments on this patch and 02/14 05/14 06/14. Thank you!
These provide a new QAPI built-in type 'time'. It's like 'uint64' with an implied nanoseconds unit, and additional convenience syntax in the opts visitor and the keyval qobject input visitor. Patterned after 'size'.
The only use of 'time' so far is member @latency of NumaOptions member @hmap-lb. Uses of that:
* QMP command set-numa-node
The convenience syntax does not apply, as QMP uses the regular qobject input visitor, not the keyval one.
* CLI option -numa
We first parse the option argument with QemuOpts, then convert it to NumaOptions with the opts visitor.
The new built-in type 'time' gets used in -numa hmat-lb,...,latency=T
Questions / observations:
* The keyval qobject input visitor's support for 'time' appears to be unused for now.
* What's the anticipated range of values for -numa hmat-lb,...,latency=T? I'm asking because I wonder whether we really need convenience syntax there.
* Sure you want fractions?
Supporting fractions for byte counts (e.g. 1.5G) has been a mixed blessing, to put it charitably.
Use of fractions that aren't representable as double is not advisable. For instance, 1.1G is 1181116006 bytes rounded from 1181116006.4000001. Why would anybody want that?
Use of "nice" fractions is unproblematic, but the additional convenience is rather minor. Is being able to write 1536M as 1.5G worth the trouble? Meh.
With "metric" rather than "binary" suffixes, fractions provide even less convenience: 1.5ms vs. 1500us.
The implementation is limited to 53 bits of precision, which has been a source of confusion. Even that has arguably taken far more patches than it's worth. We're now talking about more patches to lift the restriction. Meh.
What exactly are we trying to achieve by supporting fractions?
* What about all the other time-valued things in the QAPI schema?
There are many more, and some of them are also visible in CLI or HMP. By providing convenience syntax for just -numa hmat-lb,...,latency=T, we create inconsistency.
To avoid it, we'd have to hunt down all the others. But some of them aren't in nanoseconds. Your new built-in type 'time' is only applicable to the ones in nanoseconds. Do we need more built-in types?
This series is at v17. I really, really want to tell you it's ready for merging. But as you see, I can't.
Maybe the convenience syntax is a good idea, maybe it's a bad idea. But it's definitely not a must-have idea.
Quoted 8 lines
If you want to pursue the idea, I recommend to split this series in two:
one part without the convenience, and a second part adding it. Hopefully, we can then merge the first part without too much fuss. The second part will have to deal with the questions above.You can also shelve the idea, i.e. do just the first part now. It's what I'd do.
Thank you for your suggestion and support! Considering ACPI HMAT can only store unsigned integer data, and for the memory latency nanoseconds is enough. So we can use integer for latency data. I am wondering if we can use this solution:
* Still add builtin type time, but use qemu_strtou64() to parse.
* Still refactor do_strtosz() to support suffixes list, but add a extra parameter to decide use qemu_strtou64() or qemu_strtod_finite(), so time use qemu_strtou64() and qemu_strtod_finite()
* Second part dealing with the questions.
Then the only influence on HMAT patch is we need add a comments to tell user to input integer.
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Quoted 90 lines · Tao Xu
Quoted 76 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Hi Markus,
Do you have any comments on this patch and 02/14 05/14 06/14. Thank you!
These provide a new QAPI built-in type 'time'. It's like 'uint64' with an implied nanoseconds unit, and additional convenience syntax in the opts visitor and the keyval qobject input visitor. Patterned after 'size'.
The only use of 'time' so far is member @latency of NumaOptions member @hmap-lb. Uses of that:
* QMP command set-numa-node
The convenience syntax does not apply, as QMP uses the regular qobject input visitor, not the keyval one.
* CLI option -numa
We first parse the option argument with QemuOpts, then convert it to NumaOptions with the opts visitor.
The new built-in type 'time' gets used in -numa hmat-lb,...,latency=T
Questions / observations:
* The keyval qobject input visitor's support for 'time' appears to be unused for now.
* What's the anticipated range of values for -numa hmat-lb,...,latency=T? I'm asking because I wonder whether we really need convenience syntax there.
* Sure you want fractions?
Supporting fractions for byte counts (e.g. 1.5G) has been a mixed blessing, to put it charitably.
Use of fractions that aren't representable as double is not advisable. For instance, 1.1G is 1181116006 bytes rounded from 1181116006.4000001. Why would anybody want that?
Use of "nice" fractions is unproblematic, but the additional convenience is rather minor. Is being able to write 1536M as 1.5G worth the trouble? Meh.
With "metric" rather than "binary" suffixes, fractions provide even less convenience: 1.5ms vs. 1500us.
The implementation is limited to 53 bits of precision, which has been a source of confusion. Even that has arguably taken far more patches than it's worth. We're now talking about more patches to lift the restriction. Meh.
What exactly are we trying to achieve by supporting fractions?
* What about all the other time-valued things in the QAPI schema?
There are many more, and some of them are also visible in CLI or HMP. By providing convenience syntax for just -numa hmat-lb,...,latency=T, we create inconsistency.
To avoid it, we'd have to hunt down all the others. But some of them aren't in nanoseconds. Your new built-in type 'time' is only applicable to the ones in nanoseconds. Do we need more built-in types?
This series is at v17. I really, really want to tell you it's ready for merging. But as you see, I can't.
Maybe the convenience syntax is a good idea, maybe it's a bad idea. But it's definitely not a must-have idea.
Quoted 8 lines
If you want to pursue the idea, I recommend to split this series in two:
one part without the convenience, and a second part adding it. Hopefully, we can then merge the first part without too much fuss. The second part will have to deal with the questions above.You can also shelve the idea, i.e. do just the first part now. It's what I'd do.
Thank you for your suggestion and support! Considering ACPI HMAT can only store unsigned integer data, and for the memory latency nanoseconds is enough. So we can use integer for latency data. I am wondering if we can use this solution:
Quoted 4 lines
* Still add builtin type time, but use
qemu_strtou64()to parse.
* Still refactordo_strtosz()to support suffixes list, but add a extra parameter to decide useqemu_strtou64()orqemu_strtod_finite(), so time useqemu_strtou64()andqemu_strtod_finite()
We'd still have to grapple with "What about all the other time-valued things in the QAPI schema?"
Quoted 4 lines
* Second part dealing with the questions.
Then the only influence on HMAT patch is we need add a comments to tell user to input integer.
Considerung we're already at v17, I recommend to keep the first part as focused as possible. Since plain integer types are good enough for time values elsewhere in our external interfaces, they'll do for HMAT latency, too.
Once the first part is accepted, you're free to tackle the wider problem of providing convenience syntax for time values. Fair warning: I consider this a swamp.
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
Quoted 105 lines · Markus Armbruster
Quoted 90 lines · Tao Xu
Quoted 76 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Hi Markus,
Do you have any comments on this patch and 02/14 05/14 06/14. Thank you!
These provide a new QAPI built-in type 'time'. It's like 'uint64' with an implied nanoseconds unit, and additional convenience syntax in the opts visitor and the keyval qobject input visitor. Patterned after 'size'.
The only use of 'time' so far is member @latency of NumaOptions member @hmap-lb. Uses of that:
* QMP command set-numa-node
The convenience syntax does not apply, as QMP uses the regular qobject input visitor, not the keyval one.
* CLI option -numa
We first parse the option argument with QemuOpts, then convert it to NumaOptions with the opts visitor.
The new built-in type 'time' gets used in -numa hmat-lb,...,latency=T
Questions / observations:
* The keyval qobject input visitor's support for 'time' appears to be unused for now.
* What's the anticipated range of values for -numa hmat-lb,...,latency=T? I'm asking because I wonder whether we really need convenience syntax there.
* Sure you want fractions?
Supporting fractions for byte counts (e.g. 1.5G) has been a mixed blessing, to put it charitably.
Use of fractions that aren't representable as double is not advisable. For instance, 1.1G is 1181116006 bytes rounded from 1181116006.4000001. Why would anybody want that?
Use of "nice" fractions is unproblematic, but the additional convenience is rather minor. Is being able to write 1536M as 1.5G worth the trouble? Meh.
With "metric" rather than "binary" suffixes, fractions provide even less convenience: 1.5ms vs. 1500us.
The implementation is limited to 53 bits of precision, which has been a source of confusion. Even that has arguably taken far more patches than it's worth. We're now talking about more patches to lift the restriction. Meh.
What exactly are we trying to achieve by supporting fractions?
* What about all the other time-valued things in the QAPI schema?
There are many more, and some of them are also visible in CLI or HMP. By providing convenience syntax for just -numa hmat-lb,...,latency=T, we create inconsistency.
To avoid it, we'd have to hunt down all the others. But some of them aren't in nanoseconds. Your new built-in type 'time' is only applicable to the ones in nanoseconds. Do we need more built-in types?
This series is at v17. I really, really want to tell you it's ready for merging. But as you see, I can't.
Maybe the convenience syntax is a good idea, maybe it's a bad idea. But it's definitely not a must-have idea.
Quoted 8 lines
If you want to pursue the idea, I recommend to split this series in two:
one part without the convenience, and a second part adding it. Hopefully, we can then merge the first part without too much fuss. The second part will have to deal with the questions above.You can also shelve the idea, i.e. do just the first part now. It's what I'd do.
Thank you for your suggestion and support! Considering ACPI HMAT can only store unsigned integer data, and for the memory latency nanoseconds is enough. So we can use integer for latency data. I am wondering if we can use this solution:
Quoted 4 lines
* Still add builtin type time, but use
qemu_strtou64()to parse.
* Still refactordo_strtosz()to support suffixes list, but add a extra parameter to decide useqemu_strtou64()orqemu_strtod_finite(), so time useqemu_strtou64()andqemu_strtod_finite()We'd still have to grapple with "What about all the other time-valued things in the QAPI schema?"
Quoted 4 lines
* Second part dealing with the questions.
Then the only influence on HMAT patch is we need add a comments to tell user to input integer.
Quoted 9 lines
Considerung we're already at v17, I recommend to keep the first part as focused as possible. Since plain integer types are good enough for time values elsewhere in our external interfaces, they'll do for HMAT latency, too.
Once the first part is accepted, you're free to tackle the wider problem of providing convenience syntax for time values. Fair warning: I consider this a swamp.
Thank you! I will use integer for HMAT latency and submit the first part in next version.
Re: [PATCH v17 01/14] util/cutils: Add Add qemu_strtold and qemu_strtold_finite
In reply to Tao XuQuoted 40 lines · Tao Xu
Work like
qemu_strtod()andqemu_strtold_finite, except store long double.Signed-off-by Tao Xu <[email protected]>---
No changes in v17.
--- include/qemu/cutils.h | 3 +++ util/cutils.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-)include/qemu/cutils.h +3
-0@@ -146,6 +146,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base, uint64_t *result);int qemu_strtod (const char *nptr,const char **endptr,double *result);int qemu_strtod_finite (const char *nptr,const char **endptr,double *result); +int qemu_strtold (const char *nptr,const char **endptr,long double *result); +int qemu_strtold_finite (const char *nptr,const char **endptr, +long double *result);int parse_uint (const char *s,unsigned long long *value,char **endptr,int base);util/cutils.c +1
-1@@ -553,7 +553,7 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,/** * Convert string @nptr to a double. -* +* * This is a wrapper around strtod() that is harder to misuse. * Semantics of @nptr and @endptr match strtod() with differences * noted below.
util/cutils.c int qemu_strtod_finite(const char *nptr, const char **endptr, double *result) · line 622
Quoted 7 lines
util/cutils.c +4
-0@@ -616,6 +616,52 @@ int qemu_strtod_finite(const char *nptr, const char **endptr, double *result)return ret; } +/* +* Convert string @nptr to a long double. +* +* Works like qemu_strtod(), except it stores long double.
"except it stores long double" feels redundant.
In similar comments elsewhere in this file, we spell out the different overflow behavior. Let's do the same here, and replace the redundant part by "except it stores +/-HUGE_VALL on overflow".
Quoted 12 lines
util/cutils.c +12
-0+*/ +int qemu_strtold (const char *nptr,const char **endptr,long double *result) +{ +char *ep; + +if (!nptr) { +if (endptr) { + *endptr = nptr; + } +return -EINVAL ; + } +
util/cutils.c int qemu_strtod_finite(const char *nptr, const char **endptr, double *result) · line 644
Quoted 10 lines
util/cutils.c +10
-0+ errno =0 ; + *result =strtold (nptr, &ep); +return check_strtox_error (nptr, ep, endptr, errno); +} + +/* +* Convert string @nptr to a finite long double. +* +* Works like qemu_strtod_finite(), except it stores long double. +*/
Likewise.
Quoted 13 lines
util/cutils.c +13
-0+int qemu_strtold_finite (const char *nptr,const char **endptr, +long double *result) +{ +long double tmp; +int ret; + + ret =qemu_strtold (nptr, endptr, &tmp); +if (!ret && !isfinite (tmp)) { +if (endptr) { + *endptr = nptr; + } + ret = -EINVAL ; + }
util/cutils.c int qemu_strtod_finite(const char *nptr, const char **endptr, double *result) · line 667
Quoted 10 lines
util/cutils.c +7
-0+ +if (ret != -EINVAL ) { + *result = tmp; + } +return ret; +} +/** * Searches for the first occurrence of 'c' in 's', and returns a pointer * to the trailing null byte if none was found.
Preferably with the comments tweaked:
PATCH v17 2/14 util/cutils: Use qemu_strtold_finite to parse size
In reply to Tao XuSupport full 64bit precision, modify related test cases.
---
No changes in v17.
--- tests/test-cutils.c | 41 +++++------------------------------- tests/test-keyval.c | 47 +++++++----------------------------------- tests/test-qemu-opts.c | 39 +++++++---------------------------- util/cutils.c | 13 +++++------- 4 files changed, 24 insertions(+), 116 deletions(-)
tests/test-cutils.c +5 -36
@@ -1970,40 +1970,19 @@ static void test_qemu_strtosz_simple(void) g_assert_cmpint(err, ==, 0); g_assert_cmpint(res, ==, 12345); -/* Note: precision is 53 bits since we're parsing with strtod() */ +/* Note: precision is 64 bits (UINT64_MAX) */ - str ="9007199254740991" ;/* 2^53-1 */ + str ="18446744073709551614" ;/* UINT64_MAX - 1 */ err =qemu_strtosz (str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 0x1fffffffffffff); -g_assert (endptr == str +16 ); - - str ="9007199254740992" ;/* 2^53 */ - err =qemu_strtosz (str, &endptr, &res); - g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 0x20000000000000); -g_assert (endptr == str +16 ); - - str ="9007199254740993" ;/* 2^53+1 */ - err =qemu_strtosz (str, &endptr, &res); - g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 0x20000000000000); /* rounded to 53 bits */ -g_assert (endptr == str +16 ); - - str ="18446744073709549568" ;/* 0xfffffffffffff800 (53 msbs set) */ - err =qemu_strtosz (str, &endptr, &res); - g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 0xfffffffffffff800); + g_assert_cmpint(res, ==, 0xfffffffffffffffe);g_assert (endptr == str +20 ); - str ="18446744073709550591" ;/* 0xfffffffffffffbff */ + str ="18446744073709551615" ;/* UINT64_MAX */ err =qemu_strtosz (str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 0xfffffffffffff800); /* rounded to 53 bits */ + g_assert_cmpint(res, ==, 0xffffffffffffffff);g_assert (endptr == str +20 ); - -/* 0x7ffffffffffffe00..0x7fffffffffffffff get rounded to -* 0x8000000000000000, thus -ERANGE; see test_qemu_strtosz_erange() */ }static void test_qemu_strtosz_units (void )
@@ -2145,16 +2124,6 @@ static void test_qemu_strtosz_erange(void) g_assert_cmpint(err, ==, -ERANGE);g_assert (endptr == str +2 ); - str ="18446744073709550592" ;/* 0xfffffffffffffc00 */ - err =qemu_strtosz (str, &endptr, &res); - g_assert_cmpint(err, ==, -ERANGE); -g_assert (endptr == str +20 ); - - str ="18446744073709551615" ;/* 2^64-1 */ - err =qemu_strtosz (str, &endptr, &res); - g_assert_cmpint(err, ==, -ERANGE); -g_assert (endptr == str +20 ); - str ="18446744073709551616" ;/* 2^64 */ err =qemu_strtosz (str, &endptr, &res); g_assert_cmpint(err, ==, -ERANGE);
tests/test-keyval.c +7 -40
66 lines not on this page · raw message
tests/test-qemu-opts.c +7 -32
@@ -650,50 +650,25 @@ static void test_opts_parse_size(void) g_assert_cmpuint(opts_count(opts), ==, 1); g_assert_cmpuint(qemu_opt_get_size(opts, "size1", 1), ==, 0); -/* Note: precision is 53 bits since we're parsing with strtod() */ +/* Note: precision is 64 bits (UINT64_MAX) */ -/* Around limit of precision: 2^53-1, 2^53, 2^54 */ +/* Around limit of precision: UINT64_MAX - 1, UINT64_MAX */ opts =qemu_opts_parse (&opts_list_02, -"size1=9007199254740991," -"size2=9007199254740992," -"size3=9007199254740993" , - false, &error_abort); - g_assert_cmpuint(opts_count(opts), ==, 3); -g_assert_cmphex (qemu_opt_get_size (opts,"size1" ,1 ), - ==, 0x1fffffffffffff); -g_assert_cmphex (qemu_opt_get_size (opts,"size2" ,1 ), - ==, 0x20000000000000); -g_assert_cmphex (qemu_opt_get_size (opts,"size3" ,1 ), - ==, 0x20000000000000); - -/* Close to signed upper limit 0x7ffffffffffffc00 (53 msbs set) */ - opts =qemu_opts_parse (&opts_list_02, -"size1=9223372036854774784," /* 7ffffffffffffc00 */ -"size2=9223372036854775295" ,/* 7ffffffffffffdff */ - false, &error_abort); - g_assert_cmpuint(opts_count(opts), ==, 2); -g_assert_cmphex (qemu_opt_get_size (opts,"size1" ,1 ), - ==, 0x7ffffffffffffc00); -g_assert_cmphex (qemu_opt_get_size (opts,"size2" ,1 ), - ==, 0x7ffffffffffffc00); - -/* Close to actual upper limit 0xfffffffffffff800 (53 msbs set) */ - opts =qemu_opts_parse (&opts_list_02, -"size1=18446744073709549568," /* fffffffffffff800 */ -"size2=18446744073709550591" ,/* fffffffffffffbff */ +"size1=18446744073709551614," +"size2=18446744073709551615" , false, &error_abort); g_assert_cmpuint(opts_count(opts), ==, 2);g_assert_cmphex (qemu_opt_get_size (opts,"size1" ,1 ), - ==, 0xfffffffffffff800); + ==, 0xfffffffffffffffe);g_assert_cmphex (qemu_opt_get_size (opts,"size2" ,1 ), - ==, 0xfffffffffffff800); + ==, 0xffffffffffffffff);/* Beyond limits */ opts =qemu_opts_parse (&opts_list_02,"size1=-1" , false, &err);error_free_or_abort (&err);g_assert (!opts); opts =qemu_opts_parse (&opts_list_02, -"size1=18446744073709550592" ,/* fffffffffffffc00 */ +"size1=18446744073709551616" ,/* 2^64 */ false, &err);error_free_or_abort (&err);g_assert (!opts);
util/cutils.c +5 -8
@@ -216,13 +216,13 @@ static int do_strtosz(const char *nptr, const char **end,const char *endptr;unsigned char c;int mul_required =0 ; -double val, mul, integral, fraction; +long double val, mul, integral, fraction; - retval =qemu_strtod_finite (nptr, &endptr, &val); + retval =qemu_strtold_finite (nptr, &endptr, &val);if (retval) { goto out; } - fraction =modf (val, &integral); + fraction =modfl (val, &integral);if (fraction !=0 ) { mul_required =1 ; }
@@ -238,11 +238,8 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL ; goto out; } -/* -* Values >= 0xfffffffffffffc00 overflow uint64_t after their trip -* through double (53 bits of precision). -*/ -if ((val * mul >=0xfffffffffffffc00 ) || val <0 ) { +/* Values > UINT64_MAX overflow uint64_t */ +if ((val * mul >UINT64_MAX ) || val <0 ) { retval = -ERANGE ; goto out; }
Signature · 1 line
2.20.1
Re: [PATCH v17 02/14] util/cutils: Use qemu_strtold_finite to parse size
Quoted 1 line · Tao Xu
Support full 64bit precision, modify related test cases.
That's not true in general: long double need not be any wider than double.
It might be true on the host machines we support, but I don't know. If we decide to rely on it, we better make the build fail when the host machine doesn't meet our expectations, preferably in configure.
Quoted 3 lines
Signed-off-by Tao Xu <[email protected]>---
[...]
Quoted 25 lines
util/cutils.c +3
-3@@ -216,13 +216,13 @@ static int do_strtosz(const char *nptr, const char **end,const char *endptr;unsigned char c;int mul_required =0 ; -double val, mul, integral, fraction; +long double val, mul, integral, fraction; - retval =qemu_strtod_finite (nptr, &endptr, &val); + retval =qemu_strtold_finite (nptr, &endptr, &val);if (retval) { goto out; } - fraction =modf (val, &integral); + fraction =modfl (val, &integral);if (fraction !=0 ) { mul_required =1 ; }@@ -238,11 +238,8 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL ; goto out; }
util/cutils.c static int do_strtosz(const char *nptr, const char **end, · line 245
Quoted 10 lines
util/cutils.c +2
-5-/* -* Values >= 0xfffffffffffffc00 overflow uint64_t after their trip -* through double (53 bits of precision). -*/ -if ((val * mul >=0xfffffffffffffc00 ) || val <0 ) { +/* Values > UINT64_MAX overflow uint64_t */ +if ((val * mul >UINT64_MAX ) || val <0 ) { retval = -ERANGE ; goto out; }
Not portable. If it was, we'd have made this changd long ago :)
Re: [PATCH v17 02/14] util/cutils: Use qemu_strtold_finite to parse size
Quoted 11 lines · Markus Armbruster
Quoted 1 line · Tao Xu
Support full 64bit precision, modify related test cases.
That's not true in general: long double need not be any wider than double.
It might be true on the host machines we support, but I don't know. If we decide to rely on it, we better make the build fail when the host machine doesn't meet our expectations, preferably in configure.
[...]
Quoted 9 lines
util/cutils.c static int do_strtosz(const char *nptr, const char **end, · line 245
Quoted 6 lines
util/cutils.c +2
-1-if ((val * mul >=0xfffffffffffffc00 ) || val <0 ) { +/* Values > UINT64_MAX overflow uint64_t */ +if ((val * mul >UINT64_MAX ) || val <0 ) { retval = -ERANGE ; goto out; }Not portable. If it was, we'd have made this changd long ago :)
OK. So the suitable solution is what you suggested in v14?
"A possible alternative is to parse the numeric part both as a double and as a 64 bit unsigned integer, then use whatever consumes more characters. This enables providing full 64 bits unless you actually use a fraction."
I will try this way.
Re: [PATCH v17 02/14] util/cutils: Use qemu_strtold_finite to parse size
Quoted 23 lines · Tao Xu
Quoted 11 lines · Markus Armbruster
Quoted 1 line · Tao Xu
Support full 64bit precision, modify related test cases.
That's not true in general: long double need not be any wider than double.
It might be true on the host machines we support, but I don't know. If we decide to rely on it, we better make the build fail when the host machine doesn't meet our expectations, preferably in configure.
[...]
Quoted 9 lines
util/cutils.c static int do_strtosz(const char *nptr, const char **end, · line 245
Quoted 6 lines
util/cutils.c +2
-1-if ((val * mul >=0xfffffffffffffc00 ) || val <0 ) { +/* Values > UINT64_MAX overflow uint64_t */ +if ((val * mul >UINT64_MAX ) || val <0 ) { retval = -ERANGE ; goto out; }Not portable. If it was, we'd have made this changd long ago :)
Quoted 7 lines
OK. So the suitable solution is what you suggested in v14?
"A possible alternative is to parse the numeric part both as a double and as a 64 bit unsigned integer, then use whatever consumes more characters. This enables providing full 64 bits unless you actually use
a fraction."
Yes, that bypasses the portability issue.
Quoted 1 line
I will try this way.
Go ahead.
PATCH v17 3/14 util/cutils: refactor do_strtosz() to support suffixes list
In reply to Tao XuAdd do_strtomul() to convert string according to different suffixes.
---
No changes in v17.
Changes in v15:
- Add a new patch to refactor do_strtosz() (Eduardo)
--- util/cutils.c | 72 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 30 deletions(-)
util/cutils.c +42 -30
@@ -181,41 +181,37 @@ int fcntl_setfl(int fd, int flag) }#endif -static int64_t suffix_mul (char suffix,int64_t unit) +static int64_t suffix_mul (const char *suffixes[],int num_suffix, +const char *endptr,int *offset,int64_t unit) { -switch (qemu_toupper (suffix)) { -case 'B' : -return 1 ; -case 'K' : -return unit; -case 'M' : -return unit * unit; -case 'G' : -return unit * unit * unit; -case 'T' : -return unit * unit * unit * unit; -case 'P' : -return unit * unit * unit * unit * unit; -case 'E' : -return unit * unit * unit * unit * unit * unit; +int i, suffix_len; +int64_t mul =1 ; + +for (i =0 ; i < num_suffix; i++) { + suffix_len =strlen (suffixes[i]); +if (g_ascii_strncasecmp (suffixes[i], endptr, suffix_len) ==0 ) { + *offset = suffix_len; +return mul; + } + mul *= unit; } +return -1 ; }/* -* Convert string to bytes, allowing either B/b for bytes, K/k for KB, -* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned -* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on -* other error. +* Convert string according to different suffixes. End pointer will be returned +* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on other error. */ -static int do_strtosz (const char *nptr,const char **end, -const char default_suffix,int64_t unit, +static int do_strtomul (const char *nptr,const char **end, +const char *suffixes[],int num_suffix, +const char *default_suffix,int64_t unit,uint64_t *result) {int retval;const char *endptr; -unsigned char c;int mul_required =0 ; +int offset =0 ;long double val, mul, integral, fraction; retval =qemu_strtold_finite (nptr, &endptr, &val);
@@ -226,12 +222,12 @@ static int do_strtosz(const char *nptr, const char **end,if (fraction !=0 ) { mul_required =1 ; } - c = *endptr; - mul =suffix_mul (c, unit); + + mul =suffix_mul (suffixes, num_suffix, endptr, &offset, unit);if (mul >=0 ) { - endptr++; + endptr += offset; }else { - mul =suffix_mul (default_suffix, unit); + mul =suffix_mul (suffixes, num_suffix, default_suffix, &offset, unit);assert (mul >=0 ); }if (mul ==1 && mul_required) {
@@ -256,19 +252,35 @@ out:return retval; } +/* +* Convert string to bytes, allowing either B/b for bytes, K/k for KB, +* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned +* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on +* other error. +*/ +static int do_strtosz (const char *nptr,const char **end, +const char *default_suffix,int64_t unit, +uint64_t *result) +{ +static const char *suffixes[] = {"B" ,"K" ,"M" ,"G" ,"T" ,"P" ,"E" }; + +return do_strtomul (nptr, end, suffixes,ARRAY_SIZE (suffixes), + default_suffix, unit, result); +} +int qemu_strtosz (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'B' ,1024 , result); +return do_strtosz (nptr, end,"B" ,1024 , result); }int qemu_strtosz_MiB (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'M' ,1024 , result); +return do_strtosz (nptr, end,"M" ,1024 , result); }int qemu_strtosz_metric (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'B' ,1000 , result); +return do_strtosz (nptr, end,"B" ,1000 , result); }/**
Signature · 1 line
2.20.1
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>
What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
Quoted 10 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
1) Parameters added to suffix_mul() (suffix table);
2) do_strtomul() is being extracted from do_strtosz().
do_strtomul() interface and behavior stays the same.
Signature · 1 line
Eduardo
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
Quoted 8 lines · Eduardo Habkost
Quoted 7 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>
Quoted 8 lines
Quoted 3 lines
What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
1) Parameters added to
suffix_mul()(suffix table);
2)do_strtomul()is being extracted fromdo_strtosz().
do_strtomul()interface and behavior stays the same.
Alright, it's two related changes squashed together (which tends to complicate writing good commit messages). 2) is really a refactoring.
1) is not: it makes suffix_mul() more flexible. Summarizing 1) and 2) as "refactor do_strtosz() to support suffixes list" is confusing, because it's about 1), while the interesting part is actually 2).
Moreover, the commit message should state why these two changes are useful. It tries, but "to support suffixes list" merely kicks the can down the road, because the reader is left to wonder why supporting suffix lists is useful. It's actually for use by the next patch. So say that.
I'll review the actual patch now.
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
Quoted 25 lines · Markus Armbruster
Quoted 8 lines · Eduardo Habkost
Quoted 7 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>Quoted 8 lines
Quoted 3 lines
What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
1) Parameters added to
suffix_mul()(suffix table);
2)do_strtomul()is being extracted fromdo_strtosz().
do_strtomul()interface and behavior stays the same.Alright, it's two related changes squashed together (which tends to complicate writing good commit messages). 2) is really a refactoring.
1) is not: it makessuffix_mul()more flexible. Summarizing 1) and 2) as "refactordo_strtosz()to support suffixes list" is confusing, because it's about 1), while the interesting part is actually 2).
Quoted 5 lines
Moreover, the commit message should state why these two changes are useful. It tries, but "to support suffixes list" merely kicks the can down the road, because the reader is left to wonder why supporting suffix lists is useful. It's actually for use by the next patch. So say that.
Test case additions to test-cutils.c would go a long way to illustrating what is added & that its working correctly.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
Quoted 26 lines · Daniel P. Berrangé
Quoted 25 lines · Markus Armbruster
Quoted 8 lines · Eduardo Habkost
Quoted 7 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>Quoted 8 lines
Quoted 3 lines
What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
1) Parameters added to
suffix_mul()(suffix table);
2)do_strtomul()is being extracted fromdo_strtosz().
do_strtomul()interface and behavior stays the same.Alright, it's two related changes squashed together (which tends to complicate writing good commit messages). 2) is really a refactoring.
1) is not: it makessuffix_mul()more flexible. Summarizing 1) and 2) as "refactordo_strtosz()to support suffixes list" is confusing, because it's about 1), while the interesting part is actually 2).
Quoted 8 lines
Quoted 5 lines
Moreover, the commit message should state why these two changes are useful. It tries, but "to support suffixes list" merely kicks the can down the road, because the reader is left to wonder why supporting suffix lists is useful. It's actually for use by the next patch. So say that.
Test case additions to
test-cutils.cwould go a long way to illustrating what is added & that its working correctly.
Since this patch only prepares for new features, it doesn't need test updates. The next patch adds features, and it does update the tests.
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
In reply to Markus ArmbrusterQuoted 17 lines · Markus Armbruster
Quoted 15 lines · Eduardo Habkost
Quoted 10 lines · Markus Armbruster
Quoted 4 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>What's the actual change here? "Refactor" suggests the interfaces stay the same, only their implementation changes. "Support suffixes list" suggests some interface supports something new.
1) Parameters added to
suffix_mul()(suffix table);
2)do_strtomul()is being extracted fromdo_strtosz().
Quoted 7 lines
Quoted 1 line
do_strtomul()interface and behavior stays the same.Alright, it's two related changes squashed together (which tends to complicate writing good commit messages). 2) is really a refactoring.
1) is not: it makessuffix_mul()more flexible. Summarizing 1) and 2) as "refactordo_strtosz()to support suffixes list" is confusing, because it's about 1), while the interesting part is actually 2).
I agree the interesting part is 2. I still consider 1 being refactoring, as it doesn't change any external behavior.
Quoted 6 lines
Moreover, the commit message should state why these two changes are useful. It tries, but "to support suffixes list" merely kicks the can down the road, because the reader is left to wonder why supporting suffix lists is useful. It's actually for use by the next patch. So say that.
Agreed.
Quoted 2 lines
I'll review the actual patch now.
Thanks!
Signature · 1 line
Eduardo
Re: [PATCH v17 03/14] util/cutils: refactor do_strtosz() to support suffixes list
In reply to Tao XuQuoted 19 lines · Tao Xu
Add
do_strtomul()to convert string according to different suffixes.Reviewed-by Eduardo Habkost <[email protected]>Signed-off-by Tao Xu <[email protected]>---
No changes in v17.
Changes in v15:
- Add a new patch to refactordo_strtosz()(Eduardo)--- util/cutils.c | 72 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 30 deletions(-)util/cutils.c +0
-0
util/cutils.c int fcntl_setfl(int fd, int flag) · line 185
Quoted 6 lines
util/cutils.c +2
-1@@ -181,41 +181,37 @@ int fcntl_setfl(int fd, int flag) }#endif -static int64_t suffix_mul (char suffix,int64_t unit) +static int64_t suffix_mul (const char *suffixes[],int num_suffix, +const char *endptr,int *offset,int64_t unit)
This function could really use a contract comment now.
Quoted 10 lines
util/cutils.c +0
-9{ -switch (qemu_toupper (suffix)) { -case 'B' : -return 1 ; -case 'K' : -return unit; -case 'M' : -return unit * unit; -case 'G' : -return unit * unit * unit;
util/cutils.c int fcntl_setfl(int fd, int flag) · line 190
Quoted 10 lines
util/cutils.c +4
-6-case 'T' : -return unit * unit * unit * unit; -case 'P' : -return unit * unit * unit * unit * unit; -case 'E' : -return unit * unit * unit * unit * unit * unit; +int i, suffix_len; +int64_t mul =1 ; + +for (i =0 ; i < num_suffix; i++) {
Aha: @num_suffix is the number of elements in suffixes[].
I'd put a terminating NULL into suffixes[] and dispense with @num_suffix:
for (i = 0; suffix[i]; i++) {util/cutils.c int fcntl_setfl(int fd, int flag) · line 191
Quoted 1 line
util/cutils.c +1
-0+ suffix_len =strlen (suffixes[i]);
@suffix_len should be size_t, because that's what strlen() returns.
util/cutils.c int fcntl_setfl(int fd, int flag) · line 192
Quoted 1 line
util/cutils.c +1
-0+if (g_ascii_strncasecmp (suffixes[i], endptr, suffix_len) ==0 ) {
@endptr is a terrible name: it points to the *beginning* of the suffix.
util/cutils.c int fcntl_setfl(int fd, int flag) · line 193
Quoted 1 line
util/cutils.c +1
-0+ *offset = suffix_len;
@offset is a terrible name: it provides no clue whatsoever on its meaning. It's actually for receiving the length of the suffix.
Please replace it by char **end, because that's how the related functions work.
Quoted 12 lines
util/cutils.c +4
-3+return mul; + } + mul *= unit; } +return -1 ; }/* -* Convert string to bytes, allowing either B/b for bytes, K/k for KB, -* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned -* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on
util/cutils.c int fcntl_setfl(int fd, int flag) · line 209
Quoted 10 lines
util/cutils.c +5
-3-* other error. +* Convert string according to different suffixes. End pointer will be returned +* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on other error. */ -static int do_strtosz (const char *nptr,const char **end, -const char default_suffix,int64_t unit, +static int do_strtomul (const char *nptr,const char **end, +const char *suffixes[],int num_suffix, +const char *default_suffix,int64_t unit,uint64_t *result)
The function comment is barely adequate before your patch: it doesn't explain the arguments. Your patch adds more arguments, thus more guesswork for the reader.
Again, I'd put a terminating NULL into suffixes[] and dispense with @num_suffix.
Quoted 10 lines
util/cutils.c +1
-1{int retval;const char *endptr; -unsigned char c;int mul_required =0 ; +int offset =0 ;long double val, mul, integral, fraction; retval =qemu_strtold_finite (nptr, &endptr, &val);
util/cutils.c static int do_strtosz(const char *nptr, const char **end, · line 226
Quoted 7 lines
util/cutils.c +2
-2@@ -226,12 +222,12 @@ static int do_strtosz(const char *nptr, const char **end,if (fraction !=0 ) { mul_required =1 ; } - c = *endptr; - mul =suffix_mul (c, unit); + + mul =suffix_mul (suffixes, num_suffix, endptr, &offset, unit);
@endptr points behind the number, i.e. to the suffix, and @offset is the length of the suffix. Suggest to rename @endptr to @suffix, and replace @offset by @endptr.
util/cutils.c static int do_strtosz(const char *nptr, const char **end, · line 231
Quoted 7 lines
util/cutils.c +2
-2if (mul >=0 ) { - endptr++; + endptr += offset; }else { - mul =suffix_mul (default_suffix, unit); + mul =suffix_mul (suffixes, num_suffix, default_suffix, &offset, unit);assert (mul >=0 );
Please assert "no trailing crap in @default_suffix".
Quoted 41 lines
util/cutils.c +19
-3}if (mul ==1 && mul_required) {@@ -256,19 +252,35 @@ out:return retval; } +/* +* Convert string to bytes, allowing either B/b for bytes, K/k for KB, +* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned +* in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on +* other error. +*/ +static int do_strtosz (const char *nptr,const char **end, +const char *default_suffix,int64_t unit, +uint64_t *result) +{ +static const char *suffixes[] = {"B" ,"K" ,"M" ,"G" ,"T" ,"P" ,"E" }; + +return do_strtomul (nptr, end, suffixes,ARRAY_SIZE (suffixes), + default_suffix, unit, result); +} +int qemu_strtosz (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'B' ,1024 , result); +return do_strtosz (nptr, end,"B" ,1024 , result); }int qemu_strtosz_MiB (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'M' ,1024 , result); +return do_strtosz (nptr, end,"M" ,1024 , result); }int qemu_strtosz_metric (const char *nptr,const char **end,uint64_t *result) { -return do_strtosz (nptr, end,'B' ,1000 , result); +return do_strtosz (nptr, end,"B" ,1000 , result); }/**
PATCH v17 4/14 util/cutils: Add qemu_strtotime_ns()
In reply to Tao XuTo convert strings with time suffixes to numbers, support time unit are "ns" for nanosecond, "us" for microsecond, "ms" for millisecond or "s" for second. Add test for qemu_strtotime_ns, test the input of basic, time suffixes, float, invaild, trailing and overflow.
---
No changes in v17.
Changes in v16:
- Update the test because precision is 64 bits
Changes in v15:
- Add a new patch to refactor do_strtosz() (Eduardo)
- use ARRAY_SIZE(suffixes) instead of hardcoding the suffixes number (Eduardo)
--- include/qemu/cutils.h | 1 + tests/test-cutils.c | 173 ++++++++++++++++++++++++++++++++++++++++++ util/cutils.c | 14 ++++ 3 files changed, 188 insertions(+)
include/qemu/cutils.h +1 -0
@@ -185,5 +185,6 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n);* *str1 is <, == or > than *str2. */ int qemu_pstrcmp0 (const char **str1,const char **str2); +int qemu_strtotime_ns (const char *nptr,const char **end,uint64_t *result);#endif
tests/test-cutils.c +173 -0
184 lines not on this page · raw message
util/cutils.c +14 -0
@@ -283,6 +283,20 @@ int qemu_strtosz_metric(const char *nptr, const char **end, uint64_t *result)return do_strtosz (nptr, end,"B" ,1000 , result); } +/* +* Convert string to time, support time unit are ns for nanosecond, us for +* microsecond, ms for millisecond and s for second. End pointer will be +* returned in *end, if not NULL. Return -ERANGE on overflow, and -EINVAL on +* other error. +*/ +int qemu_strtotime_ns (const char *nptr,const char **end,uint64_t *result) +{ +static const char *suffixes[] = {"ns" ,"us" ,"ms" ,"s" }; + +return do_strtomul (nptr, end, suffixes,ARRAY_SIZE (suffixes),"ns" ,1000 , + result); +} +/** * Helper function for error checking after strtol() and the like */
Signature · 1 line
2.20.1
PATCH v17 5/14 qapi: Add builtin type time
In reply to Tao XuAdd optional builtin type time, fallback is uint64. This type use qemu_strtotime_ns() for pre-converting time suffix to numbers.
---
No changes in v17.
Changes in v14:
- Drop time unit picosecond (Eric)
--- include/qapi/visitor-impl.h | 4 ++++ include/qapi/visitor.h | 8 ++++++++ qapi/opts-visitor.c | 22 ++++++++++++++++++++++ qapi/qapi-visit-core.c | 12 ++++++++++++ qapi/qobject-input-visitor.c | 18 ++++++++++++++++++ qapi/trace-events | 1 + scripts/qapi/schema.py | 1 + 7 files changed, 66 insertions(+)
include/qapi/visitor-impl.h +4 -0
@@ -88,6 +88,10 @@ struct Visitorvoid (*type_size)(Visitor *v,const char *name,uint64_t *obj,Error **errp); +/* Optional; fallback is type_uint64() */ +void (*type_time)(Visitor *v,const char *name,uint64_t *obj, +Error **errp); +/* Must be set */ void (*type_bool)(Visitor *v,const char *name,bool *obj,Error **errp);
include/qapi/visitor.h +8 -0
@@ -554,6 +554,14 @@ void visit_type_int64(Visitor *v, const char *name, int64_t *obj,void visit_type_size (Visitor *v,const char *name,uint64_t *obj,Error **errp); +/* +* Visit a uint64_t value. +* Like visit_type_uint64(), except that some visitors may choose to +* recognize numbers with timeunit suffix, such as "ns", "us" "ms" and "s". +*/ +void visit_type_time (Visitor *v,const char *name,uint64_t *obj, +Error **errp); +/* * Visit a boolean value. *
qapi/opts-visitor.c +22 -0
@@ -526,6 +526,27 @@ opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp)processed (ov, name); } +static void +opts_type_time (Visitor *v,const char *name,uint64_t *obj,Error **errp) +{ +OptsVisitor *ov =to_ov (v); +const QemuOpt *opt; +int err; + + opt =lookup_scalar (ov, name, errp); +if (!opt) { +return ; + } + + err =qemu_strtotime_ns (opt->str ? opt->str :"" ,NULL , obj); +if (err <0 ) { +error_setg (errp,QERR_INVALID_PARAMETER_VALUE , opt->name, +"a time value" ); +return ; + } + +processed (ov, name); +}static void opts_optional (Visitor *v,const char *name,bool *present)
@@ -573,6 +594,7 @@ opts_visitor_new(const QemuOpts *opts) ov->visitor.type_int64 = &opts_type_int64; ov->visitor.type_uint64 = &opts_type_uint64; ov->visitor.type_size = &opts_type_size; + ov->visitor.type_time = &opts_type_time; ov->visitor.type_bool = &opts_type_bool; ov->visitor.type_str = &opts_type_str;
qapi/qapi-visit-core.c +12 -0
@@ -277,6 +277,18 @@ void visit_type_size(Visitor *v, const char *name, uint64_t *obj, } } +void visit_type_time (Visitor *v,const char *name,uint64_t *obj, +Error **errp) +{ +assert (obj); +trace_visit_type_time (v, name, obj); +if (v->type_time) { + v->type_time (v, name, obj, errp); + }else { + v->type_uint64 (v, name, obj, errp); + } +} +void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {assert (obj);
qapi/qobject-input-visitor.c +18 -0
@@ -627,6 +627,23 @@ static void qobject_input_type_size_keyval(Visitor *v, const char *name, } } +static void qobject_input_type_time_keyval (Visitor *v,const char *name, +uint64_t *obj,Error **errp) +{ +QObjectInputVisitor *qiv =to_qiv (v); +const char *str =qobject_input_get_keyval (qiv, name, errp); + +if (!str) { +return ; + } + +if (qemu_strtotime_ns (str,NULL , obj) <0 ) { +/* TODO report -ERANGE more nicely */ +error_setg (errp,QERR_INVALID_PARAMETER_VALUE , +full_name (qiv, name),"time" ); + } +} +static void qobject_input_optional (Visitor *v,const char *name,bool *present) {QObjectInputVisitor *qiv =to_qiv (v);
@@ -708,6 +725,7 @@ Visitor *qobject_input_visitor_new_keyval(QObject *obj) v->visitor.type_any = qobject_input_type_any; v->visitor.type_null = qobject_input_type_null; v->visitor.type_size = qobject_input_type_size_keyval; + v->visitor.type_time = qobject_input_type_time_keyval; v->keyval = true;return &v->visitor;
qapi/trace-events +1 -0
@@ -29,6 +29,7 @@ visit_type_int16(void *v, const char *name, int16_t *obj) "v=%p name=%s obj=%p" visit_type_int32(void *v, const char *name, int32_t *obj) "v=%p name=%s obj=%p" visit_type_int64(void *v, const char *name, int64_t *obj) "v=%p name=%s obj=%p" visit_type_size(void *v, const char *name, uint64_t *obj) "v=%p name=%s obj=%p" +visit_type_time(void *v, const char *name, uint64_t *obj) "v=%p name=%s obj=%p" visit_type_bool(void *v, const char *name, bool *obj) "v=%p name=%s obj=%p" visit_type_str(void *v, const char *name, char **obj) "v=%p name=%s obj=%p" visit_type_number(void *v, const char *name, void *obj) "v=%p name=%s obj=%p"
scripts/qapi/schema.py +1 -0
@@ -855,6 +855,7 @@ class QAPISchema(object): ('uint32', 'int', 'uint32_t'), ('uint64', 'int', 'uint64_t'), ('size', 'int', 'uint64_t'), + ('time', 'int', 'uint64_t'), ('bool', 'boolean', 'bool'), ('any', 'value', 'QObject' + pointer_suffix), ('null', 'null', 'QNull' + pointer_suffix)]:
Signature · 1 line
2.20.1
Re: [PATCH v17 05/14] qapi: Add builtin type time
Quoted 10 lines · Tao Xu
Add optional builtin type time, fallback is uint64. This type use
qemu_strtotime_ns()for pre-converting time suffix to numbers.Signed-off-by Tao Xu <[email protected]>---
No changes in v17.
Changes in v14:
- Drop time unit picosecond (Eric)
Quoted 9 lines
--- include/qapi/visitor-impl.h | 4 ++++ include/qapi/visitor.h | 8 ++++++++ qapi/opts-visitor.c | 22 ++++++++++++++++++++++ qapi/qapi-visit-core.c | 12 ++++++++++++ qapi/qobject-input-visitor.c | 18 ++++++++++++++++++ qapi/trace-events | 1 + scripts/qapi/schema.py | 1 + 7 files changed, 66 insertions(+)
Missing: test coverage for the new built-in type. I'm not asking for much. Suggest to match what's done for 'size' in qapi-schema-test.json.
Possibly missing: string-input-visitor, string-output-visitor implement type_size(). Both lack test coverage, though. Should any of them implement type_time(), too?
Quoted 21 lines
include/qapi/visitor-impl.h +4
-0@@ -88,6 +88,10 @@ struct Visitorvoid (*type_size)(Visitor *v,const char *name,uint64_t *obj,Error **errp); +/* Optional; fallback is type_uint64() */ +void (*type_time)(Visitor *v,const char *name,uint64_t *obj, +Error **errp); +/* Must be set */ void (*type_bool)(Visitor *v,const char *name,bool *obj,Error **errp);include/qapi/visitor.h +0
-0
include/qapi/visitor.h void visit_type_int64(Visitor *v, const char *name, int64_t *obj, · line 561
Quoted 8 lines
include/qapi/visitor.h +5
-0@@ -554,6 +554,14 @@ void visit_type_int64(Visitor *v, const char *name, int64_t *obj,void visit_type_size (Visitor *v,const char *name,uint64_t *obj,Error **errp); +/* +* Visit a uint64_t value. +* Like visit_type_uint64(), except that some visitors may choose to +* recognize numbers with timeunit suffix, such as "ns", "us" "ms" and "s". +*/
Overspecifies what implementations may do. Let's use visit_type_size()'s contract here:
/*
* Visit a uint64_t value.
* Like visit_type_uint64(), except that some visitors may choose to
* recognize additional syntax, such as suffixes for easily scaling
* values.
*/
Quoted 129 lines
include/qapi/visitor.h +3
-0+void visit_type_time (Visitor *v,const char *name,uint64_t *obj, +Error **errp); +/* * Visit a boolean value. * qapi/opts-visitor.c +22
-0@@ -526,6 +526,27 @@ opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp)processed (ov, name); } +static void +opts_type_time (Visitor *v,const char *name,uint64_t *obj,Error **errp) +{ +OptsVisitor *ov =to_ov (v); +const QemuOpt *opt; +int err; + + opt =lookup_scalar (ov, name, errp); +if (!opt) { +return ; + } + + err =qemu_strtotime_ns (opt->str ? opt->str :"" ,NULL , obj); +if (err <0 ) { +error_setg (errp,QERR_INVALID_PARAMETER_VALUE , opt->name, +"a time value" ); +return ; + } + +processed (ov, name); +}static void opts_optional (Visitor *v,const char *name,bool *present)@@ -573,6 +594,7 @@ opts_visitor_new(const QemuOpts *opts) ov->visitor.type_int64 = &opts_type_int64; ov->visitor.type_uint64 = &opts_type_uint64; ov->visitor.type_size = &opts_type_size; + ov->visitor.type_time = &opts_type_time; ov->visitor.type_bool = &opts_type_bool; ov->visitor.type_str = &opts_type_str;qapi/qapi-visit-core.c +12
-0@@ -277,6 +277,18 @@ void visit_type_size(Visitor *v, const char *name, uint64_t *obj, } } +void visit_type_time (Visitor *v,const char *name,uint64_t *obj, +Error **errp) +{ +assert (obj); +trace_visit_type_time (v, name, obj); +if (v->type_time) { + v->type_time (v, name, obj, errp); + }else { + v->type_uint64 (v, name, obj, errp); + } +} +void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {assert (obj);qapi/qobject-input-visitor.c +18
-0@@ -627,6 +627,23 @@ static void qobject_input_type_size_keyval(Visitor *v, const char *name, } } +static void qobject_input_type_time_keyval (Visitor *v,const char *name, +uint64_t *obj,Error **errp) +{ +QObjectInputVisitor *qiv =to_qiv (v); +const char *str =qobject_input_get_keyval (qiv, name, errp); + +if (!str) { +return ; + } + +if (qemu_strtotime_ns (str,NULL , obj) <0 ) { +/* TODO report -ERANGE more nicely */ +error_setg (errp,QERR_INVALID_PARAMETER_VALUE , +full_name (qiv, name),"time" ); + } +} +static void qobject_input_optional (Visitor *v,const char *name,bool *present) {QObjectInputVisitor *qiv =to_qiv (v);@@ -708,6 +725,7 @@ Visitor *qobject_input_visitor_new_keyval(QObject *obj) v->visitor.type_any = qobject_input_type_any; v->visitor.type_null = qobject_input_type_null; v->visitor.type_size = qobject_input_type_size_keyval; + v->visitor.type_time = qobject_input_type_time_keyval; v->keyval = true;return &v->visitor;qapi/trace-events +1
-0@@ -29,6 +29,7 @@ visit_type_int16(void *v, const char *name, int16_t *obj) "v=%p name=%s obj=%p" visit_type_int32(void *v, const char *name, int32_t *obj) "v=%p name=%s obj=%p" visit_type_int64(void *v, const char *name, int64_t *obj) "v=%p name=%s obj=%p" visit_type_size(void *v, const char *name, uint64_t *obj) "v=%p name=%s obj=%p" +visit_type_time(void *v, const char *name, uint64_t *obj) "v=%p name=%s obj=%p" visit_type_bool(void *v, const char *name, bool *obj) "v=%p name=%s obj=%p" visit_type_str(void *v, const char *name, char **obj) "v=%p name=%s obj=%p" visit_type_number(void *v, const char *name, void *obj) "v=%p name=%s obj=%p"scripts/qapi/schema.py +1
-0@@ -855,6 +855,7 @@ class QAPISchema(object): ('uint32', 'int', 'uint32_t'), ('uint64', 'int', 'uint64_t'), ('size', 'int', 'uint64_t'), + ('time', 'int', 'uint64_t'), ('bool', 'boolean', 'bool'), ('any', 'value', 'QObject' + pointer_suffix), ('null', 'null', 'QNull' + pointer_suffix)]:
PATCH v17 6/14 tests: Add test for QAPI builtin type time
In reply to Tao XuAdd tests for time input such as zero, around limit of precision, signed upper limit, actual upper limit, beyond limits, time suffixes, and etc.
---
No changes in v17.
Changes in v16:
- Update the test cases
Changes in v14:
- Drop time unit picosecond (Eric)
--- tests/test-keyval.c | 89 ++++++++++++++++++++++++++++++ tests/test-qobject-input-visitor.c | 29 ++++++++++ 2 files changed, 118 insertions(+)
tests/test-keyval.c +89 -0
@@ -457,6 +457,94 @@ static void test_keyval_visit_size(void)visit_free (v); } +static void test_keyval_visit_time (void ) +{ +Error *err =NULL ; +Visitor *v; +QDict *qdict; +uint64_t time; + +/* Lower limit zero */ + qdict =keyval_parse ("time1=0" ,NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmpuint(time, ==, 0); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Around limit of precision: UINT64_MAX - 1, UINT64_MAX */ + qdict =keyval_parse ("time1=18446744073709551614," +"time2=18446744073709551615" , +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmphex(time, ==, 0xfffffffffffffffe); +visit_type_time (v,"time2" , &time, &error_abort); + g_assert_cmphex(time, ==, 0xffffffffffffffff); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Beyond limits */ + qdict =keyval_parse ("time1=-1," +"time2=18446744073709551616" ,/* 2^64 */ +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_type_time (v,"time2" , &time, &err); +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Suffixes */ + qdict =keyval_parse ("time1=2ns,time2=3.4us,time3=5ms,time4=600s" , +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmpuint(time, ==, 2); +visit_type_time (v,"time2" , &time, &error_abort); + g_assert_cmpuint(time, ==, 3400); +visit_type_time (v,"time3" , &time, &error_abort); + g_assert_cmphex(time, ==, 5 * 1000 * 1000); +visit_type_time (v,"time4" , &time, &error_abort); + g_assert_cmphex(time, ==, 600 * 1000000000LL); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Beyond limit with suffix */ + qdict =keyval_parse ("time1=1844674407370955s" ,NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Trailing crap */ + qdict =keyval_parse ("time1=89ks,time2=ns" ,NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_type_time (v,"time2" , &time, &err);; +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); +} +static void test_keyval_visit_dict (void ) {Error *err =NULL ;
@@ -645,6 +733,7 @@ int main(int argc, char *argv[])g_test_add_func ("/keyval/visit/bool" , test_keyval_visit_bool);g_test_add_func ("/keyval/visit/number" , test_keyval_visit_number);g_test_add_func ("/keyval/visit/size" , test_keyval_visit_size); +g_test_add_func ("/keyval/visit/time" , test_keyval_visit_time);g_test_add_func ("/keyval/visit/dict" , test_keyval_visit_dict);g_test_add_func ("/keyval/visit/list" , test_keyval_visit_list);g_test_add_func ("/keyval/visit/optional" , test_keyval_visit_optional);
tests/test-qobject-input-visitor.c +29 -0
@@ -366,6 +366,31 @@ static void test_visitor_in_size_str_fail(TestInputVisitorData *data,error_free_or_abort (&err); } +static void test_visitor_in_time_str_keyval (TestInputVisitorData *data, +const void *unused) +{ +uint64_t res, value =265 *1000 *1000 ; +Visitor *v; + + v =visitor_input_test_init_full (data, true,"\"265ms\"" ); + +visit_type_time (v,NULL , &res, &error_abort); + g_assert_cmpfloat(res, ==, value); +} + +static void test_visitor_in_time_str_fail (TestInputVisitorData *data, +const void *unused) +{ +uint64_t res =0 ; +Visitor *v; +Error *err =NULL ; + + v =visitor_input_test_init (data,"\"265ms\"" ); + +visit_type_time (v,NULL , &res, &err); +error_free_or_abort (&err); +} +static void test_visitor_in_string (TestInputVisitorData *data,const void *unused) {
@@ -1311,6 +1336,10 @@ int main(int argc, char **argv) NULL, test_visitor_in_size_str_keyval);input_visitor_test_add ("/visitor/input/size_str_fail" ,NULL , test_visitor_in_size_str_fail); +input_visitor_test_add ("/visitor/input/time_str_keyval" , +NULL , test_visitor_in_time_str_keyval); +input_visitor_test_add ("/visitor/input/time_str_fail" , +NULL , test_visitor_in_time_str_fail);input_visitor_test_add ("/visitor/input/string" ,NULL , test_visitor_in_string); input_visitor_test_add("/visitor/input/enum",
Signature · 1 line
2.20.1
Re: [PATCH v17 06/14] tests: Add test for QAPI builtin type time
Quoted 84 lines · Tao Xu
Add tests for time input such as zero, around limit of precision, signed upper limit, actual upper limit, beyond limits, time suffixes, and etc.
Signed-off-by Tao Xu <[email protected]>---
No changes in v17.
Changes in v16:
- Update the test casesChanges in v14:
- Drop time unit picosecond (Eric)--- tests/test-keyval.c | 89 ++++++++++++++++++++++++++++++ tests/test-qobject-input-visitor.c | 29 ++++++++++ 2 files changed, 118 insertions(+)tests/test-keyval.c +57
-0@@ -457,6 +457,94 @@ static void test_keyval_visit_size(void)visit_free (v); } +static void test_keyval_visit_time (void ) +{ +Error *err =NULL ; +Visitor *v; +QDict *qdict; +uint64_t time; + +/* Lower limit zero */ + qdict =keyval_parse ("time1=0" ,NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmpuint(time, ==, 0); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Around limit of precision: UINT64_MAX - 1, UINT64_MAX */ + qdict =keyval_parse ("time1=18446744073709551614," +"time2=18446744073709551615" , +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmphex(time, ==, 0xfffffffffffffffe); +visit_type_time (v,"time2" , &time, &error_abort); + g_assert_cmphex(time, ==, 0xffffffffffffffff); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Beyond limits */ + qdict =keyval_parse ("time1=-1," +"time2=18446744073709551616" ,/* 2^64 */ +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_type_time (v,"time2" , &time, &err); +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Suffixes */ + qdict =keyval_parse ("time1=2ns,time2=3.4us,time3=5ms,time4=600s" , +NULL , &error_abort); + v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &error_abort); + g_assert_cmpuint(time, ==, 2); +visit_type_time (v,"time2" , &time, &error_abort); + g_assert_cmpuint(time, ==, 3400);
tests/test-keyval.c static void test_keyval_visit_size(void) · line 526
Quoted 10 lines
tests/test-keyval.c +10
-0+visit_type_time (v,"time3" , &time, &error_abort); + g_assert_cmphex(time, ==, 5 * 1000 * 1000); +visit_type_time (v,"time4" , &time, &error_abort); + g_assert_cmphex(time, ==, 600 * 1000000000LL); +visit_check_struct (v, &error_abort); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Beyond limit with suffix */ + qdict =keyval_parse ("time1=1844674407370955s" ,NULL , &error_abort);
We want to test a value just above the limit, like test_keyval_visit_size() does. The limit is 2^64-1 ns = 1844674.407370955s.
Please use "1844675s".
tests/test-keyval.c static void test_keyval_visit_size(void) · line 536
Quoted 10 lines
tests/test-keyval.c +10
-0+ v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); + +/* Trailing crap */ + qdict =keyval_parse ("time1=89ks,time2=ns" ,NULL , &error_abort);
"time1=89ks" tests empty suffix followed by crap "ks". Matches test_keyval_visit_size()'s "sz1=16E", except that test case got messed up in commit 5e00984aef7 (I'll post a fix).
"time2=ns" doesn't test *trailing* crap, i.e. characters following valid input. There is no valid input. Please use something like "time2=123use".
Quoted 69 lines
tests/test-keyval.c +12
-0+ v =qobject_input_visitor_new_keyval (QOBJECT (qdict)); +qobject_unref (qdict); +visit_start_struct (v,NULL ,NULL ,0 , &error_abort); +visit_type_time (v,"time1" , &time, &err); +error_free_or_abort (&err); +visit_type_time (v,"time2" , &time, &err);; +error_free_or_abort (&err); +visit_end_struct (v,NULL ); +visit_free (v); +} +static void test_keyval_visit_dict (void ) {Error *err =NULL ;@@ -645,6 +733,7 @@ int main(int argc, char *argv[])g_test_add_func ("/keyval/visit/bool" , test_keyval_visit_bool);g_test_add_func ("/keyval/visit/number" , test_keyval_visit_number);g_test_add_func ("/keyval/visit/size" , test_keyval_visit_size); +g_test_add_func ("/keyval/visit/time" , test_keyval_visit_time);g_test_add_func ("/keyval/visit/dict" , test_keyval_visit_dict);g_test_add_func ("/keyval/visit/list" , test_keyval_visit_list);g_test_add_func ("/keyval/visit/optional" , test_keyval_visit_optional);tests/test-qobject-input-visitor.c +29
-0@@ -366,6 +366,31 @@ static void test_visitor_in_size_str_fail(TestInputVisitorData *data,error_free_or_abort (&err); } +static void test_visitor_in_time_str_keyval (TestInputVisitorData *data, +const void *unused) +{ +uint64_t res, value =265 *1000 *1000 ; +Visitor *v; + + v =visitor_input_test_init_full (data, true,"\"265ms\"" ); + +visit_type_time (v,NULL , &res, &error_abort); + g_assert_cmpfloat(res, ==, value); +} + +static void test_visitor_in_time_str_fail (TestInputVisitorData *data, +const void *unused) +{ +uint64_t res =0 ; +Visitor *v; +Error *err =NULL ; + + v =visitor_input_test_init (data,"\"265ms\"" ); + +visit_type_time (v,NULL , &res, &err); +error_free_or_abort (&err); +} +static void test_visitor_in_string (TestInputVisitorData *data,const void *unused) {@@ -1311,6 +1336,10 @@ int main(int argc, char **argv) NULL, test_visitor_in_size_str_keyval);input_visitor_test_add ("/visitor/input/size_str_fail" ,NULL , test_visitor_in_size_str_fail); +input_visitor_test_add ("/visitor/input/time_str_keyval" , +NULL , test_visitor_in_time_str_keyval); +input_visitor_test_add ("/visitor/input/time_str_fail" , +NULL , test_visitor_in_time_str_fail);input_visitor_test_add ("/visitor/input/string" ,NULL , test_visitor_in_string); input_visitor_test_add("/visitor/input/enum",
PATCH v17 7/14 numa: Extend CLI to provide initiator information for numa nodes
In reply to Tao XuIn ACPI 6.3 chapter 5.2.27 Heterogeneous Memory Attribute Table (HMAT), The initiator represents processor which access to memory. And in 5.2.27.3 Memory Proximity Domain Attributes Structure, the attached initiator is defined as where the memory controller responsible for a memory proximity domain. With attached initiator information, the topology of heterogeneous memory can be described.
Extend CLI of "-numa node" option to indicate the initiator numa node-id. In the linux kernel, the codes in drivers/acpi/hmat/hmat.c parse and report the platform's HMAT tables.
---
No changes in v17.
Changes in v15:
- Change the QAPI version tag to 5.0 (Eric)
--- hw/core/machine.c | 64 +++++++++++++++++++++++++++++++++++++++++++ hw/core/numa.c | 23 ++++++++++++++++ include/sysemu/numa.h | 5 ++++ qapi/machine.json | 10 ++++++- qemu-options.hx | 35 +++++++++++++++++++---- 5 files changed, 131 insertions(+), 6 deletions(-)
hw/core/machine.c +64 -0
@@ -518,6 +518,20 @@ static void machine_set_nvdimm(Object *obj, bool value, Error **errp) ms->nvdimms_state->is_enabled = value; } +static bool machine_get_hmat (Object *obj,Error **errp) +{ +MachineState *ms =MACHINE (obj); + +return ms->numa_state->hmat_enabled; +} + +static void machine_set_hmat (Object *obj,bool value,Error **errp) +{ +MachineState *ms =MACHINE (obj); + + ms->numa_state->hmat_enabled = value; +} +static char *machine_get_nvdimm_persistence (Object *obj,Error **errp) {MachineState *ms =MACHINE (obj);
@@ -645,6 +659,7 @@ void machine_set_cpu_numa_node(MachineState *machine, const CpuInstanceProperties *props, Error **errp) { MachineClass *mc = MACHINE_GET_CLASS(machine); +NodeInfo *numa_info = machine->numa_state->nodes;bool match = false;int i;
@@ -714,6 +729,17 @@ void machine_set_cpu_numa_node(MachineState *machine, match = true; slot->props.node_id = props->node_id; slot->props.has_node_id = props->has_node_id; + +if (machine->numa_state->hmat_enabled) { +if ((numa_info[props->node_id].initiator <MAX_NODES ) && + (props->node_id != numa_info[props->node_id].initiator)) { +error_setg (errp,"The initiator of CPU NUMA node %" PRId64 +" should be itself" , props->node_id); +return ; + } + numa_info[props->node_id].has_cpu = true; + numa_info[props->node_id].initiator = props->node_id; + } }if (!match) {
@@ -960,6 +986,13 @@ static void machine_initfn(Object *obj)if (mc->numa_mem_supported) { ms->numa_state =g_new0 (NumaState,1 ); +object_property_add_bool (obj,"hmat" , + machine_get_hmat, machine_set_hmat, + &error_abort); +object_property_set_description (obj,"hmat" , +"Set on/off to enable/disable " +"ACPI Heterogeneous Memory Attribute " +"Table (HMAT)" ,NULL ); }/* Register notifier when init is done for sysbus sanity checks */
@@ -1048,6 +1081,32 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)return g_string_free (s, false); } +static void numa_validate_initiator (NumaState *numa_state) +{ +int i; +NodeInfo *numa_info = numa_state->nodes; + +for (i =0 ; i < numa_state->num_nodes; i++) { +if (numa_info[i].initiator ==MAX_NODES ) { +error_report ("The initiator of NUMA node %d is missing, use " +"'-numa node,initiator' option to declare it" , i); +exit (1 ); + } + +if (!numa_info[numa_info[i].initiator].present) { +error_report ("NUMA node %" PRIu16" is missing, use " +"'-numa node' option to declare it first" , + numa_info[i].initiator); +exit (1 ); + } + +if (!numa_info[numa_info[i].initiator].has_cpu) { +error_report ("The initiator of NUMA node %d is invalid" , i); +exit (1 ); + } + } +} +static void machine_numa_finish_cpu_init (MachineState *machine) {int i;
@@ -1088,6 +1147,11 @@ static void machine_numa_finish_cpu_init(MachineState *machine)machine_set_cpu_numa_node (machine, &props, &error_fatal); } } + +if (machine->numa_state->hmat_enabled) { +numa_validate_initiator (machine->numa_state); + } +if (s->len && !qtest_enabled ()) {warn_report ("CPU(s) not present in any NUMA nodes: %s" , s->str);
hw/core/numa.c +23 -0
@@ -133,6 +133,29 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, numa_info[nodenr].node_mem =object_property_get_uint (o,"size" ,NULL ); numa_info[nodenr].node_memdev =MEMORY_BACKEND (o); } + +/* +* If not set the initiator, set it to MAX_NODES. And if +* HMAT is enabled and this node has no cpus, QEMU will raise error. +*/ + numa_info[nodenr].initiator =MAX_NODES ; +if (node->has_initiator) { +if (!ms->numa_state->hmat_enabled) { +error_setg (errp,"ACPI Heterogeneous Memory Attribute Table " +"(HMAT) is disabled, enable it with -machine hmat=on " +"before using any of hmat specific options" ); +return ; + } + +if (node->initiator >=MAX_NODES ) { +error_report ("The initiator id %" PRIu16" expects an integer " +"between 0 and %d" , node->initiator, +MAX_NODES -1 ); +return ; + } + + numa_info[nodenr].initiator = node->initiator; + } numa_info[nodenr].present = true; max_numa_nodeid =MAX (max_numa_nodeid, nodenr +1 ); ms->numa_state->num_nodes++;
include/sysemu/numa.h +5 -0
@@ -18,6 +18,8 @@ struct NodeInfo {uint64_t node_mem;struct HostMemoryBackend *node_memdev;bool present; +bool has_cpu; +uint16_t initiator;uint8_t distance[MAX_NODES ]; };
@@ -33,6 +35,9 @@ struct NumaState {/* Allow setting NUMA distance for different NUMA nodes */ bool have_numa_distance; +/* Detect if HMAT support is enabled. */ +bool hmat_enabled; +/* NUMA nodes information */ NodeInfo nodes[MAX_NODES ]; };
qapi/machine.json +9 -1
@@ -463,6 +463,13 @@ # @memdev: memory backend object. If specified for one node, # it must be specified for all nodes. # +# @initiator: defined in ACPI 6.3 Chapter 5.2.27.3 Table 5-145, +# points to the nodeid which has the memory controller +# responsible for this NUMA node. This field provides +# additional information as to the initiator node that +# is closest (as in directly attached) to this node, and +# therefore has the best performance (since 5.0) +# # Since: 2.1 ## { 'struct': 'NumaNodeOptions',
@@ -470,7 +477,8 @@ '*nodeid': 'uint16', '*cpus': ['uint16'], '*mem': 'size', - '*memdev': 'str' }} + '*memdev': 'str', + '*initiator': 'uint16' }} ## # @NumaDistOptions:
qemu-options.hx +30 -5
@@ -43,7 +43,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " suppress-vmdesc=on|off disables self-describing migration (default=off)\n" " nvdimm=on|off controls NVDIMM support (default=off)\n" " enforce-config-section=on|off enforce configuration section migration (default=off)\n" - " memory-encryption=@var{} memory encryption object to use (default=none)\n", + " memory-encryption=@var{} memory encryption object to use (default=none)\n" + " hmat=on|off controls ACPI HMAT support (default=off)\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@@ -103,6 +104,9 @@ NOTE: this parameter is deprecated. Please use @option{-global} @option{migration.send-configuration}=@var{on|off} instead. @item memory-encryption=@var{} Memory encryption object to use. The default is none. +@item hmat=on|off +Enables or disables ACPI Heterogeneous Memory Attribute Table (HMAT) support. +The default is off. @end table ETEXI
@@ -161,14 +165,14 @@ If any on the three values is given, the total number of CPUs @var{n} can be omi ETEXI DEF("numa", HAS_ARG, QEMU_OPTION_numa, - "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n" - "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n" + "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" + "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" "-numa dist,src=source,dst=destination,val=distance\n" "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n", QEMU_ARCH_ALL) STEXI -@item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}] -@itemx -numa node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}] +@item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] +@itemx -numa node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}] @itemx -numa dist,src=@var{source},dst=@var{destination},val=@var{distance} @itemx -numa cpu,node-id=@var{node}[,socket-id=@var{x}][,core-id=@var{y}][,thread-id=@var{z}] @findex -numa
@@ -215,6 +219,27 @@ split equally between them. @samp{mem} and @samp{memdev} are mutually exclusive. Furthermore, if one node uses @samp{memdev}, all of them have to use it. +@samp{initiator} is an additional option that points to an @var{initiator} +NUMA node that has best performance (the lowest latency or largest bandwidth) +to this NUMA @var{node}. Note that this option can be set only when +the machine property 'hmat' is set to 'on'. + +Following example creates a machine with 2 NUMA nodes, node 0 has CPU. +node 1 has only memory, and its initiator is node 0. Note that because +node 0 has CPU, by default the initiator of node 0 is itself and must be +itself. +@example +-machine hmat=on \ +-m 2G,slots=2,maxmem=4G \ +-object memory-backend-ram,size=1G,id=m0 \ +-object memory-backend-ram,size=1G,id=m1 \ +-numa node,nodeid=0,memdev=m0 \ +-numa node,nodeid=1,memdev=m1,initiator=0 \ +-smp 2,sockets=2,maxcpus=2 \ +-numa cpu,node-id=0,socket-id=0 \ +-numa cpu,node-id=0,socket-id=1 +@end example + @var{source} and @var{destination} are NUMA node IDs. @var{distance} is the NUMA distance from @var{source} to @var{destination}. The distance from a node to itself is always 10. If any pair of nodes is
Signature · 1 line
2.20.1
PATCH v17 8/14 numa: Extend CLI to provide memory latency and bandwidth information
In reply to Tao XuFrom: Liu Jingqi <[email protected]>
Add -numa hmat-lb option to provide System Locality Latency and Bandwidth Information. These memory attributes help to build System Locality Latency and Bandwidth Information Structure(s) in ACPI Heterogeneous Memory Attribute Table (HMAT).
---
Changes in v17:
- Add check when user input latency or bandwidth 0, the lb_info_provided should also be 0. Because in ACPI 6.3 5.2.27.4, 0 means the corresponding latency or bandwidth information is not provided.
- Fix the infinite loop when node->latency is 0.
Changes in v16:
- Initialize HMAT_LB_Data lb_data (Igor)
- Remove punctuation from error_setg (Igor)
- Correct some description (Igor)
- Drop statement about max value (Igor)
- Simplify struct HMAT_LB_Info and related code, unify latency and bandwidth (Igor)
Changes in v15:
- Change the QAPI version tag to 5.0 (Eric)
--- hw/core/numa.c | 178 ++++++++++++++++++++++++++++++++++++++++++ include/sysemu/numa.h | 53 +++++++++++++ qapi/machine.json | 94 +++++++++++++++++++++- qemu-options.hx | 49 +++++++++++- 4 files changed, 371 insertions(+), 3 deletions(-)
hw/core/numa.c +178 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/units.h" #include "sysemu/hostmem.h" #include "sysemu/numa.h" #include "sysemu/sysemu.h"
@@ -198,6 +199,170 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp) ms->numa_state->have_numa_distance = true; } +void parse_numa_hmat_lb (NumaState *numa_state,NumaHmatLBOptions *node, +Error **errp) +{ +int i, first_bit, last_bit; +uint64_t max_entry, temp_base_la; +NodeInfo *numa_info = numa_state->nodes; +HMAT_LB_Info *hmat_lb = + numa_state->hmat_lb[node->hierarchy][node->data_type]; +HMAT_LB_Data lb_data = {}; +HMAT_LB_Data *lb_temp; + +/* Error checking */ +if (node->initiator > numa_state->num_nodes) { +error_setg (errp,"Invalid initiator=%d, it should be less than %d" , + node->initiator, numa_state->num_nodes); +return ; + } +if (node->target > numa_state->num_nodes) { +error_setg (errp,"Invalid target=%d, it should be less than %d" , + node->target, numa_state->num_nodes); +return ; + } +if (!numa_info[node->initiator].has_cpu) { +error_setg (errp,"Invalid initiator=%d, it isn't an " +"initiator proximity domain" , node->initiator); +return ; + } +if (!numa_info[node->target].present) { +error_setg (errp,"The target=%d should point to an existing node" , + node->target); +return ; + } + +if (!hmat_lb) { + hmat_lb =g_malloc0 (sizeof (*hmat_lb)); + numa_state->hmat_lb[node->hierarchy][node->data_type] = hmat_lb; + hmat_lb->list =g_array_new (false, true,sizeof (HMAT_LB_Data)); + } + hmat_lb->hierarchy = node->hierarchy; + hmat_lb->data_type = node->data_type; + lb_data.initiator = node->initiator; + lb_data.target = node->target; + +if (node->data_type <=HMATLB_DATA_TYPE_WRITE_LATENCY ) { +/* Input latency data */ + +if (!node->has_latency) { +error_setg (errp,"Missing 'latency' option" ); +return ; + } +if (node->has_bandwidth) { +error_setg (errp,"Invalid option 'bandwidth' since " +"the data type is latency" ); +return ; + } + +/* Detect duplicate configuration */ +for (i =0 ; i < hmat_lb->list->len; i++) { + lb_temp = &g_array_index (hmat_lb->list, HMAT_LB_Data, i); + +if (node->initiator == lb_temp->initiator && + node->target == lb_temp->target) { +error_setg (errp,"Duplicate configuration of the latency for " +"initiator=%d and target=%d" , node->initiator, + node->target); +return ; + } + } + + hmat_lb->base = hmat_lb->base ? hmat_lb->base :UINT64_MAX ; + +if (node->latency) { +/* Calculate the temporary base and compressed latency */ + max_entry = node->latency; + temp_base_la =1 ; +while (QEMU_IS_ALIGNED (max_entry,10 )) { + max_entry /=10 ; + temp_base_la *=10 ; + } + +/* Calculate the max compressed latency */ + hmat_lb->base =MIN (hmat_lb->base, temp_base_la); + max_entry = node->latency / hmat_lb->base; + hmat_lb->range_bitmap =MAX (hmat_lb->range_bitmap, max_entry); + +/* +* For latency hmat_lb->range_bitmap record the max compressed +* latency which should be less than 0xFFFF (UINT16_MAX) +*/ +if (hmat_lb->range_bitmap >=UINT16_MAX ) { +error_setg (errp,"Latency %" PRIu64" between initiator=%d and " +"target=%d should not differ from previously entered " +"min or max values on more than %d" , node->latency, + node->initiator, node->target,UINT16_MAX -1 ); +return ; + } + +/* Set lb_info_provided bit 0 as 1, latency information is provided */ + numa_info[node->target].lb_info_provided |=BIT (0 ); + } + lb_data.data = node->latency; + }else if (node->data_type >=HMATLB_DATA_TYPE_ACCESS_BANDWIDTH ) { +/* Input bandwidth data */ + +if (!node->has_bandwidth) { +error_setg (errp,"Missing 'bandwidth' option" ); +return ; + } +if (node->has_latency) { +error_setg (errp,"Invalid option 'latency' since " +"the data type is bandwidth" ); +return ; + } +if (!QEMU_IS_ALIGNED (node->bandwidth, MiB)) { +error_setg (errp,"Bandwidth %" PRIu64" between initiator=%d and " +"target=%d should be 1MB aligned" , node->bandwidth, + node->initiator, node->target); +return ; + } + +/* Detect duplicate configuration */ +for (i =0 ; i < hmat_lb->list->len; i++) { + lb_temp = &g_array_index (hmat_lb->list, HMAT_LB_Data, i); + +if (node->initiator == lb_temp->initiator && + node->target == lb_temp->target) { +error_setg (errp,"Duplicate configuration of the bandwidth for " +"initiator=%d and target=%d" , node->initiator, + node->target); +return ; + } + } + + hmat_lb->range_bitmap |= node->bandwidth; + first_bit =ctz64 (hmat_lb->range_bitmap); + hmat_lb->base =UINT64_C (1 ) << first_bit; + max_entry = node->bandwidth / hmat_lb->base; + last_bit =64 -clz64 (hmat_lb->range_bitmap); + +/* +* For bandwidth, first_bit record the base unit of bandwidth bits, +* last_bit record the last bit of the max bandwidth. The max compressed +* bandwidth should be less than 0xFFFF (UINT16_MAX) +*/ +if ((last_bit - first_bit) >UINT16_BITS || max_entry >=UINT16_MAX ) { +error_setg (errp,"Bandwidth %" PRIu64" between initiator=%d and " +"target=%d should not differ from previously entered " +"values on more than %d" , node->bandwidth, + node->initiator, node->target,UINT16_MAX -1 ); +return ; + } + +/* Set lb_info_provided bit 1 as 1, bandwidth information is provided */ +if (node->bandwidth) { + numa_info[node->target].lb_info_provided |=BIT (1 ); + } + lb_data.data = node->bandwidth; + }else { +assert (0 ); + } + +g_array_append_val (hmat_lb->list, lb_data); +} +void set_numa_options (MachineState *ms,NumaOptions *object,Error **errp) {Error *err =NULL ;
@@ -236,6 +401,19 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp)machine_set_cpu_numa_node (ms,qapi_NumaCpuOptions_base (&object->u.cpu), &err);break ; +case NUMA_OPTIONS_TYPE_HMAT_LB : +if (!ms->numa_state->hmat_enabled) { +error_setg (errp,"ACPI Heterogeneous Memory Attribute Table " +"(HMAT) is disabled, enable it with -machine hmat=on " +"before using any of hmat specific options" ); +return ; + } + +parse_numa_hmat_lb (ms->numa_state, &object->u.hmat_lb, &err); +if (err) { + goto end; + } +break ;default :abort (); }
include/sysemu/numa.h +53 -0
81 lines not on this page · raw message
qapi/machine.json +92 -2
115 lines not on this page · raw message
qemu-options.hx +48 -1
70 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v17 9/14 numa: Extend CLI to provide memory side cache information
In reply to Tao XuFrom: Liu Jingqi <[email protected]>
Add -numa hmat-cache option to provide Memory Side Cache Information. These memory attributes help to build Memory Side Cache Information Structure(s) in ACPI Heterogeneous Memory Attribute Table (HMAT).
---
Changes in v17:
- Use NumaHmatCacheOptions to replace HMAT_Cache_Info (Igor)
- Add check for unordered cache level input (Igor)
Changes in v16:
- Add cross check with hmat_lb data (Igor)
- Drop total_levels in struct HMAT_Cache_Info (Igor)
- Correct the error table number (Igor)
Changes in v15:
- Change the QAPI version tag to 5.0 (Eric)
--- hw/core/numa.c | 78 +++++++++++++++++++++++++++++++++++++++++++ include/sysemu/numa.h | 5 +++ qapi/machine.json | 78 +++++++++++++++++++++++++++++++++++++++++-- qemu-options.hx | 16 +++++++-- 4 files changed, 173 insertions(+), 4 deletions(-)
hw/core/numa.c +78 -0
@@ -363,6 +363,71 @@ void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node,g_array_append_val (hmat_lb->list, lb_data); } +void parse_numa_hmat_cache (MachineState *ms,NumaHmatCacheOptions *node, +Error **errp) +{ +int nb_numa_nodes = ms->numa_state->num_nodes; +NodeInfo *numa_info = ms->numa_state->nodes; +NumaHmatCacheOptions *hmat_cache =NULL ; + +if (node->node_id >= nb_numa_nodes) { +error_setg (errp,"Invalid node-id=%" PRIu32", it should be less " +"than %d" , node->node_id, nb_numa_nodes); +return ; + } + +if (numa_info[node->node_id].lb_info_provided != (BIT (0 ) |BIT (1 ))) { +error_setg (errp,"The latency and bandwidth information of " +"node-id=%" PRIu32" should be provided before memory side " +"cache attributes" , node->node_id); +return ; + } + +if (node->level >=HMAT_LB_LEVELS ) { +error_setg (errp,"Invalid level=%" PRIu8", it should be less than or " +"equal to %d" , node->level,HMAT_LB_LEVELS -1 ); +return ; + } +assert (node->assoc <HMAT_CACHE_ASSOCIATIVITY__MAX ); +assert (node->policy <HMAT_CACHE_WRITE_POLICY__MAX ); +if (ms->numa_state->hmat_cache[node->node_id][node->level]) { +error_setg (errp,"Duplicate configuration of the side cache for " +"node-id=%" PRIu32" and level=%" PRIu8, + node->node_id, node->level); +return ; + } + +if ((node->level >1 ) && + ms->numa_state->hmat_cache[node->node_id][node->level -1 ] && + (node->size >= + ms->numa_state->hmat_cache[node->node_id][node->level -1 ]->size)) { +error_setg (errp,"Invalid size=%" PRIu64", the size of level=%" PRIu8 +" should be small than the size(%" PRIu64") of " +"level=%" PRIu8, node->size, node->level, + ms->numa_state->hmat_cache[node->node_id] + [node->level -1 ]->size, + node->level -1 ); +return ; + } + +if ((node->level <HMAT_LB_LEVELS -1 ) && + ms->numa_state->hmat_cache[node->node_id][node->level +1 ] && + (node->size <= + ms->numa_state->hmat_cache[node->node_id][node->level +1 ]->size)) { +error_setg (errp,"Invalid size=%" PRIu64", the size of level=%" PRIu8 +" should be larger than the size(%" PRIu64") of " +"level=%" PRIu8, node->size, node->level, + ms->numa_state->hmat_cache[node->node_id] + [node->level +1 ]->size, + node->level +1 ); +return ; + } + + hmat_cache =g_malloc0 (sizeof (*hmat_cache)); +memcpy (hmat_cache, node,sizeof (*hmat_cache)); + ms->numa_state->hmat_cache[node->node_id][node->level] = hmat_cache; +} +void set_numa_options (MachineState *ms,NumaOptions *object,Error **errp) {Error *err =NULL ;
@@ -414,6 +479,19 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) goto end; }break ; +case NUMA_OPTIONS_TYPE_HMAT_CACHE : +if (!ms->numa_state->hmat_enabled) { +error_setg (errp,"ACPI Heterogeneous Memory Attribute Table " +"(HMAT) is disabled, enable it with -machine hmat=on " +"before using any of hmat specific options" ); +return ; + } + +parse_numa_hmat_cache (ms, &object->u.hmat_cache, &err); +if (err) { + goto end; + } +break ;default :abort (); }
include/sysemu/numa.h +5 -0
@@ -91,6 +91,9 @@ struct NumaState {/* NUMA nodes HMAT Locality Latency and Bandwidth Information */ HMAT_LB_Info *hmat_lb[HMAT_LB_LEVELS ][HMAT_LB_TYPES ]; + +/* Memory Side Cache Information Structure */ +NumaHmatCacheOptions *hmat_cache[MAX_NODES ][HMAT_LB_LEVELS ]; };typedef struct NumaState NumaState ;
@@ -98,6 +101,8 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp);void parse_numa_opts (MachineState *ms);void parse_numa_hmat_lb (NumaState *numa_state,NumaHmatLBOptions *node,Error **errp); +void parse_numa_hmat_cache (MachineState *ms,NumaHmatCacheOptions *node, +Error **errp);void numa_complete_configuration (MachineState *ms);void query_numa_node_mem (NumaNodeMem node_mem[],MachineState *ms);extern QemuOptsList qemu_numa_opts;
qapi/machine.json +76 -2
99 lines not on this page · raw message
qemu-options.hx +14 -2
@@ -169,7 +169,8 @@ DEF("numa", HAS_ARG, QEMU_OPTION_numa, "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" "-numa dist,src=source,dst=destination,val=distance\n" "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n" - "-numa hmat-lb,initiator=node,target=node,hierarchy=memory|first-level|second-level|third-level,data-type=access-latency|read-latency|write-latency[,latency=lat][,bandwidth=bw]\n", + "-numa hmat-lb,initiator=node,target=node,hierarchy=memory|first-level|second-level|third-level,data-type=access-latency|read-latency|write-latency[,latency=lat][,bandwidth=bw]\n" + "-numa hmat-cache,node-id=node,size=size,level=level[,assoc=none|direct|complex][,policy=none|write-back|write-through][,line=size]\n", QEMU_ARCH_ALL) STEXI @item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}]
@@ -177,6 +178,7 @@ STEXI @itemx -numa dist,src=@var{source},dst=@var{destination},val=@var{distance} @itemx -numa cpu,node-id=@var{node}[,socket-id=@var{x}][,core-id=@var{y}][,thread-id=@var{z}] @itemx -numa hmat-lb,initiator=@var{node},target=@var{node},hierarchy=@var{hierarchy},data-type=@var{tpye}[,latency=@var{lat}][,bandwidth=@var{bw}] +@itemx -numa hmat-cache,node-id=@var{node},size=@var{size},level=@var{level}[,assoc=@var{str}][,policy=@var{str}][,line=@var{size}] @findex -numa Define a NUMA node and assign RAM and VCPUs to it. Set the NUMA distance from a source node to a destination node.
@@ -282,11 +284,19 @@ Note that if NUM is 0, means the corresponding latency or bandwidth information is not provided. And if input numbers without any unit, the latency unit will be 'ns' and the bandwidth will be B/s. +In @samp{hmat-cache} option, @var{node-id} is the NUMA-id of the memory belongs. +@var{size} is the size of memory side cache in bytes. @var{level} is the cache +level described in this structure. @var{assoc} is the cache associativity, +the possible value is 'none/direct(direct-mapped)/complex(complex cache indexing)'. +@var{policy} is the write policy. @var{line} is the cache Line size in bytes. + For example, the following options describe 2 NUMA nodes. Node 0 has 2 cpus and a ram, node 1 has only a ram. The processors in node 0 access memory in node 0 with access-latency 5 nanoseconds, access-bandwidth is 200 MB/s; The processors in NUMA node 0 access memory in NUMA node 1 with access-latency 10 nanoseconds, access-bandwidth is 100 MB/s. +And for memory side cache information, NUMA node 0 and 1 both have 1 level memory +cache, size is 10KB, policy is write-back, the cache Line size is 8 bytes: @example -machine hmat=on \ -m 2G \
@@ -300,7 +310,9 @@ nanoseconds, access-bandwidth is 100 MB/s. -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=5ns \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=200M \ -numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=10ns \ --numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=100M +-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=100M \ +-numa hmat-cache,node-id=0,size=10K,level=1,assoc=direct,policy=write-back,line=8 \ +-numa hmat-cache,node-id=1,size=10K,level=1,assoc=direct,policy=write-back,line=8 @end example ETEXI
Signature · 1 line
2.20.1
Re: [PATCH v17 09/14] numa: Extend CLI to provide memory side cache information
Quoted 9 lines · On Fri, 22 Nov 2019 15:48:21 +0800 Tao Xu <[email protected]> wrote:
From: Liu Jingqi <[email protected]>
Add -numa hmat-cache option to provide Memory Side Cache Information. These memory attributes help to build Memory Side Cache Information Structure(s) in ACPI Heterogeneous Memory Attribute Table (HMAT).
Reviewed-by Daniel Black <[email protected]>Signed-off-by Liu Jingqi <[email protected]>Signed-off-by Tao Xu <[email protected]>
with nit below fixed:
Quoted 58 lines
---
Changes in v17:
- Use NumaHmatCacheOptions to replaceHMAT_Cache_Info(Igor)
- Add check for unordered cache level input (Igor)Changes in v16:
- Add cross check withhmat_lbdata (Igor)
- Droptotal_levelsin structHMAT_Cache_Info(Igor)
- Correct the error table number (Igor)Changes in v15:
- Change the QAPI version tag to 5.0 (Eric)--- hw/core/numa.c | 78 +++++++++++++++++++++++++++++++++++++++++++ include/sysemu/numa.h | 5 +++ qapi/machine.json | 78 +++++++++++++++++++++++++++++++++++++++++-- qemu-options.hx | 16 +++++++-- 4 files changed, 173 insertions(+), 4 deletions(-)hw/core/numa.c +30
-0@@ -363,6 +363,71 @@ void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node,g_array_append_val (hmat_lb->list, lb_data); } +void parse_numa_hmat_cache (MachineState *ms,NumaHmatCacheOptions *node, +Error **errp) +{ +int nb_numa_nodes = ms->numa_state->num_nodes; +NodeInfo *numa_info = ms->numa_state->nodes; +NumaHmatCacheOptions *hmat_cache =NULL ; + +if (node->node_id >= nb_numa_nodes) { +error_setg (errp,"Invalid node-id=%" PRIu32", it should be less " +"than %d" , node->node_id, nb_numa_nodes); +return ; + } + +if (numa_info[node->node_id].lb_info_provided != (BIT (0 ) |BIT (1 ))) { +error_setg (errp,"The latency and bandwidth information of " +"node-id=%" PRIu32" should be provided before memory side " +"cache attributes" , node->node_id); +return ; + } + +if (node->level >=HMAT_LB_LEVELS ) { +error_setg (errp,"Invalid level=%" PRIu8", it should be less than or " +"equal to %d" , node->level,HMAT_LB_LEVELS -1 ); +return ; + } +assert (node->assoc <HMAT_CACHE_ASSOCIATIVITY__MAX ); +assert (node->policy <HMAT_CACHE_WRITE_POLICY__MAX ); +if (ms->numa_state->hmat_cache[node->node_id][node->level]) { + error_setg(errp, "Duplicate configuration of the side cache for " + "node-id=%" PRIu32 " and level=%" PRIu8,
hw/core/numa.c void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node, · line 405
Quoted 10 lines
hw/core/numa.c +10
-0+ node->node_id, node->level); +return ; + } + +if ((node->level >1 ) && + ms->numa_state->hmat_cache[node->node_id][node->level -1 ] && + (node->size >= + ms->numa_state->hmat_cache[node->node_id][node->level -1 ]->size)) { +error_setg (errp,"Invalid size=%" PRIu64", the size of level=%" PRIu8 + " should be small than the size(%" PRIu64 ") of "
s/small/less/
Quoted 230 lines
hw/core/numa.c +38
-0+"level=%" PRIu8, node->size, node->level, + ms->numa_state->hmat_cache[node->node_id] + [node->level -1 ]->size, + node->level - 1); +return ; + } + +if ((node->level <HMAT_LB_LEVELS -1 ) && + ms->numa_state->hmat_cache[node->node_id][node->level +1 ] && + (node->size <= + ms->numa_state->hmat_cache[node->node_id][node->level +1 ]->size)) { +error_setg (errp,"Invalid size=%" PRIu64", the size of level=%" PRIu8 +" should be larger than the size(%" PRIu64") of " +"level=%" PRIu8, node->size, node->level, + ms->numa_state->hmat_cache[node->node_id] + [node->level +1 ]->size, + node->level +1 ); +return ; + } + + hmat_cache =g_malloc0 (sizeof (*hmat_cache)); +memcpy (hmat_cache, node,sizeof (*hmat_cache)); + ms->numa_state->hmat_cache[node->node_id][node->level] = hmat_cache; +} +void set_numa_options (MachineState *ms,NumaOptions *object,Error **errp) {Error *err =NULL ;@@ -414,6 +479,19 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) goto end; }break ; +case NUMA_OPTIONS_TYPE_HMAT_CACHE : +if (!ms->numa_state->hmat_enabled) { +error_setg (errp,"ACPI Heterogeneous Memory Attribute Table " +"(HMAT) is disabled, enable it with -machine hmat=on " +"before using any of hmat specific options" ); +return ; + } + +parse_numa_hmat_cache (ms, &object->u.hmat_cache, &err); +if (err) { + goto end; + } +break ;default :abort (); }include/sysemu/numa.h +5
-0@@ -91,6 +91,9 @@ struct NumaState {/* NUMA nodes HMAT Locality Latency and Bandwidth Information */ HMAT_LB_Info *hmat_lb[HMAT_LB_LEVELS ][HMAT_LB_TYPES ]; + +/* Memory Side Cache Information Structure */ +NumaHmatCacheOptions *hmat_cache[MAX_NODES ][HMAT_LB_LEVELS ]; };typedef struct NumaState NumaState ;@@ -98,6 +101,8 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp);void parse_numa_opts (MachineState *ms);void parse_numa_hmat_lb (NumaState *numa_state,NumaHmatLBOptions *node,Error **errp); +void parse_numa_hmat_cache (MachineState *ms,NumaHmatCacheOptions *node, +Error **errp);void numa_complete_configuration (MachineState *ms);void query_numa_node_mem (NumaNodeMem node_mem[],MachineState *ms);extern QemuOptsList qemu_numa_opts;qapi/machine.json +76
-2@@ -428,10 +428,12 @@ # # @hmat-lb: memory latency and bandwidth information (Since: 5.0) # +# @hmat-cache: memory side cache information (Since: 5.0) +# # Since: 2.1 ## { 'enum': 'NumaOptionsType', - 'data': [ 'node', 'dist', 'cpu', 'hmat-lb' ] } + 'data': [ 'node', 'dist', 'cpu', 'hmat-lb', 'hmat-cache' ] } ## # @NumaOptions:@@ -447,7 +449,8 @@ 'node': 'NumaNodeOptions', 'dist': 'NumaDistOptions', 'cpu': 'NumaCpuOptions', - 'hmat-lb': 'NumaHmatLBOptions' }} + 'hmat-lb': 'NumaHmatLBOptions', + 'hmat-cache': 'NumaHmatCacheOptions' }} ## # @NumaNodeOptions:@@ -647,6 +650,77 @@ '*latency': 'time', '*bandwidth': 'size' }} +## +# @HmatCacheAssociativity: +# +# Cache associativity in the Memory Side Cache +# Information Structure of HMAT +# +# For more information of @HmatCacheAssociativity see +# the chapter 5.2.27.5: Table 5-147 of ACPI 6.3 spec. +# +# @none: None +# +# @direct: Direct Mapped +# +# @complex: Complex Cache Indexing (implementation specific) +# +# Since: 5.0 +## +{ 'enum': 'HmatCacheAssociativity', + 'data': [ 'none', 'direct', 'complex' ] } + +## +# @HmatCacheWritePolicy: +# +# Cache write policy in the Memory Side Cache +# Information Structure of HMAT +# +# For more information of @HmatCacheWritePolicy see +# the chapter 5.2.27.5: Table 5-147: Field "Cache Attributes" of ACPI 6.3 spec. +# +# @none: None +# +# @write-back: Write Back (WB) +# +# @write-through: Write Through (WT) +# +# Since: 5.0 +## +{ 'enum': 'HmatCacheWritePolicy', + 'data': [ 'none', 'write-back', 'write-through' ] } + +## +# @NumaHmatCacheOptions: +# +# Set the memory side cache information for a given memory domain. +# +# For more information of @NumaHmatCacheOptions see +# the chapter 5.2.27.5: Table 5-147: Field "Cache Attributes" of ACPI 6.3 spec. +# +# @node-id: the memory proximity domain to which the memory belongs. +# +# @size: the size of memory side cache in bytes. +# +# @level: the cache level described in this structure. +# +# @assoc: the cache associativity, none/direct-mapped/complex(complex cache indexing). +# +# @policy: the write policy, none/write-back/write-through. +# +# @line: the cache Line size in bytes. +# +# Since: 5.0 +## +{ 'struct': 'NumaHmatCacheOptions', + 'data': { + 'node-id': 'uint32', + 'size': 'size', + 'level': 'uint8', + 'assoc': 'HmatCacheAssociativity', + 'policy': 'HmatCacheWritePolicy', + 'line': 'uint16' }} + ## # @HostMemPolicy: #qemu-options.hx +14
-2@@ -169,7 +169,8 @@ DEF("numa", HAS_ARG, QEMU_OPTION_numa, "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node][,initiator=node]\n" "-numa dist,src=source,dst=destination,val=distance\n" "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n" - "-numa hmat-lb,initiator=node,target=node,hierarchy=memory|first-level|second-level|third-level,data-type=access-latency|read-latency|write-latency[,latency=lat][,bandwidth=bw]\n", + "-numa hmat-lb,initiator=node,target=node,hierarchy=memory|first-level|second-level|third-level,data-type=access-latency|read-latency|write-latency[,latency=lat][,bandwidth=bw]\n" + "-numa hmat-cache,node-id=node,size=size,level=level[,assoc=none|direct|complex][,policy=none|write-back|write-through][,line=size]\n", QEMU_ARCH_ALL) STEXI @item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}][,initiator=@var{initiator}]@@ -177,6 +178,7 @@ STEXI @itemx -numa dist,src=@var{source},dst=@var{destination},val=@var{distance} @itemx -numa cpu,node-id=@var{node}[,socket-id=@var{x}][,core-id=@var{y}][,thread-id=@var{z}] @itemx -numa hmat-lb,initiator=@var{node},target=@var{node},hierarchy=@var{hierarchy},data-type=@var{tpye}[,latency=@var{lat}][,bandwidth=@var{bw}] +@itemx -numa hmat-cache,node-id=@var{node},size=@var{size},level=@var{level}[,assoc=@var{str}][,policy=@var{str}][,line=@var{size}] @findex -numa Define a NUMA node and assign RAM and VCPUs to it. Set the NUMA distance from a source node to a destination node.@@ -282,11 +284,19 @@ Note that if NUM is 0, means the corresponding latency or bandwidth information is not provided. And if input numbers without any unit, the latency unit will be 'ns' and the bandwidth will be B/s. +In @samp{hmat-cache} option, @var{node-id} is the NUMA-id of the memory belongs. +@var{size} is the size of memory side cache in bytes. @var{level} is the cache +level described in this structure. @var{assoc} is the cache associativity, +the possible value is 'none/direct(direct-mapped)/complex(complex cache indexing)'. +@var{policy} is the write policy. @var{line} is the cache Line size in bytes. + For example, the following options describe 2 NUMA nodes. Node 0 has 2 cpus and a ram, node 1 has only a ram. The processors in node 0 access memory in node 0 with access-latency 5 nanoseconds, access-bandwidth is 200 MB/s; The processors in NUMA node 0 access memory in NUMA node 1 with access-latency 10 nanoseconds, access-bandwidth is 100 MB/s. +And for memory side cache information, NUMA node 0 and 1 both have 1 level memory +cache, size is 10KB, policy is write-back, the cache Line size is 8 bytes: @example -machine hmat=on \ -m 2G \@@ -300,7 +310,9 @@ nanoseconds, access-bandwidth is 100 MB/s. -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=5ns \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=200M \ -numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=10ns \ --numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=100M +-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=100M \ +-numa hmat-cache,node-id=0,size=10K,level=1,assoc=direct,policy=write-back,line=8 \ +-numa hmat-cache,node-id=1,size=10K,level=1,assoc=direct,policy=write-back,line=8 @end example ETEXI
PATCH v17 10/14 hmat acpi: Build Memory Proximity Domain Attributes Structure(s)
In reply to Tao XuFrom: Liu Jingqi <[email protected]>
HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table (HMAT). The specification references below link:
http://www.uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf
It describes the memory attributes, such as memory side cache attributes and bandwidth and latency details, related to the Memory Proximity Domain. The software is
expected to use this information as hint for optimization.
This structure describes Memory Proximity Domain Attributes by memory subsystem and its associativity with processor proximity domain as well as hint for memory usage.
In the linux kernel, the codes in drivers/acpi/hmat/hmat.c parse and report the platform's HMAT tables.
---
No changes in v17.
Changes in v16:
- Use uint32_t for initiator and mem_node
Changes in v13:
- Remove the unnecessary head file.
--- hw/acpi/Kconfig | 7 ++- hw/acpi/Makefile.objs | 1 + hw/acpi/hmat.c | 99 +++++++++++++++++++++++++++++++++++++++++++ hw/acpi/hmat.h | 42 ++++++++++++++++++ hw/i386/acpi-build.c | 5 +++ 5 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 hw/acpi/hmat.c create mode 100644 hw/acpi/hmat.h
hw/acpi/Kconfig +5 -2
@@ -7,6 +7,7 @@ config ACPI_X86 select ACPI_NVDIMM select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG + select ACPI_HMAT config ACPI_X86_ICH bool
@@ -23,6 +24,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_HMAT + bool + depends on ACPI + config ACPI_PCI bool depends on ACPI && PCI
@@ -33,5 +38,3 @@ config ACPI_VMGENID depends on PC config ACPI_HW_REDUCED - bool - depends on ACPI
hw/acpi/Makefile.objs +1 -0
@@ -7,6 +7,7 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o +common-obj-$(CONFIG_ACPI_HMAT) += hmat.o common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o
hw/acpi/hmat.c new file +99 -0
99 lines not on this page · raw message
hw/acpi/hmat.h new file +42 -0
42 lines not on this page · raw message
hw/i386/acpi-build.c +5 -0
@@ -67,6 +67,7 @@#include "hw/i386/intel_iommu.h" #include "hw/acpi/ipmi.h" +#include "hw/acpi/hmat.h" /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows
@@ -2834,6 +2835,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)acpi_add_table (table_offsets, tables_blob);build_slit (tables_blob, tables->linker, machine); } +if (machine->numa_state->hmat_enabled) { +acpi_add_table (table_offsets, tables_blob); +build_hmat (tables_blob, tables->linker, machine->numa_state); + } }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob);
Signature · 1 line
2.20.1
PATCH v17 11/14 hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)
In reply to Tao XuFrom: Liu Jingqi <[email protected]>
This structure describes the memory access latency and bandwidth information from various memory access initiator proximity domains. The latency and bandwidth numbers represented in this structure correspond to rated latency and bandwidth for the platform. The software could use this information as hint for optimization.
---
Changes in v17:
- Remove unnecessary header file (Igor)
Changes in v16:
- Add more description for lb_length (Igor)
- Drop entry_list and calculate entries in this patch (Igor)
Changes in v13:
- Calculate the entries in a new patch.
--- hw/acpi/hmat.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-)
hw/acpi/hmat.c +103 -1
@@ -25,6 +25,7 @@*/ #include "qemu/osdep.h" +#include "qemu/units.h" #include "sysemu/numa.h" #include "hw/acpi/hmat.h"
@@ -67,11 +68,89 @@ static void build_hmat_mpda(GArray *table_data, uint16_t flags,build_append_int_noprefix (table_data,0 ,8 ); } +/* +* ACPI 6.3: 5.2.27.4 System Locality Latency and Bandwidth Information +* Structure: Table 5-146 +*/ +static void build_hmat_lb (GArray *table_data,HMAT_LB_Info *hmat_lb, +uint32_t num_initiator,uint32_t num_target, +uint32_t *initiator_list) +{ +int i, index; +HMAT_LB_Data *lb_data; +uint16_t *entry_list; +uint32_t base; +/* Length in bytes for entire structure */ +uint32_t lb_length + =32 /* Table length upto and including Entry Base Unit */ + +4 * num_initiator/* Initiator Proximity Domain List */ + +4 * num_target/* Target Proximity Domain List */ + +2 * num_initiator * num_target;/* Latency or Bandwidth Entries */ + +/* Type */ +build_append_int_noprefix (table_data,1 ,2 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Length */ +build_append_int_noprefix (table_data, lb_length,4 ); +/* Flags: Bits [3:0] Memory Hierarchy, Bits[7:4] Reserved */ +assert (!(hmat_lb->hierarchy >>4 )); +build_append_int_noprefix (table_data, hmat_lb->hierarchy,1 ); +/* Data Type */ +build_append_int_noprefix (table_data, hmat_lb->data_type,1 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Number of Initiator Proximity Domains (s) */ +build_append_int_noprefix (table_data, num_initiator,4 ); +/* Number of Target Proximity Domains (t) */ +build_append_int_noprefix (table_data, num_target,4 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 ); + +/* Entry Base Unit */ +if (hmat_lb->data_type <=HMAT_LB_DATA_WRITE_LATENCY ) { +/* Convert latency base from nanoseconds to picosecond */ + base = hmat_lb->base *1000 ; + }else { +/* Convert bandwidth base from Byte to Megabyte */ + base = hmat_lb->base / MiB; + } +build_append_int_noprefix (table_data, base,8 ); + +/* Initiator Proximity Domain List */ +for (i =0 ; i < num_initiator; i++) { +build_append_int_noprefix (table_data, initiator_list[i],4 ); + } + +/* Target Proximity Domain List */ +for (i =0 ; i < num_target; i++) { +build_append_int_noprefix (table_data, i,4 ); + } + +/* Latency or Bandwidth Entries */ + entry_list =g_malloc0 (hmat_lb->list->len *sizeof (uint16_t )); +for (i =0 ; i < hmat_lb->list->len; i++) { + lb_data = &g_array_index (hmat_lb->list, HMAT_LB_Data, i); + index = lb_data->initiator * num_target + lb_data->target; + + entry_list[index] = (uint16_t )(lb_data->data / hmat_lb->base); + } + +for (i =0 ; i < num_initiator * num_target; i++) { +build_append_int_noprefix (table_data, entry_list[i],2 ); + } + +g_free (entry_list); +} +/* Build HMAT sub table structures */ static void hmat_build_table_structs (GArray *table_data,NumaState *numa_state) {uint16_t flags; -int i; +uint32_t num_initiator =0 ; +uint32_t initiator_list[MAX_NODES ]; +int i, hierarchy, type; +HMAT_LB_Info *hmat_lb;for (i =0 ; i < numa_state->num_nodes; i++) { flags =0 ;
@@ -82,6 +161,29 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state)build_hmat_mpda (table_data, flags, numa_state->nodes[i].initiator, i); } + +for (i =0 ; i < numa_state->num_nodes; i++) { +if (numa_state->nodes[i].has_cpu) { + initiator_list[num_initiator++] = i; + } + } + +/* +* ACPI 6.3: 5.2.27.4 System Locality Latency and Bandwidth Information +* Structure: Table 5-146 +*/ +for (hierarchy =HMAT_LB_MEM_MEMORY ; + hierarchy <=HMAT_LB_MEM_CACHE_3RD_LEVEL ; hierarchy++) { +for (type =HMAT_LB_DATA_ACCESS_LATENCY ; + type <=HMAT_LB_DATA_WRITE_BANDWIDTH ; type++) { + hmat_lb = numa_state->hmat_lb[hierarchy][type]; + +if (hmat_lb && hmat_lb->list->len) { +build_hmat_lb (table_data, hmat_lb, num_initiator, + numa_state->num_nodes, initiator_list); + } + } + } }void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state)
Signature · 1 line
2.20.1
PATCH v17 12/14 hmat acpi: Build Memory Side Cache Information Structure(s)
In reply to Tao XuFrom: Liu Jingqi <[email protected]>
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.
---
No changes in v17.
Changes in v16:
- Use checks and assert to replace masks (Igor)
- Fields in Cache Attributes are promoted to uint32_t before shifting (Igor)
- Drop cpu_to_le32() (Igor)
Changes in v13:
- rename level as cache_level
--- hw/acpi/hmat.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)
hw/acpi/hmat.c +68 -1
@@ -143,14 +143,62 @@ static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *hmat_lb,g_free (entry_list); } +/* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: Table 5-147 */ +static void build_hmat_cache (GArray *table_data,uint8_t total_levels, +NumaHmatCacheOptions *hmat_cache) +{ +/* +* Cache Attributes: Bits [3:0] – Total Cache Levels +* for this Memory Proximity Domain +*/ +uint32_t cache_attr = total_levels; + +/* Bits [7:4] : Cache Level described in this structure */ + cache_attr |= (uint32_t ) hmat_cache->level <<4 ; + +/* Bits [11:8] - Cache Associativity */ + cache_attr |= (uint32_t ) hmat_cache->assoc <<8 ; + +/* Bits [15:12] - Write Policy */ + cache_attr |= (uint32_t ) hmat_cache->policy <<12 ; + +/* Bits [31:16] - Cache Line size in bytes */ + cache_attr |= (uint32_t ) hmat_cache->line <<16 ; + +/* 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->node_id,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 *numa_state) {uint16_t flags;uint32_t num_initiator =0 ;uint32_t initiator_list[MAX_NODES ]; -int i, hierarchy, type; +int i, hierarchy, type, cache_level, total_levels;HMAT_LB_Info *hmat_lb; +NumaHmatCacheOptions *hmat_cache;for (i =0 ; i < numa_state->num_nodes; i++) { flags =0 ;
@@ -184,6 +232,25 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) } } } + +/* +* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: +* Table 5-147 +*/ +for (i =0 ; i < numa_state->num_nodes; i++) { + total_levels =0 ; +for (cache_level =1 ; cache_level <HMAT_LB_LEVELS ; cache_level++) { +if (numa_state->hmat_cache[i][cache_level]) { + total_levels++; + } + } +for (cache_level =0 ; cache_level <= total_levels; cache_level++) { + hmat_cache = numa_state->hmat_cache[i][cache_level]; +if (hmat_cache) { +build_hmat_cache (table_data, total_levels, hmat_cache); + } + } + } }void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state)
Signature · 1 line
2.20.1
Re: [PATCH v17 12/14] hmat acpi: Build Memory Side Cache Information Structure(s)
Quoted 11 lines · On Fri, 22 Nov 2019 15:48:24 +0800 Tao Xu <[email protected]> wrote:
From: Liu Jingqi <[email protected]>
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.Reviewed-by Daniel Black <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
for the future reference,
You are not supposed to carry over Reviewed-by tags if you do non trivial change to the patch.
Quoted 2 lines
Signed-off-by Liu Jingqi <[email protected]>Signed-off-by Tao Xu <[email protected]>
Quoted 110 lines
---
No changes in v17.
Changes in v16:
- Use checks and assert to replace masks (Igor)
- Fields in Cache Attributes are promoted touint32_tbefore shifting (Igor)
- Dropcpu_to_le32()(Igor)Changes in v13:
- rename level ascache_level--- hw/acpi/hmat.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)hw/acpi/hmat.c +68
-1@@ -143,14 +143,62 @@ static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *hmat_lb,g_free (entry_list); } +/* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: Table 5-147 */ +static void build_hmat_cache (GArray *table_data,uint8_t total_levels, +NumaHmatCacheOptions *hmat_cache) +{ +/* +* Cache Attributes: Bits [3:0] – Total Cache Levels +* for this Memory Proximity Domain +*/ +uint32_t cache_attr = total_levels; + +/* Bits [7:4] : Cache Level described in this structure */ + cache_attr |= (uint32_t ) hmat_cache->level <<4 ; + +/* Bits [11:8] - Cache Associativity */ + cache_attr |= (uint32_t ) hmat_cache->assoc <<8 ; + +/* Bits [15:12] - Write Policy */ + cache_attr |= (uint32_t ) hmat_cache->policy <<12 ; + +/* Bits [31:16] - Cache Line size in bytes */ + cache_attr |= (uint32_t ) hmat_cache->line <<16 ; + +/* 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->node_id,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 *numa_state) {uint16_t flags;uint32_t num_initiator =0 ;uint32_t initiator_list[MAX_NODES ]; -int i, hierarchy, type; +int i, hierarchy, type, cache_level, total_levels;HMAT_LB_Info *hmat_lb; +NumaHmatCacheOptions *hmat_cache;for (i =0 ; i < numa_state->num_nodes; i++) { flags =0 ;@@ -184,6 +232,25 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) } } } + +/* +* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: +* Table 5-147 +*/ +for (i =0 ; i < numa_state->num_nodes; i++) { + total_levels =0 ; +for (cache_level =1 ; cache_level <HMAT_LB_LEVELS ; cache_level++) { +if (numa_state->hmat_cache[i][cache_level]) { + total_levels++; + } + } +for (cache_level =0 ; cache_level <= total_levels; cache_level++) { + hmat_cache = numa_state->hmat_cache[i][cache_level]; +if (hmat_cache) { +build_hmat_cache (table_data, total_levels, hmat_cache); + } + } + } }void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state)
Re: [PATCH v17 12/14] hmat acpi: Build Memory Side Cache Information Structure(s)
Quoted 12 lines · Igor Mammedov
Quoted 9 lines · On Fri, 22 Nov 2019 15:48:24 +0800 Tao Xu <[email protected]> wrote:
From: Liu Jingqi <[email protected]>
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.
Quoted 7 lines
Quoted 2 lines
Reviewed-by Daniel Black <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>for the future reference,
You are not supposed to carry over Reviewed-by tags if you do non trivial change to the patch.
OK, thanks for your suggestion
Quoted 116 lines
Quoted 2 lines
Signed-off-by Liu Jingqi <[email protected]>Signed-off-by Tao Xu <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Quoted 110 lines
---
No changes in v17.
Changes in v16:
- Use checks and assert to replace masks (Igor)
- Fields in Cache Attributes are promoted touint32_tbefore shifting (Igor)
- Dropcpu_to_le32()(Igor)Changes in v13:
- rename level ascache_level--- hw/acpi/hmat.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)hw/acpi/hmat.c +68
-1@@ -143,14 +143,62 @@ static void build_hmat_lb(GArray *table_data, HMAT_LB_Info *hmat_lb,g_free (entry_list); } +/* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: Table 5-147 */ +static void build_hmat_cache (GArray *table_data,uint8_t total_levels, +NumaHmatCacheOptions *hmat_cache) +{ +/* +* Cache Attributes: Bits [3:0] – Total Cache Levels +* for this Memory Proximity Domain +*/ +uint32_t cache_attr = total_levels; + +/* Bits [7:4] : Cache Level described in this structure */ + cache_attr |= (uint32_t ) hmat_cache->level <<4 ; + +/* Bits [11:8] - Cache Associativity */ + cache_attr |= (uint32_t ) hmat_cache->assoc <<8 ; + +/* Bits [15:12] - Write Policy */ + cache_attr |= (uint32_t ) hmat_cache->policy <<12 ; + +/* Bits [31:16] - Cache Line size in bytes */ + cache_attr |= (uint32_t ) hmat_cache->line <<16 ; + +/* 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->node_id,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 *numa_state) {uint16_t flags;uint32_t num_initiator =0 ;uint32_t initiator_list[MAX_NODES ]; -int i, hierarchy, type; +int i, hierarchy, type, cache_level, total_levels;HMAT_LB_Info *hmat_lb; +NumaHmatCacheOptions *hmat_cache;for (i =0 ; i < numa_state->num_nodes; i++) { flags =0 ;@@ -184,6 +232,25 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) } } } + +/* +* ACPI 6.3: 5.2.27.5 Memory Side Cache Information Structure: +* Table 5-147 +*/ +for (i =0 ; i < numa_state->num_nodes; i++) { + total_levels =0 ; +for (cache_level =1 ; cache_level <HMAT_LB_LEVELS ; cache_level++) { +if (numa_state->hmat_cache[i][cache_level]) { + total_levels++; + } + } +for (cache_level =0 ; cache_level <= total_levels; cache_level++) { + hmat_cache = numa_state->hmat_cache[i][cache_level]; +if (hmat_cache) { +build_hmat_cache (table_data, total_levels, hmat_cache); + } + } + } }void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state)
PATCH v17 13/14 tests/numa: Add case for QMP build HMAT
In reply to Tao XuCheck configuring HMAT usecase
---
Chenges in v17:
- Add some fail test cases (Igor)
--- tests/numa-test.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+)
tests/numa-test.c +194 -0
@@ -327,6 +327,197 @@ static void pc_dynamic_cpu_cfg(const void *data)qtest_quit (qs); } +static void pc_hmat_build_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig -machine hmat=on " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0 " +"-numa node,nodeid=1,memdev=m1,initiator=0 " +"-numa cpu,node-id=0,socket-id=0 " +"-numa cpu,node-id=0,socket-id=1" , + data ? (char *)data :"" ); + +/* Fail: Initiator should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 2, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Target should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 2," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Initiator should contain cpu */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 1, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Data-type mismatch */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"write-latency\"," +" 'bandwidth': 524288000 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"read-bandwidth\"," +" 'latency': 5 } }" ))); + +/* Fail: Bandwidth should be 1MB (1048576) aligned */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 1048575 } }" ))); + +/* Configuring HMAT bandwidth and latency details */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" )));/* 1 ns */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 5 } }" )));/* Fail: Duplicate configuration */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 68717379584 } }" )));/* 65534 MB/s */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 65534 } }" )));/* 65534 ns */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 34358689792 } }" )));/* 32767 MB/s */ + +/* Fail: node_id should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 2, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Fail: level should be less than HMAT_LB_LEVELS (4) */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 4, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Configuring HMAT memory side cache attributes */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" )));/* Fail: Duplicate configuration */ +/* Fail: The size of level 2 size should be small than level 1 */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 2, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +/* Fail: The size of level 0 size should be larger than level 1 */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 0, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 1, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} + +static void pc_hmat_off_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0" , + data ? (char *)data :"" ); + +/* +* Fail: Enable HMAT with -machine hmat=on +* before using any of hmat specific options +*/ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\"," +" 'initiator': 0 } }" ))); +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\" } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} + +static void pc_hmat_erange_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig -machine hmat=on " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0 " +"-numa node,nodeid=1,memdev=m1,initiator=0 " +"-numa cpu,node-id=0,socket-id=0 " +"-numa cpu,node-id=0,socket-id=1" , + data ? (char *)data :"" ); + +/* Can't store the compressed latency */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" )));/* 1 ns */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 65535 } }" )));/* 65535 ns */ + +/* Test the 0 input (bandwidth not provided) */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 0 } }" )));/* 0 MB/s */ +/* Fail: bandwidth should be provided before memory side cache attributes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Can't store the compressed bandwidth */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 68718428160 } }" )));/* 65535 MB/s */ + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} +int main (int argc,char **argv) {const char *args =NULL ;
@@ -346,6 +537,9 @@ int main(int argc, char **argv)if (!strcmp (arch,"i386" ) || !strcmp (arch,"x86_64" )) {qtest_add_data_func ("/numa/pc/cpu/explicit" , args, pc_numa_cpu);qtest_add_data_func ("/numa/pc/dynamic/cpu" , args, pc_dynamic_cpu_cfg); +qtest_add_data_func ("/numa/pc/hmat/build" , args, pc_hmat_build_cfg); +qtest_add_data_func ("/numa/pc/hmat/off" , args, pc_hmat_off_cfg); +qtest_add_data_func ("/numa/pc/hmat/erange" , args, pc_hmat_erange_cfg); }if (!strcmp (arch,"ppc64" )) {
Signature · 1 line
2.20.1
Re: [PATCH v17 13/14] tests/numa: Add case for QMP build HMAT
Quoted 4 lines · On Fri, 22 Nov 2019 15:48:25 +0800 Tao Xu <[email protected]> wrote:
Check configuring HMAT usecase
Suggested-by Igor Mammedov <[email protected]>Signed-off-by Tao Xu <[email protected]>
Quoted 220 lines
---
Chenges in v17:
- Add some fail test cases (Igor)--- tests/numa-test.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+)tests/numa-test.c +194
-0@@ -327,6 +327,197 @@ static void pc_dynamic_cpu_cfg(const void *data)qtest_quit (qs); } +static void pc_hmat_build_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig -machine hmat=on " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0 " +"-numa node,nodeid=1,memdev=m1,initiator=0 " +"-numa cpu,node-id=0,socket-id=0 " +"-numa cpu,node-id=0,socket-id=1" , + data ? (char *)data :"" ); + +/* Fail: Initiator should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 2, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Target should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 2," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Initiator should contain cpu */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 1, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }" ))); + +/* Fail: Data-type mismatch */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"write-latency\"," +" 'bandwidth': 524288000 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"read-bandwidth\"," +" 'latency': 5 } }" ))); + +/* Fail: Bandwidth should be 1MB (1048576) aligned */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 1048575 } }" ))); + +/* Configuring HMAT bandwidth and latency details */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" )));/* 1 ns */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 5 } }" )));/* Fail: Duplicate configuration */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 68717379584 } }" )));/* 65534 MB/s */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 65534 } }" )));/* 65534 ns */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 34358689792 } }" )));/* 32767 MB/s */ + +/* Fail: node_id should be less than the number of nodes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 2, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Fail: level should be less than HMAT_LB_LEVELS (4) */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 4, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Configuring HMAT memory side cache attributes */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" )));/* Fail: Duplicate configuration */ +/* Fail: The size of level 2 size should be small than level 1 */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 2, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +/* Fail: The size of level 0 size should be larger than level 1 */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 0, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 1, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} + +static void pc_hmat_off_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0" , + data ? (char *)data :"" ); + +/* +* Fail: Enable HMAT with -machine hmat=on +* before using any of hmat specific options +*/ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\"," +" 'initiator': 0 } }" ))); +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\" } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" ))); +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} + +static void pc_hmat_erange_cfg (const void *data) +{ +QTestState *qs =qtest_initf ("%s -nodefaults --preconfig -machine hmat=on " +"-smp 2,sockets=2 " +"-m 128M,slots=2,maxmem=1G " +"-object memory-backend-ram,size=64M,id=m0 " +"-object memory-backend-ram,size=64M,id=m1 " +"-numa node,nodeid=0,memdev=m0 " +"-numa node,nodeid=1,memdev=m1,initiator=0 " +"-numa cpu,node-id=0,socket-id=0 " +"-numa cpu,node-id=0,socket-id=1" , + data ? (char *)data :"" ); + +/* Can't store the compressed latency */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 1 } }" )));/* 1 ns */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-latency\"," +" 'latency': 65535 } }" )));/* 65535 ns */ + +/* Test the 0 input (bandwidth not provided) */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 0 } }" )));/* 0 MB/s */ +/* Fail: bandwidth should be provided before memory side cache attributes */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240," +" 'level': 1, 'assoc': \"direct\", 'policy': \"write-back\"," +" 'line': 8 } }" ))); + +/* Can't store the compressed bandwidth */ +g_assert (qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'set-numa-node'," +" 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1," +" 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\"," +" 'bandwidth': 68718428160 } }" )));/* 65535 MB/s */ + +/* let machine initialization to complete and run */ +g_assert (!qmp_rsp_is_err (qtest_qmp (qs,"{ 'execute': 'x-exit-preconfig' }" ))); +qtest_qmp_eventwait (qs,"RESUME" ); + +qtest_quit (qs); +} +int main (int argc,char **argv) {const char *args =NULL ;@@ -346,6 +537,9 @@ int main(int argc, char **argv)if (!strcmp (arch,"i386" ) || !strcmp (arch,"x86_64" )) {qtest_add_data_func ("/numa/pc/cpu/explicit" , args, pc_numa_cpu);qtest_add_data_func ("/numa/pc/dynamic/cpu" , args, pc_dynamic_cpu_cfg); +qtest_add_data_func ("/numa/pc/hmat/build" , args, pc_hmat_build_cfg); +qtest_add_data_func ("/numa/pc/hmat/off" , args, pc_hmat_off_cfg); +qtest_add_data_func ("/numa/pc/hmat/erange" , args, pc_hmat_erange_cfg); }if (!strcmp (arch,"ppc64" )) {
PATCH v17 14/14 tests/bios-tables-test: add test cases for ACPI HMAT
In reply to Tao XuACPI table HMAT has been introduced, QEMU now builds HMAT tables for Heterogeneous Memory with boot option '-numa node'.
Add test cases on PC and Q35 machines with 2 numa nodes. Because HMAT is generated when system enable numa, the following tables need to be added for this test:
tests/data/acpi/pc/APIC.acpihmat tests/data/acpi/pc/SRAT.acpihmat tests/data/acpi/pc/HMAT.acpihmat tests/data/acpi/pc/DSDT.acpihmat tests/data/acpi/q35/APIC.acpihmat tests/data/acpi/q35/SRAT.acpihmat tests/data/acpi/q35/HMAT.acpihmat tests/data/acpi/q35/DSDT.acpihmat
---
Changes in v17:
- Update the latency and bandwidth
Changes in v15:
- Make tests without breaking CI (Michael)
Changes in v13:
- Use decimal notation with appropriate suffix for cache size
--- tests/bios-tables-test-allowed-diff.h | 8 +++++ tests/bios-tables-test.c | 44 +++++++++++++++++++++++++++ tests/data/acpi/pc/APIC.acpihmat | 0 tests/data/acpi/pc/DSDT.acpihmat | 0 tests/data/acpi/pc/HMAT.acpihmat | 0 tests/data/acpi/pc/SRAT.acpihmat | 0 tests/data/acpi/q35/APIC.acpihmat | 0 tests/data/acpi/q35/DSDT.acpihmat | 0 tests/data/acpi/q35/HMAT.acpihmat | 0 tests/data/acpi/q35/SRAT.acpihmat | 0 10 files changed, 52 insertions(+) create mode 100644 tests/data/acpi/pc/APIC.acpihmat create mode 100644 tests/data/acpi/pc/DSDT.acpihmat create mode 100644 tests/data/acpi/pc/HMAT.acpihmat create mode 100644 tests/data/acpi/pc/SRAT.acpihmat create mode 100644 tests/data/acpi/q35/APIC.acpihmat create mode 100644 tests/data/acpi/q35/DSDT.acpihmat create mode 100644 tests/data/acpi/q35/HMAT.acpihmat create mode 100644 tests/data/acpi/q35/SRAT.acpihmat
tests/bios-tables-test-allowed-diff.h +8 -0
@@ -1 +1,9 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/APIC.acpihmat" , +"tests/data/acpi/pc/SRAT.acpihmat" , +"tests/data/acpi/pc/HMAT.acpihmat" , +"tests/data/acpi/pc/DSDT.acpihmat" , +"tests/data/acpi/q35/APIC.acpihmat" , +"tests/data/acpi/q35/SRAT.acpihmat" , +"tests/data/acpi/q35/HMAT.acpihmat" , +"tests/data/acpi/q35/DSDT.acpihmat",
tests/bios-tables-test.c +44 -0
56 lines not on this page · raw message
tests/data/acpi/pc/APIC.acpihmat new file +0 -0
tests/data/acpi/pc/DSDT.acpihmat new file +0 -0
tests/data/acpi/pc/HMAT.acpihmat new file +0 -0
tests/data/acpi/pc/SRAT.acpihmat new file +0 -0
tests/data/acpi/q35/APIC.acpihmat new file +0 -0
tests/data/acpi/q35/DSDT.acpihmat new file +0 -0
tests/data/acpi/q35/HMAT.acpihmat new file +0 -0
tests/data/acpi/q35/SRAT.acpihmat new file +0 -0
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
TEST check-qtest-x86_64: tests/numa-test
Broken pipe/tmp/qemu-test/src/tests/libqtest.c:149: kill_qemu() detected QEMU death from signal 8 (Floating point exception) (core dumped)
ERROR - too few tests run (expected 9, got 8)
make: *** [check-qtest-x86_64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 172
TEST iotest-qcow2: 174
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=dcec428a97434211b9c0856da658ff0b', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-zr9swotk/src/docker-src.2019-11-22-03.28.32.26341:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=dcec428a97434211b9c0856da658ff0b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-zr9swotk/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 12m44.362s
user 0m7.997s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v17 00/14] Build ACPI Heterogeneous Memory Attribute Table (HMAT)
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
- [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
9192aa6 tests/bios-tables-test: add test cases for ACPI HMAT
309fd85 tests/numa: Add case for QMP build HMAT
864da49 hmat acpi: Build Memory Side Cache Information Structure(s) 6d92931 hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s) 39ba308 hmat acpi: Build Memory Proximity Domain Attributes Structure(s) 7d0bffc numa: Extend CLI to provide memory side cache information
3fc8a54 numa: Extend CLI to provide memory latency and bandwidth information 592a96a numa: Extend CLI to provide initiator information for numa nodes 7032fc4 tests: Add test for QAPI builtin type time
2d89c93 qapi: Add builtin type time
dbe82f5 util/cutils: Add qemu_strtotime_ns()
2fef66f util/cutils: refactor do_strtosz() to support suffixes list 2cae457 util/cutils: Use qemu_strtold_finite to parse size
a691b5f util/cutils: Add Add qemu_strtold and qemu_strtold_finite
=== OUTPUT BEGIN ===
1/14 Checking commit a691b5f92191 (util/cutils: Add Add qemu_strtold and qemu_strtold_finite)
ERROR: consider using qemu_strtold in preference to strtold
#61: FILE: util/cutils.c:636:
+ *result = strtold(nptr, &ep);
total: 1 errors, 0 warnings, 69 lines checked
Patch 1/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/14 Checking commit 2cae457669b9 (util/cutils: Use qemu_strtold_finite to parse size) 3/14 Checking commit 2fef66fd2a82 (util/cutils: refactor do_strtosz() to support suffixes list) 4/14 Checking commit dbe82f50cf86 (util/cutils: Add qemu_strtotime_ns())
5/14 Checking commit 2d89c9350115 (qapi: Add builtin type time)
6/14 Checking commit 7032fc4756a0 (tests: Add test for QAPI builtin type time)
7/14 Checking commit 592a96a0ff21 (numa: Extend CLI to provide initiator information for numa nodes) 8/14 Checking commit 3fc8a542a4b7 (numa: Extend CLI to provide memory latency and bandwidth information)
WARNING: line over 80 characters
#130: FILE: hw/core/numa.c:299:
+ /* Set lb_info_provided bit 0 as 1, latency information is provided */
total: 0 errors, 1 warnings, 462 lines checked
Patch 8/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/14 Checking commit 7d0bffca6382 (numa: Extend CLI to provide memory side cache information) 10/14 Checking commit 39ba308b5612 (hmat acpi: Build Memory Proximity Domain Attributes Structure(s))
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#72:
new file mode 100644
total: 0 errors, 1 warnings, 185 lines checked
Patch 10/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/14 Checking commit 6d92931a0a40 (hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)) 12/14 Checking commit 864da49c0ce4 (hmat acpi: Build Memory Side Cache Information Structure(s)) 13/14 Checking commit 309fd85d39fc (tests/numa: Add case for QMP build HMAT)
WARNING: line over 80 characters
#124: FILE: tests/numa-test.c:433:
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));
WARNING: line over 80 characters
#159: FILE: tests/numa-test.c:468:
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));
WARNING: line over 80 characters
#206: FILE: tests/numa-test.c:515:
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));
total: 0 errors, 3 warnings, 206 lines checked
Patch 13/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
14/14 Checking commit 9192aa6b273f (tests/bios-tables-test: add test cases for ACPI HMAT)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #106:
new file mode 100644
total: 0 errors, 1 warnings, 65 lines checked
Patch 14/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 2 lines · On Fri, 22 Nov 2019 01:17:12 -0800 (PST) [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
do not ignore warnings "line over 80 characters",
just fix them
Quoted 118 lines
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v17 00/14] Build ACPI Heterogeneous Memory Attribute Table (HMAT)
Type: series
Message-id: [email protected]=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base >/dev/null|| exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl--mailback base..
=== TEST SCRIPT END ===Updating
3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
- [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
9192aa6 tests/bios-tables-test: add test cases for ACPI HMAT
309fd85 tests/numa: Add case for QMP build HMAT
864da49 hmat acpi: Build Memory Side Cache Information Structure(s) 6d92931 hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s) 39ba308 hmat acpi: Build Memory Proximity Domain Attributes Structure(s) 7d0bffc numa: Extend CLI to provide memory side cache information
3fc8a54 numa: Extend CLI to provide memory latency and bandwidth information 592a96a numa: Extend CLI to provide initiator information for numa nodes 7032fc4 tests: Add test for QAPI builtin type time
2d89c93 qapi: Add builtin type time
dbe82f5 util/cutils: Addqemu_strtotime_ns()
2fef66f util/cutils: refactordo_strtosz()to support suffixes list 2cae457 util/cutils: Useqemu_strtold_finiteto parse size
a691b5f util/cutils: Add Addqemu_strtoldandqemu_strtold_finite=== OUTPUT BEGIN ===
1/14 Checking commita691b5f92191(util/cutils: Add Addqemu_strtoldandqemu_strtold_finite)
ERROR: consider usingqemu_strtoldin preference to strtold
#61: FILE:util/cutils.c:636:
+ *result =strtold(nptr, &ep);total: 1 errors, 0 warnings, 69 lines checked
Patch 1/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in
MAINTAINERS.2/14 Checking commit
2cae457669b9(util/cutils: Useqemu_strtold_finiteto parse size) 3/14 Checking commit2fef66fd2a82(util/cutils: refactordo_strtosz()to support suffixes list) 4/14 Checking commitdbe82f50cf86(util/cutils: Addqemu_strtotime_ns())
5/14 Checking commit2d89c9350115(qapi: Add builtin type time)
6/14 Checking commit7032fc4756a0(tests: Add test for QAPI builtin type time)
7/14 Checking commit592a96a0ff21(numa: Extend CLI to provide initiator information for numa nodes) 8/14 Checking commit3fc8a542a4b7(numa: Extend CLI to provide memory latency and bandwidth information)
WARNING: line over 80 characters
#130: FILE:hw/core/numa.c:299:
+ /* Setlb_info_providedbit 0 as 1, latency information is provided */total: 0 errors, 1 warnings, 462 lines checked
Patch 8/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
9/14 Checking commit7d0bffca6382(numa: Extend CLI to provide memory side cache information) 10/14 Checking commit39ba308b5612(hmat acpi: Build Memory Proximity Domain Attributes Structure(s))
WARNING: added, moved or deleted file(s), doesMAINTAINERSneed updating?
#72:
new file mode 100644total: 0 errors, 1 warnings, 185 lines checked
Patch 10/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
11/14 Checking commit6d92931a0a40(hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)) 12/14 Checking commit864da49c0ce4(hmat acpi: Build Memory Side Cache Information Structure(s)) 13/14 Checking commit309fd85d39fc(tests/numa: Add case for QMP build HMAT)
WARNING: line over 80 characters
#124: FILE:tests/numa-test.c:433:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));WARNING: line over 80 characters
#159: FILE:tests/numa-test.c:468:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));WARNING: line over 80 characters
#206: FILE:tests/numa-test.c:515:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));total: 0 errors, 3 warnings, 206 lines checked
Patch 13/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
14/14 Checking commit9192aa6b273f(tests/bios-tables-test: add test cases for ACPI HMAT)
WARNING: added, moved or deleted file(s), doesMAINTAINERSneed updating? #106:
new file mode 100644total: 0 errors, 1 warnings, 65 lines checked
Patch 14/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in
MAINTAINERS.
=== OUTPUT END ===Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 7 lines · Igor Mammedov
Quoted 2 lines · On Fri, 22 Nov 2019 01:17:12 -0800 (PST) [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
do not ignore warnings "line over 80 characters",
just fix them
OK I will fin them in the next version
Quoted 120 lines
Quoted 119 lines
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v17 00/14] Build ACPI Heterogeneous Memory Attribute Table (HMAT)
Type: series
Message-id: [email protected]=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base >/dev/null|| exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl--mailback base..
=== TEST SCRIPT END ===Updating
3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
- [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
9192aa6 tests/bios-tables-test: add test cases for ACPI HMAT
309fd85 tests/numa: Add case for QMP build HMAT
864da49 hmat acpi: Build Memory Side Cache Information Structure(s) 6d92931 hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s) 39ba308 hmat acpi: Build Memory Proximity Domain Attributes Structure(s) 7d0bffc numa: Extend CLI to provide memory side cache information
3fc8a54 numa: Extend CLI to provide memory latency and bandwidth information 592a96a numa: Extend CLI to provide initiator information for numa nodes 7032fc4 tests: Add test for QAPI builtin type time
2d89c93 qapi: Add builtin type time
dbe82f5 util/cutils: Addqemu_strtotime_ns()
2fef66f util/cutils: refactordo_strtosz()to support suffixes list 2cae457 util/cutils: Useqemu_strtold_finiteto parse size
a691b5f util/cutils: Add Addqemu_strtoldandqemu_strtold_finite=== OUTPUT BEGIN ===
1/14 Checking commita691b5f92191(util/cutils: Add Addqemu_strtoldandqemu_strtold_finite)
ERROR: consider usingqemu_strtoldin preference to strtold
#61: FILE:util/cutils.c:636:
+ *result =strtold(nptr, &ep);total: 1 errors, 0 warnings, 69 lines checked
Patch 1/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in
MAINTAINERS.2/14 Checking commit
2cae457669b9(util/cutils: Useqemu_strtold_finiteto parse size) 3/14 Checking commit2fef66fd2a82(util/cutils: refactordo_strtosz()to support suffixes list) 4/14 Checking commitdbe82f50cf86(util/cutils: Addqemu_strtotime_ns())
5/14 Checking commit2d89c9350115(qapi: Add builtin type time)
6/14 Checking commit7032fc4756a0(tests: Add test for QAPI builtin type time)
7/14 Checking commit592a96a0ff21(numa: Extend CLI to provide initiator information for numa nodes) 8/14 Checking commit3fc8a542a4b7(numa: Extend CLI to provide memory latency and bandwidth information)
WARNING: line over 80 characters
#130: FILE:hw/core/numa.c:299:
+ /* Setlb_info_providedbit 0 as 1, latency information is provided */total: 0 errors, 1 warnings, 462 lines checked
Patch 8/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
9/14 Checking commit7d0bffca6382(numa: Extend CLI to provide memory side cache information) 10/14 Checking commit39ba308b5612(hmat acpi: Build Memory Proximity Domain Attributes Structure(s))
WARNING: added, moved or deleted file(s), doesMAINTAINERSneed updating?
#72:
new file mode 100644total: 0 errors, 1 warnings, 185 lines checked
Patch 10/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
11/14 Checking commit6d92931a0a40(hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)) 12/14 Checking commit864da49c0ce4(hmat acpi: Build Memory Side Cache Information Structure(s)) 13/14 Checking commit309fd85d39fc(tests/numa: Add case for QMP build HMAT)
WARNING: line over 80 characters
#124: FILE:tests/numa-test.c:433:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));WARNING: line over 80 characters
#159: FILE:tests/numa-test.c:468:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));WARNING: line over 80 characters
#206: FILE:tests/numa-test.c:515:
+g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'x-exit-preconfig' }")));total: 0 errors, 3 warnings, 206 lines checked
Patch 13/14 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH inMAINTAINERS.
14/14 Checking commit9192aa6b273f(tests/bios-tables-test: add test cases for ACPI HMAT)
WARNING: added, moved or deleted file(s), doesMAINTAINERSneed updating? #106:
new file mode 100644total: 0 errors, 1 warnings, 65 lines checked
Patch 14/14 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in
MAINTAINERS.
=== OUTPUT END ===Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]