From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbdJTCfC (ORCPT ); Thu, 19 Oct 2017 22:35:02 -0400 Received: from mail-bl2nam02on0054.outbound.protection.outlook.com ([104.47.38.54]:2647 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751921AbdJTCer (ORCPT ); Thu, 19 Oct 2017 22:34:47 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@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, linux-kernel@vger.kernel.org Subject: [Part2 PATCH v6 06/38] KVM: X86: Extend CPUID range to include new leaf Date: Thu, 19 Oct 2017 21:33:41 -0500 Message-Id: <20171020023413.122280-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171020023413.122280-1-brijesh.singh@amd.com> References: <20171020023413.122280-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: MWHPR1701CA0020.namprd17.prod.outlook.com (10.172.58.30) To SN1PR12MB0157.namprd12.prod.outlook.com (10.162.3.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 031ee0cb-a858-4f58-44c8-08d51763201b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199);SRVR:SN1PR12MB0157; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0157;3:7xI88g2V5irNUFHk4FzIQPDL8hAFn21+GZCxWhf1aocAY5pUV9v9lYlt9UNjhHHVJfonomcsvmIcW9/NnfVjUVj5RpAwdzex2oIBpvDZcngWhKUb2C0nZYxkFsYSNirVveFOVeXD8MNpje8rkVognih9feZV19KCjDBnmCJRXCmfQR3eds+htHtqECx73BpQts/+qibS6Qap3q+TI/aYeiaq3+WbRAOCVc3TFdvVCsricRsxabVI20uX2Ilbb8y8;25:f8Aji/0MoShTG0apgyMPhIdH3C0jSiuC+EQKMC3sv5FP/ITfiK5kBfUMfEy/4+tX+LiHg9GMHNhUehaH8X7a5OqDPCsp2iq4B3o7de+3JOUC16wFaYG8p0wQ//DAgIGOVwh/PnMXOIW38Z3MwdgFM9FcLI82yyyMpGesg7wZml/zbu77ep9pCsmFpnHmZ83SGiU37fce8BKvhvnHa4QFg4HgOsOHWDnTnZPqdXFg0Az5KV8hfS5QECXogmeCC3iHKGyXSEGKsXa7bmEudzA4ssmZeO/ML/QAwxD5AlnjvVUVggGAUEOqIZSdAvUN+lasWedy3E+cRGcn+/LLVvdSgg==;31:qaTMbD6yaWTx9uUzeRl4CRF5y8i701/6ufZtaLqXpc4WAcTSXYrzRZmyrYa6jzdM3+7sM+Y0NWA8IKwLg/gzQs3D00T7NZt5ykekJmKkxa4jZ1CohYykOsR+nO6PqQK2hG7Yk0KMK5BW37WDtKmurrwHIipfXkTtykt1fttPsh1/NuVvuRPkmBYQjfX87uOf0IDdfQjCqqIg2b7+/kPgptwVSk9u+v3SPlyFFYA/ZpM= X-MS-TrafficTypeDiagnostic: SN1PR12MB0157: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0157;20:b82hgNMp7ipD9qV2j2oJreXHDQMp0fxW/8p7RV/SlkF6/DiGtWNfwbWXGcfn2cFnoD34xnvv8x9QhWHKvkFaH0hTQN1i39z2Zowu+LJfa0AlVFeWoIdO/+EQni0cxE6fDgMHGQVPW7U73GMFUd6ok8qr9b7kyJyEIZ7I/0VJKuNStqvG6nMz3JZv91diIJDnHxL6WNeDOsCdL2mu/f4G2wcfY3Mps4gccTVFQAMsd4kboRYlcZqJwZXnvUyH5VifAVKswXq/lnw2f0QcEQP4ePjm06vZb6DuNhpJJz1QwXy/wrv3s7KrpsT3i3YlvuHEtr5Tj6yrFyLNROMM1C/BKrEuJBv2/VL72W9RbjjFkAU9CawTOhLQ3jClxGGemKCPiLrYD0oO/wKE3vDEvEkjKh13+rad6OqCpI/oACHPbcnBRboDy7+JkNXkAff/RDZ4/fkWxkW5NGgtFAGx4QeeOvRa2yU3KtzvyIbPpgD1vEhUCH3EC3BN3Y8+FHILkVgD;4:YRvSZ1RFRuC3UwpAEnx9ESJTtUA46WIZF74Q+Nf1aYT1zZGSWIHcI3PwRSgjtnIr14Uq9Ususr4kor9eHRlqE7iDaUoCLcNBQ9Likmommn8GQ773Z+reQU7ua210WSoiJco2FjQ0qd4Xhis8+Bn3C5NZ4Nm8+Sy5AIvYAwP2rtbUDZrqfNoX99kFVk3THnzfvawpRrdtsnVGAzCM1gpDmkByZk0tLO2CjbIQS8WAtSb3P6pVUAZ0NiUZNgQ941+KjQ2q6whshxtmV6shfMunDbQeJzgvxITHntibx4GKTvof0eAJjK8pMX10T9ohQiIWP++eJrgb8PGs4oRkT+rHUA== 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)(3231020)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0157;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0157; X-Forefront-PRVS: 0466CA5A45 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(36756003)(7736002)(68736007)(50466002)(1076002)(478600001)(4326008)(16526018)(316002)(53936002)(6486002)(86362001)(305945005)(53416004)(54906003)(50226002)(2351001)(106356001)(101416001)(81166006)(105586002)(8676002)(2361001)(76176999)(2870700001)(2906002)(50986999)(6916009)(23676002)(66066001)(47776003)(97736004)(6116002)(2950100002)(189998001)(8936002)(3846002)(33646002)(81156014)(7416002)(5660300001)(25786009);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0157;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTU3OzIzOlB5SVRMdG96VDUzVXNEZGliVVErZ3R5dkdm?= =?utf-8?B?bUlYZnQ3c2tqNkF1SVZSbnFmK2JrMzdKYjI3S2FqQlI0N09BOWdKVnlPSVhG?= =?utf-8?B?SFFBbXVkWnkvZjlEVm9ZcGt0aS9yL2RCQmg3U1B6eG43WGNCZXhWNm5DYlZV?= =?utf-8?B?WCt5MnpqV3RtcGpyeXgwWjhYdlpKaVlEMnMveGZ5UXpTMnJqQ1FXUnZFb20z?= =?utf-8?B?QzZpclh2blJkMnZvb3pyNzlWVi9IcUE5QjFST0I5NE5oU3dCZVRhY0ZOeThz?= =?utf-8?B?ZnZMTU1JRjVBNmwwRjVXbXNuSGxGVWVMdEVwdWgzQkdtZzNUZEtYUUZZK2Vs?= =?utf-8?B?TkRHSGJnNWlkUGw1WGdXV1lkODkzSXFmZGR1WjQxTzVRUlRGVUZTWitrcnBn?= =?utf-8?B?WlZkMHNINEtSZjBYbXdwOVBUTkszQ3dnVVJrQldsdnBOam80WTJFSmFiSUc0?= =?utf-8?B?KzBnVU8vdm5BNlErTVdhTGxLMnpnakZtK1hWY1NTajBLdVk0YWdaNXZEai9R?= =?utf-8?B?TXh0S2NLR3ovOUJyajJIMUp5OXNsNlpieDMzdlZ5MW1HSU9yeEk3a0MzWVhv?= =?utf-8?B?cGhvMUd3bjdCTWNIbjVrdTJPT001bzRmWEhQanRKY2VGNzFaNW9oWFZaTVdv?= =?utf-8?B?RlNsYUtTWGxoaVhYSE03dk1XTHJhb3JweGlvTVJ1UnZCR1pPQ0NOTVNROFpM?= =?utf-8?B?dU1hQWxreXE5aHl6SkpOcWM5V3lCbUdmS2Z5QTlKTmN6cExSRmVtcUxrb3pu?= =?utf-8?B?Vit0RjZDZUNBVFBLbXliU1BGcHhaeGVwZXVIc3g1WE5MaUd6YjNKVkhCdmtw?= =?utf-8?B?cDFnN3lrRXdqSlkrVFJMMXQ1TStlbHJkSVIrY0NLRkQ1L2R3Zm9YNDg4UkNn?= =?utf-8?B?ZFRPbmNlcXhXZU5QbFhZLzRjQ0N1Wk5QQllTZHN0bHcxNzY0QlNtYmU4VWZX?= =?utf-8?B?QS9OSGN5REkxaERSbG9TWjRQTVRiaU5NTFlzTTNCdGZjSytZOGFWakNkSzdF?= =?utf-8?B?STBkRXZOeVlKUDZaWXBHaS95bWFiKzdnVnZ0VldrZmRudjRXdjhzcEZobnRL?= =?utf-8?B?c1B0VndOdFhyNkI5MkxLekFCaVZFZUxlTFRHbFdNQXd4blJ5UndGSkgyTnFB?= =?utf-8?B?alpITEdtRFBjaFBreUY2MEZmNFhnZVpybUt2SjFiRXZsSnZjQThTMFpVQmJq?= =?utf-8?B?bldKS0E0QVcyOXBMT0VSaDBNdzZoVzM4djRPay8rODhSbE1IM1V0eDJqTmcr?= =?utf-8?B?NldJeG94NjZGazFDQmZUb0l6RVJZWTlacnN1SllNLzg0WmdjbDBHcFVHTDZw?= =?utf-8?B?UTJGY2VZdlFMTndQV0NYVk01bDN3eWRVMjBQa0NwKzR1NnM2bEdYd1h4S21k?= =?utf-8?B?Z0pEWnh3SXlZQjJzTE1BMzJQQ3pFMHhDTXMwMVcyaUVGMWI4cHRYc3kvN2kr?= =?utf-8?B?ZFRJQ3dFZGVzWitLOUl1S05rbXRQZXV1R2pWZ3Bud3RPRzVYSW80M2FFVW56?= =?utf-8?Q?VrBFbMY0OHUOGzkxgitF5PSJA=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0157;6:8eBiBsoLyMJtku3uH0QDBFpMUnPAKmmSKM2wsZrAqp+YjEaGM+wcFkXJODsdbdTBEb/grhvY+RFdlcI9FfTECwaGnRhfdI9Q/vTYY/4Gab4sw3igZJF6JHzXI7zcQKi992q0ASLGRqPIzQqQ4xBD4H3Ioy1wragKWWWZmneOyrbeBha6K0ZhEErDpR8oXxoF/tcFEF7ObZbSKvEpp1pPw+6BM+85dvSmscthJ96PgITPNiZTpeCk3vs4gpK7ILFv/iNLFE1ie5qJLNiXVWumqGV2ydtrSWY0Og21w2cDZeVVWg9S/3alCC/sm8NSPAZ2+FYW7WUUexUEtX48A2BsOA==;5:3GgjgD16mEiirPT3YOIfvkqgP4FuIskg404DQuUy4sx4jLbXAHtGuYCGhoytX4pTiVNeJUE3j8B3y5OBUgH9DfcF6AwveRhVK/oWGBZVlMLtZSJX1ebLNYZu9vXrkFsAbn7sVDxEdyUOBUfLqoVM3w==;24:pfs8ibefNGBvZN9uaVK7M47KnOizjgoP7JX90Mq9jkYeG/RtYiI7HLGJDldAKlWdPTTi9UuJ0dYRiRBTYASkSCJf/HAc4XhcecyarAa2mTI=;7:CJ7ZH41WJGRM+51DvpVSnqOHRfFi+4GGxU+ThrpQzyNkUE4q3IY3TkCezjRUBcLAq4nbkRXjamtc7oSZ7Uy0uzPZ9mZKZDJ/9xI4WaF31O6c7fKDpMcw+Ee/cUSo/U4MNJMhwF6HkyuOL2AXypjlC3n6X1/fYYngBKibvKJMNw3+/MFS8Xqca/fzA2U2rXGX02wdGI1bovUUEt+r4jBShTWBQTv0Uw9WCW3P/GkLhfo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0157;20:8Seks8JTR+FxqmgWOgWYIqS2hp1mZkQAVT1qtMoowgi+jjGaFzaE7FSnZSQWikSUMEwnj/a7Boc1aqCAI52MPzo/dngmDDQveeB1jiFhRP2sHxvoCPk/zfAAojTRQpVo3rGkwOQbXcSMHBa/7yZceFZ8S/VZZaidh0d/8DiBNBswmLyfjrqqMkDMZHkpnExnKGU1tg1KBc2DbTkXjKCupsP0z5K+HR6lr++q4inijVgnmBeLkbaUUSaELXvJj19w X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 02:34:43.3620 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 031ee0cb-a858-4f58-44c8-08d51763201b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0157 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