d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mbuf: rename in_port to just port

Browse Source 
In some cases we may want to tag a packet for a particular destination
or output port, so rename the "in_port" field in the mbuf to just "port"
so that it can be re-used for this purpose if an application needs it.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Bruce Richardson 2014-08-28 16:42:38 +01:00 committed by Thomas Monjalon
parent ea672a8b16
commit ca04aaea80
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dpdk_qat/main.c
View File

@ -384,7 +384,7 @@ main_loop(__attribute__((unused)) void *dummy)
} }
} }
port = dst_ports[pkt->in_port]; port = dst_ports[pkt->port];
/* Transmit the packet */ /* Transmit the packet */
nic_tx_send_packet(pkt, (uint8_t)port); nic_tx_send_packet(pkt, (uint8_t)port);

2
examples/ipv4_multicast/main.c
View File

@ -337,7 +337,7 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone)
hdr->nb_segs = (uint8_t)(pkt->nb_segs + 1); hdr->nb_segs = (uint8_t)(pkt->nb_segs + 1);
/* copy metadata from source packet*/ /* copy metadata from source packet*/
hdr->in_port = pkt->in_port; hdr->port = pkt->port;
hdr->vlan_macip = pkt->vlan_macip; hdr->vlan_macip = pkt->vlan_macip;
hdr->hash = pkt->hash; hdr->hash = pkt->hash;

2
examples/load_balancer/runtime.c
View File

