From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754509AbdJPPjZ (ORCPT ); Mon, 16 Oct 2017 11:39:25 -0400 Received: from mail-cys01nam02on0072.outbound.protection.outlook.com ([104.47.37.72]:39104 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754003AbdJPPet (ORCPT ); Mon, 16 Oct 2017 11:34:49 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: x86@kernel.org Cc: bp@alien8.de, Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , linux-kernel@vger.kernel.org, Brijesh Singh Subject: [Part1 PATCH v6 03/17] x86/mm: Don't attempt to encrypt initrd under SEV Date: Mon, 16 Oct 2017 10:34:09 -0500 Message-Id: <20171016153423.2980-4-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171016153423.2980-1-brijesh.singh@amd.com> References: <20171016153423.2980-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR16CA0015.namprd16.prod.outlook.com (10.172.212.153) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36beaa6b-2ee7-440f-2977-08d514ab6d46 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;3:A1dOowwbJAwKHMbjK7HrOFHKXNh5lS2jN7itnW8sC06TIcO4q2FpVokxYKYAeK0LCN7aNmOqGjCDUhy6SUliwYs/cjkrQB5QaHPsUewFv5f/GuOzJPvSvDR+Dpj+sFZ2zgB8cRdcDJWIJl/d46Nlr5OS+eaAU4PHbuhEUmr5NNQn3QqhXVPTV5jDCdqox0TD8JrXiDpc2G6Z550A8FzGlelx+I+PHBor3QooGMBPZfx/QB+Yb8cqqjWXSvsprZtb;25:G0tjzTpu+vkzr1aa/OwR4LQIAbsXyNVgP/0yzyryVql0W0+YHEqAhIdr+CDHGptli4J1aVdYESDWObMZBEJ5RDR6qVYaC4K3mUTepMgd5BkCxHORl/R7LiYW/gEkQeXIpnHygNt3y9yq5U6YppZiZT3ixLrHBy4szweyRNy+maI0hYUo37W1Y6kz2dNf9HSCwah0UfwRcjKILvYqLXC+0o5+hUZtO8j6h15koFoLpf12Y93ivNo1Aoxhg3hcVIdzRI06qNzcMrkqF3Qu50iYfgSj2CSG9EZW3SSJmf4/EQ5C2TV/BzJx91XDAbFJiGhs0pq/GB3ArLy6DKsNFpl63g==;31:E1sWuOWVTpE5k7iLniMRLvwRAcW/xRX9EfK8H/jNylNN/gyD+eOeeOgDrfnd5XHfucPoKSmAHsG+bvITs0sVyA207BrfH7J30xn1oSBO1fWQntDD/qvqVzB/hzRD6rmbcTYhF9uWtT9FBtXl+7Ir1mBToyzjvnanb0pnUJPa3o6H6RW2xOXywxWy+jkqCA5+YdqxPhj2taF6DY5z/Ebzn1eisN4rjLCE2wbXH5ZmECo= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:W5Bwf33DGGK7husCRDSS9JhXoMN7K8dOki34cDyh2OHW2a+hTwIQTjHx5Oufti8vrUH5MSVG/Jy8vQewAE+zjGM/cqrW1ptNL9FMhRxBo6a1VIMx4heTac0r0OuWoJZgRyWclgkymmKV1sTD1Ytlx3ejH++HOMmfZ5ZRsigSF41SfLeQp/ufA1VsNs4fsG31Kvridp+Vi8nFgxmvOImpzcxT0ads5RSKqbhuC8XiQHLo4PzXksfku1RWYjvh5kAf/B1cx/fALApI140qlplpQRnXrTjcsRD5qKNYZS2U0HB/MXGRRysyMb3OJ9Cwgv9LALa63s26FWLm/nl6cTQvmUlKPk2lg7J7atC+KbGuWFUpKLDXPLKg8+M0sKhPEdjfwOwrEUA5f/TRuUHoxN6Bjq9Yhg706gwHLSl7Ml3xS5gIngpVDlj8lc6ffSGx1R2V/ji4qKlK60IXhd6nSngQk9Bw8Yb9uhV4Y3LA58sQw8r04NH6n7J7rrUoP1z0CjTU;4:MavsHvqdlzyjbmxbINTSJi1F9GO1ptKw0c6jKu+hcFxf2oCP5rHuYMEOCV82fCOrHCF1ABu2xCIOUGgG5k8IaHWY8nnuNyrN1BvCgsy61edX05yymigLULMEuXp7NajDFkmeEEf12JjlLrVy7qa58jv4NM4zms1uJj5yCXJaP2B4OqzEVXVbzQshvqNv7sA/tIt02zU6PWJkSEoe1lYlTBl+KtOehT2oAFlPKRUHX0u+NNPItPpTesf6qb0UaSJH8MhL6r2O+YPXDR9vN3Fm6qq01MwujEhf8hm0ZAxCv1b4z4TtEK0UEgf7DjYzHVYCaAL4lEEZmcwJ40EGk+61ww== 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)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0158;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(199003)(189002)(54906003)(1076002)(316002)(5660300001)(16586007)(68736007)(2906002)(4326008)(16526018)(7736002)(47776003)(305945005)(6666003)(53936002)(86362001)(33646002)(2950100002)(6916009)(66066001)(189998001)(97736004)(76176999)(106356001)(101416001)(8676002)(53416004)(105586002)(36756003)(3846002)(6486002)(6116002)(8936002)(50226002)(81166006)(81156014)(25786009)(48376002)(478600001)(50986999)(2351001)(5003940100001)(2361001)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0158;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0158;23:uEKkLQxoo5D8PRHbVEzVC48rdOt0TYS7OPkGJOcyr?= =?us-ascii?Q?0kZW4iIsz6F1JF7j89TyZZk5WkHEo1CGnbKPBpZQrVLB6CmAMwYcjFuJwBko?= =?us-ascii?Q?YxppEXSDt7tls6jLQHYAu5Cho6vGxgsuuE8bPbLZ+tK/GWYL53tqJmMBqjQE?= =?us-ascii?Q?iSNa1OqyChdgMnS2mC1xbSzWReaI1nBel7whsUqErT7eyI+is/xna/AEjVMH?= =?us-ascii?Q?b1inCWH2xfUSFTWkR/HiddEBNMA6ffYNducUz2vEQYABKBIi0Ply2ZEa4yT1?= =?us-ascii?Q?KpnBeIS0YspXhh20jBhsa7cD8iFzl1O/3Oobuoosm30rcnZTa7/PFY/K7b3r?= =?us-ascii?Q?TnEKOyidqhRI2+sKrmSL+tTVfe3scLZoT/M4I6wLJEyuT/E3cf3GI7EhgaY0?= =?us-ascii?Q?uUnh8FuzkX+Anl/XIa2tVg4j+RprpgpWOBCORzdAEMTxMJiAH7Am2EtJhXcD?= =?us-ascii?Q?TJDT7l2qobyzcban3wSRvTcRTX4PTlKu9b26KmrDk/+sZrwb8BzOPLJB43dZ?= =?us-ascii?Q?vM7nKCB9sD3S8FvdwbHNqB1R9tQ3LltZJPN+f69/yB0FRI7VxeW54OTtmD3S?= =?us-ascii?Q?snK/UKIU1bHx6byRmQrUaVENoja8TQpXRWk7/cbz3pb0dOapxYzbsEu76/S3?= =?us-ascii?Q?c8TrRnfrymRVeRyZhMLLkbTsIhkKjJAzcOhO3pe+5otuA8RavjIBq9RYIr1D?= =?us-ascii?Q?NhaCi3Qp/C5KcKedd690w5+H4SSl8FjNkupXOxR8r/2imDlk+da9xy9pHO7r?= =?us-ascii?Q?F93xyw2dAg0ilVclQP77H0v590sBruZFvUEkh8WSCfJuxuTg55x+IzpCaocM?= =?us-ascii?Q?EYuYK5BU0F0AgDplKhslUSnCvNTaFXuBvjeadFON3WuWPSLJ6PAELwtSpeMf?= =?us-ascii?Q?mPh+GDLWD1gygPFfrfeZMCXcQ+Xj2OgK6l5ZTWpOOfAouwUMV30q+2pzxq/A?= =?us-ascii?Q?6lS6qJ+IqIqB81PRHMbav8RSVWYNhFV8IEPfv4PPgPndzKmSZTRIjwL8vHoX?= =?us-ascii?Q?ZWCCz6BWJJr+tkzWpvlb5bCgZVvpQw4wkRGatNMTHQbEegt30o5qG31xHu9D?= =?us-ascii?Q?QJ7nSlBCT275UFVJ1o4/nEW2z5wubTY2AH34fdnBu4Z3gQ3m6Lz/tlFuODbm?= =?us-ascii?Q?95VukzRi60=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;6:95sThiLlt3+LF3TBetQxqnzKIAxHr4RhFrQxfZ0Gh3EWgiUBy/LhMizRho3lWAhazzOwnGTrF97MPUbNSv7nzKtkd+sF5Nu5PYrgi//hhNM35Eug3qYlbdDs+iJV4h4gtsTK2kJR97jYvnraxF82JodWf8prN4xk6Qqdm5vZkVNRoH5p2uLn6Ub4+d+qPwQaRmneHQMZSqoQZRstvx9CjMcz+AmLczDtPAe3eGbPLxUtqgFSXMLiILwV8bpL+ESiM2dmnLAa9DWGcuFzcY6OknTENtPxeH9aG5Ccd0iv9S3QA2G+PEybTrf5T7GcyRTmGhCnl3u/VIHLFhCVmzKY9Q==;5:Tkqg72S70NRkcZZWZpVpUdn1HKgpzs3rSdTVjYv2sRt3TaSfHa8E0S0sNQBWSuoB7qANSu+cLdHk+i9vuR7DaCucE9wp8HHgafZWD1MnvmbFr8h/mHfV8VfBcUvC0oLZndA2FOpSEzDu6MC4kuaJ4g==;24:yoRmVU8C/LgOv9hDUlUJo0x4P9rsUmAAcgRiaClskIjDdIWaQFvTw9v7cO5gHfBNEvE80wrPb/EAZby+UPJgZler4QtbexT3e3tQ91CVIPI=;7:+knURLOnvm0pHrjLV0avBYeSOpuFFyfxWbdgKvmovfZqY4i/PcklTk4KAXWr+baLHZXQmIKAsNuywaJX1+cbQDTNA3KP54CaR3UC+xBl9ATseFr13dSB8MtOmrtBYO/KIAbCvnLgYsILN6en8LZP9rhOMe17mzLTNC5g3Ky9CStySHlrthFj66s74l2laEnyilGl5ygPYmZoU8bH1e1u8GeZUyNWgWpps19BCmKug/g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:WVAeVOcWVO8VOiZLAOovI2kr8h/K1Pk+yzJvoJ66PrPRLGVhwECs84a4dGnebOMlWu44l2jqr9dmPtH7Dn4D2tIfkQE2+lp8gtBwgod3morjtbXgqfHCPdBig03EOJGn+xvVa3qiBJ4rJoirEnf/pb/qmuUVXAB6KKZBqC/3q6YbtxJL+cwaEvr6NZ60UHP2BWwQy6HKTDRfElr2bKEF6zTxqxhnwxheyEy5+b1uvnjuqrSRa6SlZw5ws7F9WLAr X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 15:34:43.9946 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 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 17dea09f06a3..bb5c3b4ea00f 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