From patchwork Mon Feb 12 15:37:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10213455 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 BA17460467 for ; Mon, 12 Feb 2018 16:05:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAC1328731 for ; Mon, 12 Feb 2018 16:05:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EA7A288D8; Mon, 12 Feb 2018 16:05:31 +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.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EEC6228731 for ; Mon, 12 Feb 2018 16:05:30 +0000 (UTC) Received: from localhost ([::1]:46120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elGbi-00013M-1X for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Feb 2018 11:05:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elGBn-0003hw-MT for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elGBk-0004Tq-69 for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38:43 -0500 Received: from mail-by2nam01on0062.outbound.protection.outlook.com ([104.47.34.62]:17764 helo=NAM01-BY2-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 1elGBj-0004Sw-Ts for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38: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=2DFtgqwVUgcxVVo6D8Y4SyRXve2OmdSb12VfhrX6DHc=; b=5IMIVZRxGSZYwMYQpa4xDhs9Ph4FHAkPsFr0+FCQJ/IcH+ZZf3vhYNDbagFrwEgZEg1TwhQaAP4Jyg6J5sp3aBLmrvThU4vvVp1Sig4y5k1fsnUYpZ2dXqmYuyrRfIFP2IjrmDP8hWn9AUJ1QnQjqn/2naZhjkHH2Mzl31jbZ80= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by BY2PR12MB0146.namprd12.prod.outlook.com (10.162.82.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Mon, 12 Feb 2018 15:38:35 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Mon, 12 Feb 2018 09:37:07 -0600 Message-Id: <20180212153715.87555-21-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180212153715.87555-1-brijesh.singh@amd.com> References: <20180212153715.87555-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0801CA0004.namprd08.prod.outlook.com (10.161.215.142) To BY2PR12MB0146.namprd12.prod.outlook.com (10.162.82.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0be2552c-442b-47de-d46f-08d5722eae9e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BY2PR12MB0146; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 3:GgBVA2uP4nkYIS5JHbWuL85mUFs7xpeGNv0BzPsp8gvIHAjb9pWi68zS2+WyXmdcbSsGFcuXr7kGGIDQQZ3/vo0ztK/T1g99HRKNvLgDeKholTvQLLy9mtqZ+z9/BbQFjyPGBKac+FcQOGyWaStMGt4B8DbtNj4Kuu59VDk/nTmh+frXMBpFJH7HCw+3saFWDV77uhhAhwxl7yeJHcuGXya+eONHp7vCkFxa3Bpe5OGi82Ec4utRVR7V/P5PGLB4; 25:1n7owo1DO49ydk5vqnGsMqVWCls8jOwh5rVrCkLAlseeTeviDPAXcND5DTDWTqW2P78cVHxBvRJahdzUdjODTHrn61x7DYjmE1ae16SfgzrdN+VPPm3zG+0IiE9G32lRUsQcf20KwJbmDY9PnT2FLriursGnyto4ExlSQsQ1sJDZTq2I76R06ljEXX8WFkyKYDgyqigOvPoDTikvWAMetKIPIKBcDotfg7/w6FfbD7U40SDiKbDZ8EVM2GGvw4MPo0VsgVdjMB68mFz30kdDkzhAoxppNc5lR2LQrrEwmgnFxamWNHZXdyAWy348g9xCg/zEfElgRQ3jiVdlPu/PKw==; 31:1HCAR+7wLdtqV+bVHFB08K1YUPVKvUdnQcQvCEpCjIQGKJMeJMFXMwyj/qHD/VR775XjezNJtlvQ8JtlyisfsIBw7KTm7Gy6ybikM8Zb5PziY5RhE8Iriu4JXYq0TKQ2Yv8QeMyJuiyDVVlXBmQSbA7J5psCwBjLjX34EaR4clr2qJqS6KONGuvN6LSw6L0f3U7uK3zLWv9p+Vml/83Z/z21rORAi4jfcasfEd/tGDU= X-MS-TrafficTypeDiagnostic: BY2PR12MB0146: X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 20:m7kDxEoJaywphpLPx+T9RXriF5CktPmTiYwcd0gvvIJVPtmjgr9dD1Js2Woed2MwFeV8Bp7TiJtNRtyd9flBML4+vaQcBXxhtN0XyIojBUuulgbc8HwI7yN90Vw6G2uyR3HvrbZ2eCzMFyC5hMexmWAUX/ncMGUeOBMyHEMTwqM8N9o3m2VlmC0YiOqKyymlsb8vHfpgNoYYddU9dPrRcJ/arWxL/3CJHNXaXzg41wJLou7HEiOgDVBkt4A13VBi536xEH51wzgZvZ+V0dIexjERgbwFOja6GP27v624yDb8IbVAy1ZvaOtp7fPyQ5F7RpKHZlq4NjBGnm+zyHO7jx/fvY18cXm0iHqoapX3OKeFAbLdJLVvwNQVbhqU0FTOL1MthmPEEfZs0QLxdEqCI0KDYXP1SdOlNAfT3fQYaTkeDcwkmfx7GYK2plXyAZ3M/fsuuXloffFT82EbR3liM70VQBPIEPGMqTZgHdJ0zG6+yrQH2YMj4LYZz1U3aXtc; 4:e8ccKKmPXjqTxaMZfewce463RNYa/lp8jTYwAzKGDHq3FZxFPWrdQXoyhFSEdSY+pJKSHGJxBM05TtzVjfQo1GhCjOj/eQRNtkVV6Ax4JWYEihITtGwDa3E/KxSfBox+BkTzTeIQYmFLeUs8yIfiSW6ke78XeOks9GfH+uMv6cGCJwksoOn9UkBKxs+1H7lJAXVBNbuMviretE8qDKwrPb8HxQab7xD4rf6zkufmBK2eFujDpiAoLRxY6uak6ARFsJpf7gG1TqH05lusaei91kG3O4NQ/37DdJwcTV1FqhMjhjwAwhVq1VIoUmlVKAEJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231101)(2400082)(944501161)(6055026)(6041288)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:BY2PR12MB0146; BCL:0; PCL:0; RULEID:; SRVR:BY2PR12MB0146; X-Forefront-PRVS: 0581B5AB35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(39860400002)(346002)(396003)(366004)(376002)(199004)(189003)(25786009)(53416004)(66066001)(8676002)(7416002)(105586002)(59450400001)(81156014)(76176011)(81166006)(5660300001)(97736004)(186003)(16526019)(8936002)(106356001)(50226002)(2361001)(6116002)(3846002)(47776003)(305945005)(1076002)(86362001)(26005)(2351001)(7736002)(478600001)(51416003)(36756003)(4326008)(2906002)(53936002)(6666003)(2950100002)(8656006)(52116002)(6486002)(48376002)(39060400002)(68736007)(54906003)(16586007)(7696005)(386003)(316002)(6916009)(50466002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR12MB0146; 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; BY2PR12MB0146; 23:P9uS+rji6Q5pMDRrT1j0zjkQftet7KJAUuiecnnMN?= =?us-ascii?Q?zq5cznERHaI3gQ8byazV2+zg2gIkbx1ltb1lKZOP6kRsbldU73NrA0vGPr13?= =?us-ascii?Q?WmHo3gut8r4W4bQfjgrurcLv5eesRMmDxVQmPEwu7FQ9oYHk8NWkA9nn6BW0?= =?us-ascii?Q?I2gQ4Qb56hYIlZm/dYSbylkk2rz9PDW1CC2jCZ7WbaVu+aXnqaiH3rsr+BoS?= =?us-ascii?Q?QjJXQVrU2vUmv73XzO7BLVBrhaVkky8ZLd4tiwCvsv5kMIGc/2uVTaYy10Ib?= =?us-ascii?Q?RTW4INQg9ZD+uG8/Oh5S3RvhwvcZH/h+ORKivZcUNIddNDOaOB21KELeborB?= =?us-ascii?Q?kXDTdWz/uHo9rocRDVSHTccLa1PyhbTUX2py64AJaW8GfwhOWffJvE1nvE76?= =?us-ascii?Q?BhkVGN+NVegVzl4+KsEBWLeHwzFTkd6UVqshPcouhEVhUmwivCps8tBZXviL?= =?us-ascii?Q?ba2zSD4fZlWuIOzFN+ASAQlZnJLbYo6gpoSppaP5f2xpSS063+Bsr6yD5kFT?= =?us-ascii?Q?6oRIoUSoMdJlOoY5JXS7a3ewl4llxQP7wnJmtO8ni1gJknDCigu+wcbGHIvu?= =?us-ascii?Q?1H7Vt+G6g2RHpw91MDVFo9wHFvgTALW7Jyl+puexlaPZG1x9rwomlAE4cU67?= =?us-ascii?Q?BVEd/jBmmvzNmvpT6vTynAaR1UZLPQMB8a4gd+tkOf0kJ1aYqhEkzhacTm74?= =?us-ascii?Q?L9kz+XTYcLCWEw790hAlIV811JEooek9jf0RQh3sf2STGZqGMv+Xw2RRBSHL?= =?us-ascii?Q?zcLDPQs10VhVz2CW7lJa+huqZonhfsSWw8tktFTSrTOSwBG1w6fjYChw6wuu?= =?us-ascii?Q?US32cBC1uFNzPftgo2aMOGiueepJvSBJaQELK7vuIUkcR79gYqCpZa9Ror/L?= =?us-ascii?Q?cnJI+DW9LEUZe8w4vl6YeNhGYSx65AOkPmETgfy/viHrbg06R4OEWnailte+?= =?us-ascii?Q?dd8fa8qsnQJ0ntOZuseXXCu4jl/GdeXvR17WdwCEEBL52hYUlPhvZ5bKmU9S?= =?us-ascii?Q?b1XXoBA+4FTrlt20NsFdyqTiMA8HmjS9Boa47L8h6xuPkllH3FJSubNyRCA4?= =?us-ascii?Q?gGTDssMYLH81UBZZuLcWwr751hlCxCYscy9R/oApkxr8sb0iEBqm/n7ypCNO?= =?us-ascii?Q?3tJYC2hWyvcI66FMCP7A34r7PpT4pyZYC8Y7iSHVFYpX6OmeLgM0bWe9lKRh?= =?us-ascii?Q?exdcT54n+/xZnX553qVHOpBz4Zxyp7GJ16BOsNpEgzX7umqeJumAipu2FDmZ?= =?us-ascii?Q?QvtMnOznZJ/sei6Ovsk2Gs0y0FASoCUD6BBY3AephXwBOOj3CKpZn0wrJuy/?= =?us-ascii?Q?dBJDUrjCY68nD633kkEOpk=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 6:3SiyBEb5gpgZdwco6P8LMfpS9/q1JDKPyJCM2h2NEKc78cUYePJG6piBP2W6yQi4deVUUnj0Kv1CY9cx+60Au4TKu6ugLmr4ED8lP+Qhr5Gc33K500RfBnbgIjMSkOJQ5UOvwEgWDewSu2QDqVuEfoNqGhyhBwx2YqTGs4IbE/L16ja8rAm9rVG9C/HcRElMid+VE8I408B/6K6brIRHP2WbCts4kPb1280HlAv9pRhuyBnYYXEASc043hHWlwjjQOgv292Q/zcTPwY95wKLawcX8yez1F56CtbfmRTjCeXMMyTlMRi9zELUDXNpeqbtH+9AcWdd9x70BG8OB3BiL38v5M0IMGe6GwJCLUxNwUY=; 5:z9wplkb5mmQCBLKm6jokmdp6inABGOIQKMq6MMaDS+LVDOeiOSd22Ap4U6GcRQYf8QnG8YAwLfmevH4eGGi0V+589LCorVZZXbTVZohB8lTWmg/fiICcXjg7y6gpBpjva0drmqIFklQzAuNrUQmovQRqnWL//CkIutib5Jbqnfk=; 24:k1TmAZVx8aIBY4tA8c4zRZvCtWqM7Cj9sNcWNXY/ZcbwVd21H3mRi4EvwarOEwA35Tax5srgRDjepAhT6S5wtBkI42rSvMcUGHdNRZkL7Tc=; 7:QkR7SEPnJKpLhhwl6+lgfK9Jqpt3f+NJaNGU8/fz5FzplZn8GCqO24rUpByfvADoHxmfltzmiWbCvyD53jWH0g+gUd7K4gLyINXy9b1MSWJG/Jz7/xcS0CiN44+gkj4egfDuC7BPlQ9kdrujoQ/w8hpZRzlFX7rgCBncw2jfDTE0jABzTs7swII9l1vNjiTcikdnEHIK/TC3BBAZQHiwHODmweDWAEL7Mfu69h3wYqwVWFjOPyFNnrF1mgmBO42S SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 20:mlUm9/9B2H5zhbvcvEZjUuEnFTerYCH+beaFGtLZf0kSh3qAkUKY6wpK9eueECvbbkvc92xgzICDCROv1tm4BjsilbjiSRCDdXMBuEFDIqmd7YiWkOTdaTYAABs1e+0PUjUZiuNnkGnviJAhB3oI4FIHhFrJNeBZ7NAJhY2TFaAoyn0jHBvaF828NCLBpoZSskox2he7lXKxK6EGvF7H+Hh8lLmfqoRImqj9nO2dF1ez4lhAvYuIxQ4cdnfjl96N X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2018 15:38:35.2126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0be2552c-442b-47de-d46f-08d5722eae9e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0146 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.62 Subject: [Qemu-devel] [PATCH v8 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 55e69d66fe6f..53ddecef369c 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); } } }