Re: [dpdk-dev] [PATCH v5 05/11] net/virtio: dump packed virtqueue data
On Mon, Sep 10, 2018 at 02:18:17PM +0800, Tiwei Bie wrote: On Mon, Sep 10, 2018 at 06:02:19AM +, Gavin Hu (Arm Technology China) wrote: > -Original Message- > From: dev On Behalf Of Jens Freimann > Sent: Friday, September 7, 2018 2:20 AM > To: dev@dpdk.org > Cc: tiwei@intel.com; maxime.coque...@redhat.com > Subject: [dpdk-dev] [PATCH v5 05/11] net/virtio: dump packed virtqueue > data > > Add support to dump packed virtqueue data to the > VIRTQUEUE_DUMP() macro. > > Signed-off-by: Jens Freimann Acked-by: Gavin Hu > --- > drivers/net/virtio/virtqueue.h | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h > index 53fce61b4..531ba8c65 100644 > --- a/drivers/net/virtio/virtqueue.h > +++ b/drivers/net/virtio/virtqueue.h > @@ -384,6 +384,12 @@ virtqueue_notify(struct virtqueue *vq) > uint16_t used_idx, nused; \ > used_idx = (vq)->vq_ring.used->idx; \ The vq_ring.used doesn't exist in packed ring. > nused = (uint16_t)(used_idx - (vq)->vq_used_cons_idx); \ The nused can't be calculated in this way in packed ring. you're right, this doesn't work. I will fix it and test properly. regards, Jens
Re: [dpdk-dev] [PATCH v5 02/11] net/virtio: add virtio 1.1 defines
On Mon, Sep 10, 2018 at 05:22:43AM +, Gavin Hu (Arm Technology China) wrote: The following 1.1 new defines should be added in this patch or the parent patch. VIRTIO_F_IO_BARRIER VIRTIO_F_SR_IOV I think I should rename this patch to "add packed virtqueue defines" instead. Above defines should be introduced in the appropriate patch set. Thanks for the review! regards, Jens
[dpdk-dev] [PATCH v3 02/10] event/dsw: add DSW device and queue configuration
Allow queue- and device-level configuration for and retrieval of
contextual information from a DSW event device.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.c | 87 +++
drivers/event/dsw/dsw_evdev.h | 28 +++
2 files changed, 115 insertions(+)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 6990bbc9e..1500d2426 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -9,6 +9,91 @@
#define EVENTDEV_NAME_DSW_PMD event_dsw
+static int
+dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
+ const struct rte_event_queue_conf *conf)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ struct dsw_queue *queue = &dsw->queues[queue_id];
+
+ if (RTE_EVENT_QUEUE_CFG_ALL_TYPES & conf->event_queue_cfg)
+ return -ENOTSUP;
+
+ if (conf->schedule_type == RTE_SCHED_TYPE_ORDERED)
+ return -ENOTSUP;
+
+ /* SINGLE_LINK is better off treated as TYPE_ATOMIC, since it
+* avoid the "fake" TYPE_PARALLEL flow_id assignment. Since
+* the queue will only have a single serving port, no
+* migration will ever happen, so the extra TYPE_ATOMIC
+* migration overhead is avoided.
+*/
+ if (RTE_EVENT_QUEUE_CFG_SINGLE_LINK & conf->event_queue_cfg)
+ queue->schedule_type = RTE_SCHED_TYPE_ATOMIC;
+ else /* atomic or parallel */
+ queue->schedule_type = conf->schedule_type;
+
+ queue->num_serving_ports = 0;
+
+ return 0;
+}
+
+static void
+dsw_queue_def_conf(struct rte_eventdev *dev __rte_unused,
+ uint8_t queue_id __rte_unused,
+ struct rte_event_queue_conf *queue_conf)
+{
+ *queue_conf = (struct rte_event_queue_conf) {
+ .nb_atomic_flows = 4096,
+ .schedule_type = RTE_SCHED_TYPE_ATOMIC,
+ .priority = RTE_EVENT_DEV_PRIORITY_NORMAL
+ };
+}
+
+static void
+dsw_queue_release(struct rte_eventdev *dev __rte_unused,
+ uint8_t queue_id __rte_unused)
+{
+}
+
+static void
+dsw_info_get(struct rte_eventdev *dev __rte_unused,
+struct rte_event_dev_info *info)
+{
+ *info = (struct rte_event_dev_info) {
+ .driver_name = DSW_PMD_NAME,
+ .max_event_queues = DSW_MAX_QUEUES,
+ .max_event_queue_flows = DSW_MAX_FLOWS,
+ .max_event_queue_priority_levels = 1,
+ .max_event_priority_levels = 1,
+ .max_event_ports = DSW_MAX_PORTS,
+ .max_event_port_dequeue_depth = DSW_MAX_PORT_DEQUEUE_DEPTH,
+ .max_event_port_enqueue_depth = DSW_MAX_PORT_ENQUEUE_DEPTH,
+ .max_num_events = DSW_MAX_EVENTS,
+ .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE|
+ RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED
+ };
+}
+
+static int
+dsw_configure(const struct rte_eventdev *dev)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ const struct rte_event_dev_config *conf = &dev->data->dev_conf;
+
+ dsw->num_queues = conf->nb_event_queues;
+
+ return 0;
+}
+
+static struct rte_eventdev_ops dsw_evdev_ops = {
+ .queue_setup = dsw_queue_setup,
+ .queue_def_conf = dsw_queue_def_conf,
+ .queue_release = dsw_queue_release,
+ .dev_infos_get = dsw_info_get,
+ .dev_configure = dsw_configure,
+};
+
static int
dsw_probe(struct rte_vdev_device *vdev)
{
@@ -23,6 +108,8 @@ dsw_probe(struct rte_vdev_device *vdev)
if (dev == NULL)
return -EFAULT;
+ dev->dev_ops = &dsw_evdev_ops;
+
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index 9a0f4c357..5eda8d114 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -9,8 +9,36 @@
#define DSW_PMD_NAME RTE_STR(event_dsw)
+/* Code changes are required to allow more ports. */
+#define DSW_MAX_PORTS (64)
+#define DSW_MAX_PORT_DEQUEUE_DEPTH (128)
+#define DSW_MAX_PORT_ENQUEUE_DEPTH (128)
+
+#define DSW_MAX_QUEUES (16)
+
+#define DSW_MAX_EVENTS (16384)
+
+/* Code changes are required to allow more flows than 32k. */
+#define DSW_MAX_FLOWS_BITS (15)
+#define DSW_MAX_FLOWS (1<<(DSW_MAX_FLOWS_BITS))
+#define DSW_MAX_FLOWS_MASK (DSW_MAX_FLOWS-1)
+
+struct dsw_queue {
+ uint8_t schedule_type;
+ uint16_t num_serving_ports;
+};
+
struct dsw_evdev {
struct rte_eventdev_data *data;
+
+ struct dsw_queue queues[DSW_MAX_QUEUES];
+ uint8_t num_queues;
};
+static inline struct dsw_evdev *
+dsw_pmd_priv(const struct rte_eventdev *eventdev)
+{
+ return eventdev->data->dev_private;
+}
+
#endif
--
2.17.1
[dpdk-dev] [PATCH v3 01/10] event/dsw: add DSW device registration and build system
This patch contains the Meson and GNU Make build system extensions
required for the Distributed Event Device, and also the initialization
code for the driver itself.
Signed-off-by: Mattias Rönnblom
---
config/common_base| 5 ++
drivers/event/Makefile| 1 +
drivers/event/dsw/Makefile| 26 ++
drivers/event/dsw/dsw_evdev.c | 52 +++
drivers/event/dsw/dsw_evdev.h | 16 ++
drivers/event/dsw/meson.build | 6 +++
.../event/dsw/rte_pmd_dsw_event_version.map | 3 ++
drivers/event/meson.build | 2 +-
mk/rte.app.mk | 1 +
9 files changed, 111 insertions(+), 1 deletion(-)
create mode 100644 drivers/event/dsw/Makefile
create mode 100644 drivers/event/dsw/dsw_evdev.c
create mode 100644 drivers/event/dsw/dsw_evdev.h
create mode 100644 drivers/event/dsw/meson.build
create mode 100644 drivers/event/dsw/rte_pmd_dsw_event_version.map
diff --git a/config/common_base b/config/common_base
index 4bcbaf923..c43f5139d 100644
--- a/config/common_base
+++ b/config/common_base
@@ -614,6 +614,11 @@ CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n
#
CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y
+#
+# Compile PMD for distributed software event device
+#
+CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y
+
#
# Compile PMD for octeontx sso event device
#
diff --git a/drivers/event/Makefile b/drivers/event/Makefile
index f301d8dc2..03ad1b6cb 100644
--- a/drivers/event/Makefile
+++ b/drivers/event/Makefile
@@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton
DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw
DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx
ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa
diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile
new file mode 100644
index 0..5cbf488ff
--- /dev/null
+++ b/drivers/event/dsw/Makefile
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Ericsson AB
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+LIB = librte_pmd_dsw_event.a
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -Wno-format-nonliteral
+
+LDLIBS += -lrte_eal
+LDLIBS += -lrte_mbuf
+LDLIBS += -lrte_mempool
+LDLIBS += -lrte_ring
+LDLIBS += -lrte_eventdev
+LDLIBS += -lrte_bus_vdev
+
+LIBABIVER := 1
+
+EXPORT_MAP := rte_pmd_dsw_event_version.map
+
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw_evdev.c
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
new file mode 100644
index 0..6990bbc9e
--- /dev/null
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Ericsson AB
+ */
+
+#include
+#include
+
+#include "dsw_evdev.h"
+
+#define EVENTDEV_NAME_DSW_PMD event_dsw
+
+static int
+dsw_probe(struct rte_vdev_device *vdev)
+{
+ const char *name;
+ struct rte_eventdev *dev;
+ struct dsw_evdev *dsw;
+
+ name = rte_vdev_device_name(vdev);
+
+ dev = rte_event_pmd_vdev_init(name, sizeof(struct dsw_evdev),
+ rte_socket_id());
+ if (dev == NULL)
+ return -EFAULT;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ dsw = dev->data->dev_private;
+ dsw->data = dev->data;
+
+ return 0;
+}
+
+static int
+dsw_remove(struct rte_vdev_device *vdev)
+{
+ const char *name;
+
+ name = rte_vdev_device_name(vdev);
+ if (name == NULL)
+ return -EINVAL;
+
+ return rte_event_pmd_vdev_uninit(name);
+}
+
+static struct rte_vdev_driver evdev_dsw_pmd_drv = {
+ .probe = dsw_probe,
+ .remove = dsw_remove
+};
+
+RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_DSW_PMD, evdev_dsw_pmd_drv);
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
new file mode 100644
index 0..9a0f4c357
--- /dev/null
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Ericsson AB
+ */
+
+#ifndef _DSW_EVDEV_H_
+#define _DSW_EVDEV_H_
+
+#include
+
+#define DSW_PMD_NAME RTE_STR(event_dsw)
+
+struct dsw_evdev {
+ struct rte_eventdev_data *data;
+};
+
+#endif
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
new file mode 100644
index 0..275d051c3
--- /dev/null
+++ b/drivers/event/dsw/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Ericsson AB
+
+allow_experimental_apis = true
+deps += ['bus_vdev']
+sources = files('dsw_evdev.c')
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map
b/drivers/event/dsw/rte_pmd_dsw_event_version.map
new file mode 100644
index 0
[dpdk-dev] [PATCH v3 00/10] A Distributed Software Event Device
v3: * Fixed incorrect headline prefixes. * Removed dummy dsw_event_schedule() function. * Removed redundant output buffer flush. v2: * Added support for Meson builds. * Eventdev 'xstats' support is now mandatory. * Added check in dsw_probe() to allow secondary processes. * rte_event_dev_stop() now runs the flush callback. * Added documentation. * Fixed uninitialized-use warning in ‘dsw_port_consider_migration'. * Removed some dead (#if 0) debugging code. * Version .map file is bumped to 18.11. * Header files sorted in alphabetic order, newline after declarations and various other coding style-related improvements. This is the Distributed Software (DSW) event device, which distributes the task of scheduling events among all the eventdev ports and their lcore threads. DSW is primarily designed for atomic-only queues, but also supports single-link and parallel queues. (DSW would be more accurately described as 'parallel', but since that term is used to describe an eventdev queue type, it's referred to as 'distributed', to avoid suggesting it's somehow biased toward parallel queues.) Event Scheduling Internally, DSW hashes an eventdev flow id to a 15-bit "flow hash". For each eventdev queue, there's a table mapping a flow hash to an eventdev port. That port is considered the owner of the flow. Owners are randomly picked at initialization time, among the ports serving (i.e. are linked to) that queue. The scheduling of an event to a port is done (by the sender port) at time of the enqueue operation, and in most cases simply consists of hashing the flow id and performing a lookup in the destination queue's table. Each port has an MP/SC event ring to which the events are enqueued. This means events go directly port-to-port, typically meaning core-to-core. Port Load Measurement = DSW includes a concept of port load. The event device keeps track of transitions between "idle" and "busy" (or vice versa) on a per-port basis, compares this to the wall time passed, and computes to what extent the port was busy (for a certain interval). A port transitions to "busy" on a non-zero dequeue, and again back to "idle" at the point it performs a dequeue operation returning zero events. Flow Migration == Periodically, hidden to the API user and as a part of a normal enqueue/dequeue operations, a port updates its load estimate, and in case the load has reached a certain threshold, considers moving one of its flow to a different, more lightly loaded, port. This process is called migration. Migration Strategy ~~ The DSW migration strategy is to move a small, but yet active flow. To quickly find which are the active flows (w/o resorting to scanning through the tables and/or keeping per-event counters), each port maintains a list of the last 128 events it has dequeued. If there are lightly-loaded enough target ports, it will attempt to migrate one of those flows, starting with the smallest. The size is estimated by the number of events seen on that flow, in that small sample of events. A good migration strategy, based on reasonably good estimates of port and current flow event rates, is key for proper load balancing in a DSW-style event device. Migration Process ~ If the prerequisites are met, and a migration target flow and port is found, the owning (source) port will initiate the migration process. For parallel queues it's a very straightforward operation - simply a table update. For atomic queues, in order to maintain their semantics, it's a fair bit more elaborate a procedure. A high-level view the migration process is available[1] in the form a sequence diagram. Much simplified, it consist of the source port sending messages to all ports configured, asking them to "pause" the to-be-migrated flow. Such ports will flush their output buffers and provide a confirmation back to the source port. Each port holds a list of which flows are paused. Upon the enqueue of an event belonging to a paused flow, it will be accepted into the machinery, but kept in a paused-events buffer located on the sending port. After receiving confirmations from all ports, the source port will make sure its application-level user has finished processing of all events related to the migrating flow, update the relevant queue's table, and forward all unprocessed events (in its input event ring) to the new target port. The source port will then send out a request to "unpause" the flow to all ports. Upon receiving such a request, the port will flush any buffered (paused) events related to the paused flow, and provide a confirmation. All the signaling are done on regular DPDK rings (separate from the event-carrying rings), and are pulled as a part of normal enqueue/dequeue operation. The migrations can be made fairly rapidly (in the range of a couple hundred us, or even faster), but the algorithm, load measurement and migration interval parameters must be careful
[dpdk-dev] [PATCH v3 03/10] event/dsw: add DSW port configuration
Allow port setup and release in the DSW event device.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.c | 60 +++
drivers/event/dsw/dsw_evdev.h | 28
2 files changed, 88 insertions(+)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 1500d2426..91b1a2449 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -9,6 +9,62 @@
#define EVENTDEV_NAME_DSW_PMD event_dsw
+static int
+dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
+ const struct rte_event_port_conf *conf)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ struct dsw_port *port;
+ struct rte_event_ring *in_ring;
+ char ring_name[RTE_RING_NAMESIZE];
+
+ port = &dsw->ports[port_id];
+
+ *port = (struct dsw_port) {
+ .id = port_id,
+ .dsw = dsw,
+ .dequeue_depth = conf->dequeue_depth,
+ .enqueue_depth = conf->enqueue_depth,
+ .new_event_threshold = conf->new_event_threshold
+ };
+
+ snprintf(ring_name, sizeof(ring_name), "dsw%d_p%u", dev->data->dev_id,
+port_id);
+
+ in_ring = rte_event_ring_create(ring_name, DSW_IN_RING_SIZE,
+ dev->data->socket_id,
+ RING_F_SC_DEQ|RING_F_EXACT_SZ);
+
+ if (in_ring == NULL)
+ return -ENOMEM;
+
+ port->in_ring = in_ring;
+
+ dev->data->ports[port_id] = port;
+
+ return 0;
+}
+
+static void
+dsw_port_def_conf(struct rte_eventdev *dev __rte_unused,
+ uint8_t port_id __rte_unused,
+ struct rte_event_port_conf *port_conf)
+{
+ *port_conf = (struct rte_event_port_conf) {
+ .new_event_threshold = 1024,
+ .dequeue_depth = DSW_MAX_PORT_DEQUEUE_DEPTH / 4,
+ .enqueue_depth = DSW_MAX_PORT_ENQUEUE_DEPTH / 4
+ };
+}
+
+static void
+dsw_port_release(void *p)
+{
+ struct dsw_port *port = p;
+
+ rte_event_ring_free(port->in_ring);
+}
+
static int
dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
const struct rte_event_queue_conf *conf)
@@ -81,12 +137,16 @@ dsw_configure(const struct rte_eventdev *dev)
struct dsw_evdev *dsw = dsw_pmd_priv(dev);
const struct rte_event_dev_config *conf = &dev->data->dev_conf;
+ dsw->num_ports = conf->nb_event_ports;
dsw->num_queues = conf->nb_event_queues;
return 0;
}
static struct rte_eventdev_ops dsw_evdev_ops = {
+ .port_setup = dsw_port_setup,
+ .port_def_conf = dsw_port_def_conf,
+ .port_release = dsw_port_release,
.queue_setup = dsw_queue_setup,
.queue_def_conf = dsw_queue_def_conf,
.queue_release = dsw_queue_release,
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index 5eda8d114..2a4f10421 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -5,6 +5,7 @@
#ifndef _DSW_EVDEV_H_
#define _DSW_EVDEV_H_
+#include
#include
#define DSW_PMD_NAME RTE_STR(event_dsw)
@@ -23,6 +24,31 @@
#define DSW_MAX_FLOWS (1<<(DSW_MAX_FLOWS_BITS))
#define DSW_MAX_FLOWS_MASK (DSW_MAX_FLOWS-1)
+/* The rings are dimensioned so that all in-flight events can reside
+ * on any one of the port rings, to avoid the trouble of having to
+ * care about the case where there's no room on the destination port's
+ * input ring.
+ */
+#define DSW_IN_RING_SIZE (DSW_MAX_EVENTS)
+
+struct dsw_port {
+ uint16_t id;
+
+ /* Keeping a pointer here to avoid container_of() calls, which
+* are expensive since they are very frequent and will result
+* in an integer multiplication (since the port id is an index
+* into the dsw_evdev port array).
+*/
+ struct dsw_evdev *dsw;
+
+ uint16_t dequeue_depth;
+ uint16_t enqueue_depth;
+
+ int32_t new_event_threshold;
+
+ struct rte_event_ring *in_ring __rte_cache_aligned;
+} __rte_cache_aligned;
+
struct dsw_queue {
uint8_t schedule_type;
uint16_t num_serving_ports;
@@ -31,6 +57,8 @@ struct dsw_queue {
struct dsw_evdev {
struct rte_eventdev_data *data;
+ struct dsw_port ports[DSW_MAX_PORTS];
+ uint16_t num_ports;
struct dsw_queue queues[DSW_MAX_QUEUES];
uint8_t num_queues;
};
--
2.17.1
[dpdk-dev] [PATCH v3 04/10] event/dsw: add support in DSW for linking/unlinking ports
Added support for linking and unlinking ports to queues in a DSW event
device.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.c | 67 +++
drivers/event/dsw/dsw_evdev.h | 1 +
2 files changed, 68 insertions(+)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 91b1a2449..5dccc232a 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -2,6 +2,8 @@
* Copyright(c) 2018 Ericsson AB
*/
+#include
+
#include
#include
@@ -112,6 +114,69 @@ dsw_queue_release(struct rte_eventdev *dev __rte_unused,
{
}
+static void
+queue_add_port(struct dsw_queue *queue, uint16_t port_id)
+{
+ queue->serving_ports[queue->num_serving_ports] = port_id;
+ queue->num_serving_ports++;
+}
+
+static bool
+queue_remove_port(struct dsw_queue *queue, uint16_t port_id)
+{
+ uint16_t i;
+
+ for (i = 0; i < queue->num_serving_ports; i++)
+ if (queue->serving_ports[i] == port_id) {
+ uint16_t last_idx = queue->num_serving_ports - 1;
+ if (i != last_idx)
+ queue->serving_ports[i] =
+ queue->serving_ports[last_idx];
+ queue->num_serving_ports--;
+ return true;
+ }
+ return false;
+}
+
+static int
+dsw_port_link_unlink(struct rte_eventdev *dev, void *port,
+const uint8_t queues[], uint16_t num, bool link)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ struct dsw_port *p = port;
+ uint16_t i;
+ uint16_t count = 0;
+
+ for (i = 0; i < num; i++) {
+ uint8_t qid = queues[i];
+ struct dsw_queue *q = &dsw->queues[qid];
+ if (link) {
+ queue_add_port(q, p->id);
+ count++;
+ } else {
+ bool removed = queue_remove_port(q, p->id);
+ if (removed)
+ count++;
+ }
+ }
+
+ return count;
+}
+
+static int
+dsw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
+ const uint8_t priorities[] __rte_unused, uint16_t num)
+{
+ return dsw_port_link_unlink(dev, port, queues, num, true);
+}
+
+static int
+dsw_port_unlink(struct rte_eventdev *dev, void *port, uint8_t queues[],
+ uint16_t num)
+{
+ return dsw_port_link_unlink(dev, port, queues, num, false);
+}
+
static void
dsw_info_get(struct rte_eventdev *dev __rte_unused,
struct rte_event_dev_info *info)
@@ -150,6 +215,8 @@ static struct rte_eventdev_ops dsw_evdev_ops = {
.queue_setup = dsw_queue_setup,
.queue_def_conf = dsw_queue_def_conf,
.queue_release = dsw_queue_release,
+ .port_link = dsw_port_link,
+ .port_unlink = dsw_port_unlink,
.dev_infos_get = dsw_info_get,
.dev_configure = dsw_configure,
};
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index 2a4f10421..ad0f857cc 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -51,6 +51,7 @@ struct dsw_port {
struct dsw_queue {
uint8_t schedule_type;
+ uint8_t serving_ports[DSW_MAX_PORTS];
uint16_t num_serving_ports;
};
--
2.17.1
[dpdk-dev] [PATCH v3 06/10] event/dsw: add DSW port load measurements
The DSW event device port now attempts to estimate its load (i.e. how
busy it is). This is required for load balancing to work (although
load balancing is not included in this patch), and may also be useful
for debugging purposes.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.c | 14 +
drivers/event/dsw/dsw_evdev.h | 40 +
drivers/event/dsw/dsw_event.c | 109 ++
3 files changed, 163 insertions(+)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 40a7435be..bcfa17bab 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -4,6 +4,7 @@
#include
+#include
#include
#include
#include
@@ -43,6 +44,11 @@ dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
port->in_ring = in_ring;
+ rte_atomic16_init(&port->load);
+
+ port->load_update_interval =
+ (DSW_LOAD_UPDATE_INTERVAL * rte_get_timer_hz()) / US_PER_S;
+
dev->data->ports[port_id] = port;
return 0;
@@ -240,11 +246,19 @@ static int
dsw_start(struct rte_eventdev *dev)
{
struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ uint16_t i;
+ uint64_t now;
rte_atomic32_init(&dsw->credits_on_loan);
initial_flow_to_port_assignment(dsw);
+ now = rte_get_timer_cycles();
+ for (i = 0; i < dsw->num_ports; i++) {
+ dsw->ports[i].measurement_start = now;
+ dsw->ports[i].busy_start = now;
+ }
+
return 0;
}
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index f8e94e4a4..a5399dda5 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -36,6 +36,15 @@
*/
#define DSW_PARALLEL_FLOWS (1024)
+/* 'Background tasks' are polling the control rings for *
+ * migration-related messages, or flush the output buffer (so
+ * buffered events doesn't linger too long). Shouldn't be too low,
+ * since the system won't benefit from the 'batching' effects from
+ * the output buffer, and shouldn't be too high, since it will make
+ * buffered events linger too long in case the port goes idle.
+ */
+#define DSW_MAX_PORT_OPS_PER_BG_TASK (128)
+
/* Avoid making small 'loans' from the central in-flight event credit
* pool, to improve efficiency.
*/
@@ -50,6 +59,22 @@
*/
#define DSW_IN_RING_SIZE (DSW_MAX_EVENTS)
+#define DSW_MAX_LOAD (INT16_MAX)
+#define DSW_LOAD_FROM_PERCENT(x) ((int16_t)(((x)*DSW_MAX_LOAD)/100))
+#define DSW_LOAD_TO_PERCENT(x) ((100*x)/DSW_MAX_LOAD)
+
+/* The thought behind keeping the load update interval shorter than
+ * the migration interval is that the load from newly migrated flows
+ * should 'show up' on the load measurement before new migrations are
+ * considered. This is to avoid having too many flows, from too many
+ * source ports, to be migrated too quickly to a lightly loaded port -
+ * in particular since this might cause the system to oscillate.
+ */
+#define DSW_LOAD_UPDATE_INTERVAL (DSW_MIGRATION_INTERVAL/4)
+#define DSW_OLD_LOAD_WEIGHT (1)
+
+#define DSW_MIGRATION_INTERVAL (1000)
+
struct dsw_port {
uint16_t id;
@@ -71,10 +96,25 @@ struct dsw_port {
uint16_t next_parallel_flow_id;
+ uint16_t ops_since_bg_task;
+
+ uint64_t last_bg;
+
+ /* For port load measurement. */
+ uint64_t next_load_update;
+ uint64_t load_update_interval;
+ uint64_t measurement_start;
+ uint64_t busy_start;
+ uint64_t busy_cycles;
+ uint64_t total_busy_cycles;
+
uint16_t out_buffer_len[DSW_MAX_PORTS];
struct rte_event out_buffer[DSW_MAX_PORTS][DSW_MAX_PORT_OUT_BUFFER];
struct rte_event_ring *in_ring __rte_cache_aligned;
+
+ /* Estimate of current port load. */
+ rte_atomic16_t load __rte_cache_aligned;
} __rte_cache_aligned;
struct dsw_queue {
diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index 4a3af8ecd..f326147c9 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -7,6 +7,7 @@
#include
#include
+#include
#include
static bool
@@ -75,6 +76,70 @@ dsw_port_return_credits(struct dsw_evdev *dsw, struct
dsw_port *port,
}
}
+static void
+dsw_port_load_record(struct dsw_port *port, unsigned int dequeued)
+{
+ if (dequeued > 0 && port->busy_start == 0)
+ /* work period begins */
+ port->busy_start = rte_get_timer_cycles();
+ else if (dequeued == 0 && port->busy_start > 0) {
+ /* work period ends */
+ uint64_t work_period =
+ rte_get_timer_cycles() - port->busy_start;
+ port->busy_cycles += work_period;
+ port->busy_start = 0;
+ }
+}
+
+static int16_t
+dsw_port_load_close_period(struct dsw_port *port, uint64_t now)
+{
+ uint64_t passed = now - port->measurement_start;
+ uint64_t busy_cycles = port->busy_cycle
[dpdk-dev] [PATCH v3 08/10] event/dsw: let DSW event device sort events on dequeue
With this patch, the DSW event device will (optionally) sort the event
burst before giving it to the application. The sorting will primarily
be on queue id, and secondary on flow id.
The sorting is an attempt to optimize data and instruction cache usage
for the application, at the cost of additional event device overhead.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.h | 11
drivers/event/dsw/dsw_event.c | 23 +
drivers/event/dsw/dsw_sort.h | 48 +++
3 files changed, 82 insertions(+)
create mode 100644 drivers/event/dsw/dsw_sort.h
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index 783c418bf..f6f8f0454 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -93,6 +93,17 @@
*/
#define DSW_CTL_IN_RING_SIZE ((DSW_MAX_PORTS-1)*4)
+/* With DSW_SORT_DEQUEUED enabled, the scheduler will, at the point of
+ * dequeue(), arrange events so that events with the same flow id on
+ * the same queue forms a back-to-back "burst", and also so that such
+ * bursts of different flow ids, but on the same queue, also come
+ * consecutively. All this in an attempt to improve data and
+ * instruction cache usage for the application, at the cost of a
+ * scheduler overhead increase.
+ */
+
+/* #define DSW_SORT_DEQUEUED */
+
struct dsw_queue_flow {
uint8_t queue_id;
uint16_t flow_hash;
diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index f0347592d..a84b19c33 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -4,6 +4,10 @@
#include "dsw_evdev.h"
+#ifdef DSW_SORT_DEQUEUED
+#include "dsw_sort.h"
+#endif
+
#include
#include
@@ -1121,6 +1125,21 @@ dsw_port_record_seen_events(struct dsw_port *port,
struct rte_event *events,
DSW_MAX_EVENTS_RECORDED);
}
+#ifdef DSW_SORT_DEQUEUED
+
+#define DSW_EVENT_TO_INT(_event) \
+ ((int)_event)->queue_id)<<16)|((_event)->flow_id)))
+
+static inline int
+dsw_cmp_event(const void *v_event_a, const void *v_event_b)
+{
+ const struct rte_event *event_a = v_event_a;
+ const struct rte_event *event_b = v_event_b;
+
+ return DSW_EVENT_TO_INT(event_a) - DSW_EVENT_TO_INT(event_b);
+}
+#endif
+
static uint16_t
dsw_port_dequeue_burst(struct dsw_port *port, struct rte_event *events,
uint16_t num)
@@ -1191,5 +1210,9 @@ dsw_event_dequeue_burst(void *port, struct rte_event
*events, uint16_t num,
* 0.
*/
+#ifdef DSW_SORT_DEQUEUED
+ dsw_stable_sort(events, dequeued, sizeof(events[0]), dsw_cmp_event);
+#endif
+
return dequeued;
}
diff --git a/drivers/event/dsw/dsw_sort.h b/drivers/event/dsw/dsw_sort.h
new file mode 100644
index 0..609767fdf
--- /dev/null
+++ b/drivers/event/dsw/dsw_sort.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Ericsson AB
+ */
+
+#ifndef _DSW_SORT_
+#define _DSW_SORT_
+
+#include
+
+#include
+
+#define DSW_ARY_ELEM_PTR(_ary, _idx, _elem_size) \
+ RTE_PTR_ADD(_ary, (_idx) * (_elem_size))
+
+#define DSW_ARY_ELEM_SWAP(_ary, _a_idx, _b_idx, _elem_size)\
+ do {\
+ char tmp[_elem_size]; \
+ void *_a_ptr = DSW_ARY_ELEM_PTR(_ary, _a_idx, _elem_size); \
+ void *_b_ptr = DSW_ARY_ELEM_PTR(_ary, _b_idx, _elem_size); \
+ memcpy(tmp, _a_ptr, _elem_size);\
+ memcpy(_a_ptr, _b_ptr, _elem_size); \
+ memcpy(_b_ptr, tmp, _elem_size);\
+ } while (0)
+
+static inline void
+dsw_insertion_sort(void *ary, uint16_t len, uint16_t elem_size,
+ int (*cmp_fn)(const void *, const void *))
+{
+ uint16_t i;
+
+ for (i = 1; i < len; i++) {
+ uint16_t j;
+ for (j = i; j > 0 &&
+cmp_fn(DSW_ARY_ELEM_PTR(ary, j-1, elem_size),
+ DSW_ARY_ELEM_PTR(ary, j, elem_size)) > 0;
+j--)
+ DSW_ARY_ELEM_SWAP(ary, j, j-1, elem_size);
+ }
+}
+
+static inline void
+dsw_stable_sort(void *ary, uint16_t len, uint16_t elem_size,
+ int (*cmp_fn)(const void *, const void *))
+{
+ dsw_insertion_sort(ary, len, elem_size, cmp_fn);
+}
+
+#endif
--
2.17.1
[dpdk-dev] [PATCH v3 10/10] event/dsw: include DSW event device documentation
The DSW event device is documented in DPDK Programmer's Guide.
Signed-off-by: Mattias Rönnblom
---
doc/guides/eventdevs/dsw.rst | 97 ++
doc/guides/eventdevs/index.rst | 1 +
2 files changed, 98 insertions(+)
create mode 100644 doc/guides/eventdevs/dsw.rst
diff --git a/doc/guides/eventdevs/dsw.rst b/doc/guides/eventdevs/dsw.rst
new file mode 100644
index 0..de41ae9d3
--- /dev/null
+++ b/doc/guides/eventdevs/dsw.rst
@@ -0,0 +1,97 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2017 Intel Corporation.
+Copyright(c) 2018 Ericsson AB
+
+Distributed Software Eventdev Poll Mode Driver
+==
+
+The distributed software eventdev is a parallel implementation of the
+eventdev API, which distributes the task of scheduling events among
+all the eventdev ports and the lcore threads using them.
+
+Features
+
+
+Queues
+ * Atomic
+ * Parallel
+ * Single-Link
+
+Ports
+ * Load balanced (for Atomic, Ordered, Parallel queues)
+ * Single Link (for single-link queues)
+
+Configuration and Options
+-
+
+The distributed software eventdev is a vdev device, and as such can be
+created from the application code, or from the EAL command line:
+
+* Call ``rte_vdev_init("event_dsw0")`` from the application
+
+* Use ``--vdev="event_dsw0"`` in the EAL options, which will call
+ rte_vdev_init() internally
+
+Example:
+
+.. code-block:: console
+
+./your_eventdev_application --vdev="event_dsw0"
+
+Limitations
+---
+
+Unattended Ports
+
+
+The distributed software eventdev uses an internal signaling schema
+between the ports to achieve load balancing. In order for this to
+work, the application must perform enqueue and/or dequeue operations
+on all ports.
+
+Producer-only ports which currently have no events to enqueue should
+periodically call rte_event_enqueue_burst() with a zero-sized burst.
+
+Ports left unattended for longer periods of time will prevent load
+balancing, and also cause traffic interruptions on the flows which
+are in the process of being migrated.
+
+Output Buffering
+
+
+For efficiency reasons, the distributed software eventdev might not
+send enqueued events immediately to the destination port, but instead
+store them in an internal buffer in the source port.
+
+In case no more events are enqueued on a port with buffered events,
+these events will be sent after the application has performed a number
+of enqueue and/or dequeue operations.
+
+For explicit flushing, an application may call
+rte_event_enqueue_burst() with a zero-sized burst.
+
+
+Priorities
+~~
+
+The distributed software eventdev does not support event priorities.
+
+Ordered Queues
+~~
+
+The distributed software eventdev does not support the ordered queue type.
+
+
+"All Types" Queues
+~~
+
+The distributed software eventdev does not support queues of type
+RTE_EVENT_QUEUE_CFG_ALL_TYPES, which allow both atomic, ordered, and
+parallel events on the same queue.
+
+Dynamic Link/Unlink
+~~~
+
+The distributed software eventdev does not support calls to
+rte_event_port_link() or rte_event_port_unlink() after
+rte_event_dev_start() has been called.
diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index 18ec8e462..984eea5f4 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -14,5 +14,6 @@ application trough the eventdev API.
dpaa
dpaa2
sw
+dsw
octeontx
opdl
--
2.17.1
[dpdk-dev] [PATCH v3 05/10] event/dsw: add DSW event scheduling and device start/stop
With this patch, the DSW event device can be started and stopped,
and also supports scheduling events between ports.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/Makefile| 2 +-
drivers/event/dsw/dsw_evdev.c | 125
drivers/event/dsw/dsw_evdev.h | 56 ++
drivers/event/dsw/dsw_event.c | 359 ++
drivers/event/dsw/meson.build | 2 +-
5 files changed, 542 insertions(+), 2 deletions(-)
create mode 100644 drivers/event/dsw/dsw_event.c
diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile
index 5cbf488ff..6374a454e 100644
--- a/drivers/event/dsw/Makefile
+++ b/drivers/event/dsw/Makefile
@@ -21,6 +21,6 @@ LIBABIVER := 1
EXPORT_MAP := rte_pmd_dsw_event_version.map
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw_evdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw_evdev.c dsw_event.c
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 5dccc232a..40a7435be 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -6,6 +6,7 @@
#include
#include
+#include
#include "dsw_evdev.h"
@@ -201,10 +202,125 @@ dsw_configure(const struct rte_eventdev *dev)
{
struct dsw_evdev *dsw = dsw_pmd_priv(dev);
const struct rte_event_dev_config *conf = &dev->data->dev_conf;
+ int32_t min_max_in_flight;
dsw->num_ports = conf->nb_event_ports;
dsw->num_queues = conf->nb_event_queues;
+ /* Avoid a situation where consumer ports are holding all the
+* credits, without making use of them.
+*/
+ min_max_in_flight = conf->nb_event_ports * DSW_PORT_MAX_CREDITS;
+
+ dsw->max_inflight = RTE_MAX(conf->nb_events_limit, min_max_in_flight);
+
+ return 0;
+}
+
+
+static void
+initial_flow_to_port_assignment(struct dsw_evdev *dsw)
+{
+ uint8_t queue_id;
+ for (queue_id = 0; queue_id < dsw->num_queues; queue_id++) {
+ struct dsw_queue *queue = &dsw->queues[queue_id];
+ uint16_t flow_hash;
+ for (flow_hash = 0; flow_hash < DSW_MAX_FLOWS; flow_hash++) {
+ uint8_t port_idx =
+ rte_rand() % queue->num_serving_ports;
+ uint8_t port_id =
+ queue->serving_ports[port_idx];
+ dsw->queues[queue_id].flow_to_port_map[flow_hash] =
+ port_id;
+ }
+ }
+}
+
+static int
+dsw_start(struct rte_eventdev *dev)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+
+ rte_atomic32_init(&dsw->credits_on_loan);
+
+ initial_flow_to_port_assignment(dsw);
+
+ return 0;
+}
+
+static void
+dsw_port_drain_buf(uint8_t dev_id, struct rte_event *buf, uint16_t buf_len,
+ eventdev_stop_flush_t flush, void *flush_arg)
+{
+ uint16_t i;
+
+ for (i = 0; i < buf_len; i++)
+ flush(dev_id, buf[i], flush_arg);
+}
+
+static void
+dsw_port_drain_out(uint8_t dev_id, struct dsw_evdev *dsw, struct dsw_port
*port,
+ eventdev_stop_flush_t flush, void *flush_arg)
+{
+ uint16_t dport_id;
+
+ for (dport_id = 0; dport_id < dsw->num_ports; dport_id++)
+ if (dport_id != port->id)
+ dsw_port_drain_buf(dev_id, port->out_buffer[dport_id],
+ port->out_buffer_len[dport_id],
+ flush, flush_arg);
+}
+
+static void
+dsw_port_drain_in_ring(uint8_t dev_id, struct dsw_port *port,
+ eventdev_stop_flush_t flush, void *flush_arg)
+{
+ struct rte_event ev;
+
+ while (rte_event_ring_dequeue_burst(port->in_ring, &ev, 1, NULL))
+ flush(dev_id, ev, flush_arg);
+}
+
+static void
+dsw_drain(uint8_t dev_id, struct dsw_evdev *dsw,
+ eventdev_stop_flush_t flush, void *flush_arg)
+{
+ uint16_t port_id;
+
+ if (flush == NULL)
+ return;
+
+ for (port_id = 0; port_id < dsw->num_ports; port_id++) {
+ struct dsw_port *port = &dsw->ports[port_id];
+
+ dsw_port_drain_out(dev_id, dsw, port, flush, flush_arg);
+ dsw_port_drain_in_ring(dev_id, port, flush, flush_arg);
+ }
+}
+
+static void
+dsw_stop(struct rte_eventdev *dev)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+ uint8_t dev_id;
+ eventdev_stop_flush_t flush;
+ void *flush_arg;
+
+ dev_id = dev->data->dev_id;
+ flush = dev->dev_ops->dev_stop_flush;
+ flush_arg = dev->data->dev_stop_flush_arg;
+
+ dsw_drain(dev_id, dsw, flush, flush_arg);
+}
+
+static int
+dsw_close(struct rte_eventdev *dev)
+{
+ struct dsw_evdev *dsw = dsw_pmd_priv(dev);
+
+ dsw->num_ports = 0;
+ dsw->num_queues = 0;
+
return 0;
}
@@ -219,6 +335,9 @@ static struct rte_eventdev_ops dsw_evdev_ops = {
[dpdk-dev] [PATCH v3 07/10] event/dsw: add load balancing to the DSW event device
The DSW event device will now attempt to migrate (move) flows between
ports in order to balance the load.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/dsw_evdev.c | 27 ++
drivers/event/dsw/dsw_evdev.h | 80
drivers/event/dsw/dsw_event.c | 735 +-
3 files changed, 838 insertions(+), 4 deletions(-)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index bcfa17bab..2ecb365ba 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -20,6 +20,7 @@ dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
struct dsw_evdev *dsw = dsw_pmd_priv(dev);
struct dsw_port *port;
struct rte_event_ring *in_ring;
+ struct rte_ring *ctl_in_ring;
char ring_name[RTE_RING_NAMESIZE];
port = &dsw->ports[port_id];
@@ -42,13 +43,29 @@ dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
if (in_ring == NULL)
return -ENOMEM;
+ snprintf(ring_name, sizeof(ring_name), "dswctl%d_p%u",
+dev->data->dev_id, port_id);
+
+ ctl_in_ring = rte_ring_create(ring_name, DSW_CTL_IN_RING_SIZE,
+ dev->data->socket_id,
+ RING_F_SC_DEQ|RING_F_EXACT_SZ);
+
+ if (ctl_in_ring == NULL) {
+ rte_event_ring_free(in_ring);
+ return -ENOMEM;
+ }
+
port->in_ring = in_ring;
+ port->ctl_in_ring = ctl_in_ring;
rte_atomic16_init(&port->load);
port->load_update_interval =
(DSW_LOAD_UPDATE_INTERVAL * rte_get_timer_hz()) / US_PER_S;
+ port->migration_interval =
+ (DSW_MIGRATION_INTERVAL * rte_get_timer_hz()) / US_PER_S;
+
dev->data->ports[port_id] = port;
return 0;
@@ -72,6 +89,7 @@ dsw_port_release(void *p)
struct dsw_port *port = p;
rte_event_ring_free(port->in_ring);
+ rte_ring_free(port->ctl_in_ring);
}
static int
@@ -272,6 +290,14 @@ dsw_port_drain_buf(uint8_t dev_id, struct rte_event *buf,
uint16_t buf_len,
flush(dev_id, buf[i], flush_arg);
}
+static void
+dsw_port_drain_paused(uint8_t dev_id, struct dsw_port *port,
+ eventdev_stop_flush_t flush, void *flush_arg)
+{
+ dsw_port_drain_buf(dev_id, port->paused_events, port->paused_events_len,
+ flush, flush_arg);
+}
+
static void
dsw_port_drain_out(uint8_t dev_id, struct dsw_evdev *dsw, struct dsw_port
*port,
eventdev_stop_flush_t flush, void *flush_arg)
@@ -308,6 +334,7 @@ dsw_drain(uint8_t dev_id, struct dsw_evdev *dsw,
struct dsw_port *port = &dsw->ports[port_id];
dsw_port_drain_out(dev_id, dsw, port, flush, flush_arg);
+ dsw_port_drain_paused(dev_id, port, flush, flush_arg);
dsw_port_drain_in_ring(dev_id, port, flush, flush_arg);
}
}
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index a5399dda5..783c418bf 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -73,7 +73,37 @@
#define DSW_LOAD_UPDATE_INTERVAL (DSW_MIGRATION_INTERVAL/4)
#define DSW_OLD_LOAD_WEIGHT (1)
+/* The minimum time (in us) between two flow migrations. What puts an
+ * upper limit on the actual migration rate is primarily the pace in
+ * which the ports send and receive control messages, which in turn is
+ * largely a function of how much cycles are spent the processing of
+ * an event burst.
+ */
#define DSW_MIGRATION_INTERVAL (1000)
+#define DSW_MIN_SOURCE_LOAD_FOR_MIGRATION (DSW_LOAD_FROM_PERCENT(70))
+#define DSW_MAX_TARGET_LOAD_FOR_MIGRATION (DSW_LOAD_FROM_PERCENT(95))
+
+#define DSW_MAX_EVENTS_RECORDED (128)
+
+/* Only one outstanding migration per port is allowed */
+#define DSW_MAX_PAUSED_FLOWS (DSW_MAX_PORTS)
+
+/* Enough room for paus request/confirm and unpaus request/confirm for
+ * all possible senders.
+ */
+#define DSW_CTL_IN_RING_SIZE ((DSW_MAX_PORTS-1)*4)
+
+struct dsw_queue_flow {
+ uint8_t queue_id;
+ uint16_t flow_hash;
+};
+
+enum dsw_migration_state {
+ DSW_MIGRATION_STATE_IDLE,
+ DSW_MIGRATION_STATE_PAUSING,
+ DSW_MIGRATION_STATE_FORWARDING,
+ DSW_MIGRATION_STATE_UNPAUSING
+};
struct dsw_port {
uint16_t id;
@@ -98,6 +128,7 @@ struct dsw_port {
uint16_t ops_since_bg_task;
+ /* most recent 'background' processing */
uint64_t last_bg;
/* For port load measurement. */
@@ -108,11 +139,46 @@ struct dsw_port {
uint64_t busy_cycles;
uint64_t total_busy_cycles;
+ /* For the ctl interface and flow migration mechanism. */
+ uint64_t next_migration;
+ uint64_t migration_interval;
+ enum dsw_migration_state migration_state;
+
+ uint64_t migration_start;
+ uint64_t migrations;
+ uint64_t migration_latency;
+
+ uint8_t migration_target_
Re: [dpdk-dev] [PATCH v2] ethdev: make default behavior CRC strip on Rx
On Tue, Sep 04, 2018 at 11:12:56AM +0100, Ferruh Yigit wrote: > Removed DEV_RX_OFFLOAD_CRC_STRIP offload flag. > Without any specific Rx offload flag, default behavior by PMDs is to > strip CRC. > > PMDs that support keeping CRC should advertise DEV_RX_OFFLOAD_KEEP_CRC > Rx offload capability. > > Applications that require keeping CRC should check PMD capability first > and if it is supported can enable this feature by setting > DEV_RX_OFFLOAD_KEEP_CRC in Rx offload flag in rte_eth_dev_configure() [...] > diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c > index 8d493ffed..abe004b24 100644 > --- a/drivers/net/enic/enic_res.c > +++ b/drivers/net/enic/enic_res.c > @@ -195,7 +195,6 @@ int enic_get_vnic_config(struct enic *enic) > enic->rx_offload_capa = > DEV_RX_OFFLOAD_SCATTER | > DEV_RX_OFFLOAD_JUMBO_FRAME | > - DEV_RX_OFFLOAD_CRC_STRIP | > DEV_RX_OFFLOAD_VLAN_STRIP | > DEV_RX_OFFLOAD_IPV4_CKSUM | > DEV_RX_OFFLOAD_UDP_CKSUM | For net/enic. Acked-by: Hyong Youb Kim
[dpdk-dev] [PATCH v3 09/10] event/dsw: implement eventdev 'xstats' counters in DSW
The DSW event device now implements the 'xstats' interface and a
number of port- and device-level counters.
Signed-off-by: Mattias Rönnblom
---
drivers/event/dsw/Makefile | 3 +-
drivers/event/dsw/dsw_evdev.c | 5 +-
drivers/event/dsw/dsw_evdev.h | 19 +++
drivers/event/dsw/dsw_event.c | 35
drivers/event/dsw/dsw_xstats.c | 288 +
drivers/event/dsw/meson.build | 2 +-
6 files changed, 349 insertions(+), 3 deletions(-)
create mode 100644 drivers/event/dsw/dsw_xstats.c
diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile
index 6374a454e..ea1e5259a 100644
--- a/drivers/event/dsw/Makefile
+++ b/drivers/event/dsw/Makefile
@@ -21,6 +21,7 @@ LIBABIVER := 1
EXPORT_MAP := rte_pmd_dsw_event_version.map
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw_evdev.c dsw_event.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \
+ dsw_evdev.c dsw_event.c dsw_xstats.c
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 2ecb365ba..33ba13647 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -378,7 +378,10 @@ static struct rte_eventdev_ops dsw_evdev_ops = {
.dev_configure = dsw_configure,
.dev_start = dsw_start,
.dev_stop = dsw_stop,
- .dev_close = dsw_close
+ .dev_close = dsw_close,
+ .xstats_get = dsw_xstats_get,
+ .xstats_get_names = dsw_xstats_get_names,
+ .xstats_get_by_name = dsw_xstats_get_by_name
};
static int
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index f6f8f0454..dc28ab125 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -176,6 +176,14 @@ struct dsw_port {
uint16_t seen_events_idx;
struct dsw_queue_flow seen_events[DSW_MAX_EVENTS_RECORDED];
+ uint64_t new_enqueued;
+ uint64_t forward_enqueued;
+ uint64_t release_enqueued;
+ uint64_t queue_enqueued[DSW_MAX_QUEUES];
+
+ uint64_t dequeued;
+ uint64_t queue_dequeued[DSW_MAX_QUEUES];
+
uint16_t out_buffer_len[DSW_MAX_PORTS];
struct rte_event out_buffer[DSW_MAX_PORTS][DSW_MAX_PORT_OUT_BUFFER];
@@ -243,6 +251,17 @@ uint16_t dsw_event_dequeue(void *port, struct rte_event
*ev, uint64_t wait);
uint16_t dsw_event_dequeue_burst(void *port, struct rte_event *events,
uint16_t num, uint64_t wait);
+int dsw_xstats_get_names(const struct rte_eventdev *dev,
+enum rte_event_dev_xstats_mode mode,
+uint8_t queue_port_id,
+struct rte_event_dev_xstats_name *xstats_names,
+unsigned int *ids, unsigned int size);
+int dsw_xstats_get(const struct rte_eventdev *dev,
+ enum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,
+ const unsigned int ids[], uint64_t values[], unsigned int n);
+uint64_t dsw_xstats_get_by_name(const struct rte_eventdev *dev,
+ const char *name, unsigned int *id);
+
static inline struct dsw_evdev *
dsw_pmd_priv(const struct rte_eventdev *eventdev)
{
diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index a84b19c33..61a66fabf 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -82,6 +82,33 @@ dsw_port_return_credits(struct dsw_evdev *dsw, struct
dsw_port *port,
}
}
+static void
+dsw_port_enqueue_stats(struct dsw_port *port, uint16_t num_new,
+ uint16_t num_forward, uint16_t num_release)
+{
+ port->new_enqueued += num_new;
+ port->forward_enqueued += num_forward;
+ port->release_enqueued += num_release;
+}
+
+static void
+dsw_port_queue_enqueue_stats(struct dsw_port *source_port, uint8_t queue_id)
+{
+ source_port->queue_enqueued[queue_id]++;
+}
+
+static void
+dsw_port_dequeue_stats(struct dsw_port *port, uint16_t num)
+{
+ port->dequeued += num;
+}
+
+static void
+dsw_port_queue_dequeued_stats(struct dsw_port *source_port, uint8_t queue_id)
+{
+ source_port->queue_dequeued[queue_id]++;
+}
+
static void
dsw_port_load_record(struct dsw_port *port, unsigned int dequeued)
{
@@ -1059,12 +1086,16 @@ dsw_event_enqueue_burst_generic(void *port, const
struct rte_event events[],
source_port->pending_releases -= num_release;
+ dsw_port_enqueue_stats(source_port, num_new,
+ num_non_release-num_new, num_release);
+
for (i = 0; i < events_len; i++) {
const struct rte_event *event = &events[i];
if (likely(num_release == 0 ||
event->op != RTE_EVENT_OP_RELEASE))
dsw_port_buffer_event(dsw, source_port, event);
+ dsw_port_queue_enqueue_stats(source_port, event->queue_id);
}
DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-re
Re: [dpdk-dev] [PATCH] net/fm10k: add imissed stats
Hi,
Please, do not merge this patch. I need to check and readapt this patch. A
version 2 will be sent later.
Thanks,
--
Julien Meunier
> -Original Message-
> From: Wang, Xiao W
> Sent: Tuesday, September 11, 2018 3:52 AM
> To: Meunier, Julien (Nokia - FR/Paris-Saclay) ;
> Zhang, Qi Z
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] net/fm10k: add imissed stats
>
> Hi,
>
> -Original Message-
> From: Julien Meunier [mailto:julien.meun...@nokia.com]
> Sent: Monday, September 10, 2018 11:51 PM
> To: Zhang, Qi Z ; Wang, Xiao W
>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/fm10k: add imissed stats
>
> Add support of imissed and q_errors statistics, reported by PCIE_QPRDC
> register (see datasheet, section 11.27.2.60), which exposes the number of
> receive packets dropped for a queue.
>
> Signed-off-by: Julien Meunier
> ---
> drivers/net/fm10k/fm10k_ethdev.c | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index 541a49b..a9af6c2 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -1325,7 +1325,7 @@ fm10k_xstats_get(struct rte_eth_dev *dev, struct
> rte_eth_xstat *xstats, static int fm10k_stats_get(struct rte_eth_dev *dev,
> struct rte_eth_stats *stats) {
> - uint64_t ipackets, opackets, ibytes, obytes;
> + uint64_t ipackets, opackets, ibytes, obytes, imissed;
> struct fm10k_hw *hw =
> FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> struct fm10k_hw_stats *hw_stats =
> @@ -1336,22 +1336,25 @@ fm10k_stats_get(struct rte_eth_dev *dev, struct
> rte_eth_stats *stats)
>
> fm10k_update_hw_stats(hw, hw_stats);
>
> - ipackets = opackets = ibytes = obytes = 0;
> + ipackets = opackets = ibytes = obytes = imissed = 0;
> for (i = 0; (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) &&
> (i < hw->mac.max_queues); ++i) {
> stats->q_ipackets[i] = hw_stats->q[i].rx_packets.count;
> stats->q_opackets[i] = hw_stats->q[i].tx_packets.count;
> stats->q_ibytes[i] = hw_stats->q[i].rx_bytes.count;
> stats->q_obytes[i] = hw_stats->q[i].tx_bytes.count;
> + stats->q_errors[i] = hw_stats->q[i].rx_drops.count;
> ipackets += stats->q_ipackets[i];
> opackets += stats->q_opackets[i];
> ibytes += stats->q_ibytes[i];
> obytes += stats->q_obytes[i];
> + imissed += stats->q_errors[i];
> }
> stats->ipackets = ipackets;
> stats->opackets = opackets;
> stats->ibytes = ibytes;
> stats->obytes = obytes;
> + stats->imissed = imissed;
> return 0;
> }
>
> Acked-by: Xiao Wang
>
>
> --
> 2.10.2
Re: [dpdk-dev] [PATCH 05/15] build: add Meson files for qede PMD
> -Original Message-
> From: Luca Boccassi
> Sent: Tuesday, September 11, 2018 1:34 AM
> To: dev@dpdk.org
> Cc: keith.wi...@intel.com; roy.fan.zh...@intel.com; jingjing...@intel.com;
> wenzhuo...@intel.com; Mody, Rasesh ; Patil,
> Harish ; Shaikh, Shahed
> ; amr.mokh...@intel.com; Thotton, Shijith
> ; Srinivasan, Srisivasubramanian
> ; liang.j...@intel.com;
> peter.mccar...@intel.com; Jacob, Jerin
> ; Czekaj, Maciej
> ; arybche...@solarflare.com;
> antosh.shu...@caviumnetworks.com; Gupta, Ashish
> ; yongw...@vmware.com;
> bruce.richard...@intel.com; tho...@monjalon.net
> Subject: [PATCH 05/15] build: add Meson files for qede PMD
.
.
> +subdir('base')
> +objs = [base_objs]
> +
> +sources = files(
> + 'qede_ethdev.c',
> + 'qede_fdir.c',
Heads up -
We have submitted a patch series in which qede_fdir.c gets renamed to
qede_filter.c.
Series has not be accepted yet, so you may have to change this if our patch
series gets applied before this one.
> + 'qede_main.c',
> + 'qede_rxtx.c',
> +)
> +
> +#deps += ['ethdev']
> --
> 2.18.0
Acked-by: Shahed Shaikh
Re: [dpdk-dev] [PATCH v4 1/2] lib/librte_power: traffic pattern aware power control
Hi Kevin, On 27/6/2018 6:33 PM, Kevin Traynor wrote: On 06/26/2018 12:40 PM, Radu Nicolau wrote: From: Liang Ma 1. Abstract --snip-- 2.2 There are two phases to establish the power management system: a.Initialization/Training phase. There is no traffic pass-through, the system will test average empty poll numbers with LOW/MED/HIGH power state. Those average empty poll numbers will be the baseline for the normal phase. The system will collect all core's counter every 100ms. The Training phase will take 5 seconds. This is requiring an application to sit for 5 secs in order to train and align poll numbers with states? That doesn't seem realistic to me. Thanks for the discussion at DPDK Userspace conference. Since we got back, Liang and I have discussed the feedback we received, and we have a proposal. We can split out the training phase into a separate run of the application which does the training, spits out the threshold numbers, and then the actual runs will start instantly once the threshold parameters are provided on the command line, or falls back to hard-coded defaults if no command line parameters are given. So there are three ways of running the app 1. Run without any threshold parameters, in which case the algorithm runs with default numbers calculated based on the min and max available frequency. 2. Run with --train option, which requires no traffic on the NICS, and runs the training algorithm, prints out the thresholds for the host CPU, and exits. 3. Take the output of the train phase, and provide the thresholds on the command line, and the app runs with the best fit to the running CPU. That would eliminate the training period at startup, unless the user wanted to fine-tune for a particular host CPU. Would that be an adequate solution to the training period concerns? Regards, Dave.
Re: [dpdk-dev] [PATCH v2] vhost-user: drop connection on message handling failures
On 09/03/2018 12:12 PM, Ilya Maximets wrote:
There are a lot of cases where vhost-user massage handling
could fail and end up in a fully not recoverable state. For
example, allocation failures of shadow used ring and batched
copy array are not recoverable and leads to the segmentation
faults like this on the receiving/transmission path:
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7f913fecf0 (LWP 43625)]
in copy_desc_to_mbuf () at /lib/librte_vhost/virtio_net.c:760
760 batch_copy[vq->batch_copy_nb_elems].dst =
This could be easily reproduced in case of low memory or big
number of vhost-user ports.
Fix that by propagating error to the upper layer which will
end up with disconnection in case we can not report to
the message sender when the error happens.
Fixes: f689586bc060 ("vhost: shadow used ring update")
Cc: sta...@dpdk.org
Signed-off-by: Ilya Maximets
---
v2:
* Patch changed to cover most of possible failures at once. [Tiwei Bie]
lib/librte_vhost/vhost_user.c | 51 +--
1 file changed, 31 insertions(+), 20 deletions(-)
Applied to dpdk-next-virtio/master.
Thanks!
Maxime
Re: [dpdk-dev] [PATCH v2 0/5] vhost_user.c code cleanup
Hi Nikolay, On 07/19/2018 09:13 PM, Nikolay Nikolaev wrote: vhost: vhost_user.c code cleanup This patchesries introduce a set of code redesigns in vhost_user.c. The goal is to unify and simplify vhost-user message handling. The patches do not intend to introduce any functional changes. v2 changes: - Fix the comments by Tiwei Bie - Keep the old behavior - Fall through when the callback returns VH_RESULT_ERR - Fall through if the request is out of range --- Nikolay Nikolaev (5): vhost: unify VhostUserMsg usage vhost: make message handling functions prepare the reply vhost: handle unsupported message types in functions vhost: unify message handling function signature vhost: message handling implemented as a callback array lib/librte_vhost/vhost_user.c | 392 ++--- 1 file changed, 208 insertions(+), 184 deletions(-) -- Signature Could you please rebase and fix the series (see Iliya comments) on top of git://dpdk.org/next/dpdk-next-virtio master branch? Thanks, Maxime
[dpdk-dev] [PATCH v1] eal: add strscpy function
The strncpy function has long been deemed unsafe for use,
in favor of strlcpy or snprintf.
While snprintf is standard and strlcpy is still largely available,
they both have issues regarding error checking and performance.
Both will force reading the source buffer past the requested size
if the input is not a proper c-string, and will return the expected
number of bytes copied, meaning that error checking needs to verify
that the number of bytes copied is not superior to the destination
size.
This contributes to awkward code flow, unclear error checking and
potential issues with malformed input.
The function strscpy has been discussed for some time already and
has been made available in the linux kernel[1].
Propose this new function as a safe alternative.
[1]:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=30c44659f4a3e7e1f9f47e895591b4b40bf62671
Signed-off-by: Gaetan Rivet
---
I agree with the original email, here is a proposed implementation.
I have added the function as part of 18.11 API proper, because this API
is definitely not meant to change.
This is not meant to be enforced on existing code, or even on new code.
But I think it is better to have it available.
lib/librte_eal/common/eal_common_string_fns.c | 30 +++
.../common/include/rte_string_fns.h | 23 ++
lib/librte_eal/rte_eal_version.map| 7 +
3 files changed, 60 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_string_fns.c
b/lib/librte_eal/common/eal_common_string_fns.c
index 6ac5f8289..8a34d2422 100644
--- a/lib/librte_eal/common/eal_common_string_fns.c
+++ b/lib/librte_eal/common/eal_common_string_fns.c
@@ -38,3 +38,33 @@ rte_strsplit(char *string, int stringlen,
errno = EINVAL;
return -1;
}
+
+/* Copy src string into dst.
+ *
+ * Return negative value and NUL-terminate if dst is too short,
+ * Otherwise return number of bytes copied.
+ */
+ssize_t
+strscpy(char *dst, const char *src, size_t dsize)
+{
+ const char *osrc = src;
+ size_t nleft = dsize;
+
+ /* Copy as many bytes as will fit. */
+ if (nleft != 0) {
+ while (--nleft != 0) {
+ if ((*dst++ = *src++) == '\0')
+ break;
+ }
+ }
+
+ /* Not enough room in dst, add NUL and return error. */
+ if (nleft == 0) {
+ if (dsize != 0)
+ *dst = '\0';
+ return -E2BIG;
+ }
+
+ /* count does not include NUL */
+ return (src - osrc - 1);
+}
diff --git a/lib/librte_eal/common/include/rte_string_fns.h
b/lib/librte_eal/common/include/rte_string_fns.h
index 97597a148..46dd919b4 100644
--- a/lib/librte_eal/common/include/rte_string_fns.h
+++ b/lib/librte_eal/common/include/rte_string_fns.h
@@ -76,6 +76,29 @@ rte_strlcpy(char *dst, const char *src, size_t size)
#endif /* RTE_USE_LIBBSD */
#endif /* BSDAPP */
+/**
+ * Copy string src to buffer dst of size dsize.
+ * At most dsize-1 chars will be copied.
+ * Always NUL-terminates, unless (dsize == 0).
+ * Returns number of bytes copied (terminating NUL-byte excluded) on success.
+ * Negative errno on error.
+ *
+ * @param dst
+ * The destination string.
+ *
+ * @param src
+ * The input string to be copied.
+ *
+ * @param dsize
+ * Length in bytes of the destination buffer.
+ *
+ * @return
+ * The number of bytes copied on success
+ * -E2BIG if the destination buffer is too small.
+ */
+ssize_t
+strscpy(char *dst, const char *src, size_t dsize);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index 344a43d32..fc7b50669 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -262,6 +262,13 @@ DPDK_18.08 {
} DPDK_18.05;
+DPDK_18.11 {
+ global:
+
+ strscpy;
+
+} DPDK_18.08;
+
EXPERIMENTAL {
global:
--
2.18.0
Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue of logid
> -Original Message-
> From: Yang, Ziye
> Sent: Tuesday, September 11, 2018 2:28 AM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin ; Ziye Yang
>
> Subject: [PATCH v7] linuxapp, eal: Fix the memory leak issue of logid
>
> From: Ziye Yang
>
> This patch is used to fix the memory leak issue of logid.
> We use the ASAN test in SPDK when intergrating DPDK and
> find this memory leak issue.
>
> By the way, we also fix several missed function call of
> rte_atomic32_clear.
>
> Signed-off-by: Ziye Yang
> ---
> lib/librte_eal/linuxapp/eal/eal.c | 11 +++
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal.c
> b/lib/librte_eal/linuxapp/eal/eal.c
> index e59ac65..a5129e5 100644
> --- a/lib/librte_eal/linuxapp/eal/eal.c
> +++ b/lib/librte_eal/linuxapp/eal/eal.c
> @@ -793,7 +793,8 @@ static void rte_eal_init_alert(const char *msg)
> int i, fctret, ret;
> pthread_t thread_id;
> static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
> - const char *logid;
> + const char *p;
> + static char logid[PATH_MAX];
> char cpuset[RTE_CPU_AFFINITY_STR_LEN];
> char thread_name[RTE_MAX_THREAD_NAME_LEN];
>
> @@ -810,9 +811,8 @@ static void rte_eal_init_alert(const char *msg)
> return -1;
> }
>
> - logid = strrchr(argv[0], '/');
> - logid = strdup(logid ? logid + 1: argv[0]);
> -
> + p = strrchr(argv[0], '/');
> + snprintf(logid, sizeof(logid), "%s", (p ? p + 1 : argv[0]));
> thread_id = pthread_self();
>
> eal_reset_internal_config(&internal_config);
> @@ -823,6 +823,7 @@ static void rte_eal_init_alert(const char *msg)
> if (rte_eal_cpu_init() < 0) {
> rte_eal_init_alert("Cannot detect lcores.");
> rte_errno = ENOTSUP;
> + rte_atomic32_clear(&run_once);
> return -1;
> }
>
> @@ -851,6 +852,7 @@ static void rte_eal_init_alert(const char *msg)
>
> if (rte_eal_intr_init() < 0) {
> rte_eal_init_alert("Cannot init interrupt-handling thread\n");
> + rte_atomic32_clear(&run_once);
> return -1;
> }
>
> @@ -861,6 +863,7 @@ static void rte_eal_init_alert(const char *msg)
> rte_eal_init_alert("failed to init mp channel\n");
> if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
> rte_errno = EFAULT;
> + rte_atomic32_clear(&run_once);
> return -1;
> }
> }
> --
Acked-by: Konstantin Ananyev
> 1.9.3
Re: [dpdk-dev] [PATCH v1] eal: add strscpy function
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Gaetan Rivet
> Sent: Tuesday, September 11, 2018 1:04 PM
> To: dev@dpdk.org
> Cc: Gaetan Rivet
> Subject: [dpdk-dev] [PATCH v1] eal: add strscpy function
>
> The strncpy function has long been deemed unsafe for use,
> in favor of strlcpy or snprintf.
>
> While snprintf is standard and strlcpy is still largely available,
> they both have issues regarding error checking and performance.
>
> Both will force reading the source buffer past the requested size
> if the input is not a proper c-string, and will return the expected
> number of bytes copied, meaning that error checking needs to verify
> that the number of bytes copied is not superior to the destination
> size.
>
> This contributes to awkward code flow, unclear error checking and
> potential issues with malformed input.
>
> The function strscpy has been discussed for some time already and
> has been made available in the linux kernel[1].
>
> Propose this new function as a safe alternative.
>
> [1]:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i
> d=30c44659f4a3e7e1f9f47e895591b4b40bf62671
>
> Signed-off-by: Gaetan Rivet
> ---
>
> I agree with the original email, here is a proposed implementation.
> I have added the function as part of 18.11 API proper, because this API
> is definitely not meant to change.
>
> This is not meant to be enforced on existing code, or even on new code.
> But I think it is better to have it available.
>
> lib/librte_eal/common/eal_common_string_fns.c | 30
> +++
> .../common/include/rte_string_fns.h | 23 ++
> lib/librte_eal/rte_eal_version.map| 7 +
> 3 files changed, 60 insertions(+)
>
> diff --git a/lib/librte_eal/common/eal_common_string_fns.c
> b/lib/librte_eal/common/eal_common_string_fns.c
> index 6ac5f8289..8a34d2422 100644
> --- a/lib/librte_eal/common/eal_common_string_fns.c
> +++ b/lib/librte_eal/common/eal_common_string_fns.c
> @@ -38,3 +38,33 @@ rte_strsplit(char *string, int stringlen,
> errno = EINVAL;
> return -1;
> }
> +
> +/* Copy src string into dst.
> + *
> + * Return negative value and NUL-terminate if dst is too short,
> + * Otherwise return number of bytes copied.
> + */
> +ssize_t
> +strscpy(char *dst, const char *src, size_t dsize)
> +{
> + const char *osrc = src;
> + size_t nleft = dsize;
> +
> + /* Copy as many bytes as will fit. */
> + if (nleft != 0) {
> + while (--nleft != 0) {
> + if ((*dst++ = *src++) == '\0')
> + break;
> + }
> + }
> +
> + /* Not enough room in dst, add NUL and return error. */
> + if (nleft == 0) {
> + if (dsize != 0)
> + *dst = '\0';
> + return -E2BIG;
> + }
> +
> + /* count does not include NUL */
> + return (src - osrc - 1);
> +}
> diff --git a/lib/librte_eal/common/include/rte_string_fns.h
> b/lib/librte_eal/common/include/rte_string_fns.h
> index 97597a148..46dd919b4 100644
> --- a/lib/librte_eal/common/include/rte_string_fns.h
> +++ b/lib/librte_eal/common/include/rte_string_fns.h
> @@ -76,6 +76,29 @@ rte_strlcpy(char *dst, const char *src, size_t size)
> #endif /* RTE_USE_LIBBSD */
> #endif /* BSDAPP */
>
> +/**
> + * Copy string src to buffer dst of size dsize.
> + * At most dsize-1 chars will be copied.
> + * Always NUL-terminates, unless (dsize == 0).
> + * Returns number of bytes copied (terminating NUL-byte excluded) on
> success.
> + * Negative errno on error.
> + *
> + * @param dst
> + * The destination string.
> + *
> + * @param src
> + * The input string to be copied.
> + *
> + * @param dsize
> + * Length in bytes of the destination buffer.
> + *
> + * @return
> + * The number of bytes copied on success
> + * -E2BIG if the destination buffer is too small.
> + */
> +ssize_t
> +strscpy(char *dst, const char *src, size_t dsize);
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/librte_eal/rte_eal_version.map
> b/lib/librte_eal/rte_eal_version.map
> index 344a43d32..fc7b50669 100644
> --- a/lib/librte_eal/rte_eal_version.map
> +++ b/lib/librte_eal/rte_eal_version.map
> @@ -262,6 +262,13 @@ DPDK_18.08 {
>
> } DPDK_18.05;
>
> +DPDK_18.11 {
> + global:
> +
> + strscpy;
> +
> +} DPDK_18.08;
> +
> EXPERIMENTAL {
> global:
Acked-by: Juhamatti Kuusisaari
> --
> 2.18.0
Re: [dpdk-dev] [PATCH] crypto action
Hi,
Sorry about the spam but this patch was not intended to send to DPDK just yet.
I need further polish it and splits into a patchset as the v2 of
http://patchwork.dpdk.org/patch/43919/
So I marked this patch as rejected in patchwork.
Regards,
Fan
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Zhang, Roy Fan
> Sent: Monday, September 10, 2018 3:33 PM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian
> Subject: [dpdk-dev] [PATCH] crypto action
>
> Change-Id: If1aecaac3335685f3bef79f47768ba8ae7765fbb
> Signed-off-by: Zhang, Roy Fan
> ---
> examples/ip_pipeline/Makefile | 1 +
> examples/ip_pipeline/action.c | 11 +
> examples/ip_pipeline/action.h | 1 +
> examples/ip_pipeline/cli.c| 744
> +-
> examples/ip_pipeline/examples/flow_crypto.cli | 76 +++
> examples/ip_pipeline/main.c | 17 +
> examples/ip_pipeline/mempool.c| 2 +-
> examples/ip_pipeline/mempool.h| 1 +
> examples/ip_pipeline/pipeline.c | 61 +++
> examples/ip_pipeline/pipeline.h | 13 +
> examples/ip_pipeline/sym_crypto.c | 320 +++
> examples/ip_pipeline/sym_crypto.h | 104
> examples/ip_pipeline/thread.c | 10 +
> lib/librte_pipeline/rte_table_action.c| 183 ---
> lib/librte_pipeline/rte_table_action.h| 28 +-
> 15 files changed, 1472 insertions(+), 100 deletions(-)
> create mode 100644 examples/ip_pipeline/examples/flow_crypto.cli
> create mode 100644 examples/ip_pipeline/sym_crypto.c
> create mode 100644 examples/ip_pipeline/sym_crypto.h
>
> diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile
> index 3fb98ce3e..819625632 100644
> --- a/examples/ip_pipeline/Makefile
> +++ b/examples/ip_pipeline/Makefile
> @@ -18,6 +18,7 @@ SRCS-y += swq.c
> SRCS-y += tap.c
> SRCS-y += thread.c
> SRCS-y += tmgr.c
> +SRCS-y += sym_crypto.c
>
> # Build using pkg-config variables if possible
> $(shell pkg-config --exists libdpdk)
> diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
> index a29c2b368..d97423568 100644
> --- a/examples/ip_pipeline/action.c
> +++ b/examples/ip_pipeline/action.c
> @@ -333,6 +333,17 @@ table_action_profile_create(const char *name,
> }
> }
>
> + if (params->action_mask & (1LLU <<
> RTE_TABLE_ACTION_SYM_CRYPTO)) {
> + status = rte_table_action_profile_action_register(ap,
> + RTE_TABLE_ACTION_SYM_CRYPTO,
> + ¶ms->sym_crypto);
> +
> + if (status) {
> + rte_table_action_profile_free(ap);
> + return NULL;
> + }
> + }
> +
> status = rte_table_action_profile_freeze(ap);
> if (status) {
> rte_table_action_profile_free(ap);
> diff --git a/examples/ip_pipeline/action.h b/examples/ip_pipeline/action.h
> index 417200e86..cde17e69a 100644
> --- a/examples/ip_pipeline/action.h
> +++ b/examples/ip_pipeline/action.h
> @@ -53,6 +53,7 @@ struct table_action_profile_params {
> struct rte_table_action_nat_config nat;
> struct rte_table_action_ttl_config ttl;
> struct rte_table_action_stats_config stats;
> + struct rte_table_action_sym_crypto_config sym_crypto;
> };
>
> struct table_action_profile {
> diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
> index 102a1d6b7..c73403378 100644
> --- a/examples/ip_pipeline/cli.c
> +++ b/examples/ip_pipeline/cli.c
> @@ -17,6 +17,7 @@
> #include "mempool.h"
> #include "parser.h"
> #include "pipeline.h"
> +#include "sym_crypto.h"
> #include "swq.h"
> #include "tap.h"
> #include "thread.h"
> @@ -66,7 +67,7 @@ cmd_mempool(char **tokens,
> char *name;
> struct mempool *mempool;
>
> - if (n_tokens != 10) {
> + if (n_tokens != 10 && n_tokens != 12) {
> snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
> return;
> }
> @@ -113,6 +114,18 @@ cmd_mempool(char **tokens,
> return;
> }
>
> + if (n_tokens == 12) {
> + if (strcmp(tokens[10], "priv") != 0) {
> + snprintf(out, out_size, MSG_ARG_INVALID, "priv");
> + return;
> + }
> +
> + if (parser_read_uint32(&p.priv_size, tokens[11]) != 0) {
> + snprintf(out, out_size, MSG_ARG_INVALID, "priv");
> + return;
> + }
> + }
> +
> mempool = mempool_create(name, &p);
> if (mempool == NULL) {
> snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
> @@ -785,6 +798,569 @@ cmd_kni(char **tokens,
> }
> }
>
> +static const char cmd_sym_crypto_help[] =
> +"sym_crypto \n"
> +" cryptodev | cryptodev_id \n"
> +" q \n"
> +" offset \n"
> +" cpu \n";
> +
> +static void
> +cmd_sym_cryp
Re: [dpdk-dev] [PATCH v2] net/pcap: Generate unique MAC addresses for interfaces
On 9/10/2018 4:52 PM, Cian Ferriter wrote: > The MAC addresses are generated in a similar manner as in the TAP PMD, > where the address is based on the number of PCAP ports created. > > This is useful for the purposes of debugging DPDK applications using > PCAP devices instead of real devices where multiple devices should still > have unique MAC addresses. This method was chosen over randomly > assigning MAC addresses to make the creation of pcaps, specifically > matching the destination ethernet address field to an interface, easier. > > Signed-off-by: Cian Ferriter Acked-by: Ferruh Yigit
Re: [dpdk-dev] [PATCH 1/3] net/virtio-user: fix deadlock in memory events callback
On 09/05/2018 06:28 AM, Tiwei Bie wrote:
Deadlock can occur when allocating memory if a vhost-kernel
based virtio-user device is in use. To fix the deadlock,
we will take memory hotplug lock explicitly in virtio-user
when necessary, and always call the _thread_unsafe memory
functions.
Bugzilla ID: 81
Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
Cc: sta...@dpdk.org
Reported-by: Seán Harte
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_user/vhost_kernel.c | 6 +-
.../net/virtio/virtio_user/virtio_user_dev.c | 19 +++
2 files changed, 24 insertions(+), 1 deletion(-)
Reviewed-by: Maxime Coquelin
Thanks,
Maxime
Re: [dpdk-dev] [PATCH 2/3] net/virtio-user: avoid parsing process mappings
On 09/05/2018 06:28 AM, Tiwei Bie wrote: Recently some memory APIs were introduced to allow users to get the file descriptor and offset for each memory segment. We can leverage those APIs to get rid of the /proc magic on memory table preparation in vhost-user backend. Signed-off-by: Tiwei Bie --- drivers/net/virtio/virtio_user/vhost_user.c | 211 +--- 1 file changed, 90 insertions(+), 121 deletions(-) Nice to get rid off the /proc parsing! Reviewed-by: Maxime Coquelin Thanks, Maxime
Re: [dpdk-dev] [PATCH v3] net/i40e: add alarm handler
> -Original Message- > From: Xing, Beilei > Sent: Tuesday, September 11, 2018 11:36 AM > To: Zhang, Qi Z > Cc: dev@dpdk.org > Subject: [PATCH v3] net/i40e: add alarm handler > > This patch adds alarm handler, and then i40e PF will use alarm handler instead > of interrupt handler when device is started and Rx interrupt mode is disabled. > This way will save CPU cycles during receiving packets. > > Signed-off-by: Beilei Xing Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> The library is called librte_pmd_lio, so rename the map file and set
> the name in the meson file so that the built library names with meson
> and legacy makefiles are the same
>
> Fixes: bad475c03fee ("net/liquidio: add to meson build")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Luca Boccassi
Rather than doing this renaming, can we instead add a symlink in the
install phase to map the old name to the new one? I'd like to see the
consistency of directory name, map filename and driver name enforced
strictly in the build system. Having exceptions is a pain.
/Bruce
Re: [dpdk-dev] [PATCH 10/15] net/thunderx: rename version map after library file name
On Mon, Sep 10, 2018 at 09:04:10PM +0100, Luca Boccassi wrote:
> The library is called librte_pmd_thunderx_nicvf, so rename the map file
> and set the name in the meson file so that the built library names with
> meson and legacy makefiles are the same
>
> Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Luca Boccassi
> ---
Again, I'd prefer we use a symlink if we need to enforce backward
compatibility. I also think we should then use the deprecation procedure to
remove those symlinks in a later version.
/Bruce
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > The library is called librte_pmd_lio, so rename the map file and
> > set
> > the name in the meson file so that the built library names with
> > meson
> > and legacy makefiles are the same
> >
> > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Luca Boccassi
>
> Rather than doing this renaming, can we instead add a symlink in the
> install phase to map the old name to the new one? I'd like to see the
> consistency of directory name, map filename and driver name enforced
> strictly in the build system. Having exceptions is a pain.
>
> /Bruce
We could, but the pain gets shifted on packagers then - what about
renaming the directory entirely to net/lio?
--
Kind regards,
Luca Boccassi
Re: [dpdk-dev] [PATCH 3/3] net/virtio-user: fix memory hotplug support in vhost-kernel
On 09/05/2018 06:28 AM, Tiwei Bie wrote:
It's possible to have much more hugepage backed memory regions
than what vhost-kernel supports due to the memory hotplug, which
may cause problems. A better solution is to have the virtio-user
pass all the memory ranges reserved by DPDK to vhost-kernel.
Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
Cc: sta...@dpdk.org
Signed-off-by: Tiwei Bie
---
drivers/net/virtio/virtio_user/vhost_kernel.c | 38 +--
1 file changed, 18 insertions(+), 20 deletions(-)
Reviewed-by: Maxime Coquelin
Re: [dpdk-dev] [PATCH 0/3] Some fixes/improvements for virtio-user memory table
On 09/05/2018 06:28 AM, Tiwei Bie wrote: This series consists of some fixes and improvements for virtio-user's memory table preparation. This series supersedes below patches: https://patches.dpdk.org/patch/43807/ https://patches.dpdk.org/patch/43918/ The second patch in this series depends on the below patch set: http://patches.dpdk.org/project/dpdk/list/?series=1177 Tiwei Bie (3): net/virtio-user: fix deadlock in memory events callback net/virtio-user: avoid parsing process mappings net/virtio-user: fix memory hotplug support in vhost-kernel drivers/net/virtio/virtio_user/vhost_kernel.c | 50 +++-- drivers/net/virtio/virtio_user/vhost_user.c | 211 -- .../net/virtio/virtio_user/virtio_user_dev.c | 19 ++ 3 files changed, 135 insertions(+), 145 deletions(-) That's all good to me. I'll apply it once Anatoly's series is accepted. Thanks, Maxime
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > > The library is called librte_pmd_lio, so rename the map file and
> > > set
> > > the name in the meson file so that the built library names with
> > > meson
> > > and legacy makefiles are the same
> > >
> > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Luca Boccassi
> >
> > Rather than doing this renaming, can we instead add a symlink in the
> > install phase to map the old name to the new one? I'd like to see the
> > consistency of directory name, map filename and driver name enforced
> > strictly in the build system. Having exceptions is a pain.
> >
> > /Bruce
>
> We could, but the pain gets shifted on packagers then - what about
> renaming the directory entirely to net/lio?
>
It is still an issue with packagers if the symlinks are created as part of
the install step of DPDK itself (which is what I was intending)? I was
thinking of adding a new post-install script for the backward compatible
renames.
As for renaming the directory, I don't mind, but I'll let the driver
maintainers comment on their thoughts on it.
/Bruce
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > > The library is called librte_pmd_lio, so rename the map file and
> > > set
> > > the name in the meson file so that the built library names with
> > > meson
> > > and legacy makefiles are the same
> > >
> > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Luca Boccassi
> >
> > Rather than doing this renaming, can we instead add a symlink in the
> > install phase to map the old name to the new one? I'd like to see the
> > consistency of directory name, map filename and driver name enforced
> > strictly in the build system. Having exceptions is a pain.
> >
> > /Bruce
>
> We could, but the pain gets shifted on packagers then - what about
> renaming the directory entirely to net/lio?
For packagers, what sort of ABI compatibility guarantees do you try and
keep between releases. Is this something that just needs a one-release ABI
announcement, as with other ABI changes?
/Bruce
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, 2018-09-11 at 14:30 +0100, Bruce Richardson wrote:
> On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> > On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > > > The library is called librte_pmd_lio, so rename the map file
> > > > and
> > > > set
> > > > the name in the meson file so that the built library names with
> > > > meson
> > > > and legacy makefiles are the same
> > > >
> > > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Luca Boccassi
> > >
> > > Rather than doing this renaming, can we instead add a symlink in
> > > the
> > > install phase to map the old name to the new one? I'd like to see
> > > the
> > > consistency of directory name, map filename and driver name
> > > enforced
> > > strictly in the build system. Having exceptions is a pain.
> > >
> > > /Bruce
> >
> > We could, but the pain gets shifted on packagers then - what about
> > renaming the directory entirely to net/lio?
> >
>
> It is still an issue with packagers if the symlinks are created as
> part of
> the install step of DPDK itself (which is what I was intending)? I
> was
> thinking of adding a new post-install script for the backward
> compatible
> renames.
At least for Debian/Ubuntu, if I tell the tools that package libfoo1
needs to have libfoo.so.1.2.3, that's what it will do, without
following symlinks. So a broken link will be installed in the system,
unless I start tracking what symlinks are there and adding them
manually to the package they belong to.
There's also the fact that by policy the library package names should
match the file name of the library and its ABI revision, so
libfoo.so.1.2.3 should be in libfoo1 pkg vy policy - if they mismatch,
some linters tools are going to yell at me at the very least.
> As for renaming the directory, I don't mind, but I'll let the driver
> maintainers comment on their thoughts on it.
>
> /Bruce
--
Kind regards,
Luca Boccassi
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, 2018-09-11 at 14:32 +0100, Bruce Richardson wrote:
> On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> > On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > > > The library is called librte_pmd_lio, so rename the map file
> > > > and
> > > > set
> > > > the name in the meson file so that the built library names with
> > > > meson
> > > > and legacy makefiles are the same
> > > >
> > > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Luca Boccassi
> > >
> > > Rather than doing this renaming, can we instead add a symlink in
> > > the
> > > install phase to map the old name to the new one? I'd like to see
> > > the
> > > consistency of directory name, map filename and driver name
> > > enforced
> > > strictly in the build system. Having exceptions is a pain.
> > >
> > > /Bruce
> >
> > We could, but the pain gets shifted on packagers then - what about
> > renaming the directory entirely to net/lio?
>
> For packagers, what sort of ABI compatibility guarantees do you try
> and
> keep between releases. Is this something that just needs a one-
> release ABI
> announcement, as with other ABI changes?
>
> /Bruce
Currently in Debian/Ubuntu we are using the ABI override (because of
the sticky ABI breakage issue) so the filenames and package names are
different on every release anyway.
So in theory we could change the name of the libs and packages, but
what I'm mostly worried about is keeping consistency and some level of
compatibility between old and new build systems, isn't that an issue?
--
Kind regards,
Luca Boccassi
Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue of logid
Ziye Yang writes:
> From: Ziye Yang
>
> This patch is used to fix the memory leak issue of logid.
> We use the ASAN test in SPDK when intergrating DPDK and
> find this memory leak issue.
>
> By the way, we also fix several missed function call of
> rte_atomic32_clear.
This part I don't understand. It should be a separate proposal.
> Signed-off-by: Ziye Yang
> ---
> lib/librte_eal/linuxapp/eal/eal.c | 11 +++
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal.c
> b/lib/librte_eal/linuxapp/eal/eal.c
> index e59ac65..a5129e5 100644
> --- a/lib/librte_eal/linuxapp/eal/eal.c
> +++ b/lib/librte_eal/linuxapp/eal/eal.c
> @@ -793,7 +793,8 @@ static void rte_eal_init_alert(const char *msg)
> int i, fctret, ret;
> pthread_t thread_id;
> static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
> - const char *logid;
> + const char *p;
> + static char logid[PATH_MAX];
On a linux system, PATH_MAX is 4096, but an argument may be
MAX_ARG_STRLEN which is significantly higher.
Have you thought about an alternative where you keep the strdup and add
an atexit() handler to do the free? Otherwise, you'll need to add code
to check the string length as well and enforce some kind of size
restriction.
> char cpuset[RTE_CPU_AFFINITY_STR_LEN];
> char thread_name[RTE_MAX_THREAD_NAME_LEN];
>
> @@ -810,9 +811,8 @@ static void rte_eal_init_alert(const char *msg)
> return -1;
> }
>
> - logid = strrchr(argv[0], '/');
> - logid = strdup(logid ? logid + 1: argv[0]);
> -
> + p = strrchr(argv[0], '/');
> + snprintf(logid, sizeof(logid), "%s", (p ? p + 1 : argv[0]));
> thread_id = pthread_self();
>
> eal_reset_internal_config(&internal_config);
> @@ -823,6 +823,7 @@ static void rte_eal_init_alert(const char *msg)
> if (rte_eal_cpu_init() < 0) {
> rte_eal_init_alert("Cannot detect lcores.");
> rte_errno = ENOTSUP;
> + rte_atomic32_clear(&run_once);
This is not recoverable. No amount of retry will allow the user to
re-init the eal - the hardware isn't supported. Why clear the run_once
flag?
> return -1;
> }
>
> @@ -851,6 +852,7 @@ static void rte_eal_init_alert(const char *msg)
>
> if (rte_eal_intr_init() < 0) {
> rte_eal_init_alert("Cannot init interrupt-handling thread\n");
> + rte_atomic32_clear(&run_once);
Arguable whether or not this is recoverable. IIRC, the eal_intr_init
spawns a thread - if it fails to spawn the likelihood is the process
won't be able to continue.
> return -1;
> }
>
> @@ -861,6 +863,7 @@ static void rte_eal_init_alert(const char *msg)
> rte_eal_init_alert("failed to init mp channel\n");
> if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
> rte_errno = EFAULT;
> + rte_atomic32_clear(&run_once);
This is also not recoverable. Why clear the run_once flag?
> return -1;
> }
> }
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, Sep 11, 2018 at 02:41:36PM +0100, Luca Boccassi wrote:
> On Tue, 2018-09-11 at 14:32 +0100, Bruce Richardson wrote:
> > On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> > > On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > > > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi wrote:
> > > > > The library is called librte_pmd_lio, so rename the map file
> > > > > and
> > > > > set
> > > > > the name in the meson file so that the built library names with
> > > > > meson
> > > > > and legacy makefiles are the same
> > > > >
> > > > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > > > Cc: sta...@dpdk.org
> > > > >
> > > > > Signed-off-by: Luca Boccassi
> > > >
> > > > Rather than doing this renaming, can we instead add a symlink in
> > > > the
> > > > install phase to map the old name to the new one? I'd like to see
> > > > the
> > > > consistency of directory name, map filename and driver name
> > > > enforced
> > > > strictly in the build system. Having exceptions is a pain.
> > > >
> > > > /Bruce
> > >
> > > We could, but the pain gets shifted on packagers then - what about
> > > renaming the directory entirely to net/lio?
> >
> > For packagers, what sort of ABI compatibility guarantees do you try
> > and
> > keep between releases. Is this something that just needs a one-
> > release ABI
> > announcement, as with other ABI changes?
> >
> > /Bruce
>
> Currently in Debian/Ubuntu we are using the ABI override (because of
> the sticky ABI breakage issue) so the filenames and package names are
> different on every release anyway.
>
> So in theory we could change the name of the libs and packages, but
> what I'm mostly worried about is keeping consistency and some level of
> compatibility between old and new build systems, isn't that an issue?
>
It's a good question, and I suspect everyone will have their own opinion.
Personally, I take the view that moving build system involves quite a
number of changes anyway, so we should take the opportunity to clean up a
few other things at the same time. This is why I'm so keep on trying to
keep everything consistent as far as possible throughout the system and not
put in special cases. For many of these a) if we put in lots of name
overrides now we'll probably never get rid of them, and b) it's more likely
that future drivers will adopt the same technique to have different naming
of drivers and directories.
However, if keeping sonames consistent is a major concern, then perhaps we
should look to rename some directories, like you suggested before.
/Bruce
Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue of logid
> -Original Message-
> From: Aaron Conole [mailto:acon...@redhat.com]
> Sent: Tuesday, September 11, 2018 2:47 PM
> To: Yang, Ziye
> Cc: dev@dpdk.org; Ananyev, Konstantin ; Ziye
> Yang
> Subject: Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue
> of logid
>
> Ziye Yang writes:
>
> > From: Ziye Yang
> >
> > This patch is used to fix the memory leak issue of logid.
> > We use the ASAN test in SPDK when intergrating DPDK and
> > find this memory leak issue.
> >
> > By the way, we also fix several missed function call of
> > rte_atomic32_clear.
>
> This part I don't understand. It should be a separate proposal.
>
> > Signed-off-by: Ziye Yang
> > ---
> > lib/librte_eal/linuxapp/eal/eal.c | 11 +++
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/librte_eal/linuxapp/eal/eal.c
> > b/lib/librte_eal/linuxapp/eal/eal.c
> > index e59ac65..a5129e5 100644
> > --- a/lib/librte_eal/linuxapp/eal/eal.c
> > +++ b/lib/librte_eal/linuxapp/eal/eal.c
> > @@ -793,7 +793,8 @@ static void rte_eal_init_alert(const char *msg)
> > int i, fctret, ret;
> > pthread_t thread_id;
> > static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
> > - const char *logid;
> > + const char *p;
> > + static char logid[PATH_MAX];
>
> On a linux system, PATH_MAX is 4096, but an argument may be
> MAX_ARG_STRLEN which is significantly higher.
But we only interested here in 'basename(argv[0])'.
Surely it shouldn't be bigger than PATH_MAX unless something is terribly wrong
here.
>
> Have you thought about an alternative where you keep the strdup and add
> an atexit() handler to do the free? Otherwise, you'll need to add code
> to check the string length as well and enforce some kind of size
> restriction.
snprintf() below will do a safe truncation for us.
>
> > char cpuset[RTE_CPU_AFFINITY_STR_LEN];
> > char thread_name[RTE_MAX_THREAD_NAME_LEN];
> >
> > @@ -810,9 +811,8 @@ static void rte_eal_init_alert(const char *msg)
> > return -1;
> > }
> >
> > - logid = strrchr(argv[0], '/');
> > - logid = strdup(logid ? logid + 1: argv[0]);
> > -
> > + p = strrchr(argv[0], '/');
> > + snprintf(logid, sizeof(logid), "%s", (p ? p + 1 : argv[0]));
> > thread_id = pthread_self();
> >
> > eal_reset_internal_config(&internal_config);
> > @@ -823,6 +823,7 @@ static void rte_eal_init_alert(const char *msg)
> > if (rte_eal_cpu_init() < 0) {
> > rte_eal_init_alert("Cannot detect lcores.");
> > rte_errno = ENOTSUP;
> > + rte_atomic32_clear(&run_once);
>
> This is not recoverable. No amount of retry will allow the user to
> re-init the eal - the hardware isn't supported. Why clear the run_once
> flag?
>
> > return -1;
> > }
> >
> > @@ -851,6 +852,7 @@ static void rte_eal_init_alert(const char *msg)
> >
> > if (rte_eal_intr_init() < 0) {
> > rte_eal_init_alert("Cannot init interrupt-handling thread\n");
> > + rte_atomic32_clear(&run_once);
>
> Arguable whether or not this is recoverable. IIRC, the eal_intr_init
> spawns a thread - if it fails to spawn the likelihood is the process
> won't be able to continue.
>
> > return -1;
> > }
> >
> > @@ -861,6 +863,7 @@ static void rte_eal_init_alert(const char *msg)
> > rte_eal_init_alert("failed to init mp channel\n");
> > if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
> > rte_errno = EFAULT;
> > + rte_atomic32_clear(&run_once);
>
> This is also not recoverable. Why clear the run_once flag?
>
> > return -1;
> > }
> > }
[dpdk-dev] [PATCH v2 00/15] add flow API support to softnic
This patch series adds the flow API support for the softnic. This patch set also introduce a new cli command to provide mapping of flow group and direction to softnic pipeline and table. v2: added missing code to patch #9/10 reworded commit titles. Reshma Pattan (15): net/softnic: add infrastructure for flow API net/softnic: map flow attributes to pipeline table net/softnic: add new cli for flow attribute map net/softnic: replace some pointers with arrays net/softnic: add free table and find out port functions net/softnic: add function to get eth device from softnic net/softnic: implement flow validate API net/softnic: validate and map flow rule with acl table match net/softnic: parse flow protocol for acl table match net/softnic: validate and map flow with hash table match net/softnic: validate and map flow action with table action net/softnic: add flow create API net/softnic: add flow destroy API net/softnic: add flow query API net/softnic: add parsing for raw flow item drivers/net/softnic/Makefile|1 + drivers/net/softnic/meson.build |1 + drivers/net/softnic/rte_eth_softnic.c | 16 + drivers/net/softnic/rte_eth_softnic_cli.c | 115 +- drivers/net/softnic/rte_eth_softnic_flow.c | 1824 +++ drivers/net/softnic/rte_eth_softnic_internals.h | 98 +- drivers/net/softnic/rte_eth_softnic_pipeline.c | 61 +- 7 files changed, 2086 insertions(+), 30 deletions(-) create mode 100644 drivers/net/softnic/rte_eth_softnic_flow.c -- 2.14.4
[dpdk-dev] [PATCH v2 01/15] net/softnic: add infrastructure for flow API
Add rte_flow infra structure for flow api support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_internals.h | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index a25eb874c..882cfd191 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -20,6 +20,7 @@
#include
#include
+#include
#include "rte_eth_softnic.h"
#include "conn.h"
@@ -43,6 +44,13 @@ struct pmd_params {
} tm;
};
+/**
+ * Ethdev Flow API
+ */
+struct rte_flow;
+
+TAILQ_HEAD(flow_list, rte_flow);
+
/**
* MEMPOOL
*/
@@ -762,6 +770,15 @@ struct softnic_table_rule_action {
struct rte_table_action_time_params time;
};
+struct rte_flow {
+ TAILQ_ENTRY(rte_flow) node;
+ struct softnic_table_rule_match match;
+ struct softnic_table_rule_action action;
+ void *data;
+ struct pipeline *pipeline;
+ uint32_t table_id;
+};
+
int
softnic_pipeline_port_in_stats_read(struct pmd_internals *p,
const char *pipeline_name,
--
2.14.4
[dpdk-dev] [PATCH v2 02/15] net/softnic: map flow attributes to pipeline table
Added mapping support from rte flow attributes
to softnic pipeline and table.
So added flow attribute map set and get functions
definition to new file rte_eth_sofnic_flow.c.
Added pmd flow internals with ingress and egress
flow attribute maps.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/Makefile| 1 +
drivers/net/softnic/meson.build | 1 +
drivers/net/softnic/rte_eth_softnic_flow.c | 46 +
drivers/net/softnic/rte_eth_softnic_internals.h | 31 +
4 files changed, 79 insertions(+)
create mode 100644 drivers/net/softnic/rte_eth_softnic_flow.c
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index ea9b65f4e..12515b10d 100644
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -33,6 +33,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) +=
rte_eth_softnic_action.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index ff9822747..56e5e2b21 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -13,6 +13,7 @@ sources = files('rte_eth_softnic_tm.c',
'rte_eth_softnic_pipeline.c',
'rte_eth_softnic_thread.c',
'rte_eth_softnic_cli.c',
+ 'rte_eth_softnic_flow.c',
'parser.c',
'conn.c')
deps += ['pipeline', 'port', 'table', 'sched']
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
new file mode 100644
index 0..843db7590
--- /dev/null
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
+ */
+
+#include "rte_eth_softnic_internals.h"
+#include "rte_eth_softnic.h"
+
+int
+flow_attr_map_set(struct pmd_internals *softnic,
+ uint32_t group_id,
+ int ingress,
+ const char *pipeline_name,
+ uint32_t table_id)
+{
+ struct pipeline *pipeline;
+ struct flow_attr_map *map;
+
+ if (group_id >= SOFTNIC_FLOW_MAX_GROUPS ||
+ pipeline_name == NULL)
+ return -1;
+
+ pipeline = softnic_pipeline_find(softnic, pipeline_name);
+ if (pipeline == NULL ||
+ table_id >= pipeline->n_tables)
+ return -1;
+
+ map = (ingress) ? &softnic->flow.ingress_map[group_id] :
+ &softnic->flow.egress_map[group_id];
+ strcpy(map->pipeline_name, pipeline_name);
+ map->table_id = table_id;
+ map->valid = 1;
+
+ return 0;
+}
+
+struct flow_attr_map *
+flow_attr_map_get(struct pmd_internals *softnic,
+ uint32_t group_id,
+ int ingress)
+{
+ if (group_id >= SOFTNIC_FLOW_MAX_GROUPS)
+ return NULL;
+
+ return (ingress) ? &softnic->flow.ingress_map[group_id] :
+ &softnic->flow.egress_map[group_id];
+}
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index 882cfd191..d1996c469 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -51,6 +51,21 @@ struct rte_flow;
TAILQ_HEAD(flow_list, rte_flow);
+struct flow_attr_map {
+ char pipeline_name[NAME_SIZE];
+ uint32_t table_id;
+ int valid;
+};
+
+#ifndef SOFTNIC_FLOW_MAX_GROUPS
+#define SOFTNIC_FLOW_MAX_GROUPS64
+#endif
+
+struct flow_internals {
+ struct flow_attr_map ingress_map[SOFTNIC_FLOW_MAX_GROUPS];
+ struct flow_attr_map egress_map[SOFTNIC_FLOW_MAX_GROUPS];
+};
+
/**
* MEMPOOL
*/
@@ -497,6 +512,7 @@ struct pmd_internals {
struct tm_internals tm; /**< Traffic Management */
} soft;
+ struct flow_internals flow;
struct softnic_conn *conn;
struct softnic_mempool_list mempool_list;
struct softnic_swq_list swq_list;
@@ -510,6 +526,21 @@ struct pmd_internals {
struct softnic_thread_data thread_data[RTE_MAX_LCORE];
};
+/**
+ * Ethdev Flow API
+ */
+int
+flow_attr_map_set(struct pmd_internals *softnic,
+ uint32_t group_id,
+ int ingress,
+ const char *pipeline_name,
+ uint32_t table_id);
+
+struct flow_attr_map *
+flow_attr_map_get(struct pmd_internals *softnic,
+ uint32_t group_id,
+ int ingress);
+
/**
* MEMPOOL
*/
--
2.14.4
[dpdk-dev] [PATCH v2 03/15] net/softnic: add new cli for flow attribute map
Added new cli by which user can specify to softnic
which rte flow group and direction has to mapped to
which pipeline and table.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_cli.c | 81 +++
1 file changed, 81 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 0c7448cc4..8f5f82555 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -4797,6 +4797,81 @@ cmd_softnic_thread_pipeline_disable(struct pmd_internals
*softnic,
}
}
+/**
+ * flowapi map
+ * group
+ * ingress | egress
+ * pipeline
+ * table
+ */
+static void
+cmd_softnic_flowapi_map(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ char *pipeline_name;
+ uint32_t group_id, table_id;
+ int ingress, status;
+
+ if (n_tokens != 9) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ if (strcmp(tokens[1], "map") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "map");
+ return;
+ }
+
+ if (strcmp(tokens[2], "group") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "group");
+ return;
+ }
+
+ if (softnic_parser_read_uint32(&group_id, tokens[3]) != 0) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "group_id");
+ return;
+ }
+
+ if (strcmp(tokens[4], "ingress") == 0) {
+ ingress = 1;
+ } else if (strcmp(tokens[4], "egress") == 0) {
+ ingress = 0;
+ } else {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "ingress | egress");
+ return;
+ }
+
+ if (strcmp(tokens[5], "pipeline") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pipeline");
+ return;
+ }
+
+ pipeline_name = tokens[6];
+
+ if (strcmp(tokens[7], "table") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "table");
+ return;
+ }
+
+ if (softnic_parser_read_uint32(&table_id, tokens[8]) != 0) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
+ return;
+ }
+
+ status = flow_attr_map_set(softnic,
+ group_id,
+ ingress,
+ pipeline_name,
+ table_id);
+ if (status) {
+ snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
+ return;
+ }
+}
+
void
softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
{
@@ -5089,6 +5164,12 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
}
}
+ if (strcmp(tokens[0], "flowapi") == 0) {
+ cmd_softnic_flowapi_map(softnic, tokens, n_tokens, out,
+ out_size);
+ return;
+ }
+
snprintf(out, out_size, MSG_CMD_UNKNOWN, tokens[0]);
}
--
2.14.4
[dpdk-dev] [PATCH v2 04/15] net/softnic: replace some pointers with arrays
Change dev_name, action_profile_name and key_mask
from char* type to arary type of structures
softnic_port_in_params, softnic_port_out_params
and softnic_table_hash_params.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_cli.c | 34 +++--
drivers/net/softnic/rte_eth_softnic_internals.h | 18 ++---
drivers/net/softnic/rte_eth_softnic_pipeline.c | 4 +--
3 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 8f5f82555..dc8ccdc73 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1697,6 +1697,8 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
uint32_t t0;
int enabled, status;
+ memset(&p, 0, sizeof(p));
+
if (n_tokens < 7) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
@@ -1735,7 +1737,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
p.type = PORT_IN_RXQ;
- p.dev_name = tokens[t0 + 1];
+ strcpy(p.dev_name, tokens[t0 + 1]);
if (strcmp(tokens[t0 + 2], "rxq") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "rxq");
@@ -1758,7 +1760,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
p.type = PORT_IN_SWQ;
- p.dev_name = tokens[t0 + 1];
+ strcpy(p.dev_name, tokens[t0 + 1]);
t0 += 2;
} else if (strcmp(tokens[t0], "tmgr") == 0) {
@@ -1770,7 +1772,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
p.type = PORT_IN_TMGR;
- p.dev_name = tokens[t0 + 1];
+ strcpy(p.dev_name, tokens[t0 + 1]);
t0 += 2;
} else if (strcmp(tokens[t0], "tap") == 0) {
@@ -1782,7 +1784,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
p.type = PORT_IN_TAP;
- p.dev_name = tokens[t0 + 1];
+ strcpy(p.dev_name, tokens[t0 + 1]);
if (strcmp(tokens[t0 + 2], "mempool") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND,
@@ -1814,8 +1816,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
p.type = PORT_IN_SOURCE;
- p.dev_name = NULL;
-
if (strcmp(tokens[t0 + 1], "mempool") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND,
"mempool");
@@ -1851,7 +1851,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
return;
}
- p.action_profile_name = NULL;
if (n_tokens > t0 &&
(strcmp(tokens[t0], "action") == 0)) {
if (n_tokens < t0 + 2) {
@@ -1859,7 +1858,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
return;
}
- p.action_profile_name = tokens[t0 + 1];
+ strcpy(p.action_profile_name, tokens[t0 + 1]);
t0 += 2;
}
@@ -1945,7 +1944,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,
p.type = PORT_OUT_TXQ;
- p.dev_name = tokens[7];
+ strcpy(p.dev_name, tokens[7]);
if (strcmp(tokens[8], "txq") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "txq");
@@ -1966,7 +1965,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,
p.type = PORT_OUT_SWQ;
- p.dev_name = tokens[7];
+ strcpy(p.dev_name, tokens[7]);
} else if (strcmp(tokens[6], "tmgr") == 0) {
if (n_tokens != 8) {
snprintf(out, out_size, MSG_ARG_MISMATCH,
@@ -1976,7 +1975,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,
p.type = PORT_OUT_TMGR;
- p.dev_name = tokens[7];
+ strcpy(p.dev_name, tokens[7]);
} else if (strcmp(tokens[6], "tap") == 0) {
if (n_tokens != 8) {
snprintf(out, out_size, MSG_ARG_MISMATCH,
@@ -1986,7 +1985,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,
p.type = PORT_OUT_TAP;
- p.dev_name = tokens[7];
+ strcpy(p.dev_name, tokens[7]);
} else if (strcmp(tokens[6], "sink") == 0) {
if ((n_tokens != 7) && (n_tokens != 11)) {
snprintf(out, out_size, MSG_ARG_MISMATCH,
@@ -1996,8 +1995,6 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,
p.type = PORT_OUT_SINK;
- p.dev_name = NULL;
-
if (n_tokens == 7) {
p.sink.file_name = NULL;
p.sink.max_n_pkts = 0;
@@ -2064,12 +2061,13 @@ cmd_pipeline_table(struct pmd_internals *softnic,
char *o
[dpdk-dev] [PATCH v2 05/15] net/softnic: add free table and find out port functions
Added utility function to freeup the
pipeline tables.
Added utility functions to find the pipeline
output port.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_internals.h | 13 ++
drivers/net/softnic/rte_eth_softnic_pipeline.c | 57 +
2 files changed, 70 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index f40215dfe..9c587bc7d 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -415,10 +415,15 @@ struct softnic_port_in {
struct rte_port_in_action *a;
};
+struct softnic_port_out {
+ struct softnic_port_out_params params;
+};
+
struct softnic_table {
struct softnic_table_params params;
struct softnic_table_action_profile *ap;
struct rte_table_action *a;
+ struct flow_list flows;
};
struct pipeline {
@@ -426,7 +431,9 @@ struct pipeline {
char name[NAME_SIZE];
struct rte_pipeline *p;
+ struct pipeline_params params;
struct softnic_port_in port_in[RTE_PIPELINE_PORT_IN_MAX];
+ struct softnic_port_out port_out[RTE_PIPELINE_PORT_OUT_MAX];
struct softnic_table table[RTE_PIPELINE_TABLE_MAX];
uint32_t n_ports_in;
uint32_t n_ports_out;
@@ -725,6 +732,12 @@ softnic_pipeline_port_out_create(struct pmd_internals *p,
const char *pipeline_name,
struct softnic_port_out_params *params);
+int
+softnic_pipeline_port_out_find(struct pmd_internals *softnic,
+ const char *pipeline_name,
+ const char *name,
+ uint32_t *port_id);
+
int
softnic_pipeline_table_create(struct pmd_internals *p,
const char *pipeline_name,
diff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c
b/drivers/net/softnic/rte_eth_softnic_pipeline.c
index dacf7bc9a..d1084ea36 100644
--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c
+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c
@@ -43,17 +43,41 @@ softnic_pipeline_init(struct pmd_internals *p)
return 0;
}
+static void
+softnic_pipeline_table_free(struct softnic_table *table)
+{
+ for ( ; ; ) {
+ struct rte_flow *flow;
+
+ flow = TAILQ_FIRST(&table->flows);
+ if (flow == NULL)
+ break;
+
+ TAILQ_REMOVE(&table->flows, flow, node);
+ free(flow);
+ }
+}
+
void
softnic_pipeline_free(struct pmd_internals *p)
{
for ( ; ; ) {
struct pipeline *pipeline;
+ uint32_t table_id;
pipeline = TAILQ_FIRST(&p->pipeline_list);
if (pipeline == NULL)
break;
TAILQ_REMOVE(&p->pipeline_list, pipeline, node);
+
+ for (table_id = 0; table_id < pipeline->n_tables; table_id++) {
+ struct softnic_table *table =
+ &pipeline->table[table_id];
+
+ softnic_pipeline_table_free(table);
+ }
+
rte_ring_free(pipeline->msgq_req);
rte_ring_free(pipeline->msgq_rsp);
rte_pipeline_free(pipeline->p);
@@ -160,6 +184,7 @@ softnic_pipeline_create(struct pmd_internals *softnic,
/* Node fill in */
strlcpy(pipeline->name, name, sizeof(pipeline->name));
pipeline->p = p;
+ memcpy(&pipeline->params, params, sizeof(*params));
pipeline->n_ports_in = 0;
pipeline->n_ports_out = 0;
pipeline->n_tables = 0;
@@ -401,6 +426,7 @@ softnic_pipeline_port_out_create(struct pmd_internals
*softnic,
} pp_nodrop;
struct pipeline *pipeline;
+ struct softnic_port_out *port_out;
uint32_t port_id;
int status;
@@ -542,6 +568,8 @@ softnic_pipeline_port_out_create(struct pmd_internals
*softnic,
return -1;
/* Pipeline */
+ port_out = &pipeline->port_out[pipeline->n_ports_out];
+ memcpy(&port_out->params, params, sizeof(*params));
pipeline->n_ports_out++;
return 0;
@@ -960,7 +988,36 @@ softnic_pipeline_table_create(struct pmd_internals
*softnic,
memcpy(&table->params, params, sizeof(*params));
table->ap = ap;
table->a = action;
+ TAILQ_INIT(&table->flows);
pipeline->n_tables++;
return 0;
}
+
+int
+softnic_pipeline_port_out_find(struct pmd_internals *softnic,
+ const char *pipeline_name,
+ const char *name,
+ uint32_t *port_id)
+{
+ struct pipeline *pipeline;
+ uint32_t i;
+
+ if (softnic == NULL ||
+ pipeline_name == NULL ||
+ name == NULL ||
+ port_id == NULL)
+ return -1;
+
+ pipeline = softnic_pipeline_find(softnic, pipeline_name);
+ if (
[dpdk-dev] [PATCH v2 06/15] net/softnic: add function to get eth device from softnic
Add utility function to get the rte_eth_dev from
a given softnic.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_internals.h | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index 9c587bc7d..1857ec50d 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -18,6 +18,7 @@
#include
#include
+#include
#include
#include
#include
@@ -537,6 +538,22 @@ struct pmd_internals {
struct softnic_thread_data thread_data[RTE_MAX_LCORE];
};
+static inline struct rte_eth_dev *
+ETHDEV(struct pmd_internals *softnic)
+{
+ uint16_t port_id;
+ int status;
+
+ if (softnic == NULL)
+ return NULL;
+
+ status = rte_eth_dev_get_port_by_name(softnic->params.name, &port_id);
+ if (status)
+ return NULL;
+
+ return &rte_eth_devices[port_id];
+}
+
/**
* Ethdev Flow API
*/
--
2.14.4
[dpdk-dev] [PATCH v2 08/15] net/softnic: validate and map flow rule with acl table match
Support for validating and mapping rte flow rule with
ACL table match is added.
As part of this support below utility functions
been added
flow_rule_match_get()
flow_rule_match_acl_get()
flow_item_skip_disabled_protos()
flow_item_proto_preprocess()
flow_item_is_proto()
flow_item_raw_preprocess()
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 386 +
1 file changed, 386 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index f37890333..022d41775 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -95,6 +95,375 @@ flow_pipeline_table_get(struct pmd_internals *softnic,
return 0;
}
+union flow_item {
+ uint8_t raw[TABLE_RULE_MATCH_SIZE_MAX];
+ struct rte_flow_item_eth eth;
+ struct rte_flow_item_vlan vlan;
+ struct rte_flow_item_ipv4 ipv4;
+ struct rte_flow_item_ipv6 ipv6;
+ struct rte_flow_item_icmp icmp;
+ struct rte_flow_item_udp udp;
+ struct rte_flow_item_tcp tcp;
+ struct rte_flow_item_sctp sctp;
+ struct rte_flow_item_vxlan vxlan;
+ struct rte_flow_item_e_tag e_tag;
+ struct rte_flow_item_nvgre nvgre;
+ struct rte_flow_item_mpls mpls;
+ struct rte_flow_item_gre gre;
+ struct rte_flow_item_gtp gtp;
+ struct rte_flow_item_esp esp;
+ struct rte_flow_item_geneve geneve;
+ struct rte_flow_item_vxlan_gpe vxlan_gpe;
+ struct rte_flow_item_arp_eth_ipv4 arp_eth_ipv4;
+ struct rte_flow_item_ipv6_ext ipv6_ext;
+ struct rte_flow_item_icmp6 icmp6;
+ struct rte_flow_item_icmp6_nd_ns icmp6_nd_ns;
+ struct rte_flow_item_icmp6_nd_na icmp6_nd_na;
+ struct rte_flow_item_icmp6_nd_opt icmp6_nd_opt;
+ struct rte_flow_item_icmp6_nd_opt_sla_eth icmp6_nd_opt_sla_eth;
+ struct rte_flow_item_icmp6_nd_opt_tla_eth icmp6_nd_opt_tla_eth;
+};
+
+static const union flow_item flow_item_raw_mask;
+
+static int
+flow_item_is_proto(enum rte_flow_item_type type,
+ const void **mask,
+ size_t *size)
+{
+ switch (type) {
+ case RTE_FLOW_ITEM_TYPE_RAW:
+ *mask = &flow_item_raw_mask;
+ *size = sizeof(flow_item_raw_mask);
+ return 1; /* TRUE */
+
+ case RTE_FLOW_ITEM_TYPE_ETH:
+ *mask = &rte_flow_item_eth_mask;
+ *size = sizeof(struct rte_flow_item_eth);
+ return 1; /* TRUE */
+
+ case RTE_FLOW_ITEM_TYPE_VLAN:
+ *mask = &rte_flow_item_vlan_mask;
+ *size = sizeof(struct rte_flow_item_vlan);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_IPV4:
+ *mask = &rte_flow_item_ipv4_mask;
+ *size = sizeof(struct rte_flow_item_ipv4);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_IPV6:
+ *mask = &rte_flow_item_ipv6_mask;
+ *size = sizeof(struct rte_flow_item_ipv6);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_ICMP:
+ *mask = &rte_flow_item_icmp_mask;
+ *size = sizeof(struct rte_flow_item_icmp);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_UDP:
+ *mask = &rte_flow_item_udp_mask;
+ *size = sizeof(struct rte_flow_item_udp);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_TCP:
+ *mask = &rte_flow_item_tcp_mask;
+ *size = sizeof(struct rte_flow_item_tcp);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_SCTP:
+ *mask = &rte_flow_item_sctp_mask;
+ *size = sizeof(struct rte_flow_item_sctp);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_VXLAN:
+ *mask = &rte_flow_item_vxlan_mask;
+ *size = sizeof(struct rte_flow_item_vxlan);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_E_TAG:
+ *mask = &rte_flow_item_e_tag_mask;
+ *size = sizeof(struct rte_flow_item_e_tag);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_NVGRE:
+ *mask = &rte_flow_item_nvgre_mask;
+ *size = sizeof(struct rte_flow_item_nvgre);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_MPLS:
+ *mask = &rte_flow_item_mpls_mask;
+ *size = sizeof(struct rte_flow_item_mpls);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_GRE:
+ *mask = &rte_flow_item_gre_mask;
+ *size = sizeof(struct rte_flow_item_gre);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_GTP:
+ case RTE_FLOW_ITEM_TYPE_GTPC:
+ case RTE_FLOW_ITEM_TYPE_GTPU:
+ *mask = &rte_flow_item_gtp_mask;
+ *size = sizeof(struct rte_flow_item_gtp);
+ return 1;
+
+ case RTE_FLOW_ITEM_TYPE_ESP:
+ *mask = &rte_flow_it
[dpdk-dev] [PATCH v2 07/15] net/softnic: implement flow validate API
Start adding flow api operations.
Started with flow validate api support by adding
below basic infrastructure.
flow_pipeline_table_get()
pmd_flow_validate()
Additional flow validate changes will be
added in next patches.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic.c | 16
drivers/net/softnic/rte_eth_softnic_flow.c | 112
drivers/net/softnic/rte_eth_softnic_internals.h | 2 +
3 files changed, 130 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index 30fb3952a..ae2a4385b 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -205,6 +205,21 @@ pmd_link_update(struct rte_eth_dev *dev __rte_unused,
return 0;
}
+static int
+pmd_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
+ enum rte_filter_type filter_type,
+ enum rte_filter_op filter_op,
+ void *arg)
+{
+ if (filter_type == RTE_ETH_FILTER_GENERIC &&
+ filter_op == RTE_ETH_FILTER_GET) {
+ *(const void **)arg = &pmd_flow_ops;
+ return 0;
+ }
+
+ return -ENOTSUP;
+}
+
static int
pmd_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
{
@@ -222,6 +237,7 @@ static const struct eth_dev_ops pmd_ops = {
.dev_infos_get = pmd_dev_infos_get,
.rx_queue_setup = pmd_rx_queue_setup,
.tx_queue_setup = pmd_tx_queue_setup,
+ .filter_ctrl = pmd_filter_ctrl,
.tm_ops_get = pmd_tm_ops_get,
};
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index 843db7590..f37890333 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -44,3 +44,115 @@ flow_attr_map_get(struct pmd_internals *softnic,
return (ingress) ? &softnic->flow.ingress_map[group_id] :
&softnic->flow.egress_map[group_id];
}
+
+static int
+flow_pipeline_table_get(struct pmd_internals *softnic,
+ const struct rte_flow_attr *attr,
+ const char **pipeline_name,
+ uint32_t *table_id,
+ struct rte_flow_error *error)
+{
+ struct flow_attr_map *map;
+
+ if (attr == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR,
+ NULL,
+ "Null attr");
+
+ if (!attr->ingress && !attr->egress)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
+ attr,
+ "Ingress/egress not specified");
+
+ if (attr->ingress && attr->egress)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
+ attr,
+ "Setting both ingress and egress is not
allowed");
+
+ map = flow_attr_map_get(softnic,
+ attr->group,
+ attr->ingress);
+ if (map == NULL ||
+ map->valid == 0)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_GROUP,
+ attr,
+ "Invalid group ID");
+
+ if (pipeline_name)
+ *pipeline_name = map->pipeline_name;
+
+ if (table_id)
+ *table_id = map->table_id;
+
+ return 0;
+}
+
+static int
+pmd_flow_validate(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item item[],
+ const struct rte_flow_action action[],
+ struct rte_flow_error *error)
+{
+ struct pmd_internals *softnic = dev->data->dev_private;
+ struct pipeline *pipeline;
+ const char *pipeline_name = NULL;
+ uint32_t table_id = 0;
+ int status;
+
+ /* Check input parameters. */
+ if (attr == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR,
+ NULL, "Null attr");
+
+ if (item == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ NULL,
+ "Null item");
+
+ if (action == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+
[dpdk-dev] [PATCH v2 10/15] net/softnic: validate and map flow with hash table match
Support for validating and mapping flow rule with HASH
table match is added.
As part of this, below helper functions are added.
flow_rule_match_hash_get()
hash_key_mask_is_same()
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 201 -
1 file changed, 200 insertions(+), 1 deletion(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index 94af66391..dc3dd493b 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -791,7 +791,195 @@ flow_rule_match_acl_get(struct pmd_internals *softnic
__rte_unused,
return 0;
}
- static int
+/***
+ * Both *tmask* and *fmask* are byte arrays of size *tsize* and *fsize*
+ * respectively.
+ * They are located within a larger buffer at offsets *toffset* and *foffset*
+ * respectivelly. Both *tmask* and *fmask* represent bitmasks for the larger
+ * buffer.
+ * Question: are the two masks equivalent?
+ *
+ * Notes:
+ * 1. Offset basically indicates that the first offset bytes in the buffer
+ *are "don't care", so offset is equivalent to pre-pending an "all-zeros"
+ *array of *offset* bytes to the *mask*.
+ * 2. Each *mask* might contain a number of zero bytes at the beginning or
+ *at the end.
+ * 3. Bytes in the larger buffer after the end of the *mask* are also
considered
+ *"don't care", so they are equivalent to appending an "all-zeros" array of
+ *bytes to the *mask*.
+ *
+ * Example:
+ * Buffer = [xx xx xx xx xx xx xx xx], buffer size = 8 bytes
+ * tmask = [00 22 00 33 00], toffset = 2, tsize = 5
+ *=> buffer mask = [00 00 00 22 00 33 00 00]
+ * fmask = [22 00 33], foffset = 3, fsize = 3 =>
+ *=> buffer mask = [00 00 00 22 00 33 00 00]
+ * Therefore, the tmask and fmask from this example are equivalent.
+ */
+static int
+hash_key_mask_is_same(uint8_t *tmask,
+ size_t toffset,
+ size_t tsize,
+ uint8_t *fmask,
+ size_t foffset,
+ size_t fsize,
+ size_t *toffset_plus,
+ size_t *foffset_plus)
+{
+ size_t tpos; /* Position of first non-zero byte in the tmask buffer. */
+ size_t fpos; /* Position of first non-zero byte in the fmask buffer. */
+
+ /* Compute tpos and fpos. */
+ for (tpos = 0; tmask[tpos] == 0; tpos++)
+ ;
+ for (fpos = 0; fmask[fpos] == 0; fpos++)
+ ;
+
+ if (toffset + tpos != foffset + fpos)
+ return 0; /* FALSE */
+
+ tsize -= tpos;
+ fsize -= fpos;
+
+ if (tsize < fsize) {
+ size_t i;
+
+ for (i = 0; i < tsize; i++)
+ if (tmask[tpos + i] != fmask[fpos + i])
+ return 0; /* FALSE */
+
+ for ( ; i < fsize; i++)
+ if (fmask[fpos + i])
+ return 0; /* FALSE */
+ } else {
+ size_t i;
+
+ for (i = 0; i < fsize; i++)
+ if (tmask[tpos + i] != fmask[fpos + i])
+ return 0; /* FALSE */
+
+ for ( ; i < tsize; i++)
+ if (tmask[tpos + i])
+ return 0; /* FALSE */
+ }
+
+ if (toffset_plus)
+ *toffset_plus = tpos;
+
+ if (foffset_plus)
+ *foffset_plus = fpos;
+
+ return 1; /* TRUE */
+}
+
+static int
+flow_rule_match_hash_get(struct pmd_internals *softnic __rte_unused,
+ struct pipeline *pipeline __rte_unused,
+ struct softnic_table *table,
+ const struct rte_flow_attr *attr __rte_unused,
+ const struct rte_flow_item *item,
+ struct softnic_table_rule_match *rule_match,
+ struct rte_flow_error *error)
+{
+ struct softnic_table_rule_match_hash key, key_mask;
+ struct softnic_table_hash_params *params = &table->params.match.hash;
+ size_t offset = 0, length = 0, tpos, fpos;
+ int status;
+
+ memset(&key, 0, sizeof(key));
+ memset(&key_mask, 0, sizeof(key_mask));
+
+ /* VOID or disabled protos only, if any. */
+ status = flow_item_skip_disabled_protos(&item, 0, &offset, error);
+ if (status)
+ return status;
+
+ if (item->type == RTE_FLOW_ITEM_TYPE_END)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "HASH: END detected too early");
+
+ /* VOID or any protocols (enabled or disabled). */
+ for ( ; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+ union flow_item spec, mask;
+ size_t size;
+ int disabled, status;
+
+ if (item->type == RTE_FLOW_ITEM_TYPE_VOID)
+ continue;
+
+ status = flow_item_proto_preprocess(item,
[dpdk-dev] [PATCH v2 09/15] net/softnic: parse flow protocol for acl table match
Added flow protocol parsing for IPV4/IPV6 and
TCP/UDP/SCTP for ACL table rule match.
Added below helper functions for doing the same.
port_mask_to_range()
ipv6_mask_to_depth()
ipv4_mask_to_depth()
mask_to_depth()
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 359 -
1 file changed, 357 insertions(+), 2 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index 022d41775..94af66391 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1,10 +1,13 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017 Intel Corporation
+ * Copyright(c) 2018 Intel Corporation
*/
#include "rte_eth_softnic_internals.h"
#include "rte_eth_softnic.h"
+#define rte_ntohs rte_be_to_cpu_16
+#define rte_ntohl rte_be_to_cpu_32
+
int
flow_attr_map_set(struct pmd_internals *softnic,
uint32_t group_id,
@@ -397,6 +400,113 @@ flow_item_skip_disabled_protos(const struct rte_flow_item
**item,
((1LLU << RTE_FLOW_ITEM_TYPE_IPV4) | \
(1LLU << RTE_FLOW_ITEM_TYPE_IPV6))
+static void
+flow_item_skip_void(const struct rte_flow_item **item)
+{
+ for ( ; ; (*item)++)
+ if ((*item)->type != RTE_FLOW_ITEM_TYPE_VOID)
+ return;
+}
+
+#define IP_PROTOCOL_TCP 0x06
+#define IP_PROTOCOL_UDP 0x11
+#define IP_PROTOCOL_SCTP 0x84
+
+static int
+mask_to_depth(uint64_t mask,
+ uint32_t *depth)
+{
+ uint64_t n;
+
+ if (mask == UINT64_MAX) {
+ if (depth)
+ *depth = 64;
+
+ return 0;
+ }
+
+ mask = ~mask;
+
+ if (mask & (mask + 1))
+ return -1;
+
+ n = __builtin_popcountll(mask);
+ if (depth)
+ *depth = (uint32_t)(64 - n);
+
+ return 0;
+}
+
+static int
+ipv4_mask_to_depth(uint32_t mask,
+ uint32_t *depth)
+{
+ uint32_t d;
+ int status;
+
+ status = mask_to_depth(mask | (UINT64_MAX << 32), &d);
+ if (status)
+ return status;
+
+ d -= 32;
+ if (depth)
+ *depth = d;
+
+ return 0;
+}
+
+static int
+ipv6_mask_to_depth(uint8_t *mask,
+ uint32_t *depth)
+{
+ uint64_t *m = (uint64_t *)mask;
+ uint64_t m0 = rte_be_to_cpu_64(m[0]);
+ uint64_t m1 = rte_be_to_cpu_64(m[1]);
+ uint32_t d0, d1;
+ int status;
+
+ status = mask_to_depth(m0, &d0);
+ if (status)
+ return status;
+
+ status = mask_to_depth(m1, &d1);
+ if (status)
+ return status;
+
+ if (d0 < 64 && d1)
+ return -1;
+
+ if (depth)
+ *depth = d0 + d1;
+
+ return 0;
+}
+
+static int
+port_mask_to_range(uint16_t port,
+ uint16_t port_mask,
+ uint16_t *port0,
+ uint16_t *port1)
+{
+ int status;
+ uint16_t p0, p1;
+
+ status = mask_to_depth(port_mask | (UINT64_MAX << 16), NULL);
+ if (status)
+ return -1;
+
+ p0 = port & port_mask;
+ p1 = p0 | ~port_mask;
+
+ if (port0)
+ *port0 = p0;
+
+ if (port1)
+ *port1 = p1;
+
+ return 0;
+}
+
static int
flow_rule_match_acl_get(struct pmd_internals *softnic __rte_unused,
struct pipeline *pipeline __rte_unused,
@@ -409,6 +519,7 @@ flow_rule_match_acl_get(struct pmd_internals *softnic
__rte_unused,
union flow_item spec, mask;
size_t size, length = 0;
int disabled = 0, status;
+ uint8_t ip_proto, ip_proto_mask;
memset(rule_match, 0, sizeof(*rule_match));
rule_match->match_type = TABLE_ACL;
@@ -427,6 +538,80 @@ flow_rule_match_acl_get(struct pmd_internals *softnic
__rte_unused,
return status;
switch (item->type) {
+ case RTE_FLOW_ITEM_TYPE_IPV4:
+ {
+ uint32_t sa_depth, da_depth;
+
+ status = ipv4_mask_to_depth(rte_ntohl(mask.ipv4.hdr.src_addr),
+ &sa_depth);
+ if (status)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "ACL: Illegal IPv4 header source address mask");
+
+ status = ipv4_mask_to_depth(rte_ntohl(mask.ipv4.hdr.dst_addr),
+ &da_depth);
+ if (status)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "ACL: Illegal IPv4 header destination address
mask");
+
+ ip_proto = spec.ipv4.hdr.next_proto_id;
+ ip_pr
[dpdk-dev] [PATCH v2 12/15] net/softnic: add flow create API
pmd_flow_create API is added to support
rte flow create.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 174 +
1 file changed, 174 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index 16f1e4730..d3c94965b 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1,13 +1,39 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2018 Intel Corporation
*/
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
#include "rte_eth_softnic_internals.h"
#include "rte_eth_softnic.h"
+#define rte_htons rte_cpu_to_be_16
+#define rte_htonl rte_cpu_to_be_32
+
#define rte_ntohs rte_be_to_cpu_16
#define rte_ntohl rte_be_to_cpu_32
+static struct rte_flow *
+softnic_flow_find(struct softnic_table *table,
+ struct softnic_table_rule_match *rule_match)
+{
+ struct rte_flow *flow;
+
+ TAILQ_FOREACH(flow, &table->flows, node)
+ if (memcmp(&flow->match, rule_match, sizeof(*rule_match)) == 0)
+ return flow;
+
+ return NULL;
+}
+
int
flow_attr_map_set(struct pmd_internals *softnic,
uint32_t group_id,
@@ -1443,6 +1469,154 @@ pmd_flow_validate(struct rte_eth_dev *dev,
return 0;
}
+static struct rte_flow *
+pmd_flow_create(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item item[],
+ const struct rte_flow_action action[],
+ struct rte_flow_error *error)
+{
+ struct softnic_table_rule_match rule_match;
+ struct softnic_table_rule_action rule_action;
+ void *rule_data;
+
+ struct pmd_internals *softnic = dev->data->dev_private;
+ struct pipeline *pipeline;
+ struct softnic_table *table;
+ struct rte_flow *flow;
+ const char *pipeline_name = NULL;
+ uint32_t table_id = 0;
+ int new_flow, status;
+
+ /* Check input parameters. */
+ if (attr == NULL) {
+ rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR,
+ NULL,
+ "Null attr");
+ return NULL;
+ }
+
+ if (item == NULL) {
+ rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ NULL,
+ "Null item");
+ return NULL;
+ }
+
+ if (action == NULL) {
+ rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL,
+ "Null action");
+ return NULL;
+ }
+
+ /* Identify the pipeline table to add this flow to. */
+ status = flow_pipeline_table_get(softnic, attr, &pipeline_name,
+ &table_id, error);
+ if (status)
+ return NULL;
+
+ pipeline = softnic_pipeline_find(softnic, pipeline_name);
+ if (pipeline == NULL) {
+ rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Invalid pipeline name");
+ return NULL;
+ }
+
+ if (table_id >= pipeline->n_tables) {
+ rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Invalid pipeline table ID");
+ return NULL;
+ }
+
+ table = &pipeline->table[table_id];
+
+ /* Rule match. */
+ memset(&rule_match, 0, sizeof(rule_match));
+ status = flow_rule_match_get(softnic,
+ pipeline,
+ table,
+ attr,
+ item,
+ &rule_match,
+ error);
+ if (status)
+ return NULL;
+
+ /* Rule action. */
+ memset(&rule_action, 0, sizeof(rule_action));
+ status = flow_rule_action_get(softnic,
+ pipeline,
+ table,
+ attr,
+ action,
+ &rule_action,
+ error);
+ if (status)
+ return NULL;
+
+ /* Flow find/allocate. */
+ new_flow = 0;
+ flow = softnic_flow_find(table, &rule_match);
+ if (flow == NULL) {
+ new_flow = 1;
+ flow = calloc(1, sizeof(struct rte_flow));
+ if (flow == NULL) {
+ rte_flow_error_set(error,
+ ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "No
[dpdk-dev] [PATCH v2 11/15] net/softnic: validate and map flow action with table action
Added validation and mapping of flow rule action
with table action profile.
Added flow_rule_action_get() to do the same.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 350 +
1 file changed, 350 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index dc3dd493b..16f1e4730 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1009,6 +1009,8 @@ flow_rule_match_get(struct pmd_internals *softnic,
rule_match,
error);
+ /* FALLTHROUGH */
+
default:
return rte_flow_error_set(error,
ENOTSUP,
@@ -1018,6 +1020,341 @@ flow_rule_match_get(struct pmd_internals *softnic,
}
}
+static int
+flow_rule_action_get(struct pmd_internals *softnic,
+ struct pipeline *pipeline,
+ struct softnic_table *table,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_action *action,
+ struct softnic_table_rule_action *rule_action,
+ struct rte_flow_error *error __rte_unused)
+{
+ struct softnic_table_action_profile *profile;
+ struct softnic_table_action_profile_params *params;
+ int n_jump_queue_rss_drop = 0;
+ int n_count = 0;
+
+ profile = softnic_table_action_profile_find(softnic,
+ table->params.action_profile_name);
+ if (profile == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ action,
+ "JUMP: Table action profile");
+
+ params = &profile->params;
+
+ for ( ; action->type != RTE_FLOW_ACTION_TYPE_END; action++) {
+ if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
+ continue;
+
+ switch (action->type) {
+ case RTE_FLOW_ACTION_TYPE_JUMP:
+ {
+ const struct rte_flow_action_jump *conf = action->conf;
+ struct flow_attr_map *map;
+
+ if (conf == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "JUMP: Null configuration");
+
+ if (n_jump_queue_rss_drop)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "Only one termination action is"
+ " allowed per flow");
+
+ if ((params->action_mask &
+ (1LLU << RTE_TABLE_ACTION_FWD)) == 0)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "JUMP action not enabled for this
table");
+
+ n_jump_queue_rss_drop = 1;
+
+ map = flow_attr_map_get(softnic,
+ conf->group,
+ attr->ingress);
+ if (map == NULL || map->valid == 0)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "JUMP: Invalid group mapping");
+
+ if (strcmp(pipeline->name, map->pipeline_name) != 0)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "JUMP: Jump to table in different
pipeline");
+
+ /* RTE_TABLE_ACTION_FWD */
+ rule_action->fwd.action = RTE_PIPELINE_ACTION_TABLE;
+ rule_action->fwd.id = map->table_id;
+ rule_action->action_mask |= 1 << RTE_TABLE_ACTION_FWD;
+ break;
+ } /* RTE_FLOW_ACTION_TYPE_JUMP */
+
+ case RTE_FLOW_ACTION_TYPE_QUEUE:
+ {
+ char name[NAME_SIZE];
+ struct rte_eth_dev *dev;
+ const struct rte_flow_action_queue *conf = action->conf;
[dpdk-dev] [PATCH v2 14/15] net/softnic: add flow query API
Added pmd_flow_query() API, for flow query
support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 55 ++
1 file changed, 55 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index 90387b30b..bdf1d4091 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1654,8 +1654,63 @@ pmd_flow_destroy(struct rte_eth_dev *dev,
return 0;
}
+static int
+pmd_flow_query(struct rte_eth_dev *dev __rte_unused,
+ struct rte_flow *flow,
+ const struct rte_flow_action *action __rte_unused,
+ void *data,
+ struct rte_flow_error *error)
+{
+ struct rte_table_action_stats_counters stats;
+ struct softnic_table *table;
+ struct rte_flow_query_count *flow_stats = data;
+ int status;
+
+ /* Check input parameters. */
+ if (flow == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE,
+ NULL,
+ "Null flow");
+
+ if (data == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Null data");
+
+ table = &flow->pipeline->table[flow->table_id];
+
+ /* Rule stats read. */
+ status = rte_table_action_stats_read(table->a,
+ flow->data,
+ &stats,
+ flow_stats->reset);
+ if (status)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Pipeline table rule stats read failed");
+
+ /* Fill in flow stats. */
+ flow_stats->hits_set =
+ (table->ap->params.stats.n_packets_enabled) ? 1 : 0;
+ flow_stats->bytes_set =
+ (table->ap->params.stats.n_bytes_enabled) ? 1 : 0;
+ flow_stats->hits = stats.n_packets;
+ flow_stats->bytes = stats.n_bytes;
+
+ return 0;
+}
+
const struct rte_flow_ops pmd_flow_ops = {
.validate = pmd_flow_validate,
.create = pmd_flow_create,
.destroy = pmd_flow_destroy,
+ .flush = NULL,
+ .query = pmd_flow_query,
+ .isolate = NULL,
};
--
2.14.4
[dpdk-dev] [PATCH v2 13/15] net/softnic: add flow destroy API
pmd_flow_destroy() API is added to destroy the
created flow.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 39 ++
1 file changed, 39 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index d3c94965b..90387b30b 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1616,7 +1616,46 @@ pmd_flow_create(struct rte_eth_dev *dev,
return flow;
}
+static int
+pmd_flow_destroy(struct rte_eth_dev *dev,
+ struct rte_flow *flow,
+ struct rte_flow_error *error)
+{
+ struct pmd_internals *softnic = dev->data->dev_private;
+ struct softnic_table *table;
+ int status;
+
+ /* Check input parameters. */
+ if (flow == NULL)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE,
+ NULL,
+ "Null flow");
+
+ table = &flow->pipeline->table[flow->table_id];
+
+ /* Rule delete. */
+ status = softnic_pipeline_table_rule_delete(softnic,
+ flow->pipeline->name,
+ flow->table_id,
+ &flow->match);
+ if (status)
+ return rte_flow_error_set(error,
+ EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Pipeline table rule delete failed");
+
+ /* Flow delete. */
+ TAILQ_REMOVE(&table->flows, flow, node);
+ free(flow);
+
+ return 0;
+}
+
const struct rte_flow_ops pmd_flow_ops = {
.validate = pmd_flow_validate,
.create = pmd_flow_create,
+ .destroy = pmd_flow_destroy,
};
--
2.14.4
[dpdk-dev] [PATCH v2 15/15] net/softnic: add parsing for raw flow item
Added support for parsing raw flow item.
flow_item_raw_preprocess() is added for the same.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Reshma Pattan
---
drivers/net/softnic/rte_eth_softnic_flow.c | 108 +
1 file changed, 108 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
index bdf1d4091..fc7a0b02a 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -297,6 +297,106 @@ flow_item_is_proto(enum rte_flow_item_type type,
}
}
+static int
+flow_item_raw_preprocess(const struct rte_flow_item *item,
+ union flow_item *item_spec,
+ union flow_item *item_mask,
+ size_t *item_size,
+ int *item_disabled,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_item_raw *item_raw_spec = item->spec;
+ const struct rte_flow_item_raw *item_raw_mask = item->mask;
+ const uint8_t *pattern;
+ const uint8_t *pattern_mask;
+ uint8_t *spec = (uint8_t *)item_spec;
+ uint8_t *mask = (uint8_t *)item_mask;
+ size_t pattern_length, pattern_offset, i;
+ int disabled;
+
+ if (!item->spec)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Null specification");
+
+ if (item->last)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Range not allowed (last must be NULL)");
+
+ if (item_raw_spec->relative == 0)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Absolute offset not supported");
+
+ if (item_raw_spec->search)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Search not supported");
+
+ if (item_raw_spec->offset < 0)
+ return rte_flow_error_set(error,
+ ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Negative offset not supported");
+
+ if (item_raw_spec->length == 0)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Zero pattern length");
+
+ if (item_raw_spec->offset + item_raw_spec->length >
+ TABLE_RULE_MATCH_SIZE_MAX)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Item too big");
+
+ if (!item_raw_spec->pattern && item_raw_mask && item_raw_mask->pattern)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "RAW: Non-NULL pattern mask not allowed with NULL
pattern");
+
+ pattern = item_raw_spec->pattern;
+ pattern_mask = (item_raw_mask) ? item_raw_mask->pattern : NULL;
+ pattern_length = (size_t)item_raw_spec->length;
+ pattern_offset = (size_t)item_raw_spec->offset;
+
+ disabled = 0;
+ if (pattern_mask == NULL)
+ disabled = 1;
+ else
+ for (i = 0; i < pattern_length; i++)
+ if ((pattern)[i])
+ disabled = 1;
+
+ memset(spec, 0, TABLE_RULE_MATCH_SIZE_MAX);
+ if (pattern)
+ memcpy(&spec[pattern_offset], pattern, pattern_length);
+
+ memset(mask, 0, TABLE_RULE_MATCH_SIZE_MAX);
+ if (pattern_mask)
+ memcpy(&mask[pattern_offset], pattern_mask, pattern_length);
+
+ *item_size = pattern_offset + pattern_length;
+ *item_disabled = disabled;
+
+ return 0;
+}
+
static int
flow_item_proto_preprocess(const struct rte_flow_item *item,
union flow_item *item_spec,
@@ -317,6 +417,14 @@ flow_item_proto_preprocess(const struct rte_flow_item
*item,
item,
"Item type not supported");
+ if (item->type == RTE_FLOW_ITEM_TYPE_RAW)
+ return flow_item_raw_preprocess(item,
+ item_spec,
+ item_mask,
+ item_size,
+ item_disabled,
+ error);
+
/* spec */
if (!item->spec) {
/* If spec is NULL, then last and mask also have to be NULL. */
--
2.14.4
[dpdk-dev] [PATCH v2] eal: add strscpy function
The strncpy function has long been deemed unsafe for use,
in favor of strlcpy or snprintf.
While snprintf is standard and strlcpy is still largely available,
they both have issues regarding error checking and performance.
Both will force reading the source buffer past the requested size
if the input is not a proper c-string, and will return the expected
number of bytes copied, meaning that error checking needs to verify
that the number of bytes copied is not superior to the destination
size.
This contributes to awkward code flow, unclear error checking and
potential issues with malformed input.
The function strscpy has been discussed for some time already and
has been made available in the linux kernel[1].
Propose this new function as a safe alternative.
[1]: http://git.kernel.org/linus/30c44659f4a3
Signed-off-by: Gaetan Rivet
Acked-by: Juhamatti Kuusisaari
---
v2: use rte_prefix,
avoid assignment in if()
I agree with the original email, here is a proposed implementation.
I have added the function as part of 18.11 API proper, because this API
is definitely not meant to change.
This is not meant to be enforced on existing code, or even on new code.
But I think it is better to have it available.
lib/librte_eal/common/eal_common_string_fns.c | 26 +++
.../common/include/rte_string_fns.h | 23
lib/librte_eal/rte_eal_version.map| 7 +
3 files changed, 56 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_string_fns.c
b/lib/librte_eal/common/eal_common_string_fns.c
index 6ac5f8289..60c5dd66f 100644
--- a/lib/librte_eal/common/eal_common_string_fns.c
+++ b/lib/librte_eal/common/eal_common_string_fns.c
@@ -38,3 +38,29 @@ rte_strsplit(char *string, int stringlen,
errno = EINVAL;
return -1;
}
+
+/* Copy src string into dst.
+ *
+ * Return negative value and NUL-terminate if dst is too short,
+ * Otherwise return number of bytes copied.
+ */
+ssize_t
+rte_strscpy(char *dst, const char *src, size_t dsize)
+{
+ size_t nleft = dsize;
+ size_t res = 0;
+
+ /* Copy as many bytes as will fit. */
+ while (nleft != 0) {
+ dst[res] = src[res];
+ if (src[res] == '\0')
+ return res;
+ res++;
+ nleft--;
+ }
+
+ /* Not enough room in dst, set NUL and return error. */
+ if (res != 0)
+ dst[res - 1] = '\0';
+ return -E2BIG;
+}
diff --git a/lib/librte_eal/common/include/rte_string_fns.h
b/lib/librte_eal/common/include/rte_string_fns.h
index 97597a148..ecd141b85 100644
--- a/lib/librte_eal/common/include/rte_string_fns.h
+++ b/lib/librte_eal/common/include/rte_string_fns.h
@@ -76,6 +76,29 @@ rte_strlcpy(char *dst, const char *src, size_t size)
#endif /* RTE_USE_LIBBSD */
#endif /* BSDAPP */
+/**
+ * Copy string src to buffer dst of size dsize.
+ * At most dsize-1 chars will be copied.
+ * Always NUL-terminates, unless (dsize == 0).
+ * Returns number of bytes copied (terminating NUL-byte excluded) on success ;
+ * negative errno on error.
+ *
+ * @param dst
+ * The destination string.
+ *
+ * @param src
+ * The input string to be copied.
+ *
+ * @param dsize
+ * Length in bytes of the destination buffer.
+ *
+ * @return
+ * The number of bytes copied on success
+ * -E2BIG if the destination buffer is too small.
+ */
+ssize_t
+rte_strscpy(char *dst, const char *src, size_t dsize);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index 344a43d32..2031d7b15 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -262,6 +262,13 @@ DPDK_18.08 {
} DPDK_18.05;
+DPDK_18.11 {
+ global:
+
+ rte_strscpy;
+
+} DPDK_18.08;
+
EXPERIMENTAL {
global:
--
2.18.0
Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue of logid
"Ananyev, Konstantin" writes:
>> -Original Message-
>> From: Aaron Conole [mailto:acon...@redhat.com]
>> Sent: Tuesday, September 11, 2018 2:47 PM
>> To: Yang, Ziye
>> Cc: dev@dpdk.org; Ananyev, Konstantin
>> ; Ziye Yang
>> Subject: Re: [dpdk-dev] [PATCH v7] linuxapp, eal: Fix the memory leak issue
>> of logid
>>
>> Ziye Yang writes:
>>
>> > From: Ziye Yang
>> >
>> > This patch is used to fix the memory leak issue of logid.
>> > We use the ASAN test in SPDK when intergrating DPDK and
>> > find this memory leak issue.
>> >
>> > By the way, we also fix several missed function call of
>> > rte_atomic32_clear.
>>
>> This part I don't understand. It should be a separate proposal.
>>
>> > Signed-off-by: Ziye Yang
>> > ---
>> > lib/librte_eal/linuxapp/eal/eal.c | 11 +++
>> > 1 file changed, 7 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/lib/librte_eal/linuxapp/eal/eal.c
>> > b/lib/librte_eal/linuxapp/eal/eal.c
>> > index e59ac65..a5129e5 100644
>> > --- a/lib/librte_eal/linuxapp/eal/eal.c
>> > +++ b/lib/librte_eal/linuxapp/eal/eal.c
>> > @@ -793,7 +793,8 @@ static void rte_eal_init_alert(const char *msg)
>> >int i, fctret, ret;
>> >pthread_t thread_id;
>> >static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
>> > - const char *logid;
>> > + const char *p;
>> > + static char logid[PATH_MAX];
>>
>> On a linux system, PATH_MAX is 4096, but an argument may be
>> MAX_ARG_STRLEN which is significantly higher.
>
> But we only interested here in 'basename(argv[0])'.
> Surely it shouldn't be bigger than PATH_MAX unless something is terribly
> wrong here.
The application has full control of what it passes into
EAL, but does it sanitize and scrub the arguments? We make an
assumption that the argv,argc are direct from cmdline and are calls by
the user at a shell. But nothing forces this to be true.
>>
>> Have you thought about an alternative where you keep the strdup and add
>> an atexit() handler to do the free? Otherwise, you'll need to add code
>> to check the string length as well and enforce some kind of size
>> restriction.
>
> snprintf() below will do a safe truncation for us.
Anyway, yes. I completely glossed over it.
>>
>> >char cpuset[RTE_CPU_AFFINITY_STR_LEN];
>> >char thread_name[RTE_MAX_THREAD_NAME_LEN];
>> >
>> > @@ -810,9 +811,8 @@ static void rte_eal_init_alert(const char *msg)
>> >return -1;
>> >}
>> >
>> > - logid = strrchr(argv[0], '/');
>> > - logid = strdup(logid ? logid + 1: argv[0]);
>> > -
>> > + p = strrchr(argv[0], '/');
>> > + snprintf(logid, sizeof(logid), "%s", (p ? p + 1 : argv[0]));
>> >thread_id = pthread_self();
>> >
>> >eal_reset_internal_config(&internal_config);
>> > @@ -823,6 +823,7 @@ static void rte_eal_init_alert(const char *msg)
>> >if (rte_eal_cpu_init() < 0) {
>> >rte_eal_init_alert("Cannot detect lcores.");
>> >rte_errno = ENOTSUP;
>> > + rte_atomic32_clear(&run_once);
>>
>> This is not recoverable. No amount of retry will allow the user to
>> re-init the eal - the hardware isn't supported. Why clear the run_once
>> flag?
>>
>> >return -1;
>> >}
>> >
>> > @@ -851,6 +852,7 @@ static void rte_eal_init_alert(const char *msg)
>> >
>> >if (rte_eal_intr_init() < 0) {
>> >rte_eal_init_alert("Cannot init interrupt-handling thread\n");
>> > + rte_atomic32_clear(&run_once);
>>
>> Arguable whether or not this is recoverable. IIRC, the eal_intr_init
>> spawns a thread - if it fails to spawn the likelihood is the process
>> won't be able to continue.
>>
>> >return -1;
>> >}
>> >
>> > @@ -861,6 +863,7 @@ static void rte_eal_init_alert(const char *msg)
>> >rte_eal_init_alert("failed to init mp channel\n");
>> >if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
>> >rte_errno = EFAULT;
>> > + rte_atomic32_clear(&run_once);
>>
>> This is also not recoverable. Why clear the run_once flag?
>>
>> >return -1;
>> >}
>> >}
Re: [dpdk-dev] [PATCH v6] net/pcap: physical interface MAC address support
On 9/10/2018 5:55 PM, Juhamatti Kuusisaari wrote:
> At the moment, PCAP interfaces use dummy MAC by default. This change
> adds support for selecting PCAP physical interface MAC with phy_mac=1
> devarg. This allows to setup packet flows using the physical interface
> MAC.
>
> Signed-off-by: Juhamatti Kuusisaari
>
> ---
> v6:
> * Review changes:
> * Clarified devarg applicability (applies to iface-only)
> * Introduced detailed documentation for the devarg
> * More checkpatches-fixes
> v5-v3:
> * FreeBSD related compilation and checkpatches-fixes
> v2:
> * FreeBSD support introduced
> * Release notes added
> v1:
> * phy_mac=1 devarg support
<...>
> +#elif defined(__FreeBSD__)
Just to double check did you check/verify below code on FreeBSD?
<...>
> @@ -955,6 +1034,10 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev,
> else
> (*internals)->if_index = if_nametoindex(pair->value);
>
> + if (phy_mac && pair) /* phy_mac arg is applied only to iface */
Having this comment is good, but "iface" is so generic, it may be confusing for
beyond this context, what about "only if iface devarg provided" kind of detail?
<...>
> @@ -989,6 +1073,19 @@ eth_from_pcaps(struct rte_vdev_device *vdev,
> return 0;
> }
>
> +static int
> +select_phy_mac(const char *key, const char *value, void *extra_args)
> +{
> + if (extra_args) {
> + const int phy_mac = atoi(value);
> + int *enable_phy_mac = extra_args;
> +
> + if (phy_mac)
> + *enable_phy_mac = 1;
> + }
> + return 0;
> +}
This is causing build error because of "key" not used, needs __rte_unused
marker.
<...>
> @@ -1031,6 +1129,16 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
>* reading / writing
>*/
> if (rte_kvargs_count(kvlist, ETH_PCAP_IFACE_ARG) == 1) {
> + /*
> + * We check first whether we want to use phy MAC of the PCAP
> + * interface.
> + */
> + if (rte_kvargs_count(kvlist, ETH_PCAP_PHY_MAC_ARG)) {
Do you need count check at all?
> + ret = rte_kvargs_process(kvlist, ETH_PCAP_PHY_MAC_ARG,
> + &select_phy_mac, &phy_mac);
> + if (ret < 0)
> + goto free_kvlist;
> + }
I would prefer to see this block below ETH_PCAP_IFACE_ARG check, this block is
for "iface", so it makes more sense to me first verify it, later verify phy_mac
Re: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name
On Tue, 2018-09-11 at 15:06 +0100, Bruce Richardson wrote:
> On Tue, Sep 11, 2018 at 02:41:36PM +0100, Luca Boccassi wrote:
> > On Tue, 2018-09-11 at 14:32 +0100, Bruce Richardson wrote:
> > > On Tue, Sep 11, 2018 at 02:09:30PM +0100, Luca Boccassi wrote:
> > > > On Tue, 2018-09-11 at 14:06 +0100, Bruce Richardson wrote:
> > > > > On Mon, Sep 10, 2018 at 09:04:07PM +0100, Luca Boccassi
> > > > > wrote:
> > > > > > The library is called librte_pmd_lio, so rename the map
> > > > > > file
> > > > > > and
> > > > > > set
> > > > > > the name in the meson file so that the built library names
> > > > > > with
> > > > > > meson
> > > > > > and legacy makefiles are the same
> > > > > >
> > > > > > Fixes: bad475c03fee ("net/liquidio: add to meson build")
> > > > > > Cc: sta...@dpdk.org
> > > > > >
> > > > > > Signed-off-by: Luca Boccassi
> > > > >
> > > > > Rather than doing this renaming, can we instead add a symlink
> > > > > in
> > > > > the
> > > > > install phase to map the old name to the new one? I'd like to
> > > > > see
> > > > > the
> > > > > consistency of directory name, map filename and driver name
> > > > > enforced
> > > > > strictly in the build system. Having exceptions is a pain.
> > > > >
> > > > > /Bruce
> > > >
> > > > We could, but the pain gets shifted on packagers then - what
> > > > about
> > > > renaming the directory entirely to net/lio?
> > >
> > > For packagers, what sort of ABI compatibility guarantees do you
> > > try
> > > and
> > > keep between releases. Is this something that just needs a one-
> > > release ABI
> > > announcement, as with other ABI changes?
> > >
> > > /Bruce
> >
> > Currently in Debian/Ubuntu we are using the ABI override (because
> > of
> > the sticky ABI breakage issue) so the filenames and package names
> > are
> > different on every release anyway.
> >
> > So in theory we could change the name of the libs and packages, but
> > what I'm mostly worried about is keeping consistency and some level
> > of
> > compatibility between old and new build systems, isn't that an
> > issue?
> >
>
> It's a good question, and I suspect everyone will have their own
> opinion.
>
> Personally, I take the view that moving build system involves quite a
> number of changes anyway, so we should take the opportunity to clean
> up a
> few other things at the same time. This is why I'm so keep on trying
> to
> keep everything consistent as far as possible throughout the system
> and not
> put in special cases. For many of these a) if we put in lots of name
> overrides now we'll probably never get rid of them, and b) it's more
> likely
> that future drivers will adopt the same technique to have different
> naming
> of drivers and directories.
>
> However, if keeping sonames consistent is a major concern, then
> perhaps we
> should look to rename some directories, like you suggested before.
>
> /Bruce
Actually I tend to agree, it would be better to make the libraries
consistent, so I'm fine with having to deal with it once in packaging.
I'll send a v2 without most of the renames.
--
Kind regards,
Luca Boccassi
[dpdk-dev] [PATCH v2 1/9] build: add Meson file for TAP PMD
Use same autoconf generation mechanism as the MLX4/5 PMDs Signed-off-by: Luca Boccassi --- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 + 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c7a2d0e7db..b7b4870eb8 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio'] diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build new file mode 100644 index 00..ef3c6e1fee --- /dev/null +++ b/drivers/net/tap/meson.build @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 Luca Boccassi + +sources = files( + 'rte_eth_tap.c', + 'tap_bpf_api.c', + 'tap_flow.c', + 'tap_intr.c', + 'tap_netlink.c', + 'tap_tcmsgs.c', +) + +deps = ['bus_vdev', 'gso', 'hash'] + +cflags += '-DTAP_MAX_QUEUES=16' + +# To maintain the compatibility with the make build system +# tap_autoconf.h file is still generated. +# input array for meson symbol search: +# [ "MACRO to define if found", "header for the search", +# "enum/define", "symbol to search" ] +# +args = [ + [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_UNSPEC' ], + [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_KEY_VLAN_PRIO' ], + [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_UNSPEC' ], + [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_FD' ], + [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_UNSPEC' ], + [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_FD' ], +] +config = configuration_data() +foreach arg:args + config.set(arg[0], cc.has_header_symbol(arg[1], arg[3])) +endforeach +configure_file(output : 'tap_autoconf.h', configuration : config) -- 2.18.0
[dpdk-dev] [PATCH v2 4/9] build: add Meson files for avf PMD
Signed-off-by: Luca Boccassi
---
drivers/net/avf/base/meson.build | 20
drivers/net/avf/meson.build | 15 +++
drivers/net/meson.build | 1 +
3 files changed, 36 insertions(+)
create mode 100644 drivers/net/avf/base/meson.build
create mode 100644 drivers/net/avf/meson.build
diff --git a/drivers/net/avf/base/meson.build b/drivers/net/avf/base/meson.build
new file mode 100644
index 00..90fd6b445f
--- /dev/null
+++ b/drivers/net/avf/base/meson.build
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+sources = [
+ 'avf_adminq.c',
+ 'avf_common.c',
+]
+
+error_cflags = ['-Wno-pointer-to-int-cast']
+c_args = cflags
+foreach flag: error_cflags
+ if cc.has_argument(flag)
+ c_args += flag
+ endif
+endforeach
+
+base_lib = static_library('avf_base', sources,
+ dependencies: static_rte_eal,
+ c_args: c_args)
+base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/avf/meson.build b/drivers/net/avf/meson.build
new file mode 100644
index 00..d341f029b2
--- /dev/null
+++ b/drivers/net/avf/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+subdir('base')
+objs = [base_objs]
+
+sources = files(
+ 'avf_ethdev.c',
+ 'avf_rxtx.c',
+ 'avf_rxtx_vec_sse.c',
+ 'avf_vchnl.c',
+)
+if arch_subdir == 'x86'
+ sources += files('avf_rxtx_vec_sse.c')
+endif
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 68ac42d67c..28efeda0b6 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -3,6 +3,7 @@
drivers = ['af_packet',
'ark',
+ 'avf',
'avp',
'axgbe', 'bonding',
'bnx2x',
--
2.18.0
[dpdk-dev] [PATCH v2 2/9] build: add Meson file for vdev_netvsc PMD
Signed-off-by: Luca Boccassi
---
drivers/net/meson.build | 1 +
drivers/net/vdev_netvsc/meson.build | 19 +++
2 files changed, 20 insertions(+)
create mode 100644 drivers/net/vdev_netvsc/meson.build
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index b7b4870eb8..68ac42d67c 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -29,6 +29,7 @@ drivers = ['af_packet',
'szedata2',
'tap',
'thunderx',
+ 'vdev_netvsc',
'vhost',
'virtio']
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
diff --git a/drivers/net/vdev_netvsc/meson.build
b/drivers/net/vdev_netvsc/meson.build
new file mode 100644
index 00..cc956e7b27
--- /dev/null
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+sources = files('vdev_netvsc.c')
+
+allow_experimental_apis = true
+
+cflags_options = [
+'-Wall',
+'-Wextra',
+'-D_BSD_SOURCE',
+'-D_DEFAULT_SOURCE',
+'-D_XOPEN_SOURCE=600'
+]
+foreach option:cflags_options
+if cc.has_argument(option)
+cflags += option
+endif
+endforeach
--
2.18.0
[dpdk-dev] [PATCH v2 7/9] event/opdl: rename map file to match library name
So that it can be used from Meson as well
Signed-off-by: Luca Boccassi
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map =>
rte_pmd_opdl_event_version.map} (100%)
diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile
index cea8118d36..bf50a60a0b 100644
--- a/drivers/event/opdl/Makefile
+++ b/drivers/event/opdl/Makefile
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool
LIBABIVER := 1
# versioning export map
-EXPORT_MAP := rte_pmd_evdev_opdl_version.map
+EXPORT_MAP := rte_pmd_opdl_event_version.map
# library source files
SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
diff --git a/drivers/event/opdl/rte_pmd_evdev_opdl_version.map
b/drivers/event/opdl/rte_pmd_opdl_event_version.map
similarity index 100%
rename from drivers/event/opdl/rte_pmd_evdev_opdl_version.map
rename to drivers/event/opdl/rte_pmd_opdl_event_version.map
--
2.18.0
[dpdk-dev] [PATCH v2 8/9] build: add Meson file for opdl_event PMD
Signed-off-by: Luca Boccassi --- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build diff --git a/drivers/event/meson.build b/drivers/event/meson.build index e951199358..ed56d20062 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build new file mode 100644 index 00..cc6029c6f0 --- /dev/null +++ b/drivers/event/opdl/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev'] -- 2.18.0
[dpdk-dev] [PATCH v2 5/9] build: add Meson files for qede PMD
Signed-off-by: Luca Boccassi
Acked-by: Shahed Shaikh
---
config/rte_config.h | 3 ++
drivers/net/meson.build | 2 +-
drivers/net/qede/base/meson.build | 57 +++
drivers/net/qede/meson.build | 12 +++
4 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/qede/base/meson.build
create mode 100644 drivers/net/qede/meson.build
diff --git a/config/rte_config.h b/config/rte_config.h
index 46775a8419..ee84f04977 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -116,4 +116,7 @@
#define RTE_PMD_RING_MAX_RX_RINGS 16
#define RTE_PMD_RING_MAX_TX_RINGS 16
+/* QEDE PMD defines */
+#define RTE_LIBRTE_QEDE_FW ""
+
#endif /* _RTE_CONFIG_H_ */
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 28efeda0b6..74f4109161 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -24,7 +24,7 @@ drivers = ['af_packet',
'mvpp2',
'netvsc',
'nfp',
- 'null', 'octeontx', 'pcap', 'ring',
+ 'null', 'octeontx', 'pcap', 'qede', 'ring',
'sfc',
'softnic',
'szedata2',
diff --git a/drivers/net/qede/base/meson.build
b/drivers/net/qede/base/meson.build
new file mode 100644
index 00..59b41c895d
--- /dev/null
+++ b/drivers/net/qede/base/meson.build
@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+sources = [
+ 'bcm_osal.c',
+ 'ecore_cxt.c',
+ 'ecore_dcbx.c',
+ 'ecore_dev.c',
+ 'ecore_hw.c',
+ 'ecore_init_fw_funcs.c',
+ 'ecore_init_ops.c',
+ 'ecore_int.c',
+ 'ecore_l2.c',
+ 'ecore_mcp.c',
+ 'ecore_sp_commands.c',
+ 'ecore_spq.c',
+ 'ecore_sriov.c',
+ 'ecore_vf.c',
+]
+
+
+error_cflags = [
+ '-Wno-unused-parameter',
+ '-Wno-sign-compare',
+ '-Wno-missing-prototypes',
+ '-Wno-cast-qual',
+ '-Wno-unused-function',
+ '-Wno-unused-variable',
+ '-Wno-strict-aliasing',
+ '-Wno-missing-prototypes',
+ '-Wno-unused-value',
+ '-Wno-format-nonliteral',
+ '-Wno-shift-negative-value',
+ '-Wno-unused-but-set-variable',
+ '-Wno-missing-declarations',
+ '-Wno-maybe-uninitialized',
+ '-Wno-strict-prototypes',
+ '-Wno-shift-negative-value',
+ '-Wno-implicit-fallthrough',
+ '-Wno-format-extra-args',
+ '-Wno-visibility',
+ '-Wno-empty-body',
+ '-Wno-invalid-source-encoding',
+ '-Wno-sometimes-uninitialized',
+ '-Wno-pointer-bool-conversion',
+]
+c_args = cflags
+foreach flag: error_cflags
+if cc.has_argument(flag)
+c_args += flag
+endif
+endforeach
+
+base_lib = static_library('qede_base', sources,
+ dependencies: static_rte_net,
+ c_args: c_args)
+base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
new file mode 100644
index 00..6280073a56
--- /dev/null
+++ b/drivers/net/qede/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+subdir('base')
+objs = [base_objs]
+
+sources = files(
+ 'qede_ethdev.c',
+ 'qede_fdir.c',
+ 'qede_main.c',
+ 'qede_rxtx.c',
+)
--
2.18.0
[dpdk-dev] [PATCH v2 6/9] build: add Meson file for bbdev_null PMD
Signed-off-by: Luca Boccassi
---
drivers/baseband/meson.build | 7 +++
drivers/baseband/null/meson.build | 7 +++
drivers/meson.build | 1 +
3 files changed, 15 insertions(+)
create mode 100644 drivers/baseband/meson.build
create mode 100644 drivers/baseband/null/meson.build
diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build
new file mode 100644
index 00..52489df354
--- /dev/null
+++ b/drivers/baseband/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+drivers = ['null']
+
+config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
+driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/baseband/null/meson.build
b/drivers/baseband/null/meson.build
new file mode 100644
index 00..64c29d8600
--- /dev/null
+++ b/drivers/baseband/null/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+deps += ['bbdev', 'bus_vdev', 'ring']
+name = 'bbdev_null'
+allow_experimental_apis = true
+sources = files('bbdev_null.c')
diff --git a/drivers/meson.build b/drivers/meson.build
index f94e2fe672..14e335ec1d 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -9,6 +9,7 @@ driver_classes = ['common',
'crypto', # depends on common, bus and mempool (net in future).
'compress', # depends on common, bus, mempool.
'event', # depends on common, bus, mempool and net.
+ 'baseband', # depends on common and bus.
'raw'] # depends on common, bus, mempool, net and event.
default_cflags = machine_args
--
2.18.0
[dpdk-dev] [PATCH v2 3/9] build: add Meson file for crypto scheduler PMD
Signed-off-by: Luca Boccassi --- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index d64ca418bc..6ed853b7ab 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build new file mode 100644 index 00..c5ba2d6804 --- /dev/null +++ b/drivers/crypto/scheduler/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +) -- 2.18.0
[dpdk-dev] [PATCH v2 9/9] build: add Meson file for vmxnet3_uio PMD
Signed-off-by: Luca Boccassi --- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 18 ++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 74f4109161..5906283c2f 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev']# same with vdev bus diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build new file mode 100644 index 00..a92bd28680 --- /dev/null +++ b/drivers/net/vmxnet3/meson.build @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', +'-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags +if cc.has_argument(flag) +cflags += flag +endif +endforeach -- 2.18.0
[dpdk-dev] [PATCH] doc: support building HTML guides with meson
Signed-off-by: Bruce Richardson
---
NOTE: this patch depends upon:
http://patches.dpdk.org/project/dpdk/list/?series=1232
doc/api/meson.build| 3 ++-
doc/guides/meson.build | 16
doc/meson.build| 11 +++
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 doc/guides/meson.build
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5dfa0fe04..f9bee4dac 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -50,5 +50,6 @@ if doxygen.found()
install_dir: htmldir,
build_by_default: false)
- run_target('doc', command: 'true', depends: doxy_build)
+ doc_targets += doxy_build
+ doc_target_names += 'Doxygen_API'
endif
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
new file mode 100644
index 0..6d1e2990d
--- /dev/null
+++ b/doc/guides/meson.build
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
+
+if sphinx.found()
+ html_guides_build = custom_target('html_guides_build',
+ input: meson.current_source_dir(),
+ output: 'index.html',
+ command: [sphinx, '-b', 'html', '@INPUT@',
meson.current_build_dir() + '/html'],
+ build_by_default: false,
+ install: get_option('enable_docs'))
+
+ doc_targets += html_guides_build
+ doc_target_names += 'HTML_Guides'
+endif
diff --git a/doc/meson.build b/doc/meson.build
index afca2e713..c5410d85d 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,4 +1,15 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi
+doc_targets = []
+doc_target_names = []
subdir('api')
+subdir('guides')
+
+if doc_targets.length() == 0
+ message = 'No docs targets found'
+else
+ message = 'Building docs:'
+endif
+run_target('doc', command: ['echo', message, doc_target_names],
+ depends: doc_targets)
--
2.11.0
Re: [dpdk-dev] [PATCH] app/testpmd: Optimize membuf pool allocation
Hi Gavin,
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org]
> Sent: Monday, August 27, 2018 10:33 AM
> To: dev@dpdk.org
> Cc: n...@arm.com; gavin...@arm.com
> Subject: [dpdk-dev] [PATCH] app/testpmd: Optimize membuf pool allocation
>
> By default, testpmd will create membuf pool for all NUMA nodes and ignore EAL
> configuration.
>
> Count the number of available NUMA according to EAL core mask or core list
> configuration. Optimized by only creating membuf pool for those nodes.
>
> Fixes: d5aeab6542f ("app/testpmd: fix mempool creation by socket id")
>
> Signed-off-by: Phil Yang
> ---
> app/test-pmd/testpmd.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> ee48db2..a56af2b 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -476,6 +476,8 @@ set_default_fwd_lcores_config(void)
>
> nb_lc = 0;
> for (i = 0; i < RTE_MAX_LCORE; i++) {
> + if (!rte_lcore_is_enabled(i))
> + continue;
> sock_num = rte_lcore_to_socket_id(i);
> if (new_socket_id(sock_num)) {
> if (num_sockets >= RTE_MAX_NUMA_NODES) { @@ -
> 485,8 +487,6 @@ set_default_fwd_lcores_config(void)
> }
> socket_ids[num_sockets++] = sock_num;
> }
> - if (!rte_lcore_is_enabled(i))
> - continue;
> if (i == rte_get_master_lcore())
> continue;
> fwd_lcores_cpuids[nb_lc++] = i;
> --
> 2.7.4
./dpdk/devtools/check-git-log.sh -1
Wrong headline uppercase:
app/testpmd: Optimize membuf pool allocation
Wrong 'Fixes' reference:
Fixes: d5aeab6542f ("app/testpmd: fix mempool creation by socket id")
Regards,
Bernard.
Re: [dpdk-dev] [PATCH 01/21] net/atlantic: atlantic PMD driver skeleton
On Fri, 7 Sep 2018 18:21:39 +0300 Igor Russkikh wrote: > +#CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value > +CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args Can't you fix your code to get rid of these errors?
Re: [dpdk-dev] [PATCH 04/21] net/atlantic: hw_atl register declarations
On Fri, 7 Sep 2018 18:21:42 +0300
Igor Russkikh wrote:
> +/* register address for bitfield imr_rx{r}_en */
> + static u32 itr_imr_rxren_adr[32] = {
> + 0x2100U, 0x2100U, 0x2104U, 0x2104U,
> + 0x2108U, 0x2108U, 0x210CU, 0x210CU,
> + 0x2110U, 0x2110U, 0x2114U, 0x2114U,
> + 0x2118U, 0x2118U, 0x211CU, 0x211CU,
> + 0x2120U, 0x2120U, 0x2124U, 0x2124U,
> + 0x2128U, 0x2128U, 0x212CU, 0x212CU,
> + 0x2130U, 0x2130U, 0x2134U, 0x2134U,
> + 0x2138U, 0x2138U, 0x213CU, 0x213CU
> + };
> +
Don't you want to make these data tables const?
Re: [dpdk-dev] [PATCH 05/21] net/atlantic: b0 hardware layer main logic
On Fri, 7 Sep 2018 18:21:43 +0300 Igor Russkikh wrote: > +/* > + * aQuantia Corporation Network Driver > + * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + */ > + > +/* File hw_atl_b0.c: Definition of Atlantic hardware specific functions. */ > + Please use SPDX headers and not GPL boilerplate comments.
Re: [dpdk-dev] [PATCH 05/21] net/atlantic: b0 hardware layer main logic
On Fri, 7 Sep 2018 18:21:43 +0300 Igor Russkikh wrote: > + > +#define pif_rpf_rss_ipv4_hdr_only_i (1 << 4)//calc hash only in IPv4 > header, regardless of presence of TCP > +#define pif_rpf_rss_ipv4_tcp_hdr_only_i (1 << 3)//calc hash only if TCP > header and IPv4 > +#define pif_rpf_rss_ipv6_hdr_only_i (1 << 2)//calc hash only in IPv6 > header, regardless of presence of TCP > +#define pif_rpf_rss_ipv6_tcp_hdr_only_i (1 << 1)//calc hash only if TCP > header and IPv4 > +#define pif_rpf_rss_dont_use_udp_i (1 << 0)//bug 5124 - rss hashing > types - FIXME > + Please don't use C++ style comments
Re: [dpdk-dev] [PATCH 17/21] net/atlantic: device statistics, xstats
On Fri, 7 Sep 2018 18:21:55 +0300
Igor Russkikh wrote:
> +
> +static int
> +atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused, struct
> rte_eth_xstat_name *xstats_names, unsigned int size)
> +{
> + unsigned int i;
> +
Please break really long lines at between 80 and 100 characters.
[dpdk-dev] RFC: compressdev: append dest data in PMDs instead of in application
Proposal: In compressdev, move the responsibility for appending data in the destination mbuf from the application to the PMD. Why: Compression operations are all out-of-place and the output size is unknown. Source and destination mbufs are passed to the PMDs. There's no problem with the src, but there is with the destination. The application allocates the dest mbuf from the pool, guesses how much of the buffer the PMD will write with output and calls rte_pktmbuf_append() for this amount. No data is actually copied into the dest mbuf by the application. The PMD writes output data to the destination mbuf, and returns the amount written in the op.produced parameter. Throughout this the mbuf is not consistent with expectations, i.e. a call to rte_pktmbuf_data_len() will NOT return the actual amount of data in the buffer. A call to rte_pktmbuf_append() will NOT add space at end of existing data. rte_pktmbuf_tailroom() will not return how much space is available at the end of the data. Also, some PMDs, e.g. ISA-L, need scratch space at end of the output buffer for checksum calculation. So though the appl has appended a specific amount in the expectation that it can be used for compressed data, the PMD needs to reduce this by 4 bytes to reserve space for the checksum - even though there may be space to append another 4bytes. It seems more logical that the PMD should take responsibility for appending. I.e. the application should pass in an empty mbuf, the PMD uses the rte_pktmbuf_tailroom() to know what space is available, uses this space as it needs and appends the output data to match the actual amount of data it writes. This method caters for an mbuf already containing some data, in this case the PMD will append the output AFTER the data already in the mbuf. It also needs to cater for SGL aka chained_mbuf case, though I'd propose in this case only the first mbuf in the chain is allowed to already contain data, the rest must be empty. An application can adjust a chain to satisfy this condition. Code impacts: * rte_comp_op.dst.offset should be deprecated. * comments on the m_dst would be changed to describe this usage * applications should alloc destination mbuf(s) from a pool, but not append. * PMDs should use append() to correctly reflect the amount of data returned. This turns out to be more complex than expected for SGLs as rte_mbuf chains DON'T support empty mbuf chains, i.e. several macros assume there's only tailroom available in the last segment of a chain. So essentially if an application chains a bunch of empty mbufs together the only tailroom available is the buf_len of the last mbuf and the space in all the other mbufs is "lost". We've investigated several ways around this, I think either options 1 or 2 would be ok, but am not keen on option 3. I'm looking for feedback please. Option1: create an rte_comp_mbuf, identical to rte_mbuf - probably just cast to it - with its own set of macros. Most of these wrap existing mbuf macros, those that need to cater for the empty chain case. Option2: pass in a pool on the API instead and the PMD allocs dest mbufs as needed and chains them. Storage customers expect to use external buffers attached to mbufs so this may not suit their use-case. Although it may be an option if all mbufs in the pool are pre-attached to external buffers. Option3: appl does as today. PMD trims space not used. Would need changes or additions to mbuf macros so it could trim from more than just the last segment. PMD would need to free unused segments. I'm not keen on this as doing the work in 2 places and there's potential to leak mbufs here as allocating them in API and freeing in PMD. Regards, Fiona
Re: [dpdk-dev] [PATCH] eal: force IOVA mode to physical
On 09/07/2018 04:13 PM, Eric Zhang wrote: On 09/07/2018 05:26 AM, Burakov, Anatoly wrote: On 06-Sep-18 8:34 AM, Jerin Jacob wrote: -Original Message- Date: Tue, 4 Sep 2018 23:40:36 -0400 From: Eric Zhang To: santosh , hemant.agra...@nxp.com, Gaëtan Rivet , "Burakov, Anatoly" CC: bruce.richard...@intel.com, dev@dpdk.org, allain.leg...@windriver.com, matt.pet...@windriver.com Subject: Re: [dpdk-dev] [PATCH] eal: force IOVA mode to physical User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 On 08/30/2018 08:59 AM, santosh wrote: On Thursday 30 August 2018 05:43 PM, Hemant wrote: External Email Hi, On 8/30/2018 3:13 PM, Gaëtan Rivet wrote: Hi, On Thu, Aug 30, 2018 at 10:09:04AM +0100, Burakov, Anatoly wrote: On 29-Aug-18 4:58 PM, eric zhang wrote: This patch adds a configuration option to force the IOVA mode to physical address (PA). There exists virtual devices that are not directly attached to the PCI bus, and therefore the auto detection of the IOVA mode based on probing the PCI bus and IOMMU configuration may not report the required addressing mode. Having the configuration option permits the mode to be explicitly configured in this scenario. Signed-off-by: eric zhang --- Defining this at compile-time seems like an overkill. Wouldn't it be better to just add an EAL command-line option to force IOVA mode to a particular value? That is a good suggestion. -- Thanks, Anatoly What is the bus of these devices and why not implement get_iommu_class in it? There are cases, where you are using dpdk libraries with external libraries and you need to change the default behavior DPDK lib to use physical address instead of virtual address. Providing an option to user will help. More appropriate solution could be: * Either fix it at bus layer .. i.e.. get_iommu_class().. * Or introduce something like [1] --iova-mode= param. Former is better solution than latter if autodetection is a key criteria. Thanks. [1] http://patchwork.dpdk.org/patch/25192/ It's not generic which couldn't be fixed at bus layer. So what's the preference of EAL option or compile time solution? Adding --iova-mode as patch [1] will overrivde auto-detection rte_bus_get_iommu_class() make it no use; compile time solution will align with upstream and keep new atuodetection solution in #ifndef. If it is for vdev devices, why not introduce something like RTE_PCI_DRV_IOVA_AS_VA and let vdev device describe its personality. And based on the devices(flags) on vdev bus, rte_bus_get_iommu_class() of vdev can decide the mode just like PCI bus. That seems like a better option to me, +1. As far as i know, at the moment if there are no devices attached at all, or if there are only vdev devices attached, DPDK will default to IOVA as PA mode for no good reason; such a change would certainly fix this. Thanks for the suggestions however our virtual device doesn't run dpdk vdev code so we can't use the flag. Notice that in eal.c there is one workaround that force iova to be PA per virtual device is not directly attached to pci. That case is checking kni module. Ours is a similar case that virtual device not attach pci directly. So we have to turn to force iova to PA either 1. compilation option 2. eal option. Which one should be the preference by taking into consideration that align with upstream? Thanks Any comments? Thanks Eric
[dpdk-dev] [PATCH] doc/fix: add CCM to the QAT feature list
Signed-off-by: Tomasz Cel --- doc/guides/cryptodevs/features/qat.ini | 3 +++ doc/guides/cryptodevs/qat.rst | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini index 29d865e..a37a1a1 100644 --- a/doc/guides/cryptodevs/features/qat.ini +++ b/doc/guides/cryptodevs/features/qat.ini @@ -56,3 +56,6 @@ ZUC EIA3 = Y AES GCM (128) = Y AES GCM (192) = Y AES GCM (256) = Y +AES CCM (128) = Y +AES CCM (256) = Y +AES CCM (192) = Y diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index af10799..b09624f 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -66,6 +66,7 @@ Hash algorithms: Supported AEAD algorithms: * ``RTE_CRYPTO_AEAD_AES_GCM`` +* ``RTE_CRYPTO_AEAD_AES_CCM`` Limitations -- 2.7.4
Re: [dpdk-dev] [PATCH] net/mlx5: add bluefield vf support
> On Sep 2, 2018, at 6:55 AM, Ori Kam wrote:
>
> Signed-off-by: Ori Kam
> ---
Acked-by: Yongseok Koh
Thanks
> drivers/net/mlx5/mlx5.c | 4
> drivers/net/mlx5/mlx5.h | 1 +
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 30d4e70..fd89e2a 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -1489,6 +1489,10 @@ struct mlx5_dev_spawn_data {
> PCI_DEVICE_ID_MELLANOX_CONNECTX5BF)
> },
> {
> + RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
> +PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF)
> + },
> + {
> .vendor_id = 0
> }
> };
> diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
> index 35a196e..4d3e9f3 100644
> --- a/drivers/net/mlx5/mlx5.h
> +++ b/drivers/net/mlx5/mlx5.h
> @@ -51,6 +51,7 @@ enum {
> PCI_DEVICE_ID_MELLANOX_CONNECTX5EX = 0x1019,
> PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF = 0x101a,
> PCI_DEVICE_ID_MELLANOX_CONNECTX5BF = 0xa2d2,
> + PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF = 0xa2d3,
> };
>
> /** Switch information returned by mlx5_nl_switch_info(). */
> --
> 1.8.3.1
>
Re: [dpdk-dev] [PATCH 1/3] mbuf: add sanity checks on segment metadata
> On Sep 9, 2018, at 10:45 PM, David Marchand wrote:
>
> Add some basic checks on the segments offset and length metadata:
> always funny to have a < 0 tailroom cast to uint16_t ;-).
>
> Signed-off-by: David Marchand
> ---
> lib/librte_mbuf/rte_mbuf.c | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
> index e714c5a59..137a320ed 100644
> --- a/lib/librte_mbuf/rte_mbuf.c
> +++ b/lib/librte_mbuf/rte_mbuf.c
> @@ -200,6 +200,11 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int
> is_header)
> pkt_len = m->pkt_len;
>
> do {
> + if (m->data_off > m->buf_len)
> + rte_panic("data offset too big in mbuf segment\n");
> + if ((uint32_t)m->data_off + (uint32_t)m->data_len >
> + (uint32_t)m->buf_len)
Casting to uint32_t is needed? All of the three fields are uint16_t and it would
anyway happen because of the integer promotion rule. Right?
Thanks,
Yongseok
> + rte_panic("data length too big in mbuf segment\n");
> nb_segs -= 1;
> pkt_len -= m->data_len;
> } while ((m = m->next) != NULL);
> --
> 2.17.1
>
[dpdk-dev] [Bug 90] DPDK Installation fails on Centos
https://bugs.dpdk.org/show_bug.cgi?id=90 Bug ID: 90 Summary: DPDK Installation fails on Centos Product: DPDK Version: 17.02 Hardware: x86 OS: Other Status: CONFIRMED Severity: major Priority: Normal Component: meson Assignee: dev@dpdk.org Reporter: devisreaga...@hcl.com Target Milestone: --- Hi Team , From below link I could see centos 7.0 with DPDK 17.02 are compatible/supported, however DPDK is failing , Pls find the error mentioned below . note: I have tried same centos 7.0 with DPDK 17.11 it is working fine [I mean the installation goes fine fully]. Error Logs[centos 7.0 with DPDK 17.02]: - [root@localhost ~]# cd /opt/tempT/dpdk-stable-17.02.1/ [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# ls app buildtools config devtools doc drivers examples GNUmakefile lib LICENSE.GPL LICENSE.LGPL MAINTAINERS Makefile mk pkg README usertools x86_64-native-linuxapp-gcc [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# rm -rf x86_64-native-linuxapp-gcc [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# cd [root@localhost ~]# [root@localhost ~]# [root@localhost ~]# cd /opt/tempT/dpdk-stable-17.02.1/ [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# ls app buildtools config devtools doc drivers examples GNUmakefile lib LICENSE.GPL LICENSE.LGPL MAINTAINERS Makefile mk pkg README usertools [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# export RTE_SDK=/opt/tempT/dpdk-stable-17.02.1 [root@localhost dpdk-stable-17.02.1]# export RTE_TARGET=x86_64-native-linuxapp-gcc [root@localhost dpdk-stable-17.02.1]# make config T=x86_64-native-linuxapp-gcc O=x86_64-native-linuxapp-gcc Configuration done [root@localhost dpdk-stable-17.02.1]# ls app buildtools config devtools doc drivers examples GNUmakefile lib LICENSE.GPL LICENSE.LGPL MAINTAINERS Makefile mk pkg README usertools x86_64-native-linuxapp-gcc [root@localhost dpdk-stable-17.02.1]# [root@localhost dpdk-stable-17.02.1]# cd x86_64-native-linuxapp-gcc/ [root@localhost x86_64-native-linuxapp-gcc]# [root@localhost x86_64-native-linuxapp-gcc]# make == Build lib == Build lib/librte_compat SYMLINK-FILE include/rte_compat.h == Build lib/librte_eal == Build lib/librte_eal/common SYMLINK-FILE include/generic/rte_atomic.h SYMLINK-FILE include/generic/rte_byteorder.h SYMLINK-FILE include/generic/rte_cycles.h SYMLINK-FILE include/generic/rte_prefetch.h SYMLINK-FILE include/generic/rte_spinlock.h SYMLINK-FILE include/generic/rte_memcpy.h SYMLINK-FILE include/generic/rte_cpuflags.h SYMLINK-FILE include/generic/rte_rwlock.h SYMLINK-FILE include/generic/rte_vect.h SYMLINK-FILE include/generic/rte_io.h SYMLINK-FILE include/rte_branch_prediction.h SYMLINK-FILE include/rte_common.h SYMLINK-FILE include/rte_debug.h SYMLINK-FILE include/rte_eal.h SYMLINK-FILE include/rte_errno.h SYMLINK-FILE include/rte_launch.h SYMLINK-FILE include/rte_lcore.h SYMLINK-FILE include/rte_log.h SYMLINK-FILE include/rte_memory.h SYMLINK-FILE include/rte_memzone.h SYMLINK-FILE include/rte_pci.h SYMLINK-FILE include/rte_per_lcore.h SYMLINK-FILE include/rte_random.h SYMLINK-FILE include/rte_tailq.h SYMLINK-FILE include/rte_interrupts.h SYMLINK-FILE include/rte_alarm.h SYMLINK-FILE include/rte_string_fns.h SYMLINK-FILE include/rte_version.h SYMLINK-FILE include/rte_eal_memconfig.h SYMLINK-FILE include/rte_malloc_heap.h SYMLINK-FILE include/rte_hexdump.h SYMLINK-FILE include/rte_devargs.h SYMLINK-FILE include/rte_bus.h SYMLINK-FILE include/rte_dev.h SYMLINK-FILE include/rte_vdev.h SYMLINK-FILE include/rte_pci_dev_feature_defs.h SYMLINK-FILE include/rte_pci_dev_features.h SYMLINK-FILE include/rte_malloc.h SYMLINK-FILE include/rte_keepalive.h SYMLINK-FILE include/rte_time.h SYMLINK-FILE include/rte_rwlock.h SYMLINK-FILE include/rte_memcpy.h SYMLINK-FILE include/rte_cycles.h SYMLINK-FILE include/rte_spinlock.h SYMLINK-FILE include/rte_atomic_32.h SYMLINK-FILE include/rte_vect.h SYMLINK-FILE include/rte_prefetch.h SYMLINK-FILE include/rte_byteorder_32.h SYMLINK-FILE include/rte_atomic_64.h SYMLINK-FILE include/rte_rtm.h SYMLINK-FILE include/rte_cpuflags.h SYMLINK-FILE include/rte_byteorder_64.h SYMLINK-FILE include/rte_atomic.h SYMLINK-FILE include/rte_io.h SYMLINK-FILE include/rte_byteorder.h == Build lib/librte_eal/linuxapp == Build lib/librte_eal/linuxapp/eal CC eal.o CC eal_hugepage_info.o CC eal_memory.o CC eal_thread.o CC eal_log.o CC eal_vfio.o CC eal_vfio_mp_sync.o CC eal_pci.o CC eal_pci_uio.o CC eal_
Re: [dpdk-dev] [PATCH] doc: support building HTML guides with meson
On Tue, 2018-09-11 at 17:13 +0100, Bruce Richardson wrote:
> Signed-off-by: Bruce Richardson
> ---
> NOTE: this patch depends upon:
> http://patches.dpdk.org/project/dpdk/list/?series=1232
Just a reminder that's v2, and the patch won't apply cleanly on the
latest revision
> doc/api/meson.build| 3 ++-
> doc/guides/meson.build | 16
> doc/meson.build| 11 +++
> 3 files changed, 29 insertions(+), 1 deletion(-)
> create mode 100644 doc/guides/meson.build
>
> diff --git a/doc/api/meson.build b/doc/api/meson.build
> index 5dfa0fe04..f9bee4dac 100644
> --- a/doc/api/meson.build
> +++ b/doc/api/meson.build
> @@ -50,5 +50,6 @@ if doxygen.found()
> install_dir: htmldir,
> build_by_default: false)
>
> - run_target('doc', command: 'true', depends: doxy_build)
> + doc_targets += doxy_build
> + doc_target_names += 'Doxygen_API'
> endif
> diff --git a/doc/guides/meson.build b/doc/guides/meson.build
> new file mode 100644
> index 0..6d1e2990d
> --- /dev/null
> +++ b/doc/guides/meson.build
> @@ -0,0 +1,16 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2017 Intel Corporation
s/2017/2018
> +sphinx = find_program('sphinx-build', required:
> get_option('enable_docs'))
> +
> +if sphinx.found()
> + html_guides_build = custom_target('html_guides_build',
> + input: meson.current_source_dir(),
> + output: 'index.html',
As we discussed I don't have a good solution, but right now running
ninja will rebuild these sphinx docs again and again, which will be a
bit annoying when using enable_docs=true as it will always happen.
Changing output to 'html' fixes the issue and it makes it build only
once, but then they won't rebuild if the docs change as you noted.
> + command: [sphinx, '-b', 'html', '@INPUT@',
> meson.current_build_dir() + '/html'],
> + build_by_default: false,
> + install: get_option('enable_docs'))
> +
> + doc_targets += html_guides_build
> + doc_target_names += 'HTML_Guides'
> +endif
> diff --git a/doc/meson.build b/doc/meson.build
> index afca2e713..c5410d85d 100644
> --- a/doc/meson.build
> +++ b/doc/meson.build
> @@ -1,4 +1,15 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2018 Luca Boccassi
>
> +doc_targets = []
> +doc_target_names = []
> subdir('api')
> +subdir('guides')
> +
> +if doc_targets.length() == 0
> + message = 'No docs targets found'
> +else
> + message = 'Building docs:'
> +endif
> +run_target('doc', command: ['echo', message, doc_target_names],
> + depends: doc_targets)
One thing that's missing is the install_dir, without which ninja
install doesn't work (actually errors out for the whole tree).
To keep the install the same as the legacy makefiles this diff is
needed (I need to change the outdir in the doxygen stuff too, v5
coming) (in the build dir it will be slightly awkward as it's
build/doc/guides/guides and build/doc/api/api, but I can't find another
way to get it to work and install in the expected directories):
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -4,12 +4,14 @@
sphinx = find_program('sphinx-build', required: get_option('enable_docs'))
if sphinx.found()
+ htmldir = join_paths('share', 'doc', 'dpdk')
html_guides_build = custom_target('html_guides_build',
input: meson.current_source_dir(),
- output: 'index.html',
- command: [sphinx, '-b', 'html', '@INPUT@',
meson.current_build_dir() + '/html'],
+ output: 'guides',
+ command: [sphinx, '-b', 'html', '@INPUT@',
meson.current_build_dir() + '/guides'],
build_by_default: false,
- install: get_option('enable_docs'))
+ install: get_option('enable_docs'),
+ install_dir: htmldir)
doc_targets += html_guides_build
doc_target_names += 'HTML_Guides'
--
Kind regards,
Luca Boccassi
[dpdk-dev] [PATCH v5 1/4] mk: use script to generate examples.dox
This will make it possible to generate the file in the same way from
Meson as well.
Signed-off-by: Luca Boccassi
Acked-by: Bruce Richardson
---
v2: simplified script by using exec > file
v4: add acked-by
doc/api/generate_examples.sh | 12
mk/rte.sdkdoc.mk | 5 +
2 files changed, 13 insertions(+), 4 deletions(-)
create mode 100755 doc/api/generate_examples.sh
diff --git a/doc/api/generate_examples.sh b/doc/api/generate_examples.sh
new file mode 100755
index 00..6fcfe513b6
--- /dev/null
+++ b/doc/api/generate_examples.sh
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2018 Luca Boccassi
+
+EXAMPLES_DIR=$1
+API_EXAMPLES=$2
+
+exec > "${API_EXAMPLES}"
+printf '/**\n'
+printf '@page examples DPDK Example Programs\n\n'
+find "${EXAMPLES_DIR}" -type f -name '*.c' -printf '@example examples/%P\n' |
LC_ALL=C sort
+printf '*/\n'
diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index bd2e5763df..d023b720fe 100644
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -63,10 +63,7 @@ api-html-clean:
$(API_EXAMPLES): api-html-clean
$(Q)mkdir -p $(@D)
- @printf '/**\n' > $(API_EXAMPLES)
- @printf '@page examples DPDK Example Programs\n\n' >> $(API_EXAMPLES)
- @find examples -type f -name '*.c' -printf '@example %p\n' | LC_ALL=C
sort >> $(API_EXAMPLES)
- @printf '*/\n' >> $(API_EXAMPLES)
+ $(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES)
guides-pdf-clean: guides-pdf-img-clean
guides-pdf-img-clean:
--
2.18.0
[dpdk-dev] [PATCH v5 4/4] build: generate API documentation with Meson
Signed-off-by: Luca Boccassi
Acked-by: Bruce Richardson
---
v2: made doxygen dependency optional, skip doxygen build when not found
v3: made doxygen dependency mandatory if enable_docs is true, add
alternative doc target that prints "doxygen not found" when doxygen
is not found and enable_docs is false (default)
v4: add acked-by
v5: change install directory to $PREFIX/share/doc/dpdk to match legacy
makefiles
doc/api/generate_doxygen.sh | 10 +++
doc/api/meson.build | 56 +
doc/build-sdk-meson.txt | 2 ++
doc/meson.build | 4 +++
meson.build | 3 ++
meson_options.txt | 2 ++
6 files changed, 77 insertions(+)
create mode 100755 doc/api/generate_doxygen.sh
create mode 100644 doc/api/meson.build
create mode 100644 doc/meson.build
diff --git a/doc/api/generate_doxygen.sh b/doc/api/generate_doxygen.sh
new file mode 100755
index 00..ab57660958
--- /dev/null
+++ b/doc/api/generate_doxygen.sh
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2018 Luca Boccassi
+
+DOXYCONF=$1
+OUTDIR=$2
+SCRIPTCSS=$3
+
+doxygen "${DOXYCONF}"
+"${SCRIPTCSS}" "${OUTDIR}"/doxygen.css
diff --git a/doc/api/meson.build b/doc/api/meson.build
new file mode 100644
index 00..13fcbb8cd7
--- /dev/null
+++ b/doc/api/meson.build
@@ -0,0 +1,56 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+doxygen = find_program('doxygen', required: get_option('enable_docs'))
+
+if doxygen.found()
+ # due to the CSS customisation script, which needs to run on a file that
+ # is in a subdirectory that is created at build time and thus it cannot
+ # be an individual custom_target, we need to wrap the doxygen call in a
+ # script to run the CSS modification afterwards
+ generate_doxygen = find_program('generate_doxygen.sh')
+ generate_examples = find_program('generate_examples.sh')
+ generate_css = find_program('doxy-html-custom.sh')
+
+ inputdir = join_paths(meson.source_root(), 'examples')
+ htmldir = join_paths('share', 'doc', 'dpdk')
+
+ # due to the following bug:
https://github.com/mesonbuild/meson/issues/4107
+ # if install is set to true it will override build_by_default and it
will
+ # cause the target to always be built. If install were to be always set
to
+ # false it would be impossible to install the docs.
+ # So use a configure option for now.
+ example = custom_target('examples.dox',
+ input: inputdir,
+ output: 'examples.dox',
+ command: [generate_examples, '@INPUT@', '@OUTPUT@'],
+ install: get_option('enable_docs'),
+ install_dir: htmldir,
+ build_by_default: false)
+
+ cdata = configuration_data()
+ cdata.set('VERSION', meson.project_version())
+ cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api',
'examples.dox'))
+ cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api'))
+ cdata.set('HTML_OUTPUT', 'api')
+ cdata.set('TOPDIR', meson.source_root())
+ cdata.set('STRIP_FROM_PATH', meson.source_root())
+
+ doxy_conf = configure_file(input: 'doxy-api.conf.in',
+ output: 'doxy-api.conf',
+ configuration: cdata,
+ install: false)
+
+ doxy_build = custom_target('doxygen',
+ depends: example,
+ input: doxy_conf,
+ output: 'api',
+ command: [generate_doxygen, '@INPUT@', '@OUTPUT@',
generate_css],
+ install: get_option('enable_docs'),
+ install_dir: htmldir,
+ build_by_default: false)
+
+ run_target('doc', command: 'true', depends: doxy_build)
+else
+ run_target('doc', command: ['echo', 'doxygen', 'not', 'found'])
+endif
diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 9618e759ea..508e2cb642 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -85,6 +85,8 @@ Project-specific options are passed used -Doption=value::
meson -Dmax_lcores=8 smallbuild # scale build for smaller systems
+ meson -Denable_docs=true fullbuild # build and install docs
+
Examples of setting the same options using meson configure::
meson configure -Dwerror=true
diff --git a/doc/meson.build b/doc/meson.build
new file mode 100644
index 00..afca2e7133
--- /dev/null
+++ b/doc/meson.build
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Luca Boccassi
+
+subdir('api')
diff --git a/meson.build b/meson.build
index e8640a..09506ec48c 100644
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,9 @@ subdir('usertools')
subdir('app')
subdir('test')
+# build docs
+subdir('doc')
+
# build any examples explicitly requested - useful for developers
if get_option('examples') != ''
sub
[dpdk-dev] [PATCH v5 3/4] build: use same version as make showversion in Meson
make showversion will print 18.11.0-rc0 but Meson sets 18.11-rc0,
causing among other things a difference in the generated documentation.
Fixes: 76b9d9de5c7d ("version: 18.11-rc0")
Signed-off-by: Luca Boccassi
Acked-by: Thomas Monjalon
Acked-by: Bruce Richardson
---
v3: add acked-by
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 84af32ecef..e8640a 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
# Copyright(c) 2017 Intel Corporation
project('DPDK', 'C',
- version: '18.11-rc0',
+ version: '18.11.0-rc0',
license: 'BSD',
default_options: ['buildtype=release', 'default_library=static'],
meson_version: '>= 0.41'
--
2.18.0
[dpdk-dev] [PATCH v5 2/4] mk: use templated doxygen config, modified on the fly
This will allow the same config file to be used from Meson. The result has been verified to be identical via diffoscope. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: reordered generated fields as requested v4: add acked-by doc/api/doxy-api.conf| 87 doc/api/doxy-api.conf.in | 96 mk/rte.sdkdoc.mk | 16 +++ 3 files changed, 103 insertions(+), 96 deletions(-) delete mode 100644 doc/api/doxy-api.conf create mode 100644 doc/api/doxy-api.conf.in diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf deleted file mode 100644 index 66693c3835..00 --- a/doc/api/doxy-api.conf +++ /dev/null @@ -1,87 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2013-2017 6WIND S.A. - -PROJECT_NAME= DPDK -INPUT = doc/api/doxy-api-index.md \ - drivers/crypto/scheduler \ - drivers/mempool/dpaa2 \ - drivers/net/bnxt \ - drivers/net/bonding \ - drivers/net/dpaa \ - drivers/net/i40e \ - drivers/net/ixgbe \ - drivers/net/softnic \ - drivers/raw/dpaa2_cmdif \ - drivers/raw/dpaa2_qdma \ - lib/librte_eal/common/include \ - lib/librte_eal/common/include/generic \ - lib/librte_acl \ - lib/librte_bbdev \ - lib/librte_bitratestats \ - lib/librte_bpf \ - lib/librte_cfgfile \ - lib/librte_cmdline \ - lib/librte_compat \ - lib/librte_compressdev \ - lib/librte_cryptodev \ - lib/librte_distributor \ - lib/librte_efd \ - lib/librte_ethdev \ - lib/librte_eventdev \ - lib/librte_flow_classify \ - lib/librte_gro \ - lib/librte_gso \ - lib/librte_hash \ - lib/librte_ip_frag \ - lib/librte_jobstats \ - lib/librte_kni \ - lib/librte_kvargs \ - lib/librte_latencystats \ - lib/librte_lpm \ - lib/librte_mbuf \ - lib/librte_member \ - lib/librte_mempool \ - lib/librte_meter \ - lib/librte_metrics \ - lib/librte_net \ - lib/librte_pci \ - lib/librte_pdump \ - lib/librte_pipeline \ - lib/librte_port \ - lib/librte_power \ - lib/librte_rawdev \ - lib/librte_reorder \ - lib/librte_ring \ - lib/librte_sched \ - lib/librte_security \ - lib/librte_table \ - lib/librte_timer \ - lib/librte_vhost -FILE_PATTERNS = rte_*.h \ - cmdline.h -PREDEFINED = __DOXYGEN__ \ - VFIO_PRESENT \ - __attribute__(x)= - -OPTIMIZE_OUTPUT_FOR_C = YES -ENABLE_PREPROCESSING= YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -EXTRACT_STATIC = YES -DISTRIBUTE_GROUP_DOC= YES -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_SCOPE_NAMES= YES -GENERATE_DEPRECATEDLIST = NO -VERBATIM_HEADERS= NO -ALPHABETICAL_INDEX = NO - -HTML_TIMESTAMP = NO -HTML_DYNAMIC_SECTIONS = YES -SEARCHENGINE= NO -SORT_MEMBER_DOCS= NO -SOURCE_BROWSER = YES - -EXAMPLE_PATH= examples -EXAMPLE_PATTERNS= *.c -EXAMPLE_RECURSIVE = YES diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in new file mode 100644 index 00..c3d8fdef18 --- /dev/null +++ b/doc/api/doxy-api.conf.in @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2013-2017 6WIND S.A. + +PROJECT_NAME= DPDK +PROJECT_NUMBER = @VERSION@ +INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ + @TOPDIR@/drivers/crypto/scheduler \ + @TOPDIR@/drivers/mempool/dpaa2 \ + @TOPDIR@/drivers/net/bnxt \ + @TOPDIR@/drivers/net/bonding \ + @TOPDIR@/drivers/net/dpaa
Re: [dpdk-dev] [PATCH v2 10/10] kni: add API to set link status on kernel interface
Hi All, So I implemented the "write to /sys/devices/virtual/net/*/carrier" method to change the link status, but there is one more minor thing that I wanted to point out about this approach. The problem is that you cannot read or write the '/sys/devices/virtual/net/*/carrier' file while the interface is marked 'down'. This means that link status changes can only be performed by the DPDK application while the interface is in the "up" state. With the ioctl method, you can change the carrier state at pretty much any time. Is this a problem? It's not a huge one, I guess, but it is something else to consider. Please let me know what you all think. thanks dan
Re: [dpdk-dev] [PATCH] doc: support building HTML guides with meson
On Tue, 2018-09-11 at 21:36 +0100, Luca Boccassi wrote:
> On Tue, 2018-09-11 at 17:13 +0100, Bruce Richardson wrote:
> > Signed-off-by: Bruce Richardson
> > ---
> > NOTE: this patch depends upon:
> > http://patches.dpdk.org/project/dpdk/list/?series=1232
>
> Just a reminder that's v2, and the patch won't apply cleanly on the
> latest revision
>
> > doc/api/meson.build| 3 ++-
> > doc/guides/meson.build | 16
> > doc/meson.build| 11 +++
> > 3 files changed, 29 insertions(+), 1 deletion(-)
> > create mode 100644 doc/guides/meson.build
> >
> > diff --git a/doc/api/meson.build b/doc/api/meson.build
> > index 5dfa0fe04..f9bee4dac 100644
> > --- a/doc/api/meson.build
> > +++ b/doc/api/meson.build
> > @@ -50,5 +50,6 @@ if doxygen.found()
> > install_dir: htmldir,
> > build_by_default: false)
> >
> > - run_target('doc', command: 'true', depends: doxy_build)
> > + doc_targets += doxy_build
> > + doc_target_names += 'Doxygen_API'
> > endif
> > diff --git a/doc/guides/meson.build b/doc/guides/meson.build
> > new file mode 100644
> > index 0..6d1e2990d
> > --- /dev/null
> > +++ b/doc/guides/meson.build
> > @@ -0,0 +1,16 @@
> > +# SPDX-License-Identifier: BSD-3-Clause
> > +# Copyright(c) 2017 Intel Corporation
>
> s/2017/2018
>
> > +sphinx = find_program('sphinx-build', required:
> > get_option('enable_docs'))
> > +
> > +if sphinx.found()
> > + html_guides_build = custom_target('html_guides_build',
> > + input: meson.current_source_dir(),
> > + output: 'index.html',
>
> As we discussed I don't have a good solution, but right now running
> ninja will rebuild these sphinx docs again and again, which will be a
> bit annoying when using enable_docs=true as it will always happen.
> Changing output to 'html' fixes the issue and it makes it build only
> once, but then they won't rebuild if the docs change as you noted.
>
> > + command: [sphinx, '-b', 'html', '@INPUT@',
> > meson.current_build_dir() + '/html'],
> > + build_by_default: false,
> > + install: get_option('enable_docs'))
> > +
> > + doc_targets += html_guides_build
> > + doc_target_names += 'HTML_Guides'
> > +endif
> > diff --git a/doc/meson.build b/doc/meson.build
> > index afca2e713..c5410d85d 100644
> > --- a/doc/meson.build
> > +++ b/doc/meson.build
> > @@ -1,4 +1,15 @@
> > # SPDX-License-Identifier: BSD-3-Clause
> > # Copyright(c) 2018 Luca Boccassi
> >
> > +doc_targets = []
> > +doc_target_names = []
> > subdir('api')
> > +subdir('guides')
> > +
> > +if doc_targets.length() == 0
> > + message = 'No docs targets found'
> > +else
> > + message = 'Building docs:'
> > +endif
> > +run_target('doc', command: ['echo', message, doc_target_names],
> > + depends: doc_targets)
>
> One thing that's missing is the install_dir, without which ninja
> install doesn't work (actually errors out for the whole tree).
>
> To keep the install the same as the legacy makefiles this diff is
> needed (I need to change the outdir in the doxygen stuff too, v5
> coming) (in the build dir it will be slightly awkward as it's
> build/doc/guides/guides and build/doc/api/api, but I can't find
> another
> way to get it to work and install in the expected directories):
>
> --- a/doc/guides/meson.build
> +++ b/doc/guides/meson.build
> @@ -4,12 +4,14 @@
> sphinx = find_program('sphinx-build', required:
> get_option('enable_docs'))
>
> if sphinx.found()
> + htmldir = join_paths('share', 'doc', 'dpdk')
> html_guides_build = custom_target('html_guides_build',
> input: meson.current_source_dir(),
> - output: 'index.html',
> - command: [sphinx, '-b', 'html', '@INPUT@',
> meson.current_build_dir() + '/html'],
> + output: 'guides',
> + command: [sphinx, '-b', 'html', '@INPUT@',
> meson.current_build_dir() + '/guides'],
> build_by_default: false,
> - install: get_option('enable_docs'))
> + install: get_option('enable_docs'),
> + install_dir: htmldir)
>
> doc_targets += html_guides_build
> doc_target_names += 'HTML_Guides'
Couple more issues: I diffed the installed doc with ye olde make and
this one, and:
1) This one will install sphinx temporary cache files, which among
other things will screw up reproducible builds. It's easy to get rid of
the .doctrees by adding the following to the sphinx command:
'-d', meson.current_build_dir() + '/.doctrees'
so that the doctrees are stored in the build directory, rather than in
the output directory, and so they will not be installed.
But the .buildinfo file, with some hashes (and so more reproducibility
problems) is still installed and I can't see how to get rid of it.
2) The custom.css file is installed manually by ye olde makefiles and
thus is missing from guides/_static/css/custom.css
--
Kind regards,
Luca Boccassi
Re: [dpdk-dev] [PATCH v2 10/10] kni: add API to set link status on kernel interface
On Tue, 11 Sep 2018 18:45:49 -0300 Dan Gora wrote: > Hi All, > > So I implemented the "write to /sys/devices/virtual/net/*/carrier" > method to change the link status, but there is one more minor thing > that I wanted to point out about this approach. The problem is that > you cannot read or write the '/sys/devices/virtual/net/*/carrier' file > while the interface is marked 'down'. This means that link status > changes can only be performed by the DPDK application while the > interface is in the "up" state. With the ioctl method, you can change > the carrier state at pretty much any time. > > Is this a problem? It's not a huge one, I guess, but it is something > else to consider. > > Please let me know what you all think. > > thanks > dan The carrier state has no meaning when device is down, at least for physical devices. Because often the PHY is powered off when the device is marked down.
Re: [dpdk-dev] [PATCH v2 10/10] kni: add API to set link status on kernel interface
On Tue, Sep 11, 2018 at 6:52 PM, Stephen Hemminger wrote: > The carrier state has no meaning when device is down, at least for physical > devices. Because often the PHY is powered off when the device is marked down. The thing that caught my attention is that when you mark a kernel ethernet device 'down', you get a message that the link is down in the syslog. snappy:root:bash 2645 => ip link set down dev eth0 Sep 11 18:32:48 snappy kernel: e1000e: eth0 NIC Link is Down With this method, that's not possible because you cannot change the link state from the callback from kni_net_release. The carrier state doesn't have any meaning from a data transfer point of view, but it's often useful for being able to diagnose connectivity issues (is my cable plugged in or not). I'm still not really clear what the objection really is to the ioctl method. Is it just the number of changes? That the kernel driver has to change as well? Just that there is another way to do it? thanks dan
[dpdk-dev] [PATCH 0/2] kni: add API to set link status on kernel interface
Hi All, The following patches are to add support for DPDK applications to be able to change the carrier state of Linux network interfaces in the KNI kernel module. The carrier state is changed by writing to the Linux /sys file: /sys/devices/virtual/net//carrier, where is the KNI interface name. These patches supercede: '[PATCH v2 10/10] kni: add API to set link status on kernel interface' Message-Id: <20180629015508.26599-11...@adax.com> Dan Gora (2): kni: add API to set link status on kernel interface kni: set default carrier state to 'off' kernel/linux/kni/kni_misc.c | 2 ++ kernel/linux/kni/kni_net.c | 2 ++ lib/librte_kni/rte_kni.c| 57 + lib/librte_kni/rte_kni.h| 18 4 files changed, 79 insertions(+) -- 2.19.0
[dpdk-dev] [PATCH 1/2] kni: add API to set link status on kernel interface
Add a new API function to KNI, rte_kni_update_link() to allow DPDK
applications to update the link status for KNI network interfaces in
the linux kernel.
Signed-off-by: Dan Gora
---
lib/librte_kni/rte_kni.c | 57
lib/librte_kni/rte_kni.h | 18 +
2 files changed, 75 insertions(+)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 65f6a2b03..afe1d7410 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -790,6 +790,63 @@ rte_kni_unregister_handlers(struct rte_kni *kni)
return 0;
}
+
+int
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link)
+{
+ char path[64];
+ char carrier[2];
+ const char *new_carrier;
+ int fd, ret;
+
+ if (kni == NULL || link == NULL)
+ return -1;
+
+ snprintf(path, sizeof(path), "/sys/devices/virtual/net/%s/carrier",
+ kni->name);
+
+ fd = open(path, O_RDWR);
+ if (fd == -1) {
+ RTE_LOG(ERR, KNI, "Failed to open file: %s.\n", path);
+ return -1;
+ }
+
+ ret = read(fd, carrier, 2);
+ if (ret < 1) {
+ /* Cannot read carrier until interface is marked
+* 'up', so don't log an error.
+*/
+ close(fd);
+ return -1;
+ }
+
+ new_carrier = (link->link_status == ETH_LINK_UP) ? "1" : "0";
+ ret = write(fd, new_carrier, 1);
+ if (ret < 1) {
+ RTE_LOG(ERR, KNI, "Failed to write file: %s.\n", path);
+ close(fd);
+ return -1;
+ }
+
+ if (strncmp(carrier, new_carrier, 1)) {
+ if (link->link_status == ETH_LINK_UP) {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Up %d Mbps %s %s.\n",
+ kni->name,
+ link->link_speed,
+ link->link_autoneg ? "(Fixed)" : "(AutoNeg)",
+ link->link_duplex ?
+ "Full Duplex" : "Half Duplex");
+ } else {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Down.\n",
+ kni->name);
+ }
+ }
+
+ close(fd);
+
+ return 0;
+}
+
void
rte_kni_close(void)
{
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 99055e2c2..4118ae97a 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
@@ -228,6 +229,23 @@ int rte_kni_register_handlers(struct rte_kni *kni, struct
rte_kni_ops *ops);
*/
int rte_kni_unregister_handlers(struct rte_kni *kni);
+/**
+ * Update link status info for KNI port.
+ *
+ * Update the linkup/linkdown status of a KNI interface in the kernel.
+ *
+ * @param kni
+ * pointer to struct rte_kni.
+ * @param link
+ * pointer to struct rte_eth_link containing new interface status.
+ *
+ * @return
+ * On success: 0
+ * On failure: -1
+ */
+int __rte_experimental
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link);
+
/**
* Close KNI device.
*/
--
2.19.0
Re: [dpdk-dev] [PATCH v2 10/10] kni: add API to set link status on kernel interface
On Tue, 11 Sep 2018 19:07:47 -0300 Dan Gora wrote: > On Tue, Sep 11, 2018 at 6:52 PM, Stephen Hemminger > wrote: > > The carrier state has no meaning when device is down, at least for physical > > devices. Because often the PHY is powered off when the device is marked > > down. > > The thing that caught my attention is that when you mark a kernel > ethernet device 'down', you get a message that the link is down in the > syslog. > > snappy:root:bash 2645 => ip link set down dev eth0 > Sep 11 18:32:48 snappy kernel: e1000e: eth0 NIC Link is Down > > With this method, that's not possible because you cannot change the > link state from the callback from kni_net_release. > > The carrier state doesn't have any meaning from a data transfer point > of view, but it's often useful for being able to diagnose connectivity > issues (is my cable plugged in or not). > > I'm still not really clear what the objection really is to the ioctl > method. Is it just the number of changes? That the kernel driver has > to change as well? Just that there is another way to do it? > > thanks > dan I want to see KNI as part of the standard Linux kernel at some future date. Having KNI as an out of tree driver means it is doomed to chasing tail lights for the Linux kernel ABI instability and also problems with Linux distributions. One of the barriers to entry for Linux drivers is introducing new ioctl's. Ioctl's have issues with being device specific and also 32/64 compatiablity. If KNI has ioctl's it makes it harder to get merged some day. I freely admit that this is forcing KNI to respond to something that is not there yet, so if it is too hard, then doing it with ioctl is going to be necessary.
Re: [dpdk-dev] [PATCH 1/2] kni: add API to set link status on kernel interface
Sorry all.. I totally goofed up with git-send-email.. Please ignore this message. On Tue, Sep 11, 2018 at 8:14 PM, Dan Gora wrote: > Add a new API function to KNI, rte_kni_update_link() to allow DPDK > applications to update the link status for KNI network interfaces in > the linux kernel. >
[dpdk-dev] [PATCH 0/2] kni: add API to set link status on kernel interface
Hi All, The following patches are to add support for DPDK applications to be able to change the carrier state of Linux network interfaces in the KNI kernel module. The carrier state is changed by writing to the Linux /sys file: /sys/devices/virtual/net//carrier, where is the KNI interface name. These patches supercede: '[PATCH v2 10/10] kni: add API to set link status on kernel interface' https://mails.dpdk.org/archives/dev/2018-August/110383.html Dan Gora (2): kni: add API to set link status on kernel interface kni: set default carrier state to 'off' kernel/linux/kni/kni_misc.c | 2 ++ kernel/linux/kni/kni_net.c | 2 ++ lib/librte_kni/rte_kni.c| 57 + lib/librte_kni/rte_kni.h| 18 4 files changed, 79 insertions(+) -- 2.19.0
[dpdk-dev] [PATCH 1/2] kni: add API to set link status on kernel interface
Add a new API function to KNI, rte_kni_update_link() to allow DPDK
applications to update the link status for KNI network interfaces in
the linux kernel.
Signed-off-by: Dan Gora
---
lib/librte_kni/rte_kni.c | 57
lib/librte_kni/rte_kni.h | 18 +
2 files changed, 75 insertions(+)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 65f6a2b03..afe1d7410 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -790,6 +790,63 @@ rte_kni_unregister_handlers(struct rte_kni *kni)
return 0;
}
+
+int
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link)
+{
+ char path[64];
+ char carrier[2];
+ const char *new_carrier;
+ int fd, ret;
+
+ if (kni == NULL || link == NULL)
+ return -1;
+
+ snprintf(path, sizeof(path), "/sys/devices/virtual/net/%s/carrier",
+ kni->name);
+
+ fd = open(path, O_RDWR);
+ if (fd == -1) {
+ RTE_LOG(ERR, KNI, "Failed to open file: %s.\n", path);
+ return -1;
+ }
+
+ ret = read(fd, carrier, 2);
+ if (ret < 1) {
+ /* Cannot read carrier until interface is marked
+* 'up', so don't log an error.
+*/
+ close(fd);
+ return -1;
+ }
+
+ new_carrier = (link->link_status == ETH_LINK_UP) ? "1" : "0";
+ ret = write(fd, new_carrier, 1);
+ if (ret < 1) {
+ RTE_LOG(ERR, KNI, "Failed to write file: %s.\n", path);
+ close(fd);
+ return -1;
+ }
+
+ if (strncmp(carrier, new_carrier, 1)) {
+ if (link->link_status == ETH_LINK_UP) {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Up %d Mbps %s %s.\n",
+ kni->name,
+ link->link_speed,
+ link->link_autoneg ? "(Fixed)" : "(AutoNeg)",
+ link->link_duplex ?
+ "Full Duplex" : "Half Duplex");
+ } else {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Down.\n",
+ kni->name);
+ }
+ }
+
+ close(fd);
+
+ return 0;
+}
+
void
rte_kni_close(void)
{
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 99055e2c2..4118ae97a 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
@@ -228,6 +229,23 @@ int rte_kni_register_handlers(struct rte_kni *kni, struct
rte_kni_ops *ops);
*/
int rte_kni_unregister_handlers(struct rte_kni *kni);
+/**
+ * Update link status info for KNI port.
+ *
+ * Update the linkup/linkdown status of a KNI interface in the kernel.
+ *
+ * @param kni
+ * pointer to struct rte_kni.
+ * @param link
+ * pointer to struct rte_eth_link containing new interface status.
+ *
+ * @return
+ * On success: 0
+ * On failure: -1
+ */
+int __rte_experimental
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link);
+
/**
* Close KNI device.
*/
--
2.19.0
[dpdk-dev] [PATCH 2/2] kni: set default carrier state to 'off'
Set the carrier state to 'off' when the interface is instantiated or when it is marked 'up' or 'down'. This is necessary to set the interface to a known operational state until the carrier state is changed with rte_kni_update_link(). Signed-off-by: Dan Gora --- kernel/linux/kni/kni_misc.c | 2 ++ kernel/linux/kni/kni_net.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index fa69f8e63..45649499d 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -466,6 +466,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, return -ENODEV; } + netif_carrier_off(net_dev); + ret = kni_run_thread(knet, kni, dev_info.force_bind); if (ret != 0) return ret; diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 7fcfa106c..1f8ba0700 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -133,6 +133,7 @@ kni_net_open(struct net_device *dev) struct kni_dev *kni = netdev_priv(dev); netif_start_queue(dev); + netif_carrier_off(dev); memset(&req, 0, sizeof(req)); req.req_id = RTE_KNI_REQ_CFG_NETWORK_IF; @@ -152,6 +153,7 @@ kni_net_release(struct net_device *dev) struct kni_dev *kni = netdev_priv(dev); netif_stop_queue(dev); /* can't transmit any more */ + netif_carrier_off(dev); memset(&req, 0, sizeof(req)); req.req_id = RTE_KNI_REQ_CFG_NETWORK_IF; -- 2.19.0
[dpdk-dev] [PATCH v8] linuxapp, eal: Fix the memory leak issue of logid
From: Ziye Yang This patch is used to fix the memory leak issue of logid. We use the ASAN test in SPDK when intergrating DPDK and find this memory leak issue. Signed-off-by: Ziye Yang --- lib/librte_eal/linuxapp/eal/eal.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index e59ac65..46494f9 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -793,7 +793,8 @@ static void rte_eal_init_alert(const char *msg) int i, fctret, ret; pthread_t thread_id; static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0); - const char *logid; + const char *p; + static char logid[PATH_MAX]; char cpuset[RTE_CPU_AFFINITY_STR_LEN]; char thread_name[RTE_MAX_THREAD_NAME_LEN]; @@ -810,9 +811,8 @@ static void rte_eal_init_alert(const char *msg) return -1; } - logid = strrchr(argv[0], '/'); - logid = strdup(logid ? logid + 1: argv[0]); - + p = strrchr(argv[0], '/'); + snprintf(logid, sizeof(logid), "%s", (p ? p + 1 : argv[0])); thread_id = pthread_self(); eal_reset_internal_config(&internal_config); -- 1.9.3
[dpdk-dev] [PATCH v2] app/testpmd: optimize membuf pool allocation
By default, testpmd will create membuf pool for all NUMA nodes and
ignore EAL configuration.
Count the number of available NUMA according to EAL core mask or core
list configuration. Optimized by only creating membuf pool for those
nodes.
Fixes: c9cafcc ("app/testpmd: fix mempool creation by socket id")
Signed-off-by: Phil Yang
Acked-by: Gavin Hu
---
app/test-pmd/testpmd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index ee48db2..a56af2b 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -476,6 +476,8 @@ set_default_fwd_lcores_config(void)
nb_lc = 0;
for (i = 0; i < RTE_MAX_LCORE; i++) {
+ if (!rte_lcore_is_enabled(i))
+ continue;
sock_num = rte_lcore_to_socket_id(i);
if (new_socket_id(sock_num)) {
if (num_sockets >= RTE_MAX_NUMA_NODES) {
@@ -485,8 +487,6 @@ set_default_fwd_lcores_config(void)
}
socket_ids[num_sockets++] = sock_num;
}
- if (!rte_lcore_is_enabled(i))
- continue;
if (i == rte_get_master_lcore())
continue;
fwd_lcores_cpuids[nb_lc++] = i;
--
2.7.4
Re: [dpdk-dev] [PATCH] app/testpmd: Optimize membuf pool allocation
Hi Bernard,
Thanks for you comments. I have updated the patch. Please review it.
Thanks,
Phil Yang
> -Original Message-
> From: dev On Behalf Of Iremonger, Bernard
> Sent: Wednesday, September 12, 2018 12:23 AM
> To: dev ; dev@dpdk.org
> Cc: nd ; Gavin Hu (Arm Technology China)
> Subject: Re: [dpdk-dev] [PATCH] app/testpmd: Optimize membuf pool allocation
>
> Hi Gavin,
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org]
> > Sent: Monday, August 27, 2018 10:33 AM
> > To: dev@dpdk.org
> > Cc: n...@arm.com; gavin...@arm.com
> > Subject: [dpdk-dev] [PATCH] app/testpmd: Optimize membuf pool
> > allocation
> >
> > By default, testpmd will create membuf pool for all NUMA nodes and
> > ignore EAL configuration.
> >
> > Count the number of available NUMA according to EAL core mask or core
> > list configuration. Optimized by only creating membuf pool for those nodes.
> >
> > Fixes: d5aeab6542f ("app/testpmd: fix mempool creation by socket id")
> >
> > Signed-off-by: Phil Yang
> > ---
> > app/test-pmd/testpmd.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> > ee48db2..a56af2b 100644
> > --- a/app/test-pmd/testpmd.c
> > +++ b/app/test-pmd/testpmd.c
> > @@ -476,6 +476,8 @@ set_default_fwd_lcores_config(void)
> >
> > nb_lc = 0;
> > for (i = 0; i < RTE_MAX_LCORE; i++) {
> > + if (!rte_lcore_is_enabled(i))
> > + continue;
> > sock_num = rte_lcore_to_socket_id(i);
> > if (new_socket_id(sock_num)) {
> > if (num_sockets >= RTE_MAX_NUMA_NODES) { @@ -
> > 485,8 +487,6 @@ set_default_fwd_lcores_config(void)
> > }
> > socket_ids[num_sockets++] = sock_num;
> > }
> > - if (!rte_lcore_is_enabled(i))
> > - continue;
> > if (i == rte_get_master_lcore())
> > continue;
> > fwd_lcores_cpuids[nb_lc++] = i;
> > --
> > 2.7.4
>
> ./dpdk/devtools/check-git-log.sh -1
>
> Wrong headline uppercase:
> app/testpmd: Optimize membuf pool allocation Wrong 'Fixes' reference:
> Fixes: d5aeab6542f ("app/testpmd: fix mempool creation by socket id")
>
> Regards,
>
> Bernard.
>
