[v2] malloc: fix adjacency check to also include segment list
Checks
Commit Message
It may so happen that two memory locations may be adjacent in
virtual memory, but belong to different segment lists. With
current code, such segments will be concatenated. Fix the
adjacency checking code to also check if the adjacent malloc
elements belong to the same memseg list.
Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
Cc: stable@dpdk.org
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
Notes:
v2: fixed typo in second comparison
lib/librte_eal/common/malloc_elem.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Comments
On 14-Nov-18 3:00 PM, Anatoly Burakov wrote:
> It may so happen that two memory locations may be adjacent in
> virtual memory, but belong to different segment lists. With
> current code, such segments will be concatenated. Fix the
> adjacency checking code to also check if the adjacent malloc
> elements belong to the same memseg list.
>
> Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
>
> Cc: stable@dpdk.org
>
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
Oops, reply tag was set wrong.
14/11/2018 16:00, Anatoly Burakov:
> It may so happen that two memory locations may be adjacent in
> virtual memory, but belong to different segment lists. With
> current code, such segments will be concatenated. Fix the
> adjacency checking code to also check if the adjacent malloc
> elements belong to the same memseg list.
>
> Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
>
> Cc: stable@dpdk.org
>
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Applied, thanks
@@ -316,13 +316,15 @@ remove_elem(struct malloc_elem *elem)
static int
next_elem_is_adjacent(struct malloc_elem *elem)
{
- return elem->next == RTE_PTR_ADD(elem, elem->size);
+ return elem->next == RTE_PTR_ADD(elem, elem->size) &&
+ elem->next->msl == elem->msl;
}
static int
prev_elem_is_adjacent(struct malloc_elem *elem)
{
- return elem == RTE_PTR_ADD(elem->prev, elem->prev->size);
+ return elem == RTE_PTR_ADD(elem->prev, elem->prev->size) &&
+ elem->prev->msl == elem->msl;
}
/*