From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbdJDNYf (ORCPT ); Wed, 4 Oct 2017 09:24:35 -0400 Received: from mail-cys01nam02on0084.outbound.protection.outlook.com ([104.47.37.84]:31550 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751694AbdJDNOv (ORCPT ); Wed, 4 Oct 2017 09:14:51 -0400 From: Brijesh Singh To: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: 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 v5 06/31] KVM: X86: Extend CPUID range to include new leaf Date: Wed, 4 Oct 2017 08:13:47 -0500 Message-Id: <20171004131412.13038-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171004131412.13038-1-brijesh.singh@amd.com> References: <20171004131412.13038-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: MWHPR2201CA0056.namprd22.prod.outlook.com (10.172.59.30) To SN1PR12MB0160.namprd12.prod.outlook.com (10.162.3.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d60d7418-2da5-4f94-d5ce-08d50b29e472 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0160; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;3:KD8f6npq8YSn8nvvIo8V3k/yZsWDl7HpzDeUXtJ4Og4u59CPfWEaw5QDyVwLm+LiwuA2+sjJRskD3nBpvv2WTvAkdpjKutoAnj7RrGAK+hK5UFsWQ/YAtIC1a6EByn+gCHXsUFbwffaQ8bgBwEkEHwFwtbiJZMm0z40Bx3pQeKHAch1k1+mSk4a+8YpRqCmnyug0RCGnN1m3gfe+QZg3k1T4JM1Rt+zMQq4VbehHQfLwQPzrRGpkFqPmfMp9/qZK;25:9noCBCBJRanWRWOtQFz0SO/k4290BkoyKq9Vgn4Gw0hr5o3Sgo+fYWs9NHg94EIg1t8olMUl+DVkd25OwNeQ9N+4IEche2vXGSFnI7lR6sCQQa7ul+Lo6thvEIJSZYGzIfeKtwv2stkLb1zpIYb9/Cnio6oYA+N2VJ031EEqxXyaLRREM+Neh7lVra+yduLBe3+xJHdHhL1KZuOWl3OZllWYnT37GomStFievd3FspoIrqzSk2Bhoc4aj3cj5zO9EE+peKyZHutKjKriP1YW8CUnBhPSI0RSOqSma/uBdFXH1bEIjiCBrkZUe4phkm5muFcOanILMbWSG3YPfkuFQg==;31:VNN3KidZPR3aAJpw5oXDXSUKw6AUdu2Nvvxi3Ff5/rLXv/ohse/Yqkvle0nJhNLGPgASsbWTAil/Af2USl47O5jRf/3UhWSJmNNDuc5nV/dqwkv6G811vTAlmoyS3Dr2DEkOufag2jIEktCs18u1AFFQ33t+vCUwk154KfX1pqIrup1UIK6bKdYC1fB2iCXtTzUc1ErO/vZDzPX7/6ouUGn7YCWkks1qZbj/OoEkS/w= X-MS-TrafficTypeDiagnostic: SN1PR12MB0160: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:BgId8SQqaUgHw3HGQvt8Dntp1UMkBxl7ofApPHN7UX54xp+eJVkCUS9FBlQygXZ8rdli/pfhjbE+yAb7aGIdQpApvHFiqCN5DDFd5s5UxhFC/3lvOlAOfSqC8n+feAnoySEcV9v4OKC7BCZ19JMQBO/CsamsFA0kDLm0Gg/siEppFFeyAf0kbxvQnMsyCNftAqughdauE/dff9DeTDtHv7Wr6JYQMTRoPdVqvYX3OErJkeDh+jCuKna6E/nHNSSjno6hwop+UtCCFE6JDrCEdxPrzijzm6cZpHP7DCd8HeNQqNYuNbB5Wwy3gD4Nz3jRQMM75YqeCfm7NhZ2XmvWmTK3UOIHPeZDiBVszTIDR2OR9b6sfuSyofbo3Jtjo1VXtPkLLfd8xjS8uiTmBLxHR6rDjRLSRwEyCHMdfUuAVCVbid+ugViMPOBuLyAws8hrA5oF9asdvO9BZTf/XDWEZC5ENeHdYU9Tc7Ao5FJ1x8S4fD34fXtSHI+lnm53TCo6;4:wHqBOTGppmzwZE1Td7k2oRqr/GEgn9dQ+AfOeJUcrVioX1NSt3A984sHuHzuYn3hp/YcIjS0dxzRle5koC3eVLeovQkHvxj0UJUxHv4IoCy7eCbNsS8jbio44g68SJ1uepGM4PqB+utgaOnj3SOBjr3dwWZ8FvIwLdbciG1JDjg8zPsoD0yn6BmPCR9t7ktiQodAQJHy3JnDxSHWcWHPwpL7+4n+OQRp+gD6Hj7/MlSpkDnvfnomm7bGR1C1+1Pqt70whBFAtzWojDqIlYgMKfbBAQg4imroXA2b1Mlwa/n3XYL7D4okth+QsmUTArgEkuIJdPtzN/W5MHTwZRJ28w== 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)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0160;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0160; X-Forefront-PRVS: 0450A714CB X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(97736004)(86362001)(23676002)(76176999)(53936002)(50986999)(1076002)(6116002)(3846002)(478600001)(36756003)(47776003)(101416001)(33646002)(6486002)(66066001)(189998001)(68736007)(105586002)(53416004)(50466002)(4326008)(54906003)(8936002)(305945005)(2870700001)(81166006)(5660300001)(81156014)(25786009)(2906002)(8676002)(7736002)(2950100002)(7416002)(50226002)(106356001)(316002)(16526018);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0160;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTYwOzIzOmlLQjRlK3NNdExIZHU2KzVSanJjYVh2aU5h?= =?utf-8?B?VnpER2pabFhNOElqRkJxT1RFRmVJbTZueHVBSElubEZjdkRScHhhbDZkOXkw?= =?utf-8?B?aW9vUXd4WjJNWUhjaXpRdlpyTUpseDBhYnhCU29DMkUxdmFzejg1Ukt3Nk1K?= =?utf-8?B?eXpFcUFQbkFYNENJZ212SkViQzFwcUdyenUvejd2aCtmUHJlZ25UUGhHVjJy?= =?utf-8?B?UU9zOHBCNHFJUVJUZ1F1eHExbUIzSitidzJGcDJsNk9iSy9ZbmpvS3lpZW1D?= =?utf-8?B?VXMyZU10N1I0ME9HUWxJWGRBK2xiR3dyaDkyQ1ZVNzc5SlFadGFpQ29VYksw?= =?utf-8?B?dy9EYkJSS2JiYm81ZG45eFNZL0ZCRFA1RlB0d2c2OGhVRUY5THJPWWYxRzRp?= =?utf-8?B?elhaVUY3eWxsTEpCYWo0SzVNeHJPYWxrdFlSU0R1SWlpaHlrdEdoNFViVWRv?= =?utf-8?B?WGpoWjZwTGNBSndtbFdaakJOYnZlME94L3F4TUFPbm5ibVdsZkZsZldmdUpl?= =?utf-8?B?QzNqSkRVUm0wRU05aEs2WkNPdHhRSkpTcVZ3b2Z1MHhtVUcxL3dFUGxxN0tl?= =?utf-8?B?MnFWcC82RU13a0FHMXoya2Q1Y1ZhbGJpRFk2V25TR3ZJK1g3aXpMcFNvWHNm?= =?utf-8?B?dDhpNDZJUTdFY2pCSk9Uc2lsVis5ZXR3UlM1Umt0WVhoVFpWSHY4ZVpBSTdw?= =?utf-8?B?a21leXV2amZSazlsL0RrNWJRZCtFK2ZQTHBwYTVCaFZ2eGI2a2ZLdVp2Z0VM?= =?utf-8?B?eDVOenMvUzFSWjJhTHFqZUVkUk93WGZFSTQ3ZUVNNUR4NFFqV1JKc21iTXA1?= =?utf-8?B?Q0c1T2tTNVAvWXI2czhGb2Ewa201Y3Q0LzV4K3RxMXEzeHdYRGUvOXdhM1BO?= =?utf-8?B?T2VsZHAzbDljOS9tdEd2MVJrVGRTT2ZRWkRLbFZFS0hLcXRKblp4clhoRmVl?= =?utf-8?B?SldodzZYZFUyWXd6Rzlqd01IN1N6RkhmWlJVd25IV1NZaGxQNFh5NzVMdWpS?= =?utf-8?B?eTlUai9sVDM1R3N4Sno0SWFmVTFQeTJERlZuMHRpOVhsZkxtR0taRjJlSlFj?= =?utf-8?B?dzlOdjY2Y2NBdEFBTmVMcXZzL3lrUFZvbnJHSXhXaS82blNwajA1M0FEU0dI?= =?utf-8?B?TUdkeEhRNUlOMzdkem5BMWduTlBkS1ErRERHejNqakxYOGdWME5tOWhBM2Jx?= =?utf-8?B?bWtYdlB2QTFGMERJNS9RRkdIc1EwOVZaRE91d2lrQ2JVQTgzSWZsejVuZkNi?= =?utf-8?B?VUh6WnVWTFFPRjNZaWpnbjlCVElBd0JDMExrUEs1U0cwRE1MQitidWFkVndx?= =?utf-8?B?K09tSUxYdTF4K3N3UzhLL3NubFBGUi9mVmRwY0NzNTBRQm1nd2hnNFZ0ZzJT?= =?utf-8?B?RkxLc1BhTmRJNXZlKzlIRjBwNkhrbW1mN21yOHZ6aHYwMWpVRzlUOWZ1UlRR?= =?utf-8?Q?aQe6P1Yw0UDijNGHQThJ7oSy+/j?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;6:bql2CISi+hFvCSH8pK+nK7UmMAa2ltD/dQ955PzkelzqsvyeQFvfgO2FPG8193uvnuMP7+xD8C1guHNAdCuLfj2C2HCEps30b6307wDyYAEYglucGCDqTwsyl0ArRIvfpxeI2f/tEr7+6/zO9l0c0TDpgJ5CfU90loHPsLxpIk9jOOZZVDa33Bw74tdYTWCWFVkMeyfJ3s0wRH525iFib4vaO3zDOhxXv6Xr+iYhd2qtian4Gz3MZqP41bdeZmfeSgOrPUk/7qcL0v5OLmAMcdiSSDtzWVeHTqlsWTtkFBkSKo6u9pE/dMHRuOzmwbSfa3M1asQ40ZMsrN5Eu7znJA==;5:HCsyJH6e9NWRqskpnPqJu2GdM6wq6EtnA/Lq/Vr4ypZ4nQZlbwP1wOG7wKNNlWNoChIx7t2+A4ORfBbPVbGC0l64MHiowKIR9j5DrBlg1KBbtFzR7mpm6y19ikfYg3PQhM8aT94pMUokPFSQ5ZUQXA==;24:+WnvbfHIT3gU7R7RzwOfCrdOUXaZ0R+CzfWHiv+IhXzv3ReVd74FyMJxUvAo2jxWt4TzdKU0L4G+MPN9+o7SbClGgrkgGAsbpOoZ4ol/KxQ=;7:mvXzRXliZ+DFwpU6uE7Q8MQuHD9mkhpPUgEunBUb/sIyJdEAl6eBYVK06mY1nMaQssT/PI0sRrz88jA3bnhjQgnJDYazURLDT7cBoFijoUL4GLjvZctj55/FknrrLUq7BXIZZusALXk7yJSHujM9Bo6xsXU9znaDo6bIEt7lWmxiTwcgh9dCS2BBMZo0IQr/kGpE4Nvc3Ju7QdwutjatOhwD5w7atl42aMgEI/hT6Go= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:a9L1j0GAMPukl5ByoXMg/sZ/JugLjrDcq5VoPjCHcrq2MsnLcm0DOIBNX290MWH3IiFIKMzAr6KgE6Nu/c+8pu3nMNjRRsp7VOrx5vF5PA83TtUjoqDOJFl1f7TOL1pPGwy+Q8xrGqsgqcnSmbjjuHQhn/XjHZc+j5IQ1RuGi7LZg8qEuv96UvmVZ4a5FWnnuq811W1IIcGBnyIM2+lusdgwQ4NyvzffHp6MIQWLFj58EOBl3P4D5UUexYi4G0A4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 13:14:48.1308 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0160 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