* Re: [Xen-devel] [PATCH] xen: populate correct number of pages when across mem boundary [not found] <4FF3E781.5040603@oracle.com> @ 2012-07-12 14:55 ` David Vrabel [not found] ` <4FFEE552.4070201@citrix.com> 1 sibling, 0 replies; 7+ messages in thread From: David Vrabel @ 2012-07-12 14:55 UTC (permalink / raw) To: zhenzhong.duan Cc: jeremy, xen-devel, Konrad Rzeszutek Wilk, x86, Feng Jin, linux-kernel, virtualization, mingo, hpa, tglx On 04/07/12 07:49, zhenzhong.duan wrote: > 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. > > Also need consider the rare case when xen_do_chunk fail(populate). > > 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 <zhenzhong.duan@oracle.com> > --- > arch/x86/xen/setup.c | 24 +++++++++++------------- > 1 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c > index a4790bf..bd78773 100644 > --- a/arch/x86/xen/setup.c > +++ b/arch/x86/xen/setup.c > @@ -157,50 +157,48 @@ 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); Ok. > > /* 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); Ok. > /* 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 > */ > +again: > if (s_pfn <= max_pfn) { > 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 (credits_left > 0 && *last_pfn < e_pfn) { > + s_pfn = *last_pfn; > + goto again; > + } This looks like it will loop forever if xen_do_chunk() repeatedly fails because Xen is out of pages. I think if xen_do_chunk() cannot get a page from Xen the repopulation process should stop -- aborting this chunk and any others. This will allow the guest to continue to boot just with less memory than expected. David ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <4FFEE552.4070201@citrix.com>]
* Re: [Xen-devel] [PATCH] xen: populate correct number of pages when across mem boundary [not found] ` <4FFEE552.4070201@citrix.com> @ 2012-07-13 5:37 ` zhenzhong.duan 2012-07-13 8:31 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan 1 sibling, 0 replies; 7+ messages in thread From: zhenzhong.duan @ 2012-07-13 5:37 UTC (permalink / raw) To: David Vrabel Cc: jeremy, xen-devel, Konrad Rzeszutek Wilk, x86, Feng Jin, linux-kernel, virtualization, mingo, hpa, tglx 于 2012-07-12 22:55, David Vrabel 写道: > On 04/07/12 07:49, zhenzhong.duan wrote: >> 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. >> >> Also need consider the rare case when xen_do_chunk fail(populate). >> >> 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<zhenzhong.duan@oracle.com> >> --- >> arch/x86/xen/setup.c | 24 +++++++++++------------- >> 1 files changed, 11 insertions(+), 13 deletions(-) >> >> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c >> index a4790bf..bd78773 100644 >> --- a/arch/x86/xen/setup.c >> +++ b/arch/x86/xen/setup.c >> @@ -157,50 +157,48 @@ 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); > Ok. > >> >> /* 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); > Ok. > >> /* 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 >> */ >> +again: >> if (s_pfn<= max_pfn) { >> 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 (credits_left> 0&& *last_pfn< e_pfn) { >> + s_pfn = *last_pfn; >> + goto again; >> + } > This looks like it will loop forever if xen_do_chunk() repeatedly fails > because Xen is out of pages. I think if xen_do_chunk() cannot get a > page from Xen the repopulation process should stop -- aborting this > chunk and any others. This will allow the guest to continue to boot > just with less memory than expected. > > David Ok, I'll update the patch, loop forever isn't a good idea. Originally, I considered the case there is dynamic memory control functionality in the system. thanks for comment. _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary [not found] ` <4FFEE552.4070201@citrix.com> 2012-07-13 5:37 ` zhenzhong.duan @ 2012-07-13 8:31 ` zhenzhong.duan 2012-07-17 14:45 ` Konrad Rzeszutek Wilk 1 sibling, 1 reply; 7+ messages in thread From: zhenzhong.duan @ 2012-07-13 8:31 UTC (permalink / raw) To: David Vrabel Cc: jeremy, xen-devel, Konrad Rzeszutek Wilk, x86, Feng Jin, linux-kernel, virtualization, mingo, hpa, tglx 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<zhenzhong.duan@oracle.com> --- 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; } -- 1.7.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary 2012-07-13 8:31 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan @ 2012-07-17 14:45 ` Konrad Rzeszutek Wilk 2012-07-18 2:48 ` [Xen-devel] [PATCH -v2] " zhenzhong.duan 2012-07-18 3:08 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan 0 siblings, 2 replies; 7+ messages in thread From: Konrad Rzeszutek Wilk @ 2012-07-17 14:45 UTC (permalink / raw) To: zhenzhong.duan Cc: jeremy, xen-devel, x86, Feng Jin, linux-kernel, virtualization, mingo, David Vrabel, hpa, tglx On Fri, Jul 13, 2012 at 04:31:21PM +0800, zhenzhong.duan wrote: > 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<zhenzhong.duan@oracle.com> Please run this first through scripts/cleanpatch.pl and fix up the issues and then resend. Thanks! > --- > 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; > } > -- > 1.7.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Xen-devel] [PATCH -v2] xen: populate correct number of pages when across mem boundary 2012-07-17 14:45 ` Konrad Rzeszutek Wilk @ 2012-07-18 2:48 ` zhenzhong.duan 2012-07-18 3:08 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan 1 sibling, 0 replies; 7+ messages in thread From: zhenzhong.duan @ 2012-07-18 2:48 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: jeremy, xen-devel, x86, Feng Jin, linux-kernel, virtualization, mingo, David Vrabel, hpa, tglx 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<zhenzhong.duan@oracle.com> --- 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; } -- 1.7.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary 2012-07-17 14:45 ` Konrad Rzeszutek Wilk 2012-07-18 2:48 ` [Xen-devel] [PATCH -v2] " zhenzhong.duan @ 2012-07-18 3:08 ` zhenzhong.duan 2012-07-18 4:40 ` zhenzhong.duan 1 sibling, 1 reply; 7+ messages in thread From: zhenzhong.duan @ 2012-07-18 3:08 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: jeremy, xen-devel, x86, Feng Jin, linux-kernel, virtualization, mingo, David Vrabel, hpa, tglx From c40ea05842fec8f6caa053b2d58f54608ed0835f Mon Sep 17 00:00:00 2001 From: Zhenzhong Duan<zhenzhong.duan@oracle.com> 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<zhenzhong.duan@oracle.com> --- 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; } -- 1.7.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH-v2] xen: populate correct number of pages when across mem boundary 2012-07-18 3:08 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan @ 2012-07-18 4:40 ` zhenzhong.duan 0 siblings, 0 replies; 7+ messages in thread From: zhenzhong.duan @ 2012-07-18 4:40 UTC (permalink / raw) To: zhenzhong.duan Cc: jeremy, xen-devel, Konrad Rzeszutek Wilk, x86, Feng Jin, linux-kernel, virtualization, mingo, David Vrabel, hpa, tglx 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<zhenzhong.duan@oracle.com> > 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<zhenzhong.duan@oracle.com> > --- > 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; > } _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-07-18 4:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <4FF3E781.5040603@oracle.com>
2012-07-12 14:55 ` [Xen-devel] [PATCH] xen: populate correct number of pages when across mem boundary David Vrabel
[not found] ` <4FFEE552.4070201@citrix.com>
2012-07-13 5:37 ` zhenzhong.duan
2012-07-13 8:31 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan
2012-07-17 14:45 ` Konrad Rzeszutek Wilk
2012-07-18 2:48 ` [Xen-devel] [PATCH -v2] " zhenzhong.duan
2012-07-18 3:08 ` [Xen-devel] [PATCH-v2] " zhenzhong.duan
2012-07-18 4:40 ` zhenzhong.duan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).