From mboxrd@z Thu Jan 1 00:00:00 1970 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 3E2EEC001DB for ; Tue, 15 Aug 2023 13:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237405AbjHONOv (ORCPT ); Tue, 15 Aug 2023 09:14:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237406AbjHONOp (ORCPT ); Tue, 15 Aug 2023 09:14:45 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8480F1999 for ; Tue, 15 Aug 2023 06:14:44 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RQBXf1NYRzrShH; Tue, 15 Aug 2023 21:13:22 +0800 (CST) Received: from [10.67.102.169] (10.67.102.169) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 15 Aug 2023 21:14:41 +0800 CC: , , , , , Subject: Re: [PATCH v2] drivers/perf: hisi: Schedule perf session according to locality To: , , References: <20230815130613.535-1-yangyicong@huawei.com> From: Yicong Yang Message-ID: <2eb98cd6-21a1-8e2c-ddf4-41dad5f2a2cb@huawei.com> Date: Tue, 15 Aug 2023 21:14:41 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <20230815130613.535-1-yangyicong@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.102.169] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Please ignore this due to the wrong format of the changelog. Has resend. Sorry for the noise. On 2023/8/15 21:06, Yicong Yang wrote: > From: Yicong Yang > > The PCIe PMUs locate on different NUMA node but currently we don't > consider it and likely stack all the sessions on the same CPU: > > [root@localhost tmp]# cat /sys/devices/hisi_pcie*/cpumask > 0 > 0 > 0 > 0 > 0 > 0 > > This can be optimize a bit to use a local CPU for the PMU. > > Signed-off-by: Yicong Yang > Change since v2: > - Make interrupt affinity consistent with CPU in online handler > Link: https://lore.kernel.org/all/20230808125147.2080-1-yangyicong@huawei.com/ > > --- > drivers/perf/hisilicon/hisi_pcie_pmu.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c > index e10fc7cb9493..5a00adb2de8c 100644 > --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c > +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c > @@ -665,8 +665,8 @@ static int hisi_pcie_pmu_online_cpu(unsigned int cpu, struct hlist_node *node) > struct hisi_pcie_pmu *pcie_pmu = hlist_entry_safe(node, struct hisi_pcie_pmu, node); > > if (pcie_pmu->on_cpu == -1) { > - pcie_pmu->on_cpu = cpu; > - WARN_ON(irq_set_affinity(pcie_pmu->irq, cpumask_of(cpu))); > + pcie_pmu->on_cpu = cpumask_local_spread(0, dev_to_node(&pcie_pmu->pdev->dev)); > + WARN_ON(irq_set_affinity(pcie_pmu->irq, cpumask_of(pcie_pmu->on_cpu))); > } > > return 0; > @@ -676,14 +676,23 @@ static int hisi_pcie_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node) > { > struct hisi_pcie_pmu *pcie_pmu = hlist_entry_safe(node, struct hisi_pcie_pmu, node); > unsigned int target; > + cpumask_t mask; > + int numa_node; > > /* Nothing to do if this CPU doesn't own the PMU */ > if (pcie_pmu->on_cpu != cpu) > return 0; > > pcie_pmu->on_cpu = -1; > - /* Choose a new CPU from all online cpus. */ > - target = cpumask_any_but(cpu_online_mask, cpu); > + > + /* Choose a local CPU from all online cpus. */ > + numa_node = dev_to_node(&pcie_pmu->pdev->dev); > + if (cpumask_and(&mask, cpumask_of_node(numa_node), cpu_online_mask) && > + cpumask_andnot(&mask, &mask, cpumask_of(cpu))) > + target = cpumask_any(&mask); > + else > + target = cpumask_any_but(cpu_online_mask, cpu); > + > if (target >= nr_cpu_ids) { > pci_err(pcie_pmu->pdev, "There is no CPU to set\n"); > return 0; >