LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v4 0/3] enable early printing of hashed pointers
@ 2018-05-15  3:06 Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 1/3] random: Fix whitespace pre random-bytes work Tobin C. Harding
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15  3:06 UTC (permalink / raw)
  To: Theodore Ts'o
  Cc: Tobin C. Harding, Linus Torvalds, Randy Dunlap, Steven Rostedt,
	Kees Cook, Anna-Maria Gleixner, Andrew Morton,
	Greg Kroah-Hartman, Arnd Bergmann, linux-kernel

Currently if an attempt is made to print a pointer before there is
enough entropy then '(____ptrval____)' is printed.  This makes debugging
stack traces during early boot difficult.

One partial solution to this problem is to use the hw RNG if it is
available.

This version drops the final patch from the series to facilitate 
merge via Ted's tree.

Ted are you able to take these patches please?

Patch 1 - Whitespace fixes.
Patch 2 - Fix get_random_bytes_arch()
Patch 3 - Use hw RNG for pointer hashing if available (by default).


thanks,
Tobin.

v3 -> v4
 - remove last patch of series (command line option patch)

v2 -> v3
 - Add __ro_after_init (suggested by Kees).

v1 -> v2
 - Use min_t() instead of min() (thanks checkpatch).
 - Add __must_check to function declaration (thanks Steve).
 - Use hw RNG by default if available (as originally suggested by Kees).
 - Add command line option to use cryptographically insecure hashing.
   If debug_early_boot is enabled use hash_long() instead of siphash
   (as requested by Steve, and solves original problem for Anna-Maria).

Tobin C. Harding (3):
  random: Fix whitespace pre random-bytes work
  random: Return nbytes filled from hw RNG
  vsprintf: Use hw RNG for ptr_key

 drivers/char/random.c  | 19 ++++++++++---------
 include/linux/random.h |  2 +-
 lib/vsprintf.c         | 19 ++++++++++++++++---
 3 files changed, 27 insertions(+), 13 deletions(-)

-- 
2.7.4

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v4 1/3] random: Fix whitespace pre random-bytes work
  2018-05-15  3:06 [PATCH v4 0/3] enable early printing of hashed pointers Tobin C. Harding
@ 2018-05-15  3:06 ` Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 2/3] random: Return nbytes filled from hw RNG Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key Tobin C. Harding
  2 siblings, 0 replies; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15  3:06 UTC (permalink / raw)
  To: Theodore Ts'o
  Cc: Tobin C. Harding, Linus Torvalds, Randy Dunlap, Steven Rostedt,
	Kees Cook, Anna-Maria Gleixner, Andrew Morton,
	Greg Kroah-Hartman, Arnd Bergmann, linux-kernel

There are a couple of whitespace issues around the function
get_random_bytes_arch().  In preparation for patching this function
let's clean them up.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Acked-by: Theodore Ts'o <tytso@mit.edu>
---
 drivers/char/random.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index cd888d4ee605..031d18b31e0f 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1737,7 +1737,7 @@ void get_random_bytes_arch(void *buf, int nbytes)
 
 		if (!arch_get_random_long(&v))
 			break;
-		
+
 		memcpy(p, &v, chunk);
 		p += chunk;
 		nbytes -= chunk;
@@ -1748,7 +1748,6 @@ void get_random_bytes_arch(void *buf, int nbytes)
 }
 EXPORT_SYMBOL(get_random_bytes_arch);
 
-
 /*
  * init_std_data - initialize pool with system data
  *
-- 
2.7.4

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v4 2/3] random: Return nbytes filled from hw RNG
  2018-05-15  3:06 [PATCH v4 0/3] enable early printing of hashed pointers Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 1/3] random: Fix whitespace pre random-bytes work Tobin C. Harding
@ 2018-05-15  3:06 ` Tobin C. Harding
  2018-05-15 13:37   ` Steven Rostedt
  2018-05-15  3:06 ` [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key Tobin C. Harding
  2 siblings, 1 reply; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15  3:06 UTC (permalink / raw)
  To: Theodore Ts'o
  Cc: Tobin C. Harding, Linus Torvalds, Randy Dunlap, Steven Rostedt,
	Kees Cook, Anna-Maria Gleixner, Andrew Morton,
	Greg Kroah-Hartman, Arnd Bergmann, linux-kernel

Currently the function get_random_bytes_arch() has return value 'void'.
If the hw RNG fails we currently fall back to using get_random_bytes().
This defeats the purpose of requesting random material from the hw RNG
in the first place.

There are currently no intree users of get_random_bytes_arch().

Only get random bytes from the hw RNG, make function return the number
of bytes retrieved from the hw RNG.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Acked-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Tobin C. Harding <me@tobin.cc>
---
 drivers/char/random.c  | 16 +++++++++-------
 include/linux/random.h |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 031d18b31e0f..4b0ec597e783 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1725,26 +1725,28 @@ EXPORT_SYMBOL(del_random_ready_callback);
  * key known by the NSA).  So it's useful if we need the speed, but
  * only if we're willing to trust the hardware manufacturer not to
  * have put in a back door.
