2018-07-12 07:10:59

by Thomas Richter

[permalink] [raw]
Subject: [PATCH] perf kvm: Fix subcommands on s390

With commit eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
s390 platform provides detailed type/model/capacitiy information
in the CPU indentifier string instead of just "IBM/S390".

This breaks perf kvm support which uses hard coded string IBM/S390 to
compare with the CPU identifier string. Fix this by changing the comparison.

Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
Cc: Stefan Raspl <[email protected]>
Cc: <[email protected]> # 4.17

Signed-off-by: Thomas Richter <[email protected]>
Reviewed-by: Hendrik Brueckner <[email protected]>
---
tools/perf/arch/s390/util/kvm-stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/s390/util/kvm-stat.c b/tools/perf/arch/s390/util/kvm-stat.c
index d233e2eb9592..aaabab5e2830 100644
--- a/tools/perf/arch/s390/util/kvm-stat.c
+++ b/tools/perf/arch/s390/util/kvm-stat.c
@@ -102,7 +102,7 @@ const char * const kvm_skip_events[] = {

int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)
{
- if (strstr(cpuid, "IBM/S390")) {
+ if (strstr(cpuid, "IBM")) {
kvm->exit_reasons = sie_exit_reasons;
kvm->exit_reasons_isa = "SIE";
} else
--
2.14.3



2018-07-12 07:16:39

by Christian Borntraeger

[permalink] [raw]
Subject: Re: [PATCH] perf kvm: Fix subcommands on s390



On 07/12/2018 09:09 AM, Thomas Richter wrote:
> With commit eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> s390 platform provides detailed type/model/capacitiy information
> in the CPU indentifier string instead of just "IBM/S390".
>
> This breaks perf kvm support which uses hard coded string IBM/S390 to
> compare with the CPU identifier string. Fix this by changing the comparison.
>
> Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> Cc: Stefan Raspl <[email protected]>
> Cc: <[email protected]> # 4.17
>
> Signed-off-by: Thomas Richter <[email protected]>
> Reviewed-by: Hendrik Brueckner <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>

> ---
> tools/perf/arch/s390/util/kvm-stat.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/arch/s390/util/kvm-stat.c b/tools/perf/arch/s390/util/kvm-stat.c
> index d233e2eb9592..aaabab5e2830 100644
> --- a/tools/perf/arch/s390/util/kvm-stat.c
> +++ b/tools/perf/arch/s390/util/kvm-stat.c
> @@ -102,7 +102,7 @@ const char * const kvm_skip_events[] = {
>
> int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)
> {
> - if (strstr(cpuid, "IBM/S390")) {
> + if (strstr(cpuid, "IBM")) {
> kvm->exit_reasons = sie_exit_reasons;
> kvm->exit_reasons_isa = "SIE";
> } else
>


2018-07-12 14:18:13

by Stefan Raspl

[permalink] [raw]
Subject: Re: [PATCH] perf kvm: Fix subcommands on s390

On 12.07.2018 09:09, Thomas Richter wrote:
> With commit eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> s390 platform provides detailed type/model/capacitiy information
> in the CPU indentifier string instead of just "IBM/S390".
>
> This breaks perf kvm support which uses hard coded string IBM/S390 to
> compare with the CPU identifier string. Fix this by changing the comparison.
>
> Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> Cc: Stefan Raspl <[email protected]>
> Cc: <[email protected]> # 4.17
>
> Signed-off-by: Thomas Richter <[email protected]>
> Reviewed-by: Hendrik Brueckner <[email protected]>


Reported-and-tested-by: Stefan Raspl <[email protected]>


2018-07-16 20:44:42

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf kvm: Fix subcommands on s390

Em Thu, Jul 12, 2018 at 04:17:14PM +0200, Stefan Raspl escreveu:
> On 12.07.2018 09:09, Thomas Richter wrote:
> > With commit eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> > s390 platform provides detailed type/model/capacitiy information
> > in the CPU indentifier string instead of just "IBM/S390".

> > This breaks perf kvm support which uses hard coded string IBM/S390 to
> > compare with the CPU identifier string. Fix this by changing the comparison.

> > Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> > Cc: Stefan Raspl <[email protected]>
> > Cc: <[email protected]> # 4.17

> > Signed-off-by: Thomas Richter <[email protected]>
> > Reviewed-by: Hendrik Brueckner <[email protected]>

> Reported-and-tested-by: Stefan Raspl <[email protected]>

Thanks, applied together with Christian's Acked-by,

- Arnaldo

Subject: [tip:perf/core] perf kvm: Fix subcommands on s390

Commit-ID: 8a95c8994509c55abf1e38c0cc037b1205725e21
Gitweb: https://git.kernel.org/tip/8a95c8994509c55abf1e38c0cc037b1205725e21
Author: Thomas Richter <[email protected]>
AuthorDate: Thu, 12 Jul 2018 09:09:36 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 24 Jul 2018 14:49:49 -0300

perf kvm: Fix subcommands on s390

With commit eca0fa28cd0d ("perf record: Provide detailed information on
s390 CPU") s390 platform provides detailed type/model/capacity
information in the CPU identifier string instead of just "IBM/S390".

This breaks 'perf kvm' support which uses hard coded string IBM/S390 to
compare with the CPU identifier string. Fix this by changing the
comparison.

Reported-by: Stefan Raspl <[email protected]>
Signed-off-by: Thomas Richter <[email protected]>
Reviewed-by: Hendrik Brueckner <[email protected]>
Tested-by: Stefan Raspl <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: [email protected]
Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/arch/s390/util/kvm-stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/s390/util/kvm-stat.c b/tools/perf/arch/s390/util/kvm-stat.c
index d233e2eb9592..aaabab5e2830 100644
--- a/tools/perf/arch/s390/util/kvm-stat.c
+++ b/tools/perf/arch/s390/util/kvm-stat.c
@@ -102,7 +102,7 @@ const char * const kvm_skip_events[] = {

int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)
{
- if (strstr(cpuid, "IBM/S390")) {
+ if (strstr(cpuid, "IBM")) {
kvm->exit_reasons = sie_exit_reasons;
kvm->exit_reasons_isa = "SIE";
} else