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 90284A0524 for ; Fri, 5 Feb 2021 12:39:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BA394067B; Fri, 5 Feb 2021 12:39:05 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 6A378188A5B for ; Fri, 5 Feb 2021 12:39:04 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id z6so7285737wrq.10 for ; Fri, 05 Feb 2021 03:39:04 -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=Jw/NyY5krgJATJauRF3ukiW6koqdM0zKhehiq+RiSsI=; b=Iu2sdqfbRKIG5W2rNaMjEHByBQYQUeenbS8feqh6wXTLIdlpRorK0tES6WUYSNo1SA 9UUUvNiRYwUyHJshjzxEshmWFPYUygtWLaLKdefarLLqdhv59E8sSaSjyaDDawlqj3R3 Mc+T1zRROvZ+utaCphllEkjTlDcDP7Yhp2J82UXqQH4XJeeytVF34rMS9WSe4wQqpGOF esn2EsHrqwWZ7DBJ/jo37hr60o4DrZYIICrs86Kt/QudujmGPtR5uURo6bVkeTO6u1rO EVB8iXvi/sgW0AolSnBvOTwf1rxwq/zp4XkQkCDGcwFysitogLyz8Xc/lK3EHghzSgk/ MMWw== 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=Jw/NyY5krgJATJauRF3ukiW6koqdM0zKhehiq+RiSsI=; b=USR27y8fqVsTSpxqtI+YPCKco66pEFjPfFnfQu2qEOXHsm1j1QkdNRydnf01vFOQfp U3u63isSE6Tgnqof0hv0549cWmOpWach49d800PIxxyuoul2qfrUwaXUvGI0JYuAQOaN 9hm0wlOu2Fyb+jgAvCP0Vx5tvZ08SEMpeow/xICvP6eT/mIpXyAwP6UuP80dQcGfIHwl UZezWDtisJpbpGDBdynYbgHLyTa5kJ3j+n09cV592G8XhEJWyoqZ3v3IogEontVFBr5A yaQQ1EUfcJtgnc1TlYOV3Gy24fEYxi3O9WYgopYMbSn+zLa0oiUibOfJ1YAW0p4Ff9ro Ybww== X-Gm-Message-State: AOAM531sdeBmnPHtNluHgBLuCvdI8HL5hu495c1eBPARLr61iyb4pd+b 0sYGczJaUQ2XLAN0Vjebr6M/uvMq0S7raffO X-Google-Smtp-Source: ABdhPJxVjsJOdBZjo6ZxSH1GPwU8w3h0iDFaJVOvwRXbTCQ9Hze+KUjg00FI+MLq00/nN4vjRA2CBQ== X-Received: by 2002:a5d:50c1:: with SMTP id f1mr4651411wrt.235.1612525144204; Fri, 05 Feb 2021 03:39:04 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b3sm9585614wme.32.2021.02.05.03.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:39:03 -0800 (PST) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: dpdk stable Date: Fri, 5 Feb 2021 11:19:06 +0000 Message-Id: <20210205111920.1272063-260-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix wire vport hint' has been queued to stable release 20.11.1 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" Hi, FYI, your patch has been queued to stable release 20.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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/99e743b72dc0eeb1e1c1d3dfcb4a3a328867ddaa Thanks. Luca Boccassi --- >From 99e743b72dc0eeb1e1c1d3dfcb4a3a328867ddaa Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 27 Jan 2021 15:53:05 +0200 Subject: [PATCH] net/mlx5: fix wire vport hint [ upstream commit 53900e1ae6bbc985934a7647bc1afef83bccea84 ] In order to optimize number of hops in the steering tables there was the hint field of source vport in the matcher. If this hint was provided for the wire port the actual vport match, used by kernel, was not set in the matcher metadata register field. This could led to not creating the rule in hardware and E-Switch malfunction if kernel used non-zero metadata value for the wire vport. This patch always sets the match for the vport metadata register value besides the hint. Fixes: aaf34de5d801 ("net/mlx5: add wire vport hint") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 4dca11ad5b..32065efa41 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7704,11 +7704,15 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *matcher, priv->pf_bond < 0 && attr->transfer) flow_dv_translate_item_source_vport (matcher, key, priv->vport_id, mask); - else - flow_dv_translate_item_meta_vport - (matcher, key, - priv->vport_meta_tag, - priv->vport_meta_mask); + /* + * We should always set the vport metadata register, + * otherwise the SW steering library can drop + * the rule if wire vport metadata value is not zero, + * it depends on kernel configuration. + */ + flow_dv_translate_item_meta_vport(matcher, key, + priv->vport_meta_tag, + priv->vport_meta_mask); } else { flow_dv_translate_item_source_vport(matcher, key, priv->vport_id, mask); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.636783558 +0000 +++ 0260-net-mlx5-fix-wire-vport-hint.patch 2021-02-05 11:18:29.294700403 +0000 @@ -1 +1 @@ -From 53900e1ae6bbc985934a7647bc1afef83bccea84 Mon Sep 17 00:00:00 2001 +From 99e743b72dc0eeb1e1c1d3dfcb4a3a328867ddaa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 53900e1ae6bbc985934a7647bc1afef83bccea84 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 95a066f78e..8c11ac306f 100644 +index 4dca11ad5b..32065efa41 100644 @@ -29 +30 @@ -@@ -8662,11 +8662,15 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *matcher, +@@ -7704,11 +7704,15 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *matcher,