* [dpdk-stable] [PATCH v2] malloc: fix adjacency check to also include segment list [not found] <8533ab3a49f63e9700764ead8b9147a098911b41.1542204687.git.anatoly.burakov@intel.com> @ 2018-11-14 15:00 ` Anatoly Burakov 2018-11-14 16:04 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly 2018-11-18 13:15 ` Thomas Monjalon 0 siblings, 2 replies; 3+ messages in thread From: Anatoly Burakov @ 2018-11-14 15:00 UTC (permalink / raw) To: dev; +Cc: yuwei1.zhang, stable 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(-) diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c index 1a74660de..9d3dcb6a9 100644 --- a/lib/librte_eal/common/malloc_elem.c +++ b/lib/librte_eal/common/malloc_elem.c @@ -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; } /* -- 2.17.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] malloc: fix adjacency check to also include segment list 2018-11-14 15:00 ` [dpdk-stable] [PATCH v2] malloc: fix adjacency check to also include segment list Anatoly Burakov @ 2018-11-14 16:04 ` Burakov, Anatoly 2018-11-18 13:15 ` Thomas Monjalon 1 sibling, 0 replies; 3+ messages in thread From: Burakov, Anatoly @ 2018-11-14 16:04 UTC (permalink / raw) To: dev; +Cc: yuwei1.zhang, stable 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. -- Thanks, Anatoly ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] malloc: fix adjacency check to also include segment list 2018-11-14 15:00 ` [dpdk-stable] [PATCH v2] malloc: fix adjacency check to also include segment list Anatoly Burakov 2018-11-14 16:04 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly @ 2018-11-18 13:15 ` Thomas Monjalon 1 sibling, 0 replies; 3+ messages in thread From: Thomas Monjalon @ 2018-11-18 13:15 UTC (permalink / raw) To: Anatoly Burakov; +Cc: dev, yuwei1.zhang, stable 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-18 13:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <8533ab3a49f63e9700764ead8b9147a098911b41.1542204687.git.anatoly.burakov@intel.com>
2018-11-14 15:00 ` [dpdk-stable] [PATCH v2] malloc: fix adjacency check to also include segment list Anatoly Burakov
2018-11-14 16:04 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2018-11-18 13:15 ` Thomas Monjalon
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).