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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBBA9C433ED for ; Fri, 9 Apr 2021 06:58:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91332610FC for ; Fri, 9 Apr 2021 06:58:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233422AbhDIG7E (ORCPT ); Fri, 9 Apr 2021 02:59:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231540AbhDIG7D (ORCPT ); Fri, 9 Apr 2021 02:59:03 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27C6AC061760 for ; Thu, 8 Apr 2021 23:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Ob2ufrv9W9kaz7mrVWRRvsjATK5g5L7t7+n/YniHhkI=; b=M9SjYHx64+cTEDLVBs5X5mfnMw tIK3La3wwbVC5Ug3Hd2H4qecpGSwCuxpcHFDDaeLpk2V3yTDZByZNPvt0zh+ivEMhflmIIHx8py9d h4nfzrXSbBnOa5pAYeCyDhjgiPZahJdJutfMWblJo5CSqVv1iUYX1N+7td2m6aJ97w8ntP0S/Bn7G Z9n6i/v/hTQtiy6d7OkMbY+D1HJhetLKt4y5Vqs0k3XDH7F6q8kGuC0ReSPRx1gGuAgso7TpxJwzU 4tryrY5wbr2CP82/hehiofazoFyPxnocMaCTx4s5B8WPZm5uGKssKLUi9XMZuiULbJTmH9yobjju3 Gj0/pGmg==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lUl5r-00HXSK-Fz; Fri, 09 Apr 2021 06:58:21 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 757AC30001B; Fri, 9 Apr 2021 08:58:14 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 574B92040C569; Fri, 9 Apr 2021 08:58:14 +0200 (CEST) Date: Fri, 9 Apr 2021 08:58:14 +0200 From: Peter Zijlstra To: kan.liang@linux.intel.com Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, acme@kernel.org, tglx@linutronix.de, bp@alien8.de, namhyung@kernel.org, jolsa@redhat.com, ak@linux.intel.com, yao.jin@linux.intel.com, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, ricardo.neri-calderon@linux.intel.com Subject: Re: [PATCH V5 16/25] perf/x86: Register hybrid PMUs Message-ID: References: <1617635467-181510-1-git-send-email-kan.liang@linux.intel.com> <1617635467-181510-17-git-send-email-kan.liang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1617635467-181510-17-git-send-email-kan.liang@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 05, 2021 at 08:10:58AM -0700, kan.liang@linux.intel.com wrote: > @@ -2089,9 +2119,46 @@ static int __init init_hw_perf_events(void) > if (err) > goto out1; > > - err = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW); > - if (err) > - goto out2; > + if (!is_hybrid()) { > + err = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW); > + if (err) > + goto out2; > + } else { > + u8 cpu_type = get_this_hybrid_cpu_type(); > + struct x86_hybrid_pmu *hybrid_pmu; > + bool registered = false; > + int i; > + > + if (!cpu_type && x86_pmu.get_hybrid_cpu_type) > + cpu_type = x86_pmu.get_hybrid_cpu_type(); > + > + for (i = 0; i < x86_pmu.num_hybrid_pmus; i++) { > + hybrid_pmu = &x86_pmu.hybrid_pmu[i]; > + > + hybrid_pmu->pmu = pmu; > + hybrid_pmu->pmu.type = -1; > + hybrid_pmu->pmu.attr_update = x86_pmu.attr_update; > + hybrid_pmu->pmu.capabilities |= PERF_PMU_CAP_HETEROGENEOUS_CPUS; > + > + err = perf_pmu_register(&hybrid_pmu->pmu, hybrid_pmu->name, > + (hybrid_pmu->cpu_type == hybrid_big) ? PERF_TYPE_RAW : -1); > + if (err) > + continue; > + > + if (cpu_type == hybrid_pmu->cpu_type) > + x86_pmu_update_cpu_context(&hybrid_pmu->pmu, raw_smp_processor_id()); > + > + registered = true; > + } > + > + if (!registered) { > + pr_warn("Failed to register hybrid PMUs\n"); > + kfree(x86_pmu.hybrid_pmu); > + x86_pmu.hybrid_pmu = NULL; > + x86_pmu.num_hybrid_pmus = 0; > + goto out2; > + } I don't think this is quite right. registered will be true even if one fails, while I think you meant to only have it true when all (both) types registered correctly. > + } > > return 0; >