Skip to content

Commit 41885b0

Browse files
mpredfearnralfbaechle
authored andcommitted
MIPS: Stacktrace: Fix microMIPS stack unwinding on big endian systems
The stack unwinding code uses the mips_instuction union to decode the instructions it finds. That union uses the __BITFIELD_FIELD macro to reorder depending on endianness. The stack unwinding code always places 16bit instructions in halfword 1 of the union. This makes the union accesses correct for little endian systems. Similarly, 32bit instructions are reordered such that they are correct for little endian systems. This handling leaves unwinding the stack on big endian systems broken, as the mips_instruction union will then look for the fields in the wrong halfword. To fix this, use a logical shift to place the 16bit instruction into the correct position in the word field of the union. Use the same shifting to order the 2 halfwords of 32bit instuctions. Then replace accesses to the halfword with accesses to the shifted word. In the case of the ADDIUS5 instruction, switch to using the mm16_r5_format union member to avoid the need for a 16bit shift. Fixes: 34c2f66 ("MIPS: microMIPS: Add unaligned access support.") Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: Marcin Nowakowski <marcin.nowakowski@imgtec.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16956/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent cea8cd4 commit 41885b0

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

arch/mips/kernel/process.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static inline int is_ra_save_ins(union mips_instruction *ip, int *poff)
208208
*
209209
* microMIPS is way more fun...
210210
*/
211-
if (mm_insn_16bit(ip->halfword[1])) {
211+
if (mm_insn_16bit(ip->word >> 16)) {
212212
switch (ip->mm16_r5_format.opcode) {
213213
case mm_swsp16_op:
214214
if (ip->mm16_r5_format.rt != 31)
@@ -287,7 +287,7 @@ static inline int is_jump_ins(union mips_instruction *ip)
287287
*
288288
* microMIPS is kind of more fun...
289289
*/
290-
if (mm_insn_16bit(ip->halfword[1])) {
290+
if (mm_insn_16bit(ip->word >> 16)) {
291291
if ((ip->mm16_r5_format.opcode == mm_pool16c_op &&
292292
(ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op))
293293
return 1;
@@ -324,7 +324,7 @@ static inline int is_sp_move_ins(union mips_instruction *ip)
324324
*
325325
* microMIPS is not more fun...
326326
*/
327-
if (mm_insn_16bit(ip->halfword[1])) {
327+
if (mm_insn_16bit(ip->word >> 16)) {
328328
return (ip->mm16_r3_format.opcode == mm_pool16d_op &&
329329
ip->mm16_r3_format.simmediate & mm_addiusp_func) ||
330330
(ip->mm16_r5_format.opcode == mm_pool16d_op &&
@@ -364,12 +364,10 @@ static int get_frame_info(struct mips_frame_info *info)
364364
for (i = 0; i < max_insns && ip < ip_end; i++) {
365365
ip = (void *)ip + last_insn_size;
366366
if (is_mmips && mm_insn_16bit(ip->halfword[0])) {
367-
insn.halfword[0] = 0;
368-
insn.halfword[1] = ip->halfword[0];
367+
insn.word = ip->halfword[0] << 16;
369368
last_insn_size = 2;
370369
} else if (is_mmips) {
371-
insn.halfword[0] = ip->halfword[1];
372-
insn.halfword[1] = ip->halfword[0];
370+
insn.word = ip->halfword[0] << 16 | ip->halfword[1];
373371
last_insn_size = 4;
374372
} else {
375373
insn.word = ip->word;
@@ -380,7 +378,7 @@ static int get_frame_info(struct mips_frame_info *info)
380378
if (is_sp_move_ins(&insn))
381379
{
382380
#ifdef CONFIG_CPU_MICROMIPS
383-
if (mm_insn_16bit(ip->halfword[0]))
381+
if (mm_insn_16bit(insn.word >> 16))
384382
{
385383
unsigned short tmp;
386384

@@ -393,7 +391,7 @@ static int get_frame_info(struct mips_frame_info *info)
393391
tmp ^= 0x100;
394392
info->frame_size = -(signed short)(tmp << 2);
395393
} else {
396-
tmp = (ip->halfword[0] >> 1);
394+
tmp = (ip->mm16_r5_format.imm >> 1);
397395
info->frame_size = -(signed short)(tmp & 0xf);
398396
}
399397
} else

0 commit comments

Comments
 (0)