From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752842AbdI0PN6 (ORCPT ); Wed, 27 Sep 2017 11:13:58 -0400 Received: from mail-by2nam03on0046.outbound.protection.outlook.com ([104.47.42.46]:10845 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752551AbdI0PNw (ORCPT ); Wed, 27 Sep 2017 11:13:52 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , Brijesh Singh Subject: [Part1 PATCH v5 03/17] x86/mm: Don't attempt to encrypt initrd under SEV Date: Wed, 27 Sep 2017 10:13:15 -0500 Message-Id: <20170927151329.70011-4-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170927151329.70011-1-brijesh.singh@amd.com> References: <20170927151329.70011-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR04CA0033.namprd04.prod.outlook.com (10.174.93.150) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e16f26eb-65c3-4184-b88d-08d505ba5b35 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;3:K5PBxvOPWDZkgH4msnTfAgBj5JSTJha435qHHURmH0NKbxgctZvNBI9yf71yBGacB0atM2haGVrO4slblXBVlCjH2CV76By4zrLF4X0BgdyfyKVvUTgMKtzRzSdEprEHzmarQekkR7sL398Y/I2WIK6Rns+804pSG86bYg9ymPE1mH98k9s3TmEbUv3Hm4RXczsrCy0u+rpf2k6Q1TnMWq+85QmRIh5+zPFNl/VAe8dauSwQZXDl14E4SOp7O+3M;25:3qH/GB6kep0S0/F/+AQE3pFenIOzU0JrZvaz9GTcI2jBvD7xeB6Wxnih8m94KZZ3DCFGo9SJPE4RP8Fg2EjIayER80ZHJzFn+zK2VunvjwMwdsNn+H0VY0GPmercuDH3y7vl/O9HuZRLIJQr3+xNVvudGuj2mR06oZQJtxQvJIVutahggfkkdGiL6iLfQu29waA93J9sAmmxSNQ9J6C3GgIDe1mvUKCMcheXaAd3CGW7x4dpnHyJWDZWc9VC2WPprp3jG35vGHRAjTKV2qXi8+qCkaUCBtZhr7OusVBDCe3EXMUuzJgJpnUjG3qCrSpu4tlDfdgzxzkNxMioYTNn9w==;31:gygfIf7VzRBHYkf9ES/r+4ErXKl6XJfNjtb/QbOS6igUD0lyrliXA8NHb8WJTxnTUbHICJKjGRvESBr+JxdEYVoTohZWHkuArxSuMX/RsapSelyFgQujePfsvFvDcVICyDukBiF/QnfjYOwWOAr0E4XKKmC8k+B3TQeC62EXpbv+gRLYeAYFjs9UkiAxhIA1M5EHyVeCLY44ZWJe3wQSvJkH43PLT01wzpjFc8ZAEjo= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:1tCIkq+73+9Ayu60Vuzyz8caIvdCMh9VwJSzIMpSlOmXDUK//9tEyehAPXA+Cv9N0Bgp4FlHT0xj5PYp4SLJIFarOUJFN39DDxkS6nPqgsmBcklrUHKUalPnw+Zmxyhmg1snwuwf3QjP5ujZZCfYS+T1N+RFKCO6LOSrQGArsiqwbBJ+u1jck4EeFHwHD5Pf4fzJEkZjhc9uikQZ5KvqWblfAxusEGGM+uokhc3oGrujTqL/rzXuXEQctNXMvTnuexmOF8lbGLETxfuaDWWnAj2QyzemusHkHk8Bcu5QxC6KbhcBkLEqTFWT6aEK0cOXer8FK1q96BWGj6QOUyO3GoJpdFIT6iB6pkM3Z37j76P+TGqfvrqL0TmaeKrtUil9qjDSbJ1zoWeT0sS+osrd4xjjzUtJtCSMxiE2hLhmtf6IMnjjwLOrZ3CcI/DtJBmyA1MZTuyDCrTBhlJsI8bEB0ErLxlv6q5jzDrPTakoLTxLXqPAmKJ4dCOSkCk+VNL0;4:i4/oIoHn/dDPji7BhYzHkq1fSRNoubNdZPuZmHiXAENodz2TdaDQQowR6JAdoELbMxI26KOZRqeUwIlpcNCNtArzhyiqoXSC7M4NnxRYXkbk3ImpDYbTKQO0OdtfK8844NG8A9PvtO8a/nuCv1Q1qkwTyrzH/zQdyD8ohmTT+fam+i5kiQWIQdZcJHCDRfyXu+d1Kbmr3ufKZXIc6Po6AMaxZ8LZCMfFhbA4cjvps7GzDm7Aui2FMAEp/vdwse/ZKywDINglZwY6kw5w8XrXt5Urm9dt2MYIUGIFWPpUZY/wXArkxyZFTjASbu00lmb24JL14Wh8ykG216jVWaFoCg== X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY1PR12MB0152;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY1PR12MB0152; X-Forefront-PRVS: 04433051BF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(3846002)(25786009)(6116002)(53416004)(106356001)(8936002)(4326008)(54906003)(1076002)(6486002)(50226002)(8676002)(305945005)(50466002)(5003940100001)(81156014)(48376002)(81166006)(6666003)(68736007)(36756003)(189998001)(7736002)(105586002)(97736004)(53936002)(2950100002)(101416001)(478600001)(16526017)(16586007)(76176999)(50986999)(316002)(47776003)(66066001)(86362001)(33646002)(5660300001)(575784001)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0152;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0152;23:yQXVOIiQ+tJltlNjcIXRUeSbcXPUfTsBFNNAjyJRm?= =?us-ascii?Q?IFN/6Dn6OKGxulCmP+Hf6c7rmbbv5+1Mac9w/OIRHp2Y1UK0cpgdq25c+7wQ?= =?us-ascii?Q?klpolhgOD/GpAd8rgZpEfjyPiMfDWrMHtMO2uNOw+Q2TwCzHOCaZRTEZvXYo?= =?us-ascii?Q?d685vl+LqlrmJAZUX6URfS5ZSFQ9sNIpUM+M8mSi46fdCN1kRRPpG3y7l8oZ?= =?us-ascii?Q?5Qit/eDB03EbEByooxL6CiwbKngVDj9Qd5zVl02+9AYitrLn/eovFIyhFRTG?= =?us-ascii?Q?vj52SeOf7h5B0TKPWA75j4lB14Oc5u7953eCTjSJ+Spu4FEuSQ/IqK3FQuVY?= =?us-ascii?Q?ypI5ddkulMdmvFOQ1J103DuFiVVMZD7Dq944ExAuxJabV1VcnYa8eXgDNQTv?= =?us-ascii?Q?rS4VqHOU13vAgmxzpnyeimGY94+U52Fh3dHcPBuAeS4/I7kXc2A40sxoErXe?= =?us-ascii?Q?U0e/CTkamhdnyhIKQ666OFkwcaeaafG5Gp4OXn97+O5I/qh4KhdeHuDq2J7A?= =?us-ascii?Q?CUcfIk2jL236fo35ScQQtFV1lWfORxk5HYR5DHI81OLUQZ+tg+2VlItDYJpE?= =?us-ascii?Q?r6hDwEO+qGDNg6+qxdnmJShp64xnTyVGfiy2wNW2sZMlMzcLISq7ZBlJpQU5?= =?us-ascii?Q?YJueEZZz0ZC0gfN6qPqEPOqvGu6RrMEoXL//7S1jL0Yqur61fT5rME41uzoM?= =?us-ascii?Q?LBoaxbeVVxcUgCwE2TNHDh2Hp2e64EGxyY0xcufmwyCwIBI5mnRbn5XMrGgf?= =?us-ascii?Q?14Rc2FEM/oaqF5UUq9jGyp+dCDnCF0LxJQS1lLDLE+8uJDpUclyD62QhihAs?= =?us-ascii?Q?rUL2gkWRE8pQFPaGoolIbFWWKlCdrUWnZBClN1xH6lbE/jKft+vOCv+PyGm1?= =?us-ascii?Q?F3+eFMlPgH8PpGnnNFt0IxOAFNTiL2GiGkZMOejwYgiPxQKdDMPoNTVytMiO?= =?us-ascii?Q?UNDQkmNySDcytBsWi787b5JuTUm17vkfx14ZQ0rZduH7vQMLsuYyje9WIO4K?= =?us-ascii?Q?Wag+cW9rjo+YDzGwKmNxkSEMS2zLT8sHhC9E1yLQcnBImNm3kotOg9t3aHaf?= =?us-ascii?Q?9JJQq3VR0CseolhH3yxreFdxi0EYF94cie6IuFMVgZTEEylalf5oQOEYOGKJ?= =?us-ascii?Q?fCFFoOm/fs=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;6:Ad1smsTU08UrA6SzkRB125N7YDThev0Ku3p/uzJJwctsqlLmoGxJRUz8/feJltEXwJDkMysEcd+NJtvw1qyj+GQlS1tzVpbk8z7nN/3ykyqtt7NzCgQbhd5m/PDZRQHXR+iF003CoFHIwDvmhazwKo+IKWPboDX5MyTbsBHeDwnWngrDoS7sJcg4zUKY9Dn3oCR+Ri/6u05/CtbMhNWQCbiRVE21YIokrZEGBGwp8zV1AJ0d0Y4YEJ9BoKlTFOcavqG1ovZmG33CAfICcBript0GTgVIfgrHm8aQtW19XzoGCvBVKBA3cua7MlUtMSzdyQiGcAfhWp3ePcEoISi2NA==;5:h+lqSU43aspy6irnM4RMqQITdSHkbcXcsWP27xQUGdY+LZB0Ji27CV3nC+w/5GHEyx6NReSY4ab7d8nGm/f5a6QoSvN/JV3wBuOy7bsIHD1kyL9iv7/GDgAlO5ygM7Qmc+PoM1QSj+gZPN/7ZY+RBQ==;24:Q/RRKcf3b4uSpeWzVdMtB8QwbntKx64okV2nN8KzmcZu0GyLgWVw6v2eGr4HU52wB7UbIDQB4pmNmM/s69Z/Na4JZ4xTv7m4eJLO0h1xgY8=;7:27JkygBrVaLwvwYlS6CLQcFj8zR5UbEpSFGo9GJAvR3pZApRtud+UPmQ7vGcZDuVbRcFJxmB0RAnTFyG+E4shx7NmYIDUt7gNTFR6cuWyGVYMZa2HnISz8hHasHoWMoh9h6f7btNNETrVGietC84kVz0nWBMXgtgF3M5ezYlOx2l+DSkOwT8JosFHy2qrDCZ5bi1sccq017Rb24OeBBJoIGRMofTHxgDaBzJON3gXuU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:vDiekmC8PtAAwDrnt00AbqYCFwogndaYvldtG7WFA81QxpO3/++EviYw7+qjNy6/zJtv/8kdd9BREchSP20cUdZdFE70+yj3Rp05JTgwWRWyT8IK9IPdlY4QlcGXUj1KLYz/z/sGj6EijQJ+0U5Isx0JOy7Vn7+HCJAmX9cJUk7Lhmdr77035Qmy3HC3uU7frASvNoOuC0k79fTyGq1NW5dHXB2z5TEgyUPq4fi2JOp6wO7WP4ZDbHioO9Y9GeWG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2017 15:13:48.0408 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Lendacky When SEV is active the initrd/initramfs will already have already been placed in memory encrypted so do not try to encrypt it. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Andy Lutomirski Cc: linux-kernel@vger.kernel.org Cc: x86@kernel.org Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Reviewed-by: Borislav Petkov --- arch/x86/kernel/setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 82559867e0a9..967155e63afe 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -368,9 +368,11 @@ static void __init reserve_initrd(void) * If SME is active, this memory will be marked encrypted by the * kernel when it is accessed (including relocation). However, the * ramdisk image was loaded decrypted by the bootloader, so make - * sure that it is encrypted before accessing it. + * sure that it is encrypted before accessing it. For SEV the + * ramdisk will already be encrypted, so only do this for SME. */ - sme_early_encrypt(ramdisk_image, ramdisk_end - ramdisk_image); + if (sme_active()) + sme_early_encrypt(ramdisk_image, ramdisk_end - ramdisk_image); initrd_start = 0; -- 2.9.5