[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1204647331.2774.18.camel@muff>
Date: Tue, 04 Mar 2008 16:15:31 +0000
From: Mark McLoughlin <markmc@...hat.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: Ian Campbell <ijc@...lion.org.uk>,
"H. Peter Anvin" <hpa@...or.com>,
Alexander van Heukelum <heukelum@...lshack.com>,
Alexander van Heukelum <heukelum@...tmail.fm>,
Andi Kleen <ak@...e.de>, Thomas Gleixner <tglx@...utronix.de>,
Jeremy Fitzhardinge <jeremy@...p.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [RFC] use realmode code to reserve end-of-conventional-memory
to 1MB
On Tue, 2008-03-04 at 15:33 +0100, Ingo Molnar wrote:
> * Mark McLoughlin <markmc@...hat.com> wrote:
>
> > > The patch below seems like the right thing to do. It certainly boots
> > > in a domU without the DMI problem (without any of the other related
> > > patches such as Alexander's).
> >
> > Yep, this patch on its own fixes 2.6.25-rc3 DomU boot for me here.
>
> thanks - i picked it up for v2.6.25 merging.
Great.
> i'm wondering, what triggered this bug, and why didnt we have these
> problems in the past?
That's been bothering me too, but hadn't come up with anything until I
just now looked again.
I'm pretty certain that dmi_scan_machine() wasn't using a fixmap before
(in 2.6.24) since I had to fix a broken xen dom0 patch to handle this
new situation.
Looking at 2.6.24 bt_ioremap(), it would have been hitting this:
/*
* Don't remap the low PCI/ISA area, it's always mapped..
*/
if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
return phys_to_virt(phys_addr);
If I restore this behaviour (i.e. remove Ian's e820 hole and add the
patch below), then I see us still allocating a page table at 0xf0000 but
we don't then try and create a new writable mapping to it later, and
everything goes fine.
That's a little worrying though, surely? The mapping created by
kernel_physical_mapping_init() is writable, so shouldn't Xen barf if you
try and use a page within that mapping as a page table?
Cheers,
Mark.
>>From c43a8a1badf5347a57d66556a4ba497623d620d4 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@...hat.com>
Date: Tue, 4 Mar 2008 15:32:03 +0000
Subject: [PATCH] x86: Don't remap the ISA region in early_ioremap()
Restore the previous behaviour of bt_ioremap() where
it would use the existing mapping of the ISA region
rather than using a fixmap.
Signed-off-by: Mark McLoughlin <markmc@...hat.com>
---
arch/x86/mm/ioremap.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 882328e..89fdd8f 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -425,6 +425,13 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size)
return NULL;
}
+ /*
+ * Don't remap the low PCI/ISA area, it's always mapped..
+ */
+ if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
+ return phys_to_virt(phys_addr);
+
+
if (nesting >= FIX_BTMAPS_NESTING) {
WARN_ON(1);
return NULL;
@@ -471,6 +478,10 @@ void __init early_iounmap(void *addr, unsigned long size)
enum fixed_addresses idx;
unsigned int nesting;
+ virt_addr = (unsigned long)addr;
+ if (virt_addr < fix_to_virt(FIX_BTMAP_BEGIN))
+ return;
+
nesting = --early_ioremap_nested;
WARN_ON(nesting < 0);
@@ -480,11 +491,6 @@ void __init early_iounmap(void *addr, unsigned long size)
dump_stack();
}
- virt_addr = (unsigned long)addr;
- if (virt_addr < fix_to_virt(FIX_BTMAP_BEGIN)) {
- WARN_ON(1);
- return;
- }
offset = virt_addr & ~PAGE_MASK;
nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT;
--
1.5.4.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists