summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2019-10-08 09:33:47 -0700
committerDavid Marchand <david.marchand@redhat.com>2019-10-16 12:42:04 +0200
commit6b1dd3be5420767fe113293e6ef26f2333069a08 (patch)
treea1e83871f41520f2b5c40a0bfe485910e1aba790
parent1636775425456d021b4ab0dd0b312edc8fbd78b8 (diff)
downloaddpdk-next-eventdev-6b1dd3be5420767fe113293e6ef26f2333069a08.zip
dpdk-next-eventdev-6b1dd3be5420767fe113293e6ef26f2333069a08.tar.gz
dpdk-next-eventdev-6b1dd3be5420767fe113293e6ef26f2333069a08.tar.xz
mbuf: deinline linearize function
This copy part of this function is too big to be put inline. The places it is used are only in special exception paths where a highly fragmented mbuf arrives at a device that can't handle it. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Andrew Rybchenko <arybchenko@solarflare.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>
-rw-r--r--lib/librte_mbuf/rte_mbuf.c37
-rw-r--r--lib/librte_mbuf/rte_mbuf.h38
-rw-r--r--lib/librte_mbuf/rte_mbuf_version.map7
3 files changed, 50 insertions, 32 deletions
diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 37718d4..e2c661c 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -245,6 +245,43 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header,
return 0;
}
+/* convert multi-segment mbuf to single mbuf */
+int
+__rte_pktmbuf_linearize(struct rte_mbuf *mbuf)
+{
+ size_t seg_len, copy_len;
+ struct rte_mbuf *m;
+ struct rte_mbuf *m_next;
+ char *buffer;
+
+ /* Extend first segment to the total packet length */
+ copy_len = rte_pktmbuf_pkt_len(mbuf) - rte_pktmbuf_data_len(mbuf);
+
+ if (unlikely(copy_len > rte_pktmbuf_tailroom(mbuf)))
+ return -1;
+
+ buffer = rte_pktmbuf_mtod_offset(mbuf, char *, mbuf->data_len);
+ mbuf->data_len = (uint16_t)(mbuf->pkt_len);
+
+ /* Append data from next segments to the first one */
+ m = mbuf->next;
+ while (m != NULL) {
+ m_next = m->next;
+
+ seg_len = rte_pktmbuf_data_len(m);
+ rte_memcpy(buffer, rte_pktmbuf_mtod(m, char *), seg_len);
+ buffer += seg_len;
+
+ rte_pktmbuf_free_seg(m);
+ m = m_next;
+ }
+
+ mbuf->next = NULL;
+ mbuf->nb_segs = 1;
+
+ return 0;
+}
+
/* dump a mbuf on console */
void
rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 98225ec..bffda1c 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -2401,6 +2401,11 @@ rte_validate_tx_offload(const struct rte_mbuf *m)
}
/**
+ * @internal used by rte_pktmbuf_linearize().
+ */
+int __rte_pktmbuf_linearize(struct rte_mbuf *mbuf);
+
+/**
* Linearize data in mbuf.
*
* This function moves the mbuf data in the first segment if there is enough
@@ -2415,40 +2420,9 @@ rte_validate_tx_offload(const struct rte_mbuf *m)
static inline int
rte_pktmbuf_linearize(struct rte_mbuf *mbuf)
{
- size_t seg_len, copy_len;
- struct rte_mbuf *m;
- struct rte_mbuf *m_next;
- char *buffer;
-
if (rte_pktmbuf_is_contiguous(mbuf))
return 0;
-
- /* Extend first segment to the total packet length */
- copy_len = rte_pktmbuf_pkt_len(mbuf) - rte_pktmbuf_data_len(mbuf);
-
- if (unlikely(copy_len > rte_pktmbuf_tailroom(mbuf)))
- return -1;
-
- buffer = rte_pktmbuf_mtod_offset(mbuf, char *, mbuf->data_len);
- mbuf->data_len = (uint16_t)(mbuf->pkt_len);
-
- /* Append data from next segments to the first one */
- m = mbuf->next;
- while (m != NULL) {
- m_next = m->next;
-
- seg_len = rte_pktmbuf_data_len(m);
- rte_memcpy(buffer, rte_pktmbuf_mtod(m, char *), seg_len);
- buffer += seg_len;
-
- rte_pktmbuf_free_seg(m);
- m = m_next;
- }
-
- mbuf->next = NULL;
- mbuf->nb_segs = 1;
-
- return 0;
+ return __rte_pktmbuf_linearize(mbuf);
}
/**
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
index 2662a37..f09828c 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -46,6 +46,13 @@ DPDK_18.08 {
rte_pktmbuf_pool_create_by_ops;
} DPDK_16.11;
+DPDK_19.11 {
+ global:
+
+ __rte_pktmbuf_linearize;
+
+} DPDK_18.08;
+
EXPERIMENTAL {
global: