upgrade 2.6.12 - testing wanted

PATCH In review Vincent Hanquez 6 participants 11 messages Jul 7, 2005 – Jul 8, 2005

Share & tools

Vincent Hanquez

author

2005-07-07 18:34 UTC #0 lore raw

Hi,

we are going to upgrade very soon the repository to 2.6.12. meanwhile I'ld appreciate if some people could test the patch, and see if there's no regressions or anything bad before everybody get to use it.

just get latest snapshot of unstable, then do:

mv linux-2.6.11-xen-sparse/ linux-2.6.12-xen-sparse/ mv patches/linux-2.6.11/ patches/linux-2.6.12/
rm patches/linux-2.6.12/agpgart.patch
rm patches/linux-2.6.12/i386-cpu-hotplug-updated-for-mm.patch rm patches/linux-2.6.12/iomap.patch
rm patches/linux-2.6.12/linux-2.6.11.12.patch
rm patches/linux-2.6.12/udp-frag.patch

get the patch here:

http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/temp/xen-upgrade-2612-rc2.diff.bz2

and apply it on top of your repository.

Cheers,

Signature · 1 line

Vincent Hanquez

Andrew Theurer

2005-07-07 19:12 UTC #1 lore raw

Quoted 6 lines · Vincent Hanquez

Hi,
we are going to upgrade very soon the repository to 2.6.12. meanwhile I'ld appreciate if some people could test the patch, and see if there's no regressions or anything bad before everybody get to use it.

I'll run 2.6.12 patched and latest -unstable through my benchmarks here.

-Andrew

Quoted 19 lines

just get latest snapshot of unstable, then do:
mv linux-2.6.11-xen-sparse/ linux-2.6.12-xen-sparse/ mv patches/linux-2.6.11/ patches/linux-2.6.12/
rm patches/linux-2.6.12/agpgart.patch
rm patches/linux-2.6.12/i386-cpu-hotplug-updated-for-mm.patch rm patches/linux-2.6.12/iomap.patch
rm patches/linux-2.6.12/linux-2.6.11.12.patch
rm patches/linux-2.6.12/udp-frag.patch
get the patch here:
http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/temp/xen-upg
rade-2612-rc2.diff.bz2
and apply it on top of your repository.
Cheers,

Andrew Theurer

2005-07-07 19:30 UTC #2 lore raw

In reply to Vincent Hanquez

Quoted 17 lines · Vincent Hanquez

Hi,
we are going to upgrade very soon the repository to 2.6.12. meanwhile I'ld appreciate if some people could test the patch, and see if there's no regressions or anything bad before everybody get to use it.
just get latest snapshot of unstable, then do:
mv linux-2.6.11-xen-sparse/ linux-2.6.12-xen-sparse/ mv patches/linux-2.6.11/ patches/linux-2.6.12/
rm patches/linux-2.6.12/agpgart.patch
rm patches/linux-2.6.12/i386-cpu-hotplug-updated-for-mm.patch rm patches/linux-2.6.12/iomap.patch
rm patches/linux-2.6.12/linux-2.6.11.12.patch
rm patches/linux-2.6.12/udp-frag.patch

Quoted 4 lines

get the patch here:
http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/temp/xen-upg
rade-2612-rc2.diff.bz2

on xenU:

# make
  CHK     include/linux/version.h
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  CC      arch/xen/i386/kernel/process.o
arch/xen/i386/kernel/process.c: In function `play_dead':
arch/xen/i386/kernel/process.c:119: error: `per_cpu__cpu_state' 
undeclared (first use in this function)
arch/xen/i386/kernel/process.c:119: error: (Each undeclared identifier 
is reported only once
arch/xen/i386/kernel/process.c:119: error: for each function it appears 
in.)
arch/xen/i386/kernel/process.c:119: warning: type defaults to `int' in 
declaration of `type name'
arch/xen/i386/kernel/process.c:119: error: invalid type argument of 
`unary *'
arch/xen/i386/kernel/process.c:125: warning: type defaults to `int' in 
declaration of `type name'
arch/xen/i386/kernel/process.c:125: error: invalid type argument of 
`unary *'
make[1]: *** [arch/xen/i386/kernel/process.o] Error 1
make: *** [arch/xen/i386/kernel] Error 2

Did you come across this while building linux-2.6.12-xenU?

-Andrew

Paul Larson

2005-07-07 19:53 UTC #3 lore raw

Quoted 14 lines · Andrew Theurer

