| Message ID | 20220607073031.722174-2-Penny.Zheng@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | populate/unpopulate memory when domain on static allocation | expand |
On 07.06.2022 09:30, Penny Zheng wrote: > PGC_reserved could be ambiguous, and we have to tell what the pages are > reserved for, so this commit intends to rename PGC_reserved to > PGC_static, which clearly indicates the page is reserved for static > memory. > > Signed-off-by: Penny Zheng <penny.zheng@arm.com> Acked-by: Jan Beulich <jbeulich@suse.com>
Hi, On 07/06/2022 08:30, Penny Zheng wrote: > PGC_reserved could be ambiguous, and we have to tell what the pages are > reserved for, so this commit intends to rename PGC_reserved to > PGC_static, which clearly indicates the page is reserved for static > memory. > > Signed-off-by: Penny Zheng <penny.zheng@arm.com> Acked-by: Julien Grall <jgrall@amazon.com> Cheers, > --- > v6 changes: > - rename PGC_staticmem to PGC_static > --- > v5 changes: > - new commit > --- > xen/arch/arm/include/asm/mm.h | 6 +++--- > xen/common/page_alloc.c | 22 +++++++++++----------- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h > index 424aaf2823..fbff11c468 100644 > --- a/xen/arch/arm/include/asm/mm.h > +++ b/xen/arch/arm/include/asm/mm.h > @@ -108,9 +108,9 @@ struct page_info > /* Page is Xen heap? */ > #define _PGC_xen_heap PG_shift(2) > #define PGC_xen_heap PG_mask(1, 2) > - /* Page is reserved */ > -#define _PGC_reserved PG_shift(3) > -#define PGC_reserved PG_mask(1, 3) > + /* Page is static memory */ > +#define _PGC_static PG_shift(3) > +#define PGC_static PG_mask(1, 3) > /* ... */ > /* Page is broken? */ > #define _PGC_broken PG_shift(7) > diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c > index 319029140f..9e5c757847 100644 > --- a/xen/common/page_alloc.c > +++ b/xen/common/page_alloc.c > @@ -151,8 +151,8 @@ > #define p2m_pod_offline_or_broken_replace(pg) BUG_ON(pg != NULL) > #endif > > -#ifndef PGC_reserved > -#define PGC_reserved 0 > +#ifndef PGC_static > +#define PGC_static 0 > #endif > > /* > @@ -2286,7 +2286,7 @@ int assign_pages( > > for ( i = 0; i < nr; i++ ) > { > - ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_reserved))); > + ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_static))); > if ( pg[i].count_info & PGC_extra ) > extra_pages++; > } > @@ -2346,7 +2346,7 @@ int assign_pages( > page_set_owner(&pg[i], d); > smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ > pg[i].count_info = > - (pg[i].count_info & (PGC_extra | PGC_reserved)) | PGC_allocated | 1; > + (pg[i].count_info & (PGC_extra | PGC_static)) | PGC_allocated | 1; > > page_list_add_tail(&pg[i], page_to_list(d, &pg[i])); > } > @@ -2652,8 +2652,8 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, > scrub_one_page(pg); > } > > - /* In case initializing page of static memory, mark it PGC_reserved. */ > - pg[i].count_info |= PGC_reserved; > + /* In case initializing page of static memory, mark it PGC_static. */ > + pg[i].count_info |= PGC_static; > } > } > > @@ -2682,8 +2682,8 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, > > for ( i = 0; i < nr_mfns; i++ ) > { > - /* The page should be reserved and not yet allocated. */ > - if ( pg[i].count_info != (PGC_state_free | PGC_reserved) ) > + /* The page should be static and not yet allocated. */ > + if ( pg[i].count_info != (PGC_state_free | PGC_static) ) > { > printk(XENLOG_ERR > "pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n", > @@ -2697,10 +2697,10 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, > &tlbflush_timestamp); > > /* > - * Preserve flag PGC_reserved and change page state > + * Preserve flag PGC_static and change page state > * to PGC_state_inuse. > */ > - pg[i].count_info = PGC_reserved | PGC_state_inuse; > + pg[i].count_info = PGC_static | PGC_state_inuse; > /* Initialise fields which have other uses for free pages. */ > pg[i].u.inuse.type_info = 0; > page_set_owner(&pg[i], NULL); > @@ -2722,7 +2722,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, > > out_err: > while ( i-- ) > - pg[i].count_info = PGC_reserved | PGC_state_free; > + pg[i].count_info = PGC_static | PGC_state_free; > > spin_unlock(&heap_lock); >
diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 424aaf2823..fbff11c468 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -108,9 +108,9 @@ struct page_info /* Page is Xen heap? */ #define _PGC_xen_heap PG_shift(2) #define PGC_xen_heap PG_mask(1, 2) - /* Page is reserved */ -#define _PGC_reserved PG_shift(3) -#define PGC_reserved PG_mask(1, 3) + /* Page is static memory */ +#define _PGC_static PG_shift(3) +#define PGC_static PG_mask(1, 3) /* ... */ /* Page is broken? */ #define _PGC_broken PG_shift(7) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 319029140f..9e5c757847 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -151,8 +151,8 @@ #define p2m_pod_offline_or_broken_replace(pg) BUG_ON(pg != NULL) #endif -#ifndef PGC_reserved -#define PGC_reserved 0 +#ifndef PGC_static +#define PGC_static 0 #endif /* @@ -2286,7 +2286,7 @@ int assign_pages( for ( i = 0; i < nr; i++ ) { - ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_reserved))); + ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_static))); if ( pg[i].count_info & PGC_extra ) extra_pages++; } @@ -2346,7 +2346,7 @@ int assign_pages( page_set_owner(&pg[i], d); smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ pg[i].count_info = - (pg[i].count_info & (PGC_extra | PGC_reserved)) | PGC_allocated | 1; + (pg[i].count_info & (PGC_extra | PGC_static)) | PGC_allocated | 1; page_list_add_tail(&pg[i], page_to_list(d, &pg[i])); } @@ -2652,8 +2652,8 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, scrub_one_page(pg); } - /* In case initializing page of static memory, mark it PGC_reserved. */ - pg[i].count_info |= PGC_reserved; + /* In case initializing page of static memory, mark it PGC_static. */ + pg[i].count_info |= PGC_static; } } @@ -2682,8 +2682,8 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, for ( i = 0; i < nr_mfns; i++ ) { - /* The page should be reserved and not yet allocated. */ - if ( pg[i].count_info != (PGC_state_free | PGC_reserved) ) + /* The page should be static and not yet allocated. */ + if ( pg[i].count_info != (PGC_state_free | PGC_static) ) { printk(XENLOG_ERR "pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n", @@ -2697,10 +2697,10 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, &tlbflush_timestamp); /* - * Preserve flag PGC_reserved and change page state + * Preserve flag PGC_static and change page state * to PGC_state_inuse. */ - pg[i].count_info = PGC_reserved | PGC_state_inuse; + pg[i].count_info = PGC_static | PGC_state_inuse; /* Initialise fields which have other uses for free pages. */ pg[i].u.inuse.type_info = 0; page_set_owner(&pg[i], NULL); @@ -2722,7 +2722,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, out_err: while ( i-- ) - pg[i].count_info = PGC_reserved | PGC_state_free; + pg[i].count_info = PGC_static | PGC_state_free; spin_unlock(&heap_lock);
PGC_reserved could be ambiguous, and we have to tell what the pages are reserved for, so this commit intends to rename PGC_reserved to PGC_static, which clearly indicates the page is reserved for static memory. Signed-off-by: Penny Zheng <penny.zheng@arm.com> --- v6 changes: - rename PGC_staticmem to PGC_static --- v5 changes: - new commit --- xen/arch/arm/include/asm/mm.h | 6 +++--- xen/common/page_alloc.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-)