From patchwork Wed Nov 2 22:23:05 2022 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: 14512 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp175585wru; Wed, 2 Nov 2022 15:24:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4gt9tsGiTr+VddZ8bJvOrYwOUKpMeh4tDUNmIlk8qq65JhkNToe4YklyNgUURzFUVFUAte X-Received: by 2002:a50:d0c4:0:b0:464:14ed:834 with SMTP id g4-20020a50d0c4000000b0046414ed0834mr3761146edf.174.1667427859305; Wed, 02 Nov 2022 15:24:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667427859; cv=none; d=google.com; s=arc-20160816; b=ZwhPYlvTFFu7xeTz5BNTC821EzL80WCrbMC59glHSJbX7q7g9XiM6c7U5oQXSpjPhk GballkXf3tJIAfx2QC03HYFVBSAD+IpOPP9cEuWAC8iqQepFDIcMhJeXbVhDC54G+X+g rYWuAQCEP2eSGBvb5bRjumyljWj+ucF322e1yt4OyxD8oyyD1QPHNo5Hb6k4A5r3dtH/ UVK0OwiiHyA/4i5eYBq06qF8VBM0/UBDkpjHpXs4qtrj5/m/37ND78jDwSQsXr79Ojqn Jfiq+o0DD86pNVfAM6jU/1q68rsATg36b6vfbyFQgX4/JwooL6LDG/pow9OFzHf0IQzt nASg== 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=z1dVtGo5iEau0GObV6ZlrFrixHqrFcsKq5JPVirrBdY=; b=Qhh2lVQZEaVO4ZvjmygCPipzGLbN+FX4jKVLnIW0bN3dC09+4gO+Zd+i7kI8nR7T9X P1lesion0vG+CYZnfv+LOK6qzZW++/yzi58LR9r9okcDjh/e5Z8SiAUzHI04aEC4euHa hLexYs/ufK8RDjZYJaXjTmMuWfKvkWg2svIbbsKOxxQpSoPUys8gsHptyInz2v91FhhY AmrPvW/Tg71w7XztWdHXDC3zLWBoLDKjuV4s9IAoXhOAdOclfEfXWXMFp6q1LNGiJjl3 9J3o7fnVxuhZN9xBMXQGXey1TH1B2Vy5PQJL0gqj0byG8HhI+HEZeI+7UjdEgE5Y4Zpt Xmug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=lEbHW4CX; 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 di21-20020a170906731500b007adb868f102si19004557ejc.476.2022.11.02.15.23.47; Wed, 02 Nov 2022 15:24:19 -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=lEbHW4CX; 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 S231381AbiKBWXM (ORCPT + 99 others); Wed, 2 Nov 2022 18:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbiKBWXJ (ORCPT ); Wed, 2 Nov 2022 18:23:09 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63768A467; Wed, 2 Nov 2022 15:23:08 -0700 (PDT) Date: Wed, 02 Nov 2022 22:23:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667427786; 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=z1dVtGo5iEau0GObV6ZlrFrixHqrFcsKq5JPVirrBdY=; b=lEbHW4CXyUc0spTPpDFEo9esDx15AW3mAY3S89JloWPhMlzsYREtxPTkB3hv0DsX+V1+yT 9qkGEMsjfx84gcgifEgO3xKgl0tyQl12z+zfYDj/FVCiNGBpf6EUmjzVG+Mox6nUHpYwNp IWts+Uw56Deti9OmO0BDpaJMdEw0axt51IqaPemD4LS4GQ5SjlcnGPHz9PxI/SMPvkZ18q RVNctrgCVmJW+WRTsibS3gtD/ury8beRHLV5BeU4VMtsiUbw54raGXYKK5K6Y3lZ1x+UCT c8Ox7a9HFUto5d0VASRhx3nTIkcv5B0uXspY/L0pRV7YNrLL0mCnfS2IbO3PBQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667427786; 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=z1dVtGo5iEau0GObV6ZlrFrixHqrFcsKq5JPVirrBdY=; b=1QiNCdCRU3wMyIyuWunZie0d57vNGUQuwoVW0WvxbKkLpnhXEzl7M/vMpKgosLW+gVEUI2 qhpB28ltSi9SUIAg== From: "tip-bot2 for Kan Liang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86/intel: Fix pebs event constraints for SPR Cc: Kan Liang , "Peter Zijlstra (Intel)" , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221031154119.571386-2-kan.liang@linux.intel.com> References: <20221031154119.571386-2-kan.liang@linux.intel.com> MIME-Version: 1.0 Message-ID: <166742778547.6127.15390204561307101823.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748218476662366948?= X-GMAIL-MSGID: =?utf-8?q?1748424834625071352?= The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 0916886bb978e7eae1ca3955ba07f51c020da20c Gitweb: https://git.kernel.org/tip/0916886bb978e7eae1ca3955ba07f51c020da20c Author: Kan Liang AuthorDate: Mon, 31 Oct 2022 08:41:19 -07:00 Committer: Peter Zijlstra CommitterDate: Wed, 02 Nov 2022 12:22:06 +01:00 perf/x86/intel: Fix pebs event constraints for SPR According to the latest event list, update the MEM_INST_RETIRED events which support the DataLA facility for SPR. Fixes: 61b985e3e775 ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids") Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20221031154119.571386-2-kan.liang@linux.intel.com --- arch/x86/events/intel/ds.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 41e8d65..446d283 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -1009,8 +1009,13 @@ struct event_constraint intel_spr_pebs_event_constraints[] = { INTEL_FLAGS_EVENT_CONSTRAINT(0xc0, 0xfe), INTEL_PLD_CONSTRAINT(0x1cd, 0xfe), INTEL_PSD_CONSTRAINT(0x2cd, 0x1), - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x1d0, 0xf), - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x2d0, 0xf), + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_LOADS */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x21d0, 0xf), /* MEM_INST_RETIRED.LOCK_LOADS */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x41d0, 0xf), /* MEM_INST_RETIRED.SPLIT_LOADS */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x42d0, 0xf), /* MEM_INST_RETIRED.SPLIT_STORES */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x81d0, 0xf), /* MEM_INST_RETIRED.ALL_LOADS */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x82d0, 0xf), /* MEM_INST_RETIRED.ALL_STORES */ INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_LD_RANGE(0xd1, 0xd4, 0xf),