mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	perf: Honour event state for aux stream data
Anton reported that perf record kept receiving events even after calling ioctl(PERF_EVENT_IOC_DISABLE). It turns out that FORK,COMM and MMAP events didn't respect the disabled state and kept flowing in. Reported-by: Anton Blanchard <anton@samba.org> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Tested-by: Anton Blanchard <anton@samba.org> LKML-Reference: <1263459187.4244.265.camel@laptop> CC: stable@kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
		
							parent
							
								
									fe432200ab
								
							
						
					
					
						commit
						22e190851f
					
				
					 1 changed files with 9 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -3268,6 +3268,9 @@ static void perf_event_task_output(struct perf_event *event,
 | 
			
		|||
 | 
			
		||||
static int perf_event_task_match(struct perf_event *event)
 | 
			
		||||
{
 | 
			
		||||
	if (event->state != PERF_EVENT_STATE_ACTIVE)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	if (event->cpu != -1 && event->cpu != smp_processor_id())
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -3377,6 +3380,9 @@ static void perf_event_comm_output(struct perf_event *event,
 | 
			
		|||
 | 
			
		||||
static int perf_event_comm_match(struct perf_event *event)
 | 
			
		||||
{
 | 
			
		||||
	if (event->state != PERF_EVENT_STATE_ACTIVE)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	if (event->cpu != -1 && event->cpu != smp_processor_id())
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -3494,6 +3500,9 @@ static void perf_event_mmap_output(struct perf_event *event,
 | 
			
		|||
static int perf_event_mmap_match(struct perf_event *event,
 | 
			
		||||
				   struct perf_mmap_event *mmap_event)
 | 
			
		||||
{
 | 
			
		||||
	if (event->state != PERF_EVENT_STATE_ACTIVE)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	if (event->cpu != -1 && event->cpu != smp_processor_id())
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue