From patchwork Wed Mar 7 16:50:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10264457 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 5242C602BD for ; Wed, 7 Mar 2018 16:53:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4287A29617 for ; Wed, 7 Mar 2018 16:53:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3671D29710; Wed, 7 Mar 2018 16:53:46 +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 917CA29617 for ; Wed, 7 Mar 2018 16:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934289AbeCGQxn (ORCPT ); Wed, 7 Mar 2018 11:53:43 -0500 Received: from mail-bl2nam02on0075.outbound.protection.outlook.com ([104.47.38.75]:30896 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934156AbeCGQwj (ORCPT ); Wed, 7 Mar 2018 11:52:39 -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=GZqp8hzqvX3V4fCooOrd+RyAMjAOInWIbhjjBnxmOFs=; b=p02P49UN4/ZIhteBI/eQoLHwtmatNeMG8YoALspHkBnJL0aZ8myPljuC3zW8Tr7joJluYiOc61DOXFpV1M5M6Qr4TIc0EoiTmbz0d/pjsF2QHH3FGKcCrGmSqxZ7hcTH83TgqvRCmMX0xqyEwoc6CcsmwLOco3Z/LRMXYx7+K/0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by SN1PR12MB0158.namprd12.prod.outlook.com (2a01:111:e400:5144::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 7 Mar 2018 16:51:25 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Cc: Alistair Francis , Christian Borntraeger , Cornelia Huck , "Daniel P . Berrange" , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , "Edgar E. Iglesias" , Eduardo Habkost , Eric Blake , kvm@vger.kernel.org, Marcel Apfelbaum , Markus Armbruster , Paolo Bonzini , Peter Crosthwaite , Peter Maydell , Richard Henderson , Stefan Hajnoczi , Thomas Lendacky , Borislav Petkov , Alexander Graf , Bruce Rogers , Brijesh Singh , Richard Henderson Subject: [PATCH v11 25/28] cpu/i386: populate CPUID 0x8000_001F when SEV is active Date: Wed, 7 Mar 2018 10:50:35 -0600 Message-Id: <20180307165038.88640-26-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180307165038.88640-1-brijesh.singh@amd.com> References: <20180307165038.88640-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0501CA0095.namprd05.prod.outlook.com (2603:10b6:803:22::33) To SN1PR12MB0158.namprd12.prod.outlook.com (2a01:111:e400:5144::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4f7461d6-c02f-46ae-1979-08d5844baabe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:Eo97coFdII9A1RCCovxI+eEbeXmnwPnG56L81E+Z5i+deQapoEaigX0Vh9KJziG06uKALWjIImnJT8mE1to/LZaX6Oakcpjmg28rizPj9j54KxbciqFGUaFvSOHWtU7oLzs8wK87dfo+lVScX2GgyLvLZx+lQ/6LucZVDb1hwq7vb81myAMQn454Zf1kNQ5jrKhs9fzxxlg5+KQS5Y1YvP0E2MCSrW2RARPeLtmGfXYGWJgzTE8JMf2hhW2amiAW; 25:VoJZ6NepKM+39EC+Usbdl3SWlTjc0CU8urd5fxdcRrVWOsJxUfwmwhDtjO+tUuYbnqo8FBFnt7jQHTw8vf7LwH07gjswJEpGaWbrgaTCwZl+a2Wy/YZjabn4+BS9WWJuxSI6UMaI/cClS/2jXg2gEsVGqqeNY9eCgb6A/rakzJdUHT9iEQZPxAuyM+3nm60rihviQ1rLclFxjaLscKsysUBD0IsANz8HqLxifbqwSO22DioBiKaLKFdEdBHqQIjCY8+i6Jl+PZvQnnU/W6mxQKgb48BMhKTq/98zZO2c9qDQvaAKdn0FcHl2kn+99S/mQioawh2x7qI4BS2G+xB4Gw==; 31:59lk4mgg20XX5SGpXpOFnRZlFf5jJPnXPAfhMS/bhgVD3W9pGV4uv8y9KsOb8Z0kLfQgeAG6ccom6m+2cNt/VYeoLptvHAI41QaB5l+n2Plqlv6pjBqRyRFDFUOIA4j5NcZur79IalKYCFRco6O8fK7e9zoLkJzSMC150I4iYYYbPS95eeBhTLufUZt0p//kG2cNrFhhVYqUK0Bp+RLwYdnKG6snnQodNoXdPkmZFWY= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:ArDqgh9jHxpLr7GdwMXFtrWp/bzEnk8vUiArryteeCBNq8i2akx4TvqCUS8FPa0KgSImAvzAvHIXP/+amLJ4xkHoYzYxQ0I7SoIoX3HnZ6esguhVCrKJO/1SeoyxedO1LeGl7vFjlUtVLQhZ/DwC241stxep2o31XO7dVuX7DorBEucOF8LcSdjITw7UGqfzC395sOdd5fGkqOMT/oFPneN4aHYHdrdtbZSuvrg1JLXn++8Kcpwl7UMZ64zLg7KkShea5efZyVCgeu8DSC+T8zAccZYPJt2/vtOwpydgaSrLyZvJjL92+ay/nXZMPbTj+BvYdz6iaug1hh8bMsrmN/FJuoLtcPRMF5cOu+exUpR4WUrBLhpzpUxCAvz/Zzjd5IOjTmBQg/6s/HXd1P9iqd4DA1wWjj2bgvXpE2cAXQlkohFAWXfHMbCy6I/8rJqcu4POiwWmFrOllejfbXIgQgq8pUq9GUoPJmjAp8Uvo3WXPoKm5aobj7apkrCXCMDb; 4:JrnUxgkCIDrPtE8Yp51Kg4GWudcl2nxx8oVA2qSNBR5CUbDtcjub/aotYE3mePL9zbuT0mc5t7K9k0uDbyOOFn+UrUm2sQBJ98pnnXR2wvhOHhdoDWps6dgB65Y1/G1RIPDkMySRQ1nO4YekHuvE5oVNmozILFYbwoquURH85bLnQa7kQIB10MxZx59pmu3+Haa7OZpM0hKOKXn1dUuZwzttqbLgUu8Ui81MWBL1V+If4jvdyIJBkl7loGOw/wiKpmDjtjzZVdQBVdZWUmJyjemmReGGGCRn30BkMqnCHfr6PcyuNthqvN7Ld5ixzSwt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0604AFA86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(346002)(396003)(366004)(189003)(199004)(53936002)(6306002)(8666007)(2950100002)(6486002)(6666003)(6916009)(53416004)(3846002)(1076002)(6116002)(4326008)(54906003)(8656006)(2906002)(25786009)(59450400001)(386003)(68736007)(478600001)(48376002)(50466002)(105586002)(2361001)(2351001)(86362001)(66066001)(106356001)(47776003)(186003)(16526019)(51416003)(76176011)(52116002)(7696005)(26005)(16586007)(316002)(50226002)(8936002)(8676002)(81156014)(81166006)(36756003)(7416002)(97736004)(305945005)(7736002)(39060400002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:wsp141597wss.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; SN1PR12MB0158; 23:ECttvu6MwvuR7DHEeWdSkU9cWz7AmeZcWaUaeLjb4?= =?us-ascii?Q?EhHrZb4oJi/4IyTvB50T02nYZPMoray55FWI2emk3/HvXHLGAr6ULXJZYKoj?= =?us-ascii?Q?ti8PQmiamKiQvB/3d6n4cr8cy2VUfGWnJTegRRll5jBQ6dK1wcPbBwdUDXd3?= =?us-ascii?Q?2EXan8av0hsfq6dlxkHPfXUql7r+Ft1AiYiPunjku5dkf942CXbNVB7hTEMt?= =?us-ascii?Q?4GkEX807ilqBP3kIN5uHuG7JpvPVBbnsWiAaxIkr+hX2lXnqgxogJCNSQqcv?= =?us-ascii?Q?ZJCnTSXP6ITb0e/uABndYdfEm4trTlnqczoyOmJCRih70nDcjAzbaJWXn313?= =?us-ascii?Q?fCIxPRuSDZnLnI9+yjJmvR8ha+6elvqKqH7uCwOkscedLweCtBSuTSrX3HEQ?= =?us-ascii?Q?25Qq6TLp46nnitOfCg3WdsZ8eQXbK5FmNF/Ukxa0KZjTfDI9SUgQ5OGQFxLx?= =?us-ascii?Q?ghNdwmwG+HDIVoqHTSLN2c1DyXfuwJDCixbs62aE/zVXY8RCuypB1g+ezFhF?= =?us-ascii?Q?Drf1F9xRzfQyR+VMIQiPxVVC3IWbnIntdK6e+aPWZNR7+zYyA6nxouARBkm1?= =?us-ascii?Q?SGlOv1MKBoBaYNfpXRhptkor0hf1nj6IgkVGKsPu7mvBe3Ns3uLg7rbXRJUJ?= =?us-ascii?Q?lYzpgv2KnEzsDGNzu7nzNl30hm58sNfHXXcIPRsnsn0kFQqOUF1R85Grd5Vh?= =?us-ascii?Q?gQr1fI2phWlRKKy1lt3K/4Lybi0ZFLZlXZyAgZG0bYEjjol+A+us741j4C8c?= =?us-ascii?Q?O/NOTVOuJ6qli6/m4LAoGzhXWGyvYIPWi6wUFtTU60o900xa5m+7WFNsgx5P?= =?us-ascii?Q?kQXU3gC9WHW6JnekeqgBrubToqcxRbIgyJECC5QL8vR2zd/VG51VO6tdEITY?= =?us-ascii?Q?+RBN1sWVFbeOD2910/goRL0ChAcGc4NlgR1vlNVfNGliaocgFJ6LEd52IRU0?= =?us-ascii?Q?K9jqLL0alUsfNW1Mr7XRL2iOynTQQeKHCamAVXzm/sLbg2uXVMagA5VsnMhk?= =?us-ascii?Q?Co4A3Svxo8nqo+4my9xFu4W2rt4S1lCbksCVBaJ7xVU3Y0+UHkOWPGQd4BEt?= =?us-ascii?Q?C2OWhAySu21kCAKJZPnE6SPTFIqBJegh8vgU7ZKLbJvK98mskiTDv4UGIZZC?= =?us-ascii?Q?jNXiToPJCinYV75WywFVXKNS9EKh3adzmJTRgjvjZ/Yh0vwAUDkpT2RxYy3x?= =?us-ascii?Q?JreYP+KU44Q91RnGjkK+Me0Glus5jAkUG+gbJBae0P2QZdekqkBWA70xNAbK?= =?us-ascii?Q?crfPNs8lt4cOWx96opzC/TrW9fLhAKbEV0Hn6Tor83+AibGvLlioQgpLThVR?= =?us-ascii?Q?/6HPs88pt243f6o0slhFkPUExBeujdR22N8Z0TwgG/8?= X-Microsoft-Antispam-Message-Info: 7da46h4MH+IR3VBtG+EyIWg62IcjQoUN8RwmRxXm1hagcaNvObhCU+QWBpt0zCKx1lWMhbN/nMCZlw+PHbA8jWI/AuVhuwtFsGRFyJsnIGaVLWwrBI09E78Bl/Ye+X5jHWtNfownrP21AdZmTobqPwBqjFNWMshjlKiMZhyTCVIsx0nJ2myaBsJihpEXioXe X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:qq5bTx7FtPqw2axSFR79HYlXP73eOzKJtdegDlaXNeVBI9icYMZXwAl83PKbMu8uw/eV1zZe/Wrat1eHRPJGf3uyvldRuQbb/a2zbbpxvzKxsCnWAn1YyFsXJ62pYyhoMFXcKK7LUaGJysNNS7fMMaNdp/uU10zVetgfy67NyMuBZ9Jxw2dj35vQXEXPGKj/+C79/WYWqfoVINX8P+G86gCpvwwr+BXs/QFZKw8P3G3tC6KXMGrsXxNGSjKA5qsV6v8OyeYIy7iM4xiTzOXpc0W7pSHaPBjg3GLsCBTulsTn/fnBp4SLSGfLLxfzPO8fQzaUVz4gtfo9t11wMiLjGrup0ULPDRUjWZB8u9Z5010=; 5:TR6IcRmbSAWcjUdj0WCat4S3gVN+qtE1p1sv4JZ4Fu+yChjzxtA0aj3VwDgKR7gpSmL5FMtb5oI1Q++V86pLyknnYRSOEK8IqYPx3+13TC75yknW2aRdcAQGf97RJRWuYoDQOojRy/wqheqFTKSWZ/nYSCH25wjrRahHPDuFmLg=; 24:skSahdWlNqjxFuhG4Pah3SCqQCeyT9l3eYva577XZ2EY8oxj1TPMyCLYED92wlyMDBHvnVdllVB5/1/QP816bKntknTlhsV6kO9iUyYoSN0=; 7:IyO0DNZusQfZO0ZhTe6lHqEyCrwHIksb95LnwUrBk0ZwMKFBC4L7s+Tjm4aNxwjn/0GFG80Drt9FcapJs+hxP7w6OQyHgvuhUkLFG8+WnIkqUjjtq4o/Srv2TuiTDk0smy1X9vN1o7HhvbAaW2qwMd5CnA67tRvFAAMwdbuQl3wsnIHIy7nLED8FU/BXKToZ6dcU5ZK3kaX+7nX5Yhho3jD6k5ZofxTtj0+6HBpzIldXa0r3ApYRnnSEcoi8DleM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:kbn36rX/10n1XvMN6iAxkYtAtDSys+vWmo+d/haMsoRTCs8TLkjHPaoCg4W7Kf+ToQlhUn827pWWJV8E4I+DMB9o8A8IpNfxjaCl/J7PzeBZvMnOjEdwn+3BDFYHi6OJAds51ZJPSSBLO7272CjsnQ2p650G1/1y0hqp81FYpj4FEP9N6fqJhwXNH8tESdv8va5DsDO/CUYECwDHO2Cp1be/ppLpsfAI09FDibDmlH13Wg8iU+tNcX+lq2LcBKw9 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2018 16:51:25.8073 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f7461d6-c02f-46ae-1979-08d5844baabe 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: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When SEV is enabled, CPUID 0x8000_001F should provide additional information regarding the feature (such as which page table bit is used to mark the pages as encrypted etc). The details for memory encryption CPUID is available in AMD APM (https://support.amd.com/TechDocs/24594.pdf) Section E.4.17 Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Reviewed-by: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2c04645ceac9..647f792ba123 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -26,6 +26,7 @@ #include "sysemu/hvf.h" #include "sysemu/cpus.h" #include "kvm_i386.h" +#include "sev_i386.h" #include "qemu/error-report.h" #include "qemu/option.h" @@ -3612,6 +3613,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *ecx = 0; *edx = 0; break; + case 0x8000001F: + *eax = sev_enabled() ? 0x2 : 0; + *ebx = sev_get_cbit_position(); + *ebx |= sev_get_reduced_phys_bits() << 6; + *ecx = 0; + *edx = 0; + break; default: /* reserved values: zero */ *eax = 0; @@ -4041,6 +4049,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) 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 (sev_enabled()) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); + } } /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */