Return-Path: <linux-kernel-owner+w=401wt.eu-S1754061AbZDNAiO@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754061AbZDNAiO (ORCPT <rfc822;w@1wt.eu>);
	Mon, 13 Apr 2009 20:38:14 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752007AbZDNAh6
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 13 Apr 2009 20:37:58 -0400
Received: from smtp1.linux-foundation.org ([140.211.169.13]:35843 "EHLO
	smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751848AbZDNAh5 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 13 Apr 2009 20:37:57 -0400
Date: Mon, 13 Apr 2009 17:31:13 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>, Valdis.Kletnieks@vt.edu,
       Mike Travis <travis@sgi.com>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
       mm-commits@vger.kernel.org, Rusty Russell <rusty@rustcorp.com.au>,
       Dave Jones <davej@redhat.com>, Len Brown <lenb@kernel.org>
Subject: Re: mmotm 2009-04-10-02-21 uploaded - forkbombed by work_for_cpu
Message-Id: <20090413173113.24a61442.akpm@linux-foundation.org>
In-Reply-To: <alpine.LFD.2.00.0904131648290.26713@localhost.localdomain>
References: <200904100922.n3A9MOIV013828@imap1.linux-foundation.org>
	<4609.1239456126@turing-police.cc.vt.edu>
	<alpine.LFD.2.00.0904130847500.4583@localhost.localdomain>
	<20090413171853.GA4601@elte.hu>
	<20090413102749.4ca3a217.akpm@linux-foundation.org>
	<alpine.LFD.2.00.0904131648290.26713@localhost.localdomain>
X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2226
Lines: 64

On Mon, 13 Apr 2009 16:50:45 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> So I applied this (commit 01599fca6758d2cd133e78f87426fc851c9ea725: 
> "cpufreq: use smp_call_function_[single|many]() in acpi-cpufreq.c"), but 
> just realized - because of a compiler warning - that this looks 
> suspicious:
> 
> On Mon, 13 Apr 2009, Andrew Morton wrote:
> > @@ -283,7 +280,7 @@ static unsigned int get_measured_perf(st
> >  	unsigned int perf_percent;
> >  	unsigned int retval;
> >  
> > -	if (!work_on_cpu(cpu, read_measured_perf_ctrs, &readin))
> > +	if (smp_call_function_single(cpu, read_measured_perf_ctrs, &cur, 1))
> >  		return 0;
> >  
> >  	cur.aperf.whole = readin.aperf.whole -
> 
> How and why did that "read_measured_perf_ctrs, &readin" become 
> "read_measured_perf_ctrs, &cur" when the work_on_cpu() was converted to 
> "smp_call_function_single()"?
> 
> Looks like a bug. But such an odd one that I wonder whether there was some 
> thought behind it? Andrew? 
> 

<scratches head>

OK, the acpi tree went and had conflicting changes merged into it after
I'd written the patch:

@@ -281,52 +279,57 @@ static long read_measured_perf_ctrs(void
 static unsigned int get_measured_perf(struct cpufreq_policy *policy,
 				      unsigned int cpu)
 {
-	struct perf_cur cur;
+	struct perf_pair readin, cur;
 	unsigned int perf_percent;
 	unsigned int retval;
 
-	if (!work_on_cpu(cpu, read_measured_perf_ctrs, &cur))
+	if (!work_on_cpu(cpu, read_measured_perf_ctrs, &readin))
 		return 0;
 
+	cur.aperf.whole = readin.aperf.whole -
+				per_cpu(drv_data, cpu)->saved_aperf;
+	cur.mperf.whole = readin.mperf.whole -
+				per_cpu(drv_data, cpu)->saved_mperf;
+	per_cpu(drv_data, cpu)->saved_aperf = readin.aperf.whole;
+	per_cpu(drv_data, cpu)->saved_mperf = readin.mperf.whole;
+

and it appears that I incorrectly reverted part of
18b2646fe3babeb40b34a0c1751e0bf5adfdc64c while fixing the resulting
rejects.

Switching it to `readin' looks correct.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/