From: Song Liu <song@kernel.org> To: Christy Lee <christylee@fb.com> Cc: Dan Carpenter <dan.carpenter@oracle.com>, Alexei Starovoitov <ast@kernel.org>, kbuild-all@lists.01.org, kbuild@lists.01.org, Linux-MM <linux-mm@kvack.org>, bpf <bpf@vger.kernel.org>, Kernel Team <kernel-team@fb.com>, christyc.y.lee@gmail.com, kernel test robot <lkp@intel.com> Subject: Re: [PATCH bpf-next] Fix incorrect integer literal used for marking scratched registers in verifier logs Date: Mon, 10 Jan 2022 13:52:18 -0800 [thread overview] Message-ID: <CAPhsuW5FQTLfs4P4GqMKxsakP82KuPGOrEcqX+zvAH1+VLf7aQ@mail.gmail.com> (raw) In-Reply-To: <20220108005854.658596-1-christylee@fb.com> On Fri, Jan 7, 2022 at 4:59 PM Christy Lee <christylee@fb.com> wrote: > > env->scratched_stack_slots is a 64-bit value, we should use ULL > instead of UL literal values. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Christy Lee <christylee@fb.com> The fix looks good to me. Thus: Acked-by: Song Liu <songliubraving@fb.com> However, the patch looks corrupted. Also, the subject is probably too long (./scripts/checkpatch.pl should complain about it). Thanks, Song > --- > kernel/bpf/verifier.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > index bfb45381fb3f..a8587210907d 100644 > --- a/kernel/bpf/verifier.c > +++ b/kernel/bpf/verifier.c > @@ -616,7 +616,7 @@ static void mark_reg_scratched(struct bpf_verifier_env *env, u32 regno) > > static void mark_stack_slot_scratched(struct bpf_verifier_env *env, u32 spi) > { > - env->scratched_stack_slots |= 1UL << spi; > + env->scratched_stack_slots |= 1ULL << spi; > } > > static bool reg_scratched(const struct bpf_verifier_env *env, u32 regno) > @@ -637,14 +637,14 @@ static bool verifier_state_scratched(const struct bpf_verifier_env *env) > static void mark_verifier_state_clean(struct bpf_verifier_env *env) > { > env->scratched_regs = 0U; > - env->scratched_stack_slots = 0UL; > + env->scratched_stack_slots = 0ULL; > } > > /* Used for printing the entire verifier state. */ > static void mark_verifier_state_scratched(struct bpf_verifier_env *env) > { > env->scratched_regs = ~0U; > - env->scratched_stack_slots = ~0UL; > + env->scratched_stack_slots = ~0ULL; > } > > /* The reg state of a pointer or a bounded scalar was saved when > -- > 2.30.2 >
WARNING: multiple messages have this Message-ID (diff)
From: Song Liu <song@kernel.org> To: kbuild-all@lists.01.org Subject: Re: [PATCH bpf-next] Fix incorrect integer literal used for marking scratched registers in verifier logs Date: Mon, 10 Jan 2022 13:52:18 -0800 [thread overview] Message-ID: <CAPhsuW5FQTLfs4P4GqMKxsakP82KuPGOrEcqX+zvAH1+VLf7aQ@mail.gmail.com> (raw) In-Reply-To: <20220108005854.658596-1-christylee@fb.com> [-- Attachment #1: Type: text/plain, Size: 1887 bytes --] On Fri, Jan 7, 2022 at 4:59 PM Christy Lee <christylee@fb.com> wrote: > > env->scratched_stack_slots is a 64-bit value, we should use ULL > instead of UL literal values. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Christy Lee <christylee@fb.com> The fix looks good to me. Thus: Acked-by: Song Liu <songliubraving@fb.com> However, the patch looks corrupted. Also, the subject is probably too long (./scripts/checkpatch.pl should complain about it). Thanks, Song > --- > kernel/bpf/verifier.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > index bfb45381fb3f..a8587210907d 100644 > --- a/kernel/bpf/verifier.c > +++ b/kernel/bpf/verifier.c > @@ -616,7 +616,7 @@ static void mark_reg_scratched(struct bpf_verifier_env *env, u32 regno) > > static void mark_stack_slot_scratched(struct bpf_verifier_env *env, u32 spi) > { > - env->scratched_stack_slots |= 1UL << spi; > + env->scratched_stack_slots |= 1ULL << spi; > } > > static bool reg_scratched(const struct bpf_verifier_env *env, u32 regno) > @@ -637,14 +637,14 @@ static bool verifier_state_scratched(const struct bpf_verifier_env *env) > static void mark_verifier_state_clean(struct bpf_verifier_env *env) > { > env->scratched_regs = 0U; > - env->scratched_stack_slots = 0UL; > + env->scratched_stack_slots = 0ULL; > } > > /* Used for printing the entire verifier state. */ > static void mark_verifier_state_scratched(struct bpf_verifier_env *env) > { > env->scratched_regs = ~0U; > - env->scratched_stack_slots = ~0UL; > + env->scratched_stack_slots = ~0ULL; > } > > /* The reg state of a pointer or a bounded scalar was saved when > -- > 2.30.2 >
next prev parent reply other threads:[~2022-01-10 21:52 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-06 0:09 [linux-next:master 7391/10864] kernel/bpf/verifier.c:619 mark_stack_slot_scratched() warn: should '1 << spi' be a 64 bit type? kernel test robot 2022-01-07 8:20 ` Dan Carpenter 2022-01-07 8:20 ` Dan Carpenter 2022-01-08 0:58 ` [PATCH bpf-next] Fix incorrect integer literal used for marking scratched registers in verifier logs Christy Lee 2022-01-08 0:58 ` Christy Lee 2022-01-10 21:52 ` Song Liu [this message] 2022-01-10 21:52 ` Song Liu 2022-01-10 22:12 ` Christy Lee 2022-01-10 22:12 ` Christy Lee 2022-01-10 22:25 ` Song Liu 2022-01-10 22:25 ` Song Liu 2022-01-11 9:48 ` Dan Carpenter 2022-01-11 9:48 ` Dan Carpenter 2022-01-11 9:48 ` Dan Carpenter 2022-01-11 17:56 ` Alexei Starovoitov 2022-01-11 17:56 ` Alexei Starovoitov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAPhsuW5FQTLfs4P4GqMKxsakP82KuPGOrEcqX+zvAH1+VLf7aQ@mail.gmail.com \ --to=song@kernel.org \ --cc=ast@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=christyc.y.lee@gmail.com \ --cc=christylee@fb.com \ --cc=dan.carpenter@oracle.com \ --cc=kbuild-all@lists.01.org \ --cc=kbuild@lists.01.org \ --cc=kernel-team@fb.com \ --cc=linux-mm@kvack.org \ --cc=lkp@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.