[dpdk-stable] patch 'net/mlx5: reject inner ethernet matching in GTP' has been queued to stable release 19.11.10

[Christian Ehrhardt]

On Wed, Aug 11, 2021 at 12:25 PM Lior Margalit <lmargalit at nvidia.com> wrote:
>
> Hi Chrtistian,
>
> This patch is not relevant for 19.11

Thanks for letting me know!

> Thank you,
> Lior
>
> -----Original Message-----
> From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
> Sent: Wednesday, August 11, 2021 12:18 PM
> To: Lior Margalit <lmargalit at nvidia.com>
> Cc: Matan Azrad <matan at nvidia.com>; dpdk stable <stable at dpdk.org>
> Subject: Re: patch 'net/mlx5: reject inner ethernet matching in GTP' has been queued to stable release 19.11.10
>
> External email: Use caution opening links or attachments
>
>
> On Tue, Aug 10, 2021 at 5:44 PM <christian.ehrhardt at canonical.com> wrote:
> >
> > Hi,
> >
> > FYI, your patch has been queued to stable release 19.11.10
>
> Hi,
> while applying cleanly your patch caused build time failures like:
>
> ../drivers/net/mlx5/mlx5_flow.c: In function ‘mlx5_flow_validate_item_eth’:
> ../drivers/net/mlx5/mlx5_flow.c:1444:19: error: ‘MLX5_FLOW_LAYER_GTP’
> undeclared (first use in this function); did you mean ‘MLX5_FLOW_LAYER_GRE’?
>  1444 |  if (item_flags & MLX5_FLOW_LAYER_GTP)
>       |                   ^~~~~~~~~~~~~~~~~~~
>       |                   MLX5_FLOW_LAYER_GRE
>
> Therefore the patch will be de-qeueud from the stable branch that shall become 19.11.10.
> Please consider having a look and providing a backport.
>
> A backport should contain a reference to the DPDK main branch commit in it's commit message in the following fashion:
>     [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
>     https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>
> When sending the backported patch, please indicate the target branch in the subject line, as we have multiple branches, for example:
>     [PATCH 19.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
>     --subject-prefix='PATCH 19.11'
>
> Send the backported patch to "stable at dpdk.org" but not "dev at dpdk.org".
>
> FYI, branch 19.11 is located at tree:
>    https://git.dpdk.org/dpdk-stable
>
> Thanks in advance,
> Chrtistian
>
> > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> > It will be pushed if I get no objections before 08/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/cpaelzer/dpdk-stable-queue
> >
> > This queued commit can be viewed at:
> > https://github.com/cpaelzer/dpdk-stable-queue/commit/72c1cc5d90154b1f8
> > a8fc0b94f097c41cdb27b24
> >
> > Thanks.
> >
> > Christian Ehrhardt <christian.ehrhardt at canonical.com>
> >
> > ---
> > From 72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 Mon Sep 17 00:00:00 2001
> > From: Lior Margalit <lmargalit at nvidia.com>
> > Date: Tue, 20 Jul 2021 18:17:18 +0300
> > Subject: [PATCH] net/mlx5: reject inner ethernet matching in GTP
> >
> > [ upstream commit 4e5ba38d56e3a037271547c90fbfc25c81938a4f ]
> >
> > The user is able to create a flow rule pattern with ETH after GTP
> > although it is not supported by the flex-parser configuration.
> >
> > Failed the rule validation in such case with proper error message.
> >
> > Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated
> > function")
> >
> > Signed-off-by: Lior Margalit <lmargalit at nvidia.com>
> > Acked-by: Matan Azrad <matan at nvidia.com>
> > ---
> >  drivers/net/mlx5/mlx5_flow.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow.c
> > b/drivers/net/mlx5/mlx5_flow.c index 65064ffb07..cb08e5ec35 100644
> > --- a/drivers/net/mlx5/mlx5_flow.c
> > +++ b/drivers/net/mlx5/mlx5_flow.c
> > @@ -1441,6 +1441,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item,
> >                 return rte_flow_error_set(error, EINVAL,
> >                                           RTE_FLOW_ERROR_TYPE_ITEM, item,
> >                                           "L2 layer should not follow
> > VLAN");
> > +       if (item_flags & MLX5_FLOW_LAYER_GTP)
> > +               return rte_flow_error_set(error, EINVAL,
> > +                                         RTE_FLOW_ERROR_TYPE_ITEM, item,
> > +                                         "L2 layer should not follow
> > + GTP");
> >         if (!mask)
> >                 mask = &rte_flow_item_eth_mask;
> >         ret = mlx5_flow_item_acceptable(item, (const uint8_t *)mask,
> > --
> > 2.32.0
> >
> > ---
> >   Diff of the applied patch vs upstream commit (please double-check if non-empty:
> > ---
> > --- -   2021-08-10 15:11:15.983836535 +0200
> > +++ 0077-net-mlx5-reject-inner-ethernet-matching-in-GTP.patch   2021-08-10 15:11:13.090638619 +0200
> > @@ -1 +1 @@
> > -From 4e5ba38d56e3a037271547c90fbfc25c81938a4f Mon Sep 17 00:00:00
> > 2001
> > +From 72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 Mon Sep 17 00:00:00
> > +2001
> > @@ -5,0 +6,2 @@
> > +[ upstream commit 4e5ba38d56e3a037271547c90fbfc25c81938a4f ]
> > +
> > @@ -12 +13,0 @@
> > -Cc: stable at dpdk.org
> > @@ -21 +22 @@
> > -index 2059f29b23..a3fdce685e 100644
> > +index 65064ffb07..cb08e5ec35 100644
> > @@ -24 +25 @@
> > -@@ -1999,6 +1999,10 @@ mlx5_flow_validate_item_eth(const struct
> > rte_flow_item *item,
> > +@@ -1441,6 +1441,10 @@ mlx5_flow_validate_item_eth(const struct
> > +rte_flow_item *item,
>
>
>
> --
> Christian Ehrhardt
> Staff Engineer, Ubuntu Server
> Canonical Ltd



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd