[PATCH trival -resend 1/2] bpf: clean up put_cpu_var usage

Subsystems: bpf [core], bpf [general] (safe dynamic programs and tools), the rest

STALE3673d

7 messages, 4 authors, 2016-09-28 · open the first message on its own page

[PATCH trival -resend 1/2] bpf: clean up put_cpu_var usage

From: Shaohua Li <hidden>
Date: 2016-09-27 15:43:06

put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Shaohua Li <redacted>
---
 kernel/bpf/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 7b7baae..aa6d981 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -1031,7 +1031,7 @@ BPF_CALL_0(bpf_user_rnd_u32)
 
 	state = &get_cpu_var(bpf_user_rnd_state);
 	res = prandom_u32_state(state);
-	put_cpu_var(state);
+	put_cpu_var(bpf_user_rnd_state);
 
 	return res;
 }
-- 
2.9.3

[PATCH trival -resend 2/2] lib: clean up put_cpu_var usage

From: Shaohua Li <hidden>
Date: 2016-09-27 15:42:52

put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Shaohua Li <redacted>
---
 lib/random32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/random32.c b/lib/random32.c
index a309235..fa594b1 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -81,7 +81,7 @@ u32 prandom_u32(void)
 	u32 res;
 
 	res = prandom_u32_state(state);
-	put_cpu_var(state);
+	put_cpu_var(net_rand_state);
 
 	return res;
 }
@@ -128,7 +128,7 @@ void prandom_bytes(void *buf, size_t bytes)
 	struct rnd_state *state = &get_cpu_var(net_rand_state);
 
 	prandom_bytes_state(state, buf, bytes);
-	put_cpu_var(state);
+	put_cpu_var(net_rand_state);
 }
 EXPORT_SYMBOL(prandom_bytes);
 
-- 
2.9.3

Re: [PATCH trival -resend 1/2] bpf: clean up put_cpu_var usage

From: Alexei Starovoitov <hidden>
Date: 2016-09-27 23:04:43

On Tue, Sep 27, 2016 at 08:42:41AM -0700, Shaohua Li wrote:
put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Shaohua Li <redacted>
Acked-by: Alexei Starovoitov <ast@kernel.org>

Re: [PATCH trival -resend 1/2] bpf: clean up put_cpu_var usage

From: Tejun Heo <tj@kernel.org>
Date: 2016-09-27 23:15:39

On Tue, Sep 27, 2016 at 08:42:41AM -0700, Shaohua Li wrote:
put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Shaohua Li <redacted>
Acked-by: Tejun Heo <tj@kernel.org>

Thanks.

-- 
tejun

Re: [PATCH trival -resend 2/2] lib: clean up put_cpu_var usage

From: Tejun Heo <tj@kernel.org>
Date: 2016-09-27 23:16:26

On Tue, Sep 27, 2016 at 08:42:42AM -0700, Shaohua Li wrote:
put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Shaohua Li <redacted>
Acked-by: Tejun Heo <tj@kernel.org>

Thanks.

-- 
tejun

Re: [PATCH trival -resend 1/2] bpf: clean up put_cpu_var usage

From: David Miller <davem@davemloft.net>
Date: 2016-09-28 02:10:39

From: Shaohua Li <redacted>
Date: Tue, 27 Sep 2016 08:42:41 -0700
put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Shaohua Li <redacted>
Applied.

Re: [PATCH trival -resend 2/2] lib: clean up put_cpu_var usage

From: David Miller <davem@davemloft.net>
Date: 2016-09-28 02:10:43

From: Shaohua Li <redacted>
Date: Tue, 27 Sep 2016 08:42:42 -0700
put_cpu_var takes the percpu data, not the data returned from
get_cpu_var.

This doesn't change the behavior.

Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Shaohua Li <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help