On Mon, Nov 25, 2019 at 10:01:36AM -0800, Sean Christopherson wrote: > On Mon, Nov 25, 2019 at 12:43:59PM -0500, Sasha Levin wrote: > > On Mon, Nov 18, 2019 at 04:22:40PM +0100, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > > >The patch below does not apply to the 4.19-stable tree. ... > > >Reported-by: Adam Borowski <kilobyte@xxxxxxxxxx> > > >Analyzed-by: David Hildenbrand <david@xxxxxxxxxx> > > >Acked-by: Dan Williams <dan.j.williams@xxxxxxxxx> > > >Cc: stable@xxxxxxxxxxxxxxx > > >Fixes: 3565fce3a659 ("mm, x86: get_user_pages() for dax mappings") > > >Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > > >Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > > > > I also took e7912386ede8 ("KVM: x86: reintroduce pte_list_remove, but > > including mmu_spte_clear_track_bits") and queued both for 4.19-4.9. > > I don't think that will work, you'd also have to pull in commit 8daf346226b2 > ("KVM: x86: rename pte_list_remove to __pte_list_remove"). And e7912386ede8 > in particular isn't stable material. > > I'll send a proper backport for 4.19 and earlier, the conflicts should be > easy to resolve. I have a silly backporting question regarding SOBs. Should I add a second SOB for myself, reorder the SOBs, or leave it as is? E.g. (A) is the most correct from a chronological handling perspective, but having two SOBs feels weird. Option A: Fixes: 3565fce3a659 ("mm, x86: get_user_pages() for dax mappings") Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> [sean: backport to 4.x; resolve conflict in mmu.c] Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Option B: Fixes: 3565fce3a659 ("mm, x86: get_user_pages() for dax mappings") Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> [sean: backport to 4.x; resolve conflict in mmu.c] Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Option C: Fixes: 3565fce3a659 ("mm, x86: get_user_pages() for dax mappings") Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>