2 files changed, 381 insertions, 2 deletions

diff --git a/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml b/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml
index fa461fa..daafadf 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml
+++ b/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml
@@ -245,7 +245,7 @@
 
         <para>Pktgen is used to generate UDP traffic that will reach testpmd,
         running in a Docker image. It will then be forwarded back to source on
-        the return trip (Forwarding).</para>
+        the return trip (<emphasis role="bold">Forwarding</emphasis>).</para>
 
         <para>This test measures:</para>
 
@@ -702,6 +702,129 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
           </table>
         </section>
       </section>
+
+      <section id="pxe-config-docker">
+        <title>SR-IOV in in Docker</title>
+
+        <para>PCI passthrough tests using pktgen and testpmd in Docker.</para>
+
+        <para>pktgen[DPDK]Docker - PHY - Docker[DPDK] testpmd</para>
+
+        <para>Measurements:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>RX packets per second in testpmd (with testpmd configured in
+            rxonly mode).</para>
+          </listitem>
+        </itemizedlist>
+
+        <section id="target-setup">
+          <title>Test Setup</title>
+
+          <para>Boot Enea NFV Access Platform from SSD:<programlisting>linux (hd0,gpt3)/boot/bzImage root=/dev/sda3 ip=dhcp nohz_full=1-7 /
+isolcpus=1-7 rcu-nocbs=1-7 rcu_nocb_poll intel_pstate=disable clocksource=tsc /
+tsc=reliable nohpet nosoftlockup intel_idle.max_cstate=0 processor.max_cstate=0 /
+mce=ignore_ce audit=0 nmi_watchdog=0 iommu=pt intel_iommu=on hugepagesz=1GB /
+hugepages=8 default_hugepagesz=1GB hugepagesz=2M hugepages=2048 /
+vfio_iommu_type1.allow_unsafe_interrupts=1l</programlisting>Allow unsafe
+          interrupts:<programlisting>echo 1 &gt; /sys/module/vfio_iommu_type1/parameters/allow_unsafe_interrupts</programlisting>Configure
+          DPDK:<programlisting>mkdir -p /mnt/huge
+mount -t hugetlbfs nodev /mnt/huge
+dpdk-devbind.py --bind=ixgbe 0000:03:00.0
+ifconfig eno3 192.168.1.2
+echo 2 &gt; /sys/class/net/eno3/device/sriov_numvfs
+modprobe vfio-pci
+dpdk-devbind.py --bind=vfio-pci 0000:03:10.0
+dpdk-devbind.py --bind=vfio-pci 0000:03:10.2</programlisting>Start two docker
+          containers:<programlisting>docker run --privileged -it --rm -v /mnt/huge:/mnt/huge/ /
+--device /dev/vfio/vfio el7_guest /bin/bash
+docker run --privileged -it --rm -v /mnt/huge:/mnt/huge/ /
+--device /dev/vfio/vfio el7_guest /bin/bash</programlisting>In the first
+          container start pktgen:<programlisting>cd /usr/share/apps/pktgen/
+./pktgen -c 0x1f -w 0000:03:10.0 -n 1 --file-prefix pg1 /
+--socket-mem 1024 -- -P -m "[3:4].0"</programlisting>In the pktgen prompt set
+          the destination MAC address:<programlisting>set mac 0 XX:XX:XX:XX:XX:XX
+str</programlisting>In the second container start testpmd:<programlisting>testpmd -c 0x7 -n 1 -w 0000:03:10.2 -- -i --portmask=0x1 /
+--txd=256 --rxd=256 --port-topology=chained</programlisting>In the testpmd
+          prompt set <emphasis role="bold">forwarding</emphasis>
+          rxonly:<programlisting>set fwd rxonly
+start</programlisting><table>
+              <title>Results</title>
+
+              <tgroup cols="5">
+                <tbody>
+                  <row>
+                    <entry align="center"><emphasis
+                    role="bold">Bytes</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">pktgen pps
+                    TX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">testpmd pps
+                    RX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">pktgen MBits/s
+                    TX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">throughput
+                    (%)</emphasis></entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">64</emphasis></entry>
+
+                    <entry>14525286</entry>
+
+                    <entry>14190869</entry>
+
+                    <entry>9739</entry>
+
+                    <entry>97.7</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">128</emphasis></entry>
+
+                    <entry>8456960</entry>
+
+                    <entry>8412172</entry>
+
+                    <entry>10013</entry>
+
+                    <entry>99.4</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">256</emphasis></entry>
+
+                    <entry>4566624</entry>
+
+                    <entry>4526587</entry>
+
+                    <entry>10083</entry>
+
+                    <entry>99.1</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">512</emphasis></entry>
+
+                    <entry>2363744</entry>
+
+                    <entry>2348015</entry>
+
+                    <entry>10060</entry>
+
+                    <entry>99.3</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </table></para>
+        </section>
+      </section>
     </section>
 
     <section id="vm-benchmarks">
