static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
/* ethernet addresses of ports */
-static struct ether_addr ports_eth_addr[MAX_PORTS];
+static struct rte_ether_addr ports_eth_addr[MAX_PORTS];
/* mask of enabled ports */
static uint32_t enabled_port_mask = 0;
.rxmode = {
.max_rx_pkt_len = JUMBO_FRAME_MAX_SIZE,
.split_hdr_size = 0,
- .ignore_offload_bitfield = 1,
- .offloads = (DEV_RX_OFFLOAD_JUMBO_FRAME |
- DEV_RX_OFFLOAD_CRC_STRIP),
+ .offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
},
.txmode = {
.mq_mode = ETH_MQ_TX_NONE,
};
static struct mcast_group_params mcast_group_table[] = {
- {IPv4(224,0,0,101), 0x1},
- {IPv4(224,0,0,102), 0x2},
- {IPv4(224,0,0,103), 0x3},
- {IPv4(224,0,0,104), 0x4},
- {IPv4(224,0,0,105), 0x5},
- {IPv4(224,0,0,106), 0x6},
- {IPv4(224,0,0,107), 0x7},
- {IPv4(224,0,0,108), 0x8},
- {IPv4(224,0,0,109), 0x9},
- {IPv4(224,0,0,110), 0xA},
- {IPv4(224,0,0,111), 0xB},
- {IPv4(224,0,0,112), 0xC},
- {IPv4(224,0,0,113), 0xD},
- {IPv4(224,0,0,114), 0xE},
- {IPv4(224,0,0,115), 0xF},
+ {RTE_IPV4(224,0,0,101), 0x1},
+ {RTE_IPV4(224,0,0,102), 0x2},
+ {RTE_IPV4(224,0,0,103), 0x3},
+ {RTE_IPV4(224,0,0,104), 0x4},
+ {RTE_IPV4(224,0,0,105), 0x5},
+ {RTE_IPV4(224,0,0,106), 0x6},
+ {RTE_IPV4(224,0,0,107), 0x7},
+ {RTE_IPV4(224,0,0,108), 0x8},
+ {RTE_IPV4(224,0,0,109), 0x9},
+ {RTE_IPV4(224,0,0,110), 0xA},
+ {RTE_IPV4(224,0,0,111), 0xB},
+ {RTE_IPV4(224,0,0,112), 0xC},
+ {RTE_IPV4(224,0,0,113), 0xD},
+ {RTE_IPV4(224,0,0,114), 0xE},
+ {RTE_IPV4(224,0,0,115), 0xF},
};
-#define N_MCAST_GROUPS \
- (sizeof (mcast_group_table) / sizeof (mcast_group_table[0]))
-
-
/* Send burst of packets on an output interface */
static void
send_burst(struct lcore_queue_conf *qconf, uint16_t port)
/* prepend new header */
hdr->next = pkt;
-
/* update header's fields */
hdr->pkt_len = (uint16_t)(hdr->data_len + pkt->pkt_len);
hdr->nb_segs = pkt->nb_segs + 1;
- /* copy metadata from source packet*/
- hdr->port = pkt->port;
- hdr->vlan_tci = pkt->vlan_tci;
- hdr->vlan_tci_outer = pkt->vlan_tci_outer;
- hdr->tx_offload = pkt->tx_offload;
- hdr->hash = pkt->hash;
-
- hdr->ol_flags = pkt->ol_flags;
-
__rte_mbuf_sanity_check(hdr, 1);
return hdr;
}
* and put it into the outgoing queue for the given port.
*/
static inline void
-mcast_send_pkt(struct rte_mbuf *pkt, struct ether_addr *dest_addr,
+mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr,
struct lcore_queue_conf *qconf, uint16_t port)
{
- struct ether_hdr *ethdr;
+ struct rte_ether_hdr *ethdr;
uint16_t len;
/* Construct Ethernet header. */
- ethdr = (struct ether_hdr *)rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr));
+ ethdr = (struct rte_ether_hdr *)
+ rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr));
RTE_ASSERT(ethdr != NULL);
- ether_addr_copy(dest_addr, ðdr->d_addr);
- ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr);
- ethdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
+ rte_ether_addr_copy(dest_addr, ðdr->d_addr);
+ rte_ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr);
+ ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
/* Put new packet into the output queue */
len = qconf->tx_mbufs[port].len;
mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)
{
struct rte_mbuf *mc;
- struct ipv4_hdr *iphdr;
+ struct rte_ipv4_hdr *iphdr;
uint32_t dest_addr, port_mask, port_num, use_clone;
int32_t hash;
uint16_t port;
union {
uint64_t as_int;
- struct ether_addr as_addr;
+ struct rte_ether_addr as_addr;
} dst_eth_addr;
/* Remove the Ethernet header from the input packet */
- iphdr = (struct ipv4_hdr *)rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
+ iphdr = (struct rte_ipv4_hdr *)
+ rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
RTE_ASSERT(iphdr != NULL);
dest_addr = rte_be_to_cpu_32(iphdr->dst_addr);
* Check that it is a valid multicast address and
* we have some active ports assigned to it.
*/
- if(!IS_IPV4_MCAST(dest_addr) ||
+ if (!RTE_IS_IPV4_MCAST(dest_addr) ||
(hash = rte_fbk_hash_lookup(mcast_hash, dest_addr)) <= 0 ||
(port_mask = hash & enabled_port_mask) == 0) {
rte_pktmbuf_free(m);
}
static void
-print_ethaddr(const char *name, struct ether_addr *eth_addr)
+print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
{
- char buf[ETHER_ADDR_FMT_SIZE];
- ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+ char buf[RTE_ETHER_ADDR_FMT_SIZE];
+ rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
printf("%s%s", name, buf);
}
return -1;
}
- for (i = 0; i < N_MCAST_GROUPS; i ++){
+ for (i = 0; i < RTE_DIM(mcast_group_table); i++) {
if (rte_fbk_hash_add_key(mcast_hash,
mcast_group_table[i].ip,
mcast_group_table[i].port_mask) < 0) {
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
+ int ret;
printf("\nChecking link status");
fflush(stdout);
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
- rte_eth_link_get_nowait(portid, &link);
+ ret = rte_eth_link_get_nowait(portid, &link);
+ if (ret < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-ret));
+ continue;
+ }
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status)
qconf = &lcore_queue_conf[rx_lcore_id];
/* limit the frame size to the maximum supported by NIC */
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info: %s\n",
+ portid, strerror(-ret));
+
local_port_conf.rxmode.max_rx_pkt_len = RTE_MIN(
dev_info.max_rx_pktlen,
local_port_conf.rxmode.max_rx_pkt_len);
"Cannot adjust number of descriptors: err=%d, port=%d\n",
ret, portid);
- rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
+ ret = rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+ "Cannot get MAC address: err=%d, port=%d\n",
+ ret, portid);
+
print_ethaddr(" Address:", &ports_eth_addr[portid]);
printf(", ");
fflush(stdout);
txconf = &dev_info.default_txconf;
- txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE;
txconf->offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
rte_lcore_to_socket_id(lcore_id), txconf);
qconf->tx_queue_id[portid] = queueid;
queueid++;
}
-
+ ret = rte_eth_allmulticast_enable(portid);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+ "rte_eth_allmulticast_enable: err=%d, port=%d\n",
+ ret, portid);
/* Start device */
ret = rte_eth_dev_start(portid);
if (ret < 0)