xen/x86: domain: Remove specific case when allocating struct domain

Commit 8916fcf457 "x86/domain: compile with lock_profile=y enabled"
allowed the struct domain to use more than a PAGE_SIZE (i.e 4096).
However, the function free_domheap_struct() will only free the first
page.

We could modify the free part to free the correct number of pages, but
the structure has been fitting in a page (even with lock profile
enabled) since commit 428607a410 "x86: shrink 'struct domain', was
already PAGE_SIZE" (part of Xen 4.7).

Therefore, the specific case for lock profile is now removed.

This is not a security issue because struct domain can only be bigger
than a page size for lock profiling. The feature can only be selected
in DEBUG and EXPERT mode.

Fixes: 8916fcf457 ("x86/domain: compile with lock_profile=y enabled")
Reported-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Julien Grall authored and Julien Grall committed 2020-01-31 18:50:32 +00:00
1 parent d9c4499c18
commit 7608f33452
1 file changed
+2 -11
+2 -11
View File
@@ -313,7 +313,6 @@ static unsigned int __init noinline _domain_struct_bits(void)
struct domain *alloc_domain_struct(void)
{
struct domain *d;
unsigned int order = get_order_from_bytes(sizeof(*d));
#ifdef CONFIG_BIGMEM
const unsigned int bits = 0;
#else
@@ -327,18 +326,10 @@ struct domain *alloc_domain_struct(void)
bits = _domain_struct_bits();
#endif
#ifndef CONFIG_DEBUG_LOCK_PROFILE
BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE);
#endif
d = alloc_xenheap_pages(order, MEMF_bits(bits));
d = alloc_xenheap_pages(0, MEMF_bits(bits));
if ( d != NULL )
{
unsigned int sz;
for ( sz = 0; sz < (PAGE_SIZE << order); sz += PAGE_SIZE )
clear_page((void *)d + sz);
}
clear_page(d);
return d;
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.