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/xenvirt: remove
[dpdk.git]
/
app
/
test-pmd
/
ieee1588fwd.c
diff --git
a/app/test-pmd/ieee1588fwd.c
b/app/test-pmd/ieee1588fwd.c
index
b1a301b
..
91ee786
100644
(file)
--- a/
app/test-pmd/ieee1588fwd.c
+++ b/
app/test-pmd/ieee1588fwd.c
@@
-34,6
+34,7
@@
#include <rte_cycles.h>
#include <rte_ethdev.h>
#include <rte_cycles.h>
#include <rte_ethdev.h>
+#include <rte_flow.h>
#include "testpmd.h"
#include "testpmd.h"
@@
-85,12
+86,11
@@
port_ieee1588_rx_timestamp_check(portid_t pi, uint32_t index)
struct timespec timestamp = {0, 0};
if (rte_eth_timesync_read_rx_timestamp(pi, ×tamp, index) < 0) {
struct timespec timestamp = {0, 0};
if (rte_eth_timesync_read_rx_timestamp(pi, ×tamp, index) < 0) {
- printf("Port %u RX timestamp registers not valid\n",
- (unsigned) pi);
+ printf("Port %u RX timestamp registers not valid\n", pi);
return;
}
return;
}
- printf("Port %u RX timestamp value %lu\n",
-
(unsigned) pi, timestamp.tv_
sec);
+ printf("Port %u RX timestamp value %lu
s %lu ns
\n",
+
pi, timestamp.tv_sec, timestamp.tv_n
sec);
}
#define MAX_TX_TMST_WAIT_MICROSECS 1000 /**< 1 milli-second */
}
#define MAX_TX_TMST_WAIT_MICROSECS 1000 /**< 1 milli-second */
@@
-109,12
+109,12
@@
port_ieee1588_tx_timestamp_check(portid_t pi)
if (wait_us >= MAX_TX_TMST_WAIT_MICROSECS) {
printf("Port %u TX timestamp registers not valid after "
"%u micro-seconds\n",
if (wait_us >= MAX_TX_TMST_WAIT_MICROSECS) {
printf("Port %u TX timestamp registers not valid after "
"%u micro-seconds\n",
-
(unsigned) pi, (unsigned)
MAX_TX_TMST_WAIT_MICROSECS);
+
pi,
MAX_TX_TMST_WAIT_MICROSECS);
return;
}
return;
}
- printf("Port %u TX timestamp value %lu validated after "
+ printf("Port %u TX timestamp value %lu
s %lu ns
validated after "
"%u micro-second%s\n",
"%u micro-second%s\n",
-
(unsigned) pi, timestamp.tv_
sec, wait_us,
+
pi, timestamp.tv_sec, timestamp.tv_n
sec, wait_us,
(wait_us == 1) ? "" : "s");
}
(wait_us == 1) ? "" : "s");
}
@@
-123,6
+123,7
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
{
struct rte_mbuf *mb;
struct ether_hdr *eth_hdr;
{
struct rte_mbuf *mb;
struct ether_hdr *eth_hdr;
+ struct ether_addr addr;
struct ptpv2_msg *ptp_hdr;
uint16_t eth_type;
uint32_t timesync_index;
struct ptpv2_msg *ptp_hdr;
uint16_t eth_type;
uint32_t timesync_index;
@@
-146,11
+147,11
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
if (eth_type == ETHER_TYPE_1588) {
printf("Port %u Received PTP packet not filtered"
" by hardware\n",
if (eth_type == ETHER_TYPE_1588) {
printf("Port %u Received PTP packet not filtered"
" by hardware\n",
-
(unsigned)
fs->rx_port);
+ fs->rx_port);
} else {
printf("Port %u Received non PTP packet type=0x%4x "
"len=%u\n",
} else {
printf("Port %u Received non PTP packet type=0x%4x "
"len=%u\n",
-
(unsigned)
fs->rx_port, eth_type,
+ fs->rx_port, eth_type,
(unsigned) mb->pkt_len);
}
rte_pktmbuf_free(mb);
(unsigned) mb->pkt_len);
}
rte_pktmbuf_free(mb);
@@
-159,7
+160,7
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
if (eth_type != ETHER_TYPE_1588) {
printf("Port %u Received NON PTP packet incorrectly"
" detected by hardware\n",
if (eth_type != ETHER_TYPE_1588) {
printf("Port %u Received NON PTP packet incorrectly"
" detected by hardware\n",
-
(unsigned)
fs->rx_port);
+ fs->rx_port);
rte_pktmbuf_free(mb);
return;
}
rte_pktmbuf_free(mb);
return;
}
@@
-173,19
+174,19
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
if (ptp_hdr->version != 0x02) {
printf("Port %u Received PTP V2 Ethernet frame with wrong PTP"
" protocol version 0x%x (should be 0x02)\n",
if (ptp_hdr->version != 0x02) {
printf("Port %u Received PTP V2 Ethernet frame with wrong PTP"
" protocol version 0x%x (should be 0x02)\n",
-
(unsigned)
fs->rx_port, ptp_hdr->version);
+ fs->rx_port, ptp_hdr->version);
rte_pktmbuf_free(mb);
return;
}
if (ptp_hdr->msg_id != PTP_SYNC_MESSAGE) {
printf("Port %u Received PTP V2 Ethernet frame with unexpected"
" message ID 0x%x (expected 0x0 - PTP_SYNC_MESSAGE)\n",
rte_pktmbuf_free(mb);
return;
}
if (ptp_hdr->msg_id != PTP_SYNC_MESSAGE) {
printf("Port %u Received PTP V2 Ethernet frame with unexpected"
" message ID 0x%x (expected 0x0 - PTP_SYNC_MESSAGE)\n",
-
(unsigned)
fs->rx_port, ptp_hdr->msg_id);
+ fs->rx_port, ptp_hdr->msg_id);
rte_pktmbuf_free(mb);
return;
}
printf("Port %u IEEE1588 PTP V2 SYNC Message filtered by hardware\n",
rte_pktmbuf_free(mb);
return;
}
printf("Port %u IEEE1588 PTP V2 SYNC Message filtered by hardware\n",
-
(unsigned)
fs->rx_port);
+ fs->rx_port);
/*
* Check that the received PTP packet has been timestamped by the
/*
* Check that the received PTP packet has been timestamped by the
@@
-194,7
+195,7
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
if (! (mb->ol_flags & PKT_RX_IEEE1588_TMST)) {
printf("Port %u Received PTP packet not timestamped"
" by hardware\n",
if (! (mb->ol_flags & PKT_RX_IEEE1588_TMST)) {
printf("Port %u Received PTP packet not timestamped"
" by hardware\n",
-
(unsigned)
fs->rx_port);
+ fs->rx_port);
rte_pktmbuf_free(mb);
return;
}
rte_pktmbuf_free(mb);
return;
}
@@
-205,12
+206,16
@@
ieee1588_packet_fwd(struct fwd_stream *fs)
/* Read and check the RX timestamp. */
port_ieee1588_rx_timestamp_check(fs->rx_port, timesync_index);
/* Read and check the RX timestamp. */
port_ieee1588_rx_timestamp_check(fs->rx_port, timesync_index);
+ /* Swap dest and src mac addresses. */
+ ether_addr_copy(ð_hdr->d_addr, &addr);
+ ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr);
+ ether_addr_copy(&addr, ð_hdr->s_addr);
+
/* Forward PTP packet with hardware TX timestamp */
mb->ol_flags |= PKT_TX_IEEE1588_TMST;
fs->tx_packets += 1;
if (rte_eth_tx_burst(fs->rx_port, fs->tx_queue, &mb, 1) == 0) {
/* Forward PTP packet with hardware TX timestamp */
mb->ol_flags |= PKT_TX_IEEE1588_TMST;
fs->tx_packets += 1;
if (rte_eth_tx_burst(fs->rx_port, fs->tx_queue, &mb, 1) == 0) {
- printf("Port %u sent PTP packet dropped\n",
- (unsigned) fs->rx_port);
+ printf("Port %u sent PTP packet dropped\n", fs->rx_port);
fs->fwd_dropped += 1;
rte_pktmbuf_free(mb);
return;
fs->fwd_dropped += 1;
rte_pktmbuf_free(mb);
return;