Skip to contentSkip to conversation

fixing 2.6.10 UP builds

PATCH dann frazier 7 participants 15 messages Jan 6, 2005 – Jan 13, 2005

lore
Share & tools
lore
#0 lore raw

Debian is putting together 2.6.10 packages, and we noticed that we still need to forward port Jesse's patches. Attached is the patch Ubuntu forward ported, and Debian is including. It would be great to get this merged upstream so we don't need to port it for each release.

arch/ia64/kernel/Makefile +1 -0
diff -Nru a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
@@ -15,6 +15,7 @@
 obj-$(CONFIG_IOSAPIC)		+= iosapic.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o domain.o
+obj-$(CONFIG_NUMA)		+= numa.o
 obj-$(CONFIG_PERFMON)		+= perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
 
arch/ia64/kernel/numa.c new file +46 -0

46 lines not on this page · raw message

arch/ia64/kernel/smpboot.c +0 -41

47 lines not on this page · raw message

arch/ia64/mm/discontig.c +31 -21

88 lines not on this page · raw message

include/asm-ia64/smp.h +1 -0
diff -Nru a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
@@ -126,6 +126,7 @@
 #else
 
 #define cpu_logical_id(cpuid)		0
+#define cpu_physical_id(i)	((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
 
 #endif /* CONFIG_SMP */
 #endif /* _ASM_IA64_SMP_H */
arch/ia64/kernel/acpi.c +3 -1
diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/acpi.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/acpi.c
@@ -618,9 +618,11 @@
 			if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
 				node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
 	}
-	build_cpu_to_node_map();
 # endif
 #endif
+#ifdef CONFIG_ACPI_NUMA
+	build_cpu_to_node_map();
+#endif
 	/* Make boot-up look pretty */
 	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
 	return 0;
arch/ia64/kernel/cyclone.c +0 -2
diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/cyclone.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/cyclone.c
@@ -1,8 +1,6 @@
-#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <asm/io.h>
 
 /* IBM Summit (EXA) Cyclone counter code*/
 #define CYCLONE_CBAR_ADDR 0xFEB00CD0
arch/ia64/kernel/numa.c +30 -19

76 lines not on this page · raw message

arch/ia64/kernel/setup.c +0 -2
diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/setup.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/setup.c
@@ -317,11 +317,9 @@
 	machvec_init(acpi_get_sysname());
 #endif
 
-#ifdef CONFIG_SMP
 	/* If we register an early console, allow CPU 0 to printk */
 	if (!early_console_setup())
 		cpu_set(smp_processor_id(), cpu_online_map);
-#endif
 
 #ifdef CONFIG_ACPI_BOOT
 	/* Initialize the ACPI boot-time table parser */
arch/ia64/mm/discontig.c +17 -7
diff -urN kernel-source-2.6.8.defconfig/arch/ia64/mm/discontig.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/mm/discontig.c
@@ -398,8 +398,8 @@
  */
 static void __init initialize_pernode_data(void)
 {
-	int cpu, node;
 	pg_data_t *pgdat_list[NR_NODES];
+	int cpu, node;
 
 	for (node = 0; node < numnodes; node++)
 		pgdat_list[node] = mem_data[node].pgdat;
@@ -409,12 +409,22 @@
 		memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
 		       sizeof(pgdat_list));
 	}
-
+#ifdef CONFIG_SMP
 	/* Set the node_data pointer for each per-cpu struct */
 	for (cpu = 0; cpu < NR_CPUS; cpu++) {
 		node = node_cpuid[cpu].nid;
 		per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;
 	}
