lkml.org 
[lkml]   [2010]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf & kvm: Clean up some of the guest profiling callback API details
    Commit-ID:  dcf46b9443ad48a227a61713adea001228925adf
    Gitweb: http://git.kernel.org/tip/dcf46b9443ad48a227a61713adea001228925adf
    Author: Zhang, Yanmin <yanmin_zhang@linux.intel.com>
    AuthorDate: Tue, 20 Apr 2010 10:13:58 +0800
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Tue, 20 Apr 2010 08:08:28 +0200

    perf & kvm: Clean up some of the guest profiling callback API details

    Fix some build bug and programming style issues:

    - use valid C
    - fix up various style details

    Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com>
    Cc: Avi Kivity <avi@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Sheng Yang <sheng@linux.intel.com>
    Cc: Marcelo Tosatti <mtosatti@redhat.com>
    Cc: oerg Roedel <joro@8bytes.org>
    Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
    Cc: Gleb Natapov <gleb@redhat.com>
    Cc: Zachary Amsden <zamsden@redhat.com>
    Cc: zhiteng.huang@intel.com
    Cc: tim.c.chen@intel.com
    Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
    LKML-Reference: <1271729638.2078.624.camel@ymzhang.sh.intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/cpu/perf_event.c | 20 ++++++++++++++------
    arch/x86/kvm/x86.c | 4 ++++
    include/linux/perf_event.h | 10 ++++------
    3 files changed, 22 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index 2ea78ab..7de7061 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1752,23 +1752,31 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski
    unsigned long perf_instruction_pointer(struct pt_regs *regs)
    {
    unsigned long ip;
    +
    if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
    ip = perf_guest_cbs->get_guest_ip();
    else
    ip = instruction_pointer(regs);
    +
    return ip;
    }

    unsigned long perf_misc_flags(struct pt_regs *regs)
    {
    int misc = 0;
    +
    if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
    - misc |= perf_guest_cbs->is_user_mode() ?
    - PERF_RECORD_MISC_GUEST_USER :
    - PERF_RECORD_MISC_GUEST_KERNEL;
    - } else
    - misc |= user_mode(regs) ? PERF_RECORD_MISC_USER :
    - PERF_RECORD_MISC_KERNEL;
    + if (perf_guest_cbs->is_user_mode())
    + misc |= PERF_RECORD_MISC_GUEST_USER;
    + else
    + misc |= PERF_RECORD_MISC_GUEST_KERNEL;
    + } else {
    + if (user_mode(regs))
    + misc |= PERF_RECORD_MISC_USER;
    + else
    + misc |= PERF_RECORD_MISC_KERNEL;
    + }
    +
    if (regs->flags & PERF_EFLAGS_EXACT)
    misc |= PERF_RECORD_MISC_EXACT;

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index c3a33b2..21b9b6a 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -3776,16 +3776,20 @@ static int kvm_is_in_guest(void)
    static int kvm_is_user_mode(void)
    {
    int user_mode = 3;
    +
    if (percpu_read(current_vcpu))
    user_mode = kvm_x86_ops->get_cpl(percpu_read(current_vcpu));
    +
    return user_mode != 0;
    }

    static unsigned long kvm_get_guest_ip(void)
    {
    unsigned long ip = 0;
    +
    if (percpu_read(current_vcpu))
    ip = kvm_rip_read(percpu_read(current_vcpu));
    +
    return ip;
    }

    diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
    index 24de5f1..ace31fb 100644
    --- a/include/linux/perf_event.h
    +++ b/include/linux/perf_event.h
    @@ -941,10 +941,8 @@ static inline void perf_event_mmap(struct vm_area_struct *vma)
    }

    extern struct perf_guest_info_callbacks *perf_guest_cbs;
    -extern int perf_register_guest_info_callbacks(
    - struct perf_guest_info_callbacks *);
    -extern int perf_unregister_guest_info_callbacks(
    - struct perf_guest_info_callbacks *);
    +extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
    +extern int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);

    extern void perf_event_comm(struct task_struct *tsk);
    extern void perf_event_fork(struct task_struct *tsk);
    @@ -1016,9 +1014,9 @@ static inline void
    perf_bp_event(struct perf_event *event, void *data) { }

    static inline int perf_register_guest_info_callbacks
    -(struct perf_guest_info_callbacks *) {return 0; }
    +(struct perf_guest_info_callbacks *callbacks) { return 0; }
    static inline int perf_unregister_guest_info_callbacks
    -(struct perf_guest_info_callbacks *) {return 0; }
    +(struct perf_guest_info_callbacks *callbacks) { return 0; }

    static inline void perf_event_mmap(struct vm_area_struct *vma) { }
    static inline void perf_event_comm(struct task_struct *tsk) { }

    \
     
     \ /
      Last update: 2010-04-20 19:57    [W:0.029 / U:0.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site