On Fri, 2020-01-10 at 11:15 +0000, Durrant, Paul wrote: > > -----Original Message----- > > From: Xen-devel <xen-devel-boun...@lists.xenproject.org> On Behalf > > Of > > David Woodhouse > > Sent: 08 January 2020 17:25 > > To: Xen-devel <xen-devel@lists.xenproject.org> > > Cc: Stefano Stabellini <sstabell...@kernel.org>; Julien Grall > > <jul...@xen.org>; Wei Liu <w...@xen.org>; Konrad Rzeszutek Wilk > > <konrad.w...@oracle.com>; George Dunlap < > > george.dun...@eu.citrix.com>; > > Andrew Cooper <andrew.coop...@citrix.com>; p...@xen.org; Ian > > Jackson > > <ian.jack...@eu.citrix.com>; Jan Beulich <jbeul...@suse.com>; Roger > > Pau > > Monné <roger....@citrix.com> > > Subject: [Xen-devel] [RFC PATCH 1/3] x86/setup: Don't skip 2MiB > > underneath > > relocated Xen image > > > > From: David Woodhouse <d...@amazon.co.uk> > > > > Set 'e' correctly to reflect the location that Xen is actually > > relocated > > to from its default 2MiB location. Not 2MiB below that. > > > > Signed-off-by: David Woodhouse <d...@amazon.co.uk> > > --- > > xen/arch/x86/setup.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > > index 501f3f5e4b..47e065e5fe 100644 > > --- a/xen/arch/x86/setup.c > > +++ b/xen/arch/x86/setup.c > > @@ -1077,9 +1077,9 @@ void __init noreturn __start_xen(unsigned > > long > > mbi_p) > > unsigned long pte_update_limit; > > > > /* Select relocation address. */ > > - e = end - reloc_size; > > - xen_phys_start = e; > > - bootsym(trampoline_xen_phys_start) = e; > > + xen_phys_start = end - reloc_size; > > + e = xen_phys_start + XEN_IMG_OFFSET; > > + bootsym(trampoline_xen_phys_start) = xen_phys_start; > > > > /* > > * No PTEs pointing above this address are candidates > > for > > relocation. > > Do you not also need to adjust the setting of pte_update_limit that's > just out of context below here?
Yes. I missed that when forward-porting to the master branch. Thanks.
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