+#else
+	{
+		struct cpuinfo_ia64 *cpu0_cpu_info;
+		cpu = 0;
+		node = node_cpuid[cpu].nid;
+		cpu0_cpu_info = (struct cpuinfo_ia64 *)(__phys_per_cpu_start +
+			((char *)&per_cpu__cpu_info - __per_cpu_start));
+		cpu0_cpu_info->node_data = mem_data[node].node_data;
+	}
+#endif /* CONFIG_SMP */
 }
 
 /**
@@ -489,12 +499,11 @@
 {
 	int cpu;
 
-	if (smp_processor_id() = 0) {
-		for (cpu = 0; cpu < NR_CPUS; cpu++) {
-			per_cpu(local_per_cpu_offset, cpu) -				__per_cpu_offset[cpu];
-		}
-	}
+	if (smp_processor_id() != 0)
+		return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
+
+	for (cpu = 0; cpu < NR_CPUS; cpu++)
+		per_cpu(local_per_cpu_offset, cpu) = __per_cpu_offset[cpu];
 
 	return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
 }
#1 lore raw
Quoted 4 lines

Debian is putting together 2.6.10 packages, and we noticed that we still need to forward port Jesse's patches. Attached is the patch Ubuntu forward ported, and Debian is including. It would be great to get this merged upstream so we don't need to port it for each release.

2.6.10 built as UP for me (I have it running on zx2000).

Can you provide some changelog information on what this is doing. It also looks like this might be better separated back into a couple (or more) patches ... I see that arch/ia64/kernel/numa.c is being patched twice by this patch.

A "Signed-off-by:" line (or lines) is needed too.

-Tony

#2 lore raw
In reply to dann frazier
Quoted 4 lines · dann frazier

Debian is putting together 2.6.10 packages, and we noticed that we still need to forward port Jesse's patches. Attached is the patch Ubuntu forward ported, and Debian is including. It would be great to get this merged upstream so we don't need to port it for each release.

should be mentioned it's original from Jesse Barnes (OTOH the numa.c copyright message implies that already).

I'd like to second the request for inclusion, distributions like Debian really need a generic UP kernel, and having to forward-port patches everytime a new upstream release is out is extremly annoying.

arch/ia64/kernel/cyclone.c line 6

Quoted 11 lines
arch/ia64/kernel/cyclone.c +0 -2
@@ -1,8 +1,6 @@
-#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <asm/io.h>
 
 /* IBM Summit (EXA) Cyclone counter code*/
 #define CYCLONE_CBAR_ADDR 0xFEB00CD0

this hunk looks bogus.

#3 lore raw
In reply to dann frazier
Quoted 6 lines · Tony
Quoted 4 lines

Debian is putting together 2.6.10 packages, and we noticed that we still need to forward port Jesse's patches. Attached is the patch Ubuntu forward ported, and Debian is including. It would be great to get this merged upstream so we don't need to port it for each release.

2.6.10 built as UP for me (I have it running on zx2000).

A zx1 specific kernel? Most of these changes are NUMA and discontig specific, so they apply more to generic kernels than particular types.

Jesse

#4 lore raw
In reply to dann frazier
Quoted 6 lines
Quoted 2 lines

2.6.10 built as UP for me (I have it running on zx2000).

A zx1 specific kernel? Most of these changes are NUMA and discontig specific,
so they apply more to generic kernels than particular types.

Ah yes ... I based my config on the zx1_config file ... a generic UP build does have problems that need to be fixed.

-Tony

#5 lore raw
In reply to dann frazier

I've regenerated this patch, original developed by Jesse Barnes, against 2.6.10, which fixes UP builds. I've also removed the bogus header removals from the cyclone driver.

I won't pretend to be able to explain the details, hopefully Jesse recalls :)

arch/ia64/kernel/Makefile +1 -0
diff -urN linux-2.6.10.orig/arch/ia64/kernel/Makefile linux-2.6.10/arch/ia64/kernel/Makefile
@@ -15,6 +15,7 @@
 obj-$(CONFIG_IOSAPIC)		+= iosapic.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o domain.o
+obj-$(CONFIG_NUMA)		+= numa.o
 obj-$(CONFIG_PERFMON)		+= perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
 obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
