patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v3 02/14] net/mlx5: fix field reference for PPC
       [not found] ` <20211103075838.1486056-1-xuemingl@nvidia.com>
@ 2021-11-03  7:58   ` Xueming Li
  2021-11-03  7:58   ` [dpdk-stable] [PATCH v3 05/14] net/mlx5: fix Rx queue memory allocation return value Xueming Li
  1 sibling, 0 replies; 6+ messages in thread
From: Xueming Li @ 2021-11-03  7:58 UTC (permalink / raw)
  To: dev
  Cc: xuemingl, Lior Margalit, viacheslavo, stable, David Christensen,
	Matan Azrad, Yongseok Koh

This patch fixes stale field reference.

Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath")
Cc: viacheslavo@nvidia.com
Cc: stable@dpdk.org

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
index bcf487c34e9..1d00c1c43d1 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
@@ -974,10 +974,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
 			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
 		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p3].rsvd3[9], 0LL};
+			&cq[pos + p3].rsvd4[2], 0LL};
 		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p2].rsvd3[9], 0LL};
+			&cq[pos + p2].rsvd4[2], 0LL};
 		cqes[3] = (vector unsigned char)
 			vec_sel((vector unsigned short)cqes[3],
 			(vector unsigned short)cqe_tmp2,
@@ -1037,10 +1037,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
 			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
 		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p1].rsvd3[9], 0LL};
+			&cq[pos + p1].rsvd4[2], 0LL};
 		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos].rsvd3[9], 0LL};
+			&cq[pos].rsvd4[2], 0LL};
 		cqes[1] = (vector unsigned char)
 			vec_sel((vector unsigned short)cqes[1],
 			(vector unsigned short)cqe_tmp2, cqe_sel_mask2);
-- 
2.33.0


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

* [dpdk-stable] [PATCH v3 05/14] net/mlx5: fix Rx queue memory allocation return value
       [not found] ` <20211103075838.1486056-1-xuemingl@nvidia.com>
  2021-11-03  7:58   ` [dpdk-stable] [PATCH v3 02/14] net/mlx5: fix field reference for PPC Xueming Li
@ 2021-11-03  7:58   ` Xueming Li
  1 sibling, 0 replies; 6+ messages in thread
From: Xueming Li @ 2021-11-03  7:58 UTC (permalink / raw)
  To: dev
  Cc: xuemingl, Lior Margalit, akozyrev, stable, Matan Azrad,
	Viacheslav Ovsiienko

If error happened during Rx queue mbuf allocation, boolean value
returned. From description, return value should be error number.

This patch returns negative error number.

Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst")
Cc: akozyrev@nvidia.com
Cc: stable@dpdk.org

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 9220bb2c15c..4567b43c1b6 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -129,7 +129,7 @@ rxq_alloc_elts_mprq(struct mlx5_rxq_ctrl *rxq_ctrl)
  *   Pointer to RX queue structure.
  *
  * @return
- *   0 on success, errno value on failure.
+ *   0 on success, negative errno value on failure.
  */
 static int
 rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
@@ -220,7 +220,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
  *   Pointer to RX queue structure.
  *
  * @return
- *   0 on success, errno value on failure.
+ *   0 on success, negative errno value on failure.
  */
 int
 rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl)
@@ -233,7 +233,9 @@ rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl)
 	 */
 	if (mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq))
 		ret = rxq_alloc_elts_mprq(rxq_ctrl);
