LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Michael Ellerman <michael@ellerman.id.au>
To: Carl Love <cel@us.ibm.com>
Cc: Hannsj_uhl <Hannsj_uhl@de.ibm.com>,
	acjohnso <acjohnso@us.ibm.com>,
	oprofile-list@lists.sourceforge.net, linuxppc-dev@ozlabs.org,
	cel@linux.vnet.ibm.com, cbe-oss-dev@ozlabs.org,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [UDATED PATCH] Cell OProfile: Incorrect local array size in activate spu profiling function
Date: Wed, 29 Oct 2008 11:51:54 +1100	[thread overview]
Message-ID: <1225241514.7799.2.camel@localhost> (raw)
In-Reply-To: <1225207079.20229.32.camel@carll-linux-desktop>

[-- Attachment #1: Type: text/plain, Size: 2572 bytes --]

On Tue, 2008-10-28 at 08:17 -0700, Carl Love wrote:
> Updated the patch to address comments by Michael Ellerman.  
> Specifically, changed upper limit in for loop to 
> ARRAY_SIZE() macro and added a check to make sure the 
> number of events specified by the user, which is used as
> the max for indexing various arrays, is no bigger then the
> declared size of the arrays.
> 
> The size of the pm_signal_local array should be equal to the
> number of SPUs being configured in the array.  Currently, the
> array is of size 4 (NR_PHYS_CTRS) but being indexed by a for 
> loop from 0 to 7 (NUM_SPUS_PER_NODE).  
> 
> Signed-off-by: Carl Love <carll@us.ibm.com>
> 
> 
> Index: Cell_kernel_10_24_2008/arch/powerpc/oprofile/op_model_cell.c
> ===================================================================
> --- Cell_kernel_10_24_2008.orig/arch/powerpc/oprofile/op_model_cell.c
> +++ Cell_kernel_10_24_2008/arch/powerpc/oprofile/op_model_cell.c
> @@ -582,6 +582,13 @@ static int cell_reg_setup(struct op_coun
>  
>  	num_counters = num_ctrs;
>  
> +	if (unlikely(num_ctrs > NR_PHYS_CTRS)) {
> +		printk(KERN_ERR
> +		       "%s: Oprofile, number of specified events " \
> +		       "exceeds number of physical counters\n",
> +		       __func__);
> +		return -EIO;
> +	}

I wouldn't bother with the unlikely, but whatever, looks good.

>  	pm_regs.group_control = 0;
>  	pm_regs.debug_bus_control = 0;
>  
> @@ -830,13 +837,13 @@ static int calculate_lfsr(int n)
>  static int pm_rtas_activate_spu_profiling(u32 node)
>  {
>  	int ret, i;
> -	struct pm_signal pm_signal_local[NR_PHYS_CTRS];
> +	struct pm_signal pm_signal_local[NUM_SPUS_PER_NODE];
>  
>  	/*
>  	 * Set up the rtas call to configure the debug bus to
>  	 * route the SPU PCs.  Setup the pm_signal for each SPU
>  	 */
> -	for (i = 0; i < NUM_SPUS_PER_NODE; i++) {
> +	for (i = 0; i < ARRAY_SIZE(pm_signal_local); i++) {
>  		pm_signal_local[i].cpu = node;
>  		pm_signal_local[i].signal_group = 41;
>  		/* spu i on word (i/2) */

Looks good, but ..

You should patch the call to rtas_ibm_cbe_perftools() as well, like:

        ret = rtas_ibm_cbe_perftools(SUBFUNC_ACTIVATE,
                                     PASSTHRU_ENABLE, pm_signal_local,
				     sizeof(pm_signal_local));


cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2008-10-29  0:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-24 18:47 [Cbe-oss-dev] [PATCH] " Carl Love
2008-10-25  4:39 ` Michael Ellerman
2008-10-28 15:17   ` [UDATED PATCH] " Carl Love
2008-10-29  0:51     ` Michael Ellerman [this message]
2008-10-29 15:06       ` [UPDATED PATCH VER2] " Carl Love
2008-10-31 15:14         ` Robert Richter
2008-10-27 18:26 ` [Cbe-oss-dev] [PATCH] " Robert Richter

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=1225241514.7799.2.camel@localhost \
    --to=michael@ellerman.id.au \
    --cc=Hannsj_uhl@de.ibm.com \
    --cc=acjohnso@us.ibm.com \
    --cc=cbe-oss-dev@ozlabs.org \
    --cc=cel@linux.vnet.ibm.com \
    --cc=cel@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=oprofile-list@lists.sourceforge.net \
    --subject='Re: [UDATED PATCH] Cell OProfile: Incorrect local array size in activate spu profiling function' \
    /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

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).