* FAILED: patch "[PATCH] arch/arm/mm: fix major fault accounting when retrying under" failed to apply to 6.7-stable tree
@ 2024-02-19 18:44 gregkh
2024-02-20 19:02 ` [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Suren Baghdasaryan
0 siblings, 2 replies; 10+ messages in thread
From: gregkh @ 2024-02-19 18:44 UTC (permalink / raw)
To: surenb, agordeev, akpm, catalin.marinas, christophe.leroy,
dave.hansen, gerald.schaefer, luto, mpe, palmer, peterz,
rmk+kernel, stable, will, willy
Cc: stable
The patch below does not apply to the 6.7-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.7.y
git checkout FETCH_HEAD
git cherry-pick -x e870920bbe68e52335a4c31a059e6af6a9a59dbb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024021921-bleak-sputter-5ecf@gregkh' --subject-prefix 'PATCH 6.7.y' HEAD^..
Possible dependencies:
e870920bbe68 ("arch/arm/mm: fix major fault accounting when retrying under per-VMA lock")
c16af1212479 ("ARM: 9328/1: mm: try VMA lock-based page fault handling first")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e870920bbe68e52335a4c31a059e6af6a9a59dbb Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Mon, 22 Jan 2024 22:43:05 -0800
Subject: [PATCH] arch/arm/mm: fix major fault accounting when retrying under
per-VMA lock
The change [1] missed ARM architecture when fixing major fault accounting
for page fault retry under per-VMA lock.
The user-visible effects is that it restores correct major fault
accounting that was broken after [2] was merged in 6.7 kernel. The
more detailed description is in [3] and this patch simply adds the
same fix to ARM architecture which I missed in [3].
Add missing code to fix ARM architecture fault accounting.
[1] 46e714c729c8 ("arch/mm/fault: fix major fault accounting when retrying under per-VMA lock")
[2] https://lore.kernel.org/all/20231006195318.4087158-6-willy@infradead.org/
[3] https://lore.kernel.org/all/20231226214610.109282-1-surenb@google.com/
Link: https://lkml.kernel.org/r/20240123064305.2829244-1-surenb@google.com
Fixes: 12214eba1992 ("mm: handle read faults under the VMA lock")
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index e96fb40b9cc3..07565b593ed6 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
goto done;
}
count_vm_vma_lock_event(VMA_LOCK_RETRY);
+ if (fault & VM_FAULT_MAJOR)
+ flags |= FAULT_FLAG_TRIED;
/* Quick path to respond to signals */
if (fault_signal_pending(fault, regs)) {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock
2024-02-19 18:44 FAILED: patch "[PATCH] arch/arm/mm: fix major fault accounting when retrying under" failed to apply to 6.7-stable tree gregkh
@ 2024-02-20 19:02 ` Suren Baghdasaryan
2024-02-20 19:07 ` Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Suren Baghdasaryan
1 sibling, 1 reply; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 19:02 UTC (permalink / raw)
To: stable
Cc: Suren Baghdasaryan, Russell King, Alexander Gordeev,
Andy Lutomirski, Catalin Marinas, Christophe Leroy, Dave Hansen,
Gerald Schaefer, Matthew Wilcox, Michael Ellerman, Palmer Dabbelt,
Peter Zijlstra, Will Deacon, Andrew Morton
The change [1] missed ARM architecture when fixing major fault accounting
for page fault retry under per-VMA lock.
The user-visible effects is that it restores correct major fault
accounting that was broken after [2] was merged in 6.7 kernel. The
more detailed description is in [3] and this patch simply adds the
same fix to ARM architecture which I missed in [3].
Add missing code to fix ARM architecture fault accounting.
[1] 46e714c729c8 ("arch/mm/fault: fix major fault accounting when retrying under per-VMA lock")
[2] https://lore.kernel.org/all/20231006195318.4087158-6-willy@infradead.org/
[3] https://lore.kernel.org/all/20231226214610.109282-1-surenb@google.com/
Link: https://lkml.kernel.org/r/20240123064305.2829244-1-surenb@google.com
Fixes: 12214eba1992 ("mm: handle read faults under the VMA lock")
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/arm/mm/fault.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index e96fb40b9cc3..07565b593ed6 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
goto done;
}
count_vm_vma_lock_event(VMA_LOCK_RETRY);
+ if (fault & VM_FAULT_MAJOR)
+ flags |= FAULT_FLAG_TRIED;
/* Quick path to respond to signals */
if (fault_signal_pending(fault, regs)) {
--
2.44.0.rc0.258.g7320e95886-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first
2024-02-19 18:44 FAILED: patch "[PATCH] arch/arm/mm: fix major fault accounting when retrying under" failed to apply to 6.7-stable tree gregkh
2024-02-20 19:02 ` [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
@ 2024-02-20 19:03 ` Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
2024-02-20 20:20 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Greg KH
1 sibling, 2 replies; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 19:03 UTC (permalink / raw)
To: stable; +Cc: Wang Kefeng, Russell King, Suren Baghdasaryan
From: Wang Kefeng <wangkefeng.wang@huawei.com>
Attempt VMA lock-based page fault handling first, and fall back to the
existing mmap_lock-based handling if that fails, the ebizzy benchmark
shows 25% improvement on qemu with 2 cpus.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f8567e95f98b..8f47d6762ea4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -35,6 +35,7 @@ config ARM
select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
select ARCH_SUPPORTS_ATOMIC_RMW
select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE
+ select ARCH_SUPPORTS_PER_VMA_LOCK
select ARCH_USE_BUILTIN_BSWAP
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_USE_MEMTEST
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index fef62e4a9edd..e96fb40b9cc3 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -278,6 +278,35 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr);
+ if (!(flags & FAULT_FLAG_USER))
+ goto lock_mmap;
+
+ vma = lock_vma_under_rcu(mm, addr);
+ if (!vma)
+ goto lock_mmap;
+
+ if (!(vma->vm_flags & vm_flags)) {
+ vma_end_read(vma);
+ goto lock_mmap;
+ }
+ fault = handle_mm_fault(vma, addr, flags | FAULT_FLAG_VMA_LOCK, regs);
+ if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED)))
+ vma_end_read(vma);
+
+ if (!(fault & VM_FAULT_RETRY)) {
+ count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
+ goto done;
+ }
+ count_vm_vma_lock_event(VMA_LOCK_RETRY);
+
+ /* Quick path to respond to signals */
+ if (fault_signal_pending(fault, regs)) {
+ if (!user_mode(regs))
+ goto no_context;
+ return 0;
+ }
+lock_mmap:
+
retry:
vma = lock_mm_and_find_vma(mm, addr, regs);
if (unlikely(!vma)) {
@@ -316,6 +345,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
}
mmap_read_unlock(mm);
+done:
/*
* Handle the "normal" case first - VM_FAULT_MAJOR
--
2.44.0.rc0.258.g7320e95886-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock
2024-02-20 19:03 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Suren Baghdasaryan
@ 2024-02-20 19:03 ` Suren Baghdasaryan
2024-02-20 20:20 ` Greg KH
2024-02-20 20:20 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Greg KH
1 sibling, 1 reply; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 19:03 UTC (permalink / raw)
To: stable
Cc: Suren Baghdasaryan, Russell King, Alexander Gordeev,
Andy Lutomirski, Catalin Marinas, Christophe Leroy, Dave Hansen,
Gerald Schaefer, Matthew Wilcox, Michael Ellerman, Palmer Dabbelt,
Peter Zijlstra, Will Deacon, Andrew Morton
The change [1] missed ARM architecture when fixing major fault accounting
for page fault retry under per-VMA lock.
The user-visible effects is that it restores correct major fault
accounting that was broken after [2] was merged in 6.7 kernel. The
more detailed description is in [3] and this patch simply adds the
same fix to ARM architecture which I missed in [3].
Add missing code to fix ARM architecture fault accounting.
[1] 46e714c729c8 ("arch/mm/fault: fix major fault accounting when retrying under per-VMA lock")
[2] https://lore.kernel.org/all/20231006195318.4087158-6-willy@infradead.org/
[3] https://lore.kernel.org/all/20231226214610.109282-1-surenb@google.com/
Link: https://lkml.kernel.org/r/20240123064305.2829244-1-surenb@google.com
Fixes: 12214eba1992 ("mm: handle read faults under the VMA lock")
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/arm/mm/fault.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index e96fb40b9cc3..07565b593ed6 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
goto done;
}
count_vm_vma_lock_event(VMA_LOCK_RETRY);
+ if (fault & VM_FAULT_MAJOR)
+ flags |= FAULT_FLAG_TRIED;
/* Quick path to respond to signals */
if (fault_signal_pending(fault, regs)) {
--
2.44.0.rc0.258.g7320e95886-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock
2024-02-20 19:02 ` [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
@ 2024-02-20 19:07 ` Suren Baghdasaryan
0 siblings, 0 replies; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 19:07 UTC (permalink / raw)
To: stable
Cc: Russell King, Alexander Gordeev, Andy Lutomirski, Catalin Marinas,
Christophe Leroy, Dave Hansen, Gerald Schaefer, Matthew Wilcox,
Michael Ellerman, Palmer Dabbelt, Peter Zijlstra, Will Deacon,
Andrew Morton
On Tue, Feb 20, 2024 at 11:02 AM Suren Baghdasaryan <surenb@google.com> wrote:
>
> The change [1] missed ARM architecture when fixing major fault accounting
> for page fault retry under per-VMA lock.
>
> The user-visible effects is that it restores correct major fault
> accounting that was broken after [2] was merged in 6.7 kernel. The
> more detailed description is in [3] and this patch simply adds the
> same fix to ARM architecture which I missed in [3].
>
> Add missing code to fix ARM architecture fault accounting.
>
> [1] 46e714c729c8 ("arch/mm/fault: fix major fault accounting when retrying under per-VMA lock")
> [2] https://lore.kernel.org/all/20231006195318.4087158-6-willy@infradead.org/
> [3] https://lore.kernel.org/all/20231226214610.109282-1-surenb@google.com/
>
> Link: https://lkml.kernel.org/r/20240123064305.2829244-1-surenb@google.com
> Fixes: 12214eba1992 ("mm: handle read faults under the VMA lock")
> Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Andy Lutomirski <luto@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
> Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Will Deacon <will@kernel.org>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Sorry, missed the prerequisite patch. Please ignore this one and see
the next patchset I sent with 2 patches in it:
https://lore.kernel.org/all/20240220190351.39815-1-surenb@google.com/
https://lore.kernel.org/all/20240220190351.39815-2-surenb@google.com/
Thanks,
Suren.
> ---
> arch/arm/mm/fault.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
> index e96fb40b9cc3..07565b593ed6 100644
> --- a/arch/arm/mm/fault.c
> +++ b/arch/arm/mm/fault.c
> @@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
> goto done;
> }
> count_vm_vma_lock_event(VMA_LOCK_RETRY);
> + if (fault & VM_FAULT_MAJOR)
> + flags |= FAULT_FLAG_TRIED;
>
> /* Quick path to respond to signals */
> if (fault_signal_pending(fault, regs)) {
> --
> 2.44.0.rc0.258.g7320e95886-goog
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first
2024-02-20 19:03 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
@ 2024-02-20 20:20 ` Greg KH
2024-02-20 20:23 ` Suren Baghdasaryan
1 sibling, 1 reply; 10+ messages in thread
From: Greg KH @ 2024-02-20 20:20 UTC (permalink / raw)
To: Suren Baghdasaryan; +Cc: stable, Wang Kefeng, Russell King
On Tue, Feb 20, 2024 at 11:03:50AM -0800, Suren Baghdasaryan wrote:
> From: Wang Kefeng <wangkefeng.wang@huawei.com>
>
> Attempt VMA lock-based page fault handling first, and fall back to the
> existing mmap_lock-based handling if that fails, the ebizzy benchmark
> shows 25% improvement on qemu with 2 cpus.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> ---
> arch/arm/Kconfig | 1 +
> arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++
> 2 files changed, 31 insertions(+)
No git id?
What kernel branch(s) does this go to?
confused,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock
2024-02-20 19:03 ` [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
@ 2024-02-20 20:20 ` Greg KH
0 siblings, 0 replies; 10+ messages in thread
From: Greg KH @ 2024-02-20 20:20 UTC (permalink / raw)
To: Suren Baghdasaryan
Cc: stable, Russell King, Alexander Gordeev, Andy Lutomirski,
Catalin Marinas, Christophe Leroy, Dave Hansen, Gerald Schaefer,
Matthew Wilcox, Michael Ellerman, Palmer Dabbelt, Peter Zijlstra,
Will Deacon, Andrew Morton
On Tue, Feb 20, 2024 at 11:03:51AM -0800, Suren Baghdasaryan wrote:
> The change [1] missed ARM architecture when fixing major fault accounting
> for page fault retry under per-VMA lock.
>
> The user-visible effects is that it restores correct major fault
> accounting that was broken after [2] was merged in 6.7 kernel. The
> more detailed description is in [3] and this patch simply adds the
> same fix to ARM architecture which I missed in [3].
>
> Add missing code to fix ARM architecture fault accounting.
>
> [1] 46e714c729c8 ("arch/mm/fault: fix major fault accounting when retrying under per-VMA lock")
> [2] https://lore.kernel.org/all/20231006195318.4087158-6-willy@infradead.org/
> [3] https://lore.kernel.org/all/20231226214610.109282-1-surenb@google.com/
>
> Link: https://lkml.kernel.org/r/20240123064305.2829244-1-surenb@google.com
> Fixes: 12214eba1992 ("mm: handle read faults under the VMA lock")
> Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Andy Lutomirski <luto@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
> Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Will Deacon <will@kernel.org>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> arch/arm/mm/fault.c | 2 ++
> 1 file changed, 2 insertions(+)
No git id? :(
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first
2024-02-20 20:20 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Greg KH
@ 2024-02-20 20:23 ` Suren Baghdasaryan
2024-02-20 20:46 ` Greg KH
0 siblings, 1 reply; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 20:23 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Wang Kefeng, Russell King
On Tue, Feb 20, 2024 at 12:20 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Tue, Feb 20, 2024 at 11:03:50AM -0800, Suren Baghdasaryan wrote:
> > From: Wang Kefeng <wangkefeng.wang@huawei.com>
> >
> > Attempt VMA lock-based page fault handling first, and fall back to the
> > existing mmap_lock-based handling if that fails, the ebizzy benchmark
> > shows 25% improvement on qemu with 2 cpus.
> >
> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> > ---
> > arch/arm/Kconfig | 1 +
> > arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++
> > 2 files changed, 31 insertions(+)
>
> No git id?
>
> What kernel branch(s) does this go to?
>
> confused,
Sorry, I used the command from your earlier email about the merge conflict:
git send-email --to '<stable@vger.kernel.org>' --in-reply-to
'2024021921-bleak-sputter-5ecf@gregkh' --subject-prefix 'PATCH 6.7.y'
HEAD^..
but it didn't send both patches, so I formatted the patches I wanted
to send and sent it with the same command replacing "HEAD^.." with
"*.patch". What should I have done instead?
>
> greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first
2024-02-20 20:23 ` Suren Baghdasaryan
@ 2024-02-20 20:46 ` Greg KH
2024-02-20 20:54 ` Suren Baghdasaryan
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2024-02-20 20:46 UTC (permalink / raw)
To: Suren Baghdasaryan; +Cc: stable, Wang Kefeng, Russell King
On Tue, Feb 20, 2024 at 12:23:01PM -0800, Suren Baghdasaryan wrote:
> On Tue, Feb 20, 2024 at 12:20 PM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Tue, Feb 20, 2024 at 11:03:50AM -0800, Suren Baghdasaryan wrote:
> > > From: Wang Kefeng <wangkefeng.wang@huawei.com>
> > >
> > > Attempt VMA lock-based page fault handling first, and fall back to the
> > > existing mmap_lock-based handling if that fails, the ebizzy benchmark
> > > shows 25% improvement on qemu with 2 cpus.
> > >
> > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> > > ---
> > > arch/arm/Kconfig | 1 +
> > > arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++
> > > 2 files changed, 31 insertions(+)
> >
> > No git id?
> >
> > What kernel branch(s) does this go to?
> >
> > confused,
>
> Sorry, I used the command from your earlier email about the merge conflict:
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to
> '2024021921-bleak-sputter-5ecf@gregkh' --subject-prefix 'PATCH 6.7.y'
> HEAD^..
> but it didn't send both patches, so I formatted the patches I wanted
> to send and sent it with the same command replacing "HEAD^.." with
> "*.patch". What should I have done instead?
You forgot the "git cherry-pick -x " portion of the instructions :(
And the subject prefix didn't work here, right?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first
2024-02-20 20:46 ` Greg KH
@ 2024-02-20 20:54 ` Suren Baghdasaryan
0 siblings, 0 replies; 10+ messages in thread
From: Suren Baghdasaryan @ 2024-02-20 20:54 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Wang Kefeng, Russell King
On Tue, Feb 20, 2024 at 12:46 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Tue, Feb 20, 2024 at 12:23:01PM -0800, Suren Baghdasaryan wrote:
> > On Tue, Feb 20, 2024 at 12:20 PM Greg KH <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Tue, Feb 20, 2024 at 11:03:50AM -0800, Suren Baghdasaryan wrote:
> > > > From: Wang Kefeng <wangkefeng.wang@huawei.com>
> > > >
> > > > Attempt VMA lock-based page fault handling first, and fall back to the
> > > > existing mmap_lock-based handling if that fails, the ebizzy benchmark
> > > > shows 25% improvement on qemu with 2 cpus.
> > > >
> > > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> > > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > > > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> > > > ---
> > > > arch/arm/Kconfig | 1 +
> > > > arch/arm/mm/fault.c | 30 ++++++++++++++++++++++++++++++
> > > > 2 files changed, 31 insertions(+)
> > >
> > > No git id?
> > >
> > > What kernel branch(s) does this go to?
> > >
> > > confused,
> >
> > Sorry, I used the command from your earlier email about the merge conflict:
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to
> > '2024021921-bleak-sputter-5ecf@gregkh' --subject-prefix 'PATCH 6.7.y'
> > HEAD^..
> > but it didn't send both patches, so I formatted the patches I wanted
> > to send and sent it with the same command replacing "HEAD^.." with
> > "*.patch". What should I have done instead?
>
> You forgot the "git cherry-pick -x " portion of the instructions :(
Ah, I see. Will do next time.
>
>
> And the subject prefix didn't work here, right?
Yes, looks like it. It worked the first time though :/
>
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-02-20 20:54 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19 18:44 FAILED: patch "[PATCH] arch/arm/mm: fix major fault accounting when retrying under" failed to apply to 6.7-stable tree gregkh
2024-02-20 19:02 ` [PATCH 6.7.y] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
2024-02-20 19:07 ` Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Suren Baghdasaryan
2024-02-20 19:03 ` [PATCH 2/2] arch/arm/mm: fix major fault accounting when retrying under per-VMA lock Suren Baghdasaryan
2024-02-20 20:20 ` Greg KH
2024-02-20 20:20 ` [PATCH 1/2] ARM: 9328/1: mm: try VMA lock-based page fault handling first Greg KH
2024-02-20 20:23 ` Suren Baghdasaryan
2024-02-20 20:46 ` Greg KH
2024-02-20 20:54 ` Suren Baghdasaryan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox