From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755394AbcIZXwL (ORCPT ); Mon, 26 Sep 2016 19:52:11 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35565 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751497AbcIZXwE (ORCPT ); Mon, 26 Sep 2016 19:52:04 -0400 Date: Mon, 26 Sep 2016 16:51:59 -0700 From: Alexei Starovoitov To: Shaohua Li Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Tejun Heo , Alexei Starovoitov , Daniel Borkmann Subject: Re: [PATCH trival 1/2] bpf: clean up put_cpu_var usage Message-ID: <20160926235157.GB58431@ast-mbp.thefacebook.com> References: <1474c666552accf475fc809b3525892e1ae88bfa.1474912742.git.shli@fb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1474c666552accf475fc809b3525892e1ae88bfa.1474912742.git.shli@fb.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 26, 2016 at 11:14:50AM -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 > Cc: Alexei Starovoitov > Signed-off-by: Shaohua Li Looks good. Nice catch. Please rebase to net-next tree and send it to netdev list. Otherwise we'll have conflicts at the time of the merge window. > --- > 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 03fd23d..b73913b 100644 > --- a/kernel/bpf/core.c > +++ b/kernel/bpf/core.c > @@ -1031,7 +1031,7 @@ u64 bpf_user_rnd_u32(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) > > 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 >