Re: [Xen-devel] [RFC PATCH 71/84] x86/setup: start tearing down the direct map.

[Wei Liu <wl@xxxxxxx>]

On Thu, Sep 26, 2019 at 10:46:34AM +0100, hongyax@xxxxxxxxxx wrote:
> From: Hongyan Xia <hongyax@xxxxxxxxxx>
> 
> Signed-off-by: Hongyan Xia <hongyax@xxxxxxxxxx>
> ---
>  xen/arch/x86/setup.c    | 4 ++--
>  xen/common/page_alloc.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
> index e964c032f6..3dc2fad987 100644
> --- a/xen/arch/x86/setup.c
> +++ b/xen/arch/x86/setup.c
> @@ -1367,7 +1367,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
>  
>              if ( map_e < end )
>              {
> -                map_pages_to_xen((unsigned long)__va(map_e), 
> maddr_to_mfn(map_e),
> +                map_pages_to_xen((unsigned long)__va(map_e), INVALID_MFN,
>                                   PFN_DOWN(end - map_e), PAGE_HYPERVISOR);

Why don't you just remove the calls to map_pages_to_xen?

>                  init_boot_pages(map_e, end);
>                  map_e = end;
> @@ -1382,7 +1382,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
>          }
>          if ( s < map_s )
>          {
> -            map_pages_to_xen((unsigned long)__va(s), maddr_to_mfn(s),
> +            map_pages_to_xen((unsigned long)__va(s), INVALID_MFN,
>                               PFN_DOWN(map_s - s), PAGE_HYPERVISOR);
>              init_boot_pages(s, map_s);
>          }
> diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
> index a00db4c0d9..deeeac065c 100644
> --- a/xen/common/page_alloc.c
> +++ b/xen/common/page_alloc.c
> @@ -2157,7 +2157,7 @@ void *alloc_xenheap_pages(unsigned int order, unsigned 
> int memflags)
>      map_pages_to_xen((unsigned long)ret, page_to_mfn(pg),
>                       1UL << order, PAGE_HYPERVISOR);
>  
> -    return page_to_virt(pg);
> +    return ret;

This hunk is a fix to a previous patch. It doesn't below here.

Wei.

>  }
>  
>  
> -- 
> 2.17.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel