Skip to contentSkip to conversation

mbuf: cleanup rte_pktmbuf_lastseg(), fix atomic usage

PATCH In review Hanoh Haim 2 participants 2 messages Nov 15, 2017

lore
Share & tools
lore

Hanoh Haim

author
#0 lore raw

PATCH 1/1 mbuf: cleanup rte_pktmbuf_lastseg(), fix atomic usage

---
 lib/librte_mbuf/rte_mbuf.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
lib/librte_mbuf/rte_mbuf.h +0 -0
index 7e326bb..ab110f8 100644
@@ -1159,6 +1159,15 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)
	__rte_mbuf_sanity_check(m, 1);

}

+
+static __rte_always_inline void rte_pktmbuf_reset_before_free(struct rte_mbuf *m) +{
+ if (m->next != NULL) {
+ m->next = NULL;
+ m->nb_segs = 1;
+ }
+}
+
/**
* Allocate a new mbuf from a mempool.
*
@@ -1323,8 +1332,7 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m)

	m->ol_flags = 0;
 
	if (rte_mbuf_refcnt_update(md, -1) == 0) {
-		md->next = NULL;
-		md->nb_segs = 1;
+		rte_pktmbuf_reset_before_free(m);
		rte_mbuf_refcnt_set(md, 1);
		rte_mbuf_raw_free(md);
	}
@@ -1354,25 +1362,16 @@ rte_pktmbuf_prefree_seg(struct rte_mbuf *m)
		if (RTE_MBUF_INDIRECT(m))
			rte_pktmbuf_detach(m);

- if (m->next != NULL) {
- m->next = NULL;
- m->nb_segs = 1;
- }
-

+		rte_pktmbuf_reset_before_free(m);
		return m;

- } else if (rte_atomic16_add_return(&m->refcnt_atomic, -1) == 0) {
-
+ } else if (rte_mbuf_refcnt_update(m, -1) == 0) {

		if (RTE_MBUF_INDIRECT(m))
			rte_pktmbuf_detach(m);

- if (m->next != NULL) {
- m->next = NULL;
- m->nb_segs = 1;
- }

+		rte_pktmbuf_reset_before_free(m);
		rte_mbuf_refcnt_set(m, 1);
-
		return m;
	}
	return NULL;
Signature · 1 line
2.9.3
#1 lore raw

Hi Hanoh,

Quoted 5 lines · Hanoh Haim
---
 lib/librte_mbuf/rte_mbuf.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

Please increase the version number in the title when sending a new verion of a patch.

Also take some time to check the patch with checkpatch and check-git-log.sh before sending it.

Then plese resend the last version as a v2.

Thanks,
Olivier