[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel-xen-2.6/devel linux-2.6-disable-netback-checksum.patch, NONE, 1.1 linux-2.6-fix-x86_64-smp.patch, NONE, 1.1 linux-2.6-fix-x86_64-vgetcpu.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 kernel-xen.spec, 1.20, 1.21 sources, 1.4, 1.5 xen-version-strings.patch, 1.2, 1.3



Author: quintela

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17065

Modified Files:
	.cvsignore kernel-xen.spec sources xen-version-strings.patch 
Added Files:
	linux-2.6-disable-netback-checksum.patch 
	linux-2.6-fix-x86_64-smp.patch 
	linux-2.6-fix-x86_64-vgetcpu.patch 
Log Message:
- Updated Xen Hypervisor tarball to 3.1.0-rc7, hg cset 7041b52471c3


linux-2.6-disable-netback-checksum.patch:

--- NEW FILE linux-2.6-disable-netback-checksum.patch ---
From: Herbert Xu <herbert xu redhat com>
Subject: Re: Final resolution for the checksum problems


Daniel P. Berrange <berrange redhat com> wrote:
>
>> > Alternatively we could just make netback default tx checksums to off
>> > which should have a similar effect as disabling it on virbr0.
>> 
>> This seems like a simpler path than introducing new infrastructure for
>> scripts to run every time the interface is brought up/down.  And then
>> it's even easier to remove the "trigger" when we get the functionality
>> in the kernel
> 
> I agree - this would be even simpler. 

Here is a patch which does just that.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert gondor apana org au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
--- a/drivers/xen/netback/interface.c	2007-04-28 11:57:31.000000000 +1000
+++ b/drivers/xen/netback/interface.c	2007-05-02 19:58:16.000000000 +1000
@@ -161,7 +161,6 @@
 	dev->open            = net_open;
 	dev->stop            = net_close;
 	dev->change_mtu	     = netbk_change_mtu;
-	dev->features        = NETIF_F_IP_CSUM;
 
 	SET_ETHTOOL_OPS(dev, &network_ethtool_ops);
 



linux-2.6-fix-x86_64-smp.patch:

--- NEW FILE linux-2.6-fix-x86_64-smp.patch ---
--- linux-2.6.20.noarch/arch/x86_64/kernel/time-xen.c~orig	2007-04-26 02:05:31.000000000 -0700
+++ linux-2.6.20.noarch/arch/x86_64/kernel/time-xen.c	2007-04-26 02:02:27.000000000 -0700
@@ -985,7 +985,7 @@ void time_resume(void)
 #ifdef CONFIG_SMP
 static char timer_name[NR_CPUS][15];
 
-void local_setup_timer(unsigned int cpu)
+int local_setup_timer(unsigned int cpu)
 {
 	int seq;
 
@@ -1009,6 +1009,7 @@ void local_setup_timer(unsigned int cpu)
 			timer_name[cpu],
 			NULL);
 	BUG_ON(per_cpu(timer_irq, cpu) < 0);
+	return 0;
 }
 
 void local_teardown_timer(unsigned int cpu)

linux-2.6-fix-x86_64-vgetcpu.patch:

--- NEW FILE linux-2.6-fix-x86_64-vgetcpu.patch ---
--- linux-2.6.20.noarch/arch/x86_64/kernel/vsyscall.c~orig	2007-04-26 02:05:31.000000000 -0700
+++ linux-2.6.20.noarch/arch/x86_64/kernel/vsyscall.c	2007-04-26 15:11:02.000000000 -0700
@@ -40,6 +40,9 @@
 #include <asm/segment.h>
 #include <asm/desc.h>
 #include <asm/topology.h>
+#ifdef CONFIG_XEN
+#include <asm/hypercall.h>
+#endif
 
 #define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
 #define __syscall_clobber "r11","rcx","memory"
@@ -246,12 +249,11 @@
 
 #endif
 
-#ifndef CONFIG_XEN
 /* Assume __initcall executes before all user space. Hopefully kmod
    doesn't violate that. We'll find out if it does. */
 static void __cpuinit vsyscall_set_cpu(int cpu)
 {
-	unsigned long *d;
+	unsigned long *d, n;
 	unsigned long node = 0;
 #ifdef CONFIG_NUMA
 	node = cpu_to_node[cpu];
@@ -263,10 +265,15 @@
 	   in user space in vgetcpu.
 	   12 bits for the CPU and 8 bits for the node. */
 	d = (unsigned long *)(cpu_gdt(cpu) + GDT_ENTRY_PER_CPU);
-	*d = 0x0f40000000000ULL;
-	*d |= cpu;
-	*d |= (node & 0xf) << 12;
-	*d |= (node >> 4) << 48;
+	n = 0x0f40000000000ULL;
+	n |= cpu;
+	n |= (node & 0xf) << 12;
+	n |= (node >> 4) << 48;
+#ifndef CONFIG_XEN
+	*d = n;
+#else
+	HYPERVISOR_update_descriptor(virt_to_machine(d), n);
+#endif
 }
 
 static void __cpuinit cpu_vsyscall_init(void *arg)
