Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (8e6d539e) · Commits · 戴 / test

Documentation/kernel-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -1797,6 +1797,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

		noresidual [PPC] Don't use residual data on PReP machines.

		nordrand [X86] Disable the direct use of the RDRAND
		instruction even if it is supported by the
		processor. RDRAND is still available to user
		space applications.

		noresume [SWSUSP] Disables resume and restores original swap
		space.

arch/x86/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -1454,6 +1454,15 @@ config ARCH_USES_PG_UNCACHED
		def_bool y
		depends on X86_PAT

		config ARCH_RANDOM
		def_bool y
		prompt "x86 architectural random number generator" if EXPERT
		---help---
		Enable the x86 architectural RDRAND instruction
		(Intel Bull Mountain technology) to generate random numbers.
		If supported, this is a high bandwidth, cryptographically
		secure hardware random number generator.

		config EFI
		bool "EFI runtime service support"
		depends on ACPI

arch/x86/include/asm/archrandom.h

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		/*
		* 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 */

arch/x86/kernel/cpu/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ CFLAGS_common.o := $(nostackp)
		obj-y := intel_cacheinfo.o scattered.o topology.o
		obj-y += proc.o capflags.o powerflags.o common.o
		obj-y += vmware.o hypervisor.o sched.o mshyperv.o
		obj-y += rdrand.o

		obj-$(CONFIG_X86_32) += bugs.o
		obj-$(CONFIG_X86_64) += bugs_64.o

arch/x86/kernel/cpu/common.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <asm/stackprotector.h>
		#include <asm/perf_event.h>
		#include <asm/mmu_context.h>
		#include <asm/archrandom.h>
		#include <asm/hypervisor.h>
		#include <asm/processor.h>
		#include <asm/sections.h>
		@@ -860,6 +861,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
		#endif

		init_hypervisor(c);
		x86_init_rdrand(c);

		/*
		* Clear/Set all flags overriden by options, need do it

Admin message