Re: [PATCH v2 04/11] x86/mm: Pass flush_tlb_info to flush_tlb_others() etc

[Ingo Molnar]

* Andy Lutomirski <luto@xxxxxxxxxx> wrote:

> Rather than passing all the contents of flush_tlb_info to
> flush_tlb_others(), pass a pointer to the structure directly. For
> consistency, this also removes the unnecessary cpu parameter from
> uv_flush_tlb_others() to make its signature match the other
> *flush_tlb_others() functions.
> 
> This serves two purposes:
> 
>  - It will dramatically simplify future patches that change struct
>    flush_tlb_info, which I'm planning to do.
> 
>  - struct flush_tlb_info is an adequate description of what to do
>    for a local flush, too, so by reusing it we can remove duplicated
>    code between local and remove flushes in a future patch.
> 
> Cc: Rik van Riel <riel@xxxxxxxxxx>
> Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
> Cc: Nadav Amit <namit@xxxxxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
> ---
>  arch/x86/include/asm/paravirt.h       |  6 ++--
>  arch/x86/include/asm/paravirt_types.h |  5 ++-
>  arch/x86/include/asm/tlbflush.h       | 19 ++++++-----
>  arch/x86/include/asm/uv/uv.h          |  9 ++---
>  arch/x86/mm/tlb.c                     | 64 +++++++++++++++++------------------
>  arch/x86/platform/uv/tlb_uv.c         | 10 +++---
>  arch/x86/xen/mmu.c                    | 10 +++---
>  7 files changed, 59 insertions(+), 64 deletions(-)

I've picked up the first three patches, but this patch apparently clashes with 
v4.12 changes:

patching file arch/x86/platform/uv/tlb_uv.c
Hunk #1 FAILED at 1109.
Hunk #2 FAILED at 1170.
2 out of 2 hunks FAILED -- rejects in file arch/x86/platform/uv/tlb_uv.c
patching file arch/x86/xen/mmu.c
Hunk #1 FAILED at 1427.
Hunk #2 FAILED at 1440.
Hunk #3 FAILED at 1454.
3 out of 3 hunks FAILED -- rejects in file arch/x86/xen/mmu.c

Patch 10 is broken and patch 11 needs an Ack from the KVM guys so I'll wait for a 
new series on top of the new x86/mm branch. (Which I'll push out once it passes 
testing.)

Thanks,

	Ingo