From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbdJDNP3 (ORCPT ); Wed, 4 Oct 2017 09:15:29 -0400 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:59363 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752348AbdJDNPS (ORCPT ); Wed, 4 Oct 2017 09:15:18 -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 15/31] KVM: SVM: Reserve ASID range for SEV guest Date: Wed, 4 Oct 2017 08:13:56 -0500 Message-Id: <20171004131412.13038-16-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: 4e1b87b3-9cd4-46c7-88c1-08d50b29eea1 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:5nyANh30znrbO8lVNTENOMmPVOa+W5QJn4MI3dhLlQMXpPj/xL5ZQoudJnkODC+mqFFbAaNLk/tccEUzMJtXI0gu69UOLqx7MSBvgBQ09Ihfj/nRYcB/WG4PqUnCXmtLK48Sh8sXANeKZVmkfvmXJ2j77o/J82T8kOLJQEXWjTMexhujmUGc0Vei8v3AOMQBrubIR3wCLAapU5lNDaT8uJ4N2BwFL1/Q51EXXYcNsEYBED/epuoEf48NLs2Hz3xv;25:AcRVISQNtd+lQm4FqvBTJSXuJsK07EdPCas82lRYPDLatdSnGypqzI37j18f8t7DJr4QBq3pqEc9GgwfYFjoGY09NKyrjyKflfoliwPO+ie5MvnfG9JLSs66R74pMYqvIUMWZssI0PJ49caXRhT4xmCD5g2bcOM5FZnPM5CO2YLzZVnv1nm8gHcl0+T0L1wv8td4CrUgcwid962ne6IHj8Xqp+ksyBf+/hH62W8WuG32azDMvwXI6FU511XcMqjsKP6/Ffrx+tw+CJW8Bx6pLb8hBKZh8zLQJzIxlO4dQRuNcpGxCMxhj/ZNNxxWXChxmyuYO2soWtjfaAvp6UxdQg==;31:Y4j6Q1Kr4VJ54OkOC9F9OratBuir0eBsMQ7/fkpjQ/ubllFdgQUB+KpBwM/bAvSYBpo9ArNp1hmWhFZyKLYNTMh0BcSBClwIbgdBs9u1RoZtuH8XgscJ3mxBHllngnSMxMPfwibuiFXpWVgGiMO4aHr/cdaluJbSvsZIwjJnixHtXtv0BrU6X/0JSgOgES0bMzHfUA9OHU7H4RUDyTNsqYddMciGAT2Zyi3+oqYm4vA= X-MS-TrafficTypeDiagnostic: SN1PR12MB0160: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:UsUftn8/RYnr4nfZx6bSCb11U15Fe7A7O2FJyBAnGWerzgGD6qFT2jzQ5vG+SaAyvE7P+mTIlJM3PD/uSlWXKwIDPS5/uI72xBptDfIxxB5aaRMaotWk7uKc5yywWCLQzGcdANJdEdK4eYsE538+sJbCE7fZLkz3yaAu6UQ5ms0Wk9/auf7AQC0q9iAqamvISh0OlYKx8wOdBsWYQ1rcsI168ODik7NrChMhECIPgmRjhwSS6pil8e+ggpNoFPywPuYjReVxynHP9btHXvu2hziwBV+ObX4N84iiaXjtfQ5JY/ijrPuXBoK6qGa9ux/Y791CvNtPAvpPc8tvJ2JAwkEkG3i8Mb+WcXEMpodvK1fkc3A3yjkYp29YoYGeV2KLnqGPfRMc/4PQhKejCLIuGmPTrJV0FFc4z+gwnHs1T/uX9Wiw6bcaaqqnIRu8y1DojlqxSYysEWR2ysyCGYvqd9eqaj8VuEBLb998hWard/iPogJTXWGqROxGfne8Vb6B;4:/3FoKmCei9yMiCfZQBGoaQY22Y934JTtL9sD1rbaxB5PL7khD5ZByyH2RKlZahU5lHqraNnk73IHOI4//THPRjfmbUKnrI3X7Xu3RYHosGiMufkibsEGFc98pru7+cL/O8+jyHpA5cDaoykaM9XWJd6Rtazwzd7hf18apOogfetHiXvNPEyfsagE85BkKQb/DGBv8214CJ/4/hb2B1oZWTOtfIDf+9yeFhmOy8u0cwN/oTnFnGIPJtxQU3UbmbymgjJehsZ9rYaot8/Z27eV/mK05PiV/HIN+tt/PaXO8/mat+N0lOfy4PXSkQkkBp8Y 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)(6666003)(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?MTtTTjFQUjEyTUIwMTYwOzIzOkdUN2dFNXF2aEhxZ3dpRW8vcW41VVBTUUpu?= =?utf-8?B?L1Mxdk5oam05ekV2cGpxbTRZV2JLa0dBTlExVGg2ODAzcDE1VEsySDh3cUZr?= =?utf-8?B?blNOaUxRcjF1QmFTM2dUK3JBT2pRR1U4YkRBRHNWU3lYQWdnRXhuL3ZUUlM2?= =?utf-8?B?NmJEb1JtTVdqWFVVUkZTYm9qbUViNzMwY3JGVWhvMXZ2TVFVUXQ3aFpUczly?= =?utf-8?B?UzlRRnAvcFlseWhPbEZDdXNCM0N5Vmw1UHowNDFydHZRVUE4a3o4WFlYMDI3?= =?utf-8?B?bDM2Q1FkYkk2eTZBZWd3a2d6ZUhpRWRPSmpuWWk5c2FHeFgrVHNYN3RFbC9J?= =?utf-8?B?ZW1WQXF3TTJoT0dDdDhpUjJwb3RqMDc3Q0xHb29WYng3QVE3RFUwaFFReUhz?= =?utf-8?B?U044S2JQL2ZQNnJPYWNCWDZDNlZPZER1TkMwSWQvMXVxTFJ1Y2ZXc0YzUEdM?= =?utf-8?B?ZTk3QThYaEFVSGlpM2FIV0tFL2EvS1cyY3hpSHN1YUt6NzVkMGJUbXRuZ1FC?= =?utf-8?B?V1hUdkRhcjVTSXJvREo2UTBCbjlXTTJESEdlSFRlL1hWbkpTVmtiVWRlVkRp?= =?utf-8?B?Vm83SUVBSHRoREVzN2hTc21WL2NYcVhGREY0VnRCL2RCRmRKa1F3bWhCeVpY?= =?utf-8?B?aW9ucjBSMUg1cFZMT2VpaHhkWFVDQVNLVllVejhERTNEYUdWZTg0RWlidmFX?= =?utf-8?B?aUpxRG00NlFTcVZTcndWNkRFSS9LQmFxU2ZCRjBzZ01zNUZmMDl2NWZHMnZh?= =?utf-8?B?WjBpOS9HYytzNitQTmdxNnhoZUJtT0xsUkh1OHlMSThrcWpiZFlMdnFDeEIw?= =?utf-8?B?b1p3ajllYVo1NldxaDZyWnBEVUIvT2NZSmwrY1RwWkNxMFM3dFhvVkh6Nnhj?= =?utf-8?B?R3YxS3ZKZkROS1djbk14Q0RKbUNvZ2pDVDRiRmNhLzVwbXhHdi8wY3lLWGhP?= =?utf-8?B?bE5xaUZZb2ZRQnIxNE04YVJhYUxQS01yUElvWnlWYWZFbjhZUjRJNGpSamhX?= =?utf-8?B?NjVVR0NXcXZGOHpuQnBtd3pqN3BGVmhaakQ0SWw3VldIcmFDajVDZ08xbEZP?= =?utf-8?B?TGVqaStMMGpMOW45dytPK3VPQzllS3BqNkovR3Y4T1d0endxdURLQkxyUjFM?= =?utf-8?B?OTBObkZxMWJTbmFYcWdtT1piOGFQUUU3RVN6Nk5HY1NqcjVuV3ZPSFFiTjlL?= =?utf-8?B?S21zOVpkTlpMQlkwb2pYcmt3WGM1SjZmZHVpU1Q1Z0x0d1RnRVFWZVBnNm02?= =?utf-8?B?RjVGUE9aSjMzeEx5TXRuVEJXRFpmbVZtQUR4NlNUKzFPUlh0VTE0SDRRTUwy?= =?utf-8?B?WXdMMnRERFo5UWFPRlNkZkE4MXJvT2xuNzR6Rkh5TkRNdnYzUTN5SUJ4ZmVy?= =?utf-8?B?R3h5aDc2UmwyeUpROGFxaG1IYmVIZzg4WHlTM1pvYnhuUDhtMVJESmt1eEVJ?= =?utf-8?Q?OSWLb+4Q77ktBzkWHw2NkhuBZNM?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;6:I1J4bh3tpxnEv2HxXIC43RQMwNmYlfQYf2nSeVAQuGRXFbVLRZPeDyIs+43jptJC3S89vWeXJATysmugkPqR61LhjX2Z87JsZ8H+WcZsfoYlN7rQoCZeIxp2h4pMhXgJ7gIIlEgZstNl/jYuLs66E4TK6uvSZH4At+K7W+2axmm0oA3pSJS3mNVqeFnc9A/fydGaNaQ2Z3xA7VqA5VrGFF8GmbOGoX3MqR33hj58tj3I2ULdWtKx+VIZqs+chtP76ljw6IO0EEYDc9hE6dqg7nUIxFvVS2ArsXUgcCdCAusep1xbcD9FdWsz8vlGVGyqI8v1od5q2i19qdT2bz8aEw==;5:K/ksD55OXO311whKs9huOcwukL/8x2x8ttXpy68uNdIpz6BIMrxzdsZBfgL7nNReCB2X87LO1eOLdFmJcXtffnoYdbbPnFHL/6RvOpTGWnZuDqntcJ2JP0bTTw/V47KZpFK+ahlRutRfOvVZLVvv/A==;24:8FCkrAghyPhUYYReNQmzTcOW7rerfIXu8g95pxdpVO/oWyjlGD56hkyz12xsWo9X2JYG1C7ZhqQ9nGJqkg5Ee1Rtd1RZobMcnJDsgfcFRw0=;7:ewiesQeyFQIUakHbQGTakrCivDhuVcpHMbamPRzX9y9vyEkQe5k0UuNLY0coPufMf9pjZWiUhqPLA8HG3M7tPY51hy9m6b8NTfLf4u5ym8dJe7ZVtN4TsTVdskm03JkVIABQsmVspN0f+gEXGW5kDFCH4aKi5Xp66PH03zAtfHZHVUhH6ThqxTL56uU86OgSADVoLPkpq9/ipk83rAq5twDK6Rjyf8DSKD1qCR4qMqI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:kNcMDXoiHN0VQaDVZUF+78iXfhm6FBEIkwvWndQJ+t8Yz4OvdWmd+MKJZ9x+obtI18cSMNfptrvLkzDLq0Aq9f3YwPSHBpyJ6cGBO1qTFu5KEq+LQvuKZNg/LU2SQhBT/GAYV3KmCnIrWLQN+qJYXpf7vRsSNYKvp/F/2w3SVs2ETbIOM2t3D/KXwKEdceFyIXiiP3RDGqH0myEYsTP19Hgx0mG3z+xr3aLiJpNrb50607wUgjpgegBzajjQMJ1q X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 13:15:05.2140 (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 A SEV-enabled guest must use ASIDs from the defined subset, while non-SEV guests can use the remaining ASID range. The range of allowed SEV guest ASIDs is [1 - CPUID_8000_001F[ECX][31:0]]. 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 Signed-off-by: Brijesh Singh --- arch/x86/kvm/svm.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index be2e98c01b22..3244b8f88010 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -323,6 +323,8 @@ enum { #define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL +static unsigned int max_sev_asid; + static inline void mark_all_dirty(struct vmcb *vmcb) { vmcb->control.clean = 0; @@ -787,7 +789,7 @@ static int svm_hardware_enable(void) sd->asid_generation = 1; sd->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1; sd->next_asid = sd->max_asid + 1; - sd->min_asid = 1; + sd->min_asid = max_sev_asid + 1; gdt = get_current_gdt_rw(); sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS); @@ -1054,6 +1056,15 @@ static int avic_ga_log_notifier(u32 ga_tag) return 0; } +/* + * Get maximum number of encrypted guest supported: Fn8001_001F[ECX]. + * [31:0]: Number of supported guest + */ +static __init void sev_hardware_setup(void) +{ + max_sev_asid = cpuid_ecx(0x8000001F); +} + static __init int svm_hardware_setup(void) { int cpu; @@ -1084,6 +1095,16 @@ static __init int svm_hardware_setup(void) kvm_tsc_scaling_ratio_frac_bits = 32; } + if (sev) { + if (!boot_cpu_has(X86_FEATURE_SEV) || + !IS_ENABLED(CONFIG_KVM_AMD_SEV)) { + sev = false; + } else { + sev_hardware_setup(); + pr_info("SEV supported\n"); + } + } + if (nested) { printk(KERN_INFO "kvm: Nested Virtualization enabled\n"); kvm_enable_efer_bits(EFER_SVME | EFER_LMSLE); -- 2.9.5