@@ -1253,6 +1376,262 @@ show port stats 0</programlisting>For VM1, we record the stats relevant for
           </table>
         </section>
       </section>
+
+      <section id="pxe-config-vm">
+        <title>SR-IOV in Virtual Machines</title>
+
+        <para>PCI passthrough tests using pktgen and testpmd in virtual
+        machines.</para>
+
+        <para>pktgen[DPDK]VM - PHY - VM[DPDK] testpmd.</para>
+
+        <para>Measurements:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>pktgen to testpmd in <emphasis
+            role="bold">forwarding</emphasis> mode.</para>
+          </listitem>
+
+          <listitem>
+            <para>pktgen to testpmd in <emphasis
+            role="bold">termination</emphasis> mode.</para>
+          </listitem>
+        </itemizedlist>
+
+        <section id="test-setup-target-four">
+          <title>Test Setup</title>
+
+          <para>SSD boot using the following <literal>grub.cfg</literal>
+          entry: <programlisting>linux (hd0,gpt3)/boot/bzImage root=/dev/sda3 ip=dhcp nohz_full=1-7 /
+isolcpus=1-7 rcu-nocbs=1-7 rcu_nocb_poll intel_pstate=disable /
+clocksource=tsc tsc=reliable nohpet nosoftlockup intel_idle.max_cstate=0 /
+processor.max_cstate=0 mce=ignore_ce audit=0 nmi_watchdog=0 iommu=pt /
+intel_iommu=on  hugepagesz=1GB hugepages=8 default_hugepagesz=1GB /
+hugepagesz=2M hugepages=2048 vfio_iommu_type1.allow_unsafe_interrupts=1</programlisting>Stop
+          other services and mount hugepages: <programlisting>systemctl stop openvswitch
+mkdir -p /mnt/huge
+mount -t hugetlbfs hugetlbfs /mnt/huge</programlisting>Configure SR-IOV
+          interfaces:<programlisting>/usr/share/usertools/dpdk-devbind.py --bind=ixgbe 0000:03:00.0
+echo 2 &gt; /sys/class/net/eno3/device/sriov_numvfs
+ifconfig eno3 10.0.0.1
+modprobe vfio_pci
+/usr/share/usertools/dpdk-devbind.py --bind=vfio-pci 0000:03:10.0
+/usr/share/usertools/dpdk-devbind.py --bind=vfio-pci 0000:03:10.2
+ip link set eno3 vf 0 mac 0c:c4:7a:E5:0F:48
+ip link set eno3 vf 1 mac 0c:c4:7a:BF:52:E7</programlisting>Launch two QEMU
+          instances: <programlisting>taskset -c 4,5 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M /
+q35 -smp cores=2,sockets=1 -vcpu 0,affinity=4 -vcpu 1,affinity=5 -enable-kvm /
+-nographic -kernel /mnt/qemu/bzImage /
+-drive file=/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4,if=virtio,/
+format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/
+share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.0 /
+-append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 /
+isolcpus=1 nohz_full=1 rcu_nocbs=1 irqaffinity=0 rcu_nocb_poll /
+intel_pstate=disable intel_idle.max_cstate=0 /
+processor.max_cstate=0 mce=ignore_ce audit=0'
+
+
+taskset -c 2,3 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M /
+q35 -smp cores=2,sockets=1 -vcpu 0,affinity=2 -vcpu 1,affinity=3  -enable-kvm /
+-nographic -kernel /mnt/qemu/bzImage /
+-drive file=/mnt/qemu/enea-image2-virtualization-guest-qemux86-64.ext4,if=virtio,/
+format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/
+share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.2 /
+-append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 /
+isolcpus=1 nohz_full=1 rcu_nocbs=1 irqaffinity=0 rcu_nocb_poll /
+intel_pstate=disable intel_idle.max_cstate=0 processor.max_cstate=0 /
+mce=ignore_ce audit=0'</programlisting>In the first VM, mount hugepages and
+          start pktgen:<programlisting>mkdir -p /mnt/huge &amp;&amp; \
+mount -t hugetlbfs hugetlbfs /mnt/huge
+modprobe igb_uio
+/usr/share/usertools/dpdk-devbind.py --bind=igb_uio 0000:00:03.0
+cd /usr/share/apps/pktgen
+./pktgen -c 0x3 -- -P -m "1.0"</programlisting>In the pktgen console set the
+          MAC of the destination and start generating
+          packages:<programlisting>set mac 0 0C:C4:7A:BF:52:E7
+str</programlisting>In the second VM, mount hugepages and start
+          testpmd:<programlisting>mkdir -p /mnt/huge &amp;&amp; \
+mount -t hugetlbfs hugetlbfs /mnt/huge
+modprobe igb_uio
+/usr/share/usertools/dpdk-devbind.py --bind=igb_uio 0000:00:03.0
+testpmd -c 0x3 -n 2 -- -i --txd=512 --rxd=512  --port-topology=chained /
+--eth-peer=0,0c:c4:7a:e5:0f:48</programlisting>In order to enable <emphasis
+          role="bold">forwarding</emphasis> mode, in the testpmd console,
+          run:<programlisting>set fwd mac
+start</programlisting>In order to enable <emphasis
+          role="bold">termination</emphasis> mode, in the testpmd console,
+          run:<programlisting>set fwd rxonly
+start</programlisting><table>
+              <title>Results in forwarding mode</title>
+
+              <tgroup cols="5">
+                <tbody>
+                  <row>
+                    <entry align="center"><emphasis
+                    role="bold">Bytes</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM1 pktgen pps
+                    TX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM1 pktgen pps
+                    RX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM2 testpmd
+                    pps RX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM2 testpmd
+                    pps RX</emphasis></entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">64</emphasis></entry>
+
+                    <entry>7105645</entry>
+
+                    <entry>7103976</entry>
+
+                    <entry>7101487</entry>
+
+                    <entry>7101487</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">128</emphasis></entry>
+
+                    <entry>5722795</entry>
+
+                    <entry>5722252</entry>
+
+                    <entry>5704219</entry>
+
+                    <entry>5704219</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">256</emphasis></entry>
+
+                    <entry>3454075</entry>
+
+                    <entry>3455144</entry>
+
+                    <entry>3452020</entry>
+
+                    <entry>3452020</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">512</emphasis></entry>
+
+                    <entry>1847751</entry>
+
+                    <entry>1847751</entry>
+
+                    <entry>1847751</entry>
+
+                    <entry>1847751</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">1024</emphasis></entry>
+
+                    <entry>956214</entry>
+
+                    <entry>956214</entry>
+
+                    <entry>956214</entry>
+
+                    <entry>956214</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">1500</emphasis></entry>
+
+                    <entry>797174</entry>
+
+                    <entry>797174</entry>
+
+                    <entry>797174</entry>
+
+                    <entry>797174</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </table><table>
+              <title>Results in termination mode</title>
+
+              <tgroup cols="3">
+                <tbody>
+                  <row>
+                    <entry align="center"><emphasis
+                    role="bold">Bytes</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM1 pktgen pps
+                    TX</emphasis></entry>
+
+                    <entry align="center"><emphasis role="bold">VM2 testpmd
+                    RX</emphasis></entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">64</emphasis></entry>
+
+                    <entry>14204580</entry>
+
+                    <entry>14205063</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">128</emphasis></entry>
+
+                    <entry>8424611</entry>
+
+                    <entry>8424611</entry>
+                  </row>
+
+                  <row>
+                    <entry role="bold"><emphasis
+                    role="bold">256</emphasis></entry>
+
+                    <entry>4529024</entry>
+
+                    <entry>4529024</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">512</emphasis></entry>
+
+                    <entry>2348640</entry>
+
+                    <entry>2348640</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">1024</emphasis></entry>
+
+                    <entry>1197101</entry>
+
+                    <entry>1197101</entry>
+                  </row>
+
+                  <row>
+                    <entry><emphasis role="bold">1500</emphasis></entry>
+
+                    <entry>822244</entry>
+
+                    <entry>822244</entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </table></para>
+        </section>
+      </section>
     </section>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk
index 92e395c..9867951 100644
--- a/doc/manifest_conf.mk
+++ b/doc/manifest_conf.mk
@@ -5,4 +5,4 @@
 #MANIFESTHASH      ?= 0d0f06384afa65eaae4b170e234ee5a813edf44d
         #change the above value later to refs/tags/ELnnn (?)
 MANIFESTURL       := git@git.enea.com:linux/manifests/el_manifests-virtualization.git
-PROFILE_NAME      := Enea NFV Access Platform
+PROFILE_NAME      := Enea NFV Access Platform.$(shell date +"%Y.%m.%d %H:%M:%S")