git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ixgbe: fix link state timing on fiber ports
[dpdk.git]
/
app
/
test-pmd
/
txonly.c
diff --git
a/app/test-pmd/txonly.c
b/app/test-pmd/txonly.c
index
fdfca14
..
076ccaf
100644
(file)
--- a/
app/test-pmd/txonly.c
+++ b/
app/test-pmd/txonly.c
@@
-45,17
+45,14
@@
uint16_t tx_udp_src_port = 9;
uint16_t tx_udp_dst_port = 9;
/* use RFC5735 / RFC2544 reserved network test addresses */
uint16_t tx_udp_dst_port = 9;
/* use RFC5735 / RFC2544 reserved network test addresses */
-uint32_t tx_ip_src_addr = (19
2
U << 24) | (18 << 16) | (0 << 8) | 1;
-uint32_t tx_ip_dst_addr = (19
2
U << 24) | (18 << 16) | (0 << 8) | 2;
+uint32_t tx_ip_src_addr = (19
8
U << 24) | (18 << 16) | (0 << 8) | 1;
+uint32_t tx_ip_dst_addr = (19
8
U << 24) | (18 << 16) | (0 << 8) | 2;
#define IP_DEFTTL 64 /* from RFC 1340. */
#define IP_DEFTTL 64 /* from RFC 1340. */
-#define IP_VERSION 0x40
-#define IP_HDRLEN 0x05 /* default IP header length == five 32-bits words. */
-#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN)
-static struct
ipv4_hdr pkt_ip_hdr;
/**< IP header of transmitted packets. */
+static struct
rte_ipv4_hdr pkt_ip_hdr;
/**< IP header of transmitted packets. */
RTE_DEFINE_PER_LCORE(uint8_t, _ip_var); /**< IP address variation */
RTE_DEFINE_PER_LCORE(uint8_t, _ip_var); /**< IP address variation */
-static struct
udp_hdr pkt_udp_hdr; /**< UDP header of transmitted
packets. */
+static struct
rte_udp_hdr pkt_udp_hdr; /**< UDP header of tx
packets. */
static void
copy_buf_to_pkt_segs(void* buf, unsigned len, struct rte_mbuf *pkt,
static void
copy_buf_to_pkt_segs(void* buf, unsigned len, struct rte_mbuf *pkt,
@@
-95,8
+92,8
@@
copy_buf_to_pkt(void* buf, unsigned len, struct rte_mbuf *pkt, unsigned offset)
}
static void
}
static void
-setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,
- struct udp_hdr *udp_hdr,
+setup_pkt_udp_ip_headers(struct
rte_
ipv4_hdr *ip_hdr,
+ struct
rte_
udp_hdr *udp_hdr,
uint16_t pkt_data_len)
{
uint16_t *ptr16;
uint16_t pkt_data_len)
{
uint16_t *ptr16;
@@
-106,7
+103,7
@@
setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,
/*
* Initialize UDP header.
*/
/*
* Initialize UDP header.
*/
- pkt_len = (uint16_t) (pkt_data_len + sizeof(struct udp_hdr));
+ pkt_len = (uint16_t) (pkt_data_len + sizeof(struct
rte_
udp_hdr));
udp_hdr->src_port = rte_cpu_to_be_16(tx_udp_src_port);
udp_hdr->dst_port = rte_cpu_to_be_16(tx_udp_dst_port);
udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_len);
udp_hdr->src_port = rte_cpu_to_be_16(tx_udp_src_port);
udp_hdr->dst_port = rte_cpu_to_be_16(tx_udp_dst_port);
udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_len);
@@
-115,8
+112,8
@@
setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,
/*
* Initialize IP header.
*/
/*
* Initialize IP header.
*/
- pkt_len = (uint16_t) (pkt_len + sizeof(struct ipv4_hdr));
- ip_hdr->version_ihl =
IP
_VHL_DEF;
+ pkt_len = (uint16_t) (pkt_len + sizeof(struct
rte_
ipv4_hdr));
+ ip_hdr->version_ihl =
RTE_IPV4
_VHL_DEF;
ip_hdr->type_of_service = 0;
ip_hdr->fragment_offset = 0;
ip_hdr->time_to_live = IP_DEFTTL;
ip_hdr->type_of_service = 0;
ip_hdr->fragment_offset = 0;
ip_hdr->time_to_live = IP_DEFTTL;
@@
-152,17
+149,16
@@
setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr,
static inline bool
pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
static inline bool
pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
- struct ether_hdr *eth_hdr, const uint16_t vlan_tci,
+ struct
rte_
ether_hdr *eth_hdr, const uint16_t vlan_tci,
const uint16_t vlan_tci_outer, const uint64_t ol_flags)
{
struct rte_mbuf *pkt_segs[RTE_MAX_SEGS_PER_PKT];
const uint16_t vlan_tci_outer, const uint64_t ol_flags)
{
struct rte_mbuf *pkt_segs[RTE_MAX_SEGS_PER_PKT];
- uint8_t ip_var = RTE_PER_LCORE(_ip_var);
struct rte_mbuf *pkt_seg;
uint32_t nb_segs, pkt_len;
uint8_t i;
if (unlikely(tx_pkt_split == TX_PKT_SPLIT_RND))
struct rte_mbuf *pkt_seg;
uint32_t nb_segs, pkt_len;
uint8_t i;
if (unlikely(tx_pkt_split == TX_PKT_SPLIT_RND))
- nb_segs = r
andom
() % tx_pkt_nb_segs + 1;
+ nb_segs = r
te_rand
() % tx_pkt_nb_segs + 1;
else
nb_segs = tx_pkt_nb_segs;
else
nb_segs = tx_pkt_nb_segs;
@@
-173,11
+169,12
@@
pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
rte_pktmbuf_reset_headroom(pkt);
pkt->data_len = tx_pkt_seg_lengths[0];
rte_pktmbuf_reset_headroom(pkt);
pkt->data_len = tx_pkt_seg_lengths[0];
- pkt->ol_flags = ol_flags;
+ pkt->ol_flags &= EXT_ATTACHED_MBUF;
+ pkt->ol_flags |= ol_flags;
pkt->vlan_tci = vlan_tci;
pkt->vlan_tci_outer = vlan_tci_outer;
pkt->vlan_tci = vlan_tci;
pkt->vlan_tci_outer = vlan_tci_outer;
- pkt->l2_len = sizeof(struct ether_hdr);
- pkt->l3_len = sizeof(struct ipv4_hdr);
+ pkt->l2_len = sizeof(struct
rte_
ether_hdr);
+ pkt->l3_len = sizeof(struct
rte_
ipv4_hdr);
pkt_len = pkt->data_len;
pkt_seg = pkt;
pkt_len = pkt->data_len;
pkt_seg = pkt;
@@
-193,14
+190,15
@@
pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
*/
copy_buf_to_pkt(eth_hdr, sizeof(*eth_hdr), pkt, 0);
copy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt,
*/
copy_buf_to_pkt(eth_hdr, sizeof(*eth_hdr), pkt, 0);
copy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt,
- sizeof(struct ether_hdr));
+ sizeof(struct
rte_
ether_hdr));
if (txonly_multi_flow) {
if (txonly_multi_flow) {
- struct ipv4_hdr *ip_hdr;
+ uint8_t ip_var = RTE_PER_LCORE(_ip_var);
+ struct rte_ipv4_hdr *ip_hdr;
uint32_t addr;
ip_hdr = rte_pktmbuf_mtod_offset(pkt,
uint32_t addr;
ip_hdr = rte_pktmbuf_mtod_offset(pkt,
- struct ipv4_hdr *,
- sizeof(struct ether_hdr));
+ struct
rte_
ipv4_hdr *,
+ sizeof(struct
rte_
ether_hdr));
/*
* Generate multiple flows by varying IP src addr. This
* enables packets are well distributed by RSS in
/*
* Generate multiple flows by varying IP src addr. This
* enables packets are well distributed by RSS in
@@
-210,10
+208,11
@@
pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
*/
addr = (tx_ip_dst_addr | (ip_var++ << 8)) + rte_lcore_id();
ip_hdr->src_addr = rte_cpu_to_be_32(addr);
*/
addr = (tx_ip_dst_addr | (ip_var++ << 8)) + rte_lcore_id();
ip_hdr->src_addr = rte_cpu_to_be_32(addr);
+ RTE_PER_LCORE(_ip_var) = ip_var;
}
copy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt,
}
copy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt,
- sizeof(struct ether_hdr) +
- sizeof(struct ipv4_hdr));
+ sizeof(struct
rte_
ether_hdr) +
+ sizeof(struct
rte_
ipv4_hdr));
/*
* Complete first mbuf of packet and append it to the
* burst of packets to be transmitted.
/*
* Complete first mbuf of packet and append it to the
* burst of packets to be transmitted.
@@
-234,7
+233,7
@@
pkt_burst_transmit(struct fwd_stream *fs)
struct rte_port *txp;
struct rte_mbuf *pkt;
struct rte_mempool *mbp;
struct rte_port *txp;
struct rte_mbuf *pkt;
struct rte_mempool *mbp;
- struct ether_hdr eth_hdr;
+ struct
rte_
ether_hdr eth_hdr;
uint16_t nb_tx;
uint16_t nb_pkt;
uint16_t vlan_tci, vlan_tci_outer;
uint16_t nb_tx;
uint16_t nb_pkt;
uint16_t vlan_tci, vlan_tci_outer;
@@
-266,9
+265,9
@@
pkt_burst_transmit(struct fwd_stream *fs)
/*
* Initialize Ethernet header.
*/
/*
* Initialize Ethernet header.
*/
- ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.d_addr);
- ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.s_addr);
- eth_hdr.ether_type = rte_cpu_to_be_16(
ETHER_TYPE_IPv
4);
+
rte_
ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.d_addr);
+
rte_
ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.s_addr);
+ eth_hdr.ether_type = rte_cpu_to_be_16(
RTE_ETHER_TYPE_IPV
4);
if (rte_mempool_get_bulk(mbp, (void **)pkts_burst,
nb_pkt_per_burst) == 0) {
if (rte_mempool_get_bulk(mbp, (void **)pkts_burst,
nb_pkt_per_burst) == 0) {
@@
-317,7
+316,7
@@
pkt_burst_transmit(struct fwd_stream *fs)
fs->tx_packets += nb_tx;
if (txonly_multi_flow)
fs->tx_packets += nb_tx;
if (txonly_multi_flow)
- RTE_PER_LCORE(_ip_var)
+=
nb_tx;
+ RTE_PER_LCORE(_ip_var)
-= nb_pkt -
nb_tx;
#ifdef RTE_TEST_PMD_RECORD_BURST_STATS
fs->tx_burst_stats.pkt_burst_spread[nb_tx]++;
#ifdef RTE_TEST_PMD_RECORD_BURST_STATS
fs->tx_burst_stats.pkt_burst_spread[nb_tx]++;
@@
-343,13
+342,14
@@
pkt_burst_transmit(struct fwd_stream *fs)
}
static void
}
static void
-tx_only_begin(__
attribute__((unused))
portid_t pi)
+tx_only_begin(__
rte_unused
portid_t pi)
{
uint16_t pkt_data_len;
{
uint16_t pkt_data_len;
- pkt_data_len = (uint16_t) (tx_pkt_length - (sizeof(struct ether_hdr) +
- sizeof(struct ipv4_hdr) +
- sizeof(struct udp_hdr)));
+ pkt_data_len = (uint16_t) (tx_pkt_length - (
+ sizeof(struct rte_ether_hdr) +
+ sizeof(struct rte_ipv4_hdr) +
+ sizeof(struct rte_udp_hdr)));
setup_pkt_udp_ip_headers(&pkt_ip_hdr, &pkt_udp_hdr, pkt_data_len);
}
setup_pkt_udp_ip_headers(&pkt_ip_hdr, &pkt_udp_hdr, pkt_data_len);
}