From patchwork Thu Oct 20 15:17:56 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: 6249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp170206wrr; Thu, 20 Oct 2022 08:21:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5uj8QPIA82yf+h8w5pl7cOlXihZdr/fzMJbvFM/ZVho5USQaSFVNVGLKwz/u7lylQPDrSW X-Received: by 2002:a05:6402:f24:b0:45c:d71c:7f62 with SMTP id i36-20020a0564020f2400b0045cd71c7f62mr12950826eda.416.1666279310859; Thu, 20 Oct 2022 08:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666279310; cv=none; d=google.com; s=arc-20160816; b=gdCkf4WtfOukebn0BL+SEH0IT1Je3VIDIHlZXACQCflnqBv7+xRWE66I+LpTX8WhsK Hde+MR17UT/DGRDGf9wrjiOnm2oISPhENBfQqAfY5PbyIqUp4encdjCpr9wA6Mcu0z0t fncI6G48RLcCa0668QB/4QkQOzaDBCgRDwJnH3Zc4mvVNTZUALCXLYSZY6hXx101qQwG O8BcPrH+6ESJranafPVBzTN7dcW1Kq4f/gGyq1zNmFzHpqJAWDpWAQpdDJOrZv9mIz5X CSy2JM/f9nsmxSUgHlFBvPHlNBRPoEWng6NZYixr2bky9CqiG/njD52SneHpG8DlyHx2 8x8g== 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=REkz0EKzIlK/GALKmbUCwMeQcbqiQnCP6nUbBx72gis=; b=XxcJurajB3PTVU65Kmz4EFX/vzqRAjEXFO/ZUAiqfxSnG37EiWYEMpogIJ5e68vOTN iSN0kLeHKAchHngLHXUHkSGnvG/L55bSkrQUckP6Q6Q2HY87EPk0r4+Nk0GqiyG4h7Se HX+aDqv22keM80FBCazGKdiewRZTgFHp5+4OLb4ORcZBM0QW4BNpQ50Lf0kPj4bVD/mb EdaG/KGR9jG+SW00Xsv0sbdX03NAHIoWIs7TzZMNXPsG/rFVs3FdTPatcDt2LtmRKtN/ MZnlgrtb3T0QXw0QYO/JzPrC6Odzg4T2Mh5wJN452AG4GPk++7LxvZG98uoKSuu3AH49 eoeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ddrV6sMy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=6Kho1Y4q; 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 cw10-20020a170906478a00b0078c5d28e27esi17303996ejc.604.2022.10.20.08.21.18; Thu, 20 Oct 2022 08:21:50 -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=ddrV6sMy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=6Kho1Y4q; 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 S229576AbiJTPTZ (ORCPT + 99 others); Thu, 20 Oct 2022 11:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230334AbiJTPTJ (ORCPT ); Thu, 20 Oct 2022 11:19: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 E33841645E1; Thu, 20 Oct 2022 08:18:57 -0700 (PDT) Date: Thu, 20 Oct 2022 15:17:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666279077; 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=REkz0EKzIlK/GALKmbUCwMeQcbqiQnCP6nUbBx72gis=; b=ddrV6sMyoOyEfkOBsfSBIFEEW+irM+0MWqxRVl/hSpeuG7qj3rGfcTitxWn2eBFO3ZCzyW 3epoX4WHLbp46KuQPkFU3kXADZc9XGtCff+cUGSpxo/PF7CehMj2CNW6efvAlKZZsnEPO5 9knirdUFgl2XuQO5q3+a/qXc1BcNGj96ry1sOhuYmbf/7SE6dAH7/Iz84YlSlZAjJ0qZtD JF5W4kg23BtPKVlb1r36RKj7GPSIbo5YIcNrGUn1V//vq8DpLIks9iixs7yC6jWejh65GK cIGzuaKhPgRtSAwepdrb5mh7UDHu7mo0WD9lHf9QIdmtlXhsjMXVtO+pWJKoSg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666279077; 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=REkz0EKzIlK/GALKmbUCwMeQcbqiQnCP6nUbBx72gis=; b=6Kho1Y4qLaAGey8k23908DZQ6eqEf8caaow+njiPyid1sncx0252bNcA5Jb07wHRgQP7us 7TYEZ2aCu+8fZuAw== From: "tip-bot2 for Maxim Levitsky" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap() Cc: Maxim Levitsky , "Peter Zijlstra (Intel)" , Kan Liang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220718141123.136106-2-mlevitsk@redhat.com> References: <20220718141123.136106-2-mlevitsk@redhat.com> MIME-Version: 1.0 Message-ID: <166627907623.401.782680400478591314.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,URIBL_BLOCKED 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?1747220495089575485?= X-GMAIL-MSGID: =?utf-8?q?1747220495089575485?= The following commit has been merged into the x86/urgent branch of tip: Commit-ID: b329f5ddc9ce4b622d9c7aaf5c6df4de52caf91a Gitweb: https://git.kernel.org/tip/b329f5ddc9ce4b622d9c7aaf5c6df4de52caf91a Author: Maxim Levitsky AuthorDate: Mon, 18 Jul 2022 17:11:19 +03:00 Committer: Peter Zijlstra CommitterDate: Thu, 20 Oct 2022 17:10:28 +02:00 perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap() clear_cpu_cap(&boot_cpu_data) is very similar to setup_clear_cpu_cap() except that the latter also sets a bit in 'cpu_caps_cleared' which later clears the same cap in secondary cpus, which is likely what is meant here. Fixes: 47125db27e47 ("perf/x86/intel/lbr: Support Architectural LBR") Signed-off-by: Maxim Levitsky Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kan Liang Link: https://lkml.kernel.org/r/20220718141123.136106-2-mlevitsk@redhat.com --- arch/x86/events/intel/lbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 4fce1a4..8259d72 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -1596,7 +1596,7 @@ void __init intel_pmu_arch_lbr_init(void) return; clear_arch_lbr: - clear_cpu_cap(&boot_cpu_data, X86_FEATURE_ARCH_LBR); + setup_clear_cpu_cap(X86_FEATURE_ARCH_LBR); } /**