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
ethdev: use constants for link state
[dpdk.git]
/
examples
/
ip_reassembly
/
main.c
diff --git
a/examples/ip_reassembly/main.c
b/examples/ip_reassembly/main.c
index
39d60ec
..
c27e735
100644
(file)
--- a/
examples/ip_reassembly/main.c
+++ b/
examples/ip_reassembly/main.c
@@
-50,7
+50,6
@@
#include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_memzone.h>
#include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_memzone.h>
-#include <rte_tailq.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
@@
-79,8
+78,6
@@
#include <rte_ip_frag.h>
#include <rte_ip_frag.h>
-#include "main.h"
-
#define MAX_PKT_BURST 32
#define MAX_PKT_BURST 32
@@
-88,7
+85,7
@@
#define MAX_JUMBO_PKT_LEN 9600
#define MAX_JUMBO_PKT_LEN 9600
-#define BUF_SIZE
2048
+#define BUF_SIZE
RTE_MBUF_DEFAULT_DATAROOM
#define MBUF_SIZE \
(BUF_SIZE + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
#define MBUF_SIZE \
(BUF_SIZE + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
@@
-307,7
+304,7
@@
send_burst(struct lcore_queue_conf *qconf, uint32_t thresh, uint8_t port)
txmb->tail = 0;
}
txmb->tail = 0;
}
- return
(fill)
;
+ return
fill
;
}
/* Enqueue a single packet, and send burst if queue is filled */
}
/* Enqueue a single packet, and send burst if queue is filled */
@@
-338,7
+335,7
@@
send_single_packet(struct rte_mbuf *m, uint8_t port)
if(++txmb->head == len)
txmb->head = 0;
if(++txmb->head == len)
txmb->head = 0;
- return
(0)
;
+ return
0
;
}
static inline void
}
static inline void
@@
-350,7
+347,8
@@
reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
struct rte_ip_frag_death_row *dr;
struct rx_queue *rxq;
void *d_addr_bytes;
struct rte_ip_frag_death_row *dr;
struct rx_queue *rxq;
void *d_addr_bytes;
- uint8_t next_hop, dst_port;
+ uint32_t next_hop_ipv4;
+ uint8_t next_hop_ipv6, dst_port;
rxq = &qconf->rx_queue_list[queue];
rxq = &qconf->rx_queue_list[queue];
@@
-359,7
+357,7
@@
reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
dst_port = portid;
/* if packet is IPv4 */
dst_port = portid;
/* if packet is IPv4 */
- if (
m->ol_flags & (PKT_RX_IPV4_HDR
)) {
+ if (
RTE_ETH_IS_IPV4_HDR(m->packet_type
)) {
struct ipv4_hdr *ip_hdr;
uint32_t ip_dst;
struct ipv4_hdr *ip_hdr;
uint32_t ip_dst;
@@
-393,15
+391,14
@@
reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
ip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);
/* Find destination port */
ip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);
/* Find destination port */
- if (rte_lpm_lookup(rxq->lpm, ip_dst, &next_hop) == 0 &&
- (enabled_port_mask & 1 << next_hop) != 0) {
- dst_port = next_hop;
+ if (rte_lpm_lookup(rxq->lpm, ip_dst, &next_hop
_ipv4
) == 0 &&
+ (enabled_port_mask & 1 << next_hop
_ipv4
) != 0) {
+ dst_port = next_hop
_ipv4
;
}
eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
}
eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
- }
- /* if packet is IPv6 */
- else if (m->ol_flags & (PKT_RX_IPV6_HDR | PKT_RX_IPV6_HDR_EXT)) {
+ } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+ /* if packet is IPv6 */
struct ipv6_extension_fragment *frag_hdr;
struct ipv6_hdr *ip_hdr;
struct ipv6_extension_fragment *frag_hdr;
struct ipv6_hdr *ip_hdr;
@@
-431,9
+428,9
@@
reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
}
/* Find destination port */
}
/* Find destination port */
- if (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr, &next_hop) == 0 &&
- (enabled_port_mask & 1 << next_hop) != 0) {
- dst_port = next_hop;
+ if (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr, &next_hop
_ipv6
) == 0 &&
+ (enabled_port_mask & 1 << next_hop
_ipv6
) != 0) {
+ dst_port = next_hop
_ipv6
;
}
eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
}
eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
@@
-565,13
+562,13
@@
parse_flow_num(const char *str, uint32_t min, uint32_t max, uint32_t *val)
errno = 0;
v = strtoul(str, &end, 10);
if (errno != 0 || *end != '\0')
errno = 0;
v = strtoul(str, &end, 10);
if (errno != 0 || *end != '\0')
- return
(-EINVAL)
;
+ return
-EINVAL
;
if (v < min || v > max)
if (v < min || v > max)
- return
(-EINVAL)
;
+ return
-EINVAL
;
*val = (uint32_t)v;
*val = (uint32_t)v;
- return
(0)
;
+ return
0
;
}
static int
}
static int
@@
-587,20
+584,20
@@
parse_flow_ttl(const char *str, uint32_t min, uint32_t max, uint32_t *val)
errno = 0;
v = strtoul(str, &end, 10);
if (errno != 0)
errno = 0;
v = strtoul(str, &end, 10);
if (errno != 0)
- return
(-EINVAL)
;
+ return
-EINVAL
;
if (*end != '\0') {
if (strncmp(frmt_sec, end, sizeof(frmt_sec)) == 0)
v *= MS_PER_S;
else if (strncmp(frmt_msec, end, sizeof (frmt_msec)) != 0)
if (*end != '\0') {
if (strncmp(frmt_sec, end, sizeof(frmt_sec)) == 0)
v *= MS_PER_S;
else if (strncmp(frmt_msec, end, sizeof (frmt_msec)) != 0)
- return
(-EINVAL)
;
+ return
-EINVAL
;
}
if (v < min || v > max)
}
if (v < min || v > max)
- return
(-EINVAL)
;
+ return
-EINVAL
;
*val = (uint32_t)v;
*val = (uint32_t)v;
- return
(0)
;
+ return
0
;
}
static int
}
static int
@@
-693,7
+690,7
@@
parse_args(int argc, char **argv)
optarg,
lgopts[option_index].name);
print_usage(prgname);
optarg,
lgopts[option_index].name);
print_usage(prgname);
- return
(ret)
;
+ return
ret
;
}
}
}
}
@@
-706,7
+703,7
@@
parse_args(int argc, char **argv)
optarg,
lgopts[option_index].name);
print_usage(prgname);
optarg,
lgopts[option_index].name);
print_usage(prgname);
- return
(ret)
;
+ return
ret
;
}
}
}
}
@@
-766,7
+763,7
@@
check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
continue;
}
/* clear all_ports_up flag if any link down */
continue;
}
/* clear all_ports_up flag if any link down */
- if (link.link_status ==
0
) {
+ if (link.link_status ==
ETH_LINK_DOWN
) {
all_ports_up = 0;
break;
}
all_ports_up = 0;
break;
}
@@
-860,7
+857,7
@@
setup_port_tbl(struct lcore_queue_conf *qconf, uint32_t lcore, int socket,
n = RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST);
sz = sizeof (*mtb) + sizeof (mtb->m_table[0]) * n;
n = RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST);
sz = sizeof (*mtb) + sizeof (mtb->m_table[0]) * n;
- if ((mtb = rte_zmalloc_socket(__func__, sz, CACHE_LINE_SIZE,
+ if ((mtb = rte_zmalloc_socket(__func__, sz,
RTE_
CACHE_LINE_SIZE,
socket)) == NULL) {
RTE_LOG(ERR, IP_RSMBL, "%s() for lcore: %u, port: %u "
"failed to allocate %zu bytes\n",
socket)) == NULL) {
RTE_LOG(ERR, IP_RSMBL, "%s() for lcore: %u, port: %u "
"failed to allocate %zu bytes\n",
@@
-930,6
+927,7
@@
init_mem(void)
char buf[PATH_MAX];
struct rte_lpm *lpm;
struct rte_lpm6 *lpm6;
char buf[PATH_MAX];
struct rte_lpm *lpm;
struct rte_lpm6 *lpm6;
+ struct rte_lpm_config lpm_config;
int socket;
unsigned lcore_id;
int socket;
unsigned lcore_id;
@@
-949,7
+947,11
@@
init_mem(void)
RTE_LOG(INFO, IP_RSMBL, "Creating LPM table on socket %i\n", socket);
snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
RTE_LOG(INFO, IP_RSMBL, "Creating LPM table on socket %i\n", socket);
snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
- lpm = rte_lpm_create(buf, socket, LPM_MAX_RULES, 0);
+ lpm_config.max_rules = LPM_MAX_RULES;
+ lpm_config.number_tbl8s = 256;
+ lpm_config.flags = 0;
+
+ lpm = rte_lpm_create(buf, socket, &lpm_config);
if (lpm == NULL) {
RTE_LOG(ERR, IP_RSMBL, "Cannot create LPM table\n");
return -1;
if (lpm == NULL) {
RTE_LOG(ERR, IP_RSMBL, "Cannot create LPM table\n");
return -1;
@@
-1012,7
+1014,7
@@
signal_handler(int signum)
}
int
}
int
-
MAIN
(int argc, char **argv)
+
main
(int argc, char **argv)
{
struct lcore_queue_conf *qconf;
struct rte_eth_dev_info dev_info;
{
struct lcore_queue_conf *qconf;
struct rte_eth_dev_info dev_info;