2022-05-04 19:39:19

by Jason A. Donenfeld

Subject: [PATCH] openrisc: remove bogus nops and shutdowns

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will
shut down the simulator, which isn't what we want, since it makes it
possible to handle errors.

Cc: Stafford Horne <[email protected]>
Signed-off-by: Jason A. Donenfeld <[email protected]>
---
arch/openrisc/mm/fault.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
index 80bb66ad42f6..860da58d7509 100644
--- a/arch/openrisc/mm/fault.c
+++ b/arch/openrisc/mm/fault.c
@@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
{
const struct exception_table_entry *entry;

- __asm__ __volatile__("l.nop 42");
-
if ((entry = search_exception_tables(regs->pc)) != NULL) {
/* Adjust the instruction pointer in the stackframe */
regs->pc = entry->fixup;
@@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
*/

out_of_memory:
- __asm__ __volatile__("l.nop 42");
- __asm__ __volatile__("l.nop 1");
-
mmap_read_unlock(mm);
if (!user_mode(regs))
goto no_context;
--
2.35.1

2022-05-05 00:01:45

by Stafford Horne

Subject: Re: [PATCH] openrisc: remove bogus nops and shutdowns

On Wed, May 04, 2022 at 01:09:11PM +0200, Jason A. Donenfeld wrote:
> Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will
> shut down the simulator, which isn't what we want, since it makes it
> possible to handle errors.

Do you mean impossible to handler errors?

> Cc: Stafford Horne <[email protected]>
> Signed-off-by: Jason A. Donenfeld <[email protected]>

This looks good to me, I didn't add these debug's I think we can remove them.

-Stafford

> ---
> arch/openrisc/mm/fault.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
> index 80bb66ad42f6..860da58d7509 100644
> --- a/arch/openrisc/mm/fault.c
> +++ b/arch/openrisc/mm/fault.c
> @@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
> {
> const struct exception_table_entry *entry;
>
> - __asm__ __volatile__("l.nop 42");
> -
> if ((entry = search_exception_tables(regs->pc)) != NULL) {
> /* Adjust the instruction pointer in the stackframe */
> regs->pc = entry->fixup;
> @@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
> */
>
> out_of_memory:
> - __asm__ __volatile__("l.nop 42");
> - __asm__ __volatile__("l.nop 1");
> -
> mmap_read_unlock(mm);
> if (!user_mode(regs))
> goto no_context;
> --
> 2.35.1
>

2022-05-05 02:24:16

by Jason A. Donenfeld

Subject: Re: [PATCH] openrisc: remove bogus nops and shutdowns

On Thu, May 05, 2022 at 07:24:50AM +0900, Stafford Horne wrote:
> On Wed, May 04, 2022 at 01:09:11PM +0200, Jason A. Donenfeld wrote:
> > Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will
> > shut down the simulator, which isn't what we want, since it makes it
> > possible to handle errors.
>
> Do you mean impossible to handler errors?

Whoops, yes.

>
> > Cc: Stafford Horne <[email protected]>
> > Signed-off-by: Jason A. Donenfeld <[email protected]>
>
> This looks good to me, I didn't add these debug's I think we can remove them.
>

2022-05-11 18:20:25

by Jason A. Donenfeld

Subject: [PATCH v2] openrisc: remove bogus nops and shutdowns

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will
shut down the simulator, which isn't what we want, since it makes it
impossible to handle errors.

Cc: Stafford Horne <[email protected]>
Signed-off-by: Jason A. Donenfeld <[email protected]>
---
Changes v1->v2:
- Fixed typo in commit message.

arch/openrisc/mm/fault.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
index 80bb66ad42f6..860da58d7509 100644
--- a/arch/openrisc/mm/fault.c
+++ b/arch/openrisc/mm/fault.c
@@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
{
const struct exception_table_entry *entry;

- __asm__ __volatile__("l.nop 42");
-
if ((entry = search_exception_tables(regs->pc)) != NULL) {
/* Adjust the instruction pointer in the stackframe */
regs->pc = entry->fixup;
@@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
*/

out_of_memory:
- __asm__ __volatile__("l.nop 42");
- __asm__ __volatile__("l.nop 1");
-
mmap_read_unlock(mm);
if (!user_mode(regs))
goto no_context;
--
2.35.1

2022-05-13 04:08:50

by Stafford Horne

Subject: Re: [PATCH v2] openrisc: remove bogus nops and shutdowns

On Wed, May 11, 2022 at 03:35:50PM +0200, Jason A. Donenfeld wrote:
> Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will
> shut down the simulator, which isn't what we want, since it makes it
> impossible to handle errors.
>
> Cc: Stafford Horne <[email protected]>
> Signed-off-by: Jason A. Donenfeld <[email protected]>

Thanks, this looks good now. I will queue it.