From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933795AbdKAWKL (ORCPT ); Wed, 1 Nov 2017 18:10:11 -0400 Received: from mail-bn3nam01on0059.outbound.protection.outlook.com ([104.47.33.59]:44352 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933465AbdKAVQu (ORCPT ); Wed, 1 Nov 2017 17:16:50 -0400 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 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 , x86@kernel.org Subject: [Part2 PATCH v7 06/38] KVM: X86: Extend CPUID range to include new leaf Date: Wed, 1 Nov 2017 16:15:51 -0500 Message-Id: <20171101211623.71496-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171101211623.71496-1-brijesh.singh@amd.com> References: <20171101211623.71496-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: DM5PR06CA0064.namprd06.prod.outlook.com (2603:10b6:3:37::26) To DM2PR12MB0155.namprd12.prod.outlook.com (2a01:111:e400:50ce::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 235fad4e-307e-40d4-529d-08d5216dd7f7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(4534020)(4602075)(2017052603199);SRVR:DM2PR12MB0155; X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0155;3:X11Zc3+hC4D3TrpB2xfsUYGkAidCIU67xcWkJJLuusQDhv0l2X/s2kMennAR759hgRPr1nrQvdkC6JGI4lrKM9G1QLxrfnSYOEqGX37wTWBqmE9Vx7C9j+ZcXzEW7T99CGl1aETSeyMkAbMXdnYakjcEjh0hlPdzJHXSOZwZHUJS1WMIoK1SbojIA5QJCHQLI68boGpXciPldoWZtFMIrmGF17vaQLNem/t048+b8WRhpdP0iwgR+Q6MNLTFNOJE;25:cxPQJ3E7D/s84ZwEm5IfeKnTvmxHM4ao9hoWbEvEfuoS7uZBRR6X+lqv7+KOJlqyuh3sI4yXtPdqpBr+23QUcol7yKn0VumZ0hUlHseIYYIqSwIO7eG7S1fzCF3Ij64/NfeIFlskO7CXVA3u9qx1HzAPdUwphqA7w4fN4iunh+Xe+jnx0ThpwKqsKnWwHf9gc81LNUNGTdiLaNkccfc/CMNQwb7j4DbDCfdPqjiGrIOD1P4b22aHk/LHuffesM5tGp2uCqC4WrbjDon5R61o+tQ0jvaXYOMffmVeVNABvgO4gW+2yJKva/OliifhjZR/cOqpwTwXAgJjV2mCWyiI5g==;31:GK1vctJ3xbrZRHNzZ77POWEziC4waAG0Hmf7ivKBEkrgBrB8+f0kjz4dlDzkSGwaifxhNYhq2V9k9vA1Q79Ovi4lHJq6M0on4tSgNUVJ4fmEY4bVqZdMsa09cKQ5FZRsO6OvSKOxLlSgiTHDeNNqSGVLpvQuqNtxw5KMXFpIwc9dozcMlFHwdXwvqAUlUXaDcq+bGAQvVImLzCB/Dl9GeWTHivdB2pX/77we1SjngGA= X-MS-TrafficTypeDiagnostic: DM2PR12MB0155: X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0155;20:ZiTY58iQBD9+KDksSkAhE3yNAvg8nCcm36SFQg+UaJ/Es3OcFY6g9+R+GvlqvEk6c9YIz2C6BIdwJZT/5F0mhxgywDlNUOMPdmzQNpOvOQLx6vtUQWXfm4ySiKX1N92Z3o3B8bfPD03wYIcm7SFJST8HZngl+wX97aglpdk/li5/Ig+W2gbOGLGy40PDzrR/5S/FQ3wdTX2QR3eJnPz+GpMHmPMSU0CxjBsMxczkw3vLPwGmAie52RSbglv2uqChvj6tMoVfFimWIdfK/pdnbvo+OeBuWYlVDaBjv7wh2FaGZcDjjOEC+eIYP2d1BVKY0uKxwR0sW5eRFeaFkjE+cf+xvBx5ncxriASFZ87+IsAfNqUe9oPeDlSeVnVkQTS4gL4UYZSNfNWNV9PwTnfOvFD2J23+9EiZZyU5Qq5eCwW3J8egvSrHsUX4HsXaRSVtn4A7sy7IUJtNZY4D80Enze/yzE/1w1BnSauTdPxPjvVPmtYAYnrWDbkwYmAh0Tk8;4:Qq8mcq/sYmmgaLxYOMeLlquJ2WK9XF3YDsNH7DpJ2AE6lCYtHWRFF4KFT9EuTmFXDnZ+L5xsPlfytnyTR+wBfYbkFFS+qJXfVMTmyPg+AG+YzVPVS5rIDPEq8zcvs5Bgf+RU+qKVgECrkJxfSkVeMtayfjtiKIZe23782lit+8vKGGxv4XiFA+Ahq6rPynjMnhowEUuZuClS2zX+3QEmOITnu4RR+s6l9hnAXIJls8RqpH0vvUPZGnn/KfsgOXo52fIxeEYpMe97Fhm8xjc/vpAoTt0cNqV65Y3Kq7gC2M7jNdxC7BghI93SfG+VXs6eMNdpR+6cVJp6PjZixKqoWg== X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); 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)(100000703101)(100105400095)(3231020)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM2PR12MB0155;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM2PR12MB0155; X-Forefront-PRVS: 0478C23FE0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(39860400002)(376002)(346002)(189002)(199003)(1076002)(6116002)(97736004)(66066001)(50466002)(3846002)(25786009)(4326008)(54906003)(316002)(8676002)(47776003)(36756003)(23676003)(50986999)(478600001)(7416002)(81156014)(81166006)(105586002)(53416004)(53936002)(189998001)(106356001)(2906002)(16526018)(2870700001)(76176999)(33646002)(305945005)(7736002)(86362001)(5660300001)(6486002)(101416001)(50226002)(68736007)(8936002)(2950100002)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR12MB0155;H:wsp141597wss.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjEyTUIwMTU1OzIzOmh5OEFNelFidUJ2bk41RUhPeTRDb2g3cmU1?= =?utf-8?B?aEpYWjJRZzVxT2RuaGxJUHEyVklnSkxZLzQ5ckJoVXg1Z21WOHB1cjJHYm1q?= =?utf-8?B?eTc4Wlg5Z24zRFRlQVpxQmVLK0wwaWhnQlUxQTdUY29YckdCSmRYNklHMHJU?= =?utf-8?B?RlQ3N09yRjFXQk8wQ3czdXBJZW52cVZEQStIUEtPUkxWcDNHR2lqcUNwUW5a?= =?utf-8?B?OEl3MDJWMk0ycTBvcXdDVWhhV0ZUa3huM2s4SHNqUUtwTkx0LzZ1ZFc0OHMz?= =?utf-8?B?ZWdHNjlHTEE3WjZrL1RXSUlGL2ZQU2ovbXFTQ0JrZVpLdzVxa0NDbXlPbVJE?= =?utf-8?B?TXJOOCt6NUo3d2luR2RURlVkaURJS3RGOE9uWTVwREVMa1d5OUhocUVIWG5Y?= =?utf-8?B?eXJXekNhdHhxNFU4L0ZMWHlVQ1dBMzV4TWdiUW9zOWVSbVk4ME5CWk9XVTBX?= =?utf-8?B?WTR5eVA1UFY5dWdWSmlkSDRjMDRITUVoVFNWWlhsQlZrT3VKb1lySGdNemhw?= =?utf-8?B?aSsxcEl4OXNQSXZvMFNMVmRJc1lnZ2p5dEM2VXAyTThLa2toU0kxWno1SnpN?= =?utf-8?B?a29VSDZsSXkybjZIdzFwZVZydExDcjU2NjlSS2tXNEF5QWpyVnBXTXROZjhO?= =?utf-8?B?bEpzQ3l4WVkrZXJpZHEzTU10OXN2dkhDWkI0Wmd2SjdYOHFmVnZMRmJBQXNy?= =?utf-8?B?bFROS3E3Ync3V09jek1jTVQxU3Y0TXFFTFdkc0s4OVIwakRJa3h3c0dPbVhp?= =?utf-8?B?c3A2YkxlMjB3V3M4ekErQjAwU1lUMmN6WDlzQ2Jyek8zVFYrYzNwVUtJLzI4?= =?utf-8?B?cjI4c0R4UGlSR09jaUYzTmR3U0xydGkzR25JT3VWOTZPeWlxcEFKaURwMERV?= =?utf-8?B?WU02YytnZWNvcXBrVzNCYkFIVVA2SzVzbGRGMU9vUEtuNER4Y2dtc1d0cStt?= =?utf-8?B?NHBNdHB1U09oVC8yUkpGMXBXTXhpcm1JN054QXNGRk1YV29yeWcwaEhtaHJi?= =?utf-8?B?SUhyQ3NUSUlobVNaVTQxYWxYc2tvNlRDK1o0SmFkTkViaFRBRmNmUjEvS2g3?= =?utf-8?B?eFd6V2JtVjVOc1BPTUZYZHJlSW9aK2lVa0lLTXlxZldYeEd1bjV3M2xqck1O?= =?utf-8?B?WDNzS0J1T0ppNkt0SzYvYW8rMHp0b3JoekRYVnRYZE01U1VzNVpXSCszeU9O?= =?utf-8?B?KzhvVUM4eWRwSWhVcCtabUNwYm85MkwzNXBDYk9HcmVSWGwrL2ZCdVE4V1lo?= =?utf-8?B?Q3JRUVpIQ1hmY2FKcEhsdnEzRElmcnVMcnZkaHVIamR6OXZyWnpLKzBrWW56?= =?utf-8?B?Wnp0K2tvQTkzbzFLQWREeTdkYWs3WjlpMTdQcGFkV0RqdXBPcWFGbXJuQWVP?= =?utf-8?B?N2NPNitVaWUyWFIvcDlOc3JJbk1SUTNxd1FLeHVBWDRZZW0ydEFNUUc5WW1m?= =?utf-8?Q?CJElMN2+DcZjtEQNDBv4CEvpgBd?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0155;6:t0ATpVLoKwUNOlVIEitVnw/noL6Y8g8SWHMSCSJemg7HtCdmXqBeWN3U8Q8402NQEq/JPYecqwBqZBK860Y8NG+pCk8sYJHDxg7Mx0S2/iNiG4SzJneNr9VJPBfapZmlBwTbUhdDcs0nZJsC8T/xVq/EswxQg6fJW85d9/kNHGP1KEbNbW8F1xhIhSy8OUgv4u1WhxC/TUS+50QjzEOFI5REbFX0B6XyH9V0xHn29oKwqDpmFyzjidY5w1wEsUYfbKBMAYqZ4o2kxt8SphiUaH+HR+YNMC4/NQyLAvqJtMXjk1+UI+9kHkIRrfyVZMJ3xQPzVAlB8mlBvhiXEAnnTzrvdayPINP5Ttt01Vbtjyk=;5:gXy3vp/eLb8fdbBT4pZ7pbqkAkjQu6215lho6fZtkOdAfEFHaDSYQ083FQ5dw8pNGydyAg7BGOm/9iPy7UBtLOr332145MIMS0AfpfDmFVZOGUOcUQ9XRIaeKbVcvxSP/c8KfhgwXPkSyafvxwmcJ/QPNtorC0VuMX1BtAA65N4=;24:WaJ7SFEpPTyRWQvUsDyys/I0sWFjZF8hUk8VGR/hoCYIhllVbSMV2XdrWWedRb62BZ8acnzA8MAdH7joQjZLMTdfLLx60wO3Z2X4e0d1mwU=;7:n1NdphNXEcMx6d2T3mDHiNX6z2Go4pdeG9kqZJnrQ3Z2geHl8z8Ej53o9rNGRObgwkEQc8Onyl16+b/QauHikVvwGaoATQfZYCXose3AVTr3mt7vcYSBElkKc+WqZH5VW63gFqD5tORRJ2HtAeWilVrpwcpFlAUcvg0fhJ7AfDE45aWN3AjeBeLHEkY2sSNBPZ2Rmwnk42f3TDqAF5d7SOB6s0Ik/LegH8imuGlRCXJ4mhlsrE7hkciA3AvdHr8h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0155;20:BdIhsvVEjJjPWEtCUi4jJQEnXiRchLAAclVilHS2UeVvO2Th++fEvoS0FVVlQorOqEQOpKMY94bpYLqW+71s6vnqIfnc2FvB502gAC+CxbC/D7EHQ3G7cIH3/Y65iXb76gmSfQhH7B96zJHI4M3xQzHzxB103amaSH3lshN1mTvUJH62PCutWzlBOU6rH5C/FErC07UGR43gqkNeuSI5Thop63jwIms4/OEXKCzX91pDdN+1uIzM7SObHtmSx/MF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2017 21:16:39.7348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 235fad4e-307e-40d4-529d-08d5216dd7f7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0155 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 2c3a3c88596c..fab5b1b7fc63 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -5149,6 +5149,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