-	return (ret || rxq_alloc_elts_sprq(rxq_ctrl));
+	if (ret == 0)
+		ret = rxq_alloc_elts_sprq(rxq_ctrl);
+	return ret;
 }
 
 /**
-- 
2.33.0


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

* [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC
       [not found] ` <20211104123320.1638915-1-xuemingl@nvidia.com>
@ 2021-11-04 12:33   ` Xueming Li
  2021-11-04 17:07     ` [dpdk-stable] [dpdk-dev] " Raslan Darawsheh
  2021-11-04 17:49     ` [dpdk-stable] " David Christensen
  2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 05/14] net/mlx5: fix Rx queue memory allocation return value Xueming Li
  1 sibling, 2 replies; 6+ messages in thread
From: Xueming Li @ 2021-11-04 12:33 UTC (permalink / raw)
  To: dev
  Cc: xuemingl, Lior Margalit, viacheslavo, stable, David Christensen,
	Matan Azrad, Yongseok Koh

This patch fixes stale field reference.

Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath")
Cc: viacheslavo@nvidia.com
Cc: stable@dpdk.org

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Slava Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
index bcf487c34e9..1d00c1c43d1 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
@@ -974,10 +974,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
 			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
 		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p3].rsvd3[9], 0LL};
+			&cq[pos + p3].rsvd4[2], 0LL};
 		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p2].rsvd3[9], 0LL};
+			&cq[pos + p2].rsvd4[2], 0LL};
 		cqes[3] = (vector unsigned char)
 			vec_sel((vector unsigned short)cqes[3],
 			(vector unsigned short)cqe_tmp2,
@@ -1037,10 +1037,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
 			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
 		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos + p1].rsvd3[9], 0LL};
+			&cq[pos + p1].rsvd4[2], 0LL};
 		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
 			*(__rte_aligned(8) unsigned long *)
-			&cq[pos].rsvd3[9], 0LL};
+			&cq[pos].rsvd4[2], 0LL};
 		cqes[1] = (vector unsigned char)
 			vec_sel((vector unsigned short)cqes[1],
 			(vector unsigned short)cqe_tmp2, cqe_sel_mask2);
-- 
2.33.0


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

* [dpdk-stable] [PATCH v4 05/14] net/mlx5: fix Rx queue memory allocation return value
       [not found] ` <20211104123320.1638915-1-xuemingl@nvidia.com>
  2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC Xueming Li
@ 2021-11-04 12:33   ` Xueming Li
  1 sibling, 0 replies; 6+ messages in thread
From: Xueming Li @ 2021-11-04 12:33 UTC (permalink / raw)
  To: dev
  Cc: xuemingl, Lior Margalit, akozyrev, stable, Slava Ovsiienko, Matan Azrad

If error happened during Rx queue mbuf allocation, boolean value
returned. From description, return value should be error number.

This patch returns negative error number.

Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst")
Cc: akozyrev@nvidia.com
Cc: stable@dpdk.org

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Slava Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 9220bb2c15c..4567b43c1b6 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -129,7 +129,7 @@ rxq_alloc_elts_mprq(struct mlx5_rxq_ctrl *rxq_ctrl)
  *   Pointer to RX queue structure.
  *
  * @return
- *   0 on success, errno value on failure.
+ *   0 on success, negative errno value on failure.
  */
 static int
 rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
@@ -220,7 +220,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
  *   Pointer to RX queue structure.
  *
  * @return
- *   0 on success, errno value on failure.
+ *   0 on success, negative errno value on failure.
  */
 int
 rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl)
@@ -233,7 +233,9 @@ rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl)
 	 */
 	if (mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq))
 		ret = rxq_alloc_elts_mprq(rxq_ctrl);
