[dpdk-stable] patch 'doc: add VFIO in ENA guide' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 1bbf0fd6b9d9433a8972eb1733a652acb3b62579 Mon Sep 17 00:00:00 2001
From: Rafal Kozik <rk at semihalf.com>
Date: Wed, 10 Oct 2018 14:08:15 +0200
Subject: [PATCH] doc: add VFIO in ENA guide

[ upstream commit 4d0155db76da10b4e549b5b8814962748bcf2192 ]

Add instruction how to bind ENA to VFIO-PCI driver.

Fixes: cf8a122c296a ("ena: introduce documentation")

Signed-off-by: Zorik Machulsky <zorik at amazon.com>
Signed-off-by: Rafal Kozik <rk at semihalf.com>
Acked-by: Michal Krawczyk <mk at semihalf.com>
---
 doc/guides/nics/ena.rst          | 15 ++++++++++++---
 doc/guides/nics/features/ena.ini |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst
index d19912e9b..695960d4c 100644
--- a/doc/guides/nics/ena.rst
+++ b/doc/guides/nics/ena.rst
@@ -188,9 +188,18 @@ Prerequisites
 
 #. Prepare the system as recommended by DPDK suite.  This includes environment
-   variables, hugepages configuration, tool-chains and configuration
+   variables, hugepages configuration, tool-chains and configuration.
 
-#. Insert igb_uio kernel module using the command 'modprobe igb_uio'
+#. ENA PMD can operate with ``vfio-pci`` or ``igb_uio`` driver.
 
-#. Bind the intended ENA device to igb_uio module
+#. Insert ``vfio-pci`` or ``igb_uio`` kernel module using the command
+   ``modprobe vfio-pci`` or ``modprobe igb_uio`` respectively.
+
+#. For ``vfio-pci`` users only:
+   Please make sure that ``IOMMU`` is enabled in your system,
+   or use ``vfio`` driver in ``noiommu`` mode::
+
+     echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode
+
+#. Bind the intended ENA device to ``vfio-pci`` or ``igb_uio`` module.
 
 
diff --git a/doc/guides/nics/features/ena.ini b/doc/guides/nics/features/ena.ini
index 691c1e3d3..aa6f05a71 100644
--- a/doc/guides/nics/features/ena.ini
+++ b/doc/guides/nics/features/ena.ini
@@ -24,4 +24,5 @@ Basic stats          = Y
 Extended stats       = Y
 Linux UIO            = Y
+Linux VFIO           = Y
 x86-32               = Y
 x86-64               = Y
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.473275188 +0000
+++ 0056-doc-add-VFIO-in-ENA-guide.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,12 +1,13 @@
-From 4d0155db76da10b4e549b5b8814962748bcf2192 Mon Sep 17 00:00:00 2001
+From 1bbf0fd6b9d9433a8972eb1733a652acb3b62579 Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <rk at semihalf.com>
 Date: Wed, 10 Oct 2018 14:08:15 +0200
 Subject: [PATCH] doc: add VFIO in ENA guide
 
+[ upstream commit 4d0155db76da10b4e549b5b8814962748bcf2192 ]
+
 Add instruction how to bind ENA to VFIO-PCI driver.
 
 Fixes: cf8a122c296a ("ena: introduce documentation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Zorik Machulsky <zorik at amazon.com>
 Signed-off-by: Rafal Kozik <rk at semihalf.com>