arch/ia64/kernel/acpi.c +3 -1
diff -urN linux-2.6.10.orig/arch/ia64/kernel/acpi.c linux-2.6.10/arch/ia64/kernel/acpi.c
@@ -627,9 +627,11 @@
 			if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
 				node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
 	}
-	build_cpu_to_node_map();
 # endif
 #endif
+#ifdef CONFIG_ACPI_NUMA
+	build_cpu_to_node_map();
+#endif
 	/* Make boot-up look pretty */
 	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
 	return 0;
arch/ia64/kernel/numa.c +57 -0

57 lines not on this page · raw message

arch/ia64/kernel/smpboot.c +0 -41

47 lines not on this page · raw message

arch/ia64/mm/discontig.c +48 -22

121 lines not on this page · raw message

include/asm-ia64/smp.h +1 -0
diff -urN linux-2.6.10.orig/include/asm-ia64/smp.h linux-2.6.10/include/asm-ia64/smp.h
@@ -126,6 +126,7 @@
 #else
 
 #define cpu_logical_id(cpuid)		0
+#define cpu_physical_id(i)	((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
 
 #endif /* CONFIG_SMP */
 #endif /* _ASM_IA64_SMP_H */
include/asm-ia64/sn/sn_cpuid.h +0 -6
diff -urN linux-2.6.10.orig/include/asm-ia64/sn/sn_cpuid.h linux-2.6.10/include/asm-ia64/sn/sn_cpuid.h
@@ -80,12 +80,6 @@
  *
  */
 
