Re: [dpdk-dev] [PATCH v2] vhost: flush IOTLB cache on new mem table handling
On 08/03/2018 04:30 AM, Tiwei Bie wrote:
On Thu, Aug 02, 2018 at 07:21:22PM +0200, Maxime Coquelin wrote:
IOTLB entries contain the host virtual address of the guest
pages. When receiving a new VHOST_USER_SET_MEM_TABLE request,
the previous regions get unmapped, so the IOTLB entries, if any,
will be invalid. It does cause the vhost-user process to
segfault.
This patch introduces a new function to flush the IOTLB cache,
and call it as soon as the backend handles a VHOST_USER_SET_MEM
request.
Fixes: 69c90e98f483 ("vhost: enable IOMMU support")
Cc: sta...@dpdk.org
Signed-off-by: Maxime Coquelin
---
Changes since v1:
- Fix indentation (Stephen)
- Fix double iotlb-lock lock
lib/librte_vhost/iotlb.c | 10 --
lib/librte_vhost/iotlb.h | 2 +-
lib/librte_vhost/vhost_user.c | 5 +
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index c11ebcaac..c6354fef7 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -303,6 +303,13 @@ vhost_user_iotlb_cache_find(struct vhost_virtqueue *vq,
uint64_t iova,
return vva;
}
+void
+vhost_user_iotlb_flush_all(struct vhost_virtqueue *vq)
+{
+ vhost_user_iotlb_cache_remove_all(vq);
+ vhost_user_iotlb_pending_remove_all(vq);
+}
+
int
vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
{
@@ -315,8 +322,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
* The cache has already been initialized,
* just drop all cached and pending entries.
*/
- vhost_user_iotlb_cache_remove_all(vq);
- vhost_user_iotlb_pending_remove_all(vq);
+ vhost_user_iotlb_flush_all(vq);
}
#ifdef RTE_LIBRTE_VHOST_NUMA
diff --git a/lib/librte_vhost/iotlb.h b/lib/librte_vhost/iotlb.h
index e7083e37b..60b9e4c57 100644
--- a/lib/librte_vhost/iotlb.h
+++ b/lib/librte_vhost/iotlb.h
@@ -73,7 +73,7 @@ void vhost_user_iotlb_pending_insert(struct vhost_virtqueue
*vq, uint64_t iova,
uint8_t perm);
void vhost_user_iotlb_pending_remove(struct vhost_virtqueue *vq, uint64_t
iova,
uint64_t size, uint8_t perm);
-
+void vhost_user_iotlb_flush_all(struct vhost_virtqueue *vq);
int vhost_user_iotlb_init(struct virtio_net *dev, int vq_index);
#endif /* _VHOST_IOTLB_H_ */
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index dc53ff712..a2d4c9ffc 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -813,6 +813,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct
VhostUserMsg *pmsg)
dev->mem = NULL;
}
+ /* Flush IOTLB cache as previous HVAs are now invalid */
+ if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
+ for (i = 0; i < dev->nr_vring; i++)
+ vhost_user_iotlb_flush_all(dev->virtqueue[i]);
Why is the pending list also flushed?
As it might be asynchronous, I think it is better to flush the pending
list too.
For example, the backend request a translation just before the guest
remove the driver, the IOVA requested might not be valid anymore and
so no reply will be sent by QEMU. So the request would remain in the
pending list forever.
I don't doing that is mandatory, but it does nor hurt IMHO.
Maxime
Thanks,
Tiwei
Re: [dpdk-dev] [PATCH v2] ethdev: decrease log level for successful API
On 02.08.2018 21:39, Kevin Traynor wrote:
Change log level of messages from ERR to INFO where
the post condition of the API is success, but no action
was actually needed as the condition already existed.
e.g. calling rte_eth_dev_start() for a device that is
already started.
Fixes: bea1e0c70cfc ("ethdev: convert static log type usage to dynamic")
Signed-off-by: Kevin Traynor
Acked-by: Andrew Rybchenko
Re: [dpdk-dev] [PATCH] net/tap: fix zeroed flow mask configurations
Hi Matan,
On Thu, Aug 02, 2018 at 05:52:18PM +, Matan Azrad wrote:
> Hi Adrien
>
> From: Adrien Mazarguil
> > On Thu, Aug 02, 2018 at 10:33:00AM +, Matan Azrad wrote:
> > > The rte_flow meaning of zero flow mask configuration is to match all
> > > the range of the item value.
> > > For example, the flow eth / ipv4 dst spec 1.2.3.4 dst mask 0.0.0.0
> > > should much all the ipv4 traffic from the rte_flow API perspective.
> > >
> > > From some kernel perspectives the above rule means to ignore all the
> > > ipv4 traffic (e.g. Ubuntu 16.04, 4.15.10).
> > >
> > > Due to the fact that the tap PMD should provide the rte_flow meaning,
> > > it is necessary to ignore the spec in case the mask is zero when it
> > > forwards such like flows to the kernel.
> > > So, the above rule should be translated to eth / ipv4 to get the
> > > correct meaning.
> > >
> > > Ignore spec configurations when the mask is zero.
> >
> > I would go further, one should be able to match IP address 0.0.0.0 for
> > instance.
> > The PMD should only trust the mask on all fields without looking at spec.
>
> The PMD should convert the RTE flow API to the device configuration,
> So I can think on scenarios that the PMD should look on spec.
Obviously the PMD needs to take spec into account. What I meant is that for
each field, spec must be taken into account according to mask only.
For any given field, when mask is empty, don't look at spec, it's like a
wildcard. When mask is full, take spec as is, even if spec only contains
zeroed bits.
User intent in that case is to match a zero value exactly, so it must not
result in a wildcard match. If supported, when mask is partial, masked bits
are also matched exactly, even if these turn out to be a zero
value. Unmasked bits are considered wildcards.
In short, to address both the issue mentioned in the commit log and the one
I'm talking about, you only need to replace "spec" with "mask" in the
original code. More below.
> See
> > below for suggestions.
> >
> > > Fixes: de96fe68ae95 ("net/tap: add basic flow API patterns and
> > > actions")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Matan Azrad
> > > ---
> > > drivers/net/tap/tap_flow.c | 13 -
> > > 1 file changed, 8 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
> > > index 6b60e6d..993e6f6 100644
> > > --- a/drivers/net/tap/tap_flow.c
> > > +++ b/drivers/net/tap/tap_flow.c
> > > @@ -537,7 +537,8 @@ tap_flow_create_eth(const struct rte_flow_item
> > *item, void *data)
> > > if (!flow)
> > > return 0;
> > > msg = &flow->msg;
> > > - if (!is_zero_ether_addr(&spec->dst)) {
> > > + if (!is_zero_ether_addr(&spec->dst) &&
> >
> > This check should be removed.
>
> I don't know why we need this check, and the below checks
> So it should be tested before the change.
> It may be a different issue.
>
> >
> > > + !is_zero_ether_addr(&mask->dst)) {
Should read:
if (!is_zero_ether_addr(&mask->dst)) {
> > > tap_nlattr_add(&msg->nh, TCA_FLOWER_KEY_ETH_DST,
> > ETHER_ADDR_LEN,
> > > &spec->dst.addr_bytes);
> > > tap_nlattr_add(&msg->nh,
> > > @@ -651,13 +652,13 @@ tap_flow_create_ipv4(const struct rte_flow_item
> > *item, void *data)
> > > info->eth_type = htons(ETH_P_IP);
> > > if (!spec)
> > > return 0;
> > > - if (spec->hdr.dst_addr) {
> > > + if (spec->hdr.dst_addr && mask->hdr.dst_addr) {
> >
> > Ditto (before &&).
Should read:
if (mask->hdr.dst_addr) {
> >
> > > tap_nlattr_add32(&msg->nh, TCA_FLOWER_KEY_IPV4_DST,
> > >spec->hdr.dst_addr);
> > > tap_nlattr_add32(&msg->nh,
> > TCA_FLOWER_KEY_IPV4_DST_MASK,
> > >mask->hdr.dst_addr);
> > > }
> > > - if (spec->hdr.src_addr) {
> > > + if (spec->hdr.src_addr && mask->hdr.src_addr) {
> >
> > Ditto.
Should read:
if (mask->hdr.dst_addr) {
> > > tap_nlattr_add32(&msg->nh, TCA_FLOWER_KEY_IPV4_SRC,
> > >spec->hdr.src_addr);
> > > tap_nlattr_add32(&msg->nh,
> > TCA_FLOWER_KEY_IPV4_SRC_MASK, @@ -707,13
> > > +708,15 @@ tap_flow_create_ipv6(const struct rte_flow_item *item, void
> > *data)
> > > info->eth_type = htons(ETH_P_IPV6);
> > > if (!spec)
> > > return 0;
> > > - if (memcmp(spec->hdr.dst_addr, empty_addr, 16)) {
> > > + if (memcmp(spec->hdr.dst_addr, empty_addr, 16) &&
> >
> > Ditto.
Should read:
if (memcmp(mask->hdr.dst_addr, empty_addr, 16)) {
> >
> > > + memcmp(mask->hdr.dst_addr, empty_addr, 16)) {
> > > tap_nlattr_add(&msg->nh, TCA_FLOWER_KEY_IPV6_DST,
> > > sizeof(spec->hdr.dst_addr), &spec->hdr.dst_addr);
> > > tap_nlattr_add(&msg->nh,
> > TCA_FLOWER_KEY_IPV6_DST_MASK,
> > > sizeof(mask->hdr.dst_addr), &mask->hdr.dst_addr);
> > > }
> > > - if (memcmp(spec->hdr.src_addr, empty_addr, 16)) {
> > > + if (memcm
Re: [dpdk-dev] [PATCH v2] vhost: flush IOTLB cache on new mem table handling
On Fri, Aug 03, 2018 at 09:54:21AM +0200, Maxime Coquelin wrote: > On 08/03/2018 04:30 AM, Tiwei Bie wrote: > > On Thu, Aug 02, 2018 at 07:21:22PM +0200, Maxime Coquelin wrote: [...] > >> > >> #endif /* _VHOST_IOTLB_H_ */ > >> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > >> index dc53ff712..a2d4c9ffc 100644 > >> --- a/lib/librte_vhost/vhost_user.c > >> +++ b/lib/librte_vhost/vhost_user.c > >> @@ -813,6 +813,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, > >> struct VhostUserMsg *pmsg) > >>dev->mem = NULL; > >>} > >> > >> + /* Flush IOTLB cache as previous HVAs are now invalid */ > >> + if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) > >> + for (i = 0; i < dev->nr_vring; i++) > >> + vhost_user_iotlb_flush_all(dev->virtqueue[i]); > > > > Why is the pending list also flushed? > > As it might be asynchronous, I think it is better to flush the pending > list too. > > For example, the backend request a translation just before the guest > remove the driver, the IOVA requested might not be valid anymore and > so no reply will be sent by QEMU. So the request would remain in the > pending list forever. > > I don't doing that is mandatory, but it does nor hurt IMHO. Yeah, it doesn't hurt. I was just curious about why you want to do that. :) Reviewed-by: Tiwei Bie
Re: [dpdk-dev] [PATCH v2] compress/isal: fixes offset check
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of De Lara Guarch, Pablo
> Sent: Wednesday, August 1, 2018 2:31 PM
> To: Daly, Lee
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] compress/isal: fixes offset check
>
>
>
> > -Original Message-
> > From: Daly, Lee
> > Sent: Wednesday, August 1, 2018 2:24 PM
> > To: De Lara Guarch, Pablo
> > Cc: dev@dpdk.org; Daly, Lee
> > Subject: [PATCH v2] compress/isal: fixes offset check
> >
> > This commit fixes an offset check in decompression which was checking
> > destination offset size against dst data_len rather than checking
> > against dst pkt_len as required.
> >
> > Fixes:788e748d3845 ("compress/isal: support chained mbufs")
> >
> > Signed-off-by: Lee Daly
>
> Acked-by: Pablo de Lara
Applied to dpdk-next-crypto.
Thanks,
Pablo
Re: [dpdk-dev] [PATCH] app/crypto-perf: fix auth IV offset
> -Original Message-
> From: De Lara Guarch, Pablo
> Sent: Thursday, August 2, 2018 9:45 AM
> To: Doherty, Declan
> Cc: dev@dpdk.org; De Lara Guarch, Pablo ;
> sta...@dpdk.org
> Subject: [PATCH] app/crypto-perf: fix auth IV offset
>
> Auth IV offset was not being set when creating the crypto session.
>
> Fixes: acf8616901b5 ("cryptodev: add auth IV")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Pablo de Lara
Applied to dpdk-next-crypto.
Pablo
Re: [dpdk-dev] [PATCH 0/2] common/qat: handle offset greater than first sgl segment
> -Original Message- > From: Jozwiak, TomaszX > Sent: Thursday, August 2, 2018 4:09 PM > To: De Lara Guarch, Pablo ; dev@dpdk.org; > Trahe, Fiona ; Jozwiak, TomaszX > > Subject: [PATCH 0/2] common/qat: handle offset greater than first sgl segment > > This patchset fixes buffer lengths and SGL filling to handle offset greater > than > first SGL segment. Series applied to dpdk-next-crypto. Thanks, Pablo
Re: [dpdk-dev] [PATCH v2] vhost: flush IOTLB cache on new mem table handling
On Thu, Aug 02, 2018 at 07:21:22PM +0200, Maxime Coquelin wrote:
IOTLB entries contain the host virtual address of the guest
pages. When receiving a new VHOST_USER_SET_MEM_TABLE request,
the previous regions get unmapped, so the IOTLB entries, if any,
will be invalid. It does cause the vhost-user process to
segfault.
This patch introduces a new function to flush the IOTLB cache,
and call it as soon as the backend handles a VHOST_USER_SET_MEM
request.
Fixes: 69c90e98f483 ("vhost: enable IOMMU support")
Cc: sta...@dpdk.org
Signed-off-by: Maxime Coquelin
---
Changes since v1:
- Fix indentation (Stephen)
- Fix double iotlb-lock lock
lib/librte_vhost/iotlb.c | 10 --
lib/librte_vhost/iotlb.h | 2 +-
lib/librte_vhost/vhost_user.c | 5 +
3 files changed, 14 insertions(+), 3 deletions(-)
Reviewed-by: Jens Freimann
[dpdk-dev] [PATCH v1] add dpdk-quickstart python script
This patch contains two section.
1. Updates to the existing quick-start.html page giving
infomration on the new dpdk-quickstart.py script.
2. The dpdk-quickstart.py script itself.
1. The Quick start section contains some instructions for
building DPDK and running TestPMD.
While this is still useful, automating these steps
through a script would provide a much faster and painless
way to have DPDK up and running. The new dpdk-quickstart.py
aims to address this.
2. This script performs the following:
- Gets the latest DPDK release
- Gets the necessary dependencies (if needed)
- Builds DPDK with the default target
- Sets up hugepages
- Helps the user to select the ports to use on DPDK
- Runs TestPMD, showing packet forwarding between two ports
Signed-off-by: Pablo de Lara
Signed-off-by: Kirill Rybalchenko
Signed-off-by: David Hunt
---
doc/quick-start.html | 25 +
scripts/dpdk-quickstart.py | 996 +
2 files changed, 1021 insertions(+)
create mode 100755 scripts/dpdk-quickstart.py
diff --git a/doc/quick-start.html b/doc/quick-start.html
index 85551fa..fa49932 100644
--- a/doc/quick-start.html
+++ b/doc/quick-start.html
@@ -39,6 +39,31 @@
Quick start
+ The dpdk-quickstart script is a python script
which
+ provides a quick way to get DPDK up and
running.
+
+ The script can be downloaded here: dpdk-quickstart.py
+
+ The script performs the following operations, on a
guided and
+ interactive graphical interface:
+
+
+ Gets the latest DPDK release from the main git
repository
+ Checks and downloads the necessary
dependencies
+ Builds DPDK with the default target
+ Sets up the minimum amount of hugepages to run
TestPMD (a basic
+ L2 forwarding application)
+ Helps the user to select the ports to use on DPDK
(including
+ loopback detection between ports)
+ Runs TestPMD, to show packet forwarding between
two ports
+ (virtual interfaces can also be used, if no ports
connected with a
+ loopback are available).
+
+ Note that this script is only supported on Fedora
and Ubuntu.
+
+
+ Alternatively, DPDK can be
+ installed and configured manually, with the following
instructions:
"A simple forwarding test with pcap PMD which
works with any NIC (with performance penalties)"
Extract sources.
diff --git a/scripts/dpdk-quickstart.py b/scripts/dpdk-quickstart.py
new file mode 100755
index 000..5fe82d0
--- /dev/null
+++ b/scripts/dpdk-quickstart.py
@@ -0,0 +1,996 @@
+#!/bin/sh
+which python3 >/dev/null 2>&1 && exec python3 "$0" "$@" # '''
+which python2 >/dev/null 2>&1 && exec python2 "$0" "$@" # '''
+
+which python >/dev/null 2>&1 && exec python "$0" "$@" # '''
+exec echo "Error: I can't find python anywhere" # '''
+#! /usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+#
+
+import copy
+import getopt
+import os
+import platform
+import subprocess
+import sys
+import time
+from collections import OrderedDict
+from os.path import exists, abspath, dirname, basename
+from os import listdir
+from os import system
+from shutil import rmtree
+from time import sleep
+from math import ceil
+
+script_dir_path = os.getcwd()
+
+# The PCI base class for NETWORK devices
+NETWORK_BASE_CLASS = "02"
+
+# global dict ethernet devices present. Dictionary indexed by PCI address.
+# Each device within this is itself a dictionary of device properties
+devices = {}
+# list of supported DPDK drivers
+dpdk_drivers = ["igb_uio", "vfio-pci", "uio_pci_generic"]
+
+# DPDK URL
+dpdk_url = "http://dpdk.org/git/dpdk";
+
+dpdk_dir = "dpdk_demo"
+
+log_name = "/tmp/dpdk-quickstart.log"
+
+# command-line arg flags
+b_flag = None
+status_flag = False
+force_flag = False
+args = []
+
+
+class NotRootException(Exception):
+pass
+
+
+def log_output(args):
+with open(log_name, 'a') as log_file:
+log_file.write(args + '\n')
+
+
+# This is roughly compatible with check_output function in subprocess module
+# which is only available in python 2.7.
+def check_output(args, stderr=None):
+'''Run a command and capture its output'''
+return subprocess.Popen(args, stdout=subprocess.PIPE,
+stderr=subprocess.STDOUT).communicate()[0]
+
+
+def check_output_dlg(args, stderr=None, title="console"):
+'''Run a command and capture its output'''
+p = subprocess
[dpdk-dev] [PATCH v11 4/6] test: add unit test for pdump library
Unit test cases are added for pdump library.
Primary process will act as server, forks a child secondary process.
Secondary process acts as client.
Server will do pdump init to serve any pdump client requests.
Server will create a vdev, send/receive packets continuously
in a separate thread.
Client will create virtual rings to receive the packet dump.
Client sends pdump enable/disable requests using either port/device id.
Packet flow direction can be tx/rx/tx&rx.
In Server, appropriate pdump callbacks are triggered,
when packets are transmitted/received.
Pdump packet is copied to client rings.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/Makefile | 6 ++
test/test/process.h| 12 +++
test/test/test.c | 2 +
test/test/test_pdump.c | 232 +
test/test/test_pdump.h | 31 +++
5 files changed, 283 insertions(+)
create mode 100644 test/test/test_pdump.c
create mode 100644 test/test/test_pdump.h
diff --git a/test/test/Makefile b/test/test/Makefile
index bba3be1be..3e7baef76 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -185,6 +185,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
@@ -214,6 +215,11 @@ CFLAGS += $(WERROR_FLAGS)
CFLAGS += -D_GNU_SOURCE
LDLIBS += -lm
+
+ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y)
+LDLIBS += -lpthread
+endif
+
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
LDLIBS += -lz
diff --git a/test/test/process.h b/test/test/process.h
index ba3a18502..c015c9030 100644
--- a/test/test/process.h
+++ b/test/test/process.h
@@ -18,6 +18,10 @@
#define exe "exe"
#endif
+#include
+extern void *send_pkts(void *empty);
+extern uint16_t flag_for_send_pkts;
+
/*
* launches a second copy of the test process using the given argv parameters,
* which should include argv[0] as the process name. To identify in the
@@ -31,6 +35,7 @@ process_dup(const char *const argv[], int numargs, const char
*env_value)
char *argv_cpy[numargs + 1];
int i, fd, status;
char path[32];
+ pthread_t thread;
pid_t pid = fork();
if (pid < 0)
@@ -61,8 +66,15 @@ process_dup(const char *const argv[], int numargs, const
char *env_value)
rte_panic("Cannot exec\n");
}
/* parent process does a wait */
+ if ((strcmp(env_value, "run_pdump_server_tests") == 0))
+ pthread_create(&thread, NULL, &send_pkts, NULL);
+
while (wait(&status) != pid)
;
+ if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
+ flag_for_send_pkts = 0;
+ pthread_join(thread, NULL);
+ }
return status;
}
diff --git a/test/test/test.c b/test/test/test.c
index 44dfe20ef..a54b0d142 100644
--- a/test/test/test.c
+++ b/test/test/test.c
@@ -30,6 +30,7 @@ extern cmdline_parse_ctx_t main_ctx[];
#endif
#include "test.h"
+#include "test_pdump.h"
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
@@ -49,6 +50,7 @@ do_recursive_call(void)
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
+ { "run_pdump_server_tests", test_pdump },
{ "test_missing_c_flag", no_action },
{ "test_master_lcore_flag", no_action },
{ "test_invalid_n_flag", no_action },
diff --git a/test/test/test_pdump.c b/test/test/test_pdump.c
new file mode 100644
index 0..cfdda4d39
--- /dev/null
+++ b/test/test/test_pdump.c
@@ -0,0 +1,232 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+#include "sample_packet_forward.h"
+#include "test_pdump.h"
+#include "process.h"
+
+#define launch_p(ARGV) process_dup(ARGV, \
+ sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
+
+struct rte_ring *ring_server;
+uint16_t portid;
+uint16_t flag_for_send_pkts = 1;
+
+int
+test_pdump_init(void)
+{
+ int ret = 0;
+
+ ret = rte_pdump_init(NULL);
+ if (ret < 0) {
+ printf("rte_pdump_init failed\n");
+ return -1;
+ }
+ ret = test_ring_setup(&ring_server, &portid);
+ if (ret < 0) {
+ printf("test_ring_setup failed\n");
+ return -1;
+ }
+ printf(
[dpdk-dev] [PATCH v11 0/6] add unit tests for bitrate, latency and pdump libraries
1/6: add helper functions for tests using ring-PMD Rx/Tx 2/6: unit test cases added for bitrate library 3/6: unit test cases added for latencystats library 4/6: unit test cases added for pdump library 5/6: added new unit tests to autotest list 6/6: updated maintainers for bitrate latency pdump tests Patches 2/6, 3/6 and 4/6 depends on 1/6 Signed-off-by: Naga Suresh Somarowthu Reviewed-by: Reshma Pattan Reviewed-by: Remy Horton Reviewed-by: Anatoly Burakov Acked-by: Reshma Pattan --- v11: fixed compilation issue in centos and 32bit arch removed memzone free as per fix in the latency library and updated the maintainers file v10: fixed clang compiler issues and freed latency stats memzone in latency stats unit tests. v9: rebased ontop of latest autotest changes and added new tests to the autotest list v8: renamed commit headline and freed the metrics memzone for bitrate ut v7: removed unused macros and corrected the comment v6: updated ring variable appropriately v5: rebased, freed pools and rings, created common patch set --- Naga Suresh Somarowthu (6): test: add helper functions for tests using ring-PMD Rx/Tx test: add unit tests for bitrate library test: add unit tests for latencystats library test: add unit test for pdump library autotest: add new unit tests to autotest list maintainers: add bitrate latency pdump tests MAINTAINERS | 10 +- test/test/Makefile| 9 ++ test/test/autotest_data.py| 18 +++ test/test/process.h | 12 ++ test/test/sample_packet_forward.c | 115 +++ test/test/sample_packet_forward.h | 40 +++ test/test/test.c | 2 + test/test/test_bitratestats.c | 229 + test/test/test_latencystats.c | 226 + test/test/test_pdump.c| 232 ++ test/test/test_pdump.h| 31 + 11 files changed, 923 insertions(+), 1 deletion(-) create mode 100644 test/test/sample_packet_forward.c create mode 100644 test/test/sample_packet_forward.h create mode 100644 test/test/test_bitratestats.c create mode 100644 test/test/test_latencystats.c create mode 100644 test/test/test_pdump.c create mode 100644 test/test/test_pdump.h -- 2.13.6
[dpdk-dev] [PATCH v11 2/6] test: add unit tests for bitrate library
Unit Test Cases for BitRate library.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
Reviewed-by: Remy Horton
---
test/test/Makefile| 1 +
test/test/test_bitratestats.c | 229 ++
2 files changed, 230 insertions(+)
create mode 100644 test/test/test_bitratestats.c
diff --git a/test/test/Makefile b/test/test/Makefile
index 9f7d398e4..c619877f0 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -183,6 +183,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
+SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
diff --git a/test/test/test_bitratestats.c b/test/test/test_bitratestats.c
new file mode 100644
index 0..38f7da4b5
--- /dev/null
+++ b/test/test/test_bitratestats.c
@@ -0,0 +1,229 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+#include "sample_packet_forward.h"
+
+#define BIT_NUM_PACKETS 10
+#define QUEUE_ID 0
+
+uint16_t portid;
+struct rte_stats_bitrates *bitrate_data;
+struct rte_ring *ring;
+
+/* To test whether rte_stats_bitrate_create is successful */
+static int
+test_stats_bitrate_create(void)
+{
+ bitrate_data = rte_stats_bitrate_create();
+ TEST_ASSERT(bitrate_data != NULL, "rte_stats_bitrate_create failed");
+
+ return TEST_SUCCESS;
+}
+
+/* To test bit rate registration */
+static int
+test_stats_bitrate_reg(void)
+{
+ int ret = 0;
+
+ /* Test to register bit rate without metrics init */
+ ret = rte_stats_bitrate_reg(bitrate_data);
+ TEST_ASSERT(ret < 0, "Test Failed: rte_stats_bitrate_reg succeeded "
+ "without metrics init, ret:%d", ret);
+
+ /* Metrics initialization */
+ rte_metrics_init(rte_socket_id());
+ /* Test to register bit rate after metrics init */
+ ret = rte_stats_bitrate_reg(bitrate_data);
+ TEST_ASSERT((ret >= 0), "Test Failed: rte_stats_bitrate_reg %d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate registration with invalid pointer */
+static int
+test_stats_bitrate_reg_invalidpointer(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_reg(NULL);
+ TEST_ASSERT(ret < 0, "Test Failed: Expected failure < 0 but "
+ "got %d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test bit rate calculation with invalid bit rate data pointer */
+static int
+test_stats_bitrate_calc_invalid_bitrate_data(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(NULL, portid);
+ TEST_ASSERT(ret < 0, "Test Failed: rte_stats_bitrate_calc "
+ "ret:%d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with invalid portid
+ * (higher than max ports)
+ */
+static int
+test_stats_bitrate_calc_invalid_portid_1(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, 33);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for higher "
+ "portid rte_stats_bitrate_calc ret:%d", EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with invalid portid (lesser than 0) */
+static int
+test_stats_bitrate_calc_invalid_portid_2(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, -1);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for invalid "
+ "portid rte_stats_bitrate_calc ret:%d", EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with non-existing portid */
+static int
+test_stats_bitrate_calc_non_existing_portid(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, 31);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for "
+ "non-existing portid rte_stats_bitrate_calc ret:%d",
+ EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with valid bit rate data, valid portid */
+static int
+test_stats_bitrate_calc(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, portid);
+ TEST_ASSERT(ret >= 0, "Test Failed: Expected >=0 for valid portid "
+ "rte_stats_bitrate_calc ret:%d", ret);
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_bit_packet_forward(void)
+{
+ int ret;
+ struct rte_mbuf *pbuf[BIT_NUM_PACKETS] = { };
+ struct rte_mempool *mp;
+ char poolname[] = "mbuf_pool";
+ ret = test_get_mbuf_from
[dpdk-dev] [PATCH v11 3/6] test: add unit tests for latencystats library
Unit Test Cases added for latencystats library.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/Makefile| 1 +
test/test/test_latencystats.c | 226 ++
2 files changed, 227 insertions(+)
create mode 100644 test/test/test_latencystats.c
diff --git a/test/test/Makefile b/test/test/Makefile
index c619877f0..bba3be1be 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -184,6 +184,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) +=
test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
+SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
diff --git a/test/test/test_latencystats.c b/test/test/test_latencystats.c
new file mode 100644
index 0..82433033e
--- /dev/null
+++ b/test/test/test_latencystats.c
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include "test.h"
+#include "sample_packet_forward.h"
+#define NUM_STATS 4
+#define LATENCY_NUM_PACKETS 10
+#define QUEUE_ID 0
+
+uint16_t portid;
+struct rte_ring *ring;
+
+struct rte_metric_name lat_stats_strings[] = {
+ {"min_latency_ns"},
+ {"avg_latency_ns"},
+ {"max_latency_ns"},
+ {"jitter_ns"},
+};
+
+/* Test case for latency init with metrics init */
+static int test_latency_init(void)
+{
+ int ret = 0;
+
+ /* Metrics Initialization */
+ rte_metrics_init(rte_socket_id());
+
+ ret = rte_latencystats_init(1, NULL);
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_init failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to update the latency stats */
+static int test_latency_update(void)
+{
+ int ret = 0;
+
+ ret = rte_latencystats_update();
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_update failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to uninit latency stats */
+static int test_latency_uninit(void)
+{
+ int ret = 0;
+
+ ret = rte_latencystats_uninit();
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_uninit failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to get names of latency stats */
+static int test_latencystats_get_names(void)
+{
+ int ret = 0, i = 0;
+ int size = 0;
+ struct rte_metric_name names[NUM_STATS];
+ struct rte_metric_name wrongnames[NUM_STATS - 2];
+
+ size_t m_size = sizeof(struct rte_metric_name);
+ for (i = 0; i < NUM_STATS; i++)
+ memset(&names[i], 0, m_size);
+ for (i = 0; i < NUM_STATS - 2; i++)
+ memset(&wrongnames[i], 0, m_size);
+
+ /* Success Test: Valid names and size */
+ size = NUM_STATS;
+ ret = rte_latencystats_get_names(names, size);
+ for (i = 0; i <= NUM_STATS; i++) {
+ if (strcmp(lat_stats_strings[i].name, names[i].name) == 0)
+ printf(" %s\n", names[i].name);
+ else
+ printf("Failed: Names are not matched\n");
+ }
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get metrics names");
+
+ /* Failure Test: Invalid names and valid size */
+ ret = rte_latencystats_get_names(NULL, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get the metrics count,"
+ "Actual: %d Expected: %d", ret, NUM_STATS);
+
+ /* Failure Test: Valid names and invalid size */
+ size = 0;
+ ret = rte_latencystats_get_names(names, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get the metrics count,"
+ "Actual: %d Expected: %d", ret, NUM_STATS);
+
+ /* Failure Test: Invalid names (array size lesser than size) */
+ size = NUM_STATS + 1;
+ ret = rte_latencystats_get_names(wrongnames, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get metrics names");
+ return TEST_SUCCESS;
+}
+
+/* Test case to get latency stats values */
+static int test_latencystats_get(void)
+{
+ int ret = 0, i = 0;
+ int size = 0;
+ struct rte_metric_value values[NUM_STATS];
+ struct rte_metric_value wrongvalues[NUM_STATS - 2];
+
+ size_t v_size = sizeof(struct rte_metric_value);
+ for (i = 0; i < NUM_STATS; i++)
+ memset(&values[i], 0, v_size);
+ for (i = 0; i < NUM_STATS - 2; i++)
+ memset(&wrongvalues[i], 0, v_size);
+
+ /* Success Test: Valid values and valid size */
+ size = NUM_STATS;
+ ret = rte_latencystats_get(values, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get latency metrics"
+
[dpdk-dev] [PATCH v11 1/6] test: add helper functions for tests using ring-PMD Rx/Tx
Added ring pmd based packet rx/tx helper functions
for verifying Latency, Bitrate and pdump lib UTs.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
Reviewed-by: Anatoly Burakov
---
test/test/Makefile| 1 +
test/test/sample_packet_forward.c | 115 ++
test/test/sample_packet_forward.h | 40 +
3 files changed, 156 insertions(+)
create mode 100644 test/test/sample_packet_forward.c
create mode 100644 test/test/sample_packet_forward.h
diff --git a/test/test/Makefile b/test/test/Makefile
index e6967bab6..9f7d398e4 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -165,6 +165,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c
SRCS-y += virtual_pmd.c
SRCS-y += packet_burst_generator.c
+SRCS-y += sample_packet_forward.c
SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
diff --git a/test/test/sample_packet_forward.c
b/test/test/sample_packet_forward.c
new file mode 100644
index 0..3822577b9
--- /dev/null
+++ b/test/test/sample_packet_forward.c
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "sample_packet_forward.h"
+#include "test.h"
+
+/* Sample test to create virtual rings and tx,rx portid from rings */
+int
+test_ring_setup(struct rte_ring **ring, uint16_t *portid)
+{
+ *ring = rte_ring_create("R0", RING_SIZE, rte_socket_id(),
+ RING_F_SP_ENQ | RING_F_SC_DEQ);
+ if (*ring == NULL) {
+ printf("%s() line %u: rte_ring_create R0 failed",
+ __func__, __LINE__);
+ return -1;
+ }
+ *portid = rte_eth_from_rings("net_ringa", ring, NUM_QUEUES,
+ ring, NUM_QUEUES, rte_socket_id());
+
+ return 0;
+}
+
+/* Sample test to free the mempool */
+void
+test_mp_free(struct rte_mempool *mp)
+{
+ rte_mempool_free(mp);
+}
+
+/* Sample test to free the virtual rings */
+void
+test_ring_free(struct rte_ring *rxtx)
+{
+ rte_ring_free(rxtx);
+}
+
+/* Sample test to release the vdev */
+void
+test_vdev_uninit(const char *vdev)
+{
+ rte_vdev_uninit(vdev);
+}
+
+/* sample test to allocate the mempool */
+int
+test_get_mempool(struct rte_mempool **mp, char *poolname)
+{
+ *mp = rte_pktmbuf_pool_create(poolname, NB_MBUF, 32, 0,
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ if (*mp == NULL)
+ return -1;
+ return 0;
+}
+
+/* sample test to allocate buffer for pkts */
+int
+test_get_mbuf_from_pool(struct rte_mempool **mp, struct rte_mbuf **pbuf,
+ char *poolname)
+{
+ int ret = 0;
+
+ ret = test_get_mempool(mp, poolname);
+ if (ret < 0)
+ return -1;
+ if (rte_pktmbuf_alloc_bulk(*mp, pbuf, NUM_PACKETS) != 0) {
+ printf("%s() line %u: rte_pktmbuf_alloc_bulk failed", __func__,
+ __LINE__);
+ return -1;
+ }
+ return 0;
+}
+
+/* sample test to deallocate the allocated buffers and mempool */
+void
+test_put_mbuf_to_pool(struct rte_mempool *mp, struct rte_mbuf **pbuf)
+{
+ int itr = 0;
+
+ for (itr = 0; itr < NUM_PACKETS; itr++)
+ rte_pktmbuf_free(pbuf[itr]);
+ rte_mempool_free(mp);
+}
+
+/* Sample test to forward packets using virtual portids */
+int
+test_packet_forward(struct rte_mbuf **pbuf, uint16_t portid, uint16_t queue_id)
+{
+ /* send and receive packet and check for stats update */
+ if (rte_eth_tx_burst(portid, queue_id, pbuf, NUM_PACKETS)
+ < NUM_PACKETS) {
+ printf("%s() line %u: Error sending packet to"
+ " port %d\n", __func__, __LINE__, portid);
+ return -1;
+ }
+ if (rte_eth_rx_burst(portid, queue_id, pbuf, NUM_PACKETS)
+ < NUM_PACKETS) {
+ printf("%s() line %u: Error receiving packet from"
+ " port %d\n", __func__, __LINE__, portid);
+ return -1;
+ }
+ return 0;
+}
diff --git a/test/test/sample_packet_forward.h
b/test/test/sample_packet_forward.h
new file mode 100644
index 0..433bd3ba2
--- /dev/null
+++ b/test/test/sample_packet_forward.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#ifndef _SAMPLE_PACKET_FORWARD_H_
+#define _SAMPLE_PACKET_FORWARD_H_
+
+/* MACROS to support virtual ring creation */
+#define RING_SIZE 256
+#define NUM_QUEUES 1
+#define NB_MBUF 512
+
+#define NUM_PACKETS 10
+
+/* Sample test to create virtual rings and tx,rx portid from rings */
+int test_ring_setup(struct rte_ring **ring, uint16_t *portid);
+
+/* Sample test to free the virtual rings */
+void test_ring_free(struct rte_ring *rxtx);
+
+/* S
[dpdk-dev] [PATCH v11 5/6] autotest: add new unit tests to autotest list
added bitrate, latency and pdump lib unit tests to autotest list.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/autotest_data.py | 18 ++
1 file changed, 18 insertions(+)
diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
index f68d9b111..9a54d0c04 100644
--- a/test/test/autotest_data.py
+++ b/test/test/autotest_data.py
@@ -482,6 +482,24 @@
"Func":default_autotest,
"Report": None,
},
+{
+"Name":"Bitratestats autotest",
+"Command": "bitratestats_autotest",
+"Func":default_autotest,
+"Report": None,
+},
+{
+"Name":"Latencystats autotest",
+"Command": "latencystats_autotest",
+"Func":default_autotest,
+"Report": None,
+},
+{
+"Name":"Pdump autotest",
+"Comamnd": "pdump_autotest",
+"Func":default_autotest,
+"Report": None,
+},
#
#Please always keep all dump tests at the end and together!
#
--
2.13.6
[dpdk-dev] [PATCH v11 6/6] maintainers: add bitrate latency pdump tests
Update MAINTAINERSHIP for bitrate, latency, pdump unit tests and sample packet helper functions for unit test. Signed-off-by: Naga Suresh Somarowthu Reviewed-by: Reshma Pattan --- MAINTAINERS | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3b9fec76f..7b9277404 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1018,7 +1018,8 @@ F: lib/librte_pdump/ F: doc/guides/prog_guide/pdump_lib.rst F: app/pdump/ F: doc/guides/tools/pdump.rst - +F: test/test/test_pdump.c +F: test/test/test_pdump.h Packet Framework @@ -1144,10 +1145,12 @@ F: lib/librte_metrics/ Bit-rate statistics M: Remy Horton F: lib/librte_bitratestats/ +F: test/test/test_bitratestats.c Latency statistics M: Reshma Pattan F: lib/librte_latencystats/ +F: test/test/test_latencystats.c BPF - EXPERIMENTAL M: Konstantin Ananyev @@ -1176,6 +1179,11 @@ F: test/test/test_resource.c F: test/test/virtual_pmd.c F: test/test/virtual_pmd.h +Sample packet helper functions for unit test +M: Reshma Pattan +F: test/test/sample_packet_forward.c +F: test/test/sample_packet_forward.h + Driver testing tool M: Wenzhuo Lu M: Jingjing Wu -- 2.13.6
[dpdk-dev] [PATCH v12 6/6] maintainers: add bitrate latency pdump tests
Update MAINTAINERSHIP for bitrate, latency, pdump unit tests and sample packet helper functions for unit test. Signed-off-by: Naga Suresh Somarowthu Reviewed-by: Reshma Pattan --- MAINTAINERS | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3b9fec76f..7b9277404 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1018,7 +1018,8 @@ F: lib/librte_pdump/ F: doc/guides/prog_guide/pdump_lib.rst F: app/pdump/ F: doc/guides/tools/pdump.rst - +F: test/test/test_pdump.c +F: test/test/test_pdump.h Packet Framework @@ -1144,10 +1145,12 @@ F: lib/librte_metrics/ Bit-rate statistics M: Remy Horton F: lib/librte_bitratestats/ +F: test/test/test_bitratestats.c Latency statistics M: Reshma Pattan F: lib/librte_latencystats/ +F: test/test/test_latencystats.c BPF - EXPERIMENTAL M: Konstantin Ananyev @@ -1176,6 +1179,11 @@ F: test/test/test_resource.c F: test/test/virtual_pmd.c F: test/test/virtual_pmd.h +Sample packet helper functions for unit test +M: Reshma Pattan +F: test/test/sample_packet_forward.c +F: test/test/sample_packet_forward.h + Driver testing tool M: Wenzhuo Lu M: Jingjing Wu -- 2.13.6
[dpdk-dev] [PATCH v12 5/6] autotest: add new unit tests to autotest list
added bitrate, latency and pdump lib unit tests to autotest list.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/autotest_data.py | 18 ++
1 file changed, 18 insertions(+)
diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
index f68d9b111..9a54d0c04 100644
--- a/test/test/autotest_data.py
+++ b/test/test/autotest_data.py
@@ -482,6 +482,24 @@
"Func":default_autotest,
"Report": None,
},
+{
+"Name":"Bitratestats autotest",
+"Command": "bitratestats_autotest",
+"Func":default_autotest,
+"Report": None,
+},
+{
+"Name":"Latencystats autotest",
+"Command": "latencystats_autotest",
+"Func":default_autotest,
+"Report": None,
+},
+{
+"Name":"Pdump autotest",
+"Comamnd": "pdump_autotest",
+"Func":default_autotest,
+"Report": None,
+},
#
#Please always keep all dump tests at the end and together!
#
--
2.13.6
[dpdk-dev] [PATCH v12 2/6] test: add unit tests for bitrate library
Unit Test Cases for BitRate library.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
Reviewed-by: Remy Horton
---
test/test/Makefile| 1 +
test/test/test_bitratestats.c | 229 ++
2 files changed, 230 insertions(+)
create mode 100644 test/test/test_bitratestats.c
diff --git a/test/test/Makefile b/test/test/Makefile
index 9f7d398e4..c619877f0 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -183,6 +183,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
+SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
diff --git a/test/test/test_bitratestats.c b/test/test/test_bitratestats.c
new file mode 100644
index 0..38f7da4b5
--- /dev/null
+++ b/test/test/test_bitratestats.c
@@ -0,0 +1,229 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+#include "sample_packet_forward.h"
+
+#define BIT_NUM_PACKETS 10
+#define QUEUE_ID 0
+
+uint16_t portid;
+struct rte_stats_bitrates *bitrate_data;
+struct rte_ring *ring;
+
+/* To test whether rte_stats_bitrate_create is successful */
+static int
+test_stats_bitrate_create(void)
+{
+ bitrate_data = rte_stats_bitrate_create();
+ TEST_ASSERT(bitrate_data != NULL, "rte_stats_bitrate_create failed");
+
+ return TEST_SUCCESS;
+}
+
+/* To test bit rate registration */
+static int
+test_stats_bitrate_reg(void)
+{
+ int ret = 0;
+
+ /* Test to register bit rate without metrics init */
+ ret = rte_stats_bitrate_reg(bitrate_data);
+ TEST_ASSERT(ret < 0, "Test Failed: rte_stats_bitrate_reg succeeded "
+ "without metrics init, ret:%d", ret);
+
+ /* Metrics initialization */
+ rte_metrics_init(rte_socket_id());
+ /* Test to register bit rate after metrics init */
+ ret = rte_stats_bitrate_reg(bitrate_data);
+ TEST_ASSERT((ret >= 0), "Test Failed: rte_stats_bitrate_reg %d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate registration with invalid pointer */
+static int
+test_stats_bitrate_reg_invalidpointer(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_reg(NULL);
+ TEST_ASSERT(ret < 0, "Test Failed: Expected failure < 0 but "
+ "got %d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test bit rate calculation with invalid bit rate data pointer */
+static int
+test_stats_bitrate_calc_invalid_bitrate_data(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(NULL, portid);
+ TEST_ASSERT(ret < 0, "Test Failed: rte_stats_bitrate_calc "
+ "ret:%d", ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with invalid portid
+ * (higher than max ports)
+ */
+static int
+test_stats_bitrate_calc_invalid_portid_1(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, 33);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for higher "
+ "portid rte_stats_bitrate_calc ret:%d", EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with invalid portid (lesser than 0) */
+static int
+test_stats_bitrate_calc_invalid_portid_2(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, -1);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for invalid "
+ "portid rte_stats_bitrate_calc ret:%d", EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with non-existing portid */
+static int
+test_stats_bitrate_calc_non_existing_portid(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, 31);
+ TEST_ASSERT(ret == -EINVAL, "Test Failed: Expected -%d for "
+ "non-existing portid rte_stats_bitrate_calc ret:%d",
+ EINVAL, ret);
+
+ return TEST_SUCCESS;
+}
+
+/* To test the bit rate calculation with valid bit rate data, valid portid */
+static int
+test_stats_bitrate_calc(void)
+{
+ int ret = 0;
+
+ ret = rte_stats_bitrate_calc(bitrate_data, portid);
+ TEST_ASSERT(ret >= 0, "Test Failed: Expected >=0 for valid portid "
+ "rte_stats_bitrate_calc ret:%d", ret);
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_bit_packet_forward(void)
+{
+ int ret;
+ struct rte_mbuf *pbuf[BIT_NUM_PACKETS] = { };
+ struct rte_mempool *mp;
+ char poolname[] = "mbuf_pool";
+ ret = test_get_mbuf_from
[dpdk-dev] [PATCH v12 1/6] test: add helper functions for tests using ring-PMD Rx/Tx
Added ring pmd based packet rx/tx helper functions
for verifying Latency, Bitrate and pdump lib UTs.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
Reviewed-by: Anatoly Burakov
---
test/test/Makefile| 1 +
test/test/sample_packet_forward.c | 115 ++
test/test/sample_packet_forward.h | 40 +
3 files changed, 156 insertions(+)
create mode 100644 test/test/sample_packet_forward.c
create mode 100644 test/test/sample_packet_forward.h
diff --git a/test/test/Makefile b/test/test/Makefile
index e6967bab6..9f7d398e4 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -165,6 +165,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c
SRCS-y += virtual_pmd.c
SRCS-y += packet_burst_generator.c
+SRCS-y += sample_packet_forward.c
SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
diff --git a/test/test/sample_packet_forward.c
b/test/test/sample_packet_forward.c
new file mode 100644
index 0..3822577b9
--- /dev/null
+++ b/test/test/sample_packet_forward.c
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "sample_packet_forward.h"
+#include "test.h"
+
+/* Sample test to create virtual rings and tx,rx portid from rings */
+int
+test_ring_setup(struct rte_ring **ring, uint16_t *portid)
+{
+ *ring = rte_ring_create("R0", RING_SIZE, rte_socket_id(),
+ RING_F_SP_ENQ | RING_F_SC_DEQ);
+ if (*ring == NULL) {
+ printf("%s() line %u: rte_ring_create R0 failed",
+ __func__, __LINE__);
+ return -1;
+ }
+ *portid = rte_eth_from_rings("net_ringa", ring, NUM_QUEUES,
+ ring, NUM_QUEUES, rte_socket_id());
+
+ return 0;
+}
+
+/* Sample test to free the mempool */
+void
+test_mp_free(struct rte_mempool *mp)
+{
+ rte_mempool_free(mp);
+}
+
+/* Sample test to free the virtual rings */
+void
+test_ring_free(struct rte_ring *rxtx)
+{
+ rte_ring_free(rxtx);
+}
+
+/* Sample test to release the vdev */
+void
+test_vdev_uninit(const char *vdev)
+{
+ rte_vdev_uninit(vdev);
+}
+
+/* sample test to allocate the mempool */
+int
+test_get_mempool(struct rte_mempool **mp, char *poolname)
+{
+ *mp = rte_pktmbuf_pool_create(poolname, NB_MBUF, 32, 0,
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ if (*mp == NULL)
+ return -1;
+ return 0;
+}
+
+/* sample test to allocate buffer for pkts */
+int
+test_get_mbuf_from_pool(struct rte_mempool **mp, struct rte_mbuf **pbuf,
+ char *poolname)
+{
+ int ret = 0;
+
+ ret = test_get_mempool(mp, poolname);
+ if (ret < 0)
+ return -1;
+ if (rte_pktmbuf_alloc_bulk(*mp, pbuf, NUM_PACKETS) != 0) {
+ printf("%s() line %u: rte_pktmbuf_alloc_bulk failed", __func__,
+ __LINE__);
+ return -1;
+ }
+ return 0;
+}
+
+/* sample test to deallocate the allocated buffers and mempool */
+void
+test_put_mbuf_to_pool(struct rte_mempool *mp, struct rte_mbuf **pbuf)
+{
+ int itr = 0;
+
+ for (itr = 0; itr < NUM_PACKETS; itr++)
+ rte_pktmbuf_free(pbuf[itr]);
+ rte_mempool_free(mp);
+}
+
+/* Sample test to forward packets using virtual portids */
+int
+test_packet_forward(struct rte_mbuf **pbuf, uint16_t portid, uint16_t queue_id)
+{
+ /* send and receive packet and check for stats update */
+ if (rte_eth_tx_burst(portid, queue_id, pbuf, NUM_PACKETS)
+ < NUM_PACKETS) {
+ printf("%s() line %u: Error sending packet to"
+ " port %d\n", __func__, __LINE__, portid);
+ return -1;
+ }
+ if (rte_eth_rx_burst(portid, queue_id, pbuf, NUM_PACKETS)
+ < NUM_PACKETS) {
+ printf("%s() line %u: Error receiving packet from"
+ " port %d\n", __func__, __LINE__, portid);
+ return -1;
+ }
+ return 0;
+}
diff --git a/test/test/sample_packet_forward.h
b/test/test/sample_packet_forward.h
new file mode 100644
index 0..433bd3ba2
--- /dev/null
+++ b/test/test/sample_packet_forward.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#ifndef _SAMPLE_PACKET_FORWARD_H_
+#define _SAMPLE_PACKET_FORWARD_H_
+
+/* MACROS to support virtual ring creation */
+#define RING_SIZE 256
+#define NUM_QUEUES 1
+#define NB_MBUF 512
+
+#define NUM_PACKETS 10
+
+/* Sample test to create virtual rings and tx,rx portid from rings */
+int test_ring_setup(struct rte_ring **ring, uint16_t *portid);
+
+/* Sample test to free the virtual rings */
+void test_ring_free(struct rte_ring *rxtx);
+
+/* S
[dpdk-dev] [PATCH v12 0/6] add unit tests for bitrate, latency and pdump libraries
1/6: add helper functions for tests using ring-PMD Rx/Tx 2/6: unit test cases added for bitrate library 3/6: unit test cases added for latencystats library 4/6: unit test cases added for pdump library 5/6: added new unit tests to autotest list 6/6: updated maintainers for bitrate latency pdump tests Patches 2/6, 3/6 and 4/6 depends on 1/6 Signed-off-by: Naga Suresh Somarowthu Reviewed-by: Reshma Pattan Reviewed-by: Remy Horton Reviewed-by: Anatoly Burakov Acked-by: Reshma Pattan --- v12: corrected commit message for pdump unit test v11: fixed compilation issue in centos and 32bit arch removed memzone free as per fix in the latency library and updated the maintainers file v10: fixed clang compiler issues and freed latency stats memzone in latency stats unit tests. v9: rebased ontop of latest autotest changes and added new tests to the autotest list v8: renamed commit headline and freed the metrics memzone for bitrate ut v7: removed unused macros and corrected the comment v6: updated ring variable appropriately v5: rebased, freed pools and rings, created common patch set --- Naga Suresh Somarowthu (6): test: add helper functions for tests using ring-PMD Rx/Tx test: add unit tests for bitrate library test: add unit tests for latencystats library test: add unit test for pdump library autotest: add new unit tests to autotest list maintainers: add bitrate latency pdump tests MAINTAINERS | 10 +- test/test/Makefile| 9 ++ test/test/autotest_data.py| 18 +++ test/test/process.h | 12 ++ test/test/sample_packet_forward.c | 115 +++ test/test/sample_packet_forward.h | 40 +++ test/test/test.c | 2 + test/test/test_bitratestats.c | 229 + test/test/test_latencystats.c | 226 + test/test/test_pdump.c| 232 ++ test/test/test_pdump.h| 31 + 11 files changed, 923 insertions(+), 1 deletion(-) create mode 100644 test/test/sample_packet_forward.c create mode 100644 test/test/sample_packet_forward.h create mode 100644 test/test/test_bitratestats.c create mode 100644 test/test/test_latencystats.c create mode 100644 test/test/test_pdump.c create mode 100644 test/test/test_pdump.h -- 2.13.6
[dpdk-dev] [PATCH v12 3/6] test: add unit tests for latencystats library
Unit Test Cases added for latencystats library.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/Makefile| 1 +
test/test/test_latencystats.c | 226 ++
2 files changed, 227 insertions(+)
create mode 100644 test/test/test_latencystats.c
diff --git a/test/test/Makefile b/test/test/Makefile
index c619877f0..bba3be1be 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -184,6 +184,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) +=
test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
+SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
diff --git a/test/test/test_latencystats.c b/test/test/test_latencystats.c
new file mode 100644
index 0..82433033e
--- /dev/null
+++ b/test/test/test_latencystats.c
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include "test.h"
+#include "sample_packet_forward.h"
+#define NUM_STATS 4
+#define LATENCY_NUM_PACKETS 10
+#define QUEUE_ID 0
+
+uint16_t portid;
+struct rte_ring *ring;
+
+struct rte_metric_name lat_stats_strings[] = {
+ {"min_latency_ns"},
+ {"avg_latency_ns"},
+ {"max_latency_ns"},
+ {"jitter_ns"},
+};
+
+/* Test case for latency init with metrics init */
+static int test_latency_init(void)
+{
+ int ret = 0;
+
+ /* Metrics Initialization */
+ rte_metrics_init(rte_socket_id());
+
+ ret = rte_latencystats_init(1, NULL);
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_init failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to update the latency stats */
+static int test_latency_update(void)
+{
+ int ret = 0;
+
+ ret = rte_latencystats_update();
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_update failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to uninit latency stats */
+static int test_latency_uninit(void)
+{
+ int ret = 0;
+
+ ret = rte_latencystats_uninit();
+ TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_uninit failed");
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to get names of latency stats */
+static int test_latencystats_get_names(void)
+{
+ int ret = 0, i = 0;
+ int size = 0;
+ struct rte_metric_name names[NUM_STATS];
+ struct rte_metric_name wrongnames[NUM_STATS - 2];
+
+ size_t m_size = sizeof(struct rte_metric_name);
+ for (i = 0; i < NUM_STATS; i++)
+ memset(&names[i], 0, m_size);
+ for (i = 0; i < NUM_STATS - 2; i++)
+ memset(&wrongnames[i], 0, m_size);
+
+ /* Success Test: Valid names and size */
+ size = NUM_STATS;
+ ret = rte_latencystats_get_names(names, size);
+ for (i = 0; i <= NUM_STATS; i++) {
+ if (strcmp(lat_stats_strings[i].name, names[i].name) == 0)
+ printf(" %s\n", names[i].name);
+ else
+ printf("Failed: Names are not matched\n");
+ }
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get metrics names");
+
+ /* Failure Test: Invalid names and valid size */
+ ret = rte_latencystats_get_names(NULL, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get the metrics count,"
+ "Actual: %d Expected: %d", ret, NUM_STATS);
+
+ /* Failure Test: Valid names and invalid size */
+ size = 0;
+ ret = rte_latencystats_get_names(names, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get the metrics count,"
+ "Actual: %d Expected: %d", ret, NUM_STATS);
+
+ /* Failure Test: Invalid names (array size lesser than size) */
+ size = NUM_STATS + 1;
+ ret = rte_latencystats_get_names(wrongnames, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get metrics names");
+ return TEST_SUCCESS;
+}
+
+/* Test case to get latency stats values */
+static int test_latencystats_get(void)
+{
+ int ret = 0, i = 0;
+ int size = 0;
+ struct rte_metric_value values[NUM_STATS];
+ struct rte_metric_value wrongvalues[NUM_STATS - 2];
+
+ size_t v_size = sizeof(struct rte_metric_value);
+ for (i = 0; i < NUM_STATS; i++)
+ memset(&values[i], 0, v_size);
+ for (i = 0; i < NUM_STATS - 2; i++)
+ memset(&wrongvalues[i], 0, v_size);
+
+ /* Success Test: Valid values and valid size */
+ size = NUM_STATS;
+ ret = rte_latencystats_get(values, size);
+ TEST_ASSERT((ret == NUM_STATS), "Test Failed to get latency metrics"
+
[dpdk-dev] [PATCH v12 4/6] test: add unit test for pdump library
Unit test cases are added for pdump library.
Primary process will act as server, forks a child secondary process.
Secondary process acts as client.
Server will do pdump init to serve any pdump client requests.
Server will create a vdev, send/receive packets continuously
in a separate thread.
Client will create virtual rings to receive the packet dump.
Client sends pdump enable/disable requests using either port/device id.
Packet flow direction can be tx/rx/tx&rx.
In Server, appropriate pdump callbacks are triggered,
when packets are transmitted/received.
Pdump packet is copied to client rings.
Signed-off-by: Naga Suresh Somarowthu
Reviewed-by: Reshma Pattan
---
test/test/Makefile | 6 ++
test/test/process.h| 12 +++
test/test/test.c | 2 +
test/test/test_pdump.c | 232 +
test/test/test_pdump.h | 31 +++
5 files changed, 283 insertions(+)
create mode 100644 test/test/test_pdump.c
create mode 100644 test/test/test_pdump.h
diff --git a/test/test/Makefile b/test/test/Makefile
index bba3be1be..3e7baef76 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -185,6 +185,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
@@ -214,6 +215,11 @@ CFLAGS += $(WERROR_FLAGS)
CFLAGS += -D_GNU_SOURCE
LDLIBS += -lm
+
+ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y)
+LDLIBS += -lpthread
+endif
+
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
LDLIBS += -lz
diff --git a/test/test/process.h b/test/test/process.h
index ba3a18502..c015c9030 100644
--- a/test/test/process.h
+++ b/test/test/process.h
@@ -18,6 +18,10 @@
#define exe "exe"
#endif
+#include
+extern void *send_pkts(void *empty);
+extern uint16_t flag_for_send_pkts;
+
/*
* launches a second copy of the test process using the given argv parameters,
* which should include argv[0] as the process name. To identify in the
@@ -31,6 +35,7 @@ process_dup(const char *const argv[], int numargs, const char
*env_value)
char *argv_cpy[numargs + 1];
int i, fd, status;
char path[32];
+ pthread_t thread;
pid_t pid = fork();
if (pid < 0)
@@ -61,8 +66,15 @@ process_dup(const char *const argv[], int numargs, const
char *env_value)
rte_panic("Cannot exec\n");
}
/* parent process does a wait */
+ if ((strcmp(env_value, "run_pdump_server_tests") == 0))
+ pthread_create(&thread, NULL, &send_pkts, NULL);
+
while (wait(&status) != pid)
;
+ if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
+ flag_for_send_pkts = 0;
+ pthread_join(thread, NULL);
+ }
return status;
}
diff --git a/test/test/test.c b/test/test/test.c
index 44dfe20ef..a54b0d142 100644
--- a/test/test/test.c
+++ b/test/test/test.c
@@ -30,6 +30,7 @@ extern cmdline_parse_ctx_t main_ctx[];
#endif
#include "test.h"
+#include "test_pdump.h"
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
@@ -49,6 +50,7 @@ do_recursive_call(void)
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
+ { "run_pdump_server_tests", test_pdump },
{ "test_missing_c_flag", no_action },
{ "test_master_lcore_flag", no_action },
{ "test_invalid_n_flag", no_action },
diff --git a/test/test/test_pdump.c b/test/test/test_pdump.c
new file mode 100644
index 0..cfdda4d39
--- /dev/null
+++ b/test/test/test_pdump.c
@@ -0,0 +1,232 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+#include "sample_packet_forward.h"
+#include "test_pdump.h"
+#include "process.h"
+
+#define launch_p(ARGV) process_dup(ARGV, \
+ sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
+
+struct rte_ring *ring_server;
+uint16_t portid;
+uint16_t flag_for_send_pkts = 1;
+
+int
+test_pdump_init(void)
+{
+ int ret = 0;
+
+ ret = rte_pdump_init(NULL);
+ if (ret < 0) {
+ printf("rte_pdump_init failed\n");
+ return -1;
+ }
+ ret = test_ring_setup(&ring_server, &portid);
+ if (ret < 0) {
+ printf("test_ring_setup failed\n");
+ return -1;
+ }
+ printf("pdump_init su
Re: [dpdk-dev] [PATCH] app/testpmd: fix commands to config some offload
Thanks, Iremonger.
I will reply this patch with a v3 patch.
> -Original Message-
> From: Iremonger, Bernard
> Sent: Thursday, August 2, 2018 5:12 PM
> To: Dai, Wei ; Wu, Jingjing ; Lu,
> Wenzhuo
> Cc: dev@dpdk.org; Dai, Wei ; sta...@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] app/testpmd: fix commands to config some
> offload
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Wei Dai
> > Sent: Thursday, August 2, 2018 2:32 AM
> > To: Wu, Jingjing ; Lu, Wenzhuo
> >
> > Cc: dev@dpdk.org; Dai, Wei ; sta...@dpdk.org
> > Subject: [dpdk-dev] [PATCH] app/testpmd: fix commands to config some
> > offload
> >
> > Without this patch, testpmd command to config Rx offload keep_crc
> > would fail and report "Bad argument".
> > This patch aslo fix the command to config the Tx offload mbuf_fast_free.
> >
> > Fixes: 70815c9ecadd ("ethdev: add new offload flag to keep CRC")
> > Fixes: c73a9071877a ("app/testpmd: add commands to test new offload
> > API")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Wei Dai
> > Tested-by: Yuan Peng
>
> Should have been [PATCH v2] otherwise fine.
>
> Acked-by: Bernard Iremonger
>
[dpdk-dev] [PATCH v3] app/testpmd: fix commands to config some offload
Without this patch, testpmd command to config Rx offload keep_crc
would fail and report "Bad argument".
This patch aslo fix the command to config the Tx offload mbuf_fast_free.
Fixes: 70815c9ecadd ("ethdev: add new offload flag to keep CRC")
Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API")
Cc: sta...@dpdk.org
Signed-off-by: Wei Dai
Tested-by: Yuan Peng
Acked-by: Bernard Iremonger
---
app/test-pmd/cmdline.c | 16
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 54ba2f5..589121d 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -17005,7 +17005,7 @@ struct cmd_config_per_port_rx_offload_result {
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");
+ "crc_strip#scatter#timestamp#security#keep_crc");
cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off =
TOKEN_STRING_INITIALIZER
(struct cmd_config_per_port_rx_offload_result,
@@ -17084,7 +17084,7 @@ struct cmd_config_per_port_rx_offload_result {
.help_str = "port config 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 "
+ "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
"on|off",
.tokens = {
(void *)&cmd_config_per_port_rx_offload_result_port,
@@ -17134,7 +17134,7 @@ struct cmd_config_per_queue_rx_offload_result {
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");
+ "crc_strip#scatter#timestamp#security#keep_crc");
cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
TOKEN_STRING_INITIALIZER
(struct cmd_config_per_queue_rx_offload_result,
@@ -17186,7 +17186,7 @@ struct cmd_config_per_queue_rx_offload_result {
"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 "
+ "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
"on|off",
.tokens = {
(void *)&cmd_config_per_queue_rx_offload_result_port,
@@ -17403,7 +17403,7 @@ struct cmd_config_per_port_tx_offload_result {
"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#fast_free#security");
+ "mt_lockfree#multi_segs#mbuf_fast_free#security");
cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_on_off =
TOKEN_STRING_INITIALIZER
(struct cmd_config_per_port_tx_offload_result,
@@ -17484,7 +17484,7 @@ struct cmd_config_per_port_tx_offload_result {
"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|fast_free|security "
+ "mt_lockfree|multi_segs|mbuf_fast_free|security "
"on|off",
.tokens = {
(void *)&cmd_config_per_port_tx_offload_result_port,
@@ -17535,7 +17535,7 @@ struct cmd_config_per_queue_tx_offload_result {
"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#fast_free#security");
+ "mt_lockfree#multi_segs#mbuf_fast_free#security");
cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_on_off =
TOKEN_STRING_INITIALIZER
(struct cmd_config_per_queue_tx_offload_result,
@@ -17588,7 +17588,7 @@ struct cmd_config_per_queue_tx_offload_result {
"sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
"qinq_insert|vxlan_tn
Re: [dpdk-dev] [PATCH v1] add dpdk-quickstart python script
On 03-Aug-18 12:41 PM, David Hunt wrote: This patch contains two section. 1. Updates to the existing quick-start.html page giving infomration on the new dpdk-quickstart.py script. 2. The dpdk-quickstart.py script itself. 1. The Quick start section contains some instructions for building DPDK and running TestPMD. While this is still useful, automating these steps through a script would provide a much faster and painless way to have DPDK up and running. The new dpdk-quickstart.py aims to address this. 2. This script performs the following: - Gets the latest DPDK release - Gets the necessary dependencies (if needed) - Builds DPDK with the default target - Sets up hugepages - Helps the user to select the ports to use on DPDK - Runs TestPMD, showing packet forwarding between two ports Signed-off-by: Pablo de Lara Signed-off-by: Kirill Rybalchenko Signed-off-by: David Hunt --- Just a side note (and i'm being selfish here, because i want reviews!) - usages like this is exactly what i had in mind when i created the Python library RFC [1]. This has a lot of code duplication with the DPDK devbind etc., which could've been avoided if the code has been more modular. [1] http://patches.dpdk.org/project/dpdk/list/?series=225&state=* -- Thanks, Anatoly
Re: [dpdk-dev] [dpdk-stable] [PATCH v2 1/2] net/bnx2x: fix to poll link status
03/08/2018 06:42, Rasesh Mody:
> The PMD has been modified to invoke the polling function in the link
> management code which detects the peer speed/mode, configure the link
> and update the status accordingly. This patch is the fix for the link
> down issue seen when we do dev_stop() and dev_start() from an
> application.
>
> Fixes: 540a211084a7 ("bnx2x: driver core")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Rasesh Mody
Series applied, thanks
[dpdk-dev] [PATCH v2 0/7] ethdev: add flow API object converter
This is a follow up to the "Flow API helpers enhancements" series submitted almost a year ago [1]. The new title is due to the reduced scope of this version. rte_flow_conv() is a flexible replacement to rte_flow_copy(), itself a temporary solution pending something better [2]. It replaces a lot of duplicated code found in testpmd and removes some of the maintenance burden that developers tend to forget (me included) when modifying pattern item or actions (updating app/test-pmd/config.c to be clear). This series was unearthed in order to complete the implementation of RTE_FLOW_ACTION_TYPE_ENCAP_(VXLAN|NVGRE) in testpmd [3] without having to duplicate existing code once again. See individual patches for specific changes in this version. v2 changes: - rte_flow_copy() is kept, albeit deprecated, no API/ABI impact. - Updated bonding PMD. - No more automatic generation of rte_flow_conv.h. [1] https://mails.dpdk.org/archives/dev/2017-October/077551.html [2] https://mails.dpdk.org/archives/dev/2017-July/070492.html [3] Currently the command-line parser (cmdline_flow.c) is aware of these actions, however config.c isn't. Flow rules with such actions cannot be created and cannot be validated with PMDs that implement them. Adrien Mazarguil (7): ethdev: add flow API object converter ethdev: add flow API item/action name conversion app/testpmd: rely on flow API conversion function net/failsafe: switch to flow API object conversion function net/bonding: switch to flow API object conversion function ethdev: deprecate rte_flow_copy function ethdev: add missing item/actions to flow object converter app/test-pmd/config.c | 407 +++ app/test-pmd/testpmd.h | 7 +- doc/guides/prog_guide/rte_flow.rst | 20 + drivers/net/bonding/rte_eth_bond_api.c | 6 +- drivers/net/bonding/rte_eth_bond_flow.c| 31 +- drivers/net/bonding/rte_eth_bond_private.h | 5 +- drivers/net/failsafe/failsafe_ether.c | 6 +- drivers/net/failsafe/failsafe_flow.c | 31 +- drivers/net/failsafe/failsafe_private.h| 5 +- lib/librte_ethdev/rte_ethdev_version.map | 1 + lib/librte_ethdev/rte_flow.c | 666 ++-- lib/librte_ethdev/rte_flow.h | 230 +++- 12 files changed, 883 insertions(+), 532 deletions(-) -- 2.11.0
[dpdk-dev] [PATCH v2 3/7] app/testpmd: rely on flow API conversion function
This commit replaces all local information about pattern items and actions
as well as flow rule duplication code with calls to rte_flow_conv().
Signed-off-by: Adrien Mazarguil
Cc: Wenzhuo Lu
Cc: Jingjing Wu
Cc: Bernard Iremonger
---
app/test-pmd/config.c | 407 +++-
app/test-pmd/testpmd.h | 7 +-
2 files changed, 67 insertions(+), 347 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 14ccd6864..669be168b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -984,324 +984,35 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
/* Generic flow management functions. */
-/** Generate flow_item[] entry. */
-#define MK_FLOW_ITEM(t, s) \
- [RTE_FLOW_ITEM_TYPE_ ## t] = { \
- .name = # t, \
- .size = s, \
- }
-
-/** Information about known flow pattern items. */
-static const struct {
- const char *name;
- size_t size;
-} flow_item[] = {
- MK_FLOW_ITEM(END, 0),
- MK_FLOW_ITEM(VOID, 0),
- MK_FLOW_ITEM(INVERT, 0),
- MK_FLOW_ITEM(ANY, sizeof(struct rte_flow_item_any)),
- MK_FLOW_ITEM(PF, 0),
- MK_FLOW_ITEM(VF, sizeof(struct rte_flow_item_vf)),
- MK_FLOW_ITEM(PHY_PORT, sizeof(struct rte_flow_item_phy_port)),
- MK_FLOW_ITEM(PORT_ID, sizeof(struct rte_flow_item_port_id)),
- MK_FLOW_ITEM(RAW, sizeof(struct rte_flow_item_raw)),
- MK_FLOW_ITEM(ETH, sizeof(struct rte_flow_item_eth)),
- MK_FLOW_ITEM(VLAN, sizeof(struct rte_flow_item_vlan)),
- MK_FLOW_ITEM(IPV4, sizeof(struct rte_flow_item_ipv4)),
- MK_FLOW_ITEM(IPV6, sizeof(struct rte_flow_item_ipv6)),
- MK_FLOW_ITEM(ICMP, sizeof(struct rte_flow_item_icmp)),
- MK_FLOW_ITEM(UDP, sizeof(struct rte_flow_item_udp)),
- MK_FLOW_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
- MK_FLOW_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
- MK_FLOW_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
- MK_FLOW_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
- MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
- MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
- MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
- MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
- MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
- MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
- MK_FLOW_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)),
- MK_FLOW_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)),
- MK_FLOW_ITEM(VXLAN_GPE, sizeof(struct rte_flow_item_vxlan_gpe)),
- MK_FLOW_ITEM(ARP_ETH_IPV4, sizeof(struct rte_flow_item_arp_eth_ipv4)),
- MK_FLOW_ITEM(IPV6_EXT, sizeof(struct rte_flow_item_ipv6_ext)),
- MK_FLOW_ITEM(ICMP6, sizeof(struct rte_flow_item_icmp6)),
- MK_FLOW_ITEM(ICMP6_ND_NS, sizeof(struct rte_flow_item_icmp6_nd_ns)),
- MK_FLOW_ITEM(ICMP6_ND_NA, sizeof(struct rte_flow_item_icmp6_nd_na)),
- MK_FLOW_ITEM(ICMP6_ND_OPT, sizeof(struct rte_flow_item_icmp6_nd_opt)),
- MK_FLOW_ITEM(ICMP6_ND_OPT_SLA_ETH,
-sizeof(struct rte_flow_item_icmp6_nd_opt_sla_eth)),
- MK_FLOW_ITEM(ICMP6_ND_OPT_TLA_ETH,
-sizeof(struct rte_flow_item_icmp6_nd_opt_tla_eth)),
-};
-
-/** Pattern item specification types. */
-enum item_spec_type {
- ITEM_SPEC,
- ITEM_LAST,
- ITEM_MASK,
-};
-
-/** Compute storage space needed by item specification and copy it. */
-static size_t
-flow_item_spec_copy(void *buf, const struct rte_flow_item *item,
- enum item_spec_type type)
-{
- size_t size = 0;
- const void *data =
- type == ITEM_SPEC ? item->spec :
- type == ITEM_LAST ? item->last :
- type == ITEM_MASK ? item->mask :
- NULL;
-
- if (!item->spec || !data)
- goto empty;
- switch (item->type) {
- union {
- const struct rte_flow_item_raw *raw;
- } spec;
- union {
- const struct rte_flow_item_raw *raw;
- } last;
- union {
- const struct rte_flow_item_raw *raw;
- } mask;
- union {
- const struct rte_flow_item_raw *raw;
- } src;
- union {
- struct rte_flow_item_raw *raw;
- } dst;
- size_t off;
-
- case RTE_FLOW_ITEM_TYPE_RAW:
- spec.raw = item->spec;
- last.raw = item->last ? item->last : item->spec;
- mask.raw = item->mask ? item->mask : &rte_flow_item_raw_mask;
- src.raw = data;
- dst.raw = buf;
- off = RTE_ALIGN_CEIL(sizeof(struct rte_flow_item_raw),
-sizeof(*src.raw->pattern));
- if (type == ITEM_SPEC ||
-
[dpdk-dev] [PATCH v2 2/7] ethdev: add flow API item/action name conversion
This provides a means for applications to retrieve the name of flow pattern
items and actions.
Signed-off-by: Adrien Mazarguil
Cc: Thomas Monjalon
Cc: Ferruh Yigit
Cc: Andrew Rybchenko
--
v2 changes:
- Replaced rte_flow_conv_name_ptr() with extra is_ptr argument to
rte_flow_conv_name() since both functions were almost identical.
- Properly documented internal helper functions.
---
doc/guides/prog_guide/rte_flow.rst | 1 +
lib/librte_ethdev/rte_flow.c | 63 +
lib/librte_ethdev/rte_flow.h | 56 +
3 files changed, 120 insertions(+)
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 964cf9ceb..1b17f6e01 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2437,6 +2437,7 @@ operations include:
- Attributes, pattern item or action duplication.
- Duplication of an entire pattern or list of actions.
- Duplication of a complete flow rule description.
+- Pattern item or action name retrieval.
Caveats
---
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 930fe09c8..5d487c108 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include "rte_ethdev.h"
#include "rte_flow_driver.h"
#include "rte_flow.h"
@@ -679,6 +680,60 @@ rte_flow_conv_rule(struct rte_flow_conv_rule *dst,
return off;
}
+/**
+ * Retrieve the name of a pattern item/action type.
+ *
+ * @param is_action
+ * Nonzero when @p src represents an action type instead of a pattern item
+ * type.
+ * @param is_ptr
+ * Nonzero to write string address instead of contents into @p dst.
+ * @param[out] dst
+ * Destination buffer. Can be NULL if @p size is zero.
+ * @param size
+ * Size of @p dst in bytes.
+ * @param[in] src
+ * Depending on @p is_action, source pattern item or action type cast as a
+ * pointer.
+ * @param[out] error
+ * Perform verbose error reporting if not NULL.
+ *
+ * @return
+ * A positive value representing the number of bytes needed to store the
+ * name or its address regardless of @p size on success (@p buf contents
+ * are truncated to @p size if not large enough), a negative errno value
+ * otherwise and rte_errno is set.
+ */
+static int
+rte_flow_conv_name(int is_action,
+ int is_ptr,
+ char *dst,
+ const size_t size,
+ const void *src,
+ struct rte_flow_error *error)
+{
+ struct desc_info {
+ const struct rte_flow_desc_data *data;
+ size_t num;
+ };
+ static const struct desc_info info_rep[2] = {
+ { rte_flow_desc_item, RTE_DIM(rte_flow_desc_item), },
+ { rte_flow_desc_action, RTE_DIM(rte_flow_desc_action), },
+ };
+ const struct desc_info *const info = &info_rep[!!is_action];
+ unsigned int type = (uintptr_t)src;
+
+ if (type >= info->num)
+ return rte_flow_error_set
+ (error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+"unknown object type to retrieve the name of");
+ if (!is_ptr)
+ return strlcpy(dst, info->data[type].name, size);
+ if (size >= sizeof(const char **))
+ *((const char **)dst) = info->data[type].name;
+ return sizeof(const char **);
+}
+
/** Helper function to convert flow API objects. */
int
rte_flow_conv(enum rte_flow_conv_op op,
@@ -708,6 +763,14 @@ rte_flow_conv(enum rte_flow_conv_op op,
return rte_flow_conv_actions(dst, size, src, 0, error);
case RTE_FLOW_CONV_OP_RULE:
return rte_flow_conv_rule(dst, size, src, error);
+ case RTE_FLOW_CONV_OP_ITEM_NAME:
+ return rte_flow_conv_name(0, 0, dst, size, src, error);
+ case RTE_FLOW_CONV_OP_ACTION_NAME:
+ return rte_flow_conv_name(1, 0, dst, size, src, error);
+ case RTE_FLOW_CONV_OP_ITEM_NAME_PTR:
+ return rte_flow_conv_name(0, 1, dst, size, src, error);
+ case RTE_FLOW_CONV_OP_ACTION_NAME_PTR:
+ return rte_flow_conv_name(1, 1, dst, size, src, error);
}
return rte_flow_error_set
(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 71dc30e4c..c48ea8a51 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -2043,6 +2043,62 @@ enum rte_flow_conv_op {
* @code struct rte_flow_conv_rule * @endcode
*/
RTE_FLOW_CONV_OP_RULE,
+
+ /**
+* Convert item type to its name string.
+*
+* Writes a NUL-terminated string to @p dst. Like snprintf(), the
+* returned value excludes the terminator which is always written
+* nonetheless.
+*
+
[dpdk-dev] [PATCH v2 1/7] ethdev: add flow API object converter
rte_flow_copy() is bound to duplicate flow rule descriptions (attributes,
pattern and list of actions, all at once), however applications sometimes
need more flexibility, for instance the ability to duplicate only one of
the underlying objects (a single pattern item or action) or retrieve other
properties such as their names.
Instead of adding dedicated functions to handle each possible use case,
this patch introduces rte_flow_conv(), which supports any number of object
conversion operations in an extensible manner.
This patch re-implements rte_flow_copy() as a wrapper to rte_flow_conv().
Signed-off-by: Adrien Mazarguil
Cc: Thomas Monjalon
Cc: Ferruh Yigit
Cc: Andrew Rybchenko
Cc: Gaetan Rivet
--
v2 changes:
- Modified patch to keep rte_flow_copy() around instead of removing it
entirely. Reworded commit log accordingly.
- Moved failsafe PMD changes to a subsequent patch.
- Re-implemented rte_flow_copy() as a wrapper to rte_flow_conv() to reduce
code duplication.
- Tweaked semantics of rte_flow_conv() to return the required number of
bytes regardless of the size parameter; a buffer not large enough is not
considered to be an error anymore. This change removes the need for a
"store" pass in underlying helper functions.
- Renamed and properly documented internal helper functions.
---
doc/guides/prog_guide/rte_flow.rst | 19 +
lib/librte_ethdev/rte_ethdev_version.map | 1 +
lib/librte_ethdev/rte_flow.c | 553 ++
lib/librte_ethdev/rte_flow.h | 169 +++-
4 files changed, 581 insertions(+), 161 deletions(-)
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index b305a72a5..964cf9ceb 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2419,6 +2419,25 @@ This function initializes ``error`` (if non-NULL) with
the provided
parameters and sets ``rte_errno`` to ``code``. A negative error ``code`` is
then returned.
+Object conversion
+~
+
+.. code-block:: c
+
+ int
+ rte_flow_conv(enum rte_flow_conv_op op,
+ void *dst,
+ size_t size,
+ const void *src,
+ struct rte_flow_error *error);
+
+Convert ``src`` to ``dst`` according to operation ``op``. Possible
+operations include:
+
+- Attributes, pattern item or action duplication.
+- Duplication of an entire pattern or list of actions.
+- Duplication of a complete flow rule description.
+
Caveats
---
diff --git a/lib/librte_ethdev/rte_ethdev_version.map
b/lib/librte_ethdev/rte_ethdev_version.map
index 38f117f01..2345f3002 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -217,6 +217,7 @@ DPDK_18.08 {
global:
rte_eth_dev_logtype;
+ rte_flow_conv;
} DPDK_18.05;
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index cff4b5209..930fe09c8 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -288,26 +288,41 @@ rte_flow_error_set(struct rte_flow_error *error,
}
/** Pattern item specification types. */
-enum item_spec_type {
- ITEM_SPEC,
- ITEM_LAST,
- ITEM_MASK,
+enum rte_flow_conv_item_spec_type {
+ RTE_FLOW_CONV_ITEM_SPEC,
+ RTE_FLOW_CONV_ITEM_LAST,
+ RTE_FLOW_CONV_ITEM_MASK,
};
-/** Compute storage space needed by item specification and copy it. */
+/**
+ * Copy pattern item specification.
+ *
+ * @param[out] buf
+ * Output buffer. Can be NULL if @p size is zero.
+ * @param size
+ * Size of @p buf in bytes.
+ * @param[in] item
+ * Pattern item to copy specification from.
+ * @param type
+ * Specification selector for either @p spec, @p last or @p mask.
+ *
+ * @return
+ * Number of bytes needed to store pattern item specification regardless
+ * of @p size. @p buf contents are truncated to @p size if not large
+ * enough.
+ */
static size_t
-flow_item_spec_copy(void *buf, const struct rte_flow_item *item,
- enum item_spec_type type)
+rte_flow_conv_item_spec(void *buf, const size_t size,
+ const struct rte_flow_item *item,
+ enum rte_flow_conv_item_spec_type type)
{
- size_t size = 0;
+ size_t off;
const void *data =
- type == ITEM_SPEC ? item->spec :
- type == ITEM_LAST ? item->last :
- type == ITEM_MASK ? item->mask :
+ type == RTE_FLOW_CONV_ITEM_SPEC ? item->spec :
+ type == RTE_FLOW_CONV_ITEM_LAST ? item->last :
+ type == RTE_FLOW_CONV_ITEM_MASK ? item->mask :
NULL;
- if (!item->spec || !data)
- goto empty;
switch (item->type) {
union {
const struct rte_flow_item_raw *raw;
@@ -324,7 +339,7 @@ flow_item_spec_copy(void *buf, const struct rte_flow_item
*item,
union {
[dpdk-dev] [PATCH v2 6/7] ethdev: deprecate rte_flow_copy function
No users left for this function, time to deprecate it.
Signed-off-by: Adrien Mazarguil
Cc: Thomas Monjalon
Cc: Ferruh Yigit
Cc: Andrew Rybchenko
Cc: Gaetan Rivet
--
v2 changes:
- Patch was not present in original series.
---
lib/librte_ethdev/rte_flow.h | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index c48ea8a51..891be1557 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -2332,6 +2332,7 @@ rte_flow_error_set(struct rte_flow_error *error,
const char *message);
/**
+ * @deprecated
* @see rte_flow_copy()
*/
struct rte_flow_desc {
@@ -2343,10 +2344,13 @@ struct rte_flow_desc {
};
/**
+ * @deprecated
* Copy an rte_flow rule description.
*
* This interface is kept for compatibility with older applications but is
- * implemented as a wrapper to rte_flow_conv().
+ * implemented as a wrapper to rte_flow_conv(). It is deprecated due to its
+ * lack of flexibility and reliance on a type unusable with C++ programs
+ * (struct rte_flow_desc).
*
* @param[in] fd
* Flow rule description.
@@ -2365,6 +2369,7 @@ struct rte_flow_desc {
* If len is lower than the size of the flow, the number of bytes that would
* have been written to desc had it been sufficient. Nothing is written.
*/
+__rte_deprecated
size_t
rte_flow_copy(struct rte_flow_desc *fd, size_t len,
const struct rte_flow_attr *attr,
--
2.11.0
[dpdk-dev] [PATCH v2 4/7] net/failsafe: switch to flow API object conversion function
This patch replaces rte_flow_copy() with rte_flow_conv().
Signed-off-by: Adrien Mazarguil
Cc: Gaetan Rivet
--
v2 changes:
- Patch was split from "ethdev: add flow API object converter".
---
drivers/net/failsafe/failsafe_ether.c | 6 +++---
drivers/net/failsafe/failsafe_flow.c| 31 +---
drivers/net/failsafe/failsafe_private.h | 5 -
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/drivers/net/failsafe/failsafe_ether.c
b/drivers/net/failsafe/failsafe_ether.c
index 5b5cb3b49..8bce368f3 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -230,9 +230,9 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
DEBUG("Creating flow #%" PRIu32, i++);
flow->flows[SUB_ID(sdev)] =
rte_flow_create(PORT_ID(sdev),
- &flow->fd->attr,
- flow->fd->items,
- flow->fd->actions,
+ flow->rule.attr,
+ flow->rule.pattern,
+ flow->rule.actions,
&ferror);
ret = rte_errno;
if (ret)
diff --git a/drivers/net/failsafe/failsafe_flow.c
b/drivers/net/failsafe/failsafe_flow.c
index bfe42fcee..5e2b5f7c6 100644
--- a/drivers/net/failsafe/failsafe_flow.c
+++ b/drivers/net/failsafe/failsafe_flow.c
@@ -3,8 +3,11 @@
* Copyright 2017 Mellanox Technologies, Ltd
*/
+#include
+#include
#include
+#include
#include
#include
#include
@@ -18,19 +21,33 @@ fs_flow_allocate(const struct rte_flow_attr *attr,
const struct rte_flow_action *actions)
{
struct rte_flow *flow;
- size_t fdsz;
+ const struct rte_flow_conv_rule rule = {
+ .attr_ro = attr,
+ .pattern_ro = items,
+ .actions_ro = actions,
+ };
+ struct rte_flow_error error;
+ int ret;
- fdsz = rte_flow_copy(NULL, 0, attr, items, actions);
- flow = rte_zmalloc(NULL,
- sizeof(struct rte_flow) + fdsz,
+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, NULL, 0, &rule, &error);
+ if (ret < 0) {
+ ERROR("Unable to process flow rule (%s): %s",
+ error.message ? error.message : "unspecified",
+ strerror(rte_errno));
+ return NULL;
+ }
+ flow = rte_zmalloc(NULL, offsetof(struct rte_flow, rule) + ret,
RTE_CACHE_LINE_SIZE);
if (flow == NULL) {
ERROR("Could not allocate new flow");
return NULL;
}
- flow->fd = (void *)((uintptr_t)flow + sizeof(*flow));
- if (rte_flow_copy(flow->fd, fdsz, attr, items, actions) != fdsz) {
- ERROR("Failed to copy flow description");
+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &flow->rule, ret, &rule,
+ &error);
+ if (ret < 0) {
+ ERROR("Failed to copy flow rule (%s): %s",
+ error.message ? error.message : "unspecified",
+ strerror(rte_errno));
rte_free(flow);
return NULL;
}
diff --git a/drivers/net/failsafe/failsafe_private.h
b/drivers/net/failsafe/failsafe_private.h
index 886af8616..cc1f0343d 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -6,6 +6,7 @@
#ifndef _RTE_ETH_FAILSAFE_PRIVATE_H_
#define _RTE_ETH_FAILSAFE_PRIVATE_H_
+#include
#include
#include
@@ -13,6 +14,7 @@
#include
#include
#include
+#include
#include
#define FAILSAFE_DRIVER_NAME "Fail-safe PMD"
@@ -81,7 +83,8 @@ struct rte_flow {
/* sub_flows */
struct rte_flow *flows[FAILSAFE_MAX_ETHPORTS];
/* flow description for synchronization */
- struct rte_flow_desc *fd;
+ struct rte_flow_conv_rule rule;
+ uint8_t rule_data[];
};
enum dev_state {
--
2.11.0
[dpdk-dev] [PATCH v2 5/7] net/bonding: switch to flow API object conversion function
This patch replaces rte_flow_copy() with rte_flow_conv().
Signed-off-by: Adrien Mazarguil
Cc: Declan Doherty
Cc: Chas Williams
--
v2 changes:
- Patch was not present in original series.
---
drivers/net/bonding/rte_eth_bond_api.c | 6 ++---
drivers/net/bonding/rte_eth_bond_flow.c| 31 +++--
drivers/net/bonding/rte_eth_bond_private.h | 5 +++-
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 49fa2d78d..045c907cf 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -245,9 +245,9 @@ slave_rte_flow_prepare(uint16_t slave_id, struct
bond_dev_private *internals)
}
TAILQ_FOREACH(flow, &internals->flow_list, next) {
flow->flows[slave_id] = rte_flow_create(slave_port_id,
- &flow->fd->attr,
- flow->fd->items,
- flow->fd->actions,
+ flow->rule.attr,
+ flow->rule.pattern,
+ flow->rule.actions,
&ferror);
if (flow->flows[slave_id] == NULL) {
RTE_BOND_LOG(ERR, "Cannot create flow for slave"
diff --git a/drivers/net/bonding/rte_eth_bond_flow.c
b/drivers/net/bonding/rte_eth_bond_flow.c
index 31e4bcaeb..f94d46ca4 100644
--- a/drivers/net/bonding/rte_eth_bond_flow.c
+++ b/drivers/net/bonding/rte_eth_bond_flow.c
@@ -2,8 +2,11 @@
* Copyright 2018 Mellanox Technologies, Ltd
*/
+#include
+#include
#include
+#include
#include
#include
#include
@@ -16,19 +19,33 @@ bond_flow_alloc(int numa_node, const struct rte_flow_attr
*attr,
const struct rte_flow_action *actions)
{
struct rte_flow *flow;
- size_t fdsz;
+ const struct rte_flow_conv_rule rule = {
+ .attr_ro = attr,
+ .pattern_ro = items,
+ .actions_ro = actions,
+ };
+ struct rte_flow_error error;
+ int ret;
- fdsz = rte_flow_copy(NULL, 0, attr, items, actions);
- flow = rte_zmalloc_socket(NULL, sizeof(struct rte_flow) + fdsz,
+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, NULL, 0, &rule, &error);
+ if (ret < 0) {
+ RTE_BOND_LOG(ERR, "Unable to process flow rule (%s): %s",
+error.message ? error.message : "unspecified",
+strerror(rte_errno));
+ return NULL;
+ }
+ flow = rte_zmalloc_socket(NULL, offsetof(struct rte_flow, rule) + ret,
RTE_CACHE_LINE_SIZE, numa_node);
if (unlikely(flow == NULL)) {
RTE_BOND_LOG(ERR, "Could not allocate new flow");
return NULL;
}
- flow->fd = (void *)((uintptr_t)flow + sizeof(*flow));
- if (unlikely(rte_flow_copy(flow->fd, fdsz, attr, items, actions) !=
-fdsz)) {
- RTE_BOND_LOG(ERR, "Failed to copy flow description");
+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &flow->rule, ret, &rule,
+ &error);
+ if (ret < 0) {
+ RTE_BOND_LOG(ERR, "Failed to copy flow rule (%s): %s",
+error.message ? error.message : "unspecified",
+strerror(rte_errno));
rte_free(flow);
return NULL;
}
diff --git a/drivers/net/bonding/rte_eth_bond_private.h
b/drivers/net/bonding/rte_eth_bond_private.h
index 43e0e448d..61202845e 100644
--- a/drivers/net/bonding/rte_eth_bond_private.h
+++ b/drivers/net/bonding/rte_eth_bond_private.h
@@ -5,9 +5,11 @@
#ifndef _RTE_ETH_BOND_PRIVATE_H_
#define _RTE_ETH_BOND_PRIVATE_H_
+#include
#include
#include
+#include
#include
#include
#include
@@ -93,7 +95,8 @@ struct rte_flow {
/* Slaves flows */
struct rte_flow *flows[RTE_MAX_ETHPORTS];
/* Flow description for synchronization */
- struct rte_flow_desc *fd;
+ struct rte_flow_conv_rule rule;
+ uint8_t rule_data[];
};
typedef void (*burst_xmit_hash_t)(struct rte_mbuf **buf, uint16_t nb_pkts,
--
2.11.0
[dpdk-dev] [PATCH v2 7/7] ethdev: add missing item/actions to flow object converter
Several pattern items and actions were never handled by rte_flow_copy()
because their descriptions were missing. rte_flow_conv() inherited this
deficiency.
This patch adds them and reorders others to match rte_flow.h. It doesn't
pose as a fix because so far no one has complained about it and
rte_flow_conv() would have to be backported as well: this function is the
only sane approach to handle VXLAN and NVGRE encap definitions.
As a matter of fact, it's the last missing piece to finally allow testpmd
users to request the creation of VXLAN/NVGRE encap/decap flow rules without
getting rejected outright.
Signed-off-by: Adrien Mazarguil
Cc: Declan Doherty
Cc: Nelio Laranjeiro
--
v2 changes:
- Patch was not present in original series.
---
lib/librte_ethdev/rte_flow.c | 50 +--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 5d487c108..0c84defdb 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -51,10 +51,15 @@ static const struct rte_flow_desc_data rte_flow_desc_item[]
= {
MK_FLOW_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
MK_FLOW_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
MK_FLOW_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
- MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
- MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
MK_FLOW_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
+ MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
+ MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
+ MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
+ MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
+ MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
+ MK_FLOW_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)),
+ MK_FLOW_ITEM(ESP, sizeof(struct rte_flow_item_esp)),
MK_FLOW_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)),
MK_FLOW_ITEM(VXLAN_GPE, sizeof(struct rte_flow_item_vxlan_gpe)),
MK_FLOW_ITEM(ARP_ETH_IPV4, sizeof(struct rte_flow_item_arp_eth_ipv4)),
@@ -67,6 +72,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] =
{
sizeof(struct rte_flow_item_icmp6_nd_opt_sla_eth)),
MK_FLOW_ITEM(ICMP6_ND_OPT_TLA_ETH,
sizeof(struct rte_flow_item_icmp6_nd_opt_tla_eth)),
+ MK_FLOW_ITEM(MARK, sizeof(struct rte_flow_item_mark)),
};
/** Generate flow_action[] entry. */
@@ -81,6 +87,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[]
= {
MK_FLOW_ACTION(END, 0),
MK_FLOW_ACTION(VOID, 0),
MK_FLOW_ACTION(PASSTHRU, 0),
+ MK_FLOW_ACTION(JUMP, sizeof(struct rte_flow_action_jump)),
MK_FLOW_ACTION(MARK, sizeof(struct rte_flow_action_mark)),
MK_FLOW_ACTION(FLAG, 0),
MK_FLOW_ACTION(QUEUE, sizeof(struct rte_flow_action_queue)),
@@ -91,6 +98,8 @@ static const struct rte_flow_desc_data rte_flow_desc_action[]
= {
MK_FLOW_ACTION(VF, sizeof(struct rte_flow_action_vf)),
MK_FLOW_ACTION(PHY_PORT, sizeof(struct rte_flow_action_phy_port)),
MK_FLOW_ACTION(PORT_ID, sizeof(struct rte_flow_action_port_id)),
+ MK_FLOW_ACTION(METER, sizeof(struct rte_flow_action_meter)),
+ MK_FLOW_ACTION(SECURITY, sizeof(struct rte_flow_action_security)),
MK_FLOW_ACTION(OF_SET_MPLS_TTL,
sizeof(struct rte_flow_action_of_set_mpls_ttl)),
MK_FLOW_ACTION(OF_DEC_MPLS_TTL, 0),
@@ -110,6 +119,10 @@ static const struct rte_flow_desc_data
rte_flow_desc_action[] = {
sizeof(struct rte_flow_action_of_pop_mpls)),
MK_FLOW_ACTION(OF_PUSH_MPLS,
sizeof(struct rte_flow_action_of_push_mpls)),
+ MK_FLOW_ACTION(VXLAN_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)),
+ MK_FLOW_ACTION(VXLAN_DECAP, 0),
+ MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)),
+ MK_FLOW_ACTION(NVGRE_DECAP, 0),
};
static int
@@ -407,11 +420,16 @@ rte_flow_conv_action_conf(void *buf, const size_t size,
switch (action->type) {
union {
const struct rte_flow_action_rss *rss;
+ const struct rte_flow_action_vxlan_encap *vxlan_encap;
+ const struct rte_flow_action_nvgre_encap *nvgre_encap;
} src;
union {
struct rte_flow_action_rss *rss;
+ struct rte_flow_action_vxlan_encap *vxlan_encap;
+ struct rte_flow_action_nvgre_encap *nvgre_encap;
} dst;
size_t tmp;
+ int ret;
case RTE_FLOW_ACTION_TYPE_RSS:
src.rss = action->conf;
@@ -445,6 +463,34 @@ rte_flow_conv_action_conf(void *buf, const size_t size,
Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency and pdump libraries
Hi Thomas,
> -Original Message-
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Wednesday, August 1, 2018 8:52 AM
> To: Pattan, Reshma
> Cc: dev@dpdk.org; Burakov, Anatoly ;
> Parthasarathy, JananeeX M ;
> Somarowthu, Naga SureshX
> Subject: Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency
> and
> pdump libraries
>
> 01/08/2018 00:18, Reshma Pattan:
> > v10: fixed clang compiler issues and freed latency stats memzone in
> > latency stats unit tests.
> > v9: rebased ontop of latest autotest changes and added new tests to
> > the autotest list
> > v8: renamed commit headline and freed the metrics memzone for bitrate
> > ut
> > v7: removed unused macros and corrected the comment
> > v6: updated ring variable appropriately
> > v5: rebased, freed pools and rings, created common patch set
> > ---
>
> Sorry, the integration of this patchset is very painful.
>
> After asking for rebase, for clang fix, there are still some basic errors
> with 32-
> bit compilation:
>
> test_latencystats.c:131:21: error:
> format ‘%ld’ expects argument of type ‘long int’,
> but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’}
>
> linkage:
>
> test@test@@dpdk-test@exe/test.c.o:(.data+0x18): undefined
> reference to `test_pdump'
>
> or even MAINTAINERS file:
>
> test/test/sample_packet_forward.c
> test/test/sample_packet_forward.h
> test/test/test_bitratestats.c
> test/test/test_latencystats.c
>
> I have already spent too much time on it, despite it is not fixing 18.08.
>
> Please do a complete detailed review of this series, so it can be considered
> for
> 18.11.
>
We missed to do these basic checks, apologies for consuming your time.
Naga Suresh has now proactively worked on fixing these issues and running pre
checks on patches and addressed in v12.
The earlier versions were reviewed by me, Remy and Anatoly . So we request you
to consider latest patches for 18.08,
until unless they don’t give any last minute surprises.
Thanks,
Reshma
[dpdk-dev] [PATCH 01/10] eal: add shorthand __rte_weak macro
Signed-off-by: Keith Wiles --- lib/librte_eal/common/include/rte_common.h | 5 + 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index 069c13ec7..2c4535b1a 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -68,6 +68,11 @@ typedef uint16_t unaligned_uint16_t; /*** Macro to mark functions and fields scheduled for removal */ #define __rte_deprecated __attribute__((__deprecated__)) +/** + * short definition to mark a function or variable to a weak reference. + */ +#define __rte_weak __attribute__((__weak__)) + /*** Macros to eliminate unused variable warnings / /** -- 2.17.1
[dpdk-dev] [PATCH 02/10] qat: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/common/qat/qat_device.c | 12 ++--
drivers/common/qat/qat_qp.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c
index f32d72358..db01e5bc2 100644
--- a/drivers/common/qat/qat_device.c
+++ b/drivers/common/qat/qat_device.c
@@ -239,37 +239,37 @@ static struct rte_pci_driver rte_qat_pmd = {
.remove = qat_pci_remove
};
-__attribute__((weak)) int
+__rte_weak int
qat_sym_dev_create(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
}
-__attribute__((weak)) int
+__rte_weak int
qat_asym_dev_create(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
}
-__attribute__((weak)) int
+__rte_weak int
qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
}
-__attribute__((weak)) int
+__rte_weak int
qat_asym_dev_destroy(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
}
-__attribute__((weak)) int
+__rte_weak int
qat_comp_dev_create(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
}
-__attribute__((weak)) int
+__rte_weak int
qat_comp_dev_destroy(struct qat_pci_device *qat_pci_dev __rte_unused)
{
return 0;
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index 7ca7a45eb..11a2d2e90 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -635,7 +635,7 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops)
return resp_counter;
}
-__attribute__((weak)) int
+__rte_weak int
qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused)
{
return 0;
--
2.17.1
[dpdk-dev] [PATCH 03/10] avf: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/net/avf/avf_rxtx.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
index e03a136fc..1c1b1f05e 100644
--- a/drivers/net/avf/avf_rxtx.c
+++ b/drivers/net/avf/avf_rxtx.c
@@ -1925,7 +1925,7 @@ avf_dev_tx_desc_status(void *tx_queue, uint16_t offset)
return RTE_ETH_TX_DESC_FULL;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
avf_recv_pkts_vec(__rte_unused void *rx_queue,
__rte_unused struct rte_mbuf **rx_pkts,
__rte_unused uint16_t nb_pkts)
@@ -1933,7 +1933,7 @@ avf_recv_pkts_vec(__rte_unused void *rx_queue,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
avf_recv_scattered_pkts_vec(__rte_unused void *rx_queue,
__rte_unused struct rte_mbuf **rx_pkts,
__rte_unused uint16_t nb_pkts)
@@ -1941,7 +1941,7 @@ avf_recv_scattered_pkts_vec(__rte_unused void *rx_queue,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
avf_xmit_fixed_burst_vec(__rte_unused void *tx_queue,
__rte_unused struct rte_mbuf **tx_pkts,
__rte_unused uint16_t nb_pkts)
@@ -1949,13 +1949,13 @@ avf_xmit_fixed_burst_vec(__rte_unused void *tx_queue,
return 0;
}
-int __attribute__((weak))
+__rte_weak int
avf_rxq_vec_setup(__rte_unused struct avf_rx_queue *rxq)
{
return -1;
}
-int __attribute__((weak))
+__rte_weak int
avf_txq_vec_setup(__rte_unused struct avf_tx_queue *txq)
{
return -1;
--
2.17.1
[dpdk-dev] [PATCH 04/10] fm10k: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/net/fm10k/fm10k_ethdev.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 541a49b75..e43b16d4e 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -129,13 +129,13 @@ fm10k_mbx_unlock(struct fm10k_hw *hw)
}
/* Stubs needed for linkage when vPMD is disabled */
-int __attribute__((weak))
+__rte_weak int
fm10k_rx_vec_condition_check(__rte_unused struct rte_eth_dev *dev)
{
return -1;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
fm10k_recv_pkts_vec(
__rte_unused void *rx_queue,
__rte_unused struct rte_mbuf **rx_pkts,
@@ -144,7 +144,7 @@ fm10k_recv_pkts_vec(
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
fm10k_recv_scattered_pkts_vec(
__rte_unused void *rx_queue,
__rte_unused struct rte_mbuf **rx_pkts,
@@ -153,33 +153,33 @@ fm10k_recv_scattered_pkts_vec(
return 0;
}
-int __attribute__((weak))
+__rte_weak int
fm10k_rxq_vec_setup(__rte_unused struct fm10k_rx_queue *rxq)
{
return -1;
}
-void __attribute__((weak))
+__rte_weak void
fm10k_rx_queue_release_mbufs_vec(
__rte_unused struct fm10k_rx_queue *rxq)
{
return;
}
-void __attribute__((weak))
+__rte_weak void
fm10k_txq_vec_setup(__rte_unused struct fm10k_tx_queue *txq)
{
return;
}
-int __attribute__((weak))
+__rte_weak int
fm10k_tx_vec_condition_check(__rte_unused struct fm10k_tx_queue *txq)
{
return -1;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
fm10k_xmit_fixed_burst_vec(__rte_unused void *tx_queue,
__rte_unused struct rte_mbuf **tx_pkts,
__rte_unused uint16_t nb_pkts)
--
2.17.1
[dpdk-dev] [PATCH 05/10] i40e: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/net/i40e/i40e_rxtx.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 59a6a8adb..73499dfdd 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -3165,13 +3165,13 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)
}
/* Stubs needed for linkage when CONFIG_RTE_I40E_INC_VECTOR is set to 'n' */
-int __attribute__((weak))
+__rte_weak int
i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
{
return -1;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_recv_pkts_vec(
void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
@@ -3180,7 +3180,7 @@ i40e_recv_pkts_vec(
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_recv_scattered_pkts_vec(
void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
@@ -3189,7 +3189,7 @@ i40e_recv_scattered_pkts_vec(
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_recv_pkts_vec_avx2(void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
uint16_t __rte_unused nb_pkts)
@@ -3197,7 +3197,7 @@ i40e_recv_pkts_vec_avx2(void __rte_unused *rx_queue,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_recv_scattered_pkts_vec_avx2(void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
uint16_t __rte_unused nb_pkts)
@@ -3205,25 +3205,25 @@ i40e_recv_scattered_pkts_vec_avx2(void __rte_unused
*rx_queue,
return 0;
}
-int __attribute__((weak))
+__rte_weak int
i40e_rxq_vec_setup(struct i40e_rx_queue __rte_unused *rxq)
{
return -1;
}
-int __attribute__((weak))
+__rte_weak int
i40e_txq_vec_setup(struct i40e_tx_queue __rte_unused *txq)
{
return -1;
}
-void __attribute__((weak))
+__rte_weak void
i40e_rx_queue_release_mbufs_vec(struct i40e_rx_queue __rte_unused*rxq)
{
return;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_xmit_fixed_burst_vec(void __rte_unused * tx_queue,
struct rte_mbuf __rte_unused **tx_pkts,
uint16_t __rte_unused nb_pkts)
@@ -3231,7 +3231,7 @@ i40e_xmit_fixed_burst_vec(void __rte_unused * tx_queue,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
i40e_xmit_pkts_vec_avx2(void __rte_unused * tx_queue,
struct rte_mbuf __rte_unused **tx_pkts,
uint16_t __rte_unused nb_pkts)
--
2.17.1
[dpdk-dev] [PATCH 07/10] mlx5: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/net/mlx5/mlx5_rxtx.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 2d14f8a6e..357c64838 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -2324,7 +2324,7 @@ removed_rx_burst(void *dpdk_txq __rte_unused,
* (e.g. mlx5_rxtx_vec_sse.c for x86).
*/
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
mlx5_tx_burst_raw_vec(void *dpdk_txq __rte_unused,
struct rte_mbuf **pkts __rte_unused,
uint16_t pkts_n __rte_unused)
@@ -2332,7 +2332,7 @@ mlx5_tx_burst_raw_vec(void *dpdk_txq __rte_unused,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
mlx5_tx_burst_vec(void *dpdk_txq __rte_unused,
struct rte_mbuf **pkts __rte_unused,
uint16_t pkts_n __rte_unused)
@@ -2340,7 +2340,7 @@ mlx5_tx_burst_vec(void *dpdk_txq __rte_unused,
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
mlx5_rx_burst_vec(void *dpdk_txq __rte_unused,
struct rte_mbuf **pkts __rte_unused,
uint16_t pkts_n __rte_unused)
@@ -2348,25 +2348,25 @@ mlx5_rx_burst_vec(void *dpdk_txq __rte_unused,
return 0;
}
-int __attribute__((weak))
+__rte_weak int
mlx5_check_raw_vec_tx_support(struct rte_eth_dev *dev __rte_unused)
{
return -ENOTSUP;
}
-int __attribute__((weak))
+__rte_weak int
mlx5_check_vec_tx_support(struct rte_eth_dev *dev __rte_unused)
{
return -ENOTSUP;
}
-int __attribute__((weak))
+__rte_weak int
mlx5_rxq_check_vec_support(struct mlx5_rxq_data *rxq __rte_unused)
{
return -ENOTSUP;
}
-int __attribute__((weak))
+__rte_weak int
mlx5_check_vec_rx_support(struct rte_eth_dev *dev __rte_unused)
{
return -ENOTSUP;
--
2.17.1
[dpdk-dev] [PATCH 08/10] virtio: update code to use __rte_weak macro
Signed-off-by: Keith Wiles --- drivers/net/virtio/virtio_rxtx_simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c index 31e565b4c..f8bcbaa1c 100644 --- a/drivers/net/virtio/virtio_rxtx_simple.c +++ b/drivers/net/virtio/virtio_rxtx_simple.c @@ -47,7 +47,7 @@ virtio_rxq_vec_setup(struct virtnet_rx *rxq) } /* Stub for linkage when arch specific implementation is not available */ -uint16_t __attribute__((weak)) +__rte_weak uint16_t virtio_recv_pkts_vec(void *rx_queue __rte_unused, struct rte_mbuf **rx_pkts __rte_unused, uint16_t nb_pkts __rte_unused) -- 2.17.1
[dpdk-dev] [PATCH 10/10] bpf: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
lib/librte_bpf/bpf_load.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c
index 2b84fe724..d9d163b7d 100644
--- a/lib/librte_bpf/bpf_load.c
+++ b/lib/librte_bpf/bpf_load.c
@@ -131,7 +131,7 @@ rte_bpf_load(const struct rte_bpf_prm *prm)
return bpf;
}
-__rte_experimental __attribute__ ((weak)) struct rte_bpf *
+__rte_experimental __rte_weak struct rte_bpf *
rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char *fname,
const char *sname)
{
--
2.17.1
[dpdk-dev] [PATCH 06/10] ixgbe: update code to use __rte_weak macro
Signed-off-by: Keith Wiles
---
drivers/net/ixgbe/ixgbe_rxtx.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index f82b74a9a..510c36c4c 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -5715,13 +5715,13 @@ ixgbe_config_rss_filter(struct rte_eth_dev *dev,
}
/* Stubs needed for linkage when CONFIG_RTE_IXGBE_INC_VECTOR is set to 'n' */
-int __attribute__((weak))
+__rte_weak int
ixgbe_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
{
return -1;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
ixgbe_recv_pkts_vec(
void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
@@ -5730,7 +5730,7 @@ ixgbe_recv_pkts_vec(
return 0;
}
-uint16_t __attribute__((weak))
+__rte_weak uint16_t
ixgbe_recv_scattered_pkts_vec(
void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
@@ -5739,7 +5739,7 @@ ixgbe_recv_scattered_pkts_vec(
return 0;
}
-int __attribute__((weak))
+__rte_weak int
ixgbe_rxq_vec_setup(struct ixgbe_rx_queue __rte_unused *rxq)
{
return -1;
--
2.17.1
[dpdk-dev] [PATCH 09/10] acl: update code to use __rte_weak macro
Signed-off-by: Keith Wiles --- lib/librte_acl/rte_acl.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c index 2f1243cde..db7d3221e 100644 --- a/lib/librte_acl/rte_acl.c +++ b/lib/librte_acl/rte_acl.c @@ -16,7 +16,7 @@ EAL_REGISTER_TAILQ(rte_acl_tailq) * If the compiler doesn't support AVX2 instructions, * then the dummy one would be used instead for AVX2 classify method. */ -int __attribute__ ((weak)) +__rte_weak int rte_acl_classify_avx2(__rte_unused const struct rte_acl_ctx *ctx, __rte_unused const uint8_t **data, __rte_unused uint32_t *results, @@ -26,7 +26,7 @@ rte_acl_classify_avx2(__rte_unused const struct rte_acl_ctx *ctx, return -ENOTSUP; } -int __attribute__ ((weak)) +__rte_weak int rte_acl_classify_sse(__rte_unused const struct rte_acl_ctx *ctx, __rte_unused const uint8_t **data, __rte_unused uint32_t *results, @@ -36,7 +36,7 @@ rte_acl_classify_sse(__rte_unused const struct rte_acl_ctx *ctx, return -ENOTSUP; } -int __attribute__ ((weak)) +__rte_weak int rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx, __rte_unused const uint8_t **data, __rte_unused uint32_t *results, @@ -46,7 +46,7 @@ rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx, return -ENOTSUP; } -int __attribute__ ((weak)) +__rte_weak int rte_acl_classify_altivec(__rte_unused const struct rte_acl_ctx *ctx, __rte_unused const uint8_t **data, __rte_unused uint32_t *results, -- 2.17.1
Re: [dpdk-dev] [PATCH v2 0/7] ethdev: add flow API object converter
03/08/2018 15:36, Adrien Mazarguil: > Adrien Mazarguil (7): > ethdev: add flow API object converter > ethdev: add flow API item/action name conversion > app/testpmd: rely on flow API conversion function > net/failsafe: switch to flow API object conversion function > net/bonding: switch to flow API object conversion function > ethdev: deprecate rte_flow_copy function > ethdev: add missing item/actions to flow object converter This series will be considered for 18.11. As you plan to deprecate rte_flow_copy function, please send a deprecation notice which could enter in 18.08 release notes. Thanks
Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency and pdump libraries
03/08/2018 15:45, Pattan, Reshma:
> Hi Thomas,
>
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Wednesday, August 1, 2018 8:52 AM
> >
> > 01/08/2018 00:18, Reshma Pattan:
> > > v10: fixed clang compiler issues and freed latency stats memzone in
> > > latency stats unit tests.
> > > v9: rebased ontop of latest autotest changes and added new tests to
> > > the autotest list
> > > v8: renamed commit headline and freed the metrics memzone for bitrate
> > > ut
> > > v7: removed unused macros and corrected the comment
> > > v6: updated ring variable appropriately
> > > v5: rebased, freed pools and rings, created common patch set
> > > ---
> >
> > Sorry, the integration of this patchset is very painful.
> >
> > After asking for rebase, for clang fix, there are still some basic errors
> > with 32-
> > bit compilation:
> >
> > test_latencystats.c:131:21: error:
> > format ‘%ld’ expects argument of type ‘long int’,
> > but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’}
> >
> > linkage:
> >
> > test@test@@dpdk-test@exe/test.c.o:(.data+0x18): undefined
> > reference to `test_pdump'
> >
> > or even MAINTAINERS file:
> >
> > test/test/sample_packet_forward.c
> > test/test/sample_packet_forward.h
> > test/test/test_bitratestats.c
> > test/test/test_latencystats.c
> >
> > I have already spent too much time on it, despite it is not fixing 18.08.
> >
> > Please do a complete detailed review of this series, so it can be
> > considered for
> > 18.11.
> >
>
> We missed to do these basic checks, apologies for consuming your time.
> Naga Suresh has now proactively worked on fixing these issues and running
> pre checks on patches and addressed in v12.
> The earlier versions were reviewed by me, Remy and Anatoly . So we request
> you to consider latest patches for 18.08,
> until unless they don’t give any last minute surprises.
Sorry, I consider it is now too late for such patch in 18.08.
It is not fixing any issue.
Last days of 18.08 cycle will be really focus on bugs and doc.
Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency and pdump libraries
Hi Thomas,
>-Original Message-
>From: Pattan, Reshma
>Sent: Friday, August 03, 2018 7:15 PM
>To: Thomas Monjalon ; Somarowthu, Naga SureshX
>
>Cc: dev@dpdk.org; Burakov, Anatoly ;
>Parthasarathy, JananeeX M
>Subject: RE: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency and
>pdump libraries
>
>Hi Thomas,
>
>> -Original Message-
>> From: Thomas Monjalon [mailto:tho...@monjalon.net]
>> Sent: Wednesday, August 1, 2018 8:52 AM
>> To: Pattan, Reshma
>> Cc: dev@dpdk.org; Burakov, Anatoly ;
>> Parthasarathy, JananeeX M ;
>> Somarowthu, Naga SureshX
>> Subject: Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate,
>> latency and pdump libraries
>>
>> 01/08/2018 00:18, Reshma Pattan:
>> > v10: fixed clang compiler issues and freed latency stats memzone in
>> > latency stats unit tests.
>> > v9: rebased ontop of latest autotest changes and added new tests to
>> > the autotest list
>> > v8: renamed commit headline and freed the metrics memzone for
>> > bitrate ut
>> > v7: removed unused macros and corrected the comment
>> > v6: updated ring variable appropriately
>> > v5: rebased, freed pools and rings, created common patch set
>> > ---
>>
>> Sorry, the integration of this patchset is very painful.
>>
>> After asking for rebase, for clang fix, there are still some basic
>> errors with 32- bit compilation:
>>
>> test_latencystats.c:131:21: error:
>> format ‘%ld’ expects argument of type ‘long int’,
>> but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’}
>>
>> linkage:
>>
>> test@test@@dpdk-test@exe/test.c.o:(.data+0x18): undefined
>reference
>> to `test_pdump'
>>
>> or even MAINTAINERS file:
>>
>> test/test/sample_packet_forward.c
>> test/test/sample_packet_forward.h
>> test/test/test_bitratestats.c
>> test/test/test_latencystats.c
>>
>> I have already spent too much time on it, despite it is not fixing 18.08.
>>
>> Please do a complete detailed review of this series, so it can be
>> considered for 18.11.
>>
>
>We missed to do these basic checks, apologies for consuming your time.
> Naga Suresh has now proactively worked on fixing these issues and running
>pre checks on patches and addressed in v12.
>The earlier versions were reviewed by me, Remy and Anatoly . So we request
>you to consider latest patches for 18.08, until unless they don’t give any last
>minute surprises.
>
>Thanks,
>Reshma
>
>
>
Apologies very much to miss the earlier patch pre-checks.
We have gone through the cheatsheet and validated pre-checks in the patch v12.
Compiled Successfully in Fedora 27, Fedora 26, CentOS 7.2, CentOS 7.4, Ubuntu
for both 32bit/64bit and FreeBSD (64bit)
Build using compilers gcc, icc, clang were successful in Fedora.
Shared Library builds were successful in Fedora 27, CentOS 7.2 and Ubuntu
Executed checkpatch, check-git-log without any errors.
Code changes were acknowledged by reviewers.
Request to please consider the patch set v12 to be included in RC3 18.08.
In case of any info/change please let us know.
Thanks for your support.
M.P.Jananee
--
Intel Research and Development Ireland Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
This e-mail and any attachments may contain confidential material for the sole
use of the intended recipient(s). Any review or distribution by others is
strictly prohibited. If you are not the intended recipient, please contact the
sender and delete all copies.
Re: [dpdk-dev] [PATCH] hash table: add a bucket iterator function
On 07/31/2018 09:40 PM, Wang, Yipeng1 wrote: How about an API that is more universal? For example, an API such as "rte_iterate_conflict_entries". After an insertion failure, this function will iterate all entries that may conflict with the newly inserted key and you could decide which entry to evict? Fine. We'll rewrite the patch to do so. Thank you for the feedback. [ ]'s Michel Machado
[dpdk-dev] [PATCH v3 1/3] test: add unit tests for metrics library
Unit testcases are added for metrics library.
Signed-off-by: Hari Kumar Vemula
Reviewed-by: Reshma Pattan
Reviewed-by: Remy Horton
Acked-by: Remy Horton
---
test/test/Makefile | 2 +
test/test/test_metrics.c | 312 +++
2 files changed, 314 insertions(+)
create mode 100644 test/test/test_metrics.c
diff --git a/test/test/Makefile b/test/test/Makefile
index e6967bab6..30bc53087 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -183,6 +183,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) +=
test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
+SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c
+
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
endif
diff --git a/test/test/test_metrics.c b/test/test/test_metrics.c
new file mode 100644
index 0..12b96625f
--- /dev/null
+++ b/test/test/test_metrics.c
@@ -0,0 +1,312 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include "test.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#defineREG_METRIC_COUNT6
+#defineMETRIC_LESSER_COUNT 3
+#defineKEY 1
+#defineVALUE 1
+
+/* Initializes metric module. This function must be called
+ * from a primary process before metrics are used
+ */
+static int
+test_metrics_init(void)
+{
+ rte_metrics_init(rte_socket_id());
+ return TEST_SUCCESS;
+}
+
+ /* Test Case to check failures when memzone init is not done */
+static int
+test_metrics_without_init(void)
+{
+ int err = 0;
+ const uint64_t value[REG_METRIC_COUNT] = {0};
+ const char * const mnames[] = {
+ "mean_bits_in", "mean_bits_out",
+ "peak_bits_in", "peak_bits_out",
+ };
+
+ /* Failure Test: Checking for memzone initialization */
+ err = rte_metrics_reg_name("peak_bits_in");
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_reg_names(&mnames[0], 1);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_update_value(RTE_METRICS_GLOBAL, KEY, VALUE);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_update_values(RTE_METRICS_GLOBAL, KEY, &value[0], 4);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_get_names(NULL, 0);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_get_values(RTE_METRICS_GLOBAL, NULL, 0);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ return TEST_SUCCESS;
+}
+
+/* Test Case to validate registering a single metric */
+static int
+test_metrics_reg_name_with_validname(void)
+{
+ int err = 0;
+
+ /* Test to register the new metric name */
+ err = rte_metrics_reg_name("peak_bits_out");
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Test to register the same metric name */
+ err = rte_metrics_reg_name("peak_bits_out");
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Test case to validate registering a invalid metric */
+ err = rte_metrics_reg_name(NULL);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to validate registering a list of valid metric names */
+static int
+test_metrics_reg_names(void)
+{
+ int err = 0;
+ const char * const mnames[] = {
+ "mean_bits_in", "mean_bits_out",
+ "peak_bits_in", "peak_bits_out",
+ };
+
+ /* Success Test: valid array and count size */
+ err = rte_metrics_reg_names(&mnames[0], ARRAY_SIZE(mnames));
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to validate update a metric */
+static int
+test_metrics_update_value(void)
+{
+ int err = 0;
+
+ /* Successful Test: Valid port_id, key and value */
+ err = rte_metrics_update_value(RTE_METRICS_GLOBAL, KEY, VALUE);
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Successful Test: Valid port_id otherthan RTE_METRICS_GLOBAL, key
+* and value
+*/
+ err = rte_metrics_update_value(9, KEY, VALUE);
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Failed Test: Invalid port_id with lower value */
+ err = rte_metrics_update_value(-2, KEY, VALUE);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ /* Failed Test: Invalid port_id with higher value */
+ err = rte_metrics_update_value(39, KEY, VALUE);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ /* Failed Test: valid port id, value wit
[dpdk-dev] [PATCH v3 0/3] add unit test for metrics library
1/3: add unit tests for metrics library 2/3: add new unit tests to autotest list 3/3: updated maintainer for metrics test Signed-off-by: Hari Kumar Vemula Reviewed-by: Reshma Pattan Acked-by: Reshma Pattan --- v3: Resolved clang compilation issue, changed the expected value of tests in test_metrics_without_init as per library fix added metrics test to the autotest list updated maintainers file for metrics unit test v2: Removal of overstated array size based testcases as suggested --- Hari Kumar Vemula (3): test: add unit tests for metrics library autotest: add new unit tests to autotest list maintainers: add metrics test MAINTAINERS| 1 + test/test/Makefile | 2 + test/test/autotest_data.py | 6 + test/test/test_metrics.c | 312 + 4 files changed, 321 insertions(+) create mode 100644 test/test/test_metrics.c -- 2.13.6
[dpdk-dev] [PATCH v3 2/3] autotest: add new unit tests to autotest list
added metrics unit test to autotest list.
Signed-off-by: Hari Kumar Vemula
Reviewed-by: Reshma Pattan
---
test/test/autotest_data.py | 6 ++
1 file changed, 6 insertions(+)
diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
index f68d9b111..9fc4f2fbc 100644
--- a/test/test/autotest_data.py
+++ b/test/test/autotest_data.py
@@ -482,6 +482,12 @@
"Func":default_autotest,
"Report": None,
},
+{
+"Name":"Metrics autotest",
+"Command": "metrics_autotest",
+"Func":default_autotest,
+"Report": None,
+},
#
#Please always keep all dump tests at the end and together!
#
--
2.13.6
[dpdk-dev] [PATCH v3 3/3] maintainers: add metrics test
Update MAINTAINERSHIP for metrics unit test Signed-off-by: Hari Kumar Vemula Reviewed-by: Reshma Pattan --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3b9fec76f..7057b8a0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1140,6 +1140,7 @@ F: doc/guides/sample_app_ug/l2_forward_job_stats.rst Metrics M: Remy Horton F: lib/librte_metrics/ +F: test/test/test_metrics.c Bit-rate statistics M: Remy Horton -- 2.13.6
[dpdk-dev] [PATCH] doc: announce deprecation of flow copy function
Signed-off-by: Adrien Mazarguil Cc: Thomas Monjalon Cc: Ferruh Yigit Cc: Gaetan Rivet --- doc/guides/rel_notes/deprecation.rst | 7 +++ 1 file changed, 7 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 14714fe94..05c77da65 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -68,3 +68,10 @@ Deprecation Notices - ``rte_pdump_set_socket_dir`` will be removed; - The parameter, ``path``, of ``rte_pdump_init`` will be removed; - The enum ``rte_pdump_socktype`` will be removed. + +* ethdev: flow API function ``rte_flow_copy()`` will be deprecated in v18.11 + in favor of ``rte_flow_conv()`` (which will appear in that version) and + subsequently removed for v19.02. + + This is due to a lack of flexibility and reliance on a type unusable with + C++ programs (struct rte_flow_desc). -- 2.11.0
Re: [dpdk-dev] [dpdk-stable] [PATCH] net/bnx2x: fix copyright
27/07/2018 17:45, Rasesh Mody:
> Originally the PMD had "QLogic Corporation" copyright. When we submitted
> commit e3de5dad2a5d ("net/bnx2x: change copyright info to Cavium"),
> the "Qlogic Corporation" copyright was accidentally replaced
> with "Cavium Inc". So now we see multiple Cavium copyright messages.
> We're changing it to "Broadcom Corporation" copyright.
>
> Fixes: e3de5dad2a5d ("net/bnx2x: change copyright info to Cavium")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Rasesh Mody
Applied
Re: [dpdk-dev] [PATCH v3] net/bnx2x: move SPDX tags to source files
27/07/2018 17:47, Rasesh Mody: > We were using LICENSE.bnx2x_pmd to reference inclusion of SPDX licensing > tag from all the source file. Remove the LICENSE.bnx2x_pmd file and > directly include SPDX tags in source files. > > Signed-off-by: Rasesh Mody > Acked-by: Hemant Agrawal Applied
Re: [dpdk-dev] [PATCH v10 0/5] add unit tests for bitrate, latency and pdump libraries
03/08/2018 16:16, Parthasarathy, JananeeX M:
> Hi Thomas,
>
> From: Pattan, Reshma
> >
> >Hi Thomas,
> >
> > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> >> 01/08/2018 00:18, Reshma Pattan:
> >> > v10: fixed clang compiler issues and freed latency stats memzone in
> >> > latency stats unit tests.
> >> > v9: rebased ontop of latest autotest changes and added new tests to
> >> > the autotest list
> >> > v8: renamed commit headline and freed the metrics memzone for
> >> > bitrate ut
> >> > v7: removed unused macros and corrected the comment
> >> > v6: updated ring variable appropriately
> >> > v5: rebased, freed pools and rings, created common patch set
> >> > ---
> >>
> >> Sorry, the integration of this patchset is very painful.
> >>
> >> After asking for rebase, for clang fix, there are still some basic
> >> errors with 32- bit compilation:
> >>
> >>test_latencystats.c:131:21: error:
> >>format ‘%ld’ expects argument of type ‘long int’,
> >>but argument 2 has type ‘uint64_t’ {aka ‘long long unsigned int’}
> >>
> >> linkage:
> >>
> >>test@test@@dpdk-test@exe/test.c.o:(.data+0x18): undefined
> >reference
> >> to `test_pdump'
> >>
> >> or even MAINTAINERS file:
> >>
> >>test/test/sample_packet_forward.c
> >>test/test/sample_packet_forward.h
> >>test/test/test_bitratestats.c
> >>test/test/test_latencystats.c
> >>
> >> I have already spent too much time on it, despite it is not fixing 18.08.
> >>
> >> Please do a complete detailed review of this series, so it can be
> >> considered for 18.11.
> >>
> >
> >We missed to do these basic checks, apologies for consuming your time.
> > Naga Suresh has now proactively worked on fixing these issues and running
> >pre checks on patches and addressed in v12.
> >The earlier versions were reviewed by me, Remy and Anatoly . So we request
> >you to consider latest patches for 18.08, until unless they don’t give any
> >last
> >minute surprises.
> >
> >Thanks,
> >Reshma
> >
> >
> >
> Apologies very much to miss the earlier patch pre-checks.
> We have gone through the cheatsheet and validated pre-checks in the patch v12.
> Compiled Successfully in Fedora 27, Fedora 26, CentOS 7.2, CentOS 7.4, Ubuntu
> for both 32bit/64bit and FreeBSD (64bit)
> Build using compilers gcc, icc, clang were successful in Fedora.
> Shared Library builds were successful in Fedora 27, CentOS 7.2 and Ubuntu
>
> Executed checkpatch, check-git-log without any errors.
> Code changes were acknowledged by reviewers.
>
> Request to please consider the patch set v12 to be included in RC3 18.08.
>
> In case of any info/change please let us know.
Why are you insisting so much?
I have already replied to Reshma that it is too late and not urgent:
http://mails.dpdk.org/archives/dev/2018-August/109352.html
Please do not make it even more difficult.
I just do not want to spend more time on this series now.
When I will take time, I will do a better review, and I can promise
that I will have some comments.
So please consider my earlier comment to avoid burning too much time:
"Please do a complete detailed review of this series"
After a quick look, I already see some suspicious includes, linkage,
and last 2 patches should be integrated with others.
To make it clear, the quality was not good and I already burnt too much time.
I won't spend more time on it during August.
Re: [dpdk-dev] [PATCH v4] rte_ring: clarify preemptible nature of ring algorithm
On Mon, Jul 16, 2018 at 11:52:44PM -0500, Honnappa Nagarahalli wrote: > rte_ring implementation is not preemptible only under certain > circumstances. This clarification is helpful for data plane and > control plane communication using rte_ring. > > Signed-off-by: Honnappa Nagarahalli > Reviewed-by: Gavin Hu > Reviewed-by: Ola Liljedahl Acked-by: Olivier Matz Thanks!
Re: [dpdk-dev] [PATCH] net/dpaa2: remove unnecessary loop for unused pool entries
31/07/2018 15:52, Shreyansh Jain:
> On 7/31/2018 1:21 PM, Gavin Hu wrote:
> > Currently only one buffer pool is configured and in use,
> > looping for up to maxmum 8 times is unnecessary and might
> > be buggy as assigned uninititalized values.
> >
> > The fix is to loop for the configured times with initialize
> > with valid values.
> >
> > Fixes: 16bbc98a3e ("bus/fslmc: update MC to 10.3.x")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Gavin Hu
> > Reviewed-by: Honnappa Nagarahalli
> > ---
>
> Acked-by: Shreyansh Jain
Applied, thanks
Re: [dpdk-dev] [PATCH] hash table: add a bucket iterator function
On Wed, 1 Aug 2018 08:57:39 -0400 Michel Machado wrote: > On 07/31/2018 09:40 PM, Wang, Yipeng1 wrote: > > How about an API that is more universal? For example, an API such as > > "rte_iterate_conflict_entries". After an insertion failure, this function > > will iterate all entries that may conflict with the newly inserted key and > > you could decide which entry to evict? > > Fine. We'll rewrite the patch to do so. > > Thank you for the feedback. > > [ ]'s > Michel Machado Often for time based cleanup it is better to have a second linked list that is ordered by time value. Then the cleanup code can start at the oldest stop when it reaches the last item that could expire. That does mean having some form of lock and doing delete/insert on every usage. i.e spinlock(&timer_lock); TAILQ_REMOVE(&timer_list, entry, timer_list); entry->expiration = new time; TAILQ_INSERT_TAIL(&timer_list, entry, timer_list); spinunlock(&timer_unlock);
[dpdk-dev] [pull-request] next-crypto 18.08-rc3
The following changes since commit e94be227b7ea025d8fd0ee5d79052a8c31d432c6: net/dpaa2: remove loop for unused pool entries (2018-08-03 17:09:44 +0200) are available in the Git repository at: http://dpdk.org/git/next/dpdk-next-crypto for you to fetch changes up to fb33043c4552e1166bbb3a8d9f140aacd0377ef9: common/qat: fix offset greater than first sgl segment (2018-08-03 08:14:24 +0100) Lee Daly (1): compress/isal: fix offset check Pablo de Lara (1): app/crypto-perf: fix auth IV offset Tomasz Jozwiak (2): compress/qat: fix buffer lengths in offset case common/qat: fix offset greater than first sgl segment app/test-crypto-perf/cperf_ops.c | 3 ++ drivers/common/qat/qat_common.c | 77 +-- drivers/common/qat/qat_common.h | 2 +- drivers/compress/isal/isal_compress_pmd.c | 10 ++-- drivers/compress/qat/qat_comp.c | 19 drivers/crypto/qat/qat_sym.c | 18 6 files changed, 61 insertions(+), 68 deletions(-)
Re: [dpdk-dev] [PATCH 07/10] mlx5: update code to use __rte_weak macro
> On Aug 3, 2018, at 7:06 AM, Keith Wiles wrote: > > Signed-off-by: Keith Wiles > --- Acked-by: Yongseok Koh Thanks
[dpdk-dev] [PATCH] mlx5: spelling fixes
Fix spelling errors in messages and comments.
Signed-off-by: Stephen Hemminger
---
drivers/net/mlx5/mlx5_ethdev.c | 2 +-
drivers/net/mlx5/mlx5_flow.c | 4 ++--
drivers/net/mlx5/mlx5_mr.c | 8
drivers/net/mlx5/mlx5_rxq.c| 20 ++--
drivers/net/mlx5/mlx5_rxtx.c | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 34c5b95ee6d2..2c838e6539b6 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -1138,7 +1138,7 @@ mlx5_dev_interrupt_handler_install(struct rte_eth_dev
*dev)
}
ret = mlx5_socket_init(dev);
if (ret)
- DRV_LOG(ERR, "port %u cannot initialise socket: %s",
+ DRV_LOG(ERR, "port %u cannot initialize socket: %s",
dev->data->port_id, strerror(rte_errno));
else if (priv->primary_socket) {
priv->intr_handle_socket.fd = priv->primary_socket;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b94c442ec4e6..d13178be6ba1 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1090,7 +1090,7 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item,
struct rte_flow *flow,
item,
"L3 cannot follow an L4 layer.");
/*
-* IPv6 is not recognised by the NIC inside a GRE tunnel.
+* IPv6 is not recognized by the NIC inside a GRE tunnel.
* Such support has to be disabled as the rule will be
* accepted. Issue reproduced with Mellanox OFED 4.3-3.0.2.1 and
* Mellanox OFED 4.4-1.0.0.0.
@@ -1100,7 +1100,7 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item,
struct rte_flow *flow,
RTE_FLOW_ERROR_TYPE_ITEM,
item,
"IPv6 inside a GRE tunnel is"
- " not recognised.");
+ " not recognized.");
if (!mask)
mask = &rte_flow_item_ipv6_mask;
ret = mlx5_flow_item_acceptable
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 1d1bcb5fe028..aa7ca355b4d8 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -446,7 +446,7 @@ mr_free(struct mlx5_mr *mr)
}
/**
- * Releass resources of detached MR having no online entry.
+ * Release resources of detached MR having no online entry.
*
* @param dev
* Pointer to Ethernet device.
@@ -496,7 +496,7 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list *msl,
}
/**
- * Create a new global Memroy Region (MR) for a missing virtual address.
+ * Create a new global Memory Region (MR) for a missing virtual address.
* Register entire virtually contiguous memory chunk around the address.
*
* @param dev
@@ -553,7 +553,7 @@ mlx5_mr_create(struct rte_eth_dev *dev, struct
mlx5_mr_cache *entry,
* Find out a contiguous virtual address chunk in use, to which the
* given address belongs, in order to register maximum range. In the
* best case where mempools are not dynamically recreated and
-* '--socket-mem' is speicified as an EAL option, it is very likely to
+* '--socket-mem' is specified as an EAL option, it is very likely to
* have only one MR(LKey) per a socket and per a hugepage-size even
* though the system memory is highly fragmented.
*/
@@ -604,7 +604,7 @@ mlx5_mr_create(struct rte_eth_dev *dev, struct
mlx5_mr_cache *entry,
bmp_mem = RTE_PTR_ALIGN_CEIL(mr + 1, RTE_CACHE_LINE_SIZE);
mr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size);
if (mr->ms_bmp == NULL) {
- DEBUG("port %u unable to initialize bitamp for a new MR of"
+ DEBUG("port %u unable to initialize bitmap for a new MR of"
" address (%p).",
dev->data->port_id, (void *)addr);
rte_errno = EINVAL;
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 16e1641d00bc..7c2d65ff2007 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -751,7 +751,7 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t
rx_queue_id)
* Queue index in DPDK Rx queue array
*
* @return
- * The Verbs object initialised, NULL otherwise and rte_errno is set.
+ * The Verbs object initialized, NULL otherwise and rte_errno is set.
*/
struct mlx5_rxq_ibv *
mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
@@ -1179,7 +1179,7 @@ mlx5_mprq_free_mp(struct rte_eth_dev *dev)
/**
* Allocate a mempool for Multi-Packet RQ. All configured Rx queues share the
- * mempool. If already allocated, reuse it if there're enough elements.
+ * mempool. If already allocated, reuse it if there are enoug
[dpdk-dev] [PATCH] net/mlx5: fix sanity check for MPLS-in-GRE
Multiple tunnel isn't allowed but MPLS over GRE should be accepted.
Fixes: a4a5cd21d20a ("net/mlx5: add flow MPLS item")
Signed-off-by: Yongseok Koh
---
drivers/net/mlx5/mlx5_flow.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b7500ec9d6..ca4625b699 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1778,7 +1778,9 @@ mlx5_flow_item_mpls(const struct rte_flow_item *item
__rte_unused,
item,
"protocol filtering not compatible"
" with MPLS layer");
- if (flow->layers & MLX5_FLOW_LAYER_TUNNEL)
+ /* Multi-tunnel isn't allowed but MPLS over GRE is an exception. */
+ if (flow->layers & MLX5_FLOW_LAYER_TUNNEL &&
+ (flow->layers & MLX5_FLOW_LAYER_GRE) != MLX5_FLOW_LAYER_GRE)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM,
item,
--
2.11.0
Re: [dpdk-dev] [PATCH] devtools: trap SIGINT is not recognizable to dash
On Wed, 1 Aug 2018 13:22:57 +0800
Gavin Hu wrote:
> When running checkpatch.sh, it generates the following error
> on some linux distributions(like Debian) with Dash as the
> default shell interpreter.
> trap: SIGINT: bad trap
>
> The fix is to replace SIGINT with INT signal, it works for
> both bash and dash.
>
> Fixes: 4bec48184e ("devtools: add checks for ABI symbol addition")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Gavin Hu
> Reviewed-by: Honnappa Nagarahalli
> ---
> devtools/checkpatches.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
> index 2509269df..ba795ad1d 100755
> --- a/devtools/checkpatches.sh
> +++ b/devtools/checkpatches.sh
> @@ -29,7 +29,7 @@ clean_tmp_files() {
> fi
> }
>
> -trap "clean_tmp_files" SIGINT
> +trap "clean_tmp_files" INT
>
> print_usage () {
> cat <<- END_OF_HELP
This patch alone is not sufficient to make checkpatch run successfully
./devtools/checkpatches.sh: 52: read: Illegal option -d
It looks like the -d flag to read is also a bash extension.
I recommend changing both checkpatches.sh and check-symbol-changes to have
#!/bin/bash
Re: [dpdk-dev] [PATCH] mlx5: spelling fixes
On Fri, Aug 03, 2018 at 01:31:48PM -0700, Stephen Hemminger wrote:
> Fix spelling errors in messages and comments.
>
> Signed-off-by: Stephen Hemminger
> ---
Hi Stephen,
'initialise' is accepted, not a typo. AFAIK, it is 'British' way.
Same for 'recognised' and 'finalise'. I don't want to enforce people to use
'non-Britain' English for mlx5 PMD. :-)
Other than those, thanks for correcting typos.
Please send out v2.
Thanks,
Yongseok
> drivers/net/mlx5/mlx5_ethdev.c | 2 +-
> drivers/net/mlx5/mlx5_flow.c | 4 ++--
> drivers/net/mlx5/mlx5_mr.c | 8
> drivers/net/mlx5/mlx5_rxq.c| 20 ++--
> drivers/net/mlx5/mlx5_rxtx.c | 2 +-
> 5 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index 34c5b95ee6d2..2c838e6539b6 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -1138,7 +1138,7 @@ mlx5_dev_interrupt_handler_install(struct rte_eth_dev
> *dev)
> }
> ret = mlx5_socket_init(dev);
> if (ret)
> - DRV_LOG(ERR, "port %u cannot initialise socket: %s",
> + DRV_LOG(ERR, "port %u cannot initialize socket: %s",
> dev->data->port_id, strerror(rte_errno));
> else if (priv->primary_socket) {
> priv->intr_handle_socket.fd = priv->primary_socket;
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index b94c442ec4e6..d13178be6ba1 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -1090,7 +1090,7 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item,
> struct rte_flow *flow,
> item,
> "L3 cannot follow an L4 layer.");
> /*
> - * IPv6 is not recognised by the NIC inside a GRE tunnel.
> + * IPv6 is not recognized by the NIC inside a GRE tunnel.
>* Such support has to be disabled as the rule will be
>* accepted. Issue reproduced with Mellanox OFED 4.3-3.0.2.1 and
>* Mellanox OFED 4.4-1.0.0.0.
> @@ -1100,7 +1100,7 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item,
> struct rte_flow *flow,
> RTE_FLOW_ERROR_TYPE_ITEM,
> item,
> "IPv6 inside a GRE tunnel is"
> - " not recognised.");
> + " not recognized.");
> if (!mask)
> mask = &rte_flow_item_ipv6_mask;
> ret = mlx5_flow_item_acceptable
> diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
> index 1d1bcb5fe028..aa7ca355b4d8 100644
> --- a/drivers/net/mlx5/mlx5_mr.c
> +++ b/drivers/net/mlx5/mlx5_mr.c
> @@ -446,7 +446,7 @@ mr_free(struct mlx5_mr *mr)
> }
>
> /**
> - * Releass resources of detached MR having no online entry.
> + * Release resources of detached MR having no online entry.
> *
> * @param dev
> * Pointer to Ethernet device.
> @@ -496,7 +496,7 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list
> *msl,
> }
>
> /**
> - * Create a new global Memroy Region (MR) for a missing virtual address.
> + * Create a new global Memory Region (MR) for a missing virtual address.
> * Register entire virtually contiguous memory chunk around the address.
> *
> * @param dev
> @@ -553,7 +553,7 @@ mlx5_mr_create(struct rte_eth_dev *dev, struct
> mlx5_mr_cache *entry,
>* Find out a contiguous virtual address chunk in use, to which the
>* given address belongs, in order to register maximum range. In the
>* best case where mempools are not dynamically recreated and
> - * '--socket-mem' is speicified as an EAL option, it is very likely to
> + * '--socket-mem' is specified as an EAL option, it is very likely to
>* have only one MR(LKey) per a socket and per a hugepage-size even
>* though the system memory is highly fragmented.
>*/
> @@ -604,7 +604,7 @@ mlx5_mr_create(struct rte_eth_dev *dev, struct
> mlx5_mr_cache *entry,
> bmp_mem = RTE_PTR_ALIGN_CEIL(mr + 1, RTE_CACHE_LINE_SIZE);
> mr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size);
> if (mr->ms_bmp == NULL) {
> - DEBUG("port %u unable to initialize bitamp for a new MR of"
> + DEBUG("port %u unable to initialize bitmap for a new MR of"
> " address (%p).",
> dev->data->port_id, (void *)addr);
> rte_errno = EINVAL;
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
> index 16e1641d00bc..7c2d65ff2007 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -751,7 +751,7 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t
> rx_queue_id)
> * Queue index in DPDK Rx queue array
> *
> * @return
> - * The Verbs object initialised, NULL
Re: [dpdk-dev] [PATCH] devtools: trap SIGINT is not recognizable to dash
Hi Stephen,
I am no sure only supporting bash is acceptable or not. Any impact to freebsd?
We should seek wider opinions about this.
I did not meet your problem, either bash or dash, what's your shell?
Best Regards,
Gavin
> -Original Message-
> From: Stephen Hemminger
> Sent: Saturday, August 4, 2018 6:17 AM
> To: Gavin Hu
> Cc: dev@dpdk.org; Honnappa Nagarahalli
> ; sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] devtools: trap SIGINT is not recognizable to
> dash
>
> On Wed, 1 Aug 2018 13:22:57 +0800
> Gavin Hu wrote:
>
> > When running checkpatch.sh, it generates the following error on some
> > linux distributions(like Debian) with Dash as the default shell
> > interpreter.
> > trap: SIGINT: bad trap
> >
> > The fix is to replace SIGINT with INT signal, it works for both bash
> > and dash.
> >
> > Fixes: 4bec48184e ("devtools: add checks for ABI symbol addition")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Gavin Hu
> > Reviewed-by: Honnappa Nagarahalli
> > ---
> > devtools/checkpatches.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index
> > 2509269df..ba795ad1d 100755
> > --- a/devtools/checkpatches.sh
> > +++ b/devtools/checkpatches.sh
> > @@ -29,7 +29,7 @@ clean_tmp_files() {
> > fi
> > }
> >
> > -trap "clean_tmp_files" SIGINT
> > +trap "clean_tmp_files" INT
> >
> > print_usage () {
> > cat <<- END_OF_HELP
>
> This patch alone is not sufficient to make checkpatch run successfully
>
> ./devtools/checkpatches.sh: 52: read: Illegal option -d
>
> It looks like the -d flag to read is also a bash extension.
>
> I recommend changing both checkpatches.sh and check-symbol-changes to
> have #!/bin/bash
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
