Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1216341imm; Wed, 25 Jul 2018 13:46:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfyGvA4docmNEq0Sk64TkaNWpghR5EE2SnX3mNkoImm3oJclbuf7B/q3GlTIXHyoN4x7zmY X-Received: by 2002:a62:8a4f:: with SMTP id y76-v6mr23722449pfd.233.1532551561899; Wed, 25 Jul 2018 13:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532551561; cv=none; d=google.com; s=arc-20160816; b=mFUd0bicMAdN5wNlg9GwRY+05YcSrBVWITZFbsSIbRmBOLkuBL+X+wCrH+MAa/Nzal TZvC6lJFLejYlsO2nOUE1bQkZVx3XUupCuuKv8m+VXb+oWuBYgnDaAgDwcqO4HayRpij cWnRiw/NyY8IuSpgMVfU52LAewMEwgZgDwBEbGQcw16Ippv8lhlyaqcIwkcoaTMLBfIN WjmUMXuIysOxCvpdp91h4d6eie3bU7kuTa2p12haEyJ8/UXlPqsT5ugTZs1u1/anCPd1 XjoRSSo0cNpDP5jvGmo0WJUp/Ln/vLGELfhOmmThmrEfqNprl7acOPw3/CRurx4IbzNF nmeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=Mt0AVgg4kG76k8YndY5FpLID8RWo0mo74PWS+0O5KrU=; b=PVaTP2mjWCaJa2vh6RSfrX4Pu2bwRuooV5iM4jfh+8aOBC4rsMKV0hsqHGI3WHj2mh V43VEPW9lW/zQfGHKYjBona99HD6ovmuXxtWJFomJ1Kk7jiTegE30NVb/T8FWEUBYIW1 ZVPhddzX6rAvWfPgrA0CjOPDrOpwV8D7/pKO4BMwU/e6HcZSQgHF5acZd4kb9gXrtMc3 XIpSlbc/brwCE+pkL0jfctuFFVGfDWskvVuU2WTJeXSj+aqe2I/GSOEzcmtId80vwkkw qH55sheDY3i44+2F9ehycvubsmOXFpNK35ZIUM5ikF5QnOyFEFZUZi3SBDEU7eQ9zD0U yRRQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q74-v6si16168122pfq.32.2018.07.25.13.45.47; Wed, 25 Jul 2018 13:46:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731392AbeGYV5e (ORCPT + 99 others); Wed, 25 Jul 2018 17:57:34 -0400 Received: from terminus.zytor.com ([198.137.202.136]:59345 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730623AbeGYV5d (ORCPT ); Wed, 25 Jul 2018 17:57:33 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6PKi3Sr499198 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 25 Jul 2018 13:44:03 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6PKi33C499064; Wed, 25 Jul 2018 13:44:03 -0700 Date: Wed, 25 Jul 2018 13:44:03 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Thomas Richter Message-ID: Cc: heiko.carstens@de.ibm.com, tglx@linutronix.de, borntraeger@de.ibm.com, mingo@kernel.org, acme@redhat.com, schwidefsky@de.ibm.com, brueckner@linux.ibm.com, tmricht@linux.ibm.com, raspl@linux.ibm.com, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, borntraeger@de.ibm.com, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, brueckner@linux.ibm.com, mingo@kernel.org, acme@redhat.com, tmricht@linux.ibm.com, raspl@linux.ibm.com, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20180712070936.67547-1-tmricht@linux.ibm.com> References: <20180712070936.67547-1-tmricht@linux.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf kvm: Fix subcommands on s390 Git-Commit-ID: 8a95c8994509c55abf1e38c0cc037b1205725e21 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-0.7 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_FUTURE_48_96 autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8a95c8994509c55abf1e38c0cc037b1205725e21 Gitweb: https://git.kernel.org/tip/8a95c8994509c55abf1e38c0cc037b1205725e21 Author: Thomas Richter AuthorDate: Thu, 12 Jul 2018 09:09:36 +0200 Committer: Arnaldo Carvalho de Melo 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 Signed-off-by: Thomas Richter Reviewed-by: Hendrik Brueckner Tested-by: Stefan Raspl Acked-by: Christian Borntraeger Cc: Heiko Carstens Cc: Martin Schwidefsky 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 --- 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