From patchwork Wed Feb 28 21:10:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10249803 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 78FCF60212 for ; Wed, 28 Feb 2018 21:12:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67A22284BD for ; Wed, 28 Feb 2018 21:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C03228DB5; Wed, 28 Feb 2018 21:12:17 +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 B566C284BD for ; Wed, 28 Feb 2018 21:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934492AbeB1VMI (ORCPT ); Wed, 28 Feb 2018 16:12:08 -0500 Received: from mail-dm3nam03on0043.outbound.protection.outlook.com ([104.47.41.43]:21700 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934353AbeB1VLy (ORCPT ); Wed, 28 Feb 2018 16:11:54 -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=vqV0+918XIPD/xtA91ylkG0s4V/sQ6qxC33YuQjqIc8=; b=HmTOcAzDNyS3o/YoHln7c0vQymuXEEzDOGdolCFNhUaeNPgybwILj+8yDJECoy+Pns/X8Ny8ciVJg5SOnhoLnVQBvkQrvRKGQ5Mvh7N2HnnFmMAzcdzN8duvhVoBKwNimvRlwvpvn+jlNg+JDK7wXGRPdBNUA8F91nkt1FAaNpk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0155.namprd12.prod.outlook.com (2a01:111:e400:50ce::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Wed, 28 Feb 2018 21:11:17 +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 v10 25/28] cpu/i386: populate CPUID 0x8000_001F when SEV is active Date: Wed, 28 Feb 2018 15:10:25 -0600 Message-Id: <20180228211028.83970-26-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180228211028.83970-1-brijesh.singh@amd.com> References: <20180228211028.83970-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR10CA0008.namprd10.prod.outlook.com (2603:10b6:4:2::18) To DM2PR12MB0155.namprd12.prod.outlook.com (2a01:111:e400:50ce::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c62f61d1-9477-4871-f9b4-08d57eefcf12 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM2PR12MB0155; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 3:DYf79Af5YRi2uMwOWYUF3y/JROjU3NVw1f985qHpxOOfl8BgWqv6e/MAQ+S7YfyW12oFYGlHP2AtougisURcaGmB+ok3du0IHriaobv1kpk2z0Kkcy0L8FYQp6rwaBqvBD+TBKPrZffHrhX3/dWKteEaEEHqieEiXMRQn/y4Kr/FreFRVivYTEGBb8eocqudcdlNVgpMQw/Fef5RCdey4/ppwfZ0w3o5MTZD6w4uUDZo2/bjdVM1GBhknXpAxYuF; 25:/+0E8K8NS+67Q8JJhGhoJzVE0nTYeGNbVAK2o588hjmjkpfxES804KJ5j9x6Mgo4itAVPm4dCugxvww3hC6yv9zofuwfqq2W62xrJfG8xmWSBL8ZdW6KMkSW1JoTBjcnFREBvZ5vSxssT9UODzQV5EDRT1ZcGjrhWHWXuCX2GHDEl1gixz+wAAnhJHFYy12NLE3Xw/ydmF9uoxqFywmkFkSH+CKOSWkNnfMC0g93UnfDcUWE5RJfYSbHuo/LsfHr1U8/DX2tHWUU3wEtl05BSAgU1FiUqJld4duOveczimBuFIVaWmxBBeGoal+FYWh2/0ERLjaZmWPro5luTsbxzw==; 31:CFNYZr4wXREJVYkwpoYko/7SUEuiSEMLQqOj8OBM4oOyCKTcM3BaORBiA4l1rdX0M5rOZEyp77M7Z2ytCnED2cOkdx9I5WsrWzNDGjtuzaApps748z1EPTGi/Gx0nsu0clHHjMPtquArtMu4ZRvvfnbwNGSFxuEhQpMypNUihLf49Vc6ceTfARFMXk6AwpsstFyZn9+5pBhMbBSYRh41JVXh/+tqZgVEu21OcUkZoxk= X-MS-TrafficTypeDiagnostic: DM2PR12MB0155: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 20:jjh9AP/uMrs2Q0nrXLISvW1sgXjQx6dRfW3MGuG2XW7ao+FgXjZ3iKbZlqqduFbjwbB2qI0/AfncsPMbzZGiCcwI5oohjfaN5l6bDKUkkZkSZ8wNVHw4Ege/TRf75xVO1X6LpDJvh0uR/lNSFtRTNMGEnh0wUX6uXVb54sk0z5K6tpbvttFLVBsqWFkynVHg1CNxIVOZkFu1Mv3+nzILYPo4mlr6WQ6RrdtHPQVpz/mqbdIms4SVtKxvDxmMqX3Y464qvB7StNz9xf6n12FVDa5JDgI6MQ4RHbHvNc7C2O88GU0YUyWNUqZC9FiVqkoenEfxQJM+PzYN/6Rioxni2uc2F6i6xiydyR7J8YIjmvUWz+Nou2Xq9zqUaPlT5qu3HcS+/p/pMeLBST2gep8NTB2Wc6V8t7OrokgxqL9PEX9up+pZy42OFGWQozHOU6PJZeFDy/qGpiBa4IyNkO84Owf2Z7YTBNHSzIQF1Aiv1T9LfzrlQbPPHouFCGMbv/Yu; 4:qpHg4qF7U9x9jJlX6Xyjem17lF3GLEKLHCOQxvQhRGNLYeY98yo+oIkCDgBxKK8M36CR3Ldjh5e1OcA2FzNnDuq1kZvkUtSX9/uUgviCnq1pgngQ4lx8P8RixM80MW3h9mPbzwbymazgWhVT7XYFscswx+VknDs7jUdxEPXSueqwrsCwM4Wg9xezyjd8MZLry+zoSpH8qk1ykzX96X3dopKv1Y6x/8gvD2JduHKq63LEC6j1q68TdpXhStfMaMwMSrb5WLkky2+GEvO9BJ52+sSnofO8A3kYNMu/GaACIXpyaLi+HCyOpsIBDdpW4xxT 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)(8121501046)(5005006)(3231220)(944501219)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM2PR12MB0155; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0155; X-Forefront-PRVS: 0597911EE1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39860400002)(39380400002)(396003)(346002)(366004)(376002)(189003)(199004)(6486002)(6116002)(1076002)(2351001)(36756003)(16526019)(16586007)(54906003)(53416004)(26005)(53936002)(66066001)(186003)(47776003)(6306002)(59450400001)(2361001)(478600001)(8666007)(316002)(81166006)(50226002)(8676002)(8936002)(386003)(106356001)(97736004)(5660300001)(2950100002)(6666003)(305945005)(4326008)(76176011)(7736002)(39060400002)(8656006)(105586002)(68736007)(50466002)(7696005)(51416003)(25786009)(48376002)(52116002)(3846002)(2906002)(86362001)(81156014)(7416002)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0155; 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; DM2PR12MB0155; 23:AZ07pBF3+P+i+YJjBQBHd6yr5J37YMBkLlKrAGZc0?= =?us-ascii?Q?K4JdGOpL+YoEXEEq5b3PWJlLzSneDkzeOVGPtWGbUW015hLXzq1sEXlgpPrr?= =?us-ascii?Q?3J92uSB0tO0tSBnL2oE2XAB3cnBXYguiHvxgYnJtFEr5BYl8H+tO+dmv5k32?= =?us-ascii?Q?5d1QZX6lh7j+s6Gc+2ApF44wCCKHE3x2/9DhZECNA5DEgtlsd7LFcoc5Ir12?= =?us-ascii?Q?YkFE8SCLHN+dz5dv2ah5KPdwUWgMrrlcmVksDFruY898l5QgAx1Nep5JKLOF?= =?us-ascii?Q?0iZpeZ6ciHPnuDmquD6WXidGBtDIgvTIvm9Xzi4DJOZ0k6vT3Cn/IZHq2o96?= =?us-ascii?Q?g8NymohCVqeK6z/Go8yBhp213lbEituD04PbCgjVqJ794WxFxmNx/egltA9l?= =?us-ascii?Q?8JioDa8KklM5OboxRqrGZaKC/1sFg76Yq5QKMA52FNKmOI/Kxp6KlCNeKUcs?= =?us-ascii?Q?7PBKi3/7Y48PTDrVZVQHyAb60R4+GBly9soICCI6wWJEk2bUWwb/Xm+o9XAF?= =?us-ascii?Q?JZVSVJxAU5KDoISWVcc3qrZJ470fRXvVOZ0pUhxfiYtlM7MESlIVH+iOUwsz?= =?us-ascii?Q?hSgb6ntx0GRI1JJwY7JY/w0ptVwk0KpvF/whvfo2M4s+x4wTMe/1MN6aH0WA?= =?us-ascii?Q?6FFVYhWpv9jtU0QUx+0IFzaUv51uayb1MoCivEpgYl2hWVDQ7sf5SehPBD/S?= =?us-ascii?Q?lWbzgjh/1PgVFHf42FONQ+ualxOk02Z3DSsH++ZAo3z4hl0w64cXCF8dZhxg?= =?us-ascii?Q?1IuiTPt9RrwztGSVU6kEyi3wXBx/AhPXqqYJ3jRcq67GKgprMiiqNdBjEq2F?= =?us-ascii?Q?KI2qAu6yXGHqvxhv31UhPsDxt8kIDdyDzy2erxX2xvTPLdlsxu+hV6XUwGGZ?= =?us-ascii?Q?J58EDd07K4CWmznIIiZ2vyzQiCA0mlbzCzkiw0zTILU8aT5vgIjsUhlnWYBV?= =?us-ascii?Q?rur9g5MGoO8UFzufbxnfYmg7et67/qjwVzLvdI0S0Ru5XcMbUbg9+LATdeqq?= =?us-ascii?Q?2+zCmv2pexMDOFWeTqpv0Y1tGyEenp3cJKO/43K4keczpu54U45YvcbOZ/dT?= =?us-ascii?Q?1xSzB5+BIE8W7c3ZNrhkh1Xk99GhdyjcDkyXUX+AXHUnX1ioVzW7db/qNcqH?= =?us-ascii?Q?tzNh5d6VPnJXk1MhkCeSsp+OAvbQbgGp4dz24XMAYKU2q6/0US68ljv7Wh8A?= =?us-ascii?Q?KkGES2O6gMF9HI+diHtBIaYDU8hplq9Pfmk8osxIzBxuULZ50wOXoAha95L8?= =?us-ascii?Q?pDKFcdu7OW1rDzpeEGYA0eRhocJ5hjVJDo1/+w3e72gcFAqV+A6FCtmxqJmh?= =?us-ascii?Q?NqRmsIwKfPhSW8oi539Dp9xkeGgCkzIckzuA/p1MUwa?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 6:0vHkVhTU3e46FZz/2YLbR11pIk9/LVJn1jsnFp/bAhoV6ClNW+zl4zRHBt7lYNbiniZy/Wti8b8rNt32CePg/gcq7XKtALH8BUiAT0QKXxq93z4mySkJ28fFMDBS1QAPoDn434GlRwMhm75ZOjn1GG8EQgM0TOL4R2R2CgzeDtT01CKzn4jDirTueBUziipCy02zB3h8SCeNGo7SX8wbq6VGGYt2wTMMMbPPYNt0ETKAdcn1iDSPXnJEctvhzFimqPpRx3PnKp/yHFPdsi22SPnAqUv/tX1P3SVLdMZRLPh7iHXunFm3cMpjb8paI8PPToQe1nJSy2SHPIrc1WBe4j9MygFg1rYeYz9m1hzdVms=; 5:j6hsow2+cWCAaSYrIir/xZuFrhhQ2AnidpFvEkT2qVOpwV1/1EfJ2zPch+uLByjgZK5S09tMZXwEgCc2KO/BBjjXhftBd+RGItkDEk+KWT226vWwfIpdrfoZRi/nfKhF+dlajeE/30jzX/t5fOd27ktzUvplTGPewC2n3axkGBk=; 24:yxwN4dJ05OqCUpGuVLLMXn3h7OWelCizRHTEXnN2AEAXuen1h94i7KNjb2RN3rowp/2KJt9QPSSdwxVlreVKp1bviwNmEPx08pEHero6W44=; 7:1bKwQq9j1OfGVJoq0v31Ce+HA00Dha4iVf1SJQYXDI5x6tx+hUkFMNxkN3L2eahtKTrAldPiZc+etr+3j7n15+q1XlajaL3BCb4Y7n38GXxqaz5Ax6oylnw1Xj3bhFOPteNh1onlnI2XorkG0Z4fvzCSwxGQuPJjgFRt5gRZ4tn0huxkRBUPYQqjR3JWfw+/kkYylNAa0LrFEs14oDtXgW0a9DYdVDSksIkmhXYlkdRc7YCLSWomcxGSRgQPIs5v SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 20:yvRpLqPgR4O9qvZF3Xb6IdD4VsbIiJmMSrE/tlZinZBi/PS9y2CRX7gx+9sGjfkhY/6NNoq8kRMeqpnRTJMc9rht83o1dAzq1IeaR7QySMJjZwi28W1xOSqx7RAr1SXnN1epj2oIhbUysDR/zJXjcu1xo2i7DCUQUOCZExZilcEMFuvyA7RNFaqUz1HxISCBvXE6+E194goh1KoJH1Wdmj4k+99iaO+9JfvevC544S0F2WvpIRyBYwhcbbO/5u7Y X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2018 21:11:17.1079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c62f61d1-9477-4871-f9b4-08d57eefcf12 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0155 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 Signed-off-by: Brijesh Singh Reviewed-by: Eduardo Habkost --- target/i386/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b5e431e769da..7a3cec59402b 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 */