Re: [PATCH 1/2] arm: irq_pipeline: Fix fault_{entry,exit} imbalance

Florian Bezdeka <[email protected]> writes:

> upstream commit
> d92725256b4f ("mm: avoid unnecessary page fault retires on shared memory types")
> introduced a new exit path to do_page_fault(), so that an imbalance
> of fault_{entry,exit} can happen.
>
> The commit was introduced with Linux 6.0, so all newer Dovetail
> versions are affected.
>
> Signed-off-by: Florian Bezdeka <[email protected]>
> ---
>  arch/arm/mm/fault.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
> index b4bb33e1638cd67ce2b6c0b90a4a9693e784bb3e..4beae304c0269d11173cd3b360cec05e59f30d82 100644
> --- a/arch/arm/mm/fault.c
> +++ b/arch/arm/mm/fault.c
> @@ -539,7 +539,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
>  
>  	/* The fault is fully completed (including releasing mmap lock) */
>  	if (fault & VM_FAULT_COMPLETED)
> -		return 0;
> +		goto out;
>  
>  	if (!(fault & VM_FAULT_ERROR)) {
>  		if (fault & VM_FAULT_RETRY) {

Merged, thanks.

-- 
Philippe.