1 diff --git a/doc/guides/index.rst b/doc/guides/index.rst
2 index 0441859..57570f6 100644
3 --- a/doc/guides/index.rst
4 +++ b/doc/guides/index.rst
5 @@ -41,6 +41,7 @@ DPDK documentation
13 diff --git a/doc/guides/sample_app_ug/index.rst b/doc/guides/sample_app_ug/index.rst
14 index 96bb317..6573452 100644
15 --- a/doc/guides/sample_app_ug/index.rst
16 +++ b/doc/guides/sample_app_ug/index.rst
17 @@ -72,11 +72,9 @@ Sample Applications User Guide
29 diff --git a/doc/guides/sample_app_ug/pdump.rst b/doc/guides/sample_app_ug/pdump.rst
30 deleted file mode 100644
31 index ac0e7c9..0000000
32 --- a/doc/guides/sample_app_ug/pdump.rst
37 - Copyright(c) 2016 Intel Corporation. All rights reserved.
38 - All rights reserved.
40 - Redistribution and use in source and binary forms, with or without
41 - modification, are permitted provided that the following conditions
44 - * Redistributions of source code must retain the above copyright
45 - notice, this list of conditions and the following disclaimer.
46 - * Redistributions in binary form must reproduce the above copyright
47 - notice, this list of conditions and the following disclaimer in
48 - the documentation and/or other materials provided with the
50 - * Neither the name of Intel Corporation nor the names of its
51 - contributors may be used to endorse or promote products derived
52 - from this software without specific prior written permission.
54 - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
55 - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
56 - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
57 - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
58 - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
59 - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
60 - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
61 - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
62 - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
63 - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
64 - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
67 -dpdk-pdump Application
68 -======================
70 -The ``dpdk-pdump`` tool is a Data Plane Development Kit (DPDK) tool that runs as
71 -a DPDK secondary process and is capable of enabling packet capture on dpdk ports.
75 - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled
76 - by default in the build configuration files,
77 - owing to an external dependency on the libpcap development files
78 - which must be installed on the board.
79 - Once the libpcap development files are installed, the libpcap based PMD
80 - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK.
83 -Running the Application
84 ------------------------
86 -The tool has a number of command line options:
88 -.. code-block:: console
90 - ./build/app/dpdk-pdump --
91 - --pdump '(port=<port id> | device_id=<pci id or vdev name>),
93 - (rx-dev=<iface or pcap file> |
94 - tx-dev=<iface or pcap file>),
95 - [ring-size=<ring size>],
96 - [mbuf-size=<mbuf data size>],
97 - [total-num-mbufs=<number of mbufs>]'
98 - [--server-socket-path=<server socket dir>]
99 - [--client-socket-path=<client socket dir>]
101 -The ``--pdump`` command line option is mandatory and it takes various sub arguments which are described in
106 - * Parameters inside the parentheses represents mandatory parameters.
108 - * Parameters inside the square brackets represents optional parameters.
110 - * Multiple instances of ``--pdump`` can be passed to capture packets on different port and queue combinations.
112 -The ``--server-socket-path`` command line option is optional. This represents the server socket directory.
113 -If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
116 -The ``--client-socket-path`` command line option is optional. This represents the client socket directory.
117 -If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
121 -The ``--pdump`` parameters
122 -~~~~~~~~~~~~~~~~~~~~~~~~~~
125 -Port id of the eth device on which packets should be captured.
128 -PCI address (or) name of the eth device on which packets should be captured.
132 - * As of now the ``dpdk-pdump`` tool cannot capture the packets of virtual devices
133 - in the primary process due to a bug in the ethdev library. Due to this bug, in a multi process context,
134 - when the primary and secondary have different ports set, then the secondary process
135 - (here the ``dpdk-pdump`` tool) overwrites the ``rte_eth_devices[]`` entries of the primary process.
138 -Queue id of the eth device on which packets should be captured. The user can pass a queue value of ``*`` to enable
139 -packet capture on all queues of the eth device.
142 -Can be either a pcap file name or any Linux iface.
145 -Can be either a pcap file name or any Linux iface.
149 - * To receive ingress packets only, ``rx-dev`` should be passed.
151 - * To receive egress packets only, ``tx-dev`` should be passed.
153 - * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
154 - should both be passed with the different file names or the Linux iface names.
156 - * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
157 - should both be passed with the same file names or the the Linux iface names.
160 -Size of the ring. This value is used internally for ring creation. The ring will be used to enqueue the packets from
161 -the primary application to the secondary. This is an optional parameter with default size 16384.
164 -Size of the mbuf data. This is used internally for mempool creation. Ideally this value must be same as
165 -the primary application's mempool's mbuf data size which is used for packet RX. This is an optional parameter with
168 -``total-num-mbufs``:
169 -Total number mbufs in mempool. This is used internally for mempool creation. This is an optional parameter with default
176 -.. code-block:: console
178 - $ sudo ./build/app/dpdk-pdump -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap'
179 diff --git a/doc/guides/sample_app_ug/proc_info.rst b/doc/guides/sample_app_ug/proc_info.rst
180 deleted file mode 100644
181 index 73f2195..0000000
182 --- a/doc/guides/sample_app_ug/proc_info.rst
187 - Copyright(c) 2015 Intel Corporation. All rights reserved.
188 - All rights reserved.
190 - Redistribution and use in source and binary forms, with or without
191 - modification, are permitted provided that the following conditions
194 - * Redistributions of source code must retain the above copyright
195 - notice, this list of conditions and the following disclaimer.
196 - * Redistributions in binary form must reproduce the above copyright
197 - notice, this list of conditions and the following disclaimer in
198 - the documentation and/or other materials provided with the
200 - * Neither the name of Intel Corporation nor the names of its
201 - contributors may be used to endorse or promote products derived
202 - from this software without specific prior written permission.
204 - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
205 - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
206 - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
207 - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
208 - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
209 - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
210 - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
211 - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
212 - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
213 - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
214 - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
217 -dpdk-procinfo Application
218 -=========================
220 -The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application
221 -that runs as a DPDK secondary process and is capable of retrieving port
222 -statistics, resetting port statistics and printing DPDK memory information.
223 -This application extends the original functionality that was supported by
226 -Running the Application
227 ------------------------
228 -The application has a number of command line options:
230 -.. code-block:: console
232 - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats |
233 - --stats-reset | --xstats-reset]
237 -**-p PORTMASK**: Hexadecimal bitmask of ports to configure.
240 -The stats parameter controls the printing of generic port statistics. If no
241 -port mask is specified stats are printed for all DPDK ports.
244 -The stats parameter controls the printing of extended port statistics. If no
245 -port mask is specified xstats are printed for all DPDK ports.
248 -The stats-reset parameter controls the resetting of generic port statistics. If
249 -no port mask is specified, the generic stats are reset for all DPDK ports.
252 -The xstats-reset parameter controls the resetting of extended port statistics.
253 -If no port mask is specified xstats are reset for all DPDK ports.
255 -**-m**: Print DPDK memory information.
256 diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst
258 index 0000000..d7654a2
260 +++ b/doc/guides/tools/index.rst
263 + Copyright(c) 2016 Canonical Limited. All rights reserved.
264 + All rights reserved.
266 + Redistribution and use in source and binary forms, with or without
267 + modification, are permitted provided that the following conditions
270 + * Redistributions of source code must retain the above copyright
271 + notice, this list of conditions and the following disclaimer.
272 + * Redistributions in binary form must reproduce the above copyright
273 + notice, this list of conditions and the following disclaimer in
274 + the documentation and/or other materials provided with the
276 + * Neither the name of Intel Corporation nor the names of its
277 + contributors may be used to endorse or promote products derived
278 + from this software without specific prior written permission.
280 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
281 + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
282 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
283 + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
284 + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
285 + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
286 + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
287 + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
288 + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
289 + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
290 + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
302 diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst
304 index 0000000..ac0e7c9
306 +++ b/doc/guides/tools/pdump.rst
310 + Copyright(c) 2016 Intel Corporation. All rights reserved.
311 + All rights reserved.
313 + Redistribution and use in source and binary forms, with or without
314 + modification, are permitted provided that the following conditions
317 + * Redistributions of source code must retain the above copyright
318 + notice, this list of conditions and the following disclaimer.
319 + * Redistributions in binary form must reproduce the above copyright
320 + notice, this list of conditions and the following disclaimer in
321 + the documentation and/or other materials provided with the
323 + * Neither the name of Intel Corporation nor the names of its
324 + contributors may be used to endorse or promote products derived
325 + from this software without specific prior written permission.
327 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
328 + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
329 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
330 + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
331 + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
332 + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
333 + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
334 + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
335 + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
336 + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
337 + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
340 +dpdk-pdump Application
341 +======================
343 +The ``dpdk-pdump`` tool is a Data Plane Development Kit (DPDK) tool that runs as
344 +a DPDK secondary process and is capable of enabling packet capture on dpdk ports.
348 + * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled
349 + by default in the build configuration files,
350 + owing to an external dependency on the libpcap development files
351 + which must be installed on the board.
352 + Once the libpcap development files are installed, the libpcap based PMD
353 + can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK.
356 +Running the Application
357 +-----------------------
359 +The tool has a number of command line options:
361 +.. code-block:: console
363 + ./build/app/dpdk-pdump --
364 + --pdump '(port=<port id> | device_id=<pci id or vdev name>),
365 + (queue=<queue_id>),
366 + (rx-dev=<iface or pcap file> |
367 + tx-dev=<iface or pcap file>),
368 + [ring-size=<ring size>],
369 + [mbuf-size=<mbuf data size>],
370 + [total-num-mbufs=<number of mbufs>]'
371 + [--server-socket-path=<server socket dir>]
372 + [--client-socket-path=<client socket dir>]
374 +The ``--pdump`` command line option is mandatory and it takes various sub arguments which are described in
379 + * Parameters inside the parentheses represents mandatory parameters.
381 + * Parameters inside the square brackets represents optional parameters.
383 + * Multiple instances of ``--pdump`` can be passed to capture packets on different port and queue combinations.
385 +The ``--server-socket-path`` command line option is optional. This represents the server socket directory.
386 +If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
389 +The ``--client-socket-path`` command line option is optional. This represents the client socket directory.
390 +If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
394 +The ``--pdump`` parameters
395 +~~~~~~~~~~~~~~~~~~~~~~~~~~
398 +Port id of the eth device on which packets should be captured.
401 +PCI address (or) name of the eth device on which packets should be captured.
405 + * As of now the ``dpdk-pdump`` tool cannot capture the packets of virtual devices
406 + in the primary process due to a bug in the ethdev library. Due to this bug, in a multi process context,
407 + when the primary and secondary have different ports set, then the secondary process
408 + (here the ``dpdk-pdump`` tool) overwrites the ``rte_eth_devices[]`` entries of the primary process.
411 +Queue id of the eth device on which packets should be captured. The user can pass a queue value of ``*`` to enable
412 +packet capture on all queues of the eth device.
415 +Can be either a pcap file name or any Linux iface.
418 +Can be either a pcap file name or any Linux iface.
422 + * To receive ingress packets only, ``rx-dev`` should be passed.
424 + * To receive egress packets only, ``tx-dev`` should be passed.
426 + * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
427 + should both be passed with the different file names or the Linux iface names.
429 + * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
430 + should both be passed with the same file names or the the Linux iface names.
433 +Size of the ring. This value is used internally for ring creation. The ring will be used to enqueue the packets from
434 +the primary application to the secondary. This is an optional parameter with default size 16384.
437 +Size of the mbuf data. This is used internally for mempool creation. Ideally this value must be same as
438 +the primary application's mempool's mbuf data size which is used for packet RX. This is an optional parameter with
441 +``total-num-mbufs``:
442 +Total number mbufs in mempool. This is used internally for mempool creation. This is an optional parameter with default
449 +.. code-block:: console
451 + $ sudo ./build/app/dpdk-pdump -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap'
452 diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst
454 index 0000000..73f2195
456 +++ b/doc/guides/tools/proc_info.rst
460 + Copyright(c) 2015 Intel Corporation. All rights reserved.
461 + All rights reserved.
463 + Redistribution and use in source and binary forms, with or without
464 + modification, are permitted provided that the following conditions
467 + * Redistributions of source code must retain the above copyright
468 + notice, this list of conditions and the following disclaimer.
469 + * Redistributions in binary form must reproduce the above copyright
470 + notice, this list of conditions and the following disclaimer in
471 + the documentation and/or other materials provided with the
473 + * Neither the name of Intel Corporation nor the names of its
474 + contributors may be used to endorse or promote products derived
475 + from this software without specific prior written permission.
477 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
478 + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
479 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
480 + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
481 + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
482 + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
483 + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
484 + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
485 + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
486 + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
487 + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
490 +dpdk-procinfo Application
491 +=========================
493 +The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application
494 +that runs as a DPDK secondary process and is capable of retrieving port
495 +statistics, resetting port statistics and printing DPDK memory information.
496 +This application extends the original functionality that was supported by
499 +Running the Application
500 +-----------------------
501 +The application has a number of command line options:
503 +.. code-block:: console
505 + ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats |
506 + --stats-reset | --xstats-reset]
510 +**-p PORTMASK**: Hexadecimal bitmask of ports to configure.
513 +The stats parameter controls the printing of generic port statistics. If no
514 +port mask is specified stats are printed for all DPDK ports.
517 +The stats parameter controls the printing of extended port statistics. If no
518 +port mask is specified xstats are printed for all DPDK ports.
521 +The stats-reset parameter controls the resetting of generic port statistics. If
522 +no port mask is specified, the generic stats are reset for all DPDK ports.
525 +The xstats-reset parameter controls the resetting of extended port statistics.
526 +If no port mask is specified xstats are reset for all DPDK ports.
528 +**-m**: Print DPDK memory information.