From patchwork Fri May 26 21:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13257411 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6259AC77B73 for ; Fri, 26 May 2023 22:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O8IVqEvJ1M6Ot90wWpQfmf9ZATzI+T8nN+SUBjhS4dA=; b=PbkBBNYUwm1Qru hLNR9WBZsBoyNLCvx5BCeT002vdeYdhDamqVf4C5+dCPmG1fzhAMCHjLRcIJODOuAaAUwUFtFcWme pR478nn8T5VDgagfQCXFs3qYFHhyZE7f+6IiIqvkpZfs5kyg9FWm7BPdEeC7vdCe7YoYb96vQvXI3 yUE81EQxtrLxF70r1VzjQGSyKUlxY3xL6H0sJZTNMBArv9ogpPAWRDGX9Yp2mswmq31Exntr/5Zre WaUNt4l2bM+xMuXcajJo1HNFON57LuZ8jztZpffv9tnR/ClXcw48bPFLgs2iOIzsSkTrJMrhEntJF ZxXrBIvTgFeHL3MlpWww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2g7G-004AAT-1d; Fri, 26 May 2023 22:40:58 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2g6v-0049xi-0p for linux-arm-kernel@bombadil.infradead.org; Fri, 26 May 2023 22:40:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=oDuqTopdZxG/tZhzCpsOUxdl3hr1CdgTwDzFadwyJDk=; b=DCvbgtb0npx9CxTvzYFsqrcD4T alCW7ibeLIDc6/ju3nUUcqJqwkZjeWdWgVyMtYLjfyTjEvaIYyTiP1levzkFNHYLELOd/3eUY3702 UtHu1uulsXyxdATWVjHBwu4kkLxnkgvF/J5Cfewv8Uzdij4eMEVFQNp8BKSUVCEu44sPOUTmj7KAI 5qasfrJX4oVenVoIzV7xpWYK6B4didjqewiUyBGu41i4g9u1oL68QxJOqG4z9aAmy+HOEa5gnXrqL kQbMVzQjuuJAuc9JZWkAW0B2fu7q8QFrSlryvqto6GBIA+0B1vlHsdckCYo2+RBcgCcFj6/JnHCjV 3nqGRKpQ==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2fOd-007itQ-2g for linux-arm-kernel@lists.infradead.org; Fri, 26 May 2023 21:54:54 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bad475920a8so467915276.1 for ; Fri, 26 May 2023 14:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685138090; x=1687730090; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=oDuqTopdZxG/tZhzCpsOUxdl3hr1CdgTwDzFadwyJDk=; b=cN6RZVoMZUHPAfJbFWf90UK+o6yj3PXDnshig1R3nYUD5nhkJNhZaxPqedUgw2np0N mYqfYDOy7bbq5hWyQrqrSHs/B2URvS7pLYFNrGG1xp3OjLsunz0jHq3YCIlR+wUVQXlj nH0a5YpIyIi2C780sL6BfvqUiqhPvgURNdv/mtll4gchXtDsjiSWtzBuE1tmc+cgHvtt 2pB4015qwzMtpIYO/YQjdWLYV9+frAcY2QMgEwhb1nwbXpndDckitvLd7WyjcPXT97B4 EbBY2K32dtmSOIVh1SXS4d4yotcqKHb0IKvt9Lzr5QypBzni8xSrLtIEvlZRr7tyC0Kx E78g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685138090; x=1687730090; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oDuqTopdZxG/tZhzCpsOUxdl3hr1CdgTwDzFadwyJDk=; b=W+knLUaNmrpvygWIVuir6yjbcIfNkhKfwYuxBKqA59yyHAYuibtoIQ/Q2mTNPPggVE yDWVZE22Lblt8WvPUAWGkh5fpdxtS6i+U7lWLvqlEk+JsJ0HUIAXVFZPJfCmPjx6VhHT VpIDF9Vl3LIMjT9NYSo95yJFgZEaMJe20iURuVL3i3vuR3LNhlcCiiEDLuazfco7J8zT 2+p98CeymH0NGr45trc1fFy+IQOT1MJ5KfBag3Y8kjDeiA6qlPsNDPKONgpTzuCdIS93 uqQwW+c6viFiUIp/woI1PmTpk02MnR7gMNhw766hkpk/2Agetvs3HFuy7q0inOobCoIJ hFyA== X-Gm-Message-State: AC+VfDyldoWbqiCTs4Kc9raaz5li68cB6xE127dIGHmGZFEgTsX2eLV6 k2JL1ji9xzgYuJbeJQ73XI99/g9PLvxQ X-Google-Smtp-Source: ACHHUZ7yTJwEXmiBP+wP6WIVEGmqKho+m3IBcST1HGYx7R+IJnfGD81e4GtwX9lmjT/JG9knJiEXMk4GWHtj X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:dc81:0:b0:ba8:1e5f:8514 with SMTP id y123-20020a25dc81000000b00ba81e5f8514mr217351ybe.5.1685138090262; Fri, 26 May 2023 14:54:50 -0700 (PDT) Date: Fri, 26 May 2023 14:53:51 -0700 In-Reply-To: <20230526215410.2435674-1-irogers@google.com> Message-Id: <20230526215410.2435674-17-irogers@google.com> Mime-Version: 1.0 References: <20230526215410.2435674-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v4 16/35] perf pmu: Remove perf_pmu__hybrid_mounted From: Ian Rogers To: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_225452_078328_DF312826 X-CRM114-Status: GOOD ( 17.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org perf_pmu__hybrid_mounted is used to detect whether cpu_core or cpu_atom is mounted with a non-empty cpus file by pmu_lookup. Discussion [1] showed the empty cpus file check to be redundant and so pmu_lookup needn't have a call to perf_pmu__hybrid_mounted. Checking hybrid_mounted in pmu_is_uncore is redundant as the next cpumask read will fail returning false. Reduce the scope of perf_pmu__find_hybrid_pmu by making it static. [1] https://lore.kernel.org/lkml/20230524221831.1741381-17-irogers@google.com/ Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/pmu-hybrid.c | 15 +-------------- tools/perf/util/pmu-hybrid.h | 3 --- tools/perf/util/pmu.c | 13 +------------ 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/tools/perf/util/pmu-hybrid.c b/tools/perf/util/pmu-hybrid.c index bc4cb0738c35..7fe943dd3217 100644 --- a/tools/perf/util/pmu-hybrid.c +++ b/tools/perf/util/pmu-hybrid.c @@ -18,20 +18,7 @@ LIST_HEAD(perf_pmu__hybrid_pmus); -bool perf_pmu__hybrid_mounted(const char *name) -{ - int cpu; - char pmu_name[PATH_MAX]; - struct perf_pmu pmu = {.name = pmu_name}; - - if (strncmp(name, "cpu_", 4)) - return false; - - strlcpy(pmu_name, name, sizeof(pmu_name)); - return perf_pmu__scan_file(&pmu, "cpus", "%u", &cpu) > 0; -} - -struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name) +static struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name) { struct perf_pmu *pmu; diff --git a/tools/perf/util/pmu-hybrid.h b/tools/perf/util/pmu-hybrid.h index 206b94931531..8dbcae935020 100644 --- a/tools/perf/util/pmu-hybrid.h +++ b/tools/perf/util/pmu-hybrid.h @@ -13,9 +13,6 @@ extern struct list_head perf_pmu__hybrid_pmus; #define perf_pmu__for_each_hybrid_pmu(pmu) \ list_for_each_entry(pmu, &perf_pmu__hybrid_pmus, hybrid_list) -bool perf_pmu__hybrid_mounted(const char *name); - -struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name); bool perf_pmu__is_hybrid(const char *name); static inline int perf_pmu__hybrid_pmu_num(void) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index cd94abe7a87a..83c7eeb8abea 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -617,9 +617,6 @@ static bool pmu_is_uncore(int dirfd, const char *name) { int fd; - if (perf_pmu__hybrid_mounted(name)) - return false; - fd = perf_pmu__pathname_fd(dirfd, name, "cpumask", O_PATH); if (fd < 0) return false; @@ -907,15 +904,8 @@ static struct perf_pmu *pmu_lookup(int dirfd, const char *lookup_name) LIST_HEAD(aliases); __u32 type; char *name = pmu_find_real_name(lookup_name); - bool is_hybrid = perf_pmu__hybrid_mounted(name); char *alias_name; - /* - * Check pmu name for hybrid and the pmu may be invalid in sysfs - */ - if (!strncmp(name, "cpu_", 4) && !is_hybrid) - return NULL; - /* * The pmu data we store & need consists of the pmu * type value and format definitions. Load both right @@ -936,7 +926,6 @@ static struct perf_pmu *pmu_lookup(int dirfd, const char *lookup_name) pmu->cpus = pmu_cpumask(dirfd, name); pmu->name = strdup(name); - if (!pmu->name) goto err; @@ -967,7 +956,7 @@ static struct perf_pmu *pmu_lookup(int dirfd, const char *lookup_name) list_splice(&aliases, &pmu->aliases); list_add_tail(&pmu->list, &pmus); - if (is_hybrid) + if (!strcmp(name, "cpu_core") || !strcmp(name, "cpu_atom")) list_add_tail(&pmu->hybrid_list, &perf_pmu__hybrid_pmus); else INIT_LIST_HEAD(&pmu->hybrid_list);