2023-04-20 19:41:38

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH v2] sh: sq: Use the bitmap API when applicable

Using the bitmap API is less verbose than hand writing it.
It also improves the semantic.

Signed-off-by: Christophe JAILLET <[email protected]>
---
v2:
- synch with latest linux-next because of 80f746e2bd0e which fixes a bug
---
arch/sh/kernel/cpu/sh4/sq.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 27f2e3da5aa2..d289e99dc118 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -372,7 +372,6 @@ static struct subsys_interface sq_interface = {
static int __init sq_api_init(void)
{
unsigned int nr_pages = 0x04000000 >> PAGE_SHIFT;
- unsigned int size = (nr_pages + (BITS_PER_LONG - 1)) / BITS_PER_LONG;
int ret = -ENOMEM;

printk(KERN_NOTICE "sq: Registering store queue API.\n");
@@ -382,7 +381,7 @@ static int __init sq_api_init(void)
if (unlikely(!sq_cache))
return ret;

- sq_bitmap = kcalloc(size, sizeof(long), GFP_KERNEL);
+ sq_bitmap = bitmap_zalloc(nr_pages, GFP_KERNEL);
if (unlikely(!sq_bitmap))
goto out;

@@ -393,7 +392,7 @@ static int __init sq_api_init(void)
return 0;

out:
- kfree(sq_bitmap);
+ bitmap_free(sq_bitmap);
kmem_cache_destroy(sq_cache);

return ret;
@@ -402,7 +401,7 @@ static int __init sq_api_init(void)
static void __exit sq_api_exit(void)
{
subsys_interface_unregister(&sq_interface);
- kfree(sq_bitmap);
+ bitmap_free(sq_bitmap);
kmem_cache_destroy(sq_cache);
}

--
2.34.1


2023-04-21 07:32:32

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH v2] sh: sq: Use the bitmap API when applicable

On Thu, Apr 20, 2023 at 9:41 PM Christophe JAILLET
<[email protected]> wrote:
> Using the bitmap API is less verbose than hand writing it.
> It also improves the semantic.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> v2:
> - synch with latest linux-next because of 80f746e2bd0e which fixes a bug

Reviewed-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Subject: Re: [PATCH v2] sh: sq: Use the bitmap API when applicable

On Thu, 2023-04-20 at 21:19 +0200, Christophe JAILLET wrote:
> Using the bitmap API is less verbose than hand writing it.
> It also improves the semantic.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> v2:
> - synch with latest linux-next because of 80f746e2bd0e which fixes a bug
> ---
> arch/sh/kernel/cpu/sh4/sq.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
> index 27f2e3da5aa2..d289e99dc118 100644
> --- a/arch/sh/kernel/cpu/sh4/sq.c
> +++ b/arch/sh/kernel/cpu/sh4/sq.c
> @@ -372,7 +372,6 @@ static struct subsys_interface sq_interface = {
> static int __init sq_api_init(void)
> {
> unsigned int nr_pages = 0x04000000 >> PAGE_SHIFT;
> - unsigned int size = (nr_pages + (BITS_PER_LONG - 1)) / BITS_PER_LONG;
> int ret = -ENOMEM;
>
> printk(KERN_NOTICE "sq: Registering store queue API.\n");
> @@ -382,7 +381,7 @@ static int __init sq_api_init(void)
> if (unlikely(!sq_cache))
> return ret;
>
> - sq_bitmap = kcalloc(size, sizeof(long), GFP_KERNEL);
> + sq_bitmap = bitmap_zalloc(nr_pages, GFP_KERNEL);
> if (unlikely(!sq_bitmap))
> goto out;
>
> @@ -393,7 +392,7 @@ static int __init sq_api_init(void)
> return 0;
>
> out:
> - kfree(sq_bitmap);
> + bitmap_free(sq_bitmap);
> kmem_cache_destroy(sq_cache);
>
> return ret;
> @@ -402,7 +401,7 @@ static int __init sq_api_init(void)
> static void __exit sq_api_exit(void)
> {
> subsys_interface_unregister(&sq_interface);
> - kfree(sq_bitmap);
> + bitmap_free(sq_bitmap);
> kmem_cache_destroy(sq_cache);
> }
>

Reviewed-by: John Paul Adrian Glaubitz <[email protected]>

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913

Subject: Re: [PATCH v2] sh: sq: Use the bitmap API when applicable

On Thu, 2023-04-20 at 21:19 +0200, Christophe JAILLET wrote:
> Using the bitmap API is less verbose than hand writing it.
> It also improves the semantic.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> v2:
> - synch with latest linux-next because of 80f746e2bd0e which fixes a bug
> ---
> arch/sh/kernel/cpu/sh4/sq.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
> index 27f2e3da5aa2..d289e99dc118 100644
> --- a/arch/sh/kernel/cpu/sh4/sq.c
> +++ b/arch/sh/kernel/cpu/sh4/sq.c
> @@ -372,7 +372,6 @@ static struct subsys_interface sq_interface = {
> static int __init sq_api_init(void)
> {
> unsigned int nr_pages = 0x04000000 >> PAGE_SHIFT;
> - unsigned int size = (nr_pages + (BITS_PER_LONG - 1)) / BITS_PER_LONG;
> int ret = -ENOMEM;
>
> printk(KERN_NOTICE "sq: Registering store queue API.\n");
> @@ -382,7 +381,7 @@ static int __init sq_api_init(void)
> if (unlikely(!sq_cache))
> return ret;
>
> - sq_bitmap = kcalloc(size, sizeof(long), GFP_KERNEL);
> + sq_bitmap = bitmap_zalloc(nr_pages, GFP_KERNEL);
> if (unlikely(!sq_bitmap))
> goto out;
>
> @@ -393,7 +392,7 @@ static int __init sq_api_init(void)
> return 0;
>
> out:
> - kfree(sq_bitmap);
> + bitmap_free(sq_bitmap);
> kmem_cache_destroy(sq_cache);
>
> return ret;
> @@ -402,7 +401,7 @@ static int __init sq_api_init(void)
> static void __exit sq_api_exit(void)
> {
> subsys_interface_unregister(&sq_interface);
> - kfree(sq_bitmap);
> + bitmap_free(sq_bitmap);
> kmem_cache_destroy(sq_cache);
> }
>

Applied to my for-next branch for 6.4.

Thanks,
Adrian

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913