parisc: Reduce kernel size by packing alternative tables - variant 2
Helge Deller
maintainerPATCH 1/1 parisc: Reduce kernel size by packing alternative tables - variant 2
This is the second variant to reduce the size of the alternative tables. Basically it halves the size by reducing length, condition and replacement fields.
bloat-o-meter shows a reduction of -0.01% by this change:
Total: Before=10254498, After=10253654, chg -0.01%
Since this patch introduces more changes without benefit, I won't apply it for now, but want it to show up in patchwork.
Signed-off-by Helge Deller <[email protected]>
arch/parisc/include/asm/alternative.h +15 -17
@@ -10,7 +10,9 @@#define ALT_COND_NO_IOC_FDC 0x10/* if I/O cache does not need flushes */ #define ALT_COND_RUN_ON_QEMU 0x20/* if running on QEMU */ -#define INSN_PxTLB 0x02/* modify pdtlb, pitlb */ +#define ALTCODE_PxTLB 0x01/* add local flag to pdtlb & pitlb */ +#define ALTCODE_NOP 0x02/* insert nops */ +#define INSN_NOP 0x08000240/* nop */ #ifndef __ASSEMBLY__
@@ -22,10 +24,10 @@struct alt_instr {s32 orig_offset;/* offset to original instructions */ -s32 len;/* end of original instructions */ -u32 cond;/* see ALT_COND_XXX */ -u32 replacement;/* replacement instruction or code */ -}; +u16 len;/* number of instructions */ +u8 cond;/* see ALT_COND_XXX condition */ +u8 replacement;/* see ALTCODE_XXX replacement instruction */ +} __packed;void set_kernel_text_rw (int enable_read_write);void apply_alternatives_all (void );
@@ -34,9 +36,11 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,/* Alternative SMP implementation. */ #define ALTERNATIVE (cond, replacement) "!0:" \ - ".section .altinstructions, \"aw\" !" \ - ".word (0b-4-.), 1, " __stringify(cond) "," \ - __stringify(replacement) " !" \ + ".section .altinstructions, \"aw\" !" \ + ".word (0b-4) - . !" \ + ".hword 1 !" \ + ".byte " __stringify(cond) "!" \ + ".byte " __stringify(replacement) "!" \ ".previous"#else
@@ -44,15 +48,9 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,/* to replace one single instructions by a new instruction */ #define ALTERNATIVE (from, to, cond, replacement)\ .section .altinstructions, "aw" ! \ - .word (from - .), (to - from)/4 ! \ - .word cond, replacement ! \ - .previous - -/* to replace multiple instructions by new code */ -#define ALTERNATIVE_CODE (from, num_instructions, cond, new_instr_ptr)\ - .section .altinstructions, "aw" ! \ - .word (from - .), -num_instructions ! \ - .word cond, (new_instr_ptr - .) ! \ + .word from - . ! \ + .hword (to - from)/4 ! \ + .byte cond, replacement ! \ .previous#endif /* __ASSEMBLY__ */
arch/parisc/include/asm/barrier.h +1 -1
@@ -9,7 +9,7 @@/* The synchronize caches instruction executes as a nop on systems in which all memory references are performed in order. */ #define synchronize_caches () asm volatile("sync" \ - ALTERNATIVE(ALT_COND_NO_SMP, INSN_NOP) \ + ALTERNATIVE(ALT_COND_NO_SMP, ALTCODE_NOP) \ : : : "memory")#if defined(CONFIG_SMP )
arch/parisc/include/asm/cache.h +7 -7
@@ -40,20 +40,20 @@ extern struct pdc_cache_info cache_info;void parisc_setup_cache_timing (void );#define pdtlb (sr, addr) asm volatile("pdtlb 0(%%sr%0,%1)" \ - ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ + ALTERNATIVE(ALT_COND_NO_SMP, ALTCODE_PxTLB) \ : : "i"(sr), "r" (addr) : "memory")#define pitlb (sr, addr) asm volatile("pitlb 0(%%sr%0,%1)" \ - ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ - ALTERNATIVE(ALT_COND_NO_SPLIT_TLB, INSN_NOP) \ + ALTERNATIVE(ALT_COND_NO_SMP, ALTCODE_PxTLB) \ + ALTERNATIVE(ALT_COND_NO_SPLIT_TLB, ALTCODE_NOP) \ : : "i"(sr), "r" (addr) : "memory")#define asm_io_fdc (addr) asm volatile("fdc %%r0(%0)" \ - ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \ - ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) \ + ALTERNATIVE(ALT_COND_NO_DCACHE, ALTCODE_NOP) \ + ALTERNATIVE(ALT_COND_NO_IOC_FDC, ALTCODE_NOP) \ : : "r" (addr) : "memory")#define asm_io_sync () asm volatile("sync" \ - ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \ - ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory") + ALTERNATIVE(ALT_COND_NO_DCACHE, ALTCODE_NOP) \ + ALTERNATIVE(ALT_COND_NO_IOC_FDC, ALTCODE_NOP) :::"memory")#define asm_syncdma () asm volatile("syncdma" :::"memory")#endif /* ! __ASSEMBLY__ */
arch/parisc/kernel/alternative.c +18 -15
@@ -26,7 +26,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,struct alt_instr *entry;int index =0 , applied =0 ;int num_cpus =num_online_cpus (); -u32 cond_check; +u8 cond_check; cond_check =ALT_COND_ALWAYS | ((num_cpus == 1) ? ALT_COND_NO_SMP : 0) |
@@ -45,15 +45,19 @@ void __init_or_module apply_alternatives(struct alt_instr *start,for (entry = start; entry < end; entry++, index++) { -u32 *from, cond, replacement; -s32 len; +u32 *from, replacement; +u8 cond; +u16 len; from = (u32 *)((ulong )&entry->orig_offset + entry->orig_offset); len = entry->len; cond = entry->cond; replacement = entry->replacement; -WARN_ON (!cond); +if (WARN_ON (!cond || !len)) +continue ; +if (WARN_ON (replacement != ALTCODE_PxTLB && replacement !=ALTCODE_NOP )) +continue ;if ((cond &ALT_COND_ALWAYS ) ==0 && no_alternatives)continue ;
@@ -66,7 +70,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,continue ;/* Want to replace pdtlb by a pdtlb,l instruction? */ -if (replacement == INSN_PxTLB) { +if (replacement == ALTCODE_PxTLB) { replacement = *from;if (boot_cpu_data.cpu_type >= pcxu)/* >= pa2.0 ? */ replacement |= (1 <<10 );/* set el bit */
@@ -76,21 +80,20 @@ void __init_or_module apply_alternatives(struct alt_instr *start,* Replace instruction with NOPs? * For long distance insert a branch instruction instead. */ -if (replacement ==INSN_NOP && len >1 ) - replacement =0xe8000002 + (len-2 )*8 ;/* "b,n .+8" */ +if (replacement ==ALTCODE_NOP ) { +if (len >1 ) + replacement =0xe8000002 + (len-2 )*8 ;/* "b,n .+8" */ +else + replacement =INSN_NOP ; + len =1 ; + }pr_debug ("ALTERNATIVE %3d: Cond %2x, Replace %2d instructions to 0x%08x @ 0x%px (%pS)\n" , index, cond, len, replacement, from, from); -if (len <0 ) { -/* Replace multiple instruction by new code */ -u32 *source; - len = -len; - source = (u32 *)((ulong )&entry->replacement + entry->replacement); -memcpy (from, source,4 * len); - }else { +while (len--) {/* Replace by one instruction */ - *from = replacement; + *from++ = replacement; } applied++; }
arch/parisc/kernel/entry.S +3 -3
@@ -407,7 +407,7 @@ bb,<,n \pte,_PAGE_PRESENT_BIT,3f b \fault stw \spc,0(\tmp) -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) +99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, ALTCODE_NOP) #endif 2: LDREG 0(\ptp),\pte bb,>=,n \pte,_PAGE_PRESENT_BIT,\fault
@@ -424,7 +424,7 @@ #ifdef CONFIG_TLB_PTLOCK 98: or,COND(=) %r0,\spc,%r0 stw,ma \spc,0(\tmp) -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) +99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, ALTCODE_NOP) #endif .endm
@@ -433,7 +433,7 @@ #ifdef CONFIG_TLB_PTLOCK 98: get_ptl \tmp ptl_unlock0 \spc,\tmp -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) +99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, ALTCODE_NOP) #endif .endm
arch/parisc/kernel/pacache.S +27 -28
184 lines not on this page · raw message