+ *
+ * Return number of bytes filled in.
  */
-void get_random_bytes_arch(void *buf, int nbytes)
+int __must_check get_random_bytes_arch(void *buf, int nbytes)
 {
 	char *p = buf;
+	int left = nbytes;
 
-	trace_get_random_bytes_arch(nbytes, _RET_IP_);
-	while (nbytes) {
+	trace_get_random_bytes_arch(left, _RET_IP_);
+	while (left) {
 		unsigned long v;
-		int chunk = min(nbytes, (int)sizeof(unsigned long));
+		int chunk = min_t(int, left, (int)sizeof(unsigned long));
 
 		if (!arch_get_random_long(&v))
 			break;
 
 		memcpy(p, &v, chunk);
 		p += chunk;
-		nbytes -= chunk;
+		left -= chunk;
 	}
 
-	if (nbytes)
-		get_random_bytes(p, nbytes);
+	return nbytes - left;
 }
 EXPORT_SYMBOL(get_random_bytes_arch);
 
diff --git a/include/linux/random.h b/include/linux/random.h
index 2ddf13b4281e..f1c9bc5cd231 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -38,7 +38,7 @@ extern void get_random_bytes(void *buf, int nbytes);
 extern int wait_for_random_bytes(void);
 extern int add_random_ready_callback(struct random_ready_callback *rdy);
 extern void del_random_ready_callback(struct random_ready_callback *rdy);
-extern void get_random_bytes_arch(void *buf, int nbytes);
+extern int __must_check get_random_bytes_arch(void *buf, int nbytes);
 
 #ifndef MODULE
 extern const struct file_operations random_fops, urandom_fops;
-- 
2.7.4

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key
  2018-05-15  3:06 [PATCH v4 0/3] enable early printing of hashed pointers Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 1/3] random: Fix whitespace pre random-bytes work Tobin C. Harding
  2018-05-15  3:06 ` [PATCH v4 2/3] random: Return nbytes filled from hw RNG Tobin C. Harding
@ 2018-05-15  3:06 ` Tobin C. Harding
  2018-05-15 13:47   ` Steven Rostedt
  2 siblings, 1 reply; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15  3:06 UTC (permalink / raw)
  To: Theodore Ts'o
  Cc: Tobin C. Harding, Linus Torvalds, Randy Dunlap, Steven Rostedt,
	Kees Cook, Anna-Maria Gleixner, Andrew Morton,
	Greg Kroah-Hartman, Arnd Bergmann, linux-kernel

Currently we must wait for enough entropy to become available before
hashed pointers can be printed.  We can remove this wait by using the
hw RNG if available.

Use hw RNG to get keying material.

Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tobin C. Harding <me@tobin.cc>
---
 lib/vsprintf.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b82f0c6c2aec..3697a19c2b25 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1657,9 +1657,8 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
 static bool have_filled_random_ptr_key __read_mostly;
 static siphash_key_t ptr_key __read_mostly;
 
-static void fill_random_ptr_key(struct random_ready_callback *unused)
+static void ptr_key_ready(void)
 {
-	get_random_bytes(&ptr_key, sizeof(ptr_key));
 	/*
 	 * have_filled_random_ptr_key==true is dependent on get_random_bytes().
 	 * ptr_to_id() needs to see have_filled_random_ptr_key==true
@@ -1669,14 +1668,28 @@ static void fill_random_ptr_key(struct random_ready_callback *unused)
 	WRITE_ONCE(have_filled_random_ptr_key, true);
 }
 
+static void fill_random_ptr_key(struct random_ready_callback *unused)
+{
+	get_random_bytes(&ptr_key, sizeof(ptr_key));
+	ptr_key_ready();
+}
+
 static struct random_ready_callback random_ready = {
 	.func = fill_random_ptr_key
 };
 
 static int __init initialize_ptr_random(void)
 {
-	int ret = add_random_ready_callback(&random_ready);
+	int ret;
+	int key_size = sizeof(ptr_key);
+
+	/* Use hw RNG if available */
+	if (get_random_bytes_arch(&ptr_key, key_size) == key_size) {
+		ptr_key_ready();
+		return 0;
+	}
 
+	ret = add_random_ready_callback(&random_ready);
 	if (!ret) {
 		return 0;
 	} else if (ret == -EALREADY) {
-- 
2.7.4

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] random: Return nbytes filled from hw RNG
  2018-05-15  3:06 ` [PATCH v4 2/3] random: Return nbytes filled from hw RNG Tobin C. Harding
