From patchwork Mon Aug 7 13:47:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 132073 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1489457vqr; Mon, 7 Aug 2023 07:27:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGssaFmyBXkKuGCD33fhXHoU0zAMiPsL8wDOsPGk4NrmEX8rUz86mZ0sKNF5T8JMlyXqHwW X-Received: by 2002:a17:902:8609:b0:1b8:abe7:5a80 with SMTP id f9-20020a170902860900b001b8abe75a80mr8790820plo.40.1691418431090; Mon, 07 Aug 2023 07:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691418431; cv=none; d=google.com; s=arc-20160816; b=eo4ipa6Z1xjKV0Tle4dm0P0ZGaBYSqbIBZvN4uUDFrzd+3olzUShePdqXG3wFqmLxM uoxMf8mQ5WyZOnceajyIzsAMSdiVADpIWbjvppcq5N2uMe4PbzEQs8pDEGa0mDhIvEBq 6H+m/t6kak3vs5oeOP8XigaTBZ/X1YO3+ADeA20Dlt1j10R83hb3iZoOQnL2KPTFro0y uv8lKCh2AwwEFAsX9C7Vri8k8TdyNHl/6GBPvF8Z4LTFa2SjYoWTbNLWw6ModfL9UBfJ qcAzKyIHsTxQOh/ZPvfGRoLqOK4yo4VPsLRUmSoQgG4gpqfvFrUAJIWKptFCB1VtXbNJ k2nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=Whek4SlFnv7mFThF0zceeVbCHJjmrHp1QMnDGieY0nY=; fh=ivomXr6ELj1hgO/5BOaBDnz2IbRfNHVdxIpvR22pfyA=; b=mkkE16F0JSQMkM9lz4qz7Lf+JBUMFW0PnE/kMrompMZA7TFkMn0+mncGql3hCW71SG u1j4NFSGdrIPg3J9W3oxmoxw20uJiWSMqQL1eTH6MfduqQcsnMeosiEsUWOkt622hZ6N NYTxrmEomXgxlMqyx2CfjB3Fi1+u5aZ+Hfa5hUqBVSyvfeJf6oC5A4r6/3B3Ye9kWORt MNnbbLzOrWCOnzrgGhz6JRQ14t6aTDPzO5W3TSrEuOXLR9BF9fhHB9JZQKDjsKzCfZIb TsSGYR4dNTTGUAYGSiDxLsl+pgLRZuc90r+GDLYJQSwNN8t+9K3gyZVEOxZ68TP0nYEx phqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OKHu9Q9K; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id km13-20020a17090327cd00b001bb42c27496si5880356plb.233.2023.08.07.07.26.57; Mon, 07 Aug 2023 07:27:11 -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=@kernel.org header.s=k20201202 header.b=OKHu9Q9K; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234412AbjHGNrv (ORCPT + 99 others); Mon, 7 Aug 2023 09:47:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233725AbjHGNrd (ORCPT ); Mon, 7 Aug 2023 09:47:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D604199D for ; Mon, 7 Aug 2023 06:47:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB42F61BA3 for ; Mon, 7 Aug 2023 13:47:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A58AC433C8; Mon, 7 Aug 2023 13:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691416047; bh=5TAY87vBX6dD6m+F0KKJ7XDHlPqjK8CdGL4ggBGXcyU=; h=Date:From:To:Cc:Subject:From; b=OKHu9Q9Kwx2cWjEFiuvTDpBFGTdQVGWMFBByqw83he4qn16XOEPNh7Ya7G74DpNMx SHhjd5Nn23qE7HlCE6lmvhlX7J0ln2NqwI5MHkEkv0bQ4QrU1Gq2aOrlAuOfNmxzTM Loa7eF/5og1P5w8KWtW57mvzzIQFR3Sw/msAxXLfTy+66L9l9s+BXn8ncs91g5E4B0 TjhLwj6R9zXFZ76gCFTdPQl+Itm6faJnYDn1J8Vs2VlGWmDQ5fxybMoJq/p/u58pUc jHX0m5Un1lRBeTyo/50CCXqSLMvPFpeRNlEkQQ0i1hjefcmn2LGObb6QMaG0f9jt/D kaXEf0Hw6uxww== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 86E5B404DF; Mon, 7 Aug 2023 10:47:24 -0300 (-03) Date: Mon, 7 Aug 2023 10:47:24 -0300 From: Arnaldo Carvalho de Melo To: linux-kernel@vger.kernel.org Cc: Adrian Hunter , Borislav Petkov , Ian Rogers , Jiri Olsa , Namhyung Kim Subject: [PATCH 1/1 FYI] tools arch x86: Sync the msr-index.h copy with the kernel sources Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1773580773021920784 X-GMAIL-MSGID: 1773580773021920784 tldr; Just FYI, I'm carrying this on the perf tools tree. - Arnaldo Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. The way these headers are used in perf are not restricted to just including them to compile something. There are sometimes used in scripts that convert defines into string tables, etc, so some change may break one of these scripts, or new MSRs may use some different #define pattern, etc. E.g.: $ ls -1 tools/perf/trace/beauty/*.sh | head -5 tools/perf/trace/beauty/arch_errno_names.sh tools/perf/trace/beauty/drm_ioctl.sh tools/perf/trace/beauty/fadvise.sh tools/perf/trace/beauty/fsconfig.sh tools/perf/trace/beauty/fsmount.sh $ $ tools/perf/trace/beauty/fadvise.sh static const char *fadvise_advices[] = { [0] = "NORMAL", [1] = "RANDOM", [2] = "SEQUENTIAL", [3] = "WILLNEED", [4] = "DONTNEED", [5] = "NOREUSE", }; $ The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files. So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers. --- To pick up the changes from these csets: 522b1d69219d8f08 ("x86/cpu/amd: Add a Zenbleed fix") That cause no changes to tooling: $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after $ diff -u before after $ Just silences this perf build warning: Warning: Kernel ABI header differences: diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Cc: Adrian Hunter Cc: Borislav Petkov (AMD) Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/x86/include/asm/msr-index.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h index 3aedae61af4fcb94..a00a53e15ab73883 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -545,6 +545,7 @@ #define MSR_AMD64_DE_CFG 0xc0011029 #define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1 #define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE BIT_ULL(MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT) +#define MSR_AMD64_DE_CFG_ZEN2_FP_BACKUP_FIX_BIT 9 #define MSR_AMD64_BU_CFG2 0xc001102a #define MSR_AMD64_IBSFETCHCTL 0xc0011030