diff mbox

[dpdk-dev,1/3] net/mlx5: separate filling Rx flags

Message ID	20180502232054.7852-2-yskoh@mellanox.com (mailing list archive)
State	Superseded, archived
Delegated to:	Shahaf Shuler
Headers	From: Yongseok Koh <yskoh@mellanox.com> To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh <yskoh@mellanox.com> Date: Wed, 2 May 2018 16:20:52 -0700 Message-Id: <20180502232054.7852-2-yskoh@mellanox.com> In-Reply-To: <20180502232054.7852-1-yskoh@mellanox.com> References: <20180502232054.7852-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2040; 7:VodhQZOS06VzPs7XQcTvszfm5hwImHgcQL33AtzeaudCUVOoywhPcRXGrwY0LafhXKZjbg+lYWG4/sRtWzdBp2CtaSiThZ1N7OXy0BrsyQtJIP4qzTOBSSusDlIyeKMaTdpBdCe/6qQnoy53iA7sgo4NOQlUbO3dWKo8xs2AuIuKb8KnEeES+djuLPdc2ey+2efLMGrn3rNVK16TMcD8KtTVg4Kk60LhV/7pYWrgSafg9MVNV1m060wOJ8LmKBx7 X-MS-Office365-Filtering-Correlation-Id: 56655f81-f000-48ec-1252-08d5b083640e Subject: [dpdk-dev] [PATCH 1/3] net/mlx5: separate filling Rx flags Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	fail	apply issues

Commit Message

Yongseok Koh May 2, 2018, 11:20 p.m. UTC

  Filling in fields of mbuf becomes a separate inline function so that this
can be reused.

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 84 +++++++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 33 deletions(-)

Comments

Shahaf Shuler May 7, 2018, 5:41 a.m. UTC | #1

Thursday, May 3, 2018 2:21 AM, Yongseok Koh:
> Subject: [dpdk-dev] [PATCH 1/3] net/mlx5: separate filling Rx flags
> 
> Filling in fields of mbuf becomes a separate inline function so that this can be
> reused.
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>

Acked-by: Shahaf Shuler <shahafs@mellanox.com>

