rpms/kernel/FC-6 linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch, NONE, 1.1 xen-oprofile-on-intel-core.patch, NONE, 1.1 kernel-2.6.spec, 1.2900, 1.2901

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jan 31 09:10:03 UTC 2007


Author: armbru

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7208

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch 
	xen-oprofile-on-intel-core.patch 
Log Message:
- Xenoprof for intel core (#215519).
- Fix iSCSI root oops on x86_64 xen domU.

linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch:
 pci-dma-xen.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)

--- NEW FILE linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch ---
From: Rik van Riel <riel at redhat.com>
Subject: [PATCH][RHEL5] fix iSCSI root oops on x86_64 xen domU
Date: Tue, 14 Nov 2006 15:46:28 -0500
Bugzilla: 215581
Message-Id: <455A2B24.1090002 at redhat.com>
Changelog: Xen: fix iSCSI root oops on x86_64 xen domU


With iSCSI root on x86-64 domU, the kernel oopses in
scsi_calculate_bounce_limit() because dma_ops is NULL.

The attached patch (from upstream) initializes the iommu
operations pointer.  Even though the patch is to arch/i386/
it is x86-64 only, because this is inside the big x86-64
#ifdef in arch/i386/kernel/pci-dma-xen.c.

Thanks to Mark McLoughlin for noticing the issue and finding
the fix in the upstream tree.

Fixes bug #215581

-- 
Who do you trust?
The people with all the right answers?
Or the people with the right questions?

# HG changeset patch
# User chrisw at sous-sol.org
# Date Tue Oct 03 13:44:38 2006 -0400
# Node ID e5a7f30e1db3f1084f6789d21ea2a6fdaafdb96d
# parent: 6cd0fae5d84c4a4b15546ceaade74b7d7f044404
Make sure no_iommu_init is called when needed on x86_64.  Thanks
to Mark McLoughlin <markmc at redhat.com> for spotting the issue and
proposing a fix.

Index: latest/arch/i386/kernel/pci-dma-xen.c
===================================================================
--- latest.orig/arch/i386/kernel/pci-dma-xen.c
+++ latest/arch/i386/kernel/pci-dma-xen.c
@@ -20,6 +20,9 @@
 #include <asm/bug.h>
 
 #ifdef __x86_64__
+#include <asm/proto.h>
+#include <asm/calgary.h>
+
 int iommu_merge __read_mostly = 0;
 EXPORT_SYMBOL(iommu_merge);
 
@@ -70,6 +73,23 @@ __init int iommu_setup(char *p)
 {
     return 1;
 }
+
+static int __init pci_iommu_init(void)
+{
+#ifdef CONFIG_CALGARY_IOMMU
+	calgary_iommu_init();
+#endif
+
+#ifdef CONFIG_IOMMU
+	gart_iommu_init();
+#endif
+
+	no_iommu_init();
+	return 0;
+}
+
+/* Must execute after PCI subsystem */
+fs_initcall(pci_iommu_init);
 #endif
 
 struct dma_coherent_mem {

xen-oprofile-on-intel-core.patch:
 nmi_int.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE xen-oprofile-on-intel-core.patch ---
From: Glauber de Oliveira Costa <gcosta at redhat.com>
Subject: [PATCH RHEL-5] oprofile on Intel CORE
Date: Tue, 5 Dec 2006 16:49:13 -0200
Bugzilla: 213964
Message-Id: <20061205184913.GD13991 at redhat.com>
Changelog: xen: oprofile on Intel CORE


(with the patch _really_ following this time)

xen oprofile is not currently working on intel core and core 2
archs.  ( BZ 213964 ). Upstream took the patch that follows, and the
patch looks sane. It seems it was mostly a matter of matching the cpuid
of the new archs. It's also very low risk, since it just add new cases,
without interferring in the old ones.

It's neither a blocker nor we know if it is going to get the blocker
flag, but just in case, ACKs ? ;-)

-- 
Glauber de Oliveira Costa
Red Hat Inc.
"Free as in Freedom"

# HG changeset patch
# User kfraser at localhost.localdomain
# Node ID ca9b569ffb634604e6da477ab0b7a26004fe26bf
# Parent  7f7aeaa0cba6ec12a7230573b3bb8c32a26071c4
[OPROFILE] Add support for core and core2 chips.

Tested on Woodcrest  processors.  Requires Oprofile 0.9.2.

Signed-off-by: Andrew Theurer <habanero at us.ibm.com>

diff -r 7f7aeaa0cba6 -r ca9b569ffb63 xen/arch/x86/oprofile/nmi_int.c
--- xen/arch/x86/oprofile/nmi_int.c	Fri Nov 17 10:02:54 2006
+++ xen/arch/x86/oprofile/nmi_int.c	Fri Nov 17 10:05:12 2006
@@ -305,22 +305,24 @@
 {
 	__u8 cpu_model = current_cpu_data.x86_model;
 
-	if (cpu_model > 0xd) {
+	if (cpu_model > 15) {
 		printk("xenoprof: Initialization failed. "
 		       "Intel processor model %d for P6 class family is not "
 		       "supported\n", cpu_model);
 		return 0;
 	}
-
-	if (cpu_model == 9) {
+	else if (cpu_model == 15)
+		strncpy (cpu_type, "i386/core_2", XENOPROF_CPU_TYPE_SIZE - 1);
+	else if (cpu_model == 14)
+		strncpy (cpu_type, "i386/core", XENOPROF_CPU_TYPE_SIZE - 1);
+	else if (cpu_model == 9)
 		strncpy (cpu_type, "i386/p6_mobile", XENOPROF_CPU_TYPE_SIZE - 1);
-	} else if (cpu_model > 5) {
+	else if (cpu_model > 5)
 		strncpy (cpu_type, "i386/piii", XENOPROF_CPU_TYPE_SIZE - 1);
-	} else if (cpu_model > 2) {
+	else if (cpu_model > 2)
 		strncpy (cpu_type, "i386/pii", XENOPROF_CPU_TYPE_SIZE - 1);
-	} else {
+	else
 		strncpy (cpu_type, "i386/ppro", XENOPROF_CPU_TYPE_SIZE - 1);
-	}
 
 	model = &op_ppro_spec;
 	return 1;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2900
retrieving revision 1.2901
diff -u -r1.2900 -r1.2901
--- kernel-2.6.spec	30 Jan 2007 22:09:44 -0000	1.2900
+++ kernel-2.6.spec	31 Jan 2007 09:10:00 -0000	1.2901
@@ -370,6 +370,7 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
+Patch959: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -495,6 +496,7 @@
 Patch20000: xen-printf-rate-limit.patch
 Patch20001: xen-version-strings.patch
 Patch20002: xen-grant-security.patch
+Patch20015: xen-oprofile-on-intel-core.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -898,6 +900,8 @@
 %patch955 -p1
 # ia64 xen cleanups for kexec/kdump
 %patch958 -p1
+
+%patch959 -p1
 %endif
 
 #
@@ -1145,6 +1149,7 @@
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
+%patch20015 -p1
 
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
@@ -2017,6 +2022,10 @@
 %endif
 
 %changelog
+* Wed Jan 31 2007 Markus Armbruster <armbru at redhat.com>
+- Xenoprof for intel core (#215519).
+- Fix iSCSI root oops on x86_64 xen domU.
+
 * Tue Jan 30 2007 Chuck Ebbert <cebbert at redhat.com>
 - Minor config file changes
 




More information about the fedora-cvs-commits mailing list