From: Matt Mackall <mpm@selenic.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: m.kozlowski@tuxland.pl, linux-kernel@vger.kernel.org,
paulus@samba.org, linuxppc-dev@ozlabs.org
Subject: Re: 2.6.24-rc8-mm1: powerpc oopses
Date: Thu, 17 Jan 2008 18:12:48 -0600 [thread overview]
Message-ID: <1200615168.3839.26.camel@cinder.waste.org> (raw)
In-Reply-To: <20080117160513.3456b4eb.akpm@linux-foundation.org>
On Thu, 2008-01-17 at 16:05 -0800, Andrew Morton wrote:
> On Thu, 17 Jan 2008 17:39:54 -0600
> Matt Mackall <mpm@selenic.com> wrote:
>
> >
> > On Thu, 2008-01-17 at 14:51 -0800, Andrew Morton wrote:
> > > > proc_loop: /proc/3731/task/3731/pagemap
> > > > kernel: BUG: sleeping function called from invalid context at fs/proc/task_mmu.c:554
> > > > kernel: in_atomic():1, irqs_disabled():0
> > > > kernel: Call Trace:
> > > > kernel: [cf1cddf0] [c000840c] show_stack+0x3c/0x194 (unreliable)
> > > > kernel: [cf1cde20] [c002b2ec] __might_sleep+0xf4/0x108
> > > > kernel: [cf1cde30] [c00d2d54] add_to_pagemap+0x40/0x11c
> > > > kernel: [cf1cde50] [c00d2f44] pagemap_pte_range+0xa8/0x10c
> > > > kernel: [cf1cde70] [c0081b30] walk_page_range+0x148/0x23c
> > > > kernel: [cf1cdeb0] [c00d3104] pagemap_read+0x15c/0x244
> > > > kernel: [cf1cdef0] [c0092144] vfs_read+0xc4/0x16c
> > > > kernel: [cf1cdf10] [c009261c] sys_read+0x4c/0x90
> > > > kernel: [cf1cdf40] [c001328c] ret_from_syscall+0x0/0x40
> > >
> > > It's not really an oops - it's a warning. add_to_pagemap() is doing a
> > > put_user() inside pagemap_pte_range->pte_offset_map->kmap_atomic.
> > >
> > > A known bug, I'm afraid.
> > >
> > > How to fix?
> > >
> > > - double-buffer the data to be copied to userspace or
> > >
> > > - take a local copy of the pte page then work on that instead or
> > >
> > > - play copy_to_user_inatomic() tricks.
> >
> > Hmm, this fell off my radar. How about something like this as a minimal
> > fix (untested as -mm is a complete doorstop for me at the moment)?
> >
> > diff -r 5595adaea70f fs/proc/task_mmu.c
> > --- a/fs/proc/task_mmu.c Thu Jan 17 13:26:54 2008 -0600
> > +++ b/fs/proc/task_mmu.c Thu Jan 17 17:29:21 2008 -0600
> > @@ -582,20 +583,26 @@
> > {
> > struct pagemapread *pm = private;
> > pte_t *pte;
> > - int err = 0;
> > + int offset = 0, err = 0;
> >
> > pte = pte_offset_map(pmd, addr);
> > - for (; addr != end; pte++, addr += PAGE_SIZE) {
> > + for (; addr != end; offset++, addr += PAGE_SIZE) {
> > u64 pfn = PM_NOT_PRESENT;
> > - if (is_swap_pte(*pte))
> > - pfn = swap_pte_to_pagemap_entry(*pte);
> > - else if (pte_present(*pte))
> > - pfn = pte_pfn(*pte);
> > + if (is_swap_pte(pte[offset]))
> > + pfn = swap_pte_to_pagemap_entry(pte[offset]);
> > + else if (pte_present(pte[offset]))
> > + pfn = pte_pfn(pte[offset]);
> > +#ifdef CONFIG_HIGHPTE
> > + pte_unmap(pte);
> > err = add_to_pagemap(addr, pfn, pm);
> > + pte = pte_offset_map(pmd, addr);
> > +#else
> > + err = add_to_pagemap(addr, pfn, pm);
> > +#endif
> > if (err)
> > return err;
> > }
> > - pte_unmap(pte - 1);
> > + pte_unmap(pte);
> >
> > cond_resched();
> >
>
> Good point, it really can be taht simple.
>
> Do we need the ifdef? pte_offset_map/pte_unmap should be super-cheap on
> !CONFIG_HIGHPTE builds.
In that case, pte_unmap is free, pte_offset_map is just a bit of math.
So yeah, we can simplify this. How about:
diff -r 5595adaea70f fs/proc/task_mmu.c
--- a/fs/proc/task_mmu.c Thu Jan 17 13:26:54 2008 -0600
+++ b/fs/proc/task_mmu.c Thu Jan 17 18:11:13 2008 -0600
@@ -582,20 +583,20 @@
{
struct pagemapread *pm = private;
pte_t *pte;
- int err = 0;
+ int offset = 0, err = 0;
- pte = pte_offset_map(pmd, addr);
- for (; addr != end; pte++, addr += PAGE_SIZE) {
+ for (; addr != end; offset++, addr += PAGE_SIZE) {
u64 pfn = PM_NOT_PRESENT;
- if (is_swap_pte(*pte))
- pfn = swap_pte_to_pagemap_entry(*pte);
- else if (pte_present(*pte))
- pfn = pte_pfn(*pte);
+ pte = pte_offset_map(pmd, addr);
+ if (is_swap_pte(pte[offset]))
+ pfn = swap_pte_to_pagemap_entry(pte[offset]);
+ else if (pte_present(pte[offset]))
+ pfn = pte_pfn(pte[offset]);
+ pte_unmap(pte);
err = add_to_pagemap(addr, pfn, pm);
if (err)
return err;
}
- pte_unmap(pte - 1);
cond_resched();
--
Mathematics is the supreme nostalgia of our time.
next prev parent reply other threads:[~2008-01-18 0:13 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-17 10:35 2.6.24-rc8-mm1 Andrew Morton
2008-01-17 12:41 ` 2.6.24-rc8-mm1 Build Failure on S390x Kamalesh Babulal
2008-01-17 14:05 ` Martin Schwidefsky
2008-01-17 12:46 ` 2.6.24-rc8-mm1 Balbir Singh
2008-01-17 18:40 ` 2.6.24-rc8-mm1 Andrew Morton
2008-01-17 19:22 ` 2.6.24-rc8-mm1 Pallipadi, Venkatesh
2008-01-17 19:40 ` 2.6.24-rc8-mm1 Andrew Morton
2008-01-17 19:47 ` [E1000-devel] 2.6.24-rc8-mm1 Brandeburg, Jesse
2008-01-17 23:33 ` 2.6.24-rc8-mm1 Venki Pallipadi
2008-01-17 23:04 ` 2.6.24-rc8-mm1 Balbir Singh
2008-01-18 1:42 ` 2.6.24-rc8-mm1 Siddha, Suresh B
2008-01-18 5:06 ` 2.6.24-rc8-mm1 Balbir Singh
2008-01-17 20:25 ` 2.6.24-rc8-mm1 Balbir Singh
2008-01-17 13:21 ` [-mm Patch] UML: fix a building error WANG Cong
2008-01-17 17:59 ` Jeff Dike
2008-01-17 13:34 ` 2.6.24-rc8-mm1 Kamalesh Babulal
2008-01-17 14:26 ` 2.6.24-rc8-mm1 Ingo Molnar
2008-01-17 13:54 ` 2.6.24-rc8-mm1 kernel panic while bootup Kamalesh Babulal
2008-01-17 18:54 ` Andrew Morton
2008-01-17 19:00 ` Randy Dunlap
2008-01-20 6:24 ` Kamalesh Babulal
2008-01-20 7:17 ` Andrew Morton
2008-01-17 13:56 ` [-mm Patch] uml: fix a building error WANG Cong
2008-01-17 17:59 ` Jeff Dike
2008-01-17 18:11 ` Mariusz Kozlowski
2008-01-17 18:56 ` Andrew Morton
2008-01-17 19:38 ` Pallipadi, Venkatesh
2008-01-17 19:44 ` Andrew Morton
2008-01-17 20:42 ` Mariusz Kozlowski
2008-01-17 21:14 ` Jeff Dike
2008-01-17 21:41 ` Venki Pallipadi
2008-01-17 23:08 ` Jeff Dike
2008-01-17 23:17 ` Pallipadi, Venkatesh
2008-01-18 2:19 ` Jeff Dike
2008-01-17 18:56 ` Jeff Dike
2008-01-17 15:23 ` do_md_run returned -22 [Was: 2.6.24-rc8-mm1] Jiri Slaby
2008-01-17 19:01 ` Andrew Morton
2008-01-17 23:15 ` Neil Brown
2008-01-17 16:15 ` 2.6.24-rc8-mm1 Build Failure on scsi driver Kamalesh Babulal
2008-01-17 19:11 ` Andrew Morton
2008-01-18 0:53 ` [PATCH] aha152x: fix isa/pcmcia compile problem Tejun Heo
2008-01-18 6:29 ` Kamalesh Babulal
2008-01-18 6:37 ` 2.6.24-rc8-mm1 Build Failure on scsi driver Kamalesh Babulal
2008-01-18 7:20 ` [PATCH] SCSI: fix isa/pcmcia compile problem Tejun Heo
2008-01-18 7:30 ` Kamalesh Babulal
2008-01-18 14:58 ` James Bottomley
2008-01-18 23:27 ` Tejun Heo
2008-01-18 23:28 ` Tejun Heo
2008-01-18 23:32 ` James Bottomley
2008-01-18 23:46 ` Tejun Heo
2008-01-18 23:47 ` James Bottomley
2008-01-18 23:54 ` Tejun Heo
2008-01-21 9:56 ` Christoph Hellwig
2008-01-21 14:59 ` James Bottomley
2008-01-18 7:27 ` 2.6.24-rc8-mm1 Build Failure on scsi driver Andrew Morton
2008-01-17 16:48 ` 2.6.24-rc8-mm1 (BUG: sched_rt) Randy Dunlap
2008-01-17 17:11 ` Peter Zijlstra
2008-01-17 18:05 ` Randy Dunlap
2008-01-17 19:14 ` Randy Dunlap
2008-01-17 19:38 ` Andrew Morton
2008-01-17 17:15 ` Peter Zijlstra
2008-01-17 17:28 ` x86 refuses to build [Re: 2.6.24-rc8-mm1] Dhaval Giani
2008-01-17 18:44 ` Dhaval Giani
2008-01-18 8:59 ` Ingo Molnar
2008-01-18 16:16 ` Mike Travis
2008-01-17 18:13 ` 2.6.24-rc8-mm1: broken suspend Rafael J. Wysocki
2008-01-17 18:18 ` 2.6.24-rc8-mm1: powerpc: include/asm/nvram.h:62: error: field 'partition' has incomplete type Mariusz Kozlowski
2008-01-17 19:27 ` Andrew Morton
2008-01-17 19:06 ` 2.6.24-rc8-mm1 powerpc build errors Olof Johansson
2008-01-17 19:35 ` Andrew Morton
2008-01-17 22:00 ` Greg KH
2008-01-17 21:10 ` 2.6.24-rc8-mm1 Matt Mackall
2008-01-18 1:29 ` 2.6.24-rc8-mm1 Matt Mackall
2008-01-18 5:08 ` 2.6.24-rc8-mm1 Andrew Morton
2008-01-18 13:55 ` 2.6.24-rc8-mm1 Matt Mackall
2008-01-17 21:29 ` 2.6.24-rc8-mm1 - mkubootimg wants <zlib.h> Joseph Fannin
2008-01-17 22:21 ` Josh Boyer
2008-01-17 22:15 ` 2.6.24-rc8-mm1: powerpc oopses Mariusz Kozlowski
2008-01-17 22:51 ` Andrew Morton
2008-01-17 23:39 ` Matt Mackall
2008-01-18 0:05 ` Andrew Morton
2008-01-18 0:12 ` Matt Mackall [this message]
2008-01-18 0:29 ` Andrew Morton
2008-01-18 0:47 ` Matt Mackall
2008-01-18 1:07 ` Andrew Morton
2008-01-18 1:16 ` Matt Mackall
2008-01-18 17:23 ` Mariusz Kozlowski
2008-01-18 17:33 ` Matt Mackall
2008-01-18 6:14 ` 2.6.24-rc8-mm1 Build Failure at scripts/mkubooting/crc32.c Kamalesh Babulal
2008-01-18 8:06 ` Sam Ravnborg
2008-01-20 15:30 ` Mel Gorman
2008-01-18 7:09 ` 2.6.24-rc8-mm1 build failure on headers_check Kamalesh Babulal
2008-01-18 7:38 ` Andrew Morton
2008-01-18 8:36 ` 2.6.24-rc8-mm1 Kernel oops will running kernbench Kamalesh Babulal
2008-01-18 8:44 ` Andrew Morton
2008-01-18 9:01 ` Paul Mackerras
2008-01-18 9:34 ` Kamalesh Babulal
2008-01-18 10:19 ` Paul Mackerras
2008-01-18 10:26 ` Paul Mackerras
2008-01-18 10:44 ` Kamalesh Babulal
2008-01-18 10:54 ` Balbir Singh
2008-01-25 6:05 ` 2.6.24 Kernel oops will running kernbench regression from 2.6.24-rc8-mm1 Kamalesh Babulal
2008-01-18 13:34 ` 2.6.24-rc8-mm1: broken suspend (due to git-cpufreq.patch) Rafael J. Wysocki
2008-01-18 16:53 ` Dave Jones
2008-01-18 17:10 ` Dave Jones
2008-01-18 20:50 ` Rafael J. Wysocki
2008-01-18 21:55 ` Rafael J. Wysocki
2008-01-18 17:26 ` 2.6.24-rc8-mm1 (KVM build issues) Balbir Singh
2008-01-22 8:40 ` Andrew Morton
2008-01-18 18:06 ` 2.6.24-rc8-mm1 Kyle McMartin
2008-01-20 1:10 ` 2.6.24-rc8-mm1: WARN_ON() in clockevents_register_device() on HP nx6325 Rafael J. Wysocki
2008-01-20 10:24 ` Ingo Molnar
2008-01-20 11:21 ` Rafael J. Wysocki
2008-01-20 16:31 ` 2.6.24-rc8-mm1 Mel Gorman
2008-01-20 16:35 ` 2.6.24-rc8-mm1 Balbir Singh
2008-01-20 18:24 ` 2.6.24-rc8-mm1 Mel Gorman
2008-01-21 18:31 ` 2.6.24-rc8-mm1 - SELinux issues Valdis.Kletnieks
2008-01-21 18:53 ` [PATCH} 2.6.24-rc8-mm1 - x86_64 PAT issues with vesafb and NVidia cards Valdis.Kletnieks
2008-01-22 20:30 ` 2.6.24-rc8-mm1: sparc64 warning at fs/file_table.c:49 __fput+0x1a8/0x1e0() Mariusz Kozlowski
2008-01-22 21:02 ` Andrew Morton
2008-01-22 22:28 ` Dave Hansen
2008-01-22 23:13 ` Dave Hansen
2008-01-23 5:47 ` Christoph Hellwig
2008-02-01 23:34 ` Andrew Morton
2008-01-24 6:09 ` 2.6.24-rc8-mm1 Kernel oops on CIFS while running fsstress Kamalesh Babulal
2008-01-24 6:44 ` 2.6.24-rc8-mm1 Badness at net/ipv4/tcp_input.c:2506 Kamalesh Babulal
2008-01-25 0:04 ` 2.6.24-rc8-mm1: old sparc64 bug Mariusz Kozlowski
2008-01-25 17:11 ` Takashi Iwai
2008-01-25 18:34 ` Mariusz Kozlowski
2008-01-28 11:55 ` Takashi Iwai
2008-01-28 22:13 ` Mariusz Kozlowski
2008-01-25 21:59 ` 2.6.24-rc8-mm1 Torsten Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1200615168.3839.26.camel@cinder.waste.org \
--to=mpm@selenic.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=m.kozlowski@tuxland.pl \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).