> ---
>  drivers/net/mlx5/mlx5_rxtx.c | 84 +++++++++++++++++++++++++++--------
> ---------
>  1 file changed, 51 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
> index 8a863c157..299408b31 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.c
> +++ b/drivers/net/mlx5/mlx5_rxtx.c
> @@ -43,6 +43,10 @@ mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile
> struct mlx5_cqe *cqe,  static __rte_always_inline uint32_t
> rxq_cq_to_ol_flags(volatile struct mlx5_cqe *cqe);
> 
> +static __rte_always_inline void
> +rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,
> +	       volatile struct mlx5_cqe *cqe, uint32_t rss_hash_res);
> +
>  uint32_t mlx5_ptype_table[] __rte_cache_aligned = {
>  	[0xff] = RTE_PTYPE_ALL_MASK, /* Last entry for errored packet. */
> }; @@ -1841,6 +1845,52 @@ rxq_cq_to_ol_flags(volatile struct mlx5_cqe
> *cqe)  }
> 
>  /**
> + * Fill in mbuf fields from RX completion flags.
> + * Note that pkt->ol_flags should be initialized outside of this function.
> + *
> + * @param rxq
> + *   Pointer to RX queue.
> + * @param pkt
> + *   mbuf to fill.
> + * @param cqe
> + *   CQE to process.
> + * @param rss_hash_res
> + *   Packet RSS Hash result.
> + */
> +static inline void
> +rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,
> +	       volatile struct mlx5_cqe *cqe, uint32_t rss_hash_res) {
> +	/* Update packet information. */
> +	pkt->packet_type = rxq_cq_to_pkt_type(rxq, cqe);
> +	if (rss_hash_res && rxq->rss_hash) {
> +		pkt->hash.rss = rss_hash_res;
> +		pkt->ol_flags |= PKT_RX_RSS_HASH;
> +	}
> +	if (rxq->mark && MLX5_FLOW_MARK_IS_VALID(cqe-
> >sop_drop_qpn)) {
> +		pkt->ol_flags |= PKT_RX_FDIR;
> +		if (cqe->sop_drop_qpn !=
> +		    rte_cpu_to_be_32(MLX5_FLOW_MARK_DEFAULT)) {
> +			uint32_t mark = cqe->sop_drop_qpn;
> +
> +			pkt->ol_flags |= PKT_RX_FDIR_ID;
> +			pkt->hash.fdir.hi = mlx5_flow_mark_get(mark);
> +		}
> +	}
> +	if (rxq->csum)
> +		pkt->ol_flags |= rxq_cq_to_ol_flags(cqe);
> +	if (rxq->vlan_strip &&
> +	    (cqe->hdr_type_etc &
> rte_cpu_to_be_16(MLX5_CQE_VLAN_STRIPPED))) {
> +		pkt->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
> +		pkt->vlan_tci = rte_be_to_cpu_16(cqe->vlan_info);
> +	}
> +	if (rxq->hw_timestamp) {
> +		pkt->timestamp = rte_be_to_cpu_64(cqe->timestamp);
> +		pkt->ol_flags |= PKT_RX_TIMESTAMP;
> +	}
> +}
> +
> +/**
>   * DPDK callback for RX.
>   *
>   * @param dpdk_rxq
> @@ -1916,40 +1966,8 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf
> **pkts, uint16_t pkts_n)
>  			}
>  			pkt = seg;
>  			assert(len >= (rxq->crc_present << 2));
> -			/* Update packet information. */
> -			pkt->packet_type = rxq_cq_to_pkt_type(rxq, cqe);
>  			pkt->ol_flags = 0;
> -			if (rss_hash_res && rxq->rss_hash) {
> -				pkt->hash.rss = rss_hash_res;
> -				pkt->ol_flags = PKT_RX_RSS_HASH;
> -			}
> -			if (rxq->mark &&
> -			    MLX5_FLOW_MARK_IS_VALID(cqe-
> >sop_drop_qpn)) {
> -				pkt->ol_flags |= PKT_RX_FDIR;
> -				if (cqe->sop_drop_qpn !=
> -
> rte_cpu_to_be_32(MLX5_FLOW_MARK_DEFAULT)) {
> -					uint32_t mark = cqe->sop_drop_qpn;
> -
> -					pkt->ol_flags |= PKT_RX_FDIR_ID;
> -					pkt->hash.fdir.hi =
> -						mlx5_flow_mark_get(mark);
> -				}
> -			}
> -			if (rxq->csum)
> -				pkt->ol_flags |= rxq_cq_to_ol_flags(cqe);
> -			if (rxq->vlan_strip &&
> -			    (cqe->hdr_type_etc &
> -			     rte_cpu_to_be_16(MLX5_CQE_VLAN_STRIPPED)))
> {
> -				pkt->ol_flags |= PKT_RX_VLAN |
> -					PKT_RX_VLAN_STRIPPED;
> -				pkt->vlan_tci =
> -					rte_be_to_cpu_16(cqe->vlan_info);
> -			}
> -			if (rxq->hw_timestamp) {
> -				pkt->timestamp =
> -					rte_be_to_cpu_64(cqe->timestamp);
> -				pkt->ol_flags |= PKT_RX_TIMESTAMP;
> -			}
> +			rxq_cq_to_mbuf(rxq, pkt, cqe, rss_hash_res);
>  			if (rxq->crc_present)
>  				len -= ETHER_CRC_LEN;
>  			PKT_LEN(pkt) = len;
> --
> 2.11.0

diff mbox

Patch

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 8a863c157..299408b31 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -43,6 +43,10 @@  mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,
 static __rte_always_inline uint32_t
 rxq_cq_to_ol_flags(volatile struct mlx5_cqe *cqe);
 
+static __rte_always_inline void
+rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,
+	       volatile struct mlx5_cqe *cqe, uint32_t rss_hash_res);
+
 uint32_t mlx5_ptype_table[] __rte_cache_aligned = {
 	[0xff] = RTE_PTYPE_ALL_MASK, /* Last entry for errored packet. */
 };
