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 87544A051C for ; Tue, 11 Feb 2020 12:40:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DE581DB9; Tue, 11 Feb 2020 12:40:58 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 8A8D11BFA7 for ; Tue, 11 Feb 2020 12:40:55 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id g3so10863350wrs.12 for ; Tue, 11 Feb 2020 03:40:55 -0800 (PST) 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=OBQBgI2pbFx7VJWQfkBVjpETBhTnaxpKHNtpkB+8L/Q=; b=ntG6Cqrf9m91hXSCTDXShcRU10rK78u/RaSWEM1w+xgW7iwn/Pv3y8u5ijiVJ9vL8R m1TUYd4rjelGr0THkelF2tfRMzFrls1ppDAD6Aenp6+Gg6Hr7MXdITJIlmyDb1e7j93g cgh2RZYdqNAPSZnFutsL0riW5ZoNGgMbZlDyJDQzM7Vruy3WRmLN65fp67+CZO636XQm IMYJXmUDfzqxyPAwxk5UKZASFErbukBhYcNofDAwP1W+fVIY3HgCS06oc4SlxxCrHMSv Z0vjgCeSm2PwO1Wl5mmUva0bD3dOLpH8a9/SgPhl95kRQVwvsu3OvNQm2FVqwtPQrmJv vYsQ== 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=OBQBgI2pbFx7VJWQfkBVjpETBhTnaxpKHNtpkB+8L/Q=; b=s7vLLdhr6TpFikTxn3bvmrg86BNDalCpIzJM8cr5AfZ0NchUlvn95PeancjmHqXwdY 5xwvStOyUxsGMlx4ZdEPCyst/uDhx/DC6iBpHMaQSpfT7Ai/xVM35qOSUPiY3nBqCcaf 3YRqQ+Pgyt5RcD6MjDbf3AZdWo3rycDn1l1U0m5qQHhj3JofHprD6Ci7m8Ix8s6O74RG DXA8XwyiGQiB8fGiAWMZLOCsKmyHMlxB9571nAHV+dh3pHF497WmN2WKbqpGLzyvCnEi C+EwD2UK8oFg8/8qmJrPL8HmOFjZxUHWaz3oAR4xjjueSd+iV2z9ez/rA6Ha44VYHB7z m6dQ== X-Gm-Message-State: APjAAAUlExNTfX0nimkIEwZoTXMlju9BVUTFZqTx4iHeWcY/pYMmCl/S ksWo1L7W37ZQwEgZOi91DJrKIxw6VWk= X-Google-Smtp-Source: APXvYqwAWoDXZoSPw2WYg0bUrlBEIEcxto5GgqRdZoeevPXWvjC0Mve2khb3iEJ+TVDjPrbgr7dSfA== X-Received: by 2002:adf:82ce:: with SMTP id 72mr8217699wrc.14.1581421254979; Tue, 11 Feb 2020 03:40:54 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l132sm3558418wmf.16.2020.02.11.03.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:54 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , dpdk stable Date: Tue, 11 Feb 2020 11:21:40 +0000 Message-Id: <20200211112216.3929-154-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix setting of port ID for egress rules' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 767de68c9021ecdda8df11b5c787d8fdc74c377c Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 14:33:06 +0200 Subject: [PATCH] net/mlx5: fix setting of port ID for egress rules [ upstream commit 813f9bfa12c93737472f0eefe0e1a7d30502e532 ] Previous patch fixed the setting of port-id for eswitch rules, which are ingress only. This patch expands the fix, to support NIC rules as well, which can be ingress or egress. Fixes: ce777b147bf8 ("net/mlx5: fix E-Switch flow without port item") Signed-off-by: Dekel Peled Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 0079d4a8c7..6aedb3c0bc 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7271,13 +7271,13 @@ cnt_err: item_flags |= last_item; } /* - * In case of ingress traffic when E-Switch mode is enabled, - * we have two cases where we need to set the source port manually. + * When E-Switch mode is enabled, we have two cases where we need to + * set the source port manually. * The first one, is in case of Nic steering rule, and the second is * E-Switch rule where no port_id item was found. In both cases * the source port is set according the current port in use. */ - if ((attr->ingress && !(item_flags & MLX5_FLOW_ITEM_PORT_ID)) && + if (!(item_flags & MLX5_FLOW_ITEM_PORT_ID) && (priv->representor || priv->master)) { if (flow_dv_translate_item_port_id(dev, match_mask, match_value, NULL)) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.991461464 +0000 +++ 0154-net-mlx5-fix-setting-of-port-ID-for-egress-rules.patch 2020-02-11 11:17:38.736007630 +0000 @@ -1,15 +1,16 @@ -From 813f9bfa12c93737472f0eefe0e1a7d30502e532 Mon Sep 17 00:00:00 2001 +From 767de68c9021ecdda8df11b5c787d8fdc74c377c Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 14:33:06 +0200 Subject: [PATCH] net/mlx5: fix setting of port ID for egress rules +[ upstream commit 813f9bfa12c93737472f0eefe0e1a7d30502e532 ] + Previous patch fixed the setting of port-id for eswitch rules, which are ingress only. This patch expands the fix, to support NIC rules as well, which can be ingress or egress. Fixes: ce777b147bf8 ("net/mlx5: fix E-Switch flow without port item") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -18,10 +19,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index a32f0be803..c2900c5d0d 100644 +index 0079d4a8c7..6aedb3c0bc 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -7602,13 +7602,13 @@ cnt_err: +@@ -7271,13 +7271,13 @@ cnt_err: item_flags |= last_item; } /*