From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailapp01.imgtec.com ([195.59.15.196]:49585 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbdFEXRQ (ORCPT ); Mon, 5 Jun 2017 19:17:16 -0400 Date: Tue, 6 Jun 2017 00:17:05 +0100 From: "Maciej W. Rozycki" To: Ralf Baechle CC: James Hogan , , Subject: [PATCH 4/9] MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn' In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: stable-owner@vger.kernel.org List-ID: Fix commit e50c0a8fa60d ("Support the MIPS32 / MIPS64 DSP ASE.") and send SIGILL rather than SIGBUS whenever an unimplemented BPOSGE32 DSP ASE instruction has been encountered in `__compute_return_epc_for_insn' as our Reserved Instruction exception handler would in response to an attempt to actually execute the instruction. Sending SIGBUS only makes sense for the unaligned PC case, since moved to `__compute_return_epc'. Adjust function documentation accordingly, correct formatting and use `pr_info' rather than `printk' as the other exit path already does. Cc: stable@vger.kernel.org # 2.6.14+ Fixes: e50c0a8fa60d ("Support the MIPS32 / MIPS64 DSP ASE.") Signed-off-by: Maciej W. Rozycki --- I hope folding the formatting fix and `pr_info' update with the base change is fine given that they all apply to the same code line. Maciej linux-mips-epc-for-insn-sigill-dsp.diff Index: linux-sfr-test/arch/mips/kernel/branch.c =================================================================== --- linux-sfr-test.orig/arch/mips/kernel/branch.c 2017-06-01 06:30:07.969735000 +0100 +++ linux-sfr-test/arch/mips/kernel/branch.c 2017-06-01 06:33:27.149519000 +0100 @@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct * * @regs: Pointer to pt_regs * @insn: branch instruction to decode - * @returns: -EFAULT on error and forces SIGBUS, and on success + * @returns: -EFAULT on error and forces SIGILL, and on success * returns 0 or BRANCH_LIKELY_TAKEN as appropriate after * evaluating the branch. * @@ -830,8 +830,9 @@ int __compute_return_epc_for_insn(struct return ret; sigill_dsp: - printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm); - force_sig(SIGBUS, current); + pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n", + current->comm); + force_sig(SIGILL, current); return -EFAULT; sigill_r6: pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n", From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.59.15.196]:61731 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S23993898AbdFEXRUGf-6M (ORCPT ); Tue, 6 Jun 2017 01:17:20 +0200 Date: Tue, 6 Jun 2017 00:17:05 +0100 From: "Maciej W. Rozycki" Subject: [PATCH 4/9] MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn' In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Ralf Baechle Cc: James Hogan , linux-mips@linux-mips.org, stable@vger.kernel.org Message-ID: <20170605231705.wczrnC-hMR29w2l2jpm5LQPv-815MbDmmpWwAQL4abM@z> Fix commit e50c0a8fa60d ("Support the MIPS32 / MIPS64 DSP ASE.") and send SIGILL rather than SIGBUS whenever an unimplemented BPOSGE32 DSP ASE instruction has been encountered in `__compute_return_epc_for_insn' as our Reserved Instruction exception handler would in response to an attempt to actually execute the instruction. Sending SIGBUS only makes sense for the unaligned PC case, since moved to `__compute_return_epc'. Adjust function documentation accordingly, correct formatting and use `pr_info' rather than `printk' as the other exit path already does. Cc: stable@vger.kernel.org # 2.6.14+ Fixes: e50c0a8fa60d ("Support the MIPS32 / MIPS64 DSP ASE.") Signed-off-by: Maciej W. Rozycki --- I hope folding the formatting fix and `pr_info' update with the base change is fine given that they all apply to the same code line. Maciej linux-mips-epc-for-insn-sigill-dsp.diff Index: linux-sfr-test/arch/mips/kernel/branch.c =================================================================== --- linux-sfr-test.orig/arch/mips/kernel/branch.c 2017-06-01 06:30:07.969735000 +0100 +++ linux-sfr-test/arch/mips/kernel/branch.c 2017-06-01 06:33:27.149519000 +0100 @@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct * * @regs: Pointer to pt_regs * @insn: branch instruction to decode - * @returns: -EFAULT on error and forces SIGBUS, and on success + * @returns: -EFAULT on error and forces SIGILL, and on success * returns 0 or BRANCH_LIKELY_TAKEN as appropriate after * evaluating the branch. * @@ -830,8 +830,9 @@ int __compute_return_epc_for_insn(struct return ret; sigill_dsp: - printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm); - force_sig(SIGBUS, current); + pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n", + current->comm); + force_sig(SIGILL, current); return -EFAULT; sigill_r6: pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",