From patchwork Tue Aug 11 06:16:25 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: 6988961 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 059759F358 for ; Tue, 11 Aug 2015 06:23:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE2B720588 for ; Tue, 11 Aug 2015 06:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66DC5205B1 for ; Tue, 11 Aug 2015 06:22:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755309AbbHKGSI (ORCPT ); Tue, 11 Aug 2015 02:18:08 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34188 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755227AbbHKGSE (ORCPT ); Tue, 11 Aug 2015 02:18:04 -0400 Received: by pawu10 with SMTP id u10so157013408paw.1; Mon, 10 Aug 2015 23:18:03 -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=E2h4iagc1ffPt5bKSuh7NSWFgFvRHNHpCXeodqu0QFc=; b=LYAXxp/OTN5Nyi6azTNHyfsngH1uO0wxKwniI2RocvqfByhb9086lJsMXqb5oTUvUy UnuSZ7tYeCSxGrzX7yzyDLbJYgUBwrobBIXQiAlKYMTEeXj+PDo1m5tBP59BBTf/74ft lQYjp3oTv0J1J35dtf22raCbaZRV1z5FgjJ7Yhz9s8sNEb3os+lmtEcDlnkGcoDK7Oy+ bzxI8OlpZ8OHAMcNhlFqJeJjFkcJKwc0xboyXGgLY28LN8MLrB87gWoqIxDC49NLPS4z qX8/VuTxTH/1dNMynl+beR2hKlOLoLwpLrLY9TBaKiUlBdoDz1nLWCUdbmjrM1/AJJ0S tkUw== X-Received: by 10.66.66.130 with SMTP id f2mr54360373pat.120.1439273883710; Mon, 10 Aug 2015 23:18:03 -0700 (PDT) Received: from linux-rxt1.site ([130.57.30.250]) by smtp.gmail.com with ESMTPSA id qe3sm1082667pbc.73.2015.08.10.23.17.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 23:18:03 -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 05/16] x86/efi: Get entropy through EFI random number generator protocol Date: Tue, 11 Aug 2015 14:16:25 +0800 Message-Id: <1439273796-25359-6-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 To grab random numbers through EFI protocol as one of the entropies source of swsusp key, this patch adds the logic for accessing EFI RNG (random number generator) protocol that's introduced since UEFI 2.4. Signed-off-by: Lee, Chun-Yi --- arch/x86/boot/compressed/efi_random.c | 209 ++++++++++++++++++++++++++++++++++ include/linux/efi.h | 13 +++ 2 files changed, 222 insertions(+) diff --git a/arch/x86/boot/compressed/efi_random.c b/arch/x86/boot/compressed/efi_random.c index a69352e..1d29e28 100644 --- a/arch/x86/boot/compressed/efi_random.c +++ b/arch/x86/boot/compressed/efi_random.c @@ -1,7 +1,209 @@ #include "misc.h" #include +#include #include +#include + +#define EFI_STATUS_STR(_status) \ +case EFI_##_status: \ + return "EFI_" __stringify(_status); + +static char *efi_status_to_str(efi_status_t status) +{ + switch (status) { + EFI_STATUS_STR(SUCCESS) + EFI_STATUS_STR(INVALID_PARAMETER) + EFI_STATUS_STR(OUT_OF_RESOURCES) + EFI_STATUS_STR(DEVICE_ERROR) + EFI_STATUS_STR(WRITE_PROTECTED) + EFI_STATUS_STR(SECURITY_VIOLATION) + EFI_STATUS_STR(NOT_FOUND) + } + + return ""; +} + +static efi_status_t efi_locate_rng(efi_system_table_t *sys_table, + void ***rng_handle) +{ + efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID; + unsigned long size = 0; + efi_status_t status; + + *rng_handle = NULL; + status = efi_call_early(locate_handle, + EFI_LOCATE_BY_PROTOCOL, + &rng_proto, NULL, &size, *rng_handle); + + if (status == EFI_BUFFER_TOO_SMALL) { + status = efi_call_early(allocate_pool, + EFI_LOADER_DATA, + size, (void **)rng_handle); + + if (status != EFI_SUCCESS) { + efi_printk(sys_table, "Failed to alloc mem for rng_handle\n"); + return status; + } + + status = efi_call_early(locate_handle, + EFI_LOCATE_BY_PROTOCOL, &rng_proto, + NULL, &size, *rng_handle); + } + + if (status != EFI_SUCCESS) { + efi_printk(sys_table, "Failed to locate EFI_RNG_PROTOCOL\n"); + efi_call_early(free_pool, *rng_handle); + } + + return status; +} + +static bool efi_rng_supported32(efi_system_table_t *sys_table, void **rng_handle) +{ + const struct efi_config *efi_early = __efi_early(); + efi_rng_protocol_32 *rng = NULL; + efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID; + u32 *handles = (u32 *)(unsigned long)rng_handle; + unsigned long size = 0; + void **algorithmlist = NULL; + efi_status_t status; + + status = efi_call_early(handle_protocol, handles[0], + &rng_proto, (void **)&rng); + if (status != EFI_SUCCESS) + efi_printk(sys_table, "Failed to get EFI_RNG_PROTOCOL handles\n"); + + if (status == EFI_SUCCESS && rng) { + status = efi_early->call((unsigned long)rng->get_info, rng, + &size, algorithmlist); + return (status == EFI_BUFFER_TOO_SMALL); + } + + return false; +} + +static bool efi_rng_supported64(efi_system_table_t *sys_table, void **rng_handle) +{ + const struct efi_config *efi_early = __efi_early(); + efi_rng_protocol_64 *rng = NULL; + efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID; + u64 *handles = (u64 *)(unsigned long)rng_handle; + unsigned long size = 0; + void **algorithmlist = NULL; + efi_status_t status; + + status = efi_call_early(handle_protocol, handles[0], + &rng_proto, (void **)&rng); + if (status != EFI_SUCCESS) + efi_printk(sys_table, "Failed to get EFI_RNG_PROTOCOL handles\n"); + + if (status == EFI_SUCCESS && rng) { + status = efi_early->call((unsigned long)rng->get_info, rng, + &size, algorithmlist); + return (status == EFI_BUFFER_TOO_SMALL); + } + + return false; +} + +static bool efi_rng_supported(efi_system_table_t *sys_table) +{ + const struct efi_config *efi_early = __efi_early(); + bool supported; + efi_status_t status; + void **rng_handle = NULL; + + status = efi_locate_rng(sys_table, &rng_handle); + if (status != EFI_SUCCESS) + return false; + + if (efi_early->is64) + supported = efi_rng_supported64(sys_table, rng_handle); + else + supported = efi_rng_supported32(sys_table, rng_handle); + + efi_call_early(free_pool, rng_handle); + + return supported; +} + +static unsigned long efi_get_rng32(efi_system_table_t *sys_table, + void **rng_handle) +{ + const struct efi_config *efi_early = __efi_early(); + efi_rng_protocol_32 *rng = NULL; + efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID; + u32 *handles = (u32 *)(unsigned long)rng_handle; + efi_status_t status; + unsigned long rng_number = 0; + + status = efi_call_early(handle_protocol, handles[0], + &rng_proto, (void **)&rng); + if (status != EFI_SUCCESS) + efi_printk(sys_table, "Failed to get EFI_RNG_PROTOCOL handles\n"); + + if (status == EFI_SUCCESS && rng) { + status = efi_early->call((unsigned long)rng->get_rng, rng, NULL, + sizeof(rng_number), &rng_number); + if (status != EFI_SUCCESS) { + efi_printk(sys_table, "Failed to get RNG value: "); + efi_printk(sys_table, efi_status_to_str(status)); + efi_printk(sys_table, "\n"); + } + } + + return rng_number; +} + +static unsigned long efi_get_rng64(efi_system_table_t *sys_table, + void **rng_handle) +{ + const struct efi_config *efi_early = __efi_early(); + efi_rng_protocol_64 *rng = NULL; + efi_guid_t rng_proto = EFI_RNG_PROTOCOL_GUID; + u64 *handles = (u64 *)(unsigned long)rng_handle; + efi_status_t status; + unsigned long rng_number; + + status = efi_call_early(handle_protocol, handles[0], + &rng_proto, (void **)&rng); + if (status != EFI_SUCCESS) + efi_printk(sys_table, "Failed to get EFI_RNG_PROTOCOL handles\n"); + + if (status == EFI_SUCCESS && rng) { + status = efi_early->call((unsigned long)rng->get_rng, rng, NULL, + sizeof(rng_number), &rng_number); + if (status != EFI_SUCCESS) { + efi_printk(sys_table, "Failed to get RNG value: "); + efi_printk(sys_table, efi_status_to_str(status)); + efi_printk(sys_table, "\n"); + } + } + + return rng_number; +} + +static unsigned long efi_get_rng(efi_system_table_t *sys_table) +{ + const struct efi_config *efi_early = __efi_early(); + unsigned long random = 0; + efi_status_t status; + void **rng_handle = NULL; + + status = efi_locate_rng(sys_table, &rng_handle); + if (status != EFI_SUCCESS) + return 0; + + if (efi_early->is64) + random = efi_get_rng64(sys_table, rng_handle); + else + random = efi_get_rng32(sys_table, rng_handle); + + efi_call_early(free_pool, rng_handle); + + return random; +} #define EDX_TSC (1 << 4) #define ECX_RDRAND (1 << 30) @@ -46,6 +248,13 @@ static unsigned long get_random_long(unsigned long entropy, use_i8254 = false; } + if (efi_rng_supported(sys_table)) { + raw = efi_get_rng(sys_table); + if (raw) + random ^= raw; + use_i8254 = false; + } + if (use_i8254) random ^= read_i8254(); diff --git a/include/linux/efi.h b/include/linux/efi.h index 85ef051..8914d60 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -427,6 +427,16 @@ typedef struct { #define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000 #define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 0x40000 +typedef struct { + u32 get_info; + u32 get_rng; +} efi_rng_protocol_32; + +typedef struct { + u64 get_info; + u64 get_rng; +} efi_rng_protocol_64; + /* * Types and defines for EFI ResetSystem */ @@ -595,6 +605,9 @@ void efi_native_runtime_setup(void); #define DEVICE_TREE_GUID \ EFI_GUID( 0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) +#define EFI_RNG_PROTOCOL_GUID \ + EFI_GUID( 0x3152bca5, 0xeade, 0x433d, 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 ) + typedef struct { efi_guid_t guid; u64 table;