From patchwork Sat Feb 18 11:11:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13145528 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 A6802C61DA4 for ; Sat, 18 Feb 2023 11:12:41 +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:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=T2pHvMeaY/FGwiaUvrSfT9hDvQww8Z1twZfr/TcugF8=; b=rbcb0+64iQ9c11 ceNPVpWY3Jg3I2ptBR54B+0hsuVwAM87LPI5/ADxfj3zecpNQIiYKFFDXAuFtQE32nXJ7L5LWQXjg KbLsvbFp/cFQ9Rkrl+t/zmuIDKEgL+Ol5XCGZTekVmKsDoj0CXaMxEUm+JJ8si8Ww5Olgk5RDB/Od Fv4Y91YVNunWILisIEmADWq6dOnn79UncdA3JiQKX+4h6qcFcpQhRrTKLozgoOg12DJI7URgna+/C YCuADryR/u6JhEr47nMuR+GkFoWNnYygw64QrtI+at2UaVP2QbIbdQP22PcWxEiHOMGnmK9CZAByx CrPFuhp12hc2FkmSfneA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pTL7s-00Gptf-8c; Sat, 18 Feb 2023 11:11:32 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pTL7o-00Gpt6-VE for linux-arm-kernel@lists.infradead.org; Sat, 18 Feb 2023 11:11:30 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6ABA360B5E; Sat, 18 Feb 2023 11:11:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6E83C433EF; Sat, 18 Feb 2023 11:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676718686; bh=TYpBl7Pv8a8OgRVX8tmlNgi4Jw3ee7WV6w+cG8t3Tk0=; h=Date:From:To:Cc:Subject:From; b=AuO8JsA1EY1vEUAClCXt7jBmtw+zvrpTmXOIzLWQ+deJZKGQbJyHM9qpjNby+66kD PKzesJ32v1pbKFABOwwjlaZ/b5V/w3yqMClAyW6z81dRx1koeFlEEEqDLjnhKbdhu2 9rt2L3csQ1rlNoPyFStWjhX/UNGRsp3jOmYg19VW3fHC8s8KloEYOkebmvRye0PgQs bDWJD8bNzxmH3QhlJPCj5eMLvmTPD6RhswemLSjybAJm/RrSa9jyIIPQAM0YPC9Tye NsfvkmJHapnWGfroB3oNbVsk4ASs4RzKLiFZnRSSlVSsb/1NL+okNQQ7pTmae5QGPz CAZDdRncIujkw== Date: Sat, 18 Feb 2023 11:11:22 +0000 From: Will Deacon To: torvalds@linux-foundation.org Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: [GIT PULL] arm64 perf/PMU regression fixes for 6.2 Message-ID: <20230218111100.GA23413@willie-the-truck> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230218_031129_089052_BEA2F520 X-CRM114-Status: GOOD ( 16.18 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Linus, Apologies for the _extremely_ late pull request here, but we had a 'perf' (i.e. CPU PMU) regression on the Apple M1 reported on Wednesday [1] which was introduced by bd2756811766 ("perf: Rewrite core context handling") during the merge window. Mark and I looked into this and noticed an additional problem caused by the same patch, where the 'CHAIN' event (used to combine two adjacent 32-bit counters into a single 64-bit counter) was not being filtered correctly. Mark posted a series on Thursday [2] which addresses both of these regressions and I queued it the same day. Unfortunately, the timing has meant that these two patches are yet to land in linux-next. We narrowly missed the 20230217 release and now we're into the weekend. The changes are small, self-contained and have been confirmed to fix the original regression, so I'd really appreciate it if you could please pull them in for 6.2 despite the caveat above. Thanks, and sorry again for the unfortunate timing. Will [1] https://lore.kernel.org/asahi/20230215-arm_pmu_m1_regression-v1-1-f5a266577c8d@jannau.net/ [2] https://lore.kernel.org/linux-arm-kernel/20230216141240.3833272-1-mark.rutland@arm.com/ --->8 The following changes since commit a428eb4b99ab80454f06ad256b25e930fe8a4954: Partially revert "perf/arm-cmn: Optimise DTC counter accesses" (2023-01-26 13:55:38 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes for you to fetch changes up to 853e2dac25c15f7431dfe59805de1bada34c96e9: arm64: perf: reject CHAIN events at creation time (2023-02-16 21:23:52 +0000) ---------------------------------------------------------------- arm64 regression fix for 6.2 - Fix 'perf' regression for non-standard CPU PMU hardware (i.e. Apple M1) ---------------------------------------------------------------- Mark Rutland (2): arm_pmu: fix event CPU filtering arm64: perf: reject CHAIN events at creation time arch/arm64/kernel/perf_event.c | 15 ++++++++------- drivers/perf/arm_pmu.c | 8 +------- include/linux/perf/arm_pmu.h | 1 - 3 files changed, 9 insertions(+), 15 deletions(-)