From: Michael Ellerman <mpe@ellerman.id.au> To: qemu-devel@nongnu.org Cc: <kvm@vger.kernel.org>, alfs@linux.vnet.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, jan.kiszka@siemens.com, pbonzini@redhat.com, aik@ozlabs.ru Subject: [PATCH 3/6] kvm_stat: Rework platform detection Date: Tue, 17 Jun 2014 17:54:32 +1000 [thread overview] Message-ID: <1402991675-24905-3-git-send-email-mpe@ellerman.id.au> (raw) In-Reply-To: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> The current platform detection is a little bit messy. We look for lines in /proc/cpuinfo starting with 'flags' OR 'vendor-id', and scan both for values we know will only occur in one or the other. We also keep scanning once we've found a value, which could be a feature, but isn't in this case. We'd also like to add another platform, powerpc, which will just make it worse. So clean it up in preparation. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- scripts/kvm/kvm_stat | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index fe2eae3..98c81a8 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -169,27 +169,41 @@ generic_exit_reasons = { 23: 'EPR', } -vendor_exit_reasons = { +x86_exit_reasons = { 'vmx': vmx_exit_reasons, 'svm': svm_exit_reasons, - 'IBM/S390': generic_exit_reasons, } -syscall_numbers = { - 'IBM/S390': 331, -} - -sc_perf_evt_open = 298 - +sc_perf_evt_open = None exit_reasons = None -for line in file('/proc/cpuinfo').readlines(): - if line.startswith('flags') or line.startswith('vendor_id'): - for flag in line.split(): - if flag in vendor_exit_reasons: - exit_reasons = vendor_exit_reasons[flag] - if flag in syscall_numbers: - sc_perf_evt_open = syscall_numbers[flag] +def x86_init(flag): + globals().update({ + 'sc_perf_evt_open' : 298, + 'exit_reasons' : x86_exit_reasons[flag], + }) + +def s390_init(): + globals().update({ + 'sc_perf_evt_open' : 331, + 'exit_reasons' : generic_exit_reasons, + }) + +def detect_platform(): + for line in file('/proc/cpuinfo').readlines(): + if line.startswith('flags'): + for flag in line.split(): + if flag in x86_exit_reasons: + x86_init(flag) + return + elif line.startswith('vendor_id'): + for flag in line.split(): + if flag == 'IBM/S390': + s390_init() + return + +detect_platform() + filters = { 'kvm_exit': ('exit_reason', exit_reasons) } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Michael Ellerman <mpe@ellerman.id.au> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, aik@ozlabs.ru, jan.kiszka@siemens.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, alfs@linux.vnet.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 3/6] kvm_stat: Rework platform detection Date: Tue, 17 Jun 2014 17:54:32 +1000 [thread overview] Message-ID: <1402991675-24905-3-git-send-email-mpe@ellerman.id.au> (raw) In-Reply-To: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> The current platform detection is a little bit messy. We look for lines in /proc/cpuinfo starting with 'flags' OR 'vendor-id', and scan both for values we know will only occur in one or the other. We also keep scanning once we've found a value, which could be a feature, but isn't in this case. We'd also like to add another platform, powerpc, which will just make it worse. So clean it up in preparation. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- scripts/kvm/kvm_stat | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index fe2eae3..98c81a8 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -169,27 +169,41 @@ generic_exit_reasons = { 23: 'EPR', } -vendor_exit_reasons = { +x86_exit_reasons = { 'vmx': vmx_exit_reasons, 'svm': svm_exit_reasons, - 'IBM/S390': generic_exit_reasons, } -syscall_numbers = { - 'IBM/S390': 331, -} - -sc_perf_evt_open = 298 - +sc_perf_evt_open = None exit_reasons = None -for line in file('/proc/cpuinfo').readlines(): - if line.startswith('flags') or line.startswith('vendor_id'): - for flag in line.split(): - if flag in vendor_exit_reasons: - exit_reasons = vendor_exit_reasons[flag] - if flag in syscall_numbers: - sc_perf_evt_open = syscall_numbers[flag] +def x86_init(flag): + globals().update({ + 'sc_perf_evt_open' : 298, + 'exit_reasons' : x86_exit_reasons[flag], + }) + +def s390_init(): + globals().update({ + 'sc_perf_evt_open' : 331, + 'exit_reasons' : generic_exit_reasons, + }) + +def detect_platform(): + for line in file('/proc/cpuinfo').readlines(): + if line.startswith('flags'): + for flag in line.split(): + if flag in x86_exit_reasons: + x86_init(flag) + return + elif line.startswith('vendor_id'): + for flag in line.split(): + if flag == 'IBM/S390': + s390_init() + return + +detect_platform() + filters = { 'kvm_exit': ('exit_reason', exit_reasons) } -- 1.9.1
next prev parent reply other threads:[~2014-06-17 7:54 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-17 7:54 [PATCH 1/6] kvm_stat: Only consider online cpus Michael Ellerman 2014-06-17 7:54 ` [Qemu-devel] " Michael Ellerman 2014-06-17 7:54 ` [PATCH 2/6] kvm_stat: Fix the non-x86 exit reasons Michael Ellerman 2014-06-17 7:54 ` [Qemu-devel] " Michael Ellerman 2014-10-31 15:49 ` Paolo Bonzini 2014-10-31 15:49 ` [Qemu-devel] " Paolo Bonzini 2014-06-17 7:54 ` Michael Ellerman [this message] 2014-06-17 7:54 ` [Qemu-devel] [PATCH 3/6] kvm_stat: Rework platform detection Michael Ellerman 2014-06-17 7:54 ` [PATCH 4/6] kvm_stat: Fix tracepoint filter definition for s390 Michael Ellerman 2014-06-17 7:54 ` [Qemu-devel] " Michael Ellerman 2014-06-17 7:54 ` [PATCH 5/6] kvm_stat: Abstract ioctl numbers Michael Ellerman 2014-06-17 7:54 ` [Qemu-devel] " Michael Ellerman 2014-06-17 7:54 ` [PATCH 6/6] kvm_stat: Add powerpc support Michael Ellerman 2014-06-17 7:54 ` [Qemu-devel] " Michael Ellerman 2014-06-17 8:27 ` Alexander Graf 2014-06-17 8:27 ` [Qemu-devel] " Alexander Graf 2014-06-18 0:50 ` Michael Ellerman 2014-06-18 0:50 ` [Qemu-devel] " Michael Ellerman 2014-06-18 0:59 ` Alexander Graf 2014-06-18 0:59 ` [Qemu-devel] " Alexander Graf 2014-06-18 1:37 ` Michael Ellerman 2014-06-18 1:37 ` [Qemu-devel] " Michael Ellerman 2014-06-18 1:54 ` Alexander Graf 2014-06-18 1:54 ` [Qemu-devel] " Alexander Graf 2014-10-31 15:36 ` Paolo Bonzini 2014-10-31 15:36 ` [Qemu-devel] " Paolo Bonzini 2014-11-03 0:40 ` Michael Ellerman 2014-11-03 0:40 ` [Qemu-devel] " Michael Ellerman
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=1402991675-24905-3-git-send-email-mpe@ellerman.id.au \ --to=mpe@ellerman.id.au \ --cc=agraf@suse.de \ --cc=aik@ozlabs.ru \ --cc=alfs@linux.vnet.ibm.com \ --cc=jan.kiszka@siemens.com \ --cc=jfrei@linux.vnet.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.