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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52E2BC77B7E for ; Thu, 1 Jun 2023 08:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232207AbjFAIaa (ORCPT ); Thu, 1 Jun 2023 04:30:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232148AbjFAIaO (ORCPT ); Thu, 1 Jun 2023 04:30:14 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0388F194 for ; Thu, 1 Jun 2023 01:30:08 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba8337ade1cso867894276.2 for ; Thu, 01 Jun 2023 01:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685608208; x=1688200208; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=eBjsD43TTJUA5+5ML4PQTzZNVAmBu4fetqvUzrBnI2w=; b=1hFDF13eappzpr3oR5mOqV2PzI8qzt9K5J+pc/kdAnx4yAuAu9g8YIXTNNLCcJYdBo coUdghQLiKRTHFVSbF26jiQ1B7LKFDqfpYUFeha1HiYjyrFKjpFDR2JVLFjcbdkhQ2Uj 6phY7ul7piXiTomRmhI/DczWalXMFCReEKYYgJr0lvY42dyKcYJjVHCI92KXWLGgyqEW mt22v0imRp53AZkxFrbFi5v5cHXMXzc0DsK4jRRGWEfHvWOp/erpBPbAydJn39+5yoqY Nn1DGiJ6D/xebG+xlNatsvHqinN6tXr7lgHzuErj0Q0L0zSFDfYM1DdbL7wCjLFcvgmy H1Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685608208; x=1688200208; 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=eBjsD43TTJUA5+5ML4PQTzZNVAmBu4fetqvUzrBnI2w=; b=kVa2Y24Djd58gEDxspFLDlzzfu+59DRDbSIJiIYXF2Bg2n5j5PLwrLWl7P7dpI7HfF mbHamuPrShRsqQQ5n/ruqPGljKfh4C7H5wz404FOgIBwTluSQ/1hhHg1FRTfFzBio7PE h/58juxCgaUfWHOPvj4Z1BqDvbK9VOG+LtQyTm4vrDrKWlmWoCzTenTTWcGxIYvdzyr3 S+fliTgkBvLwnhawIh1+oe0oAipMbSPP5PH0K/4Kl4DNyYDPaRBTO5zvDExHJVBNbBvm nmuSIkWRN69H3nTRHPeHPyZvgp+QtoIWfIOKbBRXGSymnkdY/y+SU+XwD6glgz25Y+D9 969g== X-Gm-Message-State: AC+VfDw9wbKYTEjo/34u6DMS75a3v9lPUq74ciL/Ku2c+M/3ih8Lr/ZV 5Ri5q8UFbGmBcRmM2yiqH3KdRtPNIzjI X-Google-Smtp-Source: ACHHUZ7fLyH0WGyX4qvVX4LXezYFbkIR8CXYC9O9u/4ZdeyQBvLkHIMozZgAwCoHk+bdhrc0lAu1gnJ+N75R X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a344:94b4:9b8d:a089]) (user=irogers job=sendgmr) by 2002:a05:6902:1022:b0:bb1:3606:6a29 with SMTP id x2-20020a056902102200b00bb136066a29mr2576163ybt.3.1685608208084; Thu, 01 Jun 2023 01:30:08 -0700 (PDT) Date: Thu, 1 Jun 2023 01:29:51 -0700 In-Reply-To: <20230601082954.754318-1-irogers@google.com> Message-Id: <20230601082954.754318-2-irogers@google.com> Mime-Version: 1.0 References: <20230601082954.754318-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v2 1/4] perf pmu: Correct perf_pmu__auto_merge_stats affecting hybrid From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kan Liang , Rob Herring , Zhengjun Xing , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Richter Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Flip the return value correcting a bug. Fixes: 6b9da2607030 ("perf pmu: Remove is_pmu_hybrid") Reported-by: Kan Liang Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0520aa9fe991..36e163f38368 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1424,7 +1424,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu) bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu) { - return pmu->is_core && perf_pmus__num_core_pmus() > 1; + return pmu->is_core && perf_pmus__num_core_pmus() == 1; } bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name) -- 2.41.0.rc0.172.g3f132b7071-goog