Skip to content

L
linux
Commit 22cc877b authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Linus Torvalds
Browse files
Options

mm: nommu: refactor debug and warning prints 

kenter/kleave/kdebug are wrapper macros to print functions flow and debug
information.  This set was written before pr_devel() was introduced, so it
was controlled by "#if 0" construction.  It is questionable if anyone is
using them [1] now.

This patch removes these macros, converts numerous printk(KERN_WARNING,
...) to use general pr_warn(...) and removes debug print line from
validate_mmap_request() function.
Signed-off-by: default avatarLeon Romanovsky <leon@leon.nu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8809aa2d
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 92 deletions
mm/nommu.c
View file @ 22cc877b
...@@ -42,22 +42,6 @@ ...@@ -42,22 +42,6 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include "internal.h" #include "internal.h"
#if 0
#define kenter(FMT, ...) \
printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
#define kleave(FMT, ...) \
printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
#define kdebug(FMT, ...) \
printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__)
#else
#define kenter(FMT, ...) \
no_printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
#define kleave(FMT, ...) \
no_printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
#define kdebug(FMT, ...) \
no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__)
#endif
void *high_memory; void *high_memory;
EXPORT_SYMBOL(high_memory); EXPORT_SYMBOL(high_memory);
struct page *mem_map; struct page *mem_map;
...@@ -665,11 +649,7 @@ static void free_page_series(unsigned long from, unsigned long to) ...@@ -665,11 +649,7 @@ static void free_page_series(unsigned long from, unsigned long to)
for (; from < to; from += PAGE_SIZE) { for (; from < to; from += PAGE_SIZE) {
struct page *page = virt_to_page(from); struct page *page = virt_to_page(from);
kdebug("- free %lx", from);
atomic_long_dec(&mmap_pages_allocated); atomic_long_dec(&mmap_pages_allocated);
if (page_count(page) != 1)
kdebug("free page %p: refcount not one: %d",
page, page_count(page));
put_page(page); put_page(page);
} }
} }
...@@ -683,8 +663,6 @@ static void free_page_series(unsigned long from, unsigned long to) ...@@ -683,8 +663,6 @@ static void free_page_series(unsigned long from, unsigned long to)
static void __put_nommu_region(struct vm_region *region) static void __put_nommu_region(struct vm_region *region)
__releases(nommu_region_sem) __releases(nommu_region_sem)
{ {
kenter("%p{%d}", region, region->vm_usage);
BUG_ON(!nommu_region_tree.rb_node); BUG_ON(!nommu_region_tree.rb_node);
if (--region->vm_usage == 0) { if (--region->vm_usage == 0) {
...@@ -697,10 +675,8 @@ static void __put_nommu_region(struct vm_region *region) ...@@ -697,10 +675,8 @@ static void __put_nommu_region(struct vm_region *region)
/* IO memory and memory shared directly out of the pagecache /* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */ * from ramfs/tmpfs mustn't be released here */
if (region->vm_flags & VM_MAPPED_COPY) { if (region->vm_flags & VM_MAPPED_COPY)
kdebug("free series");
free_page_series(region->vm_start, region->vm_top); free_page_series(region->vm_start, region->vm_top);
}
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
} else { } else {
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
...@@ -744,8 +720,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma) ...@@ -744,8 +720,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
struct address_space *mapping; struct address_space *mapping;
struct rb_node **p, *parent, *rb_prev; struct rb_node **p, *parent, *rb_prev;
kenter(",%p", vma);
BUG_ON(!vma->vm_region); BUG_ON(!vma->vm_region);
mm->map_count++; mm->map_count++;
...@@ -813,8 +787,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma) ...@@ -813,8 +787,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
struct task_struct *curr = current; struct task_struct *curr = current;
kenter("%p", vma);
protect_vma(vma, 0); protect_vma(vma, 0);
mm->map_count--; mm->map_count--;
...@@ -854,7 +826,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma) ...@@ -854,7 +826,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
*/ */
static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
{ {
kenter("%p", vma);
if (vma->vm_ops && vma->vm_ops->close) if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma); vma->vm_ops->close(vma);
if (vma->vm_file) if (vma->vm_file)
...@@ -957,12 +928,8 @@ static int validate_mmap_request(struct file *file, ...@@ -957,12 +928,8 @@ static int validate_mmap_request(struct file *file,
int ret; int ret;
/* do the simple checks first */ /* do the simple checks first */
if (flags & MAP_FIXED) { if (flags & MAP_FIXED)
printk(KERN_DEBUG
"%d: Can't do fixed-address/overlay mmap of RAM\n",
current->pid);
return -EINVAL; return -EINVAL;
}
if ((flags & MAP_TYPE) != MAP_PRIVATE && if ((flags & MAP_TYPE) != MAP_PRIVATE &&
(flags & MAP_TYPE) != MAP_SHARED) (flags & MAP_TYPE) != MAP_SHARED)
...@@ -1060,8 +1027,7 @@ static int validate_mmap_request(struct file *file, ...@@ -1060,8 +1027,7 @@ static int validate_mmap_request(struct file *file,
) { ) {
capabilities &= ~NOMMU_MAP_DIRECT; capabilities &= ~NOMMU_MAP_DIRECT;
if (flags & MAP_SHARED) { if (flags & MAP_SHARED) {
printk(KERN_WARNING pr_warn("MAP_SHARED not completely supported on !MMU\n");
"MAP_SHARED not completely supported on !MMU\n");
return -EINVAL; return -EINVAL;
} }
} }
...@@ -1205,16 +1171,12 @@ static int do_mmap_private(struct vm_area_struct *vma, ...@@ -1205,16 +1171,12 @@ static int do_mmap_private(struct vm_area_struct *vma,
* we're allocating is smaller than a page * we're allocating is smaller than a page
*/ */
order = get_order(len); order = get_order(len);
kdebug("alloc order %d for %lx", order, len);
total = 1 << order; total = 1 << order;
point = len >> PAGE_SHIFT; point = len >> PAGE_SHIFT;
/* we don't want to allocate a power-of-2 sized page set */ /* we don't want to allocate a power-of-2 sized page set */
if (sysctl_nr_trim_pages && total - point >= sysctl_nr_trim_pages) { if (sysctl_nr_trim_pages && total - point >= sysctl_nr_trim_pages)
total = point; total = point;
kdebug("try to alloc exact %lu pages", total);
}
base = alloc_pages_exact(total << PAGE_SHIFT, GFP_KERNEL); base = alloc_pages_exact(total << PAGE_SHIFT, GFP_KERNEL);
if (!base) if (!base)
...@@ -1285,18 +1247,14 @@ unsigned long do_mmap_pgoff(struct file *file, ...@@ -1285,18 +1247,14 @@ unsigned long do_mmap_pgoff(struct file *file,
unsigned long capabilities, vm_flags, result; unsigned long capabilities, vm_flags, result;
int ret; int ret;
kenter(",%lx,%lx,%lx,%lx,%lx", addr, len, prot, flags, pgoff);
*populate = 0; *populate = 0;
/* decide whether we should attempt the mapping, and if so what sort of /* decide whether we should attempt the mapping, and if so what sort of
* mapping */ * mapping */
ret = validate_mmap_request(file, addr, len, prot, flags, pgoff, ret = validate_mmap_request(file, addr, len, prot, flags, pgoff,
&capabilities); &capabilities);
if (ret < 0) { if (ret < 0)
kleave(" = %d [val]", ret);
return ret; return ret;
}
/* we ignore the address hint */ /* we ignore the address hint */
addr = 0; addr = 0;
...@@ -1383,11 +1341,9 @@ unsigned long do_mmap_pgoff(struct file *file, ...@@ -1383,11 +1341,9 @@ unsigned long do_mmap_pgoff(struct file *file,
vma->vm_start = start; vma->vm_start = start;
vma->vm_end = start + len; vma->vm_end = start + len;
if (pregion->vm_flags & VM_MAPPED_COPY) { if (pregion->vm_flags & VM_MAPPED_COPY)
kdebug("share copy");
vma->vm_flags |= VM_MAPPED_COPY; vma->vm_flags |= VM_MAPPED_COPY;
} else { else {
kdebug("share mmap");
ret = do_mmap_shared_file(vma); ret = do_mmap_shared_file(vma);
if (ret < 0) { if (ret < 0) {
vma->vm_region = NULL; vma->vm_region = NULL;
...@@ -1467,7 +1423,6 @@ unsigned long do_mmap_pgoff(struct file *file, ...@@ -1467,7 +1423,6 @@ unsigned long do_mmap_pgoff(struct file *file,
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
kleave(" = %lx", result);
return result; return result;
error_just_free: error_just_free:
...@@ -1479,26 +1434,23 @@ unsigned long do_mmap_pgoff(struct file *file, ...@@ -1479,26 +1434,23 @@ unsigned long do_mmap_pgoff(struct file *file,
if (vma->vm_file) if (vma->vm_file)
fput(vma->vm_file); fput(vma->vm_file);
kmem_cache_free(vm_area_cachep, vma); kmem_cache_free(vm_area_cachep, vma);
kleave(" = %d", ret);
return ret; return ret;
sharing_violation: sharing_violation:
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
printk(KERN_WARNING "Attempt to share mismatched mappings\n"); pr_warn("Attempt to share mismatched mappings\n");
ret = -EINVAL; ret = -EINVAL;
goto error; goto error;
error_getting_vma: error_getting_vma:
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
printk(KERN_WARNING "Allocation of vma for %lu byte allocation" pr_warn("Allocation of vma for %lu byte allocation from process %d failed\n",
" from process %d failed\n",
len, current->pid); len, current->pid);
show_free_areas(0); show_free_areas(0);
return -ENOMEM; return -ENOMEM;
error_getting_region: error_getting_region:
printk(KERN_WARNING "Allocation of vm region for %lu byte allocation" pr_warn("Allocation of vm region for %lu byte allocation from process %d failed\n",
" from process %d failed\n",
len, current->pid); len, current->pid);
show_free_areas(0); show_free_areas(0);
return -ENOMEM; return -ENOMEM;
...@@ -1563,8 +1515,6 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, ...@@ -1563,8 +1515,6 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
struct vm_region *region; struct vm_region *region;
unsigned long npages; unsigned long npages;
kenter("");
/* we're only permitted to split anonymous regions (these should have /* we're only permitted to split anonymous regions (these should have
* only a single usage on the region) */ * only a single usage on the region) */
if (vma->vm_file) if (vma->vm_file)
...@@ -1628,8 +1578,6 @@ static int shrink_vma(struct mm_struct *mm, ...@@ -1628,8 +1578,6 @@ static int shrink_vma(struct mm_struct *mm,
{ {
struct vm_region *region; struct vm_region *region;
kenter("");
/* adjust the VMA's pointers, which may reposition it in the MM's tree /* adjust the VMA's pointers, which may reposition it in the MM's tree
* and list */ * and list */
delete_vma_from_mm(vma); delete_vma_from_mm(vma);
...@@ -1669,8 +1617,6 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ...@@ -1669,8 +1617,6 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
unsigned long end; unsigned long end;
int ret; int ret;
kenter(",%lx,%zx", start, len);
len = PAGE_ALIGN(len); len = PAGE_ALIGN(len);
if (len == 0) if (len == 0)
return -EINVAL; return -EINVAL;
...@@ -1682,9 +1628,7 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ...@@ -1682,9 +1628,7 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
if (!vma) { if (!vma) {
static int limit; static int limit;
if (limit < 5) { if (limit < 5) {
printk(KERN_WARNING pr_warn("munmap of memory not mmapped by process %d (%s): 0x%lx-0x%lx\n",
"munmap of memory not mmapped by process %d"
" (%s): 0x%lx-0x%lx\n",
current->pid, current->comm, current->pid, current->comm,
start, start + len - 1); start, start + len - 1);
limit++; limit++;
...@@ -1695,46 +1639,34 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ...@@ -1695,46 +1639,34 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
/* we're allowed to split an anonymous VMA but not a file-backed one */ /* we're allowed to split an anonymous VMA but not a file-backed one */
if (vma->vm_file) { if (vma->vm_file) {
do { do {
if (start > vma->vm_start) { if (start > vma->vm_start)
kleave(" = -EINVAL [miss]");
return -EINVAL; return -EINVAL;
}
if (end == vma->vm_end) if (end == vma->vm_end)
goto erase_whole_vma; goto erase_whole_vma;
vma = vma->vm_next; vma = vma->vm_next;
} while (vma); } while (vma);
kleave(" = -EINVAL [split file]");
return -EINVAL; return -EINVAL;
} else { } else {
/* the chunk must be a subset of the VMA found */ /* the chunk must be a subset of the VMA found */
if (start == vma->vm_start && end == vma->vm_end) if (start == vma->vm_start && end == vma->vm_end)
goto erase_whole_vma; goto erase_whole_vma;
if (start < vma->vm_start || end > vma->vm_end) { if (start < vma->vm_start || end > vma->vm_end)
kleave(" = -EINVAL [superset]");
return -EINVAL; return -EINVAL;
} if (start & ~PAGE_MASK)
if (start & ~PAGE_MASK) {
kleave(" = -EINVAL [unaligned start]");
return -EINVAL; return -EINVAL;
} if (end != vma->vm_end && end & ~PAGE_MASK)
if (end != vma->vm_end && end & ~PAGE_MASK) {
kleave(" = -EINVAL [unaligned split]");
return -EINVAL; return -EINVAL;
}
if (start != vma->vm_start && end != vma->vm_end) { if (start != vma->vm_start && end != vma->vm_end) {
ret = split_vma(mm, vma, start, 1); ret = split_vma(mm, vma, start, 1);
if (ret < 0) { if (ret < 0)
kleave(" = %d [split]", ret);
return ret; return ret;
} }
}
return shrink_vma(mm, vma, start, end); return shrink_vma(mm, vma, start, end);
} }
erase_whole_vma: erase_whole_vma:
delete_vma_from_mm(vma); delete_vma_from_mm(vma);
delete_vma(mm, vma); delete_vma(mm, vma);
kleave(" = 0");
return 0; return 0;
} }
EXPORT_SYMBOL(do_munmap); EXPORT_SYMBOL(do_munmap);
...@@ -1766,8 +1698,6 @@ void exit_mmap(struct mm_struct *mm) ...@@ -1766,8 +1698,6 @@ void exit_mmap(struct mm_struct *mm)
if (!mm) if (!mm)
return; return;
kenter("");
mm->total_vm = 0; mm->total_vm = 0;
while ((vma = mm->mmap)) { while ((vma = mm->mmap)) {
...@@ -1776,8 +1706,6 @@ void exit_mmap(struct mm_struct *mm) ...@@ -1776,8 +1706,6 @@ void exit_mmap(struct mm_struct *mm)
delete_vma(mm, vma); delete_vma(mm, vma);
cond_resched(); cond_resched();
} }
kleave("");
} }
unsigned long vm_brk(unsigned long addr, unsigned long len) unsigned long vm_brk(unsigned long addr, unsigned long len)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7