From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D2B58A0547 for ; Wed, 11 Aug 2021 13:24:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0BC140042; Wed, 11 Aug 2021 13:24:24 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id D0C0640042 for ; Wed, 11 Aug 2021 13:24:23 +0200 (CEST) Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id A9A223F077 for ; Wed, 11 Aug 2021 11:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628681063; bh=5XaCykSnDe2Fc5sjuxli8HuobgoZIrU02of8l2IvoB4=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=BKMC6KnHDIKMJC9V05DqpIFI1evwQfp2TNaqttrQAOvdni2Gp9hsAuCHLP/mic0dJ spd69PzRvZRFWyH2GtAs/aQDi1bqvdzX6JVwOiPTLIpxDtMh8XijSCSCCvArk7hoan 7Dx0kZSBSvCBGZDGPint0bGWBrGF6F4MPDY/LoXAhXEmujZuQ89IJ+M1A2MVjaR+mO 7/3sanHEqh49QXrefoM5xyU7tsNacLY5cNFv3ikZldExuijtEwcG6dmlESIVrotEsV /93A5FJQdQwRBbxClogymVMukh+w26UJ/wFd+mZo42+mcF/svZbFFPs2sVDC5pkHuE eJv8vIrQbbuTA== Received: by mail-qv1-f69.google.com with SMTP id f10-20020a0ccc8a0000b02903521ac3b9d7so1074203qvl.15 for ; Wed, 11 Aug 2021 04:24:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=5XaCykSnDe2Fc5sjuxli8HuobgoZIrU02of8l2IvoB4=; b=DM8viMovBdSobPRoILj55AnlnFth1z0QQ6yByxg9WCXsgscYviXcS+uxA1vma/Me/D ZCZW4PVz2v5FCvXERueF0YNir9lH7evUnSO31aiNdm30w9z1eb/ro2gbf6FQEvX47bti noFPBPOlog5UDtYwaC6tpZLhQxcwnTbZ5zXZu/pEi4duKyXGdtwSnBb7xCm1zASrtff5 Pioii6B7LZEWb+SPc/nnbwr7jpcOwuRcq1Uw/Oqg0HW20V1KXxNpYXxkvV1s92y9p0ey 7iDN+6zjGU2o4i58TeuEJwYG5ETQYn7Yq5mp3MNvq3Ul837Nm8/iGiFeVUCNvT8nzFv0 qawQ== X-Gm-Message-State: AOAM532KeBX7pSTs9J8BLFHlUJ+ZfR2nz4Tv8BKmou0SXgj9HOP+SFOh lvsl/zEaK5aCiNuZ4JJIV0tXWVUVsL6z7oTlcY1/NllbHhgXbUDrP9dBKY7jpAZ4UAAApwLxe3/ BH4rnytlhNtBCPoCifuXtNFAJANDbgnGFXH36rcAk X-Received: by 2002:a05:620a:7f0:: with SMTP id k16mr25511139qkk.33.1628681062593; Wed, 11 Aug 2021 04:24:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRLbotias/Gmea3o7nb4SBoMllNhj+H/iJW7y38HwXRgYnBP3+z70fECHXHIX8L8bgTj7Oe9C7EqDBsc5rHfw= X-Received: by 2002:a05:620a:7f0:: with SMTP id k16mr25511123qkk.33.1628681062408; Wed, 11 Aug 2021 04:24:22 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-77-christian.ehrhardt@canonical.com> In-Reply-To: From: Christian Ehrhardt Date: Wed, 11 Aug 2021 13:23:56 +0200 Message-ID: To: Lior Margalit Cc: Matan Azrad , dpdk stable Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] patch 'net/mlx5: reject inner ethernet matching in GTP' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Wed, Aug 11, 2021 at 12:25 PM Lior Margalit wrote= : > > Hi Chrtistian, > > This patch is not relevant for 19.11 Thanks for letting me know! > Thank you, > Lior > > -----Original Message----- > From: Christian Ehrhardt > Sent: Wednesday, August 11, 2021 12:18 PM > To: Lior Margalit > Cc: Matan Azrad ; dpdk stable > 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 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 =E2=80=98mlx5_flow_validate_= item_eth=E2=80=99: > ../drivers/net/mlx5/mlx5_flow.c:1444:19: error: =E2=80=98MLX5_FLOW_LAYER_= GTP=E2=80=99 > undeclared (first use in this function); did you mean =E2=80=98MLX5_FLOW_= LAYER_GRE=E2=80=99? > 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 b= ecome 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 i= t's commit message in the following fashion: > [ upstream commit ] > > For example: > https://git.dpdk.org/dpdk-stable/commit/?h=3D18.11&id=3Dd90e6ae6f936e= cdc2fd3811ff9f26aec7f3c06eb > > When sending the backported patch, please indicate the target branch in t= he 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=3D'PATCH 19.11' > > Send the backported patch to "stable@dpdk.org" but not "dev@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 > > > > --- > > From 72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 Mon Sep 17 00:00:00 2001 > > From: Lior Margalit > > 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 > > Acked-by: Matan Azrad > > --- > > 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_flo= w_item *item, > > return rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ITEM, ite= m, > > "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, ite= m, > > + "L2 layer should not follow > > + GTP"); > > if (!mask) > > mask =3D &rte_flow_item_eth_mask; > > ret =3D 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@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 --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd