* [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
@ 2024-01-15 22:02 Jing Zhang
2024-01-15 22:02 ` [PATCH v2] " Jing Zhang
0 siblings, 1 reply; 10+ messages in thread
From: Jing Zhang @ 2024-01-15 22:02 UTC (permalink / raw)
To: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton
Cc: Paolo Bonzini, James Morse, Suzuki K Poulose, Zenghui Yu,
Itaru Kitayama, Jing Zhang
There are some feature fields with nonzero minimum valid value. Make
sure get_safe_value() won't return invalid field values for them.
Also fix a bug that wrongly uses the feature bits type as the feature
bits sign causing all fields as signed in the get_safe_value() and
get_invalid_value().
Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
Signed-off-by: Jing Zhang <jingzhangos@google.com>
---
.../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
index bac05210b539..f17454dc6d9e 100644
--- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
+++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
@@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ uint64_t min_safe = 0;
+
+ if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
+ min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
+ else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
+ min_safe = ID_DFR0_EL1_CopDbg_Armv8;
+
+ if (ftr > min_safe)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ uint64_t min_safe = 0;
+
+ if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon"))
+ min_safe = ID_DFR0_EL1_PerfMon_PMUv3;
+
+ if (ftr > min_safe)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
--
2.43.0.472.g3155946c3a-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-15 22:02 [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly Jing Zhang
@ 2024-01-15 22:02 ` Jing Zhang
2024-01-15 23:07 ` Itaru Kitayama
2024-01-24 20:59 ` Oliver Upton
0 siblings, 2 replies; 10+ messages in thread
From: Jing Zhang @ 2024-01-15 22:02 UTC (permalink / raw)
To: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton
Cc: Paolo Bonzini, James Morse, Suzuki K Poulose, Zenghui Yu,
Itaru Kitayama, Jing Zhang, Itaru Kitayama
There are some feature fields with nonzero minimum valid value. Make
sure get_safe_value() won't return invalid field values for them.
Also fix a bug that wrongly uses the feature bits type as the feature
bits sign causing all fields as signed in the get_safe_value() and
get_invalid_value().
Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
Tested-by: Itaru Kitayama <itaru.kitayama@fujitsu.com>
Signed-off-by: Jing Zhang <jingzhangos@google.com>
---
* v1 -> v2:
- Use ftr_bits->safe_val for minimal safe value for type FTR_LOWER_SAFE.
- Fix build error reported by Zenghui with gcc-10.3.1.
---
.../selftests/kvm/aarch64/set_id_regs.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
index bac05210b539..16e2338686c1 100644
--- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
+++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
@@ -32,6 +32,10 @@ struct reg_ftr_bits {
enum ftr_type type;
uint8_t shift;
uint64_t mask;
+ /*
+ * For FTR_EXACT, safe_val is used as the exact safe value.
+ * For FTR_LOWER_SAFE, safe_val is used as the minimal safe value.
+ */
int64_t safe_val;
};
@@ -65,13 +69,13 @@ struct test_feature_reg {
static const struct reg_ftr_bits ftr_id_aa64dfr0_el1[] = {
S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, PMUVer, 0),
- REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, 0),
+ REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, ID_AA64DFR0_EL1_DebugVer_IMP),
REG_FTR_END,
};
static const struct reg_ftr_bits ftr_id_dfr0_el1[] = {
- S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, 0),
- REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, 0),
+ S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, ID_DFR0_EL1_PerfMon_PMUv3),
+ REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, ID_DFR0_EL1_CopDbg_Armv8),
REG_FTR_END,
};
@@ -224,13 +228,13 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ if (ftr > ftr_bits->safe_val)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -252,7 +256,7 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ if (ftr > ftr_bits->safe_val)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -276,7 +280,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
--
2.43.0.381.gb435a96ce8-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-15 22:02 ` [PATCH v2] " Jing Zhang
@ 2024-01-15 23:07 ` Itaru Kitayama
2024-01-24 20:59 ` Oliver Upton
1 sibling, 0 replies; 10+ messages in thread
From: Itaru Kitayama @ 2024-01-15 23:07 UTC (permalink / raw)
To: Jing Zhang
Cc: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton, Paolo Bonzini,
James Morse, Suzuki K Poulose, Zenghui Yu, Itaru Kitayama
On Mon, Jan 15, 2024 at 02:02:09PM -0800, Jing Zhang wrote:
> There are some feature fields with nonzero minimum valid value. Make
> sure get_safe_value() won't return invalid field values for them.
> Also fix a bug that wrongly uses the feature bits type as the feature
> bits sign causing all fields as signed in the get_safe_value() and
> get_invalid_value().
>
> Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> Tested-by: Itaru Kitayama <itaru.kitayama@fujitsu.com>
> Signed-off-by: Jing Zhang <jingzhangos@google.com>
v2 works on FVP.
Tested-by: Itaru Kitayama <itaru.kitayama@fujitsu.com>
Thanks,
Itaru.
>
> ---
> * v1 -> v2:
> - Use ftr_bits->safe_val for minimal safe value for type FTR_LOWER_SAFE.
> - Fix build error reported by Zenghui with gcc-10.3.1.
> ---
> .../selftests/kvm/aarch64/set_id_regs.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> index bac05210b539..16e2338686c1 100644
> --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> @@ -32,6 +32,10 @@ struct reg_ftr_bits {
> enum ftr_type type;
> uint8_t shift;
> uint64_t mask;
> + /*
> + * For FTR_EXACT, safe_val is used as the exact safe value.
> + * For FTR_LOWER_SAFE, safe_val is used as the minimal safe value.
> + */
> int64_t safe_val;
> };
>
> @@ -65,13 +69,13 @@ struct test_feature_reg {
>
> static const struct reg_ftr_bits ftr_id_aa64dfr0_el1[] = {
> S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, PMUVer, 0),
> - REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, 0),
> + REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, ID_AA64DFR0_EL1_DebugVer_IMP),
> REG_FTR_END,
> };
>
> static const struct reg_ftr_bits ftr_id_dfr0_el1[] = {
> - S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, 0),
> - REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, 0),
> + S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, ID_DFR0_EL1_PerfMon_PMUv3),
> + REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, ID_DFR0_EL1_CopDbg_Armv8),
> REG_FTR_END,
> };
>
> @@ -224,13 +228,13 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + if (ftr > ftr_bits->safe_val)
> ftr--;
> break;
> case FTR_HIGHER_SAFE:
> @@ -252,7 +256,7 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + if (ftr > ftr_bits->safe_val)
> ftr--;
> break;
> case FTR_HIGHER_SAFE:
> @@ -276,7 +280,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
>
> base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
> --
> 2.43.0.381.gb435a96ce8-goog
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-15 22:02 ` [PATCH v2] " Jing Zhang
2024-01-15 23:07 ` Itaru Kitayama
@ 2024-01-24 20:59 ` Oliver Upton
1 sibling, 0 replies; 10+ messages in thread
From: Oliver Upton @ 2024-01-24 20:59 UTC (permalink / raw)
To: ARMLinux, KVMARM, Jing Zhang, Marc Zyngier, KVM
Cc: Oliver Upton, James Morse, Suzuki K Poulose, Itaru Kitayama,
Paolo Bonzini, Itaru Kitayama, Zenghui Yu
On Mon, 15 Jan 2024 14:02:09 -0800, Jing Zhang wrote:
> There are some feature fields with nonzero minimum valid value. Make
> sure get_safe_value() won't return invalid field values for them.
> Also fix a bug that wrongly uses the feature bits type as the feature
> bits sign causing all fields as signed in the get_safe_value() and
> get_invalid_value().
>
>
> [...]
Applied to kvmarm/next, thanks!
[1/1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
https://git.kernel.org/kvmarm/kvmarm/c/1cd2b08f7cc4
--
Best,
Oliver
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
@ 2024-01-09 16:56 Jing Zhang
2024-01-09 22:27 ` Itaru Kitayama
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Jing Zhang @ 2024-01-09 16:56 UTC (permalink / raw)
To: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton
Cc: Paolo Bonzini, James Morse, Suzuki K Poulose, Zenghui Yu,
Itaru Kitayama, Jing Zhang
There are some feature fields with nonzero minimum valid value. Make
sure get_safe_value() won't return invalid field values for them.
Also fix a bug that wrongly uses the feature bits type as the feature
bits sign causing all fields as signed in the get_safe_value() and
get_invalid_value().
Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
Signed-off-by: Jing Zhang <jingzhangos@google.com>
---
.../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
index bac05210b539..f17454dc6d9e 100644
--- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
+++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
@@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ uint64_t min_safe = 0;
+
+ if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
+ min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
+ else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
+ min_safe = ID_DFR0_EL1_CopDbg_Armv8;
+
+ if (ftr > min_safe)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
ftr = ftr_bits->safe_val;
break;
case FTR_LOWER_SAFE:
- if (ftr > 0)
+ uint64_t min_safe = 0;
+
+ if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon"))
+ min_safe = ID_DFR0_EL1_PerfMon_PMUv3;
+
+ if (ftr > min_safe)
ftr--;
break;
case FTR_HIGHER_SAFE:
@@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
{
uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
- if (ftr_bits->type == FTR_UNSIGNED) {
+ if (ftr_bits->sign == FTR_UNSIGNED) {
switch (ftr_bits->type) {
case FTR_EXACT:
ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
--
2.43.0.472.g3155946c3a-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-09 16:56 [PATCH v1] " Jing Zhang
@ 2024-01-09 22:27 ` Itaru Kitayama
2024-01-15 7:41 ` Zenghui Yu
2024-01-15 9:34 ` Suzuki K Poulose
2 siblings, 0 replies; 10+ messages in thread
From: Itaru Kitayama @ 2024-01-09 22:27 UTC (permalink / raw)
To: Jing Zhang
Cc: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton, Paolo Bonzini,
James Morse, Suzuki K Poulose, Zenghui Yu
On Tue, Jan 09, 2024 at 08:56:21AM -0800, Jing Zhang wrote:
> There are some feature fields with nonzero minimum valid value. Make
> sure get_safe_value() won't return invalid field values for them.
> Also fix a bug that wrongly uses the feature bits type as the feature
> bits sign causing all fields as signed in the get_safe_value() and
> get_invalid_value().
>
> Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> Signed-off-by: Jing Zhang <jingzhangos@google.com>
> ---
> .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> index bac05210b539..f17454dc6d9e 100644
> --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + uint64_t min_safe = 0;
> +
> + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
> + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
> + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
> + min_safe = ID_DFR0_EL1_CopDbg_Armv8;
> +
> + if (ftr > min_safe)
> ftr--;
> break;
> case FTR_HIGHER_SAFE:
> @@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + uint64_t min_safe = 0;
> +
> + if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon"))
> + min_safe = ID_DFR0_EL1_PerfMon_PMUv3;
> +
> + if (ftr > min_safe)
> ftr--;
> break;
> case FTR_HIGHER_SAFE:
> @@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
>
This fixes the issue seen on an AEM RevC FVP launched via the shrinkwrap
ns-edk2.yaml config.
[...]
# ok 79 ID_AA64ZFR0_EL1_SVEver
# # Totals: pass:79 fail:0 xfail:0 xpass:0 skip:0 error:0
ok 1 selftests: kvm: set_id_regs
Tested-by: Itaru Kitayama <itaru.kitayama@fujitsu.com>
Thanks,
Itaru.
> base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
> --
> 2.43.0.472.g3155946c3a-goog
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-09 16:56 [PATCH v1] " Jing Zhang
2024-01-09 22:27 ` Itaru Kitayama
@ 2024-01-15 7:41 ` Zenghui Yu
2024-01-15 21:49 ` Jing Zhang
2024-01-15 9:34 ` Suzuki K Poulose
2 siblings, 1 reply; 10+ messages in thread
From: Zenghui Yu @ 2024-01-15 7:41 UTC (permalink / raw)
To: Jing Zhang
Cc: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton, Paolo Bonzini,
James Morse, Suzuki K Poulose, Itaru Kitayama
Hi Jing,
On 2024/1/10 0:56, Jing Zhang wrote:
> There are some feature fields with nonzero minimum valid value. Make
> sure get_safe_value() won't return invalid field values for them.
> Also fix a bug that wrongly uses the feature bits type as the feature
> bits sign causing all fields as signed in the get_safe_value() and
> get_invalid_value().
>
> Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> Signed-off-by: Jing Zhang <jingzhangos@google.com>
> ---
> .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> index bac05210b539..f17454dc6d9e 100644
> --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + uint64_t min_safe = 0;
> +
> + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
> + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
> + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
> + min_safe = ID_DFR0_EL1_CopDbg_Armv8;
> +
> + if (ftr > min_safe)
As I mentioned in my previous reply, there is a compilation error with
gcc-10.3.1.
| aarch64/set_id_regs.c: In function 'get_safe_value':
| aarch64/set_id_regs.c:233:4: error: a label can only be part of a
statement and a declaration is not a statement
| 233 | uint64_t min_safe = 0;
| | ^~~~~~~~
| aarch64/set_id_regs.c:262:4: error: a label can only be part of a
statement and a declaration is not a statement
| 262 | uint64_t min_safe = 0;
| | ^~~~~~~~
Please fix it.
Zenghui
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-15 7:41 ` Zenghui Yu
@ 2024-01-15 21:49 ` Jing Zhang
0 siblings, 0 replies; 10+ messages in thread
From: Jing Zhang @ 2024-01-15 21:49 UTC (permalink / raw)
To: Zenghui Yu
Cc: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton, Paolo Bonzini,
James Morse, Suzuki K Poulose, Itaru Kitayama
Hi Zenghui,
On Sun, Jan 14, 2024 at 11:41 PM Zenghui Yu <yuzenghui@huawei.com> wrote:
>
> Hi Jing,
>
> On 2024/1/10 0:56, Jing Zhang wrote:
> > There are some feature fields with nonzero minimum valid value. Make
> > sure get_safe_value() won't return invalid field values for them.
> > Also fix a bug that wrongly uses the feature bits type as the feature
> > bits sign causing all fields as signed in the get_safe_value() and
> > get_invalid_value().
> >
> > Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> > Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> > Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> > Signed-off-by: Jing Zhang <jingzhangos@google.com>
> > ---
> > .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
> > 1 file changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > index bac05210b539..f17454dc6d9e 100644
> > --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> > {
> > uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
> >
> > - if (ftr_bits->type == FTR_UNSIGNED) {
> > + if (ftr_bits->sign == FTR_UNSIGNED) {
> > switch (ftr_bits->type) {
> > case FTR_EXACT:
> > ftr = ftr_bits->safe_val;
> > break;
> > case FTR_LOWER_SAFE:
> > - if (ftr > 0)
> > + uint64_t min_safe = 0;
> > +
> > + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
> > + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
> > + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
> > + min_safe = ID_DFR0_EL1_CopDbg_Armv8;
> > +
> > + if (ftr > min_safe)
>
> As I mentioned in my previous reply, there is a compilation error with
> gcc-10.3.1.
>
> | aarch64/set_id_regs.c: In function 'get_safe_value':
> | aarch64/set_id_regs.c:233:4: error: a label can only be part of a
> statement and a declaration is not a statement
> | 233 | uint64_t min_safe = 0;
> | | ^~~~~~~~
> | aarch64/set_id_regs.c:262:4: error: a label can only be part of a
> statement and a declaration is not a statement
> | 262 | uint64_t min_safe = 0;
> | | ^~~~~~~~
>
> Please fix it.
Will fix it.
>
> Zenghui
Thanks,
Jing
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-09 16:56 [PATCH v1] " Jing Zhang
2024-01-09 22:27 ` Itaru Kitayama
2024-01-15 7:41 ` Zenghui Yu
@ 2024-01-15 9:34 ` Suzuki K Poulose
2024-01-15 21:53 ` Jing Zhang
2 siblings, 1 reply; 10+ messages in thread
From: Suzuki K Poulose @ 2024-01-15 9:34 UTC (permalink / raw)
To: Jing Zhang, KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton
Cc: Paolo Bonzini, James Morse, Zenghui Yu, Itaru Kitayama
On 09/01/2024 16:56, Jing Zhang wrote:
> There are some feature fields with nonzero minimum valid value. Make
> sure get_safe_value() won't return invalid field values for them.
> Also fix a bug that wrongly uses the feature bits type as the feature
> bits sign causing all fields as signed in the get_safe_value() and
> get_invalid_value().
>
> Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> Signed-off-by: Jing Zhang <jingzhangos@google.com>
> ---
> .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> index bac05210b539..f17454dc6d9e 100644
> --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + uint64_t min_safe = 0;
> +
> + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
> + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
> + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
> + min_safe = ID_DFR0_EL1_CopDbg_Armv8;
Instead of hardcoding the safe value here in the code, why not "fix" the
safe value in the ftr_id table and use ftr_bits->safe_val for both the
above cases ?
> +
> + if (ftr > min_safe)
> ftr--;
> break;
> case FTR_HIGHER_SAFE:
> @@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> ftr = ftr_bits->safe_val;
> break;
> case FTR_LOWER_SAFE:
> - if (ftr > 0)
> + uint64_t min_safe = 0;
> +
> + if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon"))
> + min_safe = ID_DFR0_EL1_PerfMon_PMUv3;
> +
> + if (ftr > min_safe)
> ftr--;
Also, here, don't we need to type case both "ftr" and min_safe to
int64_t for signed features ?
Suzuki
> break;
> case FTR_HIGHER_SAFE:
> @@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> {
> uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
>
> - if (ftr_bits->type == FTR_UNSIGNED) {
> + if (ftr_bits->sign == FTR_UNSIGNED) {
> switch (ftr_bits->type) {
> case FTR_EXACT:
> ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
>
> base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly
2024-01-15 9:34 ` Suzuki K Poulose
@ 2024-01-15 21:53 ` Jing Zhang
0 siblings, 0 replies; 10+ messages in thread
From: Jing Zhang @ 2024-01-15 21:53 UTC (permalink / raw)
To: Suzuki K Poulose
Cc: KVM, KVMARM, ARMLinux, Marc Zyngier, Oliver Upton, Paolo Bonzini,
James Morse, Zenghui Yu, Itaru Kitayama
Hi Suzuki,
On Mon, Jan 15, 2024 at 1:34 AM Suzuki K Poulose <suzuki.poulose@arm.com> wrote:
>
> On 09/01/2024 16:56, Jing Zhang wrote:
> > There are some feature fields with nonzero minimum valid value. Make
> > sure get_safe_value() won't return invalid field values for them.
> > Also fix a bug that wrongly uses the feature bits type as the feature
> > bits sign causing all fields as signed in the get_safe_value() and
> > get_invalid_value().
> >
> > Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce")
> > Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> > Reported-by: Itaru Kitayama <itaru.kitayama@linux.dev>
> > Signed-off-by: Jing Zhang <jingzhangos@google.com>
> > ---
> > .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++----
> > 1 file changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > index bac05210b539..f17454dc6d9e 100644
> > --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
> > @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> > {
> > uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
> >
> > - if (ftr_bits->type == FTR_UNSIGNED) {
> > + if (ftr_bits->sign == FTR_UNSIGNED) {
> > switch (ftr_bits->type) {
> > case FTR_EXACT:
> > ftr = ftr_bits->safe_val;
> > break;
> > case FTR_LOWER_SAFE:
> > - if (ftr > 0)
> > + uint64_t min_safe = 0;
> > +
> > + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer"))
> > + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP;
> > + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg"))
> > + min_safe = ID_DFR0_EL1_CopDbg_Armv8;
>
> Instead of hardcoding the safe value here in the code, why not "fix" the
> safe value in the ftr_id table and use ftr_bits->safe_val for both the
> above cases ?
>
SGTM. Will do.
> > +
> > + if (ftr > min_safe)
> > ftr--;
> > break;
> > case FTR_HIGHER_SAFE:
> > @@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> > ftr = ftr_bits->safe_val;
> > break;
> > case FTR_LOWER_SAFE:
> > - if (ftr > 0)
> > + uint64_t min_safe = 0;
> > +
> > + if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon"))
> > + min_safe = ID_DFR0_EL1_PerfMon_PMUv3;
> > +
> > + if (ftr > min_safe)
> > ftr--;
>
> Also, here, don't we need to type case both "ftr" and min_safe to
> int64_t for signed features ?
They are all used as unsigned on purpose. That's why the handling for
signed features are handled in different cases.
>
> Suzuki
>
> > break;
> > case FTR_HIGHER_SAFE:
> > @@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)
> > {
> > uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);
> >
> > - if (ftr_bits->type == FTR_UNSIGNED) {
> > + if (ftr_bits->sign == FTR_UNSIGNED) {
> > switch (ftr_bits->type) {
> > case FTR_EXACT:
> > ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1);
> >
> > base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a
>
Thanks,
Jing
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-01-24 21:02 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-15 22:02 [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly Jing Zhang
2024-01-15 22:02 ` [PATCH v2] " Jing Zhang
2024-01-15 23:07 ` Itaru Kitayama
2024-01-24 20:59 ` Oliver Upton
-- strict thread matches above, loose matches on Subject: below --
2024-01-09 16:56 [PATCH v1] " Jing Zhang
2024-01-09 22:27 ` Itaru Kitayama
2024-01-15 7:41 ` Zenghui Yu
2024-01-15 21:49 ` Jing Zhang
2024-01-15 9:34 ` Suzuki K Poulose
2024-01-15 21:53 ` Jing Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).