From: Jamie Lavigne <lavignen@amazon.com>
To: <dev@dpdk.org>
Cc: Jamie Lavigne <lavignen@amazon.com>
Subject: [dpdk-dev] [PATCH] Correctly handle malloc_elem resize with padding
Date: Wed, 31 May 2017 00:09:00 +0000 [thread overview]
Message-ID: <1496189340-27813-1-git-send-email-lavignen@amazon.com> (raw)
Currently when a malloc_elem is split after resizing, any padding
present in the elem is ignored. This causes the resized elem to be too
small when padding is present, and user data can overwrite the beginning
of the following malloc_elem.
Solve this by including the size of the padding when computing where to
split the malloc_elem.
Signed-off-by: Jamie Lavigne <lavignen@amazon.com>
---
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 42568e1..2ed1942 100644
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -333,9 +333,11 @@ malloc_elem_resize(struct malloc_elem *elem, size_t size)
elem_free_list_remove(next);
join_elem(elem, next);
- if (elem->size - new_size >= MIN_DATA_SIZE + MALLOC_ELEM_OVERHEAD){
+ const size_t new_total_size = new_size + elem->pad;
+
+ if (elem->size - new_total_size >= MIN_DATA_SIZE + MALLOC_ELEM_OVERHEAD){
/* now we have a big block together. Lets cut it down a bit, by splitting */
- struct malloc_elem *split_pt = RTE_PTR_ADD(elem, new_size);
+ struct malloc_elem *split_pt = RTE_PTR_ADD(elem, new_total_size);
split_pt = RTE_PTR_ALIGN_CEIL(split_pt, RTE_CACHE_LINE_SIZE);
split_elem(elem, split_pt);
malloc_elem_free_list_insert(split_pt);
--
2.7.3.AMZN
next reply other threads:[~2017-05-31 0:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 0:09 Jamie Lavigne [this message]
2017-05-31 0:16 ` [dpdk-dev] [PATCH v2] " Jamie Lavigne
2017-06-06 14:18 ` Sergio Gonzalez Monroy
2017-06-08 19:07 ` Lavigne, Jamie
2017-06-08 19:12 ` [dpdk-dev] [PATCH v3] mem: fix " Jamie Lavigne
2017-06-20 10:18 ` Sergio Gonzalez Monroy
2017-06-28 21:12 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496189340-27813-1-git-send-email-lavignen@amazon.com \
--to=lavignen@amazon.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).