Skip to contentSkip to conversation

Make gp value point to Region 5 in mca handler

PATCH In review Zou Nan hai 2 participants 4 messages Sep 13, 2006 – Sep 15, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Make gp value point to Region 5 in mca handler

MCA dispatch code take physical address of GP passed from SAL, then call DATA_PA_TO_VA twice on GP before call into C code. The first time is in ia64_set_kernel_register, the second time is in VIRTUAL_MODE_ENTER.
The gp is changed to a virtual address in region 7 because DATA_PA_TO_VA is implemented
by dep instruction.

However when notify blocks were called from MCA handler code, because notify blocks are supported by callback function pointers, gp value value was switched to region 5 again.

The patch set gp register to kernel gp of region 5 at entry of MCA dispatch.

arch/ia64/kernel/mca_asm.S +2 -7
diff -Nraup linux-2.6.18-rc6/arch/ia64/kernel/mca_asm.S linux-2.6.18-rc6-fix/arch/ia64/kernel/mca_asm.S
@@ -270,7 +270,7 @@ done_tlb_purge_and_reload:
 	mov r7=r2
 
         // Enter virtual mode from physical mode
-	VIRTUAL_MODE_ENTER(r2, r3, ia64_os_mca_virtual_begin, r4)
+	VIRTUAL_MODE_ENTER(r2, r3, ia64_os_mca_virtual_begin, r4, __gp)
 
 	// This code returns to SAL via SOS r2, in general SAL has no unwind
 	// data.  To get a clean termination when backtracing the C MCA/INIT
@@ -364,7 +364,7 @@ ia64_os_init_dispatch:
 	mov r7=r2
 
         // Enter virtual mode from physical mode
-	VIRTUAL_MODE_ENTER(r2, r3, ia64_os_init_virtual_begin, r4)
+	VIRTUAL_MODE_ENTER(r2, r3, ia64_os_init_virtual_begin, r4, __gp)
 
 	// This code returns to SAL via SOS r2, in general SAL has no unwind
 	// data.  To get a clean termination when backtracing the C MCA/INIT
@@ -1025,18 +1025,13 @@ ia64_old_stack:
 
 ia64_set_kernel_registers:
 	add temp3=MCA_SP_OFFSET, r3
-	add temp4=MCA_SOS_OFFSET+SOS(OS_GP), r3
 	mov b0=r2		// save return address
 	GET_IA64_MCA_DATA(temp1)
 	;;
-	add temp4=temp4, temp1	// &struct ia64_sal_os_state.os_gp
 	add r12=temp1, temp3	// kernel stack pointer on MCA/INIT stack
 	add r13=temp1, r3	// set current to start of MCA/INIT stack
 	add r20=temp1, r3	// physical start of MCA/INIT stack
 	;;
-	ld8 r1=[temp4]		// OS GP from SAL OS state
-	;;
-	DATA_PA_TO_VA(r1,temp1)
 	DATA_PA_TO_VA(r12,temp2)
 	DATA_PA_TO_VA(r13,temp3)
 	;;
include/asm-ia64/mca_asm.h +2 -2
diff -Nraup linux-2.6.18-rc6/include/asm-ia64/mca_asm.h linux-2.6.18-rc6-fix/include/asm-ia64/mca_asm.h
@@ -156,7 +156,7 @@
  *	7.	Do an rfi to move ipsr to psr and iip to ip.
  */
 
-#define VIRTUAL_MODE_ENTER(temp1, temp2, start_addr, old_psr)	\
+#define VIRTUAL_MODE_ENTER(temp1, temp2, start_addr, old_psr, gp_addr)	\
 	mov	temp2 = psr;					\
 	;;							\
 	mov	old_psr = temp2;				\
@@ -197,9 +197,9 @@
 	movl	temp2 = start_addr;				\
 	;;							\
 	mov	cr.iip = temp2;					\
+	movl	gp = gp_addr					\
 	;;							\
 	DATA_PA_TO_VA(sp, temp1);				\
-	DATA_PA_TO_VA(gp, temp2);				\
 	srlz.i;							\
 	;;							\
 	nop	1;						\
#1 lore raw
Quoted 13 lines · Zou Nan hai (on 13 Sep 2006 12:55:25 +0800) wrote:

MCA dispatch code take physical address of GP passed from SAL, then call DATA_PA_TO_VA twice on GP before call into C code. The first time is in ia64_set_kernel_register, the second time is in VIRTUAL_MODE_ENTER.
The gp is changed to a virtual address in region 7 because DATA_PA_TO_VA is implemented
by dep instruction.

