* [dpdk-stable] patch 'raw/ifpga: fix file descriptor leak in error path' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
@ 2019-05-08 16:01 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix spelling reported by aspell in guides' " Kevin Traynor
` (33 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:01 UTC (permalink / raw)
To: Li Qiang; +Cc: Rosen Xu, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1f78ae57332f0e11eaa154f9f6fc8026d483992d
Thanks.
Kevin Traynor
---
From 1f78ae57332f0e11eaa154f9f6fc8026d483992d Mon Sep 17 00:00:00 2001
From: Li Qiang <liq3ea@163.com>
Date: Tue, 16 Apr 2019 13:05:14 +0800
Subject: [PATCH] raw/ifpga: fix file descriptor leak in error path
[ upstream commit 194a83d837472a27030e55af95b1103c90c2c63a ]
In rte_fpga_do_pr() function, if 'stat' return error the
'file_fd' is never closed thus leading a fd leak.
This patch avoids this.
Coverity issue: 279441
Fixes: ef1e8ede3da59e ("raw/ifpga: add Intel FPGA bus rawdev driver")
Signed-off-by: Li Qiang <liq3ea@163.com>
Acked-by: Rosen Xu <rosen.xu@intel.com>
---
drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index da772d026..eff001b59 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -245,5 +245,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
IFPGA_RAWDEV_PMD_ERR("stat on bitstream file failed: %s\n",
file_name);
- return -EINVAL;
+ ret = -EINVAL;
+ goto close_fd;
}
buffer_size = file_stat.st_size;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.535308833 +0100
+++ 0002-raw-ifpga-fix-file-descriptor-leak-in-error-path.patch 2019-05-08 16:33:57.269582707 +0100
@@ -1 +1 @@
-From 194a83d837472a27030e55af95b1103c90c2c63a Mon Sep 17 00:00:00 2001
+From 1f78ae57332f0e11eaa154f9f6fc8026d483992d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 194a83d837472a27030e55af95b1103c90c2c63a ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 33b2511de..41be1a205 100644
+index da772d026..eff001b59 100644
@@ -24 +25 @@
-@@ -293,5 +293,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
+@@ -245,5 +245,6 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'doc: fix spelling reported by aspell in guides' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
2019-05-08 16:01 ` [dpdk-stable] patch 'raw/ifpga: fix file descriptor leak in error path' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix spelling reported by aspell in comments' " Kevin Traynor
` (32 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: John McNamara; +Cc: Rami Rosen, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8ca6a5b8794806d131f4bd3faf776894d8ecd90a
Thanks.
Kevin Traynor
---
From 8ca6a5b8794806d131f4bd3faf776894d8ecd90a Mon Sep 17 00:00:00 2001
From: John McNamara <john.mcnamara@intel.com>
Date: Fri, 26 Apr 2019 16:14:21 +0100
Subject: [PATCH] doc: fix spelling reported by aspell in guides
[ upstream commit d629b7b5fe812f0040b83d27d2ada33b003aa918 ]
Fix spelling errors in the guide docs.
Signed-off-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
doc/guides/compressdevs/overview.rst | 2 +-
doc/guides/contributing/patches.rst | 2 +-
doc/guides/cryptodevs/aesni_mb.rst | 2 +-
doc/guides/cryptodevs/overview.rst | 2 +-
doc/guides/cryptodevs/scheduler.rst | 2 +-
doc/guides/eventdevs/opdl.rst | 2 +-
doc/guides/eventdevs/sw.rst | 4 +--
doc/guides/howto/lm_bond_virtio_sriov.rst | 2 +-
doc/guides/howto/lm_virtio_vhost_user.rst | 4 +--
doc/guides/howto/rte_flow.rst | 6 ++--
.../howto/virtio_user_as_exceptional_path.rst | 8 +++---
doc/guides/nics/atlantic.rst | 2 +-
doc/guides/nics/cxgbe.rst | 4 +--
doc/guides/nics/dpaa.rst | 2 +-
doc/guides/nics/dpaa2.rst | 2 +-
doc/guides/nics/enetc.rst | 2 +-
doc/guides/nics/enic.rst | 2 +-
doc/guides/nics/features.rst | 2 +-
doc/guides/nics/i40e.rst | 2 +-
doc/guides/nics/ixgbe.rst | 4 +--
doc/guides/nics/kni.rst | 2 +-
doc/guides/nics/mlx5.rst | 2 +-
doc/guides/nics/mvpp2.rst | 2 +-
doc/guides/nics/netvsc.rst | 2 +-
doc/guides/nics/sfc_efx.rst | 14 +++++-----
doc/guides/nics/szedata2.rst | 2 +-
doc/guides/nics/tap.rst | 2 +-
doc/guides/platform/dpaa.rst | 4 +--
doc/guides/platform/dpaa2.rst | 4 +--
doc/guides/prog_guide/bbdev.rst | 4 +--
doc/guides/prog_guide/compressdev.rst | 6 ++--
doc/guides/prog_guide/cryptodev_lib.rst | 12 ++++----
.../prog_guide/dev_kit_build_system.rst | 2 +-
doc/guides/prog_guide/efd_lib.rst | 2 +-
.../prog_guide/env_abstraction_layer.rst | 2 +-
.../prog_guide/event_ethernet_rx_adapter.rst | 6 ++--
doc/guides/prog_guide/eventdev.rst | 6 ++--
.../prog_guide/kernel_nic_interface.rst | 2 +-
doc/guides/prog_guide/metrics_lib.rst | 2 +-
doc/guides/prog_guide/multi_proc_support.rst | 2 +-
doc/guides/prog_guide/profile_app.rst | 4 +--
doc/guides/prog_guide/rte_flow.rst | 8 +++---
doc/guides/prog_guide/rte_security.rst | 20 ++++++-------
doc/guides/prog_guide/traffic_management.rst | 2 +-
doc/guides/prog_guide/vhost_lib.rst | 2 +-
doc/guides/rawdevs/ifpga_rawdev.rst | 2 +-
doc/guides/rel_notes/known_issues.rst | 8 +++---
doc/guides/rel_notes/release_17_11.rst | 10 +++----
doc/guides/sample_app_ug/bbdev_app.rst | 4 +--
.../sample_app_ug/eventdev_pipeline.rst | 2 +-
doc/guides/sample_app_ug/intro.rst | 2 +-
doc/guides/sample_app_ug/ip_pipeline.rst | 4 +--
doc/guides/sample_app_ug/ipsec_secgw.rst | 4 +--
.../sample_app_ug/performance_thread.rst | 4 +--
doc/guides/sample_app_ug/qos_metering.rst | 2 +-
doc/guides/sample_app_ug/test_pipeline.rst | 2 +-
doc/guides/sample_app_ug/vhost.rst | 4 +--
doc/guides/sample_app_ug/vhost_scsi.rst | 2 +-
.../sample_app_ug/vm_power_management.rst | 10 +++----
doc/guides/testpmd_app_ug/run_app.rst | 10 +++----
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 28 +++++++++----------
doc/guides/tools/cryptoperf.rst | 22 +++++++--------
doc/guides/tools/proc_info.rst | 2 +-
doc/guides/tools/testbbdev.rst | 2 +-
64 files changed, 149 insertions(+), 149 deletions(-)
diff --git a/doc/guides/compressdevs/overview.rst b/doc/guides/compressdevs/overview.rst
index 70bbe82b7..809e4e6e7 100644
--- a/doc/guides/compressdevs/overview.rst
+++ b/doc/guides/compressdevs/overview.rst
@@ -19,5 +19,5 @@ Supported Feature Flags
- "OOP SGL In SGL Out" feature flag stands for
- "Out-of-place Scatter-gather list Input, Scatter-gater list Output",
+ "Out-of-place Scatter-gather list Input, Scatter-gather list Output",
which means PMD supports different scatter-gather styled input and output buffers
(i.e. both can consists of multiple segments).
diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index a64bb0368..427137dc7 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -9,5 +9,5 @@ Contributing Code to DPDK
This document outlines the guidelines for submitting code to DPDK.
-The DPDK development process is modelled (loosely) on the Linux Kernel development model so it is worth reading the
+The DPDK development process is modeled (loosely) on the Linux Kernel development model so it is worth reading the
Linux kernel guide on submitting patches:
`How to Get Your Change Into the Linux Kernel <https://www.kernel.org/doc/html/latest/process/submitting-patches.html>`_.
diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst
index d9fd41ae5..ccfc137f1 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -126,5 +126,5 @@ For AES Counter mode (AES-CTR), the library supports two different sizes for Ini
Vector (IV):
-* 12 bytes: used mainly for IPSec, as it requires 12 bytes from the user, which internally
+* 12 bytes: used mainly for IPsec, as it requires 12 bytes from the user, which internally
are appended the counter block (4 bytes), which is set to 1 for the first block
(no padding required from the user)
diff --git a/doc/guides/cryptodevs/overview.rst b/doc/guides/cryptodevs/overview.rst
index 407f063de..f9f8c7bec 100644
--- a/doc/guides/cryptodevs/overview.rst
+++ b/doc/guides/cryptodevs/overview.rst
@@ -19,5 +19,5 @@ Supported Feature Flags
- "OOP SGL In SGL Out" feature flag stands for
- "Out-of-place Scatter-gather list Input, Scatter-gater list Output",
+ "Out-of-place Scatter-gather list Input, Scatter-gather list Output",
which means pmd supports different scatter-gather styled input and output buffers
(i.e. both can consists of multiple segments).
diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst
index a754a27e6..7004ca431 100644
--- a/doc/guides/cryptodevs/scheduler.rst
+++ b/doc/guides/cryptodevs/scheduler.rst
@@ -166,5 +166,5 @@ operation:
an optimal solution, as it doesn't give significant per-core performance improvement.
For mixed traffic (IMIX) the optimal number of worker cores is around 2-3.
- For large packets (1.5 Kbytes) scheduler shows linear scaling in performance
+ For large packets (1.5 kbytes) scheduler shows linear scaling in performance
up to eight cores.
Each worker uses its own slave cryptodev. Only software cryptodevs
diff --git a/doc/guides/eventdevs/opdl.rst b/doc/guides/eventdevs/opdl.rst
index 0262a337a..979f6cd8d 100644
--- a/doc/guides/eventdevs/opdl.rst
+++ b/doc/guides/eventdevs/opdl.rst
@@ -9,5 +9,5 @@ implementation of the eventdev API. It is particularly suited to packet\
processing workloads that have high throughput and low latency requirements.\
All packets follow the same path through the device. The order in which\
-packets follow is determinted by the order in which queues are set up.\
+packets follow is determined by the order in which queues are set up.\
Events are left on the ring until they are transmitted. As a result packets\
do not go out of order
diff --git a/doc/guides/eventdevs/sw.rst b/doc/guides/eventdevs/sw.rst
index afdcad760..04c8b0305 100644
--- a/doc/guides/eventdevs/sw.rst
+++ b/doc/guides/eventdevs/sw.rst
@@ -71,5 +71,5 @@ The credit quanta is the number of credits that a port will fetch at a time from
the instance's credit pool. Higher numbers will cause less overhead in the
atomic credit fetch code, however it also reduces the overall number of credits
-in the system faster. A balanced number (eg 32) ensures that only small numbers
+in the system faster. A balanced number (e.g. 32) ensures that only small numbers
of credits are pre-allocated at a time, while also mitigating performance impact
of the atomics.
@@ -101,5 +101,5 @@ feature would be significant.
The software eventdev does not support creating queues that handle all types of
-traffic. An eventdev with this capability allows enqueueing Atomic, Ordered and
+traffic. An eventdev with this capability allows enqueuing Atomic, Ordered and
Parallel traffic to the same queue, but scheduling each of them appropriately.
diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst
index a47d6dbf8..4e5ef4d56 100644
--- a/doc/guides/howto/lm_bond_virtio_sriov.rst
+++ b/doc/guides/howto/lm_bond_virtio_sriov.rst
@@ -329,5 +329,5 @@ On host_server_2: Terminal 1
.. code-block:: console
- testomd> show port info all
+ testpmd> show port info all
testpmd> show port stats all
testpmd> show bonding config 2
diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst
index 3f5ebd58a..019c124d4 100644
--- a/doc/guides/howto/lm_virtio_vhost_user.rst
+++ b/doc/guides/howto/lm_virtio_vhost_user.rst
@@ -244,5 +244,5 @@ On host_server_2: Terminal 1
.. code-block:: console
- testomd> show port info all
+ testpmd> show port info all
testpmd> show port stats all
@@ -339,5 +339,5 @@ reset_vf_on_212_131.sh
# This script is run on the host 10.237.212.131 to reset SRIOV
- # BDF for Ninatic NIC is 0000:06:00.0
+ # BDF for Niantic NIC is 0000:06:00.0
cat /sys/bus/pci/devices/0000\:06\:00.0/max_vfs
echo 0 > /sys/bus/pci/devices/0000\:06\:00.0/max_vfs
diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index 6a8534d98..e080570e9 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -24,5 +24,5 @@ destination equals 192.168.3.2. This code is equivalent to the following
testpmd command (wrapped for clarity)::
- tpmd> flow create 0 ingress pattern eth / vlan /
+ testpmd> flow create 0 ingress pattern eth / vlan /
ipv4 dst is 192.168.3.2 / end actions drop / end
@@ -119,5 +119,5 @@ This code is equivalent to the following testpmd command (wrapped for
clarity)::
- tpmd> flow create 0 ingress pattern eth / vlan /
+ testpmd> flow create 0 ingress pattern eth / vlan /
ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 /
end actions drop / end
@@ -220,5 +220,5 @@ This code is equivalent to the following testpmd command (wrapped for
clarity)::
- tpmd> flow create 0 ingress pattern eth / vlan vid spec 123 /
+ testpmd> flow create 0 ingress pattern eth / vlan vid spec 123 /
end actions queue index 3 / end
diff --git a/doc/guides/howto/virtio_user_as_exceptional_path.rst b/doc/guides/howto/virtio_user_as_exceptional_path.rst
index 4910c12df..ec021af39 100644
--- a/doc/guides/howto/virtio_user_as_exceptional_path.rst
+++ b/doc/guides/howto/virtio_user_as_exceptional_path.rst
@@ -2,5 +2,5 @@
Copyright(c) 2016 Intel Corporation.
-.. _virtio_user_as_excpetional_path:
+.. _virtio_user_as_exceptional_path:
Virtio_user as Exceptional Path
@@ -23,5 +23,5 @@ solution is very promising in:
vhost-net is born to be a networking solution, which has lots of networking
- related featuers, like multi queue, tso, multi-seg mbuf, etc.
+ related features, like multi queue, tso, multi-seg mbuf, etc.
* Performance
@@ -39,5 +39,5 @@ in :numref:`figure_virtio_user_as_exceptional_path`.
.. figure:: img/virtio_user_as_exceptional_path.*
- Overview of a DPDK app using virtio-user as excpetional path
+ Overview of a DPDK app using virtio-user as exceptional path
@@ -76,5 +76,5 @@ compiling the kernel and those kernel modules should be inserted.
* ``queues``
- Number of multi-queues. Each qeueue will be served by a kthread. For example:
+ Number of multi-queues. Each queue will be served by a kthread. For example:
.. code-block:: console
diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst
index 80591b13c..f6f2c66bf 100644
--- a/doc/guides/nics/atlantic.rst
+++ b/doc/guides/nics/atlantic.rst
@@ -19,5 +19,5 @@ Supported features
- RSS (Receive Side Scaling)
- Checksum offload
-- Jumbo Frame upto 16K
+- Jumbo Frame up to 16K
Configuration Information
diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst
index 58d88eef5..39106274e 100644
--- a/doc/guides/nics/cxgbe.rst
+++ b/doc/guides/nics/cxgbe.rst
@@ -127,5 +127,5 @@ enabling debugging options may affect system performance.
- ``CONFIG_RTE_LIBRTE_CXGBE_TPUT`` (default **y**)
- Toggle behaviour to prefer Throughput or Latency.
+ Toggle behavior to prefer Throughput or Latency.
Runtime Options
@@ -141,5 +141,5 @@ be passed as part of EAL arguments. For example,
- ``keep_ovlan`` (default **0**)
- Toggle behaviour to keep/strip outer VLAN in Q-in-Q packets. If
+ Toggle behavior to keep/strip outer VLAN in Q-in-Q packets. If
enabled, the outer VLAN tag is preserved in Q-in-Q packets. Otherwise,
the outer VLAN tag is stripped in Q-in-Q packets.
diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst
index 2173673b9..5900ed0df 100644
--- a/doc/guides/nics/dpaa.rst
+++ b/doc/guides/nics/dpaa.rst
@@ -252,5 +252,5 @@ state during application initialization:
configuration beyond that will be standard Rx queues. The application can
choose to change their number if HW portals are limited.
- The valid values are from '0' to '4'. The valuse shall be set to '0' if the
+ The valid values are from '0' to '4'. The values shall be set to '0' if the
application want to use eventdev with DPAA device.
diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index 769dc4e12..04370e4cd 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -380,5 +380,5 @@ DPBP based Mempool driver
~~~~~~~~~~~~~~~~~~~~~~~~~
-The DPBP driver is bound to a DPBP objects and provides sevices to
+The DPBP driver is bound to a DPBP objects and provides services to
create a hardware offloaded packet buffer mempool.
diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst
index 8038bf205..376768d39 100644
--- a/doc/guides/nics/enetc.rst
+++ b/doc/guides/nics/enetc.rst
@@ -70,5 +70,5 @@ Prerequisites
~~~~~~~~~~~~~
-There are three main pre-requisities for executing ENETC PMD on a ENETC
+There are three main pre-requisites for executing ENETC PMD on a ENETC
compatible board:
diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 3b45b3b3f..c1b83b9b6 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -225,5 +225,5 @@ the use of SR-IOV.
-.. _enic-genic-flow-api:
+.. _enic-generic-flow-api:
Generic Flow API support
diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index c5bf32222..d57ddc2ff 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -496,5 +496,5 @@ Inline crypto
-------------
-Supports inline crypto processing (eg. inline IPsec). See Security library and PMD documentation for more details.
+Supports inline crypto processing (e.g. inline IPsec). See Security library and PMD documentation for more details.
* **[uses] rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_SECURITY``,
diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 40bf0f140..62e90d9fd 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -572,5 +572,5 @@ TC TX scheduling mode setting
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-There're 2 TX scheduling modes for TCs, round robin and strict priority mode.
+There are 2 TX scheduling modes for TCs, round robin and strict priority mode.
If a TC is set to strict priority mode, it can consume unlimited bandwidth.
It means if APP has set the max bandwidth for that TC, it comes to no
diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst
index 1c294b06a..975143f8b 100644
--- a/doc/guides/nics/ixgbe.rst
+++ b/doc/guides/nics/ixgbe.rst
@@ -204,6 +204,6 @@ X550 does not support legacy interrupt mode
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Desccription
-^^^^^^^^^^^^
+Description
+^^^^^^^^^^^
X550 cannot get interrupts if using ``uio_pci_generic`` module or using legacy
interrupt mode of ``igb_uio`` or ``vfio``. Because the errata of X550 states
diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst
index 204fbd563..c4fc96373 100644
--- a/doc/guides/nics/kni.rst
+++ b/doc/guides/nics/kni.rst
@@ -65,5 +65,5 @@ PMD arguments
-------------
-``no_request_thread``, by default PMD creates a phtread for each KNI interface
+``no_request_thread``, by default PMD creates a pthread for each KNI interface
to handle Linux network interface control commands, like ``ifconfig kni0 up``
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index bfa6cf162..cee167bfe 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -169,5 +169,5 @@ Limitations
- must specify the tunnel outer VNI in the VXLAN item.
- must specify the tunnel outer remote (destination) UDP port in the VXLAN item.
- - must specify the tunnel outer local (source) IPv4 or IPv6 in the , this address will locally (with scope link) assigned to the outer network interace, wildcards not allowed.
+ - must specify the tunnel outer local (source) IPv4 or IPv6 in the , this address will locally (with scope link) assigned to the outer network interface, wildcards not allowed.
- must specify the tunnel outer remote (destination) IPv4 or IPv6 in the VXLAN item, group IPs allowed.
- must specify the tunnel outer destination MAC address in the VXLAN item, this address will be used to create neigh rule.
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index b2ddeab50..f63d85875 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -92,5 +92,5 @@ Limitations
- MUSDK architecture does not support changing configuration in run time.
- All nessesary configurations should be done before first dev_start().
+ All necessary configurations should be done before first dev_start().
- RX queue start/stop is not supported.
diff --git a/doc/guides/nics/netvsc.rst b/doc/guides/nics/netvsc.rst
index 87fabf5b8..6dbb9a551 100644
--- a/doc/guides/nics/netvsc.rst
+++ b/doc/guides/nics/netvsc.rst
@@ -90,5 +90,5 @@ operations:
.. Note::
- The dpkd-devbind.py script can not be used since it only handles PCI devices.
+ The dpdk-devbind.py script can not be used since it only handles PCI devices.
diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index 40065284b..f449b19d6 100644
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -97,5 +97,5 @@ Non-supported Features
The features not yet supported include:
-- Receive queue interupts
+- Receive queue interrupts
- Priority-based flow control
@@ -208,10 +208,10 @@ Supported actions:
Validating flow rules depends on the firmware variant.
-Ethernet destinaton individual/group match
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Ethernet destination individual/group match
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Ethernet item supports I/G matching, if only the corresponding bit is set
-in the mask of destination address. If destinaton address in the spec is
-multicast, it matches all multicast (and broadcast) packets, oherwise it
+in the mask of destination address. If destination address in the spec is
+multicast, it matches all multicast (and broadcast) packets, otherwise it
matches unicast packets that are not filtered by other flow rules.
@@ -347,8 +347,8 @@ boolean parameters value.
- ``perf_profile`` [auto|throughput|low-latency] (default **throughput**)
- Choose hardware tunning to be optimized for either throughput or
+ Choose hardware tuning to be optimized for either throughput or
low-latency.
**auto** allows NIC firmware to make a choice based on
- installed licences and firmware variant configured using **sfboot**.
+ installed licenses and firmware variant configured using **sfboot**.
- ``stats_update_period_ms`` [long] (default **1000**)
diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst
index a2092f9c5..94dba82d9 100644
--- a/doc/guides/nics/szedata2.rst
+++ b/doc/guides/nics/szedata2.rst
@@ -90,5 +90,5 @@ Ethernet port may be sent to any queue.
They were historically represented in DPDK as a single port.
-However, the new NFB-200G2QL card employs an addon cable which allows to connect
+However, the new NFB-200G2QL card employs an add-on cable which allows to connect
it to two physical PCI-E slots at the same time (see the diagram below).
This is done to allow 200 Gbps of traffic to be transferred through the PCI-E
diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst
index 9a3d7b348..14c669b7b 100644
--- a/doc/guides/nics/tap.rst
+++ b/doc/guides/nics/tap.rst
@@ -41,5 +41,5 @@ actual MAC address: ``00:64:74:61:70:[00-FF]``.
The MAC address will have a user value passed as string. The MAC address is in
-format with delimeter ``:``. The string is byte converted to hex and you get
+format with delimiter ``:``. The string is byte converted to hex and you get
the actual MAC address: ``00:64:74:61:70:11``.
diff --git a/doc/guides/platform/dpaa.rst b/doc/guides/platform/dpaa.rst
index 390487152..6005f2221 100644
--- a/doc/guides/platform/dpaa.rst
+++ b/doc/guides/platform/dpaa.rst
@@ -5,5 +5,5 @@ NXP QorIQ DPAA Board Support Package
====================================
-This doc has information about steps to setup QorIq dpaa
+This doc has information about steps to setup QorIQ dpaa
based layerscape platform and information about common offload
hw block drivers of **NXP QorIQ DPAA** SoC family.
@@ -39,5 +39,5 @@ Steps To Setup Platform
-----------------------
-There are four main pre-requisities for executing DPAA PMD on a DPAA
+There are four main pre-requisites for executing DPAA PMD on a DPAA
compatible board:
diff --git a/doc/guides/platform/dpaa2.rst b/doc/guides/platform/dpaa2.rst
index 5a64406eb..2586af0ff 100644
--- a/doc/guides/platform/dpaa2.rst
+++ b/doc/guides/platform/dpaa2.rst
@@ -5,5 +5,5 @@ NXP QorIQ DPAA2 Board Support Package
=====================================
-This doc has information about steps to setup NXP QoriQ DPAA2 platform
+This doc has information about steps to setup NXP QorIQ DPAA2 platform
and information about common offload hw block drivers of
**NXP QorIQ DPAA2** SoC family.
@@ -49,5 +49,5 @@ Steps To Setup Platform
-----------------------
-There are four main pre-requisities for executing DPAA2 PMD on a DPAA2
+There are four main pre-requisites for executing DPAA2 PMD on a DPAA2
compatible board:
diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index 9de14443e..658ffd400 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -79,5 +79,5 @@ one or more queues identified by queue IDs. While different devices may have
different capabilities (e.g. support different operation types), all queues on
a device support identical configuration possibilities. A queue is configured
-for only one type of operation and is configured at initializations time.
+for only one type of operation and is configured at initialization time.
When an operation is enqueued to a specific queue ID, the result is dequeued
from the same queue ID.
@@ -679,5 +679,5 @@ baseband processor capable of transceiving data packets.
The following sample C-like pseudo-code shows the basic steps to encode several
-buffers using (**sw_trubo**) bbdev PMD.
+buffers using (**sw_turbo**) bbdev PMD.
.. code-block:: c
diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst
index 87e264906..3ba4238ce 100644
--- a/doc/guides/prog_guide/compressdev.rst
+++ b/doc/guides/prog_guide/compressdev.rst
@@ -18,5 +18,5 @@ Device Creation
Physical compression devices are discovered during the bus probe of the EAL function
which is executed at DPDK initialization, based on their unique device identifier.
-For eg. PCI devices can be identified using PCI BDF (bus/bridge, device, function).
+For e.g. PCI devices can be identified using PCI BDF (bus/bridge, device, function).
Specific physical compression devices, like other physical devices in DPDK can be
white-listed or black-listed using the EAL command line options.
@@ -380,5 +380,5 @@ using priv_xform would look like:
}
num_enqd = rte_compressdev_enqueue_burst(cdev_id, 0, comp_ops, NUM_OPS);
- /* wait for this to complete before enqueing next*/
+ /* wait for this to complete before enqueuing next*/
do {
num_deque = rte_compressdev_dequeue_burst(cdev_id, 0 , &processed_ops, NUM_OPS);
@@ -527,5 +527,5 @@ An example pseudocode to set up and process a stream having NUM_CHUNKS with each
op->input_chksum = 0;
num_enqd = rte_compressdev_enqueue_burst(cdev_id, 0, &op[i], 1);
- /* wait for this to complete before enqueing next*/
+ /* wait for this to complete before enqueuing next*/
do {
num_deqd = rte_compressdev_dequeue_burst(cdev_id, 0 , &processed_ops, 1);
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 8ee33c875..23770ffd4 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -15,5 +15,5 @@ Design Principles
-----------------
-The cryptodev library follows the same basic principles as those used in DPDKs
+The cryptodev library follows the same basic principles as those used in DPDK's
Ethernet Device framework. The Crypto framework provides a generic Crypto device
framework which supports both physical (hardware) and virtual (software) Crypto
@@ -49,5 +49,5 @@ From the command line using the --vdev EAL option
number of ``--vdev`` with appropriate libraries are to be added.
- * An Application with crypto PMD instaces sharing the same library requires unique ID.
+ * An Application with crypto PMD instances sharing the same library requires unique ID.
Example: ``--vdev 'crypto_aesni_mb0' --vdev 'crypto_aesni_mb1'``
@@ -383,5 +383,5 @@ Operation Management and Allocation
The cryptodev library provides an API set for managing Crypto operations which
utilize the Mempool Library to allocate operation buffers. Therefore, it ensures
-that the crytpo operation is interleaved optimally across the channels and
+that the crypto operation is interleaved optimally across the channels and
ranks for optimal processing.
A ``rte_crypto_op`` contains a field indicating the pool that it originated from.
@@ -587,5 +587,5 @@ Sample code
There are various sample applications that show how to use the cryptodev library,
such as the L2fwd with Crypto sample application (L2fwd-crypto) and
-the IPSec Security Gateway application (ipsec-secgw).
+the IPsec Security Gateway application (ipsec-secgw).
While these applications demonstrate how an application can be created to perform
@@ -768,5 +768,5 @@ using one of the crypto PMDs available in DPDK.
/*
* Dequeue the crypto operations until all the operations
- * are proccessed in the crypto device.
+ * are processed in the crypto device.
*/
uint16_t num_dequeued_ops, total_num_dequeued_ops = 0;
@@ -847,5 +847,5 @@ Not all asymmetric crypto xforms are supported for chaining. Currently supported
asymmetric crypto chaining is Diffie-Hellman private key generation followed by
public generation. Also, currently API does not support chaining of symmetric and
-asymmetric crypto xfroms.
+asymmetric crypto xforms.
Each xform defines specific asymmetric crypto algo. Currently supported are:
diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst
index 002d973a4..a851a8112 100644
--- a/doc/guides/prog_guide/dev_kit_build_system.rst
+++ b/doc/guides/prog_guide/dev_kit_build_system.rst
@@ -248,5 +248,5 @@ Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant
bits of data can be exported from the object file and used to produce a
hardware support description, that ``dpdk-pmdinfogen`` then encodes into a
-json formatted string in the following format:
+JSON formatted string in the following format:
.. code-block:: c
diff --git a/doc/guides/prog_guide/efd_lib.rst b/doc/guides/prog_guide/efd_lib.rst
index cb1a1df86..2b355ff2a 100644
--- a/doc/guides/prog_guide/efd_lib.rst
+++ b/doc/guides/prog_guide/efd_lib.rst
@@ -424,5 +424,5 @@ References
1- EFD is based on collaborative research work between Intel and
Carnegie Mellon University (CMU), interested readers can refer to the paper
-“Scaling Up Clustered Network Appliances with ScaleBricks;” Dong Zhou et al.
+"Scaling Up Clustered Network Appliances with ScaleBricks" Dong Zhou et al.
at SIGCOMM 2015 (`http://conferences.sigcomm.org/sigcomm/2015/pdf/papers/p241.pdf`)
for more information.
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst
index 888ce7801..94d19682e 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -649,5 +649,5 @@ The most important fields in the structure and how they are used are described b
Malloc heap is a doubly-linked list, where each element keeps track of its
previous and next elements. Due to the fact that hugepage memory can come and
-go, neighbouring malloc elements may not necessarily be adjacent in memory.
+go, neighboring malloc elements may not necessarily be adjacent in memory.
Also, since a malloc element may span multiple pages, its contents may not
necessarily be IOVA-contiguous either - each malloc element is only guaranteed
diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index 0166bb45d..7bc559c8a 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -158,5 +158,5 @@ is applicable when the adapter uses a service core function. The application
has to enable Rx queue interrupts when configuring the ethernet device
using the ``rte_eth_dev_configure()`` function and then use a servicing_weight
-of zero when addding the Rx queue to the adapter.
+of zero when adding the Rx queue to the adapter.
The adapter creates a thread blocked on the interrupt, on an interrupt this
@@ -176,7 +176,7 @@ For SW based packet transfers, i.e., when the
``RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT`` is not set in the adapter's
capabilities flags for a particular ethernet device, the service function
-temporarily enqueues mbufs to an event buffer before batch enqueueing these
+temporarily enqueues mbufs to an event buffer before batch enqueuing these
to the event device. If the buffer fills up, the service function stops
-dequeueing packets from the ethernet device. The application may want to
+dequeuing packets from the ethernet device. The application may want to
monitor the buffer fill level and instruct the service function to selectively
enqueue packets to the event device. The application may also use some other
diff --git a/doc/guides/prog_guide/eventdev.rst b/doc/guides/prog_guide/eventdev.rst
index 8fcae5469..27c51d256 100644
--- a/doc/guides/prog_guide/eventdev.rst
+++ b/doc/guides/prog_guide/eventdev.rst
@@ -43,5 +43,5 @@ application fills in to have the event scheduled as required:
* ``flow_id`` - The targeted flow identifier for the enq/deq operation.
-* ``event_type`` - The source of this event, eg RTE_EVENT_TYPE_ETHDEV or CPU.
+* ``event_type`` - The source of this event, e.g. RTE_EVENT_TYPE_ETHDEV or CPU.
* ``sub_event_type`` - Distinguishes events inside the application, that have
the same event_type (see above)
@@ -266,5 +266,5 @@ The final step is to "wire up" the ports to the queues. After this, the
eventdev is capable of scheduling events, and when cores request work to do,
the correct events are provided to that core. Note that the RX core takes input
-from eg: a NIC so it is not linked to any eventdev queues.
+from e.g.: a NIC so it is not linked to any eventdev queues.
Linking all workers to atomic queues, and the TX core to the single-link queue
@@ -277,5 +277,5 @@ can be achieved like this:
uint8_t atomic_qs[] = {0, 1};
uint8_t single_link_q = 2;
- uin8t_t priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+ uint8_t priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
for(int worker_port_id = 1; worker_port_id <= 4; worker_port_id++) {
diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst
index 33ea980e5..7b8a481a6 100644
--- a/doc/guides/prog_guide/kernel_nic_interface.rst
+++ b/doc/guides/prog_guide/kernel_nic_interface.rst
@@ -226,5 +226,5 @@ application functions:
``config_promiscusity``:
- Called when the user changes the promiscusity state of the KNI
+ Called when the user changes the promiscuity state of the KNI
interface. For example, when the user runs ``ip link set promisc
[on|off] dev <ifaceX>``. If the user sets this callback function to
diff --git a/doc/guides/prog_guide/metrics_lib.rst b/doc/guides/prog_guide/metrics_lib.rst
index e68e4e743..89bc7d68f 100644
--- a/doc/guides/prog_guide/metrics_lib.rst
+++ b/doc/guides/prog_guide/metrics_lib.rst
@@ -26,5 +26,5 @@ restriction on port numbers is that they are less than ``RTE_MAX_ETHPORTS``
- there is no requirement for the ports to actually exist.
-Initialising the library
+Initializing the library
------------------------
diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 1384fe335..6196d3f21 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -274,5 +274,5 @@ will be populated by IPC are as follows:
replied)
* ``msgs`` - pointer to where all of the responses are stored. The order in
- which responses appear is undefined. Whendoing sycnrhonous requests, this
+ which responses appear is undefined. When doing synchronous requests, this
memory must be freed by the requestor after request completes!
diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst
index 02f05614a..c1b29f937 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -65,5 +65,5 @@ get a wall clock counter in user space. Typically it runs at <= 100MHz.
The alternative method to enable ``rte_rdtsc()`` for a high resolution wall
-clock counter is through the armv8 PMU subsystem. The PMU cycle counter runs
+clock counter is through the ARMv8 PMU subsystem. The PMU cycle counter runs
at CPU frequency. However, access to the PMU cycle counter from user space is
not enabled by default in the arm64 linux kernel. It is possible to enable
@@ -76,5 +76,5 @@ scheme. Application can choose the PMU based implementation with
The example below shows the steps to configure the PMU based cycle counter on
-an armv8 machine.
+an ARMv8 machine.
.. code-block:: console
diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index dbf4999aa..4e9b4440b 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2132,5 +2132,5 @@ as defined in the ``rte_flow_action_raw_decap``
This action modifies the payload of matched flows. The data supplied must
be a valid header, either holding layer 2 data in case of removing layer 2
-before eincapsulation of layer 3 tunnel (for example MPLSoGRE) or complete
+before encapsulation of layer 3 tunnel (for example MPLSoGRE) or complete
tunnel definition starting from layer 2 and moving to the tunnel item itself.
When applied to the original packet the resulting packet must be a
@@ -2282,5 +2282,5 @@ Decrease TTL value.
If there is no valid RTE_FLOW_ITEM_TYPE_IPV4 or RTE_FLOW_ITEM_TYPE_IPV6
-in pattern, Some PMDs will reject rule because behaviour will be undefined.
+in pattern, Some PMDs will reject rule because behavior will be undefined.
.. _table_rte_flow_action_dec_ttl:
@@ -2300,5 +2300,5 @@ Assigns a new TTL value.
If there is no valid RTE_FLOW_ITEM_TYPE_IPV4 or RTE_FLOW_ITEM_TYPE_IPV6
-in pattern, Some PMDs will reject rule because behaviour will be undefined.
+in pattern, Some PMDs will reject rule because behavior will be undefined.
.. _table_rte_flow_action_set_ttl:
@@ -2726,5 +2726,5 @@ Caveats
returned).
-- There is no provision for reentrancy/multi-thread safety, although nothing
+- There is no provision for re-entrancy/multi-thread safety, although nothing
should prevent different devices from being configured at the same
time. PMDs may protect their control path functions accordingly.
diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst
index cb70caa74..7d0734a37 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -41,5 +41,5 @@ Inline Crypto
RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO:
-The crypto processing for security protocol (e.g. IPSec) is processed
+The crypto processing for security protocol (e.g. IPsec) is processed
inline during receive and transmission on NIC port. The flow based
security action should be configured on the port.
@@ -49,5 +49,5 @@ crypto status is set in Rx descriptors. After the successful inline
crypto processing the packet is presented to host as a regular Rx packet
however all security protocol related headers are still attached to the
-packet. e.g. In case of IPSec, the IPSec tunnel headers (if any),
+packet. e.g. In case of IPsec, the IPsec tunnel headers (if any),
ESP/AH headers will remain in the packet but the received packet
contains the decrypted data where the encrypted data was when the packet
@@ -112,5 +112,5 @@ Inline protocol offload
RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL:
-The crypto and protocol processing for security protocol (e.g. IPSec)
+The crypto and protocol processing for security protocol (e.g. IPsec)
is processed inline during receive and transmission. The flow based
security action should be configured on the port.
@@ -120,5 +120,5 @@ crypto status is set in the Rx descriptors. After the successful inline
crypto processing the packet is presented to the host as a regular Rx packet
but all security protocol related headers are optionally removed from the
-packet. e.g. in the case of IPSec, the IPSec tunnel headers (if any),
+packet. e.g. in the case of IPsec, the IPsec tunnel headers (if any),
ESP/AH headers will be removed from the packet and the received packet
will contains the decrypted packet only. The driver Rx path checks the
@@ -133,5 +133,5 @@ to identify the security processing done on the packet.
the device shall support crypto processing for all kind of packets matching
to a given flow, this includes fragmented packets (post reassembly).
- E.g. in case of IPSec the device may internally manage anti-replay etc.
+ E.g. in case of IPsec the device may internally manage anti-replay etc.
It will provide a configuration option for anti-replay behavior i.e. to drop
the packets or pass them to driver with error flags set in the descriptor.
@@ -151,5 +151,5 @@ to cross the MTU size.
The underlying device will manage state information required for egress
- processing. E.g. in case of IPSec, the seq number will be added to the
+ processing. E.g. in case of IPsec, the seq number will be added to the
packet, however the device shall provide indication when the sequence number
is about to overflow. The underlying device may support post encryption TSO.
@@ -200,5 +200,5 @@ Decryption: The packet is sent to the crypto device for security
protocol processing. The device will decrypt the packet and it will also
optionally remove additional security headers from the packet.
-E.g. in case of IPSec, IPSec tunnel headers (if any), ESP/AH headers
+E.g. in case of IPsec, IPsec tunnel headers (if any), ESP/AH headers
will be removed from the packet and the decrypted packet may contain
plain data only.
@@ -206,5 +206,5 @@ plain data only.
.. note::
- In case of IPSec the device may internally manage anti-replay etc.
+ In case of IPsec the device may internally manage anti-replay etc.
It will provide a configuration option for anti-replay behavior i.e. to drop
the packets or pass them to driver with error flags set in descriptor.
@@ -218,5 +218,5 @@ for any protocol header addition.
.. note::
- In the case of IPSec, the seq number will be added to the packet,
+ In the case of IPsec, the seq number will be added to the packet,
It shall provide an indication when the sequence number is about to
overflow.
@@ -550,5 +550,5 @@ IPsec related configuration parameters are defined in ``rte_security_ipsec_xform
/**< various SA options */
enum rte_security_ipsec_sa_direction direction;
- /**< IPSec SA Direction - Egress/Ingress */
+ /**< IPsec SA Direction - Egress/Ingress */
enum rte_security_ipsec_sa_protocol proto;
/**< IPsec SA Protocol - AH/ESP */
diff --git a/doc/guides/prog_guide/traffic_management.rst b/doc/guides/prog_guide/traffic_management.rst
index 98ac4310b..05b34d93a 100644
--- a/doc/guides/prog_guide/traffic_management.rst
+++ b/doc/guides/prog_guide/traffic_management.rst
@@ -40,5 +40,5 @@ At the TM level, users can get high level idea with the help of various
parameters such as maximum number of nodes, maximum number of hierarchical
levels, maximum number of shapers, maximum number of private shapers, type of
-scheduling algorithm (Strict Priority, Weighted Fair Queueing , etc.), etc.,
+scheduling algorithm (Strict Priority, Weighted Fair Queuing , etc.), etc.,
supported by the implementation.
diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst
index c77df338f..27c3af8f9 100644
--- a/doc/guides/prog_guide/vhost_lib.rst
+++ b/doc/guides/prog_guide/vhost_lib.rst
@@ -64,5 +64,5 @@ The following is an overview of some key Vhost API functions:
* zero copy is really good for VM2VM case. For iperf between two VMs, the
- boost could be above 70% (when TSO is enableld).
+ boost could be above 70% (when TSO is enabled).
* For zero copy in VM2NIC case, guest Tx used vring may be starved if the
diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst b/doc/guides/rawdevs/ifpga_rawdev.rst
index d400db6ed..a3d92a62e 100644
--- a/doc/guides/rawdevs/ifpga_rawdev.rst
+++ b/doc/guides/rawdevs/ifpga_rawdev.rst
@@ -92,5 +92,5 @@ Run-time parameters
This driver is invoked automatically in systems added with Intel FPGA,
-but PR and IFPGA Bus scan is trigged by command line using
+but PR and IFPGA Bus scan is triggered by command line using
``--vdev 'ifpga_rawdev_cfg`` EAL option.
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index 358dfa321..276327c15 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -677,5 +677,5 @@ igb uio legacy mode can not be used in X710/XL710/XXV710
**Description**:
X710/XL710/XXV710 NICs lack support for indicating INTx is asserted via the interrupt
- bit in the PCI status register. Linux delected them from INTx support table. The related
+ bit in the PCI status register. Linux deleted them from INTx support table. The related
`commit <https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/pci/quirks.c?id=8bcf4525c5d43306c5fd07e132bc8650e3491aec>`_.
@@ -723,7 +723,7 @@ Linux kernel 4.10.0 iommu attribute read error
When VT-d is enabled (``iommu=pt intel_iommu=on``), reading IOMMU attributes from
/sys/devices/virtual/iommu/dmarXXX/intel-iommu/cap on Linux kernel 4.10.0 error.
- This bug is fixed in `Linux commmit a7fdb6e648fb
+ This bug is fixed in `Linux commit a7fdb6e648fb
<https://patchwork.kernel.org/patch/9595727/>`_,
- This bug is introduced in `Linux commmit 39ab9555c241
+ This bug is introduced in `Linux commit 39ab9555c241
<https://patchwork.kernel.org/patch/9554403/>`_,
@@ -843,5 +843,5 @@ AVX-512 support disabled
On DPDK v19.02 ``AVX-512`` disable scope is reduced to ``GCC`` and ``binutils version 2.30`` based
- on information accured from the GCC community defect.
+ on information accrued from the GCC community defect.
**Reason**:
diff --git a/doc/guides/rel_notes/release_17_11.rst b/doc/guides/rel_notes/release_17_11.rst
index 2a93af323..6448b6cb1 100644
--- a/doc/guides/rel_notes/release_17_11.rst
+++ b/doc/guides/rel_notes/release_17_11.rst
@@ -169,5 +169,5 @@ New Features
* The DES DOCSIS BPI algorithm.
- This change requires version 0.47 of the IPSec Multi-buffer library. For
+ This change requires version 0.47 of the IPsec Multi-buffer library. For
more details see the :doc:`../cryptodevs/aesni_mb` documentation.
@@ -199,5 +199,5 @@ New Features
Added an experimental library - ``rte_security``. This provide security APIs
- for protocols like IPSec using inline ipsec offload to ethernet devices or
+ for protocols like IPsec using inline ipsec offload to ethernet devices or
full protocol offload with lookaside crypto devices.
@@ -208,9 +208,9 @@ New Features
Updated the ``dpaa2_sec`` crypto PMD to support ``rte_security`` lookaside
- protocol offload for IPSec.
+ protocol offload for IPsec.
* **Updated the IXGBE ethernet driver to support rte_security.**
- Updated ixgbe ethernet PMD to support ``rte_security`` inline IPSec offload.
+ Updated ixgbe ethernet PMD to support ``rte_security`` inline IPsec offload.
* **Updated i40e driver to support GTP-C/GTP-U.**
@@ -510,5 +510,5 @@ ABI Changes
A new parameter ``security_ctx`` has been added to ``rte_eth_dev`` to
- support security operations like IPSec inline.
+ support security operations like IPsec inline.
* **New parameter added to rte_cryptodev.**
diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst
index 653f972f3..6ade9c6e1 100644
--- a/doc/guides/sample_app_ug/bbdev_app.rst
+++ b/doc/guides/sample_app_ug/bbdev_app.rst
@@ -69,5 +69,5 @@ The application accepts a number of command line options:
where:
-* ``e ENCODING_CORES``: hexmask for encoding lcored (default = 0x2)
+* ``e ENCODING_CORES``: hexmask for encoding lcores (default = 0x2)
* ``d DECODING_CORES``: hexmask for decoding lcores (default = 0x4)
* ``p ETH_PORT_ID``: ethernet port ID (default = 0)
@@ -88,5 +88,5 @@ issue the command:
--file-prefix=bbdev -- -e 0x10 -d 0x20
-where, NIC0PCIADDR is the PCI addresse of the Rx port
+where, NIC0PCIADDR is the PCI address of the Rx port
This command creates one virtual bbdev devices ``baseband_turbo_sw`` where the
diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst
index 0ec02907d..dc7972aa9 100644
--- a/doc/guides/sample_app_ug/eventdev_pipeline.rst
+++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst
@@ -50,5 +50,5 @@ these settings is shown below:
The application has some sanity checking built-in, so if there is a function
-(eg; the RX core) which doesn't have a cpu core mask assigned, the application
+(e.g.; the RX core) which doesn't have a cpu core mask assigned, the application
will print an error message:
diff --git a/doc/guides/sample_app_ug/intro.rst b/doc/guides/sample_app_ug/intro.rst
index 159bcf73b..90704194a 100644
--- a/doc/guides/sample_app_ug/intro.rst
+++ b/doc/guides/sample_app_ug/intro.rst
@@ -107,5 +107,5 @@ examples are highlighted below.
and TX packet processing functions.
-* :doc:`IPSec Security Gateway<ipsec_secgw>`: The IPSec Security
+* :doc:`IPsec Security Gateway<ipsec_secgw>`: The IPsec Security
Gateway application is minimal example of something closer to a real world
example. This is also a good example of an application using the DPDK
diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst
index 447a544d5..4da0fcf89 100644
--- a/doc/guides/sample_app_ug/ip_pipeline.rst
+++ b/doc/guides/sample_app_ug/ip_pipeline.rst
@@ -114,5 +114,5 @@ Initialization
~~~~~~~~~~~~~~
-During this stage, EAL layer is initialised and application specific arguments are parsed. Furthermore, the data strcutures
+During this stage, EAL layer is initialised and application specific arguments are parsed. Furthermore, the data structures
(i.e. linked lists) for application objects are initialized. In case of any initialization error, an error message
is displayed and the application is terminated.
@@ -186,5 +186,5 @@ Examples
| IP routing | LPM (IPv4) | Forward | 1. Mempool Create |
| | | | 2. Link create |
- | | * Key = IP dest addr | | 3. Pipeline creat |
+ | | * Key = IP dest addr | | 3. Pipeline create |
| | * Offset = 286 | | 4. Pipeline port in/out |
| | * Table size = 4K | | 5. Pipeline table |
diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst
index 4869a011d..5f7d39736 100644
--- a/doc/guides/sample_app_ug/ipsec_secgw.rst
+++ b/doc/guides/sample_app_ug/ipsec_secgw.rst
@@ -26,6 +26,6 @@ Thus, traffic received on an Unprotected or Protected port is consider
Inbound or Outbound respectively.
-The application also supports complete IPSec protocol offload to hardware
-(Look aside crypto accelarator or using ethernet device). It also support
+The application also supports complete IPsec protocol offload to hardware
+(Look aside crypto accelerator or using ethernet device). It also support
inline ipsec processing by the supported ethernet device during transmission.
These modes can be selected during the SA creation configuration.
diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst
index fbd30a5ea..96f0fc6fd 100644
--- a/doc/guides/sample_app_ug/performance_thread.rst
+++ b/doc/guides/sample_app_ug/performance_thread.rst
@@ -501,6 +501,6 @@ the L-thread struct.
For legacy and backward compatibility reasons two alternative methods are also
-offered, the first is modelled directly on the pthread get/set specific APIs,
-the second approach is modelled on the ``RTE_PER_LCORE`` macros, whereby
+offered, the first is modeled directly on the pthread get/set specific APIs,
+the second approach is modeled on the ``RTE_PER_LCORE`` macros, whereby
``PER_LTHREAD`` macros are introduced, in both cases the storage is local to
the L-thread.
diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst
index 2e8e0175f..d75f7da52 100644
--- a/doc/guides/sample_app_ug/qos_metering.rst
+++ b/doc/guides/sample_app_ug/qos_metering.rst
@@ -152,4 +152,4 @@ In this particular case:
.. note::
- * In color blind mode, first row GREEN colour is only valid.
+ * In color blind mode, first row GREEN color is only valid.
* To drop the packet, policer_table action has to be set to DROP.
diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst
index a9370c80b..af9665b2c 100644
--- a/doc/guides/sample_app_ug/test_pipeline.rst
+++ b/doc/guides/sample_app_ug/test_pipeline.rst
@@ -33,5 +33,5 @@ Compiling the Application
To compile the sample application see :doc:`compiling`
-The application is located in the ``$RTE_SDK/test/test-pipline`` directory.
+The application is located in the ``$RTE_SDK/test/test-pipeline`` directory.
diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst
index df4d6f9a0..a71ada654 100644
--- a/doc/guides/sample_app_ug/vhost.rst
+++ b/doc/guides/sample_app_ug/vhost.rst
@@ -117,5 +117,5 @@ The vm2vm parameter sets the mode of packet switching between guests in
the host.
-- 0 disables vm2vm, impling that VM's packets will always go to the NIC port.
+- 0 disables vm2vm, implying that VM's packets will always go to the NIC port.
- 1 means a normal mac lookup packet routing.
- 2 means hardware mode packet forwarding between guests, it allows packets
@@ -149,5 +149,5 @@ default value is 15.
**--dequeue-zero-copy**
Dequeue zero copy will be enabled when this option is given. it is worth to
-note that if NIC is binded to driver with iommu enabled, dequeue zero copy
+note that if NIC is bound to driver with iommu enabled, dequeue zero copy
cannot work at VM2NIC mode (vm2vm=0) due to currently we don't setup iommu
dma mapping for guest memory.
diff --git a/doc/guides/sample_app_ug/vhost_scsi.rst b/doc/guides/sample_app_ug/vhost_scsi.rst
index 7ab7d0d53..6b9bf62eb 100644
--- a/doc/guides/sample_app_ug/vhost_scsi.rst
+++ b/doc/guides/sample_app_ug/vhost_scsi.rst
@@ -64,5 +64,5 @@ Vhost_scsi Common Issues
* vhost_scsi can not start with block size 512 Bytes:
- Currently DPDK vhost library was designed for NET device(althrough the APIs
+ Currently DPDK vhost library was designed for NET device(although the APIs
are generic now), for 512 Bytes block device, Qemu BIOS(x86 BIOS Enhanced
Disk Device) will enumerate all block device and do some IOs to those block
diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 5be9f24d5..57758ca00 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -340,5 +340,5 @@ monitoring of branch ratio on cores doing busy polling via PMDs.
When this parameter is used, the list of cores specified will monitor the ratio
between branch hits and branch misses. A tightly polling PMD thread will have a
- very low branch ratio, so the core frequency will be scaled down to the minimim
+ very low branch ratio, so the core frequency will be scaled down to the minimum
allowed value. When packets are received, the code path will alter, causing the
branch ratio to increase. When the ratio goes above the ratio threshold, the
@@ -380,5 +380,5 @@ the file.
The fifo is at /tmp/powermonitor/fifo
-The jason string can be a policy or instruction, and takes the following
+The JSON string can be a policy or instruction, and takes the following
format:
@@ -730,5 +730,5 @@ policy down to the host application. These parameters are as follows:
monitor. The list of cores in any vm starts at zero, and these are mapped to the
physical cores by the host application once the policy is passed down.
- Valid syntax includes individial cores '2,3,4', or a range of cores '2-4', or a
+ Valid syntax includes individual cores '2,3,4', or a range of cores '2-4', or a
combination of both '1,3,5-7'
@@ -738,5 +738,5 @@ policy down to the host application. These parameters are as follows:
A comma-separated list of hours within which to set the core frequency to maximum.
- Valid syntax includes individial hours '2,3,4', or a range of hours '2-4', or a
+ Valid syntax includes individual hours '2,3,4', or a range of hours '2-4', or a
combination of both '1,3,5-7'. Valid hours are 0 to 23.
@@ -746,5 +746,5 @@ policy down to the host application. These parameters are as follows:
A comma-separated list of hours within which to set the core frequency to minimum.
- Valid syntax includes individial hours '2,3,4', or a range of hours '2-4', or a
+ Valid syntax includes individual hours '2,3,4', or a range of hours '2-4', or a
combination of both '1,3,5-7'. Valid hours are 0 to 23.
diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index e934b4bed..89df03166 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -366,5 +366,5 @@ The command line options are:
* ``--hot-plug``
- Enable device event monitor mechanism for hot plug.
+ Enable device event monitor mechanism for hotplug.
* ``--vxlan-gpe-port=N``
@@ -406,5 +406,5 @@ The command line options are:
* ``--noisy-lkup-memory=N``
- Set the size of the noisy neighbour simulation memory buffer in MB to N.
+ Set the size of the noisy neighbor simulation memory buffer in MB to N.
Only available with the noisy forwarding mode. The default value is 0.
@@ -412,14 +412,14 @@ The command line options are:
* ``--noisy-lkup-num-reads=N``
- Set the number of reads to be done in noisy neighbour simulation memory buffer to N.
+ Set the number of reads to be done in noisy neighbor simulation memory buffer to N.
Only available with the noisy forwarding mode. The default value is 0.
* ``--noisy-lkup-num-writes=N``
- Set the number of writes to be done in noisy neighbour simulation memory buffer to N.
+ Set the number of writes to be done in noisy neighbor simulation memory buffer to N.
Only available with the noisy forwarding mode. The default value is 0.
* ``--noisy-lkup-num-reads-writes=N``
- Set the number of r/w accesses to be done in noisy neighbour simulation memory buffer to N.
+ Set the number of r/w accesses to be done in noisy neighbor simulation memory buffer to N.
Only available with the noisy forwarding mode. The default value is 0.
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index d4e3fd8a5..34f7bc766 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -303,5 +303,5 @@ The available information categories are:
* ``mac``: Changes the source and the destination Ethernet addresses of packets before forwarding them.
- Default application behaviour is to set source Ethernet address to that of the transmitting interface, and destination
+ Default application behavior is to set source Ethernet address to that of the transmitting interface, and destination
address to a dummy value (set during init). The user may specify a target destination Ethernet address via the 'eth-peer' or
'eth-peers-configfile' command-line options. It is not currently possible to specify a specific source Ethernet address.
@@ -326,5 +326,5 @@ The available information categories are:
similar to I/O mode except for the fact that packets are loopback to the softnic ports only. Therefore, portmask parameter should be set to softnic port only. The various software based custom NIC pipelines specified through the softnic firmware (DPDK packet framework script) can be tested in this mode. Furthermore, it allows to build 5-level hierarchical QoS scheduler as a default option that can be enabled through CLI once testpmd application is initialised. The user can modify the default scheduler hierarchy or can specify the new QoS Scheduler hierarchy through CLI. Requires ``CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y``.
-* ``noisy``: Noisy neighbour simulation.
+* ``noisy``: Noisy neighbor simulation.
Simulate more realistic behavior of a guest machine engaged in receiving
and sending packets performing Virtual Network Function (VNF).
@@ -2247,5 +2247,5 @@ set bonding lacp dedicated_queue
Enable dedicated tx/rx queues on bonding devices slaves to handle LACP control plane traffic
-when in mode 4 (link-aggregration-802.3ad)::
+when in mode 4 (link-aggregation-802.3ad)::
testpmd> set bonding lacp dedicated_queues (port_id) (enable|disable)
@@ -2255,5 +2255,5 @@ set bonding agg_mode
~~~~~~~~~~~~~~~~~~~~
-Enable one of the specific aggregators mode when in mode 4 (link-aggregration-802.3ad)::
+Enable one of the specific aggregators mode when in mode 4 (link-aggregation-802.3ad)::
testpmd> set bonding agg_mode (port_id) (bandwidth|count|stable)
@@ -2649,6 +2649,6 @@ where:
* ``shared_shaper_id``: Shared shaper ID to be deleted.
-Set port traffic management hiearchy node private shaper
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Set port traffic management hierarchy node private shaper
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set the port traffic management hierarchy node private shaper::
@@ -2701,5 +2701,5 @@ Add port traffic management hierarchy nonleaf node
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Add nonleaf node to port traffic management hiearchy::
+Add nonleaf node to port traffic management hierarchy::
testpmd> add port tm nonleaf node (port_id) (node_id) (parent_node_id) \
@@ -2716,5 +2716,5 @@ where:
to the weight sum of all siblings that have the same priority. It is used by
the WFQ algorithm running on the parent node for scheduling this node.
-* ``level_id``: Hiearchy level of the node.
+* ``level_id``: Hierarchy level of the node.
* ``shaper_profile_id``: Shaper profile ID of the private shaper to be used by
the node.
@@ -2727,5 +2727,5 @@ Add port traffic management hierarchy leaf node
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Add leaf node to port traffic management hiearchy::
+Add leaf node to port traffic management hierarchy::
testpmd> add port tm leaf node (port_id) (node_id) (parent_node_id) \
@@ -2742,5 +2742,5 @@ where:
to the weight sum of all siblings that have the same priority. It is used by
the WFQ algorithm running on the parent node for scheduling this node.
-* ``level_id``: Hiearchy level of the node.
+* ``level_id``: Hierarchy level of the node.
* ``shaper_profile_id``: Shaper profile ID of the private shaper to be used by
the node.
@@ -2754,5 +2754,5 @@ Delete port traffic management hierarchy node
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Delete node from port traffic management hiearchy::
+Delete node from port traffic management hierarchy::
testpmd> del port tm node (port_id) (node_id)
@@ -3947,5 +3947,5 @@ This section lists supported actions and their attributes, if any.
- ``dec_ttl``: Performs a decrease TTL value action
-- ``set_ttl``: Set TTL value with specificed value
+- ``set_ttl``: Set TTL value with specified value
- ``ttl_value {unsigned}``: The new TTL value to be set
@@ -4468,5 +4468,5 @@ bpf-load
~~~~~~~~
-Load an eBPF program as a callback for partciular RX/TX queue::
+Load an eBPF program as a callback for particular RX/TX queue::
testpmd> bpf-load rx|tx (portid) (queueid) (load-flags) (bpf-prog-filename)
@@ -4506,5 +4506,5 @@ bpf-unload
~~~~~~~~~~
-Unload previously loaded eBPF program for partciular RX/TX queue::
+Unload previously loaded eBPF program for particular RX/TX queue::
testpmd> bpf-unload rx|tx (portid) (queueid)
diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index c366af4e9..2fc65441d 100644
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -60,5 +60,5 @@ To set on the linearization options add below definition to the
Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the
-``dpdk-test-crypto-perf`` applcation.
+``dpdk-test-crypto-perf`` application.
Initially, the user must select a DPDK target to choose the correct target type
@@ -81,5 +81,5 @@ EAL Options
The following are the EAL command-line options that can be used in conjunction
-with the ``dpdk-test-crypto-perf`` applcation.
+with the ``dpdk-test-crypto-perf`` application.
See the DPDK Getting Started Guides for more information on these options.
@@ -97,8 +97,8 @@ See the DPDK Getting Started Guides for more information on these options.
Add a virtual device.
-Appication Options
-~~~~~~~~~~~~~~~~~~
+Application Options
+~~~~~~~~~~~~~~~~~~~
-The following are the appication command-line options:
+The following are the application command-line options:
* ``--ptest type``
@@ -339,5 +339,5 @@ The test vector file is a text file contain information about test vectors.
The file is made of the sections. The first section doesn't have header.
It contain global information used in each test variant vectors -
-typically information about plaintext, ciphertext, cipher key, aut key,
+typically information about plaintext, ciphertext, cipher key, auth key,
initial vector. All other sections begin header.
The sections contain particular information typically digest.
@@ -345,5 +345,5 @@ The sections contain particular information typically digest.
**Format of the file:**
-Each line beginig with sign '#' contain comment and it is ignored by parser::
+Each line beginning with sign '#' contain comment and it is ignored by parser::
# <comment>
@@ -353,14 +353,14 @@ Header line is just name in square bracket::
[<section name>]
-Data line contain information tocken then sign '=' and
+Data line contain information token then sign '=' and
a string of bytes in C byte array format::
- <tocken> = <C byte array>
+ <token> = <C byte array>
-**Tockens list:**
+**Tokens list:**
* ``plaintext``
- Original plaintext to be crypted.
+ Original plaintext to be encrypted.
* ``ciphertext``
diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst
index d5b5ed6a6..e9a0b79d3 100644
--- a/doc/guides/tools/proc_info.rst
+++ b/doc/guides/tools/proc_info.rst
@@ -49,5 +49,5 @@ Limitations
* When running ``dpdk-procinfo`` with shared library mode, it is required to
pass the same NIC PMD libraries as used for the primary application. Any
- mismatch in PMD library arguments can lead to undefined behaviour and results
+ mismatch in PMD library arguments can lead to undefined behavior and results
affecting primary application too.
diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst
index af38b1632..a8cb6fbbe 100644
--- a/doc/guides/tools/testbbdev.rst
+++ b/doc/guides/tools/testbbdev.rst
@@ -140,5 +140,5 @@ There are 6 main test cases that can be executed using testbbdev tool:
- Measures the time consumed from the first enqueue until the first
appearance of a dequeued result
- - This measurment represents the full latency of a bbdev operation
+ - This measurement represents the full latency of a bbdev operation
(encode or decode) to execute
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.582103233 +0100
+++ 0003-doc-fix-spelling-reported-by-aspell-in-guides.patch 2019-05-08 16:33:57.316581212 +0100
@@ -1 +1 @@
-From d629b7b5fe812f0040b83d27d2ada33b003aa918 Mon Sep 17 00:00:00 2001
+From 8ca6a5b8794806d131f4bd3faf776894d8ecd90a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d629b7b5fe812f0040b83d27d2ada33b003aa918 ]
+
@@ -22 +23,0 @@
- doc/guides/nics/af_packet.rst | 4 +--
@@ -27 +27,0 @@
- doc/guides/nics/ena.rst | 2 +-
@@ -34,2 +34 @@
- doc/guides/nics/mlx4.rst | 2 +-
- doc/guides/nics/mlx5.rst | 4 +--
+ doc/guides/nics/mlx5.rst | 2 +-
@@ -38,2 +36,0 @@
- doc/guides/nics/nfb.rst | 2 +-
- doc/guides/nics/nfp.rst | 4 +--
@@ -53 +49,0 @@
- doc/guides/prog_guide/ipsec_lib.rst | 16 +++++------
@@ -69 +65 @@
- doc/guides/sample_app_ug/ipsec_secgw.rst | 8 +++---
+ doc/guides/sample_app_ug/ipsec_secgw.rst | 4 +--
@@ -79 +75 @@
- doc/guides/tools/proc_info.rst | 6 ++--
+ doc/guides/tools/proc_info.rst | 2 +-
@@ -81 +77 @@
- 70 files changed, 169 insertions(+), 169 deletions(-)
+ 64 files changed, 149 insertions(+), 149 deletions(-)
@@ -95 +91 @@
-index d8404e623..3b2b174ad 100644
+index a64bb0368..427137dc7 100644
@@ -106 +102 @@
-index 89152010a..1eff2b073 100644
+index d9fd41ae5..ccfc137f1 100644
@@ -109 +105 @@
-@@ -130,5 +130,5 @@ For AES Counter mode (AES-CTR), the library supports two different sizes for Ini
+@@ -126,5 +126,5 @@ For AES Counter mode (AES-CTR), the library supports two different sizes for Ini
@@ -117 +113 @@
-index 12f342b0f..a972c794f 100644
+index 407f063de..f9f8c7bec 100644
@@ -168 +164 @@
-index ee8ccdaf5..07563b3e2 100644
+index a47d6dbf8..4e5ef4d56 100644
@@ -179 +175 @@
-index 6ebc10f71..ecb783290 100644
+index 3f5ebd58a..019c124d4 100644
@@ -197 +193 @@
-index 3dcda6cb1..e197376e2 100644
+index 6a8534d98..e080570e9 100644
@@ -253,18 +248,0 @@
-diff --git a/doc/guides/nics/af_packet.rst b/doc/guides/nics/af_packet.rst
-index 1260bb2c6..efd6f1ca7 100644
---- a/doc/guides/nics/af_packet.rst
-+++ b/doc/guides/nics/af_packet.rst
-@@ -14,5 +14,5 @@ and kernel, that's used to send and receive packets. This helps reducing system
- calls and the copies needed between user space and Kernel.
-
--The PACKET_FANOUT_HASH behaviour of AF_PACKET is used for frame reception.
-+The PACKET_FANOUT_HASH behavior of AF_PACKET is used for frame reception.
-
- Options and inherent limitations
-@@ -20,5 +20,5 @@ Options and inherent limitations
-
- The following options can be provided to set up an af_packet port in DPDK.
--Some of these, in turn, will be used to configure the PAKET_MMAP settings.
-+Some of these, in turn, will be used to configure the PACKET_MMAP settings.
-
- * ``iface`` - name of the Kernel interface to attach to (required);
@@ -272 +250 @@
-index 22f2410d0..3f3f2949f 100644
+index 80591b13c..f6f2c66bf 100644
@@ -280 +257,0 @@
- - MACSEC offload
@@ -281,0 +259 @@
+ Configuration Information
@@ -283 +261 @@
-index f3e611506..7a893cc1d 100644
+index 58d88eef5..39106274e 100644
@@ -301 +279 @@
-index cd35cabde..f85920012 100644
+index 2173673b9..5900ed0df 100644
@@ -310 +288 @@
- Currently these queues are not used for LS1023/LS1043 platform by default.
+
@@ -312 +290 @@
-index 10b9d7dff..a698e5ab6 100644
+index 769dc4e12..04370e4cd 100644
@@ -322,11 +299,0 @@
-diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst
-index 80da4b6be..d44f3cd5c 100644
---- a/doc/guides/nics/ena.rst
-+++ b/doc/guides/nics/ena.rst
-@@ -190,5 +190,5 @@ Prerequisites
- the PCI to the device, before the DMA is even triggered. For proper work
- kernel PCI driver must support write combining (WC). In mainline version of
-- ``igb_uio`` (in DPDK repo) it must be enabled by loding module with
-+ ``igb_uio`` (in DPDK repo) it must be enabled by loading module with
- ``wc_activate=1`` flag (example below). However, mainline's vfio-pci
- driver in kernel doesn't have WC support yet (planed to be added).
@@ -334 +301 @@
-index 26204601a..3c896eeff 100644
+index 8038bf205..376768d39 100644
@@ -337 +304 @@
-@@ -77,5 +77,5 @@ Prerequisites
+@@ -70,5 +70,5 @@ Prerequisites
@@ -345 +312 @@
-index 726a69e93..cdb55e037 100644
+index 3b45b3b3f..c1b83b9b6 100644
@@ -367 +334 @@
-index 9680a92a9..2e9ec799e 100644
+index 40bf0f140..62e90d9fd 100644
@@ -370 +337 @@
-@@ -581,5 +581,5 @@ TC TX scheduling mode setting
+@@ -572,5 +572,5 @@ TC TX scheduling mode setting
@@ -391 +358 @@
-index a66c59531..602a06b5f 100644
+index 204fbd563..c4fc96373 100644
@@ -394 +361 @@
-@@ -66,5 +66,5 @@ PMD arguments
+@@ -65,5 +65,5 @@ PMD arguments
@@ -401,11 +367,0 @@
-diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst
-index aaf190753..f6d7a16e4 100644
---- a/doc/guides/nics/mlx4.rst
-+++ b/doc/guides/nics/mlx4.rst
-@@ -84,5 +84,5 @@ These options can be modified in the ``.config`` file.
- - ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**)
-
-- Embed static flavour of the dependencies **libibverbs** and **libmlx4**
-+ Embed static flavor of the dependencies **libibverbs** and **libmlx4**
- in the PMD shared library or the executable static binary.
-
@@ -413 +369 @@
-index 5fa6b6252..af1e408ea 100644
+index bfa6cf162..cee167bfe 100644
@@ -423,7 +378,0 @@
-@@ -217,5 +217,5 @@ These options can be modified in the ``.config`` file.
- - ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**)
-
-- Embed static flavour of the dependencies **libibverbs** and **libmlx5**
-+ Embed static flavor of the dependencies **libibverbs** and **libmlx5**
- in the PMD shared library or the executable static binary.
-
@@ -431 +380 @@
-index 09e2f2a56..bacc013d4 100644
+index b2ddeab50..f63d85875 100644
@@ -452,24 +400,0 @@
-diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst
-index a7fb963ca..8df76c077 100644
---- a/doc/guides/nics/nfb.rst
-+++ b/doc/guides/nics/nfb.rst
-@@ -82,5 +82,5 @@ Ethernet port may be sent to any queue.
- They are represented in DPDK as a single port.
-
--NFB-200G2QL card employs an addon cable which allows to connect it to two
-+NFB-200G2QL card employs an add-on cable which allows to connect it to two
- physical PCI-E slots at the same time (see the diagram below).
- This is done to allow 200 Gbps of traffic to be transferred through the PCI-E
-diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst
-index 09a8529b9..309fa5d39 100644
---- a/doc/guides/nics/nfp.rst
-+++ b/doc/guides/nics/nfp.rst
-@@ -150,6 +150,6 @@ PF multiprocess support
-
- Due to how the driver needs to access the NFP through a CPP interface, which implies
--to use specific registers inside the chip, the number of secondary proceses with PF
--ports is limitted to only one.
-+to use specific registers inside the chip, the number of secondary processes with PF
-+ports is limited to only one.
-
- This limitation will be solved in future versions but having basic multiprocess support
@@ -477 +402 @@
-index eb47f25e3..6d01d05b0 100644
+index 40065284b..f449b19d6 100644
@@ -487,2 +412,2 @@
-@@ -210,10 +210,10 @@ Validating flow rules depends on the firmware variant.
- The :ref:`flow_isolated_mode` is supported.
+@@ -208,10 +208,10 @@ Supported actions:
+ Validating flow rules depends on the firmware variant.
@@ -502 +427 @@
-@@ -349,8 +349,8 @@ boolean parameters value.
+@@ -347,8 +347,8 @@ boolean parameters value.
@@ -525 +450 @@
-index 063bd0be4..4b6d77d37 100644
+index 9a3d7b348..14c669b7b 100644
@@ -554 +479 @@
-index 82aae0ab2..c21bb193f 100644
+index 5a64406eb..2586af0ff 100644
@@ -590 +515 @@
-index ad9703753..a06c835a0 100644
+index 87e264906..3ba4238ce 100644
@@ -615 +540 @@
-index 74a930b6d..23fa5bc18 100644
+index 8ee33c875..23770ffd4 100644
@@ -632 +557 @@
-@@ -397,5 +397,5 @@ Operation Management and Allocation
+@@ -383,5 +383,5 @@ Operation Management and Allocation
@@ -639 +564 @@
-@@ -603,5 +603,5 @@ Sample code
+@@ -587,5 +587,5 @@ Sample code
@@ -646 +571 @@
-@@ -808,5 +808,5 @@ using one of the crypto PMDs available in DPDK.
+@@ -768,5 +768,5 @@ using one of the crypto PMDs available in DPDK.
@@ -653 +578 @@
-@@ -887,5 +887,5 @@ Not all asymmetric crypto xforms are supported for chaining. Currently supported
+@@ -847,5 +847,5 @@ Not all asymmetric crypto xforms are supported for chaining. Currently supported
@@ -661 +586 @@
-index 96dbf30e0..74dba4dd1 100644
+index 002d973a4..a851a8112 100644
@@ -664 +589 @@
-@@ -205,5 +205,5 @@ Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant
+@@ -248,5 +248,5 @@ Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant
@@ -683 +608 @@
-index fa8afdb3a..c27f730c7 100644
+index 888ce7801..94d19682e 100644
@@ -686 +611 @@
-@@ -734,5 +734,5 @@ The most important fields in the structure and how they are used are described b
+@@ -649,5 +649,5 @@ The most important fields in the structure and how they are used are described b
@@ -694 +619 @@
-index e95529974..c7dda9221 100644
+index 0166bb45d..7bc559c8a 100644
@@ -697 +622 @@
-@@ -163,5 +163,5 @@ is applicable when the adapter uses a service core function. The application
+@@ -158,5 +158,5 @@ is applicable when the adapter uses a service core function. The application
@@ -704 +629 @@
-@@ -181,7 +181,7 @@ For SW based packet transfers, i.e., when the
+@@ -176,7 +176,7 @@ For SW based packet transfers, i.e., when the
@@ -715 +640 @@
-index dcdfeb75e..7bcd7603b 100644
+index 8fcae5469..27c51d256 100644
@@ -739,53 +663,0 @@
-diff --git a/doc/guides/prog_guide/ipsec_lib.rst b/doc/guides/prog_guide/ipsec_lib.rst
-index 84696d4cf..6fc08886f 100644
---- a/doc/guides/prog_guide/ipsec_lib.rst
-+++ b/doc/guides/prog_guide/ipsec_lib.rst
-@@ -66,5 +66,5 @@ In that mode the library functions perform
- - check SQN
- - prepare *rte_crypto_op* structure for each input packet
-- - verify that integity check and decryption performed by crypto device
-+ - verify that integrity check and decryption performed by crypto device
- completed successfully
- - check padding data
-@@ -89,5 +89,5 @@ In that mode the library functions perform
- * for inbound packets:
-
-- - verify that integity check and decryption performed by *rte_security*
-+ - verify that integrity check and decryption performed by *rte_security*
- device completed successfully
- - check SQN
-@@ -102,8 +102,8 @@ In that mode the library functions perform
- - add outer IP header (tunnel mode) / update IP header (transport mode)
- - add ESP header and trailer, padding and IV data
-- - update *ol_flags* inside *struct rte_mbuf* to inidicate that
-+ - update *ol_flags* inside *struct rte_mbuf* to indicate that
- inline-crypto processing has to be performed by HW on this packet
- - invoke *rte_security* device specific *set_pkt_metadata()* to associate
-- secuirty device specific data with the packet
-+ security device specific data with the packet
-
- RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL
-@@ -114,13 +114,13 @@ In that mode the library functions perform
- * for inbound packets:
-
-- - verify that integity check and decryption performed by *rte_security*
-+ - verify that integrity check and decryption performed by *rte_security*
- device completed successfully
-
- * for outbound packets:
-
-- - update *ol_flags* inside *struct rte_mbuf* to inidicate that
-+ - update *ol_flags* inside *struct rte_mbuf* to indicate that
- inline-crypto processing has to be performed by HW on this packet
- - invoke *rte_security* device specific *set_pkt_metadata()* to associate
-- secuirty device specific data with the packet
-+ security device specific data with the packet
-
- RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL
-@@ -132,5 +132,5 @@ In that mode the library functions perform
-
- - prepare *rte_crypto_op* structure for each input packet
-- - verify that integity check and decryption performed by crypto device
-+ - verify that integrity check and decryption performed by crypto device
- completed successfully
-
@@ -793 +665 @@
-index 7fcbd936f..daf87f4a8 100644
+index 33ea980e5..7b8a481a6 100644
@@ -796 +668 @@
-@@ -228,5 +228,5 @@ application functions:
+@@ -226,5 +226,5 @@ application functions:
@@ -826 +698 @@
-index 5af795c0d..a36ebef4d 100644
+index 02f05614a..c1b29f937 100644
@@ -844 +716 @@
-index 0203f4f61..937f52bce 100644
+index dbf4999aa..4e9b4440b 100644
@@ -847 +719 @@
-@@ -2130,5 +2130,5 @@ as defined in the ``rte_flow_action_raw_decap``
+@@ -2132,5 +2132,5 @@ as defined in the ``rte_flow_action_raw_decap``
@@ -854 +726 @@
-@@ -2280,5 +2280,5 @@ Decrease TTL value.
+@@ -2282,5 +2282,5 @@ Decrease TTL value.
@@ -861 +733 @@
-@@ -2298,5 +2298,5 @@ Assigns a new TTL value.
+@@ -2300,5 +2300,5 @@ Assigns a new TTL value.
@@ -961 +833 @@
-index a86c07a62..fc3ee4353 100644
+index c77df338f..27c3af8f9 100644
@@ -1048 +920 @@
-index 40a3264ab..405e706a4 100644
+index 653f972f3..6ade9c6e1 100644
@@ -1106 +978 @@
-index 3d784e705..ac118c1a2 100644
+index 4869a011d..5f7d39736 100644
@@ -1118,14 +989,0 @@
-@@ -125,5 +125,5 @@ Where:
- (available only with librte_ipsec code path).
-
--* ``-a``: enables Security Association sequence number atomic behaviour
-+* ``-a``: enables Security Association sequence number atomic behavior
- (available only with librte_ipsec code path).
-
-@@ -753,5 +753,5 @@ DUT OS(NIC1)--(IPsec)-->(NIC1)ipsec-secgw(TAP)--(plain)-->(TAP)SUT OS
- SUT OS(TAP)--(plain)-->(TAP)psec-secgw(NIC1)--(IPsec)-->(NIC1)DUT OS
-
--It then tries to perform some data transfer using the scheme decribed above.
-+It then tries to perform some data transfer using the scheme described above.
-
- usage
@@ -1133 +991 @@
-index e2c04efcc..ac6ee8ac2 100644
+index fbd30a5ea..96f0fc6fd 100644
@@ -1156 +1014 @@
-index 5f313c529..5aefd8d89 100644
+index a9370c80b..af9665b2c 100644
@@ -1162,2 +1020,2 @@
--The application is located in the ``$RTE_SDK/app/test-pipline`` directory.
-+The application is located in the ``$RTE_SDK/app/test-pipeline`` directory.
+-The application is located in the ``$RTE_SDK/test/test-pipline`` directory.
++The application is located in the ``$RTE_SDK/test/test-pipeline`` directory.
@@ -1196 +1054 @@
-index 14d432e78..109d10957 100644
+index 5be9f24d5..57758ca00 100644
@@ -1199 +1057 @@
-@@ -345,5 +345,5 @@ monitoring of branch ratio on cores doing busy polling via PMDs.
+@@ -340,5 +340,5 @@ monitoring of branch ratio on cores doing busy polling via PMDs.
@@ -1206 +1064 @@
-@@ -385,5 +385,5 @@ the file.
+@@ -380,5 +380,5 @@ the file.
@@ -1213 +1071 @@
-@@ -735,5 +735,5 @@ policy down to the host application. These parameters are as follows:
+@@ -730,5 +730,5 @@ policy down to the host application. These parameters are as follows:
@@ -1220 +1078 @@
-@@ -743,5 +743,5 @@ policy down to the host application. These parameters are as follows:
+@@ -738,5 +738,5 @@ policy down to the host application. These parameters are as follows:
@@ -1227 +1085 @@
-@@ -751,5 +751,5 @@ policy down to the host application. These parameters are as follows:
+@@ -746,5 +746,5 @@ policy down to the host application. These parameters are as follows:
@@ -1235 +1093 @@
-index fdf6ec7f9..e7db52068 100644
+index e934b4bed..89df03166 100644
@@ -1238 +1096 @@
-@@ -382,5 +382,5 @@ The command line options are:
+@@ -366,5 +366,5 @@ The command line options are:
@@ -1245 +1103 @@
-@@ -422,5 +422,5 @@ The command line options are:
+@@ -406,5 +406,5 @@ The command line options are:
@@ -1252 +1110 @@
-@@ -428,15 +428,15 @@ The command line options are:
+@@ -412,14 +412,14 @@ The command line options are:
@@ -1270 +1127,0 @@
-
@@ -1272 +1129 @@
-index 5d4dc6f0c..e602df560 100644
+index d4e3fd8a5..34f7bc766 100644
@@ -1275 +1132 @@
-@@ -304,5 +304,5 @@ The available information categories are:
+@@ -303,5 +303,5 @@ The available information categories are:
@@ -1282 +1139 @@
-@@ -327,5 +327,5 @@ The available information categories are:
+@@ -326,5 +326,5 @@ The available information categories are:
@@ -1289 +1146 @@
-@@ -2290,5 +2290,5 @@ set bonding lacp dedicated_queue
+@@ -2247,5 +2247,5 @@ set bonding lacp dedicated_queue
@@ -1296 +1153 @@
-@@ -2298,5 +2298,5 @@ set bonding agg_mode
+@@ -2255,5 +2255,5 @@ set bonding agg_mode
@@ -1303 +1160 @@
-@@ -2692,6 +2692,6 @@ where:
+@@ -2649,6 +2649,6 @@ where:
@@ -1312 +1169 @@
-@@ -2744,5 +2744,5 @@ Add port traffic management hierarchy nonleaf node
+@@ -2701,5 +2701,5 @@ Add port traffic management hierarchy nonleaf node
@@ -1319 +1176 @@
-@@ -2759,5 +2759,5 @@ where:
+@@ -2716,5 +2716,5 @@ where:
@@ -1326 +1183 @@
-@@ -2770,5 +2770,5 @@ Add port traffic management hierarchy leaf node
+@@ -2727,5 +2727,5 @@ Add port traffic management hierarchy leaf node
@@ -1333 +1190 @@
-@@ -2785,5 +2785,5 @@ where:
+@@ -2742,5 +2742,5 @@ where:
@@ -1340 +1197 @@
-@@ -2797,5 +2797,5 @@ Delete port traffic management hierarchy node
+@@ -2754,5 +2754,5 @@ Delete port traffic management hierarchy node
@@ -1347 +1204 @@
-@@ -3990,5 +3990,5 @@ This section lists supported actions and their attributes, if any.
+@@ -3947,5 +3947,5 @@ This section lists supported actions and their attributes, if any.
@@ -1354 +1211 @@
-@@ -4523,5 +4523,5 @@ bpf-load
+@@ -4468,5 +4468,5 @@ bpf-load
@@ -1361 +1218 @@
-@@ -4561,5 +4561,5 @@ bpf-unload
+@@ -4506,5 +4506,5 @@ bpf-unload
@@ -1432 +1289 @@
-index 6bdf5a861..2ea1b59c2 100644
+index d5b5ed6a6..e9a0b79d3 100644
@@ -1435,15 +1292 @@
-@@ -45,5 +45,5 @@ If no port mask is specified xstats are reset for all DPDK ports.
-
- **--show-port**
--The show-port parameter displays port level various configuration informationi
-+The show-port parameter displays port level various configuration information
- associated to RX port queue pair.
-
-@@ -57,5 +57,5 @@ settings and stats per node.
-
- **--show-ring[=name]**
--The show-ring pararmeter display current allocation of all ring with
-+The show-ring parameter display current allocation of all ring with
- debug information. Specifying the name allows to display details for specific
- ring. For invalid or no ring name, whole list is dump.
-@@ -77,5 +77,5 @@ Limitations
+@@ -49,5 +49,5 @@ Limitations
@@ -1457 +1300 @@
-index 07da35e52..7e6a4db2e 100644
+index af38b1632..a8cb6fbbe 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'doc: fix spelling reported by aspell in comments' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
2019-05-08 16:01 ` [dpdk-stable] patch 'raw/ifpga: fix file descriptor leak in error path' " Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix spelling reported by aspell in guides' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/multi_process: fix buffer underrun' " Kevin Traynor
` (31 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: John McNamara; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/5036b8b5fd40451e23dc4889d5ca9fa7c7de3b08
Thanks.
Kevin Traynor
---
From 5036b8b5fd40451e23dc4889d5ca9fa7c7de3b08 Mon Sep 17 00:00:00 2001
From: John McNamara <john.mcnamara@intel.com>
Date: Fri, 26 Apr 2019 16:14:22 +0100
Subject: [PATCH] doc: fix spelling reported by aspell in comments
[ upstream commit 8bd5f07c7a1ac0c5b8d16758efc3ada3e16b0adc ]
Fix spelling errors in the doxygen docs.
Signed-off-by: John McNamara <john.mcnamara@intel.com>
---
drivers/event/opdl/opdl_ring.h | 8 ++++----
drivers/net/i40e/rte_pmd_i40e.h | 4 ++--
drivers/net/nfp/nfp_net.c | 18 +++++++++---------
drivers/net/nfp/nfp_net_pmd.h | 4 ++--
drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 4 ++--
.../performance-thread/common/lthread_api.h | 10 +++++-----
lib/librte_acl/acl_vect.h | 4 ++--
lib/librte_bbdev/rte_bbdev.h | 4 ++--
lib/librte_bpf/rte_bpf.h | 6 +++---
lib/librte_bpf/rte_bpf_ethdev.h | 4 ++--
lib/librte_cryptodev/rte_crypto_asym.h | 10 +++++-----
lib/librte_cryptodev/rte_cryptodev.h | 2 +-
.../rte_distributor_private.h | 2 +-
.../common/include/generic/rte_cycles.h | 2 +-
lib/librte_eal/common/include/rte_class.h | 2 +-
lib/librte_eal/common/include/rte_common.h | 4 ++--
lib/librte_eal/common/include/rte_eal.h | 4 ++--
lib/librte_eal/common/include/rte_log.h | 2 +-
lib/librte_eal/common/include/rte_service.h | 2 +-
lib/librte_eal/common/include/rte_tailq.h | 2 +-
lib/librte_eal/common/include/rte_uuid.h | 4 ++--
lib/librte_eal/common/include/rte_vfio.h | 2 +-
lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +-
lib/librte_efd/rte_efd.h | 2 +-
lib/librte_ethdev/rte_eth_ctrl.h | 2 +-
lib/librte_ethdev/rte_ethdev.h | 4 ++--
lib/librte_ethdev/rte_ethdev_core.h | 4 ++--
lib/librte_ethdev/rte_ethdev_driver.h | 2 +-
lib/librte_ethdev/rte_tm.h | 8 ++++----
lib/librte_eventdev/rte_event_crypto_adapter.h | 2 +-
lib/librte_eventdev/rte_event_eth_rx_adapter.h | 4 ++--
lib/librte_eventdev/rte_eventdev.h | 4 ++--
lib/librte_eventdev/rte_eventdev_pmd.h | 2 +-
lib/librte_flow_classify/rte_flow_classify.h | 4 ++--
lib/librte_hash/rte_hash.h | 2 +-
lib/librte_ip_frag/rte_ip_frag.h | 2 +-
lib/librte_latencystats/rte_latencystats.h | 2 +-
lib/librte_lpm/rte_lpm.h | 2 +-
lib/librte_mbuf/rte_mbuf.h | 6 +++---
lib/librte_mbuf/rte_mbuf_ptype.h | 2 +-
lib/librte_mempool/rte_mempool.h | 4 ++--
lib/librte_power/rte_power_empty_poll.h | 2 +-
lib/librte_rawdev/rte_rawdev.h | 6 +++---
lib/librte_rawdev/rte_rawdev_pmd.h | 8 ++++----
lib/librte_reorder/rte_reorder.h | 2 +-
lib/librte_ring/rte_ring.h | 2 +-
lib/librte_sched/rte_sched.h | 2 +-
lib/librte_security/rte_security.h | 4 ++--
lib/librte_table/rte_table_hash.h | 6 +++---
lib/librte_vhost/rte_vhost.h | 4 ++--
50 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/drivers/event/opdl/opdl_ring.h b/drivers/event/opdl/opdl_ring.h
index 751a59dbc..14ababe0b 100644
--- a/drivers/event/opdl/opdl_ring.h
+++ b/drivers/event/opdl/opdl_ring.h
@@ -25,5 +25,5 @@
*
* A opdl_ring can be used as the basis for pipeline based applications. Instead
- * of each stage in a pipeline dequeueing from a ring, processing and enqueueing
+ * of each stage in a pipeline dequeuing from a ring, processing and enqueuing
* to another ring, it can process entries in-place on the ring. If stages do
* not depend on each other, they can run in parallel.
@@ -153,5 +153,5 @@ opdl_ring_get_name(const struct opdl_ring *t);
* will be processing this stage.
* @param is_input
- * Indication to nitialise the stage with all slots available or none
+ * Indication to initialise the stage with all slots available or none
*
* @return
@@ -590,5 +590,5 @@ opdl_ring_set_stage_threadsafe(struct opdl_stage *s, bool threadsafe);
* if key field event descriptor is changed by application, then
* update the slot in the ring otherwise do nothing with it.
- * the key field is flow_id, prioirty, mbuf, impl_opaque
+ * the key field is flow_id, priority, mbuf, impl_opaque
*
* @param s
@@ -601,5 +601,5 @@ opdl_ring_set_stage_threadsafe(struct opdl_stage *s, bool threadsafe);
* queue type associate with the stage.
* @return
- * if the evevnt key field is changed compare with previous record.
+ * if the event key field is changed compare with previous record.
*/
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index be4a6024a..a1313146b 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -271,5 +271,5 @@ struct rte_pmd_i40e_pkt_template_input {
/** the pctype used for raw packet template */
uint16_t pctype;
- /** the buffer conatining raw packet template */
+ /** the buffer containing raw packet template */
void *packet;
/** the length of buffer with raw packet template */
@@ -315,5 +315,5 @@ struct rte_pmd_i40e_inset {
* Specifies configuration parameters of raw packet template filter.
* @param add
- * Speicifes an action to be taken - add or remove raw packet template filter.
+ * Specifies an action to be taken - add or remove raw packet template filter.
* @return
* - (0) if successful.
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 7d99f080a..68c853c94 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -762,5 +762,5 @@ nfp_net_start(struct rte_eth_dev *dev)
/*
- * Allocating rte mbuffs for configured rx queues.
+ * Allocating rte mbufs for configured rx queues.
* This requires queues being enabled before
*/
@@ -1491,5 +1491,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
- /* Hw queues mapping based on firmware confifguration */
+ /* Hw queues mapping based on firmware configuration */
rxq->qidx = queue_idx;
rxq->fl_qcidx = queue_idx * hw->stride_rx;
@@ -1523,5 +1523,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
if (tz == NULL) {
- PMD_DRV_LOG(ERR, "Error allocatig rx dma");
+ PMD_DRV_LOG(ERR, "Error allocating rx dma");
nfp_net_rx_queue_release(rxq);
return -ENOMEM;
@@ -1910,5 +1910,5 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq)
* RX path design:
*
- * There are some decissions to take:
+ * There are some decisions to take:
* 1) How to check DD RX descriptors bit
* 2) How and when to allocate new mbufs
@@ -1980,5 +1980,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
/*
- * We got a packet. Let's alloc a new mbuff for refilling the
+ * We got a packet. Let's alloc a new mbuf for refilling the
* free descriptor ring as soon as possible
*/
@@ -1995,6 +1995,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
/*
- * Grab the mbuff and refill the descriptor with the
- * previously allocated mbuff
+ * Grab the mbuf and refill the descriptor with the
+ * previously allocated mbuf
*/
mb = rxb->mbuf;
@@ -2028,5 +2028,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
}
- /* Filling the received mbuff with packet info */
+ /* Filling the received mbuf with packet info */
if (hw->rx_offset)
mb->data_off = RTE_PKTMBUF_HEADROOM + hw->rx_offset;
@@ -2053,5 +2053,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
}
- /* Adding the mbuff to the mbuff array passed by the app */
+ /* Adding the mbuf to the mbuf array passed by the app */
rx_pkts[avail++] = mb;
diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h
index b01036df2..d70cbc634 100644
--- a/drivers/net/nfp/nfp_net_pmd.h
+++ b/drivers/net/nfp/nfp_net_pmd.h
@@ -35,5 +35,5 @@
* @file dpdk/pmd/nfp_net_pmd.h
*
- * Netronome NFP_NET PDM driver
+ * Netronome NFP_NET PMD driver
*/
@@ -241,5 +241,5 @@ struct nfp_net_txq {
/*
- * For each descriptor keep a reference to the mbuff and
+ * For each descriptor keep a reference to the mbuf and
* DMA address used until completion is signalled.
*/
diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h
index 17fffcb74..29b4fe917 100644
--- a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h
+++ b/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h
@@ -32,5 +32,5 @@ enum {
/**
- * If user has configued a Virtual Queue mode, but for some particular VQ
+ * If user has configured a Virtual Queue mode, but for some particular VQ
* user needs an exclusive H/W queue associated (for better performance
* on that particular VQ), then user can pass this flag while creating the
@@ -263,5 +263,5 @@ rte_qdma_vq_stats(uint16_t vq_id,
*
* @param vq_id
- * Virtual Queue ID which needs to be deinialized.
+ * Virtual Queue ID which needs to be uninitialized.
*
* @returns
diff --git a/examples/performance-thread/common/lthread_api.h b/examples/performance-thread/common/lthread_api.h
index 995deb4d1..e6879ea5c 100644
--- a/examples/performance-thread/common/lthread_api.h
+++ b/examples/performance-thread/common/lthread_api.h
@@ -207,10 +207,10 @@ void lthread_run(void);
* lcore.
*
- * If no scheduler exists yet on the curret lcore then one is created.
+ * If no scheduler exists yet on the current lcore then one is created.
*
* @param new_lt
* Pointer to an lthread pointer that will be initialized
* @param lcore
- * the lcore the thread should be started on or the current clore
+ * the lcore the thread should be started on or the current lcore
* -1 the current lcore
* 0 - LTHREAD_MAX_LCORES any other lcore
@@ -470,5 +470,5 @@ void
* Set lthread TLS
*
- * This function is modelled on pthread_set_sepcific()
+ * This function is modelled on pthread_set_specific()
* It associates a thread-specific value with a key obtained via a previous
* call to lthread_key_create().
@@ -750,5 +750,5 @@ int lthread_cond_wait(struct lthread_cond *c, uint64_t reserved);
*
* The function unblocks one thread waiting for the condition variable cond.
- * If no threads are waiting on cond, the rte_lthead_cond_signal() function
+ * If no threads are waiting on cond, the rte_lthread_cond_signal() function
* has no effect.
*
@@ -766,5 +766,5 @@ int lthread_cond_signal(struct lthread_cond *c);
*
* The function unblocks all threads waiting for the condition variable cond.
- * If no threads are waiting on cond, the rte_lthead_cond_broadcast()
+ * If no threads are waiting on cond, the rte_lathed_cond_broadcast()
* function has no effect.
*
diff --git a/lib/librte_acl/acl_vect.h b/lib/librte_acl/acl_vect.h
index 194fca902..951e5828a 100644
--- a/lib/librte_acl/acl_vect.h
+++ b/lib/librte_acl/acl_vect.h
@@ -18,5 +18,5 @@ extern "C" {
/*
- * Takes 2 SIMD registers containing N transitions eachi (tr0, tr1).
+ * Takes 2 SIMD registers containing N transitions each (tr0, tr1).
* Shuffles it into different representation:
* lo - contains low 32 bits of given N transitions.
@@ -67,5 +67,5 @@ extern "C" {
dfa_ofs = _##P##_sub_epi32(t, r); \
\
- /* QUAD/SINGLE caluclations. */ \
+ /* QUAD/SINGLE calculations. */ \
t = _##P##_cmpgt_epi8(in, tr_hi); \
t = _##P##_sign_epi8(t, t); \
diff --git a/lib/librte_bbdev/rte_bbdev.h b/lib/librte_bbdev/rte_bbdev.h
index 25ef409f7..4a2873b2f 100644
--- a/lib/librte_bbdev/rte_bbdev.h
+++ b/lib/librte_bbdev/rte_bbdev.h
@@ -44,5 +44,5 @@ extern "C" {
#endif
-/** Flags indiciate current state of BBDEV device */
+/** Flags indicate current state of BBDEV device */
enum rte_bbdev_state {
RTE_BBDEV_UNUSED,
@@ -162,5 +162,5 @@ rte_bbdev_queue_configure(uint16_t dev_id, uint16_t queue_id,
/**
* Start a device.
- * This is the last step needed before enqueueing operations is possible.
+ * This is the last step needed before enqueuing operations is possible.
*
* @param dev_id
diff --git a/lib/librte_bpf/rte_bpf.h b/lib/librte_bpf/rte_bpf.h
index ad62ef2c6..ab92af8fe 100644
--- a/lib/librte_bpf/rte_bpf.h
+++ b/lib/librte_bpf/rte_bpf.h
@@ -121,5 +121,5 @@ rte_bpf_destroy(struct rte_bpf *bpf);
*
* @param prm
- * Parameters used to create and initialise the BPF exeution context.
+ * Parameters used to create and initialise the BPF execution context.
* @return
* BPF handle that is used in future BPF operations,
@@ -137,5 +137,5 @@ rte_bpf_load(const struct rte_bpf_prm *prm);
*
* @param prm
- * Parameters used to create and initialise the BPF exeution context.
+ * Parameters used to create and initialise the BPF execution context.
* @param fname
* Pathname for a ELF file.
@@ -184,5 +184,5 @@ rte_bpf_exec_burst(const struct rte_bpf *bpf, void *ctx[], uint64_t rc[],
/**
- * Provide information about natively compield code for given BPF handle.
+ * Provide information about natively compiled code for given BPF handle.
*
* @param bpf
diff --git a/lib/librte_bpf/rte_bpf_ethdev.h b/lib/librte_bpf/rte_bpf_ethdev.h
index 11d09cdc2..1943372f2 100644
--- a/lib/librte_bpf/rte_bpf_ethdev.h
+++ b/lib/librte_bpf/rte_bpf_ethdev.h
@@ -74,5 +74,5 @@ rte_bpf_eth_tx_unload(uint16_t port, uint16_t queue);
* Name of the executable section within the file to load.
* @param prm
- * Parameters used to create and initialise the BPF exeution context.
+ * Parameters used to create and initialise the BPF execution context.
* @param flags
* Flags that define expected behavior of the loaded filter
@@ -99,5 +99,5 @@ rte_bpf_eth_rx_elf_load(uint16_t port, uint16_t queue,
* Name of the executable section within the file to load.
* @param prm
- * Parameters used to create and initialise the BPF exeution context.
+ * Parameters used to create and initialise the BPF execution context.
* @param flags
* Flags that define expected expected behavior of the loaded filter
diff --git a/lib/librte_cryptodev/rte_crypto_asym.h b/lib/librte_cryptodev/rte_crypto_asym.h
index 5e185b2dd..b1c1a6c17 100644
--- a/lib/librte_cryptodev/rte_crypto_asym.h
+++ b/lib/librte_cryptodev/rte_crypto_asym.h
@@ -113,13 +113,13 @@ enum rte_crypto_rsa_padding_type {
RTE_CRYPTO_RSA_PKCS1_V1_5_BT0,
/**< RSA PKCS#1 V1.5 Block Type 0 padding scheme
- * as descibed in rfc2313
+ * as described in rfc2313
*/
RTE_CRYPTO_RSA_PKCS1_V1_5_BT1,
/**< RSA PKCS#1 V1.5 Block Type 01 padding scheme
- * as descibed in rfc2313
+ * as described in rfc2313
*/
RTE_CRYPTO_RSA_PKCS1_V1_5_BT2,
/**< RSA PKCS#1 V1.5 Block Type 02 padding scheme
- * as descibed in rfc2313
+ * as described in rfc2313
*/
RTE_CRYPTO_RSA_PADDING_OAEP,
@@ -228,5 +228,5 @@ struct rte_crypto_rsa_xform {
* Asymmetric Modular exponentiation transform data
*
- * Structure describing modular exponentation xform param
+ * Structure describing modular exponentiation xform param
*
*/
@@ -272,5 +272,5 @@ struct rte_crypto_dh_xform {
rte_crypto_param p;
/**< p : Prime modulus data
- * DH prime modulous data in octet-string network byte order format.
+ * DH prime modulus data in octet-string network byte order format.
*
*/
diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index 4099823f1..d9c3a0646 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -1098,5 +1098,5 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id,
*
* @return
- * Size of the symmetric eader session.
+ * Size of the symmetric header session.
*/
unsigned int
diff --git a/lib/librte_distributor/rte_distributor_private.h b/lib/librte_distributor/rte_distributor_private.h
index fce68c954..33cd89410 100644
--- a/lib/librte_distributor/rte_distributor_private.h
+++ b/lib/librte_distributor/rte_distributor_private.h
@@ -42,5 +42,5 @@ extern "C" {
/**
* Maximum number of workers allowed.
- * Be aware of increasing the limit, becaus it is limited by how we track
+ * Be aware of increasing the limit, because it is limited by how we track
* in-flight tags. See in_flight_bitmask and rte_distributor_process
*/
diff --git a/lib/librte_eal/common/include/generic/rte_cycles.h b/lib/librte_eal/common/include/generic/rte_cycles.h
index ac379e878..d318b91a8 100644
--- a/lib/librte_eal/common/include/generic/rte_cycles.h
+++ b/lib/librte_eal/common/include/generic/rte_cycles.h
@@ -174,5 +174,5 @@ rte_delay_us_sleep(unsigned int us);
* @param userfunc
* User function which replaces rte_delay_us. rte_delay_us_block restores
- * buildin block delay function.
+ * builtin block delay function.
*/
void rte_delay_us_callback_register(void(*userfunc)(unsigned int));
diff --git a/lib/librte_eal/common/include/rte_class.h b/lib/librte_eal/common/include/rte_class.h
index 276c91e95..856d09b22 100644
--- a/lib/librte_eal/common/include/rte_class.h
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -16,5 +16,5 @@
* A device class defines the type of function a device
* will be used for e.g.: Ethernet adapter (eth),
- * cryptographic coprocessor (crypto), etc.
+ * cryptographic co-processor (crypto), etc.
*/
diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index 66cdf60b2..48bf28ca5 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -341,5 +341,5 @@ rte_is_power_of_2(uint32_t n)
*
* @param x
- * The integer value to algin
+ * The integer value to align
*
* @return
@@ -359,5 +359,5 @@ rte_align32pow2(uint32_t x)
*
* @param x
- * The integer value to algin
+ * The integer value to align
*
* @return
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index a0cedd573..67a4ffb6b 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -288,5 +288,5 @@ rte_mp_action_unregister(const char *name);
* Send a message to the peer process.
*
- * This function will send a message which will be responsed by the action
+ * This function will send a message which will be responded by the action
* identified by name in the peer process.
*
@@ -425,5 +425,5 @@ rte_set_application_usage_hook(rte_usage_hook_t usage_func);
/**
- * macro to get the multiple lock of mempool shared by mutiple-instance
+ * macro to get the multiple lock of mempool shared by multiple-instance
*/
#define RTE_EAL_MEMPOOL_RWLOCK (&rte_eal_get_configuration()->mem_config->mplock)
diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h
index 2f789cb90..213043c4a 100644
--- a/lib/librte_eal/common/include/rte_log.h
+++ b/lib/librte_eal/common/include/rte_log.h
@@ -37,5 +37,5 @@ struct rte_logs {
};
-/** Global log informations */
+/** Global log information */
extern struct rte_logs rte_logs;
diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
index 34b41aff2..11f673503 100644
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -338,5 +338,5 @@ int32_t rte_service_lcore_list(uint32_t array[], uint32_t n);
/**
- * Get the numer of services running on the supplied lcore.
+ * Get the number of services running on the supplied lcore.
*
* @param lcore Id of the service core.
diff --git a/lib/librte_eal/common/include/rte_tailq.h b/lib/librte_eal/common/include/rte_tailq.h
index 9b01abb2c..b6fe4e5f7 100644
--- a/lib/librte_eal/common/include/rte_tailq.h
+++ b/lib/librte_eal/common/include/rte_tailq.h
@@ -54,5 +54,5 @@ struct rte_tailq_elem {
/**
- * Return the first tailq entry casted to the right struct.
+ * Return the first tailq entry cast to the right struct.
*/
#define RTE_TAILQ_CAST(tailq_entry, struct_name) \
diff --git a/lib/librte_eal/common/include/rte_uuid.h b/lib/librte_eal/common/include/rte_uuid.h
index 2c846b5fe..16bbed321 100644
--- a/lib/librte_eal/common/include/rte_uuid.h
+++ b/lib/librte_eal/common/include/rte_uuid.h
@@ -44,5 +44,5 @@ extern "C" {
/**
- * Struct describing a Universal Unique Identifer
+ * Struct describing a Universal Unique Identifier
*/
typedef unsigned char rte_uuid_t[16];
@@ -106,5 +106,5 @@ int rte_uuid_compare(const rte_uuid_t a, const rte_uuid_t b);
* Destination UUID
* @return
- * Returns 0 on succes, and -1 if string is not a valid UUID.
+ * Returns 0 on success, and -1 if string is not a valid UUID.
*/
int rte_uuid_parse(const char *in, rte_uuid_t uu);
diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h
index 4b3a91e91..d837f1e76 100644
--- a/lib/librte_eal/common/include/rte_vfio.h
+++ b/lib/librte_eal/common/include/rte_vfio.h
@@ -179,5 +179,5 @@ int rte_vfio_noiommu_is_enabled(void);
*
* @param vfio_group_fd
- * VFIO Grouup FD.
+ * VFIO Group FD.
*
* @return
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index ee5f6613b..898bdb775 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1394,5 +1394,5 @@ eal_legacy_hugepage_init(void)
rte_mem_check_dma_mask_thread_unsafe(mcfg->dma_maskbits)) {
RTE_LOG(ERR, EAL,
- "%s(): couldnt allocate memory due to IOVA exceeding limits of current DMA mask.\n",
+ "%s(): couldn't allocate memory due to IOVA exceeding limits of current DMA mask.\n",
__func__);
if (rte_eal_iova_mode() == RTE_IOVA_VA &&
diff --git a/lib/librte_efd/rte_efd.h b/lib/librte_efd/rte_efd.h
index 2ace008e8..c2be4c09a 100644
--- a/lib/librte_efd/rte_efd.h
+++ b/lib/librte_efd/rte_efd.h
@@ -192,5 +192,5 @@ rte_efd_find_existing(const char *name);
* RTE_EFD_UPDATE_FAILED
* Either the EFD failed to find a suitable perfect hash or the group was full
- * This is a fatal error, and the table is now in an indeterminite state
+ * This is a fatal error, and the table is now in an indeterminate state
* RTE_EFD_UPDATE_NO_CHANGE
* Operation resulted in no change to the table (same value already exists)
diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h
index 5ea8ae24c..925a63f24 100644
--- a/lib/librte_ethdev/rte_eth_ctrl.h
+++ b/lib/librte_ethdev/rte_eth_ctrl.h
@@ -590,5 +590,5 @@ struct rte_eth_fdir_masks {
/** Bit mask for ipv4 flow in big endian. */
struct rte_eth_ipv4_flow ipv4_mask;
- /** Bit maks for ipv6 flow in big endian. */
+ /** Bit mask for ipv6 flow in big endian. */
struct rte_eth_ipv6_flow ipv6_mask;
/** Bit mask for L4 source port in big endian. */
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 070330192..0e3536197 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -2102,5 +2102,5 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
* statistics values function should retrieve. This parameter
* can be set to NULL if size is 0. In this case function will retrieve
- * all avalible statistics.
+ * all available statistics.
* @param values
* A pointer to a table to be filled with device statistics values.
@@ -2543,5 +2543,5 @@ rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,
* Request the driver to free mbufs currently cached by the driver. The
* driver will only free the mbuf if it is no longer in use. It is the
- * application's responsibity to ensure rte_eth_tx_buffer_flush(..) is
+ * application's responsibility to ensure rte_eth_tx_buffer_flush(..) is
* called if needed.
*
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h
index 8f03f83f6..16300b147 100644
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h
@@ -106,5 +106,5 @@ typedef int (*eth_queue_stats_mapping_set_t)(struct rte_eth_dev *dev,
typedef void (*eth_dev_infos_get_t)(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
-/**< @internal Get specific informations of an Ethernet device. */
+/**< @internal Get specific information of an Ethernet device. */
typedef const uint32_t *(*eth_dev_supported_ptypes_get_t)(struct rte_eth_dev *dev);
@@ -368,5 +368,5 @@ typedef int (*eth_tm_ops_get_t)(struct rte_eth_dev *dev, void *ops);
typedef int (*eth_mtr_ops_get_t)(struct rte_eth_dev *dev, void *ops);
-/**< @internal Get Trafffic Metering and Policing (MTR) operations */
+/**< @internal Get Traffic Metering and Policing (MTR) operations */
typedef int (*eth_get_dcb_info)(struct rte_eth_dev *dev,
diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h
index c2ac26328..f2274809c 100644
--- a/lib/librte_ethdev/rte_ethdev_driver.h
+++ b/lib/librte_ethdev/rte_ethdev_driver.h
@@ -318,5 +318,5 @@ typedef int (*ethdev_uninit_t)(struct rte_eth_dev *ethdev);
* @b EXPERIMENTAL: this API may change without prior notice.
*
- * PMD helper function for cleaing up the resources of a ethdev port on it's
+ * PMD helper function for cleaning up the resources of a ethdev port on it's
* destruction.
*
diff --git a/lib/librte_ethdev/rte_tm.h b/lib/librte_ethdev/rte_tm.h
index 646ef3880..af23c0f54 100644
--- a/lib/librte_ethdev/rte_tm.h
+++ b/lib/librte_ethdev/rte_tm.h
@@ -379,5 +379,5 @@ struct rte_tm_capabilities {
/** WRED packet mode support. When non-zero, this parameter indicates
- * that there is atleast one leaf node that supports the WRED packet
+ * that there is at least one leaf node that supports the WRED packet
* mode, which might not be true for all the leaf nodes. In packet
* mode, the WRED thresholds specify the queue length in packets, as
@@ -387,5 +387,5 @@ struct rte_tm_capabilities {
/** WRED byte mode support. When non-zero, this parameter indicates that
- * there is atleast one leaf node that supports the WRED byte mode,
+ * there is at least one leaf node that supports the WRED byte mode,
* which might not be true for all the leaf nodes. In byte mode, the
* WRED thresholds specify the queue length in bytes, as opposed to
@@ -646,5 +646,5 @@ struct rte_tm_level_capabilities {
/** WRED packet mode support. When non-zero, this
- * parameter indicates that there is atleast one leaf
+ * parameter indicates that there is at least one leaf
* node on this level that supports the WRED packet
* mode, which might not be true for all the leaf
@@ -655,5 +655,5 @@ struct rte_tm_level_capabilities {
/** WRED byte mode support. When non-zero, this
- * parameter indicates that there is atleast one leaf
+ * parameter indicates that there is at least one leaf
* node on this level that supports the WRED byte mode,
* which might not be true for all the leaf nodes. In
diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.h b/lib/librte_eventdev/rte_event_crypto_adapter.h
index d367309cb..9ac8e6f49 100644
--- a/lib/librte_eventdev/rte_event_crypto_adapter.h
+++ b/lib/librte_eventdev/rte_event_crypto_adapter.h
@@ -140,5 +140,5 @@
* - rte_event_crypto_adapter_stats_reset()
- * The applicaton creates an instance using rte_event_crypto_adapter_create()
+ * The application creates an instance using rte_event_crypto_adapter_create()
* or rte_event_crypto_adapter_create_ext().
*
diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.h b/lib/librte_eventdev/rte_event_eth_rx_adapter.h
index 863b72a10..bb14bb2d9 100644
--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.h
+++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.h
@@ -67,7 +67,7 @@
* RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT is not set in the adapter's
* capabilities flags for a particular ethernet device, the service function
- * temporarily enqueues mbufs to an event buffer before batch enqueueing these
+ * temporarily enqueues mbufs to an event buffer before batch enqueuing these
* to the event device. If the buffer fills up, the service function stops
- * dequeueing packets from the ethernet device. The application may want to
+ * dequeuing packets from the ethernet device. The application may want to
* monitor the buffer fill level and instruct the service function to
* selectively buffer packets. The application may also use some other
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h
index ef10a855d..b90a18d8b 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -1156,5 +1156,5 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);
#define RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA 0x8
-/**< Flag indicates HW/SW suports a mechanism to store and retrieve
+/**< Flag indicates HW/SW supports a mechanism to store and retrieve
* the private data information along with the crypto session.
*/
@@ -1738,5 +1738,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
*
* @param dev_id
- * The indentifier of the device.
+ * The identifier of the device.
*
* @param port_id
diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h
index 1a01326b8..d118b9e5b 100644
--- a/lib/librte_eventdev/rte_eventdev_pmd.h
+++ b/lib/librte_eventdev/rte_eventdev_pmd.h
@@ -874,5 +874,5 @@ typedef int (*eventdev_eth_tx_adapter_free_t)(uint8_t id,
*
* @param tx_queue_id
- * Transmt queue index
+ * Transmit queue index
*
* @return
diff --git a/lib/librte_flow_classify/rte_flow_classify.h b/lib/librte_flow_classify/rte_flow_classify.h
index 56e063536..01e88e543 100644
--- a/lib/librte_flow_classify/rte_flow_classify.h
+++ b/lib/librte_flow_classify/rte_flow_classify.h
@@ -209,5 +209,5 @@ rte_flow_classify_validate(struct rte_flow_classifier *cls,
/**
- * Add a flow classify rule to the flow_classifer table.
+ * Add a flow classify rule to the flow_classifier table.
*
* @param[in] cls
@@ -236,5 +236,5 @@ rte_flow_classify_table_entry_add(struct rte_flow_classifier *cls,
/**
- * Delete a flow classify rule from the flow_classifer table.
+ * Delete a flow classify rule from the flow_classifier table.
*
* @param[in] cls
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index c93d1a137..e5970b468 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -40,5 +40,5 @@ extern "C" {
#define RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY 0x04
-/** Flag to indicate the extendabe bucket table feature should be used */
+/** Flag to indicate the extendable bucket table feature should be used */
#define RTE_HASH_EXTRA_FLAGS_EXT_TABLE 0x08
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h
index 04fd9df52..bc4c100f3 100644
--- a/lib/librte_ip_frag/rte_ip_frag.h
+++ b/lib/librte_ip_frag/rte_ip_frag.h
@@ -275,5 +275,5 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
/**
* This function implements reassembly of fragmented IPv4 packets.
- * Incoming mbufs should have its l2_len/l3_len fields setup correclty.
+ * Incoming mbufs should have its l2_len/l3_len fields setup correctly.
*
* @param tbl
diff --git a/lib/librte_latencystats/rte_latencystats.h b/lib/librte_latencystats/rte_latencystats.h
index efcfa028a..67120729e 100644
--- a/lib/librte_latencystats/rte_latencystats.h
+++ b/lib/librte_latencystats/rte_latencystats.h
@@ -25,5 +25,5 @@ extern "C" {
* implementation.
*
- * Function type used for identifting flow types of a Rx packet.
+ * Function type used for identifying flow types of a Rx packet.
*
* The callback function is called on Rx for each packet.
diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h
index 21550444d..b886f54b4 100644
--- a/lib/librte_lpm/rte_lpm.h
+++ b/lib/librte_lpm/rte_lpm.h
@@ -443,5 +443,5 @@ rte_lpm_lookup_bulk_func(const struct rte_lpm *lpm, const uint32_t *ips,
* Next hop of the most specific rule found for IP (valid on lookup hit only).
* This is an 4 elements array of two byte values.
- * If the lookup was succesfull for the given IP, then least significant byte
+ * If the lookup was successful for the given IP, then least significant byte
* of the corresponding element is the actual next hop and the most
* significant byte is zero.
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index c3bf2fe6d..8eab5a836 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -210,5 +210,5 @@ extern "C" {
* Outer UDP checksum offload flag. This flag is used for enabling
* outer UDP checksum in PMD. To use outer UDP checksum, the user needs to
- * 1) Enable the following in mbuff,
+ * 1) Enable the following in mbuf,
* a) Fill outer_l2_len and outer_l3_len in mbuf.
* b) Set the PKT_TX_OUTER_UDP_CKSUM flag.
@@ -1291,5 +1291,5 @@ static inline void rte_pktmbuf_reset_headroom(struct rte_mbuf *m)
*
* @param m
- * The packet mbuf to be resetted.
+ * The packet mbuf to be reset.
*/
#define MBUF_INVALID_PORT UINT16_MAX
@@ -1464,5 +1464,5 @@ rte_pktmbuf_ext_shinfo_init_helper(void *buf_addr, uint16_t *buf_len,
*
* Memory for shared data must be provided and user must initialize all of
- * the content properly, escpecially free callback and refcnt. The pointer
+ * the content properly, especially free callback and refcnt. The pointer
* of shared data will be stored in m->shinfo.
* ``rte_pktmbuf_ext_shinfo_init_helper`` can help to simply spare a few
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h
index 23bc635f7..17a2dd357 100644
--- a/lib/librte_mbuf/rte_mbuf_ptype.h
+++ b/lib/librte_mbuf/rte_mbuf_ptype.h
@@ -427,5 +427,5 @@ extern "C" {
#define RTE_PTYPE_TUNNEL_ESP 0x00009000
/**
- * L2TP (Layer 2 Tunneling Protocol) tunnleing packet type.
+ * L2TP (Layer 2 Tunneling Protocol) tunneling packet type.
*
* Packet format:
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 7c9cd9a2f..fe2f33352 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -428,5 +428,5 @@ typedef int (*rte_mempool_dequeue_t)(struct rte_mempool *mp,
* @b EXPERIMENTAL: this API may change without prior notice.
*
- * Dequeue a number of contiquous object blocks from the external pool.
+ * Dequeue a number of contiguous object blocks from the external pool.
*/
typedef int (*rte_mempool_dequeue_contig_blocks_t)(struct rte_mempool *mp,
@@ -1365,5 +1365,5 @@ __mempool_generic_get(struct rte_mempool *mp, void **obj_table,
if (unlikely(ret < 0)) {
/*
- * In the offchance that we are buffer constrained,
+ * In the off chance that we are buffer constrained,
* where we are not able to allocate cache + n, go to
* the ring directly. If that fails, we are truly out of
diff --git a/lib/librte_power/rte_power_empty_poll.h b/lib/librte_power/rte_power_empty_poll.h
index c1ad5c24d..33f24e0c3 100644
--- a/lib/librte_power/rte_power_empty_poll.h
+++ b/lib/librte_power/rte_power_empty_poll.h
@@ -60,5 +60,5 @@ struct freq_threshold {
};
-/* Each Worder Thread Empty Poll Stats */
+/* Each Worker Thread Empty Poll Stats */
struct priority_worker {
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/librte_rawdev/rte_rawdev.h
index 684bfdb81..ed011ca22 100644
--- a/lib/librte_rawdev/rte_rawdev.h
+++ b/lib/librte_rawdev/rte_rawdev.h
@@ -26,5 +26,5 @@ extern "C" {
#include <rte_errno.h>
-/* Rawdevice object - essentially a void to be typecasted by implementation */
+/* Rawdevice object - essentially a void to be typecast by implementation */
typedef void *rte_rawdev_obj_t;
@@ -245,5 +245,5 @@ rte_rawdev_close(uint16_t dev_id);
* Raw device identifiers
* @return
- * 0 for sucessful reset,
+ * 0 for successful reset,
* !0 for failure in resetting
*/
@@ -374,5 +374,5 @@ rte_rawdev_set_attr(uint16_t dev_id,
* The identifier of the device to configure.
* @param buffers
- * Collection of buffers for enqueueing
+ * Collection of buffers for enqueuing
* @param count
* Count of buffers to enqueue
diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/librte_rawdev/rte_rawdev_pmd.h
index 811e51d07..5e6cf1d16 100644
--- a/lib/librte_rawdev/rte_rawdev_pmd.h
+++ b/lib/librte_rawdev/rte_rawdev_pmd.h
@@ -283,5 +283,5 @@ typedef uint16_t (*rawdev_queue_count_t)(struct rte_rawdev *dev);
* application can pass information about the queues on which enqueue needs
* to be done. Or, the enqueue operation might be passed reference to an
- * object containing a callback (agreed upon between applicatio and driver).
+ * object containing a callback (agreed upon between application and driver).
*
* @return
@@ -464,5 +464,5 @@ typedef int (*rawdev_firmware_version_get_t)(struct rte_rawdev *dev,
/**
- * Load firwmare from a buffer (DMA'able)
+ * Load firmware from a buffer (DMA'able)
*
* @param dev
@@ -481,5 +481,5 @@ typedef int (*rawdev_firmware_load_t)(struct rte_rawdev *dev,
/**
- * Unload firwmare
+ * Unload firmware
*
* @param dev
@@ -549,5 +549,5 @@ struct rte_rawdev_ops {
rawdev_xstats_reset_t xstats_reset;
- /**< Obtainer firmware status */
+ /**< Obtain firmware status */
rawdev_firmware_status_get_t firmware_status_get;
/**< Obtain firmware version information */
diff --git a/lib/librte_reorder/rte_reorder.h b/lib/librte_reorder/rte_reorder.h
index 1bcc2e323..6d3971008 100644
--- a/lib/librte_reorder/rte_reorder.h
+++ b/lib/librte_reorder/rte_reorder.h
@@ -71,5 +71,5 @@ rte_reorder_init(struct rte_reorder_buffer *b, unsigned int bufsize,
*
* @param name
- * Name of the reorder buffer instacne as passed to rte_reorder_create()
+ * Name of the reorder buffer instance as passed to rte_reorder_create()
* @return
* Pointer to reorder buffer instance or NULL if object not found with rte_errno
diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index 83d0f6f83..e265e9479 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -303,5 +303,5 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r);
* There are 2 choices for the users
* 1.use rmb() memory barrier
- * 2.use one-direcion load_acquire/store_release barrier,defined by
+ * 2.use one-direction load_acquire/store_release barrier,defined by
* CONFIG_RTE_USE_C11_MEM_MODEL=y
* It depends on performance test results.
diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h
index 84fa896de..c1bdb1df2 100644
--- a/lib/librte_sched/rte_sched.h
+++ b/lib/librte_sched/rte_sched.h
@@ -34,5 +34,5 @@ extern "C" {
* - When any subport traffic class is oversubscribed
* (configuration time event), the usage of subport member
- * pipes with high demand for thattraffic class pipes is
+ * pipes with high demand for that traffic class pipes is
* truncated to a dynamically adjusted value with no
* impact to low demand pipes;
diff --git a/lib/librte_security/rte_security.h b/lib/librte_security/rte_security.h
index 718147e00..7e6ced4e4 100644
--- a/lib/librte_security/rte_security.h
+++ b/lib/librte_security/rte_security.h
@@ -535,5 +535,5 @@ struct rte_security_capability {
/**< PDCP mode of operation: Control or data */
uint32_t capa_flags;
- /**< Capabilitity flags, see RTE_SECURITY_PDCP_* */
+ /**< Capability flags, see RTE_SECURITY_PDCP_* */
} pdcp;
/**< PDCP capability */
@@ -567,5 +567,5 @@ struct rte_security_capability {
/**< HW constructs trailer of packets
* Transmitted packets will have the trailer added to them
- * by hardawre. The next protocol field will be based on
+ * by hardware. The next protocol field will be based on
* the mbuf->inner_esp_next_proto field.
*/
diff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h
index 6f55bd570..61a0eed6c 100644
--- a/lib/librte_table/rte_table_hash.h
+++ b/lib/librte_table/rte_table_hash.h
@@ -30,5 +30,5 @@ extern "C" {
* current LRU key, is always picked. The LRU logic requires maintaining
* specific data structures per each bucket. Use-cases: flow cache, etc.
- * b. Extendible bucket (ext): The bucket is extended with space for 4 more
+ * b. Extendable bucket (ext): The bucket is extended with space for 4 more
* keys. This is done by allocating additional memory at table init time,
* which is used to create a pool of free keys (the size of this pool is
@@ -42,5 +42,5 @@ extern "C" {
* first group of 4 keys, the search continues beyond the first group of
* 4 keys, potentially until all keys in this bucket are examined. The
- * extendible bucket logic requires maintaining specific data structures
+ * extendable bucket logic requires maintaining specific data structures
* per table and per each bucket. Use-cases: flow table, etc.
* 2. Key size:
@@ -87,5 +87,5 @@ struct rte_table_hash_params {
};
-/** Extendible bucket hash table operations */
+/** Extendable bucket hash table operations */
extern struct rte_table_ops rte_table_hash_ext_ops;
extern struct rte_table_ops rte_table_hash_key8_ext_ops;
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index d280ac420..5905e2401 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -489,5 +489,5 @@ int rte_vhost_get_ifname(int vid, char *buf, size_t len);
*
* @return
- * num of avail entires left
+ * num of avail entries left
*/
uint16_t rte_vhost_avail_entries(int vid, uint16_t queue_id);
@@ -537,5 +537,5 @@ uint16_t rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
* Get guest mem table: a list of memory regions.
*
- * An rte_vhost_vhost_memory object will be allocated internaly, to hold the
+ * An rte_vhost_vhost_memory object will be allocated internally, to hold the
* guest memory regions. Application should free it at destroy_device()
* callback.
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.668333671 +0100
+++ 0004-doc-fix-spelling-reported-by-aspell-in-comments.patch 2019-05-08 16:33:57.358579877 +0100
@@ -1 +1 @@
-From 8bd5f07c7a1ac0c5b8d16758efc3ada3e16b0adc Mon Sep 17 00:00:00 2001
+From 5036b8b5fd40451e23dc4889d5ca9fa7c7de3b08 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8bd5f07c7a1ac0c5b8d16758efc3ada3e16b0adc ]
+
@@ -10,2 +11,0 @@
- .../common/qat/qat_adf/icp_qat_fw_mmp_ids.h | 2 +-
- drivers/common/qat/qat_adf/icp_qat_fw_pke.h | 2 +-
@@ -16 +16 @@
- drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 6 +++---
+ drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma.h | 4 ++--
@@ -22 +22 @@
- lib/librte_cryptodev/rte_crypto_asym.h | 12 ++++++------
+ lib/librte_cryptodev/rte_crypto_asym.h | 10 +++++-----
@@ -34 +34 @@
- lib/librte_eal/linux/eal/eal_memory.c | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +-
@@ -37 +37 @@
- lib/librte_ethdev/rte_ethdev.h | 8 ++++----
+ lib/librte_ethdev/rte_ethdev.h | 4 ++--
@@ -48,4 +47,0 @@
- lib/librte_ipsec/crypto.h | 2 +-
- lib/librte_ipsec/misc.h | 2 +-
- lib/librte_ipsec/rte_ipsec_group.h | 2 +-
- lib/librte_ipsec/rte_ipsec_sa.h | 2 +-
@@ -54 +50 @@
- lib/librte_mbuf/rte_mbuf.h | 8 ++++----
+ lib/librte_mbuf/rte_mbuf.h | 6 +++---
@@ -57 +52,0 @@
- lib/librte_pipeline/rte_table_action.h | 2 +-
@@ -67 +62 @@
- 57 files changed, 112 insertions(+), 112 deletions(-)
+ 50 files changed, 100 insertions(+), 100 deletions(-)
@@ -69,22 +63,0 @@
-diff --git a/drivers/common/qat/qat_adf/icp_qat_fw_mmp_ids.h b/drivers/common/qat/qat_adf/icp_qat_fw_mmp_ids.h
-index d9a42ddf1..00813cffb 100644
---- a/drivers/common/qat/qat_adf/icp_qat_fw_mmp_ids.h
-+++ b/drivers/common/qat/qat_adf/icp_qat_fw_mmp_ids.h
-@@ -9,5 +9,5 @@
- * This file documents the external interfaces that the QAT FW running
- * on the QAT Acceleration Engine provides to clients wanting to
-- * accelerate crypto assymetric applications
-+ * accelerate crypto asymmetric applications
- */
-
-diff --git a/drivers/common/qat/qat_adf/icp_qat_fw_pke.h b/drivers/common/qat/qat_adf/icp_qat_fw_pke.h
-index 1c1560a18..b2cdf0a0a 100644
---- a/drivers/common/qat/qat_adf/icp_qat_fw_pke.h
-+++ b/drivers/common/qat/qat_adf/icp_qat_fw_pke.h
-@@ -11,5 +11,5 @@
- * This file documents the external interfaces that the QAT FW running
- * on the QAT Acceleration Engine provides to clients wanting to
-- * accelerate crypto assymetric applications
-+ * accelerate crypto asymmetric applications
- */
-
@@ -142 +115 @@
-index b2ff03a67..9394309ac 100644
+index 7d99f080a..68c853c94 100644
@@ -145 +118 @@
-@@ -771,5 +771,5 @@ nfp_net_start(struct rte_eth_dev *dev)
+@@ -762,5 +762,5 @@ nfp_net_start(struct rte_eth_dev *dev)
@@ -152 +125 @@
-@@ -1552,5 +1552,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1491,5 +1491,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
@@ -159 +132 @@
-@@ -1584,5 +1584,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1523,5 +1523,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
@@ -166 +139 @@
-@@ -1971,5 +1971,5 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq)
+@@ -1910,5 +1910,5 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq)
@@ -173 +146 @@
-@@ -2041,5 +2041,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -1980,5 +1980,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -180 +153 @@
-@@ -2056,6 +2056,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -1995,6 +1995,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -189 +162 @@
-@@ -2089,5 +2089,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -2028,5 +2028,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -196 +169 @@
-@@ -2114,5 +2114,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -2053,5 +2053,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -204 +177 @@
-index 7913a29c2..61a6eba6d 100644
+index b01036df2..d70cbc634 100644
@@ -222 +195 @@
-index ce491d5d4..caf02937f 100644
+index 17fffcb74..29b4fe917 100644
@@ -225 +198 @@
-@@ -35,5 +35,5 @@ enum {
+@@ -32,5 +32,5 @@ enum {
@@ -232 +205 @@
-@@ -308,5 +308,5 @@ rte_qdma_vq_stats(uint16_t vq_id,
+@@ -263,5 +263,5 @@ rte_qdma_vq_stats(uint16_t vq_id,
@@ -239,7 +211,0 @@
-@@ -323,5 +323,5 @@ rte_qdma_vq_destroy(uint16_t vq_id);
- *
- * @param vq_id
-- * RBP based Virtual Queue ID which needs to be deinialized.
-+ * RBP based Virtual Queue ID which needs to be uninitialized.
- *
- * @returns
@@ -303 +269 @@
-index bec1ef65b..d131692c9 100644
+index 25ef409f7..4a2873b2f 100644
@@ -364 +330 @@
-index a55923a34..8672f217c 100644
+index 5e185b2dd..b1c1a6c17 100644
@@ -367 +333 @@
-@@ -115,13 +115,13 @@ enum rte_crypto_rsa_padding_type {
+@@ -113,13 +113,13 @@ enum rte_crypto_rsa_padding_type {
@@ -384 +350 @@
-@@ -230,5 +230,5 @@ struct rte_crypto_rsa_xform {
+@@ -228,5 +228,5 @@ struct rte_crypto_rsa_xform {
@@ -391 +357 @@
-@@ -283,5 +283,5 @@ struct rte_crypto_dh_xform {
+@@ -272,5 +272,5 @@ struct rte_crypto_dh_xform {
@@ -398,7 +363,0 @@
-@@ -349,5 +349,5 @@ struct rte_crypto_mod_op_param {
- *
- * This field shall be big enough to hold the result of Modular
-- * Exponentiation or Modular Multplicative Inverse
-+ * Exponentiation or Modular Multiplicative Inverse
- * (bigger or equal to length of modulus)
- */
@@ -406 +365 @@
-index 298b35217..2d4f6d7e3 100644
+index 4099823f1..d9c3a0646 100644
@@ -409 +368 @@
-@@ -1142,5 +1142,5 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id,
+@@ -1098,5 +1098,5 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id,
@@ -450 +409 @@
-index b475f767a..05a3a6401 100644
+index 66cdf60b2..48bf28ca5 100644
@@ -453 +412 @@
-@@ -360,5 +360,5 @@ rte_is_power_of_2(uint32_t n)
+@@ -341,5 +341,5 @@ rte_is_power_of_2(uint32_t n)
@@ -460 +419 @@
-@@ -378,5 +378,5 @@ rte_align32pow2(uint32_t x)
+@@ -359,5 +359,5 @@ rte_align32pow2(uint32_t x)
@@ -468 +427 @@
-index f9288666e..0603eaf25 100644
+index a0cedd573..67a4ffb6b 100644
@@ -471 +430 @@
-@@ -285,5 +285,5 @@ rte_mp_action_unregister(const char *name);
+@@ -288,5 +288,5 @@ rte_mp_action_unregister(const char *name);
@@ -478 +437 @@
-@@ -422,5 +422,5 @@ rte_set_application_usage_hook(rte_usage_hook_t usage_func);
+@@ -425,5 +425,5 @@ rte_set_application_usage_hook(rte_usage_hook_t usage_func);
@@ -486 +445 @@
-index f334efce4..cbb41846a 100644
+index 2f789cb90..213043c4a 100644
@@ -489 +448 @@
-@@ -38,5 +38,5 @@ struct rte_logs {
+@@ -37,5 +37,5 @@ struct rte_logs {
@@ -497 +456 @@
-index 670c89af4..bf25aec35 100644
+index 34b41aff2..11f673503 100644
@@ -537 +496 @@
-index 247fa2f1e..b360485fa 100644
+index 4b3a91e91..d837f1e76 100644
@@ -540 +499 @@
-@@ -181,5 +181,5 @@ int rte_vfio_noiommu_is_enabled(void);
+@@ -179,5 +179,5 @@ int rte_vfio_noiommu_is_enabled(void);
@@ -547,5 +506,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
-index 319352521..416dad898 100644
---- a/lib/librte_eal/linux/eal/eal_memory.c
-+++ b/lib/librte_eal/linux/eal/eal_memory.c
-@@ -1444,5 +1444,5 @@ eal_legacy_hugepage_init(void)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
+index ee5f6613b..898bdb775 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
+@@ -1394,5 +1394,5 @@ eal_legacy_hugepage_init(void)
@@ -570 +529 @@
-index 9fb0657e5..1ef4ed92b 100644
+index 5ea8ae24c..925a63f24 100644
@@ -573 +532 @@
-@@ -541,5 +541,5 @@ struct rte_eth_fdir_masks {
+@@ -590,5 +590,5 @@ struct rte_eth_fdir_masks {
@@ -581 +540 @@
-index b8d19c69f..1f35e1dda 100644
+index 070330192..0e3536197 100644
@@ -584,15 +543 @@
-@@ -449,5 +449,5 @@ struct rte_eth_rss_conf {
- /*
- * A packet can be identified by hardware as different flow types. Different
-- * NIC hardwares may support different flow types.
-+ * NIC hardware may support different flow types.
- * Basically, the NIC hardware identifies the flow type as deep protocol as
- * possible, and exclusively. For example, if a packet is identified as
-@@ -484,5 +484,5 @@ struct rte_eth_rss_conf {
- /*
- * The RSS offload types are defined based on flow types.
-- * Different NIC hardwares may support different RSS offload
-+ * Different NIC hardware may support different RSS offload
- * types. The supported flow types or RSS offload types can be queried by
- * rte_eth_dev_info_get().
-@@ -2221,5 +2221,5 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
+@@ -2102,5 +2102,5 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -605 +550 @@
-@@ -2691,5 +2691,5 @@ rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,
+@@ -2543,5 +2543,5 @@ rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,
@@ -642 +587 @@
-index ea5493870..03eaa0004 100644
+index 646ef3880..af23c0f54 100644
@@ -645 +590 @@
-@@ -370,5 +370,5 @@ struct rte_tm_capabilities {
+@@ -379,5 +379,5 @@ struct rte_tm_capabilities {
@@ -652 +597 @@
-@@ -378,5 +378,5 @@ struct rte_tm_capabilities {
+@@ -387,5 +387,5 @@ struct rte_tm_capabilities {
@@ -659 +604 @@
-@@ -637,5 +637,5 @@ struct rte_tm_level_capabilities {
+@@ -646,5 +646,5 @@ struct rte_tm_level_capabilities {
@@ -666 +611 @@
-@@ -646,5 +646,5 @@ struct rte_tm_level_capabilities {
+@@ -655,5 +655,5 @@ struct rte_tm_level_capabilities {
@@ -674 +619 @@
-index 528d1d9b2..60630ef66 100644
+index d367309cb..9ac8e6f49 100644
@@ -685 +630 @@
-index 176f8ca32..beab870ae 100644
+index 863b72a10..bb14bb2d9 100644
@@ -699 +644 @@
-index 62edc09a4..43b1a248a 100644
+index ef10a855d..b90a18d8b 100644
@@ -709 +654 @@
-@@ -1732,5 +1732,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
+@@ -1738,5 +1738,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
@@ -767,44 +711,0 @@
-diff --git a/lib/librte_ipsec/crypto.h b/lib/librte_ipsec/crypto.h
-index 3e9a8f41c..45d4ef7bf 100644
---- a/lib/librte_ipsec/crypto.h
-+++ b/lib/librte_ipsec/crypto.h
-@@ -96,5 +96,5 @@ gen_iv(uint64_t iv[IPSEC_MAX_IV_QWORD], rte_be64_t sqn)
- /*
- * Helper routine to copy IV
-- * Righ now we support only algorithms with IV length equals 0/8/16 bytes.
-+ * Right now we support only algorithms with IV length equals 0/8/16 bytes.
- */
- static inline void
-diff --git a/lib/librte_ipsec/misc.h b/lib/librte_ipsec/misc.h
-index 67a6be2aa..693a4afdd 100644
---- a/lib/librte_ipsec/misc.h
-+++ b/lib/librte_ipsec/misc.h
-@@ -8,5 +8,5 @@
- /**
- * @file misc.h
-- * Contains miscelaneous functions/structures/macros used internally
-+ * Contains miscellaneous functions/structures/macros used internally
- * by ipsec library.
- */
-diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/librte_ipsec/rte_ipsec_group.h
-index 696ed277a..740fa7c99 100644
---- a/lib/librte_ipsec/rte_ipsec_group.h
-+++ b/lib/librte_ipsec/rte_ipsec_group.h
-@@ -11,5 +11,5 @@
- *
- * RTE IPsec support.
-- * It is not recommended to include this file direclty,
-+ * It is not recommended to include this file directly,
- * include <rte_ipsec.h> instead.
- * Contains helper functions to process completed crypto-ops
-diff --git a/lib/librte_ipsec/rte_ipsec_sa.h b/lib/librte_ipsec/rte_ipsec_sa.h
-index 7802da3b1..fd9b3ed60 100644
---- a/lib/librte_ipsec/rte_ipsec_sa.h
-+++ b/lib/librte_ipsec/rte_ipsec_sa.h
-@@ -135,5 +135,5 @@ rte_ipsec_sa_type(const struct rte_ipsec_sa *sa);
- * Calculate required SA size based on provided input parameters.
- * @param prm
-- * Parameters that wil be used to initialise SA object.
-+ * Parameters that will be used to initialise SA object.
- * @return
- * - Actual size required for SA with given parameters.
@@ -834 +735 @@
-index 68415af02..e4c2da6ee 100644
+index c3bf2fe6d..8eab5a836 100644
@@ -837 +738 @@
-@@ -211,5 +211,5 @@ extern "C" {
+@@ -210,5 +210,5 @@ extern "C" {
@@ -844,8 +745 @@
-@@ -486,5 +486,5 @@ struct rte_mbuf_sched {
-
- /**
-- * enum for the tx_offload bit-fields lenghts and offsets.
-+ * enum for the tx_offload bit-fields lengths and offsets.
- * defines the layout of rte_mbuf tx_offload field.
- */
-@@ -1424,5 +1424,5 @@ static inline void rte_pktmbuf_reset_headroom(struct rte_mbuf *m)
+@@ -1291,5 +1291,5 @@ static inline void rte_pktmbuf_reset_headroom(struct rte_mbuf *m)
@@ -858 +752 @@
-@@ -1597,5 +1597,5 @@ rte_pktmbuf_ext_shinfo_init_helper(void *buf_addr, uint16_t *buf_len,
+@@ -1464,5 +1464,5 @@ rte_pktmbuf_ext_shinfo_init_helper(void *buf_addr, uint16_t *buf_len,
@@ -877 +771 @@
-index fd19470d7..8053f7a04 100644
+index 7c9cd9a2f..fe2f33352 100644
@@ -887 +781 @@
-@@ -1364,5 +1364,5 @@ __mempool_generic_get(struct rte_mempool *mp, void **obj_table,
+@@ -1365,5 +1365,5 @@ __mempool_generic_get(struct rte_mempool *mp, void **obj_table,
@@ -894,11 +787,0 @@
-diff --git a/lib/librte_pipeline/rte_table_action.h b/lib/librte_pipeline/rte_table_action.h
-index e77551c10..cf6eeaa30 100644
---- a/lib/librte_pipeline/rte_table_action.h
-+++ b/lib/librte_pipeline/rte_table_action.h
-@@ -533,5 +533,5 @@ struct rte_table_action_encap_config {
- };
-
--/** QinQ_PPPoE encap paramaeters. */
-+/** QinQ_PPPoE encap parameters. */
- struct rte_table_encap_ether_qinq_pppoe {
-
@@ -996 +879 @@
-index 904d09d88..9c55a787d 100644
+index 84fa896de..c1bdb1df2 100644
@@ -1007 +890 @@
-index c8e438fdd..76f54e0e0 100644
+index 718147e00..7e6ced4e4 100644
@@ -1010 +893 @@
-@@ -537,5 +537,5 @@ struct rte_security_capability {
+@@ -535,5 +535,5 @@ struct rte_security_capability {
@@ -1017 +900 @@
-@@ -569,5 +569,5 @@ struct rte_security_capability {
+@@ -567,5 +567,5 @@ struct rte_security_capability {
@@ -1050 +933 @@
-index d2c0c93f4..0226b3eff 100644
+index d280ac420..5905e2401 100644
@@ -1053 +936 @@
-@@ -543,5 +543,5 @@ int rte_vhost_get_ifname(int vid, char *buf, size_t len);
+@@ -489,5 +489,5 @@ int rte_vhost_get_ifname(int vid, char *buf, size_t len);
@@ -1060 +943 @@
-@@ -591,5 +591,5 @@ uint16_t rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
+@@ -537,5 +537,5 @@ uint16_t rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'examples/multi_process: fix buffer underrun' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (2 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix spelling reported by aspell in comments' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/power: fix buffer overrun' " Kevin Traynor
` (30 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Yongseok Koh; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c35f7d9bc396b94556820bb148c5393d4bfbb8d7
Thanks.
Kevin Traynor
---
From c35f7d9bc396b94556820bb148c5393d4bfbb8d7 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Wed, 10 Apr 2019 12:41:54 -0700
Subject: [PATCH] examples/multi_process: fix buffer underrun
[ upstream commit 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea ]
For client_server_mp, the total number of buffers for the mbuf mempool
should be correctly calculated. Otherwise, having more clients will stop
traffic.
Fixes: af75078fece3 ("first public release")
Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
.../multi_process/client_server_mp/mp_server/init.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 30c8e44bc..3af5dc699 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -38,6 +38,4 @@
#include "init.h"
-#define MBUFS_PER_CLIENT 1536
-#define MBUFS_PER_PORT 1536
#define MBUF_CACHE_SIZE 512
@@ -64,6 +62,13 @@ static int
init_mbuf_pools(void)
{
- const unsigned num_mbufs = (num_clients * MBUFS_PER_CLIENT) \
- + (ports->num_ports * MBUFS_PER_PORT);
+ const unsigned int num_mbufs_server =
+ RTE_MP_RX_DESC_DEFAULT * ports->num_ports;
+ const unsigned int num_mbufs_client =
+ num_clients * (CLIENT_QUEUE_RINGSIZE +
+ RTE_MP_TX_DESC_DEFAULT * ports->num_ports);
+ const unsigned int num_mbufs_mp_cache =
+ (num_clients + 1) * MBUF_CACHE_SIZE;
+ const unsigned int num_mbufs =
+ num_mbufs_server + num_mbufs_client + num_mbufs_mp_cache;
/* don't pass single-producer/single-consumer flags to mbuf create as it
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.759756307 +0100
+++ 0005-examples-multi_process-fix-buffer-underrun.patch 2019-05-08 16:33:57.359579845 +0100
@@ -1 +1 @@
-From 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea Mon Sep 17 00:00:00 2001
+From c35f7d9bc396b94556820bb148c5393d4bfbb8d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'examples/power: fix buffer overrun' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (3 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/multi_process: fix buffer underrun' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/power: fix json null termination' " Kevin Traynor
` (29 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: David Hunt; +Cc: Reshma Pattan, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/695d45d68113f1a5ae3a18b3842fac329c3a7d69
Thanks.
Kevin Traynor
---
From 695d45d68113f1a5ae3a18b3842fac329c3a7d69 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt@intel.com>
Date: Fri, 26 Apr 2019 09:42:09 +0100
Subject: [PATCH] examples/power: fix buffer overrun
[ upstream commit 3f1fc5f2cbc57ed719f9a1b24c8e450c5a95e8db ]
The freqs array in freq_info struct has RTE_MAX_LCORE_FREQS elements,
yet the code can attempt to look at the index at RTE_MAX_LCORE,
which may be greater than RTE_MAX_LCORE_FREQS. Fix to limit index to
RTE_MAX_LCORE_FREQS.
Coverity issue: 337660
Fixes: d26c18c93260 ("examples/vm_power: cpu frequency in host")
Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
examples/vm_power_manager/power_manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c
index f9e8c0abd..318fb0255 100644
--- a/examples/vm_power_manager/power_manager.c
+++ b/examples/vm_power_manager/power_manager.c
@@ -158,5 +158,5 @@ power_manager_get_current_frequency(unsigned core_num)
index = rte_power_get_freq(core_num);
rte_spinlock_unlock(&global_core_freq_info[core_num].power_sl);
- if (index >= POWER_MGR_MAX_CPUS)
+ if (index >= RTE_MAX_LCORE_FREQS)
freq = 0;
else
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.808861123 +0100
+++ 0006-examples-power-fix-buffer-overrun.patch 2019-05-08 16:33:57.360579813 +0100
@@ -1 +1 @@
-From 3f1fc5f2cbc57ed719f9a1b24c8e450c5a95e8db Mon Sep 17 00:00:00 2001
+From 695d45d68113f1a5ae3a18b3842fac329c3a7d69 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f1fc5f2cbc57ed719f9a1b24c8e450c5a95e8db ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 9553455be..9d4e587b0 100644
+index f9e8c0abd..318fb0255 100644
@@ -25 +26 @@
-@@ -144,5 +144,5 @@ power_manager_get_current_frequency(unsigned core_num)
+@@ -158,5 +158,5 @@ power_manager_get_current_frequency(unsigned core_num)
@@ -28 +29 @@
-- if (index >= RTE_MAX_LCORE)
+- if (index >= POWER_MGR_MAX_CPUS)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'examples/power: fix json null termination' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (4 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/power: fix buffer overrun' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'eal: fix formatting of hotplug error message' " Kevin Traynor
` (28 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: David Hunt; +Cc: Anatoly Burakov, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b65421db4e5ec6d4efb1bad650ff5a11ae112fe8
Thanks.
Kevin Traynor
---
From b65421db4e5ec6d4efb1bad650ff5a11ae112fe8 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt@intel.com>
Date: Fri, 26 Apr 2019 15:04:54 +0100
Subject: [PATCH] examples/power: fix json null termination
[ upstream commit 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a ]
coverity complains about a null-termination after a read,
so we terminate once we exit the do-while read loop.
Coverity issue: 337680
Fixes: a63504a90f ("examples/power: add JSON string handling")
Signed-off-by: David Hunt <david.hunt@intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
examples/vm_power_manager/channel_monitor.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
index 954bdf787..b5b7c6787 100644
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -843,10 +843,5 @@ read_json_packet(struct channel_info *chan_info)
} while (indent > 0);
- if (indent > 0)
- /*
- * We've broken out of the read loop without getting
- * a closing brace, so throw away the data
- */
- json_data[idx] = 0;
+ json_data[idx] = '\0';
if (strlen(json_data) == 0)
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.858760579 +0100
+++ 0007-examples-power-fix-json-null-termination.patch 2019-05-08 16:33:57.361579781 +0100
@@ -1 +1 @@
-From 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a Mon Sep 17 00:00:00 2001
+From b65421db4e5ec6d4efb1bad650ff5a11ae112fe8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 971e4f2bc..4a287109b 100644
+index 954bdf787..b5b7c6787 100644
@@ -23 +24 @@
-@@ -823,10 +823,5 @@ read_json_packet(struct channel_info *chan_info)
+@@ -843,10 +843,5 @@ read_json_packet(struct channel_info *chan_info)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'eal: fix formatting of hotplug error message' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (5 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'examples/power: fix json null termination' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: fix memory leak on request failure' " Kevin Traynor
` (27 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Rami Rosen, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4f5b343dae3812919e31e37cb5af2f70188f0d0e
Thanks.
Kevin Traynor
---
From 4f5b343dae3812919e31e37cb5af2f70188f0d0e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 24 Apr 2019 09:46:19 -0700
Subject: [PATCH] eal: fix formatting of hotplug error message
[ upstream commit 4e2fdf376011d2e2e274bf86167789aa4d41ae4a ]
This message was missing newline, and should capitalize
"Cannot" like all the others in this area.
Fixes: ac9e4a17370f ("eal: support attach/detach shared device from secondary")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
lib/librte_eal/common/hotplug_mp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c
index 9d610a8a2..7c3f38dba 100644
--- a/lib/librte_eal/common/hotplug_mp.c
+++ b/lib/librte_eal/common/hotplug_mp.c
@@ -362,5 +362,5 @@ int eal_dev_hotplug_request_to_primary(struct eal_dev_mp_req *req)
ret = rte_mp_request_sync(&mp_req, &mp_reply, &ts);
if (ret || mp_reply.nb_received != 1) {
- RTE_LOG(ERR, EAL, "cannot send request to primary");
+ RTE_LOG(ERR, EAL, "Cannot send request to primary\n");
if (!ret)
return -1;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.909426507 +0100
+++ 0008-eal-fix-formatting-of-hotplug-error-message.patch 2019-05-08 16:33:57.361579781 +0100
@@ -1 +1 @@
-From 4e2fdf376011d2e2e274bf86167789aa4d41ae4a Mon Sep 17 00:00:00 2001
+From 4f5b343dae3812919e31e37cb5af2f70188f0d0e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4e2fdf376011d2e2e274bf86167789aa4d41ae4a ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4052a5c7f..04616519c 100644
+index 9d610a8a2..7c3f38dba 100644
@@ -22 +23 @@
-@@ -377,5 +377,5 @@ int eal_dev_hotplug_request_to_primary(struct eal_dev_mp_req *req)
+@@ -362,5 +362,5 @@ int eal_dev_hotplug_request_to_primary(struct eal_dev_mp_req *req)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'ipc: fix memory leak on request failure' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (6 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'eal: fix formatting of hotplug error message' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/tap: fix memory leak on IPC request' " Kevin Traynor
` (26 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Herakliusz Lipiec; +Cc: Anatoly Burakov, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ae62bad432359db3c5a499041d4c18cd0476a141
Thanks.
Kevin Traynor
---
From ae62bad432359db3c5a499041d4c18cd0476a141 Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Date: Thu, 25 Apr 2019 13:48:16 +0100
Subject: [PATCH] ipc: fix memory leak on request failure
[ upstream commit a2a06860b8c4cb4460044fa40c867fa2e908035d ]
When sending multiple requests, rte_mp_request_sync
can succeed sending a few of those requests, but then
fail on a later one and in the end return with rc=-1.
The upper layers - e.g. device hotplug - currently
handles this case as if no messages were sent and no
memory for response buffers was allocated, which is
not true. Fixed by always freeing memory buffers on
failure.
Bugzilla ID: 228
Fixes: 783b6e54971d ("eal: add synchronous multi-process communication")
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/common/eal_common_proc.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index b46d644b3..ef5eddbea 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -928,11 +928,11 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
- if (check_input(req) == false)
- return -1;
-
reply->nb_sent = 0;
reply->nb_received = 0;
reply->msgs = NULL;
+ if (check_input(req) == false)
+ goto err;
+
if (internal_config.no_shconf) {
RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
@@ -943,5 +943,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
RTE_LOG(ERR, EAL, "Failed to get current time\n");
rte_errno = errno;
- return -1;
+ goto err;
}
@@ -955,4 +955,6 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
pthread_mutex_unlock(&pending_requests.lock);
+ if (ret)
+ goto err;
return ret;
}
@@ -963,5 +965,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
rte_errno = errno;
- return -1;
+ goto err;
}
@@ -973,5 +975,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
closedir(mp_dir);
rte_errno = errno;
- return -1;
+ goto err;
}
@@ -990,5 +992,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
*/
if (mp_request_sync(path, req, reply, &end))
- ret = -1;
+ goto err;
}
pthread_mutex_unlock(&pending_requests.lock);
@@ -999,4 +1001,10 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
closedir(mp_dir);
return ret;
+
+err:
+ free(reply->msgs);
+ reply->nb_received = 0;
+ reply->msgs = NULL;
+ return -1;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.953289339 +0100
+++ 0009-ipc-fix-memory-leak-on-request-failure.patch 2019-05-08 16:33:57.362579749 +0100
@@ -1 +1 @@
-From a2a06860b8c4cb4460044fa40c867fa2e908035d Mon Sep 17 00:00:00 2001
+From ae62bad432359db3c5a499041d4c18cd0476a141 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2a06860b8c4cb4460044fa40c867fa2e908035d ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/tap: fix memory leak on IPC request' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (7 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: fix memory leak on request failure' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: fix send error handling' " Kevin Traynor
` (25 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Herakliusz Lipiec; +Cc: Keith Wiles, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8f3e73d8c22ca3ace05b6d82482f6258f0b089b8
Thanks.
Kevin Traynor
---
From 8f3e73d8c22ca3ace05b6d82482f6258f0b089b8 Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Date: Thu, 25 Apr 2019 13:48:17 +0100
Subject: [PATCH] net/tap: fix memory leak on IPC request
[ upstream commit 388e061ecfe42446d51d8a90dabce6b43fd76167 ]
When sending synchronous IPC requests, the caller must free the response
buffer if the request was successful and reply is no longer needed.
Fix the code to correctly
use the IPC API.
Bugzilla ID: 228
Fixes: c9aa56edec8e ("net/tap: access primary process queues from secondary")
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Acked-by: Keith Wiles <keith.wiles@intel.com>
---
drivers/net/tap/rte_eth_tap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 551f4d3a2..292657d0b 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2089,5 +2089,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
for (queue = 0; queue < reply_param->txq_count; queue++)
process_private->txq_fds[queue] = reply->fds[fd_iterator++];
-
+ free(reply);
return 0;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:57.999655182 +0100
+++ 0010-net-tap-fix-memory-leak-on-IPC-request.patch 2019-05-08 16:33:57.365579654 +0100
@@ -1 +1 @@
-From 388e061ecfe42446d51d8a90dabce6b43fd76167 Mon Sep 17 00:00:00 2001
+From 8f3e73d8c22ca3ace05b6d82482f6258f0b089b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 388e061ecfe42446d51d8a90dabce6b43fd76167 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 7f74b5dc9..f8a4169c5 100644
+index 551f4d3a2..292657d0b 100644
@@ -25 +26 @@
-@@ -2119,5 +2119,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
+@@ -2089,5 +2089,5 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'ipc: fix send error handling' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (8 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/tap: fix memory leak on IPC request' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: harden message receive' " Kevin Traynor
` (24 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Anatoly Burakov; +Cc: Rami Rosen, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6c4a669bdfc38dd115f5cfe84b03da58770bfda0
Thanks.
Kevin Traynor
---
From 6c4a669bdfc38dd115f5cfe84b03da58770bfda0 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 26 Apr 2019 11:27:17 +0100
Subject: [PATCH] ipc: fix send error handling
[ upstream commit 535113907f23134375b18f40b6642a963ec50141 ]
According to manpage, ENOBUFS error indicates that either the
input or the output queue is full. This should be considered
an error, but it is treated as an "ignore" condition. Fix the
code to report an error instead.
Fixes: bacaa2754017 ("eal: add channel for multi-process communication")
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
lib/librte_eal/common/eal_common_proc.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index ef5eddbea..8586474a2 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -679,9 +679,4 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
return 0;
}
- if (errno == ENOBUFS) {
- RTE_LOG(ERR, EAL, "Peer cannot receive message %s\n",
- dst_path);
- return 0;
- }
RTE_LOG(ERR, EAL, "failed to send to (%s) due to %s\n",
dst_path, strerror(errno));
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.045663685 +0100
+++ 0011-ipc-fix-send-error-handling.patch 2019-05-08 16:33:57.365579654 +0100
@@ -1 +1 @@
-From 535113907f23134375b18f40b6642a963ec50141 Mon Sep 17 00:00:00 2001
+From 6c4a669bdfc38dd115f5cfe84b03da58770bfda0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 535113907f23134375b18f40b6642a963ec50141 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'ipc: harden message receive' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (9 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: fix send error handling' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: handle more invalid parameter cases' " Kevin Traynor
` (23 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Anatoly Burakov; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/fdadfbdec8696c4fb632f0b3427c1c71a41b62fa
Thanks.
Kevin Traynor
---
From fdadfbdec8696c4fb632f0b3427c1c71a41b62fa Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Mon, 29 Apr 2019 15:22:50 +0100
Subject: [PATCH] ipc: harden message receive
[ upstream commit 7b51d1b162914e37bcc511a11efcfbabb44b2eb3 ]
Currently, IPC does not check received messages for invalid data
and passes them to user code unchanged. This may result in buffer
overruns on reading message data. Fix this by checking the message
length and fd number on receive, and discard any messages that
are not valid.
Fixes: bacaa2754017 ("eal: add channel for multi-process communication")
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/common/eal_common_proc.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index 8586474a2..6ffd47686 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -286,5 +286,13 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
}
}
-
+ /* sanity-check the response */
+ if (m->msg.num_fds < 0 || m->msg.num_fds > RTE_MP_MAX_FD_NUM) {
+ RTE_LOG(ERR, EAL, "invalid number of fd's received\n");
+ return -1;
+ }
+ if (m->msg.len_param < 0 || m->msg.len_param > RTE_MP_MAX_PARAM_LEN) {
+ RTE_LOG(ERR, EAL, "invalid received data length\n");
+ return -1;
+ }
return 0;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.092526158 +0100
+++ 0012-ipc-harden-message-receive.patch 2019-05-08 16:33:57.366579622 +0100
@@ -1 +1 @@
-From 7b51d1b162914e37bcc511a11efcfbabb44b2eb3 Mon Sep 17 00:00:00 2001
+From fdadfbdec8696c4fb632f0b3427c1c71a41b62fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7b51d1b162914e37bcc511a11efcfbabb44b2eb3 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'ipc: handle more invalid parameter cases' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (10 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: harden message receive' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'event/dsw: fix capability flags' " Kevin Traynor
` (22 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Anatoly Burakov; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0a784ce51f4fbcb7c0cb9f3875c2082fa52639f1
Thanks.
Kevin Traynor
---
From 0a784ce51f4fbcb7c0cb9f3875c2082fa52639f1 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Mon, 29 Apr 2019 14:59:28 +0100
Subject: [PATCH] ipc: handle more invalid parameter cases
[ upstream commit 6e5d779ecb9acd034f90af1de8f9416832d663d0 ]
Length of buffer and number of fd's to send are signed values, so
they can be negative, but the API doesn't check for that. Fix it
by checking for negative values as well.
Fixes: bacaa2754017 ("eal: add channel for multi-process communication")
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/common/eal_common_proc.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index 6ffd47686..d098803b1 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -762,4 +762,16 @@ check_input(const struct rte_mp_msg *msg)
return false;
+ if (msg->len_param < 0) {
+ RTE_LOG(ERR, EAL, "Message data length is negative\n");
+ rte_errno = EINVAL;
+ return false;
+ }
+
+ if (msg->num_fds < 0) {
+ RTE_LOG(ERR, EAL, "Number of fd's is negative\n");
+ rte_errno = EINVAL;
+ return false;
+ }
+
if (msg->len_param > RTE_MP_MAX_PARAM_LEN) {
RTE_LOG(ERR, EAL, "Message data is too long\n");
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.137455480 +0100
+++ 0013-ipc-handle-more-invalid-parameter-cases.patch 2019-05-08 16:33:57.367579590 +0100
@@ -1 +1 @@
-From 6e5d779ecb9acd034f90af1de8f9416832d663d0 Mon Sep 17 00:00:00 2001
+From 0a784ce51f4fbcb7c0cb9f3875c2082fa52639f1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6e5d779ecb9acd034f90af1de8f9416832d663d0 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'event/dsw: fix capability flags' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (11 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'ipc: handle more invalid parameter cases' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' " Kevin Traynor
` (21 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Mattias Rönnblom; +Cc: Jerin Jacob, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7db88ea2b8162114e6a7a2e2c41c41e95e0b7358
Thanks.
Kevin Traynor
---
From 7db88ea2b8162114e6a7a2e2c41c41e95e0b7358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Date: Fri, 3 May 2019 18:45:53 +0200
Subject: [PATCH] event/dsw: fix capability flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 773025cab668f72122e66900c5a55d588e1ddf45 ]
The DSW event device didn't set RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT
and RTE_EVENT_DEV_CAP_NONSEQ_MODE, even though it has both these
capabilities.
Fixes: 4540ee9c68 ("event/dsw: add device and queue configuration")
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
drivers/event/dsw/dsw_evdev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 33ba13647..4157d130c 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -218,5 +218,7 @@ dsw_info_get(struct rte_eventdev *dev __rte_unused,
.max_num_events = DSW_MAX_EVENTS,
.event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE|
- RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED
+ RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED|
+ RTE_EVENT_DEV_CAP_NONSEQ_MODE|
+ RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT
};
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.186325915 +0100
+++ 0014-event-dsw-fix-capability-flags.patch 2019-05-08 16:33:57.368579559 +0100
@@ -1 +1 @@
-From 773025cab668f72122e66900c5a55d588e1ddf45 Mon Sep 17 00:00:00 2001
+From 7db88ea2b8162114e6a7a2e2c41c41e95e0b7358 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 773025cab668f72122e66900c5a55d588e1ddf45 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (12 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'event/dsw: fix capability flags' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix interactive commands in testpmd guide' " Kevin Traynor
` (20 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Dekel Peled; +Cc: Shahaf Shuler, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03
Thanks.
Kevin Traynor
---
From 52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Mon, 22 Apr 2019 18:24:11 +0300
Subject: [PATCH] net/mlx5: fix comments mixing Rx and Tx
[ upstream commit ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 ]
In mlx5_rxq.c, in some comments, text includes "Tx" instead of "Rx".
In mlx5_txq.c, in some comments, text includes "Rx" instead of "Tx".
This patch fixes these typos.
Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects")
Fixes: a1366b1a2be3 ("net/mlx5: add reference counter on DPDK Rx queues")
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
drivers/net/mlx5/mlx5_rxq.c | 6 +++---
drivers/net/mlx5/mlx5_txq.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 2f6099914..e2728f273 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1495,5 +1495,5 @@ error:
* Pointer to Ethernet device.
* @param idx
- * TX queue index.
+ * RX queue index.
*
* @return
@@ -1522,5 +1522,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx)
* Pointer to Ethernet device.
* @param idx
- * TX queue index.
+ * RX queue index.
*
* @return
@@ -1555,5 +1555,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
* Pointer to Ethernet device.
* @param idx
- * TX queue index.
+ * RX queue index.
*
* @return
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index d18561740..f69520ba8 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -347,5 +347,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst)
* Pointer to Ethernet device.
* @param idx
- * Queue index in DPDK Rx queue array
+ * Queue index in DPDK Tx queue array.
*
* @return
@@ -555,5 +555,5 @@ error:
* Pointer to Ethernet device.
* @param idx
- * Queue index in DPDK Rx queue array
+ * Queue index in DPDK Tx queue array.
*
* @return
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.230521955 +0100
+++ 0015-net-mlx5-fix-comments-mixing-Rx-and-Tx.patch 2019-05-08 16:33:57.370579495 +0100
@@ -1 +1 @@
-From ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 Mon Sep 17 00:00:00 2001
+From 52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 836bec95e..9f27f607b 100644
+index 2f6099914..e2728f273 100644
@@ -26 +27 @@
-@@ -1494,5 +1494,5 @@ error:
+@@ -1495,5 +1495,5 @@ error:
@@ -33 +34 @@
-@@ -1521,5 +1521,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx)
+@@ -1522,5 +1522,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx)
@@ -40 +41 @@
-@@ -1554,5 +1554,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
+@@ -1555,5 +1555,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
@@ -48 +49 @@
-index 9965b2b77..dbe074fe3 100644
+index d18561740..f69520ba8 100644
@@ -51 +52 @@
-@@ -389,5 +389,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst)
+@@ -347,5 +347,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst)
@@ -58 +59 @@
-@@ -598,5 +598,5 @@ error:
+@@ -555,5 +555,5 @@ error:
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'doc: fix interactive commands in testpmd guide' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (13 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'app/testpmd: fix help info for interactive commands' " Kevin Traynor
` (19 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Agalya Babu RadhaKrishnan; +Cc: Rami Rosen, Bernard Iremonger, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e1fece9e2da0fba3efd8b50d00c037519f1bcea3
Thanks.
Kevin Traynor
---
From e1fece9e2da0fba3efd8b50d00c037519f1bcea3 Mon Sep 17 00:00:00 2001
From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
Date: Tue, 23 Apr 2019 11:44:27 +0100
Subject: [PATCH] doc: fix interactive commands in testpmd guide
[ upstream commit d82ee2cc02bb619e6dd5c345a5b986afc6f8936a ]
Added some missing documentation for interactive mode commands
Fixes: 01b2092a5e4b ("testpmd: add dump commands for debug")
Fixes: caf05a1b8608 ("app/testpmd: new command to dump log types")
Fixes: 0f62d63593ed ("app/testpmd: support tunneled TSO in checksum engine")
Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC addresses")
Fixes: ae03d0d18adf ("app/testpmd: command to configure MTU")
Fixes: f79959ea1504 ("app/testpmd: allow to configure RSS hash key")
Fixes: caf05a1b8608 ("app/testpmd: new command to dump log types")
Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 100 ++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 34f7bc766..6b08a01c8 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -431,4 +431,54 @@ Show Tx metadata value set for a specific port::
testpmd> show port (port_id) tx_metadata
+dump physmem
+~~~~~~~~~~~~
+
+Dumps all physical memory segment layouts::
+
+ testpmd> dump_physmem
+
+dump memzone
+~~~~~~~~~~~~
+
+Dumps the layout of all memory zones::
+
+ testpmd> dump_memzone
+
+
+dump struct size
+~~~~~~~~~~~~~~~~
+
+Dumps the size of all memory structures::
+
+ testpmd> dump_struct_sizes
+
+dump ring
+~~~~~~~~~
+
+Dumps the status of all or specific element in DPDK rings::
+
+ testpmd> dump_ring [ring_name]
+
+dump mempool
+~~~~~~~~~~~~
+
+Dumps the statistics of all or specific memory pool::
+
+ testpmd> dump_mempool [mempool_name]
+
+dump devargs
+~~~~~~~~~~~~
+
+Dumps the user device list::
+
+ testpmd> dump_devargs
+
+dump log types
+~~~~~~~~~~~~~~
+
+Dumps the log level for all the dpdk modules::
+
+ testpmd> dump_log_types
+
Configuration Functions
-----------------------
@@ -1003,4 +1053,18 @@ Display the status of TCP Segmentation Offload::
testpmd> tso show (port_id)
+tunnel tso set
+~~~~~~~~~~~~~~
+
+Set tso segment size of tunneled packets for a port in csum engine::
+
+ testpmd> tunnel_tso set (tso_segsz) (port_id)
+
+tunnel tso show
+~~~~~~~~~~~~~~~
+
+Display the status of tunneled TCP Segmentation Offload for a port::
+
+ testpmd> tunnel_tso show (port_id)
+
set port - gro
~~~~~~~~~~~~~~
@@ -1124,4 +1188,20 @@ Remove a MAC address from a port::
testpmd> mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)
+mcast_addr add
+~~~~~~~~~~~~~~
+
+To add the multicast MAC address to/from the set of multicast addresses
+filtered by port::
+
+ testpmd> mcast_addr add (port_id) (mcast_addr)
+
+mcast_addr remove
+~~~~~~~~~~~~~~~~~
+
+To remove the multicast MAC address to/from the set of multicast addresses
+filtered by port::
+
+ testpmd> mcast_addr remove (port_id) (mcast_addr)
+
mac_addr add (for VF)
~~~~~~~~~~~~~~~~~~~~~
@@ -2141,4 +2221,24 @@ testpmd will add this value to any Tx packet sent from this port::
testpmd> port config (port_id) tx_metadata (value)
+port config mtu
+~~~~~~~~~~~~~~~
+
+To configure MTU(Maximum Transmission Unit) on devices using testpmd::
+
+ testpmd> port config mtu (port_id) (value)
+
+port config rss hash key
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+To configure the RSS hash key used to compute the RSS
+hash of input [IP] packets received on port::
+
+ testpmd> port config <port_id> rss-hash-key (ipv4|ipv4-frag|\
+ ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|\
+ ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|\
+ ipv6-other|l2-payload|ipv6-ex|ipv6-tcp-ex|\
+ ipv6-udp-ex <string of hex digits \
+ (variable length, NIC dependent)>)
+
Link Bonding Functions
----------------------
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.281751340 +0100
+++ 0016-doc-fix-interactive-commands-in-testpmd-guide.patch 2019-05-08 16:33:57.374579368 +0100
@@ -1 +1 @@
-From d82ee2cc02bb619e6dd5c345a5b986afc6f8936a Mon Sep 17 00:00:00 2001
+From e1fece9e2da0fba3efd8b50d00c037519f1bcea3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d82ee2cc02bb619e6dd5c345a5b986afc6f8936a ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index e602df560..89d494c5b 100644
+index 34f7bc766..6b08a01c8 100644
@@ -28 +29 @@
-@@ -468,4 +468,54 @@ Show Tx metadata value set for a specific port::
+@@ -431,4 +431,54 @@ Show Tx metadata value set for a specific port::
@@ -83 +84 @@
-@@ -1042,4 +1092,18 @@ Display the status of TCP Segmentation Offload::
+@@ -1003,4 +1053,18 @@ Display the status of TCP Segmentation Offload::
@@ -102 +103 @@
-@@ -1163,4 +1227,20 @@ Remove a MAC address from a port::
+@@ -1124,4 +1188,20 @@ Remove a MAC address from a port::
@@ -123 +124 @@
-@@ -2184,4 +2264,24 @@ testpmd will add this value to any Tx packet sent from this port::
+@@ -2141,4 +2221,24 @@ testpmd will add this value to any Tx packet sent from this port::
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'app/testpmd: fix help info for interactive commands' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (14 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix interactive commands in testpmd guide' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: fix coding style' " Kevin Traynor
` (18 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Agalya Babu RadhaKrishnan; +Cc: Rami Rosen, Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ad4834815bf92cc4314822bb47ed716b6fadc807
Thanks.
Kevin Traynor
---
From ad4834815bf92cc4314822bb47ed716b6fadc807 Mon Sep 17 00:00:00 2001
From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
Date: Tue, 23 Apr 2019 14:51:56 +0100
Subject: [PATCH] app/testpmd: fix help info for interactive commands
[ upstream commit 920fa9a2a1c965347bbb454ef92fb870dd25a4f7 ]
Added some missing help info for interactive mode commands
Fixes: 6673fe0ce213 ("app/testpmd: add TM commands to mark packets")
Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API")
Fixes: e977e4199a8d ("app/testpmd: add commands to load/unload BPF filters")
Fixes: c18feafa193c ("app/testpmd: support metadata as flow rule item")
Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
app/test-pmd/cmdline.c | 259 ++++++++++++++++++++++++++++-------------
1 file changed, 179 insertions(+), 80 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7ceb76b53..77641ee23 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -95,12 +95,13 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
"\n"
"Help is available for the following sections:\n\n"
- " help control : Start and stop forwarding.\n"
- " help display : Displaying port, stats and config "
+ " help control : Start and stop forwarding.\n"
+ " help display : Displaying port, stats and config "
"information.\n"
- " help config : Configuration information.\n"
- " help ports : Configuring ports.\n"
- " help registers : Reading and setting port registers.\n"
- " help filters : Filters configuration help.\n"
- " help all : All of the above sections.\n\n"
+ " help config : Configuration information.\n"
+ " help ports : Configuring ports.\n"
+ " help registers : Reading and setting port registers.\n"
+ " help filters : Filters configuration help.\n"
+ " help traffic_management : Traffic Management commmands.\n"
+ " help all : All of the above sections.\n\n"
);
@@ -211,19 +212,30 @@ static void cmd_help_long_parsed(void *parsed_result,
"show port meter stats (port_id) (meter_id) (clear)\n"
" Get meter stats on a port\n\n"
- "show port tm cap (port_id)\n"
- " Display the port TM capability.\n\n"
- "show port tm level cap (port_id) (level_id)\n"
- " Display the port TM hierarchical level capability.\n\n"
+ "show fwd stats all\n"
+ " Display statistics for all fwd engines.\n\n"
- "show port tm node cap (port_id) (node_id)\n"
- " Display the port TM node capability.\n\n"
+ "clear fwd stats all\n"
+ " Clear statistics for all fwd engines.\n\n"
- "show port tm node type (port_id) (node_id)\n"
- " Display the port TM node type.\n\n"
+ "show port (port_id) rx_offload capabilities\n"
+ " List all per queue and per port Rx offloading"
+ " capabilities of a port\n\n"
- "show port tm node stats (port_id) (node_id) (clear)\n"
- " Display the port TM node stats.\n\n"
+ "show port (port_id) rx_offload configuration\n"
+ " List port level and all queue level"
+ " Rx offloading configuration\n\n"
+ "show port (port_id) tx_offload capabilities\n"
+ " List all per queue and per port"
+ " Tx offloading capabilities of a port\n\n"
+
+ "show port (port_id) tx_offload configuration\n"
+ " List port level and all queue level"
+ " Tx offloading configuration\n\n"
+
+ "show port (port_id) tx_metadata\n"
+ " Show Tx metadata value set"
+ " for a specific port\n\n"
);
}
@@ -643,9 +655,4 @@ static void cmd_help_long_parsed(void *parsed_result,
" Delete an E-tag forwarding filter on a port\n\n"
-#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
- "set port tm hierarchy default (port_id)\n"
- " Set default traffic Management hierarchy on a port\n\n"
-
-#endif
"ddp add (port_id) (profile_path[,backup_profile_path])\n"
" Load a profile package on a port\n\n"
@@ -728,60 +735,4 @@ static void cmd_help_long_parsed(void *parsed_result,
" show all queue region related configuration info\n\n"
- "add port tm node shaper profile (port_id) (shaper_profile_id)"
- " (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)"
- " (packet_length_adjust)\n"
- " Add port tm node private shaper profile.\n\n"
-
- "del port tm node shaper profile (port_id) (shaper_profile_id)\n"
- " Delete port tm node private shaper profile.\n\n"
-
- "add port tm node shared shaper (port_id) (shared_shaper_id)"
- " (shaper_profile_id)\n"
- " Add/update port tm node shared shaper.\n\n"
-
- "del port tm node shared shaper (port_id) (shared_shaper_id)\n"
- " Delete port tm node shared shaper.\n\n"
-
- "set port tm node shaper profile (port_id) (node_id)"
- " (shaper_profile_id)\n"
- " Set port tm node shaper profile.\n\n"
-
- "add port tm node wred profile (port_id) (wred_profile_id)"
- " (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
- " (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
- " (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
- " Add port tm node wred profile.\n\n"
-
- "del port tm node wred profile (port_id) (wred_profile_id)\n"
- " Delete port tm node wred profile.\n\n"
-
- "add port tm nonleaf node (port_id) (node_id) (parent_node_id)"
- " (priority) (weight) (level_id) (shaper_profile_id)"
- " (n_sp_priorities) (stats_mask) (n_shared_shapers)"
- " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
- " Add port tm nonleaf node.\n\n"
-
- "add port tm leaf node (port_id) (node_id) (parent_node_id)"
- " (priority) (weight) (level_id) (shaper_profile_id)"
- " (cman_mode) (wred_profile_id) (stats_mask) (n_shared_shapers)"
- " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
- " Add port tm leaf node.\n\n"
-
- "del port tm node (port_id) (node_id)\n"
- " Delete port tm node.\n\n"
-
- "set port tm node parent (port_id) (node_id) (parent_node_id)"
- " (priority) (weight)\n"
- " Set port tm node parent.\n\n"
-
- "suspend port tm node (port_id) (node_id)"
- " Suspend tm node.\n\n"
-
- "resume port tm node (port_id) (node_id)"
- " Resume tm node.\n\n"
-
- "port tm hierarchy commit (port_id) (clean_on_fail)\n"
- " Commit tm hierarchy.\n\n"
-
"vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
" (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
@@ -919,4 +870,50 @@ static void cmd_help_long_parsed(void *parsed_result,
"port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)\n\n"
" Add/remove UDP tunnel port for tunneling offload\n\n"
+
+ "port config <port_id> rx_offload vlan_strip|"
+ "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+ "outer_ipv4_cksum|macsec_strip|header_split|"
+ "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+ "scatter|timestamp|security|keep_crc on|off\n"
+ " Enable or disable a per port Rx offloading"
+ " on all Rx queues of a port\n\n"
+
+ "port (port_id) rxq (queue_id) rx_offload vlan_strip|"
+ "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+ "outer_ipv4_cksum|macsec_strip|header_split|"
+ "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+ "scatter|timestamp|security|keep_crc on|off\n"
+ " Enable or disable a per queue Rx offloading"
+ " only on a specific Rx queue\n\n"
+
+ "port config (port_id) tx_offload vlan_insert|"
+ "ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+ "udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+ "gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|"
+ "macsec_insert|mt_lockfree|multi_segs|mbuf_fast_free|"
+ "security|match_metadata on|off\n"
+ " Enable or disable a per port Tx offloading"
+ " on all Tx queues of a port\n\n"
+
+ "port (port_id) txq (queue_id) tx_offload vlan_insert|"
+ "ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+ "udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+ "gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|macsec_insert"
+ "|mt_lockfree|multi_segs|mbuf_fast_free|security"
+ " on|off\n"
+ " Enable or disable a per queue Tx offloading"
+ " only on a specific Tx queue\n\n"
+
+ "bpf-load rx|tx (port) (queue) (J|M|B) (file_name)\n"
+ " Load an eBPF program as a callback"
+ " for particular RX/TX queue\n\n"
+
+ "bpf-unload rx|tx (port) (queue)\n"
+ " Unload previously loaded eBPF program"
+ " for particular RX/TX queue\n\n"
+
+ "port config (port_id) tx_metadata (value)\n"
+ " Set Tx metadata value per port. Testpmd will add this value"
+ " to any Tx packet sent from this port\n\n"
);
}
@@ -1138,4 +1135,105 @@ static void cmd_help_long_parsed(void *parsed_result,
);
}
+
+ if (show_all || !strcmp(res->section, "traffic_management")) {
+ cmdline_printf(
+ cl,
+ "\n"
+ "Traffic Management:\n"
+ "--------------\n"
+ "show port tm cap (port_id)\n"
+ " Display the port TM capability.\n\n"
+
+ "show port tm level cap (port_id) (level_id)\n"
+ " Display the port TM hierarchical level capability.\n\n"
+
+ "show port tm node cap (port_id) (node_id)\n"
+ " Display the port TM node capability.\n\n"
+
+ "show port tm node type (port_id) (node_id)\n"
+ " Display the port TM node type.\n\n"
+
+ "show port tm node stats (port_id) (node_id) (clear)\n"
+ " Display the port TM node stats.\n\n"
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+ "set port tm hierarchy default (port_id)\n"
+ " Set default traffic Management hierarchy on a port\n\n"
+#endif
+
+ "add port tm node shaper profile (port_id) (shaper_profile_id)"
+ " (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)"
+ " (packet_length_adjust)\n"
+ " Add port tm node private shaper profile.\n\n"
+
+ "del port tm node shaper profile (port_id) (shaper_profile_id)\n"
+ " Delete port tm node private shaper profile.\n\n"
+
+ "add port tm node shared shaper (port_id) (shared_shaper_id)"
+ " (shaper_profile_id)\n"
+ " Add/update port tm node shared shaper.\n\n"
+
+ "del port tm node shared shaper (port_id) (shared_shaper_id)\n"
+ " Delete port tm node shared shaper.\n\n"
+
+ "set port tm node shaper profile (port_id) (node_id)"
+ " (shaper_profile_id)\n"
+ " Set port tm node shaper profile.\n\n"
+
+ "add port tm node wred profile (port_id) (wred_profile_id)"
+ " (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
+ " (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
+ " (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
+ " Add port tm node wred profile.\n\n"
+
+ "del port tm node wred profile (port_id) (wred_profile_id)\n"
+ " Delete port tm node wred profile.\n\n"
+
+ "add port tm nonleaf node (port_id) (node_id) (parent_node_id)"
+ " (priority) (weight) (level_id) (shaper_profile_id)"
+ " (n_sp_priorities) (stats_mask) (n_shared_shapers)"
+ " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+ " Add port tm nonleaf node.\n\n"
+
+ "add port tm leaf node (port_id) (node_id) (parent_node_id)"
+ " (priority) (weight) (level_id) (shaper_profile_id)"
+ " (cman_mode) (wred_profile_id) (stats_mask) (n_shared_shapers)"
+ " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+ " Add port tm leaf node.\n\n"
+
+ "del port tm node (port_id) (node_id)\n"
+ " Delete port tm node.\n\n"
+
+ "set port tm node parent (port_id) (node_id) (parent_node_id)"
+ " (priority) (weight)\n"
+ " Set port tm node parent.\n\n"
+
+ "suspend port tm node (port_id) (node_id)"
+ " Suspend tm node.\n\n"
+
+ "resume port tm node (port_id) (node_id)"
+ " Resume tm node.\n\n"
+
+ "port tm hierarchy commit (port_id) (clean_on_fail)\n"
+ " Commit tm hierarchy.\n\n"
+
+ "set port tm mark ip_ecn (port) (green) (yellow)"
+ " (red)\n"
+ " Enables/Disables the traffic management marking"
+ " for IP ECN (Explicit Congestion Notification)"
+ " packets on a given port\n\n"
+
+ "set port tm mark ip_dscp (port) (green) (yellow)"
+ " (red)\n"
+ " Enables/Disables the traffic management marking"
+ " on the port for IP dscp packets\n\n"
+
+ "set port tm mark vlan_dei (port) (green) (yellow)"
+ " (red)\n"
+ " Enables/Disables the traffic management marking"
+ " on the port for VLAN packets with DEI enabled\n\n"
+ );
+ }
+
}
@@ -1146,10 +1244,11 @@ cmdline_parse_token_string_t cmd_help_long_section =
TOKEN_STRING_INITIALIZER(struct cmd_help_long_result, section,
"all#control#display#config#"
- "ports#registers#filters");
+ "ports#registers#filters#traffic_management");
cmdline_parse_inst_t cmd_help_long = {
.f = cmd_help_long_parsed,
.data = NULL,
- .help_str = "help all|control|display|config|ports|register|filters: "
+ .help_str = "help all|control|display|config|ports|register|"
+ "filters|traffic_management: "
"Show help",
.tokens = {
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.329130645 +0100
+++ 0017-app-testpmd-fix-help-info-for-interactive-commands.patch 2019-05-08 16:33:57.391578827 +0100
@@ -1 +1 @@
-From 920fa9a2a1c965347bbb454ef92fb870dd25a4f7 Mon Sep 17 00:00:00 2001
+From ad4834815bf92cc4314822bb47ed716b6fadc807 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 920fa9a2a1c965347bbb454ef92fb870dd25a4f7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- app/test-pmd/cmdline.c | 262 ++++++++++++++++++++++++++++-------------
- 1 file changed, 178 insertions(+), 84 deletions(-)
+ app/test-pmd/cmdline.c | 259 ++++++++++++++++++++++++++++-------------
+ 1 file changed, 179 insertions(+), 80 deletions(-)
@@ -22 +23 @@
-index 5a10c5f38..147a617d5 100644
+index 7ceb76b53..77641ee23 100644
@@ -25 +26 @@
-@@ -94,12 +94,13 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
+@@ -95,12 +95,13 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
@@ -46 +47 @@
-@@ -210,18 +211,4 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -211,19 +212,30 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -51 +52 @@
--
+
@@ -54 +55,3 @@
--
++ "show fwd stats all\n"
++ " Display statistics for all fwd engines.\n\n"
+
@@ -57 +60,3 @@
--
++ "clear fwd stats all\n"
++ " Clear statistics for all fwd engines.\n\n"
+
@@ -60,9 +64,0 @@
--
-- "show port tm node stats (port_id) (node_id) (clear)\n"
-- " Display the port TM node stats.\n\n"
-
- "show fwd stats all\n"
-@@ -230,4 +217,24 @@ static void cmd_help_long_parsed(void *parsed_result,
- "clear fwd stats all\n"
- " Clear statistics for all fwd engines.\n\n"
-+
@@ -72 +68,3 @@
-+
+
+- "show port tm node stats (port_id) (node_id) (clear)\n"
+- " Display the port TM node stats.\n\n"
@@ -76 +74 @@
-+
+
@@ -90 +88 @@
-@@ -647,9 +654,4 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -643,9 +655,4 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -100 +98 @@
-@@ -732,60 +734,4 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -728,60 +735,4 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -161 +159 @@
-@@ -929,4 +875,50 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -919,4 +870,50 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -212 +210 @@
-@@ -1148,4 +1140,105 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -1138,4 +1135,105 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -318 +316 @@
-@@ -1156,10 +1249,11 @@ cmdline_parse_token_string_t cmd_help_long_section =
+@@ -1146,10 +1244,11 @@ cmdline_parse_token_string_t cmd_help_long_section =
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/ring: fix coding style' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (15 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'app/testpmd: fix help info for interactive commands' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: avoid hard-coded length' " Kevin Traynor
` (17 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/997a9f97348da498caf69278ef15c3396b8f3ea5
Thanks.
Kevin Traynor
---
From 997a9f97348da498caf69278ef15c3396b8f3ea5 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 23 Apr 2019 09:53:32 -0700
Subject: [PATCH] net/ring: fix coding style
[ upstream commit 869bf6d222bb05502bd5b508eb1cfed4e7d2623b ]
Whitespace fixes to bring inline with current DPDK style.
Fixes: e1e4017751f1 ("ring: add new driver")
Fixes: a74a99bbb8ed ("ring: free rings when detaching device")
Fixes: 61934c0956d4 ("ring: convert to use of PMD_REGISTER_DRIVER and fix linking")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 58 ++++++++++++++++++---------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index aeb48f5ec..f301ba9f4 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -46,6 +46,6 @@ struct ring_queue {
struct pmd_internals {
- unsigned max_rx_queues;
- unsigned max_tx_queues;
+ unsigned int max_rx_queues;
+ unsigned int max_tx_queues;
struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS];
@@ -56,10 +56,9 @@ struct pmd_internals {
};
-
static struct rte_eth_link pmd_link = {
- .link_speed = ETH_SPEED_NUM_10G,
- .link_duplex = ETH_LINK_FULL_DUPLEX,
- .link_status = ETH_LINK_DOWN,
- .link_autoneg = ETH_LINK_FIXED,
+ .link_speed = ETH_SPEED_NUM_10G,
+ .link_duplex = ETH_LINK_FULL_DUPLEX,
+ .link_status = ETH_LINK_DOWN,
+ .link_autoneg = ETH_LINK_FIXED,
};
@@ -139,4 +138,5 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
{
struct pmd_internals *internals = dev->data->dev_private;
+
dev->data->rx_queues[rx_queue_id] = &internals->rx_ring_queues[rx_queue_id];
return 0;
@@ -150,4 +150,5 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
{
struct pmd_internals *internals = dev->data->dev_private;
+
dev->data->tx_queues[tx_queue_id] = &internals->tx_ring_queues[tx_queue_id];
return 0;
@@ -157,7 +158,8 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
static void
eth_dev_info(struct rte_eth_dev *dev,
- struct rte_eth_dev_info *dev_info)
+ struct rte_eth_dev_info *dev_info)
{
struct pmd_internals *internals = dev->data->dev_private;
+
dev_info->max_mac_addrs = 1;
dev_info->max_rx_pktlen = (uint32_t)-1;
@@ -170,5 +172,5 @@ static int
eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
- unsigned i;
+ unsigned int i;
unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
const struct pmd_internals *internal = dev->data->dev_private;
@@ -198,6 +200,7 @@ static void
eth_stats_reset(struct rte_eth_dev *dev)
{
- unsigned i;
+ unsigned int i;
struct pmd_internals *internal = dev->data->dev_private;
+
for (i = 0; i < dev->data->nb_rx_queues; i++)
internal->rx_ring_queues[i].rx_pkts.cnt = 0;
@@ -251,6 +254,8 @@ static struct rte_vdev_driver pmd_ring_drv;
static int
do_eth_dev_ring_create(const char *name,
- struct rte_ring * const rx_queues[], const unsigned nb_rx_queues,
- struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
+ struct rte_ring * const rx_queues[],
+ const unsigned int nb_rx_queues,
+ struct rte_ring *const tx_queues[],
+ const unsigned int nb_tx_queues,
const unsigned int numa_node, enum dev_action action,
struct rte_eth_dev **eth_dev_p)
@@ -261,5 +266,5 @@ do_eth_dev_ring_create(const char *name,
void **rx_queues_local = NULL;
void **tx_queues_local = NULL;
- unsigned i;
+ unsigned int i;
PMD_LOG(INFO, "Creating rings-backed ethdev on numa socket %u",
@@ -345,8 +350,8 @@ error:
int
rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
- const unsigned nb_rx_queues,
+ const unsigned int nb_rx_queues,
struct rte_ring *const tx_queues[],
- const unsigned nb_tx_queues,
- const unsigned numa_node)
+ const unsigned int nb_tx_queues,
+ const unsigned int numa_node)
{
struct ring_internal_args args = {
@@ -399,5 +404,5 @@ rte_eth_from_ring(struct rte_ring *r)
static int
-eth_dev_ring_create(const char *name, const unsigned numa_node,
+eth_dev_ring_create(const char *name, const unsigned int numa_node,
enum dev_action action, struct rte_eth_dev **eth_dev)
{
@@ -406,7 +411,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,
*/
struct rte_ring *rxtx[RTE_PMD_RING_MAX_RX_RINGS];
- unsigned i;
+ unsigned int i;
char rng_name[RTE_RING_NAMESIZE];
- unsigned num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS,
+ unsigned int num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS,
RTE_PMD_RING_MAX_TX_RINGS);
@@ -430,15 +435,16 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,
struct node_action_pair {
char name[PATH_MAX];
- unsigned node;
+ unsigned int node;
enum dev_action action;
};
struct node_action_list {
- unsigned total;
- unsigned count;
+ unsigned int total;
+ unsigned int count;
struct node_action_pair *list;
};
-static int parse_kvlist (const char *key __rte_unused, const char *value, void *data)
+static int parse_kvlist(const char *key __rte_unused,
+ const char *value, void *data)
{
struct node_action_list *info = data;
@@ -553,6 +559,6 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
if (!kvlist) {
- PMD_LOG(INFO, "Ignoring unsupported parameters when creating"
- " rings-backed ethernet device");
+ PMD_LOG(INFO,
+ "Ignoring unsupported parameters when creatingrings-backed ethernet device");
ret = eth_dev_ring_create(name, rte_socket_id(),
DEV_CREATE, ð_dev);
@@ -598,5 +604,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
info->total = ret;
- info->list = (struct node_action_pair*)(info + 1);
+ info->list = (struct node_action_pair *)(info + 1);
ret = rte_kvargs_process(kvlist, ETH_RING_NUMA_NODE_ACTION_ARG,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.393611691 +0100
+++ 0018-net-ring-fix-coding-style.patch 2019-05-08 16:33:57.393578764 +0100
@@ -1 +1 @@
-From 869bf6d222bb05502bd5b508eb1cfed4e7d2623b Mon Sep 17 00:00:00 2001
+From 997a9f97348da498caf69278ef15c3396b8f3ea5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 869bf6d222bb05502bd5b508eb1cfed4e7d2623b ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 115a882b5..91e5f5f8f 100644
+index aeb48f5ec..f301ba9f4 100644
@@ -153 +154 @@
-@@ -554,6 +560,6 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -553,6 +559,6 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -162 +163 @@
-@@ -599,5 +605,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -598,5 +604,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/ring: avoid hard-coded length' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (16 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: fix coding style' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: use calloc style where appropriate' " Kevin Traynor
` (16 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/94a6faf88772624a286b55cbf1400152d58e0440
Thanks.
Kevin Traynor
---
From 94a6faf88772624a286b55cbf1400152d58e0440 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 23 Apr 2019 09:53:33 -0700
Subject: [PATCH] net/ring: avoid hard-coded length
[ upstream commit 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 ]
Don't hard code string length in two place; use sizeof() instead.
Ring name should use RTE_RING_NAMESIZE.
Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index f301ba9f4..8776492b8 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -363,6 +363,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
.addr = &args,
};
- char args_str[32] = { 0 };
- char ring_name[32] = { 0 };
+ char args_str[32];
+ char ring_name[RTE_RING_NAMESIZE];
uint16_t port_id = RTE_MAX_ETHPORTS;
int ret;
@@ -382,6 +382,7 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
}
- snprintf(args_str, 32, "%s=%p", ETH_RING_INTERNAL_ARG, &args);
- snprintf(ring_name, 32, "net_ring_%s", name);
+ snprintf(args_str, sizeof(args_str), "%s=%p",
+ ETH_RING_INTERNAL_ARG, &args);
+ snprintf(ring_name, sizeof(ring_name), "net_ring_%s", name);
ret = rte_vdev_init(ring_name, args_str);
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.437720118 +0100
+++ 0019-net-ring-avoid-hard-coded-length.patch 2019-05-08 16:33:57.393578764 +0100
@@ -1 +1 @@
-From 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 Mon Sep 17 00:00:00 2001
+From 94a6faf88772624a286b55cbf1400152d58e0440 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 91e5f5f8f..2e4ca3b16 100644
+index f301ba9f4..8776492b8 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/ring: use calloc style where appropriate' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (17 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: avoid hard-coded length' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: check length of ring name' " Kevin Traynor
` (15 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/423c65b771f5a516e924fa5f8cee40abfa523d18
Thanks.
Kevin Traynor
---
From 423c65b771f5a516e924fa5f8cee40abfa523d18 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 23 Apr 2019 09:53:34 -0700
Subject: [PATCH] net/ring: use calloc style where appropriate
[ upstream commit 42a665a3227462c97222f623779a82c8d4f8c54e ]
Use rte_calloc_socket instead of computing size.
Fixes: 651c505af862 ("ring: enhance device setup from rings")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 8776492b8..e461fea8b 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -271,6 +271,6 @@ do_eth_dev_ring_create(const char *name,
numa_node);
- rx_queues_local = rte_zmalloc_socket(name,
- sizeof(void *) * nb_rx_queues, 0, numa_node);
+ rx_queues_local = rte_calloc_socket(name, nb_rx_queues,
+ sizeof(void *), 0, numa_node);
if (rx_queues_local == NULL) {
rte_errno = ENOMEM;
@@ -278,6 +278,6 @@ do_eth_dev_ring_create(const char *name,
}
- tx_queues_local = rte_zmalloc_socket(name,
- sizeof(void *) * nb_tx_queues, 0, numa_node);
+ tx_queues_local = rte_calloc_socket(name, nb_tx_queues,
+ sizeof(void *), 0, numa_node);
if (tx_queues_local == NULL) {
rte_errno = ENOMEM;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.483723161 +0100
+++ 0020-net-ring-use-calloc-style-where-appropriate.patch 2019-05-08 16:33:57.394578732 +0100
@@ -1 +1 @@
-From 42a665a3227462c97222f623779a82c8d4f8c54e Mon Sep 17 00:00:00 2001
+From 423c65b771f5a516e924fa5f8cee40abfa523d18 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 42a665a3227462c97222f623779a82c8d4f8c54e ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 2e4ca3b16..0355f2b7c 100644
+index 8776492b8..e461fea8b 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/ring: check length of ring name' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (18 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: use calloc style where appropriate' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: fix return value check' " Kevin Traynor
` (14 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b3dfc995008a8c2f85d65715378b1fb71e4ce989
Thanks.
Kevin Traynor
---
From b3dfc995008a8c2f85d65715378b1fb71e4ce989 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 23 Apr 2019 09:53:35 -0700
Subject: [PATCH] net/ring: check length of ring name
[ upstream commit 70a6aeb4639b633bc322834bb6f07b6c45c7e52b ]
The ring name is passed in as part of this drivers API, but it
doesn't check that the name is not truncated.
Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API")
Fixes: e1e4017751f1 ("ring: add new driver")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index e461fea8b..bc29795a7 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -384,5 +384,10 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
snprintf(args_str, sizeof(args_str), "%s=%p",
ETH_RING_INTERNAL_ARG, &args);
- snprintf(ring_name, sizeof(ring_name), "net_ring_%s", name);
+
+ ret = snprintf(ring_name, sizeof(ring_name), "net_ring_%s", name);
+ if (ret >= (int)sizeof(ring_name)) {
+ rte_errno = ENAMETOOLONG;
+ return -1;
+ }
ret = rte_vdev_init(ring_name, args_str);
@@ -418,5 +423,13 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node,
for (i = 0; i < num_rings; i++) {
- snprintf(rng_name, sizeof(rng_name), "ETH_RXTX%u_%s", i, name);
+ int cc;
+
+ cc = snprintf(rng_name, sizeof(rng_name),
+ "ETH_RXTX%u_%s", i, name);
+ if (cc >= (int)sizeof(rng_name)) {
+ rte_errno = ENAMETOOLONG;
+ return -1;
+ }
+
rxtx[i] = (action == DEV_CREATE) ?
rte_ring_create(rng_name, 1024, numa_node,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.528356960 +0100
+++ 0021-net-ring-check-length-of-ring-name.patch 2019-05-08 16:33:57.395578700 +0100
@@ -1 +1 @@
-From 70a6aeb4639b633bc322834bb6f07b6c45c7e52b Mon Sep 17 00:00:00 2001
+From b3dfc995008a8c2f85d65715378b1fb71e4ce989 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 70a6aeb4639b633bc322834bb6f07b6c45c7e52b ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 0355f2b7c..979993fd3 100644
+index e461fea8b..bc29795a7 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/ring: fix return value check' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (19 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: check length of ring name' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/kni: " Kevin Traynor
` (13 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Ferruh Yigit; +Cc: Bruce Richardson, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/99a6560c9037276ab2cc201d02a4234ce3edde17
Thanks.
Kevin Traynor
---
From 99a6560c9037276ab2cc201d02a4234ce3edde17 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 23 Apr 2019 16:23:32 +0100
Subject: [PATCH] net/ring: fix return value check
[ upstream commit e0474b94f8a36672d66be7408e3f7cf00e302329 ]
'rte_eth_dev_get_port_by_name()' return value is not checked caught by
coverity, adding return value check.
Coverity issue: 305853
Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index bc29795a7..c438da51c 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -397,5 +397,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
}
- rte_eth_dev_get_port_by_name(ring_name, &port_id);
+ ret = rte_eth_dev_get_port_by_name(ring_name, &port_id);
+ if (ret) {
+ rte_errno = ENODEV;
+ return -1;
+ }
return port_id;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.576476743 +0100
+++ 0022-net-ring-fix-return-value-check.patch 2019-05-08 16:33:57.396578668 +0100
@@ -1 +1 @@
-From e0474b94f8a36672d66be7408e3f7cf00e302329 Mon Sep 17 00:00:00 2001
+From 99a6560c9037276ab2cc201d02a4234ce3edde17 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e0474b94f8a36672d66be7408e3f7cf00e302329 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 979993fd3..ab963a03c 100644
+index bc29795a7..c438da51c 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/kni: fix return value check' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (20 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/ring: fix return value check' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'app/testpmd: fix unintentional integer overflow' " Kevin Traynor
` (12 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Ferruh Yigit; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3ec50060a725b0899626eabd9f2512b28471c79a
Thanks.
Kevin Traynor
---
From 3ec50060a725b0899626eabd9f2512b28471c79a Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 23 Apr 2019 16:36:21 +0100
Subject: [PATCH] net/kni: fix return value check
[ upstream commit 994e039b953b06a385d4362e1729a150f1a02d77 ]
'rte_kni_release()' return value is not checked, adding it.
Coverity issue: 336837
Fixes: 75e2bc54c018 ("net/kni: add KNI PMD")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/kni/rte_eth_kni.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index a1e9970df..9879985ec 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -455,4 +455,5 @@ eth_kni_remove(struct rte_vdev_device *vdev)
struct pmd_internals *internals;
const char *name;
+ int ret;
name = rte_vdev_device_name(vdev);
@@ -473,5 +474,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
internals = eth_dev->data->dev_private;
- rte_kni_release(internals->kni);
+ ret = rte_kni_release(internals->kni);
+ if (ret)
+ PMD_LOG(WARNING, "Not able to release kni for %s", name);
rte_eth_dev_release_port(eth_dev);
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.620227926 +0100
+++ 0023-net-kni-fix-return-value-check.patch 2019-05-08 16:33:57.396578668 +0100
@@ -1 +1 @@
-From 994e039b953b06a385d4362e1729a150f1a02d77 Mon Sep 17 00:00:00 2001
+From 3ec50060a725b0899626eabd9f2512b28471c79a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 994e039b953b06a385d4362e1729a150f1a02d77 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 89f44737c..1f232e4da 100644
+index a1e9970df..9879985ec 100644
@@ -21 +22 @@
-@@ -460,4 +460,5 @@ eth_kni_remove(struct rte_vdev_device *vdev)
+@@ -455,4 +455,5 @@ eth_kni_remove(struct rte_vdev_device *vdev)
@@ -27 +28 @@
-@@ -478,5 +479,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
+@@ -473,5 +474,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'app/testpmd: fix unintentional integer overflow' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (21 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/kni: " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/i40e: fix queue number check' " Kevin Traynor
` (11 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Tiwei Bie; +Cc: Bernard Iremonger, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6361633280b5096991e203e874fd79257dc1a523
Thanks.
Kevin Traynor
---
From 6361633280b5096991e203e874fd79257dc1a523 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie@intel.com>
Date: Wed, 24 Apr 2019 10:29:31 +0800
Subject: [PATCH] app/testpmd: fix unintentional integer overflow
[ upstream commit 8efc716f7cadead969e3ca12c0d9ba2f2aa8a8f6 ]
Fix the potential overflow in expression 1 << begin by using 1ULL.
Coverity issue: 279437, 279445
Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API")
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
app/test-pmd/cmdline.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 77641ee23..eeadb2de4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -17725,5 +17725,5 @@ print_rx_offloads(uint64_t offloads)
end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
- single_offload = 1 << begin;
+ single_offload = 1ULL << begin;
for (bit = begin; bit < end; bit++) {
if (offloads & single_offload)
@@ -18119,5 +18119,5 @@ print_tx_offloads(uint64_t offloads)
end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
- single_offload = 1 << begin;
+ single_offload = 1ULL << begin;
for (bit = begin; bit < end; bit++) {
if (offloads & single_offload)
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.665889820 +0100
+++ 0024-app-testpmd-fix-unintentional-integer-overflow.patch 2019-05-08 16:33:57.413578128 +0100
@@ -1 +1 @@
-From 8efc716f7cadead969e3ca12c0d9ba2f2aa8a8f6 Mon Sep 17 00:00:00 2001
+From 6361633280b5096991e203e874fd79257dc1a523 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8efc716f7cadead969e3ca12c0d9ba2f2aa8a8f6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 147a617d5..f45ef8a1c 100644
+index 77641ee23..eeadb2de4 100644
@@ -22 +23 @@
-@@ -17834,5 +17834,5 @@ print_rx_offloads(uint64_t offloads)
+@@ -17725,5 +17725,5 @@ print_rx_offloads(uint64_t offloads)
@@ -29 +30 @@
-@@ -18228,5 +18228,5 @@ print_tx_offloads(uint64_t offloads)
+@@ -18119,5 +18119,5 @@ print_tx_offloads(uint64_t offloads)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/i40e: fix queue number check' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (22 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'app/testpmd: fix unintentional integer overflow' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'test/bonding: fix MAC assignment for re-run' " Kevin Traynor
` (10 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Wei Zhao; +Cc: Qimai Xiao, Qi Zhang, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b8d8a5a52d4301a5ec1996d483574c0a3b42e61b
Thanks.
Kevin Traynor
---
From b8d8a5a52d4301a5ec1996d483574c0a3b42e61b Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Sun, 28 Apr 2019 14:13:18 +0800
Subject: [PATCH] net/i40e: fix queue number check
[ upstream commit f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 ]
Remove invalid queue number check which cause unexpected error return.
Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API")
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Tested-by: Qimai Xiao <qimaix.xiao@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 036c34d09..c29d972d6 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -12702,7 +12702,4 @@ i40e_config_rss_filter(struct i40e_pf *pf,
}
- if (rss_info->conf.queue_num)
- return -EINVAL;
-
/* If both VMDQ and RSS enabled, not all of PF queues are configured.
* It's necessary to calculate the actual PF queues that are configured.
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.730281221 +0100
+++ 0025-net-i40e-fix-queue-number-check.patch 2019-05-08 16:33:57.425577746 +0100
@@ -1 +1 @@
-From f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 Mon Sep 17 00:00:00 2001
+From b8d8a5a52d4301a5ec1996d483574c0a3b42e61b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f5c76298b4ea90fc7a2b9cd1b2a5d05036e7cc92 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 301193492..62865c5fd 100644
+index 036c34d09..c29d972d6 100644
@@ -22 +23 @@
-@@ -12711,7 +12711,4 @@ i40e_config_rss_filter(struct i40e_pf *pf,
+@@ -12702,7 +12702,4 @@ i40e_config_rss_filter(struct i40e_pf *pf,
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'test/bonding: fix MAC assignment for re-run' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (23 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/i40e: fix queue number check' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/i40e: fix link speed for X722' " Kevin Traynor
` (9 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Krzysztof Kanas; +Cc: Chas Williams, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f628e496a12bb4526b46868732c59263cae010e3
Thanks.
Kevin Traynor
---
From f628e496a12bb4526b46868732c59263cae010e3 Mon Sep 17 00:00:00 2001
From: Krzysztof Kanas <kkanas@marvell.com>
Date: Sat, 27 Apr 2019 00:30:29 +0200
Subject: [PATCH] test/bonding: fix MAC assignment for re-run
[ upstream commit 6e48cf0369c1906109918b3b7975b23648cf5ad4 ]
Fix test_set_bonded_port_initialization_mac_assignment so that it works
after 're run' test_link_bonding.
Fixes: f2ef6f21ee2e ("bond: fix mac assignment to slaves")
Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
Acked-by: Chas Williams <chas3@att.com>
---
test/test/test_link_bonding.c | 45 +++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
index 0fe1d78eb..0438e76cc 100644
--- a/test/test/test_link_bonding.c
+++ b/test/test/test_link_bonding.c
@@ -202,4 +202,5 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t en_isr)
static int slaves_initialized;
+static int mac_slaves_initialized;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -874,8 +875,9 @@ static int
test_set_bonded_port_initialization_mac_assignment(void)
{
- int i, slave_count, bonded_port_id;
+ int i, slave_count;
uint16_t slaves[RTE_MAX_ETHPORTS];
- int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT];
+ static int bonded_port_id = -1;
+ static int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT];
struct ether_addr slave_mac_addr, bonded_mac_addr, read_mac_addr;
@@ -888,27 +890,34 @@ test_set_bonded_port_initialization_mac_assignment(void)
* 1. a - Create / configure bonded / slave ethdevs
*/
- bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test",
- BONDING_MODE_ACTIVE_BACKUP, rte_socket_id());
- TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device");
+ if (bonded_port_id == -1) {
+ bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test",
+ BONDING_MODE_ACTIVE_BACKUP, rte_socket_id());
+ TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device");
- TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0),
- "Failed to configure bonded ethdev");
+ TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0),
+ "Failed to configure bonded ethdev");
+ }
- for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) {
- char pmd_name[RTE_ETH_NAME_MAX_LEN];
+ if (!mac_slaves_initialized) {
+ for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) {
+ char pmd_name[RTE_ETH_NAME_MAX_LEN];
- slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = i + 100;
+ slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = i + 100;
- snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "eth_slave_%d", i);
+ snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN,
+ "eth_slave_%d", i);
- slave_port_ids[i] = virtual_ethdev_create(pmd_name,
- &slave_mac_addr, rte_socket_id(), 1);
+ slave_port_ids[i] = virtual_ethdev_create(pmd_name,
+ &slave_mac_addr, rte_socket_id(), 1);
- TEST_ASSERT(slave_port_ids[i] >= 0,
- "Failed to create slave ethdev %s", pmd_name);
+ TEST_ASSERT(slave_port_ids[i] >= 0,
+ "Failed to create slave ethdev %s",
+ pmd_name);
- TEST_ASSERT_SUCCESS(configure_ethdev(slave_port_ids[i], 1, 0),
- "Failed to configure virtual ethdev %s",
- pmd_name);
+ TEST_ASSERT_SUCCESS(configure_ethdev(slave_port_ids[i], 1, 0),
+ "Failed to configure virtual ethdev %s",
+ pmd_name);
+ }
+ mac_slaves_initialized = 1;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.791437701 +0100
+++ 0026-test-bonding-fix-MAC-assignment-for-re-run.patch 2019-05-08 16:33:57.429577619 +0100
@@ -1 +1 @@
-From 6e48cf0369c1906109918b3b7975b23648cf5ad4 Mon Sep 17 00:00:00 2001
+From f628e496a12bb4526b46868732c59263cae010e3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6e48cf0369c1906109918b3b7975b23648cf5ad4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/test_link_bonding.c | 45 +++++++++++++++++++++---------------
+ test/test/test_link_bonding.c | 45 +++++++++++++++++++++--------------
@@ -18 +19 @@
-diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
+diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
@@ -20,2 +21,2 @@
---- a/app/test/test_link_bonding.c
-+++ b/app/test/test_link_bonding.c
+--- a/test/test/test_link_bonding.c
++++ b/test/test/test_link_bonding.c
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/i40e: fix link speed for X722' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (24 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'test/bonding: fix MAC assignment for re-run' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: check Tx queue size overflow' " Kevin Traynor
` (8 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Beilei Xing; +Cc: Qi Zhang, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2236b9e8fd48daf67bac584d0ce3d754a014994e
Thanks.
Kevin Traynor
---
From 2236b9e8fd48daf67bac584d0ce3d754a014994e Mon Sep 17 00:00:00 2001
From: Beilei Xing <beilei.xing@intel.com>
Date: Tue, 30 Apr 2019 14:56:37 +0800
Subject: [PATCH] net/i40e: fix link speed for X722
[ upstream commit f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 ]
If disable LSC when launching testpmd with X722, shown
link speed is 20G but not 10G. It's caused by wrongly
parsed link speed.
Correct it according to X722 datasheet.
Fixes: eef2daf2e199 ("net/i40e: fix link update no wait")
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 45 ++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index c29d972d6..af5e844b3 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2672,9 +2672,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
#define I40E_REG_MACC_25GB 0x00020000
#define I40E_REG_SPEED_MASK 0x38000000
-#define I40E_REG_SPEED_100MB 0x00000000
-#define I40E_REG_SPEED_1GB 0x08000000
-#define I40E_REG_SPEED_10GB 0x10000000
-#define I40E_REG_SPEED_20GB 0x20000000
-#define I40E_REG_SPEED_25_40GB 0x18000000
+#define I40E_REG_SPEED_0 0x00000000
+#define I40E_REG_SPEED_1 0x08000000
+#define I40E_REG_SPEED_2 0x10000000
+#define I40E_REG_SPEED_3 0x18000000
+#define I40E_REG_SPEED_4 0x20000000
uint32_t link_speed;
uint32_t reg_val;
@@ -2690,24 +2690,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
/* Parse the link status */
switch (link_speed) {
- case I40E_REG_SPEED_100MB:
+ case I40E_REG_SPEED_0:
link->link_speed = ETH_SPEED_NUM_100M;
break;
- case I40E_REG_SPEED_1GB:
+ case I40E_REG_SPEED_1:
link->link_speed = ETH_SPEED_NUM_1G;
break;
- case I40E_REG_SPEED_10GB:
- link->link_speed = ETH_SPEED_NUM_10G;
- break;
- case I40E_REG_SPEED_20GB:
- link->link_speed = ETH_SPEED_NUM_20G;
+ case I40E_REG_SPEED_2:
+ if (hw->mac.type == I40E_MAC_X722)
+ link->link_speed = ETH_SPEED_NUM_2_5G;
+ else
+ link->link_speed = ETH_SPEED_NUM_10G;
break;
- case I40E_REG_SPEED_25_40GB:
- reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
+ case I40E_REG_SPEED_3:
+ if (hw->mac.type == I40E_MAC_X722) {
+ link->link_speed = ETH_SPEED_NUM_5G;
+ } else {
+ reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
- if (reg_val & I40E_REG_MACC_25GB)
- link->link_speed = ETH_SPEED_NUM_25G;
+ if (reg_val & I40E_REG_MACC_25GB)
+ link->link_speed = ETH_SPEED_NUM_25G;
+ else
+ link->link_speed = ETH_SPEED_NUM_40G;
+ }
+ break;
+ case I40E_REG_SPEED_4:
+ if (hw->mac.type == I40E_MAC_X722)
+ link->link_speed = ETH_SPEED_NUM_10G;
else
- link->link_speed = ETH_SPEED_NUM_40G;
-
+ link->link_speed = ETH_SPEED_NUM_20G;
break;
default:
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.839585167 +0100
+++ 0027-net-i40e-fix-link-speed-for-X722.patch 2019-05-08 16:33:57.441577237 +0100
@@ -1 +1 @@
-From f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 Mon Sep 17 00:00:00 2001
+From 2236b9e8fd48daf67bac584d0ce3d754a014994e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 62865c5fd..2eea5232a 100644
+index c29d972d6..af5e844b3 100644
@@ -24 +25 @@
-@@ -2671,9 +2671,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
+@@ -2672,9 +2672,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
@@ -39 +40 @@
-@@ -2689,24 +2689,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
+@@ -2690,24 +2690,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/mlx5: check Tx queue size overflow' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (25 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/i40e: fix link speed for X722' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: fix max number of queues for NEON Tx' " Kevin Traynor
` (7 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Yongseok Koh; +Cc: Shahaf Shuler, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3f0d9b1fd20d59d5e7df9d713c513d4d7ac3b577
Thanks.
Kevin Traynor
---
From 3f0d9b1fd20d59d5e7df9d713c513d4d7ac3b577 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Tue, 30 Apr 2019 18:01:43 -0700
Subject: [PATCH] net/mlx5: check Tx queue size overflow
[ upstream commit f6d9ab4e769f0f95ecac1b418106e9f8137ca60c ]
If Tx packet inlining is enabled, rdma-core library should allocate large
Tx WQ enough to support it. It is better for PMD to calculate the size of
WQ based on the parameters and return error with appropriate message if it
exceeds the device capability.
Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
drivers/net/mlx5/mlx5_txq.c | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index f69520ba8..c5a3d1b4c 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -636,4 +636,25 @@ mlx5_txq_ibv_verify(struct rte_eth_dev *dev)
}
+/**
+ * Calcuate the total number of WQEBB for Tx queue.
+ *
+ * Simplified version of calc_sq_size() in rdma-core.
+ *
+ * @param txq_ctrl
+ * Pointer to Tx queue control structure.
+ *
+ * @return
+ * The number of WQEBB.
+ */
+static int
+txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)
+{
+ unsigned int wqe_size;
+ const unsigned int desc = 1 << txq_ctrl->txq.elts_n;
+
+ wqe_size = MLX5_WQE_SIZE + txq_ctrl->max_inline_data;
+ return rte_align32pow2(wqe_size * desc) / MLX5_WQE_SIZE;
+}
+
/**
* Set Tx queue parameters from device configuration.
@@ -781,8 +802,14 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
tmpl->idx = idx;
txq_set_params(tmpl);
- DRV_LOG(DEBUG, "port %u priv->device_attr.max_qp_wr is %d",
- dev->data->port_id, priv->device_attr.orig_attr.max_qp_wr);
- DRV_LOG(DEBUG, "port %u priv->device_attr.max_sge is %d",
- dev->data->port_id, priv->device_attr.orig_attr.max_sge);
+ if (txq_calc_wqebb_cnt(tmpl) >
+ priv->device_attr.orig_attr.max_qp_wr) {
+ DRV_LOG(ERR,
+ "port %u Tx WQEBB count (%d) exceeds the limit (%d),"
+ " try smaller queue size",
+ dev->data->port_id, txq_calc_wqebb_cnt(tmpl),
+ priv->device_attr.orig_attr.max_qp_wr);
+ rte_errno = ENOMEM;
+ goto error;
+ }
tmpl->txq.elts =
(struct rte_mbuf *(*)[1 << tmpl->txq.elts_n])(tmpl + 1);
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.896521685 +0100
+++ 0028-net-mlx5-check-Tx-queue-size-overflow.patch 2019-05-08 16:33:57.442577205 +0100
@@ -1 +1 @@
-From f6d9ab4e769f0f95ecac1b418106e9f8137ca60c Mon Sep 17 00:00:00 2001
+From 3f0d9b1fd20d59d5e7df9d713c513d4d7ac3b577 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f6d9ab4e769f0f95ecac1b418106e9f8137ca60c ]
+
@@ -11,2 +12,0 @@
-Cc: stable@dpdk.org
-
@@ -20 +20 @@
-index 4d55fd413..b281c4502 100644
+index f69520ba8..c5a3d1b4c 100644
@@ -23 +23 @@
-@@ -679,4 +679,25 @@ mlx5_txq_ibv_verify(struct rte_eth_dev *dev)
+@@ -636,4 +636,25 @@ mlx5_txq_ibv_verify(struct rte_eth_dev *dev)
@@ -49,2 +49,2 @@
-@@ -825,8 +846,14 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
- tmpl->txq.idx = idx;
+@@ -781,8 +802,14 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+ tmpl->idx = idx;
@@ -52,4 +52,4 @@
-- DRV_LOG(DEBUG, "port %u device_attr.max_qp_wr is %d",
-- dev->data->port_id, priv->sh->device_attr.orig_attr.max_qp_wr);
-- DRV_LOG(DEBUG, "port %u device_attr.max_sge is %d",
-- dev->data->port_id, priv->sh->device_attr.orig_attr.max_sge);
+- DRV_LOG(DEBUG, "port %u priv->device_attr.max_qp_wr is %d",
+- dev->data->port_id, priv->device_attr.orig_attr.max_qp_wr);
+- DRV_LOG(DEBUG, "port %u priv->device_attr.max_sge is %d",
+- dev->data->port_id, priv->device_attr.orig_attr.max_sge);
@@ -57 +57 @@
-+ priv->sh->device_attr.orig_attr.max_qp_wr) {
++ priv->device_attr.orig_attr.max_qp_wr) {
@@ -62 +62 @@
-+ priv->sh->device_attr.orig_attr.max_qp_wr);
++ priv->device_attr.orig_attr.max_qp_wr);
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/mlx5: fix max number of queues for NEON Tx' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (26 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: check Tx queue size overflow' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/tap: fix potential IPC buffer overrun' " Kevin Traynor
` (6 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Yongseok Koh; +Cc: Shahaf Shuler, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3554998505251fb9a9ace8b09fbeb5b68ae0a697
Thanks.
Kevin Traynor
---
From 3554998505251fb9a9ace8b09fbeb5b68ae0a697 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Tue, 30 Apr 2019 18:37:17 -0700
Subject: [PATCH] net/mlx5: fix max number of queues for NEON Tx
[ upstream commit 9cc42c58931a428a94e9adf7019eb97faa8fddb1 ]
BlueField SmartNIC has 0xa2d2 as PCI device ID on both ARM and x86 host. On
ARM side, Tx inlining need not be used as PCI bandwidth is not bottleneck.
Vectorized Tx can still be used up to 16 queues. For other archs
(e.g., x86), keep using the default value.
Fixes: 09d8b41699bb ("net/mlx5: make vectorized Tx threshold configurable")
Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
drivers/net/mlx5/mlx5_defs.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index bfe665580..480b33c81 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -64,8 +64,9 @@
#if defined(RTE_ARCH_ARM64)
#define MLX5_VPMD_MAX_TXQS 8
+#define MLX5_VPMD_MAX_TXQS_BLUEFIELD 16
#else
#define MLX5_VPMD_MAX_TXQS 4
+#define MLX5_VPMD_MAX_TXQS_BLUEFIELD MLX5_VPMD_MAX_TXQS
#endif
-#define MLX5_VPMD_MAX_TXQS_BLUEFIELD 16
/* Threshold of buffer replenishment for vectorized Rx. */
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.941302021 +0100
+++ 0029-net-mlx5-fix-max-number-of-queues-for-NEON-Tx.patch 2019-05-08 16:33:57.442577205 +0100
@@ -1 +1 @@
-From 9cc42c58931a428a94e9adf7019eb97faa8fddb1 Mon Sep 17 00:00:00 2001
+From 3554998505251fb9a9ace8b09fbeb5b68ae0a697 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9cc42c58931a428a94e9adf7019eb97faa8fddb1 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 69b6960e9..13801a5c2 100644
+index bfe665580..480b33c81 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/tap: fix potential IPC buffer overrun' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (27 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/mlx5: fix max number of queues for NEON Tx' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/vmxnet3: add VLAN filter capability' " Kevin Traynor
` (5 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Herakliusz Lipiec; +Cc: Anatoly Burakov, Ferruh Yigit, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4a13ffc0ad2b086ff8c4bd60e0d5315380487e1d
Thanks.
Kevin Traynor
---
From 4a13ffc0ad2b086ff8c4bd60e0d5315380487e1d Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Date: Mon, 29 Apr 2019 18:31:21 +0100
Subject: [PATCH] net/tap: fix potential IPC buffer overrun
[ upstream commit 9ad43ad8fbeeec1a485233227da21fd71e175984 ]
When secondary to primary process synchronization occurs
there is no check for number of fds which could cause buffer overrun.
Bugzilla ID: 252
Fixes: c9aa56edec8e ("net/tap: access primary process queues from secondary")
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/tap/rte_eth_tap.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 292657d0b..867873683 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2082,4 +2082,9 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
/* Attach the queues from received file descriptors */
+ if (reply_param->rxq_count + reply_param->txq_count != reply->num_fds) {
+ TAP_LOG(ERR, "Unexpected number of fds received");
+ return -1;
+ }
+
dev->data->nb_rx_queues = reply_param->rxq_count;
dev->data->nb_tx_queues = reply_param->txq_count;
@@ -2122,4 +2127,10 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
reply.num_fds = 0;
reply_param->rxq_count = 0;
+ if (dev->data->nb_rx_queues + dev->data->nb_tx_queues >
+ RTE_MP_MAX_FD_NUM){
+ TAP_LOG(ERR, "Number of rx/tx queues exceeds max number of fds");
+ return -1;
+ }
+
for (queue = 0; queue < dev->data->nb_rx_queues; queue++) {
reply.fds[reply.num_fds++] = process_private->rxq_fds[queue];
@@ -2127,6 +2138,4 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
}
RTE_ASSERT(reply_param->rxq_count == dev->data->nb_rx_queues);
- RTE_ASSERT(reply_param->txq_count == dev->data->nb_tx_queues);
- RTE_ASSERT(reply.num_fds <= RTE_MP_MAX_FD_NUM);
reply_param->txq_count = 0;
@@ -2135,4 +2144,5 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
reply_param->txq_count++;
}
+ RTE_ASSERT(reply_param->txq_count == dev->data->nb_tx_queues);
/* Send reply */
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:58.987671919 +0100
+++ 0030-net-tap-fix-potential-IPC-buffer-overrun.patch 2019-05-08 16:33:57.444577142 +0100
@@ -1 +1 @@
-From 9ad43ad8fbeeec1a485233227da21fd71e175984 Mon Sep 17 00:00:00 2001
+From 4a13ffc0ad2b086ff8c4bd60e0d5315380487e1d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ad43ad8fbeeec1a485233227da21fd71e175984 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index f8a4169c5..47a2b68f1 100644
+index 292657d0b..867873683 100644
@@ -24 +25 @@
-@@ -2112,4 +2112,9 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
+@@ -2082,4 +2082,9 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)
@@ -34 +35 @@
-@@ -2152,4 +2157,10 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
+@@ -2122,4 +2127,10 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
@@ -45 +46 @@
-@@ -2157,6 +2168,4 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
+@@ -2127,6 +2138,4 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
@@ -52 +53 @@
-@@ -2165,4 +2174,5 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
+@@ -2135,4 +2144,5 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/vmxnet3: add VLAN filter capability' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (28 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/tap: fix potential IPC buffer overrun' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'net/netvsc: reset mbuf port on VF Rx' " Kevin Traynor
` (4 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Mark Gillott; +Cc: Yong Wang, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/550fe81e3a49eded44a6c0e924a118e9cba1287d
Thanks.
Kevin Traynor
---
From 550fe81e3a49eded44a6c0e924a118e9cba1287d Mon Sep 17 00:00:00 2001
From: Mark Gillott <mgillott@vyatta.att-mail.com>
Date: Wed, 1 May 2019 16:29:42 +0100
Subject: [PATCH] net/vmxnet3: add VLAN filter capability
[ upstream commit 273168f150078efdd30f12e272973951c611d816 ]
The driver supports VLAN filtering, but the option is not included in
the advertised list of capabilities. Thus any attempt to enable VLAN
filtering always fails. Update the list of offload capabilities to
include DEV_RX_OFFLOAD_VLAN_FILTER.
Fixes: 95e4a96ccbf1 ("net/vmxnet3: convert to new Rx offload API")
Signed-off-by: Mark Gillott <mgillott@vyatta.att-mail.com>
Acked-by: Yong Wang <yongwang@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 93e5de9a7..812e18575 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -53,4 +53,5 @@
#define VMXNET3_RX_OFFLOAD_CAP \
(DEV_RX_OFFLOAD_VLAN_STRIP | \
+ DEV_RX_OFFLOAD_VLAN_FILTER | \
DEV_RX_OFFLOAD_SCATTER | \
DEV_RX_OFFLOAD_IPV4_CKSUM | \
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.032613565 +0100
+++ 0031-net-vmxnet3-add-VLAN-filter-capability.patch 2019-05-08 16:33:57.445577110 +0100
@@ -1 +1 @@
-From 273168f150078efdd30f12e272973951c611d816 Mon Sep 17 00:00:00 2001
+From 550fe81e3a49eded44a6c0e924a118e9cba1287d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 273168f150078efdd30f12e272973951c611d816 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 846d7fd7a..f54536b49 100644
+index 93e5de9a7..812e18575 100644
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'net/netvsc: reset mbuf port on VF Rx' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (29 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/vmxnet3: add VLAN filter capability' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'test: clean remaining trace of devargs autotest' " Kevin Traynor
` (3 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/676e771920bc5b1d659c7a7b3ea1aa78a24d4610
Thanks.
Kevin Traynor
---
From 676e771920bc5b1d659c7a7b3ea1aa78a24d4610 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Tue, 30 Apr 2019 11:12:16 -0700
Subject: [PATCH] net/netvsc: reset mbuf port on VF Rx
[ upstream commit 05bfd4b49184c33cede032b680436dddb0083016 ]
Redo the receive logic to set m->port on packets received on VF.
When using VF, still need to check for packets and completions
arriving on the VMBus path even if application is not doing bursting
(ie n_rx == 0).
Also, fix comment.
Fixes: dc7680e8597c ("net/netvsc: support integrated VF")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
drivers/net/netvsc/hn_rxtx.c | 47 +++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 6b3768a54..5ffc0ee14 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1386,4 +1386,22 @@ fail:
}
+static uint16_t
+hn_recv_vf(uint16_t vf_port, const struct hn_rx_queue *rxq,
+ struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+{
+ uint16_t i, n;
+
+ if (unlikely(nb_pkts == 0))
+ return 0;
+
+ n = rte_eth_rx_burst(vf_port, rxq->queue_id, rx_pkts, nb_pkts);
+
+ /* relabel the received mbufs */
+ for (i = 0; i < n; i++)
+ rx_pkts[i]->port = rxq->port_id;
+
+ return n;
+}
+
uint16_t
hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -1397,28 +1415,19 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
return 0;
- /* Transmit over VF if present and up */
+ /* Receive from VF if present and up */
vf_dev = hn_get_vf_dev(hv);
- if (vf_dev && vf_dev->data->dev_started) {
- /* Normally, with SR-IOV the ring buffer will be empty */
+ /* Check for new completions */
+ if (likely(rte_ring_count(rxq->rx_ring) < nb_pkts))
hn_process_events(hv, rxq->queue_id, 0);
- /* Get mbufs some bufs off of staging ring */
- nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
- (void **)rx_pkts,
- nb_pkts / 2, NULL);
- /* And rest off of VF */
- nb_rcv += rte_eth_rx_burst(vf_dev->data->port_id,
- rxq->queue_id,
- rx_pkts + nb_rcv, nb_pkts - nb_rcv);
- } else {
- /* If receive ring is not full then get more */
- if (rte_ring_count(rxq->rx_ring) < nb_pkts)
- hn_process_events(hv, rxq->queue_id, 0);
+ /* Always check the vmbus path for multicast and new flows */
+ nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
+ (void **)rx_pkts, nb_pkts, NULL);
- nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
- (void **)rx_pkts,
- nb_pkts, NULL);
- }
+ /* If VF is available, check that as well */
+ if (vf_dev && vf_dev->data->dev_started)
+ nb_rcv += hn_recv_vf(vf_dev->data->port_id, rxq,
+ rx_pkts + nb_rcv, nb_pkts - nb_rcv);
return nb_rcv;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.080007632 +0100
+++ 0032-net-netvsc-reset-mbuf-port-on-VF-Rx.patch 2019-05-08 16:33:57.447577046 +0100
@@ -1 +1 @@
-From 05bfd4b49184c33cede032b680436dddb0083016 Mon Sep 17 00:00:00 2001
+From 676e771920bc5b1d659c7a7b3ea1aa78a24d4610 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05bfd4b49184c33cede032b680436dddb0083016 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index c67e9ae25..7856f7e6e 100644
+index 6b3768a54..5ffc0ee14 100644
@@ -26 +27 @@
-@@ -1394,4 +1394,22 @@ fail:
+@@ -1386,4 +1386,22 @@ fail:
@@ -49 +50 @@
-@@ -1405,28 +1423,19 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -1397,28 +1415,19 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'test: clean remaining trace of devargs autotest' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (30 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'net/netvsc: reset mbuf port on VF Rx' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'eventdev: update references to removed function' " Kevin Traynor
` (2 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: David Marchand; +Cc: Gaetan Rivet, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b941c34016f02c4c5836d7b4c0d0c23273ed8c61
Thanks.
Kevin Traynor
---
From b941c34016f02c4c5836d7b4c0d0c23273ed8c61 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 29 Apr 2019 16:32:45 +0200
Subject: [PATCH] test: clean remaining trace of devargs autotest
[ upstream commit b02faebcb6344ea2f32369714d8a921803511e61 ]
This test has been removed by the commit 83945fbd7c49 ("test: remove
devargs unit tests") which left some trace in meson and reintroduced in
autotest by the second commit 9eabcb682493 ("test: update autotest
list").
Fixes: 83945fbd7c49 ("test: remove devargs unit tests")
Fixes: 9eabcb682493 ("test: update autotest list")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
test/test/autotest_data.py | 6 ------
test/test/meson.build | 1 -
2 files changed, 7 deletions(-)
diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
index 0fb7866db..d878f9547 100644
--- a/test/test/autotest_data.py
+++ b/test/test/autotest_data.py
@@ -297,10 +297,4 @@ parallel_test_list = [
"Report": None,
},
- {
- "Name": "Devargs autotest",
- "Command": "devargs_autotest",
- "Func": default_autotest,
- "Report": None,
- },
{
"Name": "Link bonding autotest",
diff --git a/test/test/meson.build b/test/test/meson.build
index ace827352..8f03ddda5 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -155,5 +155,4 @@ test_names = [
'debug_autotest',
'delay_us_sleep_autotest',
- 'devargs_autotest',
'distributor_autotest',
'distributor_perf_autotest',
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.124648907 +0100
+++ 0033-test-clean-remaining-trace-of-devargs-autotest.patch 2019-05-08 16:33:57.448577015 +0100
@@ -1 +1 @@
-From b02faebcb6344ea2f32369714d8a921803511e61 Mon Sep 17 00:00:00 2001
+From b941c34016f02c4c5836d7b4c0d0c23273ed8c61 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b02faebcb6344ea2f32369714d8a921803511e61 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- app/test/autotest_data.py | 6 ------
- app/test/meson.build | 1 -
+ test/test/autotest_data.py | 6 ------
+ test/test/meson.build | 1 -
@@ -22,5 +23,5 @@
-diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
-index fba66045f..0f2c9a746 100644
---- a/app/test/autotest_data.py
-+++ b/app/test/autotest_data.py
-@@ -303,10 +303,4 @@ parallel_test_list = [
+diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
+index 0fb7866db..d878f9547 100644
+--- a/test/test/autotest_data.py
++++ b/test/test/autotest_data.py
+@@ -297,10 +297,4 @@ parallel_test_list = [
@@ -37,10 +38,10 @@
-diff --git a/app/test/meson.build b/app/test/meson.build
-index 4e8077cd2..83391cef0 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -201,5 +201,4 @@ fast_non_parallel_test_names = [
- 'cryptodev_sw_mvsam_autotest',
- 'delay_us_sleep_autotest',
-- 'devargs_autotest',
- 'distributor_autotest',
- 'eventdev_common_autotest',
+diff --git a/test/test/meson.build b/test/test/meson.build
+index ace827352..8f03ddda5 100644
+--- a/test/test/meson.build
++++ b/test/test/meson.build
+@@ -155,5 +155,4 @@ test_names = [
+ 'debug_autotest',
+ 'delay_us_sleep_autotest',
+- 'devargs_autotest',
+ 'distributor_autotest',
+ 'distributor_perf_autotest',
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'eventdev: update references to removed function' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (31 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'test: clean remaining trace of devargs autotest' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'hash: fix doc about thread/process safety' " Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix broken link in LPM guide' " Kevin Traynor
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Erik Gabriel Carrillo; +Cc: Jerin Jacob, John McNamara, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ca4728bd0333fffd8b54f56093f2e81bce234540
Thanks.
Kevin Traynor
---
From ca4728bd0333fffd8b54f56093f2e81bce234540 Mon Sep 17 00:00:00 2001
From: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Date: Mon, 29 Apr 2019 09:38:06 -0500
Subject: [PATCH] eventdev: update references to removed function
[ upstream commit 92b5ea41bb69c15220707a9f3954b6dc0058e956 ]
Remove references to the (deleted) rte_event_port_enqueue_depth()
function in the Doxygen comments for rte_event_enqueue_burst() and
friends, and replace with references to rte_event_port_attr_get().
Fixes: 78ffab961155 ("eventdev: add port attribute function")
Fixes: c9bf83947e2e ("eventdev: add eth Tx adapter APIs")
Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
lib/librte_eventdev/rte_event_eth_tx_adapter.h | 3 ++-
lib/librte_eventdev/rte_eventdev.h | 17 +++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h
index 81456d4a9..7a4a01fa7 100644
--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h
+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h
@@ -366,5 +366,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
* @param nb_events
* The number of event objects to enqueue, typically number of
- * rte_event_port_enqueue_depth() available for this port.
+ * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...)
+ * available for this port.
*
* @return
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h
index b90a18d8b..38608114d 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -1367,5 +1367,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
* @param nb_events
* The number of event objects to enqueue, typically number of
- * rte_event_port_enqueue_depth() available for this port.
+ * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...)
+ * available for this port.
*
* @return
@@ -1382,5 +1383,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
* one or more events. This error code is only applicable to
* closed systems.
- * @see rte_event_port_enqueue_depth()
+ * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH
*/
static inline uint16_t
@@ -1416,5 +1417,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
* @param nb_events
* The number of event objects to enqueue, typically number of
- * rte_event_port_enqueue_depth() available for this port.
+ * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...)
+ * available for this port.
*
* @return
@@ -1431,5 +1433,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
* one or more events. This error code is only applicable to
* closed systems.
- * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst()
+ * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH
+ * @see rte_event_enqueue_burst()
*/
static inline uint16_t
@@ -1465,5 +1468,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
* @param nb_events
* The number of event objects to enqueue, typically number of
- * rte_event_port_enqueue_depth() available for this port.
+ * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...)
+ * available for this port.
*
* @return
@@ -1480,5 +1484,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
* one or more events. This error code is only applicable to
* closed systems.
- * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst()
+ * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH
+ * @see rte_event_enqueue_burst()
*/
static inline uint16_t
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.172048523 +0100
+++ 0034-eventdev-update-references-to-removed-function.patch 2019-05-08 16:33:57.450576951 +0100
@@ -1 +1 @@
-From 92b5ea41bb69c15220707a9f3954b6dc0058e956 Mon Sep 17 00:00:00 2001
+From ca4728bd0333fffd8b54f56093f2e81bce234540 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 92b5ea41bb69c15220707a9f3954b6dc0058e956 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 1b5278fdb..9bed12b3a 100644
+index 81456d4a9..7a4a01fa7 100644
@@ -26 +27 @@
-@@ -323,5 +323,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
+@@ -366,5 +366,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
@@ -35 +36 @@
-index 43b1a248a..517cd8083 100644
+index b90a18d8b..38608114d 100644
@@ -38 +39 @@
-@@ -1364,5 +1364,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1367,5 +1367,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -46 +47 @@
-@@ -1379,5 +1380,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1382,5 +1383,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -53 +54 @@
-@@ -1413,5 +1414,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1416,5 +1417,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -61 +62 @@
-@@ -1428,5 +1430,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1431,5 +1433,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -69 +70 @@
-@@ -1462,5 +1465,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1465,5 +1468,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
@@ -77 +78 @@
-@@ -1477,5 +1481,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1480,5 +1484,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'hash: fix doc about thread/process safety' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (32 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'eventdev: update references to removed function' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
2019-05-08 16:02 ` [dpdk-stable] patch 'doc: fix broken link in LPM guide' " Kevin Traynor
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Yipeng Wang
Cc: Andrey Nikolaev, Pablo de Lara, Dharmik Thakkar, John McNamara,
dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f26ab681cf6ab6a83340692018aef0b171df47a2
Thanks.
Kevin Traynor
---
From f26ab681cf6ab6a83340692018aef0b171df47a2 Mon Sep 17 00:00:00 2001
From: Yipeng Wang <yipeng1.wang@intel.com>
Date: Mon, 29 Apr 2019 02:40:16 -0700
Subject: [PATCH] hash: fix doc about thread/process safety
[ upstream commit c96b55df8eea9223ec60f99974a95eb1c305aec5 ]
rte_hash_hash is multi-thread safe but not multi-process safe
because of the use of function pointers. Previous document
and comment says the other way around. This commit fixes
the issue.
Fixes: fc1f2750a3ec ("doc: programmers guide")
Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation")
Reported-by: Andrey Nikolaev <gentoorion@gmail.com>
Suggested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Yipeng Wang <yipeng1.wang@intel.com>
Acked-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
doc/guides/prog_guide/multi_proc_support.rst | 2 +-
lib/librte_hash/rte_hash.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 6196d3f21..f6f012db1 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -177,5 +177,5 @@ Some of these are documented below:
* The use of function pointers between multiple processes running based of different compiled binaries is not supported,
since the location of a given function in one process may be different to its location in a second.
- This prevents the librte_hash library from behaving properly as in a multi-threaded instance,
+ This prevents the librte_hash library from behaving properly as in a multi-process instance,
since it uses a pointer to the hash function internally.
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index e5970b468..4432aef76 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -464,5 +464,5 @@ rte_hash_lookup_with_hash(const struct rte_hash *h,
/**
* Calc a hash value by key.
- * This operation is not multi-thread safe.
+ * This operation is not multi-process safe.
*
* @param h
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.219331775 +0100
+++ 0035-hash-fix-doc-about-thread-process-safety.patch 2019-05-08 16:33:57.451576919 +0100
@@ -1 +1 @@
-From c96b55df8eea9223ec60f99974a95eb1c305aec5 Mon Sep 17 00:00:00 2001
+From f26ab681cf6ab6a83340692018aef0b171df47a2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c96b55df8eea9223ec60f99974a95eb1c305aec5 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread* [dpdk-stable] patch 'doc: fix broken link in LPM guide' has been queued to LTS release 18.11.2
2019-05-08 16:01 [dpdk-stable] patch 'raw/dpaa2_qdma: fix spin lock release' has been queued to LTS release 18.11.2 Kevin Traynor
` (33 preceding siblings ...)
2019-05-08 16:02 ` [dpdk-stable] patch 'hash: fix doc about thread/process safety' " Kevin Traynor
@ 2019-05-08 16:02 ` Kevin Traynor
34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2019-05-08 16:02 UTC (permalink / raw)
To: Herakliusz Lipiec
Cc: Rami Rosen, Vladimir Medvedkin, John McNamara, dpdk stable
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b49d5dd2e545dc4a878e949a27cfe138a9bec69c
Thanks.
Kevin Traynor
---
From b49d5dd2e545dc4a878e949a27cfe138a9bec69c Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Date: Wed, 24 Apr 2019 16:35:36 +0100
Subject: [PATCH] doc: fix broken link in LPM guide
[ upstream commit 193774a7997808e6333ee1d28d899495cfd6931e ]
Bugzilla ID: 235
Fixes: fc1f2750a3ec ("doc: programmers guide")
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
doc/guides/prog_guide/lpm_lib.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guides/prog_guide/lpm_lib.rst b/doc/guides/prog_guide/lpm_lib.rst
index 99563a4a6..1609a57d0 100644
--- a/doc/guides/prog_guide/lpm_lib.rst
+++ b/doc/guides/prog_guide/lpm_lib.rst
@@ -196,3 +196,3 @@ References
* Pankaj Gupta, Algorithms for Routing Lookups and Packet Classification, PhD Thesis, Stanford University,
- 2000 (`http://klamath.stanford.edu/~pankaj/thesis/ thesis_1sided.pdf <http://klamath.stanford.edu/~pankaj/thesis/%20thesis_1sided.pdf>`_ )
+ 2000 (`http://klamath.stanford.edu/~pankaj/thesis/thesis_1sided.pdf <http://klamath.stanford.edu/~pankaj/thesis/thesis_1sided.pdf>`_ )
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-08 16:33:59.265816526 +0100
+++ 0036-doc-fix-broken-link-in-LPM-guide.patch 2019-05-08 16:33:57.452576887 +0100
@@ -1 +1 @@
-From 193774a7997808e6333ee1d28d899495cfd6931e Mon Sep 17 00:00:00 2001
+From b49d5dd2e545dc4a878e949a27cfe138a9bec69c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 193774a7997808e6333ee1d28d899495cfd6931e ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 36+ messages in thread