From mboxrd@z Thu Jan 1 00:00:00 1970 From: "zhenzhong.duan" Subject: Re: [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary Date: Wed, 18 Jul 2012 12:40:43 +0800 Message-ID: <50063E4B.8090601@oracle.com> References: <4FF3E781.5040603@oracle.com> <4FFEE552.4070201@citrix.com> <4FFFDCD9.7030305@oracle.com> <20120717144540.GC12374@phenom.dumpdata.com> <500628A1.3060609@oracle.com> Reply-To: zhenzhong.duan@oracle.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <500628A1.3060609@oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: zhenzhong.duan@oracle.com Cc: jeremy@goop.org, xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , x86@kernel.org, Feng Jin , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, mingo@redhat.com, David Vrabel , hpa@zytor.com, tglx@linutronix.de List-Id: virtualization@lists.linuxfoundation.org U29ycnksIHBscyBpZ25vcmUgaXQuIFRhYiBzdGlsbCBiZSB0cmFuc2xhdGVkIHRvIHNwYWNlLgoK 5LqOIDIwMTItMDctMTggMTE6MDgsIHpoZW56aG9uZy5kdWFuIOWGmemBkzoKPiBGcm9tIGM0MGVh MDU4NDJmZWM4ZjZjYWEwNTNiMmQ1OGY1NDYwOGVkMDgzNWYgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxCj4gRnJvbTogWmhlbnpob25nIER1YW48emhlbnpob25nLmR1YW5Ab3JhY2xlLmNvbT4KPiBE YXRlOiBXZWQsIDQgSnVsIDIwMTIgMTQ6MDg6MTAgKzA4MDAKPiBTdWJqZWN0OiBbUEFUQ0hdIHhl bjogcG9wdWxhdGUgcmlnaHQgY291bnQgb2YgcGFnZXMgd2hlbiBhY3Jvc3MgbWVtIAo+IGJvdW5k YXJ5Cj4KPiBXaGVuIHBvcHVsYXRlIHBhZ2VzIGFjcm9zcyBhIG1lbSBib3VuZGFyeSBhdCBib290 dXAsIHRoZSBwYWdlIGNvdW50Cj4gcG9wdWxhdGVkIGlzbid0IGNvcnJlY3QuIFRoaXMgaXMgZHVl IHRvIG1lbSBwb3B1bGF0ZWQgdG8gbm9uLW1lbQo+IHJlZ2lvbiBhbmQgaWdub3JlZC4KPgo+IFBm biByYW5nZSBpcyBhbHNvIHdyb25nbHkgYWxpZ25lZCB3aGVuIG1lbSBib3VuZGFyeSBpc24ndCBw YWdlIGFsaWduZWQuCj4KPiAtdjI6IElmIHhlbl9kb19jaHVuayBmYWlsKHBvcHVsYXRlKSwgYWJv cnQgdGhpcyBjaHVuayBhbmQgYW55IG90aGVycy4KPiBTdWdnZXN0ZWQgYnkgRGF2aWQsIHRoYW5r cy4KPgo+IEZvciBhIGRvbTAgYm9vdGVkIHdpdGggZG9tX21lbT0zMzY4OTUySygweGNkOWZmMDAw LTRrKSBkbWVzZyBkaWZmIGlzOgo+IFsgMC4wMDAwMDBdIEZyZWVpbmcgOWUtMTAwIHBmbiByYW5n ZTogOTggcGFnZXMgZnJlZWQKPiBbIDAuMDAwMDAwXSAxLTEgbWFwcGluZyBvbiA5ZS0+MTAwCj4g WyAwLjAwMDAwMF0gMS0xIG1hcHBpbmcgb24gY2Q5ZmYtPjEwMDAwMAo+IFsgMC4wMDAwMDBdIFJl bGVhc2VkIDk4IHBhZ2VzIG9mIHVudXNlZCBtZW1vcnkKPiBbIDAuMDAwMDAwXSBTZXQgMjA2NDM1 IHBhZ2UocykgdG8gMS0xIG1hcHBpbmcKPiAtWyAwLjAwMDAwMF0gUG9wdWxhdGluZyBjZDlmZS1j ZGEwMCBwZm4gcmFuZ2U6IDEgcGFnZXMgYWRkZWQKPiArWyAwLjAwMDAwMF0gUG9wdWxhdGluZyBj ZDlmZS1jZDlmZiBwZm4gcmFuZ2U6IDEgcGFnZXMgYWRkZWQKPiArWyAwLjAwMDAwMF0gUG9wdWxh dGluZyAxMDAwMDAtMTAwMDYxIHBmbiByYW5nZTogOTcgcGFnZXMgYWRkZWQKPiBbIDAuMDAwMDAw XSBCSU9TLXByb3ZpZGVkIHBoeXNpY2FsIFJBTSBtYXA6Cj4gWyAwLjAwMDAwMF0gWGVuOiAwMDAw MDAwMDAwMDAwMDAwIC0gMDAwMDAwMDAwMDA5ZTAwMCAodXNhYmxlKQo+IFsgMC4wMDAwMDBdIFhl bjogMDAwMDAwMDAwMDBhMDAwMCAtIDAwMDAwMDAwMDAxMDAwMDAgKHJlc2VydmVkKQo+IFsgMC4w MDAwMDBdIFhlbjogMDAwMDAwMDAwMDEwMDAwMCAtIDAwMDAwMDAwY2Q5ZmYwMDAgKHVzYWJsZSkK PiBbIDAuMDAwMDAwXSBYZW46IDAwMDAwMDAwY2Q5ZmZjMDAgLSAwMDAwMDAwMGNkYTUzYzAwIChB Q1BJIE5WUykKPiAuLi4KPiBbIDAuMDAwMDAwXSBYZW46IDAwMDAwMDAxMDAwMDAwMDAgLSAwMDAw MDAwMTAwMDYxMDAwICh1c2FibGUpCj4gWyAwLjAwMDAwMF0gWGVuOiAwMDAwMDAwMTAwMDYxMDAw IC0gMDAwMDAwMDEyYzAwMDAwMCAodW51c2FibGUpCj4gLi4uCj4gWyAwLjAwMDAwMF0gTUVNQkxP Q0sgY29uZmlndXJhdGlvbjoKPiAuLi4KPiAtWyAwLjAwMDAwMF0gcmVzZXJ2ZWRbMHg0XSBbMHgw MDAwMDBjZDlmZjAwMC0weDAwMDAwMGNkOWZmYmZmXSwgMHhjMDAgCj4gYnl0ZXMKPiAtWyAwLjAw MDAwMF0gcmVzZXJ2ZWRbMHg1XSBbMHgwMDAwMDEwMDAwMDAwMC0weDAwMDAwMTAwMDYwZmZmXSwg Cj4gMHg2MTAwMCBieXRlcwo+Cj4gUmVsYXRlZCB4ZW4gbWVtb3J5IGxheW91dDoKPiAoWEVOKSBY ZW4tZTgyMCBSQU0gbWFwOgo+IChYRU4pIDAwMDAwMDAwMDAwMDAwMDAgLSAwMDAwMDAwMDAwMDll YzAwICh1c2FibGUpCj4gKFhFTikgMDAwMDAwMDAwMDBmMDAwMCAtIDAwMDAwMDAwMDAxMDAwMDAg KHJlc2VydmVkKQo+IChYRU4pIDAwMDAwMDAwMDAxMDAwMDAgLSAwMDAwMDAwMGNkOWZmYzAwICh1 c2FibGUpCj4KPiBTaWduZWQtb2ZmLWJ5OiBaaGVuemhvbmcgRHVhbjx6aGVuemhvbmcuZHVhbkBv cmFjbGUuY29tPgo+IC0tLQo+IGRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vc2V0dXAuYyBiL2Fy Y2gveDg2L3hlbi9zZXR1cC5jCj4gaW5kZXggYTQ3OTBiZi4uZWFkODU1NyAxMDA2NDQKPiAtLS0g YS9hcmNoL3g4Ni94ZW4vc2V0dXAuYwo+ICsrKyBiL2FyY2gveDg2L3hlbi9zZXR1cC5jCj4gQEAg LTE1NywyNSArMTU3LDI0IEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIF9faW5pdCB4ZW5fcG9wdWxh dGVfY2h1bmsoCj4gdW5zaWduZWQgbG9uZyBkZXN0X3BmbjsKPgo+IGZvciAoaSA9IDAsIGVudHJ5 ID0gbGlzdDsgaTwgbWFwX3NpemU7IGkrKywgZW50cnkrKykgewo+IC0gdW5zaWduZWQgbG9uZyBj cmVkaXRzID0gY3JlZGl0c19sZWZ0Owo+IHVuc2lnbmVkIGxvbmcgc19wZm47Cj4gdW5zaWduZWQg bG9uZyBlX3BmbjsKPiB1bnNpZ25lZCBsb25nIHBmbnM7Cj4gbG9uZyBjYXBhY2l0eTsKPgo+IC0g aWYgKGNyZWRpdHM8PSAwKQo+ICsgaWYgKGNyZWRpdHNfbGVmdDw9IDApCj4gYnJlYWs7Cj4KPiBp ZiAoZW50cnktPnR5cGUgIT0gRTgyMF9SQU0pCj4gY29udGludWU7Cj4KPiAtIGVfcGZuID0gUEZO X1VQKGVudHJ5LT5hZGRyICsgZW50cnktPnNpemUpOwo+ICsgZV9wZm4gPSBQRk5fRE9XTihlbnRy eS0+YWRkciArIGVudHJ5LT5zaXplKTsKPgo+IC8qIFdlIG9ubHkgY2FyZSBhYm91dCBFODIwIGFm dGVyIHRoZSB4ZW5fc3RhcnRfaW5mby0+bnJfcGFnZXMgKi8KPiBpZiAoZV9wZm48PSBtYXhfcGZu KQo+IGNvbnRpbnVlOwo+Cj4gLSBzX3BmbiA9IFBGTl9ET1dOKGVudHJ5LT5hZGRyKTsKPiArIHNf cGZuID0gUEZOX1VQKGVudHJ5LT5hZGRyKTsKPiAvKiBJZiB0aGUgRTgyMCBmYWxscyB3aXRoaW4g dGhlIG5yX3BhZ2VzLCB3ZSB3YW50IHRvIHN0YXJ0Cj4gKiBhdCB0aGUgbnJfcGFnZXMgUEZOLgo+ ICogSWYgdGhhdCB3b3VsZCBtZWFuIGdvaW5nIHBhc3QgdGhlIEU4MjAgZW50cnksIHNraXAgaXQK PiBAQCAtMTg0LDIzICsxODMsMTkgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgX19pbml0IHhlbl9w b3B1bGF0ZV9jaHVuaygKPiBjYXBhY2l0eSA9IGVfcGZuIC0gbWF4X3BmbjsKPiBkZXN0X3BmbiA9 IG1heF9wZm47Cj4gfSBlbHNlIHsKPiAtIC8qIGxhc3RfcGZuIE1VU1QgYmUgd2l0aGluIEU4MjBf UkFNIHJlZ2lvbnMgKi8KPiAtIGlmICgqbGFzdF9wZm4mJiBlX3Bmbj49ICpsYXN0X3BmbikKPiAt IHNfcGZuID0gKmxhc3RfcGZuOwo+IGNhcGFjaXR5ID0gZV9wZm4gLSBzX3BmbjsKPiBkZXN0X3Bm biA9IHNfcGZuOwo+IH0KPiAtIC8qIElmIHdlIGhhZCBmaWxsZWQgdGhpcyBFODIwX1JBTSBlbnRy eSwgZ28gdG8gdGhlIG5leHQgb25lLiAqLwo+IC0gaWYgKGNhcGFjaXR5PD0gMCkKPiAtIGNvbnRp bnVlOwo+Cj4gLSBpZiAoY3JlZGl0cz4gY2FwYWNpdHkpCj4gLSBjcmVkaXRzID0gY2FwYWNpdHk7 Cj4gKyBpZiAoY3JlZGl0c19sZWZ0PCBjYXBhY2l0eSkKPiArIGNhcGFjaXR5ID0gY3JlZGl0c19s ZWZ0Owo+Cj4gLSBwZm5zID0geGVuX2RvX2NodW5rKGRlc3RfcGZuLCBkZXN0X3BmbiArIGNyZWRp dHMsIGZhbHNlKTsKPiArIHBmbnMgPSB4ZW5fZG9fY2h1bmsoZGVzdF9wZm4sIGRlc3RfcGZuICsg Y2FwYWNpdHksIGZhbHNlKTsKPiBkb25lICs9IHBmbnM7Cj4gLSBjcmVkaXRzX2xlZnQgLT0gcGZu czsKPiAqbGFzdF9wZm4gPSAoZGVzdF9wZm4gKyBwZm5zKTsKPiArIGlmIChwZm5zPCBjYXBhY2l0 eSkKPiArIGJyZWFrOwo+ICsgY3JlZGl0c19sZWZ0IC09IHBmbnM7Cj4gfQo+IHJldHVybiBkb25l Owo+IH0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KVmly dHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZpcnR1YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5k YXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL3ZpcnR1YWxpemF0aW9u From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289Ab2GREkn (ORCPT ); Wed, 18 Jul 2012 00:40:43 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:45219 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912Ab2GREkf (ORCPT ); Wed, 18 Jul 2012 00:40:35 -0400 Message-ID: <50063E4B.8090601@oracle.com> Date: Wed, 18 Jul 2012 12:40:43 +0800 From: "zhenzhong.duan" Reply-To: zhenzhong.duan@oracle.com Organization: oracle User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: zhenzhong.duan@oracle.com CC: Konrad Rzeszutek Wilk , David Vrabel , jeremy@goop.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, xen-devel@lists.xensource.com, x86@kernel.org, Feng Jin , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary References: <4FF3E781.5040603@oracle.com> <4FFEE552.4070201@citrix.com> <4FFFDCD9.7030305@oracle.com> <20120717144540.GC12374@phenom.dumpdata.com> <500628A1.3060609@oracle.com> In-Reply-To: <500628A1.3060609@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry, pls ignore it. Tab still be translated to space. 于 2012-07-18 11:08, zhenzhong.duan 写道: > From c40ea05842fec8f6caa053b2d58f54608ed0835f Mon Sep 17 00:00:00 2001 > From: Zhenzhong Duan > Date: Wed, 4 Jul 2012 14:08:10 +0800 > Subject: [PATCH] xen: populate right count of pages when across mem > boundary > > When populate pages across a mem boundary at bootup, the page count > populated isn't correct. This is due to mem populated to non-mem > region and ignored. > > Pfn range is also wrongly aligned when mem boundary isn't page aligned. > > -v2: If xen_do_chunk fail(populate), abort this chunk and any others. > Suggested by David, thanks. > > For a dom0 booted with dom_mem=3368952K(0xcd9ff000-4k) dmesg diff is: > [ 0.000000] Freeing 9e-100 pfn range: 98 pages freed > [ 0.000000] 1-1 mapping on 9e->100 > [ 0.000000] 1-1 mapping on cd9ff->100000 > [ 0.000000] Released 98 pages of unused memory > [ 0.000000] Set 206435 page(s) to 1-1 mapping > -[ 0.000000] Populating cd9fe-cda00 pfn range: 1 pages added > +[ 0.000000] Populating cd9fe-cd9ff pfn range: 1 pages added > +[ 0.000000] Populating 100000-100061 pfn range: 97 pages added > [ 0.000000] BIOS-provided physical RAM map: > [ 0.000000] Xen: 0000000000000000 - 000000000009e000 (usable) > [ 0.000000] Xen: 00000000000a0000 - 0000000000100000 (reserved) > [ 0.000000] Xen: 0000000000100000 - 00000000cd9ff000 (usable) > [ 0.000000] Xen: 00000000cd9ffc00 - 00000000cda53c00 (ACPI NVS) > ... > [ 0.000000] Xen: 0000000100000000 - 0000000100061000 (usable) > [ 0.000000] Xen: 0000000100061000 - 000000012c000000 (unusable) > ... > [ 0.000000] MEMBLOCK configuration: > ... > -[ 0.000000] reserved[0x4] [0x000000cd9ff000-0x000000cd9ffbff], 0xc00 > bytes > -[ 0.000000] reserved[0x5] [0x00000100000000-0x00000100060fff], > 0x61000 bytes > > Related xen memory layout: > (XEN) Xen-e820 RAM map: > (XEN) 0000000000000000 - 000000000009ec00 (usable) > (XEN) 00000000000f0000 - 0000000000100000 (reserved) > (XEN) 0000000000100000 - 00000000cd9ffc00 (usable) > > Signed-off-by: Zhenzhong Duan > --- > diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c > index a4790bf..ead8557 100644 > --- a/arch/x86/xen/setup.c > +++ b/arch/x86/xen/setup.c > @@ -157,25 +157,24 @@ static unsigned long __init xen_populate_chunk( > unsigned long dest_pfn; > > for (i = 0, entry = list; i< map_size; i++, entry++) { > - unsigned long credits = credits_left; > unsigned long s_pfn; > unsigned long e_pfn; > unsigned long pfns; > long capacity; > > - if (credits<= 0) > + if (credits_left<= 0) > break; > > if (entry->type != E820_RAM) > continue; > > - e_pfn = PFN_UP(entry->addr + entry->size); > + e_pfn = PFN_DOWN(entry->addr + entry->size); > > /* We only care about E820 after the xen_start_info->nr_pages */ > if (e_pfn<= max_pfn) > continue; > > - s_pfn = PFN_DOWN(entry->addr); > + s_pfn = PFN_UP(entry->addr); > /* If the E820 falls within the nr_pages, we want to start > * at the nr_pages PFN. > * If that would mean going past the E820 entry, skip it > @@ -184,23 +183,19 @@ static unsigned long __init xen_populate_chunk( > capacity = e_pfn - max_pfn; > dest_pfn = max_pfn; > } else { > - /* last_pfn MUST be within E820_RAM regions */ > - if (*last_pfn&& e_pfn>= *last_pfn) > - s_pfn = *last_pfn; > capacity = e_pfn - s_pfn; > dest_pfn = s_pfn; > } > - /* If we had filled this E820_RAM entry, go to the next one. */ > - if (capacity<= 0) > - continue; > > - if (credits> capacity) > - credits = capacity; > + if (credits_left< capacity) > + capacity = credits_left; > > - pfns = xen_do_chunk(dest_pfn, dest_pfn + credits, false); > + pfns = xen_do_chunk(dest_pfn, dest_pfn + capacity, false); > done += pfns; > - credits_left -= pfns; > *last_pfn = (dest_pfn + pfns); > + if (pfns< capacity) > + break; > + credits_left -= pfns; > } > return done; > }