@@ -1841,6 +1845,52 @@  rxq_cq_to_ol_flags(volatile struct mlx5_cqe *cqe)
 }
 
 /**
+ * Fill in mbuf fields from RX completion flags.
+ * Note that pkt->ol_flags should be initialized outside of this function.
+ *
+ * @param rxq
+ *   Pointer to RX queue.
+ * @param pkt
+ *   mbuf to fill.
+ * @param cqe
+ *   CQE to process.
+ * @param rss_hash_res
+ *   Packet RSS Hash result.
+ */
+static inline void
+rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,
+	       volatile struct mlx5_cqe *cqe, uint32_t rss_hash_res)
+{
+	/* Update packet information. */
+	pkt->packet_type = rxq_cq_to_pkt_type(rxq, cqe);
+	if (rss_hash_res && rxq->rss_hash) {
+		pkt->hash.rss = rss_hash_res;
+		pkt->ol_flags |= PKT_RX_RSS_HASH;
+	}
+	if (rxq->mark && MLX5_FLOW_MARK_IS_VALID(cqe->sop_drop_qpn)) {
+		pkt->ol_flags |= PKT_RX_FDIR;
+		if (cqe->sop_drop_qpn !=
+		    rte_cpu_to_be_32(MLX5_FLOW_MARK_DEFAULT)) {
+			uint32_t mark = cqe->sop_drop_qpn;
+
+			pkt->ol_flags |= PKT_RX_FDIR_ID;
+			pkt->hash.fdir.hi = mlx5_flow_mark_get(mark);
+		}
+	}
+	if (rxq->csum)
+		pkt->ol_flags |= rxq_cq_to_ol_flags(cqe);
+	if (rxq->vlan_strip &&
+	    (cqe->hdr_type_etc & rte_cpu_to_be_16(MLX5_CQE_VLAN_STRIPPED))) {
+		pkt->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+		pkt->vlan_tci = rte_be_to_cpu_16(cqe->vlan_info);
+	}
+	if (rxq->hw_timestamp) {
+		pkt->timestamp = rte_be_to_cpu_64(cqe->timestamp);
+		pkt->ol_flags |= PKT_RX_TIMESTAMP;
+	}
+}
+
+/**
  * DPDK callback for RX.
  *
  * @param dpdk_rxq
@@ -1916,40 +1966,8 @@  mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
 			}
 			pkt = seg;
 			assert(len >= (rxq->crc_present << 2));
-			/* Update packet information. */
-			pkt->packet_type = rxq_cq_to_pkt_type(rxq, cqe);
 			pkt->ol_flags = 0;
-			if (rss_hash_res && rxq->rss_hash) {
-				pkt->hash.rss = rss_hash_res;
-				pkt->ol_flags = PKT_RX_RSS_HASH;
-			}
-			if (rxq->mark &&
-			    MLX5_FLOW_MARK_IS_VALID(cqe->sop_drop_qpn)) {
-				pkt->ol_flags |= PKT_RX_FDIR;
-				if (cqe->sop_drop_qpn !=
-				    rte_cpu_to_be_32(MLX5_FLOW_MARK_DEFAULT)) {
-					uint32_t mark = cqe->sop_drop_qpn;
-
-					pkt->ol_flags |= PKT_RX_FDIR_ID;
-					pkt->hash.fdir.hi =
-						mlx5_flow_mark_get(mark);
-				}
-			}
-			if (rxq->csum)
-				pkt->ol_flags |= rxq_cq_to_ol_flags(cqe);
-			if (rxq->vlan_strip &&
-			    (cqe->hdr_type_etc &
-			     rte_cpu_to_be_16(MLX5_CQE_VLAN_STRIPPED))) {
-				pkt->ol_flags |= PKT_RX_VLAN |
-					PKT_RX_VLAN_STRIPPED;
-				pkt->vlan_tci =
-					rte_be_to_cpu_16(cqe->vlan_info);
-			}
-			if (rxq->hw_timestamp) {
-				pkt->timestamp =
-					rte_be_to_cpu_64(cqe->timestamp);
-				pkt->ol_flags |= PKT_RX_TIMESTAMP;
-			}
+			rxq_cq_to_mbuf(rxq, pkt, cqe, rss_hash_res);
 			if (rxq->crc_present)
 				len -= ETHER_CRC_LEN;
 			PKT_LEN(pkt) = len;