From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753993AbdKFRok (ORCPT ); Mon, 6 Nov 2017 12:44:40 -0500 Received: from mail-sn1nam01on0086.outbound.protection.outlook.com ([104.47.32.86]:16416 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753729AbdKFRoi (ORCPT ); Mon, 6 Nov 2017 12:44:38 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Janakarajan.Natarajan@amd.com; From: Janakarajan Natarajan To: kvm@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Paolo Bonzini , Radim Krcmar , Len Brown , Kyle Huey , Borislav Petkov , Kan Liang , Grzegorz Andrejczuk , Tom Lendacky , Tony Luck , Janakarajan Natarajan Subject: [PATCH v2 0/4] Support Perf Extension on AMD KVM guests Date: Mon, 6 Nov 2017 11:44:22 -0600 Message-Id: X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR16CA0012.namprd16.prod.outlook.com (10.172.212.150) To BN6PR12MB1668.namprd12.prod.outlook.com (10.172.19.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd220e1a-4ae7-4a13-8812-08d5253e0b07 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249);SRVR:BN6PR12MB1668; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1668;3:srgUwk1CGRDHk4pZdupUidaBqF2v7i0S9THSYOsgvmiARJSQSgkstGYVKk7LVPPioEITmz/Oy5aZiPD+QdDmvNTtPS0XRAEGonmxv5jrM5p7jR8a9hCl/Qf9wGqEFYRmLjxRtnRYwGZpIZGhTdvJlGCauVvxmjlOZPYCUzUydQS3TGZuHCG5a/+rdI9anurJobqfkdA4kEkDZq6+RTs6BpjBx+LsxUuU9SeQyADr7dKO9VBdQFNTBNB0RUSCCtKn;25:XteDg+5QHDpbQQUTE4+nYMeKSod25Cegmf4caKLi+v8IQDdtxjUmTsBkRgJZW/jKhAmYyXPNJ7WxDlJZdEN4sDUvf9zPzg4Rzx2Cul/rih6STtFBVrL7hTIOwKuPZNcA5F39+OQTAgCTahvBqr3zOqMAvS0rEbUeRQjkcWJzZdUbL/3DPwUu1D1EnDuOyN5Wk6DLQOiQd9qdxFab30aYw7hCR0JvCbDg47bFPNRl/nH1Rgk8XL388yADItd3qQhhwED8yEbFFcdB2g445bO4F35IOf3eIBwl3X9f8raTAIBuarBhvnCpcnm4j1J38DVG+tVN/Nxx8Tmsmq1T+qsPVg==;31:/QypPLMOQypwmUTzGDSz65zq23bQe1gRgeg5k/EGM1dndfZVNqKPUp7VLbLCpl3IlDbRfkc1cDowVJKtY7gtQX9PkUd+SsoBLACARBygllLFJ0QYDasQ0U3yEtid8Jz/HgmjKkgxF+1KVspiQYbbWkdCGwcUtMGdUvCuzH5ISQgnVpdn1lvUOrcKm+aDMNK2wDuqIxcKyBHZTrkKzT7BRLYNRlhxIz3wKwNnga8g+JU= X-MS-TrafficTypeDiagnostic: BN6PR12MB1668: X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1668;20:5h7WOgngHh76IMsOl4Js3ph+PetyzGsaZ04gOuvHk0RROHOIEkk+gT+aeq76qTeLccy42vDYkMXibxToV1oDouQRZyOvcLhHz1uGj+vf4X898b1aD0Ui6Iit+XwyUilhIX7ExU46feUpc0NWk4GPc+q/YiVx+wj9ZLw8uyLzrAg5AtQBuRMTRgVW2vpycnk1UPL086MdQEdTDq7/u2ci5PcYOEwAzRWo+c/kTHj+RJ0EvMaJBwovpvECJGZ4XLJ+24mXa2LCbhvvUv0ZSIxP5V9m071VEdtWkuD333ou/CE/vayK1g7FuJc9pGVcNQW3zkGuQoJiKKum1ggz9SlbntNhVggceBFUXTM6sNMNSdU2fORHd9ObClvMFEMbNFUDUQ0a8o//HClEu1jktUZ2pCQUdZXISYhK89SzrifPY60ytOn1V2OHvrR3PsXyw1JvprAsT1L7Rsf4fVHPgRW4J4n0rj8jmVKQF1CR0mc393qu9vXb4ZVTGUzIZ/BmHyCk;4:EX712P/oEl5dRnuIRr4umpSLcnlsMu7DktwVIx0PmaihZXWqSmuz5xz+8OtdkDEdt0e4+L1M0gftzZPdyjn1RM9ENmwiE7jyec5qbYhA3bj8mzsp19INFChm0aodYRBthspYOjoTcSbk17/sqlhdfgx8G0ZLr0IGPfKjPEQ0olPWfRnAES6MUuuvlL2XJMCY4HDDmhfx1jKjTkPGMQonzvRbj5Cmtg6XmC+rdB35W1+C70HDx9FM6hhjx1CMS1dM X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3231021)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN6PR12MB1668;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN6PR12MB1668; X-Forefront-PRVS: 048396AFA0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(189002)(199003)(6486002)(16586007)(25786009)(305945005)(54906003)(3846002)(16526018)(478600001)(189998001)(50226002)(36756003)(66066001)(48376002)(7736002)(47776003)(4326008)(72206003)(316002)(86362001)(2906002)(6116002)(53936002)(97736004)(50986999)(105586002)(53416004)(8936002)(68736007)(50466002)(7416002)(81166006)(106356001)(5003940100001)(101416001)(81156014)(8676002)(6666003)(5660300001)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1668;H:gi-joe.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR12MB1668;23:LjfjcNROyp+Pgdt2/lZWciEVhNZkWeeFuznCVpgRx?= =?us-ascii?Q?8anaw9XOw1H0tqwBe4qSv39Hbr0ESnSD1x4A6mPBTHcfyQhWNPMUMIoBr+6J?= =?us-ascii?Q?ZdBabJWqzh2bWEMZ64jYIoih33KfDC3EoZdK4WDl0iNWg5uUpmWr3VKRBsov?= =?us-ascii?Q?0PPov40qR8rX3KtMxHnMVH6+kzWxoiWda8r+QAgDJJZpz+eHIQwYd/ZVVAJe?= =?us-ascii?Q?7BHZFAaPj5V1dSr8FOVy8KiBd0m7u4KRHDzYeNjS06e5Wj6RYmcAZ4r2ZCk8?= =?us-ascii?Q?Fi5Q0uFb4oGlyA7l0lNmHLGlRYrZN17lYHdc9F9scMwNX6B2FEEvpbFVJB/k?= =?us-ascii?Q?LzNb8HwM+pcWaLVJmw7cN5WtBKpoWJDO+a9Bk6eJuYqYhWAiqza8UStaWsSg?= =?us-ascii?Q?tkNXvlPGc6LeetXxrf42pi9xo5u9gObAuqiK2ERrUaZDGrhxJjWDKOMjTEWj?= =?us-ascii?Q?iVHq5Sw8VIxRHv3TCiuDvgZrQgdken6H39ZLDEhZ4F8e0Ty0G0VGoswNQjrJ?= =?us-ascii?Q?tLex5GDkt9tFdPBRZUPiNnOVe6w/JLbfVTsRp6wQ9/Bf+msHblzACjwSqOSR?= =?us-ascii?Q?3F2Ag9bf7kiq6KBRTx9lPdXQrJmu0gQ5KHy0TONxZXjgFi6FbHull7+SP66n?= =?us-ascii?Q?h5R2ep9BrNOw1R4/u/gK5Od0o1sH02HptfasSuyVZgu3zGLwBGGlqKX3+vMy?= =?us-ascii?Q?uZEc7fY+CO1KejNDo5L80wZiSWCYSHAJAvhdunbYp32t7+riOLLME/jK3Ptr?= =?us-ascii?Q?LNEqDW2xrGbMqXoa46B7PezOurM8s0JBThJ1Eb+UCBfvVZmLVZ0RwMYVRgiP?= =?us-ascii?Q?UgXCSnzKWhEw8hTI4yWrBsacgVC5feTwLOs2IMPDYg1beVVZ/Aj0VnTzfqbC?= =?us-ascii?Q?uKcaV0GHfw9+b3NxsSqplyOPI6/NLYDftcEcf2lWEZH6mwmHa5nkTdcnqQH9?= =?us-ascii?Q?x7MChFgTTlb6lD58O5x3aIKwbvTXTrr6EyMcOj4SPoGhoLc3KgHCmld4L65B?= =?us-ascii?Q?AtTWhxoDfh4R3WxoRNgpYUj7RRkk3+POKfnTyC1P3wotRS8xFL48K+xZQUuy?= =?us-ascii?Q?uE2esamMSf9AskmcAs+bsirRR4k?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1668;6:b6TRq2suLwQBE6pEno0lJUhhjCuRl2z87csNL7YI2JMN2hsM4X9S2YO3D/6zh/uPv1S54pvVpnmBjJWUEoli2xgsI8Wdb8nyvVCLeQaIoiqWXl+CwfCDeFBA2CaU/3Qp+uwvnBDxt9d0dGHanH6PqyuhMlJSnIxEweuqvtIrWFSz1/BM7HUTPSSPKDCnQJ6LRja7yWC1hWuvsgeX/mcgWhxUDdQYtJrGX9KmBVaV2EFytXC8Q6UTPmzupEanJ1c6kFT1y43FTuapta036mz39bWD5eW8Sz4ySY/5b5RCmiR1OAssVg1eYrF1rf2h1ImRuD5SjeciGNxp112S4ylejQ==;5:+BYPD3CXOFXttpcHoIJs0fz850SO5IKAWGgWOe/Y2Uuce+5ejqN+GD12mjrUM05tUTIKgkkUonLQIH7UOPmyrDWa7b+hd92JlFeHr7HsTso4ckE8vS4lXhBvN49t2NOjxuN0PQ00JS+DoLjadrS60w==;24:c02McBXiCspvY2qzzKn2OndLXJ+VEOz1gYtaUUsF/n2PL5MLuhT2puIs+RRKCkBe16rXHQar8RpHZGvH7uQKFRrKLf2yO0A5k4hgvNmVi+4=;7:6bpoKbd/WkkLY1FyDC2uuhBbAninf/UvJoEQ8q8h9wRcSkr1vDaxmpG2ZklnuMS8MlilCqyncZCAxWgISrglPmJrkkh6BALQqkEQMjyJo2DzNx7ldjBvFYhJpxPiID6hfz1fq7fwCa9ObGk30jK6ATw9LeOfyX6Eu9kDgB7RkJPQbTU3Iw91Iioz5zmnbNitEXcQaFEqSDejjAKNJrHLo1SlUHDrHlDILF9QU0X2fzo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1668;20:BbJQ+L5Y81KT1I8OMRO1ahb9s17TDZzmkqOFNObA70XWsghEOMdV5pvXujYknukzwKI7Nxp8qTaN92x024l4mtBdelqHT9mbb+Ec9O2fjsOnv8cVDX4F3lvAEAw1SbESCYudVC1mlCwGDy3cf9ClIamqWDeOplT8C+9i2CuRMiNSIzurGHXWezP1rlINUx+S5C9fXCFGk/Ae1+9rqB4nZwCMGTIkpBxiUqkCZ+ROLWcgvNCkZ/PxFKw62IskyIAl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2017 17:44:33.8536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd220e1a-4ae7-4a13-8812-08d5253e0b07 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1668 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patchset adds support for Perf Extension on AMD KVM guests. When perf runs on a guest with family = 15h || 17h, the MSRs that are accessed, when the Perf Extension flag is made available, differ from the existing K7 MSRs. The accesses are to the AMD Core Performance Extension counters which provide 2 extra counters and new MSRs for both the event select and counter registers. Routines are introduced to choose the proper MSR based on the guest family. Since the new event select and counter MSRs are interleaved and K7 MSRs are contiguous, the logic to map them to the gp_counters[] is changed. Additionally, a fix is provided for CPUID_8000_0001_ECX in reverse_cpuid[] to change the CPUID function from 0xc0000001 to 0x80000001. This patchset has been tested with Family 17h and Opteron G1 guests. v1->v2: * Rearranged MSR #defines based on Boris's suggestion. Janakarajan Natarajan (4): x86/kvm/cpuid: Fix CPUID function for word 6 (80000001_ECX) Add AMD Core Perf Extension MSRs Add support for AMD Core Perf Extension in guest Expose AMD Core Perf Extension flag to guests arch/x86/include/asm/msr-index.h | 14 +++++ arch/x86/kvm/cpuid.c | 8 ++- arch/x86/kvm/cpuid.h | 2 +- arch/x86/kvm/pmu_amd.c | 133 ++++++++++++++++++++++++++++++++++----- arch/x86/kvm/x86.c | 1 + 5 files changed, 142 insertions(+), 16 deletions(-) -- 2.7.4