@@ -283,7 +290,6 @@
 		smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
 	return NOTIFY_DONE;
 }
-#endif
 
 static void __init map_vsyscall(void)
 {
@@ -320,10 +326,8 @@
 #ifdef CONFIG_SYSCTL
 	register_sysctl_table(kernel_root_table2, 0);
 #endif
-#ifndef CONFIG_XEN
 	on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
 	hotcpu_notifier(cpu_vsyscall_notifier, 0);
-#endif
 	return 0;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Apr 2007 22:09:41 -0000	1.4
+++ .cvsignore	7 May 2007 18:47:08 -0000	1.5
@@ -1,6 +1,3 @@
-linux-2.6.19.tar.bz2
-patch-2.6.19.2.bz2
-xen-3.0.4-13132.tar.bz2
 linux-2.6.20.tar.bz2
 patch-2.6.20.3.bz2
-xen-3.0.5-rc3-14934.tar.bz2
+xen-3.1.0-rc7-7041b52471c3.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kernel-xen.spec	30 Apr 2007 22:37:02 -0000	1.20
+++ kernel-xen.spec	7 May 2007 18:47:08 -0000	1.21
@@ -32,12 +32,13 @@
 %define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}testbuild4
 
 %define make_target bzImage
 %define kernel_image x86
 
-%define xen_hv_cset 14934
+%define xen_hv_version 3.1.0-rc7
+%define xen_hv_cset 7041b52471c3
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -255,7 +256,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-3.0.5-rc3-%{xen_hv_cset}.tar.bz2
+Source1: xen-%{xen_hv_version}-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -373,6 +374,9 @@
 Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
+# smp/vgetcpu fixes (#238015)
+Patch956: linux-2.6-fix-x86_64-smp.patch
+Patch957: linux-2.6-fix-x86_64-vgetcpu.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -425,6 +429,7 @@
 Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
 Patch1663: linux-2.6-kill_skbuff_hack.patch
 Patch1664: linux-2.6-csum-missing-line.patch
+Patch1665: linux-2.6-disable-netback-checksum.patch
 
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1682: linux-2.6-xfs_attr2.patch
@@ -889,6 +894,9 @@
 # Xen exec-shield bits
 %patch954 -p1
 %patch955 -p1
+# smp/vgetcpu fixes (#238015)
+%patch956 -p1
+%patch957 -p1
 %endif
 
 #
@@ -971,6 +979,7 @@
 %patch1662 -p1
 %patch1663 -p1
 %patch1664 -p1
+%patch1665 -p1
 
 # Fix XFS umount bug.
 %patch1681 -p1
@@ -1108,7 +1117,7 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
+cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
@@ -1337,7 +1346,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-  cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
+  cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
   make %{?_smp_mflags} %{xen_flags}
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
@@ -2002,6 +2011,15 @@
 #  - tux.
 
 %changelog
+* Fri May 04 2007 Eduardo Habkost <ehabkost redhat com>
+- Updated Xen Hypervisor tarball to 3.1.0-rc7, hg cset 7041b52471c3
+
+* Tue May 01 2007 Eduardo Habkost <ehabkost redhat com>
+- Updated Xen Hypervisor to 3.0.5-rc4, hg cset 1668299c0ea4
+- Added smp and vgetcpu fixes (bug #238015)
+- Added patch from Heberter Xu, disabling checksum on netback,
+  to work around problems with DHCP and partial checksums on guests
+
 * Fri Apr 27 2007 Eduardo Habkost <ehabkost redhat com>
 - Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934
 - Included checksum patches to fix bug #223258


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Apr 2007 22:09:41 -0000	1.4
+++ sources	7 May 2007 18:47:08 -0000	1.5
@@ -1,6 +1,3 @@
-443c265b57e87eadc0c677c3acc37e20  linux-2.6.19.tar.bz2
-e8a9a6dc65da3f7b192e7caa969f9a1b  patch-2.6.19.2.bz2
-ec35d2aa26cb452832761ff7ce9c4583  xen-3.0.4-13132.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 30764d4152c727b8ec7b709ab5464ec3  patch-2.6.20.3.bz2
-f8922a14df26193321284bbf90feacac  xen-3.0.5-rc3-14934.tar.bz2
+b73a966a55f3907020a1a29b4e2df64d  xen-3.1.0-rc7-7041b52471c3.tar.bz2

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-version-strings.patch	30 Apr 2007 22:09:41 -0000	1.2
+++ xen-version-strings.patch	7 May 2007 18:47:08 -0000	1.3
@@ -5,9 +5,9 @@
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
- export XEN_SUBVERSION    = 0
--export XEN_EXTRAVERSION ?= .5-rc3$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .5-rc3$(XEN_VENDORVERSION)
+ export XEN_SUBVERSION    = 1
+-export XEN_EXTRAVERSION ?= .0-rc7$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .0-rc7$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?= 
 +export XEN_BUILDVERSION ?= 
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]