CHK include/linux/version.h
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  CC      arch/xen/i386/kernel/process.o
arch/xen/i386/kernel/process.c: In function `play_dead':
arch/xen/i386/kernel/process.c:119: error: `per_cpu__cpu_state' undeclared (first use in this function) arch/xen/i386/kernel/process.c:119: error: (Each undeclared identifier is reported only once
arch/xen/i386/kernel/process.c:119: error: for each function it appears in.)
arch/xen/i386/kernel/process.c:119: warning: type defaults to int' in declaration of type name'

Quoted 8 lines

arch/xen/i386/kernel/process.c:119: error: invalid type argument of `unary *'
arch/xen/i386/kernel/process.c:125: warning: type defaults to int' in declaration of type name' arch/xen/i386/kernel/process.c:125: error: invalid type argument of `unary *'
make[1]: *** [arch/xen/i386/kernel/process.o] Error 1
make: *** [arch/xen/i386/kernel] Error 2

I'm getting the same.

Signature · 4 lines

Thanks,
Paul Larson
[email protected]
http://www.linuxtestproject.org

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Andrew Theurer

2005-07-07 20:06 UTC #4 lore raw

Quoted 24 lines · Paul Larson

Quoted 14 lines · Andrew Theurer
CHK include/linux/version.h
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  CC      arch/xen/i386/kernel/process.o
arch/xen/i386/kernel/process.c: In function `play_dead':
arch/xen/i386/kernel/process.c:119: error: `per_cpu__cpu_state' undeclared (first use in this function) arch/xen/i386/kernel/process.c:119: error: (Each undeclared identifier is reported only once arch/xen/i386/kernel/process.c:119: error: for each function it appears in.)
arch/xen/i386/kernel/process.c:119: warning: type defaults to int' in declaration of type name'
Quoted 8 lines
arch/xen/i386/kernel/process.c:119: error: invalid type argument of `unary *'
arch/xen/i386/kernel/process.c:125: warning: type defaults to int' in declaration of type name' arch/xen/i386/kernel/process.c:125: error: invalid type argument of `unary *'
make[1]: *** [arch/xen/i386/kernel/process.o] Error 1
make: *** [arch/xen/i386/kernel] Error 2

Quoted 1 line

I'm getting the same.

For now I am disabling hotplug_cpu.

-Andrew

Paul Larson

2005-07-07 20:29 UTC #5 lore raw

And another:

