From patchwork Tue Aug 15 13:10:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 135699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:3f2:4152:657d with SMTP id x8csp716491vqo; Tue, 15 Aug 2023 15:01:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvZ2VfRAvefnOnHoDzUe6wMcAn/ldS5zkyJ6M2hT7KllBMT/Am0sbuvepo87nXylWb5lrD X-Received: by 2002:a05:6a00:1593:b0:687:2e26:9ca9 with SMTP id u19-20020a056a00159300b006872e269ca9mr51882pfk.11.1692136863903; Tue, 15 Aug 2023 15:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692136863; cv=none; d=google.com; s=arc-20160816; b=VCbGDC2qaS+Nr/0qS3Jo65jvQBEIb95+ByW42XwLfwn11+oi9Z3t54aQbV7OUm4AjT mIRcJ3ADz5HPt6t9ujypRrbRUFyGFUlPmfpMm2t0wcFi1uGqWNyZpTM+iGbGWGBDDLEy HjFppICibbcYTyw5IsRJseBJ4VSfB5FeaUcBvZG4pbQbKmZZD7yLEmw1trcXDqVyOxqw Bv/a7aEZ1FI4G/GXQMWbmnF3iKzAql8h6ZUDwphTt2H9bGYs3hZmXVgbIY16WEV7fe7e 4BIbbN8gUuZvnKooJd6rblAMszCYDVk0dh9OlNcfJYo1BW8SdT9i8MLG3G8tuhkVxlfE Xjpg== 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=j+jtA1XjyxpNPhvQGq62gcGD2LcCsD//q+/9RYP0HAQ=; fh=Som+eq5y8klQ4eI2R4977nJLf7zh+/Hljgr+WElRPtQ=; b=lCE7UrCx5gAj80ltKA7kElJqG0qcuxFKEVtNVxO2YR1husQnYakQWIfa/EfQITKR4t X+Haq+6fCnp06T6llRQSwdsIv80TG6/49yeFZQ8s5bb1T2BOz2gbjfGvw5lXbV6zRoiQ LxyLStvjUPAgcmCl37G0n6Pl0U2X9cyWjlVfLur/29Oj19A/Q+RUd/MA5sRzkB6PtvaL +nhayuzAftAvYXyuZCsVpftD27t5k2cwzna+YQt2gg1xJwgzlHo62rUCqr+/kgNjJDjb Ol7GjD9AtKM8JM47o6ztMUY7VZibN/G6cp2SPMW3PWN2KYv2sRXIK2Fgao2K6HUEEJk2 eKAw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fb32-20020a056a002da000b006872f156f0dsi10326758pfb.89.2023.08.15.15.00.50; Tue, 15 Aug 2023 15:01:03 -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 S237398AbjHONMn (ORCPT + 99 others); Tue, 15 Aug 2023 09:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237442AbjHONMd (ORCPT ); Tue, 15 Aug 2023 09:12:33 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 785C610C0 for ; Tue, 15 Aug 2023 06:12:30 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RQBV41Wl6zrS48; Tue, 15 Aug 2023 21:11:08 +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.31; Tue, 15 Aug 2023 21:12:27 +0800 From: Yicong Yang To: , , CC: , , , , , Subject: [PATCH v2 RESEND] drivers/perf: hisi: Schedule perf session according to locality Date: Tue, 15 Aug 2023 21:10:10 +0800 Message-ID: <20230815131010.2147-1-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774306338706748120 X-GMAIL-MSGID: 1774334104351574006 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;