* 2.5.5 on Sparc, Ughh...
@ 2002-02-20 16:12 Holzrichter, Bruce
2002-02-20 16:39 ` David S. Miller
0 siblings, 1 reply; 5+ messages in thread
From: Holzrichter, Bruce @ 2002-02-20 16:12 UTC (permalink / raw)
To: 'ultralinux@vger.kernel.org'
Cc: 'linux-kernel@vger.kernel.org',
'davem@redhat.com'
Ok. For the adventurous types, you'll at the very least need to apply the
below included patches to get Sparc64 to begin the compilation process at
all. Here is some details:
/include/asm-sparc64/mmu_context.h - movement of the #define for MAX_PRIO_RT
in the scheduler causes the compile to fail here. My patch below will
comment out at least the failing Function, which does not appear to be doing
anything usefull anyways.
/kernel/sched.c - Ingo changed the scheduler switch_to() to 2 arguments
rather than three, but the appropriate assembly changes have not been
applied to /asm-sparc64/system.h. Ingo pointed me to a work around for
this for now, by changing the swicht_to() back to three args for sched.c.
This is not the correct fix, but will get the compile to continue.
>From here, I am getting the following errors compiling filemap.c. Anyone at
all have any luck getting Sparc to compile with 2.5.5?
`flush_dcache_page' doesn't match global one
/usr/src/linux-2.5.5/include/linux/highmem.h: In function
`truncate_list_pages':
/usr/src/linux-2.5.5/include/linux/highmem.h:112: conflicting types for
`flush_d
cache_page'
/usr/src/linux-2.5.5/include/asm/pgalloc.h:43: previous declaration of
`flush_dc
ache_page'
/usr/src/linux-2.5.5/include/linux/highmem.h:112: warning: extern
declaration of
`flush_dcache_page' doesn't match global one
filemap.c: In function `filemap_sync_pte_range':
filemap.c:2078: warning: implicit declaration of function `pte_offset_map'
filemap.c:2078: warning: assignment makes pointer from integer without a
cast
filemap.c:2088: warning: implicit declaration of function `pte_unmap'
make[2]: *** [filemap.o] Error 1
make[2]: Leaving directory `/usr/src/linux-2.5.5/mm'
make[1]: *** [first_rule] Error 2
make[1]: Leaving directory `/usr/src/linux-2.5.5/mm'
make: *** [_dir_mm] Error 2
Thanks,
Bruce H.
Here are the patch diffs to get Sparc to compile at all....
--- mmu_context.h.old Wed Feb 20 09:01:26 2002
+++ mmu_context.h Wed Feb 20 09:05:08 2002
@@ -28,14 +28,19 @@
#include <asm/spitfire.h>
/*
+ * ??? Is this needed here? This function does not appear to be
+ * Working, and is broken after the 2.5 change to MAX_RT_PRIO being
+ * moved from sched.h to sched.c
+ *
* Every architecture must define this function. It's the fastest
* way of searching a 168-bit bitmap where the first 128 bits are
* unlikely to be set. It's guaranteed that at least one of the 168
* bits is cleared.
+ *
+ * #if MAX_RT_PRIO != 128 || MAX_PRIO != 168
+ * # error update this function.
+ * #endif
*/
-#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
-# error update this function.
-#endif
static inline int sched_find_first_bit(unsigned long *b)
{
--- sched.c.old Wed Feb 20 09:38:37 2002
+++ sched.c Wed Feb 20 09:39:15 2002
@@ -437,7 +437,7 @@
}
/* Here we just switch the register state and the stack. */
- switch_to(prev, next);
+ switch_to(prev, next, prev);
}
unsigned long nr_running(void
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 2.5.5 on Sparc, Ughh...
2002-02-20 16:12 2.5.5 on Sparc, Ughh Holzrichter, Bruce
@ 2002-02-20 16:39 ` David S. Miller
2002-02-21 8:04 ` george anzinger
0 siblings, 1 reply; 5+ messages in thread
From: David S. Miller @ 2002-02-20 16:39 UTC (permalink / raw)
To: bruce.holzrichter; +Cc: ultralinux, linux-kernel
From: "Holzrichter, Bruce" <bruce.holzrichter@monster.com>
Date: Wed, 20 Feb 2002 11:12:31 -0500
Ok. For the adventurous types, you'll at the very least need to apply the
below included patches to get Sparc64 to begin the compilation process at
all. Here is some details:
You can start out with the below to fix things correctly. The only
unhandled thing is the pte_offset stuff and I'll work on that some time
later today.
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/process.c build/arch/sparc64/kernel/process.c
--- linux-2.5/arch/sparc64/kernel/process.c Thu Feb 14 13:49:29 2002
+++ build/arch/sparc64/kernel/process.c Thu Feb 14 10:05:56 2002
@@ -106,9 +106,11 @@
int cpu = smp_processor_id();
if (local_irq_count(cpu) == 0 &&
- local_bh_count(cpu) == 0)
- preempt_schedule();
- current_thread_info()->preempt_count--;
+ local_bh_count(cpu) == 0 &&
+ test_thread_flag(TIF_NEED_RESCHED)) {
+ current->state = TASK_RUNNING;
+ schedule();
+ }
}
#endif
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/ptrace.c build/arch/sparc64/kernel/ptrace.c
--- linux-2.5/arch/sparc64/kernel/ptrace.c Thu Feb 14 13:49:29 2002
+++ build/arch/sparc64/kernel/ptrace.c Thu Feb 14 10:05:56 2002
@@ -627,9 +627,11 @@
if (!(current->ptrace & PT_PTRACED))
return;
current->exit_code = SIGTRAP;
+ preempt_disable();
current->state = TASK_STOPPED;
notify_parent(current, SIGCHLD);
schedule();
+ preempt_enable();
/*
* this isn't the same as continuing with a signal, but it will do
* for normal use. strace only continues with a signal if the
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/rtrap.S build/arch/sparc64/kernel/rtrap.S
--- linux-2.5/arch/sparc64/kernel/rtrap.S Thu Feb 14 13:49:29 2002
+++ build/arch/sparc64/kernel/rtrap.S Thu Feb 14 10:05:56 2002
@@ -276,9 +276,9 @@
add %l5, 1, %l6
stw %l6, [%g6 + TI_PRE_COUNT]
call kpreempt_maybe
- wrpr %g0, RTRAP_PSTATE, %pstate
- wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate
- stw %l5, [%g6 + TI_PRE_COUNT]
+ nop
+ ba,pt %xcc, rtrap
+ stw %l5, [%g6 + TI_PRE_COUNT]
#endif
kern_fpucheck: ldub [%g6 + TI_FPDEPTH], %l5
brz,pt %l5, rt_continue
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/signal.c build/arch/sparc64/kernel/signal.c
--- linux-2.5/arch/sparc64/kernel/signal.c Thu Feb 14 13:49:29 2002
+++ build/arch/sparc64/kernel/signal.c Thu Feb 14 10:05:56 2002
@@ -713,9 +713,11 @@
if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
current->exit_code = signr;
+ preempt_disable();
current->state = TASK_STOPPED;
notify_parent(current, SIGCHLD);
schedule();
+ preempt_enable();
if (!(signr = current->exit_code))
continue;
current->exit_code = 0;
@@ -766,16 +768,20 @@
if (is_orphaned_pgrp(current->pgrp))
continue;
- case SIGSTOP:
- if (current->ptrace & PT_PTRACED)
- continue;
- current->state = TASK_STOPPED;
+ case SIGSTOP: {
+ struct signal_struct *sig;
+
current->exit_code = signr;
- if (!(current->p_pptr->sig->action[SIGCHLD-1].sa.sa_flags &
+ sig = current->p_pptr->sig;
+ preempt_disable();
+ current->state = TASK_STOPPED;
+ if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
SA_NOCLDSTOP))
notify_parent(current, SIGCHLD);
schedule();
+ preempt_enable();
continue;
+ }
case SIGQUIT: case SIGILL: case SIGTRAP:
case SIGABRT: case SIGFPE: case SIGSEGV:
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/signal32.c build/arch/sparc64/kernel/signal32.c
--- linux-2.5/arch/sparc64/kernel/signal32.c Thu Feb 14 13:49:29 2002
+++ build/arch/sparc64/kernel/signal32.c Thu Feb 14 10:05:56 2002
@@ -1379,9 +1379,11 @@
if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
current->exit_code = signr;
+ preempt_disable();
current->state = TASK_STOPPED;
notify_parent(current, SIGCHLD);
schedule();
+ preempt_enable();
if (!(signr = current->exit_code))
continue;
current->exit_code = 0;
@@ -1432,17 +1434,20 @@
if (is_orphaned_pgrp(current->pgrp))
continue;
- case SIGSTOP:
- if (current->ptrace & PT_PTRACED)
- continue;
- current->state = TASK_STOPPED;
+ case SIGSTOP: {
+ struct signal_struct *sig;
+
current->exit_code = signr;
- if (!(current->p_pptr->sig->action[SIGCHLD-1].sa.sa_flags &
+ sig = current->p_pptr->sig;
+ preempt_disable();
+ current->state = TASK_STOPPED;
+ if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
SA_NOCLDSTOP))
notify_parent(current, SIGCHLD);
schedule();
+ preempt_enable();
continue;
-
+ }
case SIGQUIT: case SIGILL: case SIGTRAP:
case SIGABRT: case SIGFPE: case SIGSEGV:
case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/bitops.h build/include/asm-sparc64/bitops.h
--- linux-2.5/include/asm-sparc64/bitops.h Thu Feb 14 13:50:37 2002
+++ build/include/asm-sparc64/bitops.h Thu Feb 14 10:40:13 2002
@@ -7,6 +7,7 @@
#ifndef _SPARC64_BITOPS_H
#define _SPARC64_BITOPS_H
+#include <linux/compiler.h>
#include <asm/byteorder.h>
extern long ___test_and_set_bit(unsigned long nr, volatile void *addr);
@@ -100,6 +101,23 @@
}
#ifdef __KERNEL__
+
+/*
+ * Every architecture must define this function. It's the fastest
+ * way of searching a 140-bit bitmap where the first 100 bits are
+ * unlikely to be set. It's guaranteed that at least one of the 140
+ * bits is cleared.
+ */
+static inline int sched_find_first_bit(unsigned long *b)
+{
+ if (unlikely(b[0]))
+ return __ffs(b[0]);
+ if (unlikely(((unsigned int)b[1])))
+ return __ffs(b[1]);
+ if (b[1] >> 32)
+ return __ffs(b[1] >> 32) + 96;
+ return __ffs(b[2]) + 128;
+}
/*
* ffs: find first bit set. This is defined the same way as
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/mmu_context.h build/include/asm-sparc64/mmu_context.h
--- linux-2.5/include/asm-sparc64/mmu_context.h Thu Feb 14 13:50:37 2002
+++ build/include/asm-sparc64/mmu_context.h Thu Feb 14 10:55:16 2002
@@ -27,25 +27,6 @@
#include <asm/system.h>
#include <asm/spitfire.h>
-/*
- * Every architecture must define this function. It's the fastest
- * way of searching a 168-bit bitmap where the first 128 bits are
- * unlikely to be set. It's guaranteed that at least one of the 168
- * bits is cleared.
- */
-#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
-# error update this function.
-#endif
-
-static inline int sched_find_first_bit(unsigned long *b)
-{
- if (unlikely(b[0]))
- return __ffs(b[0]);
- if (unlikely(b[1]))
- return __ffs(b[1]) + 64;
- return __ffs(b[2]) + 128;
-}
-
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk, unsigned cpu)
{
}
diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/system.h build/include/asm-sparc64/system.h
--- linux-2.5/include/asm-sparc64/system.h Thu Feb 14 13:50:37 2002
+++ build/include/asm-sparc64/system.h Thu Feb 14 10:55:03 2002
@@ -172,7 +172,7 @@
* not preserve it's value. Hairy, but it lets us remove 2 loads
* and 2 stores in this critical code path. -DaveM
*/
-#define switch_to(prev, next, last) \
+#define switch_to(prev, next) \
do { CHECK_LOCKS(prev); \
if (test_thread_flag(TIF_PERFCTR)) { \
unsigned long __tmp; \
@@ -193,16 +193,16 @@
"stx %%i6, [%%sp + 2047 + 0x70]\n\t" \
"stx %%i7, [%%sp + 2047 + 0x78]\n\t" \
"rdpr %%wstate, %%o5\n\t" \
- "stx %%o6, [%%g6 + %3]\n\t" \
- "stb %%o5, [%%g6 + %2]\n\t" \
+ "stx %%o6, [%%g6 + %2]\n\t" \
+ "stb %%o5, [%%g6 + %1]\n\t" \
"rdpr %%cwp, %%o5\n\t" \
- "stb %%o5, [%%g6 + %5]\n\t" \
- "mov %1, %%g6\n\t" \
- "ldub [%1 + %5], %%g1\n\t" \
+ "stb %%o5, [%%g6 + %4]\n\t" \
+ "mov %0, %%g6\n\t" \
+ "ldub [%0 + %4], %%g1\n\t" \
"wrpr %%g1, %%cwp\n\t" \
- "ldx [%%g6 + %3], %%o6\n\t" \
- "ldub [%%g6 + %2], %%o5\n\t" \
- "ldx [%%g6 + %4], %%o7\n\t" \
+ "ldx [%%g6 + %2], %%o6\n\t" \
+ "ldub [%%g6 + %1], %%o5\n\t" \
+ "ldx [%%g6 + %3], %%o7\n\t" \
"mov %%g6, %%l2\n\t" \
"wrpr %%o5, 0x0, %%wstate\n\t" \
"ldx [%%sp + 2047 + 0x70], %%i6\n\t" \
@@ -210,13 +210,13 @@
"wrpr %%g0, 0x94, %%pstate\n\t" \
"mov %%l2, %%g6\n\t" \
"wrpr %%g0, 0x96, %%pstate\n\t" \
- "andcc %%o7, %6, %%g0\n\t" \
+ "andcc %%o7, %5, %%g0\n\t" \
"bne,pn %%icc, ret_from_syscall\n\t" \
- " ldx [%%g5 + %7], %0\n\t" \
- : "=&r" (last) \
+ " nop\n\t" \
+ : /* no outputs */ \
: "r" (next->thread_info), \
"i" (TI_WSTATE), "i" (TI_KSP), "i" (TI_FLAGS), "i" (TI_CWP), \
- "i" (_TIF_NEWCHILD), "i" (TI_TASK) \
+ "i" (_TIF_NEWCHILD) \
: "cc", "g1", "g2", "g3", "g5", "g7", \
"l2", "l3", "l4", "l5", "l6", "l7", \
"i0", "i1", "i2", "i3", "i4", "i5", \
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: 2.5.5 on Sparc, Ughh...
@ 2002-02-20 19:27 Holzrichter, Bruce
0 siblings, 0 replies; 5+ messages in thread
From: Holzrichter, Bruce @ 2002-02-20 19:27 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: ultralinux, linux-kernel
> You can start out with the below to fix things correctly. The only
> unhandled thing is the pte_offset stuff and I'll work on that some time
> later today.
Thanks Dave,
I finally had the chance to try out your changes. That pesky work thing
keeps getting in my way. So far so good, from a clean tree, they apply
fine, and fix all the other issues up to the pte_offset issues in filemap.c.
If you get to them, shoot me a copy and I'll apply and test for you.
I see alot of warnings still from flush_dcache_page in
/include/linux/highmem.h and it looks like a duplicate declaration in
/asm-sparc64/pgalloc.h, but I have not had the chance to check that out yet.
I'll try to follow it up if you haven't seen that one yet.
On a side note, though not arch specific, if you use ramdisk, you'll need to
apply the patch below that removes second argument to bi_end_io that was
removed earlier in the series. I have seen a patch floating around,
hopefully it will get pushed up the chain.
Thanks again for your help!
Bruce H.
--- drivers/block/rd.c.old Wed Feb 20 14:20:53 2002
+++ drivers/block/rd.c Wed Feb 20 12:42:52 2002
@@ -268,7 +268,7 @@
goto fail;
set_bit(BIO_UPTODATE, &sbh->bi_flags);
- sbh->bi_end_io(sbh, len >> 9);
+ sbh->bi_end_io(sbh);
return 0;
fail:
bio_io_error(sbh)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 2.5.5 on Sparc, Ughh...
2002-02-20 16:39 ` David S. Miller
@ 2002-02-21 8:04 ` george anzinger
2002-02-21 16:52 ` Robert Love
0 siblings, 1 reply; 5+ messages in thread
From: george anzinger @ 2002-02-21 8:04 UTC (permalink / raw)
To: David S. Miller; +Cc: bruce.holzrichter, ultralinux, linux-kernel
"David S. Miller" wrote:
>
> From: "Holzrichter, Bruce" <bruce.holzrichter@monster.com>
> Date: Wed, 20 Feb 2002 11:12:31 -0500
>
> Ok. For the adventurous types, you'll at the very least need to apply the
> below included patches to get Sparc64 to begin the compilation process at
> all. Here is some details:
>
> You can start out with the below to fix things correctly. The only
> unhandled thing is the pte_offset stuff and I'll work on that some time
> later today.
Uh, Dave, could you expound a bit on why you need a preemption lock
around the notify parent/ schedule code? We have not found this to be
needed on other archs, but maybe we missed something.
George
>
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/process.c build/arch/sparc64/kernel/process.c
> --- linux-2.5/arch/sparc64/kernel/process.c Thu Feb 14 13:49:29 2002
> +++ build/arch/sparc64/kernel/process.c Thu Feb 14 10:05:56 2002
> @@ -106,9 +106,11 @@
> int cpu = smp_processor_id();
>
> if (local_irq_count(cpu) == 0 &&
> - local_bh_count(cpu) == 0)
> - preempt_schedule();
> - current_thread_info()->preempt_count--;
> + local_bh_count(cpu) == 0 &&
> + test_thread_flag(TIF_NEED_RESCHED)) {
> + current->state = TASK_RUNNING;
> + schedule();
> + }
> }
> #endif
>
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/ptrace.c build/arch/sparc64/kernel/ptrace.c
> --- linux-2.5/arch/sparc64/kernel/ptrace.c Thu Feb 14 13:49:29 2002
> +++ build/arch/sparc64/kernel/ptrace.c Thu Feb 14 10:05:56 2002
> @@ -627,9 +627,11 @@
> if (!(current->ptrace & PT_PTRACED))
> return;
> current->exit_code = SIGTRAP;
> + preempt_disable();
> current->state = TASK_STOPPED;
> notify_parent(current, SIGCHLD);
> schedule();
> + preempt_enable();
> /*
> * this isn't the same as continuing with a signal, but it will do
> * for normal use. strace only continues with a signal if the
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/rtrap.S build/arch/sparc64/kernel/rtrap.S
> --- linux-2.5/arch/sparc64/kernel/rtrap.S Thu Feb 14 13:49:29 2002
> +++ build/arch/sparc64/kernel/rtrap.S Thu Feb 14 10:05:56 2002
> @@ -276,9 +276,9 @@
> add %l5, 1, %l6
> stw %l6, [%g6 + TI_PRE_COUNT]
> call kpreempt_maybe
> - wrpr %g0, RTRAP_PSTATE, %pstate
> - wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate
> - stw %l5, [%g6 + TI_PRE_COUNT]
> + nop
> + ba,pt %xcc, rtrap
> + stw %l5, [%g6 + TI_PRE_COUNT]
> #endif
> kern_fpucheck: ldub [%g6 + TI_FPDEPTH], %l5
> brz,pt %l5, rt_continue
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/signal.c build/arch/sparc64/kernel/signal.c
> --- linux-2.5/arch/sparc64/kernel/signal.c Thu Feb 14 13:49:29 2002
> +++ build/arch/sparc64/kernel/signal.c Thu Feb 14 10:05:56 2002
> @@ -713,9 +713,11 @@
>
> if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
> current->exit_code = signr;
> + preempt_disable();
> current->state = TASK_STOPPED;
> notify_parent(current, SIGCHLD);
> schedule();
> + preempt_enable();
> if (!(signr = current->exit_code))
> continue;
> current->exit_code = 0;
> @@ -766,16 +768,20 @@
> if (is_orphaned_pgrp(current->pgrp))
> continue;
>
> - case SIGSTOP:
> - if (current->ptrace & PT_PTRACED)
> - continue;
> - current->state = TASK_STOPPED;
> + case SIGSTOP: {
> + struct signal_struct *sig;
> +
> current->exit_code = signr;
> - if (!(current->p_pptr->sig->action[SIGCHLD-1].sa.sa_flags &
> + sig = current->p_pptr->sig;
> + preempt_disable();
> + current->state = TASK_STOPPED;
> + if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
> SA_NOCLDSTOP))
> notify_parent(current, SIGCHLD);
> schedule();
> + preempt_enable();
> continue;
> + }
>
> case SIGQUIT: case SIGILL: case SIGTRAP:
> case SIGABRT: case SIGFPE: case SIGSEGV:
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/arch/sparc64/kernel/signal32.c build/arch/sparc64/kernel/signal32.c
> --- linux-2.5/arch/sparc64/kernel/signal32.c Thu Feb 14 13:49:29 2002
> +++ build/arch/sparc64/kernel/signal32.c Thu Feb 14 10:05:56 2002
> @@ -1379,9 +1379,11 @@
>
> if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
> current->exit_code = signr;
> + preempt_disable();
> current->state = TASK_STOPPED;
> notify_parent(current, SIGCHLD);
> schedule();
> + preempt_enable();
> if (!(signr = current->exit_code))
> continue;
> current->exit_code = 0;
> @@ -1432,17 +1434,20 @@
> if (is_orphaned_pgrp(current->pgrp))
> continue;
>
> - case SIGSTOP:
> - if (current->ptrace & PT_PTRACED)
> - continue;
> - current->state = TASK_STOPPED;
> + case SIGSTOP: {
> + struct signal_struct *sig;
> +
> current->exit_code = signr;
> - if (!(current->p_pptr->sig->action[SIGCHLD-1].sa.sa_flags &
> + sig = current->p_pptr->sig;
> + preempt_disable();
> + current->state = TASK_STOPPED;
> + if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
> SA_NOCLDSTOP))
> notify_parent(current, SIGCHLD);
> schedule();
> + preempt_enable();
> continue;
> -
> + }
> case SIGQUIT: case SIGILL: case SIGTRAP:
> case SIGABRT: case SIGFPE: case SIGSEGV:
> case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/bitops.h build/include/asm-sparc64/bitops.h
> --- linux-2.5/include/asm-sparc64/bitops.h Thu Feb 14 13:50:37 2002
> +++ build/include/asm-sparc64/bitops.h Thu Feb 14 10:40:13 2002
> @@ -7,6 +7,7 @@
> #ifndef _SPARC64_BITOPS_H
> #define _SPARC64_BITOPS_H
>
> +#include <linux/compiler.h>
> #include <asm/byteorder.h>
>
> extern long ___test_and_set_bit(unsigned long nr, volatile void *addr);
> @@ -100,6 +101,23 @@
> }
>
> #ifdef __KERNEL__
> +
> +/*
> + * Every architecture must define this function. It's the fastest
> + * way of searching a 140-bit bitmap where the first 100 bits are
> + * unlikely to be set. It's guaranteed that at least one of the 140
> + * bits is cleared.
> + */
> +static inline int sched_find_first_bit(unsigned long *b)
> +{
> + if (unlikely(b[0]))
> + return __ffs(b[0]);
> + if (unlikely(((unsigned int)b[1])))
> + return __ffs(b[1]);
> + if (b[1] >> 32)
> + return __ffs(b[1] >> 32) + 96;
> + return __ffs(b[2]) + 128;
> +}
>
> /*
> * ffs: find first bit set. This is defined the same way as
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/mmu_context.h build/include/asm-sparc64/mmu_context.h
> --- linux-2.5/include/asm-sparc64/mmu_context.h Thu Feb 14 13:50:37 2002
> +++ build/include/asm-sparc64/mmu_context.h Thu Feb 14 10:55:16 2002
> @@ -27,25 +27,6 @@
> #include <asm/system.h>
> #include <asm/spitfire.h>
>
> -/*
> - * Every architecture must define this function. It's the fastest
> - * way of searching a 168-bit bitmap where the first 128 bits are
> - * unlikely to be set. It's guaranteed that at least one of the 168
> - * bits is cleared.
> - */
> -#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
> -# error update this function.
> -#endif
> -
> -static inline int sched_find_first_bit(unsigned long *b)
> -{
> - if (unlikely(b[0]))
> - return __ffs(b[0]);
> - if (unlikely(b[1]))
> - return __ffs(b[1]) + 64;
> - return __ffs(b[2]) + 128;
> -}
> -
> static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk, unsigned cpu)
> {
> }
> diff -u --recursive --new-file --exclude=BitKeeper --exclude=ChangeSet --exclude=SCCS linux-2.5/include/asm-sparc64/system.h build/include/asm-sparc64/system.h
> --- linux-2.5/include/asm-sparc64/system.h Thu Feb 14 13:50:37 2002
> +++ build/include/asm-sparc64/system.h Thu Feb 14 10:55:03 2002
> @@ -172,7 +172,7 @@
> * not preserve it's value. Hairy, but it lets us remove 2 loads
> * and 2 stores in this critical code path. -DaveM
> */
> -#define switch_to(prev, next, last) \
> +#define switch_to(prev, next) \
> do { CHECK_LOCKS(prev); \
> if (test_thread_flag(TIF_PERFCTR)) { \
> unsigned long __tmp; \
> @@ -193,16 +193,16 @@
> "stx %%i6, [%%sp + 2047 + 0x70]\n\t" \
> "stx %%i7, [%%sp + 2047 + 0x78]\n\t" \
> "rdpr %%wstate, %%o5\n\t" \
> - "stx %%o6, [%%g6 + %3]\n\t" \
> - "stb %%o5, [%%g6 + %2]\n\t" \
> + "stx %%o6, [%%g6 + %2]\n\t" \
> + "stb %%o5, [%%g6 + %1]\n\t" \
> "rdpr %%cwp, %%o5\n\t" \
> - "stb %%o5, [%%g6 + %5]\n\t" \
> - "mov %1, %%g6\n\t" \
> - "ldub [%1 + %5], %%g1\n\t" \
> + "stb %%o5, [%%g6 + %4]\n\t" \
> + "mov %0, %%g6\n\t" \
> + "ldub [%0 + %4], %%g1\n\t" \
> "wrpr %%g1, %%cwp\n\t" \
> - "ldx [%%g6 + %3], %%o6\n\t" \
> - "ldub [%%g6 + %2], %%o5\n\t" \
> - "ldx [%%g6 + %4], %%o7\n\t" \
> + "ldx [%%g6 + %2], %%o6\n\t" \
> + "ldub [%%g6 + %1], %%o5\n\t" \
> + "ldx [%%g6 + %3], %%o7\n\t" \
> "mov %%g6, %%l2\n\t" \
> "wrpr %%o5, 0x0, %%wstate\n\t" \
> "ldx [%%sp + 2047 + 0x70], %%i6\n\t" \
> @@ -210,13 +210,13 @@
> "wrpr %%g0, 0x94, %%pstate\n\t" \
> "mov %%l2, %%g6\n\t" \
> "wrpr %%g0, 0x96, %%pstate\n\t" \
> - "andcc %%o7, %6, %%g0\n\t" \
> + "andcc %%o7, %5, %%g0\n\t" \
> "bne,pn %%icc, ret_from_syscall\n\t" \
> - " ldx [%%g5 + %7], %0\n\t" \
> - : "=&r" (last) \
> + " nop\n\t" \
> + : /* no outputs */ \
> : "r" (next->thread_info), \
> "i" (TI_WSTATE), "i" (TI_KSP), "i" (TI_FLAGS), "i" (TI_CWP), \
> - "i" (_TIF_NEWCHILD), "i" (TI_TASK) \
> + "i" (_TIF_NEWCHILD) \
> : "cc", "g1", "g2", "g3", "g5", "g7", \
> "l2", "l3", "l4", "l5", "l6", "l7", \
> "i0", "i1", "i2", "i3", "i4", "i5", \
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
George george@mvista.com
High-res-timers: http://sourceforge.net/projects/high-res-timers/
Real time sched: http://sourceforge.net/projects/rtsched/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 2.5.5 on Sparc, Ughh...
2002-02-21 8:04 ` george anzinger
@ 2002-02-21 16:52 ` Robert Love
0 siblings, 0 replies; 5+ messages in thread
From: Robert Love @ 2002-02-21 16:52 UTC (permalink / raw)
To: george anzinger
Cc: David S. Miller, bruce.holzrichter, ultralinux, linux-kernel
On Thu, 2002-02-21 at 03:04, george anzinger wrote:
> Uh, Dave, could you expound a bit on why you need a preemption lock
> around the notify parent/ schedule code? We have not found this to be
> needed on other archs, but maybe we missed something.
2.5 has diverged from the "patch" version of the code. We removed the
PREEMPT_ACTIVE flag and thus have a race against parent/wake up. All
arches disable preemption there.
Robert Love
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2002-02-21 16:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-02-20 16:12 2.5.5 on Sparc, Ughh Holzrichter, Bruce
2002-02-20 16:39 ` David S. Miller
2002-02-21 8:04 ` george anzinger
2002-02-21 16:52 ` Robert Love
-- strict thread matches above, loose matches on Subject: below --
2002-02-20 19:27 Holzrichter, Bruce
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox