Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp478681rwd; Sat, 27 May 2023 00:44:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7x23rx2SuCwd1JMRwFMfQ57+wImTMSZwGPpK1K2JUa9intN2W7rZxfQl/O++6JIQNvwlYi X-Received: by 2002:a05:6a20:7d86:b0:101:2f83:5fba with SMTP id v6-20020a056a207d8600b001012f835fbamr2618133pzj.31.1685173453359; Sat, 27 May 2023 00:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173453; cv=none; d=google.com; s=arc-20160816; b=ivvKkA84meTcOVy/lszAPoQYXGQZC3zAzj93Nc2M0of4vHq4buYkdWSXvqKvL5mh5Y kSlx23I0OhdR1k0qA2wSLWSs8nouAGdJNaG3kTw6lrgSW2EGeEaicyFwpilu0xZ0TDba JC8deX7Pw9zXWxPJx8rFg5nYVxJkC8X5r6USHjusKFHNAl1uXiFl8KZZOGaqnDOyOHoG oxhCkCKNggwiLwM1fYn7NMSi1OEIacmHIGag7w8/6anqWRWVToL0A6CZyHfjGyfschhl rTyd9axU8t9+vkFX0sK07OoCErqLFC+LQ2DB+OFUv5jCfBoqQdmS4fWxFblNbT4gmO/1 kv3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=WOjxsGu2+B4s1nXlsSxqdUIWzY+WQ/eQBroudZlXVAc=; b=ctLIHtOG0cP4mQgApw9WQumiWaWBdCuKnDDrJdljGu0vulR/vwWWb0uuukfLOjlSoR sxTTse7DZ6Ns+VFybq83zi7IgOAWWFWQLzoCEnMeHBTXryuWQVQqgioKv5jOdSUWan8H dubdLUqLllD+1ywmzwK76B+yWZTNpoKxT72MeX1irkYBKEwev3HFrJCPfZk1VxA7vQ2J c0go+OnAAdWqKgVkhKx/Tyw6NLBSs0dP5xcWbjohRMYh7bqUXOqjTmzySrr4HwbpB+ZG fkx9VYAhDHNBJAxR6HkJLXTRnlCxUZT77+ijar/wjTMSMAJ6pG70G+I25AHj45Eii7xD 78BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=AVnwhtM1; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k134-20020a636f8c000000b0053f13873c00si5320165pgc.346.2023.05.27.00.43.59; Sat, 27 May 2023 00:44:13 -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; dkim=pass header.i=@google.com header.s=20221208 header.b=AVnwhtM1; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232557AbjE0HZ5 (ORCPT + 99 others); Sat, 27 May 2023 03:25:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238331AbjE0HZc (ORCPT ); Sat, 27 May 2023 03:25:32 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC4E419D for ; Sat, 27 May 2023 00:24:54 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5657f376d8dso37836287b3.2 for ; Sat, 27 May 2023 00:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172226; x=1687764226; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=WOjxsGu2+B4s1nXlsSxqdUIWzY+WQ/eQBroudZlXVAc=; b=AVnwhtM1wdpkw3CJ7HsX0RDZfTFX/pEkwAGAWCV7/hRHJ4J0yOIPWqyAASLL2u73nJ gvyyx59B6uXL0+qMegAG0kP2a+YryTO3t8gAgMk1bLtR1P0qiQHYXnGCumb5aE/r6N1R gvDgFF2ewevrUOYMsevNyB0Tk9kiPlLAgR+OCj0a+tSWlrrACoMDIJJ9+dodIL4NFhoY 3iXdpNTIpJf8A/fRTcMZ+IkH6GI7IqPHR4pkmexQsr+YFiSl+32WwrsDcEMAe5Bi+nAI d7AJprG6Kg7DgYmQdJj7T097SICzCCIGuYWOixj2YyYo3ZmP7INFzSW9oJ2T4jG7AQQK Vcbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172226; x=1687764226; 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=WOjxsGu2+B4s1nXlsSxqdUIWzY+WQ/eQBroudZlXVAc=; b=Af3OwirT+HYXedfDDQo0R8HnAnm6dNQ6dUWpfDW6KqfSIwqYGWjVQN5tkDlVL2s6iy G6d46x5v4WiO/9XOn1RwsUPqMJDd7xr8E4K2UUFWLVVpZGrHKFzU+BhNXpjNY79J5slk BV4kT7scEDNKRgkjo0hx/ATAynsIOSGvyWL2AhdVs+lyZdBY/2t2uYvkSmyZJoPesNCL aY2cWjkRL5uQ/PeAXzmYv7ub2AHagfcJmzTLjV6q4dgb/4ClEu3vOmlJq59AtOxeqMio XvhmkAT+m9h2rhGRyjIB4aav9ywueDHgtAuXYcNuOWMLPLFz2BN2QSWkRZoDRXsLnxvi PW6Q== X-Gm-Message-State: AC+VfDxFR0AR78qORwZd50fLRgp572paAZdQQevPZdLiXLng93/eS8hE yi11/dftf24H0Yl0n1A/2JoAuLnOXOHX X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a81:d84a:0:b0:562:837:122f with SMTP id n10-20020a81d84a000000b005620837122fmr2559264ywl.9.1685172226092; Sat, 27 May 2023 00:23:46 -0700 (PDT) Date: Sat, 27 May 2023 00:22:07 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-32-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 31/34] perf pmus: Ensure all PMUs are read for find_by_type 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 Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL 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 perf_pmus__find_by_type may be called for something like a raw event, in which case the PMU isn't guaranteed to have been looked up. Add a second check to make sure all PMUs are loaded. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/pmus.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 2c512345191d..6ecccb5ad03e 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -142,7 +142,7 @@ static void pmu_read_sysfs(bool core_only) } } -struct perf_pmu *perf_pmus__find_by_type(unsigned int type) +static struct perf_pmu *__perf_pmus__find_by_type(unsigned int type) { struct perf_pmu *pmu; @@ -150,6 +150,7 @@ struct perf_pmu *perf_pmus__find_by_type(unsigned int type) if (pmu->type == type) return pmu; } + list_for_each_entry(pmu, &other_pmus, list) { if (pmu->type == type) return pmu; @@ -157,6 +158,18 @@ struct perf_pmu *perf_pmus__find_by_type(unsigned int type) return NULL; } +struct perf_pmu *perf_pmus__find_by_type(unsigned int type) +{ + struct perf_pmu *pmu = __perf_pmus__find_by_type(type); + + if (pmu || read_sysfs_all_pmus) + return pmu; + + pmu_read_sysfs(/*core_only=*/false); + pmu = __perf_pmus__find_by_type(type); + return pmu; +} + /* * pmu iterator: If pmu is NULL, we start at the begin, otherwise return the * next pmu. Returns NULL on end. -- 2.41.0.rc0.172.g3f132b7071-goog