From nobody Wed Dec 17 20:59:17 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 047F4C41513 for ; Wed, 16 Aug 2023 09:50:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243578AbjHPJu2 (ORCPT ); Wed, 16 Aug 2023 05:50:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243586AbjHPJt4 (ORCPT ); Wed, 16 Aug 2023 05:49:56 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC1326B1 for ; Wed, 16 Aug 2023 02:49:51 -0700 (PDT) Received: from kwepemm600007.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RQjvv4NLwzFqbx; Wed, 16 Aug 2023 17:46:51 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemm600007.china.huawei.com (7.193.23.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 16 Aug 2023 17:49:48 +0800 From: Jijie Shao To: , , CC: , , , , , , Subject: [PATCH drivers/perf: hisi: 1/2] drivers/perf: hisi: hns3: default use hardware event 0 as group leader event. Date: Wed, 16 Aug 2023 17:46:18 +0800 Message-ID: <20230816094619.3563784-2-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230816094619.3563784-1-shaojijie@huawei.com> References: <20230816094619.3563784-1-shaojijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600007.china.huawei.com (7.193.23.208) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hao Chen For hns3 pmu events, we use command as below before: perf stat -g -e hns3_pmu_sicl_0/config=3D0x00105,global=3D1/ -e hns3_pmu_sicl_0/config=3D0x10105,global=3D1/ -I 1000 We want to use -g parameter to make 0x00105 event and 0x10105 event share a hardware event, but for kernel 6.2, 'commit 5f8f95673f68 ("perf evlist: Remove group option.")' remove -g parameter. So add this patch to set default related event idx as 0 to share the first hardware event. The new command shows as below: perf stat -e hns3_pmu_sicl_0/config=3D0x00105,global=3D1/ -e hns3_pmu_sicl_0/config=3D0x10105,global=3D1/ -I 1000 Fixes: 5f8f95673f68 ("perf evlist: Remove group option.") Signed-off-by: Hao Chen Signed-off-by: Jijie Shao --- drivers/perf/hisilicon/hns3_pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns= 3_pmu.c index e0457d84af6b..6a4d04cbae91 100644 --- a/drivers/perf/hisilicon/hns3_pmu.c +++ b/drivers/perf/hisilicon/hns3_pmu.c @@ -796,9 +796,11 @@ static int hns3_pmu_find_related_event_idx(struct hns3= _pmu *hns3_pmu, if (!hns3_pmu_cmp_event(sibling, event)) continue; =20 - /* Related events is used in group */ + /* Related events is used in group, else we use index 0 event as related= event */ if (sibling->group_leader =3D=3D event->group_leader) return idx; + else + return 0; } =20 /* No related event and all hardware events are used up */ --=20 2.30.0 From nobody Wed Dec 17 20:59:17 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6181C04FDF for ; Wed, 16 Aug 2023 09:50:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243572AbjHPJu0 (ORCPT ); Wed, 16 Aug 2023 05:50:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243587AbjHPJt5 (ORCPT ); Wed, 16 Aug 2023 05:49:57 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F0A226B7 for ; Wed, 16 Aug 2023 02:49:51 -0700 (PDT) Received: from kwepemm600007.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4RQjxn2QmCz1GDWZ; Wed, 16 Aug 2023 17:48:29 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemm600007.china.huawei.com (7.193.23.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 16 Aug 2023 17:49:49 +0800 From: Jijie Shao To: , , CC: , , , , , , Subject: [PATCH drivers/perf: hisi: 2/2] drivers/perf: hisi: fix set wrong filter mode for running events issue Date: Wed, 16 Aug 2023 17:46:19 +0800 Message-ID: <20230816094619.3563784-3-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230816094619.3563784-1-shaojijie@huawei.com> References: <20230816094619.3563784-1-shaojijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600007.china.huawei.com (7.193.23.208) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hao Chen hns3_pmu_select_filter_mode() includes a series of mode judgments such as global mode ,function mode, function-queue mode, port mode, port-tc mode. For a special scenario, command use parameter "bdf=3D0x3700,config=3D0x3, queue=3D0x0", it is expected to enter function-queue mode, but event of config 0x3 doesn't support func-queue mode, then it enter port-tc mode. it's not up to expectations. It shouldn't enter any modes but return -ENOENT. So, add judgement of bdf parameter to fix it. Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU") Signed-off-by: Hao Chen Signed-off-by: Jijie Shao --- drivers/perf/hisilicon/hns3_pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns= 3_pmu.c index 6a4d04cbae91..7f38a9e489d4 100644 --- a/drivers/perf/hisilicon/hns3_pmu.c +++ b/drivers/perf/hisilicon/hns3_pmu.c @@ -1000,12 +1000,13 @@ static bool hns3_pmu_is_enabled_port_tc_mode(struct perf_event *event, struct hns3_pmu_event_attr *pmu_event) { + u16 bdf =3D hns3_pmu_get_bdf(event); u8 tc_id =3D hns3_pmu_get_tc(event); =20 if (!(pmu_event->filter_support & HNS3_PMU_FILTER_SUPPORT_PORT_TC)) return false; =20 - return tc_id !=3D HNS3_PMU_FILTER_ALL_TC; + return (tc_id !=3D HNS3_PMU_FILTER_ALL_TC) && (!bdf); } =20 static bool --=20 2.30.0