bpf: replace redundant |= operation with assignmen

[PATCH][next] bpf: replace redundant |= operation with assignmen

Posted by Colin Ian King 1 year, 3 months ago

The operation msk |= ~0ULL contains a redundant bit-wise or operation
since all the bits are going to be set to 1, so replace this with
an assignment since this is more optimal and probably clearer too.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 kernel/bpf/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 9aaf5124648b..fea07e12601f 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -914,7 +914,7 @@ static int bpf_parse_param(struct fs_context *fc, struct fs_parameter *param)
 		str = param->string;
 		while ((p = strsep(&str, ":"))) {
 			if (strcmp(p, "any") == 0) {
-				msk |= ~0ULL;
+				msk = ~0ULL;
 			} else if (find_btf_enum_const(info.btf, enum_t, enum_pfx, p, &val)) {
 				msk |= 1ULL << val;
 			} else {
-- 
2.39.5

Re: [PATCH][next] bpf: replace redundant |= operation with assignmen

Posted by Christian Heusel 1 year, 3 months ago

On 24/10/31 01:07PM, Colin Ian King wrote:
> The operation msk |= ~0ULL contains a redundant bit-wise or operation
> since all the bits are going to be set to 1, so replace this with
> an assignment since this is more optimal and probably clearer too.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  kernel/bpf/inode.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
> index 9aaf5124648b..fea07e12601f 100644
> --- a/kernel/bpf/inode.c
> +++ b/kernel/bpf/inode.c
> @@ -914,7 +914,7 @@ static int bpf_parse_param(struct fs_context *fc, struct fs_parameter *param)
>  		str = param->string;
>  		while ((p = strsep(&str, ":"))) {
>  			if (strcmp(p, "any") == 0) {
> -				msk |= ~0ULL;
> +				msk = ~0ULL;
>  			} else if (find_btf_enum_const(info.btf, enum_t, enum_pfx, p, &val)) {
>  				msk |= 1ULL << val;
>  			} else {
> -- 
> 2.39.5

The patch subject contains a typo ("assignmen" should be "assignment"),
but maybe this can just be fixed on apply ..

Cheers,
Chris

Re: [PATCH][next] bpf: replace redundant |= operation with assignmen

Posted by Andrii Nakryiko 1 year, 3 months ago

On Thu, Oct 31, 2024 at 6:07 AM Colin Ian King <colin.i.king@gmail.com> wrote:
>
> The operation msk |= ~0ULL contains a redundant bit-wise or operation
> since all the bits are going to be set to 1, so replace this with
> an assignment since this is more optimal and probably clearer too.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  kernel/bpf/inode.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
> index 9aaf5124648b..fea07e12601f 100644
> --- a/kernel/bpf/inode.c
> +++ b/kernel/bpf/inode.c
> @@ -914,7 +914,7 @@ static int bpf_parse_param(struct fs_context *fc, struct fs_parameter *param)
>                 str = param->string;
>                 while ((p = strsep(&str, ":"))) {
>                         if (strcmp(p, "any") == 0) {
> -                               msk |= ~0ULL;
> +                               msk = ~0ULL;

This was done for consistency with the other branch. Is there anything
wrong with this code? Doesn't seem so, so I'd like to keep it as is.

pw-bot: cr

>                         } else if (find_btf_enum_const(info.btf, enum_t, enum_pfx, p, &val)) {
>                                 msk |= 1ULL << val;
>                         } else {
> --
> 2.39.5
>