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 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 544DDC7EE23 for ; Sat, 27 May 2023 07:41:23 +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=d0ZBh8L0OheK1n 10HIBs2pkJwBhg6SJUIvCw8cUPClyOsGLQ0+Dek+n67oOnlNcSRIMTXz38hlm9A0B/5HxdDFVxoBr TtFkm9wKCkNBY7N4vDdmtiMEBbDxpr6aH0Uc4nxEA/1kQnaeRlKMmVcMsnFsLrfI8lUdkMtJlD62N vvjvyU5hldWBfeWIhkKiGtnXA16BtVRTgUb/KQg+U9kieTBWJiTxjICcoqS1oipYGcDK5WTdAnUbD hB3KENrzgIOmBReYZ3NCATEC3YGTvQWNxHA5DgY+FBgTmUEoK3mjZeKgeCYv5fEMTXk5cvbCPCyto NY3JgMbiFd6/ptSLc1Ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2oXt-0059kP-1F; Sat, 27 May 2023 07:41:01 +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 1q2oXK-0059Xg-2J for linux-arm-kernel@bombadil.infradead.org; Sat, 27 May 2023 07:40:26 +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=U2LTt5Ws8yHS9qmIdMKfQXHmsC d5tOeEq0PO0sVrTXHZQdEqt+5OB+EAzS5vLfBkPww07zjNmeWkDw8p5D3cvNmhcN3+6wH7jfk61mm X9BMeReXu7azeaJ84E54+GrgyryyqxTvtP1vhxkF3xCbrh5FCnx4L+31RvWTOrmVSw4zfxCtom1Nv ilqGABMijLNNsSpb9yrMhnCAVUXka/T8RG40yWi5/NVSBvqpAIaCtrRQn0Q69eRA8Prpqj8V3RJOF bbUTAsKJHVkurnCYaygSUUL+wi72zsogwita9H2ZPzqFy2Y7ibHJZYJEe+Ou3FTU6Ul1afPeZLZ/R bht7lEGQ==; Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2oGh-009LjA-0n for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2023 07:23:43 +0000 Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1b0128be499so15059285ad.2 for ; Sat, 27 May 2023 00:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172188; x=1687764188; 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=oBlR1tSCzKq0s0LSoPmfz2djLlR2JY1U34JfKZKwznkJjmKhZk/RvdTioa8+q4fLjx TpwS0r+d9cii6tRr5zF2F2ok0wLIa0tDwnU2W/zqhfPOlizuFbSSD2SXQvMB1z6c5NXo hTgOaIhnrZBuzm2I8alnTR7M8RAjDRLbSTeF/vqsy1BzeY6Bw1npOOfEeZlxgAgTGiyC JiiC2+pDODqDVfPosRcBt1Bd87uhc9OkhsSclVMlXiuEtbe8od2DcBHTTRX0xkAsdCcn 2zM1gcKArV0Ke5cWa8SpS/cMyeXlllCPzuRInLBitJW97+z6/i/8TtRxJl/VQEnzsJQi WBsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172188; x=1687764188; 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=EUjT0mz2r0wmUuZuXTk82++IYAgigXXTihVA/rRed1M3fxls8SwYfmFpQQeHk+GGka s76GkSROl4OPq/mx8qAc5fF0KzJN/6dcUh8z5o+2NEfPoO8DiuWicvcPCY1LiSRj1038 aGk5OTWjGz+iYHjKX1O/mgB3/XEz+55aTRhuTg/xAAy3ru9zlGUJsrN240o0a4P0Rtoe k9yKN426poFTELJHAFksgH9JUBop1A6lnwZlm6tRPJDbworSuMIG9rzetaDxMrz90IaH MpdAo67eMkX+tT8f5UE7U+GRSLKx0xYdpUjivPnj3hHWlj0XS9HSMI3yWbjL9eEr9zXu cv6g== X-Gm-Message-State: AC+VfDxbDLbVMcKIYQzcVRUHuQRKMWZXmyMgFdLYuW3M2vIwAlFmrkkI X2zZJzele5jMctTSs70wYgXqSGRsIH4A X-Google-Smtp-Source: ACHHUZ7DY38xUWWvbJCVd1fK6G0AJ4aTIxafAEHZ/Mds9Jq2tgo4+2Mgs+r+3/FVPiCUM8bqZzT1ZnmhrIdt X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a17:903:1cf:b0:1a6:a899:fe78 with SMTP id e15-20020a17090301cf00b001a6a899fe78mr1208114plh.2.1685172188090; Sat, 27 May 2023 00:23:08 -0700 (PDT) Date: Sat, 27 May 2023 00:21:51 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-16-irogers@google.com> Mime-Version: 1.0 References: <20230527072210.2900565-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v5 15/34] 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-20230527_082328_510054_C7991D93 X-CRM114-Status: GOOD ( 16.62 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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); -- 2.41.0.rc0.172.g3f132b7071-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel