From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] add trace points in irqchip code Date: Tue, 07 Jul 2009 13:06:00 +0300 Message-ID: <4A531E08.9010302@redhat.com> References: <20090706131723.GA28046@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Gleb Natapov Return-path: Received: from mx2.redhat.com ([66.187.237.31]:52996 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754258AbZGGKDg (ORCPT ); Tue, 7 Jul 2009 06:03:36 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n67A3edj005581 for ; Tue, 7 Jul 2009 06:03:40 -0400 In-Reply-To: <20090706131723.GA28046@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 07/06/2009 04:17 PM, Gleb Natapov wrote: > Add tracepoint in msi/ioapic/pic set_irq() functions, > in IPI sending and in the point where IRQ is placed into > apic's IRR. > > Signed-off-by: Gleb Natapov > diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c > index 1d1bb75..e4bcbdd 100644 > --- a/arch/x86/kvm/i8259.c > +++ b/arch/x86/kvm/i8259.c > @@ -30,6 +30,7 @@ > #include "irq.h" > > #include > +#include "trace.h" > > static void pic_lock(struct kvm_pic *s) > __acquires(&s->lock) > @@ -190,6 +191,8 @@ int kvm_pic_set_irq(void *opaque, int irq, int level) > if (irq>= 0&& irq< PIC_NUM_PINS) { > ret = pic_set_irq1(&s->pics[irq>> 3], irq& 7, level); > pic_update_irq(s); > + trace_kvm_pic_set_irq(irq>> 3, irq& 7, s->pics[irq>> 3].elcr, > + s->pics[irq>> 3].imr, ret == 0); > It's better to send undecoded arguments (irq, s, ret) and do the shifting/masking/derefing in the TP_fast_assign. This is because argument preparation is always compiled inline and executed (so I understand; not sure) but TP_fast_assign is out-of-line and only executed if the tracepoint is enabled. > +TRACE_EVENT(kvm_pic_set_irq, > + TP_PROTO(__u8 chip, __u8 pin, __u8 elcr, __u8 imr, int coalesced), > + TP_ARGS(chip, pin, elcr, imr, coalesced), > + > + TP_STRUCT__entry( > + __field( __u8, chip ) > + __field( __u8, pin ) > + __field( __u8, elcr ) > + __field( __u8, imr ) > + __field( int, coalesced ) > + ), > bool is slightly more descriptive. > + > + TP_fast_assign( > + __entry->chip = chip; > + __entry->pin = pin; > + __entry->elcr = elcr; > + __entry->imr = imr; > + __entry->coalesced = coalesced; > + ), > + > + TP_printk("chip=%u pin=%u (%s%s)%s", > + __entry->chip, __entry->pin, > + (__entry->elcr& (1<< __entry->pin)) ? "level":"edge", > + (__entry->imr& (1<< __entry->pin)) ? "|masked":"", > + __entry->coalesced ? " (coalesced)" : "") > +); > kvm style is not to use equals signs. > + > + TP_printk("dst=%x vec=%u (%s|%s|%s|%s|%s)", > + __entry->dest_id, (u8)__entry->icr_low, > + __print_symbolic((__entry->icr_low>> 8& 0x7), > + kvm_deliver_mode), > + (__entry->icr_low& (1<<11)) ? "logical":"physical", > + (__entry->icr_low& (1<<14)) ? "assert":"de-assert", > + (__entry->icr_low& (1<<15)) ? "level":"edge", > Spaces around :. > + TP_STRUCT__entry( > + __field( __u32, apicid ) > + __field( __u8, dm ) > + __field( __u8, tm ) > + __field( __u8, vec ) > + __field( __u8, coalesced ) > + ), > bool. > + > +TRACE_EVENT(kvm_msi_set_irq, > + TP_PROTO(__u32 address, __u64 data), > + TP_ARGS(address, data), > + > + TP_STRUCT__entry( > + __field( __u32, address ) > Make this a u64 just in case. -- error compiling committee.c: too many arguments to function