Skip to contentSkip to conversation

random: do not include <asm/archrandom.h> from random.h

PATCH Superseded Jason A. Donenfeld 3 participants 4 messages Oct 29, 2022 – Nov 4, 2022

Subsystems (5)
lore
Share & tools
lore

Jason A. Donenfeld

author maintainer
#0 lore raw

PATCH v2 1/1 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.

---
 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(-)
arch/powerpc/kernel/setup-common.c +1 -0
index 6d041993a45d..9b10e57040c6 100644
@@ -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>
arch/s390/kernel/setup.c +1 -0
index ab19ddb09d65..b53a45735a5d 100644
@@ -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>
drivers/char/random.c +1 -0
index e3cf4f51ed58..a7afd17db075 100644
@@ -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>
include/linux/random.h +0 -2
index 2bdd3add3400..47e7cf126e8f 100644
@@ -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);
Signature · 1 line
2.38.1
Reviewed-by on v2 1/1
#1 lore raw

Le 29/10/2022 à 03:08, Jason A. Donenfeld a écrit :

Quoted 9 lines

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.

For powerpc,

Quoted 56 lines
---
  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(-)
arch/powerpc/kernel/setup-common.c +1 -0
index 6d041993a45d..9b10e57040c6 100644
@@ -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>
arch/s390/kernel/setup.c +1 -0
index ab19ddb09d65..b53a45735a5d 100644
@@ -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>
drivers/char/random.c +1 -0
index e3cf4f51ed58..a7afd17db075 100644
@@ -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>
include/linux/random.h +0 -2
index 2bdd3add3400..47e7cf126e8f 100644
@@ -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);
author maintainer
#2 lore raw

PATCH v3 1/1 random: do not include <asm/archrandom.h> from random.h

In reply to Jason A. Donenfeld

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.

---
 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(-)
arch/powerpc/kernel/setup-common.c +1 -0
index 6d041993a45d..9b10e57040c6 100644
@@ -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>
arch/s390/kernel/setup.c +1 -0
index ab19ddb09d65..b53a45735a5d 100644
@@ -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>
drivers/char/hw_random/s390-trng.c +1 -0
index 795853dfc46b..3a388e1c3631 100644
@@ -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");
drivers/char/random.c +1 -0
index bf6144c1de7d..b696f5dd3241 100644
@@ -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>
include/linux/random.h +0 -2
index 2bdd3add3400..47e7cf126e8f 100644
@@ -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);
Signature · 1 line
2.38.1
maintainer Acked-by on v3 1/1
#3 lore raw
Quoted 8 lines · Jason A. Donenfeld

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.

Quoted 7 lines
---
 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(-)