parisc: Use local tlb purges only on UP machines
Helge Deller
maintainerRFC PATCH 1/1 parisc: Use local tlb purges only on UP machines
Limit usage of CPU-local tlb flushes in pacache.S to non-SMP machines. On 32-bit kernels this was the case already, with this patch this behaviour is used on 64-bit kernels now too.
arch/parisc/kernel/pacache.S +0 -23
@@ -539,15 +539,10 @@ ENTRY_CFI(copy_user_page_asm) /* Purge any old translations */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) - pdtlb,l %r0(%r29) -#else 0: pdtlb %r0(%r28) 1: pdtlb %r0(%r29) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif #ifdef CONFIG_64BIT /* PA8x00 CPUs can consume 2 loads or 1 store per cycle.
@@ -670,12 +665,8 @@ ENTRY_CFI(clear_user_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif #ifdef CONFIG_64BIT ldi (PAGE_SIZE / 128), %r1
@@ -736,12 +727,8 @@ ENTRY_CFI(flush_dcache_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), r31
@@ -785,12 +772,8 @@ ENTRY_CFI(purge_dcache_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), r31
@@ -837,17 +820,11 @@ ENTRY_CFI(flush_icache_page_asm) * have a flat address space, it's not clear which TLB will be * used. So, we purge both entries. */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -1: pitlb,l %r0(%sr4,%r28) - ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP) -#else 0: pdtlb %r0(%r28) 1: pitlb %r0(%sr4,%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP) -#endif 88: ldil L%icache_stride, %r1 ldw R%icache_stride(%r1), %r31
I believe this change is wrong and will reduce performance. The TLB setup for a TMPALIAS flush is local to any given CPU. So, we should only need a local TLB purge.
A local TLB purge doesn't require locking to serialize PxTLB broadcasts. It is also faster than a global TLB purges
Indeed, the case that might be wrong is the one that uses pdtlb. It potentially needs serialization on SMP machines. See comment in pgtable.h.
Dave
Quoted 83 lines · Helge Deller
Limit usage of CPU-local tlb flushes in
pacache.Sto non-SMP machines. On 32-bit kernels this was the case already, with this patch this behaviour is used on 64-bit kernels now too.Signed-off-by Helge Deller <[email protected]>arch/parisc/kernel/pacache.S +0
-23@@ -539,15 +539,10 @@ ENTRY_CFI(copy_user_page_asm) /* Purge any old translations */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) - pdtlb,l %r0(%r29) -#else 0: pdtlb %r0(%r28) 1: pdtlb %r0(%r29) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif #ifdef CONFIG_64BIT /* PA8x00 CPUs can consume 2 loads or 1 store per cycle.@@ -670,12 +665,8 @@ ENTRY_CFI(clear_user_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif #ifdef CONFIG_64BIT ldi (PAGE_SIZE / 128), %r1@@ -736,12 +727,8 @@ ENTRY_CFI(flush_dcache_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), r31@@ -785,12 +772,8 @@ ENTRY_CFI(purge_dcache_page_asm) /* Purge any old translation */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -#else 0: pdtlb %r0(%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) -#endif 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), r31@@ -837,17 +820,11 @@ ENTRY_CFI(flush_icache_page_asm) * have a flat address space, it's not clear which TLB will be * used. So, we purge both entries. */ -#ifdef CONFIG_PA20 - pdtlb,l %r0(%r28) -1: pitlb,l %r0(%sr4,%r28) - ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP) -#else 0: pdtlb %r0(%r28) 1: pitlb %r0(%sr4,%r28) ALTERNATIVE(0b, 0b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SMP, INSN_PxTLB) ALTERNATIVE(1b, 1b+4, ALT_COND_NO_SPLIT_TLB, INSN_NOP) -#endif 88: ldil L%icache_stride, %r1 ldw R%icache_stride(%r1), %r31
Signature · 1 line
John David Anglin [email protected]
Helge Deller
maintainerQuoted 1 line · John David Anglin
I believe this change is wrong and will reduce performance.
Yes, could be. That's why intentionally marked it RFC.
Quoted 2 lines
The TLB setup for a TMPALIAS flush is local to any given CPU. So, we should only need a local TLB purge.
Can those function theoretially be preempted?
If so, could it be scheduled on another CPU where the TMPALIAS isn't flushed?
Quoted 2 lines
A local TLB purge doesn't require locking to serialize PxTLB broadcasts. It is also faster than a global TLB purges
True.
Quoted 1 line
Indeed, the case that might be wrong is the one that uses pdtlb.
Which do you have in mind here?
Quoted 2 lines
It potentially needs serialization
on SMP machines. See comment inpgtable.h.
One goal of that patch was to drop the CONFIG_PA20 ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
I'll send another patch which takes care of this without changing the local purges of pdtlb on 64bit CPUs.
Helge
Quoted 10 lines · Helge Deller
Quoted 1 line · John David Anglin
I believe this change is wrong and will reduce performance.
Yes, could be. That's why intentionally marked it RFC.
Quoted 2 lines
The TLB setup for a TMPALIAS flush is local to any given CPU. So, we should only need a local TLB purge.
Can those function theoretially be preempted?
If so, could it be scheduled on another CPU where the TMPALIAS isn't flushed?
I think preempt_disable/preempt_enable are used before/after all calls to these routines.
It would be better if these calls were in the flush routines.
Quoted 9 lines
Quoted 3 lines
A local TLB purge doesn't require locking to serialize PxTLB broadcasts. It is also faster than a global TLB purges
True.
Quoted 1 line
Indeed, the case that might be wrong is the one that uses pdtlb.
Which do you have in mind here?
The pdtlb instructions in these routines are not serialized. Theoretically, this could result in bus contention and system malfunction. Maybe only D and R class machines are PA 1.1 and SMP.
Quoted 7 lines
Quoted 3 lines
It potentially needs serialization
on SMP machines. See comment inpgtable.h.One goal of that patch was to drop the
CONFIG_PA20ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
Don't think so. "pdtlb,l" is available on all PA 2.0 machines. It's not 64-bit specific.
Quoted 2 lines
I'll send another patch which takes care of this without changing the local purges of pdtlb on 64bit CPUs.
Dave
Signature · 1 line
John David Anglin [email protected]
Quoted 4 lines · John David Anglin
Quoted 3 lines
One goal of that patch was to drop the CONFIG_PA20 ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
Don't think so. "pdtlb,l" is available on all PA 2.0 machines. It's not 64-bit specific.
There is some difference in implementation between PA 1.1 and 2.0. 64-bit register values are used in the PA 2.0 implementation.
Dave
Signature · 1 line
John David Anglin [email protected]
Helge Deller
maintainerQuoted 7 lines · John David Anglin
Quoted 4 lines · John David Anglin
Quoted 3 lines
One goal of that patch was to drop the CONFIG_PA20 ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
Don't think so. "pdtlb,l" is available on all PA 2.0 machines. It's not 64-bit specific.
There is some difference in implementation between PA 1.1 and 2.0. 64-bit register values are used in the PA 2.0 implementation.
That's right.
But if you build a 32-bit kernel and choose to optimize for PA8x00 CPUs, the CONFIG_PA20 is set and the local-purge is used unconditionally. That breaks e.g. when running such a kernel in qemu (which is 32-bit only). See my just-posted patch.
Helge
Quoted 5 lines · Helge Deller
Quoted 4 lines · John David Anglin
Quoted 3 lines · John David Anglin
Quoted 3 lines
One goal of that patch was to drop the CONFIG_PA20 ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Don't think so. "pdtlb,l" is available on all PA 2.0 machines. It's not 64-bit specific.
There is some difference in implementation between PA 1.1 and 2.0. 64-bit register values are used in the PA 2.0 implementation.
That's right.
But if you build a 32-bit kernel and choose to optimize for PA8x00 CPUs, theCONFIG_PA20is set and the local-purge is used unconditionally. That breaks e.g. when running such a kernel in qemu (which is 32-bit only).
I don't think that's a valid kernel configuration for qemu. It only supports the PA 1.1 instruction set. PA8x00 CPUs always support the PA 2.0 instruction set even when running in 32-bit mode.
Quoted 1 line
See my just-posted patch.
Dave
Signature · 1 line
John David Anglin [email protected]
Helge Deller
maintainerQuoted 7 lines · John David Anglin
Quoted 6 lines · Helge Deller
Quoted 5 lines · John David Anglin
Quoted 4 lines · John David Anglin
Quoted 3 lines
One goal of that patch was to drop the CONFIG_PA20 ifdef case, because a 32-bit kernel could be compiled for PA8000 in which case the "pdtlb,l" will burn the machine.
Don't think so. "pdtlb,l" is available on all PA 2.0 machines. It's not 64-bit specific.
Quoted 8 lines
Quoted 7 lines
Quoted 2 lines
There is some difference in implementation between PA 1.1 and 2.0. 64-bit register values are used in the PA 2.0 implementation.
That's right.
But if you build a 32-bit kernel and choose to optimize for PA8x00 CPUs, theCONFIG_PA20is set and the local-purge is used unconditionally. That breaks e.g. when running such a kernel in qemu (which is 32-bit only).I don't think that's a valid kernel configuration for qemu.
I agree - it's probably not the best choice if you want to run qemu...
Quoted 2 lines
It only supports the PA 1.1 instruction set. PA8x00 CPUs always support the PA 2.0 instruction set even when running in 32-bit mode.
The 32-bit kernel is built with the 32-bit compiler.
As far as I understand arch/parisc/Makefile, choosing the CPU type just enables *tuning* for the selected CPU. See Makefile:
# select which processor to optimise for cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100 cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
The only assembler instructions which break qemu are our manually added ones: "pdtlb,l" and "ldd" (for flushing - see my first patch). The two patches I sent today allows to boot such a kernel, and they still keep the PA2.0 support when run on PA2.0 machines.
Helge
Quoted 13 lines · Helge Deller
Quoted 2 lines
It only supports the PA 1.1 instruction set. PA8x00 CPUs always support the PA 2.0 instruction set even when running in 32-bit mode.
The 32-bit kernel is built with the 32-bit compiler.
As far as I understand arch/parisc/Makefile, choosing the CPU type just enables *tuning* for the selected CPU. See Makefile:# select which processor to optimise for cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100 cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
Quoted 4 lines
The only assembler instructions which break qemu are our manually added ones: "pdtlb,l" and "ldd" (for flushing - see my first patch). The two patches I sent today allows to boot such a kernel, and they still keep the PA2.0 support when run on PA2.0 machines.
I think that patch is fine. Probably the same needs to be done the use of "pdtlb,l" instruction in the tmpalias flushes.
We used to have locking to serialize the TLB purges in the tmpalias flushes when we used the pdtlb flush.
It's true the 32-bit compiler doesn't generate much that's not PA 1.1 compatible when -march=2.0 is specified. At on time, there was some push to allow 64-bit register use in the 32-bit runtime. Some hpux systems preserve the full 64-bits in context switches, etc. So, one can get away with using 64-bit operations as long as one doesn't try to perserve values across calls.
I believe "ldd" for prefetch works both in 32 and 64-bit PA 2.0 environments.
Dave
Signature · 1 line
John David Anglin [email protected]