From: John Daley <johndale@cisco.com>
To: dev@dpdk.org
Cc: John Daley <johndale@cisco.com>, Olivier Matz <olivier.matz@6wind.com>
Subject: [dpdk-dev] [PATCH v2 02/11] enic: drop bad packets and remove unused Rx error flag
Date: Mon, 23 May 2016 23:32:50 -0700 [thread overview]
Message-ID: <1464071579-30072-3-git-send-email-johndale@cisco.com> (raw)
In-Reply-To: <1464071579-30072-1-git-send-email-johndale@cisco.com>
Following the discussions from:
http://dpdk.org/ml/archives/dev/2015-July/021721.html
http://dpdk.org/ml/archives/dev/2016-April/038143.html
Remove the unused flag from enic driver. Also, the enic driver is
modified to drop bad packets.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Signed-off-by: John Daley <johndale@cisco.com>
---
drivers/net/enic/enic_rx.c | 39 +++++++++++++++++----------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/drivers/net/enic/enic_rx.c b/drivers/net/enic/enic_rx.c
index 89c62ce..c72a80a 100644
--- a/drivers/net/enic/enic_rx.c
+++ b/drivers/net/enic/enic_rx.c
@@ -134,20 +134,15 @@ enic_cq_rx_desc_n_bytes(struct cq_desc *cqd)
}
static inline uint8_t
-enic_cq_rx_to_pkt_err_flags(struct cq_desc *cqd, uint64_t *pkt_err_flags_out)
+enic_cq_rx_check_err(struct cq_desc *cqd)
{
struct cq_enet_rq_desc *cqrd = (struct cq_enet_rq_desc *)cqd;
uint16_t bwflags;
- int ret = 0;
- uint64_t pkt_err_flags = 0;
bwflags = enic_cq_rx_desc_bwflags(cqrd);
- if (unlikely(enic_cq_rx_desc_packet_error(bwflags))) {
- pkt_err_flags = PKT_RX_MAC_ERR;
- ret = 1;
- }
- *pkt_err_flags_out = pkt_err_flags;
- return ret;
+ if (unlikely(enic_cq_rx_desc_packet_error(bwflags)))
+ return 1;
+ return 0;
}
/*
@@ -243,7 +238,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
struct enic *enic = vnic_dev_priv(rq->vdev);
unsigned int rx_id;
struct rte_mbuf *nmb, *rxmb;
- uint16_t nb_rx = 0;
+ uint16_t nb_rx = 0, nb_err = 0;
uint16_t nb_hold;
struct vnic_cq *cq;
volatile struct cq_desc *cqd_ptr;
@@ -259,7 +254,6 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
volatile struct rq_enet_desc *rqd_ptr;
dma_addr_t dma_addr;
struct cq_desc cqd;
- uint64_t ol_err_flags;
uint8_t packet_error;
/* Check for pkts available */
@@ -280,7 +274,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
}
/* A packet error means descriptor and data are untrusted */
- packet_error = enic_cq_rx_to_pkt_err_flags(&cqd, &ol_err_flags);
+ packet_error = enic_cq_rx_check_err(&cqd);
/* Get the mbuf to return and replace with one just allocated */
rxmb = rq->mbuf_ring[rx_id];
@@ -307,20 +301,21 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rqd_ptr->length_type = cpu_to_le16(nmb->buf_len
- RTE_PKTMBUF_HEADROOM);
+ /* Drop incoming bad packet */
+ if (unlikely(packet_error)) {
+ rte_pktmbuf_free(rxmb);
+ nb_err++;
+ continue;
+ }
+
/* Fill in the rest of the mbuf */
rxmb->data_off = RTE_PKTMBUF_HEADROOM;
rxmb->nb_segs = 1;
rxmb->next = NULL;
rxmb->port = enic->port_id;
- if (!packet_error) {
- rxmb->pkt_len = enic_cq_rx_desc_n_bytes(&cqd);
- rxmb->packet_type = enic_cq_rx_flags_to_pkt_type(&cqd);
- enic_cq_rx_to_pkt_flags(&cqd, rxmb);
- } else {
- rxmb->pkt_len = 0;
- rxmb->packet_type = 0;
- rxmb->ol_flags = 0;
- }
+ rxmb->pkt_len = enic_cq_rx_desc_n_bytes(&cqd);
+ rxmb->packet_type = enic_cq_rx_flags_to_pkt_type(&cqd);
+ enic_cq_rx_to_pkt_flags(&cqd, rxmb);
rxmb->data_len = rxmb->pkt_len;
/* prefetch mbuf data for caller */
@@ -331,7 +326,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rx_pkts[nb_rx++] = rxmb;
}
- nb_hold += nb_rx;
+ nb_hold += nb_rx + nb_err;
cq->to_clean = rx_id;
if (nb_hold > rq->rx_free_thresh) {
--
2.7.0
next prev parent reply other threads:[~2016-05-24 6:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 6:32 [dpdk-dev] [PATCH v2 00/11] enic counter fixes and Tx optimization John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 01/11] enic: fix Rx drop counters John Daley
2016-05-24 6:32 ` John Daley [this message]
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 03/11] enic: count truncated packets John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 04/11] enic: put Tx and Rx functions into same file John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 05/11] enic: remove some unused functions in Tx path John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 06/11] enic: streamline mbuf handling " John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 07/11] enic: use Tx completion messages instead of descriptors John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 08/11] enic: refactor Tx mbuf recycling John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 09/11] enic: optimize the Tx function John Daley
2016-05-30 10:05 ` Azarewicz, PiotrX T
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 10/11] enic: remove unused files and functions and variables John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 11/11] enic: add an enic assert macro John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 01/13] enic: fix Rx drop counters John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 02/13] enic: drop bad packets and remove unused Rx error flag John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 03/13] enic: count truncated packets John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 04/13] enic: put Tx and Rx functions into same file John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 05/13] enic: remove some unused functions in Tx path John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 06/13] enic: streamline mbuf handling " John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 07/13] enic: use Tx completion messages instead of descriptors John Daley
2016-06-10 21:18 ` Bruce Richardson
2016-06-10 22:28 ` John Daley (johndale)
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 08/13] enic: refactor Tx mbuf recycling John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 09/13] enic: optimize the Tx function John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 10/13] enic: remove unused files and functions and variables John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 11/13] enic: add an enic assert macro John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 12/13] enic: expand local Tx mbuf flags variable to 64-bits John Daley
2016-06-03 8:05 ` Azarewicz, PiotrX T
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 13/13] enic: fix Tx IP and UDP/TCP checksum offload John Daley
2016-06-10 22:38 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464071579-30072-3-git-send-email-johndale@cisco.com \
--to=johndale@cisco.com \
--cc=dev@dpdk.org \
--cc=olivier.matz@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).