LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Carl Love <cel@us.ibm.com>
To: michael@ellerman.id.au
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: [UPDATED PATCH VER2] Cell OProfile: Incorrect local array size in activate spu profiling function
Date: Wed, 29 Oct 2008 08:06:45 -0700	[thread overview]
Message-ID: <1225292805.20229.52.camel@carll-linux-desktop> (raw)
In-Reply-To: <1225241514.7799.2.camel@localhost>

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;
+	}
 	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) */
@@ -848,7 +855,7 @@ static int pm_rtas_activate_spu_profilin
 
 	ret = rtas_ibm_cbe_perftools(SUBFUNC_ACTIVATE,
 				     PASSTHRU_ENABLE, pm_signal_local,
-				     (NUM_SPUS_PER_NODE
+				     (ARRAY_SIZE(pm_signal_local)
 				      * sizeof(struct pm_signal)));
 
 	if (unlikely(ret)) {



  reply	other threads:[~2008-10-29 15:07 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
2008-10-29 15:06       ` Carl Love [this message]
2008-10-31 15:14         ` [UPDATED PATCH VER2] " 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=1225292805.20229.52.camel@carll-linux-desktop \
    --to=cel@us.ibm.com \
    --cc=Hannsj_uhl@de.ibm.com \
    --cc=acjohnso@us.ibm.com \
    --cc=cbe-oss-dev@ozlabs.org \
    --cc=cel@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=michael@ellerman.id.au \
    --cc=oprofile-list@lists.sourceforge.net \
    --subject='Re: [UPDATED PATCH VER2] 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).