Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Fix sibling call handling in get_frame_info

Given a function, get_frame_info() analyzes its instructions
to figure out frame size and return address. get_frame_info()
works as follows:

1. analyze up to 128 instructions if the function size is unknown
2. search for 'addiu/daddiu sp,sp,-immed' for frame size
3. search for 'sw ra,offset(sp)' for return address
4. end search when it sees jr/jal/jalr

This leads to an issue when the given function is a sibling
call, example shown as follows.

801ca110 <schedule>:
801ca110: 8f820000 lw v0,0(gp)
801ca114: 8c420000 lw v0,0(v0)
801ca118: 080726f0 j 801c9bc0 <__schedule>
801ca11c: 00000000 nop

801ca120 <io_schedule>:
801ca120: 27bdffe8 addiu sp,sp,-24
801ca124: 3c028022 lui v0,0x8022
801ca128: afbf0014 sw ra,20(sp)

In this case, get_frame_info() cannot properly detect schedule's
frame info, and eventually returns io_schedule's instead.

This patch adds 'j' to the end search condition to workaround
sibling call cases.

Signed-off-by: Tony Wu <tung7970@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5236/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Tony Wu and committed by
Ralf Baechle
e7438c4b d552b233

+4 -2
+4 -2
arch/mips/kernel/process.c
··· 264 264 #endif 265 265 } 266 266 267 - static inline int is_jal_jalr_jr_ins(union mips_instruction *ip) 267 + static inline int is_jump_ins(union mips_instruction *ip) 268 268 { 269 269 #ifdef CONFIG_CPU_MICROMIPS 270 270 /* ··· 288 288 return 0; 289 289 return (((ip->u_format.uimmediate >> 6) & mm_jalr_op) == mm_jalr_op); 290 290 #else 291 + if (ip->j_format.opcode == j_op) 292 + return 1; 291 293 if (ip->j_format.opcode == jal_op) 292 294 return 1; 293 295 if (ip->r_format.opcode != spec_op) ··· 352 350 353 351 for (i = 0; i < max_insns; i++, ip++) { 354 352 355 - if (is_jal_jalr_jr_ins(ip)) 353 + if (is_jump_ins(ip)) 356 354 break; 357 355 if (!info->frame_size) { 358 356 if (is_sp_move_ins(ip))