X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_port%2Frte_port_frag.c;h=0fcace99b6cc90a38efcef554bde9482c995fbdf;hb=03600dd583af60c1cb454ee5e8e9f2118269545d;hp=ff0ab9b808de05916503fbb0c85241dd6f0c9037;hpb=3a52e64742c370bebc465b91f3197d940d5738cd;p=dpdk.git diff --git a/lib/librte_port/rte_port_frag.c b/lib/librte_port/rte_port_frag.c index ff0ab9b808..0fcace99b6 100644 --- a/lib/librte_port/rte_port_frag.c +++ b/lib/librte_port/rte_port_frag.c @@ -38,14 +38,34 @@ #include "rte_port_frag.h" -/* Default byte size for the IPv4 Maximum Transfer Unit (MTU). - * This value includes the size of IPv4 header. */ -#define IPV4_MTU_DEFAULT ETHER_MTU - /* Max number of fragments per packet allowed */ -#define IPV4_MAX_FRAGS_PER_PACKET 0x80 +#define RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80 + +#ifdef RTE_PORT_STATS_COLLECT + +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val) + +#endif + +typedef int32_t + (*frag_op)(struct rte_mbuf *pkt_in, + struct rte_mbuf **pkts_out, + uint16_t nb_pkts_out, + uint16_t mtu_size, + struct rte_mempool *pool_direct, + struct rte_mempool *pool_indirect); + +struct rte_port_ring_reader_frag { + struct rte_port_in_stats stats; -struct rte_port_ring_reader_ipv4_frag { /* Input parameters */ struct rte_ring *ring; uint32_t mtu; @@ -55,19 +75,21 @@ struct rte_port_ring_reader_ipv4_frag { /* Internal buffers */ struct rte_mbuf *pkts[RTE_PORT_IN_BURST_SIZE_MAX]; - struct rte_mbuf *frags[IPV4_MAX_FRAGS_PER_PACKET]; + struct rte_mbuf *frags[RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET]; uint32_t n_pkts; uint32_t pos_pkts; uint32_t n_frags; uint32_t pos_frags; + + frag_op f_frag; } __rte_cache_aligned; static void * -rte_port_ring_reader_ipv4_frag_create(void *params, int socket_id) +rte_port_ring_reader_frag_create(void *params, int socket_id, int is_ipv4) { - struct rte_port_ring_reader_ipv4_frag_params *conf = - (struct rte_port_ring_reader_ipv4_frag_params *) params; - struct rte_port_ring_reader_ipv4_frag *port; + struct rte_port_ring_reader_frag_params *conf = + (struct rte_port_ring_reader_frag_params *) params; + struct rte_port_ring_reader_frag *port; /* Check input parameters */ if (conf == NULL) { @@ -113,16 +135,31 @@ rte_port_ring_reader_ipv4_frag_create(void *params, int socket_id) port->n_frags = 0; port->pos_frags = 0; + port->f_frag = (is_ipv4) ? + rte_ipv4_fragment_packet : rte_ipv6_fragment_packet; + return port; } +static void * +rte_port_ring_reader_ipv4_frag_create(void *params, int socket_id) +{ + return rte_port_ring_reader_frag_create(params, socket_id, 1); +} + +static void * +rte_port_ring_reader_ipv6_frag_create(void *params, int socket_id) +{ + return rte_port_ring_reader_frag_create(params, socket_id, 0); +} + static int -rte_port_ring_reader_ipv4_frag_rx(void *port, +rte_port_ring_reader_frag_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) { - struct rte_port_ring_reader_ipv4_frag *p = - (struct rte_port_ring_reader_ipv4_frag *) port; + struct rte_port_ring_reader_frag *p = + (struct rte_port_ring_reader_frag *) port; uint32_t n_pkts_out; n_pkts_out = 0; @@ -150,6 +187,7 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, if (p->n_pkts == 0) { p->n_pkts = rte_ring_sc_dequeue_burst(p->ring, (void **) p->pkts, RTE_PORT_IN_BURST_SIZE_MAX); + RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(p, p->n_pkts); if (p->n_pkts == 0) return n_pkts_out; p->pos_pkts = 0; @@ -160,7 +198,7 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, p->n_pkts--; /* If not jumbo, pass current packet to output */ - if (pkt->pkt_len <= IPV4_MTU_DEFAULT) { + if (pkt->pkt_len <= p->mtu) { pkts[n_pkts_out++] = pkt; n_pkts_to_provide = n_pkts - n_pkts_out; @@ -171,10 +209,10 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, } /* Fragment current packet into the "frags" buffer */ - status = rte_ipv4_fragment_packet( + status = p->f_frag( pkt, p->frags, - IPV4_MAX_FRAGS_PER_PACKET, + RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET, p->mtu, p->pool_direct, p->pool_indirect @@ -182,6 +220,7 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, if (status < 0) { rte_pktmbuf_free(pkt); + RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(p, 1); continue; } @@ -190,9 +229,10 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, /* Copy meta-data from input jumbo packet to its fragments */ for (i = 0; i < p->n_frags; i++) { - uint8_t *src = RTE_MBUF_METADATA_UINT8_PTR(pkt, 0); + uint8_t *src = + RTE_MBUF_METADATA_UINT8_PTR(pkt, sizeof(struct rte_mbuf)); uint8_t *dst = - RTE_MBUF_METADATA_UINT8_PTR(p->frags[i], 0); + RTE_MBUF_METADATA_UINT8_PTR(p->frags[i], sizeof(struct rte_mbuf)); memcpy(dst, src, p->metadata_size); } @@ -219,7 +259,7 @@ rte_port_ring_reader_ipv4_frag_rx(void *port, } static int -rte_port_ring_reader_ipv4_frag_free(void *port) +rte_port_ring_reader_frag_free(void *port) { if (port == NULL) { RTE_LOG(ERR, PORT, "%s: Parameter port is NULL\n", __func__); @@ -231,11 +271,35 @@ rte_port_ring_reader_ipv4_frag_free(void *port) return 0; } +static int +rte_port_frag_reader_stats_read(void *port, + struct rte_port_in_stats *stats, int clear) +{ + struct rte_port_ring_reader_frag *p = + (struct rte_port_ring_reader_frag *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Summary of port operations */ struct rte_port_in_ops rte_port_ring_reader_ipv4_frag_ops = { .f_create = rte_port_ring_reader_ipv4_frag_create, - .f_free = rte_port_ring_reader_ipv4_frag_free, - .f_rx = rte_port_ring_reader_ipv4_frag_rx, + .f_free = rte_port_ring_reader_frag_free, + .f_rx = rte_port_ring_reader_frag_rx, + .f_stats = rte_port_frag_reader_stats_read, +}; + +struct rte_port_in_ops rte_port_ring_reader_ipv6_frag_ops = { + .f_create = rte_port_ring_reader_ipv6_frag_create, + .f_free = rte_port_ring_reader_frag_free, + .f_rx = rte_port_ring_reader_frag_rx, + .f_stats = rte_port_frag_reader_stats_read, };