-#ifndef CONFIG_SMP
-#define cpu_logical_id(cpu)			0
-#define cpu_physical_id(cpuid)			((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
-#endif
-
-
 #define get_node_number(addr)			(((unsigned long)(addr)>>38) & 0x7ff)
 
 /*
#6 lore raw
In reply to dann frazier
Quoted 6 lines

I've regenerated this patch, original developed by Jesse Barnes, against 2.6.10, which fixes UP builds. I've also removed the bogus header removals from the cyclone driver.

I won't pretend to be able to explain the details, hopefully Jesse recalls :)

I think that I pulled together all the pieces, but I still see a couple of problems when trying to build a generic-UP kernel:

CC drivers/char/mmtimer.o
drivers/char/mmtimer.c: In function `mmtimer_tasklet':
drivers/char/mmtimer.c:502: structure has no member named `write_lock' make[1]: *** [drivers/char/mmtimer.o] Error 1
make: *** [drivers/char/mmtimer.o] Error 2

CC arch/ia64/sn/kernel/sn2/sn_hwperf.o
In file included from arch/ia64/sn/kernel/sn2/sn_hwperf.c:33:
include/linux/nodemask.h: In function `__first_unset_node':
include/linux/nodemask.h:244: warning: passing arg 1 of __find_next_zero_bit' discards qualifiers from pointer target type arch/ia64/sn/kernel/sn2/sn_hwperf.c: In function sn_hwperf_op_cpu':
arch/ia64/sn/kernel/sn2/sn_hwperf.c:360: warning: implicit declaration of function `smp_call_function_single'

-Tony

#7 lore raw
In reply to dann frazier
Quoted 7 lines · Tony
Quoted 6 lines

I've regenerated this patch, original developed by Jesse Barnes, against 2.6.10, which fixes UP builds. I've also removed the bogus header removals from the cyclone driver.

I won't pretend to be able to explain the details, hopefully Jesse recalls :)

Quoted 8 lines

I think that I pulled together all the pieces, but I still see a couple of problems when trying to build a generic-UP kernel:

CC drivers/char/mmtimer.o
drivers/char/mmtimer.c: In function `mmtimer_tasklet':
drivers/char/mmtimer.c:502: structure has no member named `write_lock' make[1]: *** [drivers/char/mmtimer.o] Error 1
make: *** [drivers/char/mmtimer.o] Error 2

Looks like we need rwlock_is_write_locked for this one. Christoph?

Quoted 5 lines

CC arch/ia64/sn/kernel/sn2/sn_hwperf.o
In file included from arch/ia64/sn/kernel/sn2/sn_hwperf.c:33:
include/linux/nodemask.h: In function `__first_unset_node':
include/linux/nodemask.h:244: warning: passing arg 1 of `__find_next_zero_bit' discards qualifiers from pointer target type

This warning was introduced upstream with the nodemask stuff. It should be fixed but is unrelated to the UP stuff.

Quoted 3 lines

arch/ia64/sn/kernel/sn2/sn_hwperf.c: In function `sn_hwperf_op_cpu':
arch/ia64/sn/kernel/sn2/sn_hwperf.c:360: warning: implicit declaration of function `smp_call_function_single'

Looks like we need a !CONFIG_SMP version of smp_call_function_single. include/linux/smp.h has a non-smp version of smp_call_function that just returns 0, should smp_call_function_single do the same thing?

Jesse

#8 lore raw
In reply to dann frazier
Quoted 6 lines
Quoted 2 lines

arch/ia64/sn/kernel/sn2/sn_hwperf.c: In function `sn_hwperf_op_cpu':
arch/ia64/sn/kernel/sn2/sn_hwperf.c:360: warning: implicit declaration of function `smp_call_function_single'

Looks like we need a !CONFIG_SMP version of smp_call_function_single. include/linux/smp.h has a non-smp version of smp_call_function that just returns 0, should smp_call_function_single do the same thing?

That would make the warning go away, but it isn't obvious to me that you'd end up with code that did the right thing. Looking at the bigger picture, just what is sn_hwperf_op_cpu() supposed to do in the UP case?

-Tony

#9 lore raw
In reply to dann frazier
Quoted 7 lines · Jesse Barnes
Quoted 5 lines

CC drivers/char/mmtimer.o
drivers/char/mmtimer.c: In function `mmtimer_tasklet':
drivers/char/mmtimer.c:502: structure has no member named `write_lock' make[1]: *** [drivers/char/mmtimer.o] Error 1
make: *** [drivers/char/mmtimer.o] Error 2

Looks like we need rwlock_is_write_locked for this one. Christoph?

Correct.

#10 lore raw
In reply to dann frazier
Quoted 4 lines · Tony
Quoted 4 lines
Quoted 3 lines

arch/ia64/sn/kernel/sn2/sn_hwperf.c: In function `sn_hwperf_op_cpu':
arch/ia64/sn/kernel/sn2/sn_hwperf.c:360: warning: implicit declaration of function `smp_call_function_single'

Quoted 8 lines
Quoted 3 lines

Looks like we need a !CONFIG_SMP version of smp_call_function_single. include/linux/smp.h has a non-smp version of smp_call_function that just returns 0, should smp_call_function_single do the same thing?

That would make the warning go away, but it isn't obvious to me that you'd end up with code that did the right thing. Looking at the bigger picture, just what is sn_hwperf_op_cpu() supposed to do in the UP case?

It's supposed to make a SAL call for the CPU specified in the op_arg. Seems like smp_call_function_single should make the specified call unconditionally on CPU 0?

Jesse

#11 lore raw
In reply to dann frazier
Quoted 1 line · Tony

just what is sn_hwperf_op_cpu() supposed to do in the UP case?

Needs to be wrapped with CONFIG_SMP, as follows (untested) :

=== arch/ia64/sn/kernel/sn2/sn_hwperf.c 1.5 vs edited ==--- 1.5/arch/ia64/sn/kernel/sn2/sn_hwperf.c 2004-10-27 05:12:58 +10:00
+++ edited/arch/ia64/sn/kernel/sn2/sn_hwperf.c 2005-01-13 11:53:01 +11:00
@@ -355,9 +355,13 @@
}
else {
if (use_ipi) {
+#ifdef CONFIG_SMP
/* use an interprocessor interrupt to call SAL */ smp_call_function_single(cpu, sn_hwperf_call_sal,
op_info, 1, 1);
+#else
+ sn_hwperf_call_sal(op_info);
+#endif

