On 29.07.2019 14:11, Andrew Cooper wrote:
> --- a/xen/common/page_alloc.c
> +++ b/xen/common/page_alloc.c
> @@ -811,11 +811,18 @@ static struct page_info *get_free_buddy(unsigned int
> zone_lo,
> const struct domain *d)
> {
> nodeid_t first, node = MEMF_get_node(memflags), req_node = node;
> - nodemask_t nodemask = d ? d->node_affinity : node_online_map;
> + nodemask_t nodemask = node_online_map;
> unsigned int j, zone, nodemask_retry = 0;
> struct page_info *pg;
> bool use_unscrubbed = (memflags & MEMF_no_scrub);
>
> + /*
> + * d->node_affinity is our preferred allocation set if provided, but it
> + * may have bit set outside of node_online_map. Clamp it.
Would you mind adding the apparently missing "s" to "bit"?
> + */
> + if ( d )
> + nodes_and(nodemask, nodemask, d->node_affinity);
Despite my earlier ack: Code further down assumes a non-empty mask,
which is no longer guaranteed afaics. I think you want to append an
"intersects" check in the if(). With that feel free to promote my
A-b to R-b.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
