Re: /proc/*/pagemap BUG: sleeping function called from invalid context

From: Matt Mackall
Date: Tue Apr 10 2007 - 16:21:11 EST


On Mon, Apr 09, 2007 at 12:25:54PM +0400, Alexey Dobriyan wrote:
> After
> cat /proc/self/pagemap
>
> BUG: sleeping function called from invalid context at include/asm/uaccess.h:453
> in_atomic():1, irqs_disabled():0

This should fix it:

When CONFIG_HIGHPTE is enabled, use double-buffering in pagemap to
avoid calling copy_to_user while preemption is disabled.

Tested on x86 with HIGHPTE with DEBUG_SPINLOCK_SLEEP and
PROVE_LOCKING.

Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>

Index: mm/fs/proc/task_mmu.c
===================================================================
--- mm.orig/fs/proc/task_mmu.c 2007-04-09 10:54:28.000000000 -0500
+++ mm/fs/proc/task_mmu.c 2007-04-10 14:47:21.000000000 -0500
@@ -535,6 +535,7 @@ struct pagemapread {
struct mm_struct *mm;
unsigned long next;
unsigned long *buf;
+ pte_t *ptebuf;
unsigned long pos;
size_t count;
int index;
@@ -573,6 +574,14 @@ static int pagemap_pte_range(pmd_t *pmd,
int err;

pte = pte_offset_map(pmd, addr);
+
+#ifdef CONFIG_HIGHPTE
+ /* copy PTE directory to temporary buffer and unmap it */
+ memcpy(pm->ptebuf, pte, PAGE_ALIGN((unsigned long)pte) - (unsigned long)pte);
+ pte_unmap(pte);
+ pte = pm->ptebuf;
+#endif
+
for (; addr != end; pte++, addr += PAGE_SIZE) {
if (addr < pm->next)
continue;
@@ -583,7 +592,11 @@ static int pagemap_pte_range(pmd_t *pmd,
if (err)
return err;
}
+
+#ifndef CONFIG_HIGHPTE
pte_unmap(pte - 1);
+#endif
+
return 0;
}

@@ -655,10 +668,16 @@ static ssize_t pagemap_read(struct file
if (!page)
goto out;

+#ifdef CONFIG_HIGHPTE
+ pm.ptebuf = kzalloc(PAGE_SIZE, GFP_USER);
+ if (!pm.ptebuf)
+ goto out_free;
+#endif
+
ret = 0;
mm = get_task_mm(task);
if (!mm)
- goto out_free;
+ goto out_freepte;

pm.mm = mm;
pm.next = addr;
@@ -681,7 +700,7 @@ static ssize_t pagemap_read(struct file
while (pm.count > 0 && vma) {
if (!ptrace_may_attach(task)) {
ret = -EIO;
- goto out;
+ goto out_mm;
}
vend = min(vma->vm_start - 1, end - 1) + 1;
ret = pagemap_fill(&pm, vend);
@@ -700,8 +719,13 @@ static ssize_t pagemap_read(struct file
if (!ret)
ret = pm.pos - src;

+out_mm:
mmput(mm);
+out_freepte:
+#ifdef CONFIG_HIGHPTE
+ kfree(pm.ptebuf);
out_free:
+#endif
kfree(page);
out:
put_task_struct(task);


--
Mathematics is the supreme nostalgia of our time.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/