2022-10-29 02:26:58

by Jason A. Donenfeld

Subject: [PATCH v2] random: do not include <asm/archrandom.h> from random.h

The <asm/archrandom.h> header is a random.c private detail, not
something to be called by other code. As such, don't make it
automatically available by way of random.h.

Cc: Michael Ellerman <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Jason A. Donenfeld <[email protected]>
---
arch/powerpc/kernel/setup-common.c | 1 +
arch/s390/kernel/setup.c | 1 +
drivers/char/random.c | 1 +
include/linux/random.h | 2 --
4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 6d041993a45d..9b10e57040c6 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -59,6 +59,7 @@
#include <asm/xmon.h>
#include <asm/cputhreads.h>
#include <mm/mmu_decl.h>
+#include <asm/archrandom.h>
#include <asm/fadump.h>
#include <asm/udbg.h>
#include <asm/hugetlb.h>
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ab19ddb09d65..b53a45735a5d 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -52,6 +52,7 @@
#include <linux/hugetlb.h>
#include <linux/kmemleak.h>

+#include <asm/archrandom.h>
#include <asm/boot_data.h>
#include <asm/ipl.h>
#include <asm/facility.h>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index e3cf4f51ed58..a7afd17db075 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -55,6 +55,7 @@
#include <linux/siphash.h>
#include <crypto/chacha.h>
#include <crypto/blake2s.h>
+#include <asm/archrandom.h>
#include <asm/processor.h>
#include <asm/irq.h>
#include <asm/irq_regs.h>
diff --git a/include/linux/random.h b/include/linux/random.h
index 2bdd3add3400..47e7cf126e8f 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -151,8 +151,6 @@ declare_get_random_var_wait(long, unsigned long)
*/
#include <linux/prandom.h>

-#include <asm/archrandom.h>
-
#ifdef CONFIG_SMP
int random_prepare_cpu(unsigned int cpu);
int random_online_cpu(unsigned int cpu);
--
2.38.1

2022-11-03 09:26:57

by Christophe Leroy

Subject: Re: [PATCH v2] random: do not include <asm/archrandom.h> from random.h

Le 29/10/2022 à 03:08, Jason A. Donenfeld a écrit :
> The <asm/archrandom.h> header is a random.c private detail, not
> something to be called by other code. As such, don't make it
> automatically available by way of random.h.
>
> Cc: Michael Ellerman <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Jason A. Donenfeld <[email protected]>

For powerpc,

Reviewed-by: Christophe Leroy <[email protected]>

> ---
> arch/powerpc/kernel/setup-common.c | 1 +
> arch/s390/kernel/setup.c | 1 +
> drivers/char/random.c | 1 +
> include/linux/random.h | 2 --
> 4 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
> index 6d041993a45d..9b10e57040c6 100644
> --- a/arch/powerpc/kernel/setup-common.c
> +++ b/arch/powerpc/kernel/setup-common.c
> @@ -59,6 +59,7 @@
> #include <asm/xmon.h>
> #include <asm/cputhreads.h>
> #include <mm/mmu_decl.h>
> +#include <asm/archrandom.h>
> #include <asm/fadump.h>
> #include <asm/udbg.h>
> #include <asm/hugetlb.h>
> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
> index ab19ddb09d65..b53a45735a5d 100644
> --- a/arch/s390/kernel/setup.c
> +++ b/arch/s390/kernel/setup.c
> @@ -52,6 +52,7 @@
> #include <linux/hugetlb.h>
> #include <linux/kmemleak.h>
>
> +#include <asm/archrandom.h>
> #include <asm/boot_data.h>
> #include <asm/ipl.h>
> #include <asm/facility.h>
> diff --git a/drivers/char/random.c b/drivers/char/random.c
> index e3cf4f51ed58..a7afd17db075 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -55,6 +55,7 @@
> #include <linux/siphash.h>
> #include <crypto/chacha.h>
> #include <crypto/blake2s.h>
> +#include <asm/archrandom.h>
> #include <asm/processor.h>
> #include <asm/irq.h>
> #include <asm/irq_regs.h>
> diff --git a/include/linux/random.h b/include/linux/random.h
> index 2bdd3add3400..47e7cf126e8f 100644
> --- a/include/linux/random.h
> +++ b/include/linux/random.h
> @@ -151,8 +151,6 @@ declare_get_random_var_wait(long, unsigned long)
> */
> #include <linux/prandom.h>
>
> -#include <asm/archrandom.h>
> -
> #ifdef CONFIG_SMP
> int random_prepare_cpu(unsigned int cpu);
> int random_online_cpu(unsigned int cpu);

