[PATCH] x86/mm: don't call HVM-only function for PV guests

[PATCH] x86/mm: don't call HVM-only function for PV guests

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

Somehow I managed to drop the HVM dependency from v2 to v3 of what
became commit 5c23c760a8 ("x86/HVM: correct page dirty marking in
hvm_map_guest_frame_rw()"), obviously breaking migration of PV guests.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -425,7 +425,8 @@ static int paging_log_dirty_op(struct do
          * Mark dirty all currently write-mapped pages on e.g. the
          * final iteration of a save operation.
          */
-        if ( sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL )
+        if ( has_hvm_container_domain(d) &&
+             (sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL) )
             hvm_mapped_guest_frames_mark_dirty(d);
 
         domain_pause(d);




[-- Attachment #2: x86-HVM-map-gf-dirtying-no-PV.patch --]
[-- Type: text/plain, Size: 825 bytes --]

x86/mm: don't call HVM-only function for PV guests

Somehow I managed to drop the HVM dependency from v2 to v3 of what
became commit 5c23c760a8 ("x86/HVM: correct page dirty marking in
hvm_map_guest_frame_rw()"), obviously breaking migration of PV guests.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -425,7 +425,8 @@ static int paging_log_dirty_op(struct do
          * Mark dirty all currently write-mapped pages on e.g. the
          * final iteration of a save operation.
          */
-        if ( sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL )
+        if ( has_hvm_container_domain(d) &&
+             (sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL) )
             hvm_mapped_guest_frames_mark_dirty(d);
 
         domain_pause(d);

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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

Re: [PATCH] x86/mm: don't call HVM-only function for PV guests

[Andrew Cooper]

On 27/10/15 15:23, Jan Beulich wrote:
> Somehow I managed to drop the HVM dependency from v2 to v3 of what
> became commit 5c23c760a8 ("x86/HVM: correct page dirty marking in
> hvm_map_guest_frame_rw()"), obviously breaking migration of PV guests.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Oops yes.  Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

>
> --- a/xen/arch/x86/mm/paging.c
> +++ b/xen/arch/x86/mm/paging.c
> @@ -425,7 +425,8 @@ static int paging_log_dirty_op(struct do
>           * Mark dirty all currently write-mapped pages on e.g. the
>           * final iteration of a save operation.
>           */
> -        if ( sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL )
> +        if ( has_hvm_container_domain(d) &&
> +             (sc->mode & XEN_DOMCTL_SHADOW_LOGDIRTY_FINAL) )
>              hvm_mapped_guest_frames_mark_dirty(d);
>  
>          domain_pause(d);
>
>
>