From patchwork Thu Mar 8 12:48:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="ZTEM0m3U"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr6S6gdBz9s1r for ; Thu, 8 Mar 2018 23:53:36 +1100 (AEDT) Received: from localhost ([::1]:38473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv38-0007kd-Og for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:53:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzI-0004tT-0r for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzD-0003ez-RD for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:36 -0500 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:10675 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzD-0003cj-Gj for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:31 -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=5wh5sKoS1Kacg2awiZ/kpoN2AfQkpAPFPoXLNyQ12p0=; b=ZTEM0m3Um+pIkF7tkwO08Q8em2hBwTt3+DPcQnsiQVZpHKsZXvxGZVGa/widu64V69Z4XdZ6tT16N1HLgadxlzOCgrHRIfeETL09OcqlHUeQEmNmZQdgcVs13PtWZ5qHLdD2dog/0PWRIFeZAyU2H6rjAuFXbQvgsxVfWRkpS4w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:24 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:34 -0600 Message-Id: <20180308124901.83533-2-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a3e526aa-fb23-48d7-5c3a-08d584f30668 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:6QikbbWUIO02wD09iwiSWrsBStXRbjGSBB1IeWvEKKqFAbz9BiOAPUo2fuzs6mZ3unnnq0aPxaxZ14Y+CH1AeZUvHsPuzcCxRI2XwIiXkF9rn7qzfF0MV2jpgGZBNLHbJFi3HUNyPP2JvN1GxVoi2D2C3qK6eRLOPYeyMln1yX88SB7gkMkVF2ZeMbOdugVX3aCgqZy8rqhBDQV0cdchMx7aa4H/4aO38ksNbe9S24DNwpMzuFv2sgxdj5QmPNKm; 25:UNym4tedWzwRP/6VpeUpLs5kW7rLKdjpoN3YRteSJsfcBaEGAV+YFKLA2NK0jEtJhUZDJCvQLBTICMLuL0DlTeNO51fxDzuJRDyMCLNyKz1l0rcj3HgHezSWnip4l6+vO27XKoPzhPALbfD0LN8tOLKjxG7+frPklABvUT14grfUEe/X+RFnqANLixF0wQPFaTcMT3+grIxfLODNPDidzVn7FUbXIIbw4hUZnx0yMJDbvii2TWSRAKQ09w0hLtvxEy8XPQHHqJ6YJQGFx/1aMzDgcBKPTS8S84IOodDlDSEIUKiFok3NFjcfdsg4267RKfZg4/Fws7O9EcG1J3uNZA==; 31:xx4ySiuq1gQziZWZhUPtbLVkFO6Er1IVru2MV/49cmuVL6iC60JCC2L7iEEgeOplZHFLydM48X3F0dYNeIRLRCE8P7KhRdcTI2ghPmTrFXXeEldbpRcfdKUCErXUEmFsSS91BZrD71XmMMWQRyC9i12MRnOjAJVCJUEvAuymBAc2vlOgXeulYSRwqgSks46nXPB/0jL2oBmtJuF5M+MYlsNQ2Qn/+JqdhFLdcM6FpSY= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:Y0LY99Xjm4yrhotHAMXOi+urun0qmGyUZr/Qfmg734qSrhGVM9QE+rE0zdNg2Wqw451LXVPr9oI57dg2dWUwyyObRcC012c+5H75fuKLhomVzUYr9VF8Ye3uYynRJQ0wU0afGwRyq+p/qLDxHJZltSRVCs0Vtm0sDlF+D6ojwjihQwRCDiCgZfl6Z5mxZqZ9ppUiLm3Pex6mDKHpve2mL2aTrrydYpqPx+HtTK1iz5/purpTIGNhETV+0NXN29e3ducc0u3WL1jwwwEAbNHEXrYw7rMDn6BxsXTKYmpLBEyP31EaBLdkIeokm62Q8wIKdGt42f4zitFyOM1aE4/oKAO7Pr8WiZ0IjZHJB9VvJ6mYtARjA4jKms86pVblULu/qrJ1MhwcoMkIURrTP6HppyX5ZJSIul4NgsdsTDSd+mT0CHGmYxWnPVNR2tLJcFBn3auKlob0DoZb+zj2/XbzJ+S/bUdVTyAbo8Q49jgAsofBOVi/AsmwlBvkLbcnFfkS; 4:2OyrVvebcU1EodcE6/Px30j367+3FHsqCtdU2cG+7Jo4WAUFYWlEQlMY+O2K2y7paXPbWE/JP0zOTAA9sCuyOGa+Xd6wClaW8yJBYpzjsw6Qc0kNwPW8Ds/c/dL0r6YxzdomXDbAMTZWQiqX3S8R0kcuRMI+PQUS2LHBY0Jo5cC54Ch9e/I7FSMjaeiq5oO9TMRaDZ4XHcqkHfVhn1D6Mn5Bp/GK1OEEGT94XOsGsPeDoNLMvJxH/gLHY0T4yA2iX44RIya5D6eC6O8G2VOJd4QsilDLQoEmD+MZDxpWpih/TAIoyvWWR2MlDc9lNB2MtcKS38A2RPJsa9BLKEvbjBAgZ9z58m2hPrwgx81vQr8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(192813158149592); 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:1i6jdGBi2xoLN+UboAjji+s3SHflPymHRbM1+aNJe?= Cs8r1zdJKxVbVDC00hkK+bKbb487gySEGN784AdkdKOmBNJo9BuEsH/5joDwnshUIbKHrwqjP5Fq5tQ5Hlo2o3GLtz6Y3p9lA0opKKkv4qrPY8RtaaE2vCgIiLd7JTTphKrjouphLeNdq9n0P96ubxZWMezbRS5DG41DOydiXPb0VX9zTl1Ifppf7xN3iBm5T4gdRDckm7W80u2cyu6Tq14AU1NQKMN1EIDufnvFif6Io0smZziNtcIwLiGxBDJ0GrW0e/icJu0vd6pqpBj3CGCIl5DvvMJrseKqng19TpHITrbb8ZutDDvIzD6J0QzNWQxykj5MiIzV4can25++l4vFPlSQcQCISkLXl8B63C3o1pAH8fEcfpHJWybXONfv6eiP9C8Ys2yM/Aqso5EMZucl93GAR7JBgwgHyGwPt+0DT2PM1l+nk9zk4AStHCOKF96RVXqWaBCtnYIUvkHiwEIYASLqEUTeM9LXRI+M7jvNri8rRt3scrFOz+k/3vcEOYqlC5aiMXqO9zscXEBJ+ko8MG34JLrAcau3rTTU0OSa9BNy7ToqlGq91ki9euiTUTq8RlZKOx0KH5WZ9HyVP2EE17fKUBL1XErd2QbTFBBuSF//h3iygayCq5kVKFNarM+ubUrLCrXSr4xfSuAmW/IWPQ3BhW7t9P9nAab2MEq/VHJv2zv3Y27O3IYVinxdRef9lDtsuPyrqCE8mNf6UUMuILChRSsL991bFDOO5BOSLWInaj4/y1dzd9Qd0hAzSBpjxOYeb3niFQRYfjWrg6mesYopbVFEkmLGCXIcUjSXsKIAEowBB2+pvHktZGngJ3JcS6CohECRBuEQ7dyRN+qNK8euL448Q85VT6gTQo6BQxMy/fQ3KKgHzGacNLEavPIjM/PzkMeMsd6uv9zGcw/VXnRBEhQuOgk0royG4HgdRTVYE4MTfyLpVmBLj4RH+TcSuZaJeiLVKuN2wAZKiirfaiV2V/glB7ZoK0m6LcnV5CWndFB1pzREYJ/KMp2bF0SaqOCuQm7pogP0bpR0iaWW8zggQj7mL1qzsPQdkcuza0vwifUGo6T8EfDzGFBIP1vkkQY59dJv2gUxlNQICMKjl/McUIUQ+KWLwiQOIOaZXwQxfJdCOBf37vIYMqDg+eNbq9Cq1yWNvgkAWoks6AVWrxY+YBrp5nyZI3IW9EJg8DH66Ons8uQQI+/p9OoX+9xWtCUNDnKRqqkQatXxyqjXRMAPggiyChHHZOHo+z9JA== X-Microsoft-Antispam-Message-Info: uBcEStzjuNEwK3OUypVAPCj/oMo+8VghI6+InTdxzq0S1Z3GfvXE946VznQLSfVYMKL03c44MV54jcyOYxAxvW7tzVrBj8mo4gB6LNUXKHw21hj54wJPTo2fvoHQy0/Zl4CKY+i1j0K5GUyvI3foGr49ttitOWEdlLnJfxOySRyHx03VRDuq/kX760MgAZug X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:5Wv2aMpHtRpq/bDcsKV/MUI9BjXU/Qb0IeVhO7NHYmmPGEBMoa0f+TLXUYxIf08Z1yckF4QPxtQaW5yMmPmJgNgs+u7Wz2pHmVOrckG2eNDql69xngKFyb9DYX1gtAHewRM3u3ZhoFJ9fdNuU/Mp64CX5MQAzC2nZoiCvlSlo+kBJzyLdrbeHo+UafhNiJInWjKeMWIvlbfaf+5gYv4XnqIIymu+/uPBKweOVHW74nUeNWAeVvM15uOOrpU8Ed9wbepftfQQXC1y7Cv6qpNPVgdtw/ytJg6Q+BnZMQ1pybEQvwZ4KMeXV/oJFn1R6R1RcD3G2+M4akqLhaEERTQbHGykCQM5Q6jNYAy1COTKIzg=; 5:Cs0cvi8KIxHIOV2rShhudBg69R1HWOsjrHPiZZF2rIjmOhQrbde7Ad3oC8ebwx+toLBOMX1Kk3r45YxwwiDzBmrCwEtxBFSvC9FBr29yUX9geJ5nu+Yzf2H+godx51skKOGTQMpIBFRWXUo+A6uLKZoZTXKJtfdlbQgZsDkL65w=; 24:25toNgI0kbQqnT7R/fPpr3+Sb6JtIUTquR25ynsq0bkY5IHQlQN6ng7YoyprmHU6VRML9705WeLmMd2eem47LbxI8OQSZuacPaL2uey5kHk=; 7:zbeGJa33W/K0GKkYhoJk3op8tkgKqzB6cEMOVbu19HgNY7W34+XZmrk1SIjzSfos+4S8f23FLoeJS5G6hHsFG96D4F5HU0qTIhdgfXfXsbqeWnkYIiRnFOae6GuqxK1AuF0UH4dccSNzXavE4sZPndUV5FVNza+k65ogFah+AA6++VubyxzGpdqJoFl8tATk84ph5qRrVfZukgqTFmwQOzZZdMWRQ5FrX8MdiLrvRJJt8arZsUx1Mfk8gVlrPNNJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:ObIx44ObnTuhrZvxfEKXtJQ9RGtjFtVEonOIMTh0Kl6E23IDRsGqF3RtwZVwc+NHnfxU7Jz0mGdz1uTZVn9DIGzNuLecARaX/OjBUtQ2DiEVHRqaix22eI9jDeB0iZ6oWi29lOrhHbjo+P9w/UPo27ZB4eQK/aOtFqzZiOtWyNAQxcf0spt9Mz69J2AxM9NG0vzZe0ho8aR7L5a5uBTkes8Fc6sn478k0ioA+0GpQS4Qph045rG8lLWrx/vStyEr X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:24.2215 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3e526aa-fb23-48d7-5c3a-08d584f30668 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.68 Subject: [Qemu-devel] [PATCH v12 01/28] memattrs: add debug attribute X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Extend the MemTxAttrs to include 'debug' flag. The flag can be used as general indicator that operation was triggered by the debugger. Later in the patch series we set the debug=1 when issuing a memory access from the gdbstub or HMP commands. This patch is prerequisite to support debugging the encrypted guest. If we see request with debug=1 then we will need to use encryption APIs to access the guest memory. Cc: Alistair Francis Cc: Peter Maydell Cc: "Edgar E. Iglesias" Cc: Richard Henderson Cc: Paolo Bonzini Reviewed-by: "Edgar E. Iglesias" Signed-off-by: Brijesh Singh --- include/exec/memattrs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h index d4a16420984b..08099e4f7e72 100644 --- a/include/exec/memattrs.h +++ b/include/exec/memattrs.h @@ -37,6 +37,8 @@ typedef struct MemTxAttrs { unsigned int user:1; /* Requester ID (for MSI for example) */ unsigned int requester_id:16; + /* Memory access request from the debugger */ + unsigned int debug:1; } MemTxAttrs; /* Bus masters which don't specify any attributes will get this, From patchwork Thu Mar 8 12:48: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: 883098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="4IAMMlUg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr9Y65Bsz9sXq for ; Thu, 8 Mar 2018 23:56:17 +1100 (AEDT) Received: from localhost ([::1]:38492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv5j-00024H-Ap for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:56:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzI-0004tU-18 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzE-0003fh-Gj for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:36 -0500 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:10675 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzE-0003cj-6W for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:32 -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=GX88CZz8kwtCmTXXNnOSIBkyyt9UNKXpBcr3LOG/Q9M=; b=4IAMMlUgffYR7CePwPwOKdVlMqiR0njWCuJSCnneYIrshCjfVBKX43dli5xDAGaMjbCuDJgYl0477B71G6TtAMn7fA+Ugsm/9R5Rv2G3boaDt9rPwRMLnq2xygqc5YCEEHHbEoedbWBgJ4mgGY8wwi5Rwha/ePsaBTSBbJQM3ho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:26 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:35 -0600 Message-Id: <20180308124901.83533-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: aa9a6598-8170-4536-e97c-08d584f307d9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:qb0y/M+gpb7xXqKJRKyZVWgCeE1gdGh6aaE5p6bVaAVu4Xtje1rC/J0wFI50uOVtR23lmRBPArdn6XCV41Ipw40GtPYK3ekckD8+NYT2wdTDRNLxA/B8AVe21XBeto+b3nvhB+QQHt5Q++XWIMCMqSxNjWLAkEcbaO1S7dvAKObnAPmRTulhO/+VOtCEbvfMe7gE6qTGq40OPpBo+JCm1DYISn4bxCCkntOZvpqHq14c/Nj8JED+qlQh4h0glLdA; 25:N1dTSEW5CyZWhvEEJN+OjVnoepCf3NFv6NSBT0ZmxLmhCm0ZvfQJAUffgvtH5TWN4T2BJQel4hWhEhoQIqqATA3ObzXh6cjq+hFysDZMUTAph42AYr3XkIz7naEZdy1eGNV2s1Czp+oJqrPn3oTZQOf5BCfRfaoWQokD+Mm+XDYtH1tJJst7AwJGAF9m/tJ8w3lh4Pf/WSIaUBiWQFtzixU03n5gZtMAPgByTDubG1ZYcnmfTJsB4PdamVaJJ1kXo3fOYe8cPb6EQI2ifHVQziemdhu30D7FDLflr2q2iBRw9MlvjsFRQFP4X3dSa931TZbdIZsNaBfB7rIihUokTA==; 31:SfDjB/upZ86DMJM29MgT6IcKXKtekJ1HOvv2VvMIGsSzuraqpRNQZ655BBN8y/rP5RVAysMmykbV2stzxQv40NKRqy2SAjchIh2bojhc9iO2Mzp/Ii2wpd+g1SgrIbwqIIjwxyzITKbEdbFd6rkUOcoqrcqjEYQMe5eAq73EFhMXEPCZFjkl0vKrWBLt5Pd1UISFLudxv6mv9YG7dY7rLerZTrmojpLYZrRxEU/dgHM= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:4AHzmXPsHvgyy+nOnZCeSuNLUDIaO8gMLMzFFjOtfPDGz8lne0GIW1ivJRobqKCOcwX7p9eBhuwQDqegt6pdIaWGlaM9tNhCl/LIOXNlwsRRENU7pM4dV5YaImlsinRkfKFN72BunblbMECv96FKRtbxxjb4RH19ZYE584Lae1eUmWBIvumEfhT09spS7nL2jqYaPJuM5+8dVEpUbuJkhCcEp+gyE/lSTLngdWgMc0fmECUck92m5tVJJuvaa+8ZWxtOp+AZ70JJl1GLl9Fq3OPtGa8VvbFaanVyn1gqTwMUO+mp77T5MgboQ168B12ShrrbMzqUX8ycemGO0llAeiQT7O5XV5keuYFXg+iO0gT742blvpzaMVxm99xDI+Sak+qmEZU5Xlpcljg+Wc88yqWvbHqhIwP57cVQPkhpzX6T4STNRJRokxUCGJf4KBbENHjy4S9PNLwhR+LB7Tqxzr7u24Ue7EezuHsvcPEshMOhPe8wP+MPROOcYDAwP5j7; 4:Z5ayUlFrbnnhy16Ekbi/JugrFoxmkT7QW78cABt2ZlYhotfNhnO0V9d2MYbgMKv4Px+oMhRBFGt7YR6xuQMZobmuLqElGsXDK+vflaKMgfbou7ycgEU/TYyklhGALtakg341QvysKy+Fkpuze/DD5+tgDfN7l4a9sgXyyjkhkwauwKlzWG+kyMNV/fAiXNc4QZV9VFuLlXRkaEE0Kf/iqyJmXOdIlfPK9MZyL+joKcHpkPt80QCxJRIlEHVP4WtelKDb/K2zGx/WNUnlMxLXRL9U35Oks2OKopURQyULsMc9LClW2N77PB9BfX3y9WF3pc6moQGzPXH2UtykLN51bvLUk8xu0qlMpruJTwVEUMM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:YeAm6BB9CLVlt9xc1nCTtoiJW+VoGSvbMv9jLJqTQ?= zBtNeTMgm3lHLMf7yAz5yowf0nfQXSqfwcYLGHrLSJO/tOkANkR8zde6dnQqIAd3/tcJxfY/wafZwbSgCWo8dzWy5p/2KHvpUwieTcyA+CrujAN90TUF00F8MBACjznUDafbxwi0K5c4XSzsHO8DQ3OwSg+Xv+2xT3cVCCOaWr9Ekch1yra5O8sUJSEnLM2La/OXXF1NHszs8TKiKf+LQ/U9odDtb0wAGxrxTEqLf1pQwMXsksUVNoHnH2PaSNyEF6MDrkhVAIki6vq+BBoX2dTsp5+9Whi0YKhKXkqIJ6k6/sPX3X2ld336McsCjdV1tOetXKRK2Dkgd6QVQShKonLcRju31+btON8qUCvDTU/2r4JBmjRwiTL+uCL1al/GwRnaFN3l6sSEE1rIaQB4GFFQE1erEqtlgSqB3CjmtbNuSB7XMfM0y5n130ubKv4pT1nktS6buwnoHn4gOsNN50MigIoXjc5IPXK1lT15A+hZ2YyGalye9d9w59j+gSd+ViFsRkQBAwk6Wf+WjaYUO8XoHWmLy72Mb3790mT0KhCyT0FWwDYW8rxnWA32zAxTvlYFGDUkhTjsv1D54G9ZnwWN3+j6YPQh5Tf+6kEn+fujAcIV9AQetCHZA/DqQ0NFi+OFwlr0Y+ne2zlnvp9naaiLUEwvc7axrXzKF7v082EWqNcCPWqYrAtElMev9elVZ3Kz0L+qE+J/N7il/Drlwo3SPmKfpGXUmMhMo20sk52eOhujBndl2u25ysQZnSD60iBlCVXsLZXu5ky8XVTMVHAR2Pj4LCA365dKP9fopVNGUJzxqzBrn4I/h8lbpLrnEZhCPxhIyEAMmBVgLYoKrOX55FMQWGkKAzYiiY8+vruMAU4Q7aVjKpzcYx2hTPmrd7109GLpmIlvVx8BAcMoNtlGrAJqKwok0aVXEbKMaKgcuUR6+ewXuEyKNoN81b9S6mGrvjd6qeO10MLusZm3FeTPtnStvfb+/2uaikgLaaXZyoPkCkRpYemJ0Wm63KZGOZjpdvKwRu00cyhskhKA8Bu+frRVz5vzQXuy6MNplRN+NwBaPOEQp1tsccuAaO6nBT6bHtvkrYdaclcs4a6O8cFzNnHIiL0HCrzLoZPuIuPGNtW3BPYoyghKl0sm27e54XRz0dZFFepJ7JGRccwETv6lXAJ8K/xu1HKUsKM+la/gpUjw/BwsL2yn9JAralz34SZtpQYTMOGhzZ0HMsgSf4wMtNNWQIjE+dmV9gF4oYw+soMg8TCql9oEwoBEXYDyDA= X-Microsoft-Antispam-Message-Info: 8sEqpLJw6DXnCWyC82xVvy4l1q6l0PRHfHR5Xiez34Z547zDSlh42lR/+scIuQbw64zLoIIISjzx4RUghhfW1WVaTdq3zjyYmQ0iuid/McN6yk12a78DMY+OjMFudLpgHRsdS9UNTUXtShIIqg6iMpHospOvrZvS85+7v+qEzClEJKYjZPdN5Eg/7771bgty X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:BrpxjpALF3aaK2ivNEHY+EIXWxGp8pUejS8DCFVY+unQkgNnIz4Au9FFtvUaODXzUWV22JTiIfuCk7WY3qQJ7z4rUdUybWMGyOxkXDELJ2jwvDiAqueBMWQPIwonWRJeRrzLCA03sXufV4c6RGuzUeTXa1gvt52xFXF0+MQjpq5pjh8icjuq77EDZF2c+p+ZMhaAg50yXwPrQ+cevyvuJQNaEnFooqNZcTSC+F7NfVxesffP+zsCEuzj/FB+ARGmV28LQLMQmtpBUKiVLJDLMQUNTImhcq5ZHtaZQep8OMj46sBY87UDtKenHVFw+ochjzHM/m2gTQM8WlV1EW2quc4kp/StF8/8Syx9BgTkjkY=; 5:osEK4IaEdOUX6m2cNOs3kByK8Fmh+QSQqbQ3mU5epmLDiOqvbENBm470xo6o6cnoaqkhyaHVxyxhIF+/FFWiLfJC3VrD8zdBO/pzauv1XLAlfMMLhSAaKeZnsMJljxBeujThG3rE+hTeMZOxEqkUpAv1Cp0lJnlb4GILHJVVDac=; 24:4IfnHh20mcHkxh1Rph8xzSUk1lyEXsD6DEotw/dhc5bGvSEMkEmcbvF2yQ20Q8SM4OAxVtSt1uNYHJwt6VAyZ7uYbW9ZumESXEIpTtfCUyw=; 7:CcQHmnqnBbQOIv3/23UFx0KfcAqWMLuYylQPcnrmwP/7oyAetX9T3f13PblC4sFtu1bB7Z71Xv8gsA8naLT7N6oB+nIhblp9LsIT3Oj59Qvva6OtfiTL1IXuuitACLHJapoxSbhODAn59ou8TTR/+KZKUU0AVKmiivzzlmtTrtNBKLsatHZxHaE0TNToFbfCzEPhMyIHgMVT2sn2ey44NQUGvXg4hVVw5259lfWzS+s8yJLke05ieTGHJxAGmhlp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:i/RtiuLk6TqINgH0+9Xr7xJ62bUT8+jUOeViBBsQeyrxDIU8LuMtTNBsFu+EkwArUTc1frTAQX92P6Q8G7nBEq1O40CLjcZzc6PWcKIXITnEFszK4JEnlLVcefor8BczZTvbB72G739atrxTldd0qD56kUPBx99gAwr3v3vsXIkjX+wQbndSuVKcLCrLvLWZeXHxzKJiPW8FpMRIafmlCh5wFecjGSZ+9W03CV5QhcIHPQxXE2DT0mceaDoNl67D X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:26.5809 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa9a6598-8170-4536-e97c-08d584f307d9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.68 Subject: [Qemu-devel] [PATCH v12 02/28] exec: add ram_debug_ops support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Currently, the guest memory access for the debug purpose is performed using the memcpy(). Lets extend the 'struct MemoryRegion' to include ram_debug_ops callbacks. The ram_debug_ops can be used to override memcpy() with something else. The feature can be used by encrypted guest -- which can register callbacks to override memcpy() with memory encryption/decryption APIs. a typical usage: mem_read(uint8_t *dst, uint8_t *src, uint32_t len, MemTxAttrs *attrs); mem_write(uint8_t *dst, uint8_t *src, uint32_t len, MemTxAttrs *attrs); MemoryRegionRAMReadWriteOps ops; ops.read = mem_read; ops.write = mem_write; memory_region_init_ram(mem, NULL, "memory", size, NULL); memory_region_set_ram_debug_ops(mem, ops); Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Signed-off-by: Brijesh Singh --- exec.c | 43 ++++++++++++++++++++++++++++++++----------- include/exec/memory.h | 30 +++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/exec.c b/exec.c index 604f03c535bc..f69371d30e14 100644 --- a/exec.c +++ b/exec.c @@ -3056,7 +3056,11 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, } else { /* RAM case */ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(ptr, buf, l); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->write(ptr, buf, l, attrs); + } else { + memcpy(ptr, buf, l); + } invalidate_and_set_dirty(mr, addr1, l); } @@ -3144,7 +3148,11 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, } else { /* RAM case */ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(buf, ptr, l); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->read(buf, ptr, l, attrs); + } else { + memcpy(buf, ptr, l); + } } if (release_lock) { @@ -3237,7 +3245,8 @@ enum write_rom_type { }; static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, - hwaddr addr, const uint8_t *buf, int len, enum write_rom_type type) + hwaddr addr, const uint8_t *buf, int len, MemTxAttrs attrs, + enum write_rom_type type) { hwaddr l; uint8_t *ptr; @@ -3257,7 +3266,11 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (type) { case WRITE_DATA: - memcpy(ptr, buf, l); + if (mr->ram_debug_ops) { + mr->ram_debug_ops->write(ptr, buf, l, attrs); + } else { + memcpy(ptr, buf, l); + } invalidate_and_set_dirty(mr, addr1, l); break; case FLUSH_CACHE: @@ -3276,7 +3289,9 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, void cpu_physical_memory_write_rom(AddressSpace *as, hwaddr addr, const uint8_t *buf, int len) { - cpu_physical_memory_write_rom_internal(as, addr, buf, len, WRITE_DATA); + cpu_physical_memory_write_rom_internal(as, addr, buf, len, + MEMTXATTRS_UNSPECIFIED, + WRITE_DATA); } void cpu_flush_icache_range(hwaddr start, int len) @@ -3291,8 +3306,9 @@ void cpu_flush_icache_range(hwaddr start, int len) return; } - cpu_physical_memory_write_rom_internal(&address_space_memory, - start, NULL, len, FLUSH_CACHE); + cpu_physical_memory_write_rom_internal(&address_space_memory, start, NULL, + len, MEMTXATTRS_UNSPECIFIED, + FLUSH_CACHE); } typedef struct { @@ -3612,6 +3628,10 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, page = addr & TARGET_PAGE_MASK; phys_addr = cpu_get_phys_page_attrs_debug(cpu, page, &attrs); asidx = cpu_asidx_from_attrs(cpu, attrs); + + /* set debug attrs to indicate memory access is from the debugger */ + attrs.debug = 1; + /* if no physical page mapped, return an error */ if (phys_addr == -1) return -1; @@ -3620,13 +3640,14 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, l = len; phys_addr += (addr & ~TARGET_PAGE_MASK); if (is_write) { - cpu_physical_memory_write_rom(cpu->cpu_ases[asidx].as, - phys_addr, buf, l); + cpu_physical_memory_write_rom_internal(cpu->cpu_ases[asidx].as, + phys_addr, buf, l, attrs, + WRITE_DATA); } else { address_space_rw(cpu->cpu_ases[asidx].as, phys_addr, - MEMTXATTRS_UNSPECIFIED, - buf, l, 0); + attrs, buf, l, 0); } + len -= l; buf += l; addr += l; diff --git a/include/exec/memory.h b/include/exec/memory.h index 31eae0a64062..875d39a125c6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -223,6 +223,18 @@ typedef struct IOMMUMemoryRegionClass { typedef struct CoalescedMemoryRange CoalescedMemoryRange; typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd; +/* Memory Region RAM debug callback */ +typedef struct MemoryRegionRAMReadWriteOps MemoryRegionRAMReadWriteOps; + +struct MemoryRegionRAMReadWriteOps { + /* Write data into guest memory */ + int (*write) (uint8_t *dest, const uint8_t *src, + uint32_t len, MemTxAttrs attrs); + /* Read data from guest memory */ + int (*read) (uint8_t *dest, const uint8_t *src, + uint32_t len, MemTxAttrs attrs); +}; + struct MemoryRegion { Object parent_obj; @@ -262,6 +274,7 @@ struct MemoryRegion { const char *name; unsigned ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; + const MemoryRegionRAMReadWriteOps *ram_debug_ops; }; struct IOMMUMemoryRegion { @@ -675,6 +688,21 @@ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, uint64_t size, Error **errp); +/** + * memory_region_set_ram_debug_ops: Set debug access ops for a given memory + * region. + * + * @mr: the #MemoryRegion to be initialized + * @ops: a function that will be used for when accessing @target region during + * debug + */ +static inline void +memory_region_set_ram_debug_ops(MemoryRegion *mr, + const MemoryRegionRAMReadWriteOps *ops) +{ + mr->ram_debug_ops = ops; +} + /** * memory_region_init_reservation: Initialize a memory region that reserves * I/O space. @@ -1959,7 +1987,7 @@ MemTxResult address_space_read(AddressSpace *as, hwaddr addr, MemoryRegion *mr; FlatView *fv; - if (__builtin_constant_p(len)) { + if (__builtin_constant_p(len) && !attrs.debug) { if (len) { rcu_read_lock(); fv = address_space_to_flatview(as); From patchwork Thu Mar 8 12:48:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="EiMhCsm2"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrDg4QWcz9sgk for ; Thu, 8 Mar 2018 23:58:59 +1100 (AEDT) Received: from localhost ([::1]:38504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv8L-0004T6-Bw for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:58:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzL-0004w9-08 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzG-0003hp-WB for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:39 -0500 Received: from mail-co1nam03on0043.outbound.protection.outlook.com ([104.47.40.43]:48368 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzG-0003gn-GH for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:34 -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=fPbcxpvbtAXoUIZOZ+miclkvxnl8U/lFivSWLRFRivg=; b=EiMhCsm2k47n7IYEjj+Szc/i/+jJHk0EzOJutm9/EDB34eKVjZ9dD4D58mWtEHgaDLqi51U9jIaEtNpl/eKIaxxonfW9/HYVYcquFT0GWh/p1YX28ta7oAzL0PRzyqPPFef+bmAgazs5CdheKvcnY39u2+5lEoqzga6iHCvafrs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:28 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:36 -0600 Message-Id: <20180308124901.83533-4-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ed4efe6a-8e55-4390-6284-08d584f30957 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:zCrpHN5pCVwEnqJRD3w+TqrHJ/xiy+zA+gEwsheVMoRyOqOPjp6tLYzaJPMKq7DcIR4QYrbVlnQUC1dtiVF43zvVvoNPpCL0zeynr7Ac7nPRf6OkPECMiOGoiFK/sDNUcHnxrmLFQOOkFwgZF6hf9qHg0ZcD6LYzsqjHzCz7Fxbg/Dg3lMR5dtwpXqUBQl7REE4RxDTiCPK42v3w3+1tgXXqJXEWN1MinhV9wfHl96ZZMEN6c1HQShIMRmvfq/ew; 25:UcPYnMXXSC/6cJAftIF4tu8sgxuSV/QcANPufAukFzP9VSTvJAh8shdHHvZWoqHJn2nDT9geZm3wx8Kd4RIhmDoCR5eln90BL99NBRW2cpqUAXc/Pb1rCN4+Vbwi6G26bXKtwSqzSbEf5OwhHcE+svWIBT1AHghMNV4HAek4+Nj691XgmqTjbUCzA6BOR0i8IB6RwZiOyc+MuN1xtenBq6IydAE0Oh+Ul4JoMxeW+5/FICPxlJlWBs8jOoeItVaUaAE6YiqpZApcCeQcWGqbz9duVeWAoqqz3u5GAm5mNAqnc/3i0ODnMZ7xye0/LuFd0jndLfoybjNTdjzRbXBBfg==; 31:0h8Rjv1QINY2Q6uN1CZjWVlbNGd3AQHPNi77dXHErXcETvXlQuJsN3UY0LTrDgScIeZ8EcY7BO9XQqQEHLsEwPQl95NdFZzvgZWO3NCq9JJR6U4wt+6YmdGY6PqcOlNEMOFB/FzSvb6dIBsqqeMPbZeNA1Cksy1R2DVf0g0T2COxUVopRnUdYsg6Fd92CjTVrN2wzRgnFHL08LaARa+ncV9Caib0lsscBcnTg3V+Mho= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:L3xJtemxGr+YzHMsCZS1AhrF7gfDsEM/OKdmkTRp/uRPqjQi8SHNn3Zqpf8trcdQiQvBxplz/C1BRT/3h6oA/oy7onAPQZGACZO/rpl/INehuBC47hufdxIDYVx2RW52h8giZ6cZxAHgT/+WNsnt0kFfKGnf9S0mqiQSFCAObD9ATTimmouwo/jrrqdyfWrX+uf5WVsSA8b0P+jaQ9NOz4B7M9HRkZG9Lkugrpq+NAROQRy9UWU5orxXITzJsY7RH+lf+Nw+MXqwypumAM9Ke1ghowBmwuYjdos9tjL+lX5lJh0eZzwvtOMSRLMNqbX7wIpB1b5NUYTLnuBbrMaUjGo45CE3lCR67FY7zX56vV/Qe1DaEv51Rj/yvfcmyz3RTyRdF4Ml/bq2YeI7T6geywXEiB0C3yDbSuv1BnNLt1dkBGpkfwnEQHqI9pubeOA8Oo53qwZBepRLFqACNKO3n44loYwgRhNQnZCCIZlwMuQWOgHuOB1Gw9sAKan0ftJ4; 4:rdfiM8j4HV2IXz8ufLDJmggWZRi35zg3fg3LGItAwFHOzNjbhqgOl8H8OdIDs5INOenq1MlloARGetv6f+3Vy3N2lSVYpgiT0huId5Svwc/bINckUY51+kqdXL/WfBAFOceIBhWAN2wiMSUCJNTm/BA8j7umAiG6qYUiJvuRbUnB1baRddIRkBQ6dQUiuX292LBXmbGu6T155FDMDUm1Ah3/FBRNnL+VTz7wS9uxF9mKokKkgVuj0a4mW8/07aka0fwIf33Nggh3levJzeMDzGPx484oFnC3Ejooxk3OkaAdGHM4zehe/WjzgQGKDFb5Hf3GAHemzpw/QBVQdDpGdg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:eNJgDJ1vcUpMoIyPIWVv8FXw8sidSCo0nAwNRHgND?= /6t/2VbFVJ10X91Io2Z8R/U+rflZtUSfE9ZWXR3YKtplNhXEMs+wHnt2DFq9ujZtUZmXZ7BVyWyzKcnk2tUzVm8Owygh7ho+QkGHDx4TLRK4zAytilCVVKcWVxA9G60GM9Xe/JX0jBJ08SzrnbwXzJbHEyH+zpN3m49STXYQKcmdrBuTl+g/rvfm9AsV5zXDHrkQ9jONZO4KExRyGi9g2qTpUdlTjoSDGqwQxl68YnTzmZ5vhmtM7OBiYLSK6r7JGqpCRwSX2Sy9x/LENwmQNDRaAPWh+P/hbP5F21NLBHcRU0R2TCby+KNOhKuoYAc/yiLxEIHeiFFVQCc+JYj9gp5Lwwohp5jSyOxzZDhCtd2c4G8zwX9gVffbPPYO32z8YO8h6lxJmS/UIxaDh7voqhzzoouynjNSol8jmfgczkxrQJaN2mVkDoSKNpLh+20HU54zx7MQAHfKL1PR7Xq4lKJZcQFGDgEWRGPQz24R9uTiOYKZ9f0PQFTl5XDLrVWmkxuMFz8JxoRG4mK+MST25cyARfeNAu+xAoiiOmgnlCeg/9gzQ9tDIIBAwlDSG9GeAhg/N46rfzUsbhe8TvX3hycn8OjqHRsjFAN9frruOZA/+SYTyUQzfnPBhGK3CS4LTyQlxXM57zdonyvA2bDpLxxWeFj4Iy2QWLavty0X4TQAdK6lEM3eq1hNcZ9VMwEFrp0q+GzjnPHOP8GKHK7Qur4F1WBVX79BeFUHosBN3u5yn7Q5H1PG/vbuIXK02qJXyGsQHvI8/w9wexeLUwST4E2Cjpdbm/mW+6OMTtCXg8vktt95si8PtZT3+8CSfg7G3oAzBC7v+ld1ilMzZVdrb8ionIwhUaImkFmkedc31be8BS+Vs0KBqh6CuvuWos3B7hhuvqQUPJ4iHJx5jOAlOgpLzRoqOvbhI9GcVxGWDSg4HGxXro6vXd1dU3nKpz40gxAO0zwxtq1Si+4sG32V29WuxB3/wTLMdyuSujUrefttauACRo3pfI4cM+vAobuaoWzE+u9KcDcsnIVFGKWVBFESGY38/HpmpZJwWFbZHxKC0vOkEZ55MunyjIGFHFjpqPLqQ0M1CXcZVcjVVsX/Igf+8gmMiQYRndz7iSlsn4e468UeyGxVV86/RdS1NkMveiU5FpoYwocR7T8R72JacuB6W1zZ6f1T3HYRF/LmKAYOQlHTIbWkBfT5bNt7bzT1LUQcqUugOJoAxLmoK3R/YCz8bWlz39LYPRTWcvystTXcg== X-Microsoft-Antispam-Message-Info: KSwlZvptVWp63RzDpO5Y+48FKbBh0X0fbuR4BnIUH1ApJPVhC0+r4O4Ao8Y/EYVlYnjuN7AzCnDku0dl1wE/fjPibYjFda9iGWwTPIw0LjTEwgtD3ZZTd4J9RR+BeUrze3qeYPdk9G6fUhe1FYkHWNlGoNmzokfMTpQLqoLNdLNbWqPQhUER0j1Nr47fZ5PC X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:JIjLPkYwnRixAlZRNfu5hKlZE/wHwMqkvzpcbgXnHbVxBD/r1ivqdIhPjWpDY9sDlgLT2pysGhdwdvPt2ZXw/NKGvIcFCDTdXIvj/xeTUx8eqMknqBm+r0yaxVWZ2Xz045aVbFFa8icAaKyoW6VJkNG3NGDzm3gpoavWSoXVJMaAxlC8U0XRTZC2eLK4D2FBB53ZuZsEObHCSkkUTGA/G5lv+d8pDKQC01QskPfuYMQBieBjt0Ox3rAzcPc8L6wgZ3voAiXnlk8jcJo3SsTf/nGYJieJljo6Ae8+kTjb2B4tvHIz+2UjoXAU8mealoNW6DgCt7zssKTiJamfEdr5GBwT7aStuA887v5jQrdhckg=; 5:/Z+A9oonK+bZNGEg4ZsM5V7I7Q2GKSEwdBxmfkl9SKp102qc+2YckGTJw21sPAiHNkKhkn2+vwwjUFBoWqTNt0QLDjlz6z+NIA8iulnU/AZgmVhObdibddUin98Y5Boo3IIKY401I8zpYkiumd8Dsdo3i1QRNr9+qIfo/TUMVjQ=; 24:7OwYjxDVlqAIsMX+cpTO1mIURHcrkRgvd7BV2OCnD7+13OOKf6j7ZRbcRfsGIGBNlkwDEvzy+nrTyXdbftuCzrikMfSU8lM1vlJWiCg+XAA=; 7:jeGAWirVq15EAuJ2dze14TUiKpeBdhI1TaO9ZOQVD4/tUgNOeeoYSBXUJI2rLjOK0XNw7OzYeHfEcelP2BonY4wvvGNYZPZSr6ck5x8ftEIiBp/DCmsfSGNf3AgXGRIoXHANs99kZ6Xb2NaB0RyxEbE/fFG4ZhkF72q2qrrIwhApkiXvK8GFDOfCXU5oRV0UPW9yaO+VsJq6jWvdTK6qYptibYzI8W2YANgLp4EeWVxtA8L6ywiX3Q2DcKWWWGl9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:WW91fS+eb1O+W2BsisybL0IB8RuwqNGZU1OPO3BdDlo4EWQ/BatItn1pUvo+lU1kxukp4PYvh2UDQNmNqb+OxMcNFJcBcIGNcbAFmAHh9kBsRE9Hj+jpm6DAkfu1pHQsMUfUaOzx7r+3ODCAkWxxqoWwUshJVuH3pVw1BwnALvbimjElsFybslgpqhaaOiehn/b3Fa6x0Nei9s9OqZOoWEIX7HZV0+Nu85ca8URxMhUncEZDuzfb7SDUpeSZs9fW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:28.9715 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed4efe6a-8e55-4390-6284-08d584f30957 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.43 Subject: [Qemu-devel] [PATCH v12 03/28] exec: add debug version of physical memory read and write API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Adds the following new APIs - cpu_physical_memory_read_debug - cpu_physical_memory_write_debug - cpu_physical_memory_rw_debug - ldl_phys_debug - ldq_phys_debug Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Signed-off-by: Brijesh Singh Reviewed-by: Paolo Bonzini --- exec.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/exec/cpu-common.h | 15 +++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/exec.c b/exec.c index f69371d30e14..ca81a2f3244f 100644 --- a/exec.c +++ b/exec.c @@ -3612,6 +3612,46 @@ void address_space_cache_destroy(MemoryRegionCache *cache) #define RCU_READ_UNLOCK() rcu_read_unlock() #include "memory_ldst.inc.c" +uint32_t ldl_phys_debug(CPUState *cpu, hwaddr addr) +{ + MemTxAttrs attrs; + int asidx = cpu_asidx_from_attrs(cpu, attrs); + uint32_t val; + + /* set debug attrs to indicate memory access is from the debugger */ + attrs.debug = 1; + + address_space_rw(cpu->cpu_ases[asidx].as, addr, attrs, + (void *) &val, 4, 0); + + return tswap32(val); +} + +uint64_t ldq_phys_debug(CPUState *cpu, hwaddr addr) +{ + MemTxAttrs attrs; + int asidx = cpu_asidx_from_attrs(cpu, attrs); + uint64_t val; + + /* set debug attrs to indicate memory access is from the debugger */ + attrs.debug = 1; + + address_space_rw(cpu->cpu_ases[asidx].as, addr, attrs, + (void *) &val, 8, 0); + return val; +} + +void cpu_physical_memory_rw_debug(hwaddr addr, uint8_t *buf, + int len, int is_write) +{ + MemTxAttrs attrs; + + /* set debug attrs to indicate memory access is from the debugger */ + attrs.debug = 1; + + address_space_rw(&address_space_memory, addr, attrs, buf, len, is_write); +} + /* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, uint8_t *buf, int len, int is_write) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 74341b19d26a..fa01385d4f1b 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -77,11 +77,26 @@ size_t qemu_ram_pagesize_largest(void); void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, int len, int is_write); +void cpu_physical_memory_rw_debug(hwaddr addr, uint8_t *buf, + int len, int is_write); static inline void cpu_physical_memory_read(hwaddr addr, void *buf, int len) { cpu_physical_memory_rw(addr, buf, len, 0); } +static inline void cpu_physical_memory_read_debug(hwaddr addr, + void *buf, int len) +{ + cpu_physical_memory_rw_debug(addr, buf, len, 0); +} +static inline void cpu_physical_memory_write_debug(hwaddr addr, + const void *buf, int len) +{ + cpu_physical_memory_rw_debug(addr, (void *)buf, len, 1); +} +uint32_t ldl_phys_debug(CPUState *cpu, hwaddr addr); +uint64_t ldq_phys_debug(CPUState *cpu, hwaddr addr); + static inline void cpu_physical_memory_write(hwaddr addr, const void *buf, int len) { From patchwork Thu Mar 8 12:48:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="wUjqEYKY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr5n3JLPz9sZr for ; Thu, 8 Mar 2018 23:53:01 +1100 (AEDT) Received: from localhost ([::1]:38471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv2Z-0007EN-4S for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:52:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzO-0004zq-DG for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzK-0003kU-C9 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:42 -0500 Received: from mail-cys01nam02on0047.outbound.protection.outlook.com ([104.47.37.47]:51470 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzK-0003jc-0P for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:38 -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=v+HfjGud8ZFchqDzpvLgc2E6pkVuSPdOb3Qk8UFJwQw=; b=wUjqEYKYz8rXLtxdjfRvANyh4oX/MJRTtzaRIWLPrfnDx5BXQwvBxH7v6wSvJ7T+gkdF0Jr1E+ZkBbkSE4EJZgPIQsYRcou+wj1Y2Sry/L7QR3HPIfKNlkNUYKP/16UR8N82w8l6bYPtW6Vfbx9y7zZ7WBWJn2EJftwgYDnG9H4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:31 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:37 -0600 Message-Id: <20180308124901.83533-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b0a7fdeb-dfc3-486f-8d68-08d584f30ac6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:ckEw86RKaHyKLLPHVc5Sv/BpmyhN/Wj7GteVwglWS+UFCTRSYjcmC5m73019lodzjW+6o9e6+lo+o64ECGr/MXfZXbTp5UUBIoOKCbS1CSq0KkkZwuY4wFPMLPbkJMJnt0T/fokyfzrHahkBllQun9MNTUCWh+hZNms0DBxhXqhMvNlaLoh5XBX0oLRufqWnvhj9KY7E7w0aVfYN4ENIGKSYEzGWpzN75mwPbDn7w45Rgm7v1NC4ZupCkm+VuMLF; 25:eliYKMic5B38zkyTrYeubRjkoOFjwhvu2Us/r+qWjzUQkQbXPR8QSeDXNPEBcNSyoCmzrCYM8bOl2ARrZiZcKIVRX/qFMx0M98SULphha4ww6kTCv0HxX8NXYqEznNIY8iZeLEXtHNENOy52Sb3Z0cY9sg3P+cE0xq95auSKXhETyC25R8hwFD18fj5LFi0xjL0iELLcL6JnBqXPfd2Tm060rAxq6GI8ZS6Lzx85nCma+//31MnaKxcHN8fsrgglMbFrbDHdWbj6DA9GHjgJYBOafWmbbOG9adI6xLTNx4snxmrOg9DpHMfosphQ1DXZOLcmCysHfDtLIUxRtN1Cmw==; 31:S3B0xacel63149235e//OfXfU+tCU9V98DifsmJ3/st//NVDjVUZYpWT/sbClFcii7jJFRy3AXkB8seduDpH7J8owed/IwjzZHdeKCy/lDgTQV4zIrkS+1NtUtgKSHczbHuxCkjeYU0ofTmC5pHkTbhHA7YdQ18LqOvpYOHRrqCuOYmlp5UnPcuv9b1S/xqMVoAv0yZzJFITTYtPRffch8UFFm1A8JjZV6ET2ikHrnw= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:XAo+7aKSpvp3F4f956ZNvFdR0DBRPvhIW60bp5E391L/hGDYLAILeFT+8xjI8iO50s494d93SvIUG5A/HK5SKynxl0O7cqKYKsY/cdKgC5uwlM40WZzXU/mOapjdbhsyrx+F8uGf7xBbqZ/dOR2XF7sJL0weS7nftibtFkZLW/bS7A1XP8RelQDtSI5ISI4CHzvepjFl2GeHryx7Pd0P2BHQWU/TD8S7sWoTkMoa4gFtAaH7gtpV0EkuCkrghVFqIbNh1mNI3C6cwVaQAjhskayOwPaDB4kY4c6ngEhoy3DcNoe12yLh9uRjM3u9OQQQpI31rJCd6uZAyHtjiWqcH1cYF/ZB7NI1oChssVPPR8+Fy6MM5Tyo1ff7zmlNUKCXT/HpY6Jjtjy+faBSs223L3YXcnc3ZtmEURdjSMHtBY2+Wc7tTCdQH5+OMfZoOq0QPyXdaeIsfogGf2Ruk9Tmq/Ho3GxXKznPA2oWvzcvn3Tzd1mlkiEaUaVmKwwLgitK; 4:ue94UIGg+G7V54qRmc1RrIsgNW8uKBPAqheKyONrpBxpO0wGT/6X4Es33jsUW/cqPT0kkkwf0U4KYwDv/6wTEdBxIK1IE8VHu6iiCwUilvzuWVnSN850RR9psGCvd7sPmA9bcrgGpVF7EWHSrujvQ648z4aOfkqDo1J4zn7NGCnX6TALnCT2oBNhW5IYnr06bWAQa48ssfi1rAVHZIISOxKo29HmBAxp8qD5Ofadnd451AQqfKME6v9DMqMzQRP4pj85imLZgvs2sDU/XBXgbnrlOuRUIRt9zE0OVEdcDFBiYIGsb8GvGcb2PEomg1z2njBBxvSjv/TS1mWvpui0MQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:nxYYK8yJ1v1Ao/CJnu5JwyIAVswum96474UxwQvC9?= 4Cv8rnewTCwrKu02xF7xcH9FOc9/FPAbgFUhX1gH9F8YDTpNoBVQC7UTuMQamwPhXnd0J12Ea14hFC1bgF/bpOM9A79ivWzQQu44y7fnSSAygYKU+fcdIJ44Ucfu6cWmVmC6fQfxF9sdabIaAp1MW8BACh1wQvkOz6ySpM3yxdVf/OiBuk9rwhLfbUTmzGlC36+VHVkI5Y8cwD57bhgXzHm5V6XdKOtAqylnvBu5gaQkXblHIgYBZGVSpfbv0fj5z9cq7e1EB/z/gMCxc8wNUi8jnd5iE1+F9x10sPwLvXrDOcsCETxEYcdrn3TgjwUSA8B/O9jlsoCmfSWHg6iuU36YHVGV6RsAH3vOEH8w/v3erCpKTIm0i2UupauNiBhhiUvxZ8XrpMr2cbi/SPwg7OGbk5WhYaUizsraSR1tYg0QwZ10tLKnBbYu/PrreaTRZglB1pFj6b4uwDEVJcHG1F9N7cdsJi1hX9iqjmnXItQgjVKqqjVsooGVmBtMbv/jGCLXSCtD5fQ/giA7luTHoYdaeuH/yDqv/qnLvZYZH0enIMGma+voAiUVG7xomrd61NzKPpb34TLxjt2KNu7thRncmZQCrF13hWds0aImLww3u05fBFpPe4YH7zQme7zPhZl+WU5ikxru66ZLBjv50e//iwOHEnHPiYKt8ZSa9AK/j5j3qxJZikP1WiavpQHWojfmG4SQl9Kj4gLjJCij4MNdqlLhdJWZe76N4KbasLbSp7XsbAfX7YY9XaWGjzqvSZtnpT7FhfsKXbwBrYwIIXlidJMi2d0exe6a+OROtwqFaVZpTubmcAFwJQq4TpSi/Mb/cYF2AfIjT639DAAldwpbVKUq1dHjMU3ZmW/s0NTCdyK021ifs6T7kHjeisoLssTx7abA0WELWuA/qV7cH0WS0CuvWm26EVxeA4TMW0wVENZH73vOH5W+MOvVjj6m3QC6X8hz1WC3m37dnPf6NilndUi/nYximFHxlh8LrdBxmmUEjhSfrwAvxqVSY7oIjg88G0KmXU9TgCoCtqtyVD+/PUrHXPMXke5sKL7Nc0FYYFODolY8/etkQKSmMVGT5IbJBoU9xkfSE+gO8bpWXJlmNbX2/zBWxwxyI8YXSO6d5hm+QDD+mcIw4NZNUSzD1fCFq/NDcANnMRamC2X6posSHgdfN/Hgd9GOhnoanEkBSFR1he0BBdNQSxnCSPsGqVvPR1mPfaG7Vk5S1tq2deS X-Microsoft-Antispam-Message-Info: kK8UPxdQWqqRRf7GopICFBsj9z5EuiVbpjWKdvNmZRYbJgF4nzhEgcwPjqw80qcZxDtYosUURYhmwNxAcX14wh3N+ZpCiyhW41klKX6KZKv77r05dkhhOGq1zJ5BJ8F8JrQ6r6E8mm3+J4XSlRPtLrm5T3cr3TOak5IylXzYH4Xw1er5WSeXbWJd55TzfSLD X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:GZ8X3gkmdeQJGxXjumnOwH6KFJzLXL96lHTmsECbBvbtyBKZDp9h57TULfb8Bfy5Y6/U+hALmeO7b9UrWIGgjmmkBK0iTZ3Qcm6a6SJkN/tXggorrgO7T9GWvofgUZuunYM5qLBmRW2vIDsgQ5TCQNUz9iZC8r3d/bm4aqkdbh25EvM/mvcb1s29w3TYXfbdevJUwlgw43qitteaY2abkbtOcW4BNyL3X+cQ+SLr7TSlSlxSqCY6twyNjUx+ffur6vUjSxqOKdhpWiAxta6ICIDs/A4oNmQGB4/eUnAX2p9QFyBXxRvVE5njfwGf/TyQasLtfbxaNoHCyCe85lck2Q==; 5:28PSFP0i3nHulMwzASSpDX+T21HqhOU1KOmhj3VdYRBgvxbbcmXNlxZqBNspQx8zHOkN77+ZgJgfFVMXqAq4LD2Uql/Mjzr+Y5ERlY5/By3J0V9ZmDISF0hVgS8ukeYy1aQR/M812C7zvkfzvvGZUdrpK73KUSuuUAvtlUYTbC8=; 24:4J1miZm3DuVm/zV34stVZ1LpIP8l+W7qusoUgV/9iBfH0moWeAS+J9rXtGiWZ3NQ9JPRE2GBIGfPTOwLqB2M5cxX9enSFNFHwlixuEXFGzw=; 7:d9wI3QLKahtJGNPLAqZV61Vh2OmE4F1NojQ7UZfBykPlBPbl3FEeboFbZejWfTxpUUKhuLQ2OPOmFS5Utk1GccJi8jGpeb7+s4AebidHzeOKsGpNwJ8Rk5VxfnSwGEIuDueqXvn9pSLIB+2uiuokve6YhH2zWPy80yQHjtBXdiP9OJl/lo/8b20koWOCuK0Op3PaSGYB0FDzJ+PGyJjBaclYjSjAJ/ZCAJENEIuSRmwRrwr85acnFbntuqYnBUBc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:9BdHGLA3K2YxpjLoiwDHO0eINBQRS4ti/Q+5837Xi25/d3/49xtytoAu0CHzjW5T83dVIXC0ptNvNfm6/QOrsT2AxUDzqRbP9aj/LeZ+n9WWyrZrIm9nbTnChjQnUiJ19jo8djeNuN5evLc1+hKkozKo/XEuvniLBJ/hA2iVTPsC7Qmx+vF0bBd1V8fMb1FgsjDLBP9tWuTghD+HNhiV9c539ax3uXDwXsAWiSgn4qi1A0DeqBsZd+qOlPbqlO2T X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:31.5028 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0a7fdeb-dfc3-486f-8d68-08d584f30ac6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.47 Subject: [Qemu-devel] [PATCH v12 04/28] monitor/i386: use debug APIs when accessing guest memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Updates HMP commands to use the debug version of APIs when accessing the guest memory. Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Cc: Eduardo Habkost Reviewed-by: "Dr. David Alan Gilbert" Signed-off-by: Brijesh Singh --- cpus.c | 2 +- disas.c | 2 +- monitor.c | 6 +++--- target/i386/helper.c | 14 ++++++------ target/i386/monitor.c | 60 +++++++++++++++++++++++++++------------------------ 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/cpus.c b/cpus.c index 9bcff7d63c12..0dd506bcfee3 100644 --- a/cpus.c +++ b/cpus.c @@ -2255,7 +2255,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, l = sizeof(buf); if (l > size) l = size; - cpu_physical_memory_read(addr, buf, l); + cpu_physical_memory_read_debug(addr, buf, l); if (fwrite(buf, 1, l, f) != l) { error_setg(errp, QERR_IO_ERROR); goto exit; diff --git a/disas.c b/disas.c index d4ad1089efb3..fcedbf263302 100644 --- a/disas.c +++ b/disas.c @@ -586,7 +586,7 @@ static int physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) { - cpu_physical_memory_read(memaddr, myaddr, length); + cpu_physical_memory_read_debug(memaddr, myaddr, length); return 0; } diff --git a/monitor.c b/monitor.c index a4417f26cde3..3f4ba902266b 100644 --- a/monitor.c +++ b/monitor.c @@ -1368,7 +1368,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, if (l > line_size) l = line_size; if (is_physical) { - cpu_physical_memory_read(addr, buf, l); + cpu_physical_memory_read_debug(addr, buf, l); } else { if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) { monitor_printf(mon, " Cannot access memory\n"); @@ -1574,8 +1574,8 @@ static void hmp_sum(Monitor *mon, const QDict *qdict) sum = 0; for(addr = start; addr < (start + size); addr++) { - uint8_t val = address_space_ldub(&address_space_memory, addr, - MEMTXATTRS_UNSPECIFIED, NULL); + uint8_t val; + cpu_physical_memory_read_debug(addr, &val, 1); /* BSD sum algorithm ('sum' Unix command) */ sum = (sum >> 1) | (sum << 15); sum += val; diff --git a/target/i386/helper.c b/target/i386/helper.c index 9fba146b7fb0..58fb6eec562a 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -757,7 +757,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) if (la57) { pml5e_addr = ((env->cr[3] & ~0xfff) + (((addr >> 48) & 0x1ff) << 3)) & a20_mask; - pml5e = x86_ldq_phys(cs, pml5e_addr); + pml5e = ldq_phys_debug(cs, pml5e_addr); if (!(pml5e & PG_PRESENT_MASK)) { return -1; } @@ -767,7 +767,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pml4e_addr = ((pml5e & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3)) & a20_mask; - pml4e = x86_ldq_phys(cs, pml4e_addr); + pml4e = ldq_phys_debug(cs, pml4e_addr); if (!(pml4e & PG_PRESENT_MASK)) { return -1; } @@ -788,14 +788,14 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { pdpe_addr = ((env->cr[3] & ~0x1f) + ((addr >> 27) & 0x18)) & a20_mask; - pdpe = x86_ldq_phys(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr); if (!(pdpe & PG_PRESENT_MASK)) return -1; } pde_addr = ((pdpe & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3)) & a20_mask; - pde = x86_ldq_phys(cs, pde_addr); + pde = ldq_phys_debug(cs, pde_addr); if (!(pde & PG_PRESENT_MASK)) { return -1; } @@ -808,7 +808,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pte_addr = ((pde & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3)) & a20_mask; page_size = 4096; - pte = x86_ldq_phys(cs, pte_addr); + pte = ldq_phys_debug(cs, pte_addr); } if (!(pte & PG_PRESENT_MASK)) { return -1; @@ -818,7 +818,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) /* page directory entry */ pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & a20_mask; - pde = x86_ldl_phys(cs, pde_addr); + pde = ldl_phys_debug(cs, pde_addr); if (!(pde & PG_PRESENT_MASK)) return -1; if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -827,7 +827,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { /* page directory entry */ pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & a20_mask; - pte = x86_ldl_phys(cs, pte_addr); + pte = ldl_phys_debug(cs, pte_addr); if (!(pte & PG_PRESENT_MASK)) { return -1; } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 75429129fde0..55ea10deb8ef 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -68,7 +68,7 @@ static void tlb_info_32(Monitor *mon, CPUArchState *env) pgd = env->cr[3] & ~0xfff; for(l1 = 0; l1 < 1024; l1++) { - cpu_physical_memory_read(pgd + l1 * 4, &pde, 4); + cpu_physical_memory_read_debug(pgd + l1 * 4, &pde, 4); pde = le32_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -76,7 +76,8 @@ static void tlb_info_32(Monitor *mon, CPUArchState *env) print_pte(mon, env, (l1 << 22), pde, ~((1 << 21) - 1)); } else { for(l2 = 0; l2 < 1024; l2++) { - cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4); + cpu_physical_memory_read_debug((pde & ~0xfff) + l2 * 4, + &pte, 4); pte = le32_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 22) + (l2 << 12), @@ -97,12 +98,12 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) pdp_addr = env->cr[3] & ~0x1f; for (l1 = 0; l1 < 4; l1++) { - cpu_physical_memory_read(pdp_addr + l1 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pd_addr + l2 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); pde = le64_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -112,7 +113,8 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pt_addr + l3 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l3 * 8, + &pte, 8); pte = le64_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 30) + (l2 << 21) @@ -137,7 +139,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, uint64_t pdp_addr, pd_addr, pt_addr; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); if (!(pml4e & PG_PRESENT_MASK)) { continue; @@ -145,7 +147,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); if (!(pdpe & PG_PRESENT_MASK)) { continue; @@ -160,7 +162,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); pde = le64_to_cpu(pde); if (!(pde & PG_PRESENT_MASK)) { continue; @@ -175,9 +177,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr - + l4 * 8, - &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); pte = le64_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l0 << 48) + (l1 << 39) + @@ -198,7 +198,7 @@ static void tlb_info_la57(Monitor *mon, CPUArchState *env) pml5_addr = env->cr[3] & 0x3fffffffff000ULL; for (l0 = 0; l0 < 512; l0++) { - cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); + cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); pml5e = le64_to_cpu(pml5e); if (pml5e & PG_PRESENT_MASK) { tlb_info_la48(mon, env, l0, pml5e & 0x3fffffffff000ULL); @@ -273,7 +273,7 @@ static void mem_info_32(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for(l1 = 0; l1 < 1024; l1++) { - cpu_physical_memory_read(pgd + l1 * 4, &pde, 4); + cpu_physical_memory_read_debug(pgd + l1 * 4, &pde, 4); pde = le32_to_cpu(pde); end = l1 << 22; if (pde & PG_PRESENT_MASK) { @@ -282,7 +282,8 @@ static void mem_info_32(Monitor *mon, CPUArchState *env) mem_print(mon, &start, &last_prot, end, prot); } else { for(l2 = 0; l2 < 1024; l2++) { - cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4); + cpu_physical_memory_read_debug((pde & ~0xfff) + l2 * 4, + &pte, 4); pte = le32_to_cpu(pte); end = (l1 << 22) + (l2 << 12); if (pte & PG_PRESENT_MASK) { @@ -315,13 +316,13 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l1 = 0; l1 < 4; l1++) { - cpu_physical_memory_read(pdp_addr + l1 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = l1 << 30; if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pd_addr + l2 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); pde = le64_to_cpu(pde); end = (l1 << 30) + (l2 << 21); if (pde & PG_PRESENT_MASK) { @@ -332,7 +333,8 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pt_addr + l3 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l3 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l1 << 30) + (l2 << 21) + (l3 << 12); if (pte & PG_PRESENT_MASK) { @@ -371,13 +373,13 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { @@ -389,7 +391,8 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) } else { pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, + &pde, 8); pde = le64_to_cpu(pde); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -401,9 +404,9 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr - + l4 * 8, - &pte, 8); + cpu_physical_memory_read_debug(pt_addr + + l4 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); @@ -448,7 +451,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l0 = 0; l0 < 512; l0++) { - cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); + cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); pml5e = le64_to_cpu(pml5e); end = l0 << 48; if (!(pml5e & PG_PRESENT_MASK)) { @@ -459,7 +462,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pml4_addr = pml5e & 0x3fffffffff000ULL; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); end = (l0 << 48) + (l1 << 39); if (!(pml4e & PG_PRESENT_MASK)) { @@ -470,7 +473,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = (l0 << 48) + (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { @@ -489,7 +492,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); pde = le64_to_cpu(pde); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -508,7 +511,8 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr + l4 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l4 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); From patchwork Thu Mar 8 12:48:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="M+h42Iyz"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrJ333ZBz9scc for ; Fri, 9 Mar 2018 00:01:55 +1100 (AEDT) Received: from localhost ([::1]:38523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvBB-000792-81 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:01:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzQ-00050X-Ou for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzM-0003mH-KF for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:44 -0500 Received: from mail-cys01nam02on0070.outbound.protection.outlook.com ([104.47.37.70]:52002 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzM-0003lb-AN for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:40 -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=IP7cNfOQTTBOiVJysomX7/WyWSXkIwuSKEzU/TppQc0=; b=M+h42Iyz265LKgTZE2XPxUgzd1MBMB6LgjqpMIQlW7eygLdJonGqZmGPrgBGk8w8KeSNBoGAFsaQJs4rlqqRVytJ3FKyazrckE5rPo9F6Pyzz6JTe6sVLVUfmcx6UsTjXeXdLqHre202YceMXrcTxiTwmc2DCl41r61z5AXS6mM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:34 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:38 -0600 Message-Id: <20180308124901.83533-6-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a411f228-dba7-4ad6-cb26-08d584f30c48 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:ZFTFCv5+mKVIK6JdJyYUhzLcMMBA01WQI6lLPQ/S4ikEWbrpRXSwMPNMV95llVFFdJdBqOlVkoBoq1LDjU99c0El+PRmlmDdHJ4dmQWutWiSWer4NQDwgngk2IwAJYqw3YaFV8gUZ/6xC17iQtwf678bGf9/9E2DntnaXdyYZs4hn+buHSv6Fzl/j+8x7VeucN8IvikKWrtQJyz64Xl7ld5Ud2WTAKjvl3tmLp/nXBGloMtQ9JvgcVlSbU9YLt45; 25:vOS5z8ArqbH5UiwpOr23uTySnWBctNGtkLHnVKY2RAi9ZVJXPCexcDebx2SUkAFJ8Dm4YQvd34LDOe+p+G/+htnuy+e3LWK7rej9Q78D1JQp1vRcIw4m2oARyHzJBL6d8ZR86Gz7Okd8Bw63XFW3IFVOoom2NOkksFwDbifKTQLxNxqivjRmZagj3M3TkCH8aPAyeE1ZZ1EnaKmKqgO8lhD7VCrDxMrz8xh2Pfe6w6phdozGJDItXDZYO7B+02V8YjHbnecB5XYjPc1yt42cgKsoaqaBuPFy3y/+/FZl5R1X9QPlb7i5jiiEMJ62dOkjxv8XPH6qyibJVafAcIUixw==; 31:o2EpH8XNUxpWtAHgL+a3HblGgRJkzdLgo89csHTcLoll2aBohVa59W9O6rHmZsrRf0iDeIUE6B2655LHNjn2hsIlvYiGlYgSl2zz0L/UZdcgBWV5Yo5EPr/fXy5dodd9HkbTTXPrEbrtCQ3O8IHf3I5RaSvajuibvMqqPdvXALh0GLFMlWoo1J0WNeqKjsELSGfAm2J7DsiKcIosU+a/nHnxwXHR58vTlEeSbcb7Tfc= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7foq/k0UlOG84Pdi9+lAWOfvqvI5SlU9N+R/7S25HfI7WAh3uN9SEqmApSTguq6z0RUAjlguERQah/5S4hA1p3XIiMk/TWpPul+pTGZiJciB8APxxqsu1+gexuEbpeclnHebOsSh6WZT8U6A98A6ObRSRdRQPxGQo2WS8flT8HDRLbtzVm/fLzJYnSB+Kt+qQpD+V80xrFki3+bRqoTt2h20aQXRcuS+U9HGa4XQwI+tOm0a5eu+fSI+Xnwmwz5MFiyxlejr2fN60ZF5DT0zFpY9+LEt+RWH+ID8wTO2BWiVzZQPl36aQqFAbPOq9v76ctwLNajkEk8wTNGO1NCZphb71bwlMjQqOkez9iYc5llrf/OkHlLQnlvYIl/+Zv3D5q5Oc+OqynB0/+qTkCLP2lfWvhSorukZMxSLvVr3zOsu/+TXH1gisCPjS/Dx3cGgbS9/JdGIeMHY39UqrScnbFNb/lqJNQ1LvU2bOvz3nKqRHdUKrxR1c9a6wZZHwlp3; 4:zdhtxM8nOs7Tbc4qSXZ4LBc/kaHafsh+wlirXmykIaX0SvH2ZGg/yi3Rz2FEm9QSNaO26k0y6FgycSOxYyLD6WKQjoXhJy/HKlrk62ztv4ZNgpCMqwWD6swbzpWLn3ujzBtULPtFvgCRdiMwKLk6I15xGoT59Xr/z/wa9DvLkjyEOT5GiODPFsdnDDFSt7UfXUl1RYprh9Xsa+Xwxvdu+1Lz4KGPS20jC20gJ9lXNskJxY1vPqy18Qo+nWW34ouqJfR3jbBr3YiBYMK65kVn+7Afkw4vPzLvCi5ReUDRFl0rJTV11k6ulx0PUL/mbTYjoEYruvgyjzX1BNhwylPIlqp+KJulvS3RXUMydxN7t4c= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:00HMWVkGLFPk3slJaT7EYxquQf/DA3yDdq91IQd0N?= lIy72fJOGprn6+19qgajYhlXMM1Q2fWBQGvPB8yOYPUwm2mo5uVyi74WyDLKRzJRVdEBN1Mqup7JdyEr83TluebsgbBoGYQbr9yquM7b3uGmHiINimHH++0StpB+6bJ4KKb8r8wVlSxULVK1d8v3GELmwwr3NukPVKQiQssHoepTdyxbqmAQehQUpaqBIzJZ+nC60hft3fbitktlst7DQLpZ5AN8uXgLX1nC5xQgClrmyMncEMe201lxP4zvDFsW//Hl5mUQ27LjbPQbzx/SvscebfieET2GSLiEvUSepMtGPKM6Rz1Vpv3cnaDO1DW1rTjplph2AcBjr50WX/OCD8EagPenrlbMMuti9S0eSsdY0F49tl5Ed6FFOHOk8jfQ/DV3c8gDnDVGqCYgeICIPm2feeVlddN0KIXndQRbfiof40ww2dPielI474RMAiE7SKzSNzNGrIvEmPyYffYzK+au8+8L8l06BdpTvutrWXqMxINrqD/6zWT/uMD17324dwLzF1eXVqkRUauvf+gNL3B1ZFNY9gd3QYHqo0jWCC6x7TypfSJMgkElWAYHCIUOLzHsqWBM8LH6UHXCFSS14YYMWxzYjN9VatsEpT+O8OQ2E24mPUIuAcejhEv75vvyScLadIE8n6OY4wpIXHTq684f+21M3ZysDo0LGY1LB/v/SjTvy8HyJ1jQwKbD9SQgcIwcVval8hiay5DpnelFg+7cICFNuBJO0gWDhmzeLUvOYeAeIohQB7gnwpTGrXAtFI1pq2H7yNSgewYhg9rc7qnGonSupwh54N2lipBkvEPFZs26lW80U/oYmaHvuv021zBx+Og4hOhW/EQ2kqpKefuqzSSNdIC6ij9a0kKU7o/1Wt/ybAEN8K8kTaq3elnJMa99gMxE1S385KHdh4HKeKvkPRwtKytxZ7S7GijBX0dGNDsmaiICzTUWBMchDn57BTTHr4kta+15gnJBf0mIkCbuD3tmayOr7i/mRzoyGjt2k1IJi4JU6miNg1j7AQ9YUK1155+3idiHZS9GxHHNo2ZDzjHCB+JsIhrMSZIBWPJiUrlXE80gJwfKWPDYK7tLU7twNAhlRO8Kxl5Ncz6q5zrvwvHPE+mT04gWz3KsUrsgQ7Lq6BLJDvPJOuNxtXyyacv25hORYMYXs+5T7Ljv8kWCskb6iHHbAYqpVokI6AOh75A9Lt1vqj/2R2sR/7N3TmTQ1b6QQ7nLykXf+xeymTa1d83A6eqGDJMi07ZWEJa8g== X-Microsoft-Antispam-Message-Info: dXFivc2UvzHHjShgzZ6j+YcAypiJJ7Bz9f5rQAFUSZFQVRss9iVvMBcMXswUBtO75MhIpcv6H2Qz4SvSQ50BWlz1odayQaBQhmLJpFug/spft6e7Y2PItTOiZ7jYT+qZvalN4+GEkvQcGDlaBTe8hvfHKWJTvq4Mz1jBj/FrwQnWL9PsqrWZl5e+ppZNbXTa X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:yRsyZR5h6dEmclwbgYanU8RWppFdTDyJUCp8oJYhN3UeWI/uhIZLqdVpXJdVVIkNGL2yg4RQwN/eN/9k2aCASMs4Mdm22TcSxpTTIFgW7YZVax81iaZ2xMB2XypZSRoFpJZ2zryPa7bFHr21RqcfJ66+v/Qx3ufUVk5vWT0cxV+MQLmEYYURFUVFIyzPT17Aj4Rziv21LX25yYSB8P6iXxryh6rdK2a/X7m6FDvycOzsWgr6hVXfmRNnXbHfirLM5SsQjWvyuYMggjUxRF4tQa5o3sNnbdo2ZqU8Sv/+Ne2FNZVHTeWa/D3/h5utcCpfANH7uCLVBuAZnHIlmsCeQwfdXJF46RLitdBean2IGPI=; 5:VsvCapExz6cIOtTmdZg2B7XSC9ofmTFSMUOHebCp6MlGrQpeAHo60fhotjqGKdThezjExnIiSHk3jbsXrcNWPyTGV/vNkyTduod7s5RK6SrN8ZV3eZ6LgR72cFXcrDNaSi4AoxwbA4TSYP7B1HG6FfFrDbwJqmftlzAWybZLjeQ=; 24:7inX2N8MPWUufaD5Q+rbasi6fHvTGiljIL7tR5+6D6cYYkpRGBZC/j1O+lyVCK7247eDkrfAjomMF15oifJZvi2lDxjYOBuuXC/esexK430=; 7:Kn631Xbb+UAILUTXCjYeuHJZsm4oRYm4pvq5VGXfhPqqTptbUKLX9pbsOqZoUHIVJVD3dDObIihvOTJkKvzcYZ/8W7fypWSAPOeRzeVykyvpWiUza/8QRvItpcY89t7kQElu2aCiOTG7TtVLQJOZKpBzWDIkIOW+AfqNhEPhyMQJI0ffYTh3xbN5dZznQ3ywOMFXbW5so4NrWpXN3iQp8tL28DYgbiViI4nXHgtfy/qOcVgIyYORHq/MVOX6LLNf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:3z1npDib2uQbUPxjiDQvLWD5abriLERfErIgm8qWiu1ZcjC+uBN7qc9AMR7phQWkO2HTgAiT2mVMOt1rV5QuCh0sjMxG1qaIn2aVxLosQuqC4aCzkZ9VDXZ7UWTkdHNrwOvX0hkDzKyWnKvql0vJwIS3JS1NGsLIQ6AtXiFB+0xx9UP9MDaqkWChxIdpoOVMQdYx9Gabc9HWWZKRHMsgICrRKMNF5U6PL7nknlUw5g182CfHQbekmBmaci89pqu1 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:34.0497 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a411f228-dba7-4ad6-cb26-08d584f30c48 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.70 Subject: [Qemu-devel] [PATCH v12 05/28] machine: add -memory-encryption property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When CPU supports memory encryption feature, the property can be used to specify the encryption object to use when launching an encrypted guest. Cc: Paolo Bonzini Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: Stefan Hajnoczi Signed-off-by: Brijesh Singh --- hw/core/machine.c | 22 ++++++++++++++++++++++ include/hw/boards.h | 1 + qemu-options.hx | 5 ++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 5e2bbcdacedb..2040177664d5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -334,6 +334,22 @@ static bool machine_get_enforce_config_section(Object *obj, Error **errp) return ms->enforce_config_section; } +static char *machine_get_memory_encryption(Object *obj, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + return g_strdup(ms->memory_encryption); +} + +static void machine_set_memory_encryption(Object *obj, const char *value, + Error **errp) +{ + MachineState *ms = MACHINE(obj); + + g_free(ms->memory_encryption); + ms->memory_encryption = g_strdup(value); +} + void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type) { strList *item = g_new0(strList, 1); @@ -612,6 +628,12 @@ static void machine_class_init(ObjectClass *oc, void *data) &error_abort); object_class_property_set_description(oc, "enforce-config-section", "Set on to enforce configuration section migration", &error_abort); + + object_class_property_add_str(oc, "memory-encryption", + machine_get_memory_encryption, machine_set_memory_encryption, + &error_abort); + object_class_property_set_description(oc, "memory-encryption", + "Set memory encyption object to use", &error_abort); } static void machine_class_base_init(ObjectClass *oc, void *data) diff --git a/include/hw/boards.h b/include/hw/boards.h index efb0a9edfdf1..8ce9a7a21d3d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -243,6 +243,7 @@ struct MachineState { bool suppress_vmdesc; bool enforce_config_section; bool enable_graphics; + char *memory_encryption; ram_addr_t ram_size; ram_addr_t maxram_size; diff --git a/qemu-options.hx b/qemu-options.hx index 6585058c6cde..4c280142c52c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -43,7 +43,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " suppress-vmdesc=on|off disables self-describing migration (default=off)\n" " nvdimm=on|off controls NVDIMM support (default=off)\n" " enforce-config-section=on|off enforce configuration section migration (default=off)\n" - " s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n", + " s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n" + " memory-encryption=@var{} memory encryption object to use (default=none)\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] @@ -110,6 +111,8 @@ code to send configuration section even if the machine-type sets the @option{migration.send-configuration} property to @var{off}. NOTE: this parameter is deprecated. Please use @option{-global} @option{migration.send-configuration}=@var{on|off} instead. +@item memory-encryption=@var{} +Memory encryption object to use. The default is none. @end table ETEXI From patchwork Thu Mar 8 12:48:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="iw1+lsPM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr3C0dHYz9skl for ; Thu, 8 Mar 2018 23:50:47 +1100 (AEDT) Received: from localhost ([::1]:38459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0O-00056O-IE for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:50:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzT-00052U-Ik for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzQ-0003pC-CJ for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:47 -0500 Received: from mail-co1nam03on0619.outbound.protection.outlook.com ([2a01:111:f400:fe48::619]:54942 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzQ-0003oH-2B for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:44 -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=FFCItbhe3z5LnOPkxBvVYDwqD9Hfm01bHo8CiUMEhsQ=; b=iw1+lsPMEhqRTXv2en1wFEJZAlBm5ElLlDDOduhbfdat47wO/Qgz3Cy/Af04JsMA1EiatG5VfWehteTqlHSgyxtyGMuMuLw0UyRRDUJA5Kmb+h8oUbFrzHmlTUILeGM+BivcHyj4qo8BJoCJOWCrLXEwD/zeeTSNMVpzHJ5PgJs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:36 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:39 -0600 Message-Id: <20180308124901.83533-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1eeb1508-edb5-4a88-0623-08d584f30e09 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:4LK6U+kMkeaJwGkyMjsbcTZnxmTdOo80OY9e+DTK83Y8+i3cBHHsXxiJRAuzwpPadEfxydQtncVbS4z/q2L1ajAlHScIzVxRpNRjXUQES0nm+IBtH4hRfe4h0unzSIrgQSN/v6SRWf2rGbEihXSpRwtizwvHsg5HR1U5nmtR8mOsffaTkNyi4G9XlorPdnrivsxIBcaFBIvaSpKUtpbL7QGOELnrA9CFXQlH3tfGnyEOL21UX+GzPw+FNs477rPx; 25:zAWkF8JdxA8qme7sWMLaa/e3QBWfAaiWYkqf9y0cDLGfJh/m1YOo0FmX/RFZ0z2Mj9cJJkb6VI6ZlRz1BDmMFt1Mn3TM8M6S6uarkff6qHLARYJ/i+shfMumXunTAoYHU/hnwnbqwSO5gt4/39Xs0xXTnV6/+qoNQ8UYdsNHwBSsNyzEhMOt8kgfJZekEkiumdRJU+wXNx6Tc+dTqZwKJA1io4r6bf14OwGcHD8ykifKc6p5+o2jgziiKRBQjaklG7JFiq1ylZIPIxSJ49b7UYwSURgZjpxJPiATPf+TMAkuQKVV9DlvvZn12u7Bt/a2OYc7e8vRASc7WmGuIQfnag==; 31:8ZqRdbbzBCZllrFwi7QVzIgPa4oSJiQtaiB4MpcpVhWQhitsTymOTvBRXugaB213dmkLT9wjwUCiFRYbiY6hWdP93BMwGhesB/Gxu6Uc4I9BmxfQbDjMpR46DwT9o0MvSEQn37bpQipfge36gvpkN7IUohp/HjZj9yGRKbgjecAorXMlNB+65eN5lpWCREz2c5a+T96I/f5GssJcC9ufz3etCcscrvNtuX0nYx5hP5Y= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:ZuOdAnrjq6n66CbZTaPGM26yqalRPNQ/v9hiZ/rsrV6wtnofVkryygSiO4M3uaqIjQ2kcUiI/HxgT4jPlEOaXo/9dLBZMcTs2CWGYbi2sybR0rIoYWfxX81is8ibvpx7KdhfemAlNwtTSDrIe6oNrMS2ip1qijRFuzyCtrPJzFbAnEP5sC131K5QsEvN+klIYpABysIBQnjrV03D8PPaQ1zpgvUDzvl7TxXDq7pMQkmnbXjKzaJpvq+he22OjDL9mW+SLKtsVNItWOZ5nihXjBjMHXDUv4jFppz0oW83yB1DuFHTne2tcEsInY8doTT3kMW4NB0KQigQeJkrYMZ//kJ56hICVWLkjr8za1dwpckeWo89N/ZVB4CvavipQkDp4Qf3bHbO5ksqAGHLoHQ2PGQstsG4AJG2V9dqWfCmS0RUBHTiNth2zzGIAHu0as9doHfopMUY3W2X+xDX+f2yAvMjnqyCxdo1uk5/VM/LxXj0QlibFInki7CawvY/2RD+; 4:cVZCqeTy53nMAYCcheq4C2DbYClzCIUSjcV2SguA3E6b0j41GhgkXscfxInQGxC7RCytPN5ZQVcT2uKhwNaXPmGT+bBmUxsWOPlDu6kfSIExLxfy72YKTt0QgaeYz1+5fqupnR+kz+yrjYYe60jeBKtKc0v9JKM2AFzr6h1EoArVyFCEcGooZxUWwgFS5HydqgXWFchwJMDTw8COn8Z5UdMncnk2tc6qvZjg8MdwLdSHHbAgalYU9rJr7AsPzmsMiXq4hED2BF2Hnk7ygSGIAoMGgst+c5lWBeVWDpSZhS7dI560yLKvhpurhPuMh/Nes9uIAD9nfe+vnZEjsHcy853x+I5MYEDN6l20CvNmjUb+rVYCbXXm6KJYDgCJUz3u X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(190383065149520)(104084551191319); 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(15650500001)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:UtZX8Z/rWE7fqZ+VkYdt+xIqi00qk8JZxb/AuVURS?= nJpEKd/VrMIsX8kJ8wdjQHYS65ORhFM/JPm1TAWHRfb0Ep2y6oAtE8miWVlsO0VvBeURxOUECGOkEEGOMdTWZsihfwIte/JcyBiOSJF+KEUhlmKU9nTaAulvPFTA6VmNBzVQwkElthZ3ly8zpZPoc5ziscDAkG20hwbDSXoxhB2VZC2f2EGWPGRRReaO4nR2Dyist6xG6uHwkyzAlTBuSIF9WgtTDEErVUk1PJqBZ4PvmVaJzaIPtxECdtAquKU8BEKqgDpxrO7ZB/4BokKNtGwZQ4mSPjuLYTOwPC0xCvKTS13fZEidbsWRB9rrAI9FYZHyyOfb2H+3dgww0htYO0OlWejO3x46LXSQ0euHvQMmdSwNUYIyzisB0nlMGSpysghkfwwhhsGfLdzgU81x+1Uc4aKyly+ntX383rOo8mYJA0IhKCEtRvIM1cCsXkTuEFkGtRRPqMMzlN4B9TH+DZDlQIv1RIY9yDeTwIuet76+OjnMPrC5r2GdbO/5D4cHBFqyMMhCgT/zc3WmsQ+EvkB1utMHqZs/8XStycunhUX0D9BTLypnJzUlcfvRMLQLkCTBqxHL7tWy6bHzB9c25dlu0f1hTQD3Dx0O6Pmb6Fb2N+AC4fZCf0A5MTKe+nzlex5o94/lv17pdmRErXReMz4v1+eoPqgM25GfLg71P9Azh0W2ZKcw4GOOxU0W68Ve/tcaUzdEOzloX9109ZBhNuX3SXT21fa5/sW9+ivX3bYQ1mzWSWw/SW/CYStm01JfMXFW8P52koHrop2JMiY5KQCceLY7ABT9rfZdWyWNdbS2V2fu0TizgIc6ToHxObtWLDNIJxR1puh0QtRH7v6dKgCVQ3X8+i/1/Yrk1j/F/Okk8BQ9ygaOZ/p1GkUycxmJ7tc2384e09cNJM9oDV8UWz6PHbT46A+tjODqfQ7m1EBZyuuSUdvr/x/5HkDDABfnigayIh7tWR9kHMmxyo7F33KWhZT2E+t8Ba1NXKVcxM8hicDUhLDc2zMn7GSiHOVF8J6vz2ukwIy1lHBAREhw9G+eYn819K4gzO/jVAiLmgnUzUU+o69N8Ak6HeH5emQYk32amid4h2pwvOLuFSchg2f8KMB51ViELI9L33Kg0zVaNV8KblACm1mgLW4yc3kXpu5VI2kPzrdDo8pYdkp367XYjPbRGX4o0tpPXmONoYcnaHUDAvIbs06iVRMZ9gcJfNs8MdCW/9OaBoEAK+wA5yooEMfcaJHXoCJvem1+s5dSKfmwvN83mMeU0O95+oSbig= X-Microsoft-Antispam-Message-Info: zEUhimVWIF/tRmBz2FgiWqEr0FecWCxVoE95onRQHPcDjb9zD6a4eN3su+ZnI40Hhxt3AXmjAdNZ9mbxGOlc12hkvkECfEr8/skNCcovDybf3UQTbLtsWLxIgYOHZvOIt8dhsrjWdyYw9ojYTGyzgwuHAd9gelgpsm54HGqXdU9ep87Kx6xtkY+dAIVSJuIu X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:OCjLjZWkMAX/QQa+6lIwoRQ2ouYB6W5P9mD9BDKBM8XCEX/R/50Og/ZN3+aD6/ry5Di5tpivFwCTLOrk8kNMXzJ1UPWzqX4BjLWFXeiecmLfisEEeK4cZomWlAnNZ8z5K3CdKcty+ObJ9l4RTWdJaJ/Wpj43Hy++Qfru6m6I6ZtiVUC0tGCnlVjPaBuINMJaNIagdUPxvp2IA+hwApLFNnCTCv5Fqoo9UWMJL3JbVgHJ66PWhSZu8VDU+JMfFTplpyyU6LAATNNhaZSrJ2TAl/Rf4e58pk5VUvCwzr+sxc3HZqvb84WlrGjr8uf9F404JkhNnovC0K72jw+gWeJs7EspSYZUDrVOllEvSN2XC0A=; 5:BtFAaMrlc80JN5cSrsG6W1vyuNJFKN94YfXfzUaTZI4OZy+LpZpoYbU8YK5Io82Fz+gl24EmX5BuvMXReSyb4zXqrbq2j7djs+syZQW+lt5VcDvjMJ3E8aUq/aiLPj6ugzq2rHRXhSnd1YKsbT6Qj5EZxCNrYlaADECRkDE1/L4=; 24:mCyLkpxUXEuMjk2qjoChFDaaQu+bn913CeRhKiJo7jru1u4uO7NBz7wEzmVQhSx574pJ//Uv/krSDoq11tKR9ZFQc1e84bUUCJlxf/vITyg=; 7:1Gpxpf5uHpJ4V3lgtStzZXe/tPn3QUnV7NKpX0fD3mLulj0Mw5mK5LjLqd49ajZSxbPAb4fy9FQZIfhyUxKUB8AwPtDFbrgs1dKvioRJNiTGSYPDt8QPgpGsBVo9HihfRHpZJuAso74WI0UJaeztGptyp82VqVFNsa28bNOjkVcn5rDtyIqbki82TUvMzyLrdVbRFWvRZ2jI2hGYiex8P/+IRt0239JULjTsSRg9LJWmkpGzLx1nX6NgENa+29/f SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:2SuWOB/l1q/43G+VIYhdz7C2AZkaIrAtOStEqnrG/tJIm3tNKBDOd9ndn/avD5HKn5OZDoYyLdcZhHh0W/deguXDbnm8zRhrXjQdxlhPH5y3PzulN2teHzdVNHwUwSFD8ctq6AHOFZcgE6knUieJS1IrcwQ4e3wXlXp++D8buc2ZZGfPxq/6XKqCG2x3QbUmn7/XiV+hQYarc3WT7bgKGBekN1NuRwXrDB/3Fg/CavNHidzIuYsGRImRjPGuH6BU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:36.5497 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1eeb1508-edb5-4a88-0623-08d584f30e09 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe48::619 Subject: [Qemu-devel] [PATCH v12 06/28] kvm: update kvm.h to include memory encryption ioctls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Updates kmv.h to include memory encryption ioctls and SEV commands. Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Paolo Bonzini Signed-off-by: Brijesh Singh --- linux-headers/linux/kvm.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index d92c9b2f0ed2..aed22309950d 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -1362,6 +1362,96 @@ struct kvm_s390_ucas_mapping { /* Available with KVM_CAP_S390_CMMA_MIGRATION */ #define KVM_S390_GET_CMMA_BITS _IOWR(KVMIO, 0xb8, struct kvm_s390_cmma_log) #define KVM_S390_SET_CMMA_BITS _IOW(KVMIO, 0xb9, struct kvm_s390_cmma_log) +/* Memory Encryption Commands */ +#define KVM_MEMORY_ENCRYPT_OP _IOWR(KVMIO, 0xba, unsigned long) + +struct kvm_enc_region { + __u64 addr; + __u64 size; +}; + +#define KVM_MEMORY_ENCRYPT_REG_REGION _IOR(KVMIO, 0xbb, struct kvm_enc_region) +#define KVM_MEMORY_ENCRYPT_UNREG_REGION _IOR(KVMIO, 0xbc, struct kvm_enc_region) + +/* Secure Encrypted Virtualization command */ +enum sev_cmd_id { + /* Guest initialization commands */ + KVM_SEV_INIT = 0, + KVM_SEV_ES_INIT, + /* Guest launch commands */ + KVM_SEV_LAUNCH_START, + KVM_SEV_LAUNCH_UPDATE_DATA, + KVM_SEV_LAUNCH_UPDATE_VMSA, + KVM_SEV_LAUNCH_SECRET, + KVM_SEV_LAUNCH_MEASURE, + KVM_SEV_LAUNCH_FINISH, + /* Guest migration commands (outgoing) */ + KVM_SEV_SEND_START, + KVM_SEV_SEND_UPDATE_DATA, + KVM_SEV_SEND_UPDATE_VMSA, + KVM_SEV_SEND_FINISH, + /* Guest migration commands (incoming) */ + KVM_SEV_RECEIVE_START, + KVM_SEV_RECEIVE_UPDATE_DATA, + KVM_SEV_RECEIVE_UPDATE_VMSA, + KVM_SEV_RECEIVE_FINISH, + /* Guest status and debug commands */ + KVM_SEV_GUEST_STATUS, + KVM_SEV_DBG_DECRYPT, + KVM_SEV_DBG_ENCRYPT, + /* Guest certificates commands */ + KVM_SEV_CERT_EXPORT, + + KVM_SEV_NR_MAX, +}; + +struct kvm_sev_cmd { + __u32 id; + __u64 data; + __u32 error; + __u32 sev_fd; +}; + +struct kvm_sev_launch_start { + __u32 handle; + __u32 policy; + __u64 dh_uaddr; + __u32 dh_len; + __u64 session_uaddr; + __u32 session_len; +}; + +struct kvm_sev_launch_update_data { + __u64 uaddr; + __u32 len; +}; + + +struct kvm_sev_launch_secret { + __u64 hdr_uaddr; + __u32 hdr_len; + __u64 guest_uaddr; + __u32 guest_len; + __u64 trans_uaddr; + __u32 trans_len; +}; + +struct kvm_sev_launch_measure { + __u64 uaddr; + __u32 len; +}; + +struct kvm_sev_guest_status { + __u32 handle; + __u32 policy; + __u32 state; +}; + +struct kvm_sev_dbg { + __u64 src_uaddr; + __u64 dst_uaddr; + __u32 len; +}; #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) From patchwork Thu Mar 8 12:48:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="EuS3pEBQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr6g6Pfpz9s1r for ; Thu, 8 Mar 2018 23:53:47 +1100 (AEDT) Received: from localhost ([::1]:38477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv3J-0007vP-L5 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:53:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzW-00054U-BS for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzS-0003qw-In for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:50 -0500 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:51631 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzS-0003qM-AM for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:46 -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=K0rG+9OhEX2pAYXJhYpkvMIzreLnbL1Kngbvv5Wp/bM=; b=EuS3pEBQPwqL/V1Ty8Fi+HV+bjGL/662oYJqw6r/PwofdfiZkglbQzeq4+rUc2iMipVFwNCuIrRbLbsgBpZnozhBqHfA2k0JdrPgmFge7A+6eTkgu+dBiSNbVvtRJQggshAePkTFXEa1bcsh3vYKorPoq8mTcEu0Yt1gft5sp9E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:39 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:40 -0600 Message-Id: <20180308124901.83533-8-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 19d81111-4663-4ba2-5405-08d584f30fdc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:XOkhYIby5DQTi8aH0kK5cwevo5UzDtjjik2pq58avSA7IBhwVLPIVRpg88jTaM5HZliwmQ4MOH9Eewmp6xlJe4kRXd4y0TbPF5NIQ0pxIX+e6Sj6gWHyeyGEYdIkiKuy9ZPZOxA3QUGPWhqKdKmpO8dnaTvNm7HMoS1D0ZJ/fJDb+R+IS6Su50WAtHrpRJN50b2U1MMFGgK1vpjH9sxg3P+WH2qiA8t6zD1dxWtiOC9GfpQSyEJcvAsvJgYXC/Fx; 25:QiGJpIdGRrTZJbx9nzz5VZQvklajQRZ5tEyHz9xpsBi1ZnH+Wq09oAlrZqOHJIhr7bVa9R1lT7Q64yv3wG6bJ7kIejDbs3GOoBDJJDvtGJSXvslPx8cGf8O40G48wab2B6BVSSZild9NAKOtKGvUHIfuelfuRpMb0+nXJloWL0jAKfUGAaNM6XYkU/iOBZsyxblIkQr5OIxRWCoCWZwl3YtznPUDEuVI3BoeZeGoe/mdzK4TE2FbKOtMMZFQwfWDqQBwalGE3PGmw+x6oTnX6hf8LQChT5kK1PsC+tHc7+sOFN5pN5NMYQsxmrW15e3XsrQvXjkasHzLbyYBf+/Izw==; 31:bSXoeCsYjGryx59dAHmycDZr1XnE3SbpUzPns7rRN3quUTicLbo96tiLTGpM3OmK6BfPeNvLq0oJC3hNU7CBkeC3F9tQ9g5VdveF9fuq/yaBiGAYzBjO/F1UGoixtaONb+XD1CiKRWAnp2D2LGBfnQ6ZO7Yl0i1CT3nFdV5oju03WEnBlgaYMUW4do82+OtTM1LXkVqyFlpL9r9pTWNFG0QSget9vP6c08XnBx/5bSw= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:Q99KYdcQMPHDE28WczMLxu6v+Oi9TQmLoqLPyJppY0Telxw8J+4DAcaZWGMLJEpJXT0yQDePjaj1tBOwMA+BFCBEiKIeN0dpDMuozPoiBAhOAutTmZmMufFUWn7rIwqIHc6/p9ao2mE27QSHN2NyEZCySU8CdOtrh3hX9C99ZcLiRiEP0Y9ecV5IeW1YBJenCC2+QbWM+qVu4cfaEOtbkx2OmZvhtZIwXjfgNtBNjDTFjtZUniQfZSMtnQmq/OQPgKv+MHBNj50d8qP2C7lxDbwFtw/4Kx2ZYHLktxXNpw2901dxcJv1xXeq1B/gcJJa9JCwwweaXkDMLj2+n+idioFtu3pDxVZwDmS8vIcSyWasvGS7GwtK2eBqQ9aNalaxUT7sES6SJ7S4ItjFfgcpCz1VFjGo/c0RRr+D46dpvLUtqEgcDjHjW7w+kBRWlhCFSljEjT+rGcpIrxTKBel4vs+hOi9FbnuZnfrm7ziMOSpUtwB+aqlGRS1aM6qXs4Y9; 4:dBG623eSpHAhQm6n24JS24+qkH+RlQk4HXJMM4PBbrc2WbH9InXxCCN6MHEO20wrkPY+cgWEGFZKlwq17B0K9XRKo4oczPibntxgOrsKmUu/Mx1yz65mWoOu1dtYMRJb826Os+gWutMddgXMI9bqv9fYnRUXUBMpWqHAMsApKtPPBrZxpurcJmOBIJ6qLW1V0AKwLa3R+ifM5y1RtXDN4Fkl0h3paa7wKCmPvwoRJSw1d7HcGdJP+CgWq5e2FEzTcYvBqiHQr1lNa9OqR+rYOP5+wV7bbNVAYeFY/+ciTKtNaFr0Gzz80Veu30AiH2zF 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(6306002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(966005)(48376002)(50466002)(68736007)(97736004)(1720100001)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:aHzrhOHlmYa97yLHNFj/g+wS5edsqnSyO3EkkpOui?= RhHEvoslG90gOd4jzTt7G7tjXf+TkaizrIl8sjgjD2QfhScOD3jwjIUZQXAN/MDS/2ikboo9wQTKj5L4c46mTdqHBX61KBA6Z6o8GqYDM0BI3chjMzwuYLH9wxvfXW8q4qPaj3B7NZ2q0m39wKFPEz9vU/VJsZWij8FS+aYlbUUJEbQ7HZRWvpRjiaRWjnTwGwD92mLcC2/HWbqQkqaby62NjjEh+1qP2wKUUxhTnaXEUaHKb8Mb76OuOl3Y6yHgzbNHmQOPPjRL2q3i0E3e22yUg3N7Xe41sNJN2DD+HCgr05l65CsrU57qU/LLe704hvNJnYu2EBCMWTAh0MJavxoBSql8wUbNiNlLm73TR0FBwWHd+8zUD1r/nhtqCGD+u/d0wP/d8v83EWx/2yVRPCgJ8v/3y3EsONgaVflehhURHmNQHtW33McjGonv5Q9q/BCMW9xVHZB2HSZ92Ufy7REGu18qBipy1+aalGizlX+Q2twxevgewc/5vHPQIqIGbBE4vSm2DLeoZQaDP8hNkm187VsMkyP8C0WkXjZwx7LfU/BwjBmBkq720yMi9y/iDzZZ5gPdsHfJQxIyAwLZazIxhcR19Vj1iKUX2KNVmGh+Kn646ZGQUE8EXLB52wSBmVT/bet0iVSwuYy7UgaQQ9PEZRumRr3IrsNkRkoc0piOD7Ma43sisCsQOp+ti53A6okPW0UA6PPCUSosAwusqvSMoBMW0TrH6+imDzJGnyx3ZBWvNvEW41D7GZJJnxaYf18PVBViPZ5q/sgMwCp6Yo+a+5pdnil6liJ9EoImN4AkYtJ3zbUW12HuLaqiV1xs8PbsAn2gmWc/OaSXgxeGXvwLfDBtv0s3/m5vTmhQSRlENHR0d/GvAc2WsXTMLQvg5p1ysdSxKEQSHafxE0dmSGDZR2y2jPL82/hcYxDS953JGXaESHUxZSgQEEzfJovTurB+O75ucg98RL+5J96W0HYclqHxVOUPLKt4TPBUqEAn/0MQnIYvKS4SKZ7EbxEJaH8bv1WH2zB3MsEtRHV+U6Ax8pzGbxoe5mN2tu7vfw36VdL7ngpD5cfIKtp3DPulJkfIJ8/5acbtzpChjIIpqeIu4BZLPrCDGmNQ307RrGV2cnFL9G196qAZW/Hf5YR1LRz2JWF39hIYiGj/l1gNSj9sGd697ygEe3f7Dd/Iyg/gjMHZAc/Jl56ZDZkUiTzPsw49BwM6yDTx7pbYmIpL3IoD7LXYo7J/VsQFprND7MgTR8stAYWZJ1vAYCICjiNgFScuWkhaRUbOclLmw4VPm7TL6sqXTYmJ63bDhP8wAGv5w== X-Microsoft-Antispam-Message-Info: zH5BpJJ46TlHbVtpHzPoJhjFhcxr+5vCv7xfafEHW1iSZ3Hak39C/qE/t0xwP6aYBsPBlhsDPZWZTsEz1bTufQzXvPzRf/zL7EcCFL+omJJIYm0O14tZVsztM9wDRKVwmNfxwYnB16QoWeodRFRB0r1vnUByMqQnMiLs1m+4P5WpDEn4Vo69O4DCBJn48G2F X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:gpOa51ksCri+0c8X9cQr4v6OJpadOy3pfMnq7t0ir7baAMXf2EwJGAANgP1+oDsL9tIeVgKXuDKcAmE6EAXprvJRv5UfNmFED2GvuQfjeDxcZv28sKFW2A3I3M9QdTcJdAmVFHD4X3eS7Tb7BPtXkzoiNYYlx/tohD+WiMfopP4r/JY8hThiU2mR1bYif5kTI4PhsUXJkW0n2uARGKx3a9KwNc+BkBvJUcg67qyse9B8pV/IhtBmnxI04THgEHrPjSp7W6KDrv7JsWdDgo8NuvnocdyFILoGYMCXv6LkzAtioU4rR8MCwN7IUWn5IKkEmXo1vQxS6l+Ysm/psMwyQKhED1IHrLqHJSMhX0vDqXs=; 5:p8ddZhXizNijSL9m2fp4j8E4IMiTkuqFpqHOoWJEH0u/XWsNkUTPSbaWy4HyXteXYw3gJdRTqE2efUQvry4dySjyJ7RBrZDfKIgHCEM7ZCNHppkDYFK0fkausBVkfEX+FxoxLJq67hbeXpyT1TXrQSZbSEcKp4LVstNmAN3OhsI=; 24:RCq0LRDqTVbYcnzK6xbVatQtE8gch49xA8pi/lHSXlYEINHFmoXVZ+cRsmuZ6E/c8AXtjogweW49mw7MO3pD3HqpQs4rr8uypnOviaO06Yc=; 7:AFMXQ0n/ZJ+EY8S0BX9qjnZ8nSLoj/A0MH6Q/599JfbQ62b1ESPboJOtvqOEp8JeoRRNIm6m4tadQSV5RE4Fsp6Henv2Uof0sJO9AEx3PxGivjkrLxAtkUmMFFkzG60/cWjpbNOqXfZ78rWoO0jERnW3j5dk3CQoCVqdvnQ8hOAqzC+5ujfvERNhQ4/Tj7kaS8/Vz+oVZOnrZqjyjH2XpbPSs+ATjH4WvV+6MxmwqDSFRq9qa9FHspU6woLrl9Rq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:zdjf/cL6AWyLEJ9YBVMeFFy8Q7+czq8tQIt8VkVvBIfXaoqGExruqckuv8oErH3Lo35IUzYLYnz3Is/RRaEQoCiBwg99chYQIldX2aY6aTBWp6s1DkXl9tCldPUdB11+35wb1gSVe6DQ1mMx71ewuswSP30IROVEjAdOaALyhPQBYuoUJNc3i7bDZgiSQcPZX1/PnQgAn3Sz6QKyO7XkNgDUTPerwemdI+puDlRZBgATZhvckPf60Vz0F1PFNz9v X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:39.6903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19d81111-4663-4ba2-5405-08d584f30fdc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.75 Subject: [Qemu-devel] [PATCH v12 07/28] docs: add AMD Secure Encrypted Virtualization (SEV) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Create a documentation entry to describe the AMD Secure Encrypted Virtualization (SEV) feature. Cc: Paolo Bonzini Signed-off-by: Brijesh Singh --- docs/amd-memory-encryption.txt | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 docs/amd-memory-encryption.txt diff --git a/docs/amd-memory-encryption.txt b/docs/amd-memory-encryption.txt new file mode 100644 index 000000000000..72a92b6c6353 --- /dev/null +++ b/docs/amd-memory-encryption.txt @@ -0,0 +1,92 @@ +Secure Encrypted Virtualization (SEV) is a feature found on AMD processors. + +SEV is an extension to the AMD-V architecture which supports running encrypted +virtual machine (VMs) under the control of KVM. Encrypted VMs have their pages +(code and data) secured such that only the guest itself has access to the +unencrypted version. Each encrypted VM is associated with a unique encryption +key; if its data is accessed to a different entity using a different key the +encrypted guests data will be incorrectly decrypted, leading to unintelligible +data. + +The key management of this feature is handled by separate processor known as +AMD secure processor (AMD-SP) which is present in AMD SOCs. Firmware running +inside the AMD-SP provide commands to support common VM lifecycle. This +includes commands for launching, snapshotting, migrating and debugging the +encrypted guest. Those SEV command can be issued via KVM_MEMORY_ENCRYPT_OP +ioctls. + +Launching +--------- +Boot images (such as bios) must be encrypted before guest can be booted. +MEMORY_ENCRYPT_OP ioctl provides commands to encrypt the images :LAUNCH_START, +LAUNCH_UPDATE_DATA, LAUNCH_MEASURE and LAUNCH_FINISH. These four commands +together generate a fresh memory encryption key for the VM, encrypt the boot +images and provide a measurement than can be used as an attestation of the +successful launch. + +LAUNCH_START is called first to create a cryptographic launch context within +the firmware. To create this context, guest owner must provides guest policy, +its public Diffie-Hellman key (PDH) and session parameters. These inputs +should be treated as binary blob and must be passed as-is to the SEV firmware. + +The guest policy is passed as plaintext and hypervisor may able to read it +but should not modify it (any modification of the policy bits will result +in bad measurement). The guest policy is a 4-byte data structure containing +several flags that restricts what can be done on running SEV guest. +See KM Spec section 3 and 6.2 for more details. + +Guest owners provided DH certificate and session parameters will be used to +establish a cryptographic session with the guest owner to negotiate keys used +for the attestation. + +LAUNCH_UPDATE_DATA encrypts the memory region using the cryptographic context +created via LAUNCH_START command. If required, this command can be called +multiple times to encrypt different memory regions. The command also calculates +the measurement of the memory contents as it encrypts. + +LAUNCH_MEASURE command can be used to retrieve the measurement of encrypted +memory. This measurement is a signature of the memory contents that can be +sent to the guest owner as an attestation that the memory was encrypted +correctly by the firmware. The guest owner may wait to provide the guest +confidential information until it can verify the attestation measurement. +Since the guest owner knows the initial contents of the guest at boot, the +attestation measurement can be verified by comparing it to what the guest owner +expects. + +LAUNCH_FINISH command finalizes the guest launch and destroy's the cryptographic +context. + +See SEV KM API Spec [1] 'Launching a guest' usage flow (Appendix A) for the +complete flow chart. + +Debugging +----------- +Since memory contents of SEV guest is encrypted hence hypervisor access to the +guest memory will get a cipher text. If guest policy allows debugging, then +hypervisor can use DEBUG_DECRYPT and DEBUG_ENCRYPT commands access the guest +memory region for debug purposes. + +Snapshot/Restore +----------------- +TODO + +Live Migration +---------------- +TODO + +References +----------------- + +AMD Memory Encryption whitepaper: +http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf + +Secure Encrypted Virutualization Key Management: +[1] http://support.amd.com/TechDocs/55766_SEV-KM API_Specification.pdf + +KVM Forum slides: +http://www.linux-kvm.org/images/7/74/02x08A-Thomas_Lendacky-AMDs_Virtualizatoin_Memory_Encryption_Technology.pdf + +AMD64 Architecture Programmer's Manual: + http://support.amd.com/TechDocs/24593.pdf + SME is section 7.10 + SEV is section 15.34 From patchwork Thu Mar 8 12:48:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="4yZna5rz"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr925g2Wz9s0n for ; Thu, 8 Mar 2018 23:55:50 +1100 (AEDT) Received: from localhost ([::1]:38485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv5I-0001Xx-EU for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:55:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzZ-000580-01 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzU-0003tz-Vm for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:53 -0500 Received: from mail-cys01nam02on0054.outbound.protection.outlook.com ([104.47.37.54]:31438 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzU-0003sX-Jw for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:48 -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=tjX2wpu/jA0xOPADPxPrKXSVhFTHf8Nd0l5T84yJSoQ=; b=4yZna5rzXkzO7etB2e8ssG0KACcikA3sLDFKfpOCzM28GYmhfgH93fYwWa9aoTaNE/7r9wrtMxH+Ug7X/hKEKcd3OnFK/KiK6AcCcjzsfqVnCJJmTGljqByv4rikLeUQ9Pb2k1msoofnHMXFPwQeNF4oQkUOPgpulc5mEbyQwp0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:42 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:41 -0600 Message-Id: <20180308124901.83533-9-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a9def2c3-0282-456e-5519-08d584f31182 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:hSL1P9e4Zpv4cVH+MOKS5LbED5BDIYi5BFhhEA6KloMtw+Or4v6YURqTgTpDf2JiD4bL8l0qVVPcABmE1wZccsjxA5/SYLhNyUi8ScEiJobYPBmSlJPNUxHAskrP6FBHCifk+ghicDR5d0FgL1vOSY24AhBLWJNT5pKMo1YpNuvqUp3Z9OgNlSXGlv2sqoRsZnwyqqKUtkRY2gDlJyt4cObYMHt8B3sK3X4b5RMrVEiiU9LEMDh3mch2KNl7zpen; 25:LSYctKjNoULfN3uxCjh5m0KKU4sprLBiFqZ8bt4Jb0RUdwMQEbEoBQmcbZ8l668nhvM1grJ7xkojrHrFkxBo5RaiPidG5S0UXkT2Fdx3b8RjYkOsCa3Pt4djQEbP+4JobjM+xC+UooYF92ybDVdZK069lmR+DdRDNPyjevy6jxYgS3keCGd3kinUDBDHqywB3cQRu82ZD2/iMeZYSM/94g4BdIKbIN1jAZG848UJXehz4KWLD6DTirVHQiqSSVBbvqYkJePRYi6thgm9lK5nrd6hb2PFG/tB9dubobdN75mRxTR/v1Q1bMPzFgSAsvZZTQMayBXOWndX5ZSCW+H16w==; 31:wjxgDaXeA2p0x+PLxPu7e8cIhyY1gVZFW5DIvl5aZYEiELwEvsgvbzqqehU2eFpCPR6eB+5V60/oESC0Z0AHHy/8xusCnBBmIAA3Wuv9Sw3iqzwALt0+jpDw7SNoeJryFAbqc6TSShIkAbk2j4/JRk4PRCiYzDy5LqeIWO5X/YhZqPIOV3SFbSHf7dL2euWhyUPo4eiTkmy/DGsPgssGdH9OML4ra9dzpuns5PpxZgc= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:Z0Di7cxoSJzdVNdcTq8zehpzsFAp8wUyL/GJtMkAnFhv9BeLCBBPcBWghkFF1muJE4SLAZ2D4VzesANUVwX6wcxGaPXc/hguglcRNxFybUcwxEuPIOx6rg/YySFzZH/tnjtAcGs2fpFPertzntSVbqHz12AdSotw67tejZhQppGQdvkTxSOUbwsg7J6HIEm0szcJeFND774dsdX+amLl+9fJlVmqKXZj1+oJpE22iv8XGeKHyZfVvfp8+O8+5iR1qWJqupqkWHkDyXkETc2ehG1zqx93noafKvt0paOW0LXDp9Uab3h9rbLKkb/x4CFok36oY4efFf2cmZlu34RafH8dWAsEpM4F5ZvG0JoN6BC2Bd2+DJ9yzGQbkrMBH97LNPeewNOKaD2gm70+r8WIkGdU263xokxCwIFCgpsdmWCCKz9JEC3k7rNViaDbr6rxy7DmS2uz5nv0AkrxLStLIyRJUVfwRGZYLd3gw3Vt7K1YHhfY5+NYCy2YcL6IK+/I; 4:Oo1UwsuBIcnurxu+XiXmzMR+X4TkNBW8X73+2uG9jgHnQc7vPjRFpwV++qDlsHMJMDJQo7Zkdic4CPtuXtoBRFLyYB71fgQr6yLJ3hOP7O6fqIK3vOF9rz2oWWshshnk1im9PTO5GlPExCTKBqLdITHBl/+avohnl2sYnlEk8G1TQohz7c7z4LwFJ/xSc1Y3QgyCIP+zu7YzFY1QMch6ny02QGv8dOQessZehcPZIgvkeZyGG16vsqyuYqhl54IgwNRca+x3vcO/DyGldVbYNQA2ye2bHSsxgKeFLKpNxuSeLnvt2W/k2zP7R0ZIPKAVMTFvFT/981nOZ82hNixPpA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(17755550239193); 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:PGZgWs8vKU7hYBqtmhagLKzcrHauV6MmzbYSgdDtv?= HLmEt6+uwmke34wPVR8dTcyCQHEZzUATqtCpFlp1vqBK56fziuB1NnAxK3pySgVUPZgOS6WXl1JIfOLwvBioXdfuD7TBkVeVBbr3y1GYoTMWBngT9Awq+clMkECRhXFt1qvInQMe4iBoj2Kvl0zeF7XudxEtr5EcQhpJ7y038V0liWJ62DUrEV8MHA8eQuDxRcphq2hPvpj76xrY9jaSKPr3R6opK9ZMptyRLQk4R8c1NkdQKNZpfS9ryRXNVm2OIZFKS5qLFbONzQhvZuOSbicU3Ezn2MlyT8zKwV3A+KwUtqbruXtTq6pjNZfPpu0dl8zDxv+kz/dbh0fQ9IRrg8PkAEuR7rvm7p/0so9OYLL37kxz1kV0CzgiAJIycLzTnj2glkzVqoy5cDlqaRWLDO/Ja/lsrlUVb3HXuLi7OjcdfapCQ7JyRhBlOEon9bzLWltCTm5FD3JEQdHnf/D/s1eAZ6yzOEZEKSs51jLITPxxv4FxvDW9opRTsUkRUlV9sqF4TCbnDi1XZK2lx71WYeCPi7OnEH8k48KHmuvuWGYK42kQvp04GGYeBDmwJzuSYMiQ5N/AlrMwJr8KC2NeQ3PEObkf9s6XP+tIezgjKCyrBnBvj9L16lqlYNPojdUsHI4X0HCZDVdkpdc44RODG1Ti7OFZ3MII4GrCbMG7RT/wUgeP3YTTU5AYmDvryemcQkWF+d3g9bsUPEub9nQyu0GQDzbmhXrSlKFBZDFVy5jNGX/SntZdAzFSxPsKEJVrePB63I/v/cYqk8b/g4K8QQjcX++T+5LXP2o9PE19VvYIi3QSbff1ekGcT10ds3aDfyoOeaWsiGcHStknmKytCOYM1BVwD1cz8xvw2LES1iZm8iDUGOOQ1Pqps6q9uilKyXq4TyFz2InwjOlx+g+TMJQPHVt1B4KV/qgt4ccmITk1SG/xPwDbgNQFRHdZOmfsT55b45PPKLLVDdFV3izDO35ni3Qph1dQONiVAF3dqsVTGPqvCIYhYda+1lz4kfYBC76ZhJdJFK4hXeHlTKvNPFaLK5RoXy0wIrvtTAcPOiEOh2xebFm9qcsLLZZQjAmjEUcwscs7PJ9QaEXRTilfVVkBI4M+LllriMUiG/wP4Uc/lg5/aTI4yeCws7nPbgqEOAkmNphJMDt0eAZL+kOlxMAqdiOvDPh8IG5fpGIffpupLovt9uyLgVodp3DUey9Vhg6xWCBEHOLFlNW0r/ON2O8 X-Microsoft-Antispam-Message-Info: mGew7zEH2cEWmDA1vF3UOLMpSgmTZsJseGTyVQMa/D86NUYPqHSAtsBaYPrgQHseatKDUOUPpok8Kw5llmwM6u5pXyxhMjtddDOBYhbNrZ6qehh6L7qy0ufyiweOMKqK76xDjSm6qLdfsYDWdU+m7S31Kn6MBmeO9cfuXdpX8d/7gBYs3EAp6EMgtySQvByv X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:wHSlkEbZvMD4CziuWzeki9TulLnWY2h4BtsEdlaSvo6Dzk+6h8q2+aw4SBjACiwC484BDkmug6IbfCn1m7aJjhVvYRIAKObQB3Xe5TlxMW7DsL/sLKUezm+yFSQOHjWhN+BJ1M1GMt6E/XTw4JSW3prSLlN0Vaysy4F+55PqtbvwVSEJNRNJuvgSmbE36r+odq+NTYtF+7W4AezrjnAVulvC+1XDLhTwnZsLKh611NLciC1TS8CZIx5qeytdcB+xf3CWttN6kSa/zVHC/WUDPVoWEt478qU2sm0ooq46a0B5S56FIANfmT6StykB61Jx+Ai81sHV9Wur2BSswex2eptfhSKSfGDY3z7xl+hs5MA=; 5:wlzCD2nNJJv4+KmHH+73131dp/yKPoGkI+T/OuF7nrwnSnSUtcAtnjdCkHoGYn55TqTAn02xLK+t4MjUgPGwg+AgVnGVxECm/OKyi37/dhCYw1xGWKVDqmQrlmOzsybYbLiBCv54YGa7FEHR2oJiSz5U2A2seFILlrGJnoWc1gA=; 24:WQrocUAWL085O26F8ZzzJdNuv8iD2WXlhL6f9XOUKNzWgDPosof/vTH11uidRol6YVaMj59xrePY31UmnqQXWV9LnfRjt/GO/1fEERZGPNo=; 7:p1jWNHODVptqFtb1x1q4RpqaHJ51/Rn7kCnHJnIc+zd2QdnQEXJG+mHFqzHPBoWogblg3/CGFzjQYDISeBCVUI2clVxYFPuNIL3ymMWR4OSxJlKdP3I2PILxn6ABs52vWqqmYHW2fB1Ax1pEqmxcGvb+IUiw8UdbeYF/KQNCNwIicBRHn7bGeGZ6hA7dtE+qkDU6xO5/+YXSc4UIXkhhTRwo8K0RuUmdzWJzOLlvOhlZXQqi7JFknvwIOnPewe1s SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:HcNLMAtVGsgJBerDrcEzWy/VpJfdldajWKFNbQNN4XHh+Gxt4SeOpWdbh0YayKXxvm+iRMusMUXEpMXSF8TXxNXLjcT6FYIArgPfk/Im4W7iTmfCmOQZhDAo4HR7MKp12eZyJznUpn+FqGeVKlhtN4/nQ4Cr38zuilMRMFXvbR91DUD4tL/3VFaz4wEVCPvkjAKSXhLUMSeOARvio39Nhkaq1PZftnI7q/iQTrgjuhvxyKbEnj63juD6EHl42Dn/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:42.5341 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a9def2c3-0282-456e-5519-08d584f31182 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.54 Subject: [Qemu-devel] [PATCH v12 08/28] target/i386: add Secure Encrypted Virtulization (SEV) object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a new memory encryption object 'sev-guest'. The object will be used to create enrypted VMs on AMD EPYC CPU. The object provides the properties to pass guest owner's public Diffie-hellman key, guest policy and session information required to create the memory encryption context within the SEV firmware. e.g to launch SEV guest # $QEMU \ -object sev-guest,id=sev0 \ -machine ....,memory-encryption=sev0 Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- docs/amd-memory-encryption.txt | 17 +++ qemu-options.hx | 44 ++++++++ target/i386/Makefile.objs | 2 +- target/i386/sev.c | 228 +++++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 61 +++++++++++ 5 files changed, 351 insertions(+), 1 deletion(-) create mode 100644 target/i386/sev.c create mode 100644 target/i386/sev_i386.h diff --git a/docs/amd-memory-encryption.txt b/docs/amd-memory-encryption.txt index 72a92b6c6353..05266fd41b23 100644 --- a/docs/amd-memory-encryption.txt +++ b/docs/amd-memory-encryption.txt @@ -35,10 +35,21 @@ in bad measurement). The guest policy is a 4-byte data structure containing several flags that restricts what can be done on running SEV guest. See KM Spec section 3 and 6.2 for more details. +The guest policy can be provided via the 'policy' property (see below) + +# ${QEMU} \ + sev-guest,id=sev0,policy=0x1...\ + Guest owners provided DH certificate and session parameters will be used to establish a cryptographic session with the guest owner to negotiate keys used for the attestation. +The DH certificate and session blob can be provided via 'dh-cert-file' and +'session-file' property (see below + +# ${QEMU} \ + sev-guest,id=sev0,dh-cert-file=,session-file= + LAUNCH_UPDATE_DATA encrypts the memory region using the cryptographic context created via LAUNCH_START command. If required, this command can be called multiple times to encrypt different memory regions. The command also calculates @@ -59,6 +70,12 @@ context. See SEV KM API Spec [1] 'Launching a guest' usage flow (Appendix A) for the complete flow chart. +To launch a SEV guest + +# ${QEMU} \ + -machine ...,memory-encryption=sev0 \ + -object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=1 + Debugging ----------- Since memory contents of SEV guest is encrypted hence hypervisor access to the diff --git a/qemu-options.hx b/qemu-options.hx index 4c280142c52c..6113bce08a8c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4353,6 +4353,50 @@ contents of @code{iv.b64} to the second secret data=$SECRET,iv=$( + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "qemu/base64.h" +#include "sysemu/kvm.h" +#include "sev_i386.h" +#include "sysemu/sysemu.h" + +#define DEFAULT_GUEST_POLICY 0x1 /* disable debug */ +#define DEFAULT_SEV_DEVICE "/dev/sev" + +static void +qsev_guest_finalize(Object *obj) +{ +} + +static char * +qsev_guest_get_session_file(Object *obj, Error **errp) +{ + QSevGuestInfo *s = QSEV_GUEST_INFO(obj); + + return s->session_file ? g_strdup(s->session_file) : NULL; +} + +static void +qsev_guest_set_session_file(Object *obj, const char *value, Error **errp) +{ + QSevGuestInfo *s = QSEV_GUEST_INFO(obj); + + s->session_file = g_strdup(value); +} + +static char * +qsev_guest_get_dh_cert_file(Object *obj, Error **errp) +{ + QSevGuestInfo *s = QSEV_GUEST_INFO(obj); + + return g_strdup(s->dh_cert_file); +} + +static void +qsev_guest_set_dh_cert_file(Object *obj, const char *value, Error **errp) +{ + QSevGuestInfo *s = QSEV_GUEST_INFO(obj); + + s->dh_cert_file = g_strdup(value); +} + +static char * +qsev_guest_get_sev_device(Object *obj, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + return g_strdup(sev->sev_device); +} + +static void +qsev_guest_set_sev_device(Object *obj, const char *value, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + sev->sev_device = g_strdup(value); +} + +static void +qsev_guest_class_init(ObjectClass *oc, void *data) +{ + object_class_property_add_str(oc, "sev-device", + qsev_guest_get_sev_device, + qsev_guest_set_sev_device, + NULL); + object_class_property_set_description(oc, "sev-device", + "SEV device to use", NULL); + object_class_property_add_str(oc, "dh-cert-file", + qsev_guest_get_dh_cert_file, + qsev_guest_set_dh_cert_file, + NULL); + object_class_property_set_description(oc, "dh-cert-file", + "guest owners DH certificate (encoded with base64)", NULL); + object_class_property_add_str(oc, "session-file", + qsev_guest_get_session_file, + qsev_guest_set_session_file, + NULL); + object_class_property_set_description(oc, "session-file", + "guest owners session parameters (encoded with base64)", NULL); +} + +static void +qsev_guest_set_handle(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + uint32_t value; + + visit_type_uint32(v, name, &value, errp); + sev->handle = value; +} + +static void +qsev_guest_set_policy(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + uint32_t value; + + visit_type_uint32(v, name, &value, errp); + sev->policy = value; +} + +static void +qsev_guest_set_cbitpos(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + uint32_t value; + + visit_type_uint32(v, name, &value, errp); + sev->cbitpos = value; +} + +static void +qsev_guest_set_reduced_phys_bits(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + uint32_t value; + + visit_type_uint32(v, name, &value, errp); + sev->reduced_phys_bits = value; +} + +static void +qsev_guest_get_policy(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t value; + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + value = sev->policy; + visit_type_uint32(v, name, &value, errp); +} + +static void +qsev_guest_get_handle(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t value; + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + value = sev->handle; + visit_type_uint32(v, name, &value, errp); +} + +static void +qsev_guest_get_cbitpos(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t value; + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + value = sev->cbitpos; + visit_type_uint32(v, name, &value, errp); +} + +static void +qsev_guest_get_reduced_phys_bits(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t value; + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + value = sev->reduced_phys_bits; + visit_type_uint32(v, name, &value, errp); +} + +static void +qsev_guest_init(Object *obj) +{ + QSevGuestInfo *sev = QSEV_GUEST_INFO(obj); + + sev->sev_device = g_strdup(DEFAULT_SEV_DEVICE); + sev->policy = DEFAULT_GUEST_POLICY; + object_property_add(obj, "policy", "uint32", qsev_guest_get_policy, + qsev_guest_set_policy, NULL, NULL, NULL); + object_property_add(obj, "handle", "uint32", qsev_guest_get_handle, + qsev_guest_set_handle, NULL, NULL, NULL); + object_property_add(obj, "cbitpos", "uint32", qsev_guest_get_cbitpos, + qsev_guest_set_cbitpos, NULL, NULL, NULL); + object_property_add(obj, "reduced-phys-bits", "uint32", + qsev_guest_get_reduced_phys_bits, + qsev_guest_set_reduced_phys_bits, NULL, NULL, NULL); +} + +/* sev guest info */ +static const TypeInfo qsev_guest_info = { + .parent = TYPE_OBJECT, + .name = TYPE_QSEV_GUEST_INFO, + .instance_size = sizeof(QSevGuestInfo), + .instance_finalize = qsev_guest_finalize, + .class_size = sizeof(QSevGuestInfoClass), + .class_init = qsev_guest_class_init, + .instance_init = qsev_guest_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void +sev_register_types(void) +{ + type_register_static(&qsev_guest_info); +} + +type_init(sev_register_types); diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h new file mode 100644 index 000000000000..caf879c3b874 --- /dev/null +++ b/target/i386/sev_i386.h @@ -0,0 +1,61 @@ +/* + * QEMU Secure Encrypted Virutualization (SEV) support + * + * Copyright: Advanced Micro Devices, 2016-2018 + * + * Authors: + * Brijesh Singh + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef QEMU_SEV_I386_H +#define QEMU_SEV_I386_H + +#include "qom/object.h" +#include "qapi/error.h" +#include "sysemu/kvm.h" +#include "qemu/error-report.h" + +#define SEV_POLICY_NODBG 0x1 +#define SEV_POLICY_NOKS 0x2 +#define SEV_POLICY_ES 0x4 +#define SEV_POLICY_NOSEND 0x8 +#define SEV_POLICY_DOMAIN 0x10 +#define SEV_POLICY_SEV 0x20 + +#define TYPE_QSEV_GUEST_INFO "sev-guest" +#define QSEV_GUEST_INFO(obj) \ + OBJECT_CHECK(QSevGuestInfo, (obj), TYPE_QSEV_GUEST_INFO) + +typedef struct QSevGuestInfo QSevGuestInfo; +typedef struct QSevGuestInfoClass QSevGuestInfoClass; + +/** + * QSevGuestInfo: + * + * The QSevGuestInfo object is used for creating a SEV guest. + * + * # $QEMU \ + * -object sev-guest,id=sev0 \ + * -machine ...,memory-encryption=sev0 + */ +struct QSevGuestInfo { + Object parent_obj; + + char *sev_device; + uint32_t policy; + uint32_t handle; + char *dh_cert_file; + char *session_file; + uint32_t cbitpos; + uint32_t reduced_phys_bits; +}; + +struct QSevGuestInfoClass { + ObjectClass parent_class; +}; + +#endif From patchwork Thu Mar 8 12:48:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="okEHMrTK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr9q53Vqz9sgk for ; Thu, 8 Mar 2018 23:56:31 +1100 (AEDT) Received: from localhost ([::1]:38495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv5x-0002Ew-IN for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:56:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzc-0005Be-Pe for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzY-0003xB-DM for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:56 -0500 Received: from mail-cys01nam02on0040.outbound.protection.outlook.com ([104.47.37.40]:4288 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzX-0003wA-PY for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:52 -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=ZPdB0kPhvRZbmRprteX3rhx9NKO+F1jQaSqHeMoGgbs=; b=okEHMrTKeojFdToiSdFkPapZY+PasL1toUmGFfyGE9z2dm9rKbyciPppXr4oQ/0klTNGrEdNrr/gOjQAuOt1PhnvNqet++KS+SytDLmTNZ9KqufafugRNQ36fRtxEDJA20GQht3y7U+Fu21keRrjhKayFf8LEYqbDZvMcd7/2to= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:45 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:42 -0600 Message-ID: <20180308124901.83533-10-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 07fd7bd6-4fe5-4cb9-7d47-08d584f3132f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:PSey1LU2VjLub+WDMYpIQIg6z0zdyDLULBui2COlzRelOdigyBIeXReNYTFwndG/5LtBzaKyELcjWzPB2qKBF1OTR1sWJCWJ6Vb++w72OoHCF0uLqi3SbQxdugh3mkNanil/YXW+SOo4yb8iI37nH6ajEOGgYr5ilqUHaVfKPw9ohawILqugu/cZxPEhhidtHjqEudL4yKd+JX35N2oDZEdRFPPMf98oSZCPh7xOU5nlKLcrMqUYg1NyN3pahWa8; 25:s4NpZI211wfONZRLtpyjr+dZnigb1+lDT92gXsyU57gbHh+c23xxed7oYtQuo3CVhl47eBqCEdttvetmQgxgekoGodzvaFf4cYyViuty3RuMiZ/YCGC2WBLsHkMxnF5+C+lDDNDAF+yHHQdEakfePfC+OjEiy3fcdggTGktJ/InAFQ8GFPpL38MjpDR+AqIyiyf/wW834JlkZ3ZP5w7E8nJYS/R4wVGA5i0kgVD8UalDThuc9Bzg1YdQYh2UY4Y4C0IaP6CgJJksl2TTnDvOQtWO183AoHxUGt0GFaRFJhi8RJ67a5ZS6iBM4uOhtEvzRg3IcwkNEnxAibRFEO86Og==; 31:foUH3xsdoMtjl+0rcnRomxJVuoaJK56C2fc9jNbcPyQ/HZYaNWGlVOwsajxxOScokCvj2g2dHDGdyc0AHoJuT6PQ0qKEtDDimRK6xPe8PM7HWbaigvOkYW3fUKKybZkVDC1GWfISQ40bMyPjkDSU6JlDUPgtgDGnMzqeJz1w6P5/ne+gvn0Guw+8tOibTBEcoHRAkbDLyoL+YpurHYhbTI0lLOSRTvgPb6tZ+ecIlOM= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:s0E5TN6HiaXp3JQ7dmSBFvZm/X+Wz3wX0uXART6u0T52+7Xg2+Heo1EkCETAvKe9FSg9jFFmeb1DzVLRYPXQ6M0SJ59E1g4W3BLkjocoupEDOF5uGQlQqekV0k13EqJjBCAs4SngxDMKdi9H6pq8yLsTgGnh7uazTkMNr5xL/fVzIB1pio3F8d9QqogEZFbc16X9zN/lgUq5TA+cs3xWT6FPXtDInTfDvbFajf3weOOKtSsOVGFKyBfSul0/HOJ6NJwCVXT2aWmPyXtaf+ImqB4DF26UJTK0jyV9Eo6WNlXU9W2cOiKIecK1h9TAAaYsitEe1x/0jKEooet5uGYkQUf3NbIPCUoNa5cPXwLYNyFpyf2hwCge193gTz4UpTHB0Qhbd7Lq/XTOAGPxIu6S6t6fEg7BKlseS7P/yNNXPvuWTKTRv27k74zZzCBe+SFSi9yuxY8bwonQLupWlAqbCewCxMvCNSkiNLIan60d8fsi1MYiVFr11KxsN+Xm/g8w; 4:2Nid85rUEs/ShY4W+dn3mru6FJ+fxMNfh0Sit/mUeXOpfHhGo7gWmhk/xf0GFRIO5YIbpO013CEMq1VZOY1w6DBY8BYZcEiygPNTQbT68UG0i1w7YNfbhD+DbeZ8d2Rum9RTa1BU5BPwy1McfHWP4zLrUJD3qUcyhaRdXVG4ID1W0SHRm+xtq/jLgXqJySWOnoL+4EX2RoC8KVisirtoL52TferOk/936Ux8kTminHSxR80H9/WcY2aXMtFYYV0yLRqDx1OWJQy1hllPBApF647Fw1l+1MJvYanJVKG6UKVs6DIt+GtUHPLD5yPZTO88 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(2870700001)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(7696005)(52116002)(6116002)(16526019)(186003)(26005)(1076002)(8656006)(386003)(23676004)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:G1hSQjAPt85ixbZyaxB7ZgToP4kYItpCXVxE7xBvj?= aggJzuNjw6RCXweFFLwsbg8lbExoyiB4RHrqrRPY4BGKGJFZlvnW5ksuB18gD9wmcZ9jP9IZ74TW1BkfWQyXBiWG69nsoMmtbaqoghoe258h2mVFRvIUxHzdTXMyX1hFII7bZKbm0oLjoucJp5BoMprmlDi/gjrLt5Ef8OTi59Rr6FY7WIHqL9peecRmW/QrVpQTO+cEH9rJrD8xXk7DgNq8urRN44WfrW9zmTSSdTpkO4bToJJ/sBYyh9XC7lYZ7m+phDPqgeh7WdT0lNXNF6Hsl7fe0XQ95ZvQleFJUBiS9oQe9s/3UIYKt+1/e0SSMNLqbImDXQAxFJwfH2WdDaUzwEl/pa1Zu0kCaNF7qqZ1/rhCcNIS77RZAVx6tTHKitWvz68ZoiTp2LmhJv4JCqUij69XwWdu7z+zMbe8TuDe8jEaDz+1rIQFsEmXvQ2yXQpmCXuuvZEgbjtURZR20PhUvYXEViKnt42tPYlvtUzW8jhvZYIwxzOP7lF1GKYNHHvYaQE98JSX+Po1AfHs92z+KLBDCLW/XQxtsYafVeeAo+YqX9uNO+kuiNzZS1yP7RfEkrry2PQywm4072CJ2+zMdMjkOyc7DnFRtduMMhevEv/WcMKVBmtkNqhRELorxG3rUvadhxZZOvhiSmS2O8kP8W+QDNihpIT/int1xHhA0iHGrGktVHHVYrPc0DwIW6VbKkv5ROsndiM/wl5IPaVZyJxoxOmr6AlQMfrG2A8qose/fdwAheRzPpQUj+2abryr4+WLqd3wLTAlefS4s9WV959Qhmc+DPDbeNVEIGvnhUwzHi1/7xaYuLR4+gv0/xLjEhZgIZ/Jwl1Pnf3OZQfvpoXzYTnkf65do82wlp1u1HTm1t3cUO6TuCcmRUSnoBIS912jHhXzAOt0XeldAqyTrfV2A6XvJuiGDTJqRs8XcuNQ3xFQCVUVrGwTgE8ckjwGdPiYRA7B6IxITHJQebcG3nGg3de8Z0asAzEj4hw5WEvt+RxUeVbpu7c12hVDYTvql4TOqvJd5cVnqjYkGJCkc76CH6CmV+/7LQqDvDERBBvSAs9yyrURZ5jCDQrISJw+Nh9J1z+8l2o0oJveoKkLpUGPsCFo5uPcEp356KzexiHrlvgZzE8YYTx0tGG1o2oc6D0jGwQ+KP8GhlW00j5K7EJGPKS2ljtt3Yj9Sdy+oz8VjZ9fxVHMTSX5zdxFwmfj17I3tbggEtE02Vlk4WY X-Microsoft-Antispam-Message-Info: OBslvJ+q8ajEtXqkFvOCFjMTN2JbRoGaJSuq7Ehq51gwUDahXZNkGCL0BBsk6Ha7jlWUzN3bJeD2U+ZiL74BOfS8hWkB9wJNTMAaM1MP98esrE64qLzEv+bYKaJrELJWEoJrB4fCftP97DmXmNIQ5FSXfQXJOHCY7DbKFZtgfIvPeOwqUWWnMrqUtSRSwYiN X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:JPAbHcNL7n1Voo7sQkqm3KH2UhEppp4eztqB+YRkaawK2kQ0y43BtcuOjsVXLzN5EeYlqSgvQALb3YYfCNFxG7LgYqDUnu+WNal+jUTqfXG8sTljrhxw78WS3P/UX0OHRK75OfmgjmCDj421IbISXz6UlJRyM/VTWIBvNK3wuGE678XRp1N0XIRqX85NHrNKdynGwJYj8844HYZRaXtaPn9ERIwuxfYG75mym9HKBBaW3F9AV8v/p7Un685LXGjFkFWgdPE6EZfnNQ6itNSIhbJiGiOCyty7yOWQucoMDuvnZN/huyuel24VTuwE3KcGpy7G7/A+w3UFfa/4rfv1DEj5l/te7BaGW+sREQr2hU4=; 5:OwdgArLzmZhyc5P/0y2GcJhXEinjjO988qrOig/IcszE80Okdux0PvZizpkRLsrboibQDyjqOS+DRKpcYKgzWK+AM8V4Z1ynazcl5ZFDb07/EQS05IJFW+ZRsysQqJltGIn82wtB9gG6zwMqEC58HFtZ2oDRTlyg6jjjlVhdyL0=; 24:/yLubHCqcPloGGXZw2m+RB7XfPooiAyOYzL86An5NjGblgmHjTReNFTmMVfEdpoklBWzO1Hb6qMnIVbRqVaTzj3to23MnooFV+KVOTP9/LY=; 7:CokTZTjlSjZBW1hqkxGKDkLQJ8c/Mpm9fiaPDOqCuHhoyH0MpsN4YI2Gcq1Ws0ay7DDf2OBRku3RV20wgRkX4cGTjauQo5Et+i1MN8jotx6tQ8LPdcQ1XsPct1Y76phBQjU4KZqG+Wu0lTUf52HPRykBU2QMT5UXPlo0z03tfe6iiDGfjviDeehIhZYseHx7eglWcdbWSWmoo4ybTn7OGht4gwwPzT+RSIEW7Bm/VO/WE0YA8LXoCMes+6lZdOX8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7AjlPj9lfxR81OFM4Gbt2GcZEnTSYVUXzGbzYiCXDil6v8Ye23d5lDkxSov6q7to7XL6ahPjb53TJ3hMUzm3VWL/weKQN2omWvYh7EecF67sY0hP4t0rsERo7mxEawUKXyx+hm0P1hcS7aPW1GVsFJGWY/zWY1i/MZRIxoNoF2kYdwLznwlLYH6Yy1femc8/4RyYUbstMmk9LVWVZ5GuzuHS6uVy78sTSJ8R0hAiyozii28esPqianXVV5B/X6o0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:45.3935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07fd7bd6-4fe5-4cb9-7d47-08d584f3132f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.40 Subject: [Qemu-devel] [PATCH v12 09/28] qmp: add query-sev command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The QMP query command can used to retrieve the SEV information when memory encryption is enabled on AMD platform. Cc: Eric Blake Cc: "Daniel P. Berrangé" Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Brijesh Singh --- monitor.c | 7 +++++ qapi/misc.json | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/monitor.c | 8 ++++++ 3 files changed, 91 insertions(+) diff --git a/monitor.c b/monitor.c index 3f4ba902266b..2225cf5030dc 100644 --- a/monitor.c +++ b/monitor.c @@ -983,6 +983,7 @@ static void qmp_unregister_commands_hack(void) #endif #ifndef TARGET_I386 qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection"); + qmp_unregister_command(&qmp_commands, "query-sev"); #endif #ifndef TARGET_S390X qmp_unregister_command(&qmp_commands, "dump-skeys"); @@ -4103,6 +4104,12 @@ void qmp_rtc_reset_reinjection(Error **errp) { error_setg(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection"); } + +SevInfo *qmp_query_sev(Error **errp) +{ + error_setg(errp, QERR_FEATURE_DISABLED, "query-sev"); + return NULL; +} #endif #ifndef TARGET_S390X diff --git a/qapi/misc.json b/qapi/misc.json index bd04469a4ba2..14681729f8fc 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -3201,3 +3201,79 @@ # Since: 2.9 ## { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } + + +## +# @SevState: +# +# An enumeration of SEV state information used during @query-sev. +# +# @uninit: The guest is uninitialized. +# +# @lupdate: The guest is currently being launched and plaintext and +# reigster state is being imported. +# +# @lsecret: The guest is currently being launched and ciphertext data +# are being imported. +# +# @running: The guest is fully launched or migrated in. +# +# @supdate: The guest is currently being migrated out to another machine. +# +# @rupdate: The guest is currently being migrated from another machine. +# +# Since: 2.12 +## +{ 'enum': 'SevState', + 'data': ['uninit', 'lupdate', 'lsecret', 'running', 'supdate', 'rupdate' ] } + +## +# @SevInfo: +# +# Information about Secure Encrypted Virtualization (SEV) support +# +# @enabled: true if SEV is active +# +# @api-major: SEV API major version +# +# @api-minor: SEV API minor version +# +# @build-id: SEV FW build id +# +# @policy: SEV policy value +# +# @state: SEV guest state +# +# @handle: SEV firmware handle +# +# Since: 2.12 +## +{ 'struct': 'SevInfo', + 'data': { 'enabled': 'bool', + 'api-major': 'uint8', + 'api-minor' : 'uint8', + 'build-id' : 'uint8', + 'policy' : 'uint32', + 'state' : 'SevState', + 'handle' : 'uint32' + } +} + +## +# @query-sev: +# +# Returns information about SEV +# +# Returns: @SevInfo +# +# Since: 2.12 +# +# Example: +# +# -> { "execute": "query-sev" } +# <- { "return": { "enabled": true, "api-major" : 0, "api-minor" : 0, +# "build-id" : 0, "policy" : 0, "state" : "running", +# "handle" : 1 } } +# +## +{ 'command': 'query-sev', 'returns': 'SevInfo' } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 55ea10deb8ef..27b99adf395b 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -30,6 +30,8 @@ #include "hw/i386/pc.h" #include "sysemu/kvm.h" #include "hmp.h" +#include "sev_i386.h" +#include "qapi/qapi-commands-misc.h" static void print_pte(Monitor *mon, CPUArchState *env, hwaddr addr, @@ -665,3 +667,9 @@ void hmp_info_io_apic(Monitor *mon, const QDict *qdict) ioapic_dump_state(mon, qdict); } } + +SevInfo *qmp_query_sev(Error **errp) +{ + error_setg(errp, "SEV feature is not available"); + return NULL; +} From patchwork Thu Mar 8 12:48:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="xd8qkq0E"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrMg3Q0Wz9scc for ; Fri, 9 Mar 2018 00:05:03 +1100 (AEDT) Received: from localhost ([::1]:38538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvED-0001JZ-6j for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:05:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuze-0005Cx-42 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzZ-0003yM-Ni for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:58 -0500 Received: from mail-cys01nam02on0066.outbound.protection.outlook.com ([104.47.37.66]:52661 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzZ-0003xW-Fx for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:53 -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=cOnc1P1wctgY1YibWGFUBBzMdBnXweNpGN6vslTLgiU=; b=xd8qkq0EpD1pbsis4cTdqL+r8y/UJwKzj+kVhfVx2pFz9DEPOC4jB1pChJoVPTIlOswKZpbGugFkgR47tIsl7IUM+1S1yTM6Cp/JpxIcoIEzE0LMqR857chpDHMn29u6OoidNPooUDNg7uATZ0YL2jqHJ64GjmjLNMj6ksRLBqw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:48 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:43 -0600 Message-Id: <20180308124901.83533-11-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a94b040a-b5a6-4485-a6d6-08d584f314bd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:g80mWXbTDcanDEU0hzGrddY7D0VTn1Pg2TyeyjwW2fbO+S8of/umsLWnv/mHjiHyAKaHrszaIu6Utqxo6SvMmMryC4uBDRInFhcA2YU84vXIZIHDstmboD7jJZjdMlpOtedR1seIImdWdjAD19Cb6nHKaPqLd7qnz1JROCxqKJm+WZQ2lMUNci2dIesPh7RjqsHuHRGvVJEi+5MnrOmPSw+6zjcBfKH2BIdre0sNWdjn1y+PT0WutYFz37zBA+58; 25:O7sgyAPSSmHpIBSdKDrVjRLMf/aJsAsOzC2k7Jh5pFqgc6nLxI5LuI5VR5FhgRkwnGLdDe7hyQtzpsWnmZ3lxbip6OS7HNmpFzv37srBMQquTRtMCTVtJmZDT7HVnNljCvZQOvr5/J+W0hRZN1JXpWOIWR4Q5PE4zdI9El6TXqpNVyQ/hjkXqLIV2hCeyk2K8b3RfXfKAJeV99y34hARaNpEk4zsbbXiASKqcXDRmwAT71oXWz1Sm0wGNH1OrX/9NHBiEKqfJzRrSYrlV1etipPhHo+d3CBC/XYCDYMAX0gG2bOXhyKm/yHYDCvgKgHi9XqsXqmQAXcFE5a5ie9V5A==; 31:4yPuz7mJRUGNWZeN88iGAGTom8hivsYQ50ZFP/Z6fgqLxObu1LHM2f1uprI7VuxRSUVd515ncoDEk7KdkHbvukzEnh9esyGjaLmNNq2ByNbaQiG2huOncGQFwtG60YRGVyL53rJajVawQn+HfVCff8ggz1Cr4k74sAhw1fwt5Wcufx5uoRcASpOdR1uxi9V8lmpGBlZO/KhLRPAMb7/RsZnVIijvFLZwKVHv8qXdtTc= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:2i3JscZa1Dg+tcAZREXZ7LjT1cQL7ytBr141JxE4vtHTaFwiiXjGcqt/R1M0X5xImZ3vvsO9pXdGvgoaD8NyhDPrOwJb7hPAOUQiGU8Cqecr3BuWtgJ7tVRie49q9e6jrWc6qpwp5qxnauqZamy37nCiCW/6W3xi0ZMLK9jeXEo0KN0gFQLP0/pjPIY9KclsfHfmI4nihWgiuhkznjtuCqa+ttlKjufHSkgmH9Pq5KVEU3XDgg+IsgncwO4pRt21xUObdOOLP3BuDbGAh/vJWfjG6AbBUJJCft1dPUk7Me2zqaMCzAPMSJULRzGY+kL8SLoSlmq9jkgKyn6ON0OH7uqapjE4iRN9b3I9SscXbSD4GW5Akha5MdopDBBf+PYgcjHLLIywrV/MwZu2Eu3T6QkTie6/8vdb8gUNxcw/0z32AS+itID/L8pshyk/GoEBZkdd9d7mShpAu6ms1W2ax4vYCViszvE13YB4p9CvphpaTD+aHQzcB2ULk3BQ3NHz; 4:pErY5X2fclDiekyGG0IFo4LMj9wVqJxaO8zyYzKUjGfG+VfjwuluEq3t276BRJcmtv52y2vVZJ7DAHQ/3LZgstvX6RsXAFxhfRYL44kjgpBLeNWH7+NjnXYlWNqbWIXpYt4LG9F4X21FeGDp3Jdl0VJVPFh/06copOsSzpdj+4yOyCg/l+E03XVz6xcca7Ts3eMcZg/QgJxkoSZdzuTbQFpiD52oN4cZe+5S9K5mYM2MbzI9AGhE1Sh+BkVX6M/1uyObTcovXCHEvItIe8owB0f05utrqAW1lTm9etwh5Yt50+uQi9ggUeEsXbHyOpKj 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(6306002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(966005)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:dU740bJzpYyCN5gmdzj3P+r3DxMOvK7WLaNR1p72i?= TevgE5h4w3oZXTd0Mad33BMdV16RrxlwcVBP/R3RIMv2DkzyhRRvLN2zLyy/rfBCD55l9kZEUiXNokrwtjgejJ+DNIYfhHgf+Y1sQ1DUFCpumz60T9LfnSW4b+hNeNsaenGW6xnLPZJJ+ZvgJqxQk04mnSyV4YM63b8sqQjqLwuWFfVdiPz9tx5vCmXx5scBXEjef7L5vGUk8ezMhV++P7rmJSeHg2LkS50WPQ/88Dy5RAwz8p64NMmlNjAdoN4OVxlvYu/vmbYAU7v8j12Ljb0myBm+Kf7wTjzRRKiNJDyhaX0ZnSQgT48n5B2wZiz6XLzpUo3uBMC/zexvwFHovCEbfLoeQu3Dm8WExFWxogS+z5g2F4cZIci5ujRe33lDtiRTv5IAv35x8x4GGH4H5d63jTnH1MLTFkSv4FPq7OrW+E0avBGNzeOEqNvxO1eryNkhYixSZMdfT3pqfnZz21cg/+pcQmk11lQoJC2YLj1+J0cQK1SZBNtlF4rHRlBEddzoJTGVQcX14b7HEEcXQZBKG6IDF3iGITv1q5ez+fKhUFytmcveW0XZcGfj6eiuWG0tr8kV+6krc6xXinvBBYk9yXSrrPDsabwP4WS04uYDJOh3e0JCUUnqiSUykJOL/D0VHGlcGLFjysWG9ZgU3Gd3EMSBagDDgRHFttr2fzPnXRvSoquydzIGh6nwVAxEpzmLV9+x2no5HvjZBvPmSj/zRCB2IFZpIr/Yf7lo+2wh1rNgLq4cqMyMKq6KFinTbCfJY8OPjZqk9rUroMUUi88zcxWYrfYUdRqcNaBKwMz8ys1HT9aRDjYXyAabqHALywR8j/u4ZELhzB56LgbexR++q73KOzVYxr2++53hHd4v+w4zffXo51PZSarISKrQ2TtOi26m/PaHQkelUBv/WKght6hl9YuacDZ9QCS3VmflOOX+whHjMJ4dZ2bfsPAxuwlOF5VfsDnWYgEmEPtqbR3Pin/rHiOjT8JK6np5G036WQbhPdbg9Uqak62A7dS36ODKUPQ0CNwmWVrVfYoxQ1Dv9spA8mPwFpBctfgfIVpDqaHKNEp4rRuiMvArIDkaoC4pfE3eOu676UkrUOngapJ2L8Z2zMMOoxl+tYyR2trOxyU1CNV2OZGoG4JlyPbT14sLHVWRBDO9su7L6cgCfHNQG6uqZihMpTuCCXzOmWNiq2c8/KGk/6oKgdUPmC/pGzChrdLduNlzm1dPX/fIRxqEucxURzd6okbvMxFKzxnP1MyhPj1Y7jqsqNKLGnLUMUg43+ibShYmifKW2t7qpNRMqFSOMBCBMx2ffiBrYTg8Q== X-Microsoft-Antispam-Message-Info: qHDmnvm27AsrKHdyOlAUcQXspfEFMo1yKafnI/X9D45EXj9RnHGFXOEuNeZplt9WJfEmf/f014lMtH5GSClNaKA1eBS6FkHOmZu12wKsZp17URIXix+CjGnGiHEWGqoGGjlO4pzF+jYr6HwB60X1Aj36bKBt0pY10+7jaeuG60pYvG/Dap8kVmdjgw6QCYHl X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:c+V6msvLsRwkKl0pJIJ9iPwlc+M6FdMb2TQjrNA51GnVtaqn/oUCIC6P2oO1m7PMK6ihGHn8vORSRuaQh89ynJIbAyYyX6LQXt0d3PvlQ8ssmlj4pc89T1PFGhbddp7V813l7NblULx7RcrV1Oe/edMBxDwA5SZXkcF0C5OE+Xaxz0fvdAn4QISdtdDsOu+IMrVoV+2ZSAbPV3KVYZJGZY6kF7bv+vhyMXAIp6zD05z8J3BNn260GJpEDuwvrcEwJwTGyLei92ed80aMK+Rqtc6Cshf/foa9ObpHP4zTAPJ54jekD5t6IB2+24muLL1hU8i1zg6sdMYD9er7z4hdbNkfB5STBOTM8T4znuo+EyM=; 5:WgAcmqN61PaA4sK18nz/CatmcR80Tv6vCuA0VFpIBa73Oc3HbkiUy12B0r/5awzIt1fKa49r9odN/wUl5LWYCfvVOQNcUFW6+EQtMC2u+8L61oi/Jjo10pezn6+rgYNFv9M1MbTVTQghOy3qGBes5TB2oTMsrTEzvbv480GTgyQ=; 24:urBi07N0GyAn9KZTzUinwVkfsDRjz8GfUQWodKMuAdL5QmCMcVZURao+Xw2mrTap6m45wRdTHFyjcONR0lINoEiNeKmnlCutK+bxsTu5PpI=; 7:whJ4T0iRtut7QNVwV99JOkdDaT7+DatAjr7j1Fl6T01J6GObSp/f2Pyg2fiObBimCNOmWkia4vZMCSyfa92uT80aerlAxkEwqZBlOBHdhlLMA3cArkMNG0ENl0WprS1hx/Bog1lBIGkahiwEeZdJSxOoXbycWj3+tuAYTG9woSXAb1RekS+dagKOXjNFI78koMFHkWZpWBebWXA1J0HrnYGpydCghTeMXb4gxDAvU2UJIVU8JkkOyr8lu+yIPGzb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:DxpYT9dt0zNilzVaLaouAWW10ANgQxwC82V2LVQ8PMzOrPuB9BhRji7hEVgqkK8Fq5kVCjFBaYrkPoqjPpPrd8D3tx91BXSDji/oShPyMsw64AcLp1PpHgZTI3T9eWQeR6fl3gVYwryCth9GbrvWtn2OWu9AOytX6kjHcS2Sym6S+xxHkHobPaNfWxQO3q6XWHSy/RgRc2PBQbu8WqchkiDyeKutMtbksBbKxbVtWipGcS4518StgV4oaT/dUnPw X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:48.0498 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a94b040a-b5a6-4485-a6d6-08d584f314bd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.66 Subject: [Qemu-devel] [PATCH v12 10/28] include: add psp-sev.h header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The header file provide the ioctl command and structure to communicate with /dev/sev device. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- linux-headers/linux/psp-sev.h | 142 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 linux-headers/linux/psp-sev.h diff --git a/linux-headers/linux/psp-sev.h b/linux-headers/linux/psp-sev.h new file mode 100644 index 000000000000..33e247471ae0 --- /dev/null +++ b/linux-headers/linux/psp-sev.h @@ -0,0 +1,142 @@ +/* + * Userspace interface for AMD Secure Encrypted Virtualization (SEV) + * platform management commands. + * + * Copyright (C) 2016-2017 Advanced Micro Devices, Inc. + * + * Author: Brijesh Singh + * + * SEV spec 0.14 is available at: + * http://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __PSP_SEV_USER_H__ +#define __PSP_SEV_USER_H__ + +#include + +/** + * SEV platform commands + */ +enum { + SEV_FACTORY_RESET = 0, + SEV_PLATFORM_STATUS, + SEV_PEK_GEN, + SEV_PEK_CSR, + SEV_PDH_GEN, + SEV_PDH_CERT_EXPORT, + SEV_PEK_CERT_IMPORT, + + SEV_MAX, +}; + +/** + * SEV Firmware status code + */ +typedef enum { + SEV_RET_SUCCESS = 0, + SEV_RET_INVALID_PLATFORM_STATE, + SEV_RET_INVALID_GUEST_STATE, + SEV_RET_INAVLID_CONFIG, + SEV_RET_INVALID_LEN, + SEV_RET_ALREADY_OWNED, + SEV_RET_INVALID_CERTIFICATE, + SEV_RET_POLICY_FAILURE, + SEV_RET_INACTIVE, + SEV_RET_INVALID_ADDRESS, + SEV_RET_BAD_SIGNATURE, + SEV_RET_BAD_MEASUREMENT, + SEV_RET_ASID_OWNED, + SEV_RET_INVALID_ASID, + SEV_RET_WBINVD_REQUIRED, + SEV_RET_DFFLUSH_REQUIRED, + SEV_RET_INVALID_GUEST, + SEV_RET_INVALID_COMMAND, + SEV_RET_ACTIVE, + SEV_RET_HWSEV_RET_PLATFORM, + SEV_RET_HWSEV_RET_UNSAFE, + SEV_RET_UNSUPPORTED, + SEV_RET_MAX, +} sev_ret_code; + +/** + * struct sev_user_data_status - PLATFORM_STATUS command parameters + * + * @major: major API version + * @minor: minor API version + * @state: platform state + * @flags: platform config flags + * @build: firmware build id for API version + * @guest_count: number of active guests + */ +struct sev_user_data_status { + __u8 api_major; /* Out */ + __u8 api_minor; /* Out */ + __u8 state; /* Out */ + __u32 flags; /* Out */ + __u8 build; /* Out */ + __u32 guest_count; /* Out */ +} __attribute__((packed)); + +/** + * struct sev_user_data_pek_csr - PEK_CSR command parameters + * + * @address: PEK certificate chain + * @length: length of certificate + */ +struct sev_user_data_pek_csr { + __u64 address; /* In */ + __u32 length; /* In/Out */ +} __attribute__((packed)); + +/** + * struct sev_user_data_cert_import - PEK_CERT_IMPORT command parameters + * + * @pek_address: PEK certificate chain + * @pek_len: length of PEK certificate + * @oca_address: OCA certificate chain + * @oca_len: length of OCA certificate + */ +struct sev_user_data_pek_cert_import { + __u64 pek_cert_address; /* In */ + __u32 pek_cert_len; /* In */ + __u64 oca_cert_address; /* In */ + __u32 oca_cert_len; /* In */ +} __attribute__((packed)); + +/** + * struct sev_user_data_pdh_cert_export - PDH_CERT_EXPORT command parameters + * + * @pdh_address: PDH certificate address + * @pdh_len: length of PDH certificate + * @cert_chain_address: PDH certificate chain + * @cert_chain_len: length of PDH certificate chain + */ +struct sev_user_data_pdh_cert_export { + __u64 pdh_cert_address; /* In */ + __u32 pdh_cert_len; /* In/Out */ + __u64 cert_chain_address; /* In */ + __u32 cert_chain_len; /* In/Out */ +} __attribute__((packed)); + +/** + * struct sev_issue_cmd - SEV ioctl parameters + * + * @cmd: SEV commands to execute + * @opaque: pointer to the command structure + * @error: SEV FW return code on failure + */ +struct sev_issue_cmd { + __u32 cmd; /* In */ + __u64 data; /* In */ + __u32 error; /* Out */ +} __attribute__((packed)); + +#define SEV_IOC_TYPE 'S' +#define SEV_ISSUE_CMD _IOWR(SEV_IOC_TYPE, 0x0, struct sev_issue_cmd) + +#endif /* __PSP_USER_SEV_H */ From patchwork Thu Mar 8 12:48:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="l5QntmjQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrVc66Bxz9sXk for ; Fri, 9 Mar 2018 00:11:04 +1100 (AEDT) Received: from localhost ([::1]:38578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvK2-0006Yw-Ha for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:11:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzh-0005Df-IT for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzd-00041G-Gy for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:01 -0500 Received: from mail-cys01nam02on0089.outbound.protection.outlook.com ([104.47.37.89]:10504 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzd-00040H-6V for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49: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=pFejL0C2Pz30AlJXnoyar4bGRdi6XBmbNDe1NPNRKNg=; b=l5QntmjQJyBKiqu29f97wy/KoiKhvUyeQ/cMhuXt896NbZcZhvwT/Cz3cXen8TopgqIzE1rRQwSFA6vNj0fTzvTL26QeGsqfGav1RWwBtDTNCO9HwZ/2JqzqNRZxGvegB6MWttuY6TPKySzXgiCLsfPLLlYlhd/FQIb+vFnSNTw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:50 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:44 -0600 Message-Id: <20180308124901.83533-12-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f543eb8d-4af8-43a3-e489-08d584f3163f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:madnOmbf31tGxTXHc6ynRO42SU3ZOiO93ak6ldEO9qy9LzJzazyCn6GkGvUwh2HOr248izauFmjysXSTHpckXuFx0AwFw5GemGgcLJTeJruXHm7DxSBkNr6ATf5Lv7nZmwyLjb5lc4xuXLXvtjFz/syatKC5kDsDx/Q5DMxfYFrfcbIU0lvJfx28Ondhf6BTQ2eCPFGMo+m6samo0inKxF6Um+H5EE7x9587azHOOA0+AKyMEMImpTyCKkHEcHVX; 25:lv81JbUQIX9dU4FE+36roFjpMpvGrvO0L3pH5ncRG80FJHt6i4DU9ipGy0IaLliRV6xo5/QhvR1Jtq3FQGXmG/g5KMmiZp/VTl+YKZNWsQhrc0ficnma13jb0o8N0w+1aykZ1k9gfT3kY5GOMcBy2lqp0Z8fNEq9e7/N3o8mbepEobAkorCei9OxT++ZIUFuBE60SNXDPrIkMGr9tN8KhAor1Wr/iEVcCUevPLseTFzonHdoVPbrgWRUrBpGrbs1HtIuNVgjPrk9HZ9sOFIOGup1E2xtNeq3b1InroD0Mn0EYLYAVpbIhcuR69Cp5IydDjtCtwB0wM2O2XGB5ZMWXQ==; 31:OSzH65Ee6k+JrFnQmcz9yp+ri6S2p8ojkirWSgZAY8VmR61+iZEnHMVRSPvkCtkoYbM/wWEwikh31awXg+9w8d9AvX5WmPGmSiWZeoaESYcjrzqr+3MhVjLQmJ2v/yltVmo1j8xhYMQItVJrinhSG2DpAd4hXouUaRbrQN9AcVTlO3maLzgukybif1b725FBObOBgNqPBijtwZjuxEk1laALiejwmmiUpkGjP+jD63k= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:8QAgcybsqsKXEFxVISo5PNrxC6fM840/RKJOgA06alm86v92Dh4hTCB3sHsgxrQ9U5UNvQDCYewQanxLQ36rnDzXLbLb0vkJQzxMmk9ehUCJMWxQi4LC1KdhCv3k/sMbph/NRpT1I1adFP43zx5yowYu43zsbZiBoF0ws6ciWs8kpeN+nsblBpJpRpafAiGuUmlUJwd2/2V3EqraYPKpna1EhtFCVTKJ1N31ApuPXo0km++q2MHYCZ3islVi3QPWnvtGga1DBgecuZr7MPa6IZsyszq+cD3HccvRQJ/f9wRA0ovi5JdzW0y7HlRW4CibkUAm7PLlfbhIcuME1oFxOsLYqccwJrgdh3iT6G4RNEzHljKPSNB3hkoR0IKBfpUTLNjtp/pgjGrbDMj/iBkBnp0VT+CYlZdijhbGQUC7hB89zmXw37b8R2mCiEVHuaNY1GrTYttAjTf/HHfOjJHNc48in+jzjRRyG8XZweL8OeVTp5AfU5mK7ufcdNPSkBBg; 4:XPSomTbsN4X/BdnpKj9x2pQd2wu0BsM9mmWsiDOA58Fm/hba18JOFzAFjCE3zrWnWQSSWyQ1OPfdWzKhKKe2OODoMcvTmK420QMyoou7etc7ZIjlI1p+lAQicJIa7i7CPlS5n2f8q+ykHszZt58PdDArkejR9Nno07rBU/II1zN6vr0s7PRR3r+2M/PkwR9HF8a0qsdoCXiBZpVzyY44s9a+ebD3SCrKk7QL/+zS6zauHHxZv+eiZTXGUOqkm4OonRSEjPvlpO99j01mnPdwSTUJtbfQCCZKifp4G8/1gN+nZBxugL+ZpnqktGatjc2U 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:8f/aoQYjDQ3A8xHqRthNlELyboNGX0pOS+hNBmE2Y?= mnb/JTzKzWDUB6W4jRAYDU4TiWPWKv+w3K53AVqftgTbk9BhJOUlXRQJPn7xSbnefmqMwKAtEvuO+ic2EEcr/yLL1s5keJoagnp3TiH2tCsuS7daV7Q4X6eKGeCvjEnjvgD7I1zdrrF2IGgXAHonNUVPeRbZg+ecVtE2rdmNeiUZR0O20aL2g318Fe+bxZSEYfP28/9BUfsMM0YwZHEm82bSKhEOFg54TDvOz707VBQsl1UNwpPQ75HacbAJozDtRdQLR9/wlLDz1Ab1su6vZihyjTqnjuOZYFYXe2h4EseYrDyESdUMKqQIP2Hy1d/TFcIWW8x7+5ljas4hV4os44gIRnfN8MNgVppBKgBv2QS9p37rfzOznZ3eQYhDc8QLdHVv9nfhqmEu525C4OlXEpxJn+JZ4v08JWZfhIiRLXixjk5ZkN4I3CmMD22vzVxJyiJvJ13zoDSzwG5KCbc8zS5gZg2JBjgGMtSgZ3FZ6Lvo4SieAf6rRClQg1QuzjnRYQDwIkPTXOlSYa59HNAu5nUlg+d6b0ZLRoAh9qHqO9VrRL70hEUWRiMfy/3ILFI/rrhaLaPvYIzTuGDqqNf6xqfFIgc6hDZPfBILvOJmuQr+JJZuaImJZwFHAOojiy2R1vEAfyXa7YM6omxVFy0RMpcde7OdN16IXB8uDXI8EEzKIjwHnUazE2HOZ9u//ngRKUrnqRLpL6vpUW2RTFxGUbZJ/hWVysFkujybpGN2Jmys2JtNRcbVlSxwVEkyGJsGPDeMw5hsEtvU0DO9GjI+Pa6JhfIB6oUmjMxhwYkVIN2EYH5qWaZ4fi7Vw47CwVwhuo8ls5ckoB/pUQ1xqwcYL+WzrOizlaLMIEOEe5QIoBHUz6GryD1s/z4yVenPN8UYJjud24aZEaUGPzyDOAbO+Ago8XPrHt68PuDOUlkSJfim4WloBF6eURUxy8/ZkQPY5E2NYd/zzfexsCrAZX+oHeOyl7SO6XT1dTCQi0R0bUifTNUKoKU0yNUHFoNYWl0+IhZeBwTpnlA7NgZM4P9oxYTx81Qijh5lfCf/k3z45QJCNSeFwzoLgvd7e/94y5Iu0dVDaqNBKA6fr6xMNd+3dC1kr43Ndj9cajo6GuNb5RUI60iJ6oda53oaxRxYf8qE4lPgoyAkkwoPcvfqNkE5flL72POuzJWAwFpg8U2+rf53Dr/bR5mm/KsMyyyS58RhK/pGmORar8ZHzFtPfUd0j86qvlfowo+rM8jpbrRmLvq++f/bc3BLJfkhpA2dbUc7zE= X-Microsoft-Antispam-Message-Info: tugfAJnRHkrTaQRtjf+F4lP/jgUAExgfZsdn4Y6mFV6Gg+UIGrmytc6ZSG860MlacRdA7zHmpOPqmdCzlzCx7mlOL0I8pPGzgKSgyEmsDnP9SjsNr5uodBaAWA4/op8J/Or1EDG/s4OjMC7hXlbM6X6r9OjoRbsrWV0GMyZmegaNR6LVX2eXSOZ0P4WI9oEa X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:yKGU4JgIYbStHFmzFvd8MpWC3t7+avyTlJS/LxGQOux6zECEWzZH5aj275DGQAnx40Ib0FGx93IYDUzEkyem3kf/jmdwDbjac4s8UuJUl+lyCDrM9xa9DLSoUp5FuQx/xamej21LK9pqQi7uIM9iNvvAuG4wnH0au2nnvbWBhyPmg+6jJSuCAKxbQ71bOhhLMBO7jI8dtbMXK1AESXLWxGIJ9YL7q5qaKANjKHWjJ7lu2nB9TbMO+bLr7li8aUs7JaFix/O80O1GFD7X9ZORMYzfGsuwMNYhVFHbxNQl3D72EUUJtWyGRL4kCymXXV4dznbHq1KSPXJLqnE+c7dfzY6pfTBnaZBWlc9Amy7e18c=; 5:FgNUYZJskEf3+ZLDk9EAbCJNFXd5PuuBEZLoPXzeLzuxF4csgmMURBY+CKD0cFQcel7BTw1kuox5K6aGS4mxBuVYV/9OhOIP3Jrh5G/7w7gt01hTzPf1pujd2qy+1VkJtchs7+biFduNo3RygFXHEhNW5AM4HQa9+oCg4cML9MA=; 24:FdukwlpXRmh1MUJ7gig/3SjgulnPR7X7RoPifQSLbREr7Bw7gnRI+sjxjzRlbO2/DMfCbfLxUrHaFCRZ/tiEuxgXXrN3vwTn6b5VCqh6K8Y=; 7:7dr6JZdoALSbGVKn8uyIX0Zm2Zyjl5SVQkRfSD6K7duEGRaeGNvYS9URGpSohgeP++mjDiE38FkdfHUoE47Me3MhrH85MRFTSgOyrnU7Zn/FSR1ZSOVTf2do0m7c9i87eH9NXkTN3sQMCztvChtMGYX4vwOw1Uju6zSRabLtX3GUGPmPKrjLxZTUPxDXQhzfw6SlCNYtXzyiAyYi9xQcgtmMHVbNk0fR30nKGXVVTn7ZIVPvz5ZHDt52MSjiM8WF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:IXgjtb/qniPTwRK9LSDSnINpSOSwAm6uKQzB7Xxm9z04V0AcLBTF7y+fl4yUjZVIjxTB4tiAjP9FPQfxW1K+W+f5ad3qXrP0WLMSmrJzSyJDIrefttJnWtXjsB9ECcf1txcU4B32jpqt2T7bwOEjGI3C6iLy4ETYBBUTMfM7t/OA1be4aRsVU5XrQIrc+D4247RV/c5mfiYqCi+9n5wP71Yd14OKfidsgIyjBbp4E9JsMcLtfYABNjA1ZS0lfiEb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:50.6435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f543eb8d-4af8-43a3-e489-08d584f3163f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.89 Subject: [Qemu-devel] [PATCH v12 11/28] sev/i386: add command to initialize the memory encryption context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When memory encryption is enabled, KVM_SEV_INIT command is used to initialize the platform. The command loads the SEV related persistent data from non-volatile storage and initializes the platform context. This command should be first issued before invoking any other guest commands provided by the SEV firmware. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- accel/kvm/kvm-all.c | 16 ++++ include/sysemu/sev.h | 22 +++++ stubs/Makefile.objs | 1 + stubs/sev.c | 21 +++++ target/i386/Makefile.objs | 2 +- target/i386/monitor.c | 11 ++- target/i386/sev-stub.c | 41 +++++++++ target/i386/sev.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 24 +++++ target/i386/trace-events | 3 + 10 files changed, 362 insertions(+), 3 deletions(-) create mode 100644 include/sysemu/sev.h create mode 100644 stubs/sev.c create mode 100644 target/i386/sev-stub.c diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index b91fcb7160d3..a6473522be11 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -38,6 +38,7 @@ #include "qemu/event_notifier.h" #include "trace.h" #include "hw/irq.h" +#include "sysemu/sev.h" #include "hw/boards.h" @@ -103,6 +104,9 @@ struct KVMState #endif KVMMemoryListener memory_listener; QLIST_HEAD(, KVMParkedVcpu) kvm_parked_vcpus; + + /* memory encryption */ + void *memcrypt_handle; }; KVMState *kvm_state; @@ -1636,6 +1640,18 @@ static int kvm_init(MachineState *ms) kvm_state = s; + /* + * if memory encryption object is specified then initialize the memory + * encryption context. + */ + if (ms->memory_encryption) { + kvm_state->memcrypt_handle = sev_guest_init(ms->memory_encryption); + if (!kvm_state->memcrypt_handle) { + ret = -1; + goto err; + } + } + ret = kvm_arch_init(ms, s); if (ret < 0) { goto err; diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h new file mode 100644 index 000000000000..3f6a26e92789 --- /dev/null +++ b/include/sysemu/sev.h @@ -0,0 +1,22 @@ +/* + * QEMU Secure Encrypted Virutualization (SEV) support + * + * Copyright: Advanced Micro Devices, 2016-2018 + * + * Authors: + * Brijesh Singh + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef QEMU_SEV_H +#define QEMU_SEV_H + +#include "sysemu/kvm.h" + +void *sev_guest_init(const char *id); +int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len); +void sev_set_debug_ops(void *handle, MemoryRegion *mr); +#endif diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 2d59d8409162..31b36fdfdb88 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -43,3 +43,4 @@ stub-obj-y += xen-common.o stub-obj-y += xen-hvm.o stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o +stub-obj-y += sev.o diff --git a/stubs/sev.c b/stubs/sev.c new file mode 100644 index 000000000000..4a5cc5569e5f --- /dev/null +++ b/stubs/sev.c @@ -0,0 +1,21 @@ +/* + * QEMU SEV stub + * + * Copyright Advanced Micro Devices 2018 + * + * Authors: + * Brijesh Singh + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "sysemu/sev.h" + +void *sev_guest_init(const char *id) +{ + return NULL; +} diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs index 76aeaeae2750..741cb080eb17 100644 --- a/target/i386/Makefile.objs +++ b/target/i386/Makefile.objs @@ -5,7 +5,7 @@ obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o mpx_helper.o obj-$(CONFIG_TCG) += seg_helper.o smm_helper.o svm_helper.o obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o obj-$(CONFIG_KVM) += kvm.o hyperv.o sev.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o sev-stub.o # HAX support ifdef CONFIG_WIN32 obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 27b99adf395b..29de61996371 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -670,6 +670,13 @@ void hmp_info_io_apic(Monitor *mon, const QDict *qdict) SevInfo *qmp_query_sev(Error **errp) { - error_setg(errp, "SEV feature is not available"); - return NULL; + SevInfo *info; + + info = sev_get_info(); + if (!info) { + error_setg(errp, "SEV feature is not available"); + return NULL; + } + + return info; } diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c new file mode 100644 index 000000000000..c86d8c139237 --- /dev/null +++ b/target/i386/sev-stub.c @@ -0,0 +1,41 @@ +/* + * QEMU SEV stub + * + * Copyright Advanced Micro Devices 2018 + * + * Authors: + * Brijesh Singh + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "sev_i386.h" + +SevInfo *sev_get_info(void) +{ + return NULL; +} + +bool sev_enabled(void) +{ + return false; +} + +uint64_t sev_get_me_mask(void) +{ + return ~0; +} + +uint32_t sev_get_cbit_position(void) +{ + return 0; +} + +uint32_t sev_get_reduced_phys_bits(void) +{ + return 0; +} diff --git a/target/i386/sev.c b/target/i386/sev.c index ab42e4a456d2..288612e1aa46 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -11,6 +11,11 @@ * */ +#include +#include + +#include + #include "qemu/osdep.h" #include "qapi/error.h" #include "qom/object_interfaces.h" @@ -18,10 +23,88 @@ #include "sysemu/kvm.h" #include "sev_i386.h" #include "sysemu/sysemu.h" +#include "trace.h" #define DEFAULT_GUEST_POLICY 0x1 /* disable debug */ #define DEFAULT_SEV_DEVICE "/dev/sev" +static SEVState *sev_state; + +static const char *const sev_fw_errlist[] = { + "", + "Platform state is invalid", + "Guest state is invalid", + "Platform configuration is invalid", + "Buffer too small", + "Platform is already owned", + "Certificate is invalid", + "Policy is not allowed", + "Guest is not active", + "Invalid address", + "Bad signature", + "Bad measurement", + "Asid is already owned", + "Invalid ASID", + "WBINVD is required", + "DF_FLUSH is required", + "Guest handle is invalid", + "Invalid command", + "Guest is active", + "Hardware error", + "Hardware unsafe", + "Feature not supported", + "Invalid parameter" +}; + +#define SEV_FW_MAX_ERROR ARRAY_SIZE(sev_fw_errlist) + +static int +sev_ioctl(int fd, int cmd, void *data, int *error) +{ + int r; + struct kvm_sev_cmd input; + + memset(&input, 0x0, sizeof(input)); + + input.id = cmd; + input.sev_fd = fd; + input.data = (__u64)data; + + r = kvm_vm_ioctl(kvm_state, KVM_MEMORY_ENCRYPT_OP, &input); + + if (error) { + *error = input.error; + } + + return r; +} + +static int +sev_platform_ioctl(int fd, int cmd, void *data, int *error) +{ + int r; + struct sev_issue_cmd arg; + + arg.cmd = cmd; + arg.data = (unsigned long)data; + r = ioctl(fd, SEV_ISSUE_CMD, &arg); + if (error) { + *error = arg.error; + } + + return r; +} + +static const char * +fw_error_to_str(int code) +{ + if (code >= SEV_FW_MAX_ERROR) { + return "unknown error"; + } + + return sev_fw_errlist[code]; +} + static void qsev_guest_finalize(Object *obj) { @@ -219,6 +302,147 @@ static const TypeInfo qsev_guest_info = { } }; +static QSevGuestInfo * +lookup_sev_guest_info(const char *id) +{ + Object *obj; + QSevGuestInfo *info; + + obj = object_resolve_path_component(object_get_objects_root(), id); + if (!obj) { + return NULL; + } + + info = (QSevGuestInfo *) + object_dynamic_cast(obj, TYPE_QSEV_GUEST_INFO); + if (!info) { + return NULL; + } + + return info; +} + +bool +sev_enabled(void) +{ + return sev_state ? true : false; +} + +uint64_t +sev_get_me_mask(void) +{ + return sev_state ? sev_state->me_mask : ~0; +} + +uint32_t +sev_get_cbit_position(void) +{ + return sev_state ? sev_state->cbitpos : 0; +} + +uint32_t +sev_get_reduced_phys_bits(void) +{ + return sev_state ? sev_state->reduced_phys_bits : 0; +} + +SevInfo * +sev_get_info(void) +{ + SevInfo *info; + + info = g_new0(SevInfo, 1); + info->enabled = sev_state ? true : false; + + if (info->enabled) { + info->api_major = sev_state->api_major; + info->api_minor = sev_state->api_minor; + info->build_id = sev_state->build_id; + info->policy = sev_state->policy; + info->state = sev_state->state; + info->handle = sev_state->handle; + } + + return info; +} + +void * +sev_guest_init(const char *id) +{ + SEVState *s; + char *devname; + int ret, fw_error; + uint32_t ebx; + uint32_t host_cbitpos; + struct sev_user_data_status status = {}; + + s = g_new0(SEVState, 1); + s->sev_info = lookup_sev_guest_info(id); + if (!s->sev_info) { + error_report("%s: '%s' is not a valid '%s' object", + __func__, id, TYPE_QSEV_GUEST_INFO); + goto err; + } + + sev_state = s; + s->state = SEV_STATE_UNINIT; + + host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL); + host_cbitpos = ebx & 0x3f; + + s->cbitpos = object_property_get_int(OBJECT(s->sev_info), "cbitpos", NULL); + if (host_cbitpos != s->cbitpos) { + error_report("%s: cbitpos check failed, host '%d' requested '%d'", + __func__, host_cbitpos, s->cbitpos); + goto err; + } + + s->reduced_phys_bits = object_property_get_int(OBJECT(s->sev_info), + "reduced-phys-bits", NULL); + if (s->reduced_phys_bits < 1) { + error_report("%s: reduced_phys_bits check failed, it should be >=1," + "' requested '%d'", __func__, s->reduced_phys_bits); + goto err; + } + + s->me_mask = ~(1UL << s->cbitpos); + + devname = object_property_get_str(OBJECT(s->sev_info), "sev-device", NULL); + s->sev_fd = open(devname, O_RDWR); + if (s->sev_fd < 0) { + error_report("%s: Failed to open %s '%s'", __func__, + devname, strerror(errno)); + goto err; + } + g_free(devname); + + ret = sev_platform_ioctl(s->sev_fd, SEV_PLATFORM_STATUS, &status, + &fw_error); + if (ret) { + error_report("%s: failed to get platform status ret=%d" + "fw_error='%d: %s'", __func__, ret, fw_error, + fw_error_to_str(fw_error)); + goto err; + } + s->build_id = status.build; + s->api_major = status.api_major; + s->api_minor = status.api_minor; + + trace_kvm_sev_init(); + ret = sev_ioctl(s->sev_fd, KVM_SEV_INIT, NULL, &fw_error); + if (ret) { + error_report("%s: failed to initialize ret=%d fw_error=%d '%s'", + __func__, ret, fw_error, fw_error_to_str(fw_error)); + goto err; + } + + return s; +err: + g_free(sev_state); + sev_state = NULL; + return NULL; +} + static void sev_register_types(void) { diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index caf879c3b874..924cebcab02d 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -17,7 +17,9 @@ #include "qom/object.h" #include "qapi/error.h" #include "sysemu/kvm.h" +#include "sysemu/sev.h" #include "qemu/error-report.h" +#include "qapi/qapi-commands-misc.h" #define SEV_POLICY_NODBG 0x1 #define SEV_POLICY_NOKS 0x2 @@ -30,6 +32,12 @@ #define QSEV_GUEST_INFO(obj) \ OBJECT_CHECK(QSevGuestInfo, (obj), TYPE_QSEV_GUEST_INFO) +extern bool sev_enabled(void); +extern uint64_t sev_get_me_mask(void); +extern SevInfo *sev_get_info(void); +extern uint32_t sev_get_cbit_position(void); +extern uint32_t sev_get_reduced_phys_bits(void); + typedef struct QSevGuestInfo QSevGuestInfo; typedef struct QSevGuestInfoClass QSevGuestInfoClass; @@ -58,4 +66,20 @@ struct QSevGuestInfoClass { ObjectClass parent_class; }; +struct SEVState { + QSevGuestInfo *sev_info; + uint8_t api_major; + uint8_t api_minor; + uint8_t build_id; + uint32_t policy; + uint64_t me_mask; + uint32_t cbitpos; + uint32_t reduced_phys_bits; + uint32_t handle; + int sev_fd; + SevState state; +}; + +typedef struct SEVState SEVState; + #endif diff --git a/target/i386/trace-events b/target/i386/trace-events index 3153fd445488..797b716751b7 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -5,3 +5,6 @@ kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" kvm_x86_add_msi_route(int virq) "Adding route entry for virq %d" kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d" kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" + +# target/i386/sev.c +kvm_sev_init(void) "" From patchwork Thu Mar 8 12:48:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="ZVG3MJME"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrRF20YJz9sb1 for ; Fri, 9 Mar 2018 00:08:09 +1100 (AEDT) Received: from localhost ([::1]:38555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvHD-0003wC-20 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:08:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzi-0005EJ-0i for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuze-00041o-1w for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:02 -0500 Received: from mail-cys01nam02on0089.outbound.protection.outlook.com ([104.47.37.89]:10504 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzd-00040H-PX for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49: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=/Rz9enuW1etqMNl+9YKSzlHuH5iQ5JrxodZSclIa3oE=; b=ZVG3MJMEbqlBt8qRHJb0gHQ159Hd03hIUhAhZqXI7h/Ia/fKUX6BF5HpiT5Sw/BRR2vXDu//w5yFY3Cl8JQAYujyXzfABDYnNZSDyCMlf1oS8QJx3QNOxvA6RxsbjdDbIWvnuCiNCtfkuqM3G6Jcuc1mEOo7xhWrbWjGaodcLi4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:53 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:45 -0600 Message-Id: <20180308124901.83533-13-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c6f50558-0009-4789-71c5-08d584f317b1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:kL47YeAhz4NvyBRpNaQLS9t2hyupLzVQW0WD0RsBi+fBIRCBOXNK37MtrS4DEGb8MUBKZ8iVZ79VzbUy2JKsk6xC8omkielkPFU2ui5qNyan4uOPcarWolKS5gNkLstT50BXFz1a09y+fEjymeQzYaVi4JlGpHfuKqQZsbwtqO+nJdlJjCET6juCWftI/W2XXACBNpTG8d1UeWedvqQdKFK/KWti1mTsDFHAbdD/lRewpKoHNjonHZt3Q68qS2go; 25:jy6a2BXaB5sEHHY6vnXt1VtgCAiwfQ1gRNx/US5HUUs7iqf6MjBuJttyM2jKJ39huuoxrP1x9OR3PtsbN8skBbiLMvzm4/MfQ8KJi6iAB4B5u1/wzfBBOlNLmShMNcM551OMovdr/QhcauT9yqDGWUthJeLxrmj71MeK91Rcl//v2rIHXxsQlsPAaLo6dlri8U9EEFueYDcLwa5n529xnDpm79qTSeRm9Z6eTU4EdqJs+pZQCA5Bs0c1V5kboE03GnWCAugmFdxlKgnHASIfOeBSfU3gIOV8TpV2Ie+rd4rp8zJUObi0nrQVvjVDI2ZTbFhzIQ5uiv81SpLOYak2FQ==; 31:gHqbbMfv8MG/hVWbfLL7d23YT2sWyvCIgCZ42XBiDzUgES1t0gKrlWsrQcujEdrsEGGiDjA4UnFl8sWzu65k6yDLuT1x04Cieeq0hhaFTrU6tmg3JfEcuFMjE8Abz261b9kjO0cjWznqFMiPB5ltAKsV4zRwBOaiws6D5gW6cIb5YkCY9JUS5YeXq4PdR/QzBSLHS0URdMz1Up7Aic3M+R3fmKE28QSbgb9ArDHF2d0= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:+t66UcqGGS9z4UpRXKqBksFpNByMPNe4n4lHL7O2Ezcd1NTgxLguTWIU1aV7s7MbDmwkS7Zra8gR/m6+AFGU7NN6EeSYmSPGWzNSed6bcQgT391WX6KG+UjPlRm1fOfP1bhdezr1d3EUfgkKJBu15gsiEPhr3+5lx45msveMJqD8chlfEUjUkWFJlnO+TWrVpJuAL98435hjZ/xyhN67fgJLLBy5SrtoN3WNPzCie6YUJI/Y/eKIzERhrvloonnbxN0YGqf4fFWCWdz5DmMx0pCHIeo4IIAjaeHQq6kER+fmR26uWMiq+u5WoFnmwJnyTQOaALGoOb6y6jFo+7oGPt0UKkGcuyhE/V+CJOz8kfzY1vmJBVP55zNO/qKH2bZpsv+zsERLH0BO095t4XjKFYSSW0RBvunyaJMlXQ61Cmh4M3DJo7VFAdP2EqhcRrB+Jvb+ISHV0481Oycg+RoVkFjN6Pt2yY/W4U3ptKCWXn+Z+D4OslNNzYg3w4rLlp0w; 4:4v4ix92dEV/pGApsY6S9WPQQl0kN1gbcsjIMTTlkCY+CiH3DIPoopz5v4DMzjAY6QxuMfPXiFNX4ehPNdGPWEg+Ds2j706eS+mFAc4HsCTk3zXQI+Vk1nwF5OTL8pLT1P4WElGC/7hGa7FYuX8dUPmEB2WFY9YjxJibDpGkKYZ2lSt0uRmerB2JnGCA3g7uU3tT2chjFbLsasJYHrc5E21blOfVGtZbhtSRbvX6LzlPniJcPRZtDHgWY6jmncIhRZ8L/eIG19Ytt2Kxs4PsbWuWtZix+4u7ZgpqsAAt+QifRxBfxYtMXl33Aa2f9kMK1 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:FH7JxRJO/KGzutDMJZKntp/q/sNZ0rW1lwA07iTM5?= fDQYCEM4fT2gMCWdn7Dzq416dEXyg1Hvituc8NTNzmB+C0P9GVXfZKZaLUiD4qAXljOfT5yqLAb5dptypH9WacihnfIRWvgzQbzW2t6wEL93O6ky6hAYrOUWdmlpWIg6v3YSp9PuRAKPXDncLp5TV9BMFy78k4hWRLDfLRQ8glfm4GVw7QvBd6ztmYz8LhH7cSNrLzHUtOiDG/uPoWqaPVOYGdXw0xGUEaqR+ov9n89RgXxCNn9qsKJ2+PIZm/0DJhRJ4ypUr9GU0dFJLu5kuHro4fNWgCXXMenJqOjFCLsmRJHviG8nDcqSfKoBLRXljzsH/eSu0BBy8Mpb8091AEOfz5kxEaBu7+dJTGXYyrtmhojOKO5ugeBNejXlRM/CyU4vMmEIHoc7aAXAJSeB2646OON2vBFRy0c4G/Y/1CMaWqQTa43fkn0mKdDud/ssmgk0FDAgKjTmZ5L+zXN5Qf66VIUu8jkWVApyJt4nSC+9ySwmznOJMaozBHTh1HT+Nbqv45QY4HGtwR3fyH6ZSfPaGqD+zFyRScV0JpkluKhuylTe0HUJApzDXd1nVBnI1qpz0kAmsIR1GVa80Xj83Kb1LO2AAeOIZBoracSS3+S9fGxh64psV28WUPUnUgIXlsutgHdd5/0icao3+bGjJOHjMiAYK1uYtrTOnUfegrxJD+6KfrV49D6fpcqGasQDLdsfoRZpWcFjTm2IucOynN1aekN2IBTcOBM6SlzfWITRfamhb+gz/80kCNuPhlJqZrcpToQ4CH38oM9/FUtrkPtnOZ4tj2xA4942cg3ERihYMnoLlIskl6yV02EAnc9wm8N2rVsZxzJYz1FFQTD9GyCl/0frwS+aGseO5Kz6jjL4vbOzDc5KYru1JDv0uF3yGDWE/Mywx1ZiwxwsIB4fHLRk/8ehuBSdsoQ26Z75K36QwmGaF9HdXxFNvHv51qquOW3YcJ7BZjGprFbEX89xUf3RvNEClHVNSsstLJcAZj8cZEh1MyaTcT7CoD26sr6AIBrC4aPx9XsrPVuS2kJ6E2eRvwZgrRlsxF6v25pR/j13QfoDxvbBZLn1VBybU3kExbINLMBGteCkFtpeziuO3HCBZSJ3gvbh1c0OpkUvBTPmbOlEMD6cLFBY0PPrKSAOdMrD6SHmrpLkNZr2MdVyttZuxDu5MP+NPQW03u9fy6bQLO0rLhcPr4MQRz2AZiSFDffz4El4SJSUTqPFQs4jZo6NhRmcJb/q7N92mIrmcPI+W5EfAvbNshKqOA2dVKxl7k= X-Microsoft-Antispam-Message-Info: 6MAWHQgcVt1ZDAoPzeazZY2mN10xX24vCuV27de0jVx8nhmyRhSk1Q7pgKgeXKQMFoZgIIwx6ndvAA2bSurQRYwrSK9sNr7T/tp2hTrihnmbpu5JHzwvXoeegOptswrbjkmphSqiTfvwDfdDwWe9mm1MhlPXcmbx8HR0jO8iIvkGU0l0s/h6WkTIaFmKNZba X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:lh9xSQDGzUdVwaollWAHqHcIdTRTstJHRTbii2D2K5rdNHdpU4KvLzMFPEEPv4OMdHSqZPbFDnXZYnbptMtHLWcScqWRous5MD/te07d5fJjfzC56kJiZbgfBusixvp1TOgi6R4q5Mni3/B5MPxqI10mcUzPXXWLa872mFKQfGpxl8kotik4QeD2K+QnN6syH52kL5uQEOaEGkHV4zwsSjEEZ7cHnQE5yJ2ATe0Wo+4AG0CCtrM2ACTz3A6JPkR3/rSI/A6qGPUYxGWSgvSRwMhPym0XLHKPIpHhFt9TGp6gErHMe5em8HrTU152VzRAoX12QBV+t65Udv/qfleAtP1s+OK5qU3YQRgWrb53Clw=; 5:PpSjGVrnJVIApAmPYTbGTQGe2LdVqL19Zn7wdAPWU1Qm1gCdOqj+W50ItLGixk/8ivuljjJ6iL1kesvAl5Zigx1ucr6yh6cdKF7qjnIG4/3Rdrrbp206iHmmy73XRo1xGSZTm16g/QYo1fh0Sf65lALpeZM6V/iNfUefcTvUlNE=; 24:pQvAds/p/rjFPu7d3A9A0lR/PTYINIR7hDpVRaa1xK7EKcD0g1ZdydJAxe9A8biLC2twVTrlQF6lhGjd/FCl9sDPI3Ltv0MjBokPz8lcpvA=; 7:QAPL3Fvjmq06s01C6rGRCri/P0xZydeMM2zxbFf3BZ++/LfrNmQHCCb/5Kp0njHeMiBKi4PkePliCwxZJii5wjRWI5cnBS6mHucgA9EmtskEcXnEYr3teqBUtFBGHhmUqNjRUiKdIIwBR6qksAlHua7jBqoA6RDfm0UcUeXWX8v2OUy3VXsCm+m8MWcV97QEbNj7qy6qGF6kmSA45hPS8xVupH45/YwYeu3RbAbyIDgg2RKHicP7YazMo1sdOM7O SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:HzdDXgIn2Heb1i1IEyEHCwuojf7AkVZTOQcomXM6u2enYExwemU7Sgq8sd0dOSBvj7DgAZvuGEEeQNQJTHzm0YHaWaLUHna/JguRmNihCMLOuT7aLB8y9F21iU4DWgW2WGxFbDsEdy6+iYptSExtW80DTKJOSu+K/ZI+Sy0W+gMKJ99GxxmcxMQLNVg0hLaMBq5wQ1uWzcSoFTGBJOWrcbshsidZ2qYcHVfa9nm54qjS6p74glx8j4iug7Xr9SGW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:53.1123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6f50558-0009-4789-71c5-08d584f317b1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.89 Subject: [Qemu-devel] [PATCH v12 12/28] sev/i386: register the guest memory range which may contain encrypted data X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When SEV is enabled, the hardware encryption engine uses a tweak such that the two identical plaintext at different location will have a different ciphertexts. So swapping or moving a ciphertexts of two guest pages will not result in plaintexts being swapped. Hence relocating a physical backing pages of the SEV guest will require some additional steps in KVM driver. The KVM_MEMORY_ENCRYPT_{UN,}REG_REGION ioctl can be used to register/unregister the guest memory region which may contain the encrypted data. KVM driver will internally handle the relocating physical backing pages of registered memory regions. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/sev.c | 42 ++++++++++++++++++++++++++++++++++++++++++ target/i386/trace-events | 2 ++ 2 files changed, 44 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 288612e1aa46..4f85035d5203 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -105,6 +105,46 @@ fw_error_to_str(int code) return sev_fw_errlist[code]; } +static void +sev_ram_block_added(RAMBlockNotifier *n, void *host, size_t size) +{ + int r; + struct kvm_enc_region range; + + range.addr = (__u64)host; + range.size = size; + + trace_kvm_memcrypt_register_region(host, size); + r = kvm_vm_ioctl(kvm_state, KVM_MEMORY_ENCRYPT_REG_REGION, &range); + if (r) { + error_report("%s: failed to register region (%p+%#lx) error '%s'", + __func__, host, size, strerror(errno)); + exit(1); + } +} + +static void +sev_ram_block_removed(RAMBlockNotifier *n, void *host, size_t size) +{ + int r; + struct kvm_enc_region range; + + range.addr = (__u64)host; + range.size = size; + + trace_kvm_memcrypt_unregister_region(host, size); + r = kvm_vm_ioctl(kvm_state, KVM_MEMORY_ENCRYPT_UNREG_REGION, &range); + if (r) { + error_report("%s: failed to unregister region (%p+%#lx)", + __func__, host, size); + } +} + +static struct RAMBlockNotifier sev_ram_notifier = { + .ram_block_added = sev_ram_block_added, + .ram_block_removed = sev_ram_block_removed, +}; + static void qsev_guest_finalize(Object *obj) { @@ -436,6 +476,8 @@ sev_guest_init(const char *id) goto err; } + ram_block_notifier_add(&sev_ram_notifier); + return s; err: g_free(sev_state); diff --git a/target/i386/trace-events b/target/i386/trace-events index 797b716751b7..ffa3d2250425 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -8,3 +8,5 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" # target/i386/sev.c kvm_sev_init(void) "" +kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%lu" +kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu" From patchwork Thu Mar 8 12:48:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="MMOTV7u6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrYz1WH6z9sfb for ; Fri, 9 Mar 2018 00:13:59 +1100 (AEDT) Received: from localhost ([::1]:38662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvMr-0000yR-0E for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:13:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzl-0005Ib-Sz for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzh-00044z-N9 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:05 -0500 Received: from mail-cys01nam02on0045.outbound.protection.outlook.com ([104.47.37.45]:28992 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzh-000449-Er for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:01 -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=MjeXwgp6bmm57CVrc6D8g62a6qwkiOb1n2+Iajbxsns=; b=MMOTV7u6grOSYqpFtkt95JQak6ETdVRi/29JE6Nha2rZZmpv6C6C4qaNNdN6G8LzTWfh9sM5/roGVPajwme5cMDKpa3rHbhnuTerfnpLBTb1Y/HeB1YXkbRAC6cdfSeXVtx+4tO6CmDBZjSJ15+QP6aZnxXO4AfW4oThtA3CXCU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:55 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:46 -0600 Message-Id: <20180308124901.83533-14-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e774dcbd-377a-4fea-11e2-08d584f31936 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:szCTh0t+jOlxvBRqmo+03To3uKuVPpmAEMmjn9o37GPhc7+uFgTDXl1gzJyPGYHDiZK/0deVfzGidjwI8pTKGndp2JDu47W7njeVTNZkWFbtYD1EtA8trACRyk7Vf5qUMN/6BE//+vlez7t0noqGN2OvYFCsPFXJ0FUtFb1e77t7JCOMVDPe3teEhjE5qZHuS4BlAZLMCbizjh6IcvECQgCHE4jhS4jGMZ/y+M1bHP+QWyD61EwL/J7xCg/uGDiz; 25:EPsrNi24jcKS451JwUBVdDa40nhtlLyuCCENQYmbtGlxbUWIPr1yYvRM7J7uCdI5Pxbsgr+i25wQ7leyvZeDwLblrLBznSIrCIA1ECjTOENI5+iK4NaqQeBSFnzcrBKojYNBLxx35KpPyFoqgf/zELxA0NSXt4F5qPSG0SnqMkGJyq6ZcfjLfFIyENx0XIS+Dx9va3LwnGqHbbMPxtb/ZRXsG/DyrRZTUZl0TjZmzgvTye/X2Gvhq0bJrBfmFT4TsxQIbWjEeanNnYT3D/td+M+LAAJHp6TX+jDXlGnZxjlbpGvtY8E0Yau1dg0WRNoAk6jItsIaRGm1xWceIYDwjg==; 31:kc/taN948J1iwgCrRup+T1qKuIu5QIS+KqQ4ATrECA669DCwYbHSQgGUN1B4pHFGpiWrz/F1i2FRp5SPACE1ay/OtXxySlKbCX1Mjat9eaMvHvjLh1/x0oigpcoDbzEBvIr8TIUxSvm3f4QKAGdDyGiu/HrYUWPAWw4gl13EcDjeLX0mCQajEMNqYiS1JfEWHd3ubNSxpWMJESbS/hi+bMvD6jXi1RBVuRairysmc2c= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:gjgzGpFI8iBX5y7m+t2AMto7Cj1+9YCRzSKpns1N3fXPsXTMnUdH8DiVRSQSO9y7plkY/u/DluPcPgcHD1yGGdUniEyWKdc3zLjKbWoFhtEuymUeuxDCYl8w5hWspOquYR+o5h02UfORogkpga+M78IOL2/iOlGyT/Rxw6ZzIPH/Ky4FXNpRFJkgxjlB9gPL7ctPkqsiaU1koWOZzecnQrFL6goDbylMpLmmv1ufgNy95CqB4cAl0S+PnQp1qiqL1WaeYFV+ytH5osQTqRqV1bvEDThLkB1/FG6HcPL4Xwf3jenly0ExoW/l0dbsTPkM5MV3WDYAto6R4+BLOT1NH9E2AgdimHmJNb9EG02YaGxKpBHBxx/vEcyav7qx5ny+cq5t1nEdN/zwVwzDxzWbZn9zz9IalxM88C7sGBqDwQWmSIlJlZYWm6nzIXyXtq5MqkViJm5eThwUfLWXVtnv3QH+elDaKmlAhA89I/Q181wCkQ8nCJtY1zapIPyhExuo; 4:55YTB7qdeSSskVK3zxxZEMpvmjxOfQ77gzxkdw1C8COJ8dfq9uUQqZboYlHIhnr+s9pGqcuvaNTeAYqr8I8f4VySLSjoqlc1a228ZFBIeJA2vJOcUNaYQhi8TUjMiVYN71jTELSqGTPpVDATVadyDrbS3Z7mtKKFdST36Du8s7c3xVVQwqP0t4wJnJ+IrLzBsDN6X0jtoLFP5jCyAmMFSB2LCGCafdIcxNyNSD5zk8kNOaHF54Mu+k/QK3+EEcEqPWEXGNSoCr1wsVlEWQIsYF3bk9JJ7NtkZ4Ql6tZHoBRfBuUZ8P4ckZQOCXON+rGiKj+nqSCptJaFdlj5b/dCYg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:Cwwx33wZCgWq7BwgQBe2B23cDkUqb6U1bfGklJ9dN?= Xz2trMYroldh8vfHjDpTESiYMFdf8b3lOeSlbdnl2cBjLSV9aQ/TLlVBI9fpSAjmyKe9MlH90cxQeE2sxgPAiw5VSa2OMjiC35KjJZif39h06i2za60BSjqoISLQWTKckDKvyBUKKvJtRrD6vFo+sFd9dOhYRl+OsHVsLVXlekbuELkd5CFj1Joh5iBKhFXM2jDZIh6pxSVWK7z+OUvpZwaXKqlbU3xBUl5mosgTm6n7UXIZdfnkWSznlbSVG+2Pc4+LlxbIW34pqpP+j6hJSo1EPzZVjCzv1RVL1nZm8IuyzhM6s+nbVMGF3Gsdh2+l5DaKPHNnuo4rkNy4YZxPcUtph++CWsUYky2EPI0wOjnFB6G7u4Ah8MINxz1Slg95S5YpVXK8/jh6oNdCE7IxgKzVZ8v4wvrq58Ct1BIfn14kajl1VhkS0E+vbDKXtSqmF4xp0UOdNX9H77Jx0w1LxmataDii5An3PqiheyB4uIAPZsg3sBjujtO5vpznALACxvVsENoOKSa/9LjdAfQtCsXtcFcLzC1rx8KjsI9TmqkO8l1XK2+hwdp1WXWigYdqgsA7hABppG0oiMyUuhpiVtuuZ+w05ByqyGxtNDTbY9560XHG+RiXx1IUZROdYvoNG+/7bgeUMEcgznPOkmDa4zUBu9SdA/Tqe5NENF5J6+pPhumTYcJSAu8QgRBLkHzbYYCP1Ldx6M8tbycHh2Ju/JYTakO/gNyKXaTJDy3WWi2lOJhAD1Y+H9Uy8SbXUCNSX/10tzWF3LnYf7u/85G0gXdEI0dcqz6vzgy1nvSFrBprGaRG+qDV/zVkEBC+qc0sjHvR4FYymLN8gc+78hh6YxJuL3IR6MSEYnN3Hv9PUfU/2vma2xDs8PN16Ujv8bbe0Z7LoMEbQXoi96ztFUKEQLicqrCSPhc1/iR012v3YPNwooNv6/oRMw1tlijMk7A1wqwzloWn6657M37c0Sq3+lZNSuc0/vUX7Q/OlkT8+AXWTd5EmmUrIxms80jS44Ur8EmU1XXDSn9WP2kF9P0ZUWO5Fr1N/i0IZV1+l8cMtxycbgJswoE9Ce7j1pxx869tLIe+F7zUyrBBlPWNu6CJro4obbkWEu/z3FdGhONod7vdg+jvMmr4t6ipcwaIKD2hQiQ8NIfNUFiEE1+kt1dSO/APQAlv9Ur56Lgsk6wUM2lU/Acc8rE9FQB/ZUj+yeG4TEVgoIAZKvvZbERr2smzMs3ptCRTotHqPuZ9K51ssbVQ2ASaJ7ecJ8Y7+8Z+xuSWFs= X-Microsoft-Antispam-Message-Info: mXej/Uvz9LCY7mJXlFiP0Q9fenUYK3TLBe90K/oslc0OSXvIv0N/s9P2SMVnSYhPibrR96It5PjmWzlI/o6tSuHCG+VxkIUgKQbAkIxnyEy6qX9lMPgijSHc0CIYsqFrNNTN8ecMPNEfSJEIzlbOoEo2xtfgyCscgbtmOn1BqwpxjC+yUyanvLYi7hvoeyNu X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:FGsC5Wh9monLZA0o/1fPchU6LgiPaXXVD2FZp9jt8bbU6xRKcqTkej80ZsZylljsSRmEVpkl2tIBuRmuOrqhgkivJTFiifAOGiRLx52gNompH2HuHcaaA4/muLx5lJ7YkQS0/eVz9OxLZeHt5MkhuJa3q3Awryv4DcFQR9OKMU/757v6maoRNY5VE18x1UBcwfsv/P3cAtzKa2p1BebHPpbJ8LepcikuxmGDLCMk0bD6Bjm+LnfRUk2QCheQqqMuDxVEJsXv87DqFs9BJz/MNqJ4b8xXVn0INvOHtUYRy47wrSLOTObfbXyqYGXxdcz5b5Rv5+MFrugNtcsarHsuB8mudoiTv6ctU75uc3XkRWU=; 5:DuCUq+MoCfSZr9I+vOT57ArKE98RV9DjFFPeFssxzQ9LOmWDyHDJyALH4ifkQKytYrKKAAg8bn7q+VV4f4Mh+hUR6NyoZ197PVt8BZqvWxCFo8Ym4z3LOtXOR8XEdHVIRH19gY7QpkQpcxvxcvXXzMTO5VM5EihJl0w8O8VFkLU=; 24:+E5Bntj6pC5cCnE+9+WIkcy/VFCh8VZZzH+QCGN+TdV6zeRoBjdYWjVQ2RkvLdAr0CipEUmhkTl01bQeUA91hjqGsCLSb1/iXnDS6aHZk+s=; 7:6tI2m26VuJgSUHTPmkHT61aAsoZK5lXhV8BhFttnCMLHdSAfslJJH276+wz/wp3K8esEtHyRzjzfWI43SOLHFKPhmki4/AA8y0wvPE+mtqjULOY8i0w0JloVbN11PBit/LP3DfA4jMLDXyfMWUImg6VMfTz1haBhmCyH36Z7CAA2HwUK2Sdto1ZpLDs6iZFhGIdgr9eaEz9Qjg5lBwGFKRqwtb9jrnZEQeyEIv3LDg1stzb+u1Wy2R1hHznyR/RV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:9UST9L+vyRH/DBry7oNZhLeFHUgOumUgE6bbBe9ZJvdvXWJ/cjL8JC2gbGaBGe3/qVoT1zZuv33q+Ap6ao4GCY37SO+FT7Kn3zNze8dgowAb5g4IuD2yCW1Fnv6jFIrbv4CU5H1obnyy1gMgZxX20wRxYcISRFMH2LcRxAkl9pDHkD3OIe57HckHhI0RGqyJVt6PdMGMpFyoMkcg0CTZBHlNWG38HrCSWqnaL/bFHRYS70clQOxYQO2MVR4stgvU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:55.7998 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e774dcbd-377a-4fea-11e2-08d584f31936 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.45 Subject: [Qemu-devel] [PATCH v12 13/28] kvm: introduce memory encryption APIs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Inorder to integerate the Secure Encryption Virtualization (SEV) support add few high-level memory encryption APIs which can be used for encrypting the guest memory region. Cc: Paolo Bonzini Cc: kvm@vger.kernel.org Signed-off-by: Brijesh Singh --- accel/kvm/kvm-all.c | 30 ++++++++++++++++++++++++++++++ accel/stubs/kvm-stub.c | 14 ++++++++++++++ include/sysemu/kvm.h | 25 +++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index a6473522be11..975ba3845234 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -107,6 +107,8 @@ struct KVMState /* memory encryption */ void *memcrypt_handle; + int (*memcrypt_encrypt_data)(void *handle, uint8_t *ptr, uint64_t len); + void (*memcrypt_debug_ops)(void *handle, MemoryRegion *mr); }; KVMState *kvm_state; @@ -142,6 +144,34 @@ int kvm_get_max_memslots(void) return s->nr_slots; } +bool kvm_memcrypt_enabled(void) +{ + if (kvm_state && kvm_state->memcrypt_handle) { + return true; + } + + return false; +} + +int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len) +{ + if (kvm_state->memcrypt_handle && + kvm_state->memcrypt_encrypt_data) { + return kvm_state->memcrypt_encrypt_data(kvm_state->memcrypt_handle, + ptr, len); + } + + return 1; +} + +void kvm_memcrypt_set_debug_ops(MemoryRegion *mr) +{ + if (kvm_state->memcrypt_handle && + kvm_state->memcrypt_debug_ops) { + kvm_state->memcrypt_debug_ops(kvm_state->memcrypt_handle, mr); + } +} + static KVMSlot *kvm_get_free_slot(KVMMemoryListener *kml) { KVMState *s = kvm_state; diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index c964af3e1c97..5739712a67e3 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -105,6 +105,20 @@ int kvm_on_sigbus(int code, void *addr) return 1; } +bool kvm_memcrypt_enabled(void) +{ + return false; +} + +int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len) +{ + return 1; +} + +void kvm_memcrypt_set_debug_ops(MemoryRegion *mr) +{ +} + #ifndef CONFIG_USER_ONLY int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) { diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 85002ac49a54..d69bd1ff2b07 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -231,6 +231,31 @@ int kvm_destroy_vcpu(CPUState *cpu); */ bool kvm_arm_supports_user_irq(void); +/** + * kvm_memcrypt_enabled - return boolean indicating whether memory encryption + * is enabled + * Returns: 1 memory encryption is enabled + * 0 memory encryption is disabled + */ +bool kvm_memcrypt_enabled(void); + +/** + * kvm_memcrypt_encrypt_data: encrypt the memory range + * + * Return: 1 failed to encrypt the range + * 0 succesfully encrypted memory region + */ +int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len); + +/** + * kvm_memcrypt_set_debug_ram_ops: set debug_ram_ops callback + * + * When debug_ram_ops is set, debug access to this memory region will use + * memory encryption APIs. + */ +void kvm_memcrypt_set_debug_ops(MemoryRegion *mr); + + #ifdef NEED_CPU_H #include "cpu.h" From patchwork Thu Mar 8 12:48:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="MV9AfVIf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxr8J5GBgz9shm for ; Thu, 8 Mar 2018 23:55:11 +1100 (AEDT) Received: from localhost ([::1]:38483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv4e-0000zR-8T for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:55:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzn-0005K7-EO for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzj-00046K-8s for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:07 -0500 Received: from mail-cys01nam02on0057.outbound.protection.outlook.com ([104.47.37.57]:36832 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzj-00045m-1k for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:03 -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=kk00fjaCkCd86t3KZ7YoNb7fg7GphPAxjgTr1EqTI7o=; b=MV9AfVIf/UOwrkRosiG6fqDXGPY3pU+ODvAUFFDiTOUdDj7eUYmYwn9c8XCPm3U47RzxRrIAdvtl9Ehm7hK32/AuLXdrM9xL2qn+EoVzXeKJWmMvtGy8n+7K7ovXtj7Vo/HeJXfGrBKydECMWEgX/2lg+GHlg+xojS3yQISUA0E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:58 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:47 -0600 Message-ID: <20180308124901.83533-15-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a88b7171-5b70-4f7b-da68-08d584f31aa2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:wW8S6Y3gFIJq1N+MDeIWguDucDOnINGNwQAp5jMTQqvuakTv1utv0eaXOJ6nkjSYhKhwNnVKw/F6tljgXN+EdGOV811OIftaCcnbVBPD7DUSK3j9daGYo4wTSeHZYeUtP+LbJlINOKHrlj4bBgelJkMeGlW37cYEfyITK0UdTOvkkBjwMxjhhYQBLAZxY+3p4hINg3j+k8cTYmRotDflxzjJU1XJJ/7zvkv299rgBH4ewI4xEjZwMLUpi46GXt0N; 25:KMpYfIMsxOxJa0hNuqEs/q09oV2PCGUlMfHrSu/lcRImJaIDldKCIlKREFIUTHqSSUzmeNGOwGJc3Y1I51i0tGj3PM2MbLgx5pCKcXPxQWf0Dxip1kjVTyyHamyw+b8Bf2XOI2MUIQ0NfHAvtm+VxhJvSFJsblf70LYLVcrjN1+8Tv92Y05nc+/3Lef2CIA2uC6dJpLD+JAvmX5i/ZH2FHP0gdsZdW3BEoJFOWLGria+JkK+3ijKaP2UwAM1jg5OUkzEepfSyCIS48o12FhAoouAxVyjTS1FXS+2RZZMEF6pjCU06KMdVoXGgDLqYABuDXBPuEQ7tn8TQExLxUS5Eg==; 31:/sSOxTOuPvT9I2MT0Uez+o7FIM0QGiuDV+MlmDuh/PHV4Czx8/1OPU2PLCXpnT9JpRekp1P9O1iJq8gEC8vRjhSskkyaguWrQ73muSFEaxYZ5JyFV3vGlcb2Y9khdhAnNLyyRVJz8DAttn+QKWa5HUPI2CM35PNeMtzYNMlphlsaoBAIm/Kt2Tv2sYxaWX8VfOtX3QGazBgL4qnyLq1pBMTDoTeOmsRLxKgqI4QCwFM= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:KiNvOHvUGUOC8gej91UykALyDmjbgBNawzMpTiqMixSA3A0kYGlQFdUgvXEq4chBSSFZq723ceApKl2jd3+WjyyaLpbien2sXZfGcwY8GgoGi0RgU46Vg8vvKf/Z0BjT4+8vOj+A+a9g95dSaA7Weiz+gvVpyyiMRk/qxraRGM62YGYSkO5WrSgSO6iBJVYt8HuXyTjBcTYc/eUhPZSQ+0mo8h0YV79IR/jXw5k+07vaStR1rfsc8IsY7AkLEM6/si3p9jUeznuNcN12emA8PC7bGe8agioV3SYF/5DvfFNpAQ6OG716IkiwPUsdugl/FmKKlmeJmCpuOIhXthhWfRP0gBA02PNDSrqa0vutOq0eNgkA9jpfvCyNlh4IKF88FOHicoI4V1cIrwRDdUPPj8bGevD4pcC/46YaeRJtrFL7/dEOm/fZ8bjxlp1byd1l/kJBcR4gGvuf6/Sya6o9aZaN+gxQfhfe5VoRJjyS9Dsx541N8FiXOnJ3xJPaEq5Y; 4:APWQxOrzuPxaxp1qYP/7V03dSxxJWGcV+dsCFRy7qQjS/wIr9y+KhqAZogF3FP8sIr7RXDrq6aOfqeauCcXhMi3Ea7JmOufg483OovB8UdfzENdx4i5fWvEdiNt6W13/pFJGPbZOAq/6xtzJH9//eXqjv1RBcNuupDapmIfnfMfutDS5soUTu/yNGWiL+P4r76Dc/SdMqk4IblNEMIavH4CoiwZa+aizAGq+t+om2ebzV8PxRbS/Czjgs8v12yOkN1Qp0Y8oI0zGmNCbSdAkjdY6CkLGRFnO6FQjgeqKfPVkat8CX8E2zy8MG787Hchz 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(2870700001)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(7696005)(52116002)(6116002)(16526019)(186003)(26005)(1076002)(8656006)(386003)(23676004)(54906003)(86362001)(575784001)(316002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:BCEbTO6jzPmt8pK10ItuyTUs52PpPHndrOq2d93rs?= iChTIQXOiLT7tKiSFuQA1ktiUoOu/Yh/lZ5H75D15ENtpns/ywzBE8NUYnTuz9YEqKDdc6YbrosbQDuyC89I1umn/MuCz/uNxy8ssl08h40LsE0xBCBLZhvoi3QiuqRLlnkCgRg9LKkysVNSBkkEs7n5Bs1EXjgYRNgBjCbA2oJvIe+XnvjyFBUAndhb/B8rGumdWEeBTdd/Kcp6RvVFvQz5BcBEDah/mQ9GhQoQlut4ITqaayS1q2CK8HWaOhPGUjG+Dze942EjRwNllJbcvp1hSKdjz1bCBHKJz0mdNPyRp41TqNVcDDzS22VlaMZ0y1klE7NWtejkRLIZxk98ju18QyCRHsDEzK4sXnBzfPChlwd0GU7UtJSN6+nKCMNV9bYrEi4Ir1VSGVKy9KalDNz/GJZvOoufeorCqwXajR0zmKv2oj0aOwRYpM3viJYvn//QpipfM0XKm3EMqUKLqMVXLmhlhkiMf72mKK7gcMWfX1bE+EwKVCm1Mq/Mtsuv3mQFlTqdWWu0sK1qEqzbCIirNhfBkDzyoJORhVAOMC3zvpxyU2lNh1IvtkmVn7WFsQltL+mTumBtEqvxDTpwC8iAkDUoIzJnU7RnFx4KAon7acRM8vJ1djS2+iWZPnMvTrNf2q4Y08tgIZX5T2myy7RBdKzV/6kumkjWVnMSpm5cwv8CVeTNQNWomPGv6QqcG641DRcHO+JbK3+Y71oPG4aQdf4X0BM6E68OE6tTTVwA2cTvyN1ck1tVe1+Mq0dI85WTs4zQJR1e/GwHqZjYZBD2Z5MoROUvaGk73PC6YkARmvbgzRdxFJSDfR3OPw0IwUn7Ac1R6N6WU7bwgbySmGeOvw0mPdDz71OPgRgBe/w0+uico+Np0JCOLfvjt8e5vlM82uDYK5q1qbr9gG1ruoqeueFjnI5H1EyjUupYOzlr3F4x7bI0EeQ9Xrh16W+8h1icvyQJB5ubWu9FRoDf0Ih7jWaTQXR/Aw0C2CDtTV6/cJxnkYwlM3SAKcLqGSm+93bo25PqrpYK/7GJcFOnkLmqzrmLGU/l9et8Qq+Wyw5D/Op7dUE9ZbgbdiLj0A6G3tu9xtYzqq4AgBjSingY1ul6SLYa8CtBKHCmrGjqxoNcNZR+q7XsiqZanr9bayHhFzdbei5yMNBwct3IN1kOUTgefHPYtotdXK2LnadWws/QFjZNBhJOnVyruiM8wd9mjQIpZWNj5PjBpVUSjhHoZ/2VgS9i+WUAHEninmti2CJ/Q== X-Microsoft-Antispam-Message-Info: D4jc4zTvfC2FnxC2KJAj2yjd4uBSRKUO57U+OVM7Vc0G97YArXx+doJPBjhqo4RRzzXzxt3i8zGcJ/w+quepYbIAM+IInSGkJOsHrJIblF08nlIw4dqHc7P9+4ziGLd9uu2SJZzUoC3F2n1XKFe5SJh9G+5O4rQcKadqBIeKRNMZZ0XsJTp53I7x0qZA9QVl X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:cYad8iq84q00ZJMGsYmj/tz+poVQZAaBaaTZ3VMRXdfyOr/AhK9HPKsQRVRGihYfZ0bJcpnjpHeMeVf4/kPJnIEfkftSCJmrbdMT2M/Ozk9+tN9y+p6XmwTYmdOgx5O/B7DFbv7khGAE8HpR74UYcO7bKpwAUc6k7OQnXJonokli0KGll2MBd4CuafaMTIPwk3Cn+Gmz70cdqM0TgyhY5JSyMNIm7Ix7QDmWF9D5gkgB+g3hhkRmORrQ6hN5hVgUx3uRytyu+jkbUjcJzKLvHcVJ6x2UUu+Ly7sjZehbYGav5a7Q1KiRWY4HqtTpXS7XsWB0MNT8cQ9qrUn1Stltu+9+SA6Cyo/akMftO3pR8aI=; 5:kyY3ztNOupvkIucHteA02heXi2CkzYi+yU1ftR5u0uN7AFSHQEkX37exbI+BLa8wPybTipnYOAOmvH+a58ryQfwptIzAF2ir3j03Zi9pEePGyv/Q3IYPThGWJ4aLLrMOZo1idd10EDLmx6wfG1CU1JQwAEk+cLvdW+EK0EYhyB4=; 24:0FW3/slDNUwt2KbHdHHA0UpklC6u/6C2zrE3uJP6FVohOq/SJTWWgX1lpV6ZOhwoVohFg0oZI63Cn1OucTsZBxAVmSZQUiHTB/857oggGK0=; 7:Xus86VZLXS+0E4nrDnI8WIsgSm/NSBgmlV6uqsV0Xa/EHe/kj0BaYuwPeYlKeqoMxwmmOO6p67x+PJNgzPwyvUhLNWWugpsQMCGfdmL0tQB2W4qidphiusJFj9ndp3WSqyWCbwNFtEMl50V5gwr1QHVlYADsEKpPxGsibwotmAydxmQaWZrrRgEJdUq6u34jBVmLGAdgF2FV+ynI/bwTRZ+ZsLcJ5pCd0mbsDEaYKSvp96hU2MrLl5dHCA9E7wge SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:2FUSfPJEBe6gphgnxBJzOBeLtKakQsjWM1AkGYMRV0ZLDw+Nrm/OpkMEdzqMTJaYh+nagtOSJmvS2U8tZ7rYSrDvqipt5KeqALdxF0xh9CM4WEVusSMwnCl76O2J8MSyXf0kwQVIMaprf2OdP08QgQiGk4sw7tS2zIYQKwNOaHzKlQ/p0A8XGwgPrR69cnDZjdnMiI/3wFXDksIiFGllohUy5uzIdVHLWbHgXkEIdRNlaIjVT1vhdti+jfVrBPj5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:58.0811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a88b7171-5b70-4f7b-da68-08d584f31aa2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.57 Subject: [Qemu-devel] [PATCH v12 14/28] hmp: add 'info sev' command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The command can be used to show the SEV information when memory encryption is enabled on AMD platform. Cc: Eric Blake Cc: "Daniel P. Berrangé" Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Reviewed-by: "Dr. David Alan Gilbert" Signed-off-by: Brijesh Singh --- hmp-commands-info.hx | 16 ++++++++++++++++ hmp.h | 1 + target/i386/monitor.c | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index ad590a4ffb2b..ddfcd5adcca6 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -867,6 +867,22 @@ Display the amount of initially allocated and present hotpluggable (if enabled) memory in bytes. ETEXI +#if defined(TARGET_I386) + { + .name = "sev", + .args_type = "", + .params = "", + .help = "show SEV information", + .cmd = hmp_info_sev, + }, +#endif + +STEXI +@item info sev +@findex info sev +Show SEV information. +ETEXI + STEXI @end table ETEXI diff --git a/hmp.h b/hmp.h index b89733876de1..4e2ec375b0f4 100644 --- a/hmp.h +++ b/hmp.h @@ -143,5 +143,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict *qdict); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict); +void hmp_info_sev(Monitor *mon, const QDict *qdict); #endif diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 29de61996371..4d9019626031 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -29,6 +29,7 @@ #include "qapi/qmp/qdict.h" #include "hw/i386/pc.h" #include "sysemu/kvm.h" +#include "sysemu/sev.h" #include "hmp.h" #include "sev_i386.h" #include "qapi/qapi-commands-misc.h" @@ -680,3 +681,22 @@ SevInfo *qmp_query_sev(Error **errp) return info; } + +void hmp_info_sev(Monitor *mon, const QDict *qdict) +{ + SevInfo *info = sev_get_info(); + + if (info && info->enabled) { + monitor_printf(mon, "handle: %d\n", info->handle); + monitor_printf(mon, "state: %s\n", SevState_str(info->state)); + monitor_printf(mon, "build: %d\n", info->build_id); + monitor_printf(mon, "api version: %d.%d\n", + info->api_major, info->api_minor); + monitor_printf(mon, "debug: %s\n", + info->policy & SEV_POLICY_NODBG ? "off" : "on"); + monitor_printf(mon, "key-sharing: %s\n", + info->policy & SEV_POLICY_NOKS ? "off" : "on"); + } else { + monitor_printf(mon, "SEV is not enabled\n"); + } +} From patchwork Thu Mar 8 12:48:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="OG7FxVab"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrdG35jgz9ryL for ; Fri, 9 Mar 2018 00:16:49 +1100 (AEDT) Received: from localhost ([::1]:38699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvPZ-0003ae-7X for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:16:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzt-0005Oa-UJ for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzn-00048L-CZ for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:13 -0500 Received: from mail-co1nam03on0062.outbound.protection.outlook.com ([104.47.40.62]:49216 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzn-00047i-1q for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:07 -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=ade4jJzUv7oN2gmBFhcFGgJkOYwr7DwjFTnbZJdvhqE=; b=OG7FxVabUEqu9nqYgTO6LEcW3kHLC7acz5OdMHZIZhVQ/nQCq8urUyBD4c35c0MyIuT8sWu/4z9NRTXas2IRjSNpDa4/dQY+wDbAkmOAf7tlRzJrDkCZ1hbK72KKEhq7EufUzT/eqYN2i3SaUW5UjMFxTh21Q1b5A77I9apIBeI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:00 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:48 -0600 Message-Id: <20180308124901.83533-16-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 10cc3e64-a0fb-4e55-67aa-08d584f31c14 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:8PIgK2meNU3IlPBFDw21x/71ZX7BT3mvR47Nqvl8lNeeafrLISc3Mr5rGRXxF9ZjR0f3yUoLpKUMfqOj7zHsHmhyuWroeWe8Jc8yAZ/3izwnpDLbBfGL8IUz9H/kXTiU19b2byOQ//sOGxg4CPt3PJcw9pPSiCfB2n006SrhD6OLpJFzjh62yPndvDevwQriTWRrUVSYX+vNj47eACDS8fkHMUI5mZB0ArkMyULpWdeqkSFcrquJ0qyx3tZAZtIT; 25:PHKlhICGlXjg79hqmBWrFPH01BV8KZzmIb7LEBE6Hu5zPm6GwdFUpvXKgFboTTnHJttbipGjVa1evY2TQjTYMiCbkCpCAwh/7ZusxXv6B68u0TYp3FQs6mzOcqIlfAxKPLgCM+vgmvgJ3gNUN22CHc9BIyR/j4TdDq36z1WhxEGOJAHA1BmTUzGp3VMIOFXdc8uW8vJ3DxC6HkrSn9+x/70nxCKTgkzh9c/Img4YCezgDXXv3DWRoT9CGBymlsXDsP+ET79JWBwwqHlUP2BetKpSdrdazM0q8ct7wfapu3Sp/1FsrxQ6iuS6MM9mttXSgDDf/6bkFnTXc11S0WmbOw==; 31:zgsfW6qNFmI71Riiim9NmTosanag0o/81KMbEWUizfxcwK6gc5Hd/azdWGOZDCjhrNCOlaJcu2kz6dzFp9lK2gmhnZOjKTbvFK75P2j5jKCJ5jgsRHKzPvZJBGTlQPHliYlES05sjuEBSuV4rrksUeW1p76YAbPV1HGuKl3dvXmjewn1uWzpdFHjsBKCRtFwamIUvaiv0y2KgPKGbm+7Zc5xIp4hb50fu8+7Wd/cXoc= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:qUHVip4RBXA0wpnRGOueBpt97wXF5IMHWgrqK4/k9mnUaUazSF1YyiWlQyar818w+gkJ1yKdwGc3joVV1E3rrqwNixMPkoUiPLgNPC3zSDFeSy9oHYcxI0LuYtZxoNybh+wTt6wW88QJ11DeFnxzmkyIjp+Rfm/wI657mrBy6D+qAEP/Qde3F9E84aqhXEArstAgS7jcrLTRz7lJaKkZgIWf453khchbWeyi2d61rVnxk7rbSdGLqNLUSux1mfMG7kB8TL0s77xH0DpI+bdIdccKmPRXxlvqulPO6aFD1fM14UKt68Tufj3DldrPlqob2KawsHqlMUkFc3OvE5wX7sNPgXQgOHO04FQXYPzbBk8YY9jOEldPp/VgbCqp0Xzd3GcnWZJTCgjUw+s3c3zpS+U9ecXCCpkruR3hsY79b21QUeYYFcSMWLKnL2Atxd3aro2Y4VaqG8kN9+LG4yt1Bj08WVeGbIX06MVFRa3vUXHCknGMM1EAGPHDn140JQp+; 4:YhF5v6OmBlGEYPkcWSUqeuFFcfA4q50liIO6rjrOyECGOAOMAIyKWhsoN0qpiETx9pUoqXzDzEeVX+vXmPbCqWN6NyDwfLVcnHbGzQfRUWS5of9XxnUjcOWOlcJON2Ehs365b1/RhKFFvFBfloAK70U7JTxvtybnkHzDk+PXHpxm2ZunRONV0b9+YpWID54/Y0VPfBsMQYTb9ofgR/f/45OQZxPSHkxyMzaRoAWhaF3cr71Ty6LjnmfP13Ov06x81/BITbk1GvmHSTxOidXb82mNQw2qGuYtQMUEV8pn9GqHQxZWX4T5QCMPLRNbrMuL 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:zc5HSGNhF/rfrFM9jJLmPiuvEJaSImZJM0uOGQ9Dr?= ahQ/zIJIMj/0Z4ED+zKsCCWg6Q66V3Hd+JN7Cig+8gQ4KjJK9jU9+g6lbxpC7ExAcbH8MMHOS4N9246DYhTy2ZhwbPcryoS0OqLMnJk8VK1woSFO3L0FZKeWNu1wtS9UIWbJb7fAF16Y6l0H0RAlebCmarhP0CpVoCDxD9ijhLQfz8yYTUUFLL0iHm7URDVUJckMsaZdp4ievLoUKdFkRV0Lqa5PLsie3id/WpLGPwR6Ve9EEJxxRDSncWJQ5EUFCWtmh5zVSuGZ5rHLqdN4NXkCP8G4HRVSAVBLSfqZtpAgHFR6kZw9McEk/EQjiu4YZ0xxIKZzj+GzT0gm2Sp1XiQHTMhTZ3AzwIZHN7McJUfDGKmr+hHsz4ibspbaRP1h3jL49pARDZ1BMckdFSa7dK3iYusUAqSj70brqIzAfrIk0zc3gTprrtD9f5B94QT20+0aPV7X+auJX5PKi+WddoO9sa6dHJEhBHFTvUysTbGQBW0wQJgJAVxWBj2dhqjtB+E9b9xkxhO2yIdRwKs5wuzzhh3zKevu9MGaj6GZa8v9xBVs/in6xJWp2WZXoqGeGhbUYbJ2P+gdW9Xmc6wNxqU4fm1UlX+p/hk+HwAKWetEJwnVdKUQvVLxgZklPDNdICCjZ9SC8zG3AD1CnVweG723GvJN7p/Ol42+RJfmEDDqj7x0VX7qRnbxZryDxerzO+u/ROi/D9ZHeUF9nTYbZdn6xoywz3cSGoDhh88mBF4uv/IflrDz9LqrenC6zSMzSp5xZbjWn7yHAJmNLSNsZTxpZpf9PH5dWgfYq1YrtZ9n37PNDNcrCYlPWNzM8dTG2PslemFIoG2Bk7FO/3F7+qNWsT2e7oWavctPh4BhmFFh+pUMgdL4TJW0NPpgftlgLj3y5eL6QjDKm/TTCw8WFQNsQHi+Q6mMmCXnHGoGOuwJuGjEkNftebnhznWmWdYtOkh9p/TRj3TCxlBLof6hNFcfYgT804+GJqOJLncew6KA3p2cbB7nJqVIG8EIOHnphXGyaFHxBuLBiPe9A8l81neGKDjMA7oPYyADdklsySu0YnQbNQzS6VQhgZpDSOd/LyH69LFN5jBVMwK3a07Trm+CBH26MhV5s7iUtajFK9JNWvoT9idsMmvlJBp9Jklj3e52YwLOsJcR/KJFNPlMBKWOWeJK3egWhYfSu2MpzZCPTVN/EFbZ/LLsQmz5FaTzM438RoE5AqkBBP/JfxRrWdqN0y59mFVB9QXRmkBFARH1Moxtb6nIZcpf0dR8aWj3Yg= X-Microsoft-Antispam-Message-Info: 9UOrHBFZlTGykQx/3d1pBz3hBO1HRPHp3jIXqnODVsVjunBVZmEKFtLnpLKNYK0Pfd/8m9b4GAfbaaf7yLVHe60tEsN6Gk7uo8Sem3zF5Mlu+uh+1wBULRKmAOt+NziYqVlirKsRGPrpFfw6aGua/NehO5BIVT7M1DrR2uUUi+rjk8zvZ+/zBnzd5bG4LMHG X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:QluvKOLGlUzMJq8DE+Y6dSeePE/nfXnBnr+t3aFyVrgiqLGdYLO+cU28cpRzrc5yPDGgj7JV29X4zoaUqJDmFL//uSr0+Waavsah0bXhrty9vtiYh1Qaf14XkYUrR1E2XVg/S/YyJp3h0P1lfLFfrIxENsU4Oy4IaN/m0TNsDbSKxOhYsX4aFkfwUZ6lZTko8OERNXUbPgzcrDKOd10aucop2N6miZnIzGi6F3SNtxswQBfkw60lnWu/iYLQo3eFzwVaC6/F+x4GalJakDf0I/3JOf76aI886wh9M3kZu6rW8d4epGqXrdc30OdIPKlk83OcJC/NWtZ06Wofg4x/oRpifIFCMB0EKDuvr8ZAty0=; 5:NyEp0ZyINt798FfgTqqnMWV1bZOKogsWbB6XPE3wwof9v6pbXkNtY9QbzdthevWcEIrHlSiRqXon4LgQjwP5xW4dEmz1Q25xqFpz/UhbFA8XH5gowLABDEKjFlXDAArOButoQha9uFs+nxW+3Dz+Nr7tOSh7SPdQDudadoeoo1M=; 24:ubAFhSNV8RMes4Zr/z/v44aUIGHsIJYIaKBFnk18OF8/0/lGzb+8MYc4Zfj5FjKg9YGUkmZ2UFP1pYPyr7flaR1cbu+ky6/36HHrinvRvfY=; 7:HR0IHPs4BWyPsmw79H9u5SpyGJmzHpc4v3egQtDDNhtlbGflP0al+LDO2TkPl5U8vxz62KwPMurE66Af4PkgmUd7LzqrSKmjgDjNOAKap8tfJLdZQcSJaHxYNLBk/5K07smeCjuwk1p29NBpRtV5D9TqzcXKZrSV2D7DCe9wSI91LadqMgFMRPYV0vzWaJxrSSSdnCgRvAmegCjVeHZTe3/ikAKOwdSh7MfPyArjNoiyUzAgj2EXOnilTWi69u9m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:KOPxhP5y6FWl65wUibMic5x9bgmA7YZGy1aM/AQAuiJ7cbiLjRmrr5ZFSgYA16qGZL4HPoL/87C4oZ8NDNR0ve34TqabR6Dwgw6a1do1T28Hx9b2bl5yU9d/oXe50Et/YAHf+mmA/7Y8wrWERqGfjqjAXxZ8r6nsyePCGwkdHlNvdRHErzseGrcO+XjNirrN4ADfZouvXOoLbdc7KZql0q54AdzjHjodsga/L46CYJf2kL6IbyLwDcJY/wXQyVP2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:00.4561 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 10cc3e64-a0fb-4e55-67aa-08d584f31c14 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.62 Subject: [Qemu-devel] [PATCH v12 15/28] sev/i386: add command to create launch memory encryption context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The KVM_SEV_LAUNCH_START command creates a new VM encryption key (VEK). The encryption key created with the command will be used for encrypting the bootstrap images (such as guest bios). Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/sev.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/trace-events | 2 ++ 2 files changed, 88 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 4f85035d5203..eee693745103 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -105,6 +105,17 @@ fw_error_to_str(int code) return sev_fw_errlist[code]; } +static void +sev_set_guest_state(SevState new_state) +{ + assert(new_state < SEV_STATE__MAX); + assert(sev_state); + + trace_kvm_sev_change_state(SevState_str(sev_state->state), + SevState_str(new_state)); + sev_state->state = new_state; +} + static void sev_ram_block_added(RAMBlockNotifier *n, void *host, size_t size) { @@ -406,6 +417,75 @@ sev_get_info(void) return info; } +static int +sev_read_file_base64(const char *filename, guchar **data, gsize *len) +{ + gsize sz; + gchar *base64; + GError *error = NULL; + + if (!g_file_get_contents(filename, &base64, &sz, &error)) { + error_report("failed to read '%s' (%s)", filename, error->message); + return -1; + } + + *data = g_base64_decode(base64, len); + return 0; +} + +static int +sev_launch_start(SEVState *s) +{ + gsize sz; + int ret = 1; + int fw_error; + QSevGuestInfo *sev = s->sev_info; + struct kvm_sev_launch_start *start; + guchar *session = NULL, *dh_cert = NULL; + + start = g_new0(struct kvm_sev_launch_start, 1); + + start->handle = object_property_get_int(OBJECT(sev), "handle", + &error_abort); + start->policy = object_property_get_int(OBJECT(sev), "policy", + &error_abort); + if (sev->session_file) { + if (sev_read_file_base64(sev->session_file, &session, &sz) < 0) { + return 1; + } + start->session_uaddr = (unsigned long)session; + start->session_len = sz; + } + + if (sev->dh_cert_file) { + if (sev_read_file_base64(sev->dh_cert_file, &dh_cert, &sz) < 0) { + return 1; + } + start->dh_uaddr = (unsigned long)dh_cert; + start->dh_len = sz; + } + + trace_kvm_sev_launch_start(start->policy, session, dh_cert); + ret = sev_ioctl(s->sev_fd, KVM_SEV_LAUNCH_START, start, &fw_error); + if (ret < 0) { + error_report("%s: LAUNCH_START ret=%d fw_error=%d '%s'", + __func__, ret, fw_error, fw_error_to_str(fw_error)); + return 1; + } + + object_property_set_int(OBJECT(sev), start->handle, "handle", + &error_abort); + sev_set_guest_state(SEV_STATE_LUPDATE); + s->handle = start->handle; + s->policy = start->policy; + + g_free(start); + g_free(session); + g_free(dh_cert); + + return 0; +} + void * sev_guest_init(const char *id) { @@ -476,6 +556,12 @@ sev_guest_init(const char *id) goto err; } + ret = sev_launch_start(s); + if (ret) { + error_report("%s: failed to create encryption context", __func__); + goto err; + } + ram_block_notifier_add(&sev_ram_notifier); return s; diff --git a/target/i386/trace-events b/target/i386/trace-events index ffa3d2250425..9402251e9991 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -10,3 +10,5 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" kvm_sev_init(void) "" kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%lu" kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu" +kvm_sev_change_state(const char *old, const char *new) "%s -> %s" +kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p" From patchwork Thu Mar 8 12:48:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="tjWUR/qy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrFD1Jt9z9sXq for ; Thu, 8 Mar 2018 23:59:28 +1100 (AEDT) Received: from localhost ([::1]:38509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv8o-000553-2H for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:59:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzy-0005XK-T2 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzo-000498-Va for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:18 -0500 Received: from mail-cys01nam02on0045.outbound.protection.outlook.com ([104.47.37.45]:6862 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzo-00048e-NN for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:08 -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=5g1Yc9LMBRtAZ4v0k+NYU371bpCZTD3j7HCPXiCNJFw=; b=tjWUR/qyY9SMkXR1TFhp6puiyfyr3ftkpHY5zrbVGYuW6d/bl8CLlmFGSqhdO7U5/HO0ofgF9GSwvkIvDaGzurJVJYK36bBpKjRQSzy+qIqfk8RpKocpz6jGEs1/9Y5nnC8P4tB6gze3/lQZok29DsCjIZ1svE5AdAoGX0jJN9g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:02 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:49 -0600 Message-Id: <20180308124901.83533-17-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 320b046e-7e14-4f62-b848-08d584f31da9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:sYEpZ0Ibl/1paC7/uvq26iDTYNjyCBA0ibYPMaIOg0KSyyHv9zot2b8SI994EM5FpGk2ghhBdvSO8Z4MsQGBxNpLYlD5i0DDqTOaMwdaJshDiZ/p038yu3m2nlyA07pn4lXUTkMNfLZcL8jSgkZPLhlubAapjifSGTykF0U17yg4Uksi9Uao/2LU2SH2ndGrpSjj4JNxLCtSBzXrUmwIICYy+CmYIJ/Z+P1Re7ivSCnGNMvzxl5I3TmQUudGcPhJ; 25:X4GqNom9+XUIEQMca1XdBlgh48zTNAN0E/PbyvCdbJshdP7+47snCo65adEnLRQTde74cDg0RM0JIl10aj5QT7+ZgJ9mAtXUfhPx2ooflrOZn3f5nGx2zkkFbLN019xQPgrvL5/yUeWa5/8+JNUtdL1YMHH3lZGth37zB+wDg8JRXlC24B/vPAbJbDBTJ+DBeshlmrE49CMVb7VCMLTtvDtguG1tlWSsyUaumJqg585tH/8Pn7ZslO+HQK7Sa/ldX4G5n+3Cb7vYwX9pzRwvz6IPNMQWDyWFBYOVd/mfDSnjjy1zi5QUpD8gxadBIJ/KxP6hWSc4BNNLC12wB4eV4g==; 31:CK/VMm1308Nr2/L+NMyoDZML9fDDDM6x2AsMYf70d98TEXgkZvZf6JHBBFjFz8b/5qOZhXwlqdZ8DS6ya7ira/Q1HM+OIsv3EpqkDhx2u+dpUsREl+YS1vPqxHPuDJUhLaY8NCdt/N7BN+BzLyt0GoofdQm8RztWZWi8EqavYFR8fzsk1zDCJyP7WyuK3uoBbP6gb1NjqOobiyTegInsLLJDA65I+xEINBAiG8N+5Hk= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:e5e98g64G1tcr+WlT472dD/734tmOon2ujrLtaEFwdSBtakRTKs9oMIVTM5vnRisnbnKj2hpTpmIY+0JoybJLD5xS8mPkBlTl6QGN1CBRi5djFX+BclpqN7AfjYWNIBzoZvF8ewMtLz+Sp2uKOID1+M3wW2gDb8ZtHe5hpaCT0LetlnQM5F9dQBVxyzS2aRldLQQfDPfNh0kzEptc7ABYWXTHTWl6WRbFsdu+ldzR/BRYYlJDY1liJbYZWA4N0GWzgaAZwR/wuLwoWPIcKuZcW+gVqQY5Ttm47Jy+FRusHTuVYDBUCWP3N/XTPKH5jDTLRV/laOtp/4I5TPkHE7X5DkGssK7VEwvk1fKXAhXnPH0/BHeN663pCNc1hqBH1XzL9pyXRqEmXUDYnXzS8JhSRIFt7FgfFmgIVMVyLIh4yHE/BepTbPzCUEPLbYi+EIVKltPe3qVuw53IlTxZaZWGGZQROoDsHlhsaRFHwk7JvhjX3/Y1CgIbCcdUefeJgos; 4:G31niTQ2skFFPI7aXfIJNHp9L/usr5dxxMxO63+y4jQieXTJgthsbaz/Cu+qIDCpyZEOdycz40gmgk/uIn5tPIvmWCq1LJEIFOd5i0hAcYcL4sOIGCAzsugXxfy21rro+H1ldVhB+PJAbvztFkYfGhQG9SI5zTV7wpeLpQOch461iF1XiMM1BpXEvQJ7Lgyl/IlzgmRNpuCSJQgIhkZqG6KvbqyZMSnNb6LCTQSw5IvjNGNG6su9y4eRrS/29H7ISxyF2pG1gbKBBoxGMEJRMEo5R7FWtAuVym3qve/6Tnsvv7VZSyHBgmZp+ZDZmjsu 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:9w8mBM2YUQ/4h0XoEGehRCTFIBCxyFRB2Ck0tLiHD?= mrL7jkruSrhsaMY4V8zxPZt5Xu933zhW1846EGFmgllrwMj6w/KHNE/oJDHYyRFIn/E+G9zuTWDvOGiCaAp0E/l0Fy0xza8+XRafGNiFgnkcMW1kC08wLcI5KInJqNFL1WyKe/gSoen0wuDFoMMFavpidxNbZV84iw2kL7KBq9Q6zggYifHvxFhoMaV1LhNTNxw7Y38rj93Ym3dcxwtevuocLOla3Ff2ep82pz/FV3N6PItbPfxWRMpIgTGs2lJzAr/THGiSb2hy65B6dbsHFDkIP4bLdTErHYGT02QvkrK/5yLwMEjDAXU0kI8X/YETAxTL2ExZG9If4/1rMPeS/jXTn3YJZPFHUEJINPkthXuLV7G8G0PXjTw7xA6rspI/h+vvQibkud/nUBgeebbBwYEbJCxae1rj1GzfTPaoKB3OJFpFRU0SSj4QEYd3dVfB87MANTLRSik/qwSKyAm1/4cTlF7xd0CFatNK9FFZUAvmNcxuOiKH1LPdHkM6R+ZsoGa1IywQ8uQP+FUptuj2q4HNe83PNw7wt6NyO9ufC1+jwnaKQANIDuqByah+HvhEyhunNnZquorChLgbwcsN/n9CovggUZNqCdklmxUtSZFb/A6C/g2l76ErgsAq6fqJF2uofbtbhL38Mvl9GmsjHcIGUtja5o1HgYt1Vi+qySQRS1xdMZyoQYuTkj5XjLforf+WKCRrZMll8D7amaP8yS+4IQaAtim0C/WRmSWrpavBJJqEiNFNQQuPKLeRbg961pUQh5sp+r7bBCAW4sesAz1PAKOyTaIJN1hHUiSMGzJn9irAyGisIORmy2yu7JZLHkKn3dZ72RVVfPaljIPgYgFaif3El9IvdvuG4VCrTx/9LqnDkvXRu9OeZ+reQRCy9BU+ByHUx8jXClNaLmASgW4gjRFJG8iBu4uBZr4GC66eiOAojD89G+SE23HGHyeTw2aUHpEuJ7VORBCjaSYGjmuDQdXSt8S+4awXtYTSHXGuCGv6g8PLdbDZpR9P01kYTu1xRHTj+u1HecT37rZ8F5oNMj15Ed5njlACoa4QtfWYwXDthQi6baRLWrNsv/ZuXMt7fw2VqyZ8ZudUDx0JovvRWaTuJDAt0qRyxPvFYmQOL9vMoRg/66AMRofAtggRWJlWkOeugwdpTmT5kRcTXeIdUpic65octQnnupLc+TXp5Tk3YQDXiMxTbgWuku2SW45t1cnEru7Ws46yPbISe+jg0RVurEaFQcVeyQlgs1edjOJMJGU1jiBdS7SsIPcBDfs4ucR+HQcX8skHMXv0An6 X-Microsoft-Antispam-Message-Info: B+H03sI6Hv2sWz8HmVA9LmuzlJQJY5DpzcC9/Tv+Q34tLhOBLSvLsPaiOvLsWzUSdBRHJVxkMC+iV3w8XJmqUkxRuxrnaagItvZF/ITXhPIJkGj0iIMFUmljXt2kXpQ9dxvJoHr1LFD7YZJW/x04O/qDhmlHNuOGVWIGAxwID7/IPHQE58o/Zb+Udi3mZf3m X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:9kNmswZKJoMFibbgdMeL/NNZMhO7qY7sXnYFNGWWd2GRUgCnJW83g0vF3y0D+HxGMdrwWMFUOxW0u1Au9pl7xA13UdlPsRluoerLjIDqat+RlH8QG/xm9yRCpibUkBbdNqwgNW4c3WOQAlWoz/KC4db74IggVSz1UtrDqyUueP7TCZu0FG29OOjZ3hsg5+sKjgG77k2tzZj3A9mMjKRaXETJrnzq+tEEjrkexD1XTJMeWrMw3aGyxq/VVS6XkbzcnFhgYmA46f5Gs0ZjVLmdO7L+/j+ZY4bn4iIp0bpiY3nkxFZZl59ipla79NH23Gc9XKedP+l1JVB5o/erAi/LTLXZg1KPbRf3P36jzURS5u0=; 5:/VxsoTLT65GEQ0Xy5pQKObV1XaVPX4wXu4BMWzDs+ADzd6xEqj8XmwbEKX+4l0v3xgu/v/51gbk3GCOT7fm2n/1u8QNF4H+j2elNsptilNxVgdSw9C7FEPgttOElyl+aKaUB7CkXC3ZvFpo7K+76XsFSSJ6kPo2//joou0uqkfc=; 24:y92JgjlO2TWvDDM2WSm38ii8oG6FS9Eobu3Ix2XT6BooRODUUx9iroUUwmOmQqFOWN/6yx2cFNlwDjsIEInBoQaMAiVHyHyTgMIhyVxvnxg=; 7:eq13VLHs7eGWMJ98mf3TBt//JPUOdlyiW6Z9cdDfNcLh76QJPm26pVs5PhkL1WfYw7Z87SkdNLC4maStInU4AEVdMSjORUJ7yvnw198L1V9rwMV/hwLSODyVS1GH449Uc4LdZnd+v7YDpyeswaJ9DApbnD+LGjgCuHx6z0bW8a4FcMcTqqgY08YWSoXh9ZFAw4YFfRg9ojkO/wFdZgRdmNuX3P3ldW+IDHQrF8mSpRxRiMDsKJldukYIJWxRsR4u SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7mmhACjgm13a/Bpb68x9l7YpF90VAAfMUFCNsfbIpu9CKKNR7Wn9Bt99keeUJPA8jDNifWdhgx8Xsg7ZkJAm80daQ55Sia2XIHqor1ttTETDAnMadEGa7hhNLRSxI9EnzmtSgEjhvHd2tajf2MSbSqZYDdDPQkIADYoPdUvA8BQrR/jW5+Sp9ZUFViMMZOcSNPvYnP6gbe8FOatdnmgibftoY+eacoQ3+8vKFb1T7e4YqCTzatKEmfvNNjMMAg7j X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:02.9249 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 320b046e-7e14-4f62-b848-08d584f31da9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.45 Subject: [Qemu-devel] [PATCH v12 16/28] sev/i386: add command to encrypt guest memory region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The KVM_SEV_LAUNCH_UPDATE_DATA command is used to encrypt a guest memory region using the VM Encryption Key created using LAUNCH_START. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- accel/kvm/kvm-all.c | 2 ++ stubs/sev.c | 5 +++++ target/i386/sev.c | 43 +++++++++++++++++++++++++++++++++++++++++++ target/i386/trace-events | 1 + 4 files changed, 51 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 975ba3845234..411aa87719e6 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1680,6 +1680,8 @@ static int kvm_init(MachineState *ms) ret = -1; goto err; } + + kvm_state->memcrypt_encrypt_data = sev_encrypt_data; } ret = kvm_arch_init(ms, s); diff --git a/stubs/sev.c b/stubs/sev.c index 4a5cc5569e5f..2e20f3b73a5b 100644 --- a/stubs/sev.c +++ b/stubs/sev.c @@ -15,6 +15,11 @@ #include "qemu-common.h" #include "sysemu/sev.h" +int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len) +{ + return 1; +} + void *sev_guest_init(const char *id) { return NULL; diff --git a/target/i386/sev.c b/target/i386/sev.c index eee693745103..cb0bf84742ed 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -105,6 +105,13 @@ fw_error_to_str(int code) return sev_fw_errlist[code]; } +static bool +sev_check_state(SevState state) +{ + assert(sev_state); + return sev_state->state == state ? true : false; +} + static void sev_set_guest_state(SevState new_state) { @@ -486,6 +493,29 @@ sev_launch_start(SEVState *s) return 0; } +static int +sev_launch_update_data(uint8_t *addr, uint64_t len) +{ + int ret, fw_error; + struct kvm_sev_launch_update_data update; + + if (!addr || !len) { + return 1; + } + + update.uaddr = (__u64)addr; + update.len = len; + trace_kvm_sev_launch_update_data(addr, len); + ret = sev_ioctl(sev_state->sev_fd, KVM_SEV_LAUNCH_UPDATE_DATA, + &update, &fw_error); + if (ret) { + error_report("%s: LAUNCH_UPDATE ret=%d fw_error=%d '%s'", + __func__, ret, fw_error, fw_error_to_str(fw_error)); + } + + return ret; +} + void * sev_guest_init(const char *id) { @@ -571,6 +601,19 @@ err: return NULL; } +int +sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len) +{ + assert(handle); + + /* if SEV is in update state then encrypt the data else do nothing */ + if (sev_check_state(SEV_STATE_LUPDATE)) { + return sev_launch_update_data(ptr, len); + } + + return 0; +} + static void sev_register_types(void) { diff --git a/target/i386/trace-events b/target/i386/trace-events index 9402251e9991..c0cd8e93217f 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -12,3 +12,4 @@ kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%lu" kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu" kvm_sev_change_state(const char *old, const char *new) "%s -> %s" kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p" +kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64 From patchwork Thu Mar 8 12:48:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="AO3kWvhY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrCN4VhXz9sgk for ; Thu, 8 Mar 2018 23:57:52 +1100 (AEDT) Received: from localhost ([::1]:38500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv7E-0003TZ-9T for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:57:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzw-0005T7-PL for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzs-0004Am-LL for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:16 -0500 Received: from mail-cys01nam02on0076.outbound.protection.outlook.com ([104.47.37.76]:52544 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzs-0004AE-9S for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:12 -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=hswdwbRPMNmiaZsogZDUeqLXXHCPFLfZq54ztWs1Z9A=; b=AO3kWvhYrMgSlmk92W0ASAFdu2YxnPDFlXsL4AN89qqlgGmFolBMQvHkFx6xraiIeZHzqOFGh/i02C6zR3OhMu3pvReC348TVrQK4nOEa5ernhEmRHkyPYzWlNDlu6+8SS4crDSWW5biNhaYPdZSSuAWRC6LMelDPq8/t1d5liQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:05 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:50 -0600 Message-Id: <20180308124901.83533-18-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c601dfd7-73d9-4d13-0a35-08d584f31f20 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:ef8HW5D6g/5BRqiGcOn7mpId3C9m9QBR+p+8pBmajfQsPqG/aT05sEjGBeeO8zUirPpThyERbpRNC+ZB907n/PfM9ZFPOFeZsiWUFZGWAW4S5NXcKR0e47WQlQKkrECYt9TYCrERCSV3fuXSdO0TJH1CvVqb8NdfN/+fZWxoOVowMSMfAbeXoJLlMkNc6JCc1vwc2l7gkDwaXdTjJKIqIJWRb1rChTgDNPmyRQLnhg0b6/+upSTFky2/EwI/vFwt; 25:39N1CA1PjQ/tJfM4Pida+/YsHUEqkh6Z20oKyfmSfZ9xE4yqwTbtAEKfUCJwYjsO06NeuwGTEj5JbVPkIzS3pwCchY0phMDYAdkfpYccnEKXyI+MYi+Ao8YSrGcIfdeOhktEWEube7jNmPnWPku2tyTCxW2ClLN2+IYL0p0rrRww22uWtaKgXTnWqnzt63wyHSkaskG05vWDki/MAjwfZashUYzxJ1BMnMVbdRR4vAw4scaFe//4rV5cc5HskTUmWmWY1qqdn6XUfNTAtFxnJiBJazZjQXXxGuW0/vofFTLtGacjSvQ1mV+bFCS1ryW5mAKh6TxITaBkZTq7KKoaKA==; 31:QBII8KfV2jYjz0J3HIG4wqWLmb2qmsTgGTHlDkrGVf3gjUf5LuJmMuuWs2p4Qf0AqqASRGHoGY2YNNtj6B8WA51MKOM49Q2B7iuOjQJdvKLP339gmYVCRarPmbDhhuyu8h7ONKRvCaBbS+z0S1w1Yfrv6Nn794X54pnz0h8Yp68avHhE8th2hUKUngs1dhYIl7vtXtEsnhqfEZxhImo2H+U3soH6CW9aNqG4lfDh28o= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:3jtHgVD5VKumpiSkqq98dkO1DGszyAegKIUzQ5E3BJSZ+Vf1hu+Fzh5MJri5BNAViYRsApNlpW6WBsPEaHRAvl+GA9qXCwa9OoWq15cAD0WT3ixxlst2lQV3oNld8edHl0zHuv2NLop6wPkxIiam6MjaILFtB4qpLTWLKhygIIH5RXXQH29WHXfaBPHwlQedNCYgjKdviK7H51nv1uIE6TI5E/6bRG9b596tlvkhDAi+7EHPcOqfbS2C39S3YFyBljG5xtO+LFcnvx3vqAxEQiJGHberuaxvLljWx11jRvcfZPTJwlzz2rlI9tm9o9XCXEVL53/AjIg4EVzhHkIOzA9wZSi+6N9e/lQc62zaUQHVSOendjm9HgCdby1eEraivdBwOc4wvJ27QZSW8W1B06sQkwfLCJGRSjI7jz6G2Ri9rLfR37f48sgGR62UAfTMMoOe0NwWvcEB25PiDmQAO210hXKClv9DuNgNK8JmXysLjkJ2m18I02smTtIQ1IGK; 4:HWl2qrDkUwyhUyEhH7nDfK5S8G/RjysS0+MssRYwNj2d91JbWcbFI/KgIsFx3EUl6XIfpcitDt3nMrZIkYQqatADmxZnY+fOrAgw0v66eaCTU40vs9TE2MlcWA2wOz9qQaoDmNTqb64DPRF1fAe5AstvNv60KUzsjtWN6UgQ4PhyzL2GaTtxiyEQ1SYPofzuLJUkryHiNapkb2q3JC23lnMHRTqqU66R1fV//FGNa9mM59+kpY+8hjuRpe2/PlyDpxElkPGIJfklLCQldHE2tJRJrbwGQlZKX1M/Odns6Z+Q51yqxK/8j6vJxOTZFmlZ 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:yS/VmfsaJ8zZvErHlBzQ8mPry7HQW7xt4caTD0fN7?= aX4RIkjwiub6/n8JUwXa+Ho/XKwTv5r1mq6UUcX5TPh42eCdpJtpQCAU1ku8Ynhd1iHs4ldY/gqjgGsanhAKn1qgqRB6MrgnlslhOh3SfZaldmaoq+TTekBCWcHth1PPboT2SbUKzvLIvih6j8x9Uo5crQI1wy2sbID0qloDrjNh7AjjmgokmXZqe+3dfCCFzzT2Ef26apTqIwYaX8oxeBv72S85rXTQ22m32ZhvTjheq/ljdVu9il+xOfDevKTbKo+Z+s9jPRNaUKBIi1YI1VttGhtjGqm8p/wJrnSKcr0g+4ZLPDGy2/sJzIItLMytAaUM22/77+CZM7SwfNeET7ahsS4GxZNYrpR0vsUCSDK+7QFPfhYrkV1dE7G0XB/edeoqv4n+QBNuGPVb9lsKr6hdYQdmdAklojcEsXhs0CTiFUO009orWeo3jbF3DdS0BGXYl00qElHolxpHH8y6fWxGfYQ7c30z3HiwnBPLK1zK2W/AtAszzyXnTWVzCK5816NfsN9fooTxzUhHz1MhLBP5o5mNjv1OemjI/b6x/D2NRSoZsCocELladKtpqgg+CsLIFa32rygfidRWCr7AfgQDTxMnHcGIJhMkWyKJrH101ti44/W/VGVJSe6uo6rC3ESFr9KZk2jwVCPghWRHOUSHnhr+zB/eiUXnD+IrwENGoAcDIynZobyPtt1XmXsfst7n7D8Iba13Tn76b+bm9BKmY3jyBDxHWyH7vGrqfWu6Cz40ovTe32l9EFMxT6rQmdJWfhMQowwVdF6SbfMyfpdXwjXAuWTD/lIz0PPBBuozCdJdLgC6zW9qKPJ58+vs/paQxQ7Gxg+84UL3ZPfBR0JRtTzYhGLxyq6DO5G9bX4Ir7SGUzehZn2X4H8VN5XPct/lNhJEDHqPKntYfNKS5h6jeOYaevx49FbcxffFE4NQKBnfeJHvoH25V6y3WcyWtF2k2MN7c1yqKXj1eVYuqFqWfz+aayuISkbLoN52zirvqwlTXnRtkTop42eFrHHIGGxXyw9aYHNDT6YEw/UdAZ24K3rq9fO6jhi58EUVvMNlLlaELiTQp0gkJ+WrlAJSUL46ca6r8tF6270D03nhhD1Fo09yN9nBVRY+SkUjZdIUjdZQ1/DXOQrZFRdXiUrR0LuXX9DDKiItdTN9KYapRvlf3+oBi3cGFnf7c9PcUcbUd5Lz3KZ8SiVHdHth2qOneIKUOlZtXuhL8ViJ9RWWJ2cwpommL1vYgEVQbmTo7taew== X-Microsoft-Antispam-Message-Info: xBMNmlctav18MgMiBFhm8x7tI0yDjkc8nkoHhZFxPQHMRZKwXGK3SMpp4O37XSB9G4mSdiQI5QQ8FanFH+G9vu9WAeBPqZB9/qcyZX48sRkYhG/eQ9d9PfYxqVnEwtXqIk4H4Y0M9G/UkSQEaaA8ad6Qk3+H9vur9M3lZiDOJA+aqlkxWtnNzEzLtYkUSLIG X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:gEeM1TQ2FqTo3sFaifL93wHigQh0OzSqfGTYx2uWjdo7cCsYd4bTAtmAHynQvCYjfJSaHDYVg3EpMt7jxiacUZZtNkvfsvxvRXpve8udBTqNl+B4e2HJCDOdMfxtAmbw+v1kbZpcXBW6t7k3kUIMPDJ21iZmtMl3Aq6zRInYwCc9RxbLr/kAUJF00/jfnfIZGPpsYjaxrYaetBOUCyUYT3oBLCRql1BCaCHObEca3+L8uuhMSyFbbkW34RPUvmjUTZauQAHpupdCCQR4FD6VkL2P+OKC1Ko5RP3FsNLn9/DpRPPdxbYzkkvtDduNRSmyOLOZ8OzbxvvS7PROxsBdN3LLaELww7h+tkJWKp2N8Tw=; 5:vlo4n/pYXBe6JABLvu9d75k0O5YDFHM4ZA0RUaxz6srGQATLeAe3urCAdSzTsx4Elo5RujrjLrrUqcWTR81aDBx95x/B4yPitagbsp+eIgcy44Ogxd4fsZL5IFW/D8+uTIKbY1WD2/11SHnnyP9XXHNsRJvZEVvoL8n9VN7ftbA=; 24:cE2u6Q8iTTsfeV5PqDYlECo9oVF7L4X/+wZ7tET37kuz8S0UdM/ZLwB/mIH7bNhfSkrkCr6BDveUxx8KgOlYLLb33s8mszYZ3mrQESpmDyo=; 7:EjaH69eSci/Oj5E1UeRgDuzWqCvp4aFmqccI+SGQYprXlWeMZs2tZ3MH47/jrdg3vaNl8PwF6tDl3Dyy4uy7ukZGYDjStWTsKnpck7sXP+KLVa3m9QhHMcZDofNZ2d649S3z61dSINI2LGpBqRXmjkBU1EF78/41c87jODXQXH72CflWN5SqQaRNc4TXxKu14J5rhr/7TYfvobdjzjxTxkAnbTGZgkEHb0z+UoFDD8gp5LkfLVcdTM62wD5cGNdU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:UsI0ED47pQgwh3MqEB0NIcbRWfb5hQ1nG9CPAQMnvKfsfCmV/0xOKOep0HkzDRMnJetAH85USpuQfKpinv44sE/mtK4rTpeBXju8ihTCuG5yTUB8MERQ/HHhF9P5tZsN3NdgIxa9pWgVpjZ04hSpAF5o3bsSbrdsJx6Ix1pv2iJc3hTfpCt4pNgZIO6YifcwF2OXWm1AatlVXqx9boSf5kWhVAbDEzn8FSY6Mpi3H61NPc7jiBMSAUJBaWXsP6NU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:05.5812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c601dfd7-73d9-4d13-0a35-08d584f31f20 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.76 Subject: [Qemu-devel] [PATCH v12 17/28] target/i386: encrypt bios rom X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" SEV requires that guest bios must be encrypted before booting the guest. Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- hw/i386/pc_sysfw.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 4325575e7d82..73ac783f2055 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -113,6 +113,8 @@ static void pc_system_flash_init(MemoryRegion *rom_memory) pflash_t *system_flash; MemoryRegion *flash_mem; char name[64]; + void *flash_ptr; + int ret, flash_size; sector_bits = 12; sector_size = 1 << sector_bits; @@ -169,6 +171,17 @@ static void pc_system_flash_init(MemoryRegion *rom_memory) if (unit == 0) { flash_mem = pflash_cfi01_get_memory(system_flash); pc_isa_bios_init(rom_memory, flash_mem, size); + + /* Encrypt the pflash boot ROM */ + if (kvm_memcrypt_enabled()) { + flash_ptr = memory_region_get_ram_ptr(flash_mem); + flash_size = memory_region_size(flash_mem); + ret = kvm_memcrypt_encrypt_data(flash_ptr, flash_size); + if (ret) { + error_report("failed to encrypt pflash rom"); + exit(1); + } + } } } } From patchwork Thu Mar 8 12:48:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="yugkhwQU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrDt2S4Mz9sgk for ; Thu, 8 Mar 2018 23:59:10 +1100 (AEDT) Received: from localhost ([::1]:38507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv8W-0004pQ-58 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 07:59:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzy-0005WR-8r for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzu-0004BQ-8e for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:18 -0500 Received: from mail-cys01nam02on0055.outbound.protection.outlook.com ([104.47.37.55]:40580 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzt-0004As-W4 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:14 -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=lnH+Gle5N5Fx+/VlWZnyw+Y9zqcT6b49jP+NiMBJEIQ=; b=yugkhwQUKBctWsD5kaBWfCYhId6NB1SGM/pbsXvhu3VbRDFNznhABeMLh1SbX4hqHjmnxKE262c2VxjYqRezxHR9hlDA3iD1h25hU94uAGLKD5IC1RDvu7v9nKaTj3OAsLNGRqUxwFCg/s4xXBd7t+bWpuxzNmJfKsYQ6p/hNS0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:08 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:51 -0600 Message-Id: <20180308124901.83533-19-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ce8d7535-baf1-4848-3519-08d584f3208f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:kwSz9NUwoeBgDKHKZTDWlYU4g524PnUjeWfM+tBWBwvDjjQqKQcf0BAbnWG9NYW1AVUufPcOuLsvLjv0lZ846U2301mgs55xRqyXVamfmwbIzR6Ua6J9rVlP3OXw/09zo94c2hq3BA6kh/KqAUmQdMeAQQKgDZVHm+y1zf1zsUOBTaHf+gFO7hK83Qac4WqdyLIeNc6d0ROw+vWKz6wutdnkaF8To8VF1iDt8Mc15mZZZPTtkQgCXsCxU7wDRWu+; 25:IlogoP466B7I1z6wW25TSd0XJ0bkK5jGSoz5zsaGSllwxfqBmtpzlJ42e61P9IEBO1Wj3Y2WFLysgafjiJA6ZVVCdUF43IDGDhQLv0LGZ1+JszextzNJExnF8Xv5Qqs2NSwnuGOYhVxQS2GIhUDaNiauv7mdyZX6klnQjopk3e1MxlClt5tjstucDK2zOZBuV+S1cVcrDaRSAH0GhBk9YsareygosXz9mC2vYJL2aWMEH0u7RrNpwWiNLqLTEtrGrUWCXmCligM+icxKxEd1EbFQ6SULL0UFQW4Tcl/kS45ufkjl2gmEHMCEK20tdxQ2d/M7NDUGcOr56JUKBY/6ug==; 31:vLceHw6rrFvnXRR1GNX2f1NnOaG8IxN97TNMOSlQNtGekOJwXpg0hvX2RuVCmB3ChZ5Picj/rpUfWBlE+P2k0fjs5hU2FaVkHfhI1y30LkgfLER15m4h1S8AYa8emH//nmPggR5rwasGfOsblgvCHIsr3VLMzk+L+h9na/wuMjdYLiDVLIaX5pizT+UvIro0gSeJWvw9K+swEWmfVM06Hjk+wdS48OuYjDmpwiDsRfw= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:LLQvKDS81NT8gemGOIB7V3JP/0eZuP3cgT8FdYiQMO30uwGCITn2MuwqxIaKTOZ9/aE5lszD8gXoLy1TiWj+u8/WHLBPRBUq+1wAdreyxbTzi7irVhDa4ZiA73mD2Y8Ys5Anw7y5lvUTLdxzJ73v7bPEHZLGvcoNxfhHzM3RE+fHkST/lhaES3qKklh8An/Sq/k8v5U85RCrxSnPruNfmu+YVloSvUnAU8a4irVWAF+TNHXb7ds3WDntg1BinDfLNYRRdyt/ho0Cd7noQwgt1yMnJwB1NAiQgWoQ+poUuRYKxfl95z0w9ojGDfHBHhFC3wQVKeY3FBHCa3OO6OZ1UQIUNItheLxNAseo6USiExo4lc7QfZ05NplgxAg97WqZKvGWpY+DzM/7ZM3sh/9HVP9VPtWD1s/ZmI/10v9WtNsvm7pPtEJj4UNPlTbF2J1WjGPlXhXGFZsLCZPvSn7qLH0khU8Bpn0AtLas5tgl9/iIkeW8m9o9xEgsn1VAy7l6; 4:qy4RYpTeokxg/DyT+pOMY0wCS0rpHEMRfeGcSmJRCYkZzhNmjNYgk9oDOBME2Ukg8NX3XEFOmhIl8sCtsindCIcuiYZ7ncHlPmuKUoK4yN0ZHNXsL97G5DCpgkk9u+p44CwjzwqGjDhXeTGR0/CnbZXFZvWiGJ5OaKWfgyz33AIOC+h7a4lkmYqZvrQWo81lX47uw5+a+xGjYpDf/8NkozrqM06xIBdvwdpL68tkDcs77vMyFpeA4tu3P5vn6rB+1DZBXXsulwKW+buKFDztzaycLCN9c1VBnE5iY2sdCJmg78Ddsz2keKIZ0QfmSdK5 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:JuRlCVL3xRX1WjGKLux7DlPRCCioJ7V/SXLL5ZQIX?= J8OYEpb32pOPR0esocmcBFiLEYxsw+onH2Wj7qQ5h6uah2YYHwsCdukY2tVcmljyUOHfN7/tHZ5QSUJUT3xDseMDZqXJkxlUrQvKx90ZIPEe1VgfGRT4u5AEpPP/KRnF3Wc8Bb7KOJpXqZgFy04UMZAWpZqJDQUEDZRyxMZUuhW7WZUcu3UebsCnyK4FO0ofy4kZKrK2NjmnF6YLHxsf5MHPr4azq3FwbUdA6r2lqNSurm1Y5KRvety7+R2OPVNRSxqQwIq7FqRdUHLj2KudPka4Yknrgx1NlT3oM60Ok1zHWBOSFWzEH3kmWBZdgFF06VOnwgZnBZL41wxxqdwJv5nXDaqSmM33vWDfU+Gjjp3kwMwYD9Eg/f8cmBxzkf5xy5W93C40B0gYUfvD5CZ1hUjlB6cL16V9FmswIKxeTdFeYJBYXQ3DiulaM676viz7bnFAoW9AUK2BqOrBRmoompw7tmxTBP2AQbuwpXCVMEvOArGNqnECGdYMrPLs7tyrZ747/ZAG0JGcJ1yC2xzWWn5kTVuvIH8QMokd05gvE19X25xDoLja4o9hXUsDFInI+SaePMe6+Y1Bq7ZPYcO4x9jllUFEwAm7i4eJ8PimG63Hnnz9+oiZirFakRguBhYJnr8CkL/LoGjhi1wiwcxsDo2iJEokEvyvgXTVotTRarnf8qwiNe45cKVGYFn7la8I9G84BMKgKUP32ihVQ93efEOJxY9PrqTFkpZ7sLP7UIbzlMM+rVNpLsAigg+4pUIFKTOAn1tqKESlMLTO2XbK5qkR58AuuHX4DMhsYU250zUagI5nhxb7ado3QtV7D4iywwfhqfTzcRPdBVwJf9IfM1F1LTEYXj+yKiE9fHg2l8ca+CtL+fxphDOeHs1TyPI/0A5ngUqe0zxdEQNqNsQwKyXejAvWgIDBTypdOb0pXJtvXdxZ+6trN3oybfhTTxkoZrBaIUR2NOcefC8G8ale2mZS3Yt+LHbZCED5BjhyPzpJrgcl0mKHl1+EXbJc83qq743kmhZPdTY5GP9msGTabbZk0KkSoFxkcm8Aijad/bps1dUiRQAUwzORfZBgGIy2Mbi7HEiiK21L1o58gTy2e3dghzuvveg0i5flfVj74CZRShbyFVVHSIUjT8XTt2PlTdBg3cv1wzN8G4kAJZbCKtThMec4jB7Bus4laTBiQ6ugGFI7poAD30XIwbEU/mSIqQrzU19bfdhl5TJi2TPW8z5qkgZCFKUvphII38kgtNA3xCXAPhZrKerErDzocJRMMpi0sdD9R8BpJd0PsPIUAgX X-Microsoft-Antispam-Message-Info: hWyjsVRuaw/4q4MzKjDNzVVptGHGMxTNx5s5GcIdEAeBTdgMHVI95VIIRy7FUeFLQdhTtwALh40fHoLfQLxgVUaAp+qEIrLAYawweA++KLMkbuf1t3E87z3tcivRJTMifct58an1gisiRNcoqAW86odJVGYsEJrwqqc2V3C0yA/LO4WXogs9AHMbmxF48eaX X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:nzt1DiPb8Z9mwYVYFGuvHJrY8XwQLk3qrEc/3tzj5FWIOJ89ba3d680eBes2NORTSx8QKKYcJW5vbMnmMIVCf5+B9kdiliavQpiGSNzf3MJSxbIYkgy5/mRCfoAmkMyX/sYHidaMUbCx5tsSBoi/Gvsz50ENCQKdXnNFBLJD13s8Vveq3mq/ztV0syN6v6zav5cW9aZO2LfpvyWbnORz2NY42E03K1tNnwLNClTm7hCfT0HiZ6Fh6Ft5e0nmoNuiq4ksj0JjV7LIq9U6Crf34SbCNvHFKsVR6KkED8jdLWuAhsLa1S+kGnE7/NSKW6pZSp6zHifBX1cW2bKr1knbPj6FmFUIQ1KKcITzR0Gsnkc=; 5:1sVY/Jt7G63jrB+lyW79S+98huTdLVk5RlEh9DcG/5yJthgzebUHYKTKIx1cNiJPJnF+F64wdvA5F4BZ2VfC4yhdH82NyAZhi056zgwp4VH+Ia/GPNaBNb5386Zxa7LGRXLh+kBleSNW8Z9vftropmSWuh1Fr2uRu7h/5CryMkE=; 24:t7ynFMSX8Q4nhSisvmN5B8mCCQjvoF3ATQq4CSeUxkiT3KkBHYCv/xHCJND5jj8ioZSKxqOeF+lJiFWXn5AlP1h7zWAm0/4jjzt6f8cdFBc=; 7:c25ougg6+WsHIcQbEAgK69WJl2+6WIH3xShchVE4wgXzsHbmTaSOVcDc8KTqthpkNAcGJR2W31soFclti18xuC6HnDnbByDR3OdVw65XOZj8nZFOwr0kK4Vzh6YHVK6I3dJP06dWqZ26iPhA4IzvXOZFvrTFHpwdQJVOoHTwnRBQvUORAsMbTVdL/3loua/QEKDOFXMQaV5gN0Y8NiHEhUDBmmUVgjTA7jYQPxZqpaTv5+QDqdO+BNjvLRBDmei+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:ht+lYvn3SghH+E0rTvd2i1Ab6TQgt2t7hH/USqGqYcPBCnuOjDONSmIbGIOQJpiYTWfVTo39zC7CUb/Gu66bwcPjLKjQb9zjKMH6zCEd0+5IiFoVmtmFtjXk3/EGcbW7I3sQyOTJLjqlDsHJgeJbXcA7OPhb66KFIvjmOQ7UEuaJTnGBjXZ65BirLjg9ZMz34StCm3NnLhkM1YY7Wkcw0MUDTC1yy2K+p9rSlXuVrgpp59Ut+RTCby/wTbIPdr6U X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:08.0031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce8d7535-baf1-4848-3519-08d584f3208f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.55 Subject: [Qemu-devel] [PATCH v12 18/28] sev/i386: add support to LAUNCH_MEASURE command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" During machine creation we encrypted the guest bios image, the LAUNCH_MEASURE command can be used to retrieve the measurement of the encrypted memory region. This measurement is a signature of the memory contents that can be sent to the guest owner as an attestation that the memory was encrypted correctly by the firmware. VM management tools like libvirt can query the measurement using query-sev-launch-measure QMP command. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/sev-stub.c | 5 ++++ target/i386/sev.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 2 ++ target/i386/trace-events | 1 + 4 files changed, 71 insertions(+) diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c index c86d8c139237..2f61c32ec975 100644 --- a/target/i386/sev-stub.c +++ b/target/i386/sev-stub.c @@ -39,3 +39,8 @@ uint32_t sev_get_reduced_phys_bits(void) { return 0; } + +char *sev_get_launch_measurement(void) +{ + return NULL; +} diff --git a/target/i386/sev.c b/target/i386/sev.c index cb0bf84742ed..7ad7eaf600a7 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -516,6 +516,68 @@ sev_launch_update_data(uint8_t *addr, uint64_t len) return ret; } +static void +sev_launch_get_measure(Notifier *notifier, void *unused) +{ + int ret, error; + guchar *data; + SEVState *s = sev_state; + struct kvm_sev_launch_measure *measurement; + + if (!sev_check_state(SEV_STATE_LUPDATE)) { + return; + } + + measurement = g_new0(struct kvm_sev_launch_measure, 1); + + /* query the measurement blob length */ + ret = sev_ioctl(sev_state->sev_fd, KVM_SEV_LAUNCH_MEASURE, + measurement, &error); + if (!measurement->len) { + error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'", + __func__, ret, error, fw_error_to_str(errno)); + goto free_measurement; + } + + data = g_new0(guchar, measurement->len); + measurement->uaddr = (unsigned long)data; + + /* get the measurement blob */ + ret = sev_ioctl(sev_state->sev_fd, KVM_SEV_LAUNCH_MEASURE, + measurement, &error); + if (ret) { + error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'", + __func__, ret, error, fw_error_to_str(errno)); + goto free_data; + } + + sev_set_guest_state(SEV_STATE_LSECRET); + + /* encode the measurement value and emit the event */ + s->measurement = g_base64_encode(data, measurement->len); + trace_kvm_sev_launch_measurement(s->measurement); + +free_data: + g_free(data); +free_measurement: + g_free(measurement); +} + +char * +sev_get_launch_measurement(void) +{ + if (sev_state && + sev_state->state >= SEV_STATE_LSECRET) { + return g_strdup(sev_state->measurement); + } + + return NULL; +} + +static Notifier sev_machine_done_notify = { + .notify = sev_launch_get_measure, +}; + void * sev_guest_init(const char *id) { @@ -593,6 +655,7 @@ sev_guest_init(const char *id) } ram_block_notifier_add(&sev_ram_notifier); + qemu_add_machine_init_done_notifier(&sev_machine_done_notify); return s; err: diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index 924cebcab02d..6e370775770e 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -37,6 +37,7 @@ extern uint64_t sev_get_me_mask(void); extern SevInfo *sev_get_info(void); extern uint32_t sev_get_cbit_position(void); extern uint32_t sev_get_reduced_phys_bits(void); +extern char *sev_get_launch_measurement(void); typedef struct QSevGuestInfo QSevGuestInfo; typedef struct QSevGuestInfoClass QSevGuestInfoClass; @@ -78,6 +79,7 @@ struct SEVState { uint32_t handle; int sev_fd; SevState state; + gchar *measurement; }; typedef struct SEVState SEVState; diff --git a/target/i386/trace-events b/target/i386/trace-events index c0cd8e93217f..f7a1a1e6b85c 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -13,3 +13,4 @@ kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu" kvm_sev_change_state(const char *old, const char *new) "%s -> %s" kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p" kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64 +kvm_sev_launch_measurement(const char *value) "data %s" From patchwork Thu Mar 8 12:48:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="qPVFh1va"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrJM309Qz9sgk for ; Fri, 9 Mar 2018 00:02:11 +1100 (AEDT) Received: from localhost ([::1]:38528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvBP-0007Ku-B3 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:02:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv01-0005ak-Q2 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzx-0004GJ-Lv for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:21 -0500 Received: from mail-cys01nam02on0053.outbound.protection.outlook.com ([104.47.37.53]:44877 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzx-0004EQ-8Y for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:17 -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=APtFSfmfQbRUvav+PgJ/V/oQLME46VKmdYbsWGac5Eg=; b=qPVFh1vaoNEXXqXf3BefU3Er4/KAd5YfoItZGKpbY3wKWKPhG/3kHIpGhA7e8KUM5x/SlFccg0mhE943YYFzRZXSDrZpUchwNxbFDl4RRg9iTU2IGCi8oBiXN+Fb70lh8DGV56ti2CBoiGERe2X+CBsVLBzGsS0VwqoGeVZFVDg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:10 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:52 -0600 Message-Id: <20180308124901.83533-20-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 15ea17c2-b2d0-4c38-fda5-08d584f321fb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:ORfIyAfrh0z8cVDJlBqtcB5BnCvauDVCnx0192FkkXQ1ogrNVEBvigZP4rJ5VW8j8FkT8qJ+gmOv2yWy5FsRRmZxjtzXyJD+mocYBKOKnEvNCDd29h6GP0M6hPKOj+5cDJSAz3awWYp9kfVvwG23wc0tA8BHPW/yKBQ04N/wmi+TbuG6eJMMAyCGg2n1fB2J6O5UrZf/TmhGAaugva+zj3LfiT0YFrddE9je1De/1BE31ZZ6HZIt3JKPNo1YT1H/; 25:3hUaIbEk24OrBNw29b2KvKv4MK3B+YK3+hHicN8BpFnRcJfWHxPBsOldnClss3cCJGEpX2qv8naIN4hsi1VZrAifE3B+nNDAOw+/DsqMAZDUWLHGsPFI1uyK+5m+SCGJeVJM+bclIel/L1I8xe9mao2CcKMbEtwm8dGUCQtAwGVnW8/Hp81vXfSqBfBsakmB6NokScDXavJ9hHxRpYMFnpXqDfU915e+BrNVrHh3ZPcJskK1HYoT5OfWOiMSPlPat0fL8HP76ZopxFePhTwB7qhn8HQNQwKVRKiESU46vXXoo39k0nVp1Eml8mUOc4D1OtzHS9sFEEPn+8jNR8d61Q==; 31:Xfq6wtWIJe3XDxIYiR8t2tVcT0JCEwnHNB2DE/vY3b/FfWyKt8SSrBWEf5jS6Qo7SJbPPiT7WjTd+NLF+QUQvu0rOiNIQlb74CARuK4l6s9fW05PQ2ml/X4fRQvOTc8RpObKUnBe3l8ZFjOL/j5PebYCXjK/0q/4twZrwNRNQsWOo0XpMXMxa90iUrrX7DDxRH3BVWcXEaKf50YVJ8rD1SagDe6bl1IBZQSzbEefU8E= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:tfBOboT8vGB9jQn2RaSaz3EKhzgkaVN/S91k18B2iQxt8Z38xcJNvY0ioByDd0tTf2q5OcQupVS2z7GjCWUYUSQ4z5CJmF2Sg3AF+FnFkT7P6aXuFpRy0UfQaHj1ZfLEIJSNzCrv7muCFRnIEv6Jd/Nz3QxdWgAXrWQA6htO+WXQ7wYByARVs/ZCKfKrNMKm1nmg68o5HxVjtATz46+/c62u2VLXhwPgTifcsbs/OOooH2UcdCi4QGkVHP5FwVtDWCGR7Hm7ZGzHTFYNLzt8tyfvv3Ynv3BXEB6Gm8KA6MYOGGE5GPKuiLW/SHTlzHmkjdthYdtNnxgcHNYUNKBxkhHP+xwyburGLMd+HRPvKOIpl7TuJ02zyL4fN76gOOPBpvkhd1Mehj8hSJEzfgKjS4stDdtPFI48AN5xtsO6XVVdgqAaBsgvgx3c4O/WDAiphEhcJg374Mne7lwDu8+QI67/5tBiG5b/nr9audTnIJNBVYNmYHmVJsFBDCgQHSkr; 4:pcYkULqoOKoOTlxJHSgbUXYzFjsYY2fSVe0PyZIrq4ZGB8VxqtKImouBotedGhpTy+WKkdi1qdB/6oFih58q5VMbUU2s1Rbpt2BHvsPdFGXqdpeXwKozh+bmAzeC5heSoBV3DFpuF9a1vH3iowuf744rg/quzUBzfvUp1vez7/Jcibr6PTr/Qakebq/i4ZVvLJsC1bAJGlN9jAqF7E/e8YKznRGxopAopsULCGrCfwBDiwz35SXTfGRYepmQPbhwFLjhUFhURwO+hgy00uJ0jB+gXOqzYsyhQPeip3GXF8X31fkA1iWix+C2AB3/En7x 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:4GxRtY1GURom7prm1L1xvqAHKPwFoIO9b8/ekPvqh?= d7aWW019FVVqvksoJmhurpHai8JQjr/vK5e9wuH4gGu00USovKCmGu5089gx1R3uyxtB5t83XlXdVKbOBApqVOD1b6QSvOyoGjz86N+v5Jy52aRpiMyEFHgPLl1njXejyA0AjI7Nl2jaiXv+W73yn1mLZVD2uGwvp01Kfm3YfAxETj9iZukSfkQz2VAXA/erXuHwEZX2jGnu+Grcaf2URYeyKvipF4c8og7oZgsvvzIy71cJL7Cr0zH/vTITwvI55TWIoh7ETZA9JtB27kiGu7wJ8FALZlKXz05joe83ONRPyQTphjkBHdIBpzLDqXS22yhdVRhsvWzn4HPVFNEKnQ0bG73/RBoUFuFHOL7SOCjBe4oy584aCpyIGM8i2YZvMYJ5ZG2X9XVmW+OAIwBXfU/PI6/YWKVi1/tG4hT6YEIZwrxqk15047p5qssuewzoWvPTeDL5qcL3OSAlhGVW5yrfeKLkC23zUNH/OcHbdggCvomt5dFcBwgUTq7PG2P5uUPZRX0yo2ei4EMQsVBMaXdpyuBmB5bAeJ4pEx8UQ7ZBqEwsP1E0B75bV+EM/jJ5PfmAOKmCEK/YLbmYeQ1FIxbuhh1nAtQ5fcsb6YA2Hfugohe7XKLc15RcFNIuw+OZctB5BmX7YbUW4TGByn78gVrQNHMZADcXLQsEEWJ9sBUY5zie5gUQz/KjTI/6srqaNBC673B/BK8Hy4AbYNBD8P9XuYovzZ5oMzZbGtRqkk6frOgw/z13e1KzKxCBWcgXfsyYRcvS1BYE6P3A0yEOvh8FCOLZMihx0JU8ToAVKL1QUX3z0vUEZDzicPtpvn54M9sl5CPCHbLpgyNjHAgAWAqJbdgUEGVU6umpaTqaNwA1QBB02ax/qSBN9xfknQcgtJ57KUK4bEcpQI/pU7V6FyRQXJiHexTkeOK5Q4q8eLqjh/tS8U8X0uv18NDyOQ6Ohyeg5r/YiC2EyB3wRGpoEdpmfBtEPIzQe4vP8ITxxQFjO+aktJdNK8OL2jHM1HCHOD19VlY3X9kpNpwE2z8uGT5i3i77vSoF4E3a7lDUKYtYaMMsTmLOW69d2KIohM9R455Lrr+/nuG//Q9DDuWIiLeNiy+tounNqh67FeT3UsuKwWvqFEXVot2jhD5kIopTKkXayEyTANlEbzIdfGFOprxQbMjjeB20pciZK/QCWYensYD7g5J3H9gDsMWPl+wI6gKRrU7ZnuVXtjrCPPOe/XcQIN1DAT+cqPTThrS9OzlTOhQgi8hzT+bXDkqzlFhftQ= X-Microsoft-Antispam-Message-Info: hzHOsgIr49STsAVjdSbW+t7D4QW+QVysbJJ8kunT+IJ6tlzjV0X/FTkk80EtVLaFT/AkIyySGpRuNlKj5SVqpbhy9Jr9G1LLFKIJ5CJ7APuFHhlUCxL/ReqPYQMbQ7wBy19/05gMNU4PN0zxCIT+UxfyzwgYSobklaU2f3xWM3dUCiD8K6MWE6ZoQy/0r+Hp X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:B0X3WgFWQ1f9QGxM1dCopFgKl/fyrR6S1zCT/zFgKiI/eIhZqYnToZ3i+aqcTuigMWfd2LdPe4wcQaBOEyUETZ5K+7JBQjl/nU4K059CVKmAm8sw2KLEFH58geuZnTBFcYV//kuzv1B/bLv+af+AysaLEACzIz1RoFCVu00EaAgxKk3UUKQn98lh0gOlcjYWuSzxztVO9lQ19ukWl3VE69SXeUe+fYeCx5yGde1taWjrux9asK4k0XQ9Dt7F0D+BWCka9Vh4QgPAwPZKM2KUcLS95lY9lpENCzUckm5xsJAYo+57woIOZeYgDTjLVRE8TIDJS530f+QlVF696iyvXkCf8GJgWG2yRAACMx3heWg=; 5:8KDAN/NeiA8Lq3cGhVwRbenQvA2dSSacowO0lkPbFZTWKs4QsrqVzZi9Xn0s5/eq4hamMkRILHVn8QuqHHi9XNHUHkpwDFre1bw5DP5wCBXPHezwMId4OIqsqyRj9IO7Exe2ZiaRC3F16p71sI1Jn7FphQwpC3g/K/szlUiDfI4=; 24:68YIjyr7ybVdKXf9JO1ArrnljKQQ2ObivuoFEfn8fK3AMCdgN6gr79zrIgeLD3EwoNt5lK1tX4NgnEXGMPONLaq7R6EaGndz3abO0EguU4A=; 7:jo9gZEhk2UmGZqicSIqwq7tuR/IZki5pmTAcKgyawbHmFndWKkTzjsTqhptk2VUJjeNCHPCvhw2b/GfmCiqvNPz93pR9WXCYSwNp1iuU0wed9OBFTua1vN6CfqvM19OFtz/XZA8GMscIDneSHv0l3UdUARKchUDwaznFt2/BdFX24NfdsScKI6JE/ycogt+7Aurh0vGfcDS9RCh1fTD7Q+ut6o4dTzTwrgHOAb69uhjTsj5IO0X8xLHqHHnbwF2R SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:hS7xRBsLSyUJEA+Fw6BQ+6uSAUx+LGQhdXUlyd18bvEUwjQgYjMFeA48ICtahXauHS6uuUhersIrm99UKe3u82Ky45RcxZo+cylokf2kv62XLPAvPBvyPwo5o9iylGzibGvjgCxiuHahbbfbvHHJWBQ1O9Z5to4vdGaBjswVHSJKiOgABDvLaa+2QJILLTf1DF5XnSbLqtMjknJN+YFGb8OwxpEElFbcjrRNcsPd9tFA6SaxISOEw7wXRVc4Ur5w X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:10.4406 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15ea17c2-b2d0-4c38-fda5-08d584f321fb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.53 Subject: [Qemu-devel] [PATCH v12 19/28] sev/i386: finalize the SEV guest launch flow X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" SEV launch flow requires us to issue LAUNCH_FINISH command before guest is ready to run. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/sev.c | 29 +++++++++++++++++++++++++++++ target/i386/trace-events | 1 + 2 files changed, 30 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 7ad7eaf600a7..ce199d259f7a 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -578,6 +578,34 @@ static Notifier sev_machine_done_notify = { .notify = sev_launch_get_measure, }; +static void +sev_launch_finish(SEVState *s) +{ + int ret, error; + + trace_kvm_sev_launch_finish(); + ret = sev_ioctl(sev_state->sev_fd, KVM_SEV_LAUNCH_FINISH, 0, &error); + if (ret) { + error_report("%s: LAUNCH_FINISH ret=%d fw_error=%d '%s'", + __func__, ret, error, fw_error_to_str(error)); + exit(1); + } + + sev_set_guest_state(SEV_STATE_RUNNING); +} + +static void +sev_vm_state_change(void *opaque, int running, RunState state) +{ + SEVState *s = opaque; + + if (running) { + if (!sev_check_state(SEV_STATE_RUNNING)) { + sev_launch_finish(s); + } + } +} + void * sev_guest_init(const char *id) { @@ -656,6 +684,7 @@ sev_guest_init(const char *id) ram_block_notifier_add(&sev_ram_notifier); qemu_add_machine_init_done_notifier(&sev_machine_done_notify); + qemu_add_vm_change_state_handler(sev_vm_state_change, s); return s; err: diff --git a/target/i386/trace-events b/target/i386/trace-events index f7a1a1e6b85c..b1fbde6e40fe 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -14,3 +14,4 @@ kvm_sev_change_state(const char *old, const char *new) "%s -> %s" kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p" kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64 kvm_sev_launch_measurement(const char *value) "data %s" +kvm_sev_launch_finish(void) "" From patchwork Thu Mar 8 12:48:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="RO6C01ut"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrJg6ctfz9scc for ; Fri, 9 Mar 2018 00:02:27 +1100 (AEDT) Received: from localhost ([::1]:38530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvBh-0007cf-N2 for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:02:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv02-0005be-G5 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzy-0004H8-Gw for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:22 -0500 Received: from mail-cys01nam02on0064.outbound.protection.outlook.com ([104.47.37.64]:3232 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etuzy-0004GP-9p for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:18 -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=ra6TVBAsE4wXKqwHwKVuBWhQVebjqTlAfcFmIJelUSI=; b=RO6C01ut6wiUfa+I/4sHwH5JVged2NTeiHqN8sA0WKWNYaxVWmc/pegAfaRx2dnSeZI8I8XwjUi2Rh+uL+VOIkjyvXQ0W8oWbJ/zdV7/qmUbIAP0q4j71RsjKTJjGLQNflT4rjL1FxleO4h92ZkQPTJZvleIvHFxr7R//H4rxmA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:12 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:53 -0600 Message-Id: <20180308124901.83533-21-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5acd4685-2a31-4072-ed3f-08d584f3236f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:hLjj1L0C7IkU4M5DWy5tdrlIRGh1deV0CIsJlFXo6qSMXhN5XxBSkDzmOP043oCQ8RoDPqjVqA1y8HsvGFoAWXhEUjrdsxkC0ohvrh1jBUxyw3X0pOIzCV/5MD5oM9Ats6B71bUkXSECTRSB8YOX04lTJAA8abrTV/F7ygjEZAuyc+2R1BYR2ImGr3GavvhUmqLwxHsUKcdh9FS2EJGr+9LqRB19m2SoJoV4DiGu1Z/NSa3EI1AgWERQaZJW47JA; 25:E56QznTzTSwzI68Uj4nc9IFox0cP2jLi37MBQTmjgdR+vwvXR9WsAllVK2jj34MxYdbj/X1umXqInO1uMZNJax0SFc8KSdwRCh5Au2O8fSO9RqFFWY4k7NLfd6H0VOz+BpInnSRPCgFjvv6vTiMovwagpNuFoR5/R5UXT/CDgC0kF/j1LWVS2Sf921K5t1oXlccMVSiEAQE4a21XQn4nY81jiS3a4Mw3Lq2AoMzRkjkAbs4bjKBgDuqQ6frlY6BQLgpkjRjPHvuvqvWQIBDfzsNV+0Fof4y1wKh4wkUoAWdz4ItWwoh302+0Bb/o1dFXRJUj5ek8gj2on/rELVYl8A==; 31:qJa1Z80AXDdrpBYLI24tchser9Z3Z32DEJnUnfzW2aMKMf020IqVNIdnnkmn/QgNYWR/sFpNcAId7XoF1l3hZBye9kH2W3c9dRl+uNa58QLXzKNxbDe8UDpoYbsVS3KfQozq2jK5xdkc13rCW9m1tTQ2LRqlqcsHkEHNrxv+pfM3tz7VbLmo8virjXxIdov9/2oYlMZKWk5i1iVx1MqK9FGooq+ucq4iUrTo6S/5hLY= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:Zlh4myGfm65/ZMiDDZZxCYqA/46s260/5/AtWnxgNiBWuHQ8Z9p4R1TOu2WF/fc2RE2ORE4fw09MAhjWuq2B2iGaaoo/927ggpj6zIN3vpJWua5Maj6jsgR3vGOr3cvBIrI1B9YUW5oQFKAeuaQ98BuCoUft2jA5E6rbMOfDhBYQuKCxjefU1SXbdYnAsv2CbgJCwwNgSk1O+tk05z6k8fz7eVl7Oj46jytdUjAbXzmNPf4Qm4n3OzD1ojfPbwQ/hClgSE2c15zL9kSniZeaAIzALIxIsUPb4V5k9aNx+WRgBFe8KHPiaLiAvO6fg+6lq/Mxw22PhnmHOztC3IEnDQmrxE+6avQUC63Ps8y7qDjrygLUAex9d1O+mwR1+TmuaLEH+wg30daPt7u2iZaa1Y3+XU86hUHlJHcQuTzS8vW8oGDmvbO1BYvCdXCP40ZEMeGLmHs8A2enWyZZfeFb/2kiIg5uZgMZN+i/drDm0rL+F9aPtK64Ja4UrCDbyClv; 4:ZJmNamMk+0llzn277elQS13MUE5J2/R+jQeA+VUVKkqCzflu0ub9ICsVLlMVe2SKNNqxT2ys+Ge97/AXiC5TBZ8bl14BwBg49rmKphZb7MUYJLSZSw6R2sko8rlwMWvJE/m1dy0BGRNrDu15/mBsywpD/vDAQ2atmNo/MZLRFTbopsZrCt+F4UKaipeBZCwYJG2J7dWhZ1rM4WN9mmiG5dceHnSleK6NbF058LcxpWoBpO28MBe5gt9osHfTEZ/Ix4wnalDitSjDhcK6EPd+024XIibOegDKee2Gz80/J7TnRfI6DJXMG7xp0Hb+c4f7 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:ZfmQHrRER+K6AMX/BWQ0JHFqyrnRcsBxvNuqHRELv?= btSA2jam7O3G2OofMQOBFEDIim6DlqwEyqCW01N9i1n8AR1H7gi/uz7+UMF8k2aMmzfLl6Z0z+2LpwCZjzHxEouzuEAHaigqANcRGj9t992Ugxac8xonIEHBF6hSnsozYwRppj3iIG5OqSc8EHRJg8bNzOJDMytsXdd8Ui8EFYuPrf3MV6Bzp/C8H6iWyWquiP7nTiUAsxl6z64qVlTybmULQGgoAxZ3zJWS5GfcLB/qQF98JuLo5DNl9kyH1gHhzxVwELb0kRqbeA1doJ6ZtI/xso5UOxTk6RL02Bru0lv7dWz8nL7iYhFipPr/vm8iv2llmF8OSV5tguplld2uygyy2tqOZKPYdusA/TZ3BilL/M3QQqBW/SD3bTJAJ3NxuT63xomKxTrSmXLZ4QZsF6kktaNVk00NkZFTmxjTTEaDLKNyHQtG8lhZvvrMqKccBIq8rz5ReRGxMZVXRkNi6U8MoZY8wz6y/jqZXn9/sUKL+rCI7lst560nfZCDEGWoUiz5DXmcWoJOMWfGtqTGkZ6E/USLjNctyCxtTxh+lewzz97hlFAizSIzWc340Nh+6cnuzpzKGXwOsjxAsTPuu4+az7QH39dty2OdkF7QrtULh9TU9Mye5v+KlZqV8B5OsfcVjEVKhmAJXFBE44UaHkOHnWnLgaDvJuCGVZWm9KrNSkcEC2iPQw3fsnpQ4BQmb6yD82oFmTNIUT7owfVsraO6qByCDziNXVrSLuUI6EyxU70+tWpVTFSgZjNHOFR6gIcJ6N9ynoOMDFlaE3u7r70ld+0krYozg5zU5l9YAf40VC0uqLji1eAQjfCrmWO1+uWJzl+Pc2BxcYNqY2qQSkiZWLn0P0AYjZzHIxv+AxGJ8/mZy1y2QQ8UiNkUH8OmtRjGVQccArJ79RR6VY7p9YIdJwLk5okSnwd2gUvD6rqiW/eS03Di4B/vqgSA5cFA01AUD6K67B2dOQqtlebYpbh4phqW7RTdufci1Q7mcQB4DC6RMwmze2gvXY16Z6u1AtI6J19dE9y7W+Eg9vqPqL9lbbtxnOQpnuUdTpXIxOXmJmle/zjVlwjOhLknDtXLzwDPGkhQ5FMBimqyNYmKnJIwRrDEfzM4kki6MMhWrmyHnbNikryc29sbmGeghoMuN9tEv08iQ+tChNxXBVKcIm+3wCLSPeKZ23W2i8s0yCJKL2DARLJ5U1zTCCJrjyq40YlnGTNUgx5KPWzhZDvg4AxO8eWL7aw6rob310G/ktyoad2PiRENyXFlLFSSe6Lyh8= X-Microsoft-Antispam-Message-Info: LBvHqXUVg1KRXcZa6JY/smutE6mAhecFBV95stA7+cQVk23qAvMnfsGrzofzy0O7Q0Q8pERQg/N+9KHG1CNFQQllOeODZXMaThXG8bQ1IZo4ShOZZSrmP3rntEh8OjO4Y3Rw5GPpPw8vyDkGiSG12B18I8UonR8EvWqxoUVldl4s7pXeCm8vIM/GggQlq5rS X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:QYbENyTovOd7bUaggtUSPAD5aUWFzW7PBVe97GattqsEFpSv0od9qBRFtTbU7NVsYZrqjTrCftHSzb7MkIOIdzT5P9NhNZbx3i/2eEDYzfpVXppwcb0cSyEGQURGkRX+GBTZI6r0FEvUCXVFCaCw9E/H1khb+2Lak9X++qOOxZbeVTtN9gNp1/PRVS/YxDU8Bscl1C+nQwh87nwaa2wGlohHZ4zWqXw5ebyv5/BRM9VpQdBhVJYLGvzmdl9MygpzeZ6QdSUwuKcgKUnwiGzx7y8DYbb0u1qRM2MIdaRHysywYJ22miumN6csS5KGP9j/E9cFRqWUSMWhXWTbnQWBwLK+5ejSdEsYrNmNBnVF+PU=; 5:z83GMS4ngEkmgd0d/875DtQqnhxeoWeffG7AZI7AMoKTA+FSdNC3qpGyoM05XeSGuH+8FuX58lg7MsPIdw3cqf0GFd8O1vf+zVqL+d7fJMZaztmex/d26ukts7pa9Gg/hfK3/TUSB8p0nHqFsPuECH+cEDmXAJ8Xp8c96WzROuc=; 24:WItoSQuIfqalVUzqg2XZwEdkc6xFMnG2NXlh1tGqHlerC8ChjZsDcJ6o65AJmti0kXAuH9AJZMmiOiJvyzU9Drpm1xU6TC14m77KzW8Q+OY=; 7:0h50U3JaiVwNBms4evyVzJvBPRUMR/Iup2IlvLuheXiLetJqPV8MBDup0yE1z90FHnvB8Rrr9cDRZmTulXmHd+XIYrfQ9PHxIYoNKhz0/sSfMQfA2Z91jUvMPKX99RDaz5QM+NeJ/eNKkSzERyiO6P0THhVVvQr2MrZceBJ97HW0tgLPXynHbssGJvBkfNdvwtWNwYjlDhuGpJd/zuQJ/AA2oRZYGQeP7EslnDUFH77aQMUF4E1iusFxBfT5OLjI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:zgnka5ZhgJdift9nFWPtboOosO7ks2hi+fULdD6KsvXyDBjPpfQxgkBuEpXr+kK67LE8QR5EeMFyiTKFnaey4o9yk6OVNKCofUzr5BnvQW2DRR24bnXq/afp0TPFXDuattRLA+vGbWrVhpCUMit5PvbYRTOGSZSux3EDtKM0CIWYlDRH0I3DVz/IwNEkK52N2n9Muew1OwanVU59Aa7NpMtpOdm9iGVGBMhH7z/xHELzSSHqNKLU8mNdw6vmIv9C X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:12.8468 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5acd4685-2a31-4072-ed3f-08d584f3236f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.64 Subject: [Qemu-devel] [PATCH v12 20/28] hw/i386: set ram_debug_ops when memory encryption is enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When memory encryption is enabled, the guest RAM and boot flash ROM will contain the encrypted data. By setting the debug ops allow us to invoke encryption APIs when accessing the memory for the debug purposes. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: "Michael S. Tsirkin" Signed-off-by: Brijesh Singh --- hw/i386/pc.c | 9 +++++++++ hw/i386/pc_sysfw.c | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 35fcb6efdfb9..69364b6856b5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1360,6 +1360,15 @@ void pc_memory_init(PCMachineState *pcms, e820_add_entry(0x100000000ULL, pcms->above_4g_mem_size, E820_RAM); } + /* + * When memory encryption is enabled, the guest RAM will be encrypted with + * a guest unique key. Set the debug ops so that any debug access to the + * guest RAM will go through the memory encryption APIs. + */ + if (kvm_memcrypt_enabled()) { + kvm_memcrypt_set_debug_ops(ram); + } + if (!pcmc->has_reserved_memory && (machine->ram_slots || (machine->maxram_size > machine->ram_size))) { diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 73ac783f2055..845240f97293 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -181,6 +181,12 @@ static void pc_system_flash_init(MemoryRegion *rom_memory) error_report("failed to encrypt pflash rom"); exit(1); } + + /* + * The pflash ROM is encrypted, set the debug ops so that any + * debug accesses will use memory encryption APIs. + */ + kvm_memcrypt_set_debug_ops(flash_mem); } } } From patchwork Thu Mar 8 12:48:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="mh270nJN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrNS37phz9skq for ; Fri, 9 Mar 2018 00:05:43 +1100 (AEDT) Received: from localhost ([::1]:38543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvEp-0001lK-8P for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:05:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv02-0005bx-T0 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv01-0004Ir-PF for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:22 -0500 Received: from mail-co1nam03on060c.outbound.protection.outlook.com ([2a01:111:f400:fe48::60c]:52390 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv01-0004IJ-BG for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:21 -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=aOi0TlMSWcEonwAqPnjkGuqrw1pONvn0fC1V7iTcvP0=; b=mh270nJNGlDejy1N5sIxHTwFhsfwNnd1UxLOhbmjZp68YB2bSdcD2fkOoQkMS/un2KQ1fbrvo1aqHvpxWE9YCQGFW49TBaGYn5w8uLHCrotS4nvj2EAGbdYZ4i6Btn8OLOGU21HhBPJZ+GqOZrXyXkhc3HOMp+0Da1iq5xYcxsE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:15 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:54 -0600 Message-Id: <20180308124901.83533-22-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7253599c-cebe-4628-b5c5-08d584f324dc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:rzjqfyr0fYQYm7Z98uG/0NNKQAeu3DJ7dikhHNDbGrQrcF5KQeYUGhvE07cetTPGG2lXlwMhh5OyZHv7KbWuMhKtc5A+W1H6fnnooNi3/UsSFgVdiDzRSuUTaU3zZY6wC7RXAvl+J3xalN3sQ41mCIW3TYdULNjwOf+JH+vpXiANhKShkRlHEmaNG9tSFO3KfGYF7royzbgRMav8vw3XYVQVfY8b9dA379RHnKxe7gzg/APAQdDYUVaSKWsv7YMe; 25:49F6Z1gpeuIyaj+ZvqFx58a4ZOZ1R+YVrqz51Z/72QHNEqsVNrJ7JhaDemk3XCCVFIT2UIosMPSDbgUuTw6mzlgpg1nXltHuo1HQ0jyQRbg9G3KCVxqeIUCx17gqnbHBu76ApCVRQTEqk3RLsaBr47d/+vXF7ts+76dNKUMAndPcRdTAn1qr7LTB2XRFKIaOM+kIV8THNWiYT3bi0rnR8EeFr7XyqiDiEd9pfjfYn5aIzOdGpczd6AFb18jDtKvh+IodBvsmGNTD5ofy+BE85ZaO8QxGAGg6YFOBe0cD6hmcxUuagpFmgCc8wLjebbguZT2W04HI2KgokM5HnSL53A==; 31:jMCG6iB0D2DdrakIjYAdR6uxSlbI+f5MbGHOr2E5Tapq2vIjKtB/uD7sf+ZQC0iJBUxmxOneuFtAqqyUIKptvkzGVNbuTI6d41IP/+xCv/uJRuY74DoFqrm7nUD3ylsCrzyQWgKTilvqT/gft7ZFYP2ubDp7HCjsEOJZ3CdiBabFz7D6bAZ2J1vKd2RpioHOxp4bgc0VX5otOPfVzal7guK8B3eoSolxDgIfZvJZkvY= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:8nhrFUiESGlo7+/TN3//H7dKUZPQdLfo0hgCskKJtwhqBlD0+S4V7uWMzK7U07+b88q0AYf2yqwAxwRwjjpmMXa0qdwdWz3+Sd3FaeeKFWrOlovXmBEGe6UmWr5SkfUirrObNl9J7Brjs1cgGqksivTIolE1kTBrFoG96dnSbbhdOBb02+Yj/G6qY3tIwRXmbtYRUew5OBlBpFE03PrndNZ3KYzFFP+2Aun58RDVBDVDW1CSFf4yY/uo2wpdeJV0S/vS/qIzW70HN3YjVzGkOfrc3AxBLWyfWgTcJME5P0HLUzfpWMckCDNMU2CqRO2JQyEdVOwqTBIpPpD+LHEcZ34y/FUk1e6vLLcBiIPCGn+h96MTOvdCi1iNm+wlaJBcgNkL2gkuwAhThUqLd7vPBHva5NwKs719W7Xs+jbot4yt2OGYbetoaz9JXRlV4Pwxi5it0TgOTHNODxzlYealNamsoKZwxk02NH1QYjwtO0hh8P3jHt0Ka7Xh7Q4EEZow; 4:JtwFRzAkStEb3wLDIfPLz0D34W7qutg+Nisc+iJm01UGHlhCTlL0faFPgo//j4Jc8s75NFDEWKqdx4+kIzGbq48Gprt0Vkr9ux7J1IQUcVT+3VK6Da7mYUVz6zb/pectKrl2W65Dksp6T00j1+CcC0LnRaEvrw9r+YgjD4Og2b1GGamq5eH8/YCJ/Ll3PcVmaXdlXQ+qK3ObNsOz2WdOuF8HUfdThEbKqH/FoTt/Y6y+0g5f37N6yXLdw0cLz/o8Gcg3emrYpjnWwMZpxwMpDKse41uekLTByZlIj4jkv6PtI+qJ/SUILoK4S1tuDJBk 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:tMd1J412SyybdNUBFJloslca80WxuT3xWKOc18zr/?= GV+ZMkU7I/d11iy3YGghQVHoh/VyObRdSPBM/NIWe79Olsw0GtAZjYLVQ7WnJgB9vUcOwYEKYlYyCNu05XxrUXEEklju1uOUPj9BXO3vWL4C9nUfJBOENFB01L10eK2R/dA7IZJUJv2lh9uqFvQIJfWWKGYSRz8ZzLSoK/9DoSXmVa3LmaepM/kWKLRArmJnNt/1EgO/VhI+CkoMpp0/Q7LjI9xL87wb5ZVt6T2e5blKecCOodCbOIjUuSaJYlLOiLc5qIXSshlWVnv6ejHDykaDaoja8HDafgyKOmyNDWmLF+iQ65+WxU1yncRE7WXUKCM8V877I6bKCdk6h8o57kyZJnh2n9Qj956BHeXsNK5/+vo1k4eIMYv3wqYr9/5C01zdyA46Cijn0VuqchMXkyCoq+obojV7ynjJzBIsWKrz11PjgQC2CvT1EcRm0WsYkNVpZSuJTdyaHZxZgtkfmNqK9156irvomMyZMaxHyam0eCuQUumSY4WmGbqzoTNWbO+SbYE1IDhSwLsWcwz3D1zIEjKq16C4DUjoABL4OB95KN4f17uYeZryLaS0L66ttHbUO9EXmGLhQdBeZi8f153JeTPFgLyYlM6iO0HjD5Hzy0CtOIkbifkI29qP67mtv0/Z53ILorzwYSZU0M62+TDdlsR6rfcRQ00nvepf0sg4hAfcudix7M2Cqc1Lh6mAoBjLQQTFM8Cdr8giYBmeUHhHcY7ue7xQPOr3Q3ZhB8LIv0T3YAoTesfnr/b/nIOvicnxVUIRzhnSZEDyvG06xzNG5fLVysE2o4ezeXt+7iHO7cs2K9mVXeEc1WJTOuyxlaDbeXJ22ZF7YMnKKQuA0O8DjkrZogddCZ9LsdF7r/atAdLm7HVPYhmP/cG8PYkPNoermaAYi6p860cvoP9vQhV7mIdC88nWwkr5nF4sraGAewOla+O0h6bfw3jeFHRfO6b07jcEs/o5E9UGLJywFqw0wh8zDOMHjhzfAjBPIz4ALmkGWIweIBqOyUIYdpJJFesInkH2e8QQEDaZZu242hGh9qZxpNZnFu+bc2oK/TsFINejEiKyorr2Q6MjMbzimii2K3aEU462i7P/0t10r4MT762VmuXGXyfEXq3xt16FarIiUUXxdRTBWOJM4AQDChpDPmCz24ZQ5ieMVGgUI/yADf3LjwlNofp9ARS2+dS4J/bfgE7ch3GHvqGUU7oKkEOKXGzbtR3Qb9HR5sGCMV3hwcaADJtrlYcuWqoer5exLyMXj2BpS+zvMpG3Ws85wE= X-Microsoft-Antispam-Message-Info: wAmd2JctjGdvw1UBaXnCFIFmcMQ9KZXJLDeKTaEqVIDBNpk5evRNMtTywtPJPQxSl//JWghpTR45v0MFjyuHA5XLhryG0GT5m6r4ZBNJLd/Pm9+V/J+O5QrgFS1gdqA/LsLznPKdMmsUMiqiLqXEBq4o8bwUFONZcBQNt7qTed+MyCMj6uIPPQzB9UC4YY1O X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:cIL9dDDyRovKThpgchcEAW6jxwbVEwaKnbdjWX7X72DjbYE6rccrZhwGNCjUtwIGPO8IlKwNb7maRQBY6tN5yVpYz0T01hdBvHN6Ewq03VpbVcQHnR7cSplj1H9XesWVHeeP3n7hdlHfcswcXZHH8+7iD8hpUnFJd7Pb+4xD+ZeoBZwg4BzyRMzqiZX88iBGOZR7BRhYlOakOkKvahxoApMCJl4KoZH0Tu5hhkhlED/6uh9Qbfl9w82laRObaya0yz2jJYkbW5yyrU4l4kN7BHGdn4VTJ+C/dCrqgwkpZYJrQ9xBJu2P82sP9dJasbZvrUVRKU0XQxDgNzLkqi0gw31EzaHp/YPLRN6XGmAFKPs=; 5:W/KeRdtjbioapw+LJSJ050VoPjJye6D7m9Xv6IrONj92OKqrBvipD0BUy048P5fEq5jqmI5RfLkfIzXl9iXu9xxio45vjmvj01/0PRkQ4EZMyc0VU6AygmA1UhKVF2uQvLlWLwO61GUVGsipEnx1t+ZVBZ/RgP2vUbl2/RrEjg0=; 24:tVpD4kVfE5+XRvVhiRbt479feyyCwjc+GKCQ03F5YEiMeGrf9268HHggXMCF6lE4ltLgvx0qGeBX6hp0iaiNNuWsUnZTAeBBhu/aeRn8d1M=; 7:j2e+BAHm8XEyHYuOncRO+8YfHioyh/WO0m73QSSdL+AsjMiaTCvjY8AncQC69RoQNJi/LSOGcDxQL+4ngn5ozR9MUFADIWARjgHgGMNgrrndHQKIPtZtsIYkSH7MLJ91fHW5w0eMQxxcVhsNcxOvMYdPJyhO73TMMXrn6Zd1upmjnqOWVczV6njYYCL+NrYxph8WJ+rexuEhtRNmbn4eRY+AEbPINc1xFyy1hk3pCECV6PGT8DmkzE31lNmonUPt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:Rdb4MEI/iCYF4fZAySDEn7zEfgb0KqAaCGW9Pbo+SWjpyQLB9+Y4cfDPQ2StJA6FrZVYcFRpQa6SQboWgG0x3vsigR+Etr8LIcW1UFKoLkImHbvTlTEAPmZfVHr4V4UnnFQftCch84cDGeN1m47k+F7G+aKxseWRxd/buTwCKXns/gofqOTapnuscVCtqtGmAjkl8Qqx9f9J4L7+FccGS0Nsi2dkpqSBhmkSZEQmb7TVtPpoZ7F2pdbqJa0BxtGT X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:15.2531 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7253599c-cebe-4628-b5c5-08d584f324dc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe48::60c Subject: [Qemu-devel] [PATCH v12 21/28] sev/i386: add debug encrypt and decrypt commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" KVM_SEV_DBG_DECRYPT and KVM_SEV_DBG_ENCRYPT commands are used for decrypting and encrypting guest memory region. The command works only if the guest policy allows the debugging. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- accel/kvm/kvm-all.c | 1 + stubs/sev.c | 4 ++++ target/i386/sev.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/trace-events | 1 + 4 files changed, 63 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 411aa87719e6..8089173491dd 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1682,6 +1682,7 @@ static int kvm_init(MachineState *ms) } kvm_state->memcrypt_encrypt_data = sev_encrypt_data; + kvm_state->memcrypt_debug_ops = sev_set_debug_ops; } ret = kvm_arch_init(ms, s); diff --git a/stubs/sev.c b/stubs/sev.c index 2e20f3b73a5b..73f5c7f93a67 100644 --- a/stubs/sev.c +++ b/stubs/sev.c @@ -15,6 +15,10 @@ #include "qemu-common.h" #include "sysemu/sev.h" +void sev_set_debug_ops(void *handle, MemoryRegion *mr) +{ +} + int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len) { return 1; diff --git a/target/i386/sev.c b/target/i386/sev.c index ce199d259f7a..f687e9e40e32 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -29,6 +29,7 @@ #define DEFAULT_SEV_DEVICE "/dev/sev" static SEVState *sev_state; +static MemoryRegionRAMReadWriteOps sev_ops; static const char *const sev_fw_errlist[] = { "", @@ -606,6 +607,46 @@ sev_vm_state_change(void *opaque, int running, RunState state) } } +static int +sev_dbg_enc_dec(uint8_t *dst, const uint8_t *src, uint32_t len, bool write) +{ + int ret, error; + struct kvm_sev_dbg dbg; + + dbg.src_uaddr = (unsigned long)src; + dbg.dst_uaddr = (unsigned long)dst; + dbg.len = len; + + trace_kvm_sev_debug(write ? "encrypt" : "decrypt", src, dst, len); + ret = sev_ioctl(sev_state->sev_fd, + write ? KVM_SEV_DBG_ENCRYPT : KVM_SEV_DBG_DECRYPT, + &dbg, &error); + if (ret) { + error_report("%s (%s) %#llx->%#llx+%#x ret=%d fw_error=%d '%s'", + __func__, write ? "write" : "read", dbg.src_uaddr, + dbg.dst_uaddr, dbg.len, ret, error, + fw_error_to_str(error)); + } + + return ret; +} + +static int +sev_mem_read(uint8_t *dst, const uint8_t *src, uint32_t len, MemTxAttrs attrs) +{ + assert(attrs.debug); + + return sev_dbg_enc_dec(dst, src, len, false); +} + +static int +sev_mem_write(uint8_t *dst, const uint8_t *src, uint32_t len, MemTxAttrs attrs) +{ + assert(attrs.debug); + + return sev_dbg_enc_dec(dst, src, len, true); +} + void * sev_guest_init(const char *id) { @@ -706,6 +747,22 @@ sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len) return 0; } +void +sev_set_debug_ops(void *handle, MemoryRegion *mr) +{ + SEVState *s = (SEVState *)handle; + + /* If policy does not allow debug then no need to register ops */ + if (s->policy & SEV_POLICY_NODBG) { + return; + } + + sev_ops.read = sev_mem_read; + sev_ops.write = sev_mem_write; + + memory_region_set_ram_debug_ops(mr, &sev_ops); +} + static void sev_register_types(void) { diff --git a/target/i386/trace-events b/target/i386/trace-events index b1fbde6e40fe..00aa6e98d810 100644 --- a/target/i386/trace-events +++ b/target/i386/trace-events @@ -15,3 +15,4 @@ kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64 kvm_sev_launch_measurement(const char *value) "data %s" kvm_sev_launch_finish(void) "" +kvm_sev_debug(const char *op, const uint8_t *src, uint8_t *dst, int len) "(%s) src %p dst %p len %d" From patchwork Thu Mar 8 12:48:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="skM9sv2m"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrMt249cz9scc for ; Fri, 9 Mar 2018 00:05:14 +1100 (AEDT) Received: from localhost ([::1]:38541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvEO-0001T9-3q for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:05:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv07-0005ee-Mu for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv03-0004Jr-L5 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:27 -0500 Received: from mail-cys01nam02on0088.outbound.protection.outlook.com ([104.47.37.88]:38016 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv03-0004JB-2u for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:23 -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=7G9B06V1ZVnYtJ/DQG406HoMbC5Mp9cdR+4oFfg5BXw=; b=skM9sv2mZF484F7/CBovVwy0f94OYU8lMAcvhXyZfSoJP+00jK/+z1hjItJCC35ma9O+pRkgGYx5St0Kdjw+VzYkn9/ZHPhYnMnGqKLMTY0Qm+zBMHHP4rUmAZJuP9MavvD/Zw1x6V4iY75Ht379qw1JhQX2kZd5dwhKkvbmcHM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:17 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:55 -0600 Message-Id: <20180308124901.83533-23-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7bdaa303-4017-4d80-7e51-08d584f32649 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:imlY9+V+B+GsXrjDB6IIU5bX1MI1OAqKlZ1gVBoBxHvYdo+js+omT/jU92l6RqKWLNsNMhnW0shBODwXgD/AoLHWd/6OIMIm6kVNUWA16jfYM+GoKT24yJkCf7uNcEt9eq7c2x/Wb+unXr82GivMlXAItMZQn61oiXjacMv+J2d9o13dP+2O2tEQhaylxCAWekdk45BGHuKAUEwmgsbP1vTn16rIwEBUWjFjhqQJWPFSoMXuxUmce8T5GJi3Hftg; 25:+uIPtIgifzg41VQMwHXo2tnuJdQFberXAFtvn59pS84uGOLIG1VVYL6VabyazrDDynJF56qIF7DdZQzBW32Ba7oJb2hgz15jDjC2m0nkGBCte4B90XtLytNloHZHCgc7m149Qhs9V2MHZhVhoUZNGBITbakgqYQVvp26U58el593oOODLiNSNfLPgEDxyHgzMdBCYUbCWZuQeQBpRcM83pIQOlouOVm6cV9d0IXI6NqI9xp9KMPF3v8/NB7RgbrPSTOjPm2pgIvp7ne4vEuizBPAdM1q2/wUH79vU57g5LexaswzxlK+ivARq4/6nNB9ysPCrk7G+Q9qAgZ+a7jtAQ==; 31:HYQ8vV0uYQwZrInJZVE+QpJvOyGRDxSUdHnFZvAdpS7oY+/VOq1OYxfWwGxYookkR3karFHsl59R1DXd1C+gyUIZBV2y73ndZs7ieOhqYET1YebQM2eiAmTenCtchB7yK+nnPKt0/T1FShhVBJJWDdvj/wzQyulm5WRxxuOpY4Om/6oUbBUrPKP+jdxHBTuKVKIyeQEPqLqi7lAAJV08zWxvqZ2ZKVg8M6hLw46Xbck= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:K4PJmIj9qpQeZIsuUTer4B2tjBgYAmQnY87KK1qr1FyQ3tVfZJ1dbI5ty9fnZJ+nQwkQEx9m02V+fcrgZtlMcsUaDX9vzGwjmlWJlq6nKROajKS6rtbEHKSuWVh8ZlBj3rFQ4ifm7zg3ZpEgF8acB8lmB+eNurgZWCezmg2jMAUkF5WEEf6465Ec/ItMr2qo1cnaCZbQ2FMyQhfVoVoLOVjE3I6CT+BZPklZoNQq4bxjE1TIxHu59BoOI4ogJ+FY4BhyghEzpdDpqO/xfR2OkztwcRDyJWt68h2P+aeglo2Lnr7hpZGer59Vx27sKxHU3CcYzS52KE4yZ6ZML7i470ub+8Joiyn7im36Qa7Sinel8q5xSNKfGlITjDiv+RsXB11ggu8/wIy7c1EKvKRlYnMvZQ1KQ5zZh3cmwYp21Vuyvoq+RLQxSXpjg8CbxKDiclidYCaGrIyuPEeAtuXmEBoQvSpNAE/+qorwVpcOyEuBbUUAWbE7JQJYF0Jyxk67; 4:g9PnzCgRg7/flsQ2pk+lW2ARTC6KhB9mvjI7jyfVvkM6GhVoLxj26Sx83koK8hfhS1j3LO1LCTi6sLkDsrOHonDntOnpxaCmhNrgOY1pe/PxDU1emsZc7ovQmqAwW9p9bB6I3qNs0/yPDByjMLlQAN1WmB9yCMCz5jKH5dpJBovpC5q39uOCP5Y0YR0BJxgkIEVhs/3EYR8ape+D5l1/IJO0gX2Gb1yG1HwRFXxTYbUxBzbVN5PHhWwYSCooYV3J3W2Z3P5qdi9SII4CCgyeU74TvmvZBs2299k7AZ8CLGSI4KCWbNvPE7wSuPwL8g+c 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:W+pG8lj7OEDGqfdcHmAh1dEvfjasYf5UiW62Entcn?= fuMoHovTWi1uNIR8/dqjmq4VigQByPFdsoccu92EGGnxR/rCn8JwCzOPkJvW0Db3U3aZxFhhh2kgV5jQ7mCRvUIbjLtJgw9XmUnso7rShJqswgYVjEKqU4puPZV4TVMvZutwCFiV8qlzs1okUei128GYYyQma94EaYjQ2GmXlDcuTRgPDgcMiqLsTJVENi/RqKKI3vLJaeJJld2etJSzIyCAUkaIOh2KxdTiH8fJQ47oGqod5rbCX3LDnoTZki/xq+j0nKzzE9aqlNT+bs4khIrfoQKf+m4au/2OCgpjw7VyP0AXRGr3rRkzer2NvY3XWkHhFYP+iB6r4ImV7NIWh2ABggoKH83GEijq6zyjRVQ2P2/L3SySbCOOejP3tHnB0FGzxDfIo8KkLT7uD05r8bghK7VFr38VBEHZ48X5YKi+aiJ1XczIffZzgi7lIn+b2rS4JDD87K1P6RppSDyIyvI8zdil+kBAAtzuoZNlhacnYhjJHnExtzKPefUX4WaEAWNnXszWaiXDQlNnKe1/htC/0YvfFzHfaEfpm6d6kvwTt71RyqzUSWyMXz0wSn10XuSbDcxDGVEtE8x+FWc3bfV44/6SRCGjvLmDLkiNWnmyyjtwIPn/3vmxpQ9GhAq95SW9Q106xoBd5LdnAx5i4slhp1jgwclvlMZxPBKHVXYUXKbKm7vvAnTbM0vs99US8z6dwsF4ShAX2B/o4W5ZpxFIR44upy/c6Aasje0IxsUMBUdtMHGgFyAG9Js0b/iRkXAfBBFFXucBAqg0HGRJaYPoUmp44sW0B/bZ439NfE8LzDnJzfx6USWit/X/amErgeDzUrZ5lxGTLx50sDILt5pcLZGnejpAqei2McMq6BISuRf3QQoO4asK1lmM/TR938e/FVQQVV+LXi6K26lQEKjqPffeORF+i3aMf5eYuGI32NByG9BgcUmD4ifXEsoZ0/pE82uLblukPWuEwbPUBT51f6FRH78y7deZDgU0LVjPgxGaFyqH9dje8S7pMpwp2D7eJzB6sq9Qm6WWhqrEf+TkkTKtoeviiwOBuhTXqoL535NhArmX9hZ1AfxBPFWOG5RUVEAhAYrCmhDNBJVZUz8JsCGi2IY6UESMami21j23ly4p7VqPsWpH6aSgHAGRpoWvh/ZG0DgqDrRcmhyOGoSXlA+vjba6iQtvC+p9Y49kDG3LGg3Ewwe7PqcvEIDzXrXuBQhXqCu6Q+9vZERFzbT1DnV0iLpSAIH3UYyXh3Lqg== X-Microsoft-Antispam-Message-Info: bpf8hZ9f/Xf/Mq485pNftdN72sXrOt3wrNFvClDO8qbuvog9NJKhPV0ib9ah5UG3tp6zXlgOyxaiOheGyj2MEemWVg5r57xIy86lccnPzPcK73D5qpdJLHUsfGrfK2PdD/TSlP4xItDU44zE/EzY5oAhXrjG9jQINwmlPSSGNVFT/oDsYRxNIXm2+KDVQ7hX X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:0YMCTmoUxCr+Yv6C0R+je3XiylRPZGaAerzId5GhKUg4wNX3b30g90ypuU0dnaQCmBVnrDzAc3ukVpqcsf0MAjvS/jB/7szaq7J0yFVtDQ010bcSnv/cf2jJ0exIvdnDt4K38o8teQogRf93K47/K0Aeq5QVgosADLOAeMuwDu6FHlYgprkOW3Lw3wbnG03cAQPKQYuIRc6jkohsh0NoPzx657HcmhVbErhb4fnzJU5mtYiWwJ0MDFmeAzqO+4qceN7s2HEYZ742KROxevXC+q7H7HCVzFaPl16Vpv5/ha+pTJ4+x3St7iU+y+6f+pjRmg7JqVZAvLh/sI4woddKaClI2dZIeQfmndhNb83D2Ck=; 5:tr/MuQY8fXtQCz6DY5qUK34mn5YDqbENCxeO2JPJZMPvNcXugBxz8+GBKkZPWYVqrtZXWed9uT1yB+3QBEGWTQWFSvrVDspS+5ucoAYWGviegnJp2WAixytKdaKMS6x0U0VLpGFByBRUmkyyrQeVGYkea6xn4649r3EOfU1fFpM=; 24:7RcqYUrsH/QWY6qEAEjODL82XT3Rwy9gKJW8KHVq0BqemdlEmFqBs0HbrK7Vct91zAfTRDizx1batoaEe6DzZPmCW4jTp4qzpNau9XUWtY4=; 7:z73O3cCFt+oYw4cO/BENoFsIZnZCE+G2evtPDEAWpkQaKBhFqVnhD4WFH93Cy/OOlQhuHsq5cRDpXTqH1FLWrV5uEZXuB4cqM8qoDxcsuOb3wWGMvcZfGZF1GK4SzCsyZN9IuJdrR7nlf1LUmRg+juhybPCoxS0cJtlWeE3aKuyoQjhu7VZ32ueB4PESeFZHlMNocDx9RnAMQVyRghIFI3f8z6kBCPrCdBbPBV4rO7HbPgHPgn2hF0QfDHkCLSdQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:tN3lu4xV3V8yjLsjOEYeJXUGgPd1HQhj/s8xULp3MDg8z4kozZdsejpVfbsb2bItoB2R/MyVNK/2hX0JAaP2zhPKzOLLH/TagwY0A13BDgg+QKBVADiNpvJ84nTlZI+vj945psKLiowPwbe8M3rR5iBf+QYrUPbQv5L8q0ai+J7Yk+LCmy00KM7sl+1AQGkjsVKJ1lZd0WmfdSY8KEENZtceC5JPihfrswVn15wnSlzl7gvQtc5Y+gNFxUjYgiN1 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:17.6281 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bdaa303-4017-4d80-7e51-08d584f32649 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.88 Subject: [Qemu-devel] [PATCH v12 22/28] target/i386: clear C-bit when walking SEV guest page table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In SEV-enabled guest the pte entry will have C-bit set, we need to clear the C-bit when walking the page table. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/helper.c | 31 +++++++++++++---------- target/i386/monitor.c | 68 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 62 insertions(+), 37 deletions(-) diff --git a/target/i386/helper.c b/target/i386/helper.c index 58fb6eec562a..dc5c7005cf13 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "sysemu/kvm.h" +#include "sev_i386.h" #include "kvm_i386.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" @@ -732,6 +733,9 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) int32_t a20_mask; uint32_t page_offset; int page_size; + uint64_t me_mask; + + me_mask = sev_get_me_mask(); a20_mask = x86_get_a20_mask(env); if (!(env->cr[0] & CR0_PG_MASK)) { @@ -755,25 +759,25 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } if (la57) { - pml5e_addr = ((env->cr[3] & ~0xfff) + + pml5e_addr = ((env->cr[3] & ~0xfff & me_mask) + (((addr >> 48) & 0x1ff) << 3)) & a20_mask; - pml5e = ldq_phys_debug(cs, pml5e_addr); + pml5e = ldq_phys_debug(cs, pml5e_addr) & me_mask; if (!(pml5e & PG_PRESENT_MASK)) { return -1; } } else { - pml5e = env->cr[3]; + pml5e = env->cr[3] & me_mask; } pml4e_addr = ((pml5e & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3)) & a20_mask; - pml4e = ldq_phys_debug(cs, pml4e_addr); + pml4e = ldq_phys_debug(cs, pml4e_addr) & me_mask; if (!(pml4e & PG_PRESENT_MASK)) { return -1; } pdpe_addr = ((pml4e & PG_ADDRESS_MASK) + (((addr >> 30) & 0x1ff) << 3)) & a20_mask; - pdpe = x86_ldq_phys(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr) & me_mask; if (!(pdpe & PG_PRESENT_MASK)) { return -1; } @@ -786,16 +790,16 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else #endif { - pdpe_addr = ((env->cr[3] & ~0x1f) + ((addr >> 27) & 0x18)) & - a20_mask; - pdpe = ldq_phys_debug(cs, pdpe_addr); + pdpe_addr = ((env->cr[3] & ~0x1f & me_mask) + ((addr >> 27) & 0x18)) + & a20_mask; + pdpe = ldq_phys_debug(cs, pdpe_addr) & me_mask; if (!(pdpe & PG_PRESENT_MASK)) return -1; } pde_addr = ((pdpe & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3)) & a20_mask; - pde = ldq_phys_debug(cs, pde_addr); + pde = ldq_phys_debug(cs, pde_addr) & me_mask; if (!(pde & PG_PRESENT_MASK)) { return -1; } @@ -808,7 +812,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pte_addr = ((pde & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3)) & a20_mask; page_size = 4096; - pte = ldq_phys_debug(cs, pte_addr); + pte = ldq_phys_debug(cs, pte_addr) & me_mask; } if (!(pte & PG_PRESENT_MASK)) { return -1; @@ -817,8 +821,9 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint32_t pde; /* page directory entry */ - pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & a20_mask; - pde = ldl_phys_debug(cs, pde_addr); + pde_addr = ((env->cr[3] & ~0xfff & me_mask) + ((addr >> 20) & 0xffc)) + & a20_mask; + pde = ldl_phys_debug(cs, pde_addr) & me_mask; if (!(pde & PG_PRESENT_MASK)) return -1; if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -827,7 +832,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { /* page directory entry */ pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & a20_mask; - pte = ldl_phys_debug(cs, pte_addr); + pte = ldl_phys_debug(cs, pte_addr) & me_mask; if (!(pte & PG_PRESENT_MASK)) { return -1; } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 4d9019626031..7df31c3cdf1b 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -98,16 +98,20 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) unsigned int l1, l2, l3; uint64_t pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; + uint64_t me_mask; + + me_mask = sev_get_me_mask(); pdp_addr = env->cr[3] & ~0x1f; + pdp_addr &= me_mask; for (l1 = 0; l1 < 4; l1++) { cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { /* 2M pages with PAE, CR4.PSE is ignored */ @@ -118,7 +122,7 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pt_addr + l3 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 30) + (l2 << 21) + (l3 << 12), @@ -140,10 +144,13 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, uint64_t l1, l2, l3, l4; uint64_t pml4e, pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; + uint64_t me_mask; + + me_mask = sev_get_me_mask(); for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); if (!(pml4e & PG_PRESENT_MASK)) { continue; } @@ -151,7 +158,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); if (!(pdpe & PG_PRESENT_MASK)) { continue; } @@ -166,7 +173,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); if (!(pde & PG_PRESENT_MASK)) { continue; } @@ -181,7 +188,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12), @@ -198,11 +205,14 @@ static void tlb_info_la57(Monitor *mon, CPUArchState *env) uint64_t l0; uint64_t pml5e; uint64_t pml5_addr; + uint64_t me_mask; - pml5_addr = env->cr[3] & 0x3fffffffff000ULL; + me_mask = sev_get_me_mask(); + + pml5_addr = env->cr[3] & 0x3fffffffff000ULL & me_mask; for (l0 = 0; l0 < 512; l0++) { cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); - pml5e = le64_to_cpu(pml5e); + pml5e = le64_to_cpu(pml5e & me_mask); if (pml5e & PG_PRESENT_MASK) { tlb_info_la48(mon, env, l0, pml5e & 0x3fffffffff000ULL); } @@ -230,7 +240,8 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) if (env->cr[4] & CR4_LA57_MASK) { tlb_info_la57(mon, env); } else { - tlb_info_la48(mon, env, 0, env->cr[3] & 0x3fffffffff000ULL); + tlb_info_la48(mon, env, 0, env->cr[3] & 0x3fffffffff000ULL & + sev_get_me_mask()); } } else #endif @@ -314,19 +325,22 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) uint64_t pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; hwaddr start, end; + uint64_t me_mask; - pdp_addr = env->cr[3] & ~0x1f; + me_mask = sev_get_me_mask(); + + pdp_addr = env->cr[3] & ~0x1f & me_mask; last_prot = 0; start = -1; for (l1 = 0; l1 < 4; l1++) { cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = l1 << 30; if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l1 << 30) + (l2 << 21); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -338,7 +352,7 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pt_addr + l3 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); end = (l1 << 30) + (l2 << 21) + (l3 << 12); if (pte & PG_PRESENT_MASK) { prot = pte & pde & (PG_USER_MASK | PG_RW_MASK | @@ -371,19 +385,22 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) uint64_t l1, l2, l3, l4; uint64_t pml4e, pdpe, pde, pte; uint64_t pml4_addr, pdp_addr, pd_addr, pt_addr, start, end; + uint64_t me_mask; + + me_mask = sev_get_me_mask(); - pml4_addr = env->cr[3] & 0x3fffffffff000ULL; + pml4_addr = env->cr[3] & 0x3fffffffff000ULL & me_mask; last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PSE_MASK) { @@ -396,7 +413,7 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -410,7 +427,7 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); end = (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); if (pte & PG_PRESENT_MASK) { @@ -449,13 +466,16 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) uint64_t l0, l1, l2, l3, l4; uint64_t pml5e, pml4e, pdpe, pde, pte; uint64_t pml5_addr, pml4_addr, pdp_addr, pd_addr, pt_addr, start, end; + uint64_t me_mask; + + me_mask = sev_get_me_mask(); - pml5_addr = env->cr[3] & 0x3fffffffff000ULL; + pml5_addr = env->cr[3] & 0x3fffffffff000ULL & me_mask; last_prot = 0; start = -1; for (l0 = 0; l0 < 512; l0++) { cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); - pml5e = le64_to_cpu(pml5e); + pml5e = le64_to_cpu(pml5e & me_mask); end = l0 << 48; if (!(pml5e & PG_PRESENT_MASK)) { prot = 0; @@ -466,7 +486,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pml4_addr = pml5e & 0x3fffffffff000ULL; for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); end = (l0 << 48) + (l1 << 39); if (!(pml4e & PG_PRESENT_MASK)) { prot = 0; @@ -477,7 +497,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = (l0 << 48) + (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { prot = 0; @@ -496,7 +516,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { prot = 0; From patchwork Thu Mar 8 12:48:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="WtYlTA+O"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrh40wrWz9s3v for ; Fri, 9 Mar 2018 00:19:16 +1100 (AEDT) Received: from localhost ([::1]:38769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvRx-0005gO-UT for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:19:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv09-0005gk-Q7 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv05-0004Ko-LI for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:29 -0500 Received: from mail-cys01nam02on0085.outbound.protection.outlook.com ([104.47.37.85]:63040 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv05-0004KP-9c for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:25 -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=/pwiFzm9XLlAcYuv79istr6t1tp11+uEJEkKvsJE90Q=; b=WtYlTA+OD+W0H3uwFLXQ5nHd4mANlF7lOmTk5cAajnC8+xf1gnTdGB5S0FX3uH+pHHSk4fy6wrW8hz/EjBW+1vWEVoWWdKROxj14JK6w+zYjIPuoKyFcgxfl+D5UIVElhy7YzU9PwROtrN0thZ0a8dgI3dyaTMLS5202+7uAK44= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:20 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:56 -0600 Message-ID: <20180308124901.83533-24-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f6939de4-daaa-4987-32a8-08d584f327c2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:ObgucBGkPvDT56juNudUU4Rrza9uP1M+ZiUMkf+6LCPjVCMR35stIFWHlaExsp3HT90aWb33K7Sz4Sxs22EQyCvyszq7+EV7MIs/RU/zi/EdESnEr0khgBUiAbYHQ8M4kSQQ/5tt71EKi89TqMDzBClqFL8fVWtvbgrqEqmaDzovRMNO4NhqvWKgERRG8NdP7ZWVzaomlZuS0VO81F1cgANT/Yxt+XV+km7cjhz+yznLKLshokjLH4Zb2R2pCYMc; 25:QgO1fDOouIdnFI4m6iYvFVl8DIT2vPfgt4xuaxv2oWbeilaQKyqc4paI6eaI1FcJVMzbjFhKSSWFd5XfOwGJLuemNdjEU07gs3QOwKv8Wpc1yXCSE6TA+OrQxSctzkeeM8i6SoCQ2yVDWgF4L+aKZh2kjbzP+M3CzycO84kCqAheCOsBxewHyvlrwz/k2OYQDEQZycPfdGk/mSyYaz4qeQEASEk2nOgUETFYVAU1QLgtqJ8gXoDICzI7oIKpGU6R4hETTxdeHtemYHWifEZ314wkGCDL1iLmsj+HK1nhvnZQovryiWbKu80hejqj9tbbk0+B5tl/8kn/zzxm5dsY9Q==; 31:OzcDdOfeXk7g/izKmveu34+0EFh9dh9z/JQeg+CfqCkQq+bVvlAB5e+M4NqmuuoWd8jqtat/7DVPL47HJWHBknHPou1GXujH6Fc8RwBIlPxXYBuX6+jq5BGEY0D8WTNrCwgAm+KpwJzRKhX3EOS5iISLjcADzq1zczg6J5McnbCvTicHeQmHIKVkyqo1/+keCx9W9W49HIue5mH2mbaXskWTyef0vvmil60IPGIfbnQ= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:8mCH1pYbYTpW1I/+8Fqb4B8ZH6HzO/4gS9VhpbL/NtQWfPQ0xZf17ce6sfoTvfX250LutSq0tQ2WxkFffk9jQZgzkHw2xdyGKiRDoEAu4PqO197aDHhj03f52ZN6sjblL1hmosNEayN5cvPRQzEqSJt51QFjL3MBCdbcoxYWsQdzJupOHHMl5KDOSidd/c271rZRIyHYM7fQ65zUHFDNJqGY3clOoBi5Z1w4R0DBy4nmwBpkvph2xGs/Fsvid5UX0qjx63DGQzL3OwLRkYxtL0iqm7XtiqomOu69O2T55YA+jmkKIvCiNGYGchojFvRNTqIarB2dAO2eh6XTVL45vXcxUKCZxqf0x4XCq1Y5PtkyS+WWJ5VEkpZZKhnAmiKMC59XaPlfaFFsvjVmJ2ohSWR6HcjcBr9piSZwf+RRe9FFisGplLIUea+HptRhRVU7JJbfSBw5oA33hgttg4BTDdSBrMwCwwIo4LavTRcv8cVDSy5UHWcqG7WkrVgkV8Si; 4:4AOXnXuGjU2thOSyNs5tlPrEvDdtHl1D/14i+32NIPJXGdcgdJmeBkOTkx294awAnkPZHLlonrj4RurC/nOMMIUJp3EfGskQiH9b6c7KTzLiqk1cGpqFSaJoaDvyh4GRXnMjaDMMAduUIKpTX7EGaZc1vwy9NjUvpeTH5zQTnr3SKkDlx8L0nmll0ObqqmfIm1OOZzNQuoRS+CRihadFU00vj1D4h5i13VHVdGLXqGfFaUhExVIkG0n/BnDVXeE9ZKVBPcOc9DhoFHqFdte/zfkVRijSYANtm9Wtn5TwToHAK/nb+sBnfMoviZRWIFnx 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(2870700001)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(7696005)(52116002)(6116002)(16526019)(186003)(26005)(1076002)(8656006)(386003)(23676004)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:yMLFFSFU82wppGr8QC69zZqhTXYFwwcr+MgqYnnHs?= O9+9cRcSW0Iw1cOw1YEiY/iAsO1AIXJoC0i6j4NHVQCRGBDuqElmknlZ/lLp6ohPA/RfjxiuKyHrUG2bhuc5dTT/18xsbFgyy2smFh3EZpXyj91vLW9v7LtcMftbPKUUghvzMYgEZQJ5oiMTWiVYXQFwOglP5UeLFRYiS1ildxMkbPFSuY7Jg/PMuJyZ149NWDQ+LSs7wbqLxqNsFtvJggbRAd37viS2xsxv1ynQkl1HcAzpDwhax1m6pwC7k4Rf/tU6OEjSt7rjfROgvFNsxApZuQDqJbdVIxmCn+AcLXl4MJcatkMHV++is4o47I6Dm5wKYKnr4UkmyE4xAUmvlXrV5c7VIjLldkPnH5CCJNE4JErlV26oT+e5CIXxeD2fv/j59HHelVhWvSvF7tFi6g8OHvX1T3iWyPHiYUWpiN3PeghLXCqXZ/vhdlG7LLQn6UeedfBtTSb4YZ5zO1dNMCaFNre93NUoP/IOROg8EdiiraA8qq4sjQlH4xLVu5CKXc9NN6vrNjfqfsm8wgvgNJFLwVPQX9qmUR75pCzX+Cz1ZhOT80NGqsGvOc/5gSo5FvicoX6VWIcupX3gKk4F2wysQuo6biS5GTckgQFWwy2fsHFXH95/T/UO7bTVuV/cgDR3slCO39ICX/rmfX/SOxrpTzYVvv+AFFtAunvxDmGV2gnUXKxnlCmkbU2LOcavHf+6DQFAfqr1eoh6OKCm3/4PHEljjmOCmZ5SfSfzswvQzUStAOLlX4rYZyvtjK2x2TH3VLD/qK6HoHwAbnu9oJindCtAzcLtzo/RLYmJHACQ98yQyWO5PD4jri5v/DVBl0510+S9Lt3eN1J3hiiy/G9L1URoSJnKj8ai6tBvoqfv0QRgigxDJiDG4wHfz8k90y2abFG48TAmqPILEpB8fJzJzJ85QHkDjrABin3C3/4JMx3HUUezv8vF/noiV5Of3uLWWhQ8mHNuQv6sO052M1utXqhk4//20AHWOK0lkuoUudeg85hkt84X7qnnK8T2r252PSm/ILVDUhw5YpV6zfjFsp/4bZ0AQ//vQtaUNxkykfJ7Ca1UyDs6od9+uH9EXUyHH98hG566AlTUnjtqeUou8eXJNBRzIn20UReebZHeIMS2ZMXEQo0LPmYWKvU0gbyiin+xTIES+CM+6AKf7QWKkTWY9za3giWTUFUn2ktoZ2y5X1RxsXy/Dh1W0KNbfeZVU7xLkdSty0QHk9UspCVptfahF2iQiIGw3R4nW4CwMOI5gT7XwmcLuekWfqwSIg= X-Microsoft-Antispam-Message-Info: 5zsRft7UA+Ul8I3ToMVMISApNBDSxJlyd9BgW7aD8BOmivyicD1m2tgnG2kHRADgO8x/ziVVQozEeVeTHwltX30dkbxZbrdSqy1a+nCQFdaI5rDpqwEXUgxUZYuWtN5c51eYtSU0WExP04KPhExNCHTBybVwmVZwUwoJaOU7DCGMM8jy9LVzg2SqQ5ubmhX7 X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:OhP8VxOxoSgP11Jssi1lgDIdIeSX94xGIezMmHZwt1iHs/nKaBope7jvGZ6mwOLURn9fWYaazpF9t4CCPaUpiPczhe3FFibAgm+V3aqZl/WX7BUvoS1V57sWTm9IWjwD5V11yAB9bT0KcuV9JzvXLZBWxyFwBsFS1oaPCH63LfDBJilz3uEfiARhMuVpF9rr5jgkSXN/7COKjvQkWkZY5noB1qaKY1cI6FE4a/oCxfTcrEEgAuusoFwLL146l9e+mJE/BCBOl5vf8Vx6IynSbCzJ9W2P9IX63PI8kh/ov1jI7OmQcr25nndAWD6eaOoEZJ/LiUUYPnlelg5zR5uTFYqsHg6I+oKJn2DvMmxNMTg=; 5:pOalKCjJzO0QLRqyttno9ec+YlxH0e0LOqTARHLNhG81dNh9vJKGt5PJkEbPbtyzuIC/z8ktCIvSCOjBZ9+T7WBUL0s5s869+zhqubGX3mP2NvOxbDA/rZYKkwR8Vkw/LjDCZltzOmXylT38UuG4Q64l3DLxwOxXBkMSQfvvOlI=; 24:Caffl66MJAw6gDrvbQFFCQPiq04HvoDXDEyoMJMdyPmssKbjXR+6B62csHQ3rdMMX9cPljFUFrFrMiQ3TM3ZHQkGsJXJdZfUaIPCd9G4A8k=; 7:LSJBFAASMqjLAUjP1lpQjmmuT6REuHc4Fc/OZSbWNTOTywXuhqHAXuV4TmplyTD+3GdX5VRQ/JxGIZc9oRgVru/97IigbUO5cRlFt74vUWMggKYc/Evnm7nXxrqyZARTAoib4C26NNXWv/MpHUlq6zl8MgPwm0SK1kc/TTe4YmTsQtEQ9ZFyZ2aHcyjp3lwSy96MSf66vWZZBcLzpM75bLNPvU1u1Q4w/QqF+VVcjVw6XtaqLJd6jluQ6/1nwXT1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:aHs3CWKxw1uGUG7VUygca+pAl8HNHCqJW7Kn7gYNuVyTAhP2IOIrA3UgZKqJnwTLY8I43kOY+LkDAjD7qTBYa3kc9QLpRJcfRMslVFQa2s0IUzU9zyvwHdNOk8RQ/7eElHQ/pXTVjSwH/uSHU6bwZke542z/mb/jbjMGVxSl+FdGGdyOTD2gwYUs13YAKkibmjJgslIE9pozV3YohDksJqmHAsklAbMiGBPaHsv4CImXa3eBZHu+my1T0ZHilxVZ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:20.0969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6939de4-daaa-4987-32a8-08d584f327c2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.85 Subject: [Qemu-devel] [PATCH v12 23/28] qmp: add query-sev-launch-measure command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The command can be used by libvirt to retrieve the measurement of SEV guest. This measurement is a signature of the memory contents that was encrypted through the LAUNCH_UPDATE_DATA. Cc: "Daniel P. Berrangé" Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Brijesh Singh Reviewed-by: Daniel P. Berrangé --- monitor.c | 7 +++++++ qapi/misc.json | 29 +++++++++++++++++++++++++++++ target/i386/monitor.c | 17 +++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/monitor.c b/monitor.c index 2225cf5030dc..d53ecc5ddab3 100644 --- a/monitor.c +++ b/monitor.c @@ -984,6 +984,7 @@ static void qmp_unregister_commands_hack(void) #ifndef TARGET_I386 qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection"); qmp_unregister_command(&qmp_commands, "query-sev"); + qmp_unregister_command(&qmp_commands, "query-sev-launch-measure"); #endif #ifndef TARGET_S390X qmp_unregister_command(&qmp_commands, "dump-skeys"); @@ -4110,6 +4111,12 @@ SevInfo *qmp_query_sev(Error **errp) error_setg(errp, QERR_FEATURE_DISABLED, "query-sev"); return NULL; } + +SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) +{ + error_setg(errp, QERR_FEATURE_DISABLED, "query-sev-launch-measure"); + return NULL; +} #endif #ifndef TARGET_S390X diff --git a/qapi/misc.json b/qapi/misc.json index 14681729f8fc..a39c43aa64b1 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -3277,3 +3277,32 @@ # ## { 'command': 'query-sev', 'returns': 'SevInfo' } + +## +# @SevLaunchMeasureInfo: +# +# SEV Guest Launch measurement information +# +# @data: the measurement value encoded in base64 +# +# Since: 2.12 +# +## +{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'} } + +## +# @query-sev-launch-measure: +# +# Query the SEV guest launch information. +# +# Returns: The @SevLaunchMeasureInfo for the guest +# +# Since: 2.12 +# +# Example: +# +# -> { "execute": "query-sev-launch-measure" } +# <- { "return": { "data": "4l8LXeNlSPUDlXPJG5966/8%YZ" } } +# +## +{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo' } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 7df31c3cdf1b..e5596bbc0fc2 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -720,3 +720,20 @@ void hmp_info_sev(Monitor *mon, const QDict *qdict) monitor_printf(mon, "SEV is not enabled\n"); } } + +SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) +{ + char *data; + SevLaunchMeasureInfo *info; + + data = sev_get_launch_measurement(); + if (!data) { + error_setg(errp, "Measurement is not available"); + return NULL; + } + + info = g_malloc0(sizeof(*info)); + info->data = data; + + return info; +} From patchwork Thu Mar 8 12:48:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="MP+scmgP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrGQ23S9z9scc for ; Fri, 9 Mar 2018 00:00:30 +1100 (AEDT) Received: from localhost ([::1]:38513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv9o-0005z6-4S for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:00:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0C-0005ji-Rw for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv08-0004M1-Kq for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:32 -0500 Received: from mail-cys01nam02on0067.outbound.protection.outlook.com ([104.47.37.67]:48305 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv08-0004LY-9T for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:28 -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=wxTmVRBvOF1Zwj+/2BDoiak9kN4Vu/bumSas/Jo+iNk=; b=MP+scmgPxrWgWRnZIg/rj+LusZypCF9wmWUYzDis/Q+FLLa7z9OelJOcF1SK6E6TvaXwp9foIk3PV1CsLYZKVvPOUgyyGoyCoyzslRAuBwLEysPQANmoAc0lL5xh918cLtfc7AdHGtbxvggoGWFMy1P7aFeAQq1MByIylpUFRhc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:22 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:57 -0600 Message-Id: <20180308124901.83533-25-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 92437149-65e6-415d-3672-08d584f3292a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:uI969o3fsHTdN8mWsZkiLPeyGrYgbV9zntdUKT34qpuFygDPWdR7sDOgOt/sQVLfkQF3zovKEqJKtHFXsYNNO/kaFNT0K4DrD6e+mesEvycPLCgc1T+9XmOlxtn96wqOYA0LdcxcH2wxfsNJDIdpYOftDQ4ZqU8wBCtdNBeGNmyWMRXyyPWKDeTnjEFBWsSdQQ3WOL6ZF2Eh/J0IoQU4RolTH8Usej+Xx4b6rhQvlMkcgc/iBpj/x0tpFcgT+0ub; 25:HOOSxTNqaMChK2DL4p2U7CGWGZ25/42OIjrkRbcSpZBnGsQo5PtkRxZVHqSaA7OBkaFxtyWNi2Vky0924Fych3T9JVET4mPX9HVPX2hPZ2cI2XVzAR35rTbZmUfmSomKjtYCPy3cTBMQdT1q7YJA13UPH97Ifv7a7NiGFnkYBzfLYdU+rSX0hSy6do0aefZ07V8ftQTKR7i9Dldt/l+njouQReMUS4/KVgsSJZgF6vcTxVTIC9ngWQH9oFjYN2Bugc/RkKURo0C3+0HX12R4UP5GUlxbdg8pJTxbTyl410BDCwSvCqzQWE6y6xlvlvo9XHZselMWC4waOJNe3UKnsw==; 31:aBUGtBf4W86BFmUbTNv0Zx48ADvwS4NrqIfK6vnJ3D9P+K5K71xVdGkkeuX2L8vL1TfLI52zBlDqz9L9eA0h1x62v+N6K5/krIt4MrpbRwrY58saxIg9amQ/2jHEyYQ9ALSM3Rb9OCrvRCoouCgvtbkywPA8L3UeHCkT2Rl6IRZGCwisCtjbXtYvIYXjlpcc4yP/ngTas+CdO1GAiyZr1dNVxvrm8IzB5YBzIrQGL4I= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:k8qld9MdAHxEQrYzLqt1Kue7soeS5pFQZ3MojcdaTGbOJajJa/5KtAFeVyK4ZHH+3j4VbjPkC9hkbQoMFsqp9wLPt/X87G5GvNmk4+LPoFptv7z+XtgjkJIe1EzTLxDpy9o3lJi4rYuqZiuXGKcm/Id5VfaMtitoeCFYOVNBgoPVMQP05hqyacnPc+hDdlV19p1xqXxjAkdA7AO4/A5ktvdVJ9fPRGYdCrLmCug3sbyXpCwoveVYldZFGjC4c/iaB2B0u2c8eWwb7jseat9OQ0+BBrjHL/WnzkTaC0qWxUhCOoYO+OiN8xwQ8qenBrr78bCdLeNxi1UslbsX8ENtbWrYshpimqT7zv1F9HUq7hZayaTLwNikoCV253nh8/7113wdaSUZL3PN5hCk+Ee+9iALUAa4eVNEZHLEnTfjHTzPhi66pxquEVu1WCH5pS7xUGYFEZ2xJ7sE2QRcaKmbcy3m1B7HeHG/9VGCAY84WDJSLRdtSbXYfaOzmxaJ5zWd; 4:RHrHb7nYu/+Ft5YFZB50OqpDhos5Vfvjsbb6iRbqzzgYSlNEOC0dMIebCPK/9fYHC4RxYDysZoVhkBae3WoQrxhasU+Hy0prsaErUkgyy6fEVbBkYQ5nyjb93G892PGJTztti6sQ66MXachmx/z01hHNhSKF2vjAI1JTS5+TU71WhiGY2orQucWLNfwsYxFZc7YjvR/7pEXiSZGdvKjPw6IUnYoxwwlEO5Xx6/w55cmedeZmZWHxHTocUy5NbMY5HVmSiphsLa4PD7hRiRJ0un3gaqeIpicefRbTaRtsrxg91tsesXfPyEAKXjRyuTrk 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:WtrquhkHsHRMecsVOyx9EXnUFUywmwMJDeXWsLZQh?= L2CVsqYdgzEqfVrm+MMgKmoauoqS0I/HA7HZM7LkuhWezWmw7nMknpCsMxUaJ+CccwKdnUOaxHDNs/EVZAPNBYE+73G65f4OfOS7Mf6lgtB1VoDxQnQY9p8UvCRazlJFWyHGSyQJQpaMP2r69J0eKOmZWaX2PEzpJDDVv1ZkglhX9rQWyLrFRbrBBdPmiwQn95yQjF2iL10RpVV9Ay7pOV5Ka5kgB9g7Up5ncyrjv8qZ8A26DILNT949JJu3AvO9PjXBSosqSBD/rS3mKKxvYVtKs8or2f/6lIT1sqd7f2iudskJdoNY4uz+Oe/Y1NHXfc5dk6y4HZjyLZYPOolHbhx/vbliqTP101CWE7xRWgirvTieKuLIgvyLxcbB0x+cYLscwZJZ9CmGI8NmeI0uK7RpjPwCp3zyQN0bQlaA6BSBGYfP0tliFUu6wvCBKkBveAQc4HKkFLTJV/qOh0EGrw2OT/HAtAa7E6aQn9cpevzQq6TCByB/q8jVVDsuDn83TC/5quTXXsoeDfQ0MmnZTWnUT/Uqe48oKThLVz4/RSLsvoQqOQPV/Pu7NXxl9mIlI6ojFX7+DKn2bC95RdDMkrB7F0Kpze1A4l0XE7QT31BCCcF2cvU1TGkc9+rgsMMxi7VqE9rpcw69dwXSa+JbUaoyBvkZcKpOP14SmKvmIFwefK9DFpOxYGDoXoTbacBpkcFrCM+iOu5p1Kj3y3fn9ft6Nof9eaTZYPE7ePTj7fJJGNtQuPzYk96M3P4I588RMRqN79Z3sPfvEE8NlyawEwXIBNF9+DBTZaU5UvC9Q+GCUx6qTla5lrIynoKNos/oX1wd+UaiX7E9Y2RIhmx+PuQiyxT9q17CJ+k2b9sP1T9nG3dYuLejHPCbV52wkXKC2EamY3ZtWQcNoIDB8k+XEDg38/yYzY/avXO5KsM3w4DQ4WJ9slXSED1Os0q/Rl0BjeRJ2CUE3Z9oCdpCumiEPLOttlBwU5Bv2aP9ozr/feM2w94IBunxIANL2VBbXnYkgB9ksTod69lHTsN5fkHamP6Ii77/gplMCIkdl6TMTME3F6y0A2wbUwCjKPVSEawu4eDv/su4OJUV9nOjs1KcwLw/CjzvH55zYiVtf3cxx7Q8L+ThgWK/mqAEixu8kb/8NnmEPEPJCFG4l6dzAnY3pNipk1bwmhIJgwPg3CLfiN4OaVDNkuOilHSO16FMQC/Ig7qEmqbNf3XewzyPWaeBdmHnO2FlFFj25nRApVxAY45dA== X-Microsoft-Antispam-Message-Info: hv40Ynu8GwIfv+HcJjW1ZYpDE1wplphMM9UaFJwDDHKaHKmqPd5fqTOEDb41vJM5tBmXKXnpkEwZoa/mkhPSzXzdUVWz92EIoxxOv5KSjEi4OQw/YOLPQz4bYv/sfnrp6chGnAL4OcJJSW17DmBcMJNUh10MFyP/EwV8KMgI4LFj6TESrtXOzAE67JkHxzyT X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:GFnm1kDV1vVY6qTr/aqFn/jDf0ZYJJQnPWb5kzo+YstQibygqjRUeC8T4zFuJtgIfAqWGaKX9lWGoyUNJGQsjz7eAiIlIGY/jdofCdx3kdEe2Oi9MvFpt7ooj4p4TwoKQ1213xUI/Hv+x65bPDl6X2PIhICtVcMsV7S0Ro8689hiJy3pCNerLboNt63cU/PJjVZJJSxnNZ68aLGyizDciczdbd7WoXywI6eadTGzHdbWVFS2UvE5mJ7K3SXBrvqFl08orNos3XF0KujyEz7n5KakiZHZaNIUYV9QYFSvy2Qzvfo/qLJdBM7a3EiLJFrTCaxQChV3XMVw7WAKj6Rq38xtUtaEXZOQxXtcaFoGjmI=; 5:GwcUVPCM21dMTDZnzsM/ff4FYxEBBG2w81gDrQhkxPnEKamRoWxP7dTWgiwBu7Cx9qY35IOHaQEoT6qAk9cW4t/mTInwMMDXOf6AigNRw33RM3I5EtdcRcrqte05qB1Hrd37RdN72EvZN2fQN9hrpYvtzmFKYz6LE7IdByPsVSs=; 24:XIKFfzFc/ZMPFIeNiYMZmvETuvYciuTriCB1jAHB+M5G8ZwfHxaNJEwYajng9Dk+lWHJcxw7cGX9tgW7sHEbIskBqa7U9rIzQphctqiB1Vw=; 7:7VzcEQtiF1hg7Np45QZVSFf+E7M4jmOCvla24wZPy2X0S8N26OVm5bkGQ6ofC/ikHjctTZ8nuPS3ksrFsvNx+3XrmsASD3HRlSCRsb8bKJC4JJlt3l3p3Tbv6FZYMRbx9bMrGqQq1LdeHzB9sdMPytSRNpZaKVupcqmgGpEmMV2GQivgqmb7IrpnsKLZjsK0lq5jNv3cJhYliCDuFW/uEc2MPB4i0AfSyOoInGRsq+xe04+TSA/+tNfzZcEmi/6w SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:3dv6Tb3ghBkVl6AhfDYcfh38Cyw2e43X+2IFylfIUxhiDR1kagACWGNMs3No5Nr/tz7YMjZQspIST+7PIjJBmvcZyLmrveqnwWWuUl+syUuARoEgtnJR+B/HXn0c5J5i2O7ZbqcH48BXbmAx1t7o/JJrJxJ/ivHD4ExCBiz5TJiOq9QJG8uR8JDfwExKwNIZQIcDHGe34IRrEtdlGOoJNz7krdCisA/32bXNU3Vlq2a7jiQmUiw8SSD1PFJxftEm X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:22.5344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92437149-65e6-415d-3672-08d584f3292a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.67 Subject: [Qemu-devel] [PATCH v12 24/28] sev/i386: add migration blocker X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" SEV guest migration is not implemented yet. Signed-off-by: Brijesh Singh Reviewed-by: Dr. David Alan Gilbert --- target/i386/sev.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index f687e9e40e32..b9bfce95246a 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -24,12 +24,14 @@ #include "sev_i386.h" #include "sysemu/sysemu.h" #include "trace.h" +#include "migration/blocker.h" #define DEFAULT_GUEST_POLICY 0x1 /* disable debug */ #define DEFAULT_SEV_DEVICE "/dev/sev" static SEVState *sev_state; static MemoryRegionRAMReadWriteOps sev_ops; +static Error *sev_mig_blocker; static const char *const sev_fw_errlist[] = { "", @@ -583,6 +585,7 @@ static void sev_launch_finish(SEVState *s) { int ret, error; + Error *local_err = NULL; trace_kvm_sev_launch_finish(); ret = sev_ioctl(sev_state->sev_fd, KVM_SEV_LAUNCH_FINISH, 0, &error); @@ -593,6 +596,16 @@ sev_launch_finish(SEVState *s) } sev_set_guest_state(SEV_STATE_RUNNING); + + /* add migration blocker */ + error_setg(&sev_mig_blocker, + "SEV: Migration is not implemented"); + ret = migrate_add_blocker(sev_mig_blocker, &local_err); + if (local_err) { + error_report_err(local_err); + error_free(sev_mig_blocker); + exit(1); + } } static void From patchwork Thu Mar 8 12:48:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="C0U9sFRo"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrL26Q0jz9sgk for ; Fri, 9 Mar 2018 00:03:38 +1100 (AEDT) Received: from localhost ([::1]:38533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvCq-00007z-Nw for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:03:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0D-0005l2-Vn for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv0A-0004Mb-15 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:34 -0500 Received: from mail-cys01nam02on0057.outbound.protection.outlook.com ([104.47.37.57]:52496 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv09-0004MG-PY for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:29 -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=C0U9sFRoMffotyJXlOd/TR9trsEIHg6WTLtha0XfoZjDF/GcZzX4WG8lwvJo3TkNMC91NYMsWelEW9lrgfCbHXL00vKVbJ5BITuhYYMidQtpWRU5DCiVbYAplhzToOZJxS/fJC7ULFonSw7onFsD4wJ+Bh1bAIBdFblSp5Q9Emo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:24 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:58 -0600 Message-Id: <20180308124901.83533-26-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 67735748-508f-4926-4d21-08d584f32aa5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:/b3XXkqYxdE4zMB/vR724sYUSa7ovAGLr0M0JY3JbXjS6PW9i2GdJBhSFQ09DKEnmuSHSzT+vMbTlyvAnEQAqsK1yoJ34yLflHsIB2XMmi+MULnq7EWBbZ+85yDMG55Pl8PGQanrEKzjGa/DHCIJ/svK27M1SyeT2oArafnm/Samr++MQv2NXXrNaoJQAif5AV9HpcuM2/86JHnvbXkhdci9Dz5oh8SbaXz602YYM40bzLaZLymij6J5FxsTqjRd; 25:0xQzS2UCW9HkvqTETr6A+oNHUWbGZVE5TzRxrC+RktoLY8LHLwP6LQ7REf7fjw44JOn7NDtIbStKW7SmkOo4Wm2jnZBDlSTDZ4+iTs7mXm+fXXnNdWpdt+oa051HkMVDVAOGsT4UFsqdOAQjMJg9ivyanN9if9cCyJ3JvWqYWfez1LE9QnjCBvUwhoG/foLRBXzr4o0/ARZ13zG0VchoEBrKJmWHqWcPb/1vYcdlBD2UDMVHyojNzi/LU23/MclGldqX+LDohccgl2pCsgLMhR1hy16PnL1L3GBbMlrUjuDjop1rrbmIsxITJwNGnkWWSgKV2gtgSbrFUtVI6IzZSQ==; 31:TVXokP7sUhfLBz8EVR8uSbnlaF+zfCfEFRxvgRPS44ipBpiYhZKP/i40gu9dnI5hYPwxE4515S9Pq6Umpf0HQjk8biL/wUwiQO2ZKByb1s7KisyjInRxxEq+F2EMV7Ra0Nf1eNuUsHdxsWKReaBtdH2pxdesprbfwO5PHKea9ysFe117+Pbg1xD/DpXeHWvioubJfHGoKFw7Z+qcZlCCCRdwR3B4+5SQyz8vfy0C+aQ= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:WxKPFF7Mied+CHWK0W4L9rn0KrPd2o7zed3BaIa/OUu9753WaeiiiUjnfbuzbj1Nlvr5Vpa43msUCMCLv4UnlQwIdJV1rOhs84DB2CTRNhYomKph24TIZB7nSsYr+UTHta/aD2F2yj2P/4V3CaDXW20mD/JonUeDeshi/dmrb1dQFRRduKstHWsKlNTX/H1NJKrRTKY0R90u7riSolibfwJ5FeV5J36i1rXGamxUrC4BGGSVuN8I3fr1sFvXFsFBddBM9kFLKb/Kj8pvGiWq17Y8dGSCtQC0GyrgJr6jw+gCFQOu5oTNzoMxXwy2SqpRSf9pB+3fnnqMNGe0snGsKrwut0iMR7rBOU4Y4RTDgxd7/9onNdvbmMQaOcZRqQRcfdbRRQ53terhvmoD+Sf4qRa8/stoxnZo8IcCHJaJxNLiowKf2nx2mq9ReIXA9F/f5LztTbtI+F/S1w0QjGmipUpm6wPSmjDkx8zit1/MWLYNYVWC2JuMwJZoDe51zCgr; 4:OhewfQ/cFvGrtDIZoOzKItSglhykI7tf1fu9egNvE5MIsPwLJZalT+JFSyP2hjqrKxNl08KJf3eQkWaQIoody08wOwrzWebVeT0fWwRcDmN3OoRciYAr5eprqzOTZu6mn7rPq60AI2Sl3533YpCDDTiYcs0poJ9M0B9hQENg+x/hJvxXw5jyIxRPCM0AfEoM1/2GpOoW0Odv+2z7jnhkNEXft6+KdDaEXnj5Y/yr5cTh/II84Ao+et6DtzgLq9e+h1mtOLIS+x3h0EoO2HGZ3nS46EnvtSnyWsTZVF3Bd8SE3+87NExVXNQgFwoIBzsl 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(6306002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:5Lbwmh9XS26i6T9diORh8UUEANsN7h/118RpyijFA?= ddiGrw9GB/aiUZwselr8RADXhaINv1pWoT6GNeM/NeScnK+bvygYaHaGQMCadpD8yrETiUnWAdoLoJ8SXWImZerWQoWWl/KzHV6ryIrxUxT2qzH94wBnkB3ERPBOBQ3EPLbThZmhxN0vttcv6LTCtmyIHjPLw9TEtHGCyH5lSsuXvUaDBRJ2cBqoHV8jHCMmlZmpZLAq1DKi6+t/oSROiXd47uSNP45skmSHLiEhfZjUlyFiJp2/acmgREJKORMfq8sS8kajceBd4CFJmxr4x1G/j90Xo2mI14TUGpH4p98Hakk21W8SiyQx2B9xKkQ4w8oS1NYtDRRiTzSDgdCCysPkZtChyQ20P6MWr0SC8ugpZAq17hH3KFj8j476GqSB5RY8g3rfII0HhOngisfZM7RMPAt+mQj1yvH+2/Tb+pl51oCW/O9V1zXS55JoKhkNZc1PktHpDDXJKX6P2UnKRFGTH123/E+lUyNzCjYwy0o3zMXiGtsKbBe+clUuBZufnCd+AGhcC5PezJyFEnPxtjIhwiHmBMhS6mJ6q0LEzDsqQJ94YHjxKmQdY1yrl67yC6e1H00GcNS2MwworI0Ji22Eody9Gw/hfZmWsbm4t1gYf6tY4e0Gh5Ps1e5kGhQsvstVEcQKk7fzYKsVh0A+bKmzjNluSMsqDGlr6ITq2/DbWK+1Qmq1zbfRhChoK004JnDzSYuL9l4S2qrgfqCi+/z0f3dbnJkEtQdrMdlXKvrnk1HW5TQFZoa8x74V2Td9RYjoYVxl3HEgb8VShlkRvXjbv757YicXuZj3CMgPrGCbPqJxr+wET6hRQw8/TGAmnjZa2qBzVM/o0XgJWt7vqzuwIZQUJEFom/YGQGRS2ORFbqbmyLwQl3x4AdHKGktKUCMR8U+2cGQRVtiDVoXEflv9a9nGhBXRcvPFAFtf41vVLcDQM+P5xAb20Hg8RgsmJ0QIFfD3oxEwQi8exOZhH6aOPFbd1t8+Ln1JtoKWsOCiGd+ElTpiHQhEnUlzdrJypf+E+ul7eBIHi7r2xZEHt4fyVt9MZBMJ/UeWabqSicaw8wF1IfZ94Kog7nYaxvVsFijDrd/I/LrVGjsCJqHYswcnJqvMtuo95yIBM16xFtf82uYeH7QafSKIfb6pX3ZpucJ2NOzqxIXCN4XZOsJJYugD/1w5J1SlOpCeELgWB4SMLVOo5sjXAl7pnt3CPKQgucFN55r8S6Yn54buRUVcB4nbako4TdfbkKW+xXSm+s5RqxOSs3bpgsk05T3T+gfAsO1f9kQNxXRXbJjuKz4eTnE X-Microsoft-Antispam-Message-Info: UbxRaUzZ/61HjW94jUi2rlyQFPeT2oK/cg+i/+yzeSQtVi4bh+eGO/05qHmAne0J6qlWzhYp7HsTF80Kl2c51OTnb3NGOmrAvfFvgBG6XzgSjJbLbarVVRsoB8Ebgd+fnWmCXaHWFmuKwdwjucfEegQDOYh1q5n31jHo7CfszC99sB8vgq5oVBvQMAZM+oSY X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:qqXJCZqYsujgcWddFr2IMpsGVzwxq/JJU1ONa+OxV9wsAwb7yxO6dJVG5bLxE64L6SA2wcgF0PRo7ibdfE4ftzonWwaU2qdcg7CnQDFoeJ8NaY0rUIFDGiZ2dwdaCAPDmMiBMzAaz8Pn/cIT/MOSWyW0zDuM58M9g8RC68UqITwIEHWLBm1nL1XabLPBlXbxlaow992SA7CJcxOjnixtF77aRULKm0qvi4ANRjBsNZjICAvSwWL4IaSGOx2aPD+udkmAdwYUtHGMOoDK53beqUcSWL4mp6YQjWkM5IzIJa+yYPhXjiAcItte3EgOh0VzNU1I056/iJvbGAJM/JtypXF2pUil/Lk9w/6Q+hjxy7Y=; 5:ySk9cvIoQK/aU/wpZRwCVLOtx9WCDYhDb++sulG0fasZf4PqkvvO2TrpbBw6LLCArcRVMg4TPQh8k/DiDBDb24QvWr4gj25TZ0qC9LgFpDzbBckFuw+NyZu3RDapE+mbhIO1X99554Xo5WsRJJVgqi+sr3e4GVdkn2z6jxm12Ac=; 24:RzXLPBTK6zi5pNVwHC9IhaDAB1AMaS4jz/6BTyRu4VEqPnXLimcV//UFKij0VQMwkZyC4Q5hZsGHbwbLdHva0R579qqxBE/H5M5fjtLqj1w=; 7:yrUWIrVTvmsc1iNfaIeghq3blUu9f1uPn3YdioyXD1KigXbAAeipt4jhXyVnHIQEVr0X6cs3ClMkqHmA0CeZetVVJnMpCqxb7FOQmFJBi12ZvFdRQiEhE1szruPtPFZSmMSEUfjwnlH9zDpnjO/gmrAUBc0xdFJFa8brIahLEnsbjcDYuMeQoUhtgD5AQRsL9F7tjy0ZTVl6p50Hy09V0I4w60kIj9/jr/Ba1QAOXdKdqdkr+Q6W5lK9WqFVeqTZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:6S1N41W0swYsXYWjF+dRcHXiFym0yC8TkrkIp+iFNcvThumf9m2ED/qkfvXRdj2+D0kPOvEglPV8UoVS1HahDF3NgpXc1CfvGjr4mLUpj+kED3LZYtE9SmsUGqUjqlFF6kYPWgRiWC+pIc1NYqRQNMa1zQcSGjFh3omIbLMN8sJ8/6GtyeMr88VbWOlAPhdcx3iVO0QlwoLEgL2tenD4ZoE35wMkk0jfvfdPxx86MXP1uyptqIJiUXb4NkaB/Qbw X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:24.9563 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67735748-508f-4926-4d21-08d584f32aa5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.57 Subject: [Qemu-devel] [PATCH v12 25/28] cpu/i386: populate CPUID 0x8000_001F when SEV is active X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 */ From patchwork Thu Mar 8 12:48:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883112 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="2FR7Gj7R"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrPY4NjKz9sXk for ; Fri, 9 Mar 2018 00:06:41 +1100 (AEDT) Received: from localhost ([::1]:38551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvFn-0002kF-7I for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:06:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0H-0005p2-Di for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv0D-0004OH-7L for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:37 -0500 Received: from mail-co1nam03on0078.outbound.protection.outlook.com ([104.47.40.78]:19744 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv0C-0004NT-SD for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:33 -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=uojUHmEoA+vB/tC+x5pnlAqaU0yESclMPh122/hYrA4=; b=2FR7Gj7RFNzTVd4MxHwlg8akp0ibEy4I/kpcyeFU8uO2+PvsB+6eMzaI3Nk+JIPBSZC5FlygM+oXyEOogNAhIuPUrVSPRYSgVJLO27t3akokekQ7W/mGw3AFEKwT3z8/HC3/1pU9INIR4wK3iZN2xrMxdPB2oIAVwqNn8ELlGH0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:27 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:59 -0600 Message-ID: <20180308124901.83533-27-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1a387fa1-6899-4ad1-c783-08d584f32c03 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:77ZJpCxFN3zJhvDJF3pQTInkGIBlzVa2llBQrcDBJKwpkD4eMhjVlVX8cB7Q1h1XkRrLHwCKgd0EmBz6w1mTFXzd70cW88Inzqm1EyOGrpHOAegEpBV45/tdl4yFi/qAdMcuzgk2h6bGBvo/ZOuE95ZRpZ+JzCiUeFgq1uHxuroG8nZv/mpAFDFRywHxUYgSGQzxh8c9BrLeS+ykAp+Br9kSCYt1EKtZBg+iB6X1ecnBQv6+arE6kBwIoiIXecDH; 25:FLy/99w5IJtAPzzVaWzsmE2R76kBMyY7G42zv4mpgHglc1kUBzzUpxdRbHPwkcv3DMYkC6RYXGH3icSFSaQ9d9swfVCzHkKYjcEda5fwxXyTu5aRRY/Q+chRmpvSIUdDUgmpFEbgmD+QySlwH3yjl2ZmcVLwp5vL8gzbmVEi/9nnPEZj6jlYSAoiHZokHTeqBaOm5JmsGUT55xY4akUmVPqln0YLUBzF3Gv3exbL1MADr4F6a9ZTqcQljDhPPurV3gnVT2Wzg8ChbqISxYBuPQ1lxnpCMHYCc+NeajIyGvofyYoiTS+tlkO30/t8kFh8PX6eCaZwU0nKeS9JtXYb1g==; 31:W949GAiIG1o+8cSz1MeAkn/Z0lCr/J4jnivJ7Lbv8jQVRhu86f9NeJrEeagT/4XDbrSv93HIaYniUqYKROFx+mKndDyPC/Cof8NxwQ4CmKIKJbK9+Zfb+1/QRXN+gOqsMcYXFx7WAHDZ7Rc28dKs86/OCNqaZJDQqPPvAm3LMafS2hOEL4+/X65ch1Et1CxAGirDKXUQhmV8v1e5rSF2G029KtXB8vbeTT0+xWWkPsU= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:myAQsU6ZK4/AWqSyhSes58EtHQxqj7uJkUjhR2ipadigHuVmVWg8EvoiugXnNmzuOVheKQTCkZ8QUzcvwHuKAw8Na6mCH8NdtY4Jyn2ZL82Pqay42azbJwa/TrQ/nQpmDYPq2SLr5D7KzckcEfE/5pcHdgFShjZbe+nGqZAnu87WWxfPuqLdibsxYCbL08Jpl+xyZJJFPb3mYlJ8+uYwa+qJ1GoKKt2Wpa5K/muKq0iSpJcSuQBXkJsJUQmRoESRXDCjjcz/4e3NktqFKCELqmp7iX6v+fRq5mvrLBvoPd4hvmbkZqFZyxavgR4gLCzwujheQiz7VbgfB7/AhBtiuv56QzuE7fR+5tq+QbE8jyC3oPzy0YVKrXqFXZlOIqoocET1UJMCaSo6rWEbDNzU4tw7tupjdWn6zohS5QgUMK4E/fc//+mWM22R6zHSJ9BlLj0lSczeRJPt0P2S0pZMUab85oq85UYuQKsc8hgRUVf86AZ5lZPxkRp0crTye2VE; 4:ir7wBXNaR2fsHZhmnZUt2IZJbZ8yQhuayZSeF5ZF2gw8V6VTGZu8y1/Mraei8uDIFe5j+kchn9OQprek4Qv8uzLBDQfFsKq5fHw1JVc3Sz2sRBQYaTd91Ym80LGzvedA8j2LzSSoCFRx2F6vgiJV+OE5IN0aLcBdLJxiJehh/3vCWHHb48II1Tb5sn8vPxEEpwEfs6kpXkNx7vDBVOrZ091dUIDhUi0rF56o/6qRdLRXZKCycho6WpchDu6nWtEzFL6R6Yp0fklttld8ZW13hPIFXxNNRm6SAIIFRru/pWNLNcFn06Ilowi28DbAUIf6 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(2870700001)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(7696005)(52116002)(6116002)(16526019)(186003)(26005)(1076002)(8656006)(386003)(23676004)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:TmyfYTJGtqhjmXXCbPGZs7W/KQ+oTZrnjzCIEyDTm?= ReyhYuhjsqFhl2DB+7ecZVHF/z/L/O2VGsHEvMyplIqiz/yr96L1icDVCI70qvl9VzsiWhI5j0mHq7Zjc2gQCUfJIkDL6WnBtR6eFSkQQCFgWEB7jkkmsPRK9G0RCfycAg7caejbowf8HRYP0Hj+1rw+tL1GIgsVpUX55N+bCjREiNEW8KwlwQ6M9IFE/iuDdTMzdRid1aCns4JYxH2MQeta3aSbsyU8Esig983tP/w9N0ffB3CPoXBMMxXGpf/w273INuTVB5OXG9wdlulGWgDJUKAgpMBpI0Aha5DhctIEKe7jTYrGYEBNikTu+i2l/eTQoMPEUOSxnCdNG3kc6GkzC5UaKP6DqO267C/bJnFRaG34zOG1/TVHngd0x1PilMSWngVbnrBhovkOgSrfV6WKsmcA+cu+KptV/Wjh3CJ449Je+WrTSR85TTE4FsPGKH8T0QfqQ9hv+Z+6JT6PfeSaLSCoeKbHfDIHkhsQFS/8TgYemQ7YrP8AtpbsaOelo1Kbf5AfQcg14i6c2jcFzavCqbOA71RaeIoxWf9+i11dmm+FCO0uy+/69GB8glxwhFZ+/6II2yjroYc4UJxu4UuhAxmV2ShROq/TooC6ekAQwS2+LW3GamPAMnTcYtcKZuj+o14nzXGPvPHNLTEdH6k5Li7+Un1Ppg84H9CJ6ZhfxC6BGy6mMW76ZpBGKeIyu7k8D+tQfNksonMOfeBg8D3h7YowcaivapkET6/qm4sQXkwTwMCpDxqgNce6zryOSF19XLJpjcSa3SdkPXqgvMXdzlWhMQNW+XbzRMG9M9zEAFRACFmDrnfsMpaNQItPbLnwrWoKcp/kUhFiXPPu4MynKhdvKC+Ly5KCEPq7Lh1vTLzuldpzYm0vYcFTjgn57jy0tOhhu4d+XnPEqmjR33xU+vIzugvgUK4kbmBBaqAIxS7xhWnVpbco7da/n3YrC86NgkCBVdaOEs4jPsawEtKWbIfS/EYeEWKdCMbx/yDsJ88SYUchhCnVlUg+CAb1ROTvfcfPllaeweuChjnK45nonu9si/BY8ku/STUA/9rzJ21ZSD67MoT896nG0J7o7qpgB4iXfWeA73TC94NIer9CzcreKY6aKP7ctScZKCGk0pZXLO/+bhVGDjqj6waBU9RNRviSImhg3Z+B1qTb81agTfLZ/v9OAVcvf8E2yoAg+6sOS7xFTvdYBb3ny5866WvtKfD9QMk9cUavvAriJB01dWcToh8mN8fbHQHsZwMabKNZOmTgdtSgppGoREeSOs= X-Microsoft-Antispam-Message-Info: AYxmxmu/pVYOMMMj4rq6UDPWresHOD4ojwevY6/S52aueIzCyk1aKNxgd9grz82nDyYsGyjdNvuqf5pbu98kVpa3t5Oxz3EFQ5j9dzOC/8rCQOh9UXksYPa5yMbR2S5J/pSm6pfg4LcXGnLXQFcuWONt0QGZiXxrrvH3agXm8plRbwiMDCf4+nGWC1C6eirS X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:eC+YG7ldZ+NcIWn5kRc2wXYj/RyCcSeyYefZ3DS+Dyzzhoj6WCgDAYgFNZDyt7ASb2m/zj0N2zDJ9mNUuA6eG+YGTqCbNEyegV1h6MWYao7ZDekySiVUME237wH20WWbQim7fwhuF2+TDappWK00aYImosT3anY5WuJD9l1nhlHhmpKCjoOPexpd7PZT8F24Y9wZIjy8ipcBFrseJYBEpCgsZ2c2BrAWszo+fOOBljF0wkP9+0sTfQRgCb/oaXiDwd4vwtToLHWYKyS5rKQdQvcQCeVHOZneDkoouIsp6jAwkpNunrSPIPKHZ224V93AxoAYwXf1ChB0HpWH/Mme5bfdQV8/CG9qs1RrhJTflJg=; 5:Ijif31MVimmpY9qR/V8UbXKuftwaA9uvM09Ml8xvQsQ1CLmls0pkRSK7dbFwo3mgPjg6bdLn3lpLlSYpr/iXyMQIZlkkIse9QFH0GHhX7JAVM+WOe18GUgugFTKbCteLIxxjf5ObeOwiQ2iU+0ff2NJhC1JuWZ6iuupwmP1U3Yg=; 24:FBGM4qoKk9uxhDOa7rYCaF6Zjjy6T8YXDzqKVfKyan/wdVrKDKO3CRdeCR8up6N2I0MmgAaYPiSqrrb6AbOq42SGaGFK+LFf1UJbNzpy6k8=; 7:VDdtudMhSANStFaPqouvEHUz1uPV6ZNCxtZz7wBGeVIVJyzCWmMol9TbuO9yRtqKYk2S8uSkDHywL92Im0ndIotRmMLbiH1x06iRZQLG8ZFFl5x3BxxT8NkndEguy4JuLXkrk2DECYnEDk+F3qmQOTf9Bc7nHNezMZQk92ZonikkTkjRHaBQxNEVhfx8rYzAq0k0gJBS63T+I80J3OIBkujidhgXzh9pc+TFHTpA9XoOBSe6fGbUrU1tjbhPvdgk SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7MoA9W91TT7PIEEb28KZq51r182C+lJDX8xWCOPo7Pio6pd2rHjDyRCQ4CIVXDK5gBf4qpHbmcKP+PVVwlPt0UZD47OKHo863V8h3vAQNJu3XrIbkYNPNfDHM1XFmaTf1GGSg6orKHNj+PjNRia+URN34Ll4p9NpllzsPFZtLtc4PsU60SqOP/FRzo1x3iIRZ36PjEzr6XXHVxziwklmtPuvVUgDWs7sIZgl1ViY9v/QNa6Po+96dLt8ueiOc1CM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:27.3470 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a387fa1-6899-4ad1-c783-08d584f32c03 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.78 Subject: [Qemu-devel] [PATCH v12 26/28] qmp: add query-sev-capabilities command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The command can be used by libvirt to query the SEV capabilities. Cc: "Daniel P. Berrangé" Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Signed-off-by: Brijesh Singh --- monitor.c | 7 +++++++ qapi/misc.json | 42 ++++++++++++++++++++++++++++++++++++++++++ target/i386/monitor.c | 6 ++++++ 3 files changed, 55 insertions(+) diff --git a/monitor.c b/monitor.c index d53ecc5ddab3..29ce695a80d5 100644 --- a/monitor.c +++ b/monitor.c @@ -985,6 +985,7 @@ static void qmp_unregister_commands_hack(void) qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection"); qmp_unregister_command(&qmp_commands, "query-sev"); qmp_unregister_command(&qmp_commands, "query-sev-launch-measure"); + qmp_unregister_command(&qmp_commands, "query-sev-capabilities"); #endif #ifndef TARGET_S390X qmp_unregister_command(&qmp_commands, "dump-skeys"); @@ -4117,6 +4118,12 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) error_setg(errp, QERR_FEATURE_DISABLED, "query-sev-launch-measure"); return NULL; } + +SevCapability *qmp_query_sev_capabilities(Error **errp) +{ + error_setg(errp, QERR_FEATURE_DISABLED, "query-sev-capabilities"); + return NULL; +} #endif #ifndef TARGET_S390X diff --git a/qapi/misc.json b/qapi/misc.json index a39c43aa64b1..37c89663d8f4 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -3306,3 +3306,45 @@ # ## { 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo' } + +## +# @SevCapability: +# +# The struct describes capability for a Secure Encrypted Virtualization +# feature. +# +# @pdh: Platform Diffie-Hellman key +# +# @cert-chain: PDH certificate chain +# +# @cbitpos: C-bit location in page table entry +# +# @reduced-phys-bits: Number of physical Address bit reduction when SEV is +# enabled +# +# Since: 2.12 +## +{ 'struct': 'SevCapability', + 'data': { 'pdh': 'str', + 'cert-chain': 'str', + 'cbitpos': 'int', + 'reduced-phys-bits': 'int'} } + +## +# @query-sev-capabilities: +# +# This command is used to get the SEV capabilities, and is supported on AMD +# X86 platforms only. +# +# Returns: SevCapability objects. +# +# Since: 2.12 +# +# Example: +# +# -> { "execute": "query-sev-capabilities" } +# <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE", +# "cbitpos": 47, "reduced-phys-bits": 5}} +# +## +{ 'command': 'query-sev-capabilities', 'returns': 'SevCapability' } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index e5596bbc0fc2..33e6bade693b 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -737,3 +737,9 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) return info; } + +SevCapability *qmp_query_sev_capabilities(Error **errp) +{ + error_setg(errp, "SEV feature is not available"); + return NULL; +} From patchwork Thu Mar 8 12:49:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="OgUnpXIb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrk43qnPz9s3v for ; Fri, 9 Mar 2018 00:20:59 +1100 (AEDT) Received: from localhost ([::1]:38819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvTc-0007DX-8h for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:20:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0J-0005qD-2B for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv0F-0004PM-2t for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:39 -0500 Received: from mail-cys01nam02on0041.outbound.protection.outlook.com ([104.47.37.41]:28960 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv0E-0004Oo-PY for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:34 -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=c4q+F53EvtT0/Q6OTgMmnOWY868D+ixZbU8ypuZRMpo=; b=OgUnpXIbE+z23ttATitwtpD+luXQ8yqbkcrEdcwxGwMfJciUIW5bzpzSnrGCgE52X8RmDUqokKoeSvlGooDYbKpXUM4mop29VWUiujjr3Ty1pKgzdZN1TSvGn/vwJJO0jqVOAeNW70O21OXjX5cCoUtEIYJ47nlROwvyqlzGl+o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:29 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:49:00 -0600 Message-Id: <20180308124901.83533-28-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 681a106d-4ac8-4bce-2db7-08d584f32d6e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:TfPwYLT5+gnYaPsYhatPm7qSuRbUQhgcMZP8quHZQv7SWUYfDh3NB4fTGMRuyr1aZSWIddGzAEi3ZeETz7M3MyLW70SXqELjsxeqhxGcDj2dTs0qSu49XX2iP14Hs+VqOCUy/LnXVDZ0BuyCvzkw5rAYvabHZrA19IVxRoJA9G7BOr/tWuefK2pDlz4JaBNQ6TWwZHIKdkFiVhEl6hefesDCKleW+2/ywSaCeLzkmyeWOBQ6FzUThu/EuT7Dxoqq; 25:kVRySm2eG61BMqz4ENBu6PQWY9TInhHK1m7L2iNwTkXJtKpViDh+i+2WamLE40lr6AZhDW/lJoOesb4DaKMPWzNLh52JJ1ani24yAR2UUhdyjKWd9UCo9dVarb9D2mmxdT2Sd+fA1IfD9lpe/hCItB5r6/eLA54p7Cu2LIyf+8FRD0a5bVksnTNMG49iKBB8SxWAFZvbnP6i0G7mrPMmvkddlmZ7KM79Kg91piLnu9lKzwZ2u9JXgxZ0j50ICn/1fXNsqfsHVahZ4DG1EiUSCVsCsTA2hjT83pY6rHC5JZG6QiEHWxhDKXOaQB1ojLDR1wcRmLFxdGSOiXFl17MyqA==; 31:PNejDorWMRdV5zw2a+QytfIfooAbwniXbdJYhKsPubAEeUf/cWsoTGFbNgwpmShgQnAlKUF5OLy7fFT9HsUCMVX7CtlA6CvUgfIA+P7YMZ+x3hmRAuwCMqwnq5fctvSjgHUv253qY8BfJOw4G4jRNq03FhS1Ugt9LVvdA7n7dFnDqZ5fdVc+iF6slWVbCSVQGWmJr+HIH3S1swkPmOBjWU4Eh8oKLONM6BVytKfOKq4= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:LjByn4gaQ3qxbp3v0jH++kTu1IDIpwff342bYQXPwlbi6uX8oz3fprX0M6ZKgSTT24tyaPMIn7reL1+01dVNsIX6tFQYXHAkVhwhrMqTI8NUT+SqFjCfHMlthqAnuwFpxxfWBVIDvk5J6kdUuII7r4KSzIHy0JqHLX8EVn4P9q0VbTxtbZfmuptLVrIubCPvfNmAHmXlIMBvnHtrvz4L9G30ErNorrNyNXdfQ+lJJNunJIlA85xADuN8Eg+xPfFq9o7qoLgJHyipOlGj/C69YnwTo0O2/gSRm2Lhjgaq9PK8+kWTetfVdzITCZ4LjK8JRQ4tQofxNKv+YsvAojXOYLT9WVxUegPWzMD30psJ3lI6/0MG2/VXzcaXXAMkzQ3gKI7U6YyqTDeyKbsW99KrRw1BeFN9CdHQaOTJwLGj/myDzjdGWmi7M7oXWoWUXM2poeQumXrQseHnM9mlsqqmlJTy6vT7escGNlC/FlV4zzFsULg0+G3QsqPi76+fCsPX; 4:xZZYho1EMAxH6SQjZYe1SSgET+SvYvzoFqPYw0tD4W0k1E+6CDa0Sl8hF8HyqKYhtn/3yHn9DHGZlqYbKqvS/8jgAHsT95tAa1ks6ALrtvaGjMM6fQjZFwl3CsqUiZO0Hg8KL85d8t77YRdR/97GUKSLM/hL4H58t1/x8HQoq0hXPP1GknJGZat1yPzAkKteCAprx75hq74tgemoGT78dmLqqxHNOuqpRJzHshvL7SdiFJuuXCELh10np2ESyFUNyKU7pV2fn6u2Oc6JzZYYop5mdE5sAhRmjcWu3llVxV5f+WkflAORHB85Mr+GYu4o 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:HU375NfSXSosxpZLlkXD+B2vzjtjErodx1yhGFA53?= GY9Ro+InC1RItFwlhTaAvNq/WWwRYe3VsJYMNdGvVO9gNhNZFIyv+XPuliL/LsWlILgYGD3LjYfI+sDzdK8DA7iDbNjRn0XcB6v5QXno0O1w7KdIfDsAYQTwqCMJdiyzFhJpzi3FZ5YHWtTODnlSdKSDSqLxBPC4bsQhrR+L1tqZgCKVUavXe2ZDwpUe17L3iRsutv8OB3DUKjG9kTXzJxK9f+JT9HgP0qx7MeDW/K2d3wd16kJevhMb8d4kdLAgIxp9uiY9dP/Zbwqz37TDMy0Lp7vojE6Nez8zsDhQZdRe6w7UtfY2QcVbAMs47Knx43wf1H1vkEVEVJRp7/dD6pcNuPe04K010cVHUCnQAwqLoUKVkgQ2Qvdf6l8JMGUP53LpFOzKxuCdlFgrMtHHyLJsWtaWRi68/pbPsi0NRyhc+jMhNkSeLVhNWDKXcA+aDtK/VkL2E3EnXZ0kXv8yPs2vaoL/IOfvXrB+1l8mxltfRVFqdAnl9Y55cxNR/pBtPxf+Wy9lY5NlzD0EzWy+WZzMIe5UwTSiBf61Z+uMz5gax62DJLp3/u4+h7idwPreLbOAb2sz/7HQuhYiZYnSkHXhzSZvt4yHPI/wfgfzzNz8Kpl/RwbAsVoKDPzXITNDHekt7xkhO1ETsA6GyAlwuaobwclqk6sGqiWqB8ZqH6MiNgWc3LFBE4oBfmssiOTFk2UsvtyEpFhqz59K9b6A+qtv3PW7f4p1m+0AF+sbhXNC4TZ2qpU5qgTnaMYhs8jhqmk2915p1ALmYBSXtuZzfTjENPRKKj4/Mf43JSKrHjYByi4FU80BHuTFTCAKZdRe/gp0tPdH+ETRs6MNdx+rP8VkC8MK+T6fifFrr6j7QDBxiOcF8JH+ITVpvnX7PN6EgeKoStEd8JXJliSBjW09IOV5YmLpqi9l1HoQdkJludl5ce7z8Gd0FLYvov/ixtcmveZZ8/Ztzsy61HcvMg1ekqtknLZ8hJz4pi7IqywNZie/adgniFNBbUFC/xmHpC2I5YGq5SJQRJc6xmTuEH7S1fKA9lrxNc0WqnEG4pMgoJCgxTS8LqP01gHBI4pj6CNEYiaFO9bEm6pS7D5FtRnaYe5yxsrxeteUD097PNyQNpx65l5i9VB3yqXqX2DnjPun0I13CKLv5+8J80ErsoPMMcLisRSDd3ner5aJ3nutdHK4RQqtdlVg81RmsU6CKhPfIiZpSF/LRb5doDqmC/7bfQ6+pMgGPKKRIUr+8mmKmS+jm7bek3Uh7EkXLfdct0MJ176PJVDkNhfXCct05V3XGEF X-Microsoft-Antispam-Message-Info: dKGbLxQoiiiAapM1jSOwhG8KHnf9sALYvQcXiccRQ0/LfIo6lAKxXBwTUOeH4VEzyyTs0PQI6pZj7t3TWhAFjr9MUsUCL3ev3G2m5bF2+DdQHxwyTaxxqQk0ikeiXYHG2ANcUOpw1+bCPr5vquaCfkcKwM3SpkeRMEd7sHoduOJGjZp97ohq8QfZ7jpOCRkD X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:d45CtgRlMSUIsQuqtydSTXtX6yqnBMCPLJcKlBKaHwrl7d/hKj+Y/Q7BElrf0vbIhRQHxeOoONS1U5k6Zh8XGo6rzaVRjYsFgvN73EAZvAR2T+FU2aiuDPgiJebPVZSQLabhc+w7RzPwvuAKJgVxnoDKJCvp3y2m+kMQAikAYufzxbBrBwFaifEs9c03lr1AUAj+NeqnD/LuO6AmvJ/QFS9nK4P4gewGfSu2ORUeJV8rB8BPbX/Y2ajARc+x7ryIVuGgrjcnuuwRyzVNHkZ6KuL1oDwyScDyjJK5LAxMaWaPYVFO/nYtAmqL+EjJgeFBVOZP4/GeQuvy6E0W8OHzuIk00yYt07iLEs48CdPdmKc=; 5:ycHT4xRSd990QkbhbRpWq5nVbXEBizAZT79dcW1fMYOACs08ePp6uZ7D/Ex62tImOxzRUN1dGELwxuMfPcwkTH38TJwsPYf/n2elMnRKANsuweNUoGhPJaFRngeJ65z2eyxPPASq2xGdXbOtQV3HOU0mHQTSUotZpNiUkpcU3mI=; 24:gHbA1kgIbmiN5ptgkFCG1Km0O7KJmwM2iINcB6yDSSwcpdxHx6VeWYnLlQL7I7n0lWi0v82Zog94fbZfnPf1Qwp41i1QB10kAimEFh7mGac=; 7:LP0xs2SUTiStJrpmm4yoAwfMOCecaTdb/kAp9jNfm9UEyJnc0eXt3GcjHbzrIAVDtdBSGvsITVsNSZaZWde7C338UKUomDhT9DS2ThZOr7fQ9c7xYXojm0lMJpR0fsTxF/PxG9FEqtztxP6/HpMFk/N4PGrKc+n4eTCMPYx56EjLvIg/1wG3rGKnYI2Y8sOj1w4G+fjmyu0jiQkGbO9fhc7HT1KgLqSY3q6BqYswgKISVAmdokITpkCxvcIkOWcq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7R/eS40mCbg/w4TCJHhoZ0e7Q8UymAbSXwwr+Hr1KhsLDcGypwfhAjFCqGo4tJUZHIB7ZJJ+JOtVKzvIccm+It0514MdrWnndqjoThEcrGaO+U/b2JaTpiIIYlA7x3/SqxKIrcVPwL6N2g+1iq7Scb6ti966CllssWI7b02osp4WgHrSOIOY1pqGicop0/O9Or5LFR7SBeGitY1OzQnIjogBlcEUepe/9JXQTi26HSOlrGQem1UM+wV6edj3HCUb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:29.6595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 681a106d-4ac8-4bce-2db7-08d584f32d6e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.41 Subject: [Qemu-devel] [PATCH v12 27/28] sev/i386: add sev_get_capabilities() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The function can be used to get the current SEV capabilities. The capabilities include platform diffie-hellman key (pdh) and certificate chain. The key can be provided to the external entities which wants to establish a trusted channel between SEV firmware and guest owner. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/monitor.c | 11 +++++-- target/i386/sev-stub.c | 5 +++ target/i386/sev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 1 + 4 files changed, 98 insertions(+), 2 deletions(-) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 33e6bade693b..79fa9bd7a3e3 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -740,6 +740,13 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) SevCapability *qmp_query_sev_capabilities(Error **errp) { - error_setg(errp, "SEV feature is not available"); - return NULL; + SevCapability *data; + + data = sev_get_capabilities(); + if (!data) { + error_setg(errp, "SEV feature is not available"); + return NULL; + } + + return data; } diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c index 2f61c32ec975..59a003a4ebe6 100644 --- a/target/i386/sev-stub.c +++ b/target/i386/sev-stub.c @@ -44,3 +44,8 @@ char *sev_get_launch_measurement(void) { return NULL; } + +SevCapability *sev_get_capabilities(void) +{ + return NULL; +} diff --git a/target/i386/sev.c b/target/i386/sev.c index b9bfce95246a..1d0cb8435e0f 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -427,6 +427,89 @@ sev_get_info(void) return info; } +static int +sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain, + size_t *cert_chain_len) +{ + guchar *pdh_data, *cert_chain_data; + struct sev_user_data_pdh_cert_export export = {}; + int err, r; + + /* query the certificate length */ + r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); + if (r < 0) { + if (err != SEV_RET_INVALID_LEN) { + error_report("failed to export PDH cert ret=%d fw_err=%d (%s)", + r, err, fw_error_to_str(err)); + return 1; + } + } + + pdh_data = g_new(guchar, export.pdh_cert_len); + cert_chain_data = g_new(guchar, export.cert_chain_len); + export.pdh_cert_address = (unsigned long)pdh_data; + export.cert_chain_address = (unsigned long)cert_chain_data; + + r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); + if (r < 0) { + error_report("failed to export PDH cert ret=%d fw_err=%d (%s)", + r, err, fw_error_to_str(err)); + goto e_free; + } + + *pdh = pdh_data; + *pdh_len = export.pdh_cert_len; + *cert_chain = cert_chain_data; + *cert_chain_len = export.cert_chain_len; + return 0; + +e_free: + g_free(pdh_data); + g_free(cert_chain_data); + return 1; +} + +SevCapability * +sev_get_capabilities(void) +{ + SevCapability *cap; + guchar *pdh_data, *cert_chain_data; + size_t pdh_len = 0, cert_chain_len = 0; + uint32_t ebx; + int fd; + + fd = open(DEFAULT_SEV_DEVICE, O_RDWR); + if (fd < 0) { + error_report("%s: Failed to open %s '%s'", __func__, + DEFAULT_SEV_DEVICE, strerror(errno)); + return NULL; + } + + if (sev_get_pdh_info(fd, &pdh_data, &pdh_len, + &cert_chain_data, &cert_chain_len)) { + return NULL; + } + + cap = g_new0(SevCapability, 1); + cap->pdh = g_base64_encode(pdh_data, pdh_len); + cap->cert_chain = g_base64_encode(cert_chain_data, cert_chain_len); + + host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL); + cap->cbitpos = ebx & 0x3f; + + /* + * When SEV feature is enabled, we loose one bit in guest physical + * addressing. + */ + cap->reduced_phys_bits = 1; + + g_free(pdh_data); + g_free(cert_chain_data); + + close(fd); + return cap; +} + static int sev_read_file_base64(const char *filename, guchar **data, gsize *len) { diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index 6e370775770e..b8622dfb1e49 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -38,6 +38,7 @@ extern SevInfo *sev_get_info(void); extern uint32_t sev_get_cbit_position(void); extern uint32_t sev_get_reduced_phys_bits(void); extern char *sev_get_launch_measurement(void); +extern SevCapability *sev_get_capabilities(void); typedef struct QSevGuestInfo QSevGuestInfo; typedef struct QSevGuestInfoClass QSevGuestInfoClass; From patchwork Thu Mar 8 12:49:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 883130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="WbR2EHUo"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxrSk4s5Kz9sXk for ; Fri, 9 Mar 2018 00:09:26 +1100 (AEDT) Received: from localhost ([::1]:38563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etvIS-00055B-Eo for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2018 08:09:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv0K-0005qN-UD for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etv0G-0004Q9-Nx for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:40 -0500 Received: from mail-cys01nam02on0081.outbound.protection.outlook.com ([104.47.37.81]:30931 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etv0G-0004Pk-G6 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:50:36 -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=2T9xoob0PFlzagMeAX0jQfPZCw4xR2/Xhzs4qo3A5E4=; b=WbR2EHUouXQsaF+BjOpyXj6l/raIgHUkOQyKb+cHUl1a9myitHiPA8uSqajnRxgE9MRImLjnz3VzanRVVQtNQhRm0RLRE2t1uF3ocgTXZoEO8NoJBD7Xwwa4mfndFGxvTwa5CEPHx8vJiWinXNETVmNrNuhlMNrsf/+WQClmm40= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:50:32 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:49:01 -0600 Message-ID: <20180308124901.83533-29-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8e92fca9-8fbe-410f-93df-08d584f32ed8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:oDquW+MG5FAhmuEPQo6xrIgu+LiLqYJlHig4DSamIAzZMMRrhy/2xSC6Q3c6nJNv+FF7zjfDpDOnP8q+jMKj0lvW5/NXZLyeOSiPksbRc3hsw0SMncbZh05AxtR+cCSaqFGC4CQnki6KYEYsiBwd0Occv8p4DPicTz53QiL6pzDtBW5XUt8ugRd7+BB9Qz3SITFKX//W+0a+pqVQh5dxSjRt2dYkhPPMrGyBx2C05l1h8UF9+Au2TzQ9ihythQX4; 25:8rpC1lPJQJOaBNj1iT5HutkYSgeWbmH6AWQFRc/YNmXw0NjwihruPPIoYwv1ONdOz/T5FpOj7erRCoqpHSbFCoBSIaGEm5ihLCQl3052SFtAC1+5xRxUF06Idcf6vDAfvje9/1Kmf8I+dxvIl+WGXxcb98aknMuKbtVy9PExSI1zShumqXAHKMHigypYMKzItFcJ935DlG7c4wBVu7J2KTYyOpR88wFmDRw489Ay89MKO2WNK269pPP7P0jXBh1mwJi1ui63ByCIZxK289UNiV4TyBHQByEUjpC3vPJei2bly6QnroYffCpI0zNFyGkRhO80LB0IWwiNcTKDj0Cvjg==; 31:H8+2uYarVz+Umo6Hdamdb6pfSdkIaML3ROzeM0EHWLEmfIEzxUY4P5DvRlB5k00RzQWbGb7HhPfB+3goE39gVsusZchQU1bffUMMWIzcwKUfMUN88VRb+z5aNloBVGOXQcHFqkC2ExNFG5z+JqoYe8Gqx7rHT3kQPSRz1WFF2JCVEVqb/7Aj7m91VeCjivkjYqEHz9JMoXRPxh7gGorhbdqVQVz+2MnJYD01k6WPh+w= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:7Fa7e/G6cgpWFsRaL/32OeJc6uu8z7geEhtKVXSmKqpFNXtkeiNmG0dXWa8mkXRUV5KM5vrASHSG+RQwVK5s11yYi0WLwDLsL5n0h9XjgpKqvC1ffZBBPS+LOfUZUmdeht4NdUZmjAobsC/kNN35U9k4TDf4zJC7w9mkjJT3wydUWDDu0KK/bUjlTvCi8SN8JPNdkMSJDW5pN1rv+T7gJkTNsKioQxeqFMjuWPVbts2SnfXpenOZ2RliGTc3Ud7b4+gM7ze+lubwUoy/+GgR8exa/LEQwHwmjePfvXInzELxmPQsiShxqfMYFaFnUhb6BhlANFysWNYXwwtOcGjBB5Cm4D/pO5JhhNvl5QsYj3xIZt/BILEOYyo/HyXXsSOBn2zF+H7J2vLgGU1yjnG36jcewfgykEti1NZdlArAu416LYyEcLtAvzHtfaHdqFSPVzPekjo8rXq5gPieOebmRrjtsB9q9E/EuOEsSPKaCesNjdCUNYcLy1sXCyy3ydfQ; 4:3leLs2xKWSeX6UL/NWT5F5ASEubqN3HTc0FIS0oJQrhtIbbP/WEiPQx3LbBvC4Elp6LsRTEH6oq6l8X3XCOiG+Cdu9bgpV55bSzBc/HohJ2EBEAkeGy/FzD1mnbWVf6YZJWAvQJUP0ZiLomsG1pT4S1L8zuvsVPNteodvckeu4AA2yd73i76nQdhh0DA5+juo4YC6FlRb8JquuScFgFDj45KWd4Osl8Hb6yo8TfGHe3Y+004HPPoDfRb7f/Q8bsQRTcYwN7zVvFF3DvCNNdRVOb/ETTyb9LO+al7RTizYTp0TKirCOCC+5hJLnFrcX6d 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(1496009)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(2870700001)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(7696005)(52116002)(6116002)(16526019)(186003)(26005)(1076002)(8656006)(386003)(23676004)(54906003)(86362001)(316002)(59450400001)(8666007)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; 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; DM2PR12MB0156; 23:Cj3Il6HOVLSzCA6nPy1h/A1Q7+Lvii7R8334wtxYu?= YyF4PVTyoMurGeWHoehzIt/xOhOjzxGBFYknvEuFR9RSWnBaDMYTM88JLhGhOOAaGnLTt6v4qZgBDOm6SP23qeTnXAvOfEYTgxrewjbJabYzhph6u05jwS35v2kqU8ZPNwvtzCn2sd/oOO8tm2RCqcK4uNJI309aQ6GKE9xgZK2fBQj6G/A6C4f8Vdp62hIqcU89MilTYnox1R23d93pn90CwKfvbME3vpsIuuNSl5K7zuOnO5UwRpGE5rBjrTGjujNHKeN0M3Cqt+zSP1Sl2RRyT8FifHSVQSPjoqmUOHw4yOq5EWqrpRzQRl5OaB9gkbWB2SKHAnozppT2SwfCRG9JDAXpztaYUtkFvT2vV3H8n0rKcAGCKUl4zAdB5PbzUWx8HOwQ1mmSiuTaqayp+svgPnb4cMcDl73X9A/46JQ6qMBHrH0px4gVZnkidPrHr8exAhWtPw3vcQHfDYmx6t4NDs2PXx78LsdHeEsXdQOew/9d/axW6g1t7oGsoTOv2n36DVnSWMkZ042dob36TvNWuQ0AsMGkcI93cSiIQa2L8Wi6S1/I0ZZLzBec4CfxJv6Ty/WdwPBuyqyuiWhAKEBdNUj6BKuRTgD7sL9X6WI8U9eQuwxZglEKy+k3NJJUFAy3Tb6HFAOUaj57EFSesQOLz6ZDFQXOxo6b3zHkCdB7Mi2NOhDQMVeim02S20OFZ8DE8oGUntdf2IJ29RFBsMPCzsL14on+On/pc07/c01uEguFNDLsSTXno1xcmOxB7wiLXaFt+IVlVx9C/Z6dmqnK4ZgnYu020Psepy1NHXRz2DvOtFdnPgn60ZWjRjM2d62iNBYS2exloWnb+eBcgkkZLHb4908dW1I99Ev4JQcxuysBnLwURQ35Tm+225ICt9KcqtPrdgf8l6KjhXBfwq4KUCkDdRlSoRbtwJXbq760MaV/4Vo1uocJSZuwpsC8Y79fXmDZeorH8Yig4KOuQ17DfT7/p82z7AodDF2SlJA40RHd9r1CQF40SnPDtZLiq/WI2GwmUsXt/xt/IKkV5t9ipxR8xWWSFIR01MZehuECiyq3hlQ9goCdVTdmHt6UcGNpEhLIMfbDYtTUiNf/nYXrf8cAh81/Jnvx1ptbq+IMBr5Xp1Q/vOHdBY9nkDFLpcp+MDKLquM4KdE2OTpFnb+zhdfMQUoJk+MwSsl246DseziR7xhaxF9R6/8Kx3PuNlEEvwGvs96SAuph5Dmi3+Oo2PBOspy98leVoMy+AnjfVS1DK08DM5QMJ6Vm4yXVb01U/Eo9v5ApsYZhqs69ix8yB2KbbPjm4tZrIl3e4ga3l9mH+PVM6TCczwxMfJvimA7KvxNoU8DFl4k5d58SyJp X-Microsoft-Antispam-Message-Info: gNnI5ePm195QI/mS0Pp4Mu6OFNWDbw2fKgegErQtdUEEUiZI4sQOEoKTjtHmElDclZ2ASrLNWHhfIN0wSICY30QSGQSff1G7oF6ptYB/h0fJN02e3Cjffji4UGuE1R8uLIXROSkXHR4oYpH1FO7RTkPaBiMbO9KuCfFtkQOP3F42i1jaNkWwW+u2fpHBAn+7 X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:MdY+je4DUunoP/uJ9JMlfcJxpzJr3G1yIvpf5maATHZ14Ri/xhAhyxg/lgBFBRBMR8pGh27D4xzb2I0QJ1AsDIYk4VHecxbSACzNRTMdfDSb0UhybdsQDTyteTrE4b5zX/fw7DnLynm7uptf1JFALz4Ay5QRmoiOslVthsUwZLi5c28wvGSL76moIJ7R5rxgK6WmohqEg5iPmiSgZlePog7JI1qpM5t7cY7VWaeA5lNW/r/TWfGTw1N0HeuJMbzBEQNw88Dlq/SmGVQodqtoQObj3s5hQ7d6m7lOFpxJMPzhQisiqdg2KJjHtMU9p6HTuvG1JU/FzJ8xUMJELwUgNz0X+tMVGtJ5FnxJ0itD9BQ=; 5:qDb0EqNVobk8YjQkatpzi4xxkjehuY9Q4qlG0bZD3Za4fp89G4ouIs6Bh9HJBTeKhMk6R4ohp4xXPhvHKmItLtSbIPpBgeGNF7qu4RQinqztt2e8zkFqUBO9i6cRncJ/9tQwQl3PriC8qGXuR5gheNHv2rqB85ZHQWqc2sZN9jA=; 24:MbG+t0qjEg2FY8sXIZZf7AHM4xreSZst/eoDztnoy7wIK3qjvYDPlW/zmsFaI+FN9zKvTLYyC13JOxvo/2/53rp1JKoCKTdvHB+FXWHuLrE=; 7:y6i+Es0QGEnK4ddAsoCCJP4//4diKBWFqSrWI6wXgs+xBAVA5pjdzLkjHjOkXGiZirBdcOyVBAizvv9ePVgJz267kda2vLb6ufXNcRO7tz+lZaKfzBRBUaYTxh06BbcJTTaDFiR29zFLTrZaZba2Nv0+naDzlj2uEn1PHmiV4UqwojkciQz1tBxbNGBKWSBr4L56LjEoa5iNeA/cO73RUxKHRX6CjcDmpIuAceRQvxMw1rnv4WrH+ocYIXzZyZBY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:8edPU8NnSFBUKGVd2/+ldgjKAXlB3+IfEUfX6drbTUyd/EOjXfEQM6KTAEqlkiITUgSEdNacZLG95ZxkWmY/Dc3cx2AtXZQHFBPhGBP4eF8v8r4MLPgQWJRvp2T9EgPaK39nPxhTJC5TuCuRwQRH1b2aeGFqw8wN35LwvAjeV+Vea4gxQi1cmZKa6EVGZ0yJ1RncRFBiXb3FHT/IgrcZzgBJUFiLiOCqEM/xH7nButO0GIacqawzfHa6jJvUkr7U X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:50:32.0345 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e92fca9-8fbe-410f-93df-08d584f32ed8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.81 Subject: [Qemu-devel] [PATCH v12 28/28] tests/qmp-test: blacklist sev specific qmp commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Blacklist the following commands to fix the 'make check' failure. query-sev-launch-measure: it returns meaninful data only when we launch SEV guest otherwise the command returns an error. query-sev: it return an error when SEV is not available on host (e.g non X86 platform or KVM is disabled at the build time) query-sev-capabilities: it returns an error when SEV feature is not available on host machine. Cc: "Daniel P. Berrangé" Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Reviewed-by: "Dr. David Alan Gilbert" Signed-off-by: Brijesh Singh --- tests/qmp-test.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 22445d9ec258..7470c6b754bc 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -204,6 +204,11 @@ static bool query_is_blacklisted(const char *cmd) "query-gic-capabilities", /* arm */ /* Success depends on target-specific build configuration: */ "query-pci", /* CONFIG_PCI */ + /* Success depends on launching SEV guest */ + "query-sev-launch-measure", + /* Success depends on Host or Hypervisor SEV support */ + "query-sev", + "query-sev-capabilities", NULL }; int i;