mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Donnellan <ajd@linux.ibm.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	Frederic Barrat <fbarrat@linux.ibm.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 1/2] cxl: Use the bitmap API to allocate bitmaps
Date: Wed, 13 Jul 2022 02:42:57 +1000	[thread overview]
Message-ID: <44d580dab2836bbb8679067b25c8702447c498e2.camel@linux.ibm.com> (raw)
In-Reply-To: <59010cc7c62443030c69cb1ce0b2b62c5d47e064.1657566849.git.christophe.jaillet@wanadoo.fr>

On Mon, 2022-07-11 at 21:14 +0200, Christophe JAILLET wrote:
> Use bitmap_zalloc()/bitmap_free() instead of hand-writing them.
> 
> It is less verbose and it improves the semantic.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Thanks!

Acked-by: Andrew Donnellan <ajd@linux.ibm.com>

> ---
>  drivers/misc/cxl/context.c | 2 +-
>  drivers/misc/cxl/guest.c   | 2 +-
>  drivers/misc/cxl/irq.c     | 3 +--
>  drivers/misc/cxl/of.c      | 5 ++---
>  4 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
> index e627b4056623..acaa44809c58 100644
> --- a/drivers/misc/cxl/context.c
> +++ b/drivers/misc/cxl/context.c
> @@ -331,7 +331,7 @@ static void reclaim_ctx(struct rcu_head *rcu)
>                 __free_page(ctx->ff_page);
>         ctx->sstp = NULL;
>  
> -       kfree(ctx->irq_bitmap);
> +       bitmap_free(ctx->irq_bitmap);
>  
>         /* Drop ref to the afu device taken during cxl_context_init
> */
>         cxl_afu_put(ctx->afu);
> diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
> index 3321c014913c..375f692ae9d6 100644
> --- a/drivers/misc/cxl/guest.c
> +++ b/drivers/misc/cxl/guest.c
> @@ -1053,7 +1053,7 @@ static void free_adapter(struct cxl *adapter)
>                 if (adapter->guest->irq_avail) {
>                         for (i = 0; i < adapter->guest->irq_nranges;
> i++) {
>                                 cur = &adapter->guest->irq_avail[i];
> -                               kfree(cur->bitmap);
> +                               bitmap_free(cur->bitmap);
>                         }
>                         kfree(adapter->guest->irq_avail);
>                 }
> diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
> index 5f0e2dcebb34..0ce91d99aead 100644
> --- a/drivers/misc/cxl/irq.c
> +++ b/drivers/misc/cxl/irq.c
> @@ -319,8 +319,7 @@ int afu_allocate_irqs(struct cxl_context *ctx,
> u32 count)
>         }
>  
>         ctx->irq_count = count;
> -       ctx->irq_bitmap = kcalloc(BITS_TO_LONGS(count),
> -                                 sizeof(*ctx->irq_bitmap),
> GFP_KERNEL);
> +       ctx->irq_bitmap = bitmap_zalloc(count, GFP_KERNEL);
>         if (!ctx->irq_bitmap)
>                 goto out;
>  
> diff --git a/drivers/misc/cxl/of.c b/drivers/misc/cxl/of.c
> index 1cfecba42d01..25ce725035e7 100644
> --- a/drivers/misc/cxl/of.c
> +++ b/drivers/misc/cxl/of.c
> @@ -308,8 +308,7 @@ static int read_adapter_irq_config(struct cxl
> *adapter, struct device_node *np)
>                 cur = &adapter->guest->irq_avail[i];
>                 cur->offset = be32_to_cpu(ranges[i * 2]);
>                 cur->range  = be32_to_cpu(ranges[i * 2 + 1]);
> -               cur->bitmap = kcalloc(BITS_TO_LONGS(cur->range),
> -                               sizeof(*cur->bitmap), GFP_KERNEL);
> +               cur->bitmap = bitmap_zalloc(cur->range, GFP_KERNEL);
>                 if (cur->bitmap == NULL)
>                         goto err;
>                 if (cur->offset < adapter->guest->irq_base_offset)
> @@ -326,7 +325,7 @@ static int read_adapter_irq_config(struct cxl
> *adapter, struct device_node *np)
>  err:
>         for (i--; i >= 0; i--) {
>                 cur = &adapter->guest->irq_avail[i];
> -               kfree(cur->bitmap);
> +               bitmap_free(cur->bitmap);
>         }
>         kfree(adapter->guest->irq_avail);
>         adapter->guest->irq_avail = NULL;



      parent reply	other threads:[~2022-07-12 16:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-11 19:14 Christophe JAILLET
2022-07-11 19:14 ` [PATCH 2/2] cxl: Fix a memory leak in an error handling path Christophe JAILLET
2022-07-12 16:46   ` Andrew Donnellan
2022-07-12 16:42 ` Andrew Donnellan [this message]

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=44d580dab2836bbb8679067b25c8702447c498e2.camel@linux.ibm.com \
    --to=ajd@linux.ibm.com \
    --cc=arnd@arndb.de \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=fbarrat@linux.ibm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®