Change 5c371b31be3203 in stable breaks Xen
I have a report of Xen breaking between 2.6.27.5 and .6. I bisected it down to change:
commit 5c371b31be32033b0a4a993431484da8a2305369
Author: Yinghai Lu <[email protected]> Date: Mon Sep 22 02:52:26 2008 -0700
x86: fix CONFIG_X86_RESERVE_LOW_64K=y
commit 2216d199b1430d1c0affb1498a9ebdbd9c0de439 upstream
The bad_bios_dmi_table() quirk never triggered because we do DMI setup too late. Move it a bit earlier.
Also change the CONFIG_X86_RESERVE_LOW_64K quirk to operate on the e820 table directly instead of messing with early reservations - this handles overlaps (which do occur in this low range of RAM) more gracefully.
I haven't completely root-caused why this is OK in mainline but failing in stable, but this patch works around the problem.
drivers/firmware/dmi_scan.c +0 -0
@@ -7,6 +7,7 @@
#include <linux/bootmem.h>
#include <linux/slab.h>
#include <asm/dmi.h>
+#include <asm/xen/hypervisor.h>
/*
* DMI stands for "Desktop Management Interface". It is part
@@ -364,6 +365,11 @@ void __init dmi_scan_machine(void)
char __iomem *p, *q;
int rc;+#ifdef CONFIG_XEN
+ if (is_running_on_xen())
+ return;
+#endif
+
if (efi_enabled) {
if (efi.smbios == EFI_INVALID_TABLE_ADDR)
goto out;Quoted 11 lines · Jeremy Fitzhardinge
I have a report of Xen breaking between 2.6.27.5 and .6. I bisected it
down to change:commit
5c371b31be32033b0a4a993431484da8a2305369Author: Yinghai Lu <[email protected]> Date: Mon Sep 22 02:52:26 2008 -0700x86: fix CONFIG_X86_RESERVE_LOW_64K=y commit 2216d199b1430d1c0affb1498a9ebdbd9c0de439 upstream
Looks like 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 might be needed in stable too?
commit 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7
Author: Ian Campbell <[email protected]>
Date: Fri Oct 10 11:27:38 2008 +0100
xen: do not reserve 2 pages of padding between hypervisor and fixmap.
When reserving space for the hypervisor the Xen paravirt backend adds an extra two pages (this was carried forward from the 2.6.18-xen tree which had them "for safety"). Depending on various CONFIG options this can cause the boot time fixmaps to span multiple PMDs which is not supported and triggers a WARN in early_ioremap_init().
This was exposed by 2216d199b1430d1c0affb1498a9ebdbd9c0de439 which moved the dmi table parsing earlier.
x86: fix CONFIG_X86_RESERVE_LOW_64K=y
The bad_bios_dmi_table() quirk never triggered because we do DMI setup too late. Move it a bit earlier.
There is no real reason to reserve these two extra pages and the fixmap already incorporates FIX_HOLE which serves the same purpose. None of the other callers of reserve_top_address do this.
Signature · 4 lines
Ian Campbell Moonchild without an opinion? Satan is skating to work tomorrow! -- Brett Manz
Quoted 9 lines · Ian Campbell
Quoted 7 lines · Jeremy Fitzhardinge
I have a report of Xen breaking between 2.6.27.5 and .6. I bisected it down to change:
commit
5c371b31be32033b0a4a993431484da8a2305369Author: Yinghai Lu <[email protected]> Date: Mon Sep 22 02:52:26 2008 -0700
Quoted 8 lines
Quoted 4 lines
x86: fix CONFIG_X86_RESERVE_LOW_64K=y commit 2216d199b1430d1c0affb1498a9ebdbd9c0de439 upstreamLooks like
5dc64a3442b98eaa0e3730c35fcf00cf962a93e7might be needed in stable too?
Ah, yes, that looks like the right fix. I'll see if it helps.
J
Quoted 26 lines
commit
5dc64a3442b98eaa0e3730c35fcf00cf962a93e7
Author: Ian Campbell <[email protected]>
Date: Fri Oct 10 11:27:38 2008 +0100xen: do not reserve 2 pages of padding between hypervisor and fixmap.
When reserving space for the hypervisor the Xen paravirt backend adds an extra two pages (this was carried forward from the 2.6.18-xen tree which had them "for safety"). Depending on various CONFIG options this can cause the boot time fixmaps to span multiple PMDs which is not supported and triggers a WARN in
early_ioremap_init().This was exposed by
2216d199b1430d1c0affb1498a9ebdbd9c0de439which moved the dmi table parsing earlier.
x86: fixCONFIG_X86_RESERVE_LOW_64K=yThe
bad_bios_dmi_table()quirk never triggered because we do DMI setup too late. Move it a bit earlier.There is no real reason to reserve these two extra pages and the fixmap already incorporates
FIX_HOLEwhich serves the same purpose. None of the other callers ofreserve_top_addressdo this.
Quoted 13 lines · Jeremy Fitzhardinge
Quoted 12 lines · Ian Campbell
Quoted 10 lines · Jeremy Fitzhardinge
I have a report of Xen breaking between 2.6.27.5 and .6. I bisected it
down to change:commit
5c371b31be32033b0a4a993431484da8a2305369Author: Yinghai Lu <[email protected]> Date: Mon Sep 22 02:52:26 2008 -0700x86: fix CONFIG_X86_RESERVE_LOW_64K=y
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
commit 2216d199b1430d1c0affb1498a9ebdbd9c0de439 upstreamLooks like
5dc64a3442b98eaa0e3730c35fcf00cf962a93e7might be needed in stable too?Ah, yes, that looks like the right fix. I'll see if it helps.
If so, let us know and we will add it to the next -stable release.
thanks,
greg k-h
Quoted 4 lines · Greg KH
Quoted 2 lines
Ah, yes, that looks like the right fix. I'll see if it helps.
If so, let us know and we will add it to the next -stable release.
Yep. Cherry-picking 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 onto 2.6.27.7 fixes the bug.
Thanks,
J