-
Notifications
You must be signed in to change notification settings - Fork 52.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/l…
…inux/kernel/git/tip/tip * 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, random: Verify RDRAND functionality and allow it to be disabled x86, random: Architectural inlines to get random integers with RDRAND random: Add support for architectural random hooks Fix up trivial conflicts in drivers/char/random.c: the architectural random hooks touched "get_random_int()" that was simplified to use MD5 and not do the keyptr thing any more (see commit 6e5714e: "net: Compute protocol sequence numbers and fragment IDs using MD5").
- Loading branch information
Showing
8 changed files
with
199 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* This file is part of the Linux kernel. | ||
* | ||
* Copyright (c) 2011, Intel Corporation | ||
* Authors: Fenghua Yu <fenghua.yu@intel.com>, | ||
* H. Peter Anvin <hpa@linux.intel.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms and conditions of the GNU General Public License, | ||
* version 2, as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
*/ | ||
|
||
#ifndef ASM_X86_ARCHRANDOM_H | ||
#define ASM_X86_ARCHRANDOM_H | ||
|
||
#include <asm/processor.h> | ||
#include <asm/cpufeature.h> | ||
#include <asm/alternative.h> | ||
#include <asm/nops.h> | ||
|
||
#define RDRAND_RETRY_LOOPS 10 | ||
|
||
#define RDRAND_INT ".byte 0x0f,0xc7,0xf0" | ||
#ifdef CONFIG_X86_64 | ||
# define RDRAND_LONG ".byte 0x48,0x0f,0xc7,0xf0" | ||
#else | ||
# define RDRAND_LONG RDRAND_INT | ||
#endif | ||
|
||
#ifdef CONFIG_ARCH_RANDOM | ||
|
||
#define GET_RANDOM(name, type, rdrand, nop) \ | ||
static inline int name(type *v) \ | ||
{ \ | ||
int ok; \ | ||
alternative_io("movl $0, %0\n\t" \ | ||
nop, \ | ||
"\n1: " rdrand "\n\t" \ | ||
"jc 2f\n\t" \ | ||
"decl %0\n\t" \ | ||
"jnz 1b\n\t" \ | ||
"2:", \ | ||
X86_FEATURE_RDRAND, \ | ||
ASM_OUTPUT2("=r" (ok), "=a" (*v)), \ | ||
"0" (RDRAND_RETRY_LOOPS)); \ | ||
return ok; \ | ||
} | ||
|
||
#ifdef CONFIG_X86_64 | ||
|
||
GET_RANDOM(arch_get_random_long, unsigned long, RDRAND_LONG, ASM_NOP5); | ||
GET_RANDOM(arch_get_random_int, unsigned int, RDRAND_INT, ASM_NOP4); | ||
|
||
#else | ||
|
||
GET_RANDOM(arch_get_random_long, unsigned long, RDRAND_LONG, ASM_NOP3); | ||
GET_RANDOM(arch_get_random_int, unsigned int, RDRAND_INT, ASM_NOP3); | ||
|
||
#endif /* CONFIG_X86_64 */ | ||
|
||
#endif /* CONFIG_ARCH_RANDOM */ | ||
|
||
extern void x86_init_rdrand(struct cpuinfo_x86 *c); | ||
|
||
#endif /* ASM_X86_ARCHRANDOM_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* This file is part of the Linux kernel. | ||
* | ||
* Copyright (c) 2011, Intel Corporation | ||
* Authors: Fenghua Yu <fenghua.yu@intel.com>, | ||
* H. Peter Anvin <hpa@linux.intel.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms and conditions of the GNU General Public License, | ||
* version 2, as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
*/ | ||
|
||
#include <asm/processor.h> | ||
#include <asm/archrandom.h> | ||
#include <asm/sections.h> | ||
|
||
static int __init x86_rdrand_setup(char *s) | ||
{ | ||
setup_clear_cpu_cap(X86_FEATURE_RDRAND); | ||
return 1; | ||
} | ||
__setup("nordrand", x86_rdrand_setup); | ||
|
||
/* We can't use arch_get_random_long() here since alternatives haven't run */ | ||
static inline int rdrand_long(unsigned long *v) | ||
{ | ||
int ok; | ||
asm volatile("1: " RDRAND_LONG "\n\t" | ||
"jc 2f\n\t" | ||
"decl %0\n\t" | ||
"jnz 1b\n\t" | ||
"2:" | ||
: "=r" (ok), "=a" (*v) | ||
: "0" (RDRAND_RETRY_LOOPS)); | ||
return ok; | ||
} | ||
|
||
/* | ||
* Force a reseed cycle; we are architecturally guaranteed a reseed | ||
* after no more than 512 128-bit chunks of random data. This also | ||
* acts as a test of the CPU capability. | ||
*/ | ||
#define RESEED_LOOP ((512*128)/sizeof(unsigned long)) | ||
|
||
void __cpuinit x86_init_rdrand(struct cpuinfo_x86 *c) | ||
{ | ||
#ifdef CONFIG_ARCH_RANDOM | ||
unsigned long tmp; | ||
int i, count, ok; | ||
|
||
if (!cpu_has(c, X86_FEATURE_RDRAND)) | ||
return; /* Nothing to do */ | ||
|
||
for (count = i = 0; i < RESEED_LOOP; i++) { | ||
ok = rdrand_long(&tmp); | ||
if (ok) | ||
count++; | ||
} | ||
|
||
if (count != RESEED_LOOP) | ||
clear_cpu_cap(c, X86_FEATURE_RDRAND); | ||
#endif | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters