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
replace no-return attributes
[dpdk.git]
/
examples
/
ptpclient
/
ptpclient.c
diff --git
a/examples/ptpclient/ptpclient.c
b/examples/ptpclient/ptpclient.c
index
7d28f59
..
bfa86ee
100644
(file)
--- a/
examples/ptpclient/ptpclient.c
+++ b/
examples/ptpclient/ptpclient.c
@@
-49,7
+49,7
@@
static uint8_t ptp_enabled_ports[RTE_MAX_ETHPORTS];
static const struct rte_eth_conf port_conf_default = {
.rxmode = {
static const struct rte_eth_conf port_conf_default = {
.rxmode = {
- .max_rx_pkt_len = ETHER_MAX_LEN,
+ .max_rx_pkt_len =
RTE_
ETHER_MAX_LEN,
},
};
},
};
@@
-62,7
+62,7
@@
struct tstamp {
uint16_t sec_msb;
uint32_t sec_lsb;
uint32_t ns;
uint16_t sec_msb;
uint32_t sec_lsb;
uint32_t ns;
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct clock_id {
uint8_t id[8];
struct clock_id {
uint8_t id[8];
@@
-71,7
+71,7
@@
struct clock_id {
struct port_id {
struct clock_id clock_id;
uint16_t port_number;
struct port_id {
struct clock_id clock_id;
uint16_t port_number;
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct ptp_header {
uint8_t msg_type;
struct ptp_header {
uint8_t msg_type;
@@
-86,30
+86,30
@@
struct ptp_header {
uint16_t seq_id;
uint8_t control;
int8_t log_message_interval;
uint16_t seq_id;
uint8_t control;
int8_t log_message_interval;
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct sync_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
struct sync_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct follow_up_msg {
struct ptp_header hdr;
struct tstamp precise_origin_tstamp;
uint8_t suffix[0];
struct follow_up_msg {
struct ptp_header hdr;
struct tstamp precise_origin_tstamp;
uint8_t suffix[0];
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct delay_req_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
struct delay_req_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct delay_resp_msg {
struct ptp_header hdr;
struct tstamp rx_tstamp;
struct port_id req_port_id;
uint8_t suffix[0];
struct delay_resp_msg {
struct ptp_header hdr;
struct tstamp rx_tstamp;
struct port_id req_port_id;
uint8_t suffix[0];
-} __
attribute__((packed))
;
+} __
rte_packed
;
struct ptp_message {
union {
struct ptp_message {
union {
@@
-118,7
+118,7
@@
struct ptp_message {
struct delay_req_msg delay_req;
struct follow_up_msg follow_up;
struct delay_resp_msg delay_resp;
struct delay_req_msg delay_req;
struct follow_up_msg follow_up;
struct delay_resp_msg delay_resp;
- } __
attribute__((packed))
;
+ } __
rte_packed
;
};
struct ptpv2_data_slave_ordinary {
};
struct ptpv2_data_slave_ordinary {
@@
-189,7
+189,14
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
if (!rte_eth_dev_is_valid_port(port))
return -1;
if (!rte_eth_dev_is_valid_port(port))
return -1;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@
-233,10
+240,19
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
return retval;
/* Enable timesync timestamping for the Ethernet device */
return retval;
/* Enable timesync timestamping for the Ethernet device */
- rte_eth_timesync_enable(port);
+ retval = rte_eth_timesync_enable(port);
+ if (retval < 0) {
+ printf("Timesync enable failed: %d\n", retval);
+ return retval;
+ }
/* Enable RX in promiscuous mode for the Ethernet device. */
/* Enable RX in promiscuous mode for the Ethernet device. */
- rte_eth_promiscuous_enable(port);
+ retval = rte_eth_promiscuous_enable(port);
+ if (retval != 0) {
+ printf("Promiscuous mode enable failed: %s\n",
+ rte_strerror(-retval));
+ return retval;
+ }
return 0;
}
return 0;
}
@@
-362,6
+378,7
@@
static void
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
{
struct rte_ether_hdr *eth_hdr;
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
{
struct rte_ether_hdr *eth_hdr;
+ struct rte_ether_addr eth_addr;
struct ptp_header *ptp_hdr;
struct clock_id *client_clkid;
struct ptp_message *ptp_msg;
struct ptp_header *ptp_hdr;
struct clock_id *client_clkid;
struct ptp_message *ptp_msg;
@@
-371,6
+388,7
@@
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
size_t pkt_size;
int wait_us;
struct rte_mbuf *m = ptp_data->m;
size_t pkt_size;
int wait_us;
struct rte_mbuf *m = ptp_data->m;
+ int ret;
eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *)
eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *)
@@
-391,6
+409,13
@@
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
(((uint64_t)ntohs(origin_tstamp->sec_msb)) << 32);
if (ptp_data->seqID_FOLLOWUP == ptp_data->seqID_SYNC) {
(((uint64_t)ntohs(origin_tstamp->sec_msb)) << 32);
if (ptp_data->seqID_FOLLOWUP == ptp_data->seqID_SYNC) {
+ ret = rte_eth_macaddr_get(ptp_data->portid, ð_addr);
+ if (ret != 0) {
+ printf("\nCore %u: port %u failed to get MAC address: %s\n",
+ rte_lcore_id(), ptp_data->portid,
+ rte_strerror(-ret));
+ return;
+ }
created_pkt = rte_pktmbuf_alloc(mbuf_pool);
pkt_size = sizeof(struct rte_ether_hdr) +
created_pkt = rte_pktmbuf_alloc(mbuf_pool);
pkt_size = sizeof(struct rte_ether_hdr) +
@@
-398,10
+423,10
@@
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
created_pkt->data_len = pkt_size;
created_pkt->pkt_len = pkt_size;
eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *);
created_pkt->data_len = pkt_size;
created_pkt->pkt_len = pkt_size;
eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *);
- rte_eth
_macaddr_get(ptp_data->portid
, ð_hdr->s_addr);
+ rte_eth
er_addr_copy(ð_addr
, ð_hdr->s_addr);
/* Set multicast address 01-1B-19-00-00-00. */
/* Set multicast address 01-1B-19-00-00-00. */
- ether_addr_copy(ð_multicast, ð_hdr->d_addr);
+
rte_
ether_addr_copy(ð_multicast, ð_hdr->d_addr);
eth_hdr->ether_type = htons(PTP_PROTOCOL);
ptp_msg = (struct ptp_message *)
eth_hdr->ether_type = htons(PTP_PROTOCOL);
ptp_msg = (struct ptp_message *)
@@
-413,6
+438,9
@@
parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
ptp_msg->delay_req.hdr.ver = 2;
ptp_msg->delay_req.hdr.control = 1;
ptp_msg->delay_req.hdr.log_message_interval = 127;
ptp_msg->delay_req.hdr.ver = 2;
ptp_msg->delay_req.hdr.control = 1;
ptp_msg->delay_req.hdr.log_message_interval = 127;
+ ptp_msg->delay_req.hdr.message_length =
+ htons(sizeof(struct delay_req_msg));
+ ptp_msg->delay_req.hdr.domain_number = ptp_hdr->domain_number;
/* Set up clock id. */
client_clkid =
/* Set up clock id. */
client_clkid =
@@
-568,7
+596,7
@@
parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) {
* The lcore main. This is the main thread that does the work, reading from an
* input port and writing to an output port.
*/
* The lcore main. This is the main thread that does the work, reading from an
* input port and writing to an output port.
*/
-static __
attribute__((noreturn))
void
+static __
rte_noreturn
void
lcore_main(void)
{
uint16_t portid;
lcore_main(void)
{
uint16_t portid;