mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 16:54:21 +00:00 
			
		
		
		
	mm/alpha: use general page fault accounting
Use the general page fault accounting by passing regs into handle_mm_fault(). Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault(). Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Link: http://lkml.kernel.org/r/20200707225021.200906-3-peterx@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									bce617edec
								
							
						
					
					
						commit
						c0f6eda41f
					
				
					 1 changed files with 3 additions and 5 deletions
				
			
		|  | @ -25,6 +25,7 @@ | |||
| #include <linux/interrupt.h> | ||||
| #include <linux/extable.h> | ||||
| #include <linux/uaccess.h> | ||||
| #include <linux/perf_event.h> | ||||
| 
 | ||||
| extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); | ||||
| 
 | ||||
|  | @ -116,6 +117,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, | |||
| #endif | ||||
| 	if (user_mode(regs)) | ||||
| 		flags |= FAULT_FLAG_USER; | ||||
| 	perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); | ||||
| retry: | ||||
| 	mmap_read_lock(mm); | ||||
| 	vma = find_vma(mm, address); | ||||
|  | @ -148,7 +150,7 @@ retry: | |||
| 	/* If for any reason at all we couldn't handle the fault,
 | ||||
| 	   make sure we exit gracefully rather than endlessly redo | ||||
| 	   the fault.  */ | ||||
| 	fault = handle_mm_fault(vma, address, flags, NULL); | ||||
| 	fault = handle_mm_fault(vma, address, flags, regs); | ||||
| 
 | ||||
| 	if (fault_signal_pending(fault, regs)) | ||||
| 		return; | ||||
|  | @ -164,10 +166,6 @@ retry: | |||
| 	} | ||||
| 
 | ||||
| 	if (flags & FAULT_FLAG_ALLOW_RETRY) { | ||||
| 		if (fault & VM_FAULT_MAJOR) | ||||
| 			current->maj_flt++; | ||||
| 		else | ||||
| 			current->min_flt++; | ||||
| 		if (fault & VM_FAULT_RETRY) { | ||||
| 			flags |= FAULT_FLAG_TRIED; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Peter Xu
						Peter Xu