[dpdk-stable] patch 'doc: update flow mark action in mlx5 guide' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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/06/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/307c249c073f71c80edee895943d5df6005126cc

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 307c249c073f71c80edee895943d5df6005126cc Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Fri, 11 Dec 2020 12:05:40 +0000
Subject: [PATCH] doc: update flow mark action in mlx5 guide

[ upstream commit 3ceeed9f7855368cc755f440a938f199c9654253 ]

There some limitations added for the MARK action value range.

Fixes: 2d241515ebaf ("net/mlx5: add devarg for extensive metadata support")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 doc/guides/nics/mlx5.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 5543850be2..9e4a659ab9 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -693,7 +693,7 @@ Run-time configuration
   +------+-----------+-----------+-------------+-------------+
   | 1    | 24 bits   | vary 0-32 | 32 bits     | yes         |
   +------+-----------+-----------+-------------+-------------+
-  | 2    | vary 0-32 | 32 bits   | 32 bits     | yes         |
+  | 2    | vary 0-24 | 32 bits   | 32 bits     | yes         |
   +------+-----------+-----------+-------------+-------------+
 
   If there is no E-Switch configuration the ``dv_xmeta_en`` parameter is
@@ -705,6 +705,15 @@ Run-time configuration
   of the extensive metadata features. The legacy Verbs supports FLAG and
   MARK metadata actions over NIC Rx steering domain only.
 
+  The setting MARK or META value to zero means there is no item provided and
+  receiving datapath will not report in mbufs these items are present.
+
+  For the MARK action the last 16 values in the full range are reserved for
+  internal PMD purposes (to emulate FLAG action). The valid range for the
+  MARK action values is 0-0xFFEF for the 16-bit mode and 0-xFFFFEF
+  for the 24-bit mode, the flows with the MARK action value outside
+  the specified range will be rejected.
+
 - ``dv_flow_en`` parameter [int]
 
   A nonzero value enables the DV flow steering assuming it is supported
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:32.471009956 +0100
+++ 0108-doc-update-flow-mark-action-in-mlx5-guide.patch	2021-02-04 12:04:28.130789826 +0100
@@ -1 +1 @@
-From 3ceeed9f7855368cc755f440a938f199c9654253 Mon Sep 17 00:00:00 2001
+From 307c249c073f71c80edee895943d5df6005126cc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ceeed9f7855368cc755f440a938f199c9654253 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index 17659521a9..13fd1d8a61 100644
+index 5543850be2..9e4a659ab9 100644
@@ -20 +21 @@
-@@ -840,7 +840,7 @@ Driver options
+@@ -693,7 +693,7 @@ Run-time configuration
@@ -29 +30 @@
-@@ -852,6 +852,15 @@ Driver options
+@@ -705,6 +705,15 @@ Run-time configuration