2024-05-30 16:45:19

by Palmer Dabbelt

[permalink] [raw]
Subject: [PATCH] Revert "riscv: mm: accelerate pagefault when badaccess"

From: Palmer Dabbelt <[email protected]>

I accidentally picked up an earlier version of this patch, which had
already landed via mm. The patch I picked up contains a bug, which I
kept as I thought it was a fix. So let's just revert it.

This reverts commit 4c6c0020427a4547845a83f7e4d6085e16c3e24f.

Fixes: 4c6c0020427a ("riscv: mm: accelerate pagefault when badaccess")
Signed-off-by: Palmer Dabbelt <[email protected]>
---
arch/riscv/mm/fault.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index b3fcf7d67efb..5224f3733802 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -293,8 +293,8 @@ void handle_page_fault(struct pt_regs *regs)
if (unlikely(access_error(cause, vma))) {
vma_end_read(vma);
count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
- tsk->thread.bad_cause = SEGV_ACCERR;
- bad_area_nosemaphore(regs, code, addr);
+ tsk->thread.bad_cause = cause;
+ bad_area_nosemaphore(regs, SEGV_ACCERR, addr);
return;
}

--
2.45.1



2024-05-31 04:05:56

by Kefeng Wang

[permalink] [raw]
Subject: Re: [PATCH] Revert "riscv: mm: accelerate pagefault when badaccess"



On 2024/5/31 0:44, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <[email protected]>
>
> I accidentally picked up an earlier version of this patch, which had
> already landed via mm. The patch I picked up contains a bug, which I
> kept as I thought it was a fix. So let's just revert it.
>
> This reverts commit 4c6c0020427a4547845a83f7e4d6085e16c3e24f.


Yes, this one is the wrong v1.

Reviewed-by: Kefeng Wang <[email protected]>


>
> Fixes: 4c6c0020427a ("riscv: mm: accelerate pagefault when badaccess")
> Signed-off-by: Palmer Dabbelt <[email protected]>
> ---
> arch/riscv/mm/fault.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> index b3fcf7d67efb..5224f3733802 100644
> --- a/arch/riscv/mm/fault.c
> +++ b/arch/riscv/mm/fault.c
> @@ -293,8 +293,8 @@ void handle_page_fault(struct pt_regs *regs)
> if (unlikely(access_error(cause, vma))) {
> vma_end_read(vma);
> count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
> - tsk->thread.bad_cause = SEGV_ACCERR;
> - bad_area_nosemaphore(regs, code, addr);
> + tsk->thread.bad_cause = cause;
> + bad_area_nosemaphore(regs, SEGV_ACCERR, addr);
> return;
> }
>

2024-05-31 05:46:09

by Alexandre Ghiti

[permalink] [raw]
Subject: Re: [PATCH] Revert "riscv: mm: accelerate pagefault when badaccess"

On 30/05/2024 18:44, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <[email protected]>
>
> I accidentally picked up an earlier version of this patch, which had
> already landed via mm. The patch I picked up contains a bug, which I
> kept as I thought it was a fix. So let's just revert it.
>
> This reverts commit 4c6c0020427a4547845a83f7e4d6085e16c3e24f.
>
> Fixes: 4c6c0020427a ("riscv: mm: accelerate pagefault when badaccess")
> Signed-off-by: Palmer Dabbelt <[email protected]>
> ---
> arch/riscv/mm/fault.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> index b3fcf7d67efb..5224f3733802 100644
> --- a/arch/riscv/mm/fault.c
> +++ b/arch/riscv/mm/fault.c
> @@ -293,8 +293,8 @@ void handle_page_fault(struct pt_regs *regs)
> if (unlikely(access_error(cause, vma))) {
> vma_end_read(vma);
> count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
> - tsk->thread.bad_cause = SEGV_ACCERR;
> - bad_area_nosemaphore(regs, code, addr);
> + tsk->thread.bad_cause = cause;
> + bad_area_nosemaphore(regs, SEGV_ACCERR, addr);
> return;
> }
>


Reviewed-by: Alexandre Ghiti <[email protected]>


Subject: Re: [PATCH] Revert "riscv: mm: accelerate pagefault when badaccess"

Hello:

This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:

On Thu, 30 May 2024 09:44:51 -0700 you wrote:
> From: Palmer Dabbelt <[email protected]>
>
> I accidentally picked up an earlier version of this patch, which had
> already landed via mm. The patch I picked up contains a bug, which I
> kept as I thought it was a fix. So let's just revert it.
>
> This reverts commit 4c6c0020427a4547845a83f7e4d6085e16c3e24f.
>
> [...]

Here is the summary with links:
- Revert "riscv: mm: accelerate pagefault when badaccess"
https://git.kernel.org/riscv/c/7932b172ac7e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html