lkml.org 
[lkml]   [2014]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V5 13/16] perf, x86: re-organize code that implicitly enables LBR/PEBS
    Date
    From: Kan Liang <kan.liang@intel.com>

    make later patch more readable, no logic change.

    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
    ---
    arch/x86/kernel/cpu/perf_event.c | 59 ++++++++++++++++++++--------------------
    1 file changed, 29 insertions(+), 30 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index 0a71f04..418e953 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -393,36 +393,35 @@ int x86_pmu_hw_config(struct perf_event *event)

    if (event->attr.precise_ip > precise)
    return -EOPNOTSUPP;
    - /*
    - * check that PEBS LBR correction does not conflict with
    - * whatever the user is asking with attr->branch_sample_type
    - */
    - if (event->attr.precise_ip > 1 &&
    - x86_pmu.intel_cap.pebs_format < 2) {
    - u64 *br_type = &event->attr.branch_sample_type;
    -
    - if (has_branch_stack(event)) {
    - if (!precise_br_compat(event))
    - return -EOPNOTSUPP;
    -
    - /* branch_sample_type is compatible */
    -
    - } else {
    - /*
    - * user did not specify branch_sample_type
    - *
    - * For PEBS fixups, we capture all
    - * the branches at the priv level of the
    - * event.
    - */
    - *br_type = PERF_SAMPLE_BRANCH_ANY;
    -
    - if (!event->attr.exclude_user)
    - *br_type |= PERF_SAMPLE_BRANCH_USER;
    -
    - if (!event->attr.exclude_kernel)
    - *br_type |= PERF_SAMPLE_BRANCH_KERNEL;
    - }
    + }
    + /*
    + * check that PEBS LBR correction does not conflict with
    + * whatever the user is asking with attr->branch_sample_type
    + */
    + if (event->attr.precise_ip > 1 && x86_pmu.intel_cap.pebs_format < 2) {
    + u64 *br_type = &event->attr.branch_sample_type;
    +
    + if (has_branch_stack(event)) {
    + if (!precise_br_compat(event))
    + return -EOPNOTSUPP;
    +
    + /* branch_sample_type is compatible */
    +
    + } else {
    + /*
    + * user did not specify branch_sample_type
    + *
    + * For PEBS fixups, we capture all
    + * the branches at the priv level of the
    + * event.
    + */
    + *br_type = PERF_SAMPLE_BRANCH_ANY;
    +
    + if (!event->attr.exclude_user)
    + *br_type |= PERF_SAMPLE_BRANCH_USER;
    +
    + if (!event->attr.exclude_kernel)
    + *br_type |= PERF_SAMPLE_BRANCH_KERNEL;
    }
    }

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-09-10 16:41    [W:4.168 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site