From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933529AbbICP5O (ORCPT ); Thu, 3 Sep 2015 11:57:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:60049 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933299AbbICPqq (ORCPT ); Thu, 3 Sep 2015 11:46:46 -0400 Subject: Re: [Xen-devel] [PATCH] xen/p2m: fix extra memory regions accounting To: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , David Vrabel , linux-kernel@vger.kernel.org References: <1441281916-38284-1-git-send-email-roger.pau@citrix.com> <55E83C46.8010701@suse.com> <55E85B61.4070203@citrix.com> <55E85CF3.40705@citrix.com> <55E85EB6.7060307@citrix.com> <55E85F52.9030708@suse.com> <55E860D5.5050609@citrix.com> <55E8654A.8020302@suse.com> <55E869A3.6030008@citrix.com> Cc: xen-devel@lists.xenproject.org, Boris Ostrovsky From: Juergen Gross Message-ID: <55E86B63.8020901@suse.com> Date: Thu, 3 Sep 2015 17:46:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <55E869A3.6030008@citrix.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/03/2015 05:39 PM, Roger Pau Monné wrote: > El 03/09/15 a les 17.20, Juergen Gross ha escrit: >> On 09/03/2015 05:01 PM, David Vrabel wrote: >>> On 03/09/15 15:55, Juergen Gross wrote: >>>> On 09/03/2015 04:52 PM, David Vrabel wrote: >>>>> On 03/09/15 15:45, David Vrabel wrote: >>>>>> On 03/09/15 15:38, Roger Pau Monné wrote: >>>>>>> El 03/09/15 a les 14.25, Juergen Gross ha escrit: >>>>>>>> On 09/03/2015 02:05 PM, Roger Pau Monne wrote: >>>>>>>>> On systems with memory maps with ranges that don't end at page >>>>>>>>> boundaries, >>>>>>>>> like: >>>>>>>>> >>>>>>>>> [...] >>>>>>>>> (XEN) 0000000000100000 - 00000000dfdf9c00 (usable) >>>>>>>>> (XEN) 00000000dfdf9c00 - 00000000dfe4bc00 (ACPI NVS) >>>>>>>>> [...] >>>>>>>>> >>>>>>>>> xen_add_extra_mem will create a protected range that ends up at >>>>>>>>> 0xdfdf9c00, >>>>>>>>> but the function used to check if a memory address is inside of a >>>>>>>>> protected >>>>>>>>> range works with pfns, which means that an attempt to map >>>>>>>>> 0xdfdf9c00 >>>>>>>>> will be >>>>>>>>> refused because the check is performed against 0xdfdf9000 >>>>>>>>> instead of >>>>>>>>> 0xdfdf9c00. >>>>>>>>> >>>>>>>>> In order to fix this, make sure that the ranges that are added >>>>>>>>> to the >>>>>>>>> xen_extra_mem array are aligned to page boundaries. >>>>>>>>> >>>>>>>>> Signed-off-by: Roger Pau Monné >>>>>>>>> Cc: Konrad Rzeszutek Wilk >>>>>>>>> Cc: Boris Ostrovsky >>>>>>>>> Cc: David Vrabel >>>>>>>>> Cc: Juergen Gross >>>>>>>>> Cc: xen-devel@lists.xenproject.org >>>>>>>>> --- >>>>>>>>> AFAICT this patch needs to be backported to 3.19, 4.0, 4.1 and 4.2. >>>>>>>>> --- >>>>>>>>> arch/x86/xen/setup.c | 6 ++++++ >>>>>>>>> 1 file changed, 6 insertions(+) >>>>>>>>> >>>>>>>>> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c >>>>>>>>> index 55f388e..dcf5865 100644 >>>>>>>>> --- a/arch/x86/xen/setup.c >>>>>>>>> +++ b/arch/x86/xen/setup.c >>>>>>>>> @@ -68,6 +68,9 @@ static void __init xen_add_extra_mem(phys_addr_t >>>>>>>>> start, phys_addr_t size) >>>>>>>>> { >>>>>>>>> int i; >>>>>>>>> >>>>>>>>> + start = PAGE_ALIGN(start); >>>>>>>>> + size &= PAGE_MASK; >>>>>>>> >>>>>>>> This is not correct. If start wasn't page aligned and size was, >>>>>>>> you'll >>>>>>>> add one additional page to xen_extra_mem. >>>>>>> >>>>>>> I'm not understanding this, let's put an example: >>>>>>> >>>>>>> start = 0x8c00 >>>>>>> size = 0x1000 >>>>>>> >>>>>>> After the fixup added above this would become: >>>>>>> >>>>>>> start = 0x9000 >>>>>>> size = 0x1000 >>>>>>> >>>>>>> So if anything, I'm adding one page less (because 0x8000 was partly >>>>>>> added, and with the fixup it is not added). >>>>>> >>>>>> We expand the reserved (i.e., non-RAM) areas down so they're fully >>>>>> covered with whole pages when we depopulate and 1:1 map them, we >>>>>> should >>>>>> add extra memory regions that cover these same areas. >>>>> >>>>> Ignore this. This was nonsense. >>>>> >>>>> We expand the reserved (i.e., non-RAM) areas so they're fully covered >>>>> with whole pages when we depopulate and 1:1 map them, we should add the >>>>> extra memory such that it does not overlap with with expanded regions. >>>>> i.e., round up the start and round down the end (like Roger's patch >>>>> does). >>>> >>>> Nearly. Roger's patch rounds up start and rounds down the size. It might >>>> add non-RAM partial pages to xen_extra_mem. >>> >>> Yes. You're right. >> >> Hmm, thinking more about it, I'd prefer to change xen_extra_mem to use >> pfns instead of physical addresses. This would make things much more >> clear. >> >> Roger, do you want to do the patch or should I? > > I can certainly take care of it if you are busy, otherwise I leave it to > you since you have more expertise on it :). Okay, I can do it. Should be ready soon... Juergen From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: Re: [PATCH] xen/p2m: fix extra memory regions accounting Date: Thu, 3 Sep 2015 17:46:43 +0200 Message-ID: <55E86B63.8020901@suse.com> References: <1441281916-38284-1-git-send-email-roger.pau@citrix.com> <55E83C46.8010701@suse.com> <55E85B61.4070203@citrix.com> <55E85CF3.40705@citrix.com> <55E85EB6.7060307@citrix.com> <55E85F52.9030708@suse.com> <55E860D5.5050609@citrix.com> <55E8654A.8020302@suse.com> <55E869A3.6030008@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZXWiw-0004iU-9k for xen-devel@lists.xenproject.org; Thu, 03 Sep 2015 15:46:50 +0000 In-Reply-To: <55E869A3.6030008@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , David Vrabel , linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org, Boris Ostrovsky List-Id: xen-devel@lists.xenproject.org T24gMDkvMDMvMjAxNSAwNTozOSBQTSwgUm9nZXIgUGF1IE1vbm7DqSB3cm90ZToKPiBFbCAwMy8w OS8xNSBhIGxlcyAxNy4yMCwgSnVlcmdlbiBHcm9zcyBoYSBlc2NyaXQ6Cj4+IE9uIDA5LzAzLzIw MTUgMDU6MDEgUE0sIERhdmlkIFZyYWJlbCB3cm90ZToKPj4+IE9uIDAzLzA5LzE1IDE1OjU1LCBK dWVyZ2VuIEdyb3NzIHdyb3RlOgo+Pj4+IE9uIDA5LzAzLzIwMTUgMDQ6NTIgUE0sIERhdmlkIFZy YWJlbCB3cm90ZToKPj4+Pj4gT24gMDMvMDkvMTUgMTU6NDUsIERhdmlkIFZyYWJlbCB3cm90ZToK Pj4+Pj4+IE9uIDAzLzA5LzE1IDE1OjM4LCBSb2dlciBQYXUgTW9ubsOpIHdyb3RlOgo+Pj4+Pj4+ IEVsIDAzLzA5LzE1IGEgbGVzIDE0LjI1LCBKdWVyZ2VuIEdyb3NzIGhhIGVzY3JpdDoKPj4+Pj4+ Pj4gT24gMDkvMDMvMjAxNSAwMjowNSBQTSwgUm9nZXIgUGF1IE1vbm5lIHdyb3RlOgo+Pj4+Pj4+ Pj4gT24gc3lzdGVtcyB3aXRoIG1lbW9yeSBtYXBzIHdpdGggcmFuZ2VzIHRoYXQgZG9uJ3QgZW5k IGF0IHBhZ2UKPj4+Pj4+Pj4+IGJvdW5kYXJpZXMsCj4+Pj4+Pj4+PiBsaWtlOgo+Pj4+Pj4+Pj4K Pj4+Pj4+Pj4+IFsuLi5dCj4+Pj4+Pj4+PiAoWEVOKSAgMDAwMDAwMDAwMDEwMDAwMCAtIDAwMDAw MDAwZGZkZjljMDAgKHVzYWJsZSkKPj4+Pj4+Pj4+IChYRU4pICAwMDAwMDAwMGRmZGY5YzAwIC0g MDAwMDAwMDBkZmU0YmMwMCAoQUNQSSBOVlMpCj4+Pj4+Pj4+PiBbLi4uXQo+Pj4+Pj4+Pj4KPj4+ Pj4+Pj4+IHhlbl9hZGRfZXh0cmFfbWVtIHdpbGwgY3JlYXRlIGEgcHJvdGVjdGVkIHJhbmdlIHRo YXQgZW5kcyB1cCBhdAo+Pj4+Pj4+Pj4gMHhkZmRmOWMwMCwKPj4+Pj4+Pj4+IGJ1dCB0aGUgZnVu Y3Rpb24gdXNlZCB0byBjaGVjayBpZiBhIG1lbW9yeSBhZGRyZXNzIGlzIGluc2lkZSBvZiBhCj4+ Pj4+Pj4+PiBwcm90ZWN0ZWQKPj4+Pj4+Pj4+IHJhbmdlIHdvcmtzIHdpdGggcGZucywgd2hpY2gg bWVhbnMgdGhhdCBhbiBhdHRlbXB0IHRvIG1hcAo+Pj4+Pj4+Pj4gMHhkZmRmOWMwMAo+Pj4+Pj4+ Pj4gd2lsbCBiZQo+Pj4+Pj4+Pj4gcmVmdXNlZCBiZWNhdXNlIHRoZSBjaGVjayBpcyBwZXJmb3Jt ZWQgYWdhaW5zdCAweGRmZGY5MDAwCj4+Pj4+Pj4+PiBpbnN0ZWFkIG9mCj4+Pj4+Pj4+PiAweGRm ZGY5YzAwLgo+Pj4+Pj4+Pj4KPj4+Pj4+Pj4+IEluIG9yZGVyIHRvIGZpeCB0aGlzLCBtYWtlIHN1 cmUgdGhhdCB0aGUgcmFuZ2VzIHRoYXQgYXJlIGFkZGVkCj4+Pj4+Pj4+PiB0byB0aGUKPj4+Pj4+ Pj4+IHhlbl9leHRyYV9tZW0gYXJyYXkgYXJlIGFsaWduZWQgdG8gcGFnZSBib3VuZGFyaWVzLgo+ Pj4+Pj4+Pj4KPj4+Pj4+Pj4+IFNpZ25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2Vy LnBhdUBjaXRyaXguY29tPgo+Pj4+Pj4+Pj4gQ2M6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29u cmFkLndpbGtAb3JhY2xlLmNvbT4KPj4+Pj4+Pj4+IENjOiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlz Lm9zdHJvdnNreUBvcmFjbGUuY29tPgo+Pj4+Pj4+Pj4gQ2M6IERhdmlkIFZyYWJlbCA8ZGF2aWQu dnJhYmVsQGNpdHJpeC5jb20+Cj4+Pj4+Pj4+PiBDYzogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1 c2UuY29tPgo+Pj4+Pj4+Pj4gQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwo+Pj4+ Pj4+Pj4gLS0tCj4+Pj4+Pj4+PiBBRkFJQ1QgdGhpcyBwYXRjaCBuZWVkcyB0byBiZSBiYWNrcG9y dGVkIHRvIDMuMTksIDQuMCwgNC4xIGFuZCA0LjIuCj4+Pj4+Pj4+PiAtLS0KPj4+Pj4+Pj4+ICAg ICAgYXJjaC94ODYveGVuL3NldHVwLmMgfCA2ICsrKysrKwo+Pj4+Pj4+Pj4gICAgICAxIGZpbGUg Y2hhbmdlZCwgNiBpbnNlcnRpb25zKCspCj4+Pj4+Pj4+Pgo+Pj4+Pj4+Pj4gZGlmZiAtLWdpdCBh L2FyY2gveDg2L3hlbi9zZXR1cC5jIGIvYXJjaC94ODYveGVuL3NldHVwLmMKPj4+Pj4+Pj4+IGlu ZGV4IDU1ZjM4OGUuLmRjZjU4NjUgMTAwNjQ0Cj4+Pj4+Pj4+PiAtLS0gYS9hcmNoL3g4Ni94ZW4v c2V0dXAuYwo+Pj4+Pj4+Pj4gKysrIGIvYXJjaC94ODYveGVuL3NldHVwLmMKPj4+Pj4+Pj4+IEBA IC02OCw2ICs2OCw5IEBAIHN0YXRpYyB2b2lkIF9faW5pdCB4ZW5fYWRkX2V4dHJhX21lbShwaHlz X2FkZHJfdAo+Pj4+Pj4+Pj4gc3RhcnQsIHBoeXNfYWRkcl90IHNpemUpCj4+Pj4+Pj4+PiAgICAg IHsKPj4+Pj4+Pj4+ICAgICAgICAgIGludCBpOwo+Pj4+Pj4+Pj4KPj4+Pj4+Pj4+ICsgICAgc3Rh cnQgPSBQQUdFX0FMSUdOKHN0YXJ0KTsKPj4+Pj4+Pj4+ICsgICAgc2l6ZSAmPSBQQUdFX01BU0s7 Cj4+Pj4+Pj4+Cj4+Pj4+Pj4+IFRoaXMgaXMgbm90IGNvcnJlY3QuIElmIHN0YXJ0IHdhc24ndCBw YWdlIGFsaWduZWQgYW5kIHNpemUgd2FzLAo+Pj4+Pj4+PiB5b3UnbGwKPj4+Pj4+Pj4gYWRkIG9u ZSBhZGRpdGlvbmFsIHBhZ2UgdG8geGVuX2V4dHJhX21lbS4KPj4+Pj4+Pgo+Pj4+Pj4+IEknbSBu b3QgdW5kZXJzdGFuZGluZyB0aGlzLCBsZXQncyBwdXQgYW4gZXhhbXBsZToKPj4+Pj4+Pgo+Pj4+ Pj4+IHN0YXJ0ID0gMHg4YzAwCj4+Pj4+Pj4gc2l6ZSA9IDB4MTAwMAo+Pj4+Pj4+Cj4+Pj4+Pj4g QWZ0ZXIgdGhlIGZpeHVwIGFkZGVkIGFib3ZlIHRoaXMgd291bGQgYmVjb21lOgo+Pj4+Pj4+Cj4+ Pj4+Pj4gc3RhcnQgPSAweDkwMDAKPj4+Pj4+PiBzaXplID0gMHgxMDAwCj4+Pj4+Pj4KPj4+Pj4+ PiBTbyBpZiBhbnl0aGluZywgSSdtIGFkZGluZyBvbmUgcGFnZSBsZXNzIChiZWNhdXNlIDB4ODAw MCB3YXMgcGFydGx5Cj4+Pj4+Pj4gYWRkZWQsIGFuZCB3aXRoIHRoZSBmaXh1cCBpdCBpcyBub3Qg YWRkZWQpLgo+Pj4+Pj4KPj4+Pj4+IFdlIGV4cGFuZCB0aGUgcmVzZXJ2ZWQgKGkuZS4sIG5vbi1S QU0pIGFyZWFzIGRvd24gc28gdGhleSdyZSBmdWxseQo+Pj4+Pj4gY292ZXJlZCB3aXRoIHdob2xl IHBhZ2VzIHdoZW4gd2UgZGVwb3B1bGF0ZSBhbmQgMToxIG1hcCB0aGVtLCB3ZQo+Pj4+Pj4gc2hv dWxkCj4+Pj4+PiBhZGQgZXh0cmEgbWVtb3J5IHJlZ2lvbnMgdGhhdCBjb3ZlciB0aGVzZSBzYW1l IGFyZWFzLgo+Pj4+Pgo+Pj4+PiBJZ25vcmUgdGhpcy4gIFRoaXMgd2FzIG5vbnNlbnNlLgo+Pj4+ Pgo+Pj4+PiBXZSBleHBhbmQgdGhlIHJlc2VydmVkIChpLmUuLCBub24tUkFNKSBhcmVhcyBzbyB0 aGV5J3JlIGZ1bGx5IGNvdmVyZWQKPj4+Pj4gd2l0aCB3aG9sZSBwYWdlcyB3aGVuIHdlIGRlcG9w dWxhdGUgYW5kIDE6MSBtYXAgdGhlbSwgd2Ugc2hvdWxkIGFkZCB0aGUKPj4+Pj4gZXh0cmEgbWVt b3J5IHN1Y2ggdGhhdCBpdCBkb2VzIG5vdCBvdmVybGFwIHdpdGggd2l0aCBleHBhbmRlZCByZWdp b25zLgo+Pj4+PiBpLmUuLCByb3VuZCB1cCB0aGUgc3RhcnQgYW5kIHJvdW5kIGRvd24gdGhlIGVu ZCAobGlrZSBSb2dlcidzIHBhdGNoCj4+Pj4+IGRvZXMpLgo+Pj4+Cj4+Pj4gTmVhcmx5LiBSb2dl cidzIHBhdGNoIHJvdW5kcyB1cCBzdGFydCBhbmQgcm91bmRzIGRvd24gdGhlIHNpemUuIEl0IG1p Z2h0Cj4+Pj4gYWRkIG5vbi1SQU0gcGFydGlhbCBwYWdlcyB0byB4ZW5fZXh0cmFfbWVtLgo+Pj4K Pj4+IFllcy4gIFlvdSdyZSByaWdodC4KPj4KPj4gSG1tLCB0aGlua2luZyBtb3JlIGFib3V0IGl0 LCBJJ2QgcHJlZmVyIHRvIGNoYW5nZSB4ZW5fZXh0cmFfbWVtIHRvIHVzZQo+PiBwZm5zIGluc3Rl YWQgb2YgcGh5c2ljYWwgYWRkcmVzc2VzLiBUaGlzIHdvdWxkIG1ha2UgdGhpbmdzIG11Y2ggbW9y ZQo+PiBjbGVhci4KPj4KPj4gUm9nZXIsIGRvIHlvdSB3YW50IHRvIGRvIHRoZSBwYXRjaCBvciBz aG91bGQgST8KPgo+IEkgY2FuIGNlcnRhaW5seSB0YWtlIGNhcmUgb2YgaXQgaWYgeW91IGFyZSBi dXN5LCBvdGhlcndpc2UgSSBsZWF2ZSBpdCB0bwo+IHlvdSBzaW5jZSB5b3UgaGF2ZSBtb3JlIGV4 cGVydGlzZSBvbiBpdCA6KS4KCk9rYXksIEkgY2FuIGRvIGl0LiBTaG91bGQgYmUgcmVhZHkgc29v bi4uLgoKCkp1ZXJnZW4KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=