#12 lore raw
In reply to dann frazier
Quoted 9 lines · Jesse Barnes
Quoted 8 lines · Tony
Quoted 7 lines
Quoted 3 lines

arch/ia64/sn/kernel/sn2/sn_hwperf.c: In function `sn_hwperf_op_cpu':
arch/ia64/sn/kernel/sn2/sn_hwperf.c:360: warning: implicit declaration of function `smp_call_function_single'

Looks like we need a !CONFIG_SMP version of smp_call_function_single. include/linux/smp.h has a non-smp version of smp_call_function that just returns 0, should smp_call_function_single do the same thing?

Quoted 8 lines
Quoted 4 lines

That would make the warning go away, but it isn't obvious to me that you'd end up with code that did the right thing. Looking at the bigger picture, just what is sn_hwperf_op_cpu() supposed to do in the UP case?

It's supposed to make a SAL call for the CPU specified in the op_arg. Seems like smp_call_function_single should make the specified call unconditionally on CPU 0?

that's fine for the call to smp_call_function_single() in sn_hwperf_op_cpu(), but may not be desirable elsewhere, I don't know. All the other calls to smp_call_function_single seem to be already conditional on CONFIG_SMP, so perhaps just do the same for sn_hwperf_op_cpu.

-- Mark

#13 lore raw
In reply to dann frazier
Quoted 7 lines · Jesse Barnes
Quoted 5 lines

CC drivers/char/mmtimer.o
drivers/char/mmtimer.c: In function `mmtimer_tasklet':
drivers/char/mmtimer.c:502: structure has no member named `write_lock' make[1]: *** [drivers/char/mmtimer.o] Error 1
make: *** [drivers/char/mmtimer.o] Error 2

Looks like we need rwlock_is_write_locked for this one. Christoph?

Looks like the driver is doing something completely bogus which it should stop ASAP.

#14 lore raw
In reply to dann frazier
Quoted 11 lines · Christoph Hellwig
Quoted 7 lines · Jesse Barnes
Quoted 5 lines

CC drivers/char/mmtimer.o
drivers/char/mmtimer.c: In function `mmtimer_tasklet':
drivers/char/mmtimer.c:502: structure has no member named `write_lock' make[1]: *** [drivers/char/mmtimer.o] Error 1
make: *** [drivers/char/mmtimer.o] Error 2

Looks like we need rwlock_is_write_locked for this one. Christoph?

Looks like the driver is doing something completely bogus which it should stop ASAP.

Here is the fix:

Index: linux-2.6.10/drivers/char/mmtimer.c
=================================--- linux-2.6.10.orig/drivers/char/mmtimer.c 2004-12-24 13:35:20.000000000 -0800
+++ linux-2.6.10/drivers/char/mmtimer.c 2005-01-13 09:46:10.000000000 -0800
@@ -494,17 +494,15 @@ void mmtimer_tasklet(unsigned long data)
/* Send signal and deal with periodic signals */ spin_lock_irqsave(&t->it_lock, flags); spin_lock(&x->lock);
+
/* If timer was deleted between interrupt and here, leave */ if (t != x->timer)
goto out;
t->it_overrun = 0;

- if (tasklist_lock.write_lock || posix_timer_event(t, 0) != 0) {
-
- // printk(KERN_WARNING "mmtimer: cannot deliver signal.\n");
-
+ if (posix_timer_event(t, 0) != 0)
t->it_overrun++;
- }
+
if(t->it_incr) {
/* Periodic timer */
if (reschedule_periodic_timer(x)) {
@@ -512,7 +510,7 @@ void mmtimer_tasklet(unsigned long data)
x->timer = NULL;
}
} else {
- /* Ensure we don't false trigger in mmtimer_interrupt */
+ /* Ensure we do not trigger another tasklet run from mmtimer_interrupt */
t->it_timer.expires = 0;
}
t->it_overrun_last = t->it_overrun;