2022-11-03 13:32:46

by Jason A. Donenfeld

Subject: [PATCH v3] random: do not include <asm/archrandom.h> from random.h

The <asm/archrandom.h> header is a random.c private detail, not
something to be called by other code. As such, don't make it
automatically available by way of random.h.

Cc: Michael Ellerman <[email protected]>
Cc: Heiko Carstens <[email protected]>
Reviewed-by: Christophe Leroy <[email protected]>
Signed-off-by: Jason A. Donenfeld <[email protected]>
---
arch/powerpc/kernel/setup-common.c | 1 +
arch/s390/kernel/setup.c | 1 +
drivers/char/hw_random/s390-trng.c | 1 +
drivers/char/random.c | 1 +
include/linux/random.h | 2 --
5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 6d041993a45d..9b10e57040c6 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -59,6 +59,7 @@
#include <asm/xmon.h>
#include <asm/cputhreads.h>
#include <mm/mmu_decl.h>
+#include <asm/archrandom.h>
#include <asm/fadump.h>
#include <asm/udbg.h>
#include <asm/hugetlb.h>
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ab19ddb09d65..b53a45735a5d 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -52,6 +52,7 @@
#include <linux/hugetlb.h>
#include <linux/kmemleak.h>

+#include <asm/archrandom.h>
#include <asm/boot_data.h>
#include <asm/ipl.h>
#include <asm/facility.h>
diff --git a/drivers/char/hw_random/s390-trng.c b/drivers/char/hw_random/s390-trng.c
index 795853dfc46b..3a388e1c3631 100644
--- a/drivers/char/hw_random/s390-trng.c
+++ b/drivers/char/hw_random/s390-trng.c
@@ -23,6 +23,7 @@
#include <linux/sched/signal.h>
#include <asm/debug.h>
#include <asm/cpacf.h>
+#include <asm/archrandom.h>

MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("IBM Corporation");
diff --git a/drivers/char/random.c b/drivers/char/random.c
index bf6144c1de7d..b696f5dd3241 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -55,6 +55,7 @@
#include <linux/siphash.h>
#include <crypto/chacha.h>
#include <crypto/blake2s.h>
+#include <asm/archrandom.h>
#include <asm/processor.h>
#include <asm/irq.h>
#include <asm/irq_regs.h>
diff --git a/include/linux/random.h b/include/linux/random.h
index 2bdd3add3400..47e7cf126e8f 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -151,8 +151,6 @@ declare_get_random_var_wait(long, unsigned long)
*/
#include <linux/prandom.h>

-#include <asm/archrandom.h>
-
#ifdef CONFIG_SMP
int random_prepare_cpu(unsigned int cpu);
int random_online_cpu(unsigned int cpu);
--
2.38.1

2022-11-04 15:24:36

by Heiko Carstens

Subject: Re: [PATCH v3] random: do not include <asm/archrandom.h> from random.h

On Thu, Nov 03, 2022 at 01:17:40PM +0100, Jason A. Donenfeld wrote:
> The <asm/archrandom.h> header is a random.c private detail, not
> something to be called by other code. As such, don't make it
> automatically available by way of random.h.
>
> Cc: Michael Ellerman <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Reviewed-by: Christophe Leroy <[email protected]>
> Signed-off-by: Jason A. Donenfeld <[email protected]>
> ---
> arch/powerpc/kernel/setup-common.c | 1 +
> arch/s390/kernel/setup.c | 1 +
> drivers/char/hw_random/s390-trng.c | 1 +
> drivers/char/random.c | 1 +
> include/linux/random.h | 2 --
> 5 files changed, 4 insertions(+), 2 deletions(-)

Acked-by: Heiko Carstens <[email protected]>