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 1E18BA034F for ; Wed, 11 Aug 2021 11:18:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0A6640040; Wed, 11 Aug 2021 11:18:17 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 0C7B240040 for ; Wed, 11 Aug 2021 11:18:15 +0200 (CEST) Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (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-0.canonical.com (Postfix) with ESMTPS id AEA803F044 for ; Wed, 11 Aug 2021 09:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628673495; bh=iHtp5cmHR/yNX3uWG6s1BZ3MZBOQL7wtJOXUvmlAJqM=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=K+FOskU09530C/tzmu+iKXfr+zV9/MJn4TN6TCTQ2eh+e7mCTxNtkRmjzouFIpwto IKGmJlViWFjBz5l6qs9ococSKXgjh+sfLgqVyKl0q10PIRqo4Dw0rd1JQyPEENHzTA KvYRlJolTH7uH0VfHHNZCfl+XBtddPU44q8NwjVhaCxuJ7V1bwaLyYY8OQg/7620pd lPNU+UX4dZyUJucfcfvqadpeEchuCyb4Feyjk6L06aTNP9o4EfXAokU2w5bMvxugzS nrGIiT9Qamuz5aoW0zQThvIfa7qKFqCqAjY0gA2FzuMkf/Z1pVy0RTGmoW2gTKQNQG VyDI1co+FmlGQ== Received: by mail-qk1-f197.google.com with SMTP id s206-20020a3745d70000b02903b9207abc7bso973471qka.4 for ; Wed, 11 Aug 2021 02:18:15 -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=iHtp5cmHR/yNX3uWG6s1BZ3MZBOQL7wtJOXUvmlAJqM=; b=dwWYbZx+hzPvSiqosIt628G1rUDaok3kbrGjcLqLLuImKUNgl65VMVwirbR6pplZ8E k2RGwetVHUpaFvtGYQvEouB+v0HA3sKwnCPPQZwsrRk3WXwZvXuOau9kuzuAXMbrWtc8 DGwStyuUjlU6r/g1slGSFKJ+o53upB2p4Wxxp88wajyCdmF4E2zz2zjAlGd1PBeOKNff OkjGtK8spU74ZDvZQUCrkj2carMOkA7NiHxiOLswSxD2tdEMNMWINsQ5RI+5PCIO+g3O z3c5KYFB5o8lA/gz2V5TRX8IULRD34MAkcB6FufMRcfpruoxC0XQlj6SkL0T2ug6BD25 fY1Q== X-Gm-Message-State: AOAM531prQgb6SyQhh2KzccOJRm0WA3z3TTl8OqX7dvnhs0IGA53Lnr2 QeBi3dZFpSG3Hr7/hX3m20USHWAIcl6uLyKIH0hg+On/K0snyoWCJxkqo4pvhM50CxxzzaWEvd6 eGIo+4VgPkjkGMJjLheUcne/fyJUeXirUw+3el7kv X-Received: by 2002:ad4:4f0f:: with SMTP id fb15mr10581841qvb.22.1628673494556; Wed, 11 Aug 2021 02:18:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaHnSM+1G2jovgzDKkC+hPiowhVzmkuPnJDiFr5FaR/1Xyhc4Wba8A4cmO3DWoN9/F6THQ79eJeBt1ugyYeTA= X-Received: by 2002:ad4:4f0f:: with SMTP id fb15mr10581833qvb.22.1628673494380; Wed, 11 Aug 2021 02:18:14 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-77-christian.ehrhardt@canonical.com> In-Reply-To: <20210810154022.749358-77-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Wed, 11 Aug 2021 11:17:48 +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 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_it= em_eth=E2=80=99: ../drivers/net/mlx5/mlx5_flow.c:1444:19: error: =E2=80=98MLX5_FLOW_LAYER_GT= P=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 bec= ome 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 ] For example: https://git.dpdk.org/dpdk-stable/commit/?h=3D18.11&id=3Dd90e6ae6f936ecd= c2fd3811ff9f26aec7f3c06eb 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=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 t= he > 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 reba= sing > (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/72c1cc5d90154b1f8a8f= c0b94f097c41cdb27b24 > > 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 functi= on") > > 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_flow_= item *item, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM, item, > "L2 layer should not follow VLA= N"); > + 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 =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 no= n-empty: > --- > --- - 2021-08-10 15:11:15.983836535 +0200 > +++ 0077-net-mlx5-reject-inner-ethernet-matching-in-GTP.patch 2021-08-1= 0 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, --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd