Message ID | 20170919204627.3875-11-brijesh.singh@amd.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <kvm-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 94B616038F for <patchwork-kvm@patchwork.kernel.org>; Tue, 19 Sep 2017 20:56:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A60628EE7 for <patchwork-kvm@patchwork.kernel.org>; Tue, 19 Sep 2017 20:56:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EE4C28EEA; Tue, 19 Sep 2017 20:56:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE38B28EE7 for <patchwork-kvm@patchwork.kernel.org>; Tue, 19 Sep 2017 20:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751520AbdISU4H (ORCPT <rfc822;patchwork-kvm@patchwork.kernel.org>); Tue, 19 Sep 2017 16:56:07 -0400 Received: from mail-by2nam01on0052.outbound.protection.outlook.com ([104.47.34.52]:32170 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751783AbdISUrG (ORCPT <rfc822;kvm@vger.kernel.org>); Tue, 19 Sep 2017 16:47:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=nfd6tLsc8UjnfEvGYUJxpW57dqn2QQzl2Dkgb+hBHPg=; b=UTu1tvK6MBNniVSzFBMlGJqIKQFyVWgW+I+9BU2ltKmBnR+y32y36KjXoslQnC3ixJ9sOckwwfF1bqv4u1ei1+82eszYp+oTrgeh3mpQWUDAyQJWnafh4x0Gq7J6uG5B9nIQH/CK1udTrQSDNCMaB5UjVoknS3NJDaC0nQpt1n4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from ubuntu-010236106000.amd.com (165.204.78.1) by SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Tue, 19 Sep 2017 20:46:57 +0000 From: Brijesh Singh <brijesh.singh@amd.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Brijesh Singh <brijesh.singh@amd.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Paolo Bonzini <pbonzini@redhat.com>, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com>, Joerg Roedel <joro@8bytes.org>, Borislav Petkov <bp@suse.de>, Tom Lendacky <thomas.lendacky@amd.com>, x86@kernel.org Subject: [Part2 PATCH v4 10/29] KVM: X86: Extend CPUID range to include new leaf Date: Tue, 19 Sep 2017 15:46:08 -0500 Message-Id: <20170919204627.3875-11-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170919204627.3875-1-brijesh.singh@amd.com> References: <20170919204627.3875-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: CY4PR04CA0071.namprd04.prod.outlook.com (10.171.243.164) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cd97446-6240-4dbd-2640-08d4ff9f91eb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:S+DLJ8BwcGQiwSzRzXWmHcT5fVbaOJvQzLqnhfEoWregGLIqU9hjk28eYEIELGJV6Jsey/GIGWl9qOPe40U9gxGuaXH0zpOi3pfBJAzAl9mmcL0sJJIh56COYLianPYRxCyoOIXLRpklIV6jTVlQVGWJ6eBMgAMXGHrTuV/B2Af23J+LVM4EwqDVAPMIfAp2JuBXLLbcBVclbamyRKisbwGmIdg2SwnezeyLyiLZkxmyDY0I4XJez8yYHfemFzED; 25:LIxOE7mbAvc7qQZhXx9NuFqVtT0lt2JneSm60wFjcQwK5+eRK+2FC28wAsAyQ57jUMWOEA/ohAiO9YJw52vVwec2u7G6x5iwf3cDVu4NIKpmerol+XmOeVW/Ir4XbXRx6rX2ZziXXvs8qksLxIpUPPEpzNWL2FpsYIkKCkXILJdqvaCV8L35Fn07sM6sZf0sQFNA80zFgQ8fsmaYoAquFx2TPOddpV8pwbP2W2nDm0nPHFft049SGCfGF+sFCeW+4l2osAFMH8eqmjNbxCBLMRuV3JxFq13h5fYBTf8L99cRHYjS2uAFO5b1h09xAOgMQnA8yHouNVMuVtKmdBlJrg==; 31:eR24cit+ZCwHMXEatSoOSgt6NPCL7xm5tc5Yh8zVm7OqRXXhCMHZwXeyv/VMHN7zf9xaDpIUsw/cnW1MCL6qloD2srlDfG38MQ/WX1myUezznkF/EDG4hV+F9NPGGlStWwh+ephWCCGuyVFxNXpDDIqQPFIZHsgGIIx57VgN+dX0YNccKZtW1WZsaPPwotayiTNOMgvpc9SrPd/m21ORjAIUAzB3SYFqNwYeiyIvvl4= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:y2cIndUYFkjAjnQa/O0aom8pS7v15JSvJ8tOV7sPbmyDK7exiVgpoDNAIZbrPpTWrb9wvOxEYdaCUpgpmk8Xg4btIDAdeX4f0fvDI5byR2HoxVUMgiuLsahn8pdRI0zB3c699vD04JM9eSC1Iac44sxX7FAY2L0PMJNCPtsXhWNA7/lxaR4aH2MgqnbFesAVN3nnOx6iKTQLBKmSpVPkePGFbNxuVD8jtRlpHZKAdk4OdyUZr/4a2jJLSu5rnAecj3sPAT2zB4vb0QpMJ0uQkLLxM7VD6d1eCI4sHTucH8qn05+Iy0t+1/4CItFMVFV9YGCtwCQlBUBdOCsFrs2QxlaFjdD5iRdSJW/v49Yoc50/UGAXOBon7/aC+Ut8Q9Eamn+dcybggKTX94NqEL27CjybNRgdRLi25eAwnLVzAHd96O/jW6Kw+tGyOFUDFojGhjr4Obh8YMLP0zNh6lW+/mW5dwh8GZzF6fU0G9iu3jNxCJzbDFpTYeoPQzXC03Hp; 4:Yf/9PQjfilvzsNLo+nNBzo7XYqz2ge853UCXXTG6QffWg/KaRSIeoy6VE85nXj6zh3pwmI7ZnNov8G6uLrPT61ZyiZ7lwgr+pfD0Cl3EB0XHy5UcgTfG8Kk9PlEMbM5ESZatfESsUinN7dQ29ZIEthQKJSfwrld0PL3gLJqc2pWVXvfWX7Xmn1JU1b0WR5BSsmwkgiZLVhz6KWoQaBf0j6qIGIfE28cNUKM6bzyic5joyIli2BgcW7sV3RYT/9kJ4a1L3iRLfX+mkQZf4huAfG/VU6dq6eUJpzLmgTqzYttAm9YSJFKgdC9Mm8MrxK2aINm/lt2FbXCwb04Uh1/7xg== X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Microsoft-Antispam-PRVS: <SN1PR12MB0158BF962C5913F95506F68AE5600@SN1PR12MB0158.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR12MB0158; X-Forefront-PRVS: 04359FAD81 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(86362001)(50466002)(8936002)(97736004)(6116002)(3846002)(7416002)(81156014)(8676002)(50226002)(2950100002)(81166006)(316002)(478600001)(16526017)(6666003)(7736002)(66066001)(305945005)(47776003)(6486002)(189998001)(53416004)(25786009)(101416001)(2870700001)(50986999)(76176999)(53936002)(2906002)(68736007)(36756003)(106356001)(1076002)(4326008)(5660300001)(105586002)(33646002)(23676002)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:ubuntu-010236106000.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTU4OzIzOllRMGo1LzFIYU1zUi9vVThiSEFqdjBpL0VL?= =?utf-8?B?aG9wWUR0c2tiLzk1WGExcTVXd2dqS3NqR3ROTE1IQ1R4aXBERmpiS1ZRZHVJ?= =?utf-8?B?NnIrT2lHdjU4SkhWdENWTmt1Tkk3clBOT3FheHliTXl3UmpWWDRoRVFzTHFh?= =?utf-8?B?MGRKeEtmNXJmTDROc2ZpdldaVVVMS05Pd0tsNWU5djU0OGlXdFRhS0hGaEdy?= =?utf-8?B?Q213RWZNRysyMXhqaGQzaXptQ2VlUTUrS1F6TVBRSGV0SzZJcFZxbFNjWFZQ?= =?utf-8?B?VjJieDYvVFFhOEkwVkFGZkZOb2UyUEVyMFRnZzN5TFdNcER5TktvRlRMb1ZP?= =?utf-8?B?NjNDemRMaDUzVjJrV0F0SEpBbGxwY1hCbkdMbEk4N0FsMW9TR1M4Y21zWUlq?= =?utf-8?B?Q0VvR0laaG1yVUhrNTBvSEFzemo0amxaWEFTeGh5N1NUcTJmY1N1SkdMZ1F3?= =?utf-8?B?MmNnbENrcnJ4LzhFekNrb0grM042cHFveHlxUmo3c3J5dWoyeXpXaTM0eFRW?= =?utf-8?B?U1JubG1YVzRHWUZDQVpjZGtwYTRjMytCTDUvZkFOaWEzNmNya3k5UVNmb3pG?= =?utf-8?B?TjlJU3ZWQTMzVmswbjJCbHI0clhSS1JYYVRxZGdEMGZ6cVJXUzdBWFBvSEhi?= =?utf-8?B?VGwwQWxHbXRJOXdtRHJBd2NoQ0ZLY1pvREFOTFMwK21NQlhQZzJHZG1UT0M5?= =?utf-8?B?VGlra0VVZ3FBQ2VkT2Z1TEpMSVVlRE5OaStpS1lWS0V4NVhFU0JDZ0VWTXNx?= =?utf-8?B?amkzeGpJcEs4QzU0VkJZMENHbDJKVVk3RjhFb1FMTFlZaWtFWUJuaXhvdnVj?= =?utf-8?B?eE11QmlWdml1NHUxY0szUldUOXd4aDhaeFd4N0xpaDA2dHVoQkkxMFFqNU5l?= =?utf-8?B?S1B6NHVKNmxWQnlZWWVDMTNwVlcvRDM4dGhtTHI0bVd3aFNIZXgvcEhTUFE3?= =?utf-8?B?cFp5c3dQL0EyQU9xN2xZRkxPZGhUNlRmdGg4K0wyc0M0Ymg0K2RicnVvK0Qv?= =?utf-8?B?MFNZaktoZHFVd2d0STZlcE1VQnY5MDc4dlBXYWVaWVFYa3docHdKVzhlN09t?= =?utf-8?B?S0dKbFRHdndhcm5yUUpjNy83Y2YzNkNwQmg3aTM0Rk5IcG8wMFZWakZVejV1?= =?utf-8?B?dklqeEpUbmM2SllZczN3bE4zUTNlemlaTjVwTmJRNWJja01wMXFCU0VzR3pS?= =?utf-8?B?OW9DNXVGSmJ6OU5ZODVUU3pzOG82RFRPcHIvZ0Q1b1pubUVkb3dycEZ3OW9E?= =?utf-8?B?ejhnMHQzMnY1d2ZXZU1PTkQ4RktIazQxQ0gvM0xwR0lid2MydzE5a1l2UGRn?= =?utf-8?B?b3UzZVkzcWNrUC91RHB1OUJVclRsQ1c5OXZIcGRSUHdKYXZDUnhKTk9QOG5R?= =?utf-8?B?VGVOM0xQMDY2MnZyc2dBeXErV0FqWmMySkdGblA5RkNqZjVOaWpYc2x2M2w0?= =?utf-8?Q?WxqM7MGwLSY1RylwF8bkPLPmIMn?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:qAQWO1ah/KEaxYgWwurq5o9XO93acJOpHxTyolaqXeAZZY0mSAlYxtsU+bGtUivCtyi6+KNagiVzaGJ+dS9P1o4sG1mPTcPqFDAb4UvmoEzX4Pm+WUss+oe2bGed2ooFFVWvOC18Teb+84o9AC7oONbLWeogRdEsFLQf7to1AM6T5kM4SGcyar+B+gyYEtnmOgo9T4/3XPwU1HxRviDGoz6Zhxti5jQIDS1P+wkuuu1pdoT7pfxyMywn6pFhzNd9Q2yftLnP5b7AU+nhEDlUh6g6KqvoX1YjUXDDQrZuCGRyS+0b9mka26G4qGX6QtIZ02uuq8h0CCpR+iXJ4q0nJg==; 5:6Uve4O7Lco4/OsQxHmoMrjBx47rTqzA6OjOR8xbTV1lgmqelOxRvRczBWWytOm/ATvTTWdqBvL4/OGmpMnuU1aHBzJn1PdgbEn8fX1rY7x6NntF2+SOapDPglDJaYJ03xf1NGXT7xXIvbuslgPRPng==; 24:D3cOSLscDfaSozIFcPv1aNNYeOiyGSV2gPyDzwN/CaKRAX1jyZt23zXZuy5OuHpg5nmXNlxiQxbcPViY3MhxzmiRtobtGar6XplY/90W7fU=; 7:yIf7u/5sGOZveiscAEZh0Mf5OncejSRsAmRtUgnVYSEHHmRzInf91XUNnfOFq2dvwH6fAjRUnK36W21rDPf68VBIMBXrXpFnlvKlR/UoMjz10am0bB4ahVLpppVYkJbUru4xEmxOMi4RoVg0A0PI2K2HqaqQZBo5O8wrjCbWlEnp1vuB72Tp+R+4tESqwYV/NPGT+KS8z+Vgd5+aUi7rQIFIi2y2LxRNqMUrGqH8XjM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:6G6Z9ee8mUMH/bl+rnCckbamkRA9M0AV3EP3DTqAInZTAmQOIlvh+DOrH/hj/OojwuPBGQJbs+7TfqJ/MFJqJOxwX/HNtdS5iQikdnomMtFEgluFf4sJmD/E7d5OgpQvQSI5t7190K/CIPvTYPjEMwdypMrryg4XQ5Wz737G/tK6hGcqn++bLoaBOE/pGUv5Oa3kwNmaCWB6/+UOnLFszlyhgD5h8LoZdp+o5wnNjgYiV/FJRdU30Jw0eVN6zrHN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2017 20:46:57.0324 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: <kvm.vger.kernel.org> X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
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 360f4b90f48d..3535aa510194 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); + } }