From patchwork Mon Jan 29 17:41:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10190179 Return-Path: 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 779836020C for ; Mon, 29 Jan 2018 17:42:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 725682236A for ; Mon, 29 Jan 2018 17:42:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66E43284BD; Mon, 29 Jan 2018 17:42:09 +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=ham 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 CD5522236A for ; Mon, 29 Jan 2018 17:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751611AbeA2RmH (ORCPT ); Mon, 29 Jan 2018 12:42:07 -0500 Received: from mail-dm3nam03on0075.outbound.protection.outlook.com ([104.47.41.75]:63152 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751521AbeA2Rl5 (ORCPT ); Mon, 29 Jan 2018 12:41:57 -0500 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=/nNCoPUZrKZzcL91NskhvyIWoMhnaclKHaJahtQm5rU=; b=ZiDlqbgXoZibyQUG8U9O8fDKVocJbFFh4Ka/+/VTQ/w+DmyjQ+Snd20RIOlaoRh+FNoWdGt+O8xkEMOYUM6MWaiQ02R7y5QBSfu+a84wN2s7Z7iCFHXCu+vTWqpDKdkI6tQmFdilSEK5eCMVcX/ZdwcX9xfuv75/3elY+9AUZOU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0154.namprd12.prod.outlook.com (2a01:111:e400:50ce::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 17:41:53 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Paolo Bonzini , Tom Lendacky , Peter Maydell , Richard Henderson , "Edgar E. Iglesias" , "Dr. David Alan Gilbert" , Eduardo Habkost , Stefan Hajnoczi , Eric Blake , "Michael S. Tsirkin" , "Daniel P . Berrange" , Brijesh Singh , Richard Henderson Subject: [PATCH v6 05/23] target/i386: add memory encryption feature cpuid support Date: Mon, 29 Jan 2018 11:41:14 -0600 Message-Id: <20180129174132.108925-6-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180129174132.108925-1-brijesh.singh@amd.com> References: <20180129174132.108925-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR17CA0018.namprd17.prod.outlook.com (2603:10b6:404:65::28) To DM2PR12MB0154.namprd12.prod.outlook.com (2a01:111:e400:50ce::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 07863f07-9f83-4145-8824-08d5673f965c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM2PR12MB0154; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0154; 3:TkXbV9XW3Zu8qraDpa+En5Neo5j46J0XcZd+IJQveaoVIqypOjJ+Tf/Uaect3lUpiZ0n56THuw4exa9zcz1N8nKuh7vkjrX/skWG4Xd1HszXhyiIdpVBpz5W/AvupmdbLNGGHhe1NGmJ2TuOu4T1U1Ks525qlNbLg7vFUKNw+8zJaYBF3Wn6TiLEUJ79qj48i7MzyK6++L6ty0BGbHbKZuGYOw3cgas4PlLI/XedmcbkPmgEy3+gCSzJ7sp1W62y; 25:aEs+eX2gmQA+LjlbgWFxxU5XiE02g7s6s21inIjEdOzSv8nVNIXDfjOyYp6qmIC75NJOsDHVn3trD5cYm6NwVvQ0GzNzMktWFwePX5kn+HX86luEwcXaCGIrYbUI0I8niVWA8qnPvrC3Md1oUHEH1py0r3DWQht829dzESq8Q4q29SSaY1yBQtRUFT3Zqk5Q1lgfBxEcmpFvqKPPMUK6FHZlykT3U3E4AvtdNnS0EPfeGYDFCWjnPiuI44+nTXxkkJob5e05+1ml12I5TXLdfKVtiELcPKT5M76Un7+EtOScDSNnL4gy1D94e2XJDPzHfLyqPDgBhavuvQmc/0jrGA==; 31:jk86cRHnXhBSpUr0f0QKozRB5lf3nkO8Iy43cS3wPDH4h8zhcMw7uMiXqbA9rb6n9VHw74By1nrzD9w+xmD0OJ/JzEgjvlyR1qVPTo8QeU5kF1cmy0vHqgdZUvbGssVl14jssDZT6pPZNmGXiT2E70eyKv2jf6Q+2Mt1EgnnHJIoWMpIRD/iDsMCuEaNyI0VTNnl7AyCFDqdBDXox/PIlZBEtdBQQZWPmLx7xvm6jpM= X-MS-TrafficTypeDiagnostic: DM2PR12MB0154: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0154; 20:ux7L7dq91gVDCP6h7mdlbEWwRZpTJJCMWFKQkO8sRXeGIo7/Z3ZhB/iNzfrr/18bO0Zh/oSTinEL4OuAL5DC+DxYJvjM9G+nCjThczyuVU0j16vfz2+PNDwCCXH2NrmRRXNfXR9pNKq5wDhVc/EflkcgJWPk2qThLnGSEs3a7PTJWZR0a95SQ6yx3O2yfZRqgmiUJM6NhT63iz40GD2YSNF0WVu2a5mJQBTRpvlm3au3bWuzFtIKZDQpz6I72C6O5D3z4Cw6QouxCIJSTz6Spp9osRHEdm5P9cW9H2qP3ZWvH2Aya+XxC5YP4tmPRa4sbdpnPG0PRaPDMBPN8d2MYk053pQtkAv/HVHinhwF7TNKoiWlPPya1R6opMigPSahuM21ptfSfI1BmKV6lCmuO2veLuISi3I8GIOmE+4yXT4rkmLqhzYlDmwCUD/0TN8Msb3AhovK8QjfL8pBcORgT8WoYOr5XpFAEJ+Bcq/whJHVOLY+lpH1ODQlxyhNZlJu; 4:Vq1/g85hBbGq1Voris82FAv+rkgOdTjUOhEcubvkCvqAfokQr3n1dGAYo3nP+He/cShGrvqDO1BreoDLmDWFaI2tayH6RIwSI2kQIGi01bP9CL4/Wb3GXzmCRKZIq6OLky4W9bMvJJdGKbCzMWGFmJYqDVMfTQhldSDxv3VYWbo9Z9Xg6fuNafEFNVgdLdn4Jlov98qrTYSDXolr04kPgqru3LDci9/pOzNRyKQjGjGzxVtWrFXQUhq5cLmQ6gJA4d+F8arNo97o6M5HvmeYQY896u3DCRwclcF5SEDQPiEjlk7ctMal/u+cEWmc4/45 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3231101)(944501161)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:DM2PR12MB0154; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0154; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(39380400002)(396003)(366004)(346002)(199004)(189003)(48376002)(8656006)(39060400002)(4326008)(6486002)(68736007)(36756003)(478600001)(26005)(97736004)(16526019)(6306002)(53936002)(386003)(50466002)(86362001)(575784001)(25786009)(8666007)(16586007)(54906003)(186003)(47776003)(59450400001)(316002)(7416002)(305945005)(7696005)(105586002)(106356001)(76176011)(51416003)(2906002)(81156014)(66066001)(81166006)(8676002)(2361001)(53416004)(3846002)(50226002)(52116002)(6116002)(2351001)(1076002)(8936002)(7736002)(6666003)(6916009)(5660300001)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0154; H:wsp141597wss.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: =?us-ascii?Q?1; DM2PR12MB0154; 23:5HnwjBF5hxs7ux2VAUaM96fr9jbGjB3sD7+jO6HiU?= =?us-ascii?Q?abI9aGkBHK0had7jBX5CxzwwKgndNBatOYsRSaOEFMEhDlSVR2OsBAphNbUy?= =?us-ascii?Q?IXA+Ax3D+uNKEPEvQpgVQH+3UbQ5GGM+w7/P+Q4ozxj+wDowvXhb8bvs02Xb?= =?us-ascii?Q?E6mXLPQfhgHKtuXFoOrwKcB8EaoS8E1HLlZPiotFSbaqkor87G80u52ng9SA?= =?us-ascii?Q?Xeu2CdEcj4PyXv/DVEngpHBkpw/1X/FuG1mjy6f9i8pybFMgPCfAQEYWQ8Mi?= =?us-ascii?Q?ctJZsnQZV5Z4joFxJd0zbXzLo5oIYVIxpkhQ6XfEK4Hu1QYMfuhi5lVjm9iG?= =?us-ascii?Q?xdR0LgjDfxNzGXal+/pAVLoB0no6QkvqEvjlaG5jgO/2sy1B4xdnGMKARZxc?= =?us-ascii?Q?DDoWEGeOWpnd6HYpiJlU9udNotFutZsFLmlFfm/2/YMP9s2S0vlFM7Wh6+iN?= =?us-ascii?Q?ca5mDF7UBO8DVEE41CgwR3rbPeIe7KHmHADfiSoeMJWIe7rq96rvPWhG8VQk?= =?us-ascii?Q?AdaZPi0tZUqvIToKlLJxdpp9foF1pdLYI/JESKeq8gmI583ve8off0+jF8dL?= =?us-ascii?Q?M7TS9svGwQsx+XzV9kmbozdF9qL4SAIF0I3JEvc7ML6EVgxrGlCBfw/VhXUm?= =?us-ascii?Q?40rmrnKTi2JFhHT+N0YF6DquR5ufVW6pYrqrLIwksMxcvCkPwZf4uSmkYVdc?= =?us-ascii?Q?xrLdVeafya/gI0q5YGjfXbucYLmQLO+Of5muZX7LE7NlmI8rh6wEMR/albE7?= =?us-ascii?Q?vTNWLKNP5e6YgOWspo4envApJz7pyJdBEbFZb2TaVCegNjUJTSG9w7HnaUh0?= =?us-ascii?Q?ftZ2zhBQULSCejLgaehiByLaHMk1W/6dqi1FQ0Si8q+ajHOMPeZbJrLIoKO0?= =?us-ascii?Q?WHhgACr1eolXc2byPdbOF7nfZ+GffCKsCRmWhV4AP/aTJXnb6rpR7icGjGTv?= =?us-ascii?Q?5BHCAQI7w7f0qhAk658Ms2v8OCsL9SnCOpVCqrzNiN1AF+uDMRLCRzKA2qPB?= =?us-ascii?Q?GHLZJQzgNv6JCO/XuVfmiyn5ftE0TdehdEq0hjGETakVHRVwnUQ3RweUtAEp?= =?us-ascii?Q?c6X8RnieBm7RvHmeKqVO7gBNd300vy2w9fVDzYwFL4tI5Nvv1fUWtmVCt8MD?= =?us-ascii?Q?kQpv48xRQp79nhkldz8RoP25s2/p8xJ+14wLUaw1hRik+nBFZKy/CLDlxTyW?= =?us-ascii?Q?Af3hkIcaZMzgJBGmyU2MKNSLUNHwjCEMnv+LHjX0jZGLbm9rV4nzpSQmHt44?= =?us-ascii?Q?Gnsc40WvVNvRfRROUG6IRAxhjILrEQse6JMSODn6l4Sr+ogI7MR8Z/0fZwkQ?= =?us-ascii?Q?t2Fko0eYUNUGkBz6yvH/rbluXdxYd07TCt9xUm0xutk?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0154; 6:knvg27L8tdIA/fXKmFYbiVkVxkSROP1C5sLIqwh7fwduQmLg4QRmmiR7QPpy9EK8ZEfpMUR7oAXxFR5Guv4ziNpeFvxvtm2ostLPi/LXNthbv9+wz8dF5DBtjnZsPxDZM9mIaC1NV9fONeNYlzLahsQyPbfwqrpmOcugmWPZenzPLi9l76PJpC7cQXSBUuA8Fz4N3Pxxkqkl6O+fpJ8G+XYdsO/MK+I2cf7ez4N/aCDqLUZMPaW6McM6VMpDg50AJYG+bd7S0aAh1OMkU8N3ihW0at+7mZsoF8pHAB095zT7RmGqwxSwacW6OiyF7OLJrgYwee+NHcHl8ER4ZtzxRxWvchOmjILrFEDazq+hCdc=; 5:paIVQW+4Dd6pMngFbevIM5nLTSf7MNaveyWBcMWQ01fccCP+mzOT96FJ2ICmQCqol36lJ6Yrol7IJcxY4LlTUPxaensVAtb2Gq6sw81YGVKgDfYMbdB4Pfak9sSrHep/F1WbPptl26z/G7XiIsBVLpj08XoLmeHkY28BmO1QQbI=; 24:Ff28UCSAk5x7OCyaKh3zmV9Cvh33xlQwd4+MZD1GUI+J39HJCBdTlAq/B9pg8Yj2J4tU6m+XD3KWrSDR5x3Njy739BJGK6qmjG81K2r70mc=; 7:tcD/yM313ASl0+eIWUV/36PfHHJJ3UTy5srTS2/1YPXdL4SNqpSwcqwsUOyeFfI5ra8K6mYRS23lSCk1SntlDIdFIOkuPW+PQX/q6WSkzXi62YUojTRPBa+TaC/eZjxp3LvFKV2RUU0+1OgspXqc6IBkQJQLwRIYOvBp4ICTK6vzBZHcNsPDJwf9s3iOE9gKRJLfrzm/CdAGWl1ObECCRdyL8+C0M5AXPDEuYNd1NDUnTct4R/QcA+yaBnbmR1Sj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0154; 20:dQox3IxF78ojUcyv/F7QjvqX94gzkslgKxTjL28CwbmhbXau4X27Kv4cOH7xnVOcGaXIlvOx4W4RBFkTd0qg3GqWhuWA9UiswSFWkFWowqu2s2tM9YUC0yJr2oYi1YBjCIAwJCaOuHCsZXfquvldg2uh9vg4sEpjwWkyvGmUZbM8MPbVp0D5PuOQyFmctUmGWjN89RVVSN7pw/jjsezdGSje9Q4YdFyq1TRKZgJ4d+UhmpXNjFmIExN4vbgYI78c X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 17:41:53.2602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07863f07-9f83-4145-8824-08d5673f965c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0154 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AMD EPYC processors support memory encryption feature. The feature is reported through CPUID 8000_001F[EAX]. Fn8000_001F [EAX]: Bit 0 Secure Memory Encryption (SME) supported Bit 1 Secure Encrypted Virtualization (SEV) supported Bit 2 Page flush MSR supported Bit 3 Ecrypted State (SEV-ES) support when memory encryption feature is reported, CPUID 8000_001F[EBX] should provide additional information regarding the feature (such as which page table bit is used to mark pages as encrypted etc). The information in EBX and ECX may vary from one family to another hence we use the host cpuid to populate the EBX information. The details for memory encryption CPUID is available in AMD APM (http://support.amd.com/TechDocs/24593.pdf) Section 15.34.1 Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/cpu.c | 36 ++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index a49d2221adc9..4147eb6e18a9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -234,6 +234,7 @@ static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, #define TCG_EXT4_FEATURES 0 #define TCG_SVM_FEATURES 0 #define TCG_KVM_FEATURES 0 +#define TCG_MEM_ENCRYPT_FEATURES 0 #define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP | \ CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ADX | \ CPUID_7_0_EBX_PCOMMIT | CPUID_7_0_EBX_CLFLUSHOPT | \ @@ -545,6 +546,20 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .cpuid_reg = R_EDX, .tcg_features = ~0U, }, + [FEAT_MEM_ENCRYPT] = { + .feat_names = { + "sme", "sev", "page-flush-msr", "sev-es", + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + }, + .cpuid_eax = 0x8000001F, .cpuid_reg = R_EAX, + .tcg_features = TCG_MEM_ENCRYPT_FEATURES, + } }; typedef struct X86RegisterInfo32 { @@ -1965,6 +1980,9 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] = CPUID_6_EAX_ARAT, + /* Missing: SEV_ES */ + .features[FEAT_MEM_ENCRYPT] = + CPUID_8000_001F_EAX_SME | CPUID_8000_001F_EAX_SEV, .xlevel = 0x8000000A, .model_id = "AMD EPYC Processor", }, @@ -3589,6 +3607,19 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x8000001F: + if (env->features[FEAT_MEM_ENCRYPT] & CPUID_8000_001F_EAX_SEV) { + *eax = env->features[FEAT_MEM_ENCRYPT]; + host_cpuid(0x8000001F, 0, NULL, ebx, NULL, NULL); + *ecx = 0; + *edx = 0; + } else { + *eax = 0; + *ebx = 0; + *ecx = 0; + *edx = 0; + } + break; case 0xC0000000: *eax = env->cpuid_xlevel2; *ebx = 0; @@ -4036,10 +4067,15 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX); x86_cpu_adjust_feat_level(cpu, FEAT_SVM); x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE); + x86_cpu_adjust_feat_level(cpu, FEAT_MEM_ENCRYPT); /* SVM requires CPUID[0x8000000A] */ if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); } + /* SEV requires CPUID[0x8000001F] */ + if ((env->features[FEAT_MEM_ENCRYPT] & CPUID_8000_001F_EAX_SEV)) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); + } } /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */ diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f91e37d25dea..f7a0ab20fdd1 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -483,6 +483,7 @@ typedef enum FeatureWord { FEAT_6_EAX, /* CPUID[6].EAX */ FEAT_XSAVE_COMP_LO, /* CPUID[EAX=0xd,ECX=0].EAX */ FEAT_XSAVE_COMP_HI, /* CPUID[EAX=0xd,ECX=0].EDX */ + FEAT_MEM_ENCRYPT, /* CPUID[8000_001F].EAX */ FEATURE_WORDS, } FeatureWord; @@ -679,6 +680,11 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_6_EAX_ARAT (1U << 2) +#define CPUID_8000_001F_EAX_SME (1U << 0) /* SME */ +#define CPUID_8000_001F_EAX_SEV (1U << 1) /* SEV */ +#define CPUID_8000_001F_EAX_PAGE_FLUSH_MSR (1U << 2) /* Page flush MSR */ +#define CPUID_8000_001F_EAX_SEV_ES (1U << 3) /* SEV-ES */ + /* CPUID[0x80000007].EDX flags: */ #define CPUID_APM_INVTSC (1U << 8)