linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] perf kvm: Fix subcommands on s390
@ 2018-07-12  7:09 Thomas Richter
  2018-07-12  7:15 ` Christian Borntraeger
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Thomas Richter @ 2018-07-12  7:09 UTC (permalink / raw)
  To: linux-kernel, linux-perf-users, acme
  Cc: brueckner, schwidefsky, heiko.carstens, Thomas Richter,
	Stefan Raspl, stable

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 <raspl@linux.ibm.com>
Cc: <stable@vger.kernel.org> # 4.17

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
---
 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] perf kvm: Fix subcommands on s390
  2018-07-12  7:09 [PATCH] perf kvm: Fix subcommands on s390 Thomas Richter
@ 2018-07-12  7:15 ` Christian Borntraeger
  2018-07-12 14:17 ` Stefan Raspl
  2018-07-25 20:44 ` [tip:perf/core] " tip-bot for Thomas Richter
  2 siblings, 0 replies; 5+ messages in thread
From: Christian Borntraeger @ 2018-07-12  7:15 UTC (permalink / raw)
  To: Thomas Richter, linux-kernel, linux-perf-users, acme
  Cc: brueckner, schwidefsky, heiko.carstens, Stefan Raspl, stable



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 <raspl@linux.ibm.com>
> Cc: <stable@vger.kernel.org> # 4.17
> 
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>  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
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] perf kvm: Fix subcommands on s390
  2018-07-12  7:09 [PATCH] perf kvm: Fix subcommands on s390 Thomas Richter
  2018-07-12  7:15 ` Christian Borntraeger
@ 2018-07-12 14:17 ` Stefan Raspl
  2018-07-16 20:43   ` Arnaldo Carvalho de Melo
  2018-07-25 20:44 ` [tip:perf/core] " tip-bot for Thomas Richter
  2 siblings, 1 reply; 5+ messages in thread
From: Stefan Raspl @ 2018-07-12 14:17 UTC (permalink / raw)
  To: Thomas Richter, linux-kernel, linux-perf-users, acme
  Cc: brueckner, schwidefsky, heiko.carstens, stable

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 <raspl@linux.ibm.com>
> Cc: <stable@vger.kernel.org> # 4.17
> 
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>


Reported-and-tested-by: Stefan Raspl <raspl@linux.ibm.com>


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] perf kvm: Fix subcommands on s390
  2018-07-12 14:17 ` Stefan Raspl
@ 2018-07-16 20:43   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-07-16 20:43 UTC (permalink / raw)
  To: Stefan Raspl
  Cc: Thomas Richter, linux-kernel, linux-perf-users, brueckner,
	schwidefsky, heiko.carstens, stable

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 <raspl@linux.ibm.com>
> > Cc: <stable@vger.kernel.org> # 4.17

> > Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> > Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
 
> Reported-and-tested-by: Stefan Raspl <raspl@linux.ibm.com>

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

- Arnaldo

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [tip:perf/core] perf kvm: Fix subcommands on s390
  2018-07-12  7:09 [PATCH] perf kvm: Fix subcommands on s390 Thomas Richter
  2018-07-12  7:15 ` Christian Borntraeger
  2018-07-12 14:17 ` Stefan Raspl
@ 2018-07-25 20:44 ` tip-bot for Thomas Richter
  2 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Thomas Richter @ 2018-07-25 20:44 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: heiko.carstens, tglx, borntraeger, mingo, acme, schwidefsky,
	brueckner, tmricht, raspl, linux-kernel, hpa

Commit-ID:  8a95c8994509c55abf1e38c0cc037b1205725e21
Gitweb:     https://git.kernel.org/tip/8a95c8994509c55abf1e38c0cc037b1205725e21
Author:     Thomas Richter <tmricht@linux.ibm.com>
AuthorDate: Thu, 12 Jul 2018 09:09:36 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <raspl@linux.ibm.com>
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Tested-by: Stefan Raspl <raspl@linux.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: stable@vger.kernel.org
Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
Link: http://lkml.kernel.org/r/20180712070936.67547-1-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-25 20:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-12  7:09 [PATCH] perf kvm: Fix subcommands on s390 Thomas Richter
2018-07-12  7:15 ` Christian Borntraeger
2018-07-12 14:17 ` Stefan Raspl
2018-07-16 20:43   ` Arnaldo Carvalho de Melo
2018-07-25 20:44 ` [tip:perf/core] " tip-bot for Thomas Richter

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).