@ 2018-05-15 13:37   ` Steven Rostedt
  2018-05-15 21:17     ` Tobin C. Harding
  0 siblings, 1 reply; 10+ messages in thread
From: Steven Rostedt @ 2018-05-15 13:37 UTC (permalink / raw)
  To: Tobin C. Harding
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Tue, 15 May 2018 13:06:25 +1000
"Tobin C. Harding" <me@tobin.cc> wrote:

> Currently the function get_random_bytes_arch() has return value 'void'.
> If the hw RNG fails we currently fall back to using get_random_bytes().
> This defeats the purpose of requesting random material from the hw RNG
> in the first place.
> 
> There are currently no intree users of get_random_bytes_arch().
> 
> Only get random bytes from the hw RNG, make function return the number
> of bytes retrieved from the hw RNG.
> 
> Signed-off-by: Tobin C. Harding <me@tobin.cc>
> Acked-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Tobin C. Harding <me@tobin.cc>
> ---
>  drivers/char/random.c  | 16 +++++++++-------
>  include/linux/random.h |  2 +-
>  2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/char/random.c b/drivers/char/random.c
> index 031d18b31e0f..4b0ec597e783 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -1725,26 +1725,28 @@ EXPORT_SYMBOL(del_random_ready_callback);
>   * key known by the NSA).  So it's useful if we need the speed, but
>   * only if we're willing to trust the hardware manufacturer not to
>   * have put in a back door.
> + *
> + * Return number of bytes filled in.
>   */
> -void get_random_bytes_arch(void *buf, int nbytes)
> +int __must_check get_random_bytes_arch(void *buf, int nbytes)
>  {
>  	char *p = buf;
> +	int left = nbytes;

Just a nit, but I know some kernel devs prefer "upside-down-xmas-tree"
style of declarations. Which would make the above:

	int left = nbytes;
	char *p = buf;

>  
> -	trace_get_random_bytes_arch(nbytes, _RET_IP_);
> -	while (nbytes) {
> +	trace_get_random_bytes_arch(left, _RET_IP_);

Nothing to do with this patch series, but I wonder if we should move
the trace event below, and record how much was done.

> +	while (left) {
>  		unsigned long v;
> -		int chunk = min(nbytes, (int)sizeof(unsigned long));
> +		int chunk = min_t(int, left, (int)sizeof(unsigned long));
>  
>  		if (!arch_get_random_long(&v))
>  			break;
>  
>  		memcpy(p, &v, chunk);
>  		p += chunk;
> -		nbytes -= chunk;
> +		left -= chunk;
>  	}
>  
> -	if (nbytes)
> -		get_random_bytes(p, nbytes);
> +	return nbytes - left;
>  }
>  EXPORT_SYMBOL(get_random_bytes_arch);
>  
> diff --git a/include/linux/random.h b/include/linux/random.h
> index 2ddf13b4281e..f1c9bc5cd231 100644
> --- a/include/linux/random.h
> +++ b/include/linux/random.h
> @@ -38,7 +38,7 @@ extern void get_random_bytes(void *buf, int nbytes);
>  extern int wait_for_random_bytes(void);
>  extern int add_random_ready_callback(struct random_ready_callback *rdy);
>  extern void del_random_ready_callback(struct random_ready_callback *rdy);
> -extern void get_random_bytes_arch(void *buf, int nbytes);
> +extern int __must_check get_random_bytes_arch(void *buf, int nbytes);
>  
>  #ifndef MODULE
>  extern const struct file_operations random_fops, urandom_fops;

Other than that...

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key
  2018-05-15  3:06 ` [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key Tobin C. Harding
@ 2018-05-15 13:47   ` Steven Rostedt
  2018-05-15 21:09     ` Tobin C. Harding
  0 siblings, 1 reply; 10+ messages in thread
From: Steven Rostedt @ 2018-05-15 13:47 UTC (permalink / raw)
  To: Tobin C. Harding
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Tue, 15 May 2018 13:06:26 +1000
"Tobin C. Harding" <me@tobin.cc> wrote:

> Currently we must wait for enough entropy to become available before
> hashed pointers can be printed.  We can remove this wait by using the
> hw RNG if available.
> 
> Use hw RNG to get keying material.
> 
> Suggested-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Tobin C. Harding <me@tobin.cc>
> ---
>  lib/vsprintf.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/vsprintf.c b/lib/vsprintf.c
> index b82f0c6c2aec..3697a19c2b25 100644
> --- a/lib/vsprintf.c
> +++ b/lib/vsprintf.c
> @@ -1657,9 +1657,8 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
>  static bool have_filled_random_ptr_key __read_mostly;
>  static siphash_key_t ptr_key __read_mostly;
>  
> -static void fill_random_ptr_key(struct random_ready_callback *unused)
> +static void ptr_key_ready(void)
>  {
> -	get_random_bytes(&ptr_key, sizeof(ptr_key));
>  	/*
>  	 * have_filled_random_ptr_key==true is dependent on get_random_bytes().
>  	 * ptr_to_id() needs to see have_filled_random_ptr_key==true

Nothing to do with this patch, but I believe there's a missing memory
barrier in the code.

Right after this we have:

	smp_mb();
	WRITE_ONCE(have_filled_random_ptr_key, true);

Where the comment says that have_filled_random_ptr_key must be set
after ptr_key has been updated. But there's no memory barrier on the
read side. In fact, I think this could be a smp_wmb() instead of a
smp_mb(). The read side has:

	if (unlikely(!have_filled_random_ptr_key))
		return string(buf, end, "(ptrval)", spec);

/* Missing memory barrier smp_rmb() here. */

	hashval = (unsigned long)siphash_1u64((u64)ptr, &ptr_key);

Thus we can have something like:

	CPU0				CPU1
	----				----
				   load ptr_key = 0
   store ptr_key = random
   smp_mb()
   store have_filled_random_ptr_key

				   load have_filled_random_ptr_key = true

				    BAD BAD BAD!

I'll send a patch.

> @@ -1669,14 +1668,28 @@ static void fill_random_ptr_key(struct random_ready_callback *unused)
>  	WRITE_ONCE(have_filled_random_ptr_key, true);
>  }
>  
> +static void fill_random_ptr_key(struct random_ready_callback *unused)
> +{
> +	get_random_bytes(&ptr_key, sizeof(ptr_key));
> +	ptr_key_ready();
> +}
> +
>  static struct random_ready_callback random_ready = {
>  	.func = fill_random_ptr_key
>  };
>  
>  static int __init initialize_ptr_random(void)
>  {
> -	int ret = add_random_ready_callback(&random_ready);
> +	int ret;
> +	int key_size = sizeof(ptr_key);
> +
> +	/* Use hw RNG if available */
> +	if (get_random_bytes_arch(&ptr_key, key_size) == key_size) {
> +		ptr_key_ready();
> +		return 0;
> +	}
>  
> +	ret = add_random_ready_callback(&random_ready);
>  	if (!ret) {
>  		return 0;
>  	} else if (ret == -EALREADY) {

But this patch looks good.

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key
  2018-05-15 13:47   ` Steven Rostedt
@ 2018-05-15 21:09     ` Tobin C. Harding
  0 siblings, 0 replies; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15 21:09 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Tue, May 15, 2018 at 09:47:44AM -0400, Steven Rostedt wrote:
> On Tue, 15 May 2018 13:06:26 +1000
> "Tobin C. Harding" <me@tobin.cc> wrote:
> 
> > Currently we must wait for enough entropy to become available before
> > hashed pointers can be printed.  We can remove this wait by using the
> > hw RNG if available.
> > 
> > Use hw RNG to get keying material.
> > 
> > Suggested-by: Kees Cook <keescook@chromium.org>
> > Signed-off-by: Tobin C. Harding <me@tobin.cc>
> > ---
> >  lib/vsprintf.c | 19 ++++++++++++++++---
> >  1 file changed, 16 insertions(+), 3 deletions(-)
> > 
> > diff --git a/lib/vsprintf.c b/lib/vsprintf.c
> > index b82f0c6c2aec..3697a19c2b25 100644
> > --- a/lib/vsprintf.c
> > +++ b/lib/vsprintf.c
> > @@ -1657,9 +1657,8 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
> >  static bool have_filled_random_ptr_key __read_mostly;
> >  static siphash_key_t ptr_key __read_mostly;
> >  
> > -static void fill_random_ptr_key(struct random_ready_callback *unused)
> > +static void ptr_key_ready(void)
> >  {
> > -	get_random_bytes(&ptr_key, sizeof(ptr_key));
> >  	/*
> >  	 * have_filled_random_ptr_key==true is dependent on get_random_bytes().
> >  	 * ptr_to_id() needs to see have_filled_random_ptr_key==true
> 
> Nothing to do with this patch, but I believe there's a missing memory
> barrier in the code.
> 
> Right after this we have:
> 
> 	smp_mb();
> 	WRITE_ONCE(have_filled_random_ptr_key, true);
> 
> Where the comment says that have_filled_random_ptr_key must be set
> after ptr_key has been updated. But there's no memory barrier on the
> read side. In fact, I think this could be a smp_wmb() instead of a
> smp_mb(). The read side has:
> 
> 	if (unlikely(!have_filled_random_ptr_key))
> 		return string(buf, end, "(ptrval)", spec);
> 
> /* Missing memory barrier smp_rmb() here. */
> 
> 	hashval = (unsigned long)siphash_1u64((u64)ptr, &ptr_key);
> 
> Thus we can have something like:
> 
> 	CPU0				CPU1
> 	----				----
> 				   load ptr_key = 0
>    store ptr_key = random
>    smp_mb()
>    store have_filled_random_ptr_key
> 
> 				   load have_filled_random_ptr_key = true
> 
> 				    BAD BAD BAD!
> 
> I'll send a patch.

Awesome reviewing.  Thanks for catching this.


	Tobin

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] random: Return nbytes filled from hw RNG
  2018-05-15 13:37   ` Steven Rostedt
@ 2018-05-15 21:17     ` Tobin C. Harding
  2018-05-15 21:35       ` Steven Rostedt
  0 siblings, 1 reply; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15 21:17 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Tue, May 15, 2018 at 09:37:05AM -0400, Steven Rostedt wrote:
> On Tue, 15 May 2018 13:06:25 +1000
> "Tobin C. Harding" <me@tobin.cc> wrote:
> 
> > Currently the function get_random_bytes_arch() has return value 'void'.
> > If the hw RNG fails we currently fall back to using get_random_bytes().
> > This defeats the purpose of requesting random material from the hw RNG
> > in the first place.
> > 
> > There are currently no intree users of get_random_bytes_arch().
> > 
> > Only get random bytes from the hw RNG, make function return the number
> > of bytes retrieved from the hw RNG.
> > 
> > Signed-off-by: Tobin C. Harding <me@tobin.cc>
> > Acked-by: Theodore Ts'o <tytso@mit.edu>
> > Signed-off-by: Tobin C. Harding <me@tobin.cc>
> > ---
> >  drivers/char/random.c  | 16 +++++++++-------
> >  include/linux/random.h |  2 +-
> >  2 files changed, 10 insertions(+), 8 deletions(-)
> > 
> > diff --git a/drivers/char/random.c b/drivers/char/random.c
> > index 031d18b31e0f..4b0ec597e783 100644
> > --- a/drivers/char/random.c
> > +++ b/drivers/char/random.c
> > @@ -1725,26 +1725,28 @@ EXPORT_SYMBOL(del_random_ready_callback);
> >   * key known by the NSA).  So it's useful if we need the speed, but
> >   * only if we're willing to trust the hardware manufacturer not to
> >   * have put in a back door.
> > + *
> > + * Return number of bytes filled in.
> >   */
> > -void get_random_bytes_arch(void *buf, int nbytes)
> > +int __must_check get_random_bytes_arch(void *buf, int nbytes)
> >  {
> >  	char *p = buf;
> > +	int left = nbytes;
> 
> Just a nit, but I know some kernel devs prefer "upside-down-xmas-tree"
> style of declarations. Which would make the above:
> 
> 	int left = nbytes;
> 	char *p = buf;

Super specific coding style and rigorous code cleanliness is a big part
of why I love kernel dev.  Thanks for pointing this one out. 

While we are on these code lines, whats the typical kernel variable name
for a loop counter that is going to be counted down? 'left',
'remaining', 'to_go', 'still'???

> >  
> > -	trace_get_random_bytes_arch(nbytes, _RET_IP_);
> > -	while (nbytes) {
> > +	trace_get_random_bytes_arch(left, _RET_IP_);
> 
> Nothing to do with this patch series, but I wonder if we should move
> the trace event below, and record how much was done.

I don't fully understand trace events, I just left this line in tact
and hoped for the best :(

/me adds 'trace events' to list of things to learn more about

> > +	while (left) {
> >  		unsigned long v;
> > -		int chunk = min(nbytes, (int)sizeof(unsigned long));
> > +		int chunk = min_t(int, left, (int)sizeof(unsigned long));
> >  
> >  		if (!arch_get_random_long(&v))
> >  			break;
> >  
> >  		memcpy(p, &v, chunk);
> >  		p += chunk;
> > -		nbytes -= chunk;
> > +		left -= chunk;
> >  	}
> >  
> > -	if (nbytes)
> > -		get_random_bytes(p, nbytes);
> > +	return nbytes - left;
> >  }
> >  EXPORT_SYMBOL(get_random_bytes_arch);
> >  
> > diff --git a/include/linux/random.h b/include/linux/random.h
> > index 2ddf13b4281e..f1c9bc5cd231 100644
> > --- a/include/linux/random.h
> > +++ b/include/linux/random.h
> > @@ -38,7 +38,7 @@ extern void get_random_bytes(void *buf, int nbytes);
> >  extern int wait_for_random_bytes(void);
> >  extern int add_random_ready_callback(struct random_ready_callback *rdy);
> >  extern void del_random_ready_callback(struct random_ready_callback *rdy);
> > -extern void get_random_bytes_arch(void *buf, int nbytes);
> > +extern int __must_check get_random_bytes_arch(void *buf, int nbytes);
> >  
> >  #ifndef MODULE
> >  extern const struct file_operations random_fops, urandom_fops;
> 
> Other than that...
> 
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

Thanks for the review Steve, will spin again.


	Tobin.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] random: Return nbytes filled from hw RNG
  2018-05-15 21:17     ` Tobin C. Harding
@ 2018-05-15 21:35       ` Steven Rostedt
  2018-05-15 22:26         ` Tobin C. Harding
  0 siblings, 1 reply; 10+ messages in thread
From: Steven Rostedt @ 2018-05-15 21:35 UTC (permalink / raw)
  To: Tobin C. Harding
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Wed, 16 May 2018 07:17:06 +1000
"Tobin C. Harding" <me@tobin.cc> wrote:

> > > -void get_random_bytes_arch(void *buf, int nbytes)
> > > +int __must_check get_random_bytes_arch(void *buf, int nbytes)
> > >  {
> > >  	char *p = buf;
> > > +	int left = nbytes;  
> > 
> > Just a nit, but I know some kernel devs prefer "upside-down-xmas-tree"
> > style of declarations. Which would make the above:
> > 
> > 	int left = nbytes;
> > 	char *p = buf;  
> 
> Super specific coding style and rigorous code cleanliness is a big part
> of why I love kernel dev.  Thanks for pointing this one out. 

It's a relatively new form, but I like it. It makes the code look "less
messy" ;-)  Some devs don't care, others do. This file already breaks
it, so it really is up to you. Like I said, it's "just a nit", not
really important.

> 
> While we are on these code lines, whats the typical kernel variable name
> for a loop counter that is going to be counted down? 'left',
> 'remaining', 'to_go', 'still'???

"left" looks good to me.

> 
> > >  
> > > -	trace_get_random_bytes_arch(nbytes, _RET_IP_);
> > > -	while (nbytes) {
> > > +	trace_get_random_bytes_arch(left, _RET_IP_);  
> > 
> > Nothing to do with this patch series, but I wonder if we should move
> > the trace event below, and record how much was done.  
> 
> I don't fully understand trace events, I just left this line in tact
> and hoped for the best :(

Your patch is fine. This could be something to add after your series.

> 
> /me adds 'trace events' to list of things to learn more about

Just look at /sys/kernel/debug/tracing/events

Or read Documentation/trace/ftrace.{rst,txt}.


-- Steve

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] random: Return nbytes filled from hw RNG
  2018-05-15 21:35       ` Steven Rostedt
@ 2018-05-15 22:26         ` Tobin C. Harding
  0 siblings, 0 replies; 10+ messages in thread
From: Tobin C. Harding @ 2018-05-15 22:26 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Theodore Ts'o, Linus Torvalds, Randy Dunlap, Kees Cook,
	Anna-Maria Gleixner, Andrew Morton, Greg Kroah-Hartman,
	Arnd Bergmann, linux-kernel

On Tue, May 15, 2018 at 05:35:46PM -0400, Steven Rostedt wrote:
> On Wed, 16 May 2018 07:17:06 +1000
> "Tobin C. Harding" <me@tobin.cc> wrote:
> 
> > > > -void get_random_bytes_arch(void *buf, int nbytes)
> > > > +int __must_check get_random_bytes_arch(void *buf, int nbytes)
> > > >  {
> > > >  	char *p = buf;
> > > > +	int left = nbytes;  
> > > 
> > > Just a nit, but I know some kernel devs prefer "upside-down-xmas-tree"
> > > style of declarations. Which would make the above:
> > > 
> > > 	int left = nbytes;
> > > 	char *p = buf;  
> > 
> > Super specific coding style and rigorous code cleanliness is a big part
> > of why I love kernel dev.  Thanks for pointing this one out. 
> 
> It's a relatively new form, but I like it. It makes the code look "less
> messy" ;-)  Some devs don't care, others do. This file already breaks
> it, so it really is up to you. Like I said, it's "just a nit", not
> really important.
> 
> > 
> > While we are on these code lines, whats the typical kernel variable name
> > for a loop counter that is going to be counted down? 'left',
> > 'remaining', 'to_go', 'still'???
> 
> "left" looks good to me.
> 
> > 
> > > >  
> > > > -	trace_get_random_bytes_arch(nbytes, _RET_IP_);
> > > > -	while (nbytes) {
> > > > +	trace_get_random_bytes_arch(left, _RET_IP_);  
> > > 
> > > Nothing to do with this patch series, but I wonder if we should move
> > > the trace event below, and record how much was done.  
> > 
> > I don't fully understand trace events, I just left this line in tact
> > and hoped for the best :(
> 
> Your patch is fine. This could be something to add after your series.
> 
> > 
> > /me adds 'trace events' to list of things to learn more about
> 
> Just look at /sys/kernel/debug/tracing/events
> 
> Or read Documentation/trace/ftrace.{rst,txt}.

Awesome, cheers.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-05-15 22:26 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-15  3:06 [PATCH v4 0/3] enable early printing of hashed pointers Tobin C. Harding
2018-05-15  3:06 ` [PATCH v4 1/3] random: Fix whitespace pre random-bytes work Tobin C. Harding
2018-05-15  3:06 ` [PATCH v4 2/3] random: Return nbytes filled from hw RNG Tobin C. Harding
2018-05-15 13:37   ` Steven Rostedt
2018-05-15 21:17     ` Tobin C. Harding
2018-05-15 21:35       ` Steven Rostedt
2018-05-15 22:26         ` Tobin C. Harding
2018-05-15  3:06 ` [PATCH v4 3/3] vsprintf: Use hw RNG for ptr_key Tobin C. Harding
2018-05-15 13:47   ` Steven Rostedt
2018-05-15 21:09     ` Tobin C. Harding

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).