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
cryptodev: replace enums with 1-byte variables
[dpdk.git]
/
lib
/
librte_port
/
rte_port_ras.c
diff --git
a/lib/librte_port/rte_port_ras.c
b/lib/librte_port/rte_port_ras.c
index
6bd0f8c
..
415fadd
100644
(file)
--- a/
lib/librte_port/rte_port_ras.c
+++ b/
lib/librte_port/rte_port_ras.c
@@
-93,7
+93,7
@@
static void *
rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
{
struct rte_port_ring_writer_ras_params *conf =
rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
{
struct rte_port_ring_writer_ras_params *conf =
-
(struct rte_port_ring_writer_ras_params *)
params;
+ params;
struct rte_port_ring_writer_ras *port;
uint64_t frag_cycles;
struct rte_port_ring_writer_ras *port;
uint64_t frag_cycles;
@@
-144,7
+144,7
@@
rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
port->tx_burst_sz = conf->tx_burst_sz;
port->tx_buf_count = 0;
port->tx_burst_sz = conf->tx_burst_sz;
port->tx_buf_count = 0;
- port->f_ras = (is_ipv4 ==
0
) ? process_ipv4 : process_ipv6;
+ port->f_ras = (is_ipv4 ==
1
) ? process_ipv4 : process_ipv6;
return port;
}
return port;
}
@@
-167,7
+167,7
@@
send_burst(struct rte_port_ring_writer_ras *p)
uint32_t nb_tx;
nb_tx = rte_ring_sp_enqueue_burst(p->ring, (void **)p->tx_buf,
uint32_t nb_tx;
nb_tx = rte_ring_sp_enqueue_burst(p->ring, (void **)p->tx_buf,
- p->tx_buf_count);
+ p->tx_buf_count
, NULL
);
RTE_PORT_RING_WRITER_RAS_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
for ( ; nb_tx < p->tx_buf_count; nb_tx++)
RTE_PORT_RING_WRITER_RAS_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
for ( ; nb_tx < p->tx_buf_count; nb_tx++)
@@
-182,7
+182,7
@@
process_ipv4(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)
/* Assume there is no ethernet header */
struct ipv4_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv4_hdr *);
/* Assume there is no ethernet header */
struct ipv4_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv4_hdr *);
- /* Get "
Do not fragment
" flag and fragment offset */
+ /* Get "
More fragments
" flag and fragment offset */
uint16_t frag_field = rte_be_to_cpu_16(pkt_hdr->fragment_offset);
uint16_t frag_offset = (uint16_t)(frag_field & IPV4_HDR_OFFSET_MASK);
uint16_t frag_flag = (uint16_t)(frag_field & IPV4_HDR_MF_FLAG);
uint16_t frag_field = rte_be_to_cpu_16(pkt_hdr->fragment_offset);
uint16_t frag_offset = (uint16_t)(frag_field & IPV4_HDR_OFFSET_MASK);
uint16_t frag_flag = (uint16_t)(frag_field & IPV4_HDR_MF_FLAG);
@@
-195,6
+195,8
@@
process_ipv4(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)
struct rte_ip_frag_tbl *tbl = p->frag_tbl;
struct rte_ip_frag_death_row *dr = &p->death_row;
struct rte_ip_frag_tbl *tbl = p->frag_tbl;
struct rte_ip_frag_death_row *dr = &p->death_row;
+ pkt->l3_len = sizeof(*pkt_hdr);
+
/* Process this fragment */
mo = rte_ipv4_frag_reassemble_packet(tbl, dr, pkt, rte_rdtsc(),
pkt_hdr);
/* Process this fragment */
mo = rte_ipv4_frag_reassemble_packet(tbl, dr, pkt, rte_rdtsc(),
pkt_hdr);
@@
-212,18
+214,21
@@
process_ipv6(struct rte_port_ring_writer_ras *p, struct rte_mbuf *pkt)
struct ipv6_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv6_hdr *);
struct ipv6_extension_fragment *frag_hdr;
struct ipv6_hdr *pkt_hdr = rte_pktmbuf_mtod(pkt, struct ipv6_hdr *);
struct ipv6_extension_fragment *frag_hdr;
+ uint16_t frag_data = 0;
frag_hdr = rte_ipv6_frag_get_ipv6_fragment_header(pkt_hdr);
frag_hdr = rte_ipv6_frag_get_ipv6_fragment_header(pkt_hdr);
- uint16_t frag_offset = frag_hdr->frag_offset;
-
uint16_t frag_flag = frag_hdr->more_frags
;
+ if (frag_hdr != NULL)
+
frag_data = rte_be_to_cpu_16(frag_hdr->frag_data)
;
/* If it is a fragmented packet, then try to reassemble */
/* If it is a fragmented packet, then try to reassemble */
- if ((frag_
flag == 0) && (frag_offset == 0)
)
+ if ((frag_
data & RTE_IPV6_FRAG_USED_MASK) == 0
)
p->tx_buf[p->tx_buf_count++] = pkt;
else {
struct rte_mbuf *mo;
struct rte_ip_frag_tbl *tbl = p->frag_tbl;
struct rte_ip_frag_death_row *dr = &p->death_row;
p->tx_buf[p->tx_buf_count++] = pkt;
else {
struct rte_mbuf *mo;
struct rte_ip_frag_tbl *tbl = p->frag_tbl;
struct rte_ip_frag_death_row *dr = &p->death_row;
+ pkt->l3_len = sizeof(*pkt_hdr) + sizeof(*frag_hdr);
+
/* Process this fragment */
mo = rte_ipv6_frag_reassemble_packet(tbl, dr, pkt, rte_rdtsc(), pkt_hdr,
frag_hdr);
/* Process this fragment */
mo = rte_ipv6_frag_reassemble_packet(tbl, dr, pkt, rte_rdtsc(), pkt_hdr,
frag_hdr);
@@
-238,7
+243,7
@@
static int
rte_port_ring_writer_ras_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_ras *p =
rte_port_ring_writer_ras_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_ras *p =
-
(struct rte_port_ring_writer_ras *)
port;
+ port;
RTE_PORT_RING_WRITER_RAS_STATS_PKTS_IN_ADD(p, 1);
p->f_ras(p, pkt);
RTE_PORT_RING_WRITER_RAS_STATS_PKTS_IN_ADD(p, 1);
p->f_ras(p, pkt);
@@
-254,7
+259,7
@@
rte_port_ring_writer_ras_tx_bulk(void *port,
uint64_t pkts_mask)
{
struct rte_port_ring_writer_ras *p =
uint64_t pkts_mask)
{
struct rte_port_ring_writer_ras *p =
-
(struct rte_port_ring_writer_ras *)
port;
+ port;
if ((pkts_mask & (pkts_mask + 1)) == 0) {
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
if ((pkts_mask & (pkts_mask + 1)) == 0) {
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
@@
-290,7
+295,7
@@
static int
rte_port_ring_writer_ras_flush(void *port)
{
struct rte_port_ring_writer_ras *p =
rte_port_ring_writer_ras_flush(void *port)
{
struct rte_port_ring_writer_ras *p =
-
(struct rte_port_ring_writer_ras *)
port;
+ port;
if (p->tx_buf_count > 0)
send_burst(p);
if (p->tx_buf_count > 0)
send_burst(p);
@@
-302,7
+307,7
@@
static int
rte_port_ring_writer_ras_free(void *port)
{
struct rte_port_ring_writer_ras *p =
rte_port_ring_writer_ras_free(void *port)
{
struct rte_port_ring_writer_ras *p =
-
(struct rte_port_ring_writer_ras *)
port;
+ port;
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Parameter port is NULL\n", __func__);
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Parameter port is NULL\n", __func__);
@@
-321,7
+326,7
@@
rte_port_ras_writer_stats_read(void *port,
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer_ras *p =
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer_ras *p =
-
(struct rte_port_ring_writer_ras *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));