Re: [Xen-devel] [PATCH v7 09/15] xen: move VCPUOP_register_vcpu_info to common code

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2013-05-07 at 15:12 +0100, Stefano Stabellini wrote:
> Move the implementation of VCPUOP_register_vcpu_info from x86 specific
> to commmon code.
> 
> Move vcpu_info_mfn from an arch specific vcpu sub-field to the common
> vcpu struct.
> Move the initialization of vcpu_info_mfn to common code.
> 
> Move unmap_vcpu_info and the call to unmap_vcpu_info at domain
> destruction time to common code.
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Acked-by: Keir Fraser <keir@xxxxxxx>
> CC: keir@xxxxxxx
> CC: JBeulich@xxxxxxxx

I'm afraid I get conflicts when trying to apply this patch.

Mostly they were just context changes which I could deal with but there
was one conflict in x86's domain_relinquish_resources which I wasn't too
sure about. Can you rebase please?

I don't think the code which is moved has changed but if you could
confim my conclusion that you aren't accidentally reverting something
that would be useful I think.

These two commits seem to be the source of the conflicts, with the top
one seeming to contain the conflict I wasn't sure about.

commit 9626d1c1fafe2da5af6e59478c9e9db6d03144df
Author: Jan Beulich <jbeulich@xxxxxxxx>
Date:   Thu May 2 09:29:36 2013 +0200

    x86: call unmap_vcpu_info() regardless of guest type
    
    This fixes a regression from 63753b3e ("x86: allow
    VCPUOP_register_vcpu_info to work again on PVHVM guests").
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Tested-by: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>

commit 4939f9a6dee4280f38730fd3066e5dce353112f6
Author: Jan Beulich <jbeulich@xxxxxxxx>
Date:   Thu May 2 16:37:24 2013 +0200

    x86: make vcpu_reset() preemptible
    
    ... as dropping the old page tables may take significant amounts of
    time.
    
    This is part of CVE-2013-1918 / XSA-45.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel