Skip to contentSkip to conversation

q-tools OOPS: Fixed perfmon.

DISCUSSION Peter Chubb 5 participants 7 messages Dec 9, 2003

lore
Share & tools
lore
#0 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephane" = Stephane Eranian <[email protected]> writes:

Stephane> I don't think that perfmon-2 support CONFIG_PREEMPT. Try Stephane> without it.

Here's a fix for non-preemption safety in perfmon.c.

I haven't tried it while running a preemption stress test, but this allows q-syscollect to work.

=== arch/ia64/kernel/perfmon.c 1.67 vs edited ==--- 1.67/arch/ia64/kernel/perfmon.c Tue Oct 28 17:36:50 2003
+++ edited/arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003 @@ -5475,7 +5475,7 @@

	int this_cpu;
	int ret;

- this_cpu = smp_processor_id();

+	this_cpu = get_cpu();
	min      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_min;
	max      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_max;
#1 lore raw
Quoted 8 lines · Peter Chubb

Here's a fix for non-preemption safety in perfmon.c.

I haven't tried it while running a preemption stress test, but this allows q-syscollect to work.

=== arch/ia64/kernel/perfmon.c 1.67 vs edited ==> --- 1.67/arch/ia64/kernel/perfmon.c Tue Oct 28 17:36:50 2003
+++ edited/arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003

Review line 5480

Quoted 7 lines
(quoted diff) +1 -1
@@ -5475,7 +5475,7 @@
 	int this_cpu;
 	int ret;
 
-	this_cpu = smp_processor_id();
+	this_cpu = get_cpu();
 	min      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_min;
 	max      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_max;

surely there needs to be a matching put_cpu() or else preempt is forever disabled. no?

Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain
#2 lore raw
In reply to Peter Chubb

Peter,

Yes, clearly you do not want to preempt in the perfmon interrupt handler. I think we need to also make sure we do not preempt during the perfmonctl() system call, at least until we verify that there is no assumptions in there. Similarly in all the VFS entry points, such as pfm_close(). I will try and see what I can do before the end of the week.

Thanks for your patch.

Quoted 25 lines · Peter Chubb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephane" = Stephane Eranian <[email protected]> writes:

Stephane> I don't think that perfmon-2 support CONFIG_PREEMPT. Try Stephane> without it.

Here's a fix for non-preemption safety in perfmon.c.

I haven't tried it while running a preemption stress test, but this allows q-syscollect to work.

=== arch/ia64/kernel/perfmon.c 1.67 vs edited ==> --- 1.67/arch/ia64/kernel/perfmon.c Tue Oct 28 17:36:50 2003
+++ edited/arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003

(quoted diff) +1 -2
@@ -5475,7 +5475,7 @@
 	int this_cpu;
 	int ret;
 
-	this_cpu = smp_processor_id();
+	this_cpu = get_cpu();
 	min      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_min;
 	max      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_max;
 
-

To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
-Stephane
#3 lore raw
In reply to Peter Chubb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · Stephane Eranian

Stephane> Peter, Yes, clearly you do not want to preempt in the Stephane> perfmon interrupt handler. I think we need to also make Stephane> sure we do not preempt during the perfmonctl() system Stephane> call, at least until we verify that there is no Stephane> assumptions in there. Similarly in all the VFS entry Stephane> points, such as pfm_close(). I will try and see what I can Stephane> do before the end of the week.

Stephane> Thanks for your patch.

I did put in Peter's fix in my tree, since it fixes a known crash and is obviously correct.

	--david
#4 lore raw
In reply to Peter Chubb
Quoted 13 lines · Matthew Wilcox
Quoted 12 lines · Peter Chubb

Here's a fix for non-preemption safety in perfmon.c.

I haven't tried it while running a preemption stress test, but this allows q-syscollect to work.

===== arch/ia64/kernel/perfmon.c 1.67 vs edited =====

arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003 renamed from arch/ia64/kernel/perfmon.c Tue Oct 28 17:36:50 2003 +0 -0
@@ -5475,7 +5475,7 @@
 	int this_cpu;
 	int ret;
 
Quoted 7 lines

arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003 line 5480

Quoted 4 lines
arch/ia64/kernel/perfmon.c Tue Dec 9 10:55:58 2003 renamed from arch/ia64/kernel/perfmon.c Tue Oct 28 17:36:50 2003 +1 -1
-	this_cpu = smp_processor_id();
+	this_cpu = get_cpu();
 	min      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_min;
 	max      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_max;

surely there needs to be a matching put_cpu() or else preempt is forever disabled. no?

I agree.

(from include/linux/smp.h)
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
#define put_cpu() preempt_enable()

mh

Signature · 1 line
Martin Hicks || [email protected] || PGP/GnuPG: 0x4C7F2BEE
#5 lore raw
In reply to Peter Chubb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · Martin Hicks
Quoted 2 lines · Matthew Wilcox
Quoted 2 lines

surely there needs to be a matching put_cpu() or else preempt is forever disabled. no?

Martin> I agree.

The put is already there! See put_cpu_no_resched().

Remember that patches are diffs... ;-)

	--david
#6 lore raw
In reply to Peter Chubb

Peter,

Quoted 7 lines · Stephane Eranian

Yes, clearly you do not want to preempt in the perfmon interrupt handler. I think we need to also make sure we do not preempt during the perfmonctl() system call, at least until we verify that there is no assumptions in there. Similarly in all the VFS entry points, such as pfm_close(). I will try and see what I can do before the end of the week.

I checked the code and I believe we are covered because we rely upon spin_lock_irqsave/restore for most entry points into perfmon-2. That is enough to block/unblock preemption in all the calls that need it. That applies to the sys_perfmonctl() entry, the VFS entry points as well as the internal entry points for copy_threads() and a few others. The only one missing is the one you found. The PMU state save/restore are called from the scheduler and are therefore protected as well.

Thanks for tracking down that one bug.

Signature · 1 line
-Stephane