patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH 17.11] net/cxgbe: fix missing checksum flags and packet type
@ 2019-08-02 10:52 Rahul Lakkireddy
  2019-08-02 21:36 ` Yongseok Koh
  0 siblings, 1 reply; 2+ messages in thread
From: Rahul Lakkireddy @ 2019-08-02 10:52 UTC (permalink / raw)
  To: stable; +Cc: vishal

From: Vishal Kulkarni <vishal@chelsio.com>

[ backported from upstream commit df68e75a79a4d0f86d0ebea2d43775759e066a2a ]

Checksum good offload flags are not being set and some of the
packet type flags are missing on received packets. So, rework
Rx path to set proper ol_flags and packet_type in mbufs.

Fixes: 78fc1a716ae8 ("cxgbe: improve Rx performance")

Signed-off-by: Vishal Kulkarni <vishal@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/sge.c | 77 +++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index 51800845b..babff0b9b 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -1432,6 +1432,52 @@ static inline void rspq_next(struct sge_rspq *q)
 	}
 }
 
+static inline void cxgbe_set_mbuf_info(struct rte_mbuf *pkt, uint32_t ptype,
+				       uint64_t ol_flags)
+{
+	pkt->packet_type |= ptype;
+	pkt->ol_flags |= ol_flags;
+}
+
+static inline void cxgbe_fill_mbuf_info(struct adapter *adap,
+					const struct cpl_rx_pkt *cpl,
+					struct rte_mbuf *pkt)
+{
+	bool csum_ok;
+	u16 err_vec;
+
+	if (adap->params.tp.rx_pkt_encap)
+		err_vec = G_T6_COMPR_RXERR_VEC(ntohs(cpl->err_vec));
+	else
+		err_vec = ntohs(cpl->err_vec);
+
+	csum_ok = cpl->csum_calc && !err_vec;
+
+	if (cpl->vlan_ex)
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER_VLAN,
+				    PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+	else
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER, 0);
+
+	if (cpl->l2info & htonl(F_RXF_IP))
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV4,
+				    csum_ok ? PKT_RX_IP_CKSUM_GOOD :
+					      PKT_RX_IP_CKSUM_BAD);
+	else if (cpl->l2info & htonl(F_RXF_IP6))
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV6,
+				    csum_ok ? PKT_RX_IP_CKSUM_GOOD :
+					      PKT_RX_IP_CKSUM_BAD);
+
+	if (cpl->l2info & htonl(F_RXF_TCP))
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_TCP,
+				    csum_ok ? PKT_RX_L4_CKSUM_GOOD :
+					      PKT_RX_L4_CKSUM_BAD);
+	else if (cpl->l2info & htonl(F_RXF_UDP))
+		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_UDP,
+				    csum_ok ? PKT_RX_L4_CKSUM_GOOD :
+					      PKT_RX_L4_CKSUM_BAD);
+}
+
 /**
  * process_responses - process responses from an SGE response queue
  * @q: the ingress queue to process
@@ -1482,8 +1528,6 @@ static int process_responses(struct sge_rspq *q, int budget,
 					(const void *)&q->cur_desc[1];
 				struct rte_mbuf *pkt, *npkt;
 				u32 len, bufsz;
-				bool csum_ok;
-				u16 err_vec;
 
 				rc = (const struct rsp_ctrl *)
 				     ((const char *)q->cur_desc +
@@ -1500,16 +1544,6 @@ static int process_responses(struct sge_rspq *q, int budget,
 				len = G_RSPD_LEN(len);
 				pkt->pkt_len = len;
 
-				/* Compressed error vector is enabled for
-				 * T6 only
-				 */
-				if (q->adapter->params.tp.rx_pkt_encap)
-					err_vec = G_T6_COMPR_RXERR_VEC(
-							ntohs(cpl->err_vec));
-				else
-					err_vec = ntohs(cpl->err_vec);
-				csum_ok = cpl->csum_calc && !err_vec;
-
 				/* Chain mbufs into len if necessary */
 				while (len) {
 					struct rte_mbuf *new_pkt = rsd->buf;
@@ -1527,20 +1561,7 @@ static int process_responses(struct sge_rspq *q, int budget,
 				npkt->next = NULL;
 				pkt->nb_segs--;
 
-				if (cpl->l2info & htonl(F_RXF_IP)) {
-					pkt->packet_type = RTE_PTYPE_L3_IPV4;
-					if (unlikely(!csum_ok))
-						pkt->ol_flags |=
-							PKT_RX_IP_CKSUM_BAD;
-
-					if ((cpl->l2info &
-					     htonl(F_RXF_UDP | F_RXF_TCP)) &&
-					    !csum_ok)
-						pkt->ol_flags |=
-							PKT_RX_L4_CKSUM_BAD;
-				} else if (cpl->l2info & htonl(F_RXF_IP6)) {
-					pkt->packet_type = RTE_PTYPE_L3_IPV6;
-				}
+				cxgbe_fill_mbuf_info(q->adapter, cpl, pkt);
 
 				if (!rss_hdr->filter_tid &&
 				    rss_hdr->hash_type) {
@@ -1549,10 +1570,8 @@ static int process_responses(struct sge_rspq *q, int budget,
 						ntohl(rss_hdr->hash_val);
 				}
 
-				if (cpl->vlan_ex) {
-					pkt->ol_flags |= PKT_RX_VLAN;
+				if (cpl->vlan_ex)
 					pkt->vlan_tci = ntohs(cpl->vlan);
-				}
 
 				rxq->stats.pkts++;
 				rxq->stats.rx_bytes += pkt->pkt_len;
-- 
2.18.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH 17.11] net/cxgbe: fix missing checksum flags and packet type
  2019-08-02 10:52 [dpdk-stable] [PATCH 17.11] net/cxgbe: fix missing checksum flags and packet type Rahul Lakkireddy
@ 2019-08-02 21:36 ` Yongseok Koh
  0 siblings, 0 replies; 2+ messages in thread
