From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932729AbdKFSZa (ORCPT ); Mon, 6 Nov 2017 13:25:30 -0500 Received: from mail-dm3nam03on0078.outbound.protection.outlook.com ([104.47.41.78]:9872 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932529AbdKFSML (ORCPT ); Mon, 6 Nov 2017 13:12: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 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 v8 06/38] KVM: X86: Extend CPUID range to include new leaf Date: Mon, 6 Nov 2017 12:10:58 -0600 Message-Id: <20171106181130.68491-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171106181130.68491-1-brijesh.singh@amd.com> References: <20171106181130.68491-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: BN6PR10CA0031.namprd10.prod.outlook.com (10.175.102.145) To SN1PR12MB0159.namprd12.prod.outlook.com (10.162.3.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1026aaf-995c-474d-6467-08d52541e1ea X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603199);SRVR:SN1PR12MB0159; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;3:jORnA3xcv3P43I2CWVh95/vPqQA6OxhR2uNVrpxyZ9IgSW9pICPcw7mSdGfPst4GW1KoyJiTqtQE7sprfg4fB9vFC8/ufQnrFUnjxaBQxGNrzRkoN/cmBZ4RDGGQs5rGKf3PxFkSUBK7tUgB1aAfKb3SFfY/dgZwIyuNfZCTIeOZkY2/R2m5u4o9elOnEK/29Ik0IFIulveivaXq+Zd1YZttsww7BHIhDmPvkK3XHX+2jB/jmt8UtKFkF6Kv+Dlz;25:oNixqbGLRka75cCQU+cc29ABqaUqnH0FVinxXdvGQYMJytDv7z2WD64/iL+af3cvqr65tf5P9fnyKqnkvBhyDiQ0LEhPPylbxkLcRyeUlLiBsB4b7JPaSx7z2YnJ8Ljh/8mobhUElcy7w3ogDnUpitpI8NWaE1QxxNnuZqQ8xVuFj0nWYS8UpT64WeSwbRz2pZZVitCzJwdKE8WVjE1VbwGuQeFVQaDiVhwHKd4zmWOWmSl+GA43Xtk4+eqyDCQxpCB6WEN/uZeeKVHxN1TJ1NyjfqdPI/QFQ975mJAm8+aJ2LmwmMkTXrWVDtVbSSXYG0niRCbyLfoWhEYxCv0k1Q==;31:iIsXtJMqpJoDD23tdixHizBb/nesu1WG+ZYRN/XfMMWWD6FVKkwV6YYEGfbRb1UtOlmHsBdllOuGNX8YwZpCc32k4RKlTmho0AXgTYi2ZiiFvpS0yOJuQz8++vNzlhspLHZiY6jYdOUSxg2nFNqklpgjm2g8cYVZ6W02C3MKiAr+HAPXHe5pzLhA3qwx5ffungg4e5z7WADWxFwCaFAXaEp/a0TRKF9YH9lC3KJ5kzw= X-MS-TrafficTypeDiagnostic: SN1PR12MB0159: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;20:oUVi8O219a8lbfeLfcLw4U+pjg0cFp56YO0GtoadtBiBZ9xvgVUDq4YedHh5434cnqGLNAo6c7DMKF5ozZsLAa/aHi89UXHPmUkiU76GIkhJ+c629rHRjbpnHuwQHpvCApUlCwO2ykZ/ocMLq/AiwK2DYFYS4J+EHjDzdY4ph/zhk7LecDpMIX2bX5qjJh0Grei7qrchatirJLviYAW7Y/xYbjJmyMYEbnI3pflllUDR6SFNGyLDjAHUqWtbX8hOlzYqOrTTGwkGQKsKSG48VABZgB992QCC5XM0CVHishFAmKTbyjll3KFj8FOF66Tp9/8scA9Po3/yoc86d07DRzt9lw37SnAbQ7JjLgTLNwop1mzu2teW6WfzQIWJYmuvbpk/wgFeoCnJ7pFIhf9KHYgpsTqB7vZPNjV4EJa6BbBr6COK8uOoKBxHRLOOrmSdcwgk7Z23uykF/a6fPtDyHUeiAtIM6L7FQZHO73EN1s+qovYludLoi6xv4R4/ezZ7;4:zkH/xD4O/hS4N86bB+NedtH6S4P+A+hVlIgFDl+tE24kWqpVe0gONj+7yzuK3rpZhqC+MJwEc34JzIYqWfqMorg657Isdockcuv5dSJY3+ifsH/IgpFQ9atvzrSdp3FTlfz3gj6tKfv63lX8ZNFoRrI1/0YMf5YiJFYMPFcWNuOA+3t32yMPC0Cg9Zu5F0xeWqWX5V9bvgKrrgLLupy3e96ZJ7nlyQJMCM+ihWrQDdWWvNVnzCSZK9mQYygofo2MOPNH7LE8Ypv3D65xJlLpY50Ax++/ZqV9kKqOcBRpX6wfOqKp7+nt4W/IvGPouVJRuTakzLPgsyz17lZQe3lA9g== 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)(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:SN1PR12MB0159;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0159; X-Forefront-PRVS: 048396AFA0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(189002)(199003)(68736007)(97736004)(4326008)(316002)(16526018)(54906003)(7736002)(8936002)(2906002)(81166006)(81156014)(25786009)(53936002)(8676002)(2870700001)(1076002)(6116002)(23676003)(50226002)(189998001)(305945005)(86362001)(3846002)(50466002)(33646002)(66066001)(36756003)(53416004)(47776003)(5660300001)(7416002)(76176999)(478600001)(6486002)(105586002)(50986999)(2950100002)(101416001)(106356001)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0159;H:wsp141597wss.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTU5OzIzOlBvSWJqcEE0Y1R5SUhRTmg2WFQrV1dxeHgz?= =?utf-8?B?M1pDOXpUU0RXT3RVdXJtY2lhRmNoZGsrRjJ3MlhvbDdsN0tiNnd3SGRmUUhU?= =?utf-8?B?NDcvK0NQK3hnbEs4MmVHVGNpVmRtNUdha1VyR1VzaHBKWDdPbVVHcEkrdXZn?= =?utf-8?B?WXVhazJKS0ttN0dOMGt0MVNiQmo0Qk4ycWJhZUU3SnZMQmxPajNGMlIvcC8v?= =?utf-8?B?ZlpOWnljQUpUN0pkUnU1V1BYVGwxcVg4aTNoQ0pXYy9hbEdGWXZISkN6MW1l?= =?utf-8?B?anMrSU5pbSs3LytjL1Y4SjJKUHBQVGVQTlhRYW53N2w3dkVDWGZ2QXZCeWt3?= =?utf-8?B?YTFibzVWT3IxTGhpN2pWOHRQL1NobTFTQWhicWtDN3NBUkt6VGNpaWJZMXhv?= =?utf-8?B?RTRkMlFqRTdQcDY0WGV6ZE1qSlAwbjVHY2t5MHdia2RIN0RtN1NkVDQ1bkZw?= =?utf-8?B?SmQyZGZYUnAyRVZkT0V3ZzVxRDZOTFhBSnhBL2NYZVNtVExWM3RVNnF4dHg4?= =?utf-8?B?WXF0M1RXakZva2tLaUtmMER2dVdIQXd1cElVbG0yTm8vNjBHZm92d01ZWmRM?= =?utf-8?B?bDg2alVhbkRZK2NyTGdKMGp4bUY0Z2FjUTE1SlJWbERGekQ0ODlzQzV4NkFE?= =?utf-8?B?M3Y1Z3VIb0M4aUt5cHZUTEZldXNyUi9kczJkRy96cy9lbEo2MHRMZTRXcUdr?= =?utf-8?B?Qnd3eXhjaEk2MXZuSHFORWRBNmxIWks5MzYyUU13MlFYN09tRmRkNjE0d0Ev?= =?utf-8?B?bm5mWEk2MlBxMDJzVHNNNS9hK3NpaEJxUEloNmovUkx2SWcrbFlGYzFpMzlM?= =?utf-8?B?Zlk1R3Q1T0FtK2xMRTF0UFVBUlNqaE8yNXNnTnlzUU5Ec3FEdW9VanNSMk5j?= =?utf-8?B?cEw2b29GdW5vTWxzSDQ4V1gxTU9laHhkRHdudG1wUmxsWVh4ZmxzSHJObTVC?= =?utf-8?B?c0JmTXEzRnZDR1k0SkVZRTJUYTQ1VllHY0xxUGFKZ0hnUHRkMWF4L0ovdXJH?= =?utf-8?B?S3ZFbk1yaWtXRDBTeWRxNVZLRWd4NnhYeWMyRjRJakJUOWZQL3g2ZmFNbEti?= =?utf-8?B?Rkp3YUdnRHBUQ241YnBueTBjRXN1Vm9FMFdDakxCMnQvaDZDVGUrek9jK1Bw?= =?utf-8?B?ZHZoS0RzZFp2bkFYeURndGhsS2loNVhVSERJNzgwQjdKWTBMOWcvek11SDZq?= =?utf-8?B?OHhQRmZuUGdGbnNlcUVPOEFmZDhwNzh0Ujk4MmNseVYzeTVLSm5hek5HcEpK?= =?utf-8?B?M29WSVM3cUZ4a3NTSnREMFlzalNqYzFUa1ZJSGNTa2xBOE9qblQxZjQ4ZkJp?= =?utf-8?B?VmdxOFNoTlpYekR1bklJTG1XRGtqNUdqclBMRGM1MWNTYlBOWnBQYVN5M3RX?= =?utf-8?B?cmQxY2xWZ3JiL3AwNENBeUxxRjhaTFM5QVhmREpLRmVEalZTbG1mUEpXTFQ4?= =?utf-8?Q?OHo0EblOPdekUMVGtj0jeRQLCPa?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;6:Wg3tz9TiDokbul7JlczhZf0TeMcQkS9dW38Tljd0IpBBqBZcHebGN2tETVz4z5bLv4JctTVxpBjjK5kA/fBF5nmg4RNv7AvzWncHAHKggKsUfdXLuFz8gMGyHXajY8Vy10+Mq2H6Va8s68eSdnpyDBKJ+aWSRYJo7O84ZlcITlA2kFJpmtvpukuMoO6zqscJYbtf+fBG2uPECR00ZXCgM37Bnz2p3vh7AiVdtdUdWSeQvxugcEu29Yai0vwp6vkQT9rgiM77OB+SBWGDwBk/uTh4fxFV1GAfm/5ctoj/08XnZ/EOU8/g0cP8vGRGcGZT8u/CBbA0Wuz4smgaLZJ9HN34nmbN63o7QI3mSw8EY8M=;5:JWEvbBPyNsfduCrdwI1lWJZjb2oJgKQiCLIX/jNo+0lt0Ezx17pO+O6vj0muGd3w8esEdNvVTECGJSp2nGmGsvnT+SIwixpEqA4eECb+4/dxhD8ytYtjQMsV6odgtLcCIi/tWhcKDcAC+K5e3OlPzMZ26VXiIdOmg1EaqTKDuKc=;24:oqTFeQ3WdnpfdS7pGAzawf9e+gq5DbvWV5M7KPzTi3CY+F+9J1lAUaoOEdFfaFY6zJ0tPkkXFisl6r7Wjm3oQjhLHnzj4WEUB0dl+VOhe+E=;7:m/i/TKDnFAfXtAPNxlpTMsOEXn0tCJhwc+ESPFBeR3Iklfn1wXYVDQHsWMnAW5cCvKX1QfPprsnEeZCZgAWm4qIYIaQS35ySWndb88LyyEkRCuXz/hHAaIGrqubx0pXA4DPD8fIkV3sr6yF6bLN3W6o2uTaH+2IV0gwbf/XNGNPLkx8SOT1lFmKjpGFhJ6+RmLnnaznq6exMUi8AGg9Y0H1qklsmWOoZbTHhB913IoPbRyV8XvrhYgMowlNJBa8f SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;20:80pbhFNFnsmbDxYhGEXCNMbqA2Pd4XwbyDSclCtWrOUngDa3sncl7mqSHTJpHibzMHaug95RQVq7dtYe9Kc6QS06aLT/wGm4lKTPh86D/fLNEqVyrIqejNAbYjU9i3BEV925Xjw/xuSxxNl2stGx4nRCPxGKRQXtFBe5zjGHEMvLuwq+LxCwftDdSSNOms5EjWhKfmMnmlu2y86aVwfxhNT5nBa/QUfLj6zsVD5SQ5IapfVQfLJ76xqHf7kKujBT X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2017 18:12:02.5973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1026aaf-995c-474d-6467-08d52541e1ea X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0159 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 f51462b782d5..91f859efddc0 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -5163,6 +5163,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