@ -540,7 +540,7 @@ app_lcore_worker(
ipv4_dst = rte_be_to_cpu_32(ipv4_hdr->dst_addr); ipv4_dst = rte_be_to_cpu_32(ipv4_hdr->dst_addr);
if (unlikely(rte_lpm_lookup(lp->lpm_table, ipv4_dst, &port) != 0)) { if (unlikely(rte_lpm_lookup(lp->lpm_table, ipv4_dst, &port) != 0)) {
port = pkt->in_port; port = pkt->port;
} }
pos = lp->mbuf_out[port].n_mbufs; pos = lp->mbuf_out[port].n_mbufs;

2
examples/multi_process/client_server_mp/mp_client/client.c
View File

@ -211,7 +211,7 @@ enqueue_packet(struct rte_mbuf *buf, uint8_t port)
static void static void
handle_packet(struct rte_mbuf *buf) handle_packet(struct rte_mbuf *buf)
{ {
const uint8_t in_port = buf->in_port; const uint8_t in_port = buf->port;
const uint8_t out_port = output_ports[in_port]; const uint8_t out_port = output_ports[in_port];
enqueue_packet(buf, out_port); enqueue_packet(buf, out_port);

4
lib/librte_mbuf/rte_mbuf.c
View File

@ -122,7 +122,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,
/* init some constant fields */ /* init some constant fields */
m->pool = mp; m->pool = mp;
m->nb_segs = 1; m->nb_segs = 1;
m->in_port = 0xff; m->port = 0xff;
} }
/* do some sanity checks on a mbuf: panic if it fails */ /* do some sanity checks on a mbuf: panic if it fails */
@ -176,7 +176,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len); m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
fprintf(f, " pkt_len=%"PRIu32", ol_flags=%"PRIx16", nb_segs=%u, " fprintf(f, " pkt_len=%"PRIu32", ol_flags=%"PRIx16", nb_segs=%u, "
"in_port=%u\n", m->pkt_len, m->ol_flags, "in_port=%u\n", m->pkt_len, m->ol_flags,
(unsigned)m->nb_segs, (unsigned)m->in_port); (unsigned)m->nb_segs, (unsigned)m->port);
nb_segs = m->nb_segs; nb_segs = m->nb_segs;
while (m && nb_segs != 0) { while (m && nb_segs != 0) {

6
lib/librte_mbuf/rte_mbuf.h
View File

@ -166,7 +166,7 @@ struct rte_mbuf {
/* these fields are valid for first segment only */ /* these fields are valid for first segment only */
uint8_t nb_segs; /**< Number of segments. */ uint8_t nb_segs; /**< Number of segments. */
uint8_t in_port; /**< Input port. */ uint8_t port; /**< Input port. */
uint32_t pkt_len; /**< Total pkt len: sum of all segment data_len. */ uint32_t pkt_len; /**< Total pkt len: sum of all segment data_len. */
/* offload features, valid for first segment only */ /* offload features, valid for first segment only */
@ -542,7 +542,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)
m->pkt_len = 0; m->pkt_len = 0;
m->vlan_macip.data = 0; m->vlan_macip.data = 0;
m->nb_segs = 1; m->nb_segs = 1;
m->in_port = 0xff; m->port = 0xff;
m->ol_flags = 0; m->ol_flags = 0;
buf_ofs = (RTE_PKTMBUF_HEADROOM <= m->buf_len) ? buf_ofs = (RTE_PKTMBUF_HEADROOM <= m->buf_len) ?
@ -606,7 +606,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)
mi->next = md->next; mi->next = md->next;
mi->data = md->data; mi->data = md->data;
mi->data_len = md->data_len; mi->data_len = md->data_len;
mi->in_port = md->in_port; mi->port = md->port;
mi->vlan_macip = md->vlan_macip; mi->vlan_macip = md->vlan_macip;
mi->hash = md->hash; mi->hash = md->hash;

4
lib/librte_pmd_e1000/em_rxtx.c
View File

@ -777,7 +777,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rxm->next = NULL; rxm->next = NULL;
rxm->pkt_len = pkt_len; rxm->pkt_len = pkt_len;
rxm->data_len = pkt_len; rxm->data_len = pkt_len;
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
rxm->ol_flags = rx_desc_status_to_pkt_flags(status); rxm->ol_flags = rx_desc_status_to_pkt_flags(status);
rxm->ol_flags = (uint16_t)(rxm->ol_flags | rxm->ol_flags = (uint16_t)(rxm->ol_flags |
@ -1003,7 +1003,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
* - IP checksum flag, * - IP checksum flag,
* - error flags. * - error flags.
*/ */
first_seg->in_port = rxq->port_id; first_seg->port = rxq->port_id;
first_seg->ol_flags = rx_desc_status_to_pkt_flags(status); first_seg->ol_flags = rx_desc_status_to_pkt_flags(status);
first_seg->ol_flags = (uint16_t)(first_seg->ol_flags | first_seg->ol_flags = (uint16_t)(first_seg->ol_flags |

4
lib/librte_pmd_e1000/igb_rxtx.c
View File

@ -759,7 +759,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rxm->next = NULL; rxm->next = NULL;
rxm->pkt_len = pkt_len; rxm->pkt_len = pkt_len;
rxm->data_len = pkt_len; rxm->data_len = pkt_len;
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
rxm->hash.rss = rxd.wb.lower.hi_dword.rss; rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data); hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
@ -994,7 +994,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
* - VLAN TCI, if any, * - VLAN TCI, if any,
* - error flags. * - error flags.
*/ */
first_seg->in_port = rxq->port_id; first_seg->port = rxq->port_id;
first_seg->hash.rss = rxd.wb.lower.hi_dword.rss; first_seg->hash.rss = rxd.wb.lower.hi_dword.rss;
/* /*

8
lib/librte_pmd_i40e/i40e_rxtx.c
View File

@ -687,7 +687,7 @@ i40e_rx_alloc_bufs(struct i40e_rx_queue *rxq)
mb->next = NULL; mb->next = NULL;
mb->data = (char *)mb->buf_addr + RTE_PKTMBUF_HEADROOM; mb->data = (char *)mb->buf_addr + RTE_PKTMBUF_HEADROOM;
mb->nb_segs = 1; mb->nb_segs = 1;
mb->in_port = rxq->port_id; mb->port = rxq->port_id;
dma_addr = rte_cpu_to_le_64(\ dma_addr = rte_cpu_to_le_64(\
RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mb)); RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mb));
rxdp[i].read.hdr_addr = dma_addr; rxdp[i].read.hdr_addr = dma_addr;
@ -848,7 +848,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxm->next = NULL; rxm->next = NULL;
rxm->pkt_len = rx_packet_len; rxm->pkt_len = rx_packet_len;
rxm->data_len = rx_packet_len; rxm->data_len = rx_packet_len;
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
rxm->vlan_macip.f.vlan_tci = rx_status & rxm->vlan_macip.f.vlan_tci = rx_status &
(1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT) ? (1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT) ?
@ -1002,7 +1002,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
ETHER_CRC_LEN); ETHER_CRC_LEN);
} }
first_seg->in_port = rxq->port_id; first_seg->port = rxq->port_id;
first_seg->vlan_macip.f.vlan_tci = (rx_status & first_seg->vlan_macip.f.vlan_tci = (rx_status &
(1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT)) ? (1 << I40E_RX_DESC_STATUS_L2TAG1P_SHIFT)) ?
rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0; rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0;
@ -2133,7 +2133,7 @@ i40e_alloc_rx_queue_mbufs(struct i40e_rx_queue *rxq)
mbuf->next = NULL; mbuf->next = NULL;
mbuf->data = (char *)mbuf->buf_addr + RTE_PKTMBUF_HEADROOM; mbuf->data = (char *)mbuf->buf_addr + RTE_PKTMBUF_HEADROOM;
mbuf->nb_segs = 1; mbuf->nb_segs = 1;
mbuf->in_port = rxq->port_id; mbuf->port = rxq->port_id;
dma_addr = dma_addr =
rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mbuf)); rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mbuf));

8
lib/librte_pmd_ixgbe/ixgbe_rxtx.c
View File

@ -998,7 +998,7 @@ ixgbe_rx_alloc_bufs(struct igb_rx_queue *rxq)
mb->next = NULL; mb->next = NULL;
mb->data = (char *)mb->buf_addr + RTE_PKTMBUF_HEADROOM; mb->data = (char *)mb->buf_addr + RTE_PKTMBUF_HEADROOM;
mb->nb_segs = 1; mb->nb_segs = 1;
mb->in_port = rxq->port_id; mb->port = rxq->port_id;
/* populate the descriptors */ /* populate the descriptors */
dma_addr = (uint64_t)mb->buf_physaddr + RTE_PKTMBUF_HEADROOM; dma_addr = (uint64_t)mb->buf_physaddr + RTE_PKTMBUF_HEADROOM;
@ -1253,7 +1253,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rxm->next = NULL; rxm->next = NULL;
rxm->pkt_len = pkt_len; rxm->pkt_len = pkt_len;
rxm->data_len = pkt_len; rxm->data_len = pkt_len;
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data); hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);
/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
@ -1496,7 +1496,7 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
* - VLAN TCI, if any, * - VLAN TCI, if any,
* - error flags. * - error flags.
*/ */
first_seg->in_port = rxq->port_id; first_seg->port = rxq->port_id;
/* /*
* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is * The vlan_tci field is only valid when PKT_RX_VLAN_PKT is
@ -3215,7 +3215,7 @@ ixgbe_alloc_rx_queue_mbufs(struct igb_rx_queue *rxq)
mbuf->next = NULL; mbuf->next = NULL;
mbuf->data = (char *)mbuf->buf_addr + RTE_PKTMBUF_HEADROOM; mbuf->data = (char *)mbuf->buf_addr + RTE_PKTMBUF_HEADROOM;
mbuf->nb_segs = 1; mbuf->nb_segs = 1;
mbuf->in_port = rxq->port_id; mbuf->port = rxq->port_id;
dma_addr = dma_addr =
rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mbuf)); rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mbuf));

4
lib/librte_pmd_virtio/virtio_rxtx.c
View File

@ -479,7 +479,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
continue; continue;
} }
rxm->in_port = rxvq->port_id; rxm->port = rxvq->port_id;
rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM; rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM;
rxm->nb_segs = 1; rxm->nb_segs = 1;
@ -590,7 +590,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,
rxm->pkt_len = (uint32_t)(len[0] - hdr_size); rxm->pkt_len = (uint32_t)(len[0] - hdr_size);
rxm->data_len = (uint16_t)(len[0] - hdr_size); rxm->data_len = (uint16_t)(len[0] - hdr_size);
rxm->in_port = rxvq->port_id; rxm->port = rxvq->port_id;
rx_pkts[nb_rx] = rxm; rx_pkts[nb_rx] = rxm;
prev = rxm; prev = rxm;

4
lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
View File

@ -558,12 +558,12 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxm->ol_flags = 0; rxm->ol_flags = 0;
/* Initialize newly received packet buffer */ /* Initialize newly received packet buffer */
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
rxm->nb_segs = 1; rxm->nb_segs = 1;
rxm->next = NULL; rxm->next = NULL;
rxm->pkt_len = (uint16_t)rcd->len; rxm->pkt_len = (uint16_t)rcd->len;
rxm->data_len = (uint16_t)rcd->len; rxm->data_len = (uint16_t)rcd->len;
rxm->in_port = rxq->port_id; rxm->port = rxq->port_id;
rxm->vlan_macip.f.vlan_tci = 0; rxm->vlan_macip.f.vlan_tci = 0;
rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM; rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM;

2
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
View File

@ -113,7 +113,7 @@ eth_xenvirt_rx(void *q, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM; rxm->data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM;
rxm->data_len = (uint16_t)(len[i] - sizeof(struct virtio_net_hdr)); rxm->data_len = (uint16_t)(len[i] - sizeof(struct virtio_net_hdr));
rxm->nb_segs = 1; rxm->nb_segs = 1;
rxm->in_port = pi->port_id; rxm->port = pi->port_id;
rxm->pkt_len = (uint32_t)(len[i] - sizeof(struct virtio_net_hdr)); rxm->pkt_len = (uint32_t)(len[i] - sizeof(struct virtio_net_hdr));
} }
/* allocate new mbuf for the used descriptor */ /* allocate new mbuf for the used descriptor */