-	return (ret || rxq_alloc_elts_sprq(rxq_ctrl));
+	if (ret == 0)
+		ret = rxq_alloc_elts_sprq(rxq_ctrl);
+	return ret;
 }
 
 /**
-- 
2.33.0


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

* Re: [dpdk-stable] [dpdk-dev] [PATCH v4 02/14] net/mlx5: fix field reference for PPC
  2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC Xueming Li
@ 2021-11-04 17:07     ` Raslan Darawsheh
  2021-11-04 17:49     ` [dpdk-stable] " David Christensen
  1 sibling, 0 replies; 6+ messages in thread
From: Raslan Darawsheh @ 2021-11-04 17:07 UTC (permalink / raw)
  To: Xueming(Steven) Li, dev
  Cc: Xueming(Steven) Li, Lior Margalit, Slava Ovsiienko, stable,
	David Christensen, Matan Azrad, Yongseok Koh

Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Xueming Li
> Sent: Thursday, November 4, 2021 2:33 PM
> To: dev@dpdk.org
> Cc: Xueming(Steven) Li <xuemingl@nvidia.com>; Lior Margalit
> <lmargalit@nvidia.com>; Slava Ovsiienko <viacheslavo@nvidia.com>;
> stable@dpdk.org; David Christensen <drc@linux.vnet.ibm.com>; Matan
> Azrad <matan@nvidia.com>; Yongseok Koh <yskoh@mellanox.com>
> Subject: [dpdk-dev] [PATCH v4 02/14] net/mlx5: fix field reference for PPC
> 
> This patch fixes stale field reference.
> 
> Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath")
> Cc: viacheslavo@nvidia.com
> Cc: stable@dpdk.org
> 

This should be the first patch in the series since the first patch is removing the rsvd3 from the structure.
I'll change the order during integration,

Kindest regards,
Raslan Darawsheh

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

* Re: [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC
  2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC Xueming Li
  2021-11-04 17:07     ` [dpdk-stable] [dpdk-dev] " Raslan Darawsheh
@ 2021-11-04 17:49     ` David Christensen
  1 sibling, 0 replies; 6+ messages in thread
From: David Christensen @ 2021-11-04 17:49 UTC (permalink / raw)
  To: Xueming Li, dev
  Cc: Lior Margalit, viacheslavo, stable, Matan Azrad, Yongseok Koh



On 11/4/21 5:33 AM, Xueming Li wrote:
> This patch fixes stale field reference.
> 
> Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath")
> Cc: viacheslavo@nvidia.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
> Acked-by: Slava Ovsiienko <viacheslavo@nvidia.com>
> ---
>   drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
> index bcf487c34e9..1d00c1c43d1 100644
> --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
> +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
> @@ -974,10 +974,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
>   			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
>   		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
>   			*(__rte_aligned(8) unsigned long *)
> -			&cq[pos + p3].rsvd3[9], 0LL};
> +			&cq[pos + p3].rsvd4[2], 0LL};
>   		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
>   			*(__rte_aligned(8) unsigned long *)
> -			&cq[pos + p2].rsvd3[9], 0LL};
> +			&cq[pos + p2].rsvd4[2], 0LL};
>   		cqes[3] = (vector unsigned char)
>   			vec_sel((vector unsigned short)cqes[3],
>   			(vector unsigned short)cqe_tmp2,
> @@ -1037,10 +1037,10 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
>   			(vector unsigned short)cqe_tmp1, cqe_sel_mask1);
>   		cqe_tmp2 = (vector unsigned char)(vector unsigned long){
>   			*(__rte_aligned(8) unsigned long *)
> -			&cq[pos + p1].rsvd3[9], 0LL};
> +			&cq[pos + p1].rsvd4[2], 0LL};
>   		cqe_tmp1 = (vector unsigned char)(vector unsigned long){
>   			*(__rte_aligned(8) unsigned long *)
> -			&cq[pos].rsvd3[9], 0LL};
> +			&cq[pos].rsvd4[2], 0LL};
>   		cqes[1] = (vector unsigned char)
>   			vec_sel((vector unsigned short)cqes[1],
>   			(vector unsigned short)cqe_tmp2, cqe_sel_mask2);
> 

Reviewed-by: David Christensen <drc@linux.vnet.ibm.com>

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

end of thread, other threads:[~2021-11-04 17:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20210727034204.20649-1-xuemingl@nvidia.com>
     [not found] ` <20211103075838.1486056-1-xuemingl@nvidia.com>
2021-11-03  7:58   ` [dpdk-stable] [PATCH v3 02/14] net/mlx5: fix field reference for PPC Xueming Li
2021-11-03  7:58   ` [dpdk-stable] [PATCH v3 05/14] net/mlx5: fix Rx queue memory allocation return value Xueming Li
     [not found] ` <20211104123320.1638915-1-xuemingl@nvidia.com>
2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 02/14] net/mlx5: fix field reference for PPC Xueming Li
2021-11-04 17:07     ` [dpdk-stable] [dpdk-dev] " Raslan Darawsheh
2021-11-04 17:49     ` [dpdk-stable] " David Christensen
2021-11-04 12:33   ` [dpdk-stable] [PATCH v4 05/14] net/mlx5: fix Rx queue memory allocation return value Xueming Li

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).