However when notify blocks were called from MCA handler code, because notify blocks are supported by callback function pointers, gp value value was switched to region 5 again.

Quoted 4 lines

The patch set gp register to kernel gp of region 5 at entry of MCA dispatch.

The idea is right, but there is no need to pass __gp to VIRTUAL_MODE_ENTER. There will never be a case of VIRTUAL_MODE_ENTER followed by entry to a module, so just hard code 'movl r1 = __gp' into VIRTUAL_MODE_ENTER and drop it from the parameter list.

#2 lore raw
In reply to Zou Nan hai
Quoted 17 lines · Keith Owens
Quoted 16 lines · Zou Nan hai (on 13 Sep 2006 12:55:25 +0800) wrote:

MCA dispatch code take physical address of GP passed from SAL, then call DATA_PA_TO_VA twice on GP before call into C code. The first time is in ia64_set_kernel_register, the second time is in VIRTUAL_MODE_ENTER.
The gp is changed to a virtual address in region 7 because DATA_PA_TO_VA is implemented
by dep instruction.

However when notify blocks were called from MCA handler code, because notify blocks are supported by callback function pointers, gp value value was switched to region 5 again.

The patch set gp register to kernel gp of region 5 at entry of MCA dispatch.

Quoted 6 lines
Quoted 1 line

The idea is right, but there is no need to pass __gp to VIRTUAL_MODE_ENTER. There will never be a case of VIRTUAL_MODE_ENTER followed by entry to a module, so just hard code 'movl r1 = __gp' into VIRTUAL_MODE_ENTER and drop it from the parameter list.

OK, I felt a little weird to put hard code in a macro.., but I think it
does not matter much since the macro is only used 2 times.

the updated patch

diff -Nraup linux-2.6.18-rc6/arch/ia64/kernel/mca_asm.S linux-2.6.18-rc6-fix/arch/ia64/kernel/mca_asm.S

arch/ia64/kernel/mca_asm.S +0 -5
@@ -1025,18 +1025,13 @@ ia64_old_stack:
 
 ia64_set_kernel_registers:
 	add temp3=MCA_SP_OFFSET, r3
-	add temp4=MCA_SOS_OFFSET+SOS(OS_GP), r3
 	mov b0=r2		// save return address
 	GET_IA64_MCA_DATA(temp1)
 	;;
-	add temp4=temp4, temp1	// &struct ia64_sal_os_state.os_gp
 	add r12=temp1, temp3	// kernel stack pointer on MCA/INIT stack
 	add r13=temp1, r3	// set current to start of MCA/INIT stack
 	add r20=temp1, r3	// physical start of MCA/INIT stack
 	;;
-	ld8 r1=[temp4]		// OS GP from SAL OS state
-	;;
-	DATA_PA_TO_VA(r1,temp1)
 	DATA_PA_TO_VA(r12,temp2)
 	DATA_PA_TO_VA(r13,temp3)
 	;;
include/asm-ia64/mca_asm.h +1 -1
diff -Nraup linux-2.6.18-rc6/include/asm-ia64/mca_asm.h linux-2.6.18-rc6-fix/include/asm-ia64/mca_asm.h
@@ -197,9 +197,9 @@
 	movl	temp2 = start_addr;				\
 	;;							\
 	mov	cr.iip = temp2;					\
+	movl	gp = __gp					\
 	;;							\
 	DATA_PA_TO_VA(sp, temp1);				\
-	DATA_PA_TO_VA(gp, temp2);				\
 	srlz.i;							\
 	;;							\
 	nop	1;						\
Acked-by on v1 1/1
#3 lore raw
In reply to Zou Nan hai
Quoted 12 lines · Zou Nan hai (on 14 Sep 2006 08:25:15 +0800) wrote:
Quoted 10 lines · Keith Owens
Quoted 4 lines · Zou Nan hai (on 13 Sep 2006 12:55:25 +0800) wrote:

The patch set gp register to kernel gp of region 5 at entry of MCA dispatch.

The idea is right, but there is no need to pass __gp to VIRTUAL_MODE_ENTER. There will never be a case of VIRTUAL_MODE_ENTER followed by entry to a module, so just hard code 'movl r1 = __gp' into VIRTUAL_MODE_ENTER and drop it from the parameter list.

Quoted 6 lines

OK, I felt a little weird to put hard code in a macro.., but I think it does not matter much since the macro is only used 2 times.

the updated patch

BTW, your patch deleted the only use of IA64_SAL_OS_STATE_OS_GP_OFFSET so that field can also be deleted from arch/ia64/kernel/asm-offsets.c.