[dpdk-stable] patch 'pipeline: fix build with ASan' has been queued to stable release 20.11.4

[Xueming(Steven) Li]

Thanks, removed from list.


On Wed, 2021-11-10 at 07:27 +0000, Peng, ZhihongX wrote:
> Hi , Xueming
> 
> This patch is not backward compatible. 
> 
> Regards,
> Peng,Zhihong
> 
> > -----Original Message-----
> > From: Xueming Li <xuemingl at nvidia.com>
> > Sent: Wednesday, November 10, 2021 2:31 PM
> > To: Peng, ZhihongX <zhihongx.peng at intel.com>
> > Cc: Luca Boccassi <bluca at debian.org>; Lin, Xueqin <xueqin.lin at intel.com>;
> > Dumitrescu, Cristian <cristian.dumitrescu at intel.com>; dpdk stable
> > <stable at dpdk.org>
> > Subject: patch 'pipeline: fix build with ASan' has been queued to stable
> > release 20.11.4
> > 
> > Hi,
> > 
> > FYI, your patch has been queued to stable release 20.11.4
> > 
> > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> > It will be pushed if I get no objections before 11/12/21. So please shout if
> > anyone has objections.
> > 
> > Also note that after the patch there's a diff of the upstream commit vs the
> > patch applied to the branch. This will indicate if there was any rebasing
> > needed to apply to the stable branch. If there were code changes for
> > rebasing
> > (ie: not only metadata diffs), please double check that the rebase was
> > correctly done.
> > 
> > Queued patches are on a temporary branch at:
> > https://github.com/steevenlee/dpdk
> > 
> > This queued commit can be viewed at:
> > https://github.com/steevenlee/dpdk/commit/e7dd7a6c07e28be8f4319a6b3
> > 623d9810e4c4ced
> > 
> > Thanks.
> > 
> > Xueming Li <xuemingl at nvidia.com>
> > 
> > ---
> > From e7dd7a6c07e28be8f4319a6b3623d9810e4c4ced Mon Sep 17 00:00:00
> > 2001
> > From: Zhihong Peng <zhihongx.peng at intel.com>
> > Date: Wed, 20 Oct 2021 15:46:42 +0800
> > Subject: [PATCH] pipeline: fix build with ASan
> > Cc: Xueming Li <xuemingl at nvidia.com>
> > 
> > [ upstream commit 84f5ac9418ea9995975b30fa4ea57018f9618fc1 ]
> > 
> > Code changes to avoid the following build error:
> > "Control reaches end of non-void function".
> > 
> > Signed-off-by: Xueqin Lin <xueqin.lin at intel.com>
> > Signed-off-by: Zhihong Peng <zhihongx.peng at intel.com>
> > Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
> > ---
> >  lib/librte_pipeline/rte_swx_pipeline.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lib/librte_pipeline/rte_swx_pipeline.c
> > b/lib/librte_pipeline/rte_swx_pipeline.c
> > index 4a96b77e28..923fa8b769 100644
> > --- a/lib/librte_pipeline/rte_swx_pipeline.c
> > +++ b/lib/librte_pipeline/rte_swx_pipeline.c
> > @@ -3240,7 +3240,7 @@ instr_extern_translate(struct rte_swx_pipeline *p,
> >  		return 0;
> >  	}
> > 
> > -	CHECK(0, EINVAL);
> > +	return -EINVAL;
> >  }
> > 
> >  static inline void
> > @@ -5869,7 +5869,7 @@ instr_translate(struct rte_swx_pipeline *p,
> >  					      instr,
> >  					      data);
> > 
> > -	CHECK(0, EINVAL);
> > +	return -EINVAL;
> >  }
> > 
> >  static struct instruction_data *
> > --
> > 2.33.0
> > 
> > ---
> >   Diff of the applied patch vs upstream commit (please double-check if non-
> > empty:
> > ---
> > --- -	2021-11-10 14:17:10.811450551 +0800
> > +++ 0201-pipeline-fix-build-with-ASan.patch	2021-11-10
> > 14:17:02.014078251 +0800
> > @@ -1 +1 @@
> > -From 84f5ac9418ea9995975b30fa4ea57018f9618fc1 Mon Sep 17 00:00:00
> > 2001
> > +From e7dd7a6c07e28be8f4319a6b3623d9810e4c4ced Mon Sep 17 00:00:00
> > 2001
> > @@ -4,0 +5,3 @@
> > +Cc: Xueming Li <xuemingl at nvidia.com>
> > +
> > +[ upstream commit 84f5ac9418ea9995975b30fa4ea57018f9618fc1 ]
> > @@ -13 +16 @@
> > - lib/pipeline/rte_swx_pipeline.c | 4 ++--
> > + lib/librte_pipeline/rte_swx_pipeline.c | 4 ++--
> > @@ -16,5 +19,5 @@
> > -diff --git a/lib/pipeline/rte_swx_pipeline.c
> > b/lib/pipeline/rte_swx_pipeline.c -index 5e089fb72b..1afaffefd4 100644
> > ---- a/lib/pipeline/rte_swx_pipeline.c
> > -+++ b/lib/pipeline/rte_swx_pipeline.c
> > -@@ -4642,7 +4642,7 @@ instr_meter_translate(struct rte_swx_pipeline *p,
> > +diff --git a/lib/librte_pipeline/rte_swx_pipeline.c
> > +b/lib/librte_pipeline/rte_swx_pipeline.c
> > +index 4a96b77e28..923fa8b769 100644
> > +--- a/lib/librte_pipeline/rte_swx_pipeline.c
> > ++++ b/lib/librte_pipeline/rte_swx_pipeline.c
> > +@@ -3240,7 +3240,7 @@ instr_extern_translate(struct rte_swx_pipeline
> > +*p,
> > @@ -29 +32 @@
> > -@@ -5937,7 +5937,7 @@ instr_translate(struct rte_swx_pipeline *p,
> > +@@ -5869,7 +5869,7 @@ instr_translate(struct rte_swx_pipeline *p,