From: Yongseok Koh @ 2019-08-02 21:36 UTC (permalink / raw)
  To: Rahul Lakkireddy; +Cc: dpdk stable, vishal


> On Aug 2, 2019, at 3:52 AM, Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> wrote:
> 
> From: Vishal Kulkarni <vishal@chelsio.com>
> 
> [ backported from upstream commit df68e75a79a4d0f86d0ebea2d43775759e066a2a ]
> 
> Checksum good offload flags are not being set and some of the
> packet type flags are missing on received packets. So, rework
> Rx path to set proper ol_flags and packet_type in mbufs.
> 
> Fixes: 78fc1a716ae8 ("cxgbe: improve Rx performance")
> 
> Signed-off-by: Vishal Kulkarni <vishal@chelsio.com>
> Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> ---

applied to stable/17.11

thanks,

> drivers/net/cxgbe/sge.c | 77 +++++++++++++++++++++++++----------------
> 1 file changed, 48 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
> index 51800845b..babff0b9b 100644
> --- a/drivers/net/cxgbe/sge.c
> +++ b/drivers/net/cxgbe/sge.c
> @@ -1432,6 +1432,52 @@ static inline void rspq_next(struct sge_rspq *q)
> 	}
> }
> 
> +static inline void cxgbe_set_mbuf_info(struct rte_mbuf *pkt, uint32_t ptype,
> +				       uint64_t ol_flags)
> +{
> +	pkt->packet_type |= ptype;
> +	pkt->ol_flags |= ol_flags;
> +}
> +
> +static inline void cxgbe_fill_mbuf_info(struct adapter *adap,
> +					const struct cpl_rx_pkt *cpl,
> +					struct rte_mbuf *pkt)
> +{
> +	bool csum_ok;
> +	u16 err_vec;
> +
> +	if (adap->params.tp.rx_pkt_encap)
> +		err_vec = G_T6_COMPR_RXERR_VEC(ntohs(cpl->err_vec));
> +	else
> +		err_vec = ntohs(cpl->err_vec);
> +
> +	csum_ok = cpl->csum_calc && !err_vec;
> +
> +	if (cpl->vlan_ex)
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER_VLAN,
> +				    PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
> +	else
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER, 0);
> +
> +	if (cpl->l2info & htonl(F_RXF_IP))
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV4,
> +				    csum_ok ? PKT_RX_IP_CKSUM_GOOD :
> +					      PKT_RX_IP_CKSUM_BAD);
> +	else if (cpl->l2info & htonl(F_RXF_IP6))
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV6,
> +				    csum_ok ? PKT_RX_IP_CKSUM_GOOD :
> +					      PKT_RX_IP_CKSUM_BAD);
> +
> +	if (cpl->l2info & htonl(F_RXF_TCP))
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_TCP,
> +				    csum_ok ? PKT_RX_L4_CKSUM_GOOD :
> +					      PKT_RX_L4_CKSUM_BAD);
> +	else if (cpl->l2info & htonl(F_RXF_UDP))
> +		cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_UDP,
> +				    csum_ok ? PKT_RX_L4_CKSUM_GOOD :
> +					      PKT_RX_L4_CKSUM_BAD);
> +}
> +
> /**
>  * process_responses - process responses from an SGE response queue
>  * @q: the ingress queue to process
> @@ -1482,8 +1528,6 @@ static int process_responses(struct sge_rspq *q, int budget,
> 					(const void *)&q->cur_desc[1];
> 				struct rte_mbuf *pkt, *npkt;
> 				u32 len, bufsz;
> -				bool csum_ok;
> -				u16 err_vec;
> 
> 				rc = (const struct rsp_ctrl *)
> 				     ((const char *)q->cur_desc +
> @@ -1500,16 +1544,6 @@ static int process_responses(struct sge_rspq *q, int budget,
> 				len = G_RSPD_LEN(len);
> 				pkt->pkt_len = len;
> 
> -				/* Compressed error vector is enabled for
> -				 * T6 only
> -				 */
> -				if (q->adapter->params.tp.rx_pkt_encap)
> -					err_vec = G_T6_COMPR_RXERR_VEC(
> -							ntohs(cpl->err_vec));
> -				else
> -					err_vec = ntohs(cpl->err_vec);
> -				csum_ok = cpl->csum_calc && !err_vec;
> -
> 				/* Chain mbufs into len if necessary */
> 				while (len) {
> 					struct rte_mbuf *new_pkt = rsd->buf;
> @@ -1527,20 +1561,7 @@ static int process_responses(struct sge_rspq *q, int budget,
> 				npkt->next = NULL;
> 				pkt->nb_segs--;
> 
> -				if (cpl->l2info & htonl(F_RXF_IP)) {
> -					pkt->packet_type = RTE_PTYPE_L3_IPV4;
> -					if (unlikely(!csum_ok))
> -						pkt->ol_flags |=
> -							PKT_RX_IP_CKSUM_BAD;
> -
> -					if ((cpl->l2info &
> -					     htonl(F_RXF_UDP | F_RXF_TCP)) &&
> -					    !csum_ok)
> -						pkt->ol_flags |=
> -							PKT_RX_L4_CKSUM_BAD;
> -				} else if (cpl->l2info & htonl(F_RXF_IP6)) {
> -					pkt->packet_type = RTE_PTYPE_L3_IPV6;
> -				}
> +				cxgbe_fill_mbuf_info(q->adapter, cpl, pkt);
> 
> 				if (!rss_hdr->filter_tid &&
> 				    rss_hdr->hash_type) {
> @@ -1549,10 +1570,8 @@ static int process_responses(struct sge_rspq *q, int budget,
> 						ntohl(rss_hdr->hash_val);
> 				}
> 
> -				if (cpl->vlan_ex) {
> -					pkt->ol_flags |= PKT_RX_VLAN;
> +				if (cpl->vlan_ex)
> 					pkt->vlan_tci = ntohs(cpl->vlan);
> -				}
> 
> 				rxq->stats.pkts++;
> 				rxq->stats.rx_bytes += pkt->pkt_len;
> -- 
> 2.18.0
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-02 10:52 [dpdk-stable] [PATCH 17.11] net/cxgbe: fix missing checksum flags and packet type Rahul Lakkireddy
2019-08-02 21:36 ` Yongseok Koh

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox