Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp7313981rwr; Wed, 10 May 2023 06:50:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YgXjkuaPcyF67IEp8VbEb8vyYq2logYw1waN4YlkBjUqSGu2va26EwqWU8B4M39mVnO6T X-Received: by 2002:a17:902:c412:b0:1ab:25a6:a54b with SMTP id k18-20020a170902c41200b001ab25a6a54bmr23820962plk.4.1683726612277; Wed, 10 May 2023 06:50:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683726612; cv=none; d=google.com; s=arc-20160816; b=L5BqG7f9Gb2+MqOXp5ZqwmjTIPmDr/vlyRFLFXvHmKXP7h/Jmf8Eo+xhyHErxzMpCA GTVFHna5M4oQZzRKQdLz3FsU4ZdFJAtE4HjCxIFdTw0jxKlM8ISFNMHs1lMuzc0zrLA0 P56oxGXGnpSwGGr82SGof0hMjSyTa0F7ifB/vC5Xf/S8QVmaUpodoKcxLgLr+3lB3eJD 0r21/JuelXHD4ieaGWH81MP49zIwpiTtheZcTpXFsFNuLhI2ggwh5tsL12523ykLFa9Y qgKfoaWLPOdJtUBakE+SzOi+eMfs21nDP6OAiA6kd5jZteNa79M65KzvfFyIG8lgj9Ip JA6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=knVNVjRUBByN5+Lhgn1P4/ETOz0nSMABsMXAadKItbE=; b=awXytyF8nPjON49IgZWJO1STg9f06Cuc5gXxA58fVUsfsYR44p0X80sUmBbVhVMosG S30q3+K3KWYt/BtTlczNx8M5Q62B3jyH7wSczF7LILo4GMy9Dzmbciqn7+EVE96G/l8W +cTYYGmlT00tlo+74w/bqI6/zvJ/nCYPL81c/vyPnZq1aVSstqabWn5iYd+qGjCZxd6D hu1rfFfGxYMbrMo/ZBeWKQr3raZkNR8DycaHvlPwQ69D0zw8urtfamnyJVbo0Ml9XA5b cpVaQcGeY9rEwBPTubn1/dj2rvbZf5grFXCTUm0SeOo66IAIGtmTwl7P3Qt2CKi7vaJE Hfeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=i06PJe7g; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a17090301c100b0019a59c52fd3si2460546plh.508.2023.05.10.06.50.00; Wed, 10 May 2023 06:50:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=i06PJe7g; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237152AbjEJNdz (ORCPT + 99 others); Wed, 10 May 2023 09:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237085AbjEJNdp (ORCPT ); Wed, 10 May 2023 09:33:45 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E59A6A48; Wed, 10 May 2023 06:33:43 -0700 (PDT) Date: Wed, 10 May 2023 13:33:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1683725622; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=knVNVjRUBByN5+Lhgn1P4/ETOz0nSMABsMXAadKItbE=; b=i06PJe7g4X/Nkbg+9+hHXanESzdIg/WUkLPl/QnqLIYvIIa9Z1qrLeYKVF0DJlMcGJ7xAw JRO+IBgQU6rT7Vk+hVoX1mygksRrAT4iAAx9yPxE/BA5jtRu2e6ts3MIsrcPMhI56xPKfE b1gWOH/N4CTiXFaInDfGpJBL+2hvtd1B5Z9yqUNnV4eHX1fn2GoZRginlTieKZ7JsX4X0T 3viqRFUg7/quBMNiqRmysZGQVJnQ2BnfMRuJ+5AlP+rsb00Yn74cNtBs3wPsQH6vTIkv9/ pmnp8lJ4l4DqVVnyYKe36fr9SlgDn7jfAb6aOdAHJ6YTB4PZfBtjCfq0xVvUIg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683725622; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=knVNVjRUBByN5+Lhgn1P4/ETOz0nSMABsMXAadKItbE=; b=X90AkS6bNiCIHgf9S7GRdNNomAr8nPoYljmnWUI1jxo4qnJhL/IL+O4tKNXvBxHGr/sumH rqc77I/15egbOkAw== From: "tip-bot2 for Ravi Bangoria" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/ibs: Fix interface via core pmu events Cc: Stephane Eranian , Ravi Bangoria , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230504110003.2548-3-ravi.bangoria@amd.com> References: <20230504110003.2548-3-ravi.bangoria@amd.com> MIME-Version: 1.0 Message-ID: <168372562174.404.9638595530517340082.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 2fad201fe38ff9a692acedb1990ece2c52a29f95 Gitweb: https://git.kernel.org/tip/2fad201fe38ff9a692acedb1990ece2c52a29f95 Author: Ravi Bangoria AuthorDate: Thu, 04 May 2023 16:30:01 +05:30 Committer: Peter Zijlstra CommitterDate: Mon, 08 May 2023 10:58:30 +02:00 perf/ibs: Fix interface via core pmu events Although, IBS pmus can be invoked via their own interface, indirect IBS invocation via core pmu events is also supported with fixed set of events: cpu-cycles:p, r076:p (same as cpu-cycles:p) and r0C1:p (micro-ops) for user convenience. This indirect IBS invocation is broken since commit 66d258c5b048 ("perf/core: Optimize perf_init_event()"), which added RAW pmu under 'pmu_idr' list and thus if event_init() fails with RAW pmu, it started returning error instead of trying other pmus. Forward precise events from core pmu to IBS by overwriting 'type' and 'config' in the kernel copy of perf_event_attr. Overwriting will cause perf_init_event() to retry with updated 'type' and 'config', which will automatically forward event to IBS pmu. Without patch: $ sudo ./perf record -C 0 -e r076:p -- sleep 1 Error: The r076:p event is not supported. With patch: $ sudo ./perf record -C 0 -e r076:p -- sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.341 MB perf.data (37 samples) ] Fixes: 66d258c5b048 ("perf/core: Optimize perf_init_event()") Reported-by: Stephane Eranian Signed-off-by: Ravi Bangoria Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20230504110003.2548-3-ravi.bangoria@amd.com --- arch/x86/events/amd/core.c | 2 +- arch/x86/events/amd/ibs.c | 53 ++++++++++++++---------------- arch/x86/include/asm/perf_event.h | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c index bccea57..abadd5f 100644 --- a/arch/x86/events/amd/core.c +++ b/arch/x86/events/amd/core.c @@ -374,7 +374,7 @@ static int amd_pmu_hw_config(struct perf_event *event) /* pass precise event sampling to ibs: */ if (event->attr.precise_ip && get_ibs_caps()) - return -ENOENT; + return forward_event_to_ibs(event); if (has_branch_stack(event) && !x86_pmu.lbr_nr) return -EOPNOTSUPP; diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c index 6458295..3710148 100644 --- a/arch/x86/events/amd/ibs.c +++ b/arch/x86/events/amd/ibs.c @@ -190,7 +190,7 @@ static struct perf_ibs *get_ibs_pmu(int type) } /* - * Use IBS for precise event sampling: + * core pmu config -> IBS config * * perf record -a -e cpu-cycles:p ... # use ibs op counting cycle count * perf record -a -e r076:p ... # same as -e cpu-cycles:p @@ -199,25 +199,9 @@ static struct perf_ibs *get_ibs_pmu(int type) * IbsOpCntCtl (bit 19) of IBS Execution Control Register (IbsOpCtl, * MSRC001_1033) is used to select either cycle or micro-ops counting * mode. - * - * The rip of IBS samples has skid 0. Thus, IBS supports precise - * levels 1 and 2 and the PERF_EFLAGS_EXACT is set. In rare cases the - * rip is invalid when IBS was not able to record the rip correctly. - * We clear PERF_EFLAGS_EXACT and take the rip from pt_regs then. - * */ -static int perf_ibs_precise_event(struct perf_event *event, u64 *config) +static int core_pmu_ibs_config(struct perf_event *event, u64 *config) { - switch (event->attr.precise_ip) { - case 0: - return -ENOENT; - case 1: - case 2: - break; - default: - return -EOPNOTSUPP; - } - switch (event->attr.type) { case PERF_TYPE_HARDWARE: switch (event->attr.config) { @@ -243,22 +227,37 @@ static int perf_ibs_precise_event(struct perf_event *event, u64 *config) return -EOPNOTSUPP; } +/* + * The rip of IBS samples has skid 0. Thus, IBS supports precise + * levels 1 and 2 and the PERF_EFLAGS_EXACT is set. In rare cases the + * rip is invalid when IBS was not able to record the rip correctly. + * We clear PERF_EFLAGS_EXACT and take the rip from pt_regs then. + */ +int forward_event_to_ibs(struct perf_event *event) +{ + u64 config = 0; + + if (!event->attr.precise_ip || event->attr.precise_ip > 2) + return -EOPNOTSUPP; + + if (!core_pmu_ibs_config(event, &config)) { + event->attr.type = perf_ibs_op.pmu.type; + event->attr.config = config; + } + return -ENOENT; +} + static int perf_ibs_init(struct perf_event *event) { struct hw_perf_event *hwc = &event->hw; struct perf_ibs *perf_ibs; u64 max_cnt, config; - int ret; perf_ibs = get_ibs_pmu(event->attr.type); - if (perf_ibs) { - config = event->attr.config; - } else { - perf_ibs = &perf_ibs_op; - ret = perf_ibs_precise_event(event, &config); - if (ret) - return ret; - } + if (!perf_ibs) + return -ENOENT; + + config = event->attr.config; if (event->pmu != &perf_ibs->pmu) return -ENOENT; diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 8fc15ed..fc86248 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -475,8 +475,10 @@ struct pebs_xmm { #ifdef CONFIG_X86_LOCAL_APIC extern u32 get_ibs_caps(void); +extern int forward_event_to_ibs(struct perf_event *event); #else static inline u32 get_ibs_caps(void) { return 0; } +static inline int forward_event_to_ibs(struct perf_event *event) { return -ENOENT; } #endif #ifdef CONFIG_PERF_EVENTS