From patchwork Mon Jul 31 10:19:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 128579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1931734vqg; Mon, 31 Jul 2023 03:59:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGLAidcx9iHTtrkMjCcU6BLjSQSzt1DrRq8X/wgdaJfSvk1b6z3OhCLkY9+8GoF8cdlGZNY X-Received: by 2002:a05:6808:1281:b0:3a3:fa5d:6da3 with SMTP id a1-20020a056808128100b003a3fa5d6da3mr12698754oiw.21.1690801152707; Mon, 31 Jul 2023 03:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690801152; cv=none; d=google.com; s=arc-20160816; b=yly2RTAukoWujdTbq1o1S4d+ObhYCcRT2v7HCDEzgKelYy3jSPDLqOmikwUHb7AZYn C6xs/HoVMf4CQ5SF2Ol1wgM3zuixgM3nTUEvQ7SHDWWvJCf1FM5CTSkdBlVZt5RjCQlR q/4Ss4Q+0/zRMIjwTY+IdepKlKwdnbTcMIOg010QTKOtBBfXDKdXk0ihWC3+zKgAWyJt uYjMwCyQ5eQvZLnjFsYmF8AUvjdAsXabkBVB4p3EjkWdw9wCxdPOwpdIYsUa1+VOVhoo a/TZiwzrz0XHCwX9x3m5hPsQT7E+1OUZ6qyz3im25xKooHRNsmtKYaZq70I2IrVJaJmp 3H6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=EKeb39vgzdhyS40xyxQQrpUF2A3Pl/1GUNNbiF2XXIg=; fh=ZCxiijaRLa6UjGpvEfijvuWHm8iSyxMTnmDti+U60Yo=; b=KGDwPGy57Fx7BV6CEw4Rhxoy+uTxGL+KlNY3M3D4CtxggJGXjxCz5Q44azEkyB6isq hrZrQnWqd+7LYH5pmAj8WMC4CV8bygvcQTayY/E5aXF0ssnHllibKu89Ewiv5/F+gamU CI8JCqTzHsqUCy2TERoESgFPmSeuzprdxN/tSAL1CzD2w7n2pHkR0luqPBA4u07doOD6 jhuZUnhu2knf09qPGdz7p9kRvpX5BvgP9WCDINREl2LrXVsigZnN3Y0kWZz926vJtbqK rCDiSwqrb4BkhMHD58eOCUVCf/iBaHi8WGyklyBPFk8AIT/4TUdzk8zZYjxXQJZPM/uV ztGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OQOJ7F6y; dkim=neutral (no key) header.i=@linutronix.de; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020a17090a2b8f00b0026824d6cb0fsi8692338pjd.164.2023.07.31.03.58.59; Mon, 31 Jul 2023 03:59:12 -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=@linutronix.de header.s=2020 header.b=OQOJ7F6y; dkim=neutral (no key) header.i=@linutronix.de; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230299AbjGaKTg (ORCPT + 99 others); Mon, 31 Jul 2023 06:19:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbjGaKTd (ORCPT ); Mon, 31 Jul 2023 06:19:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61058B3; Mon, 31 Jul 2023 03:19:32 -0700 (PDT) Date: Mon, 31 Jul 2023 10:19:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690798771; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKeb39vgzdhyS40xyxQQrpUF2A3Pl/1GUNNbiF2XXIg=; b=OQOJ7F6yn2nsUpWTKO7Xvx/agcOW2rfUa29HtBq8nFEgILlYHlFviBxolEt8DOX2N2ryz1 jvAv5NQRQQm9jywsxim6fzdRfyDXM2TcgevWa8NZt54PZt3MCqa2O3ygGug67z8H46UzMi LZQ7JfLNv1BxV7wEtZBojAXbW1JyPeUUVnae+w5G2oj8+BTGta9xYB79lYYfbT3f3W3VV2 zCqH+ye+9FdH5OfcIOWMMcdd4qGhAFqcjLsinXkxCU3jO+mzpeKQpnqImDFBNS4KtUZB0S NApWt+mtJbWh4qaftMjc3be54fWLCizWGfauc+h7eLPRuAGA7vQ70HjN0HJDaA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690798771; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKeb39vgzdhyS40xyxQQrpUF2A3Pl/1GUNNbiF2XXIg=; b=E0/1bPetgg8MQye830EUhwK0PGg9K/H/JzTqd0Cg8X+0UPnYa8xMIwS+H+5OBUAVaBa/93 EkMYSiEHo46z2yDQ== From: "tip-bot2 for James Clark" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability Cc: James Clark , "Peter Zijlstra (Intel)" , Anshuman Khandual , Ian Rogers , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230724134500.970496-5-james.clark@arm.com> References: <20230724134500.970496-5-james.clark@arm.com> MIME-Version: 1.0 Message-ID: <169079877042.28540.9012324637381086320.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772312876922599751 X-GMAIL-MSGID: 1772933509471237152 The following commit has been merged into the perf/core branch of tip: Commit-ID: 0cb52ad7bbb27bc6700412b055c743d5ae501b29 Gitweb: https://git.kernel.org/tip/0cb52ad7bbb27bc6700412b055c743d5ae501b29 Author: James Clark AuthorDate: Mon, 24 Jul 2023 14:44:59 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 26 Jul 2023 12:28:47 +02:00 perf: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability Since commit bd2756811766 ("perf: Rewrite core context handling") the relationship between perf_event_context and PMUs has changed so that the error scenario that PERF_PMU_CAP_HETEROGENEOUS_CPUS originally silenced no longer exists. Remove the capability to avoid confusion that it actually influences any perf core behavior and shift down the following capability bits to fill in the unused space. This change should be a no-op. Signed-off-by: James Clark Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Anshuman Khandual Acked-by: Ian Rogers Link: https://lore.kernel.org/r/20230724134500.970496-5-james.clark@arm.com --- include/linux/perf_event.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index dd92b4f..9b1cf3c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -288,10 +288,9 @@ struct perf_event_pmu_context; #define PERF_PMU_CAP_EXTENDED_REGS 0x0008 #define PERF_PMU_CAP_EXCLUSIVE 0x0010 #define PERF_PMU_CAP_ITRACE 0x0020 -#define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x0040 -#define PERF_PMU_CAP_NO_EXCLUDE 0x0080 -#define PERF_PMU_CAP_AUX_OUTPUT 0x0100 -#define PERF_PMU_CAP_EXTENDED_HW_TYPE 0x0200 +#define PERF_PMU_CAP_NO_EXCLUDE 0x0040 +#define PERF_PMU_CAP_AUX_OUTPUT 0x0080 +#define PERF_PMU_CAP_EXTENDED_HW_TYPE 0x0100 struct perf_output_handle;