From patchwork Tue Aug 11 06:16:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 6988931 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 814F19F358 for ; Tue, 11 Aug 2015 06:22:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7247A20574 for ; Tue, 11 Aug 2015 06:22:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F7BE20642 for ; Tue, 11 Aug 2015 06:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933700AbbHKGSm (ORCPT ); Tue, 11 Aug 2015 02:18:42 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:36531 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755063AbbHKGSj (ORCPT ); Tue, 11 Aug 2015 02:18:39 -0400 Received: by pdco4 with SMTP id o4so80045058pdc.3; Mon, 10 Aug 2015 23:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z3eug3TC8nYQ49gGuibHJbZClFSbimBrb48qru5z/3g=; b=IiyTzoOncRrFmbBtintcoftRQSZGFc3fO9uf6WvIOgwO18+pQNZrn+7jqLO5AUm+B2 YgWoyKLhTbubSr1v60cRslXmCQrKfDU4p33JGXjDNKVzcXK5/Ka2brBdxK49E5PQ+1l8 pTxVQRsNgNo2mTVrmhi5FjvpP6DhoEm2ADpi1KLN48bHDu8p2/9T1yeqGRL8tIAjJchi OKfJLHEoGaQF0xm+8uw4NAcxFHXSa+z+tTmOzRqPoiydBI9dsu/hcWBE1jAxqmb9FJQ1 0bNg0mHRYifxEw24VGcYBEunEn2ZhbH4T+iUXY14OcljLazFTK7mU4vO4zOBb9qlQNtX s51A== X-Received: by 10.70.48.34 with SMTP id i2mr53049825pdn.125.1439273919161; Mon, 10 Aug 2015 23:18:39 -0700 (PDT) Received: from linux-rxt1.site ([130.57.30.250]) by smtp.gmail.com with ESMTPSA id qe3sm1082667pbc.73.2015.08.10.23.18.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 23:18:38 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, linux-pm@vger.kernel.org, "Rafael J. Wysocki" , Matthew Garrett , Len Brown , Pavel Machek , Josh Boyer , Vojtech Pavlik , Matt Fleming , Jiri Kosina , "H. Peter Anvin" , Ingo Molnar , "Lee, Chun-Yi" Subject: [PATCH v2 09/16] PM / hibernate: Reserve hibernation key and erase footprints Date: Tue, 11 Aug 2015 14:16:29 +0800 Message-Id: <1439273796-25359-10-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1439273796-25359-1-git-send-email-jlee@suse.com> References: <1439273796-25359-1-git-send-email-jlee@suse.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add handler to parse the setup data that carrying hibernation key, it reserves hibernation key by memblock then copies key to a allocated page in later initcall stage. And for erasing footprints, the codes in this patch remove setup data that carried hibernation key, and clean the memory space that reserved by memblock. Reviewed-by: Jiri Kosina Tested-by: Jiri Kosina Signed-off-by: Lee, Chun-Yi --- arch/x86/include/asm/suspend.h | 4 +++ arch/x86/kernel/setup.c | 21 ++++++++++- arch/x86/power/Makefile | 1 + arch/x86/power/hibernate_keys.c | 78 +++++++++++++++++++++++++++++++++++++++++ kernel/power/power.h | 5 +++ 5 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 arch/x86/power/hibernate_keys.c diff --git a/arch/x86/include/asm/suspend.h b/arch/x86/include/asm/suspend.h index ab463c4..bb3652a 100644 --- a/arch/x86/include/asm/suspend.h +++ b/arch/x86/include/asm/suspend.h @@ -7,8 +7,12 @@ #ifdef CONFIG_HIBERNATE_VERIFICATION #include +extern void parse_hibernation_keys(u64 phys_addr, u32 data_len); + struct hibernation_keys { unsigned long hkey_status; u8 hibernation_key[HIBERNATION_DIGEST_SIZE]; }; +#else +static inline void parse_hibernation_keys(u64 phys_addr, u32 data_len) {} #endif diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 80f874b..b345359 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -112,6 +112,8 @@ #include #include +#include + /* * max_low_pfn_mapped: highest direct mapped pfn under 4GB * max_pfn_mapped: highest direct mapped pfn over 4GB @@ -425,10 +427,22 @@ static void __init reserve_initrd(void) } #endif /* CONFIG_BLK_DEV_INITRD */ +static void __init remove_setup_data(u64 pa_prev, u64 pa_next) +{ + struct setup_data *data; + + if (pa_prev) { + data = early_memremap(pa_prev, sizeof(*data)); + data->next = pa_next; + early_iounmap(data, sizeof(*data)); + } else + boot_params.hdr.setup_data = pa_next; +} + static void __init parse_setup_data(void) { struct setup_data *data; - u64 pa_data, pa_next; + u64 pa_data, pa_next, pa_prev = 0; pa_data = boot_params.hdr.setup_data; while (pa_data) { @@ -450,9 +464,14 @@ static void __init parse_setup_data(void) case SETUP_EFI: parse_efi_setup(pa_data, data_len); break; + case SETUP_HIBERNATION_KEYS: + parse_hibernation_keys(pa_data, data_len); + remove_setup_data(pa_prev, pa_next); + break; default: break; } + pa_prev = pa_data; pa_data = pa_next; } } diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index a6a198c..ef8d550 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile @@ -5,3 +5,4 @@ CFLAGS_cpu.o := $(nostackp) obj-$(CONFIG_PM_SLEEP) += cpu.o obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o +obj-$(CONFIG_HIBERNATE_VERIFICATION) += hibernate_keys.o diff --git a/arch/x86/power/hibernate_keys.c b/arch/x86/power/hibernate_keys.c new file mode 100644 index 0000000..357dc0e --- /dev/null +++ b/arch/x86/power/hibernate_keys.c @@ -0,0 +1,78 @@ +/* Hibernation keys handler + * + * Copyright (C) 2015 Lee, Chun-Yi + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence + * as published by the Free Software Foundation; either version + * 2 of the Licence, or (at your option) any later version. + */ + +#include +#include +#include +#include + +/* physical address of hibernation keys from boot params */ +static u64 keys_phys_addr; + +/* A page used to keep hibernation keys */ +static struct hibernation_keys *hibernation_keys; + +void __init parse_hibernation_keys(u64 phys_addr, u32 data_len) +{ + struct setup_data *hibernation_setup_data; + + /* Reserve keys memory, will copy and erase in init_hibernation_keys() */ + keys_phys_addr = phys_addr + sizeof(struct setup_data); + memblock_reserve(keys_phys_addr, sizeof(struct hibernation_keys)); + + /* clear hibernation_data */ + hibernation_setup_data = early_memremap(phys_addr, data_len); + if (!hibernation_setup_data) + return; + + memset(hibernation_setup_data, 0, sizeof(struct setup_data)); + early_memunmap(hibernation_setup_data, data_len); +} + +int get_hibernation_key(u8 **hkey) +{ + if (!hibernation_keys) + return -ENODEV; + + if (!hibernation_keys->hkey_status) + *hkey = hibernation_keys->hibernation_key; + + return hibernation_keys->hkey_status; +} + +static int __init init_hibernation_keys(void) +{ + struct hibernation_keys *keys; + int ret = 0; + + if (!keys_phys_addr) + return -ENODEV; + + keys = early_memremap(keys_phys_addr, sizeof(struct hibernation_keys)); + + /* Copy hibernation keys to a allocated page */ + hibernation_keys = (struct hibernation_keys *)get_zeroed_page(GFP_KERNEL); + if (hibernation_keys) { + *hibernation_keys = *keys; + } else { + pr_err("PM: Allocate hibernation keys page failed\n"); + ret = -ENOMEM; + } + + /* Erase keys data no matter copy success or failed */ + memset(keys, 0, sizeof(struct hibernation_keys)); + early_memunmap(keys, sizeof(struct hibernation_keys)); + memblock_free(keys_phys_addr, sizeof(struct hibernation_keys)); + keys_phys_addr = 0; + + return ret; +} + +late_initcall(init_hibernation_keys); diff --git a/kernel/power/power.h b/kernel/power/power.h index 6ea5c78..7d8f310 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -16,6 +16,11 @@ struct swsusp_info { u8 signature[HIBERNATION_DIGEST_SIZE]; } __aligned(PAGE_SIZE); +#ifdef CONFIG_HIBERNATE_VERIFICATION +/* arch/x86/power/hibernate_keys.c */ +extern int get_hibernation_key(u8 **hkey); +#endif + /* kernel/power/snapshot.c */ extern void __init hibernate_reserved_size_init(void); extern void __init hibernate_image_size_init(void);