mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Paolo Bonzini <pbonzini@redhat.com>, Jiri Olsa <jolsa@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
	linux-s390 <linux-s390@vger.kernel.org>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
	Alexander Yarygin <yarygin@linux.vnet.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [PATCH 10/11] perf: allow to use cpuinfo on s390
Date: Fri, 25 Apr 2014 11:12:32 +0200	[thread overview]
Message-ID: <1398417153-57347-11-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <1398417153-57347-1-git-send-email-borntraeger@de.ibm.com>

From: Alexander Yarygin <yarygin@linux.vnet.ibm.com>

This patch defines CPUINFO_PROC for s390 and implements get_cpuid().

Signed-off-by: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 tools/perf/arch/s390/Makefile      |  1 +
 tools/perf/arch/s390/util/header.c | 17 +++++++++++++++++
 tools/perf/perf.h                  |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 tools/perf/arch/s390/util/header.c

diff --git a/tools/perf/arch/s390/Makefile b/tools/perf/arch/s390/Makefile
index 15130b5..744e629 100644
--- a/tools/perf/arch/s390/Makefile
+++ b/tools/perf/arch/s390/Makefile
@@ -2,3 +2,4 @@ ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c
new file mode 100644
index 0000000..8b2ed46
--- /dev/null
+++ b/tools/perf/arch/s390/util/header.c
@@ -0,0 +1,17 @@
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../../util/header.h"
+
+int get_cpuid(char *buffer, size_t sz)
+{
+	const char *cpuid = "IBM/S390";
+
+	if (strlen(cpuid) + 1 > sz)
+		return -1;
+
+	strcpy(buffer, cpuid);
+	return 0;
+}
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 5c11eca..6f6772d 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -43,6 +43,7 @@
 #define mb()		asm volatile("bcr 15,0" ::: "memory")
 #define wmb()		asm volatile("bcr 15,0" ::: "memory")
 #define rmb()		asm volatile("bcr 15,0" ::: "memory")
+#define CPUINFO_PROC	"vendor_id"
 #endif
 
 #ifdef __sh__
-- 
1.8.4.2


  parent reply	other threads:[~2014-04-25  9:15 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-25  9:12 [PATCH/RFC 00/11] perf/s390/kvm: trace events, perf kvm stat Christian Borntraeger
2014-04-25  9:12 ` [PATCH 01/11] s390: add sie exit reasons tables Christian Borntraeger
2014-04-25  9:12 ` [PATCH 02/11] KVM: s390: Use trace tables from sie.h Christian Borntraeger
2014-04-25  9:12 ` [PATCH 03/11] KVM: s390: decoder of SIE intercepted instructions Christian Borntraeger
2014-04-25  9:12 ` [PATCH 04/11] KVM: s390: Use intercept_insn decoder in trace event Christian Borntraeger
2014-04-25  9:12 ` [PATCH 05/11] perf kvm: Intoduce HAVE_KVM_STAT_SUPPORT flag Christian Borntraeger
2014-04-25  9:12 ` [PATCH 06/11] perf kvm: simplify of exit reasons tables definitions Christian Borntraeger
2014-04-25  9:12 ` [PATCH 07/11] perf kvm: Refactoring of cpu_isa_config() Christian Borntraeger
2014-04-25  9:12 ` [PATCH 08/11] perf kvm: allow for variable string sizes Christian Borntraeger
2014-05-05 10:27   ` Christian Borntraeger
2014-05-05 15:29     ` David Ahern
2014-04-25  9:12 ` [PATCH 09/11] perf kvm: use defines of kvm events Christian Borntraeger
2014-05-05 13:33   ` Paolo Bonzini
2014-04-25  9:12 ` Christian Borntraeger [this message]
2014-04-25  9:12 ` [PATCH 11/11] perf kvm: add stat support on s390 Christian Borntraeger
2014-05-05 10:43   ` Christian Borntraeger
2014-05-02  9:16 ` [PATCH/RFC 00/11] perf/s390/kvm: trace events, perf kvm stat Jiri Olsa
2014-05-02 18:14   ` David Ahern
2014-05-05 10:36     ` Christian Borntraeger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398417153-57347-11-git-send-email-borntraeger@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=acme@redhat.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=jolsa@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=yarygin@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®