From patchwork Wed Mar 7 16:50:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10264445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 22C21602BD for ; Wed, 7 Mar 2018 16:53:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11B53296F2 for ; Wed, 7 Mar 2018 16:53:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0621E2970B; Wed, 7 Mar 2018 16:53:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BCC729715 for ; Wed, 7 Mar 2018 16:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934210AbeCGQxE (ORCPT ); Wed, 7 Mar 2018 11:53:04 -0500 Received: from mail-by2nam03on0067.outbound.protection.outlook.com ([104.47.42.67]:40290 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934173AbeCGQwN (ORCPT ); Wed, 7 Mar 2018 11:52:13 -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=ii5qnKz/iLcENW5KZJcwoPpFtKugynXFvua4SaNG7iU=; b=F0D1oGpoTJBkHBULNx5mAOysn+zEd8Gs/w0pEOOY5tRw/catzTAxtPMJE3SVa+29cv3UGqy60uMZ+Oz40Fbe9iELlbsgYo0j3cFWmeame98qdWUh8fxjBWsr6836N2lTZNXcHtZkTkBhlI+nGb412KulMacoAp9dTmOTG/cc9RI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by SN1PR12MB0158.namprd12.prod.outlook.com (2a01:111:e400:5144::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 7 Mar 2018 16:51:21 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Cc: Alistair Francis , Christian Borntraeger , Cornelia Huck , "Daniel P . Berrange" , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , "Edgar E. Iglesias" , Eduardo Habkost , Eric Blake , kvm@vger.kernel.org, Marcel Apfelbaum , Markus Armbruster , Paolo Bonzini , Peter Crosthwaite , Peter Maydell , Richard Henderson , Stefan Hajnoczi , Thomas Lendacky , Borislav Petkov , Alexander Graf , Bruce Rogers , Brijesh Singh , Richard Henderson Subject: [PATCH v11 20/28] hw/i386: set ram_debug_ops when memory encryption is enabled Date: Wed, 7 Mar 2018 10:50:30 -0600 Message-Id: <20180307165038.88640-21-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180307165038.88640-1-brijesh.singh@amd.com> References: <20180307165038.88640-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0501CA0095.namprd05.prod.outlook.com (2603:10b6:803:22::33) To SN1PR12MB0158.namprd12.prod.outlook.com (2a01:111:e400:5144::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1ce19b9e-42c5-4d92-3b4e-08d5844ba7f5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:464lrAms8FrefHjSnK1jPjUSIOlDIce2uG4XnkVF3zhzLWzK6pjNLEoUrxg+yDwLQFCzq8/cPQhX0/mqyEEItu/+/gKCGnC4daPTdhZRgwDkcfC4X0Ihi2eHx1pEaKMaZyCgXDjwLF6IfXeVRQ3aM+GrpymS29NTa7qTHl0XRCFEpwx81xNIXwAFb1MekDtfv4D+kDgZKdSCNdbUP4TlVe0bHjx4fAQ408Gox/sz6PHZqQ7n4s9khqdPIAT1pZxd; 25:sLFbG0dFdXxDAzVaxIsp0HNB3GjdklKGxkpOZ4/eBZxMfjnAO9AFtCEc7gQeu2zudbNAf//GGIq/ME8WZNNkB2tmFufxNYP07CSuOt8kOpnR/2Nyx5Jpa7lDEaY8Bnz/5dv+UsvL10OXNPDpDlW+MkRpYX92SxMrNP3ACV3eizZ0WHu01UYueqElKFn7aW+0vKW2Vlc/9ZqAHyFnuFyiSYB0SAkMv9zW+MUVjG2PyL5gpcDI2PzXOl8l7r3V/HitzN0ujxphzSnVqQ4EafbIJguQPEwZE9LcemM2s9SFIBsD5Y81tqh3n06vrrrgcDjnU5WyxSRDacWcRt7I2G/KFg==; 31:hOvXFW6vTdc4IJ+4whx4h6RrqZQ1DZdcASXBiBaKJMDoFPPqdmJKHq6XPlST7/gOtIXWC0bu++Ti61F7LqKthaISb3P/tYyZ4CooO5Ppo+8BfG48t3VrfEG3ZOJ7a3CJfrj2JlO5A04QJkArJ1DOYoKDx8+9NX2GCbdmg38lOZy01oh4lVhkSaOVfDKUYPrpbZvUmwzRrkOTDIAMCp3EZOVLhzIp028OwEilzvN/HaU= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:Wz0E3W+0gVO7HCGnr6dU+izvv/F/dN1klv6tNf+5VnNiJMl8tGqYklTSNcqbW18TqBoTAN2hfTajbWJWPPlB03yuONmzRXuxsOAqwdKOUgN/N6I7YdF9f37ZPvZPnvO5Za3Mp6sT66TSPZxUDgUKLljuzFp77I/NESi3Mag1LVeAqKzMgj0vKYuvVO9eafNcjAhatXC66B3sltePJGXOcbK4ZYdb2W0PWch9OckeuOuul+KGCZGec+5hylsSbZZXxwKmF2OqEBie1TSeyh+txXAbLzhAsBkCNrthnfDC0Gply9Uw+FODi27UJZ175/6WUCo3U30e++TJ50S59tYR4lkKqwmcvWwwWuiQ+qcOUmp9dgpU3bXqSQrfws5vwzQzpxxrPwHIQ5bljnLs0159lvKRZ8sakZjtBhdctuRPwIhx8IxfCq/w9s9tUMZH8LhCZmJF7SDZB2o4zBRTEqbF+IDUD6Rlq0pvddWTpLQN/1iMSLJjcCt84vOefFHp393K; 4:qGQJtNiTJ66n1FOofqTAb4SufwO4SUOHSPz8CKECjueovBulZlrIVubOLU59meiwQgWPanDaPJd6oU1cLRrxDH/szhZBOHaQQtSZJUnQse/Z+ijr6d867LKB5OXpuFGKnwNQAhATUMVpstqOE8QEE+PogekICQYyc4G29zVFCe/JwZjxFS3/FG8v8n5pubfhr1vwi+ax85GNuBJKWmGrjgbYzhtn+Wq2J9acxSCmRlsj/if0lXgkRvSkxzMmPY8cIjk8MiX9CEGDA5xK5rKwOLz1JtOa9rV4qxWTkgeVLBaYFzYJ0Vp+NV8JHA4Q0rhz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0604AFA86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(376002)(346002)(396003)(366004)(189003)(199004)(53936002)(8666007)(2950100002)(6486002)(6666003)(6916009)(53416004)(3846002)(1076002)(6116002)(4326008)(54906003)(8656006)(2906002)(25786009)(59450400001)(386003)(68736007)(478600001)(48376002)(50466002)(105586002)(2361001)(2351001)(86362001)(66066001)(106356001)(47776003)(186003)(16526019)(51416003)(76176011)(52116002)(7696005)(26005)(16586007)(316002)(50226002)(8936002)(8676002)(81156014)(81166006)(36756003)(7416002)(97736004)(305945005)(7736002)(39060400002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:wsp141597wss.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0158; 23:C3NpQCTZpyp7yqooppYL7ob4ArqWpDN2SrgsoU4ps?= =?us-ascii?Q?17aaBHCU7MfiwfmLrgxWO8NzP7C4zF3h/zcA1CLoz7e8NF6jVl1Duk3m4OhW?= =?us-ascii?Q?n0TVNPbU4YZQYpCu3UQy9G3kD7iDkVk2gomLdbQaTtrp5iZmMQPP4WCIwLAz?= =?us-ascii?Q?yz9thqecO5yuU0nDZqcVl7zecR6rUzPphON/4UgCRPUNmeoKrCRALwDPRYRQ?= =?us-ascii?Q?IGp+xuvqauv53Gj6kKawnKKrpacY3wiJtHNLO06wki6fxssJaCl2bGNMP2Ii?= =?us-ascii?Q?+DpTZXy/3sx4HY4e4xLhYGusSSE/ucMLdcjCoCKjvCoFxapMM8THKaH4x2UO?= =?us-ascii?Q?RNVC5VqZsS8dq3f8RL5PWqBLwY5muck9ycOd1CU5J8qwxI/LWekUMqj15R6D?= =?us-ascii?Q?wyvurcV6sjTtD2IToeEQ6BKWKkz9nzcrD9bvwtrVGUzOYklYy3KVmZ6FbZHO?= =?us-ascii?Q?hQ8ZlJkYJhy8DqZs1EzY3B6tF3KhVpgeTZpFZFCiS5A9qTI7+5zvQCqnjkjx?= =?us-ascii?Q?aycqNv4gLIC7btOZnFK8s3VJZmIi8iPNJ17/ZCM9msHZ5XtAe+8AZno6MA1+?= =?us-ascii?Q?kEDHced2ze0LjVEJnLNW3/olJoziHyqW9s8Vaq1I6BHUi0JCHu9X3redkGbg?= =?us-ascii?Q?5sw4hP9Fs6kwaDcDzYbAbIrBNVFmUX5Aub4oVyTZvMwvpQjOj9ZEaCBd0HjH?= =?us-ascii?Q?TpHrHkAxyi8A1WBVHQ4nPELC05yVZpHBUEd96XW0Mc80R1uBZvru+EF+vIdp?= =?us-ascii?Q?YEQqGOOeLRFpLrqGC5r04uem62jZSHcg42aqDUZk3U4AsDmVNz+Sv/8yZd0G?= =?us-ascii?Q?/tXy6/wlxwK0HxnuvCC46eSyPPC3b7CitvanxR7onne4WS9kS4nWZVVT+n8A?= =?us-ascii?Q?wBcmCjVDXJyHAc2abqFWJO2m4LVktHeLBJHffHD07spwTXVnd4sFyz7npKec?= =?us-ascii?Q?UosU4+3jL5QUJvEJnrPCVmT5WQdZ/RTT5C1UZcIWn+CRrQzNKAwLmb6DMG03?= =?us-ascii?Q?Qs0xi5YvnN2o9L+O6QhxPa2WKZreuP5IVpNUSduW9QSO5p6vzqzMmogtt7dc?= =?us-ascii?Q?Yy0MB+2c+vXnDZy9e8UxJnKhf9KEdDor2LQiGumBIl6J4IhvZxDy/kycCRHm?= =?us-ascii?Q?3g72N2tOyryHHPWY0CGYHfWqx0w6StRHBBhCWwLO4YW2mU0Gb29fmsfRzSOz?= =?us-ascii?Q?bl4FibsGsEecxkKEy2kbacLKlh50UeGxNz9WTF9ux7kz554SQV/R6IWOzc/B?= =?us-ascii?Q?1fXyPno7FJ/LCvxBwHLR3KjxU9eMaCU0gGbm3Tn4bCq8ayYdwAHcQpODxxq2?= =?us-ascii?Q?WyndbhZP4vDoPUynvrAG34=3D?= X-Microsoft-Antispam-Message-Info: WHmBHlfxpaXd1IeUYr1vtTXfqFeWYjoPaEb2r5q70jLH4r/DDVpYM7Ipo+2H+S9yMaH5blE+ewV8WR9uVv1YChdAFd29eaTjz2fWKPEwbU3/Ox3ZxI3uBlAcWrkuzOQktnVVI0iel9TA8NlbAkhJnQb2N2Vk9UkHsXXEK13vBYkLf6LVjPl+BhDAYq1qBN8Y X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:kv46Zy9HTSVUIzEiZQ7qiqxBWi41Cl6asZJzURiFV4OFdtiRF9nTkY5+NizbZWq0MusaEpibp6jK1gDHypWft/ur/wIScmvrWG1HuhYX1yZH/6L948mI7svc0eI+OxkycacyFmmArvQmi8OPUmXD+5WxbUy31HwQ7yspnWtbRoTEtkFpw+HG39Xf6pCo5+DK4Rj//3XGkuhB/VZcKE46DL9eLhxBB8X7iahl06FsS2TIfCNkG9SVR9XDg1wGB060+PmUOMzQ4cFU3Tv5fqfviK276XoDJqhqWVwag9X3IwJ+/Du/L9cHrpveTezcZb4fCm8mo/NQnrCGZcUo7fr+yPWtAH01ABlivvJdVcLYz1o=; 5:LxMlceEGU0pNPHBlqv8o/TavtY1ys5x3A2mki/BOjbNrdCGw1ckErLXVoh4xxSlWjLNKlsKp7kfpHgVRD/hKP4iQtEO8Dg+bwTnjxKAUk1h2/dRWA+LX3VNzzZJG8xhdm6vjeGumRoVT17YbqZ1M0MYPTQqoohdv1g1MIzwpHRo=; 24:iFrjj5Wypja8sV2D8syVmXT5mxU0Gn9YktnYaROSIgUC0R0GE95DS2gE8CJuCyUEPqApAF9y/EityM5Fx/+EqFeE51G/Pll51xr2bSnWfms=; 7:PG/GlIzKN45UJ5B3beTkbcRkxkwCNSDMW0tMdvfKNsThpY/8ta1N6p0EcBVAlxLHtyFX7OZGzcEJhlciVJdciWPLky9jd0/r5XH4UQW7Z5tDl88+Xf5mDY8xkpniT/1ON67GP+bZkuc81Oh5oc8kYQrUa94vkoQZmkl+ShJ72bkyrrIWEeijCARR/0lWiXHCiM7w36B2L3NAKaKlReaVHM1dE+QrSfwlEmPzIZBvYC7qcLVet6CfRYmnGuOju1Tl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:xkZDHJFKOyEwwsuYT3y9lGzxSkAhclGp8/rwSdI5TgcxvnxOpEwVjzGSSxhXUYV227adDhTETSTSebZnY+jE4x/p9A+uPLH6lzQbz+ZDL1qOPm/KRqnNcV7gfJdiOjGP1QQD+Z5HCLXcdXeKeQe/CPAdoihZ8v37cVte+EsAll5RpAj+NYu2wIUvA5h+WzA2KpzS8Sx2zn476qQNGJ3CzuKeI+TKPQ/MtnQQyU7bZISHLSNmhZBMP+goAE1H19BS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2018 16:51:21.1354 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ce19b9e-42c5-4d92-3b4e-08d5844ba7f5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When 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 94cfd40ef2c8..2aed48cdf13d 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); } } }