From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756178AbcEaSms (ORCPT ); Tue, 31 May 2016 14:42:48 -0400 Received: from mail.eperm.de ([89.247.134.16]:35436 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755329AbcEaSmm (ORCPT ); Tue, 31 May 2016 14:42:42 -0400 From: Stephan Mueller To: herbert@gondor.apana.org.au Cc: Ted Tso , Andi Kleen , sandyinchina@gmail.com, Jason Cooper , John Denker , "H. Peter Anvin" , Joe Perches , Pavel Machek , George Spelvin , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/5] random: conditionally compile code depending on LRNG Date: Tue, 31 May 2016 20:38:01 +0200 Message-ID: <2868682.u9Xh3cHh31@positron.chronox.de> User-Agent: KMail/4.14.10 (Linux/4.4.9-300.fc23.x86_64; KDE/4.14.20; x86_64; ; ) In-Reply-To: <1668650.acZVSyjHlL@positron.chronox.de> References: <1668650.acZVSyjHlL@positron.chronox.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When selecting the LRNG for compilation, disable the legacy /dev/random implementation. The LRNG is a drop-in replacement for the legacy /dev/random which implements the same in-kernel and user space API. Only the hooks of /dev/random into other parts of the kernel need to be disabled. Signed-off-by: Stephan Mueller --- drivers/char/random.c | 8 ++++++++ include/linux/genhd.h | 5 +++++ include/linux/random.h | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 0158d3b..ef89c0e 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -268,6 +268,8 @@ #include #include +#ifndef CONFIG_CRYPTO_LRNG + #define CREATE_TRACE_POINTS #include @@ -1621,6 +1623,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, } return urandom_read(NULL, buf, count, NULL); } +#endif /* CONFIG_CRYPTO_LRNG */ /******************************************************************** * @@ -1628,6 +1631,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, * ********************************************************************/ +#ifndef CONFIG_CRYPTO_LRNG #ifdef CONFIG_SYSCTL #include @@ -1765,6 +1769,8 @@ struct ctl_table random_table[] = { }; #endif /* CONFIG_SYSCTL */ +#endif /* CONFIG_CRYPTO_LRNG */ + static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned; int random_int_secret_init(void) @@ -1840,6 +1846,7 @@ randomize_range(unsigned long start, unsigned long end, unsigned long len) return PAGE_ALIGN(get_random_int() % range + start); } +#ifndef CONFIG_CRYPTO_LRNG /* Interface for in-kernel drivers of true hardware RNGs. * Those devices may produce endless random bits and will be throttled * when our pool is full. @@ -1859,3 +1866,4 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, credit_entropy_bits(poolp, entropy); } EXPORT_SYMBOL_GPL(add_hwgenerator_randomness); +#endif /* CONFIG_CRYPTO_LRNG */ diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 359a8e4..24cfb99 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -433,8 +433,13 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask); extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask); /* drivers/char/random.c */ +#ifdef CONFIG_CRYPTO_LRNG +#define add_disk_randomness(disk) do {} while (0) +#define rand_initialize_disk(disk) do {} while (0) +#else extern void add_disk_randomness(struct gendisk *disk); extern void rand_initialize_disk(struct gendisk *disk); +#endif static inline sector_t get_start_sect(struct block_device *bdev) { diff --git a/include/linux/random.h b/include/linux/random.h index e47e533..8773dfc 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -17,10 +17,15 @@ struct random_ready_callback { struct module *owner; }; -extern void add_device_randomness(const void *, unsigned int); extern void add_input_randomness(unsigned int type, unsigned int code, unsigned int value); extern void add_interrupt_randomness(int irq, int irq_flags); +#ifdef CONFIG_CRYPTO_LRNG +#define add_device_randomness(buf, nbytes) do {} while (0) +#else /* CONFIG_CRYPTO_LRNG */ +extern void add_device_randomness(const void *, unsigned int); +#define lrng_irq_process() +#endif /* CONFIG_CRYPTO_LRNG */ extern void get_random_bytes(void *buf, int nbytes); extern int add_random_ready_callback(struct random_ready_callback *rdy); -- 2.7.2