Messages in this thread | | | Subject | Re: [PATCH 3/4] munmap: kbuild menu for munmap interface | From | Steven Rostedt <> | Date | Mon, 25 Apr 2011 11:31:13 -0400 |
| |
On Mon, 2011-04-25 at 19:44 +0900, Geunsik Lim wrote: > From: Geunsik Lim <geunsik.lim@samsung.com> > > Support kbuild menu to select memory unmap operation size > at build time.
The subject and this line are not quite the same. The subject looks like it only modifies the kbuild options, not mm/memory.c as well. Please fix.
> > Signed-off-by: Geunsik Lim <geunsik.lim@samsung.com> > Acked-by: Hyunjin Choi <hj89.choi@samsung.com> > --- > init/Kconfig | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > mm/memory.c | 21 +++++++++++----- > 2 files changed, 84 insertions(+), 7 deletions(-) >
> --- a/mm/memory.c > +++ b/mm/memory.c > @@ -57,6 +57,7 @@ > #include <linux/swapops.h> > #include <linux/elf.h> > #include <linux/gfp.h> > +#include <linux/munmap_unit_size.h> > > #include <asm/io.h> > #include <asm/pgalloc.h> > @@ -1079,6 +1080,10 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb, > (*zap_work)--; > continue; > } > +#if 0 > +printk("DEBUG:munmap step2,(%s:%d), unmap range = current(%lu) + \ > +zap_work(%lu bytes) \n", current->comm, current->pid, addr, *zap_work); > +#endif
No #if 0 debug printing in mainline.
> next = zap_pud_range(tlb, vma, pgd, addr, next, > zap_work, details); > } while (pgd++, addr = next, (addr != end && *zap_work > 0)); > @@ -1088,12 +1093,10 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb, > return addr; > } > > -#ifdef CONFIG_PREEMPT > -# define ZAP_BLOCK_SIZE (8 * PAGE_SIZE) > -#else > -/* No preempt: go for improved straight-line efficiency */ > -# define ZAP_BLOCK_SIZE (1024 * PAGE_SIZE) > -#endif > +/* No preempt: go for improved straight-line efficiency > + * on PREEMPT(preemption mode) this is not a critical latency-path. > + */ > +# define ZAP_BLOCK_SIZE (munmap_unit_size * PAGE_SIZE) > > /** > * unmap_vmas - unmap a range of memory covered by a list of vma's > @@ -1133,7 +1136,11 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp, > spinlock_t *i_mmap_lock = details? details->i_mmap_lock: NULL; > int fullmm = (*tlbp)->fullmm; > struct mm_struct *mm = vma->vm_mm; > - > +#if 0 > +printk("DEBUG:munmap step1,(%s:%d), unit=zap_work(%ld)/ZAP_BLOCK(%ld), \ > +vma:[%8lu]=%lu-%lu \n", current->comm, current->pid, zap_work, ZAP_BLOCK_SIZE, \ > +vma->vm_end - vma->vm_start, vma->vm_end, vma->vm_start); > +#endif
Get rid of this too.
Either have pr_debug(...) or nothing at all.
-- Steve
> mmu_notifier_invalidate_range_start(mm, start_addr, end_addr); > for ( ; vma && vma->vm_start < end_addr; vma = vma->vm_next) { > unsigned long end;
| |