On 16.12.2022 12:48, Julien Grall wrote:
> @@ -597,22 +598,43 @@ static unsigned long init_node_heap(int node, unsigned
> long mfn,
> needed = 0;
> }
> else if ( *use_tail && nr >= needed &&
> - arch_mfns_in_directmap(mfn + nr - needed, needed) &&
> (!xenheap_bits ||
> !((mfn + nr - 1) >> (xenheap_bits - PAGE_SHIFT))) )
> {
> - _heap[node] = mfn_to_virt(mfn + nr - needed);
> - avail[node] = mfn_to_virt(mfn + nr - 1) +
> - PAGE_SIZE - sizeof(**avail) * NR_ZONES;
> - }
> - else if ( nr >= needed &&
By replacing these two well-formed lines with ...
> - arch_mfns_in_directmap(mfn, needed) &&
> + if ( arch_mfns_in_directmap(mfn + nr - needed, needed) )
> + {
> + _heap[node] = mfn_to_virt(mfn + nr - needed);
> + avail[node] = mfn_to_virt(mfn + nr - 1) +
> + PAGE_SIZE - sizeof(**avail) * NR_ZONES;
> + }
> + else
> + {
> + mfn_t needed_start = _mfn(mfn + nr - needed);
> +
> + _heap[node] = vmap_contig_pages(needed_start, needed);
> + BUG_ON(!_heap[node]);
> + avail[node] = (void *)(_heap[node]) + (needed << PAGE_SHIFT) -
> + sizeof(**avail) * NR_ZONES;
> + }
> + } else if ( nr >= needed &&
... this, you're not only violating style here, but you also ...
> (!xenheap_bits ||
> !((mfn + needed - 1) >> (xenheap_bits - PAGE_SHIFT))) )
... break indentation for these two lines.
Jan
