From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbdLEBPt (ORCPT ); Mon, 4 Dec 2017 20:15:49 -0500 Received: from mail-by2nam03on0083.outbound.protection.outlook.com ([104.47.42.83]:22016 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752219AbdLEBFL (ORCPT ); Mon, 4 Dec 2017 20:05:11 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: bp@alien8.de, Brijesh Singh , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Borislav Petkov , Tom Lendacky Subject: [Part2 PATCH v9 06/38] KVM: X86: Extend CPUID range to include new leaf Date: Mon, 4 Dec 2017 19:04:06 -0600 Message-Id: <20171205010438.5773-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171205010438.5773-1-brijesh.singh@amd.com> References: <20171205010438.5773-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: CY4PR0601CA0087.namprd06.prod.outlook.com (52.132.96.156) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aefa8a66-0706-467d-1449-08d53b7c3557 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603286);SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0149;3:pGm80XThteCftC/ktPEhlpkNWMRJaNA/boB06oj9yPRDUNPAyUDZ/2mHs1H6roiHqRN+rUEv8oXGRvbZaFVOc1bINC4jGShs6G30sFwskYX4mDjK6n9Pjv/9OLACqyHsCOaz3DqJINuaZ+e8AvtbQZyV1Vp2tbqThqz7P7F7E2wrSPDpi1k2lkfHuMYfKMto9dy+tW/rtm8XkC6IeqtpwhHkcxjgTMmzxXpl6Zj0RnQlyE9zEnyUUEhBvx6JEX/4;25:Fqwr7/DXhkT7LYpprxJX/xQWEk+QOG8h5Uy7MuPy2itV0R7t/V4II9hdsfIla3jZiOnf0hyMvTiX/453lyGbz8vPtzM4Ao+asJT7Oy0o2fOD0Dr9QpRyTZUDx6DbhmL/DSMiEWVvxOcFOppIvFLmQT0rEY1B0Zk3T1CUVwInMl0R+JQgTdHKCO4+4IkiXRsOzgbMx7wrMDP/QwiF2Yv7N1v00fj6h5on1A/D7rNGrsW4oRcUUA2jub4cRQh0xLu29DHZ7NGQjRzf0iAxtPaVugza0Tsq9gCQ/fSVcaaZd+iWT2BZcCrWPZDcXFfcoxPnGhzzS6iM5ZV0m+DbWGBSBw==;31:hqLpNZbPOhlOeQUzJgXQNYu6jjiUUULBiIcfY9eLOePtdZ9fnH4d2S0foh1JtR+HiG12rem3xwHWKHC6hrcZcMSVz/ylevv0FCSUTn7X9t/3j6FnKX93HLcpLSGwwoDG7qrP94PX780SX4PESqfk5DntvR3EyKGSz1ELUa3FMaGTScFidTrpWIkAdrZhtHdZ9SeZDjVW5xnwnDJA7JSW9EM4/75goEmReXxhtgZcD5I= X-MS-TrafficTypeDiagnostic: CY1PR12MB0149: X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0149;20:3P+l7iu6noSH3ko7x8dNpFLxxWLVRurwcUbg0tm1p6JU2EfEWPeQv+P8pVLJpBW70BIWy06WaKxUANiS6JulujgwS2qxlLaWne1H8eXGlGcmqi0MbCPmcYagyDr8Pc8Cj3WhEEmRA72F2NjGOwWCIPxrM0cuMqEEZl849YedbFCe/IWcyhLEeHt1Jf5IQDUsAhqIac71jXPXXPKfoXilUAw6Vv03MP209l4AJlv8iJtCJbr2H4xyMOZyoZnQLQ2P4wmj9zNUEl/yhdAUjQnh9HOYVtc+qg3YdZXDbyDGbOiDJMPwfj1LhWijBUuL4j3K5lJVPQczx6pT1UAfFN2TDWY/bgawp+TpqeZj3CrELaFnaERLtB6//uSVa9mzXh/DDn146PR+hJGQQFcXbH9wQVtwNKiHMpNNnwd5grZjO0ypDw6tHWuKxLdUfR3ZuGxGVr1NQZ8PTiGY6PPYlKKPUZz5s/t2SqInC36ZT0OMBVP6mNs88oCHAMrrUZaiVIuj;4:UPeR4FBtbX5yECUSYYtVOVgwBKtXZ46vwp/Q2amjvZXs8POSYBjBmcSj1OB4jwLzeFpLbSI4HcXOhiuGRfnbqXePk83Umi/hUA1TxlJsVAY2vtzsgqwgRqtq4Colm1QaCNR8Z6CJwsxbqmNyr/rtRVvH2kzx44dmdWLPuTuWn3MI+uWhIQj2JFu3twBBxjS8/cTQLlpUZs8E26ECc5yuUSRcyB4fCDfoCrkjj/NeBBckcjo+ZNox6mectw0yzqF9pQhiqITO4FyUDNbNG+ju+U4yHqSc3r9gDbzHjFuaGJ19CYdGhsUATkHP8Va0ZM1eAfnv5p5uLGBRS5o9CrTggg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231022)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011);SRVR:CY1PR12MB0149;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:CY1PR12MB0149; X-Forefront-PRVS: 0512CC5201 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(366004)(39860400002)(346002)(376002)(189002)(199003)(16526018)(189998001)(106356001)(478600001)(7416002)(2870700001)(101416001)(23676004)(52116002)(97736004)(86362001)(7696005)(33646002)(54906003)(25786009)(105586002)(76176011)(316002)(2950100002)(6666003)(7736002)(2906002)(6486002)(50226002)(81166006)(81156014)(8936002)(53936002)(8676002)(4326008)(1076002)(305945005)(66066001)(6116002)(53416004)(5660300001)(47776003)(68736007)(3846002)(50466002)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0149;H:wsp141597wss.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjEyTUIwMTQ5OzIzOkppR3JCcnBVdGxEM05hVzVObGhrVUxMVGhO?= =?utf-8?B?ei9STGVwcHNndHQvMEhleC9ibkNIZ0I2QnFRTVYzeHZIdUxJUXJqbFRMUTZ5?= =?utf-8?B?UjlQVVRDdDE4ditWVWErR3lhQmdzV2FtQ2JRNVpIMTJGREg5dlAzWXR3YURS?= =?utf-8?B?WmpYbTJLL0FLbU1MNmIyaW5ubFgvWU1lMjdMbTZJUmZPMXdEQnNPNFZaZ1dx?= =?utf-8?B?Z2pUVkUvNjArTGhiUVFiRlZiS2d4ZWNUSHdzTHJucnZucVhiZWU2Zll3SUwx?= =?utf-8?B?b1lDV1VpdUM1YmR3NTB1bjNlOWRDaU1Zb1VRZnJFckxLRDlXMXIyLytwTXpI?= =?utf-8?B?TFl3NmFqUSswSjBad1Z0WjZvNFYyZytJQURkcFhQSFhYeSt4WkhURUVhb1F4?= =?utf-8?B?R0FzTDRDM1ZFdk5zSEloQ2IzVGRoZzhHN3JkM3V0ei90d0VlNU8xR2dlSGRF?= =?utf-8?B?K3c1bEVhOW1uSjNxL2kzK1FYSHMvRk9kaGQ0SzI3clpwSk9WQnpyWE5SNnhS?= =?utf-8?B?a2xqTCtueGlVQkIySlJZM0VESk4wSXlpWDU5dmZ6bXMrdkZEMGpzQ0JIMVd4?= =?utf-8?B?YXBTWWRIT09EakovcXFQMFNWV3NGQUMwSmVqVXZlN2VqZEJIT0c3eDFaZ01X?= =?utf-8?B?aVJEQ3pPSkxZVXA1SVAvMU1GVGhXeVE1TDBNcWUvRGJFTXo3STJYYWxzSnp0?= =?utf-8?B?ejc3R3h1R1RmM0lwcnVUd3V0dThVdUJrMDdMclJuY0hPdkR3QXJYWmFLL0Qw?= =?utf-8?B?cUFLRkZzQzFlSmkrNlpLMEt4VndSRXdWN3M4blRQRXpPSlVxV0kzUG9kVERU?= =?utf-8?B?dFNjZDBPTDF3Zk1FWDZQbUxicnFYcC9jQzN2anpVanlwRjNaaDk0ZHJlbWFS?= =?utf-8?B?T0U3M2t1UDRtKzlwMDNqNjMyZkd6eHZPMWs0ZllZdjlUZXd4UHNITDZ5OTJS?= =?utf-8?B?ZFdsT1RQeXMvUHdoWncraWQ3NktvZWNSM3F5ZzNqQWhRcmxzZnBLTjBZN3RB?= =?utf-8?B?OTh2UWZhQnFncE9KeE5PZVJyTEU5cnR4M29LVnlzbFhzL2hqMXZDUWdRcllw?= =?utf-8?B?dXlrNTBLSGJQdmZLRmRmQ0s3NFJxaUdrUUVScFNKMHBiNEs5dkNZSUpkbHNZ?= =?utf-8?B?SVViK3huTGNtRER5MTZzY0RkT0lMOHVHTVZDbFh1ZElraWZoNzZxa1FLRFdh?= =?utf-8?B?S0g0SlZUdlRhbUo3THZrU08xN095YmhvU3FXN2tEdG5OamtvV2tidHBWTS9r?= =?utf-8?B?ZHFiSDlKSUhlMUYvVTZIU3hQcnJxTm0yODFvWG81VG13aGVvblZFbTZOSU13?= =?utf-8?B?TUcyK1VtUlNtVkhwUldXdTdYRmtycE9PaEUyVk1kWStrK2ExbjdFaDNMM1FU?= =?utf-8?B?V2VNNmF4bmZLbWVpdUY5ZWpKdGV2QzJxQ0ZHRFYrd0hTVWNSVWw1TlJxMFNM?= =?utf-8?B?MENrZVY2emJqeHJIUTJvZE1oWGQ0MFowSHFnZWdBQ1Z1M3JRNDVQazJCbVp5?= =?utf-8?Q?KWic9hA8/yfSveWFPWo38NFPg=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0149;6:Pt/gOjsyo9aBjZZk1ca0ZV0zjHtOR5BodtVv8926ZePAPTyDzquIgV3PQVfFHPKUyGmWju6piS1qL/6Yr8/gFZDbsgPbPFJnJ9j+2dnHuBwDeskSabEtSWXjSJugQoD7MpydD4nunxoo5DTwhv+LZldSIGhMjgA34iD7ecU1Uqvsij5PXHpOMAIuWZ9I9s90iI/HXvvZ5ISmfq0Gxgv0QAo8bq9PF/t490hd3+YpAXbFJYHLs560Q4vUKcwgmUFgotFCx9Rg2ZUGYon/qIT2Fm66PsGf7nkn/tih7fUtsy+uvUiujvZe0roAYrTM7IZkLDQLk8NI7DR1adbpICz1yICUQq6XCKSfkgmt0rR9BBI=;5:vNWt3NQZIHkRVsKp9dkg2jgLdyqU4hdc2gwrkV7kKdHGCYkCJFdvDyhwT+/y7WmLZedI+JwJtGF5T/LPty7HfDiZPeguLpCjt7AyMwGAGs/KRKiL4ItHmLfGibyoerJL8OVjPVEEQe60l+djK/1+4VpcRRC8fF3PAWeG07+Yu3E=;24:SFDdWlhzCGUxJUHttXfWYG1UFeYnoY9PQb2j+wMPqNGBGd88wWh8vxy6gl7pFvWD7ke7usTDHytc78Enh8DWeiUxOLD0WwqjU+5IhUSM9BQ=;7:xKHzaFqEcN3WETbqXLmmtz4Nyq9sbfp8bCddiXDho/2Rvsy0loJrKgNsyJkMo3cIXQzRiaTftg5+6N4d8LtQ3kxzf97d8Z9kKouBrCQCpYhyY3gMZ2BMXts0LmK1Uta+IM1meMAUZib7CSsR+zE5lFW8pyQ/jNr/n6Z9x0IQASs90bVNJe8VBpj/dQk8RcMB6warFdGowcG/XLTp6iL7Qlg2fRTcFAm2bG3LnB/OjnwR36vgXtqqMT2h2dyQMFLa SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0149;20:cIFtWzeDQL6EWanWhX/nlegIEaNOA5RJkVFmVqZrDd0llC0He71IBm1kaHWBuQ42SFNbSMPiLcIQZgZl9jW5TjvnUztiRPuoo5i92gmDPL1AH5VsN8ZwutrbWTqqZS4AWgSsJm6ydlauMT8PQtC1dAPPhcb2+QQxh2fnuLG/t78ilAcGr8vhnJq/s0PSgU/A3OBo8dihLbFlkSFzNnLu1zGu/n93yJUUAwS7sGNLnb62FH0CBfzbAllHKNM9xLtT X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2017 01:04:59.3738 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aefa8a66-0706-467d-1449-08d53b7c3557 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This CPUID leaf provides the memory encryption support information on AMD Platform. Its complete description is available in APM volume 2, Section 15.34 Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: "Radim Krčmář" Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Borislav Petkov Signed-off-by: Brijesh Singh --- arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/svm.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 0099e10eb045..c6473ca825cd 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -604,7 +604,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, entry->edx = 0; break; case 0x80000000: - entry->eax = min(entry->eax, 0x8000001a); + entry->eax = min(entry->eax, 0x8000001f); break; case 0x80000001: entry->edx &= kvm_cpuid_8000_0001_edx_x86_features; diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index e403cf1f6ba3..7e302a25bc45 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -5170,6 +5170,12 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) entry->edx |= SVM_FEATURE_NPT; break; + case 0x8000001F: + /* Support memory encryption cpuid if host supports it */ + if (boot_cpu_has(X86_FEATURE_SEV)) + cpuid(0x8000001f, &entry->eax, &entry->ebx, + &entry->ecx, &entry->edx); + } } -- 2.9.5