From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 569EDA0093 for ; Tue, 19 May 2020 15:16:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 41E861D98E; Tue, 19 May 2020 15:16:48 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id BB9BF1D97B for ; Tue, 19 May 2020 15:16:45 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id h17so15843456wrc.8 for ; Tue, 19 May 2020 06:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=chqMrEcFppUlUsk5iI/QruBAIK7SFu9Oy6Zf/hoAlHM=; b=I0tWXJXufewwabsEwA4NX23goHugTAvHU6c+tzetHmXN8t4eY6lukc4p9IWVWIbDOa wpFyE/lMQjb24J0H4RofzvI/xWsu56QH/6kaxkpdBj2mUY6OAXDbNDOrh18m1bj1Os0z 2mV5cNuvz9+c7SzLgunSg0dj/3P09rB/DbWbA19sCoNzn3Qz9ltNbH4FzC2ftgjLvazC FMlTpqnWNNScFwVJ6Q3Z94j8WhZqxVt5kPc+T3XKwlntQKkTIaPw07baeEIcGhb1HF5l J4ruQgUaSkOGSGaW81gwK2SjKjtfdwj7xJ73hbtn4wRVmDcTiH/SvwBQ28rgs9yVxMrt Jk5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=chqMrEcFppUlUsk5iI/QruBAIK7SFu9Oy6Zf/hoAlHM=; b=JDZlWdJoIZuGTYcRrHnSwAsc7z/EgqX1876cnkmv1pP6IAc92wVFPLPThZLPt/7gwS KYalII3GcZ7VgkLTSCPHVFPZ8GLKfUC0SziiWyR7TAxIP4wPZvlVUFPqHQh5iwOceS01 J3hZ7N38vgF/2zkLNfxXQmUbhEWReCJ0gAu6NI2+hgaDddwLIgiAFTqvqEs5LxCrczzs laM17tC3+lgA7SiqUz+HDIfijnL8d2Optn/yRXYbJ8m6S9L+6cjVjkpe/GX1qqb/q51O haVQGmSfjumrCnXeWJq6r4juLrckmDnVV8plfTsZHTXoIBTXos6yOll/FYr6bPk0ANXv gj4w== X-Gm-Message-State: AOAM531jlP2loIcuI6yIuVyfaig8i9l9Aha+CyFJyd+6eapN+RZzehmK vzqRyjV2D+p/NZVXRoHmhE4vh3/hX0IemmOT X-Google-Smtp-Source: ABdhPJzTHWzE1oBXvc/Rz/3RbODn8OOHfBK6l53WJ5thjHKaFRYMB0UqCCoTpbelzTcD4URYMXl5Ww== X-Received: by 2002:a5d:4484:: with SMTP id j4mr21458394wrq.325.1589894205449; Tue, 19 May 2020 06:16:45 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 7sm21840789wra.50.2020.05.19.06.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Matan Azrad , dpdk stable Date: Tue, 19 May 2020 14:05:43 +0100 Message-Id: <20200519130549.112823-208-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 77ca941f9db712eeac44afd8566cf8899bb697d5 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Wed, 6 May 2020 09:57:56 +0300 Subject: [PATCH] net/mlx5: fix matching for UDP tunnels with Verbs [ upstream commit 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 ] When creating flow rule with zero specs it will cause matching all UDP packets like following: eth / ipv4 / udp / vxlan / end Such rule will match all udp packets. This change the behavior to match the dv flow engine which will automatically set the match on relative outer UDP port if the user didn't specify any. Fixes: 84c406e74524 ("net/mlx5: add flow translate function") Signed-off-by: Raslan Darawsheh Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_verbs.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index f66489c791..7ac6a25e43 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -586,6 +586,28 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow, udp.val.src_port &= udp.mask.src_port; udp.val.dst_port &= udp.mask.dst_port; } + item++; + while (item->type == RTE_FLOW_ITEM_TYPE_VOID) + item++; + if (!(udp.val.dst_port & udp.mask.dst_port)) { + switch ((item)->type) { + case RTE_FLOW_ITEM_TYPE_VXLAN: + udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN); + udp.mask.dst_port = 0xffff; + break; + case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: + udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN_GPE); + udp.mask.dst_port = 0xffff; + break; + case RTE_FLOW_ITEM_TYPE_MPLS: + udp.val.dst_port = htons(MLX5_UDP_PORT_MPLS); + udp.mask.dst_port = 0xffff; + break; + default: + break; + } + } + flow_verbs_spec_add(&dev_flow->verbs, &udp, size); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:53.092511764 +0100 +++ 0208-net-mlx5-fix-matching-for-UDP-tunnels-with-Verbs.patch 2020-05-19 14:04:44.600655334 +0100 @@ -1,8 +1,10 @@ -From 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 Mon Sep 17 00:00:00 2001 +From 77ca941f9db712eeac44afd8566cf8899bb697d5 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Wed, 6 May 2020 09:57:56 +0300 Subject: [PATCH] net/mlx5: fix matching for UDP tunnels with Verbs +[ upstream commit 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 ] + When creating flow rule with zero specs it will cause matching all UDP packets like following: eth / ipv4 / udp / vxlan / end @@ -13,7 +15,6 @@ outer UDP port if the user didn't specify any. Fixes: 84c406e74524 ("net/mlx5: add flow translate function") -Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Matan Azrad @@ -22,10 +23,10 @@ 1 file changed, 22 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c -index 4659f0a7f7..c403f72be3 100644 +index f66489c791..7ac6a25e43 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c -@@ -680,6 +680,28 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow, +@@ -586,6 +586,28 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow, udp.val.src_port &= udp.mask.src_port; udp.val.dst_port &= udp.mask.dst_port; }