Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp4669011rwb; Tue, 8 Aug 2023 11:49:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4V2y27yvLaKwcPVv6dwJmZA+EoRrsrFBLDNUAsf1aW8yezQXxuGkkPJE+BP+dGrgZntt/ X-Received: by 2002:a05:651c:94:b0:2b0:297c:cbdf with SMTP id 20-20020a05651c009400b002b0297ccbdfmr313362ljq.1.1691520586693; Tue, 08 Aug 2023 11:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691520586; cv=none; d=google.com; s=arc-20160816; b=LyZ8GRVgx1D9BS051bu6+x9u3PcWntwDxCqJYqgHYeSSt/uL/feITu0kYH7LQ6ewwa 01AdBY386RNaGTNVEg5N+msok0Aveen1fH7ofG8d6nCko1cCASduFe7Zdskovf0g4/cW 2Q68x341WJq6e5RsAijAGMStB2PFyeQ7QdYMQurIti38Ha9J1Qs/1EpeKvC6f5sFcWHi p3idCcVD/+fk4geHJij6wT9qr35NLYxqrwhkV2wWOeB5cNR4TPzxhYXhp1mwink8lxh7 CtVhiGUkvlG7qqkWRrgpmSXRUoo/UnQV2rkoBAsKuYa6momkMIejNsBhwyOxxYpuaEsN xrFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=N+PeMMRMSfBeckPtcUA8cZVkqVJOT2BqnxIgx32ebhI=; fh=Som+eq5y8klQ4eI2R4977nJLf7zh+/Hljgr+WElRPtQ=; b=rB/apyXvge5fVM40v6XEr8I1N/sj343g+kE328qJawWp7+c08jOhQo1aLZs+buKxQ5 v4T4aqeLerqKBCgC+tazXcVAVyCoDDJ7eFzed2yPuqo3gT2FB2X09MoZJ2r+v3VLmj7W 3c4BPVw2H/XJAJaRfxKerZu8PnnF6e6UZZD+BEzvWmhNp59WpIzXl7T87tfrMA3IdrDN 9oybTxo6pCO0Q9+7QYQD+clXxe7jg4gEPHVXA00LmX48CwMCYyT1Vmbz/VFQLoafFJCE RNags2hyXS1SfROq0BJOZLG+Kji320lfXGaPIFqnesSgYvChDShcyLG1bjJg6zdhFwfh clMg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g23-20020a170906c19700b00992a36ceca1si8456789ejz.35.2023.08.08.11.49.21; Tue, 08 Aug 2023 11:49:46 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235828AbjHHS0b (ORCPT + 99 others); Tue, 8 Aug 2023 14:26:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235361AbjHHS0J (ORCPT ); Tue, 8 Aug 2023 14:26:09 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7176B23373 for ; Tue, 8 Aug 2023 10:41:22 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RKtMX0KczzNmyf; Tue, 8 Aug 2023 20:50:32 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) 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.27; Tue, 8 Aug 2023 20:54:00 +0800 From: Yicong Yang To: , , CC: , , , , , Subject: [PATCH] drivers/perf: hisi: Schedule perf session according to locality Date: Tue, 8 Aug 2023 20:51:47 +0800 Message-ID: <20230808125147.2080-1-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS 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 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 --- drivers/perf/hisilicon/hisi_pcie_pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c index e10fc7cb9493..60ecf469782b 100644 --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c @@ -665,7 +665,7 @@ 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; + 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(cpu))); } @@ -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; -- 2.24.0