CC arch/xen/i386/kernel/smpboot.o
CC arch/xen/i386/kernel/mpparse.o
arch/xen/i386/kernel/mpparse.c: In function `get_smp_config':
arch/xen/i386/kernel/mpparse.c:700: error:
`isa_bus_to_virt_needs_PRIVILEGED_BUILD' undeclared (first use in this function)
arch/xen/i386/kernel/mpparse.c:700: error: (Each undeclared identifier is reported only once
arch/xen/i386/kernel/mpparse.c:700: error: for each function it appears in.)
arch/xen/i386/kernel/mpparse.c: In function `smp_scan_config':
arch/xen/i386/kernel/mpparse.c:735: error:
`isa_bus_to_virt_needs_PRIVILEGED_BUILD' undeclared (first use in this function)
make[4]: *** [arch/xen/i386/kernel/mpparse.o] Error 1 make[3]: *** [arch/xen/i386/kernel] Error 2
make[3]: Leaving directory `/home/plars/xen/xen-unstable.hg/linux-2.6.12-xenU'
make[2]: *** [build] Error 2
make[2]: Leaving directory `/home/plars/xen/xen-unstable.hg' make[1]: *** [linux-2.6-xenU-build] Error 2
make[1]: Leaving directory `/home/plars/xen/xen-unstable.hg'
make: *** [kernels] Error 1

Signature · 4 lines

Thanks,
Paul Larson
[email protected]
http://www.linuxtestproject.org

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Ryan Harper

2005-07-07 23:02 UTC #6 lore raw

PATCH 1/1 fix CONFIG_CPU_HOTPLUG compile with 2.6.12 upgrade

In reply to Andrew Theurer

Quoted 25 lines · Andrew Theurer

Quoted 24 lines · Paul Larson
Quoted 22 lines · Andrew Theurer
CHK include/linux/version.h
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  CC      arch/xen/i386/kernel/process.o
arch/xen/i386/kernel/process.c: In function `play_dead':
arch/xen/i386/kernel/process.c:119: error: `per_cpu__cpu_state' undeclared (first use in this function) arch/xen/i386/kernel/process.c:119: error: (Each undeclared identifier is reported only once arch/xen/i386/kernel/process.c:119: error: for each function it appears in.)
arch/xen/i386/kernel/process.c:119: warning: type defaults to int' in declaration of type name' arch/xen/i386/kernel/process.c:119: error: invalid type argument of `unary *'
arch/xen/i386/kernel/process.c:125: warning: type defaults to int' in declaration of type name' arch/xen/i386/kernel/process.c:125: error: invalid type argument of `unary *'
make[1]: *** [arch/xen/i386/kernel/process.o] Error 1
make: *** [arch/xen/i386/kernel] Error 2

Quoted 3 lines

Quoted 1 line
I'm getting the same.
For now I am disabling hotplug_cpu.

The attached patch gets CONFIG_HOTPLUG_CPU compiling again. I'll test out the kernel tomorrow. Not sure if domU should have LOCAL_APIC and IO_APIC enabled, they use code in mpparse.c CONFIG_X86_MPPARSE was being enabled but the code down that patch uses isa_bus_to_virt(_x) which requires CONFIG_XEN_PHYSDEV_ACCESS , which most domU's don't have.

Signature · 91 lines

Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
[email protected]


diffstat output:
 linux-2.6.12-xen-sparse/arch/xen/Kconfig.debug |    2 -
 linux-2.6.12-xen-sparse/arch/xen/i386/Kconfig  |    4 +-
 patches/linux-2.6.12/cpu_hotplug_fix.patch     |   42 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)

Signed-off-by: Ryan Harper <[email protected]>
---
diff -urN a/linux-2.6.12-xen-sparse/arch/xen/i386/Kconfig foo/linux-2.6.12-xen-sparse/arch/xen/i386/Kconfig
--- a/linux-2.6.12-xen-sparse/arch/xen/i386/Kconfig	2005-07-07 17:31:37.000000000 -0500
+++ foo/linux-2.6.12-xen-sparse/arch/xen/i386/Kconfig	2005-07-07 17:14:42.000000000 -0500
@@ -716,12 +716,12 @@
 
 config X86_LOCAL_APIC
 	bool
-	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
+	depends on XEN_PRIVILEGED_GUEST && (X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER))
 	default y
 
 config X86_IO_APIC
 	bool
-	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
+	depends on XEN_PRIVILEDGE_GUEST && (X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)))
 	default y
 
 config X86_VISWS_APIC
diff -urN a/linux-2.6.12-xen-sparse/arch/xen/Kconfig.debug foo/linux-2.6.12-xen-sparse/arch/xen/Kconfig.debug
--- a/linux-2.6.12-xen-sparse/arch/xen/Kconfig.debug	2005-07-07 17:31:37.000000000 -0500
+++ foo/linux-2.6.12-xen-sparse/arch/xen/Kconfig.debug	2005-07-07 16:44:53.000000000 -0500
@@ -68,7 +68,7 @@
 
 config X86_MPPARSE
 	bool
-	depends on X86_LOCAL_APIC && !X86_VISWS && X86
+	depends on X86_LOCAL_APIC && !X86_VISWS && X86 && XEN_PHYSDEV_ACCESS
 	default y
 
 # X86_64
diff -urN a/patches/linux-2.6.12/cpu_hotplug_fix.patch foo/patches/linux-2.6.12/cpu_hotplug_fix.patch
--- a/patches/linux-2.6.12/cpu_hotplug_fix.patch	1969-12-31 18:00:00.000000000 -0600
+++ foo/patches/linux-2.6.12/cpu_hotplug_fix.patch	2005-07-07 17:50:24.000000000 -0500
@@ -0,0 +1,42 @@
+diff -urN pristine-linux-2.6.12.orig/include/asm-i386/cpu.h pristine-linux-2.6.12/include/asm-i386/cpu.h
+--- pristine-linux-2.6.12.orig/include/asm-i386/cpu.h	2005-06-17 14:48:29.000000000 -0500
++++ pristine-linux-2.6.12/include/asm-i386/cpu.h	2005-07-07 17:40:44.777157769 -0500
+@@ -5,6 +5,7 @@
+ #include <linux/cpu.h>
+ #include <linux/topology.h>
+ #include <linux/nodemask.h>
++#include <linux/percpu.h>
+ 
+ #include <asm/node.h>
+ 
+@@ -16,4 +17,5 @@
+ extern void arch_unregister_cpu(int);
+ #endif
+ 
++DECLARE_PER_CPU(int, cpu_state);
+ #endif /* _ASM_I386_CPU_H_ */
+diff -urN pristine-linux-2.6.12.orig/include/asm-i386/irq.h pristine-linux-2.6.12/include/asm-i386/irq.h
+--- pristine-linux-2.6.12.orig/include/asm-i386/irq.h	2005-06-17 14:48:29.000000000 -0500
++++ pristine-linux-2.6.12/include/asm-i386/irq.h	2005-07-07 17:41:08.857793011 -0500
+@@ -38,4 +38,8 @@
+ extern int irqbalance_disable(char *str);
+ #endif
+ 
++#ifdef CONFIG_HOTPLUG_CPU
++extern void fixup_irqs(cpumask_t map);
++#endif
++
+ #endif /* _ASM_IRQ_H */
+diff -urN pristine-linux-2.6.12.orig/include/asm-i386/smp.h pristine-linux-2.6.12/include/asm-i386/smp.h
+--- pristine-linux-2.6.12.orig/include/asm-i386/smp.h	2005-06-17 14:48:29.000000000 -0500
++++ pristine-linux-2.6.12/include/asm-i386/smp.h	2005-07-07 17:41:30.824723517 -0500
+@@ -83,6 +83,9 @@
+ }
+ 
+ #endif
++
++extern int __cpu_disable(void);
++extern void __cpu_die(unsigned int cpu);
+ #endif /* !__ASSEMBLY__ */
+ 
+ #define NO_PROC_ID		0xFF		/* No processor magic marker */

David Hopwood

2005-07-08 00:12 UTC #7 lore raw

Re: [PATCH] fix CONFIG_CPU_HOTPLUG compile with 2.6.12 upgrade

Review

Quoted 4 lines · Ryan Harper

config X86_IO_APIC

(quoted diff) +1 -1

 	bool
-	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
+	depends on XEN_PRIVILEDGE_GUEST && (X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)))

Should be XEN_PRIVILEGED_GUEST.

Signature · 1 line

David Hopwood <[email protected]>

Ryan Harper

2005-07-07 21:12 UTC #8 lore raw

In reply to Andrew Theurer

Quoted 40 lines · Andrew Theurer

Quoted 17 lines · Vincent Hanquez
Hi,
we are going to upgrade very soon the repository to 2.6.12. meanwhile I'ld appreciate if some people could test the patch, and see if there's no regressions or anything bad before everybody get to use it.
just get latest snapshot of unstable, then do:
mv linux-2.6.11-xen-sparse/ linux-2.6.12-xen-sparse/ mv patches/linux-2.6.11/ patches/linux-2.6.12/
rm patches/linux-2.6.12/agpgart.patch
rm patches/linux-2.6.12/i386-cpu-hotplug-updated-for-mm.patch rm patches/linux-2.6.12/iomap.patch
rm patches/linux-2.6.12/linux-2.6.11.12.patch
rm patches/linux-2.6.12/udp-frag.patch
Quoted 4 lines
get the patch here:
http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/temp/xen-upg
rade-2612-rc2.diff.bz2
on xenU:
# make
  CHK     include/linux/version.h
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  CC      arch/xen/i386/kernel/process.o
arch/xen/i386/kernel/process.c: In function `play_dead':
arch/xen/i386/kernel/process.c:119: error: `per_cpu__cpu_state' 
undeclared (first use in this function)
arch/xen/i386/kernel/process.c:119: error: (Each undeclared identifier 
is reported only once
arch/xen/i386/kernel/process.c:119: error: for each function it appears 
in.)
arch/xen/i386/kernel/process.c:119: warning: type defaults to `int' in 
declaration of `type name'

Quoted 8 lines

arch/xen/i386/kernel/process.c:119: error: invalid type argument of 
`unary *'
arch/xen/i386/kernel/process.c:125: warning: type defaults to `int' in 
declaration of `type name'
arch/xen/i386/kernel/process.c:125: error: invalid type argument of 
`unary *'
make[1]: *** [arch/xen/i386/kernel/process.o] Error 1
make: *** [arch/xen/i386/kernel] Error 2

Looks like a host of CONFIG_HOTPLUG_CPU changes didn't make it into the headers. I'm cleaning this up and I'll post a patch if someone doesn't beat me to it.

Signature · 5 lines

Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
[email protected]

Vincent Hanquez

author

2005-07-08 16:04 UTC #9 lore raw

In reply to Andrew Theurer

Quoted 1 line · Andrew Theurer

Did you come across this while building linux-2.6.12-xenU?

Sorry I didn't because I didn't turn on HOTPLUG_CPU (nor SMP for domU) I've fix this one now, and trying to fix the other one and roll a new patchset for testing ASAP

Thanks,

Signature · 1 line

Vincent Hanquez

Chris Wright

2005-07-08 01:43 UTC #10 lore raw

In reply to Vincent Hanquez

Quoted 3 lines · * Vincent Hanquez ([email protected]) wrote:

we are going to upgrade very soon the repository to 2.6.12. meanwhile I'ld appreciate if some people could test the patch, and see if there's no regressions or anything bad before everybody get to use it.

Still working nicely for me on x86_64.

thanks,
-chris