From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yang, Sheng" Subject: [PATCH 1/2][REPOST] KVM: trace: Add event mask support. Date: Wed, 25 Jun 2008 16:38:51 +0800 Message-ID: <200806251638.51804.sheng.yang@intel.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_bQgYIzvX9Z0j9Ep" To: kvm@vger.kernel.org Return-path: Received: from mga11.intel.com ([192.55.52.93]:55369 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085AbYFYIib (ORCPT ); Wed, 25 Jun 2008 04:38:31 -0400 Sender: kvm-owner@vger.kernel.org List-ID: --Boundary-00=_bQgYIzvX9Z0j9Ep Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline =46rom 5eb5fb6b40c45b1c140f46b00f5de9f73fc0bab6 Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Wed, 25 Jun 2008 16:37:31 +0800 Subject: [PATCH] KVM: trace: Add event mask support. Allow user space application to specify one or morefilter masks to limit the events being captured via it. Signed-off-by: Feng (Eric) Liu Signed-off-by: Sheng Yang =2D-- include/linux/kvm.h | 7 +++++++ virt/kvm/kvm_trace.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 0ea064c..f1d3d9e 100644 =2D-- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -18,6 +18,9 @@ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ + __u16 cat_mask; /* the tracing categories are enabled */ + __u16 pad1[3]; + __u64 act_bitmap[16]; /* the actions are enabled for each category */ }; /* for KVM_CREATE_MEMORY_REGION */ @@ -292,6 +295,7 @@ struct kvm_s390_interrupt { }; #define KVM_TRC_SHIFT 16 +#define KVM_TRC_CAT_NR_BITS 12 /* * kvm trace categories */ @@ -305,6 +309,9 @@ struct kvm_s390_interrupt { #define KVM_TRC_VMEXIT (KVM_TRC_ENTRYEXIT + 0x02) #define KVM_TRC_PAGE_FAULT (KVM_TRC_HANDLER + 0x01) +#define KVM_TRC_CAT(evt) (((evt) >> KVM_TRC_SHIFT) & 0x0fff) +#define KVM_TRC_ACT(evt) ((evt) & (~0u >> KVM_TRC_SHIFT)) + #define KVM_TRC_HEAD_SIZE 12 #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 diff --git a/virt/kvm/kvm_trace.c b/virt/kvm/kvm_trace.c index 58141f3..179e11f 100644 =2D-- a/virt/kvm/kvm_trace.c +++ b/virt/kvm/kvm_trace.c @@ -26,6 +26,8 @@ struct kvm_trace { int trace_state; + u16 cat_mask; + u64 act_bitmap[16]; struct rchan *rchan; struct dentry *lost_file; atomic_t lost_records; @@ -39,6 +41,23 @@ struct kvm_trace_probe { marker_probe_func *probe_func; }; +static inline int check_event_mask(struct kvm_trace *kt, u32 event) +{ + unsigned long category; + int i; + + category =3D KVM_TRC_CAT(event); + if (!(category & kt->cat_mask)) + return 1; + + i =3D find_first_bit(&category, KVM_TRC_CAT_NR_BITS); + + if (!test_bit(KVM_TRC_ACT(event), &kt->act_bitmap[i])) + return 1; + + return 0; +} + static inline int calc_rec_size(int cycle, int extra) { int rec_size =3D KVM_TRC_HEAD_SIZE; @@ -60,6 +79,9 @@ static void kvm_add_trace(void *probe_private, void=20 *call_data, return; rec.event =3D va_arg(*args, u32); + if (check_event_mask(kt, rec.event)) + return; + vcpu =3D va_arg(*args, struct kvm_vcpu *); rec.pid =3D current->tgid; rec.vcpu_id =3D vcpu->vcpu_id; @@ -175,6 +197,8 @@ static int do_kvm_trace_enable(struct kvm_user_trace_se= tup=20 *kuts) if (!kt->rchan) goto err; + kt->cat_mask =3D kuts->cat_mask; + memcpy(kt->act_bitmap, kuts->act_bitmap, sizeof(kuts->act_bitmap)); kvm_trace =3D kt; for (i =3D 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { =2D- 1.5.5 --Boundary-00=_bQgYIzvX9Z0j9Ep Content-Type: text/x-diff; charset="utf-8"; name="0001-KVM-trace-Add-event-mask-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-KVM-trace-Add-event-mask-support.patch" =46rom 5eb5fb6b40c45b1c140f46b00f5de9f73fc0bab6 Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Wed, 25 Jun 2008 16:37:31 +0800 Subject: [PATCH] KVM: trace: Add event mask support. Allow user space application to specify one or morefilter masks to limit the events being captured via it. Signed-off-by: Feng (Eric) Liu Signed-off-by: Sheng Yang =2D-- include/linux/kvm.h | 7 +++++++ virt/kvm/kvm_trace.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 0ea064c..f1d3d9e 100644 =2D-- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -18,6 +18,9 @@ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ + __u16 cat_mask; /* the tracing categories are enabled */ + __u16 pad1[3]; + __u64 act_bitmap[16]; /* the actions are enabled for each category */ }; =20 /* for KVM_CREATE_MEMORY_REGION */ @@ -292,6 +295,7 @@ struct kvm_s390_interrupt { }; =20 #define KVM_TRC_SHIFT 16 +#define KVM_TRC_CAT_NR_BITS 12 /* * kvm trace categories */ @@ -305,6 +309,9 @@ struct kvm_s390_interrupt { #define KVM_TRC_VMEXIT (KVM_TRC_ENTRYEXIT + 0x02) #define KVM_TRC_PAGE_FAULT (KVM_TRC_HANDLER + 0x01) =20 +#define KVM_TRC_CAT(evt) (((evt) >> KVM_TRC_SHIFT) & 0x0fff) +#define KVM_TRC_ACT(evt) ((evt) & (~0u >> KVM_TRC_SHIFT)) + #define KVM_TRC_HEAD_SIZE 12 #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 diff --git a/virt/kvm/kvm_trace.c b/virt/kvm/kvm_trace.c index 58141f3..179e11f 100644 =2D-- a/virt/kvm/kvm_trace.c +++ b/virt/kvm/kvm_trace.c @@ -26,6 +26,8 @@ =20 struct kvm_trace { int trace_state; + u16 cat_mask; + u64 act_bitmap[16]; struct rchan *rchan; struct dentry *lost_file; atomic_t lost_records; @@ -39,6 +41,23 @@ struct kvm_trace_probe { marker_probe_func *probe_func; }; =20 +static inline int check_event_mask(struct kvm_trace *kt, u32 event) +{ + unsigned long category; + int i; + + category =3D KVM_TRC_CAT(event); + if (!(category & kt->cat_mask)) + return 1; + + i =3D find_first_bit(&category, KVM_TRC_CAT_NR_BITS); + + if (!test_bit(KVM_TRC_ACT(event), &kt->act_bitmap[i])) + return 1; + + return 0; +} + static inline int calc_rec_size(int cycle, int extra) { int rec_size =3D KVM_TRC_HEAD_SIZE; @@ -60,6 +79,9 @@ static void kvm_add_trace(void *probe_private, void *call= _data, return; =20 rec.event =3D va_arg(*args, u32); + if (check_event_mask(kt, rec.event)) + return; + vcpu =3D va_arg(*args, struct kvm_vcpu *); rec.pid =3D current->tgid; rec.vcpu_id =3D vcpu->vcpu_id; @@ -175,6 +197,8 @@ static int do_kvm_trace_enable(struct kvm_user_trace_se= tup *kuts) if (!kt->rchan) goto err; =20 + kt->cat_mask =3D kuts->cat_mask; + memcpy(kt->act_bitmap, kuts->act_bitmap, sizeof(kuts->act_bitmap)); kvm_trace =3D kt; =20 for (i =3D 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { =2D-=20 1.5.5 --Boundary-00=_bQgYIzvX9Z0j9Ep--