linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND] drivers/perf: arm_pmu: avoid CPU device_node reference leak
Date: Thu, 15 Oct 2015 14:18:39 +0100	[thread overview]
Message-ID: <20151015131839.GC29301@arm.com> (raw)
In-Reply-To: <1444657719-3801-1-git-send-email-will.deacon@arm.com>

On Mon, Oct 12, 2015 at 02:48:39PM +0100, Will Deacon wrote:
> of_cpu_device_node_get increments the reference count on the CPU
> device_node, so we must take care to of_node_put once we've finished
> with it.
> 
> This patch fixes the perf IRQ probing code to avoid the leak.
> 
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> 
> Arnd/Olof: Please can you take this via arm-soc? It's a non-urgent, yet
>            simple fix and I don't have any other fixes queued for perf.

Ping? I can't see this queued in arm-soc and I'm away next week, so just
following up while I can.

Will

>  drivers/perf/arm_pmu.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
> index 2365a32a595e..be3755c973e9 100644
> --- a/drivers/perf/arm_pmu.c
> +++ b/drivers/perf/arm_pmu.c
> @@ -823,9 +823,15 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
>  		}
>  
>  		/* Now look up the logical CPU number */
> -		for_each_possible_cpu(cpu)
> -			if (dn == of_cpu_device_node_get(cpu))
> +		for_each_possible_cpu(cpu) {
> +			struct device_node *cpu_dn;
> +
> +			cpu_dn = of_cpu_device_node_get(cpu);
> +			of_node_put(cpu_dn);
> +
> +			if (dn == cpu_dn)
>  				break;
> +		}
>  
>  		if (cpu >= nr_cpu_ids) {
>  			pr_warn("Failed to find logical CPU for %s\n",
> -- 
> 2.1.4
> 

  reply	other threads:[~2015-10-15 13:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12 13:48 [PATCH RESEND] drivers/perf: arm_pmu: avoid CPU device_node reference leak Will Deacon
2015-10-15 13:18 ` Will Deacon [this message]
2015-10-15 15:12 ` Arnd Bergmann

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=20151015131839.GC29301@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).