[dpdk-dev] [PATCH] net/i40e: fix fail to set TPID with AQ command
TPID can be set by set_switch_config AdminQ command on
new FW release. But find fail to set 0x88A8 on some NICs.
According to the datasheet, Switch Tag value should not
be identical to either the First Tag or Second Tag values.
So set something other than common Ethertype for internal
switching.
Fixes: 73cd7d6dc8e1 ("net/i40e: use set switch AQ instead of register setting")
Cc: sta...@dpdk.org
Signed-off-by: Beilei Xing
---
drivers/net/i40e/i40e_ethdev.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index c47b9f5..93b8d6e 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1242,6 +1242,13 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void
*init_params __rte_unused)
hw->bus.func = pci_dev->addr.function;
hw->adapter_stopped = 0;
+ /*
+* Switch Tag value should not be identical to either the First Tag
+* or Second Tag values. So set something other than common Ethertype
+* for internal switching.
+*/
+ hw->switch_tag = 0x;
+
/* Check if need to support multi-driver */
i40e_support_multi_driver(dev);
--
2.5.5
Re: [dpdk-dev] [PATCH v7 09/15] vhost: add shadow used ring support for packed rings
On Wed, Jul 04, 2018 at 11:54:32PM +0200, Maxime Coquelin wrote:
[...]
> +
> +static __rte_always_inline void
> +flush_shadow_used_ring_packed(struct virtio_net *dev,
> + struct vhost_virtqueue *vq)
> +{
[...]
> +}
> +
> +static __rte_always_inline void
> +update_shadow_used_ring_packed(struct vhost_virtqueue *vq,
> + uint16_t desc_idx, uint16_t len, uint16_t count)
> +{
> + uint16_t i = vq->shadow_used_idx++;
> +
> + vq->shadow_used_packed[i].id = desc_idx;
> + vq->shadow_used_packed[i].len = len;
> + vq->shadow_used_packed[i].count = count;
> }
>
I met below build errors in this patch when doing
per-patch build test with clang:
lib/librte_vhost/virtio_net.c:134:1: error: unused function
'flush_shadow_used_ring_packed'
[-Werror,-Wunused-function]
flush_shadow_used_ring_packed(struct virtio_net *dev,
^
lib/librte_vhost/virtio_net.c:188:1: error: unused function
'update_shadow_used_ring_packed'
[-Werror,-Wunused-function]
update_shadow_used_ring_packed(struct vhost_virtqueue *vq,
^
It's better to add __rte_unused in this patch,
and remove it when functions are used.
PS. I also saw similar errors with fill_vec_buf_packed()
in patch 11/15.
Re: [dpdk-dev] [PATCH v7 14/15] vhost: add notification for packed ring
On 07/05/2018 07:12 AM, Tiwei Bie wrote:
On Wed, Jul 04, 2018 at 11:54:37PM +0200, Maxime Coquelin wrote:
[...]
@@ -225,6 +231,15 @@ struct vring_desc_packed {
uint16_t index;
uint16_t flags;
};
+
+#define VRING_EVENT_F_ENABLE 0x0
+#define VRING_EVENT_F_DISABLE 0x1
+#define VRING_EVENT_F_DESC 0x2
+
+struct vring_packed_desc_event {
+ uint16_t desc_event_off_wrap;
+ uint16_t desc_event_flags;
+};
As all above types (including struct vring_desc_packed)
and macros are being protected by VIRTIO_F_RING_PACKED,
and they won't be defined if VIRTIO_F_RING_PACKED is
defined in kernel header. We may want to unify the names.
For the types, we may have below types defined in
linux uapi:
struct vring_packed;
struct vring_packed_desc;
struct vring_packed_desc_event;
They can also be named as:
struct vring_packed;
struct vring_desc_packed;
struct vring_packed_desc_event;
We need to choose one of them or something else.
For the `struct vring_packed_desc_event`, it can
be defined as:
struct vring_packed_desc_event {
uint16_t off_wrap;
uint16_t flags;
};
or
struct vring_packed_desc_event {
uint16_t desc_event_off_wrap;
uint16_t desc_event_flags;
};
We need to choose one of them or something else.
For the `struct vring_packed_desc`, it can be
defined as:
struct vring_packed_desc {
uint64_t addr;
uint32_t len;
uint16_t index;
uint16_t flags;
};
or
struct vring_packed_desc {
uint64_t addr;
uint32_t len;
uint16_t id;// index -> id
uint16_t flags;
};
We need to choose one of them or something else.
I will align on Kernel header.
#endif
[...]
+static __rte_always_inline void
+vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq)
+{
+ uint16_t old, new, off, off_wrap;
+ bool kick = false;
+
+ /* Flush used desc update. */
+ rte_smp_mb();
+
+ if (!(dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))) {
+ if (vq->driver_event->desc_event_flags !=
+ VRING_EVENT_F_DISABLE)
+ kick = true;
+ goto kick;
+ }
+
+ old = vq->signalled_used;
We also need to check whether vq->signalled_used is valid?
Yes, thanks for pointing this out.
So if not valid, I'll kick if desc_event_flags != VRING_EVENT_F_DISABLE.
+ new = vq->last_used_idx;
+ vq->signalled_used = new;
+
+ if (vq->driver_event->desc_event_flags != VRING_EVENT_F_DESC) {
+ if (vq->driver_event->desc_event_flags !=
+ VRING_EVENT_F_DISABLE)
+ kick = true;
+ goto kick;
+ }
+
+ rte_smp_rmb();
+
+ off_wrap = vq->driver_event->desc_event_off_wrap;
+ off = off_wrap & ~(1 << 15);
+
+ if (vq->used_wrap_counter != off_wrap >> 15)
+ off -= vq->size;
+
+ if (vhost_need_event(off, new, old))
+ kick = true;
If new <= old, old needs to -= vq->size?
Right, I'll fix it in next version.
Thanks!
Maxime
+kick:
+ if (kick)
+ eventfd_write(vq->callfd, (eventfd_t)1);
+}
+
[...]
Re: [dpdk-dev] [PATCH v8 04/19] ethdev: introduce device lock
05/07/2018 05:37, Zhang, Qi Z:
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > 05/07/2018 03:38, Zhang, Qi Z:
> > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > 04/07/2018 12:49, Zhang, Qi Z:
> > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > 04/07/2018 03:47, Zhang, Qi Z:
> > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > 03/07/2018 17:08, Zhang, Qi Z:
> > > > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > > > 02/07/2018 07:44, Qi Zhang:
> > > > > > > > > > > Introduce API rte_eth_dev_lock and rte_eth_dev_unlock
> > > > > > > > > > > to let application lock or unlock on specific ethdev,
> > > > > > > > > > > a locked device can't be detached, this help
> > > > > > > > > > > applicaiton to prevent unexpected device detaching,
> > > > > > > > > > > especially in multi-process
> > > > envrionment.
> > > > > > > > > >
> > > > > > > > > > Trying to understand: a process of an application could
> > > > > > > > > > try to detach a port while another process is against this
> > decision.
> > > > > > > > > > Why an application needs to be protected against itself?
> > > > > > > > >
> > > > > > > > > I think we can regard this as a help function, it help
> > > > > > > > > application to simplified
> > > > > > > > the situation when one process want to detach a device while
> > > > > > > > another one is still using it.
> > > > > > > > > Application can register a callback which can do to
> > > > > > > > > necessary clean up (like
> > > > > > > > stop traffic, release memory ...) before device be detached.
> > > > > > > >
> > > > > > > > Yes I agree such hook can be a good idea.
> > > > [...]
> > > > > > > > After all, it is just a pre-detach hook.
> > > > > > >
> > > > > > > > Wait, how is it different of RTE_ETH_EVENT_DESTROY callback?
> > > > > > > > Perhaps we just need to improve the handling of the DESTROY
> > event?
> > > > > > >
> > > > > > > I have thought about this before.
> > > > > > > Not like RTE_ETH_EVENT_DESTROY and other event hook, the hook
> > > > > > > here
> > > > > > need to give feedback, pass or fail will impact the following
> > > > > > behavior, this make it special, so I separate it from all exist
> > > > > > rte_eth_event_type handle mechanism.
> > > > > >
> > > > > > Look at _rte_eth_dev_callback_process, there is a "ret_param".
> > > > >
> > > > > OK, that should work.
> > > > > >
> > > > > > > The alternative solution is
> > > > > > > we just introduce a new event type like
> > > > > > > RTE_ETH_EVENT_PRE_DETACH and reuse all exist API
> > > > > > rte_eth_dev_callback_register/rte_eth_dev_callback_unregister.
> > > > > >
> > > > > > I don't think we need a new event.
> > > > > > Let's try to use RTE_ETH_EVENT_DESTROY.
> > > > >
> > > > > The problem is RTE_ETH_EVENT_DESTROY is used in
> > > > rte_eth_dev_release_port already.
> > > > > And in PMD, rte_eth_dev_release_port is called after dev_uninit,
> > > > > that mean its too late to reject a detach
> > > >
> > > > You're right.
> > > >
> > > > It's a real mess currently.
> > > > The right order should be to remove ethdev ports before removing the
> > > > underlying EAL device. But it's strangely not the case.
> > > >
> > > > We need to separate things.
> > > > The function rte_eth_dev_close can be used to remove an ethdev port
> > > > if we add a call to rte_eth_dev_release_port.
> > > > So we could call rte_eth_dev_close in PMD remove functions.
> > > > Is "close" a good time to ask confirmation to the application?
> > > > Or should we ask confirmation a step before, on "stop"?
> > >
> > > I think the confirmation should before any cleanup stage, it should at the
> > beginning of driver->remove.
> >
> > So you stop a port, even if the app policy is against detaching it?
>
> My understanding is, stop and detach is different, we may stop a device and
> reconfigure it then restart it.
> but for detach, properly we will not use it, unless it be probed again.
> For dev_close , it should be called after dev_stop.
> so we have to like below.
>
> If (dev->started) {
> dev_stop /* but still problem here, if traffic is ongoing */
> if (dev_close()) {
> dev_start()
> return -EBUSY.
> }
> } else {
> If (dev_close())
> Return _EBUSY
> }
>
> So for me, neither rte_eth_dev_stop and rte_eth_dev_close is the right place
> to check this.
> But rte_eth_dev_destroy looks like a good one. We can put all the ethdev
> general logic into it,
> and PMD specific dev_unit will be called at last
If you want to detach a port, you need to stop it.
If one process try to detach a port, but another process decides
(via callback) that the port should not be detached,
you will have stopped a port for no good reason.
To me it is a real design issue.
> > > Also we should not put it into rte_eth_dev_stop, because, rte_eth_dev_stop
> > can invoked by application directly, in that case, we don
[dpdk-dev] [PATCH] test: add unit tests for metrics library
Unit Testcases are added for metrics library.
Signed-off-by: Hari Kumar
Reviewed-by: Reshma Pattan
---
test/test/Makefile | 2 +
test/test/test_metrics.c | 340 +++
2 files changed, 342 insertions(+)
create mode 100644 test/test/test_metrics.c
diff --git a/test/test/Makefile b/test/test/Makefile
index eccc8efcf..8f391cf84 100644
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -180,6 +180,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c
SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
+SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c
+
ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
endif
diff --git a/test/test/test_metrics.c b/test/test/test_metrics.c
new file mode 100644
index 0..eaec43dd1
--- /dev/null
+++ b/test/test/test_metrics.c
@@ -0,0 +1,340 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include "test.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#defineREG_METRIC_COUNT6
+#defineMETRIC_LESSER_COUNT 3
+#define INVAL_METRIC_COUNT 30
+#defineKEY 1
+#defineVALUE 1
+#define INVALID_COUNT 257
+
+/* Initializes metric module. This function must be called
+ * from a primary process before metrics are used
+ */
+static int
+test_metrics_init(void)
+{
+ rte_metrics_init(rte_socket_id());
+ return TEST_SUCCESS;
+}
+
+ /* Test Case to check failures when memzone init is not done */
+static int
+test_metrics_without_init(void)
+{
+ int err = 0;
+ const uint64_t value[REG_METRIC_COUNT] = {0};
+ const char * const mnames[] = {
+ "mean_bits_in", "mean_bits_out",
+ "peak_bits_in", "peak_bits_out",
+ };
+
+ /* Failure Test: Checking for memzone initialization */
+ err = rte_metrics_reg_name(NULL);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_reg_names(&mnames[0], 1);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_update_value(RTE_METRICS_GLOBAL, KEY, VALUE);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_update_values(RTE_METRICS_GLOBAL, KEY, &value[0], 4);
+ TEST_ASSERT(err == -EIO, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_get_names(NULL, 0);
+ TEST_ASSERT(err == 0, "%s, %d", __func__, __LINE__);
+
+ err = rte_metrics_get_values(RTE_METRICS_GLOBAL, NULL, 0);
+ TEST_ASSERT(err == 0, "%s, %d", __func__, __LINE__);
+
+ return TEST_SUCCESS;
+}
+
+/* Test Case to validate registering a single metric */
+static int
+test_metrics_reg_name_with_validname(void)
+{
+ int err = 0;
+
+ /* Test to register the new metric name */
+ err = rte_metrics_reg_name("peak_bits_out");
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Test to register the same metric name */
+ err = rte_metrics_reg_name("peak_bits_out");
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Test case to validate registering a invalid metric */
+ err = rte_metrics_reg_name(NULL);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ return TEST_SUCCESS;
+}
+
+/* Test case to validate registering a list of valid metric names */
+static int
+test_metrics_reg_names(void)
+{
+ int err = 0;
+ const char * const mnames[] = {
+ "mean_bits_in", "mean_bits_out",
+ "peak_bits_in", "peak_bits_out",
+ };
+
+
+ /* Success Test: valid array and count size */
+ err = rte_metrics_reg_names(&mnames[0], ARRAY_SIZE(mnames));
+ TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
+
+ /* Failure Test: valid array and higher count size than array size*/
+ err = rte_metrics_reg_names(&mnames[0], ARRAY_SIZE(mnames) + 2);
+ TEST_ASSERT(err < 0, "%s, %d", __func__, __LINE__);
+
+ /* Failure Test: valid array and count size lessthan 1*/
+ err = rte_metrics_reg_names(&mnames[0], 0);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ /* Failure Test: valid array and count exceeds max count */
+ err = rte_metrics_reg_names(&mnames[0], INVALID_COUNT);
+ TEST_ASSERT(err == -ENOMEM, "%s, %d", __func__, __LINE__);
+
+ /* Failure Test: Invalid array and valid count size */
+ err = rte_metrics_reg_names(NULL, ARRAY_SIZE(mnames) + 2);
+ TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
+
+ /* Failure Test: Valid array and Invalid count size */
+ err = rte_metrics_reg_names(&mnames[0], INVAL_METRIC_COUNT);
+ TEST_ASSERT(err < 0, "%s, %d", __func__, __LINE__);
+
+
[dpdk-dev] [PATCH V5 1/7] bus: add hotplug failure handler
When device be hotplug out, if app still continue to access device by mmio,
it will cause of memory failure and result the system crash.
This patch introduces a bus ops to handle device hotplug failure, it is a
bus specific behavior,so that each kind of bus can implement its own logic
case by case.
Signed-off-by: Jeff Guo
---
v5->v4:
change ops name to be more clear
refine doc and commit log
---
lib/librte_eal/common/include/rte_bus.h | 15 +++
1 file changed, 15 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_bus.h
b/lib/librte_eal/common/include/rte_bus.h
index eb9eded..8a993cf 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -168,6 +168,19 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);
typedef int (*rte_bus_parse_t)(const char *name, void *addr);
/**
+ * Implementation a specific hotplug failure handler, which is responsible
+ * for handle the failure when hot remove the device, guaranty the system
+ * would not crash in the case.
+ * @param dev
+ * Pointer of the device structure.
+ *
+ * @return
+ * 0 on success.
+ * !0 on error.
+ */
+typedef int (*rte_bus_hotplug_failure_handler_t)(struct rte_device *dev);
+
+/**
* Bus scan policies
*/
enum rte_bus_scan_mode {
@@ -211,6 +224,8 @@ struct rte_bus {
rte_bus_parse_t parse; /**< Parse a device name */
struct rte_bus_conf conf;/**< Bus configuration */
rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class */
+ rte_bus_hotplug_failure_handler_t hotplug_failure_handler;
+ /**< handle hotplug failure on bus */
};
/**
--
2.7.4
[dpdk-dev] [PATCH V5 4/7] bus/pci: implement sigbus handler operation
This patch implements the ops of sigbus handler for PCI bus, it is
functional to find the corresponding pci device which is be hotplug out.
and then handle the hotplug failure for this device.
Signed-off-by: Jeff Guo
---
v5->v4:
no change
---
drivers/bus/pci/pci_common.c | 49
1 file changed, 49 insertions(+)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index bc3bcac..f065271 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -407,6 +407,32 @@ pci_find_device(const struct rte_device *start,
rte_dev_cmp_t cmp,
return NULL;
}
+/* check the failure address belongs to which device. */
+static struct rte_pci_device *
+pci_find_device_by_addr(const void *failure_addr)
+{
+ struct rte_pci_device *pdev = NULL;
+ int i;
+
+ FOREACH_DEVICE_ON_PCIBUS(pdev) {
+ for (i = 0; i != RTE_DIM(pdev->mem_resource); i++) {
+ if ((uint64_t)(uintptr_t)failure_addr >=
+ (uint64_t)(uintptr_t)pdev->mem_resource[i].addr &&
+ (uint64_t)(uintptr_t)failure_addr <
+ (uint64_t)(uintptr_t)pdev->mem_resource[i].addr +
+ pdev->mem_resource[i].len) {
+ RTE_LOG(INFO, EAL, "Failure address "
+ "%16.16"PRIx64" belongs to "
+ "device %s!\n",
+ (uint64_t)(uintptr_t)failure_addr,
+ pdev->device.name);
+ return pdev;
+ }
+ }
+ }
+ return NULL;
+}
+
static int
pci_hotplug_failure_handler(struct rte_device *dev)
{
@@ -435,6 +461,28 @@ pci_hotplug_failure_handler(struct rte_device *dev)
}
static int
+pci_sigbus_handler(const void *failure_addr)
+{
+ struct rte_pci_device *pdev = NULL;
+ int ret = 0;
+
+ pdev = pci_find_device_by_addr(failure_addr);
+ if (!pdev) {
+ /* It is a generic sigbus error, no bus would handle it. */
+ ret = 1;
+ } else {
+ /* The sigbus error is caused of hot removal. */
+ ret = pci_hotplug_failure_handler(&pdev->device);
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Failed to handle hot plug for "
+ "device %s", pdev->name);
+ ret = -1;
+ }
+ }
+ return ret;
+}
+
+static int
pci_plug(struct rte_device *dev)
{
return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev));
@@ -465,6 +513,7 @@ struct rte_pci_bus rte_pci_bus = {
.parse = pci_parse,
.get_iommu_class = rte_pci_get_iommu_class,
.hotplug_failure_handler = pci_hotplug_failure_handler,
+ .sigbus_handler = pci_sigbus_handler,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
--
2.7.4
[dpdk-dev] [PATCH V5 0/7] hot plug failure handle mechanism
As we know, hot plug is an importance feature, either use for the datacenter device’s fail-safe, or use for SRIOV Live Migration in SDN/NFV. It could bring the higher flexibility and continuality to the networking services in multiple use cases in industry. So let we see, dpdk as an importance networking framework, what can it help to implement hot plug solution for users. We already have a general device event detect mechanism, failsafe driver, bonding driver and hot plug/unplug api in framework, app could use these to develop their hot plug solution. let’s see the case of hot unplug, it can happen when a hardware device is be removed physically, or when the software disables it. App need to call ether dev API to detach the device, to unplug the device at the bus level and make access to the device invalid. But the problem is that, the removal of the device from the software lists is not going to be instantaneous, at this time if the data(fast) path still read/write the device, it will cause MMIO error and result of the app crash out. Seems that we have got fail-safe driver(or app) + RTE_ETH_EVENT_INTR_RMV + kernel core driver solution to handle it, but still not have failsafe driver (or app) + RTE_DEV_EVENT_REMOVE + PCIe pmd driver failure handle solution. So there is an absence in dpdk hot plug solution right now. Also, we know that kernel only guaranty hot plug on the kernel side, but not for the user mode side. Firstly we can hardly have a gatekeeper for any MMIO for multiple PMD driver. Secondly, no more specific 3rd tools such as udev/driverctl have especially cover these hot plug failure processing. Third, the feasibility of app’s implement for multiple user mode PMD driver is still a problem. Here, a general hot plug failure handle mechanism in dpdk framework would be proposed, it aim to guaranty that, when hot unplug occur, the system will not crash and app will not be break out, and user space can normally stop and release any relevant resources, then unplug of the device at the bus level cleanly. The mechanism should be come across as bellow: Firstly, app enabled the device event monitor and register the hot plug event’s callback before running data path. Once the hot unplug behave occur, the mechanism will detect the removal event and then accordingly do the failure handle. In order to do that, below functional will be bring in. - Add a new bus ops “handle_hot_unplug” to handle bus read/write error, it is bus-specific and each kind of bus can implement its own logic. - Implement pci bus specific ops “pci_handle_hot_unplug”. It will base on the failure address to remap memory for the corresponding device that unplugged. For the data path or other unexpected control from the control path when hot unplug occur. - Implement a new sigbus handler, it is registered when start device even monitoring. The handler is per process. Base on the signal event principle, control path thread and data path thread will randomly receive the sigbus error, but will go to the common sigbus handler. Once the MMIO sigbus error exposure, it will trigger the above hot unplug operation. The sigbus will be check if it is cause of the hot unplug or not, if not will info exception as the original sigbus handler. If yes, will do memory remapping. For the control path and the igb uio release: - When hot unplug device, the kernel will release the device resource in the kernel side, such as the fd sys file will disappear, and the irq will be released. At this time, if igb uio driver still try to release this resource, it will cause kernel crash. On the other hand, something like interrupt disable do not automatically process in kernel side. If not handler it, this redundancy and dirty thing will affect the interrupt resource be used by other device. So the igb_uio driver have to check the hot plug status and corresponding process should be taken in igb uio deriver. This patch propose to add structure of rte_udev_state into rte_uio_pci_dev of igb_uio kernel driver, which will record the state of uio device, such as probed/opened/released/removed/unplug. When detect the unexpected removal which cause of hot unplug behavior, it will corresponding disable interrupt resource, while for the part of releasement which kernel have already handle, just skip it to avoid double free or null pointer kernel crash issue. The mechanism could be use for fail-safe driver and app which want to use hot plug solution. let testpmd for example: - Enable device event monitor->device unplug->failure handle->stop forwarding-> stop port->close port->detach port. This process will not breaking the app/fail-safe running, and will not break other irrelevance device. And app could plug in the device and restart the date path again by below. - Device plug in->bind igb_uio driver ->attached device->start port-> start forwarding. patchset history: v5->v4: split patches to
[dpdk-dev] [PATCH V5 2/7] bus/pci: implement hotplug failure handler ops
This patch implements the ops of hotplug failure handler for PCI bus,
it is functional to remap a new dummy memory which overlap to the
failure memory to avoid MMIO read/write error.
Signed-off-by: Jeff Guo
---
v5->v4:
refine log and commit log
---
drivers/bus/pci/pci_common.c | 28
drivers/bus/pci/pci_common_uio.c | 33 +
drivers/bus/pci/private.h| 12
3 files changed, 73 insertions(+)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 94b0f41..bc3bcac 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -408,6 +408,33 @@ pci_find_device(const struct rte_device *start,
rte_dev_cmp_t cmp,
}
static int
+pci_hotplug_failure_handler(struct rte_device *dev)
+{
+ struct rte_pci_device *pdev = NULL;
+ int ret = 0;
+
+ pdev = RTE_DEV_TO_PCI(dev);
+ if (!pdev)
+ return -1;
+
+ switch (pdev->kdrv) {
+ case RTE_KDRV_IGB_UIO:
+ case RTE_KDRV_UIO_GENERIC:
+ case RTE_KDRV_NIC_UIO:
+ /* mmio resources is invalid, remap it to be safe. */
+ ret = pci_uio_remap_resource(pdev);
+ break;
+ default:
+ RTE_LOG(DEBUG, EAL,
+ "Not managed by a supported kernel driver, skipped\n");
+ ret = -1;
+ break;
+ }
+
+ return ret;
+}
+
+static int
pci_plug(struct rte_device *dev)
{
return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev));
@@ -437,6 +464,7 @@ struct rte_pci_bus rte_pci_bus = {
.unplug = pci_unplug,
.parse = pci_parse,
.get_iommu_class = rte_pci_get_iommu_class,
+ .hotplug_failure_handler = pci_hotplug_failure_handler,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c
index 54bc20b..7ea73db 100644
--- a/drivers/bus/pci/pci_common_uio.c
+++ b/drivers/bus/pci/pci_common_uio.c
@@ -146,6 +146,39 @@ pci_uio_unmap(struct mapped_pci_resource *uio_res)
}
}
+/* remap the PCI resource of a PCI device in anonymous virtual memory */
+int
+pci_uio_remap_resource(struct rte_pci_device *dev)
+{
+ int i;
+ void *map_address;
+
+ if (dev == NULL)
+ return -1;
+
+ /* Remap all BARs */
+ for (i = 0; i != PCI_MAX_RESOURCE; i++) {
+ /* skip empty BAR */
+ if (dev->mem_resource[i].phys_addr == 0)
+ continue;
+ map_address = mmap(dev->mem_resource[i].addr,
+ (size_t)dev->mem_resource[i].len,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+ if (map_address == MAP_FAILED) {
+ RTE_LOG(ERR, EAL,
+ "Cannot remap resource for device %s\n",
+ dev->name);
+ return -1;
+ }
+ RTE_LOG(INFO, EAL,
+ "Successful remap resource for device %s\n",
+ dev->name);
+ }
+
+ return 0;
+}
+
static struct mapped_pci_resource *
pci_uio_find_resource(struct rte_pci_device *dev)
{
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index 8ddd03e..6b312e5 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -123,6 +123,18 @@ void pci_uio_free_resource(struct rte_pci_device *dev,
struct mapped_pci_resource *uio_res);
/**
+ * Remap the PCI resource of a PCI device in anonymous virtual memory.
+ *
+ * @param dev
+ * Point to the struct rte pci device.
+ * @return
+ * - On success, zero.
+ * - On failure, a negative value.
+ */
+int
+pci_uio_remap_resource(struct rte_pci_device *dev);
+
+/**
* Map device memory to uio resource
*
* This function is private to EAL.
--
2.7.4
[dpdk-dev] [PATCH V5 5/7] bus: add helper to handle sigbus
This patch aim to add a helper to iterate all buses to find the
corresponding bus to handle the sigbus error.
Signed-off-by: Jeff Guo
---
v5->v4:
refine the errno restore logic
---
lib/librte_eal/common/eal_common_bus.c | 36 +-
lib/librte_eal/common/eal_private.h| 12
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_bus.c
b/lib/librte_eal/common/eal_common_bus.c
index 0943851..c9f3566 100644
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include "eal_private.h"
@@ -220,7 +221,6 @@ rte_bus_find_by_device_name(const char *str)
return rte_bus_find(NULL, bus_can_parse, name);
}
-
/*
* Get iommu class of devices on the bus.
*/
@@ -242,3 +242,37 @@ rte_bus_get_iommu_class(void)
}
return mode;
}
+
+static int
+bus_handle_sigbus(const struct rte_bus *bus,
+ const void *failure_addr)
+{
+ int ret;
+
+ ret = bus->sigbus_handler(failure_addr);
+ rte_errno = ret;
+
+ return !(bus->sigbus_handler && ret <= 0);
+}
+
+int
+rte_bus_sigbus_handler(const void *failure_addr)
+{
+ struct rte_bus *bus;
+
+ int ret = 0;
+ int old_errno = rte_errno;
+ rte_errno = 0;
+
+ bus = rte_bus_find(NULL, bus_handle_sigbus, failure_addr);
+ /* failed to handle the sigbus, pass the new errno. */
+ if (bus && rte_errno == -1)
+ return -1;
+ else if (!bus)
+ ret = 1;
+
+ /* otherwise restore the old errno. */
+ rte_errno = old_errno;
+
+ return ret;
+}
diff --git a/lib/librte_eal/common/eal_private.h
b/lib/librte_eal/common/eal_private.h
index bdadc4d..a91c4b5 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -258,4 +258,16 @@ int rte_mp_channel_init(void);
*/
void dev_callback_process(char *device_name, enum rte_dev_event_type event);
+
+/**
+ * Iterate all buses to find the corresponding bus, to handle the sigbus error.
+ * @param failure_addr
+ * Pointer of the fault address of the sigbus error.
+ *
+ * @return
+ * 0 success to handle the sigbus.
+ * -1 failed to handle the sigbus
+ * 1 no bus can handler the sigbus
+ */
+int rte_bus_sigbus_handler(const void *failure_addr);
#endif /* _EAL_PRIVATE_H_ */
--
2.7.4
[dpdk-dev] [PATCH V5 3/7] bus: add sigbus handler
When device be hotplug out, if data path still read/write device, the
sigbus error will occur, this error need to be handled. So a handler
need to be here to capture the signal and handle it correspondingly.
This patch introduces a bus ops to handle sigbus error, it is a bus
specific behavior,so that each kind of bus can implement its own logic
case by case.
Signed-off-by: Jeff Guo
---
v5->v4:
refine log and commit log
---
lib/librte_eal/common/include/rte_bus.h | 16
1 file changed, 16 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_bus.h
b/lib/librte_eal/common/include/rte_bus.h
index 8a993cf..d753575 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -181,6 +181,20 @@ typedef int (*rte_bus_parse_t)(const char *name, void
*addr);
typedef int (*rte_bus_hotplug_failure_handler_t)(struct rte_device *dev);
/**
+ * Implementation a specific sigbus handler, which is responsible
+ * for handle the sigbus error which is original memory error, or specific
+ * memory error that caused of hot unplug.
+ * @param failure_addr
+ * Pointer of the fault address of the sigbus error.
+ *
+ * @return
+ * 0 for success handle the sigbus.
+ * 1 for no bus handle the sigbus.
+ * -1 for failed to handle the sigbus
+ */
+typedef int (*rte_bus_sigbus_handler_t)(const void *failure_addr);
+
+/**
* Bus scan policies
*/
enum rte_bus_scan_mode {
@@ -226,6 +240,8 @@ struct rte_bus {
rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class */
rte_bus_hotplug_failure_handler_t hotplug_failure_handler;
/**< handle hotplug failure on bus */
+ rte_bus_sigbus_handler_t sigbus_handler; /**< handle sigbus error */
+
};
/**
--
2.7.4
[dpdk-dev] [PATCH V5 6/7] eal: add failure handle mechanism for hotplug
This patch introduces a failure handler mechanism to handle device
hot plug removal event.
First register sigbus handler, once sigbus error be captured, will
check the failure address and accordingly remap the invalid memory
for the corresponding device. Bese on this mechanism, it could
guaranty the application not to be crash when hotplug out device.
Signed-off-by: Jeff Guo
---
v5->v4:
add sigbus old handler recover.
---
lib/librte_eal/linuxapp/eal/eal_dev.c | 111 +-
1 file changed, 110 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_dev.c
b/lib/librte_eal/linuxapp/eal/eal_dev.c
index 1cf6aeb..a22cb9a 100644
--- a/lib/librte_eal/linuxapp/eal/eal_dev.c
+++ b/lib/librte_eal/linuxapp/eal/eal_dev.c
@@ -4,6 +4,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -14,15 +16,28 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include "eal_private.h"
static struct rte_intr_handle intr_handle = {.fd = -1 };
static bool monitor_started;
+extern struct rte_bus_list rte_bus_list;
+
#define EAL_UEV_MSG_LEN 4096
#define EAL_UEV_MSG_ELEM_LEN 128
+/* spinlock for device failure process */
+static rte_spinlock_t dev_failure_lock = RTE_SPINLOCK_INITIALIZER;
+
+static struct sigaction sigbus_action_old;
+
+static int sigbus_need_recover;
+
static void dev_uev_handler(__rte_unused void *param);
/* identify the system layer which reports this event. */
@@ -33,6 +48,49 @@ enum eal_dev_event_subsystem {
EAL_DEV_EVENT_SUBSYSTEM_MAX
};
+static void
+sigbus_action_recover(void)
+{
+ if (sigbus_need_recover) {
+ sigaction(SIGBUS, &sigbus_action_old, NULL);
+ sigbus_need_recover = 0;
+ }
+}
+
+static void sigbus_handler(int signum, siginfo_t *info,
+ void *ctx __rte_unused)
+{
+ int ret;
+
+ RTE_LOG(INFO, EAL, "Thread[%d] catch SIGBUS, fault address:%p\n",
+ (int)pthread_self(), info->si_addr);
+
+ rte_spinlock_lock(&dev_failure_lock);
+ ret = rte_bus_sigbus_handler(info->si_addr);
+ rte_spinlock_unlock(&dev_failure_lock);
+ if (ret == -1) {
+ rte_exit(EXIT_FAILURE,
+"Failed to handle SIGBUS for hotplug, "
+"(rte_errno: %s)!", strerror(rte_errno));
+ } else if (ret == 1) {
+ if (sigbus_action_old.sa_handler)
+ (*(sigbus_action_old.sa_handler))(signum);
+ else
+ rte_exit(EXIT_FAILURE,
+"Failed to handle generic SIGBUS!");
+ }
+
+ RTE_LOG(INFO, EAL, "Success to handle SIGBUS for hotplug!\n");
+}
+
+static int cmp_dev_name(const struct rte_device *dev,
+ const void *_name)
+{
+ const char *name = _name;
+
+ return strcmp(dev->name, name);
+}
+
static int
dev_uev_socket_fd_create(void)
{
@@ -147,6 +205,9 @@ dev_uev_handler(__rte_unused void *param)
struct rte_dev_event uevent;
int ret;
char buf[EAL_UEV_MSG_LEN];
+ struct rte_bus *bus;
+ struct rte_device *dev;
+ const char *busname;
memset(&uevent, 0, sizeof(struct rte_dev_event));
memset(buf, 0, EAL_UEV_MSG_LEN);
@@ -171,13 +232,50 @@ dev_uev_handler(__rte_unused void *param)
RTE_LOG(DEBUG, EAL, "receive uevent(name:%s, type:%d, subsystem:%d)\n",
uevent.devname, uevent.type, uevent.subsystem);
- if (uevent.devname)
+ switch (uevent.subsystem) {
+ case EAL_DEV_EVENT_SUBSYSTEM_PCI:
+ case EAL_DEV_EVENT_SUBSYSTEM_UIO:
+ busname = "pci";
+ break;
+ default:
+ break;
+ }
+
+ if (uevent.devname) {
+ if (uevent.type == RTE_DEV_EVENT_REMOVE) {
+ rte_spinlock_lock(&dev_failure_lock);
+ bus = rte_bus_find_by_name(busname);
+ if (bus == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot find bus (%s)\n",
+ busname);
+ return;
+ }
+
+ dev = bus->find_device(NULL, cmp_dev_name,
+ uevent.devname);
+ if (dev == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot find device (%s) on "
+ "bus (%s)\n", uevent.devname, busname);
+ return;
+ }
+
+ ret = bus->hotplug_failure_handler(dev);
+ rte_spinlock_unlock(&dev_failure_lock);
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Can not handle hotplug for "
+ "device (%s)\n", dev->name);
+ return;
+
Re: [dpdk-dev] [PATCH V4 8/9] app/testpmd: show example to handle hot unplug
On 7/4/2018 3:06 PM, Matan Azrad wrote: Hi Thomas, Guo From: Thomas Monjalon 03/07/2018 11:35, Guo, Jia: On 7/1/2018 3:46 PM, Matan Azrad wrote: From: Jeff Guo --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2206,9 +2209,12 @@ eth_dev_event_callback(char *device_name, enum rte_dev_event_type type, case RTE_DEV_EVENT_REMOVE: RTE_LOG(ERR, EAL, "The device: %s has been removed!\n", device_name); - /* TODO: After finish failure handle, begin to stop -* packet forward, stop port, close port, detach port. -*/ + ret = rte_eth_dev_get_port_by_name(device_name, &port_id); As you probably know, 1 rte_device may be associated to more than one ethdev ports, so the ethdev port name can be different from rte_device name. Looks like we need a new ethdev API to get all the ports associated to one rte_device. agree, seems that the the old ethdev API have some issue when got all port by device name. we could check with ethdev maintainer and fix it by specific ethdev patch later. This ethdev function could return an error if several ports match. Just to clarify: The ethdev name may be different from the rte_device name of a port, The rte_eth_dev_get_port_by_name() searches the ethdev name and not the rte_device name. Ideally, we should not use this function at all. If you want to manage an ethdev port, why are you using an EAL event? There is an ethdev callback mechanism for port removal. So, looks like the EAL event should trigger an ethdev event for all the ports associated to this rte_device. I think that the best one to do it is the PMD, so maybe the PMD(which wants to support hot unplug) should register to the EAL event and to trigger an ethdev RMV event from the EAL callback. What do you think? i think matan give an constructive option to combine the usage of eal event and ethdev event, but i am not sure which is the best one. So let this discuss on going, i will remove this 8/9 and 9/9 patches, let the patch set focus on the hotplug failure mechanism , and will use another patch set to cover the event management example in testpmd.
Re: [dpdk-dev] [PATCH v3 2/4] doc: rename compress feature flag
> -Original Message- > From: De Lara Guarch, Pablo > Sent: Wednesday, July 4, 2018 3:11 PM > To: shally.ve...@caviumnetworks.com; ashish.gu...@caviumnetworks.com; Trahe, > Fiona > ; Daly, Lee > Cc: dev@dpdk.org; De Lara Guarch, Pablo > Subject: [PATCH v3 2/4] doc: rename compress feature flag > > Renamed feature "Bypass" to "Pass-through", > as it is a more explicit name, meaning that the PMD > is capable of passing the mbufs through it, > without making any modifications (i.e.. NULL algorithm). > > Signed-off-by: Pablo de Lara Acked-by: Fiona Trahe
Re: [dpdk-dev] [PATCH v3 1/4] doc: cleanup ISA-L PMD feature matrix
> -Original Message- > From: De Lara Guarch, Pablo > Sent: Wednesday, July 4, 2018 3:11 PM > To: shally.ve...@caviumnetworks.com; > ashish.gu...@caviumnetworks.com; Trahe, Fiona ; > Daly, Lee > Cc: dev@dpdk.org; De Lara Guarch, Pablo > Subject: [PATCH v3 1/4] doc: cleanup ISA-L PMD feature matrix > > In PMD feature matrices (.ini files), it is not required to have the list of > features that are not supported, just the ones that are. > > Signed-off-by: Pablo de Lara > --- > doc/guides/compressdevs/features/isal.ini | 8 > 1 file changed, 8 deletions(-) > > diff --git a/doc/guides/compressdevs/features/isal.ini > b/doc/guides/compressdevs/features/isal.ini > index ad2718df0..1d4ff1c41 100644 > --- a/doc/guides/compressdevs/features/isal.ini > +++ b/doc/guides/compressdevs/features/isal.ini > @@ -9,14 +9,6 @@ CPU SSE= Y > CPU AVX= Y > CPU AVX2 = Y > CPU AVX512 = Y > -CPU NEON = > -Stateful = > -By-Pass= > -Chained mbufs = > Deflate= Y > -LZS= > -Adler32= > -Crc32 = > -Adler32&Crc32 = > Fixed = Y > Dynamic= Y > -- > 2.14.4 Acked-by: Lee Daly
Re: [dpdk-dev] [PATCH v3 4/4] compressdev: add huffman encoding flags
>-Original Message-
>From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com]
>Sent: 04 July 2018 19:41
>To: Verma, Shally ; Gupta, Ashish
>; fiona.tr...@intel.com;
>lee.d...@intel.com
>Cc: dev@dpdk.org; Pablo de Lara
>Subject: [PATCH v3 4/4] compressdev: add huffman encoding flags
>
>External Email
>
>Added Huffman fixed and dynamic encoding feature flags,
>so an application can query if a device supports
>these two types, when performing DEFLATE compression.
>
>Signed-off-by: Pablo de Lara
>Acked-by: Fiona Trahe
>---
>
>Changes in v3:
>
>- No change
>
>Changes in v2:
>
>- Fixed typo
>
> drivers/compress/isal/isal_compress_pmd_ops.c | 4 +++-
> lib/librte_compressdev/rte_comp.c | 4
> lib/librte_compressdev/rte_comp.h | 4
> test/test/test_compressdev.c | 16
> 4 files changed, 27 insertions(+), 1 deletion(-)
>
//snip
>diff --git a/lib/librte_compressdev/rte_comp.c
>b/lib/librte_compressdev/rte_comp.c
>index f5bd3a6c0..5ed1d0daa 100644
>--- a/lib/librte_compressdev/rte_comp.c
>+++ b/lib/librte_compressdev/rte_comp.c
>@@ -36,6 +36,10 @@ rte_comp_get_feature_name(uint64_t flag)
>return "SHA2_SHA256_HASH";
>case RTE_COMP_FF_SHAREABLE_PRIV_XFORM:
>return "SHAREABLE_PRIV_XFORM";
>+ case RTE_COMP_FF_HUFFMAN_FIXED:
>+ return "HUFFMAN_FIXED";
>+ case RTE_COMP_FF_HUFFMAN_DYNAMIC:
>+ return "HUFFMAN_DYNAMIC";
>default:
>return NULL;
>}
>diff --git a/lib/librte_compressdev/rte_comp.h
>b/lib/librte_compressdev/rte_comp.h
>index 6660cee82..c9245cce1 100644
>--- a/lib/librte_compressdev/rte_comp.h
>+++ b/lib/librte_compressdev/rte_comp.h
>@@ -62,6 +62,10 @@ extern "C" {
> * to create as many priv_xforms as it expects to have stateless
> * operations in-flight.
> */
>+#define RTE_COMP_FF_HUFFMAN_FIXED (1ULL << 13)
>+/**< Fixed huffman encoding is supported */
>+#define RTE_COMP_FF_HUFFMAN_DYNAMIC(1ULL << 14)
>+/**< Dynamic huffman encoding is supported */
>
[Shally] As such okay to have this feature. But while looking at this, got a
question:
rte_compressdev_info_get() returns feature flags of type RTE_COMPDEV_FF_xxx
and, rte_compressdev_capability_get() returns PMD capability for specific algo
using feature flags of type RTE_COMP_FF_xxx. So,
1. should rte_compressdev_capability_get() and "struct
rte_compressdev_capabilities" be changed to
rte_compressdev_comp_capability_get() or rte_compressdev_algo_capability_get()?
2. where does RTE_COMPDEV_FF_HW_ACCELERATED be set? in dev_info->feature flag
or capability->feature_flag?
What if PMD support hw acceleration of one algo but have sw support of another.
(say, deflate HW accelerated and LZS sw?)
Thanks
Shally
> /** Status of comp operation */
> enum rte_comp_op_status {
>diff --git a/test/test/test_compressdev.c b/test/test/test_compressdev.c
>index 640942bac..f960963a4 100644
>--- a/test/test/test_compressdev.c
>+++ b/test/test/test_compressdev.c
>@@ -846,6 +846,14 @@ test_compressdev_deflate_stateless_fixed(void)
>const char *test_buffer;
>uint16_t i;
>int ret;
>+ const struct rte_compressdev_capabilities *capab;
>+
>+ capab = rte_compressdev_capability_get(0, RTE_COMP_ALGO_DEFLATE);
>+ TEST_ASSERT(capab != NULL, "Failed to retrieve device capabilities");
>+
>+ if ((capab->comp_feature_flags & RTE_COMP_FF_HUFFMAN_FIXED) == 0)
>+ return -ENOTSUP;
>+
>struct rte_comp_xform *compress_xform =
>rte_malloc(NULL, sizeof(struct rte_comp_xform), 0);
>
>@@ -905,6 +913,14 @@ test_compressdev_deflate_stateless_dynamic(void)
>struct rte_comp_xform *compress_xform =
>rte_malloc(NULL, sizeof(struct rte_comp_xform), 0);
>
>+ const struct rte_compressdev_capabilities *capab;
>+
>+ capab = rte_compressdev_capability_get(0, RTE_COMP_ALGO_DEFLATE);
>+ TEST_ASSERT(capab != NULL, "Failed to retrieve device capabilities");
>+
>+ if ((capab->comp_feature_flags & RTE_COMP_FF_HUFFMAN_DYNAMIC) == 0)
>+ return -ENOTSUP;
>+
>if (compress_xform == NULL) {
>RTE_LOG(ERR, USER1,
>"Compress xform could not be created\n");
>--
>2.14.4
Re: [dpdk-dev] [dpdk-stable] [PATCH 1/2] doc: fixes the limitations for dpaa sec
> -Original Message-
> From: stable [mailto:stable-boun...@dpdk.org] On Behalf Of Akhil Goyal
> Sent: Thursday, June 21, 2018 3:23 PM
> To: Hemant Agrawal ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 1/2] doc: fixes the limitations
> for
> dpaa sec
>
>
>
> On 6/21/2018 2:43 PM, Hemant Agrawal wrote:
> > Fixes: a74af788c632 ("crypto/dpaa_sec: support scatter gather")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Hemant Agrawal
> > ---
>
> Acked-by: Akhil Goyal
Applied to dpdk-next-crypto.
Thanks,
Pablo
Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] doc: fixes the limitations for dpaa2 sec
> -Original Message-
> From: stable [mailto:stable-boun...@dpdk.org] On Behalf Of Akhil Goyal
> Sent: Thursday, June 21, 2018 3:22 PM
> To: Hemant Agrawal ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 2/2] doc: fixes the limitations
> for
> dpaa2 sec
>
>
>
> On 6/21/2018 2:43 PM, Hemant Agrawal wrote:
> > Fixes: 37f96eb01bce ("crypto/dpaa2_sec: support scatter gather")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Hemant Agrawal
> > ---
> >
> Acked-by: Akhil Goyal
Applied to dpdk-next-crypto.
Thanks,
Pablo
Re: [dpdk-dev] [PATCH v6] examples: fix RSS hash function configuration
-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Ferruh Yigit
Sent: Thursday, July 5, 2018 4:02 AM
To: Jerin Jacob ; Lu, Wenzhuo
; Wu, Jingjing ; Iremonger,
Bernard ; Doherty, Declan
; Chas Williams ; Richardson, Bruce
; Hunt, David ; Van Haaren,
Harry ; Dumitrescu, Cristian
; Ananyev, Konstantin
; Horton, Remy ; Ori Kam
; De Lara Guarch, Pablo ;
Nicolau, Radu ; Akhil Goyal ;
Kantecki, Tomasz ; Burakov, Anatoly
; Mcnamara, John ; Li,
Xiaoyun ; Thomas Monjalon ; Andrew
Rybchenko
Cc: dev@dpdk.org; Yigit, Ferruh ; Ma, Liang J
; Xueming Li ; Pavan Nikhilesh
Subject: [dpdk-dev] [PATCH v6] examples: fix RSS hash function configuration
ethdev layer introduced checks for application requested RSS hash functions and
returns error for ones unsupported by hardware
This check breaks some sample applications which blindly configures RSS hash
functions without checking underlying hardware support.
Updated examples to mask out unsupported RSS has functions during device
configuration.
Prints a log if configuration values updated by this check.
Fixes: aa1a6d87f15d ("ethdev: force RSS offload rules again")
Signed-off-by: Ferruh Yigit
Tested-by: Zhao meijuan< meijuanx.z...@intel.com >;Han yingya<
yingyax@intel.com >
Re: [dpdk-dev] [PATCH] security: change to SPDX license tags
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Hemant Agrawal > Sent: Wednesday, July 4, 2018 8:51 AM > To: Nicolau, Radu ; akhil.go...@nxp.com; Doherty, > Declan > Cc: dev@dpdk.org > Subject: [dpdk-dev] [PATCH] security: change to SPDX license tags > > Signed-off-by: Hemant Agrawal Acked-by: Pablo de Lara
[dpdk-dev] [PATCH V5 0/7] hot plug failure handle mechanism
As we know, hot plug is an importance feature, either use for the datacenter device’s fail-safe, or use for SRIOV Live Migration in SDN/NFV. It could bring the higher flexibility and continuality to the networking services in multiple use cases in industry. So let we see, dpdk as an importance networking framework, what can it help to implement hot plug solution for users. We already have a general device event detect mechanism, failsafe driver, bonding driver and hot plug/unplug api in framework, app could use these to develop their hot plug solution. let’s see the case of hot unplug, it can happen when a hardware device is be removed physically, or when the software disables it. App need to call ether dev API to detach the device, to unplug the device at the bus level and make access to the device invalid. But the problem is that, the removal of the device from the software lists is not going to be instantaneous, at this time if the data(fast) path still read/write the device, it will cause MMIO error and result of the app crash out. Seems that we have got fail-safe driver(or app) + RTE_ETH_EVENT_INTR_RMV + kernel core driver solution to handle it, but still not have failsafe driver (or app) + RTE_DEV_EVENT_REMOVE + PCIe pmd driver failure handle solution. So there is an absence in dpdk hot plug solution right now. Also, we know that kernel only guaranty hot plug on the kernel side, but not for the user mode side. Firstly we can hardly have a gatekeeper for any MMIO for multiple PMD driver. Secondly, no more specific 3rd tools such as udev/driverctl have especially cover these hot plug failure processing. Third, the feasibility of app’s implement for multiple user mode PMD driver is still a problem. Here, a general hot plug failure handle mechanism in dpdk framework would be proposed, it aim to guaranty that, when hot unplug occur, the system will not crash and app will not be break out, and user space can normally stop and release any relevant resources, then unplug of the device at the bus level cleanly. The mechanism should be come across as bellow: Firstly, app enabled the device event monitor and register the hot plug event’s callback before running data path. Once the hot unplug behave occur, the mechanism will detect the removal event and then accordingly do the failure handle. In order to do that, below functional will be bring in. - Add a new bus ops “handle_hot_unplug” to handle bus read/write error, it is bus-specific and each kind of bus can implement its own logic. - Implement pci bus specific ops “pci_handle_hot_unplug”. It will base on the failure address to remap memory for the corresponding device that unplugged. For the data path or other unexpected control from the control path when hot unplug occur. - Implement a new sigbus handler, it is registered when start device even monitoring. The handler is per process. Base on the signal event principle, control path thread and data path thread will randomly receive the sigbus error, but will go to the common sigbus handler. Once the MMIO sigbus error exposure, it will trigger the above hot unplug operation. The sigbus will be check if it is cause of the hot unplug or not, if not will info exception as the original sigbus handler. If yes, will do memory remapping. For the control path and the igb uio release: - When hot unplug device, the kernel will release the device resource in the kernel side, such as the fd sys file will disappear, and the irq will be released. At this time, if igb uio driver still try to release this resource, it will cause kernel crash. On the other hand, something like interrupt disable do not automatically process in kernel side. If not handler it, this redundancy and dirty thing will affect the interrupt resource be used by other device. So the igb_uio driver have to check the hot plug status and corresponding process should be taken in igb uio deriver. This patch propose to add structure of rte_udev_state into rte_uio_pci_dev of igb_uio kernel driver, which will record the state of uio device, such as probed/opened/released/removed/unplug. When detect the unexpected removal which cause of hot unplug behavior, it will corresponding disable interrupt resource, while for the part of releasement which kernel have already handle, just skip it to avoid double free or null pointer kernel crash issue. The mechanism could be use for fail-safe driver and app which want to use hot plug solution. let testpmd for example: - Enable device event monitor->device unplug->failure handle->stop forwarding-> stop port->close port->detach port. This process will not breaking the app/fail-safe running, and will not break other irrelevance device. And app could plug in the device and restart the date path again by below. - Device plug in->bind igb_uio driver ->attached device->start port-> start forwarding. patchset history: v5->v4: split patches to
[dpdk-dev] [PATCH V5 7/7] igb_uio: fix uio release issue when hot unplug
When hotplug out device, the kernel will release the device resource in the
kernel side, such as the fd sys file will disappear, and the irq will be
released. At this time, if igb uio driver still try to release this
resource, it will cause kernel crash. On the other hand, something like
interrupt disabling do not automatically process in kernel side. If not
handler it, this redundancy and dirty thing will affect the interrupt
resource be used by other device. So the igb_uio driver have to check the
hotplug status, and the corresponding process should be taken in igb uio
driver.
This patch propose to add structure of rte_udev_state into rte_uio_pci_dev
of igb_uio kernel driver, which will record the state of uio device, such
as probed/opened/released/removed/unplug. When detect the unexpected
removal which cause of hotplug out behavior, it will corresponding disable
interrupt resource, while for the part of releasement which kernel have
already handle, just skip it to avoid double free or null pointer kernel
crash issue.
Signed-off-by: Jeff Guo
---
v5->v4:
add lock for udev state
---
kernel/linux/igb_uio/igb_uio.c | 51 +++---
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/kernel/linux/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c
index 3398eac..adc8cea 100644
--- a/kernel/linux/igb_uio/igb_uio.c
+++ b/kernel/linux/igb_uio/igb_uio.c
@@ -19,6 +19,15 @@
#include "compat.h"
+/* uio pci device state */
+enum rte_udev_state {
+ RTE_UDEV_PROBED,
+ RTE_UDEV_OPENNED,
+ RTE_UDEV_RELEASED,
+ RTE_UDEV_REMOVED,
+ RTE_UDEV_UNPLUG
+};
+
/**
* A structure describing the private information for a uio device.
*/
@@ -28,6 +37,7 @@ struct rte_uio_pci_dev {
enum rte_intr_mode mode;
struct mutex lock;
int refcnt;
+ enum rte_udev_state state;
};
static int wc_activate;
@@ -195,12 +205,22 @@ igbuio_pci_irqhandler(int irq, void *dev_id)
{
struct rte_uio_pci_dev *udev = (struct rte_uio_pci_dev *)dev_id;
struct uio_info *info = &udev->info;
+ struct pci_dev *pdev = udev->pdev;
/* Legacy mode need to mask in hardware */
if (udev->mode == RTE_INTR_MODE_LEGACY &&
!pci_check_and_mask_intx(udev->pdev))
return IRQ_NONE;
+ mutex_lock(&udev->lock);
+ /* check the uevent of the kobj */
+ if ((&pdev->dev.kobj)->state_remove_uevent_sent == 1) {
+ dev_notice(&pdev->dev, "device:%s, sent remove uevent!\n",
+ (&pdev->dev.kobj)->name);
+ udev->state = RTE_UDEV_UNPLUG;
+ }
+ mutex_unlock(&udev->lock);
+
uio_event_notify(info);
/* Message signal mode, no share IRQ and automasked */
@@ -309,7 +329,6 @@ igbuio_pci_disable_interrupts(struct rte_uio_pci_dev *udev)
#endif
}
-
/**
* This gets called while opening uio device file.
*/
@@ -331,20 +350,29 @@ igbuio_pci_open(struct uio_info *info, struct inode
*inode)
/* enable interrupts */
err = igbuio_pci_enable_interrupts(udev);
- mutex_unlock(&udev->lock);
if (err) {
dev_err(&dev->dev, "Enable interrupt fails\n");
+ pci_clear_master(dev);
+ mutex_unlock(&udev->lock);
return err;
}
+ udev->state = RTE_UDEV_OPENNED;
+ mutex_unlock(&udev->lock);
return 0;
}
+/**
+ * This gets called while closing uio device file.
+ */
static int
igbuio_pci_release(struct uio_info *info, struct inode *inode)
{
struct rte_uio_pci_dev *udev = info->priv;
struct pci_dev *dev = udev->pdev;
+ if (udev->state == RTE_UDEV_REMOVED)
+ return 0;
+
mutex_lock(&udev->lock);
if (--udev->refcnt > 0) {
mutex_unlock(&udev->lock);
@@ -356,7 +384,7 @@ igbuio_pci_release(struct uio_info *info, struct inode
*inode)
/* stop the device from further DMA */
pci_clear_master(dev);
-
+ udev->state = RTE_UDEV_RELEASED;
mutex_unlock(&udev->lock);
return 0;
}
@@ -562,6 +590,9 @@ igbuio_pci_probe(struct pci_dev *dev, const struct
pci_device_id *id)
(unsigned long long)map_dma_addr, map_addr);
}
+ mutex_lock(&udev->lock);
+ udev->state = RTE_UDEV_PROBED;
+ mutex_unlock(&udev->lock);
return 0;
fail_remove_group:
@@ -579,6 +610,20 @@ static void
igbuio_pci_remove(struct pci_dev *dev)
{
struct rte_uio_pci_dev *udev = pci_get_drvdata(dev);
+ int ret;
+
+ /* handler hot unplug */
+ if (udev->state == RTE_UDEV_OPENNED ||
+ udev->state == RTE_UDEV_UNPLUG) {
+ dev_notice(&dev->dev, "Unexpected removal!\n");
+ ret = igbuio_pci_release(&udev->info, NULL);
+ if (ret)
+ return;
+ mutex_lock(&udev->lock);
+ udev->state = RTE_UDE
Re: [dpdk-dev] [PATCH V4 1/9] bus: introduce hotplug failure handler
05/07/2018 08:23, Guo, Jia:
>
> On 7/4/2018 3:55 PM, Thomas Monjalon wrote:
> > 04/07/2018 09:16, Guo, Jia:
> >> On 7/4/2018 6:21 AM, Thomas Monjalon wrote:
> >>> 29/06/2018 12:30, Jeff Guo:
> /**
> + * Implementation a specific hot plug handler, which is responsible
> + * for handle the failure when hot remove the device, guaranty the
> system
> + * would not crash in the case.
> + * @param dev
> + * Pointer of the device structure.
> + *
> + * @return
> + * 0 on success.
> + * !0 on error.
> + */
> +typedef int (*rte_bus_hotplug_handler_t)(struct rte_device *dev);
> >>> [...]
> @@ -211,6 +224,8 @@ struct rte_bus {
> rte_bus_parse_t parse; /**< Parse a device name */
> struct rte_bus_conf conf;/**< Bus configuration */
> rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class
> */
> +rte_bus_hotplug_handler_t hotplug_handler;
> +/**< handle hot plug on
> bus */
> >>> The name is misleading.
> >>> It is to handle unplugging but is called "hotplug".
> >> ok, so i prefer hotplug_failure_handler than hot_unplug_handler, since
> >> it is more explicit for failure handle, and more clearly.
> >>
> >>> In order to demonstrate how the handler is used, you should
> >>> introduce the code using this handler in the same patch.
> >>>
> >> sorry, i check the history of rte_bus.h, and the way is introduce ops at
> >> first, second implement in specific bus, then come across the usage.
> >> I think that way clear and make sense. what do you think?
> >> Anyway, i will check the commit log if is there any misleading.
> > I think it is better to call ops when they are introduced,
> > and implement the ops in second step.
> >
>
> Hi, Thomas
>
> sorry but i want to detail the relationship of the ops and api as bellow
> to try if we can get the better sequence.
>
> Patch num:
>
> 1: introduce ops hotplug_failure_handler
>
> 2: implement ops hotplug_failure_handler
>
> 3:introduce ops sigbus_handler.
>
> 4:implement ops sigbus_handler
>
> 5: introduce helper rte_bus_sigbus_handler to call the ops sigbus_handler
>
> 6: introduce the mechanism to call helper rte_bus_sigbus_handler and
> call hotplug_failure_handler.
>
> If per you said , could I modify the sequence like 6->5->3->4->1->2? I
> don't think it will make sense, and might be more confused.
>
> And I think should be better that introduce each ops just say item, then
> when introduce the caller patch, the functional is ready to use by the
> patch.
>
>
> if i did not got your point and you have other better sequence about
> that please explicit to let me know. Thanks.
The main concern is to be able to understand each patch separately.
When introducing a new op, we need to understand how it will be used.
But actually, no need to change patch organization,
you just need to provide a clear doxygen documentation,
and introduce the context in the commit log.
Re: [dpdk-dev] [PATCH] security: change to SPDX license tags
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of De Lara Guarch, Pablo > Sent: Thursday, July 5, 2018 9:19 AM > To: Hemant Agrawal ; Nicolau, Radu > ; akhil.go...@nxp.com; Doherty, Declan > > Cc: dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH] security: change to SPDX license tags > > > > > -Original Message- > > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Hemant Agrawal > > Sent: Wednesday, July 4, 2018 8:51 AM > > To: Nicolau, Radu ; akhil.go...@nxp.com; > > Doherty, Declan > > Cc: dev@dpdk.org > > Subject: [dpdk-dev] [PATCH] security: change to SPDX license tags > > > > Signed-off-by: Hemant Agrawal > > Acked-by: Pablo de Lara Applied to dpdk-next-crypto. Thanks, Pablo
Re: [dpdk-dev] [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag
>-Original Message- >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com] >Sent: 04 July 2018 19:41 >To: Verma, Shally ; Gupta, Ashish >; fiona.tr...@intel.com; >lee.d...@intel.com >Cc: dev@dpdk.org; Pablo de Lara >Subject: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag > >External Email > >The current mbuf scatter gather feature flag is >too ambiguous, as it is not clear if input and/or output >buffers can be scatter gather mbufs or not. > >Therefore, three new flags will replace this flag: >- RTE_COMP_FF_OOP_SGL_IN_SGL_OUT >- RTE_COMP_FF_OOP_SGL_IN_FB_OUT >- RTE_COMP_FF_OOP_FB_IN_SGL_OUT > [Shally] Believe Out of place is default support on current compression API, so why do we need _OOP_ here? Thanks Shally >Note that out-of-place flat buffers is supported by default >and in-place is not supported by the library. > >Signed-off-by: Pablo de Lara >Acked-by: Fiona Trahe >--- > >Changes in v3: >- Replaced Out-of-place with OOP >- Added new feature flags in default.ini > >Changes in v2: >- Fixed typos >- Rephrased comments > > doc/guides/compressdevs/features/default.ini | 34 +++- > doc/guides/compressdevs/overview.rst | 14 > doc/guides/rel_notes/release_18_08.rst | 6 + > lib/librte_compressdev/rte_comp.c| 8 +-- > lib/librte_compressdev/rte_comp.h| 30 > 5 files changed, 64 insertions(+), 28 deletions(-) > >diff --git a/doc/guides/compressdevs/features/default.ini >b/doc/guides/compressdevs/features/default.ini >index a88414d23..003f3f3a5 100644 >--- a/doc/guides/compressdevs/features/default.ini >+++ b/doc/guides/compressdevs/features/default.ini >@@ -6,19 +6,21 @@ > ; the features table in the documentation. > ; > [Features] >-HW Accelerated = >-CPU SSE= >-CPU AVX= >-CPU AVX2 = >-CPU AVX512 = >-CPU NEON = >-Stateful = >-Pass-through = >-Chained mbufs = >-Deflate= >-LZS= >-Adler32= >-Crc32 = >-Adler32&Crc32 = >-Fixed = >-Dynamic= >+HW Accelerated = >+CPU SSE = >+CPU AVX = >+CPU AVX2= >+CPU AVX512 = >+CPU NEON= >+Stateful= >+Pass-through= >+OOP SGL In SGL Out = >+OOP SGL In FB Out = >+OOP FB In SGL Out = >+Deflate = >+LZS = >+Adler32 = >+Crc32 = >+Adler32&Crc32 = >+Fixed = >+Dynamic = >diff --git a/doc/guides/compressdevs/overview.rst >b/doc/guides/compressdevs/overview.rst >index b16c36fd6..68205c77d 100644 >--- a/doc/guides/compressdevs/overview.rst >+++ b/doc/guides/compressdevs/overview.rst >@@ -15,3 +15,17 @@ Supported Feature Flags > >- "Pass-through" feature flag refers to the ability of the PMD > to let mbufs pass-through it, without making any modifications to it. >+ >+ - "OOP SGL In SGL Out" feature flag stands for >+ "Out-of-place Scatter-gather list Input, Scatter-gater list Output", >+ which means that the input and output mbufs can consist of multiple >segments. >+ >+ - "OOP SGL In FB Out" feature flag stands for >+ "Out-of-place Scatter-gather list Input, Flat Buffers Output", >+ which means that the input mbuf can consist of multiple segments combined >+ with a single segment mbuf in the output. >+ >+ - "OOP FB In SGL Out" feature flag stands for >+ "Out-of-place Flat Buffers Input, Scatter-gather list Output", >+ which means that the output mbuf can consist of multiple segments >combined >+ with a single segment mbuf in the input. >diff --git a/doc/guides/rel_notes/release_18_08.rst >b/doc/guides/rel_notes/release_18_08.rst >index bc0124295..4ae37cb3b 100644 >--- a/doc/guides/rel_notes/release_18_08.rst >+++ b/doc/guides/rel_notes/release_18_08.rst >@@ -60,6 +60,12 @@ API Changes >Also, make sure to start the actual text at the margin. >= > >+* compressdev: Feature flag ``RTE_COMP_FF_MBUF_SCATTER_GATHER`` is >+ replaced with the following more explicit flags: >+ - ``RTE_COMP_FF_OOP_SGL_IN_SGL_OUT`` >+ - ``RTE_COMP_FF_OOP_SGL_IN_FB_OUT`` >+ - ``RTE_COMP_FF_OOP_FB_IN_SGL_OUT`` >+ > > ABI Changes > --- >diff --git a/lib/librte_compressdev/rte_comp.c >b/lib/librte_compressdev/rte_comp.c >index d596ba872..f5bd3a6c0 100644 >--- a/lib/librte_compressdev/rte_comp.c >+++ b/lib/librte_compressdev/rte_comp.c >@@ -14,8 +14,12 @@ rte_comp_get_feature_name(uint64_t flag) >return "STATEFUL_COMPRESSION"; >case RTE_COMP_FF_STATEFUL_DECOMPRESSION: >return "STATEFUL_DECOMPRESSION"; >- case RTE_COMP_FF_MBUF_SCATTER_GATHER: >- return "MBUF_SCATTER_GATHER"; >+ case RTE_COMP_FF_OOP_SGL_IN_SGL_OUT: >+ return "OOP_SGL_IN_SGL_OUT"; >+ case RTE_COMP_FF_OOP_SGL_IN_FB_OUT: >+ return "OOP
[dpdk-dev] [PATCH v4 00/10] net/mlx5: add port representor support
This series adds support for port (VF) representors to the mlx5 PMD, which can be instantiated using the standard "representor" device parameter. Note the PMD only probes existing representors which exist as Verbs devices; their creation is part of the host system configuration. v4 changes: - Fixed domain ID release that did not work, see relevant patch. - Rebased series. v3 changes: - Added the following patches: - net/mlx5: drop useless support for several Verbs ports - net/mlx5: probe port representors in natural order - net/mlx5: support negative identifiers for port representors - See individual patches for details. - Rebased series. v2 changes: - See individual patches for details. - Rebased series. Adrien Mazarguil (10): net/mlx5: rename confusing object in probe code net/mlx5: remove redundant objects in probe code net/mlx5: drop useless support for several Verbs ports net/mlx5: split PCI from generic probing code net/mlx5: re-indent generic probing function net/mlx5: add port representor awareness net/mlx5: probe all port representors net/mlx5: probe port representors in natural order net/mlx5: add parameter for port representors net/mlx5: support negative identifiers for port representors doc/guides/nics/mlx5.rst| 12 + doc/guides/prog_guide/poll_mode_drv.rst |2 + drivers/net/mlx5/Makefile | 30 + drivers/net/mlx5/mlx5.c | 1108 -- drivers/net/mlx5/mlx5.h | 29 +- drivers/net/mlx5/mlx5_ethdev.c | 135 +++- drivers/net/mlx5/mlx5_mac.c |2 +- drivers/net/mlx5/mlx5_nl.c | 297 ++- drivers/net/mlx5/mlx5_stats.c |6 +- drivers/net/mlx5/mlx5_txq.c |2 +- 10 files changed, 1149 insertions(+), 474 deletions(-) -- 2.11.0
[dpdk-dev] [PATCH v4 02/10] net/mlx5: remove redundant objects in probe code
This patch gets rid of redundant calls to open the device and query its
attributes in order to simplify the code.
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming Li
--
v2 changes:
- Minor indent fix on existing code.
---
drivers/net/mlx5/mlx5.c | 64 +---
1 file changed, 30 insertions(+), 34 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 22cbce8d5..4e7f29f5b 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -654,10 +654,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
{
struct ibv_device **list = NULL;
struct ibv_device *ibv_dev;
+ struct ibv_context *ctx = NULL;
+ struct ibv_device_attr_ex attr;
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
int err = 0;
- struct ibv_context *attr_ctx = NULL;
- struct ibv_device_attr_ex device_attr;
unsigned int vf = 0;
unsigned int mps;
unsigned int cqe_comp;
@@ -714,12 +714,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
PCI_DEVICE_ID_MELLANOX_CONNECTX5VF) ||
(pci_dev->id.device_id ==
PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF));
- attr_ctx = mlx5_glue->open_device(list[i]);
+ ctx = mlx5_glue->open_device(list[i]);
rte_errno = errno;
err = rte_errno;
break;
}
- if (attr_ctx == NULL) {
+ if (ctx == NULL) {
switch (err) {
case 0:
DRV_LOG(ERR,
@@ -748,7 +748,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
#endif
- mlx5_glue->dv_query_device(attr_ctx, &dv_attr);
+ mlx5_glue->dv_query_device(ctx, &dv_attr);
if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
DRV_LOG(DEBUG, "enhanced MPW is supported");
@@ -822,23 +822,20 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
DRV_LOG(WARNING, "MPLS over GRE/UDP tunnel offloading disabled due to"
" old OFED/rdma-core version or firmware configuration");
#endif
- err = mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr);
+ err = mlx5_glue->query_device_ex(ctx, NULL, &attr);
if (err) {
DEBUG("ibv_query_device_ex() failed");
goto error;
}
- DRV_LOG(INFO, "%u port(s) detected",
- device_attr.orig_attr.phys_port_cnt);
- for (i = 0; i < device_attr.orig_attr.phys_port_cnt; i++) {
+ DRV_LOG(INFO, "%u port(s) detected", attr.orig_attr.phys_port_cnt);
+ for (i = 0; i < attr.orig_attr.phys_port_cnt; i++) {
char name[RTE_ETH_NAME_MAX_LEN];
int len;
uint32_t port = i + 1; /* ports are indexed from one */
- struct ibv_context *ctx = NULL;
struct ibv_port_attr port_attr;
struct ibv_pd *pd = NULL;
struct priv *priv = NULL;
struct rte_eth_dev *eth_dev = NULL;
- struct ibv_device_attr_ex device_attr_ex;
struct ether_addr mac;
struct mlx5_dev_config config = {
.cqe_comp = cqe_comp,
@@ -865,7 +862,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
len = snprintf(name, sizeof(name), PCI_PRI_FMT,
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
- if (device_attr.orig_attr.phys_port_cnt > 1)
+ if (attr.orig_attr.phys_port_cnt > 1)
snprintf(name + len, sizeof(name), " port %u", i);
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
eth_dev = rte_eth_dev_attach_secondary(name);
@@ -907,7 +904,8 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
continue;
}
DRV_LOG(DEBUG, "using port %u", port);
- ctx = mlx5_glue->open_device(ibv_dev);
+ if (!ctx)
+ ctx = mlx5_glue->open_device(ibv_dev);
if (ctx == NULL) {
err = ENODEV;
goto port_error;
@@ -949,7 +947,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
priv->ctx = ctx;
strncpy(priv->ibdev_path, priv->ctx->device->ibdev_path,
sizeof(priv->ibdev_path));
- priv->device_attr = device_attr;
+ priv->device_attr = attr;
priv->port = port;
priv->pd = pd;
priv->mtu = ETHER_MTU;
@@
[dpdk-dev] [PATCH v4 01/10] net/mlx5: rename confusing object in probe code
There are several attribute objects in this function:
- IB device attributes (struct ibv_device_attr_ex device_attr).
- Direct Verbs attributes (struct mlx5dv_context attrs_out).
- Port attributes (struct ibv_port_attr).
- IB device attributes again (struct ibv_device_attr_ex device_attr_ex).
"attrs_out" is both odd and initialized using a nonstandard syntax. Rename
it "dv_attr" for consistency.
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming Li
--
v2 changes:
- Fixed ctx -> attr_ctx in mlx5_pci_probe().
---
drivers/net/mlx5/mlx5.c | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index d081bdd05..22cbce8d5 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -654,6 +654,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
{
struct ibv_device **list = NULL;
struct ibv_device *ibv_dev;
+ struct mlx5dv_context dv_attr = { .comp_mask = 0 };
int err = 0;
struct ibv_context *attr_ctx = NULL;
struct ibv_device_attr_ex device_attr;
@@ -670,7 +671,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
unsigned int mprq_min_stride_num_n = 0;
unsigned int mprq_max_stride_num_n = 0;
int i;
- struct mlx5dv_context attrs_out = {0};
#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
struct ibv_counter_set_description cs_desc = { .counter_type = 0 };
#endif
@@ -736,21 +736,21 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
ibv_dev = list[i];
DRV_LOG(DEBUG, "device opened");
#ifdef HAVE_IBV_MLX5_MOD_SWP
- attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
#endif
/*
* Multi-packet send is supported by ConnectX-4 Lx PF as well
* as all ConnectX-5 devices.
*/
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
#endif
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
#endif
- mlx5_glue->dv_query_device(attr_ctx, &attrs_out);
- if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
- if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
+ mlx5_glue->dv_query_device(attr_ctx, &dv_attr);
+ if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
+ if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
DRV_LOG(DEBUG, "enhanced MPW is supported");
mps = MLX5_MPW_ENHANCED;
} else {
@@ -762,14 +762,14 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
mps = MLX5_MPW_DISABLED;
}
#ifdef HAVE_IBV_MLX5_MOD_SWP
- if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
- swp = attrs_out.sw_parsing_caps.sw_parsing_offloads;
+ if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
+ swp = dv_attr.sw_parsing_caps.sw_parsing_offloads;
DRV_LOG(DEBUG, "SWP support: %u", swp);
#endif
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
+ if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
struct mlx5dv_striding_rq_caps mprq_caps =
- attrs_out.striding_rq_caps;
+ dv_attr.striding_rq_caps;
DRV_LOG(DEBUG, "\tmin_single_stride_log_num_of_bytes: %d",
mprq_caps.min_single_stride_log_num_of_bytes);
@@ -794,15 +794,15 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
}
#endif
if (RTE_CACHE_LINE_SIZE == 128 &&
- !(attrs_out.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP))
+ !(dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP))
cqe_comp = 0;
else
cqe_comp = 1;
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
- tunnel_en = ((attrs_out.tunnel_offloads_caps &
+ if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
+ tunnel_en = ((dv_attr.tunnel_offloads_caps &
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN) &&
-(attrs_out.tunnel_offloads_caps &
+(dv_attr.tunnel_offloads_caps &
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE));
}
DRV_LOG(DEBUG, "tunnel offloading is %ssupported",
@@ -812,9 +812,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
"tunnel offloading disabled due to old OFED/rdma-core version");
#endif
#ifdef HAVE_IBV_DEVICE_MPLS_SUPPORT
-
[dpdk-dev] [PATCH v4 04/10] net/mlx5: split PCI from generic probing code
All the generic probing code needs is an IB device. While this device is
currently supplied by a PCI lookup, other methods will be added soon.
This patch divides the original function, which has become huge over time,
as follows:
1. PCI-specific (mlx5_pci_probe()).
2. Verbs device (mlx5_dev_spawn()).
(Patch based on prior work from Yuanhan Liu)
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming Li
Cc: Shahaf Shuler
--
v3 changes:
- Moved VF device check within mlx5_pci_probe() after identifying the
device instead of before that.
- Merged mlx5_dev_spawn_one() with mlx5_dev_spawn() since there is no need
anymore for an intermediate function to iterate over Verbs ports.
v2 changes:
- Fixed device naming. A port suffix is now appended only if several IB
ports happen to be detected.
- Added separate message to distinguish missing kernel drivers from other
initialization errors, as it was confusing.
---
drivers/net/mlx5/mlx5.c | 195 ---
1 file changed, 109 insertions(+), 86 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 717d8b268..8916d4684 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include "mlx5.h"
#include "mlx5_utils.h"
@@ -635,32 +636,31 @@ mlx5_uar_init_secondary(struct rte_eth_dev *dev)
}
/**
- * DPDK callback to register a PCI device.
- *
- * This function creates an Ethernet device for each port of a given
- * PCI device.
+ * Spawn an Ethernet device from Verbs information.
*
- * @param[in] pci_drv
- * PCI driver structure (mlx5_driver).
- * @param[in] pci_dev
- * PCI device information.
+ * @param dpdk_dev
+ * Backing DPDK device.
+ * @param ibv_dev
+ * Verbs device.
+ * @param vf
+ * If nonzero, enable VF-specific features.
*
* @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
+ * A valid Ethernet device object on success, NULL otherwise and rte_errno
+ * is set.
*/
-static int
-mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
- struct rte_pci_device *pci_dev)
+static struct rte_eth_dev *
+mlx5_dev_spawn(struct rte_device *dpdk_dev,
+ struct ibv_device *ibv_dev,
+ int vf)
{
- struct ibv_device **list;
- struct ibv_context *ctx = NULL;
+ struct ibv_context *ctx;
struct ibv_device_attr_ex attr;
struct ibv_pd *pd = NULL;
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
struct rte_eth_dev *eth_dev = NULL;
struct priv *priv = NULL;
int err = 0;
- unsigned int vf = 0;
unsigned int mps;
unsigned int cqe_comp;
unsigned int tunnel_en = 0;
@@ -672,71 +672,18 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
unsigned int mprq_max_stride_size_n = 0;
unsigned int mprq_min_stride_num_n = 0;
unsigned int mprq_max_stride_num_n = 0;
- int i;
#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
struct ibv_counter_set_description cs_desc = { .counter_type = 0 };
#endif
/* Prepare shared data between primary and secondary process. */
mlx5_prepare_shared_data();
- assert(pci_drv == &mlx5_driver);
- list = mlx5_glue->get_device_list(&i);
- if (list == NULL) {
- assert(errno);
- err = errno;
- if (errno == ENOSYS)
- DRV_LOG(ERR,
- "cannot list devices, is ib_uverbs loaded?");
- goto error;
- }
- assert(i >= 0);
- /*
-* For each listed device, check related sysfs entry against
-* the provided PCI ID.
-*/
- while (i != 0) {
- struct rte_pci_addr pci_addr;
-
- --i;
- DRV_LOG(DEBUG, "checking device \"%s\"", list[i]->name);
- if (mlx5_ibv_device_to_pci_addr(list[i], &pci_addr))
- continue;
- if ((pci_dev->addr.domain != pci_addr.domain) ||
- (pci_dev->addr.bus != pci_addr.bus) ||
- (pci_dev->addr.devid != pci_addr.devid) ||
- (pci_dev->addr.function != pci_addr.function))
- continue;
- DRV_LOG(INFO, "PCI information matches, using device \"%s\"",
- list[i]->name);
- vf = ((pci_dev->id.device_id ==
- PCI_DEVICE_ID_MELLANOX_CONNECTX4VF) ||
- (pci_dev->id.device_id ==
- PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF) ||
- (pci_dev->id.device_id ==
- PCI_DEVICE_ID_MELLANOX_CONNECTX5VF) ||
- (pci_dev->id.device_id ==
- PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF));
- ctx = mlx5_glue->open_device(list[i]);
- rte_errno = errno;
- err
[dpdk-dev] [PATCH v4 03/10] net/mlx5: drop useless support for several Verbs ports
Unlike mlx4 from which this capability was inherited, mlx5 devices expose
exactly one Verbs port per PCI bus address. Each physical port gets
assigned its own bus address with a single Verbs port.
While harmless, this code requires an extra loop that would get in the way
of subsequent refactoring.
No functional impact.
Signed-off-by: Adrien Mazarguil
Cc: Shahaf Shuler
Cc: Xueming Li
--
v3 changes:
This patch was not present in prior revisions. As discussed [1], it was
added after finally deciding to remove this support.
[1] https://mails.dpdk.org/archives/dev/2018-June/105661.html
---
drivers/net/mlx5/mlx5.c| 96 +
drivers/net/mlx5/mlx5.h| 1 -
drivers/net/mlx5/mlx5_ethdev.c | 2 +-
drivers/net/mlx5/mlx5_txq.c| 2 +-
4 files changed, 34 insertions(+), 67 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 4e7f29f5b..717d8b268 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -652,11 +652,13 @@ static int
mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
{
- struct ibv_device **list = NULL;
- struct ibv_device *ibv_dev;
+ struct ibv_device **list;
struct ibv_context *ctx = NULL;
struct ibv_device_attr_ex attr;
+ struct ibv_pd *pd = NULL;
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
+ struct rte_eth_dev *eth_dev = NULL;
+ struct priv *priv = NULL;
int err = 0;
unsigned int vf = 0;
unsigned int mps;
@@ -719,6 +721,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
err = rte_errno;
break;
}
+ mlx5_glue->free_device_list(list);
if (ctx == NULL) {
switch (err) {
case 0:
@@ -733,7 +736,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
}
goto error;
}
- ibv_dev = list[i];
DRV_LOG(DEBUG, "device opened");
#ifdef HAVE_IBV_MLX5_MOD_SWP
dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
@@ -827,15 +829,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
DEBUG("ibv_query_device_ex() failed");
goto error;
}
- DRV_LOG(INFO, "%u port(s) detected", attr.orig_attr.phys_port_cnt);
- for (i = 0; i < attr.orig_attr.phys_port_cnt; i++) {
+ {
char name[RTE_ETH_NAME_MAX_LEN];
- int len;
- uint32_t port = i + 1; /* ports are indexed from one */
struct ibv_port_attr port_attr;
- struct ibv_pd *pd = NULL;
- struct priv *priv = NULL;
- struct rte_eth_dev *eth_dev = NULL;
struct ether_addr mac;
struct mlx5_dev_config config = {
.cqe_comp = cqe_comp,
@@ -859,11 +855,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
},
};
- len = snprintf(name, sizeof(name), PCI_PRI_FMT,
+ snprintf(name, sizeof(name), PCI_PRI_FMT,
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
- if (attr.orig_attr.phys_port_cnt > 1)
- snprintf(name + len, sizeof(name), " port %u", i);
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
eth_dev = rte_eth_dev_attach_secondary(name);
if (eth_dev == NULL) {
@@ -901,31 +895,22 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
eth_dev->tx_pkt_burst =
mlx5_select_tx_function(eth_dev);
rte_eth_dev_probing_finish(eth_dev);
- continue;
- }
- DRV_LOG(DEBUG, "using port %u", port);
- if (!ctx)
- ctx = mlx5_glue->open_device(ibv_dev);
- if (ctx == NULL) {
- err = ENODEV;
- goto port_error;
+ claim_zero(mlx5_glue->close_device(ctx));
+ return 0;
}
/* Check port status. */
- err = mlx5_glue->query_port(ctx, port, &port_attr);
+ err = mlx5_glue->query_port(ctx, 1, &port_attr);
if (err) {
DRV_LOG(ERR, "port query failed: %s", strerror(err));
- goto port_error;
+ goto error;
}
if (port_attr.link_layer != IBV_LINK_LAYER_ETHERNET) {
- DRV_LOG(ERR,
- "port %d is not configured in Ethernet mode",
- port);
+ DRV_LOG(ERR, "port is not configured in Ethernet mode");
[dpdk-dev] [PATCH v4 06/10] net/mlx5: add port representor awareness
The current PCI probing method is not aware of Verbs port representors,
which appear as standard Verbs devices bound to the same PCI address and
cannot be distinguished.
Problem is that more often than not, the wrong Verbs device is used,
resulting in unexpected traffic.
This patch makes the driver discard representors to only use the master
device. If unable to identify it (e.g. kernel drivers not recent enough),
either:
- There is only one matching device which isn't identified as a
representor, in that case use it.
- Otherwise log an error and do not probe the device.
(Patch based on prior work from Yuanhan Liu)
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming Li
Cc: Xueming Li
--
v3 changes:
- Replaced all heuristics (including mlx5_cmp_ibv_name()) with Netlink
queries to associate IB devices with network interfaces.
- Reworded commit log.
v2 changes:
- Fixed digit detection in mlx5_cmp_ibv_name() so that "foo1" and "foo10"
are compared on the integer conversion of "1" against "10" instead of ""
and "0".
---
drivers/net/mlx5/Makefile | 30
drivers/net/mlx5/mlx5.c| 109 +--
drivers/net/mlx5/mlx5.h| 16 ++-
drivers/net/mlx5/mlx5_nl.c | 297 ++--
4 files changed, 428 insertions(+), 24 deletions(-)
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 955861a41..745752e23 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -152,6 +152,36 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
infiniband/verbs.h \
enum IBV_FLOW_SPEC_ACTION_COUNT \
$(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_CMD_GET \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_CMD_GET \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_CMD_PORT_GET \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_CMD_PORT_GET \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_ATTR_DEV_INDEX \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_ATTR_DEV_NAME \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_ATTR_DEV_NAME \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_ATTR_PORT_INDEX \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \
+ linux/rdma_netlink.h \
+ enum RDMA_NLDEV_ATTR_NDEV_INDEX \
+ $(AUTOCONF_OUTPUT)
# Create mlx5_autoconf.h or update it in case it differs from the new one.
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 1054bf6d0..d06ba9886 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
/* Verbs header. */
@@ -274,8 +275,10 @@ mlx5_dev_close(struct rte_eth_dev *dev)
mlx5_socket_uninit(dev);
if (priv->config.vf)
mlx5_nl_mac_addr_flush(dev);
- if (priv->nl_socket >= 0)
- close(priv->nl_socket);
+ if (priv->nl_socket_route >= 0)
+ close(priv->nl_socket_route);
+ if (priv->nl_socket_rdma >= 0)
+ close(priv->nl_socket_rdma);
ret = mlx5_hrxq_ibv_verify(dev);
if (ret)
DRV_LOG(WARNING, "port %u some hash Rx queue still remain",
@@ -876,6 +879,10 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->device_attr = attr;
priv->pd = pd;
priv->mtu = ETHER_MTU;
+ /* Some internal functions rely on Netlink sockets, open them now. */
+ priv->nl_socket_rdma = mlx5_nl_init(0, NETLINK_RDMA);
+ priv->nl_socket_route = mlx5_nl_init(RTMGRP_LINK, NETLINK_ROUTE);
+ priv->nl_sn = 0;
err = mlx5_args(&config, dpdk_dev->devargs);
if (err) {
err = rte_errno;
@@ -1010,14 +1017,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
eth_dev->dev_ops = &mlx5_dev_ops;
/* Register MAC address. */
claim_zero(mlx5_mac_addr_add(eth_dev, &mac, 0, 0));
- priv->nl_socket = -1;
- priv->nl_sn = 0;
- if (vf && config.vf_nl_en) {
- priv->nl_socket = mlx5_nl_init(RTMGRP_LINK);
- if (priv->nl_socket < 0)
- priv->nl_socket = -1;
+ if (vf && config.vf_nl_en)
mlx5_nl_mac_addr_sync(eth_dev);
- }
TAILQ_INIT(&priv->flows);
TAILQ_INIT(&priv->ctrl_flows);
/* Hint libmlx5 to use PMD allocator for data plane resources */
@@ -1078,8 +1079,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
[dpdk-dev] [PATCH v4 08/10] net/mlx5: probe port representors in natural order
Port representors are probed in whatever unspecified order
ibv_get_device_list() returns them.
This is counterintuitive to users since DPDK port IDs assignment almost
never follows the same sequence as representor IDs. Additionally, the
master device does not necessarily inherit the lowest DPDK port ID.
Signed-off-by: Adrien Mazarguil
--
v3 changes:
- This patch was not present in prior revisions.
---
drivers/net/mlx5/mlx5.c | 95 ++--
1 file changed, 74 insertions(+), 21 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index c02afbb82..6592480bf 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1168,6 +1168,52 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
return NULL;
}
+/** Data associated with devices to spawn. */
+struct mlx5_dev_spawn_data {
+ unsigned int ifindex; /**< Network interface index. */
+ struct mlx5_switch_info info; /**< Switch information. */
+ struct ibv_device *ibv_dev; /**< Associated IB device. */
+ struct rte_eth_dev *eth_dev; /**< Associated Ethernet device. */
+};
+
+/**
+ * Comparison callback to sort device data.
+ *
+ * This is meant to be used with qsort().
+ *
+ * @param a[in]
+ * Pointer to pointer to first data object.
+ * @param b[in]
+ * Pointer to pointer to second data object.
+ *
+ * @return
+ * 0 if both objects are equal, less than 0 if the first argument is less
+ * than the second, greater than 0 otherwise.
+ */
+static int
+mlx5_dev_spawn_data_cmp(const void *a, const void *b)
+{
+ const struct mlx5_switch_info *si_a =
+ &((const struct mlx5_dev_spawn_data *)a)->info;
+ const struct mlx5_switch_info *si_b =
+ &((const struct mlx5_dev_spawn_data *)b)->info;
+ int ret;
+
+ /* Master device first. */
+ ret = si_b->master - si_a->master;
+ if (ret)
+ return ret;
+ /* Then representor devices. */
+ ret = si_b->representor - si_a->representor;
+ if (ret)
+ return ret;
+ /* Unidentified devices come last in no specific order. */
+ if (!si_a->representor)
+ return 0;
+ /* Order representors by name. */
+ return si_a->port_name - si_b->port_name;
+}
+
/**
* DPDK callback to register a PCI device.
*
@@ -1218,9 +1264,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
}
ibv_match[n] = NULL;
- unsigned int ifindex[n];
- struct mlx5_switch_info info[n];
- struct rte_eth_dev *eth_list[n];
+ struct mlx5_dev_spawn_data list[n];
int nl_route = n ? mlx5_nl_init(0, NETLINK_ROUTE) : -1;
int nl_rdma = n ? mlx5_nl_init(0, NETLINK_RDMA) : -1;
unsigned int i;
@@ -1242,16 +1286,19 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
*bail out.
*/
for (i = 0; i != n; ++i) {
+ list[i].ibv_dev = ibv_match[i];
+ list[i].eth_dev = NULL;
if (nl_rdma < 0)
- ifindex[i] = 0;
+ list[i].ifindex = 0;
else
- ifindex[i] = mlx5_nl_ifindex(nl_rdma,
-ibv_match[i]->name);
+ list[i].ifindex = mlx5_nl_ifindex
+ (nl_rdma, list[i].ibv_dev->name);
if (nl_route < 0 ||
- !ifindex[i] ||
- mlx5_nl_switch_info(nl_route, ifindex[i], &info[i])) {
- ifindex[i] = 0;
- memset(&info[i], 0, sizeof(info[i]));
+ !list[i].ifindex ||
+ mlx5_nl_switch_info(nl_route, list[i].ifindex,
+ &list[i].info)) {
+ list[i].ifindex = 0;
+ memset(&list[i].info, 0, sizeof(list[i].info));
continue;
}
}
@@ -1261,7 +1308,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
close(nl_route);
/* Count unidentified devices. */
for (u = 0, i = 0; i != n; ++i)
- if (!info[i].master && !info[i].representor)
+ if (!list[i].info.master && !list[i].info.representor)
++u;
if (u) {
if (n == 1 && u == 1) {
@@ -1275,6 +1322,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
n = 0;
}
}
+ /*
+* Sort list to probe devices in natural order for users convenience
+* (i.e. master first, then representors from lowest to highest ID).
+*/
+ if (n)
+ qsort(list, n, sizeof(*list), mlx5_dev_spawn_data_cmp);
switch (pci_dev->id.device_id) {
case PCI_DEVICE_ID_MELLANOX_CONNECTX4VF:
case PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF:
@@ -1288
[dpdk-dev] [PATCH v4 09/10] net/mlx5: add parameter for port representors
Prior to this patch, all port representors detected on a given device were
probed and Ethernet devices instantiated for each of them.
This patch adds support for the standard "representor" parameter, which
implies that port representors are not probed by default anymore, except
for the list provided through device arguments.
(Patch based on prior work from Yuanhan Liu)
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming Li
--
v3 changes:
- Adapted representor detection to the reworked mlx5_dev_spawn().
v2 changes:
- Added error message for when rte_eth_devargs_parse() fails.
---
doc/guides/nics/mlx5.rst| 12
doc/guides/prog_guide/poll_mode_drv.rst | 2 ++
drivers/net/mlx5/mlx5.c | 41 ++--
3 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 7dd9c1c5e..0d0d21727 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -392,6 +392,18 @@ Run-time configuration
Disabled by default.
+- ``representor`` parameter [list]
+
+ This parameter can be used to instantiate DPDK Ethernet devices from
+ existing port (or VF) representors configured on the device.
+
+ It is a standard parameter whose format is described in
+ :ref:`ethernet_device_standard_device_arguments`.
+
+ For instance, to probe port representors 0 through 2::
+
+representor=[0-2]
+
Firmware configuration
~~
diff --git a/doc/guides/prog_guide/poll_mode_drv.rst
b/doc/guides/prog_guide/poll_mode_drv.rst
index 4b69f6cbe..b2cf48354 100644
--- a/doc/guides/prog_guide/poll_mode_drv.rst
+++ b/doc/guides/prog_guide/poll_mode_drv.rst
@@ -360,6 +360,8 @@ Ethernet Device API
The Ethernet device API exported by the Ethernet PMDs is described in the
*DPDK API Reference*.
+.. _ethernet_device_standard_device_arguments:
+
Ethernet Device Standard Device Arguments
~
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6592480bf..12a77afa8 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -92,6 +92,9 @@
/* Activate Netlink support in VF mode. */
#define MLX5_VF_NL_EN "vf_nl_en"
+/* Select port representors to instantiate. */
+#define MLX5_REPRESENTOR "representor"
+
#ifndef HAVE_IBV_MLX5_MOD_MPW
#define MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED (1 << 2)
#define MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW (1 << 3)
@@ -443,6 +446,9 @@ mlx5_args_check(const char *key, const char *val, void
*opaque)
struct mlx5_dev_config *config = opaque;
unsigned long tmp;
+ /* No-op, port representors are processed in mlx5_dev_spawn(). */
+ if (!strcmp(MLX5_REPRESENTOR, key))
+ return 0;
errno = 0;
tmp = strtoul(val, NULL, 0);
if (errno) {
@@ -515,6 +521,7 @@ mlx5_args(struct mlx5_dev_config *config, struct
rte_devargs *devargs)
MLX5_RX_VEC_EN,
MLX5_L3_VXLAN_EN,
MLX5_VF_NL_EN,
+ MLX5_REPRESENTOR,
NULL,
};
struct rte_kvargs *kvlist;
@@ -672,7 +679,9 @@ mlx5_uar_init_secondary(struct rte_eth_dev *dev)
*
* @return
* A valid Ethernet device object on success, NULL otherwise and rte_errno
- * is set.
+ * is set. The following error is defined:
+ *
+ * EBUSY: device is not supposed to be spawned.
*/
static struct rte_eth_dev *
mlx5_dev_spawn(struct rte_device *dpdk_dev,
@@ -723,6 +732,26 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
int own_domain_id = 0;
unsigned int i;
+ /* Determine if this port representor is supposed to be spawned. */
+ if (switch_info->representor && dpdk_dev->devargs) {
+ struct rte_eth_devargs eth_da;
+
+ err = rte_eth_devargs_parse(dpdk_dev->devargs->args, ð_da);
+ if (err) {
+ rte_errno = -err;
+ DRV_LOG(ERR, "failed to process device arguments: %s",
+ strerror(rte_errno));
+ return NULL;
+ }
+ for (i = 0; i < eth_da.nb_representor_ports; ++i)
+ if (eth_da.representor_ports[i] ==
+ (uint16_t)switch_info->port_name)
+ break;
+ if (i == eth_da.nb_representor_ports) {
+ rte_errno = EBUSY;
+ return NULL;
+ }
+ }
/* Prepare shared data between primary and secondary process. */
mlx5_prepare_shared_data();
errno = 0;
@@ -1343,8 +1372,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
list[i].eth_dev = mlx5_dev_spawn
(&pci_dev->device, list[i].ibv_dev, vf, &list[i].info);
- if (!list[i].eth_dev)
- break;
+ if (!list[i].eth_dev) {
+
[dpdk-dev] [PATCH v4 05/10] net/mlx5: re-indent generic probing function
Since commit "net/mlx5: drop useless support for several Verbs ports"
removed an inner loop, mlx5_dev_spawn() is left with an unnecessary indent
level.
This patch eliminates a block, moves its local variables to function scope,
and re-indents its contents (diff best viewed with --ignore-all-space).
No functional impact.
Signed-off-by: Adrien Mazarguil
Reviewed-by: Xueming(Steven) Li
--
v3 changes:
- Reworded commit log since original patch was modified. This patch is also
much shorter as a consequence.
---
drivers/net/mlx5/mlx5.c | 578 +--
1 file changed, 282 insertions(+), 296 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 8916d4684..1054bf6d0 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -656,8 +656,25 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
{
struct ibv_context *ctx;
struct ibv_device_attr_ex attr;
+ struct ibv_port_attr port_attr;
struct ibv_pd *pd = NULL;
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
+ struct mlx5_dev_config config = {
+ .vf = !!vf,
+ .tx_vec_en = 1,
+ .rx_vec_en = 1,
+ .mpw_hdr_dseg = 0,
+ .txq_inline = MLX5_ARG_UNSET,
+ .txqs_inline = MLX5_ARG_UNSET,
+ .inline_max_packet_sz = MLX5_ARG_UNSET,
+ .vf_nl_en = 1,
+ .mprq = {
+ .enabled = 0,
+ .stride_num_n = MLX5_MPRQ_STRIDE_NUM_N,
+ .max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN,
+ .min_rxqs_num = MLX5_MPRQ_MIN_RXQS,
+ },
+ };
struct rte_eth_dev *eth_dev = NULL;
struct priv *priv = NULL;
int err = 0;
@@ -675,6 +692,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
struct ibv_counter_set_description cs_desc = { .counter_type = 0 };
#endif
+ struct ether_addr mac;
+ char name[RTE_ETH_NAME_MAX_LEN];
/* Prepare shared data between primary and secondary process. */
mlx5_prepare_shared_data();
@@ -710,11 +729,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(DEBUG, "MPW isn't supported");
mps = MLX5_MPW_DISABLED;
}
+ config.mps = mps;
#ifdef HAVE_IBV_MLX5_MOD_SWP
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
swp = dv_attr.sw_parsing_caps.sw_parsing_offloads;
DRV_LOG(DEBUG, "SWP support: %u", swp);
#endif
+ config.swp = !!swp;
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
struct mlx5dv_striding_rq_caps mprq_caps =
@@ -740,6 +761,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mprq_caps.min_single_wqe_log_num_of_strides;
mprq_max_stride_num_n =
mprq_caps.max_single_wqe_log_num_of_strides;
+ config.mprq.stride_num_n = RTE_MAX(MLX5_MPRQ_STRIDE_NUM_N,
+ mprq_min_stride_num_n);
}
#endif
if (RTE_CACHE_LINE_SIZE == 128 &&
@@ -747,6 +770,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
cqe_comp = 0;
else
cqe_comp = 1;
+ config.cqe_comp = cqe_comp;
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
tunnel_en = ((dv_attr.tunnel_offloads_caps &
@@ -760,6 +784,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(WARNING,
"tunnel offloading disabled due to old OFED/rdma-core version");
#endif
+ config.tunnel_en = tunnel_en;
#ifdef HAVE_IBV_DEVICE_MPLS_SUPPORT
mpls_en = ((dv_attr.tunnel_offloads_caps &
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_CW_MPLS_OVER_GRE) &&
@@ -771,326 +796,287 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(WARNING, "MPLS over GRE/UDP tunnel offloading disabled due to"
" old OFED/rdma-core version or firmware configuration");
#endif
+ config.mpls_en = mpls_en;
err = mlx5_glue->query_device_ex(ctx, NULL, &attr);
if (err) {
DEBUG("ibv_query_device_ex() failed");
goto error;
}
- {
- char name[RTE_ETH_NAME_MAX_LEN];
- struct ibv_port_attr port_attr;
- struct ether_addr mac;
- struct mlx5_dev_config config = {
- .cqe_comp = cqe_comp,
- .mps = mps,
- .tunnel_en = tunnel_en,
- .mpls_en = mpls_en,
- .tx_vec_en = 1,
- .rx_vec_en = 1,
- .mpw_hdr_dseg = 0,
- .txq_inline = MLX5_ARG_UNSET,
- .txqs_inline
[dpdk-dev] [PATCH v4 07/10] net/mlx5: probe all port representors
Probe existing port representors in addition to their master device and
associate them automatically.
To avoid collision between Ethernet devices, they are named as follows:
- "{DBDF}" for master/switch devices.
- "{DBDF}_representor_{rep}" with "rep" starting from 0 for port
representors.
(Patch based on prior work from Yuanhan Liu)
Signed-off-by: Adrien Mazarguil
Signed-off-by: Nelio Laranjeiro
Reviewed-by: Xueming Li
Cc: Xueming Li
Cc: Shahaf Shuler
--
v4 changes:
- Fixed domain ID release once the last port using it is closed. Closed
devices are not necessarily detached, their presence is not a good
indicator. Code was modified to check if they still use their domain IDs
before deciding to release it.
v3 changes:
- Nelio introduced mlx5_dev_to_port_id() to prevent the master device from
releasing a domain ID while representors are still bound. It is now
released by the last device closed.
- Reverted to original naming convention as requested by Xueming and
Shahaf; "net_" prefix and "_0" suffix were dropped.
- mlx5_dev_spawn() (previously mlx5_dev_spawn_one()) now decides on its own
whether underlying device is a representor.
- Devices can now be probed in any order and not necessarily all at once;
representors can exist without a master device.
- mlx5_pci_probe() iterates on the list of devices directly instead of
relying on an intermediate function (previously mlx5_dev_spawn()).
- mlx5_get_ifname() was rewritten to rely on mlx5_nl_ifindex() when faced
with a representor.
- Since it is not necessarily present, master device is now dynamically
retrieved in mlx5_dev_infos_get().
v2 changes:
- Added representor information to dev_infos_get(). DPDK port ID of master
device is now stored in the private structure to retrieve it
conveniently.
- Master device is assigned dummy representor ID value -1 to better
distinguish from the the first actual representor reported by
dev_infos_get() as those are indexed from 0.
- Added RTE_ETH_DEV_REPRESENTOR device flag.
---
drivers/net/mlx5/mlx5.c| 134
drivers/net/mlx5/mlx5.h| 12 +++-
drivers/net/mlx5/mlx5_ethdev.c | 133 +++
drivers/net/mlx5/mlx5_mac.c| 2 +-
drivers/net/mlx5/mlx5_stats.c | 6 +-
5 files changed, 238 insertions(+), 49 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index d06ba9886..c02afbb82 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -307,7 +307,27 @@ mlx5_dev_close(struct rte_eth_dev *dev)
if (ret)
DRV_LOG(WARNING, "port %u some flows still remain",
dev->data->port_id);
+ if (priv->domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) {
+ unsigned int c = 0;
+ unsigned int i = mlx5_dev_to_port_id(dev->device, NULL, 0);
+ uint16_t port_id[i];
+
+ i = RTE_MIN(mlx5_dev_to_port_id(dev->device, port_id, i), i);
+ while (i--) {
+ struct priv *opriv =
+ rte_eth_devices[port_id[i]].data->dev_private;
+
+ if (!opriv ||
+ opriv->domain_id != priv->domain_id ||
+ &rte_eth_devices[port_id[i]] == dev)
+ continue;
+ ++c;
+ }
+ if (!c)
+ claim_zero(rte_eth_switch_domain_free(priv->domain_id));
+ }
memset(priv, 0, sizeof(*priv));
+ priv->domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID;
}
const struct eth_dev_ops mlx5_dev_ops = {
@@ -647,6 +667,8 @@ mlx5_uar_init_secondary(struct rte_eth_dev *dev)
* Verbs device.
* @param vf
* If nonzero, enable VF-specific features.
+ * @param[in] switch_info
+ * Switch properties of Ethernet device.
*
* @return
* A valid Ethernet device object on success, NULL otherwise and rte_errno
@@ -655,7 +677,8 @@ mlx5_uar_init_secondary(struct rte_eth_dev *dev)
static struct rte_eth_dev *
mlx5_dev_spawn(struct rte_device *dpdk_dev,
struct ibv_device *ibv_dev,
- int vf)
+ int vf,
+ const struct mlx5_switch_info *switch_info)
{
struct ibv_context *ctx;
struct ibv_device_attr_ex attr;
@@ -697,6 +720,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
#endif
struct ether_addr mac;
char name[RTE_ETH_NAME_MAX_LEN];
+ int own_domain_id = 0;
+ unsigned int i;
/* Prepare shared data between primary and secondary process. */
mlx5_prepare_shared_data();
@@ -805,7 +830,12 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DEBUG("ibv_query_device_ex() failed");
goto error;
}
- rte_strlcpy(name, dpdk_dev->name, sizeof(name));
+ if (!switch_info->representor)
+ rte_strlcpy(name, dpdk_dev->name, sizeo
[dpdk-dev] [PATCH v4 10/10] net/mlx5: support negative identifiers for port representors
This patch brings support for BlueField representors. Signed-off-by: Adrien Mazarguil Cc: Shahaf Shuler -- v3 changes: - This patch was not present in prior revisions. --- drivers/net/mlx5/mlx5.c | 8 1 file changed, 8 insertions(+) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 12a77afa8..df7f39844 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1330,6 +1330,14 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, memset(&list[i].info, 0, sizeof(list[i].info)); continue; } + /* +* Port representors not associated with any VFs (e.g. on +* BlueField devices) report -1 as a port identifier. +* Quietly set it to zero since DPDK only supports positive +* values. +*/ + if (list[i].info.representor && list[i].info.port_name == -1) + list[i].info.port_name = 0; } if (nl_rdma >= 0) close(nl_rdma); -- 2.11.0
Re: [dpdk-dev] [PATCH v2 12/20] net/mlx5: add mark/flag flow action
On Wed, Jul 04, 2018 at 01:34:19AM -0700, Yongseok Koh wrote:
> On Wed, Jun 27, 2018 at 05:07:44PM +0200, Nelio Laranjeiro wrote:
> > Signed-off-by: Nelio Laranjeiro
> > ---
> > drivers/net/mlx5/mlx5_flow.c | 209 +++
> > 1 file changed, 209 insertions(+)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> > index 57f072c03..a39157533 100644
> > --- a/drivers/net/mlx5/mlx5_flow.c
> > +++ b/drivers/net/mlx5/mlx5_flow.c
> > @@ -52,6 +52,10 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;
> > #define MLX5_FLOW_FATE_DROP (1u << 0)
> > #define MLX5_FLOW_FATE_QUEUE (1u << 1)
> >
> > +/* Modify a packet. */
> > +#define MLX5_FLOW_MOD_FLAG (1u << 0)
> > +#define MLX5_FLOW_MOD_MARK (1u << 1)
> > +
> > /** Handles information leading to a drop fate. */
> > struct mlx5_flow_verbs {
> > unsigned int size; /**< Size of the attribute. */
> > @@ -70,6 +74,8 @@ struct rte_flow {
> > struct rte_flow_attr attributes; /**< User flow attribute. */
> > uint32_t layers;
> > /**< Bit-fields of present layers see MLX5_FLOW_ITEMS_*. */
> > + uint32_t modifier;
> > + /**< Bit-fields of present modifier see MLX5_FLOW_MOD_*. */
>
> Why do you think flag and mark modify a packet? I don't think modifier is an
> appropriate name.
API terminology: "Actions that modify matching traffic contents or its
properties. This includes adding/removing encapsulation, encryption,
compression and marks."
> > uint32_t fate;
> > /**< Bit-fields of present fate see MLX5_FLOW_FATE_*. */
> > struct mlx5_flow_verbs verbs; /* Verbs flow. */
> > @@ -954,6 +960,12 @@ mlx5_flow_action_drop(const struct rte_flow_action
> > *actions,
> > actions,
> > "multiple fate actions are not"
> > " supported");
> > + if (flow->modifier & (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK))
> > + return rte_flow_error_set(error, ENOTSUP,
> > + RTE_FLOW_ERROR_TYPE_ACTION,
> > + actions,
> > + "drop is not compatible with"
> > + " flag/mark action");
> > if (size < flow_size)
> > mlx5_flow_spec_verbs_add(flow, &drop, size);
> > flow->fate |= MLX5_FLOW_FATE_DROP;
> > @@ -1007,6 +1019,144 @@ mlx5_flow_action_queue(struct rte_eth_dev *dev,
> > return 0;
> > }
> >
> > +/**
> > + * Validate action flag provided by the user.
> > + *
> > + * @param actions
> > + * Pointer to flow actions array.
> > + * @param flow
> > + * Pointer to the rte_flow structure.
> > + * @param flow_size
> > + * Size in bytes of the available space for to store the flow
> > information.
> > + * @param error
> > + * Pointer to error structure.
> > + *
> > + * @return
> > + * size in bytes necessary for the conversion, a negative errno value
> > + * otherwise and rte_errno is set.
>
> Like I asked for the previous patches, please be more verbose for function
> description and explanation of args and return value.
I've update the documentation of all patches it would be strange to see
some with correct comments and some without :)
> > + */
> > +static int
> > +mlx5_flow_action_flag(const struct rte_flow_action *actions,
> > + struct rte_flow *flow, const size_t flow_size,
> > + struct rte_flow_error *error)
> > +{
> > + unsigned int size = sizeof(struct ibv_flow_spec_action_tag);
> > + struct ibv_flow_spec_action_tag tag = {
> > + .type = IBV_FLOW_SPEC_ACTION_TAG,
> > + .size = size,
> > + .tag_id = mlx5_flow_mark_set(MLX5_FLOW_MARK_DEFAULT),
> > + };
> > +
> > + if (flow->modifier & MLX5_FLOW_MOD_FLAG)
> > + return rte_flow_error_set(error, ENOTSUP,
> > + RTE_FLOW_ERROR_TYPE_ACTION,
> > + actions,
> > + "flag action already present");
> > + if (flow->fate & MLX5_FLOW_FATE_DROP)
> > + return rte_flow_error_set(error, ENOTSUP,
> > + RTE_FLOW_ERROR_TYPE_ACTION,
> > + actions,
> > + "flag is not compatible with drop"
> > + " action");
> > + if (flow->modifier & MLX5_FLOW_MOD_MARK)
> > + return 0;
> > + flow->modifier |= MLX5_FLOW_MOD_FLAG;
> > + if (size <= flow_size)
> > + mlx5_flow_spec_verbs_add(flow, &tag, size);
> > + return size;
> > +}
> > +
> > +/**
> > + * Update verbs specification to modify the flag to mark.
> > + *
> > + * @param flow
> > + * Pointer to the rte_flow structure.
> > + * @param mark_id
> > + * Mark identifier to replace the flag.
> > + */
> > +static void
> > +mlx5_flow_verbs_mark_update(struct rte_flow *fl
Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option parsing
Hi Konstantin,
On 6/22/2018 5:21 PM, Ananyev, Konstantin wrote:
-Original Message-
From: Akhil Goyal [mailto:akhil.go...@nxp.com]
Sent: Friday, June 22, 2018 11:41 AM
To: Ananyev, Konstantin ; dev@dpdk.org
Cc: Nicolau, Radu
Subject: Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option
parsing
On 6/22/2018 3:40 PM, Ananyev, Konstantin wrote:
-Original Message-
From: Akhil Goyal [mailto:akhil.go...@nxp.com]
Sent: Friday, June 22, 2018 11:01 AM
To: Ananyev, Konstantin ; dev@dpdk.org
Cc: Nicolau, Radu
Subject: Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option
parsing
Hi Konstantin,
On 6/21/2018 8:32 PM, Ananyev, Konstantin wrote:
Hi Akhil,
-Original Message-
From: Akhil Goyal [mailto:akhil.go...@nxp.com]
Sent: Thursday, June 21, 2018 2:49 PM
To: Ananyev, Konstantin ; dev@dpdk.org
Cc: Nicolau, Radu
Subject: Re: [dpdk-dev] [PATCH 2/2] examples/ipsec-secgw: fix portmask option
parsing
Hi Konstantin,
On 6/5/2018 7:46 PM, Konstantin Ananyev wrote:
parse_portmask() returns both portmask value and possible error code
as 32-bit integer. That causes some confusion for callers.
Split error code and portmask value into two distinct variables.
Also allows to run the app with unprotected_port_mask == 0.
This would also allow cryptodev_mask == 0 to work well which should not be the
case.
Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
Signed-off-by: Konstantin Ananyev
---
examples/ipsec-secgw/ipsec-secgw.c | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index fafb41161..5d7071657 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -972,20 +972,19 @@ print_usage(const char *prgname)
}
static int32_t
-parse_portmask(const char *portmask)
+parse_portmask(const char *portmask, uint32_t *pmv)
{
- char *end = NULL;
+ char *end;
unsigned long pm;
/* parse hexadecimal string */
+ errno = 0;
pm = strtoul(portmask, &end, 16);
- if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
+ if (errno != 0 || *end != '\0' || pm > UINT32_MAX)
return -1;
- if ((pm == 0) && errno)
- return -1;
-
- return pm;
+ *pmv = pm;
+ return 0;
}
static int32_t
@@ -1063,6 +1062,7 @@ parse_args(int32_t argc, char **argv)
int32_t opt, ret;
char **argvopt;
int32_t option_index;
+ uint32_t v;
char *prgname = argv[0];
int32_t f_present = 0;
@@ -1073,8 +1073,8 @@ parse_args(int32_t argc, char **argv)
switch (opt) {
case 'p':
- enabled_port_mask = parse_portmask(optarg);
- if (enabled_port_mask == 0) {
+ ret = parse_portmask(optarg, &enabled_port_mask);
+ if (ret < 0 || enabled_port_mask == 0) {
printf("invalid portmask\n");
print_usage(prgname);
return -1;
@@ -1085,8 +1085,8 @@ parse_args(int32_t argc, char **argv)
promiscuous_on = 1;
break;
case 'u':
- unprotected_port_mask = parse_portmask(optarg);
- if (unprotected_port_mask == 0) {
+ ret = parse_portmask(optarg, &unprotected_port_mask);
+ if (ret < 0) {
printf("invalid unprotected portmask\n");
print_usage(prgname);
return -1;
@@ -1147,15 +1147,16 @@ parse_args(int32_t argc, char **argv)
single_sa_idx);
break;
case CMD_LINE_OPT_CRYPTODEV_MASK_NUM:
- ret = parse_portmask(optarg);
+ ret = parse_portmask(optarg, &v);
I think there is no need for v, enabled_cryptodev_mask can be used instead.
Right now - it can't as enabled_cryptodevmask is uint64_t.
To do what you suggesting we have either downgrade enabled_cryptodevmask
32-bits,
or upgrade enabled_port_mask to 64-bit and change parse_portmask() to accept
64-bit parameter.
I am ok with any of the case.
if (ret == -1) {
enabled_cryptodev_mask should not be 0 and should be checked here.
Could you explain a bit more why enabled_cryptodevmask==0 is not allowed?
By default, the value of enabled_cryptodevmask is UINT64_MAX, which means all
crypto
devices are enabled, and if it is marked as 0, then all get disabled which is
not
correct as we need atleast 1 crypto device in ipsec application.
Might be user would like to run app with inline ipsec only,
or have app to work in bypass m
[dpdk-dev] [PATCH] maintainers: update for Mellanox PMDs
Shahaf and Matan volunteered to replace Nélio and myself as maintainers for mlx4 and mlx5 PMDs. Cheers! Signed-off-by: Adrien Mazarguil Signed-off-by: Nelio Laranjeiro Cc: sta...@dpdk.org Cc: Shahaf Shuler Cc: Matan Azrad --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index dabb12d65..e94f02386 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -580,15 +580,15 @@ F: doc/guides/nics/mvpp2.rst F: doc/guides/nics/features/mvpp2.ini Mellanox mlx4 -M: Adrien Mazarguil +M: Matan Azrad +M: Shahaf Shuler T: git://dpdk.org/next/dpdk-next-net-mlx F: drivers/net/mlx4/ F: doc/guides/nics/mlx4.rst F: doc/guides/nics/features/mlx4.ini Mellanox mlx5 -M: Adrien Mazarguil -M: Nelio Laranjeiro +M: Shahaf Shuler M: Yongseok Koh T: git://dpdk.org/next/dpdk-next-net-mlx F: drivers/net/mlx5/ -- 2.11.0
Re: [dpdk-dev] [Bug 62] Rawdev autotest fails
On Friday 15 June 2018 04:52 PM, bugzi...@dpdk.org wrote: https://dpdk.org/tracker/show_bug.cgi?id=62 Bug ID: 62 Summary: Rawdev autotest fails Product: DPDK Version: 18.05 Hardware: All OS: All Status: CONFIRMED Severity: normal Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: reshma.pat...@intel.com Target Milestone: --- Rawdev autotest fails when run via sanity script "autotest.py" *DPDK version: *git repo -> latest dpdk-dpdk , last commit id: 2077a158e22451144d1b023f949f3232cfa62b3 *OS: Fedora27, Centos7, Ubuntu17.10, FreeBSD *Compiler: GCC *32 bit compiler for Fedora27, Centos7, Ubuntu17.10 *64 bit compiler for Fedora27, Centos7, Ubuntu17.10 and FreeBSD Test Setup: Bare metal with Ubuntu 17.10, Guest VM with centos 7 OS and Fedora27,FreeBSD Steps to reproduce Run Sanity script as below, found " Rawdev autotest: Fail " ./autotest.py ./build/app/test all screen dump for the sanity: Rawdev autotest: Fail [00m 00s] Expected Result Test should succeed with no errors This issue occurs only when the patches from Jananee [1] are applied - which are essentially adding many missing tests to autotest list. Though the bug states that rawdev_autotest is failing, it is actually some other issue in the autotest_data.py. In case the order of tests just after 'event_eth_rx_adapter_autotest' is changed, the failure state shifts to that test which comes just after 'event_eth_rx_adapter_autotest'. On Master + patches from Jananee --->8--- Event eth rx adapter autotest:Fail [Test returns Skipped] [00m 00s] Rawdev autotest: Fail [00m 00s] Kvargs autotest: Success [00m 00s] Dump physmem: Skipped [Not Available] [00m 00s] --->8--- With shuffling of tests case after 'event_eth_rx_adapter_autotest': --->8--- Event eth rx adapter autotest:Fail [Test returns Skipped] [00m 00s] Kvargs autotest: Fail [00m 00s] Rawdev autotest: Success [00m 00s] Dump physmem: Skipped [Not Available] [00m 00s] --->8--- If I completely remove 'event_eth_rx_adapter_autotest', both kvargs and devargs succeed. --->8--- Kvargs autotest: Success [00m 00s] Rawdev autotest: Success [00m 00s] Dump physmem: Skipped [Not Available] [00m 00s] --->8--- Though the data and its format in autotest_data.py looks fine to me, I am not the best person for that - can someone give a hint what else should I check? Details also available in bugzilla [2]. [1] http://patches.dpdk.org/patch/40370/ [2] https://bugs.dpdk.org/show_bug.cgi?id=62 - Shreyansh
Re: [dpdk-dev] [PATCH] mk: using initial-exec model for thread local variable
05/07/2018 16:13, Marvin Liu: > When building share library, thread-local storage model will be changed > to global-dynamic. It will add additional cost for reading thread local > variable. On the other hand, dynamically load share library with static > TLS will request additional DTV slot which is limited by loader. By now > only librte_pmd_eal.so contain thread local variable. So that can make > TLS model back to initial-exec like static library for better > performance. > > Signed-off-by: Marvin Liu > > diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk > index 7e4531bab..19d5e11ef 100644 > --- a/mk/toolchain/gcc/rte.vars.mk > +++ b/mk/toolchain/gcc/rte.vars.mk It is only for GCC? not clang? > +# Initial execution TLS model has better performane compared to dynamic > +# global. But this model require for addtional slot on DTV when dlopen > +# object with thread local variable. Few typos in this comment. > +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) > +TOOLCHAIN_CFLAGS += -ftls-model=initial-exec > +endif We really need more test or review of this patch. Cc techboard: do we take the risk of getting it in RC1 without review? It is waiting for long.
Re: [dpdk-dev] [PATCH v6] examples: fix RSS hash function configuration
Hi Ferruh,
On 4/7/2018 9:02 PM, Ferruh Yigit wrote:
ethdev layer introduced checks for application requested RSS hash
functions and returns error for ones unsupported by hardware
This check breaks some sample applications which blindly configures
RSS hash functions without checking underlying hardware support.
Updated examples to mask out unsupported RSS has functions during device
configuration.
Prints a log if configuration values updated by this check.
Fixes: aa1a6d87f15d ("ethdev: force RSS offload rules again")
Signed-off-by: Ferruh Yigit
---
Return error added in this release, so no need to backport the fix to
previous versions.
Cc: David Hunt
Cc: Liang Ma
Cc: Xueming Li
v2:
Cc: Remy Horton
* add app/test-eventdev
Cc: Pavan Nikhilesh
v3:
* document rte_eth_dev_configure() API rss_hf restriction
v4:
* Flex tespmd "port config all rss xxx" command to mask out unsupported
values and print a log about the modification done to requested config
v5:
* fix local_rss_hf logic in testpmd (the one added in v4)
v6:
* don't remove offload flags from l3fwd-power
* rebase
---
app/test-eventdev/test_perf_common.c | 19 +---
app/test-eventdev/test_pipeline_common.c | 15 +++--
app/test-pmd/cmdline.c| 16 +++---
examples/bond/main.c | 12 ++
examples/distributor/main.c | 11 ++
examples/eventdev_pipeline/main.c | 11 ++
examples/ip_pipeline/link.c | 8 +--
examples/ip_reassembly/main.c | 12 ++
examples/ipsec-secgw/ipsec-secgw.c| 12 ++
examples/l3fwd-acl/main.c | 12 ++
examples/l3fwd-power/main.c | 12 ++
examples/l3fwd-vf/main.c | 12 ++
examples/l3fwd/main.c | 12 ++
examples/load_balancer/init.c | 12 ++
examples/multi_process/symmetric_mp/main.c| 12 ++
.../performance-thread/l3fwd-thread/main.c| 12 ++
examples/qos_meter/main.c | 22 +++
examples/vmdq_dcb/main.c | 13 +++
lib/librte_ethdev/rte_ethdev.h| 8 ---
19 files changed, 230 insertions(+), 13 deletions(-)
diff --git a/app/test-eventdev/test_perf_common.c
b/app/test-eventdev/test_perf_common.c
index eed80d1b1..d0d835d5e 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -700,10 +700,23 @@ perf_ethdev_setup(struct evt_test *test, struct
evt_options *opt)
}
RTE_ETH_FOREACH_DEV(i) {
+ struct rte_eth_dev_info dev_info;
+ struct rte_eth_conf local_port_conf = port_conf;
+
+ rte_eth_dev_info_get(i, &dev_info);
+
+ local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
+ if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+ port_conf.rx_adv_conf.rss_conf.rss_hf) {
+ evt_info("Port %u modified RSS hash function based on
hardware support,"
+ "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+ i,
+ port_conf.rx_adv_conf.rss_conf.rss_hf,
+ local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+ }
- if (rte_eth_dev_configure(i, 1, 1,
- &port_conf)
- < 0) {
+ if (rte_eth_dev_configure(i, 1, 1, &local_port_conf) < 0) {
evt_err("Failed to configure eth port [%d]", i);
return -EINVAL;
}
diff --git a/app/test-eventdev/test_pipeline_common.c
b/app/test-eventdev/test_pipeline_common.c
index 3bc9d513d..239c953e6 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -240,16 +240,27 @@ pipeline_ethdev_setup(struct evt_test *test, struct
evt_options *opt)
RTE_ETH_FOREACH_DEV(i) {
struct rte_eth_dev_info dev_info;
+ struct rte_eth_conf local_port_conf = port_conf;
- memset(&dev_info, 0, sizeof(struct rte_eth_dev_info));
rte_eth_dev_info_get(i, &dev_info);
mt_state = !(dev_info.tx_offload_capa &
DEV_TX_OFFLOAD_MT_LOCKFREE);
rx_conf = dev_info.default_rxconf;
rx_conf.offloads = port_conf.rxmode.offloads;
+ local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
+ if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+ port_conf.rx_adv_conf.rss_conf.rss_hf) {
+ evt_info("Port %u modified RS
Re: [dpdk-dev] [PATCH v9 20/27] ethdev: register ether layer as a class
Hi Andrew, On Wed, Jul 04, 2018 at 03:20:17PM +0300, Andrew Rybchenko wrote: > On 07/04/2018 01:15 AM, Gaetan Rivet wrote: > > Signed-off-by: Gaetan Rivet > > --- > > lib/librte_ethdev/Makefile| 3 +- > > lib/librte_ethdev/rte_class_eth.c | 79 > > +++ > > 2 files changed, 81 insertions(+), 1 deletion(-) > > create mode 100644 lib/librte_ethdev/rte_class_eth.c > > > > diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile > > index 2fa133fbc..d4c3a8d06 100644 > > --- a/lib/librte_ethdev/Makefile > > +++ b/lib/librte_ethdev/Makefile > > @@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API > > CFLAGS += -O3 > > CFLAGS += $(WERROR_FLAGS) > > LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring > > -LDLIBS += -lrte_mbuf > > +LDLIBS += -lrte_mbuf -lrte_kvargs > > EXPORT_MAP := rte_ethdev_version.map > > @@ -20,6 +20,7 @@ LIBABIVER := 9 > > SRCS-y += eth_private.c > > SRCS-y += rte_ethdev.c > > +SRCS-y += rte_class_eth.c > > SRCS-y += rte_flow.c > > SRCS-y += rte_tm.c > > SRCS-y += rte_mtr.c > > meson.build files should be updated as well. The meson version required by DPDK is not available in my distribution. -- Gaëtan Rivet 6WIND
Re: [dpdk-dev] [PATCH v7 0/2] app/testpmd implement VXLAN/NVGRE Encap/Decap
On Wed, Jul 04, 2018 at 03:54:32PM +0100, Ferruh Yigit wrote:
> On 7/2/2018 11:40 AM, Mohammad Abdul Awal wrote:
> >
> > On 27/06/2018 12:45, Nelio Laranjeiro wrote:
> >> This series adds an easy and maintainable configuration version support for
> >> those two actions for 18.08 by using global variables in testpmd to store
> >> the
> >> necessary information for the tunnel encapsulation. Those variables are
> >> used
> >> in conjunction of RTE_FLOW_ACTION_{VXLAN,NVGRE}_ENCAP action to create
> >> easily
> >> the action for flows.
> >>
> >> A common way to use it:
> >>
> >> set vxlan ipv4 4 4 4 127.0.0.1 128.0.0.1 11:11:11:11:11:11
> >> 22:22:22:22:22:22
> >> flow create 0 ingress pattern end actions vxlan_encap / queue index 0 /
> >> end
> >>
> >> set vxlan ipv6 4 4 4 ::1 :: 11:11:11:11:11:11 22:22:22:22:22:22
> >> flow create 0 ingress pattern end actions vxlan_encap / queue index 0 /
> >> end
> >>
> >> set nvgre ipv4 4 127.0.0.1 128.0.0.1 11:11:11:11:11:11 22:22:22:22:22:22
> >> flow create 0 ingress pattern end actions nvgre_encap / queue index 0 /
> >> end
> >>
> >> set nvgre ipv6 4 ::1 :: 11:11:11:11:11:11 22:22:22:22:22:22
> >> flow create 0 ingress pattern end actions nvgre_encap / queue index 0 /
> >> end
> >>
> >> This also replace the proposal done by Mohammad Abdul Awal [1] which
> >> handles
> >> in a more complex way for the same work.
> >>
> >> Note this API has already a modification planned for 18.11 [2] thus those
> >> series should have a limited life for a single release.
> >>
> >> [1] https://dpdk.org/ml/archives/dev/2018-May/101403.html
> >> [2] https://dpdk.org/ml/archives/dev/2018-June/103485.html
> >>
> >> Changes in v7:
> >>
> >> - add missing documentation added in v5 and removed in v6 by mistake.
> >>
> >> Changes in v6:
> >>
> >> - fix compilation under redhat 7.5 with gcc 4.8.5 20150623
> >>
> >> Changes in v5:
> >>
> >> - fix documentation generation.
> >> - add more explanation on how to generate several encapsulated flows.
> >>
> >> Changes in v4:
> >>
> >> - fix big endian issue on vni and tni.
> >> - add samples to the documentation.
> >> - set the VXLAN UDP source port to 0 by default to let the driver generate
> >> it
> >>from the inner hash as described in the RFC 7348.
> >> - use default rte flow mask for each item.
> >>
> >> Changes in v3:
> >>
> >> - support VLAN in the outer encapsulation.
> >> - fix the documentation with missing arguments.
> >>
> >> Changes in v2:
> >>
> >> - add default IPv6 values for NVGRE encapsulation.
> >> - replace VXLAN to NVGRE in comments concerning NVGRE layer.
> >>
> >> Nelio Laranjeiro (2):
> >>app/testpmd: add VXLAN encap/decap support
> >>app/testpmd: add NVGRE encap/decap support
> >>
> >> app/test-pmd/cmdline.c | 252 ++
> >> app/test-pmd/cmdline_flow.c | 274
> >> app/test-pmd/testpmd.c | 32 +++
> >> app/test-pmd/testpmd.h | 32 +++
> >> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 82 ++
> >> 5 files changed, 672 insertions(+)
> >
> >
> > Hi,
> >
> > I have one concern in terms of usability though.
> > In testpmd, the rte_flow command line options have auto-completion with
> > " " format which make using the command very
> > much user friendly.
> >
> > For the command "set vxlan ipv4 4 4 4 127.0.0.1 128.0.0.1
> > 11:11:11:11:11:11 22:22:22:22:22:22", it does not look much user
> > friendly to me. A user may easily lose track of sequence of 9 param
> > items. It would be much user friendly if the options would be like below
> > and has auto-completion.
> >
> > set vxlan ip_ver vni udp_src
> > udp-dst ip_src ip_dst
> > eth_src eth_dst
>
> Hi Nelio, Adrien,
>
> I tend to agree with Awal here, this is to forget/confuse and key-value pairs
> makes it easier to use.
>
> Meanwhile this is an usability improvement and I prefer not to block this
> patch
> for this.
>
> What is your comment on this, how should we proceed?
>
> Thanks,
> ferruh
Hi,
I also agree with this proposal, I'll prepare a v8 with those fix
tokens.
> > This way an user may never feel confused. Can maintainers comment on
> > this point please?
> >
> > Regards,
> > Awal.
Thanks
--
Nélio Laranjeiro
6WIND
Re: [dpdk-dev] [PATCH v8 04/19] ethdev: introduce device lock
> -Original Message-
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Thursday, July 5, 2018 3:23 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org; Burakov, Anatoly ; Ananyev,
> Konstantin ; Richardson, Bruce
> ; Yigit, Ferruh ; Shelton,
> Benjamin H ; Vangati, Narender
> ; arybche...@solarflare.com
> Subject: Re: [dpdk-dev] [PATCH v8 04/19] ethdev: introduce device lock
>
> 05/07/2018 05:37, Zhang, Qi Z:
> > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > 05/07/2018 03:38, Zhang, Qi Z:
> > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > 04/07/2018 12:49, Zhang, Qi Z:
> > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > 04/07/2018 03:47, Zhang, Qi Z:
> > > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > > 03/07/2018 17:08, Zhang, Qi Z:
> > > > > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > > > > 02/07/2018 07:44, Qi Zhang:
> > > > > > > > > > > > Introduce API rte_eth_dev_lock and
> > > > > > > > > > > > rte_eth_dev_unlock to let application lock or
> > > > > > > > > > > > unlock on specific ethdev, a locked device can't
> > > > > > > > > > > > be detached, this help applicaiton to prevent
> > > > > > > > > > > > unexpected device detaching, especially in
> > > > > > > > > > > > multi-process
> > > > > envrionment.
> > > > > > > > > > >
> > > > > > > > > > > Trying to understand: a process of an application
> > > > > > > > > > > could try to detach a port while another process is
> > > > > > > > > > > against this
> > > decision.
> > > > > > > > > > > Why an application needs to be protected against itself?
> > > > > > > > > >
> > > > > > > > > > I think we can regard this as a help function, it help
> > > > > > > > > > application to simplified
> > > > > > > > > the situation when one process want to detach a device
> > > > > > > > > while another one is still using it.
> > > > > > > > > > Application can register a callback which can do to
> > > > > > > > > > necessary clean up (like
> > > > > > > > > stop traffic, release memory ...) before device be detached.
> > > > > > > > >
> > > > > > > > > Yes I agree such hook can be a good idea.
> > > > > [...]
> > > > > > > > > After all, it is just a pre-detach hook.
> > > > > > > >
> > > > > > > > > Wait, how is it different of RTE_ETH_EVENT_DESTROY callback?
> > > > > > > > > Perhaps we just need to improve the handling of the
> > > > > > > > > DESTROY
> > > event?
> > > > > > > >
> > > > > > > > I have thought about this before.
> > > > > > > > Not like RTE_ETH_EVENT_DESTROY and other event hook, the
> > > > > > > > hook here
> > > > > > > need to give feedback, pass or fail will impact the
> > > > > > > following behavior, this make it special, so I separate it
> > > > > > > from all exist rte_eth_event_type handle mechanism.
> > > > > > >
> > > > > > > Look at _rte_eth_dev_callback_process, there is a "ret_param".
> > > > > >
> > > > > > OK, that should work.
> > > > > > >
> > > > > > > > The alternative solution is we just introduce a new event
> > > > > > > > type like RTE_ETH_EVENT_PRE_DETACH and reuse all exist API
> > > > > > > rte_eth_dev_callback_register/rte_eth_dev_callback_unregister.
> > > > > > >
> > > > > > > I don't think we need a new event.
> > > > > > > Let's try to use RTE_ETH_EVENT_DESTROY.
> > > > > >
> > > > > > The problem is RTE_ETH_EVENT_DESTROY is used in
> > > > > rte_eth_dev_release_port already.
> > > > > > And in PMD, rte_eth_dev_release_port is called after
> > > > > > dev_uninit, that mean its too late to reject a detach
> > > > >
> > > > > You're right.
> > > > >
> > > > > It's a real mess currently.
> > > > > The right order should be to remove ethdev ports before removing
> > > > > the underlying EAL device. But it's strangely not the case.
> > > > >
> > > > > We need to separate things.
> > > > > The function rte_eth_dev_close can be used to remove an ethdev
> > > > > port if we add a call to rte_eth_dev_release_port.
> > > > > So we could call rte_eth_dev_close in PMD remove functions.
> > > > > Is "close" a good time to ask confirmation to the application?
> > > > > Or should we ask confirmation a step before, on "stop"?
> > > >
> > > > I think the confirmation should before any cleanup stage, it
> > > > should at the
> > > beginning of driver->remove.
> > >
> > > So you stop a port, even if the app policy is against detaching it?
> >
> > My understanding is, stop and detach is different, we may stop a device and
> reconfigure it then restart it.
> > but for detach, properly we will not use it, unless it be probed again.
> > For dev_close , it should be called after dev_stop.
> > so we have to like below.
> >
> > If (dev->started) {
> > dev_stop /* but still problem here, if traffic is ongoing */
> > if (dev_close()) {
> > dev_start()
> > return -EBUSY.
> > }
> > } else {
> > If (dev_close())
> > Return _EBUSY
> > }
> >
> > So for me, neither
Re: [dpdk-dev] [PATCH v2] net/mlx5: add support for 32bit systems
Hi,
Didn’t see it in our setups (not an excuse), Investigating
Moti
> -Original Message-
> From: Ferruh Yigit [mailto:ferruh.yi...@intel.com]
> Sent: Wednesday, July 4, 2018 4:49 PM
> To: Mordechay Haimovsky ; Shahaf Shuler
>
> Cc: Adrien Mazarguil ; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: add support for 32bit systems
>
> On 7/2/2018 12:11 PM, Moti Haimovsky wrote:
> > This patch adds support for building and running mlx5 PMD on 32bit
> > systems such as i686.
> >
> > The main issue to tackle was handling the 32bit access to the UAR as
> > quoted from the mlx5 PRM:
> > QP and CQ DoorBells require 64-bit writes. For best performance, it is
> > recommended to execute the QP/CQ DoorBell as a single 64-bit write
> > operation. For platforms that do not support 64 bit writes, it is
> > possible to issue the 64 bits DoorBells through two consecutive
> > writes, each write 32 bits, as described below:
> > * The order of writing each of the Dwords is from lower to upper
> > addresses.
> > * No other DoorBell can be rung (or even start ringing) in the midst of
> > an on-going write of a DoorBell over a given UAR page.
> > The last rule implies that in a multi-threaded environment, the access
> > to a UAR page (which can be accessible by all threads in the process)
> > must be synchronized (for example, using a semaphore) unless an atomic
> > write of 64 bits in a single bus operation is guaranteed. Such a
> > synchronization is not required for when ringing DoorBells on
> > different UAR pages.
> >
> > Signed-off-by: Moti Haimovsky
> > ---
> > v2:
> > * Fixed coding style issues.
> > * Modified documentation according to review inputs.
> > * Fixed merge conflicts.
> > ---
> > doc/guides/nics/features/mlx5.ini | 1 +
> > doc/guides/nics/mlx5.rst | 6 +++-
> > drivers/net/mlx5/mlx5.c | 8 -
> > drivers/net/mlx5/mlx5.h | 5 +++
> > drivers/net/mlx5/mlx5_defs.h | 18 --
> > drivers/net/mlx5/mlx5_rxq.c | 6 +++-
> > drivers/net/mlx5/mlx5_rxtx.c | 22 +++--
> > drivers/net/mlx5/mlx5_rxtx.h | 69
> ++-
> > drivers/net/mlx5/mlx5_txq.c | 13 +++-
> > 9 files changed, 131 insertions(+), 17 deletions(-)
> >
> > diff --git a/doc/guides/nics/features/mlx5.ini
> > b/doc/guides/nics/features/mlx5.ini
> > index e75b14b..b28b43e 100644
> > --- a/doc/guides/nics/features/mlx5.ini
> > +++ b/doc/guides/nics/features/mlx5.ini
> > @@ -43,5 +43,6 @@ Multiprocess aware = Y
> > Other kdrv = Y
> > ARMv8= Y
> > Power8 = Y
> > +x86-32 = Y
> > x86-64 = Y
> > Usage doc= Y
> > diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
> > 7dd9c1c..5fbad60 100644
> > --- a/doc/guides/nics/mlx5.rst
> > +++ b/doc/guides/nics/mlx5.rst
> > @@ -49,7 +49,7 @@ libibverbs.
> > Features
> >
> >
> > -- Multi arch support: x86_64, POWER8, ARMv8.
> > +- Multi arch support: x86_64, POWER8, ARMv8, i686.
> > - Multiple TX and RX queues.
> > - Support for scattered TX and RX frames.
> > - IPv4, IPv6, TCPv4, TCPv6, UDPv4 and UDPv6 RSS on any number of
> queues.
> > @@ -477,6 +477,10 @@ RMDA Core with Linux Kernel
> > - Minimal kernel version : v4.14 or the most recent 4.14-rc (see
> > `Linux installation documentation`_)
> > - Minimal rdma-core version: v15+ commit 0c5f5765213a ("Merge pull
> request #227 from yishaih/tm")
> >(see `RDMA Core installation documentation`_)
> > +- When building for i686 use:
> > +
> > + - rdma-core version 18.0 or above built with 32bit support.
>
> related "or above" part, v19 giving build errors with mlx5, FYI.
>
> And with v18 getting build errors originated from rdma headers [1], am I
> doing something wrong?
>
> [1]
> In file included from .../dpdk/drivers/net/mlx5/mlx5_glue.c:20:
> .../rdma-core/build32/include/infiniband/mlx5dv.h: In function
> ‘mlx5dv_x86_set_data_seg’:
> .../rdma-core/build32/include/infiniband/mlx5dv.h:787:69: error: right shift
> count >= width of type [-Werror=shift-count-overflow]
> __m128i val = _mm_set_epi32((uint32_t)address, (uint32_t)(address >>
> 32), lkey, length);
> ^~
[dpdk-dev] [PATCH] security: fix segfault when destroy NULL session
rte_security_session_destroy should return -EINVAL is session is NULL,
but segfaults because of rte_mempool_from_obj(NULL) call.
Fixes: c261d1431bd8 ("security: introduce security API and framework")
Cc: sta...@dpdk.org
Signed-off-by: Radu Nicolau
---
lib/librte_security/rte_security.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/librte_security/rte_security.c
b/lib/librte_security/rte_security.c
index 1e559c9..f862e94 100644
--- a/lib/librte_security/rte_security.c
+++ b/lib/librte_security/rte_security.c
@@ -91,7 +91,6 @@ rte_security_session_destroy(struct rte_security_ctx
*instance,
struct rte_security_session *sess)
{
int ret;
- struct rte_mempool *mp = rte_mempool_from_obj(sess);
RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->session_destroy, -ENOTSUP);
@@ -100,7 +99,7 @@ rte_security_session_destroy(struct rte_security_ctx
*instance,
ret = instance->ops->session_destroy(instance->device, sess);
if (!ret)
- rte_mempool_put(mp, (void *)sess);
+ rte_mempool_put(rte_mempool_from_obj(sess), (void *)sess);
return ret;
}
--
2.7.5
[dpdk-dev] [PATCH v5 00/16] Cryptodev API changes
API changes in the cryptodev library, announced in the previous release, 18.05. Changes in v5: - Modified .ini files with new SGL/OOP flags - Modified overview cryptodev documentation, removing the clarification note on scatter-gather limitations and including the meaning of the new feature flags Changes in v4: - Fixed MVSAM max number of sessions (Tomasz Duszynksi) - Changed OUT_OF_PLACE to OOP in feature flags (Akhil Goyal) - Added missing feature flags in aesni_gcm and openssl PMDs (Akhil Goyal) - Removed unneeded config parameters (related to max number of sessions) (Akhil Goyal) - Restructured code in crypto-perf and l2fwd-crypto to calculate number of sessions needed (Akhil Goyal) Changes in v3: - Rephrased comments for new sgl feature flags - Added patch checking if there a device supports symmetric sessions - Extended PMD session API renaming Changes in v2: - Instead of removing max_nb_sessions in info structure, a new value `0` is allowed, to indicate that the PMD does not have any limitation on the number of sessions to be managed - Modified crypto applications to check for new value `0` on max_nb_sessions - Modified MVSAM PMD to parse max_nb_sessions, since that parameter is not generic to any PMD anymore - Removed attach/detach session API, as announced - Removed deprecated function that was not removed in previous patchset - Renamed PMD symmetric session API, to allow asymmetric session API to be added in the future Pablo de Lara (16): cryptodev: replace bus specific struct with generic dev cryptodev: remove max number of sessions per queue app/crypto-perf: limit number of sessions test/crypto: limit number of sessions examples/l2fwd-crypto: limit number of sessions examples/ipsec-secgw: check for max supported sessions crypto/mvsam: parse max number of sessions cryptodev: define value for unlimited sessions cryptodev: remove max number of sessions parameter doc: remove unneeded deprecation notice cryptodev: remove queue start/stop functions cryptodev: remove old get session size functions cryptodev: replace mbuf scatter gather flag cryptodev: remove attach/detach session API cryptodev: rename PMD symmetric session API cryptodev: check if symmetric sessions are supported app/test-crypto-perf/main.c| 34 - config/common_base | 7 - config/rte_config.h| 7 - doc/guides/cryptodevs/dpaa2_sec.rst| 5 - doc/guides/cryptodevs/dpaa_sec.rst | 5 - doc/guides/cryptodevs/features/aesni_gcm.ini | 3 +- doc/guides/cryptodevs/features/default.ini | 6 +- doc/guides/cryptodevs/features/dpaa2_sec.ini | 6 +- doc/guides/cryptodevs/features/dpaa_sec.ini| 6 +- doc/guides/cryptodevs/features/null.ini| 2 +- doc/guides/cryptodevs/features/openssl.ini | 3 +- doc/guides/cryptodevs/features/qat.ini | 6 +- doc/guides/cryptodevs/overview.rst | 32 +++- doc/guides/prog_guide/cryptodev_lib.rst| 7 +- doc/guides/rel_notes/deprecation.rst | 25 doc/guides/rel_notes/release_18_08.rst | 30 +++- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 14 +- drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 39 ++--- drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h | 2 - drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 13 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 39 ++--- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 2 - drivers/crypto/armv8/rte_armv8_pmd.c | 11 +- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 39 ++--- drivers/crypto/armv8/rte_armv8_pmd_private.h | 2 - drivers/crypto/ccp/ccp_crypto.c| 28 ++-- drivers/crypto/ccp/ccp_pmd_ops.c | 37 ++--- drivers/crypto/ccp/ccp_pmd_private.h | 1 - drivers/crypto/ccp/rte_ccp_pmd.c | 20 +-- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c| 52 +++ drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 2 - drivers/crypto/dpaa_sec/dpaa_sec.c | 81 ++- drivers/crypto/dpaa_sec/dpaa_sec.h | 1 + drivers/crypto/kasumi/rte_kasumi_pmd.c | 11 +- drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 39 ++--- drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 - drivers/crypto/mvsam/rte_mrvl_pmd.c| 134 +++-- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c| 46 ++ drivers/crypto/null/null_crypto_pmd.c | 13 +- drivers/crypto/null/null_crypto_pmd_ops.c | 39 ++--- drivers/crypto/null/null_crypto_pmd_private.h | 1 - drivers/crypto/openssl/rte_openssl_pmd.c | 14 +- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 39 ++--- drivers/crypto/openssl/rte_opens
[dpdk-dev] [PATCH v5 01/16] cryptodev: replace bus specific struct with generic dev
Structure rte_cryptodev_info has currently PCI device
information ("struct rte_pci_device") in it.
This information is not generic to all devices,
so this gets replaced with the generic "rte_device" structure,
compatible with all crypto devices.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
doc/guides/prog_guide/cryptodev_lib.rst | 2 +-
doc/guides/rel_notes/deprecation.rst | 2 --
doc/guides/rel_notes/release_18_08.rst | 5 -
drivers/crypto/qat/qat_sym_pmd.c | 1 -
drivers/crypto/virtio/virtio_cryptodev.c | 1 -
lib/librte_cryptodev/rte_cryptodev.c | 1 +
lib/librte_cryptodev/rte_cryptodev.h | 6 +++---
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst
b/doc/guides/prog_guide/cryptodev_lib.rst
index 30f0bcf7a..d02bb7514 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -269,7 +269,7 @@ relevant information for the device.
struct rte_cryptodev_info {
const char *driver_name;
uint8_t driver_id;
-struct rte_pci_device *pci_dev;
+struct rte_device *device;
uint64_t feature_flags;
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 1ce692eac..b71080bb8 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -104,8 +104,6 @@ Deprecation Notices
- Removal of ``sym`` structure in ``rte_cryptodev_info`` structure,
containing fields not relevant anymore since the session mempool
is not internal in the crypto device anymore.
- - Replacement of ``pci_dev`` field with the more generic ``rte_device``
-structure.
- Functions ``rte_cryptodev_queue_pair_attach_sym_session()`` and
``rte_cryptodev_queue_pair_dettach_sym_session()`` will be deprecated from
18.05 and removed in 18.08, as there are no drivers doing anything useful
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index bc0124295..6bf53dc31 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -60,6 +60,9 @@ API Changes
Also, make sure to start the actual text at the margin.
=
+* cryptodev: In struct ``struct rte_cryptodev_info``, field ``rte_pci_device
*pci_dev``
+ has been replaced with field ``struct rte_device *device``.
+
ABI Changes
---
@@ -118,7 +121,7 @@ The libraries prepended with a plus sign were incremented
in this version.
librte_cmdline.so.2
librte_common_octeontx.so.1
librte_compressdev.so.1
- librte_cryptodev.so.4
+ + librte_cryptodev.so.5
librte_distributor.so.1
librte_eal.so.7
librte_ethdev.so.9
diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c
index 115639089..0bc042a75 100644
--- a/drivers/crypto/qat/qat_sym_pmd.c
+++ b/drivers/crypto/qat/qat_sym_pmd.c
@@ -74,7 +74,6 @@ static void qat_sym_dev_info_get(struct rte_cryptodev *dev,
info->capabilities = internals->qat_dev_capabilities;
info->sym.max_nb_sessions = QAT_SYM_PMD_MAX_NB_SESSIONS;
info->driver_id = cryptodev_qat_driver_id;
- info->pci_dev = RTE_DEV_TO_PCI(dev->device);
}
}
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c
b/drivers/crypto/virtio/virtio_cryptodev.c
index df88953f6..482edea1a 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1409,7 +1409,6 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
if (info != NULL) {
info->driver_id = cryptodev_virtio_driver_id;
- info->pci_dev = RTE_DEV_TO_PCI(dev->device);
info->feature_flags = dev->feature_flags;
info->max_nb_queue_pairs = hw->max_dataqueues;
info->sym.max_nb_sessions =
diff --git a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index 7e5821246..457ac5670 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -966,6 +966,7 @@ rte_cryptodev_info_get(uint8_t dev_id, struct
rte_cryptodev_info *dev_info)
(*dev->dev_ops->dev_infos_get)(dev, dev_info);
dev_info->driver_name = dev->device->driver->name;
+ dev_info->device = dev->device;
}
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index ccc0f73fd..6b5f32bda 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -334,9 +334,9 @@ rte_cryptodev_get_feature_name(uint64_t flag);
/** Crypto device information */
struct rte_cryptodev_info {
- const char *driver_name;/**< Driver name. */
- uint8_t driver_id; /**< Driver identifier */
- struct rte_pci_device *pci_dev;
[dpdk-dev] [PATCH v5 02/16] cryptodev: remove max number of sessions per queue
The cryptodev info structure currently contains
the maximum number of sessions that can be used in a queue pair.
This is only set in DPAA_SEC PMD, and since it is calculated
based on the maximum number of sessions (which is not used
anymore), this field can be removed.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
drivers/crypto/dpaa_sec/dpaa_sec.c | 3 ---
lib/librte_cryptodev/rte_cryptodev.h | 4
2 files changed, 7 deletions(-)
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 06f7e4373..73cae483b 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -2215,9 +2215,6 @@ dpaa_sec_dev_infos_get(struct rte_cryptodev *dev,
info->feature_flags = dev->feature_flags;
info->capabilities = dpaa_sec_capabilities;
info->sym.max_nb_sessions = internals->max_nb_sessions;
- info->sym.max_nb_sessions_per_qp =
- RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS /
- RTE_DPAA_MAX_NB_SEC_QPS;
info->driver_id = cryptodev_driver_id;
}
}
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 6b5f32bda..114c9fd6e 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -350,10 +350,6 @@ struct rte_cryptodev_info {
struct {
unsigned max_nb_sessions;
/**< Maximum number of sessions supported by device. */
- unsigned int max_nb_sessions_per_qp;
- /**< Maximum number of sessions per queue pair.
-* Default 0 for infinite sessions
-*/
} sym;
};
--
2.14.4
[dpdk-dev] [PATCH v5 03/16] app/crypto-perf: limit number of sessions
Instead of creating a fixed number of sessions,
calculate the necessary number based on number of devices
and queue pairs used.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
app/test-crypto-perf/main.c | 34 +++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 4ae14390b..74e2165a4 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -21,7 +21,6 @@
#include "cperf_test_verify.h"
#include "cperf_test_pmd_cyclecount.h"
-#define NUM_SESSIONS 2048
#define SESS_MEMPOOL_CACHE_SIZE 64
const char *cperf_test_type_strs[] = {
@@ -67,6 +66,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts,
uint8_t *enabled_cdevs,
struct rte_mempool *session_pool_socket[])
{
uint8_t enabled_cdev_count = 0, nb_lcores, cdev_id;
+ uint32_t sessions_needed = 0;
unsigned int i, j;
int ret;
@@ -149,15 +149,43 @@ cperf_initialize_cryptodev(struct cperf_options *opts,
uint8_t *enabled_cdevs,
.nb_descriptors = opts->nb_descriptors
};
+ uint32_t dev_max_nb_sess = cdev_info.sym.max_nb_sessions;
+ /*
+* Two sessions objects are required for each session
+* (one for the header, one for the private data)
+*/
+ if (!strcmp((const char *)opts->device_type,
+ "crypto_scheduler")) {
+#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+ uint32_t nb_slaves =
+ rte_cryptodev_scheduler_slaves_get(cdev_id,
+ NULL);
+
+ sessions_needed = 2 * enabled_cdev_count *
+ opts->nb_qps * nb_slaves;
+#endif
+ } else
+ sessions_needed = 2 * enabled_cdev_count *
+ opts->nb_qps;
+
+ /*
+* A single session is required per queue pair
+* in each device
+*/
+ if (dev_max_nb_sess < opts->nb_qps) {
+ RTE_LOG(ERR, USER1,
+ "Device does not support at least "
+ "%u sessions\n", opts->nb_qps);
+ return -ENOTSUP;
+ }
if (session_pool_socket[socket_id] == NULL) {
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *sess_mp;
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
"sess_mp_%u", socket_id);
-
sess_mp = rte_mempool_create(mp_name,
- NUM_SESSIONS,
+ sessions_needed,
max_sess_size,
SESS_MEMPOOL_CACHE_SIZE,
0, NULL, NULL, NULL,
--
2.14.4
[dpdk-dev] [PATCH v5 05/16] examples/l2fwd-crypto: limit number of sessions
Calculate the number of sessions required for the application,
knowing that there is only one session required per device.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
examples/l2fwd-crypto/main.c | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 4bca87b19..db364cf5d 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -42,6 +42,9 @@
#include
#include
#include
+#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+#include
+#endif
enum cdev_type {
CDEV_TYPE_ANY,
@@ -59,7 +62,6 @@ enum cdev_type {
#define MAX_AAD_SIZE 65535
#define MAX_PKT_BURST 32
#define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
-#define MAX_SESSIONS 32
#define SESSION_POOL_CACHE_SIZE 0
#define MAXIMUM_IV_LENGTH 16
@@ -1973,6 +1975,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options
*options, unsigned nb_ports,
unsigned int cdev_id, cdev_count, enabled_cdev_count = 0;
const struct rte_cryptodev_capabilities *cap;
unsigned int sess_sz, max_sess_sz = 0;
+ uint32_t sessions_needed = 0;
int retval;
cdev_count = rte_cryptodev_count();
@@ -2010,6 +2013,21 @@ initialize_cryptodevs(struct l2fwd_crypto_options
*options, unsigned nb_ports,
rte_cryptodev_info_get(cdev_id, &dev_info);
+ /*
+* Two sessions objects are required for each session
+* (one for the header, one for the private data)
+*/
+ if (!strcmp(dev_info.driver_name, "crypto_scheduler")) {
+#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+ uint32_t nb_slaves =
+ rte_cryptodev_scheduler_slaves_get(cdev_id,
+ NULL);
+
+ sessions_needed = 2 * enabled_cdev_count * nb_slaves;
+#endif
+ } else
+ sessions_needed = 2 * enabled_cdev_count;
+
if (session_pool_socket[socket_id] == NULL) {
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *sess_mp;
@@ -2022,7 +2040,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options
*options, unsigned nb_ports,
* device private data
*/
sess_mp = rte_mempool_create(mp_name,
- MAX_SESSIONS * 2,
+ sessions_needed,
max_sess_sz,
SESSION_POOL_CACHE_SIZE,
0, NULL, NULL, NULL,
--
2.14.4
[dpdk-dev] [PATCH v5 04/16] test/crypto: limit number of sessions
Instead of using the maximum number of sessions
allowed by the PMDs (which will change to unlimited most
of the PMDs), limit the number to a small sufficient amount.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
test/test/test_cryptodev.c | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 389f79677..5c906cfae 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -39,6 +39,7 @@
#include "test_cryptodev_hmac_test_vectors.h"
#define VDEV_ARGS_SIZE 100
+#define MAX_NB_SESSIONS4
static int gbl_driver_id;
@@ -435,9 +436,16 @@ testsuite_setup(void)
* Create mempool with maximum number of sessions * 2,
* to include the session headers
*/
+ if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+ RTE_LOG(ERR, USER1, "Device does not support "
+ "at least %u sessions\n",
+ MAX_NB_SESSIONS);
+ return TEST_FAILED;
+ }
+
ts_params->session_mpool = rte_mempool_create(
"test_sess_mp",
- info.sym.max_nb_sessions * 2,
+ MAX_NB_SESSIONS * 2,
session_size,
0, 0, NULL, NULL, NULL,
NULL, SOCKET_ID_ANY,
@@ -6499,10 +6507,10 @@ test_multi_session(void)
sessions = rte_malloc(NULL,
(sizeof(struct rte_cryptodev_sym_session *) *
- dev_info.sym.max_nb_sessions) + 1, 0);
+ MAX_NB_SESSIONS) + 1, 0);
/* Create multiple crypto sessions*/
- for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+ for (i = 0; i < MAX_NB_SESSIONS; i++) {
sessions[i] = rte_cryptodev_sym_session_create(
ts_params->session_mpool);
@@ -6551,7 +6559,7 @@ test_multi_session(void)
TEST_ASSERT_NULL(sessions[i],
"Session creation succeeded unexpectedly!");
- for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+ for (i = 0; i < MAX_NB_SESSIONS; i++) {
rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
sessions[i]);
rte_cryptodev_sym_session_free(sessions[i]);
@@ -6610,7 +6618,7 @@ test_multi_session_random_usage(void)
sessions = rte_malloc(NULL,
(sizeof(struct rte_cryptodev_sym_session *)
- * dev_info.sym.max_nb_sessions) + 1, 0);
+ * MAX_NB_SESSIONS) + 1, 0);
for (i = 0; i < MB_SESSION_NUMBER; i++) {
sessions[i] = rte_cryptodev_sym_session_create(
@@ -8538,6 +8546,13 @@ test_scheduler_attach_slave_op(void)
unsigned int session_size =
rte_cryptodev_sym_get_private_session_size(i);
+ if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+ RTE_LOG(ERR, USER1,
+ "Device does not support "
+ "at least %u sessions\n",
+ MAX_NB_SESSIONS);
+ return TEST_FAILED;
+ }
/*
* Create mempool with maximum number of sessions * 2,
* to include the session headers
@@ -8545,7 +8560,7 @@ test_scheduler_attach_slave_op(void)
if (ts_params->session_mpool == NULL) {
ts_params->session_mpool = rte_mempool_create(
"test_sess_mp",
- info.sym.max_nb_sessions * 2,
+ MAX_NB_SESSIONS * 2,
session_size,
0, 0, NULL, NULL, NULL,
NULL, SOCKET_ID_ANY,
--
2.14.4
[dpdk-dev] [PATCH v5 06/16] examples/ipsec-secgw: check for max supported sessions
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
examples/ipsec-secgw/ipsec-secgw.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index a5da8b280..2582dcb6e 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1440,6 +1440,12 @@ cryptodevs_init(void)
dev_conf.socket_id = rte_cryptodev_socket_id(cdev_id);
dev_conf.nb_queue_pairs = qp;
+ uint32_t dev_max_sess = cdev_info.sym.max_nb_sessions;
+ if (dev_max_sess < (CDEV_MP_NB_OBJS / 2))
+ rte_exit(EXIT_FAILURE,
+ "Device does not support at least %u "
+ "sessions", CDEV_MP_NB_OBJS / 2);
+
if (!socket_ctx[dev_conf.socket_id].session_pool) {
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *sess_mp;
--
2.14.4
[dpdk-dev] [PATCH v5 07/16] crypto/mvsam: parse max number of sessions
The maximum number of sessions device argument will be removed,
as most PMDs do not have a limitation on this number.
Therefore, the MVSAM PMD needs to parse this value internally.
Signed-off-by: Pablo de Lara
---
drivers/crypto/mvsam/rte_mrvl_pmd.c | 132
1 file changed, 120 insertions(+), 12 deletions(-)
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c
b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 1b6029a56..a7f5389ee 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -16,8 +16,23 @@
#define MRVL_MUSDK_DMA_MEMSIZE 41943040
+#define MRVL_PMD_MAX_NB_SESS_ARG ("max_nb_sessions")
+#define MRVL_PMD_DEFAULT_MAX_NB_SESSIONS 2048
+
static uint8_t cryptodev_driver_id;
+struct mrvl_pmd_init_params {
+ struct rte_cryptodev_pmd_init_params common;
+ uint32_t max_nb_sessions;
+};
+
+const char *mrvl_pmd_valid_params[] = {
+ RTE_CRYPTODEV_PMD_NAME_ARG,
+ RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG,
+ RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+ MRVL_PMD_MAX_NB_SESS_ARG
+};
+
/**
* Flag if particular crypto algorithm is supported by PMD/MUSDK.
*
@@ -691,14 +706,15 @@ mrvl_crypto_pmd_dequeue_burst(void *queue_pair,
static int
cryptodev_mrvl_crypto_create(const char *name,
struct rte_vdev_device *vdev,
- struct rte_cryptodev_pmd_init_params *init_params)
+ struct mrvl_pmd_init_params *init_params)
{
struct rte_cryptodev *dev;
struct mrvl_crypto_private *internals;
struct sam_init_params sam_params;
int ret;
- dev = rte_cryptodev_pmd_create(name, &vdev->device, init_params);
+ dev = rte_cryptodev_pmd_create(name, &vdev->device,
+ &init_params->common);
if (dev == NULL) {
MRVL_CRYPTO_LOG_ERR("failed to create cryptodev vdev");
goto init_error;
@@ -718,7 +734,7 @@ cryptodev_mrvl_crypto_create(const char *name,
/* Set vector instructions mode supported */
internals = dev->data->dev_private;
- internals->max_nb_qpairs = init_params->max_nb_queue_pairs;
+ internals->max_nb_qpairs = init_params->common.max_nb_queue_pairs;
internals->max_nb_sessions = init_params->max_nb_sessions;
/*
@@ -740,12 +756,99 @@ cryptodev_mrvl_crypto_create(const char *name,
init_error:
MRVL_CRYPTO_LOG_ERR(
- "driver %s: %s failed", init_params->name, __func__);
+ "driver %s: %s failed", init_params->common.name, __func__);
cryptodev_mrvl_crypto_uninit(vdev);
return -EFAULT;
}
+/** Parse integer from integer argument */
+static int
+parse_integer_arg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ int *i = (int *) extra_args;
+
+ *i = atoi(value);
+ if (*i < 0) {
+ MRVL_CRYPTO_LOG_ERR("Argument has to be positive.\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+/** Parse name */
+static int
+parse_name_arg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ struct rte_cryptodev_pmd_init_params *params = extra_args;
+
+ if (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
+ MRVL_CRYPTO_LOG_ERR("Invalid name %s, should be less than "
+ "%u bytes.\n", value,
+ RTE_CRYPTODEV_NAME_MAX_LEN - 1);
+ return -EINVAL;
+ }
+
+ strncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);
+
+ return 0;
+}
+
+static int
+mrvl_pmd_parse_input_args(struct mrvl_pmd_init_params *params,
+const char *input_args)
+{
+ struct rte_kvargs *kvlist = NULL;
+ int ret = 0;
+
+ if (params == NULL)
+ return -EINVAL;
+
+ if (input_args) {
+ kvlist = rte_kvargs_parse(input_args,
+ mrvl_pmd_valid_params);
+ if (kvlist == NULL)
+ return -1;
+
+ /* Common VDEV parameters */
+ ret = rte_kvargs_process(kvlist,
+RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG,
+&parse_integer_arg,
+¶ms->common.max_nb_queue_pairs);
+ if (ret < 0)
+ goto free_kvlist;
+
+ ret = rte_kvargs_process(kvlist,
+RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+&parse_integer_arg,
+¶ms->common.socket_id);
+ if (ret < 0)
+ goto free_kvlist;
+
+ ret = rte_kvargs_process(kvlist,
+RTE_CRYPTODEV_PMD_NAME_ARG,
+&parse_name_arg,
+
[dpdk-dev] [PATCH v5 08/16] cryptodev: define value for unlimited sessions
Currently, the info structure contains the maximum number
of sessions that a device can manage.
This field was useful when the session mempool was created inside
each device, but now it is created at the application level.
Most PMDs do not have a limitation on the sessions managed,
but a few do, therefore this field must remain in the structure.
However, a new value, 0, can be used to indicate that
a device does not have an actual maximum of sessions.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
app/test-crypto-perf/main.c| 2 +-
doc/guides/rel_notes/release_18_08.rst | 2 ++
examples/ipsec-secgw/ipsec-secgw.c | 2 +-
lib/librte_cryptodev/rte_cryptodev.h | 5 -
test/test/test_cryptodev.c | 6 --
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 74e2165a4..2181d0193 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -172,7 +172,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts,
uint8_t *enabled_cdevs,
* A single session is required per queue pair
* in each device
*/
- if (dev_max_nb_sess < opts->nb_qps) {
+ if (dev_max_nb_sess != 0 && dev_max_nb_sess < opts->nb_qps) {
RTE_LOG(ERR, USER1,
"Device does not support at least "
"%u sessions\n", opts->nb_qps);
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index 6bf53dc31..2b994ee78 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -62,6 +62,8 @@ API Changes
* cryptodev: In struct ``struct rte_cryptodev_info``, field ``rte_pci_device
*pci_dev``
has been replaced with field ``struct rte_device *device``.
+ Value 0 is accepted in ``sym.max_nb_sessions``, meaning that a device
+ supports an unlimited number of sessions.
ABI Changes
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index 2582dcb6e..dacf323c9 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1441,7 +1441,7 @@ cryptodevs_init(void)
dev_conf.nb_queue_pairs = qp;
uint32_t dev_max_sess = cdev_info.sym.max_nb_sessions;
- if (dev_max_sess < (CDEV_MP_NB_OBJS / 2))
+ if (dev_max_sess != 0 && dev_max_sess < (CDEV_MP_NB_OBJS / 2))
rte_exit(EXIT_FAILURE,
"Device does not support at least %u "
"sessions", CDEV_MP_NB_OBJS / 2);
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 114c9fd6e..7989eb876 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -349,7 +349,10 @@ struct rte_cryptodev_info {
struct {
unsigned max_nb_sessions;
- /**< Maximum number of sessions supported by device. */
+ /**< Maximum number of sessions supported by device.
+* If 0, the device does not have any limitation in
+* number of sessions that can be used.
+*/
} sym;
};
diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 5c906cfae..73aadaced 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -436,7 +436,8 @@ testsuite_setup(void)
* Create mempool with maximum number of sessions * 2,
* to include the session headers
*/
- if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+ if (info.sym.max_nb_sessions != 0 &&
+ info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
RTE_LOG(ERR, USER1, "Device does not support "
"at least %u sessions\n",
MAX_NB_SESSIONS);
@@ -8546,7 +8547,8 @@ test_scheduler_attach_slave_op(void)
unsigned int session_size =
rte_cryptodev_sym_get_private_session_size(i);
- if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+ if (info.sym.max_nb_sessions != 0 &&
+ info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
RTE_LOG(ERR, USER1,
"Device does not support "
"at least %u sessions\n",
--
2.14.4
[dpdk-dev] [PATCH v5 09/16] cryptodev: remove max number of sessions parameter
Most crypto PMDs do not have a limitation of the number of the sessions that can be handled internally. The value that was set before was not actually used at all, since the sessions are created at the application level. Therefore, this value is not parsed from the initial crypto parameters anymore and it is set to 0, meaning that there is no actual limit. Signed-off-by: Pablo de Lara --- config/common_base | 7 --- config/rte_config.h| 7 --- doc/guides/cryptodevs/dpaa2_sec.rst| 5 - doc/guides/cryptodevs/dpaa_sec.rst | 5 - doc/guides/prog_guide/cryptodev_lib.rst| 5 ++--- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 5 + drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 3 ++- drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h | 2 -- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 5 + drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 3 ++- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 2 -- drivers/crypto/armv8/rte_armv8_pmd.c | 5 + drivers/crypto/armv8/rte_armv8_pmd_ops.c | 3 ++- drivers/crypto/armv8/rte_armv8_pmd_private.h | 2 -- drivers/crypto/ccp/ccp_pmd_ops.c | 3 ++- drivers/crypto/ccp/ccp_pmd_private.h | 1 - drivers/crypto/ccp/rte_ccp_pmd.c | 16 +--- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c| 4 ++-- drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 2 -- drivers/crypto/dpaa_sec/dpaa_sec.h | 1 + drivers/crypto/kasumi/rte_kasumi_pmd.c | 5 + drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 3 ++- drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 -- drivers/crypto/null/null_crypto_pmd.c | 5 + drivers/crypto/null/null_crypto_pmd_ops.c | 3 ++- drivers/crypto/null/null_crypto_pmd_private.h | 1 - drivers/crypto/openssl/rte_openssl_pmd.c | 5 + drivers/crypto/openssl/rte_openssl_pmd_ops.c | 3 ++- drivers/crypto/openssl/rte_openssl_pmd_private.h | 2 -- drivers/crypto/qat/qat_sym_pmd.c | 6 +++--- drivers/crypto/qat/qat_sym_pmd.h | 1 - drivers/crypto/scheduler/scheduler_pmd.c | 13 + drivers/crypto/scheduler/scheduler_pmd_ops.c | 14 +++--- drivers/crypto/snow3g/rte_snow3g_pmd.c | 5 + drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 3 ++- drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 2 -- drivers/crypto/virtio/virtio_cryptodev.c | 7 +++ drivers/crypto/zuc/rte_zuc_pmd.c | 5 + drivers/crypto/zuc/rte_zuc_pmd_ops.c | 3 ++- drivers/crypto/zuc/rte_zuc_pmd_private.h | 2 -- lib/librte_cryptodev/rte_cryptodev_pmd.c | 12 ++-- lib/librte_cryptodev/rte_cryptodev_pmd.h | 4 42 files changed, 48 insertions(+), 144 deletions(-) diff --git a/config/common_base b/config/common_base index 4236e295b..e84307c66 100644 --- a/config/common_base +++ b/config/common_base @@ -472,14 +472,12 @@ CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n # Compile NXP DPAA2 crypto sec driver for CAAM HW # CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n -CONFIG_RTE_DPAA2_SEC_PMD_MAX_NB_SESSIONS=2048 # # NXP DPAA caam - crypto driver # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4 -CONFIG_RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS=2048 # # Compile PMD for QuickAssist based devices @@ -498,11 +496,6 @@ CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y # Number of maximum virtio crypto devices # CONFIG_RTE_MAX_VIRTIO_CRYPTO=32 -# -# Number of sessions to create in the session memory pool -# on a single virtio crypto device. -# -CONFIG_RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS=1024 # # Compile PMD for AESNI backed device diff --git a/config/rte_config.h b/config/rte_config.h index 0ba0ead7e..8a3432aca 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -90,15 +90,8 @@ #define RTE_PMD_QAT_MAX_PCI_DEVICES 48 /* virtio crypto defines */ -#define RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS 1024 #define RTE_MAX_VIRTIO_CRYPTO 32 -/* DPAA2_SEC */ -#define RTE_DPAA2_SEC_PMD_MAX_NB_SESSIONS 2048 - -/* DPAA_SEC */ -#define RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS 2048 - /* DPAA SEC max cryptodev devices*/ #define RTE_LIBRTE_DPAA_MAX_CRYPTODEV 4 diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3ea24c8aa..990befeb7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -200,11 +200,6 @@ Please note that enabling debugging options may affect system performance. By default it is only enabled in defconfig_arm64-dpaa2-* config. Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. -* ``CONFIG_RTE_DPAA2_SEC_PMD_MAX_NB_SESSIONS`` - By default it is set
[dpdk-dev] [PATCH v5 11/16] cryptodev: remove queue start/stop functions
Removed cryptodev queue start/stop functions,
as they were marked deprecated in 18.05, since they
were not implemented by any driver.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
doc/guides/rel_notes/deprecation.rst | 4 ---
doc/guides/rel_notes/release_18_08.rst | 5 +++
drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 18 ---
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 18 ---
drivers/crypto/armv8/rte_armv8_pmd_ops.c | 18 ---
drivers/crypto/ccp/ccp_pmd_ops.c | 16 --
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c| 22 -
drivers/crypto/dpaa_sec/dpaa_sec.c | 22 -
drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 18 ---
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c| 28
drivers/crypto/null/null_crypto_pmd_ops.c | 18 ---
drivers/crypto/openssl/rte_openssl_pmd_ops.c | 18 ---
drivers/crypto/qat/qat_sym_pmd.c | 2 --
drivers/crypto/scheduler/scheduler_pmd_ops.c | 18 ---
drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 18 ---
drivers/crypto/virtio/virtio_cryptodev.c | 2 --
drivers/crypto/zuc/rte_zuc_pmd_ops.c | 18 ---
lib/librte_cryptodev/rte_cryptodev.c | 44 --
lib/librte_cryptodev/rte_cryptodev.h | 37 --
lib/librte_cryptodev/rte_cryptodev_pmd.h | 26 ---
lib/librte_cryptodev/rte_cryptodev_version.map | 2 --
21 files changed, 5 insertions(+), 367 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index dc014da21..91592534e 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -105,10 +105,6 @@ Deprecation Notices
``rte_cryptodev_queue_pair_dettach_sym_session()`` will be deprecated from
18.05 and removed in 18.08, as there are no drivers doing anything useful
with them.
- - Functions ``rte_cryptodev_queue_pair_start()`` and
-``rte_cryptodev_queue_pair_stop()`` will be deprecated from 18.05
-and removed in 18.08, as there are no drivers doing anything useful
-with them.
- Some feature flags such as ``RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER`` are
ambiguous,
so some will be replaced by more explicit flags.
- Function ``rte_cryptodev_get_header_session_size()`` will be deprecated
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index 2b994ee78..cfb2885a1 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -65,6 +65,11 @@ API Changes
Value 0 is accepted in ``sym.max_nb_sessions``, meaning that a device
supports an unlimited number of sessions.
+* cryptodev: Following functions were deprecated and are removed in 18.08:
+
+ - ``rte_cryptodev_queue_pair_start``
+ - ``rte_cryptodev_queue_pair_stop``
+
ABI Changes
---
diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
index 1f4edc0f2..489d2e08f 100644
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
@@ -242,22 +242,6 @@ aesni_gcm_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t
qp_id,
return -1;
}
-/** Start queue pair */
-static int
-aesni_gcm_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
- __rte_unused uint16_t queue_pair_id)
-{
- return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-aesni_gcm_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev,
- __rte_unused uint16_t queue_pair_id)
-{
- return -ENOTSUP;
-}
-
/** Return the number of allocated queue pairs */
static uint32_t
aesni_gcm_pmd_qp_count(struct rte_cryptodev *dev)
@@ -339,8 +323,6 @@ struct rte_cryptodev_ops aesni_gcm_pmd_ops = {
.queue_pair_setup = aesni_gcm_pmd_qp_setup,
.queue_pair_release = aesni_gcm_pmd_qp_release,
- .queue_pair_start = aesni_gcm_pmd_qp_start,
- .queue_pair_stop= aesni_gcm_pmd_qp_stop,
.queue_pair_count = aesni_gcm_pmd_qp_count,
.session_get_size = aesni_gcm_pmd_session_get_size,
diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index 6cd4134af..b806c4d52 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -509,22 +509,6 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t
qp_id,
return -1;
}
-/** Start queue pair */
-static int
-aesni_mb_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
- __rte_unused uint16_t queue_pair_id)
-{
- return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-aesni_mb_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev,
-
[dpdk-dev] [PATCH v5 12/16] cryptodev: remove old get session size functions
Removed rte_cryptodev_get_header_session_size
and rte_cryptodev_get_private_session_size functions,
as they have been substituted with functions
specific for symmetric operations, with _sym_ word
after "rte_cryptodev_".
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
doc/guides/rel_notes/deprecation.rst | 6 --
doc/guides/rel_notes/release_18_08.rst | 8
lib/librte_cryptodev/rte_cryptodev.c | 12
lib/librte_cryptodev/rte_cryptodev.h | 25 -
lib/librte_cryptodev/rte_cryptodev_version.map | 2 --
5 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 91592534e..9a73b1d8e 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -107,9 +107,3 @@ Deprecation Notices
with them.
- Some feature flags such as ``RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER`` are
ambiguous,
so some will be replaced by more explicit flags.
- - Function ``rte_cryptodev_get_header_session_size()`` will be deprecated
-in 18.05, and it gets replaced with
``rte_cryptodev_sym_get_header_session_size()``.
-It will be removed in 18.08.
- - Function ``rte_cryptodev_get_private_session_size()`` will be deprecated
-in 18.05, and it gets replaced with
``rte_cryptodev_sym_get_private_session_size()``.
-It will be removed in 18.08.
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index cfb2885a1..e482d3d5f 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -70,6 +70,14 @@ API Changes
- ``rte_cryptodev_queue_pair_start``
- ``rte_cryptodev_queue_pair_stop``
+* cryptodev: Following functions were deprecated and are replaced by
+ other functions in 18.08:
+
+ - ``rte_cryptodev_get_header_session_size`` is replaced with
+``rte_cryptodev_sym_get_header_session_size``
+ - ``rte_cryptodev_get_private_session_size`` is replaced with
+``rte_cryptodev_sym_get_private_session_size``
+
ABI Changes
---
diff --git a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index a07904fb9..381330f3d 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1181,12 +1181,6 @@ rte_cryptodev_sym_session_free(struct
rte_cryptodev_sym_session *sess)
return 0;
}
-unsigned int
-rte_cryptodev_get_header_session_size(void)
-{
- return rte_cryptodev_sym_get_header_session_size();
-}
-
unsigned int
rte_cryptodev_sym_get_header_session_size(void)
{
@@ -1198,12 +1192,6 @@ rte_cryptodev_sym_get_header_session_size(void)
return ((sizeof(void *) * nb_drivers) + sizeof(uint8_t));
}
-unsigned int
-rte_cryptodev_get_private_session_size(uint8_t dev_id)
-{
- return rte_cryptodev_sym_get_private_session_size(dev_id);
-}
-
unsigned int
rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
{
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index b5d208917..cc219c722 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -898,31 +898,6 @@ int
rte_cryptodev_sym_session_clear(uint8_t dev_id,
struct rte_cryptodev_sym_session *sess);
-/**
- * @deprecated
- * Get the size of the header session, for all registered drivers.
- *
- * @return
- * Size of the header session.
- */
-__rte_deprecated
-unsigned int
-rte_cryptodev_get_header_session_size(void);
-
-/**
- * @deprecated
- * Get the size of the private session data for a device.
- *
- * @param dev_id The device identifier.
- *
- * @return
- * - Size of the private data, if successful
- * - 0 if device is invalid or does not have private session
- */
-__rte_deprecated
-unsigned int
-rte_cryptodev_get_private_session_size(uint8_t dev_id);
-
/**
* Get the size of the header session, for all registered drivers.
*
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map
b/lib/librte_cryptodev/rte_cryptodev_version.map
index 020b45754..0ab6d5195 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -63,8 +63,6 @@ DPDK_17.08 {
rte_cryptodev_driver_id_get;
rte_cryptodev_driver_name_get;
rte_cryptodev_get_aead_algo_enum;
- rte_cryptodev_get_header_session_size;
- rte_cryptodev_get_private_session_size;
rte_cryptodev_sym_capability_check_aead;
rte_cryptodev_sym_session_init;
rte_cryptodev_sym_session_clear;
--
2.14.4
[dpdk-dev] [PATCH v5 10/16] doc: remove unneeded deprecation notice
In release 18.05, a deprecation notice to remove the `sym` structure in the cryptodev info structure was sent. However, only one of the fields inside the structure will be removed, so the notice is not actually correct. In any case, it needs to be removed. Signed-off-by: Pablo de Lara Acked-by: Akhil Goyal --- doc/guides/rel_notes/deprecation.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index b71080bb8..dc014da21 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -101,9 +101,6 @@ Deprecation Notices * cryptodev: The following changes will be made in the library for 18.08: - - Removal of ``sym`` structure in ``rte_cryptodev_info`` structure, -containing fields not relevant anymore since the session mempool -is not internal in the crypto device anymore. - Functions ``rte_cryptodev_queue_pair_attach_sym_session()`` and ``rte_cryptodev_queue_pair_dettach_sym_session()`` will be deprecated from 18.05 and removed in 18.08, as there are no drivers doing anything useful -- 2.14.4
[dpdk-dev] [PATCH v5 14/16] cryptodev: remove attach/detach session API
As announced in the previous release,
The API to attach/dettach a session to a queue pair
is removed, as it was only used in DPAA, and it is not
actually needed.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
doc/guides/rel_notes/deprecation.rst | 8
doc/guides/rel_notes/release_18_08.rst | 2 +
drivers/crypto/dpaa_sec/dpaa_sec.c | 32 +--
drivers/crypto/virtio/virtio_cryptodev.c | 4 +-
lib/librte_cryptodev/rte_cryptodev.c | 54 --
lib/librte_cryptodev/rte_cryptodev.h | 36 -
lib/librte_cryptodev/rte_cryptodev_pmd.h | 30 --
lib/librte_cryptodev/rte_cryptodev_version.map | 2 -
8 files changed, 4 insertions(+), 164 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 62d635b74..8bdaaaf5d 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -97,11 +97,3 @@ Deprecation Notices
- ``rte_pdump_set_socket_dir`` will be removed;
- The parameter, ``path``, of ``rte_pdump_init`` will be removed;
- The enum ``rte_pdump_socktype`` will be removed.
-
-* cryptodev: The following changes will be made in the library
- for 18.08:
-
- - Functions ``rte_cryptodev_queue_pair_attach_sym_session()`` and
-``rte_cryptodev_queue_pair_dettach_sym_session()`` will be deprecated from
-18.05 and removed in 18.08, as there are no drivers doing anything useful
-with them.
diff --git a/doc/guides/rel_notes/release_18_08.rst
b/doc/guides/rel_notes/release_18_08.rst
index 9cf3ea3df..ef03f4ef6 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst
@@ -69,6 +69,8 @@ API Changes
- ``rte_cryptodev_queue_pair_start``
- ``rte_cryptodev_queue_pair_stop``
+ - ``rte_cryptodev_queue_pair_attach_sym_session``
+ - ``rte_cryptodev_queue_pair_detach_sym_session``
* cryptodev: Following functions were deprecated and are replaced by
other functions in 18.08:
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 49ff7584e..f540bb4ad 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -1734,34 +1734,6 @@ dpaa_sec_attach_sess_q(struct dpaa_sec_qp *qp,
dpaa_sec_session *sess)
return ret;
}
-static int
-dpaa_sec_qp_attach_sess(struct rte_cryptodev *dev __rte_unused,
- uint16_t qp_id __rte_unused,
- void *ses __rte_unused)
-{
- PMD_INIT_FUNC_TRACE();
- return 0;
-}
-
-static int
-dpaa_sec_qp_detach_sess(struct rte_cryptodev *dev,
- uint16_t qp_id __rte_unused,
- void *ses)
-{
- dpaa_sec_session *sess = ses;
- struct dpaa_sec_dev_private *qi = dev->data->dev_private;
-
- PMD_INIT_FUNC_TRACE();
-
- if (sess->inq)
- dpaa_sec_detach_rxq(qi, sess->inq);
- sess->inq = NULL;
-
- sess->qp = NULL;
-
- return 0;
-}
-
static int
dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,
struct rte_crypto_sym_xform *xform, void *sess)
@@ -2210,9 +2182,7 @@ static struct rte_cryptodev_ops crypto_ops = {
.queue_pair_count = dpaa_sec_queue_pair_count,
.session_get_size = dpaa_sec_session_get_size,
.session_configure= dpaa_sec_session_configure,
- .session_clear= dpaa_sec_session_clear,
- .qp_attach_session= dpaa_sec_qp_attach_sess,
- .qp_detach_session= dpaa_sec_qp_detach_sess,
+ .session_clear= dpaa_sec_session_clear
};
static const struct rte_security_capability *
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c
b/drivers/crypto/virtio/virtio_cryptodev.c
index 0be435c8c..f7021b38b 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -520,9 +520,7 @@ static struct rte_cryptodev_ops virtio_crypto_dev_ops = {
/* Crypto related operations */
.session_get_size = virtio_crypto_sym_get_session_private_size,
.session_configure = virtio_crypto_sym_configure_session,
- .session_clear = virtio_crypto_sym_clear_session,
- .qp_attach_session = NULL,
- .qp_detach_session = NULL
+ .session_clear = virtio_crypto_sym_clear_session
};
static void
diff --git a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index 608db36c7..8f990b9ab 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1095,60 +1095,6 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
return sess;
}
-int
-rte_cryptodev_queue_pair_attach_sym_session(uint8_t dev_id, uint16_t qp_id,
- struct rte_cryptodev_sym_session *sess)
-{
- struct rte_cryptodev *dev;
-
- if (!rte_cryptodev_pmd_is_valid_dev
[dpdk-dev] [PATCH v5 13/16] cryptodev: replace mbuf scatter gather flag
The current mbuf scatter gatter feature flag is too ambiguous, as it is not clear if input and/or output buffers can be scatter gather mbufs or not, plus if in-place and/or out-of-place is supported. Therefore, five new flags will replace this flag: - RTE_CRYPTODEV_FF_IN_PLACE_SGL - RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT - RTE_CRYPTODEV_FF_OOP_SGL_IN_FB_OUT - RTE_CRYPTODEV_FF_OOP_FB_IN_SGL_OUT - RTE_CRYPTODEV_FF_OOP_FB_IN_FB_OUT Signed-off-by: Pablo de Lara --- doc/guides/cryptodevs/features/aesni_gcm.ini | 3 +- doc/guides/cryptodevs/features/default.ini | 6 +++- doc/guides/cryptodevs/features/dpaa2_sec.ini | 6 +++- doc/guides/cryptodevs/features/dpaa_sec.ini | 6 +++- doc/guides/cryptodevs/features/null.ini | 2 +- doc/guides/cryptodevs/features/openssl.ini | 3 +- doc/guides/cryptodevs/features/qat.ini | 6 +++- doc/guides/cryptodevs/overview.rst | 32 ++- doc/guides/rel_notes/deprecation.rst | 2 -- doc/guides/rel_notes/release_18_08.rst | 8 + drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 3 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++- drivers/crypto/dpaa_sec/dpaa_sec.c | 6 +++- drivers/crypto/null/null_crypto_pmd.c| 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +- drivers/crypto/qat/qat_sym_pmd.c | 6 +++- lib/librte_cryptodev/rte_cryptodev.c | 12 ++-- lib/librte_cryptodev/rte_cryptodev.h | 46 +++- test/test/test_cryptodev.c | 31 +-- test/test/test_cryptodev_blockcipher.c | 21 ++--- 20 files changed, 157 insertions(+), 53 deletions(-) diff --git a/doc/guides/cryptodevs/features/aesni_gcm.ini b/doc/guides/cryptodevs/features/aesni_gcm.ini index 920b6b6ac..65811e2fe 100644 --- a/doc/guides/cryptodevs/features/aesni_gcm.ini +++ b/doc/guides/cryptodevs/features/aesni_gcm.ini @@ -10,7 +10,8 @@ CPU AESNI = Y CPU SSE= Y CPU AVX= Y CPU AVX2 = Y -Mbuf scatter gather= Y +OOP SGL In FB Out = Y +OOP FB In FB Out = Y ; ; Supported crypto algorithms of the 'aesni_gcm' crypto driver. ; diff --git a/doc/guides/cryptodevs/features/default.ini b/doc/guides/cryptodevs/features/default.ini index 42783887a..82efe3e31 100644 --- a/doc/guides/cryptodevs/features/default.ini +++ b/doc/guides/cryptodevs/features/default.ini @@ -18,7 +18,11 @@ CPU AVX512 = CPU AESNI = CPU NEON = CPU ARM CE = -Mbuf scatter gather= +In Place SGL = +OOP SGL In SGL Out = +OOP SGL In FB Out = +OOP FB In SGL Out = +OOP FB In FB Out = ; ; Supported crypto algorithms of a default crypto driver. diff --git a/doc/guides/cryptodevs/features/dpaa2_sec.ini b/doc/guides/cryptodevs/features/dpaa2_sec.ini index 68c9960d8..5f23fde51 100644 --- a/doc/guides/cryptodevs/features/dpaa2_sec.ini +++ b/doc/guides/cryptodevs/features/dpaa2_sec.ini @@ -8,7 +8,11 @@ Symmetric crypto = Y Sym operation chaining = Y HW Accelerated = Y Protocol offload = Y -Mbuf scatter gather= Y +In Place SGL = Y +OOP SGL In SGL Out = Y +OOP SGL In FB Out = Y +OOP FB In SGL Out = Y +OOP FB In FB Out = Y ; ; Supported crypto algorithms of the 'dpaa2_sec' crypto driver. diff --git a/doc/guides/cryptodevs/features/dpaa_sec.ini b/doc/guides/cryptodevs/features/dpaa_sec.ini index 260fae728..521faeab6 100644 --- a/doc/guides/cryptodevs/features/dpaa_sec.ini +++ b/doc/guides/cryptodevs/features/dpaa_sec.ini @@ -8,7 +8,11 @@ Symmetric crypto = Y Sym operation chaining = Y HW Accelerated = Y Protocol offload = Y -Mbuf scatter gather= Y +In Place SGL = Y +OOP SGL In SGL Out = Y +OOP SGL In FB Out = Y +OOP FB In SGL Out = Y +OOP FB In FB Out = Y ; ; Supported crypto algorithms of the 'dpaa_sec' crypto driver. diff --git a/doc/guides/cryptodevs/features/null.ini b/doc/guides/cryptodevs/features/null.ini index a9e172da8..ecf5779ac 100644 --- a/doc/guides/cryptodevs/features/null.ini +++ b/doc/guides/cryptodevs/features/null.ini @@ -6,7 +6,7 @@ [Features] Symmetric crypto = Y Sym operation chaining = Y -Mbuf scatter gather= Y +In Place SGL = Y ; ; Supported crypto algorithms of the 'null' crypto driver. diff --git a/doc/guides/cryptodevs/features/openssl.ini b/doc/guides/cryptodevs/features/openssl.ini index 691565865..5f03166b9 100644 --- a/doc/guides/cryptodevs/features/openssl.ini +++ b/doc/guides/cryptodevs/features/openssl.ini @@ -6,7 +6,8 @@ [Features] Symmetric crypto = Y Sym operation chaining = Y -Mbuf scatter gather= Y +OOP SGL In FB Out = Y +OOP FB In FB Out = Y ; ; Supported crypto algorithms of the 'openssl' crypto driver. diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
[dpdk-dev] [PATCH v5 15/16] cryptodev: rename PMD symmetric session API
The PMD specific API to configure, clear and
obtain session private size is renamed, including
the word _sym_ to clarify that it is API
for symmetric sessions, so there will not be any
conflicts for asymmetric and other type of sessions
in the future.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 6 +++---
drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 18 -
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 8
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 18 -
drivers/crypto/armv8/rte_armv8_pmd.c | 6 +++---
drivers/crypto/armv8/rte_armv8_pmd_ops.c | 18 -
drivers/crypto/ccp/ccp_crypto.c| 28 +-
drivers/crypto/ccp/ccp_pmd_ops.c | 18 -
drivers/crypto/ccp/rte_ccp_pmd.c | 4 ++--
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c| 20 +-
drivers/crypto/dpaa_sec/dpaa_sec.c | 20 +-
drivers/crypto/kasumi/rte_kasumi_pmd.c | 6 +++---
drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 18 -
drivers/crypto/mvsam/rte_mrvl_pmd.c| 2 +-
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c| 18 -
drivers/crypto/null/null_crypto_pmd.c | 6 +++---
drivers/crypto/null/null_crypto_pmd_ops.c | 18 -
drivers/crypto/openssl/rte_openssl_pmd.c | 6 +++---
drivers/crypto/openssl/rte_openssl_pmd_ops.c | 18 -
drivers/crypto/qat/qat_sym.c | 2 +-
drivers/crypto/qat/qat_sym.h | 2 +-
drivers/crypto/qat/qat_sym_pmd.c | 6 +++---
drivers/crypto/qat/qat_sym_session.c | 6 +++---
drivers/crypto/scheduler/scheduler_pmd_ops.c | 14 ++---
drivers/crypto/snow3g/rte_snow3g_pmd.c | 6 +++---
drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 18 -
drivers/crypto/virtio/virtio_cryptodev.c | 10 -
drivers/crypto/virtio/virtio_rxtx.c| 2 +-
drivers/crypto/zuc/rte_zuc_pmd.c | 6 +++---
drivers/crypto/zuc/rte_zuc_pmd_ops.c | 18 -
lib/librte_cryptodev/rte_cryptodev.c | 11 +-
lib/librte_cryptodev/rte_cryptodev_pmd.h | 10 -
32 files changed, 184 insertions(+), 183 deletions(-)
diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
index ce740e97a..9df3740bf 100644
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
@@ -127,7 +127,7 @@ aesni_gcm_get_session(struct aesni_gcm_qp *qp, struct
rte_crypto_op *op)
if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
if (likely(sym_op->session != NULL))
sess = (struct aesni_gcm_session *)
- get_session_private_data(
+ get_sym_session_private_data(
sym_op->session,
cryptodev_driver_id);
} else {
@@ -149,8 +149,8 @@ aesni_gcm_get_session(struct aesni_gcm_qp *qp, struct
rte_crypto_op *op)
sess = NULL;
}
sym_op->session = (struct rte_cryptodev_sym_session *)_sess;
- set_session_private_data(sym_op->session, cryptodev_driver_id,
- _sess_private_data);
+ set_sym_session_private_data(sym_op->session,
+ cryptodev_driver_id, _sess_private_data);
}
if (unlikely(sess == NULL))
diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
index 489d2e08f..b6b4dd028 100644
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
@@ -251,14 +251,14 @@ aesni_gcm_pmd_qp_count(struct rte_cryptodev *dev)
/** Returns the size of the aesni gcm session structure */
static unsigned
-aesni_gcm_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
+aesni_gcm_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
{
return sizeof(struct aesni_gcm_session);
}
/** Configure a aesni gcm session from a crypto xform chain */
static int
-aesni_gcm_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
+aesni_gcm_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused,
struct rte_crypto_sym_xform *xform,
struct rte_cryptodev_sym_session *sess,
struct rte_mempool *mempool)
@@ -287,7 +287,7 @@ aesni_gcm_pmd_session_configure(struct rte_cryptodev *dev
__rte_unused,
return ret;
}
- set_session_private_data(sess, dev->driver_id,
+ set_sym_session_private_data(sess, dev->driver_id,
sess_privat
[dpdk-dev] [PATCH v5 16/16] cryptodev: check if symmetric sessions are supported
Since asymmetric functionality will be implemented soon,
not all PMDs must support symmetric sessions.
Therefore, a check is added if a device does not implement
the symmetric functions, meaning that the device does not
support symmetric operations.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
lib/librte_cryptodev/rte_cryptodev.c | 4
lib/librte_cryptodev/rte_cryptodev.h | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index 3860b0b23..26d43fd3d 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1063,6 +1063,8 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
index = dev->driver_id;
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP);
+
if (sess->sess_private_data[index] == NULL) {
ret = dev->dev_ops->sym_session_configure(dev, xforms,
sess, mp);
@@ -1107,6 +1109,8 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id,
if (dev == NULL || sess == NULL)
return -EINVAL;
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP);
+
dev->dev_ops->sym_session_clear(dev, sess);
return 0;
diff --git a/lib/librte_cryptodev/rte_cryptodev.h
b/lib/librte_cryptodev/rte_cryptodev.h
index 2049a745d..27dc7a297 100644
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -888,7 +888,8 @@ rte_cryptodev_sym_session_free(struct
rte_cryptodev_sym_session *sess);
* @return
* - On success, zero.
* - -EINVAL if input parameters are invalid.
- * - -ENOTSUP if crypto device does not support the crypto transform.
+ * - -ENOTSUP if crypto device does not support the crypto transform or
+ *does not support symmetric operations.
* - -ENOMEM if the private session could not be allocated.
*/
int
@@ -909,6 +910,7 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
* @return
* - 0 if successful.
* - -EINVAL if device is invalid or session is NULL.
+ * - -ENOTSUP if crypto device does not support symmetric operations.
*/
int
rte_cryptodev_sym_session_clear(uint8_t dev_id,
--
2.14.4
[dpdk-dev] [PATCH 0/2] Enable eal event hotplug for i40e
As we may know, we have eal event for rte device hotplug and ethdev event for ethdev hotplug. Some ethdev need to use eal event to detect hotplug behaviors, the privors way is register eal event callback in app, but seems that it will have some race between these 2 event process. In oder to fix the problem, it might be better to find a way to combind these 2 events detect. This patch set introduce a way to combind these 2 event, by register the eal event callback in pmd driver and trigger the ethdev hotplug event in the callback. That will let the ethdev device can easy process hotplug by a common way. Here let i40 pmd driver for example, other driver which support hotplug feature could be use this way to enable hotplug. Jeff Guo (2): net/i40e: enable hotplug in i40e testpmd: remove the dev event callback register app/test-pmd/testpmd.c | 76 -- drivers/net/i40e/i40e_ethdev.c | 46 - 2 files changed, 45 insertions(+), 77 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 2/2] testpmd: remove the dev event callback register
Since now we can use driver to management the eal event for hotplug,
so no need to register dev event callback in app anymore. This patch
remove the related code.
Signed-off-by: Jeff Guo
---
app/test-pmd/testpmd.c | 76 --
1 file changed, 76 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 24c1998..10ed660 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -400,12 +400,6 @@ static void check_all_ports_link_status(uint32_t
port_mask);
static int eth_event_callback(portid_t port_id,
enum rte_eth_event_type type,
void *param, void *ret_param);
-static void eth_dev_event_callback(char *device_name,
- enum rte_dev_event_type type,
- void *param);
-static int eth_dev_event_callback_register(void);
-static int eth_dev_event_callback_unregister(void);
-
/*
* Check if all the ports are started.
@@ -1915,39 +1909,6 @@ reset_port(portid_t pid)
printf("Done\n");
}
-static int
-eth_dev_event_callback_register(void)
-{
- int ret;
-
- /* register the device event callback */
- ret = rte_dev_event_callback_register(NULL,
- eth_dev_event_callback, NULL);
- if (ret) {
- printf("Failed to register device event callback\n");
- return -1;
- }
-
- return 0;
-}
-
-
-static int
-eth_dev_event_callback_unregister(void)
-{
- int ret;
-
- /* unregister the device event callback */
- ret = rte_dev_event_callback_unregister(NULL,
- eth_dev_event_callback, NULL);
- if (ret < 0) {
- printf("Failed to unregister device event callback\n");
- return -1;
- }
-
- return 0;
-}
-
void
attach_port(char *identifier)
{
@@ -2049,10 +2010,6 @@ pmd_test_exit(void)
RTE_LOG(ERR, EAL,
"fail to stop device event monitor.");
- ret = eth_dev_event_callback_unregister();
- if (ret)
- RTE_LOG(ERR, EAL,
- "fail to unregister all event callbacks.");
}
printf("\nBye...\n");
@@ -2191,37 +2148,6 @@ eth_event_callback(portid_t port_id, enum
rte_eth_event_type type, void *param,
return 0;
}
-/* This function is used by the interrupt thread */
-static void
-eth_dev_event_callback(char *device_name, enum rte_dev_event_type type,
-__rte_unused void *arg)
-{
- if (type >= RTE_DEV_EVENT_MAX) {
- fprintf(stderr, "%s called upon invalid event %d\n",
- __func__, type);
- fflush(stderr);
- }
-
- switch (type) {
- case RTE_DEV_EVENT_REMOVE:
- RTE_LOG(ERR, EAL, "The device: %s has been removed!\n",
- device_name);
- /* TODO: After finish failure handle, begin to stop
-* packet forward, stop port, close port, detach port.
-*/
- break;
- case RTE_DEV_EVENT_ADD:
- RTE_LOG(ERR, EAL, "The device: %s has been added!\n",
- device_name);
- /* TODO: After finish kernel driver binding,
-* begin to attach port.
-*/
- break;
- default:
- break;
- }
-}
-
static int
set_tx_queue_stats_mapping_registers(portid_t port_id, struct rte_port *port)
{
@@ -2735,8 +2661,6 @@ main(int argc, char** argv)
rte_errno = EINVAL;
return -1;
}
- eth_dev_event_callback_register();
-
}
if (start_port(RTE_PORT_ALL) != 0)
--
2.7.4
[dpdk-dev] [PATCH 1/2] net/i40e: enable hotplug in i40e
This patch aim to enable hotplug in i40e pmd driver. Firstly it set
the flags RTE_PCI_DRV_INTR_RMV in drv_flags to announce the hotplug
ability, and then use rte_dev_event_callback_register to register
the hotplug event callback to eal, when eal detect the hotplug event,
will call the callback to process it, if the event is hotplug remove,
it will trigger the RTE_ETH_EVENT_INTR_RMV event into ethdev callback
to letapp process the hotplug for the ethdev.
This is an example for other driver, that if any driver support hotplug
feature could be use this way to enable hotplug
Signed-off-by: Jeff Guo
---
drivers/net/i40e/i40e_ethdev.c | 46 +-
1 file changed, 45 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 13c5d32..ad4231f 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -688,7 +688,7 @@ static int eth_i40e_pci_remove(struct rte_pci_device
*pci_dev)
static struct rte_pci_driver rte_i40e_pmd = {
.id_table = pci_id_i40e_map,
.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
-RTE_PCI_DRV_IOVA_AS_VA,
+RTE_PCI_DRV_IOVA_AS_VA | RTE_PCI_DRV_INTR_RMV,
.probe = eth_i40e_pci_probe,
.remove = eth_i40e_pci_remove,
};
@@ -1183,6 +1183,47 @@ i40e_aq_debug_write_global_register(struct i40e_hw *hw,
return i40e_aq_debug_write_register(hw, reg_addr, reg_val, cmd_details);
}
+static void
+eth_dev_event_callback(char *device_name, enum rte_dev_event_type type,
+ __rte_unused void *arg)
+{
+ uint32_t pid;
+
+ if (type >= RTE_DEV_EVENT_MAX) {
+ fprintf(stderr, "%s called upon invalid event %d\n",
+ __func__, type);
+ fflush(stderr);
+ }
+
+ switch (type) {
+ case RTE_DEV_EVENT_REMOVE:
+ PMD_DRV_LOG(INFO, "The device: %s has been removed!\n",
+ device_name);
+
+ if (!device_name)
+ return;
+
+ for (pid = 0; pid < RTE_MAX_ETHPORTS; pid++) {
+ if (rte_eth_devices[pid].device) {
+ if (!strcmp(device_name,
+ rte_eth_devices[pid].device->name)) {
+ _rte_eth_dev_callback_process(
+ &rte_eth_devices[pid],
+ RTE_ETH_EVENT_INTR_RMV, NULL);
+ continue;
+ }
+ }
+ }
+ break;
+ case RTE_DEV_EVENT_ADD:
+ RTE_LOG(INFO, EAL, "The device: %s has been added!\n",
+ device_name);
+ break;
+ default:
+ break;
+ }
+}
+
static int
eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
{
@@ -1442,6 +1483,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void
*init_params __rte_unused)
rte_intr_callback_register(intr_handle,
i40e_dev_interrupt_handler, dev);
+ /* register the device event callback */
+ rte_dev_event_callback_register(NULL, eth_dev_event_callback, NULL);
+
/* configure and enable device interrupt */
i40e_pf_config_irq0(hw, TRUE);
i40e_pf_enable_irq0(hw);
--
2.7.4
Re: [dpdk-dev] [PATCH] common/qat: replace snprintf
> -Original Message- > From: Trahe, Fiona > Sent: Monday, July 2, 2018 6:26 PM > To: dev@dpdk.org > Cc: De Lara Guarch, Pablo ; Trahe, Fiona > ; Jozwiak, TomaszX > Subject: [PATCH] common/qat: replace snprintf > > Replaced snprintf with strlcpy for safer string copy > > Signed-off-by: Fiona Trahe > Signed-off-by: Tomasz Jozwiak Applied to dpdk-next-crypto. Thanks, Pablo
Re: [dpdk-dev] [PATCH] security: fix segfault when destroy NULL session
On 7/5/2018 3:34 PM, Radu Nicolau wrote:
rte_security_session_destroy should return -EINVAL is session is NULL,
but segfaults because of rte_mempool_from_obj(NULL) call.
Fixes: c261d1431bd8 ("security: introduce security API and framework")
Cc: sta...@dpdk.org
Signed-off-by: Radu Nicolau
---
Acked-by: Akhil Goyal
Re: [dpdk-dev] [PATCH v2] crypto/virtio: fix iv physical address
Hi Jianjay,
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Zhoujian (jay)
> Sent: Tuesday, July 3, 2018 1:29 PM
> To: Zhang, Roy Fan ; dev@dpdk.org
> Cc: De Lara Guarch, Pablo ; sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] crypto/virtio: fix iv physical address
>
> > -Original Message-
> > From: Fan Zhang [mailto:roy.fan.zh...@intel.com]
> > Sent: Tuesday, June 26, 2018 10:11 AM
> > To: dev@dpdk.org
> > Cc: pablo.de.lara.gua...@intel.com; Zhoujian (jay)
> > ; sta...@dpdk.org
> > Subject: [PATCH v2] crypto/virtio: fix iv physical address
> >
> > The physical address of IV required by Virtio was computed using
> > crypto operations' physical address plus the offset. However not all
> > crypto ops will have physical address field initialized and compute it
> > runtimely
> is costly.
> > This patch fixes this problem by adding iv field in
> > virtio_crypto_op_cookie and does a memcpy of iv instead.
> >
> > Fixes: 82adb12a1fce ("crypto/virtio: support burst enqueue/dequeue")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Fan Zhang
> > ---
> >
> > v2:
> > - change max iv size to 16
> > - use branch to avoid unnecessary memcpy
> >
> > drivers/crypto/virtio/virtio_cryptodev.c | 6 ++
> > drivers/crypto/virtio/virtio_cryptodev.h | 3 +++
> > drivers/crypto/virtio/virtio_rxtx.c | 14 +-
> > 3 files changed, 22 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/crypto/virtio/virtio_cryptodev.c
> > b/drivers/crypto/virtio/virtio_cryptodev.c
> > index df88953f6..6ffa7619c 100644
> > --- a/drivers/crypto/virtio/virtio_cryptodev.c
> > +++ b/drivers/crypto/virtio/virtio_cryptodev.c
> > @@ -1223,6 +1223,12 @@ virtio_crypto_sym_pad_op_ctrl_req(
> > /* Get cipher xform from crypto xform chain */
> > cipher_xform = virtio_crypto_get_cipher_xform(xform);
> > if (cipher_xform) {
> > + if (cipher_xform->iv.length > VIRTIO_CRYPTO_MAX_IV_SIZE) {
> > + VIRTIO_CRYPTO_SESSION_LOG_ERR(
> > + "cipher IV cannot longer than %u",
>
> Hi Fan,
>
> As I mentioned in V1, do you agree to use "cipher IV length" or "cipher IV
> size"
> instead of "cipher IV" here?
Fan is out of office this week. Since this is a minor change,
I can apply it and make that change on the fly.
Thanks,
Pablo
>
> Apart from that,
>
> Reviewed-by:
Re: [dpdk-dev] [PATCH v8 04/19] ethdev: introduce device lock
05/07/2018 11:54, Zhang, Qi Z:
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > 05/07/2018 05:37, Zhang, Qi Z:
> > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > 05/07/2018 03:38, Zhang, Qi Z:
> > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > 04/07/2018 12:49, Zhang, Qi Z:
> > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > 04/07/2018 03:47, Zhang, Qi Z:
> > > > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > > > 03/07/2018 17:08, Zhang, Qi Z:
> > > > > > > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > > > > > > > 02/07/2018 07:44, Qi Zhang:
> > > > > > > > > > > > > Introduce API rte_eth_dev_lock and
> > > > > > > > > > > > > rte_eth_dev_unlock to let application lock or
> > > > > > > > > > > > > unlock on specific ethdev, a locked device can't
> > > > > > > > > > > > > be detached, this help applicaiton to prevent
> > > > > > > > > > > > > unexpected device detaching, especially in
> > > > > > > > > > > > > multi-process
> > > > > > envrionment.
> > > > > > > > > > > >
> > > > > > > > > > > > Trying to understand: a process of an application
> > > > > > > > > > > > could try to detach a port while another process is
> > > > > > > > > > > > against this
> > > > decision.
> > > > > > > > > > > > Why an application needs to be protected against itself?
> > > > > > > > > > >
> > > > > > > > > > > I think we can regard this as a help function, it help
> > > > > > > > > > > application to simplified
> > > > > > > > > > the situation when one process want to detach a device
> > > > > > > > > > while another one is still using it.
> > > > > > > > > > > Application can register a callback which can do to
> > > > > > > > > > > necessary clean up (like
> > > > > > > > > > stop traffic, release memory ...) before device be detached.
> > > > > > > > > >
> > > > > > > > > > Yes I agree such hook can be a good idea.
> > > > > > [...]
> > > > > > > > > > After all, it is just a pre-detach hook.
> > > > > > > > >
> > > > > > > > > > Wait, how is it different of RTE_ETH_EVENT_DESTROY callback?
> > > > > > > > > > Perhaps we just need to improve the handling of the
> > > > > > > > > > DESTROY
> > > > event?
> > > > > > > > >
> > > > > > > > > I have thought about this before.
> > > > > > > > > Not like RTE_ETH_EVENT_DESTROY and other event hook, the
> > > > > > > > > hook here
> > > > > > > > need to give feedback, pass or fail will impact the
> > > > > > > > following behavior, this make it special, so I separate it
> > > > > > > > from all exist rte_eth_event_type handle mechanism.
> > > > > > > >
> > > > > > > > Look at _rte_eth_dev_callback_process, there is a "ret_param".
> > > > > > >
> > > > > > > OK, that should work.
> > > > > > > >
> > > > > > > > > The alternative solution is we just introduce a new event
> > > > > > > > > type like RTE_ETH_EVENT_PRE_DETACH and reuse all exist API
> > > > > > > > rte_eth_dev_callback_register/rte_eth_dev_callback_unregister.
> > > > > > > >
> > > > > > > > I don't think we need a new event.
> > > > > > > > Let's try to use RTE_ETH_EVENT_DESTROY.
> > > > > > >
> > > > > > > The problem is RTE_ETH_EVENT_DESTROY is used in
> > > > > > rte_eth_dev_release_port already.
> > > > > > > And in PMD, rte_eth_dev_release_port is called after
> > > > > > > dev_uninit, that mean its too late to reject a detach
> > > > > >
> > > > > > You're right.
> > > > > >
> > > > > > It's a real mess currently.
> > > > > > The right order should be to remove ethdev ports before removing
> > > > > > the underlying EAL device. But it's strangely not the case.
> > > > > >
> > > > > > We need to separate things.
> > > > > > The function rte_eth_dev_close can be used to remove an ethdev
> > > > > > port if we add a call to rte_eth_dev_release_port.
> > > > > > So we could call rte_eth_dev_close in PMD remove functions.
> > > > > > Is "close" a good time to ask confirmation to the application?
> > > > > > Or should we ask confirmation a step before, on "stop"?
> > > > >
> > > > > I think the confirmation should before any cleanup stage, it
> > > > > should at the
> > > > beginning of driver->remove.
> > > >
> > > > So you stop a port, even if the app policy is against detaching it?
> > >
> > > My understanding is, stop and detach is different, we may stop a device
> > > and
> > reconfigure it then restart it.
> > > but for detach, properly we will not use it, unless it be probed again.
> > > For dev_close , it should be called after dev_stop.
> > > so we have to like below.
> > >
> > > If (dev->started) {
> > > dev_stop /* but still problem here, if traffic is ongoing */
> > > if (dev_close()) {
> > > dev_start()
> > > return -EBUSY.
> > > }
> > > } else {
> > > If (dev_close())
> > > Return _EBUSY
> > > }
> > >
> > > So for me, neither rte_eth_dev_stop and rte_eth_dev_close is the right
> > > place
> > to check this.
> > > But rte_eth_dev_destr
[dpdk-dev] DPDK Release Status Meeting 05/07/2018
Minutes of 5 July 2018 -- Agenda: * Merge Deadline for 18.08 * Subtrees * Bugzilla Participants: * Intel * Mellanox * NXP * Red Hat * SuSe Merge Deadline for 18.08 * *RC1* date pushed to *Wednesday 11 July*. * sub-trees will be pulled on Tuesday 10 July. * More review needed, patches not reviewed and merged until RC1 deadline won't able to make into release. * Patchsets requires more attention are following: * hot plug failure handle * enable hotplug on multi-process * Device querying * Anatoly's fixes/patches :) * Most probably "hot plug failure handle" will be merged partially and "enable hotplug on multi-process" will be postponed to next release. More foundational changes required for hotplug. * Possible RC2 date is 20-23 July, need input from test teams. Subtrees * main * More patches to be merged, more review required * Thomas is off on Monday 9 July * next-net * Plan to send a pull-request end of Thursday 5 July * Ferruh is on holiday on next week, Thomas will pull from vendor-trees for RC1 * next-crypto * Target sub-trees pull date, Tuesday 10 July * There are API changes requires more review/input * Some PMDs may be merged on RC2 * next-virtio * There are some patches targeting Friday 6 July * Some patches can target new RC1 deadline * next-eventdev * next-pipeline * next-qos * No update was given Bugzilla * No update was given * Shreyansh mentioned from a unit test defect, will discuss offline in the mail list. DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on Thursdays at 8:30 UTC. If you wish to attend just send me an email and I will send you the invite.
[dpdk-dev] [PATCH] compress/isal: add chained mbuf support
This patch adds chained mbuf support for input or output buffers
during compression/decompression operations.
Signed-off-by: Lee Daly
---
doc/guides/compressdevs/features/isal.ini | 2 +-
doc/guides/compressdevs/isal.rst | 2 -
drivers/compress/isal/isal_compress_pmd.c | 224 +-
drivers/compress/isal/isal_compress_pmd_ops.c | 3 +-
4 files changed, 187 insertions(+), 44 deletions(-)
diff --git a/doc/guides/compressdevs/features/isal.ini
b/doc/guides/compressdevs/features/isal.ini
index ad2718d..0966e69 100644
--- a/doc/guides/compressdevs/features/isal.ini
+++ b/doc/guides/compressdevs/features/isal.ini
@@ -12,7 +12,7 @@ CPU AVX512 = Y
CPU NEON =
Stateful =
By-Pass=
-Chained mbufs =
+Chained mbufs = Y
Deflate= Y
LZS=
Adler32=
diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst
index 276ff06..3bc3022 100644
--- a/doc/guides/compressdevs/isal.rst
+++ b/doc/guides/compressdevs/isal.rst
@@ -78,8 +78,6 @@ As a result the level mappings from the API to the PMD are
shown below.
Limitations
---
-* Chained mbufs will not be supported until a future release, meaning max data
size being passed to PMD through a single mbuf is 64K - 1. If data is larger
than this it will need to be split up and sent as multiple operations.
-
* Compressdev level 0, no compression, is not supported.
* Checksums will not be supported until future release.
diff --git a/drivers/compress/isal/isal_compress_pmd.c
b/drivers/compress/isal/isal_compress_pmd.c
index 0f025a3..1ec2d98 100644
--- a/drivers/compress/isal/isal_compress_pmd.c
+++ b/drivers/compress/isal/isal_compress_pmd.c
@@ -188,6 +188,120 @@ isal_comp_set_priv_xform_parameters(struct
isal_priv_xform *priv_xform,
return 0;
}
+/* Compression using chained mbufs for input/output data */
+static int
+chained_mbuf_compression(struct rte_comp_op *op, struct isal_comp_qp *qp)
+{
+ int ret;
+ uint32_t consumed_data;
+ uint32_t remaining_data = op->src.length;
+ struct rte_mbuf *src = op->m_src;
+ struct rte_mbuf *dst = op->m_dst;
+
+ qp->stream->avail_in = src->data_len;
+ while (qp->stream->internal_state.state != ZSTATE_END) {
+ /* Last segment of data */
+ if (remaining_data <= src->data_len)
+ qp->stream->end_of_stream = 1;
+
+ /* Execute compression operation */
+ ret = isal_deflate(qp->stream);
+ op->produced = qp->stream->total_out;
+ consumed_data = src->data_len - qp->stream->avail_in;
+ remaining_data -= consumed_data;
+
+ if (ret != COMP_OK) {
+ op->status = RTE_COMP_OP_STATUS_ERROR;
+ return ret;
+ }
+
+ if (qp->stream->avail_in == 0 &&
+ qp->stream->total_in != op->src.length) {
+ if (src->next != NULL) {
+ src = src->next;
+ qp->stream->next_in =
+ rte_pktmbuf_mtod(src, uint8_t
*);
+ qp->stream->avail_in =
+ RTE_MIN(remaining_data, src->data_len);
+ }
+ }
+
+ if (qp->stream->avail_out == 0 &&
+ qp->stream->internal_state.state != ZSTATE_END)
{
+ if (dst->next != NULL) {
+ dst = dst->next;
+ qp->stream->next_out =
+ rte_pktmbuf_mtod(dst, uint8_t
*);
+ qp->stream->avail_out = dst->data_len;
+ } else {
+ ISAL_PMD_LOG(ERR,
+ "Not enough output buffer segments\n"
+ "Output Produced: %d\n", op->produced);
+ op->status =
+ RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
+ return -1;
+ }
+ }
+ }
+ op->consumed = qp->stream->total_in;
+
+ return 0;
+}
+
+/* Decompression using chained mbufs for input/output data */
+static int
+chained_mbuf_decompression(struct rte_comp_op *op, struct isal_comp_qp *qp)
+{
+ int ret;
+ uint32_t consumed_data;
+ uint32_t remaining_data = op->src.length;
+ struct rte_mbuf *src = op->m_src;
+ struct rte_mbuf *dst = op->m_dst;
+
+ qp->state->avail_in = src->data_len;
+ while (qp->state->block_state != ISAL_BLOCK_FINISH) {
+
+ ret = isal_inflate(qp->state);
+ op->produced = qp->state->total_out;
+ consumed_data = src->data_len - qp->state->avail_
Re: [dpdk-dev] [PATCH v3 2/4] doc: rename compress feature flag
> -Original Message- > From: Verma, Shally [mailto:shally.ve...@cavium.com] > Sent: Thursday, July 5, 2018 3:41 AM > To: De Lara Guarch, Pablo ; Gupta, Ashish > ; Trahe, Fiona ; Daly, Lee > ; Sahu, Sunila > Cc: dev@dpdk.org > Subject: RE: [PATCH v3 2/4] doc: rename compress feature flag > > > > >-Original Message- > >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com] > >Sent: 04 July 2018 19:41 > >To: Verma, Shally ; Gupta, Ashish > >; fiona.tr...@intel.com; lee.d...@intel.com > >Cc: dev@dpdk.org; Pablo de Lara > >Subject: [PATCH v3 2/4] doc: rename compress feature flag > > > >External Email > > > >Renamed feature "Bypass" to "Pass-through", as it is a more explicit > >name, meaning that the PMD is capable of passing the mbufs through it, > >without making any modifications (i.e.. NULL algorithm). > > > >Signed-off-by: Pablo de Lara > >--- > > doc/guides/compressdevs/features/default.ini | 2 +- > > doc/guides/compressdevs/overview.rst | 5 + > > 2 files changed, 6 insertions(+), 1 deletion(-) > > > >diff --git a/doc/guides/compressdevs/features/default.ini > >b/doc/guides/compressdevs/features/default.ini > >index 795fc5577..a88414d23 100644 > >--- a/doc/guides/compressdevs/features/default.ini > >+++ b/doc/guides/compressdevs/features/default.ini > >@@ -13,7 +13,7 @@ CPU AVX2 = > > CPU AVX512 = > > CPU NEON = > > Stateful = > >-By-Pass= > >+Pass-through = > > Chained mbufs = > > Deflate= > > LZS= > >diff --git a/doc/guides/compressdevs/overview.rst > >b/doc/guides/compressdevs/overview.rst > >index ca37de175..b16c36fd6 100644 > >--- a/doc/guides/compressdevs/overview.rst > >+++ b/doc/guides/compressdevs/overview.rst > >@@ -10,3 +10,8 @@ Supported Feature Flags .. > >_table_compression_pmd_features: > > > > .. include:: overview_feature_table.txt > >+ > >+.. Note:: > >+ > >+ - "Pass-through" feature flag refers to the ability of the PMD > >+ to let mbufs pass-through it, without making any modifications to it. > >-- > >2.14.4 > [Shally] Rather than mbufs, use generic name input / output buffers. As at > some > point, we may add alternative to mbufs. > Abd rephrase a bit, such as, in pass-through mode PMD will just copy input to > output. Ok. Will do. > > Thanks > Shally >
Re: [dpdk-dev] [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag
> -Original Message- > From: Verma, Shally [mailto:shally.ve...@cavium.com] > Sent: Thursday, July 5, 2018 9:39 AM > To: De Lara Guarch, Pablo ; Gupta, Ashish > ; Trahe, Fiona ; Daly, Lee > ; Sahu, Sunila > Cc: dev@dpdk.org > Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag > > > > >-Original Message- > >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com] > >Sent: 04 July 2018 19:41 > >To: Verma, Shally ; Gupta, Ashish > >; fiona.tr...@intel.com; lee.d...@intel.com > >Cc: dev@dpdk.org; Pablo de Lara > >Subject: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag > > > >External Email > > > >The current mbuf scatter gather feature flag is too ambiguous, as it is > >not clear if input and/or output buffers can be scatter gather mbufs or > >not. > > > >Therefore, three new flags will replace this flag: > >- RTE_COMP_FF_OOP_SGL_IN_SGL_OUT > >- RTE_COMP_FF_OOP_SGL_IN_FB_OUT > >- RTE_COMP_FF_OOP_FB_IN_SGL_OUT > > > [Shally] Believe Out of place is default support on current compression API, > so > why do we need _OOP_ here? Hi Shally, You are right, but I just wanted to clarify that the scenario is for Out of place only. Thanks, Pablo > > Thanks > Shally > >Note that out-of-place flat buffers is supported by default and > >in-place is not supported by the library. > > > >Signed-off-by: Pablo de Lara > >Acked-by: Fiona Trahe
Re: [dpdk-dev] [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag
>-Original Message- >From: De Lara Guarch, Pablo [mailto:pablo.de.lara.gua...@intel.com] >Sent: 05 July 2018 16:36 >To: Verma, Shally ; Gupta, Ashish >; Trahe, Fiona ; >Daly, Lee ; Sahu, Sunila >Cc: dev@dpdk.org >Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag > >External Email > >> -Original Message- >> From: Verma, Shally [mailto:shally.ve...@cavium.com] >> Sent: Thursday, July 5, 2018 9:39 AM >> To: De Lara Guarch, Pablo ; Gupta, Ashish >> ; Trahe, Fiona ; Daly, Lee >> ; Sahu, Sunila >> Cc: dev@dpdk.org >> Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag >> >> >> >> >-Original Message- >> >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com] >> >Sent: 04 July 2018 19:41 >> >To: Verma, Shally ; Gupta, Ashish >> >; fiona.tr...@intel.com; lee.d...@intel.com >> >Cc: dev@dpdk.org; Pablo de Lara >> >Subject: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag >> > >> >External Email >> > >> >The current mbuf scatter gather feature flag is too ambiguous, as it is >> >not clear if input and/or output buffers can be scatter gather mbufs or >> >not. >> > >> >Therefore, three new flags will replace this flag: >> >- RTE_COMP_FF_OOP_SGL_IN_SGL_OUT >> >- RTE_COMP_FF_OOP_SGL_IN_FB_OUT >> >- RTE_COMP_FF_OOP_FB_IN_SGL_OUT >> > >> [Shally] Believe Out of place is default support on current compression API, >> so >> why do we need _OOP_ here? > >Hi Shally, > >You are right, but I just wanted to clarify that the scenario is for Out of >place only. > Ok. But that looks redundant to me. Though not likely, tomorrow if some algo support in-place, Then we will end up adding in_place equivalent of same. So would prefer to keep naming generic of in/out place and specific to Scatter-gather in/out support. >Thanks, >Pablo > >> >> Thanks >> Shally >> >Note that out-of-place flat buffers is supported by default and >> >in-place is not supported by the library. >> > >> >Signed-off-by: Pablo de Lara >> >Acked-by: Fiona Trahe
Re: [dpdk-dev] [PATCH v9 20/27] ethdev: register ether layer as a class
On Thu, Jul 05, 2018 at 11:36:38AM +0200, Gaëtan Rivet wrote: > Hi Andrew, > > On Wed, Jul 04, 2018 at 03:20:17PM +0300, Andrew Rybchenko wrote: > > On 07/04/2018 01:15 AM, Gaetan Rivet wrote: > > > Signed-off-by: Gaetan Rivet > > > --- > > > lib/librte_ethdev/Makefile| 3 +- > > > lib/librte_ethdev/rte_class_eth.c | 79 > > > +++ > > > 2 files changed, 81 insertions(+), 1 deletion(-) > > > create mode 100644 lib/librte_ethdev/rte_class_eth.c > > > > > > diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile > > > index 2fa133fbc..d4c3a8d06 100644 > > > --- a/lib/librte_ethdev/Makefile > > > +++ b/lib/librte_ethdev/Makefile > > > @@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API > > > CFLAGS += -O3 > > > CFLAGS += $(WERROR_FLAGS) > > > LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring > > > -LDLIBS += -lrte_mbuf > > > +LDLIBS += -lrte_mbuf -lrte_kvargs > > > EXPORT_MAP := rte_ethdev_version.map > > > @@ -20,6 +20,7 @@ LIBABIVER := 9 > > > SRCS-y += eth_private.c > > > SRCS-y += rte_ethdev.c > > > +SRCS-y += rte_class_eth.c > > > SRCS-y += rte_flow.c > > > SRCS-y += rte_tm.c > > > SRCS-y += rte_mtr.c > > > > meson.build files should be updated as well. > > The meson version required by DPDK is not available in my distribution. > "pip3 install meson" works in just about all distros. I'd recommend using meson from pip generally, since it tends to be very up to date. The latest versions configure DPDK a lot faster than the older ones! /Bruce
Re: [dpdk-dev] [PATCH] net/sfc: cut non VLAN ID bits from TCI
On Fri, Jun 29, 2018 at 04:23:31PM +0100, Andrew Rybchenko wrote:
> TCI may contain PCP or DEI bits. Matching of these bits is not
> supported, but the bits still may be set in specification value and
> not covered by mask. So, these bits should be ignored.
>
> Fixes: 894080975e1e ("net/sfc: support VLAN in flow API filters")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Andrew Rybchenko
> Reviewed-by: Roman Zhukov
>
> ---
> drivers/net/sfc/sfc_flow.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
> index 5613d59a9..18387415e 100644
> --- a/drivers/net/sfc/sfc_flow.c
> +++ b/drivers/net/sfc/sfc_flow.c
> @@ -371,7 +371,8 @@ sfc_flow_parse_vlan(const struct rte_flow_item *item,
>* the outer tag and the next matches the inner tag.
>*/
> if (mask->tci == supp_mask.tci) {
> - vid = rte_bswap16(spec->tci);
> + /* Apply mask to keep VID only */
> + vid = rte_bswap16(spec->tci & mask->tci);
>
> if (!(efx_spec->efs_match_flags &
> EFX_FILTER_MATCH_OUTER_VID)) {
I think there is an issue with this patch when spec->mask is user-provided,
PMDs have to trust it. They must not simply ignore bits they cannot handle
but explicitly reject the flow rule for correctness.
Most devices cannot match PCP and DEI, this is why the default TCI mask was
modified in v18.05 by commit 0730ab674cb1 ("ethdev: fix default VLAN TCI
mask in flow API") to cover the VID part only.
I wrote a helper for mlx5 to help with such basic sanity checks on pattern
items in a generic(ish) fashion, maybe you could reuse something. Have a
look at mlx5_nl_flow_item_mask() [1].
[1] "net/mlx5: add L2-L4 pattern items to switch flow rules"
https://mails.dpdk.org/archives/dev/2018-June/105579.html
--
Adrien Mazarguil
6WIND
Re: [dpdk-dev] [PATCH v3 4/4] compressdev: add huffman encoding flags
> -Original Message-
> From: Verma, Shally [mailto:shally.ve...@cavium.com]
> Sent: Thursday, July 5, 2018 9:14 AM
> To: De Lara Guarch, Pablo ; Gupta, Ashish
> ; Trahe, Fiona ; Daly, Lee
>
> Cc: dev@dpdk.org
> Subject: RE: [PATCH v3 4/4] compressdev: add huffman encoding flags
>
>
>
> >-Original Message-
> >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com]
> >Sent: 04 July 2018 19:41
> >To: Verma, Shally ; Gupta, Ashish
> >; fiona.tr...@intel.com; lee.d...@intel.com
> >Cc: dev@dpdk.org; Pablo de Lara
> >Subject: [PATCH v3 4/4] compressdev: add huffman encoding flags
> >
> >External Email
> >
> >Added Huffman fixed and dynamic encoding feature flags, so an
> >application can query if a device supports these two types, when
> >performing DEFLATE compression.
> >
> >Signed-off-by: Pablo de Lara
> >Acked-by: Fiona Trahe
> >---
> >
> >Changes in v3:
> >
> >- No change
> >
> >Changes in v2:
> >
> >- Fixed typo
> >
> > drivers/compress/isal/isal_compress_pmd_ops.c | 4 +++-
> > lib/librte_compressdev/rte_comp.c | 4
> > lib/librte_compressdev/rte_comp.h | 4
> > test/test/test_compressdev.c | 16
> > 4 files changed, 27 insertions(+), 1 deletion(-)
> >
>
> //snip
>
> >diff --git a/lib/librte_compressdev/rte_comp.c
> >b/lib/librte_compressdev/rte_comp.c
> >index f5bd3a6c0..5ed1d0daa 100644
> >--- a/lib/librte_compressdev/rte_comp.c
> >+++ b/lib/librte_compressdev/rte_comp.c
> >@@ -36,6 +36,10 @@ rte_comp_get_feature_name(uint64_t flag)
> >return "SHA2_SHA256_HASH";
> >case RTE_COMP_FF_SHAREABLE_PRIV_XFORM:
> >return "SHAREABLE_PRIV_XFORM";
> >+ case RTE_COMP_FF_HUFFMAN_FIXED:
> >+ return "HUFFMAN_FIXED";
> >+ case RTE_COMP_FF_HUFFMAN_DYNAMIC:
> >+ return "HUFFMAN_DYNAMIC";
> >default:
> >return NULL;
> >}
> >diff --git a/lib/librte_compressdev/rte_comp.h
> >b/lib/librte_compressdev/rte_comp.h
> >index 6660cee82..c9245cce1 100644
> >--- a/lib/librte_compressdev/rte_comp.h
> >+++ b/lib/librte_compressdev/rte_comp.h
> >@@ -62,6 +62,10 @@ extern "C" {
> > * to create as many priv_xforms as it expects to have stateless
> > * operations in-flight.
> > */
> >+#define RTE_COMP_FF_HUFFMAN_FIXED (1ULL << 13)
> >+/**< Fixed huffman encoding is supported */
> >+#define RTE_COMP_FF_HUFFMAN_DYNAMIC(1ULL << 14)
> >+/**< Dynamic huffman encoding is supported */
> >
>
> [Shally] As such okay to have this feature. But while looking at this, got a
> question:
>
> rte_compressdev_info_get() returns feature flags of type
> RTE_COMPDEV_FF_xxx and, rte_compressdev_capability_get() returns PMD
> capability for specific algo using feature flags of type RTE_COMP_FF_xxx. So,
>
> 1. should rte_compressdev_capability_get() and "struct
> rte_compressdev_capabilities" be changed to
> rte_compressdev_comp_capability_get() or
> rte_compressdev_algo_capability_get()?
I would prefer to leave it as it is, as it matches the function name in
cryptodev, which is doing something similar.
However, I don't have an strong opinion on this. Maybe Fiona can break the tie?
:)
>
> 2. where does RTE_COMPDEV_FF_HW_ACCELERATED be set? in dev_info-
> >feature flag or capability->feature_flag?
> What if PMD support hw acceleration of one algo but have sw support of
> another. (say, deflate HW accelerated and LZS sw?)
It is set in dev_info->feature_flag.
As far as I know, this is not expected. HW_ACCELERATED should apply to the
whole device.
The device will be either hardware or software. If it is hardware, but it uses
software-based
Implementation for an algorithm, still the device is hardware.
>
> Thanks
> Shally
Re: [dpdk-dev] [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag
> -Original Message- > From: Verma, Shally [mailto:shally.ve...@cavium.com] > Sent: Thursday, July 5, 2018 12:13 PM > To: De Lara Guarch, Pablo ; Gupta, Ashish > ; Trahe, Fiona ; Daly, Lee > ; Sahu, Sunila > Cc: dev@dpdk.org > Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather flag > > > > >-Original Message- > >From: De Lara Guarch, Pablo [mailto:pablo.de.lara.gua...@intel.com] > >Sent: 05 July 2018 16:36 > >To: Verma, Shally ; Gupta, Ashish > >; Trahe, Fiona ; Daly, > >Lee ; Sahu, Sunila > >Cc: dev@dpdk.org > >Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather > >flag > > > >External Email > > > >> -Original Message- > >> From: Verma, Shally [mailto:shally.ve...@cavium.com] > >> Sent: Thursday, July 5, 2018 9:39 AM > >> To: De Lara Guarch, Pablo ; Gupta, > >> Ashish ; Trahe, Fiona > >> ; Daly, Lee ; Sahu, Sunila > >> > >> Cc: dev@dpdk.org > >> Subject: RE: [PATCH v3 3/4] compressdev: replace mbuf scatter gather > >> flag > >> > >> > >> > >> >-Original Message- > >> >From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com] > >> >Sent: 04 July 2018 19:41 > >> >To: Verma, Shally ; Gupta, Ashish > >> >; fiona.tr...@intel.com; lee.d...@intel.com > >> >Cc: dev@dpdk.org; Pablo de Lara > >> >Subject: [PATCH v3 3/4] compressdev: replace mbuf scatter gather > >> >flag > >> > > >> >External Email > >> > > >> >The current mbuf scatter gather feature flag is too ambiguous, as it > >> >is not clear if input and/or output buffers can be scatter gather > >> >mbufs or not. > >> > > >> >Therefore, three new flags will replace this flag: > >> >- RTE_COMP_FF_OOP_SGL_IN_SGL_OUT > >> >- RTE_COMP_FF_OOP_SGL_IN_FB_OUT > >> >- RTE_COMP_FF_OOP_FB_IN_SGL_OUT > >> > > >> [Shally] Believe Out of place is default support on current > >> compression API, so why do we need _OOP_ here? > > > >Hi Shally, > > > >You are right, but I just wanted to clarify that the scenario is for Out of > >place > only. > > > Ok. But that looks redundant to me. Though not likely, tomorrow if some algo > support in-place, Then we will end up adding in_place equivalent of same. So > would prefer to keep naming generic of in/out place and specific to Scatter- > gather in/out support. I think I am not quite following you. Actually, if in the future we support In-place, then it is important to have OOP in the macro, to specify that SGL is supported for Out-of-place and maybe not in-place (like in cryptodev). Otherwise, we would need to break the API, which can be avoided now. Thanks, Pablo > > >Thanks, > >Pablo > > > >> > >> Thanks > >> Shally > >> >Note that out-of-place flat buffers is supported by default and > >> >in-place is not supported by the library. > >> > > >> >Signed-off-by: Pablo de Lara > >> >Acked-by: Fiona Trahe
Re: [dpdk-dev] [PATCH v5 04/16] test/crypto: limit number of sessions
>-Original Message-
>From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com]
>Sent: 05 July 2018 07:38
>To: declan.dohe...@intel.com; akhil.go...@nxp.com; Verma, Shally
>; ravi1.ku...@amd.com; Jacob,
>Jerin ; roy.fan.zh...@intel.com;
>fiona.tr...@intel.com; t...@semihalf.com;
>jianjay.z...@huawei.com
>Cc: dev@dpdk.org; Pablo de Lara
>Subject: [PATCH v5 04/16] test/crypto: limit number of sessions
>
>External Email
>
>Instead of using the maximum number of sessions
>allowed by the PMDs (which will change to unlimited most
>of the PMDs), limit the number to a small sufficient amount.
>
>Signed-off-by: Pablo de Lara
>Acked-by: Akhil Goyal
>---
> test/test/test_cryptodev.c | 27 +--
> 1 file changed, 21 insertions(+), 6 deletions(-)
>
>diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
>index 389f79677..5c906cfae 100644
>--- a/test/test/test_cryptodev.c
>+++ b/test/test/test_cryptodev.c
>@@ -39,6 +39,7 @@
> #include "test_cryptodev_hmac_test_vectors.h"
>
> #define VDEV_ARGS_SIZE 100
>+#define MAX_NB_SESSIONS4
>
> static int gbl_driver_id;
>
>@@ -435,9 +436,16 @@ testsuite_setup(void)
> * Create mempool with maximum number of sessions * 2,
> * to include the session headers
> */
>+ if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
>+ RTE_LOG(ERR, USER1, "Device does not support "
>+ "at least %u sessions\n",
>+ MAX_NB_SESSIONS);
>+ return TEST_FAILED;
>+ }
>+
If info.sym.max_nb_sessions = 0, won't it fail from here?
Thanks
Shally
>ts_params->session_mpool = rte_mempool_create(
>"test_sess_mp",
>- info.sym.max_nb_sessions * 2,
>+ MAX_NB_SESSIONS * 2,
>session_size,
>0, 0, NULL, NULL, NULL,
>NULL, SOCKET_ID_ANY,
>@@ -6499,10 +6507,10 @@ test_multi_session(void)
>
>sessions = rte_malloc(NULL,
>(sizeof(struct rte_cryptodev_sym_session *) *
>- dev_info.sym.max_nb_sessions) + 1, 0);
>+ MAX_NB_SESSIONS) + 1, 0);
>
>/* Create multiple crypto sessions*/
>- for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
>+ for (i = 0; i < MAX_NB_SESSIONS; i++) {
>
>sessions[i] = rte_cryptodev_sym_session_create(
>ts_params->session_mpool);
>@@ -6551,7 +6559,7 @@ test_multi_session(void)
>TEST_ASSERT_NULL(sessions[i],
>"Session creation succeeded unexpectedly!");
>
>- for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
>+ for (i = 0; i < MAX_NB_SESSIONS; i++) {
>rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
>sessions[i]);
>rte_cryptodev_sym_session_free(sessions[i]);
>@@ -6610,7 +6618,7 @@ test_multi_session_random_usage(void)
>
>sessions = rte_malloc(NULL,
>(sizeof(struct rte_cryptodev_sym_session *)
>- * dev_info.sym.max_nb_sessions) + 1,
>0);
>+ * MAX_NB_SESSIONS) + 1, 0);
>
>for (i = 0; i < MB_SESSION_NUMBER; i++) {
>sessions[i] = rte_cryptodev_sym_session_create(
>@@ -8538,6 +8546,13 @@ test_scheduler_attach_slave_op(void)
>unsigned int session_size =
>rte_cryptodev_sym_get_private_session_size(i);
>
>+ if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
>+ RTE_LOG(ERR, USER1,
>+ "Device does not support "
>+ "at least %u sessions\n",
>+ MAX_NB_SESSIONS);
>+ return TEST_FAILED;
>+ }
>/*
> * Create mempool with maximum number of sessions * 2,
> * to include the session headers
>@@ -8545,7 +8560,7 @@ test_scheduler_attach_slave_op(void)
>if (ts_params->session_mpool == NULL) {
>ts_params->session_mpool = rte_mempool_create(
>"test_sess_mp",
>- info.sym.max_nb_sessions * 2,
>+ MAX_NB_SESSIONS * 2,
>session_size,
>0, 0, NULL, NULL, NULL,
>NULL, SOCKET_ID_ANY,
>--
>2.14.4
Re: [dpdk-dev] [PATCH v2] net/mlx5: add support for 32bit systems
On 7/5/2018 11:09 AM, Mordechay Haimovsky wrote:
> Hi,
> Didn’t see it in our setups (not an excuse), Investigating
Thanks. Perhaps it can be related to compiler version:
gcc (GCC) 8.1.1 20180502 (Red Hat 8.1.1-1)
(ICC 32bit also gave same build error.)
btw, to clarify rdma-core v19 build errors was not just for 32bit build, I lost
my log but I can reproduce if you require.
>
> Moti
>
>> -Original Message-
>> From: Ferruh Yigit [mailto:ferruh.yi...@intel.com]
>> Sent: Wednesday, July 4, 2018 4:49 PM
>> To: Mordechay Haimovsky ; Shahaf Shuler
>>
>> Cc: Adrien Mazarguil ; dev@dpdk.org
>> Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: add support for 32bit systems
>>
>> On 7/2/2018 12:11 PM, Moti Haimovsky wrote:
>>> This patch adds support for building and running mlx5 PMD on 32bit
>>> systems such as i686.
>>>
>>> The main issue to tackle was handling the 32bit access to the UAR as
>>> quoted from the mlx5 PRM:
>>> QP and CQ DoorBells require 64-bit writes. For best performance, it is
>>> recommended to execute the QP/CQ DoorBell as a single 64-bit write
>>> operation. For platforms that do not support 64 bit writes, it is
>>> possible to issue the 64 bits DoorBells through two consecutive
>>> writes, each write 32 bits, as described below:
>>> * The order of writing each of the Dwords is from lower to upper
>>> addresses.
>>> * No other DoorBell can be rung (or even start ringing) in the midst of
>>> an on-going write of a DoorBell over a given UAR page.
>>> The last rule implies that in a multi-threaded environment, the access
>>> to a UAR page (which can be accessible by all threads in the process)
>>> must be synchronized (for example, using a semaphore) unless an atomic
>>> write of 64 bits in a single bus operation is guaranteed. Such a
>>> synchronization is not required for when ringing DoorBells on
>>> different UAR pages.
>>>
>>> Signed-off-by: Moti Haimovsky
>>> ---
>>> v2:
>>> * Fixed coding style issues.
>>> * Modified documentation according to review inputs.
>>> * Fixed merge conflicts.
>>> ---
>>> doc/guides/nics/features/mlx5.ini | 1 +
>>> doc/guides/nics/mlx5.rst | 6 +++-
>>> drivers/net/mlx5/mlx5.c | 8 -
>>> drivers/net/mlx5/mlx5.h | 5 +++
>>> drivers/net/mlx5/mlx5_defs.h | 18 --
>>> drivers/net/mlx5/mlx5_rxq.c | 6 +++-
>>> drivers/net/mlx5/mlx5_rxtx.c | 22 +++--
>>> drivers/net/mlx5/mlx5_rxtx.h | 69
>> ++-
>>> drivers/net/mlx5/mlx5_txq.c | 13 +++-
>>> 9 files changed, 131 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/doc/guides/nics/features/mlx5.ini
>>> b/doc/guides/nics/features/mlx5.ini
>>> index e75b14b..b28b43e 100644
>>> --- a/doc/guides/nics/features/mlx5.ini
>>> +++ b/doc/guides/nics/features/mlx5.ini
>>> @@ -43,5 +43,6 @@ Multiprocess aware = Y
>>> Other kdrv = Y
>>> ARMv8= Y
>>> Power8 = Y
>>> +x86-32 = Y
>>> x86-64 = Y
>>> Usage doc= Y
>>> diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index
>>> 7dd9c1c..5fbad60 100644
>>> --- a/doc/guides/nics/mlx5.rst
>>> +++ b/doc/guides/nics/mlx5.rst
>>> @@ -49,7 +49,7 @@ libibverbs.
>>> Features
>>>
>>>
>>> -- Multi arch support: x86_64, POWER8, ARMv8.
>>> +- Multi arch support: x86_64, POWER8, ARMv8, i686.
>>> - Multiple TX and RX queues.
>>> - Support for scattered TX and RX frames.
>>> - IPv4, IPv6, TCPv4, TCPv6, UDPv4 and UDPv6 RSS on any number of
>> queues.
>>> @@ -477,6 +477,10 @@ RMDA Core with Linux Kernel
>>> - Minimal kernel version : v4.14 or the most recent 4.14-rc (see
>>> `Linux installation documentation`_)
>>> - Minimal rdma-core version: v15+ commit 0c5f5765213a ("Merge pull
>> request #227 from yishaih/tm")
>>>(see `RDMA Core installation documentation`_)
>>> +- When building for i686 use:
>>> +
>>> + - rdma-core version 18.0 or above built with 32bit support.
>>
>> related "or above" part, v19 giving build errors with mlx5, FYI.
>>
>> And with v18 getting build errors originated from rdma headers [1], am I
>> doing something wrong?
>>
>> [1]
>> In file included from .../dpdk/drivers/net/mlx5/mlx5_glue.c:20:
>> .../rdma-core/build32/include/infiniband/mlx5dv.h: In function
>> ‘mlx5dv_x86_set_data_seg’:
>> .../rdma-core/build32/include/infiniband/mlx5dv.h:787:69: error: right shift
>> count >= width of type [-Werror=shift-count-overflow]
>> __m128i val = _mm_set_epi32((uint32_t)address, (uint32_t)(address >>
>> 32), lkey, length);
>> ^~
Re: [dpdk-dev] [PATCH v5 04/16] test/crypto: limit number of sessions
Hi Shally,
On 7/5/2018 4:57 PM, Verma, Shally wrote:
-Original Message-
From: Pablo de Lara [mailto:pablo.de.lara.gua...@intel.com]
Sent: 05 July 2018 07:38
To: declan.dohe...@intel.com; akhil.go...@nxp.com; Verma, Shally
; ravi1.ku...@amd.com; Jacob,
Jerin ; roy.fan.zh...@intel.com;
fiona.tr...@intel.com; t...@semihalf.com;
jianjay.z...@huawei.com
Cc: dev@dpdk.org; Pablo de Lara
Subject: [PATCH v5 04/16] test/crypto: limit number of sessions
External Email
Instead of using the maximum number of sessions
allowed by the PMDs (which will change to unlimited most
of the PMDs), limit the number to a small sufficient amount.
Signed-off-by: Pablo de Lara
Acked-by: Akhil Goyal
---
test/test/test_cryptodev.c | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 389f79677..5c906cfae 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -39,6 +39,7 @@
#include "test_cryptodev_hmac_test_vectors.h"
#define VDEV_ARGS_SIZE 100
+#define MAX_NB_SESSIONS4
static int gbl_driver_id;
@@ -435,9 +436,16 @@ testsuite_setup(void)
* Create mempool with maximum number of sessions * 2,
* to include the session headers
*/
+ if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+ RTE_LOG(ERR, USER1, "Device does not support "
+ "at least %u sessions\n",
+ MAX_NB_SESSIONS);
+ return TEST_FAILED;
+ }
+
If info.sym.max_nb_sessions = 0, won't it fail from here?
It is added in 8/16 of this series. Till this patch 0 is not a valid value.
Thanks
Shally
Re: [dpdk-dev] [PATCH v5 13/16] cryptodev: replace mbuf scatter gather flag
On 7/5/2018 7:38 AM, Pablo de Lara wrote: The current mbuf scatter gatter feature flag is too ambiguous, as it is not clear if input and/or output buffers can be scatter gather mbufs or not, plus if in-place and/or out-of-place is supported. Therefore, five new flags will replace this flag: - RTE_CRYPTODEV_FF_IN_PLACE_SGL - RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT - RTE_CRYPTODEV_FF_OOP_SGL_IN_FB_OUT - RTE_CRYPTODEV_FF_OOP_FB_IN_SGL_OUT - RTE_CRYPTODEV_FF_OOP_FB_IN_FB_OUT Signed-off-by: Pablo de Lara --- Acked-by: Akhil Goyal
[dpdk-dev] [PATCH v10 03/27] kvargs: build before EAL
Signed-off-by: Gaetan Rivet
---
lib/Makefile | 3 +--
lib/librte_eal/meson.build| 1 +
lib/librte_kvargs/Makefile| 2 +-
lib/librte_kvargs/meson.build | 3 +++
lib/meson.build | 8 ++--
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/lib/Makefile b/lib/Makefile
index d82462ba2..e8e903c8f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,7 @@
include $(RTE_SDK)/mk/rte.vars.mk
DIRS-y += librte_compat
+DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
DEPDIRS-librte_pci := librte_eal
@@ -76,8 +77,6 @@ DEPDIRS-librte_flow_classify := librte_net librte_table
librte_acl
DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched
DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net
DEPDIRS-librte_sched += librte_timer
-DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
-DEPDIRS-librte_kvargs := librte_eal
DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor
DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev
DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 4aa63e3d0..259bb4464 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -24,6 +24,7 @@ endif
version = 7 # the version of the EAL API
allow_experimental_apis = true
deps += 'compat'
+deps += 'kvargs'
cflags += '-D_GNU_SOURCE'
sources = common_sources + env_sources
objs = common_objs + env_objs
diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile
index 39d5ac33d..875939547 100644
--- a/lib/librte_kvargs/Makefile
+++ b/lib/librte_kvargs/Makefile
@@ -7,7 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_kvargs.a
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
EXPORT_MAP := rte_kvargs_version.map
diff --git a/lib/librte_kvargs/meson.build b/lib/librte_kvargs/meson.build
index 0c5b9cb20..0a81e8da7 100644
--- a/lib/librte_kvargs/meson.build
+++ b/lib/librte_kvargs/meson.build
@@ -1,6 +1,9 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+includes = [global_inc]
+includes += include_directories('../../../lib/librte_eal/common/include')
+
version = 1
sources = files('rte_kvargs.c')
headers = files('rte_kvargs.h')
diff --git a/lib/meson.build b/lib/meson.build
index 9d11571f9..5f7eb310e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,7 +9,8 @@
# given as a dep, no need to mention ring. This is especially true for the
# core libs which are widely reused, so their deps are kept to a minimum.
libraries = [ 'compat', # just a header, used for versioning
- 'eal', 'ring', 'mempool', 'mbuf', 'net', 'kvargs', 'ethdev', 'pci', #
core
+ 'kvargs',
+ 'eal', 'ring', 'mempool', 'mbuf', 'net', 'ethdev', 'pci', # core
'metrics', # bitrate/latency stats depends on this
'hash',# efd depends on this
'timer', # eventdev depends on this
@@ -41,9 +42,12 @@ foreach l:libraries
# external package/library requirements
ext_deps = []
deps = ['eal'] # eal is standard dependency except for itself
- if l == 'eal'
+ if l == 'kvargs'
deps = []
endif
+ if l == 'eal'
+ deps = ['kvargs']
+ endif
dir_name = 'librte_' + l
subdir(dir_name)
--
2.18.0
[dpdk-dev] [PATCH v10 00/27] Device querying
This patchset introduces a new EAL API for querying devices, filtered by arbitrary properties. The following elements are introduced to this end: * A new object, "rte_class", is used to describe the device class abstraction layer (eth, crypto, ...). * Both rte_bus and rte_class now offer a way to list their devices and filter the result using locally defined properties. * The rte_dev API now has an rte_dev_iterator, which is the way for the user to define the device filter and iterate upon the resulting set. As an example, the "eth" device class is implemented. Additionally, the device filters for + rte_bus_pci + rte_bus_vdev + rte_class_eth are implemented and can be used with some properties each, to show how to extend those. Some example of filters: "bus=pci/class=eth" "bus=pci" "class=eth" "class=eth,name=net_ring0" "bus=pci,id=00:00.0" "bus=vdev,driver=net_ring" --- v2: * Reworked the dev_iterate callback to simplify its implementation. Now dev_iterate implementation do not need to learn about the intricacies of the rte_dev_iterator. The rte_dev_iterator is managed purely by the rte_dev_iterator_next function. Buses and classes then do not have to care about settings things right. Additionally, dev_iterate implementations do not have to sanitize their dev string anymore, they are prepared by the rte_dev layer prior, which also reduces the number of dynamic allocations. v3: * Introduced central constructor priority list. * Removed lightweight kvarg parsing utility, using librte_kvargs instead. * Reversed dependencies of librte_kvargs and librte_eal. * Fixed a few bugs. * @Bruce: I have noted the request for meson support. I will install it and attempt it once the bulk of the work is done. v4: * Fixed a few bugs, added relevant acks, fixed some typos. * Made each matching functions actually check for a proper list of accepted properties. * rte_kvargs now includes rte_eal directly and keeps rte_log. * added generic string comparison function to rte_kvargs, as some kind of comparison should probably be shared by many layers. v5: * Rebased on master * Use strcspn instead of custom function. * Introduce private generic rte_eth_dev iterator. This could be generalized to other iterators (port_next, owner_id-aware, etc). * Attempted to support meson.build. Got lost in the implicit variables declared when inversing dependencies between kvargs and EAL. Removed anything related to meson. * Postponed genericization of work from device query to device declaration. Much bigger than anticipated, will let this part get in first and iterate over it. v6: * Rebased on master * Introduce RTE_PRIORITY_LAST, to explicitly set the lowest constructor priority. * Fix copyright notice for eth_privage.* files. v7: * Rebased on master * Fix rte_kvargs_strcmp return value. * Fix layer parsing error devstr "bus=pci/onemorelayer" now tells that the additional layer is not recognized. v8: * Rebased on master * Cleaned kvargs use: introduced a new parser function, that simplifies using the library for DPDK devargs. * Refactored devargs parsing in a single function within rte_devargs. This function is useful both for rte_dev parsing its iterator, and for rte_devargs parsing --dev parameters (not yet implemented). * A few small bugfixes. v9: * Rebased on master * Fixed cyclic dependency kvargs <-> eal * Fixed a few checkpatch issues * Added dynamic help to testpmd for new "show device" command * Added devargs processing stubs to primary buses / classes * Added new --dev generic device declaration option v10: * Support meson build Gaetan Rivet (27): devargs: add non-variadic parsing function kvargs: remove error logs kvargs: build before EAL kvargs: introduce a more flexible parsing function eal: introduce dtor macros eal: introduce device class abstraction eal/class: register destructor devargs: add function to parse device layers eal/dev: add device iterator interface eal/class: add device iteration eal/bus: add device iteration eal/dev: implement device iteration initialization eal/dev: implement device iteration kvargs: add generic string matching callback bus/pci: implement device iteration and comparison bus/pci: add device matching field id bus/vdev: implement device iteration bus/vdev: add device matching field driver ethdev: add private generic device iterator ethdev: register ether layer as a class ethdev: add device matching field name app/testpmd: add show device command bus/pci: pre-process declarative PCI devargs bus/vdev: pre-process declarative vdev devargs bus/pci: process declarative PCI devargs ethdev: process declarative eth devargs eal: add generic dev parameter app/test-pmd/cmdline.c
[dpdk-dev] [PATCH v10 04/27] kvargs: introduce a more flexible parsing function
This function permits defining additional terminating characters,
ending the parsing to arbitrary delimiters.
Signed-off-by: Gaetan Rivet
---
lib/Makefile | 1 +
lib/librte_kvargs/meson.build| 2 ++
lib/librte_kvargs/rte_kvargs.c | 25
lib/librte_kvargs/rte_kvargs.h | 30
lib/librte_kvargs/rte_kvargs_version.map | 7 ++
5 files changed, 65 insertions(+)
diff --git a/lib/Makefile b/lib/Makefile
index e8e903c8f..8a65525cd 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,6 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
DIRS-y += librte_compat
DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
+DEPDIRS-librte_kvargs := librte_compat
DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
DEPDIRS-librte_pci := librte_eal
diff --git a/lib/librte_kvargs/meson.build b/lib/librte_kvargs/meson.build
index 0a81e8da7..a1c724961 100644
--- a/lib/librte_kvargs/meson.build
+++ b/lib/librte_kvargs/meson.build
@@ -7,3 +7,5 @@ includes +=
include_directories('../../../lib/librte_eal/common/include')
version = 1
sources = files('rte_kvargs.c')
headers = files('rte_kvargs.h')
+
+deps += 'compat'
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index 747f14964..519f77679 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -168,3 +168,28 @@ rte_kvargs_parse(const char *args, const char * const
valid_keys[])
return kvlist;
}
+
+__rte_experimental
+struct rte_kvargs *
+rte_kvargs_parse2(const char *args, const char * const valid_keys[],
+ const char *valid_ends)
+{
+ struct rte_kvargs *kvlist = NULL;
+ char *copy;
+ size_t len;
+
+ if (valid_ends == NULL)
+ return rte_kvargs_parse(args, valid_keys);
+
+ copy = strdup(args);
+ if (copy == NULL)
+ return NULL;
+
+ len = strcspn(copy, valid_ends);
+ copy[len] = '\0';
+
+ kvlist = rte_kvargs_parse(copy, valid_keys);
+
+ free(copy);
+ return kvlist;
+}
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 51b8120b8..98c4ed1bf 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -71,6 +71,36 @@ struct rte_kvargs {
struct rte_kvargs *rte_kvargs_parse(const char *args,
const char *const valid_keys[]);
+/**
+ * Allocate a rte_kvargs and store key/value associations from a string.
+ * This version will consider any byte from valid_ends as a possible
+ * terminating character, and will not parse beyond any of their occurrence.
+ *
+ * The function allocates and fills an rte_kvargs structure from a given
+ * string whose format is key1=value1,key2=value2,...
+ *
+ * The structure can be freed with rte_kvargs_free().
+ *
+ * @param args
+ * The input string containing the key/value associations
+ *
+ * @param valid_keys
+ * A list of valid keys (table of const char *, the last must be NULL).
+ * This argument is ignored if NULL
+ *
+ * @param valid_ends
+ * Acceptable terminating characters.
+ * If NULL, the behavior is the same as ``rte_kvargs_parse``.
+ *
+ * @return
+ * - A pointer to an allocated rte_kvargs structure on success
+ * - NULL on error
+ */
+__rte_experimental
+struct rte_kvargs *rte_kvargs_parse2(const char *args,
+ const char *const valid_keys[],
+ const char *valid_ends);
+
/**
* Free a rte_kvargs structure
*
diff --git a/lib/librte_kvargs/rte_kvargs_version.map
b/lib/librte_kvargs/rte_kvargs_version.map
index 2030ec46c..b9fe44b98 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -8,3 +8,10 @@ DPDK_2.0 {
local: *;
};
+
+EXPERIMENTAL {
+ global:
+
+ rte_kvargs_parse2;
+
+} DPDK_2.0;
--
2.18.0
[dpdk-dev] [PATCH v10 02/27] kvargs: remove error logs
Error logs in kvargs parsing should be better handled in components
calling the library.
This library must be as lean as possible.
Signed-off-by: Gaetan Rivet
---
lib/librte_kvargs/rte_kvargs.c | 22 +-
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index d92a5f9dc..747f14964 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include
#include "rte_kvargs.h"
@@ -28,29 +27,22 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char
*params)
* to pass to rte_strsplit
*/
kvlist->str = strdup(params);
- if (kvlist->str == NULL) {
- RTE_LOG(ERR, PMD, "Cannot parse arguments: not enough
memory\n");
+ if (kvlist->str == NULL)
return -1;
- }
/* browse each key/value pair and add it in kvlist */
str = kvlist->str;
while ((str = strtok_r(str, RTE_KVARGS_PAIRS_DELIM, &ctx1)) != NULL) {
i = kvlist->count;
- if (i >= RTE_KVARGS_MAX) {
- RTE_LOG(ERR, PMD, "Cannot parse arguments: list
full\n");
+ if (i >= RTE_KVARGS_MAX)
return -1;
- }
kvlist->pairs[i].key = strtok_r(str, RTE_KVARGS_KV_DELIM,
&ctx2);
kvlist->pairs[i].value = strtok_r(NULL, RTE_KVARGS_KV_DELIM,
&ctx2);
- if (kvlist->pairs[i].key == NULL || kvlist->pairs[i].value ==
NULL) {
- RTE_LOG(ERR, PMD,
- "Cannot parse arguments: wrong key or value\n"
- "params=<%s>\n", params);
+ if (kvlist->pairs[i].key == NULL ||
+ kvlist->pairs[i].value == NULL)
return -1;
- }
kvlist->count++;
str = NULL;
@@ -89,12 +81,8 @@ check_for_valid_keys(struct rte_kvargs *kvlist,
for (i = 0; i < kvlist->count; i++) {
pair = &kvlist->pairs[i];
ret = is_valid_key(valid, pair->key);
- if (!ret) {
- RTE_LOG(ERR, PMD,
- "Error parsing device, invalid key <%s>\n",
- pair->key);
+ if (!ret)
return -1;
- }
}
return 0;
}
--
2.18.0
[dpdk-dev] [PATCH v10 05/27] eal: introduce dtor macros
Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/include/rte_common.h | 23 ++ 1 file changed, 23 insertions(+) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index 434adfd45..0dd832728 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -111,6 +111,29 @@ static void __attribute__((constructor(RTE_PRIO(prio)), used)) func(void) #define RTE_INIT(func) \ RTE_INIT_PRIO(func, LAST) +/** + * Run after main() with low priority. + * + * @param func + * Destructor function name. + * @param prio + * Priority number must be above 100. + * Lowest number is the last to run. + */ +#define RTE_FINI_PRIO(func, prio) \ +static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) + +/** + * Run after main() with high priority. + * + * The destructor will be run *before* prioritized destructors. + * + * @param func + * Destructor function name. + */ +#define RTE_FINI(func) \ + RTE_FINI_PRIO(func, LAST) + /** * Force a function to be inlined */ -- 2.18.0
[dpdk-dev] [PATCH v10 01/27] devargs: add non-variadic parsing function
rte_devargs_parse becomes non-variadic,
rte_devargs_parsef becomes the variadic version, to be used to compose
device strings.
Signed-off-by: Gaetan Rivet
---
drivers/net/failsafe/failsafe_args.c| 2 +-
drivers/net/failsafe/failsafe_eal.c | 2 +-
lib/librte_eal/common/eal_common_dev.c | 4 +-
lib/librte_eal/common/eal_common_devargs.c | 42 -
lib/librte_eal/common/include/rte_devargs.h | 40 +++-
lib/librte_eal/rte_eal_version.map | 1 +
lib/librte_ethdev/rte_ethdev.c | 2 +-
7 files changed, 76 insertions(+), 17 deletions(-)
diff --git a/drivers/net/failsafe/failsafe_args.c
b/drivers/net/failsafe/failsafe_args.c
index 2c002b164..626883ce2 100644
--- a/drivers/net/failsafe/failsafe_args.c
+++ b/drivers/net/failsafe/failsafe_args.c
@@ -63,7 +63,7 @@ fs_parse_device(struct sub_device *sdev, char *args)
d = &sdev->devargs;
DEBUG("%s", args);
- ret = rte_devargs_parse(d, "%s", args);
+ ret = rte_devargs_parse(d, args);
if (ret) {
DEBUG("devargs parsing failed with code %d", ret);
return ret;
diff --git a/drivers/net/failsafe/failsafe_eal.c
b/drivers/net/failsafe/failsafe_eal.c
index 5672f3961..ce1633f13 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -86,7 +86,7 @@ fs_bus_init(struct rte_eth_dev *dev)
else
snprintf(devstr, sizeof(devstr), "%s",
rte_eth_devices[pid].device->name);
- ret = rte_devargs_parse(da, "%s", devstr);
+ ret = rte_devargs_parse(da, devstr);
if (ret) {
ERROR("Probed devargs parsing failed with code"
" %d", ret);
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 61cb3b162..ce4b51469 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -138,8 +138,8 @@ int __rte_experimental rte_eal_hotplug_add(const char
*busname, const char *devn
if (da == NULL)
return -ENOMEM;
- ret = rte_devargs_parse(da, "%s:%s,%s",
- busname, devname, devargs);
+ ret = rte_devargs_parsef(da, "%s:%s,%s",
+busname, devname, devargs);
if (ret)
goto err_devarg;
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index b0434158b..0a83beb94 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -62,24 +62,18 @@ bus_name_cmp(const struct rte_bus *bus, const void *name)
return strncmp(bus->name, name, strlen(bus->name));
}
-int __rte_experimental
-rte_devargs_parse(struct rte_devargs *da, const char *format, ...)
+__rte_experimental
+int
+rte_devargs_parse(struct rte_devargs *da, const char *dev)
{
struct rte_bus *bus = NULL;
- va_list ap;
- va_start(ap, format);
- char dev[vsnprintf(NULL, 0, format, ap) + 1];
const char *devname;
const size_t maxlen = sizeof(da->name);
size_t i;
- va_end(ap);
if (da == NULL)
return -EINVAL;
- va_start(ap, format);
- vsnprintf(dev, sizeof(dev), format, ap);
- va_end(ap);
/* Retrieve eventual bus info */
do {
devname = dev;
@@ -124,6 +118,34 @@ rte_devargs_parse(struct rte_devargs *da, const char
*format, ...)
return 0;
}
+__rte_experimental
+int
+rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
+{
+ va_list ap;
+ size_t len;
+ char *dev;
+
+ if (da == NULL)
+ return -EINVAL;
+
+ va_start(ap, format);
+ len = vsnprintf(NULL, 0, format, ap);
+ va_end(ap);
+
+ dev = calloc(1, len + 1);
+ if (dev == NULL) {
+ fprintf(stderr, "ERROR: not enough memory to parse device\n");
+ return -ENOMEM;
+ }
+
+ va_start(ap, format);
+ vsnprintf(dev, len, format, ap);
+ va_end(ap);
+
+ return rte_devargs_parse(da, dev);
+}
+
int __rte_experimental
rte_devargs_insert(struct rte_devargs *da)
{
@@ -150,7 +172,7 @@ rte_devargs_add(enum rte_devtype devtype, const char
*devargs_str)
if (devargs == NULL)
goto fail;
- if (rte_devargs_parse(devargs, "%s", dev))
+ if (rte_devargs_parse(devargs, dev))
goto fail;
devargs->type = devtype;
bus = devargs->bus;
diff --git a/lib/librte_eal/common/include/rte_devargs.h
b/lib/librte_eal/common/include/rte_devargs.h
index 58fbd90a2..6c3b6326b 100644
--- a/lib/librte_eal/common/include/rte_devargs.h
+++ b/lib/librte_eal/common/include/rte_devargs.h
@@ -89
[dpdk-dev] [PATCH v10 07/27] eal/class: register destructor
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/include/rte_class.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_class.h
b/lib/librte_eal/common/include/rte_class.h
index b5e550a34..e8176f5e1 100644
--- a/lib/librte_eal/common/include/rte_class.h
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -112,6 +112,11 @@ static void classinitfn_ ##nm(void) \
{\
(cls).name = RTE_STR(nm);\
rte_class_register(&cls); \
+} \
+RTE_FINI_PRIO(classfinifn_ ##nm, CLASS); \
+static void classfinifn_ ##nm(void) \
+{ \
+ rte_class_unregister(&cls); \
}
#ifdef __cplusplus
--
2.18.0
[dpdk-dev] [PATCH v10 08/27] devargs: add function to parse device layers
This function is private to the EAL.
It is used to parse each layers in a device description string,
and store the result in an rte_devargs structure.
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/eal_common_devargs.c | 144
lib/librte_eal/common/eal_private.h | 27
lib/librte_eal/common/include/rte_devargs.h | 13 +-
3 files changed, 181 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index 0a83beb94..5f89e0b6e 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -13,9 +13,13 @@
#include
#include
+#include
+#include
#include
#include
#include
+#include
+#include
#include
#include "eal_private.h"
@@ -56,6 +60,146 @@ rte_eal_parse_devargs_str(const char *devargs_str,
return 0;
}
+static size_t
+devargs_layer_count(const char *s)
+{
+ size_t i = s ? 1 : 0;
+
+ while (s != NULL && s[0] != '\0') {
+ i += s[0] == '/';
+ s++;
+ }
+ return i;
+}
+
+int
+rte_devargs_layers_parse(struct rte_devargs *da,
+const char *devstr)
+{
+ struct {
+ const char *key;
+ const char *str;
+ struct rte_kvargs *kvlist;
+ } layers[] = {
+ { "bus=",NULL, NULL, },
+ { "class=", NULL, NULL, },
+ { "driver=", NULL, NULL, },
+ };
+ struct rte_kvargs_pair *kv = NULL;
+ struct rte_class *cls = NULL;
+ struct rte_bus *bus = NULL;
+ const char *s = devstr;
+ size_t nblayer;
+ size_t i = 0;
+ int ret = 0;
+
+ /* Split each sub-lists. */
+ nblayer = devargs_layer_count(devstr);
+ if (nblayer > RTE_DIM(layers)) {
+ RTE_LOG(ERR, EAL, "Invalid format: too many layers (%zu)\n",
+ nblayer);
+ ret = -E2BIG;
+ goto get_out;
+ }
+
+ /* If the devargs points the devstr
+* as source data, then it should not allocate
+* anything and keep referring only to it.
+*/
+ if (da->data != devstr) {
+ da->data = strdup(devstr);
+ if (da->data == NULL) {
+ RTE_LOG(ERR, EAL, "OOM\n");
+ ret = -ENOMEM;
+ goto get_out;
+ }
+ s = da->data;
+ }
+
+ while (s != NULL) {
+ if (strncmp(layers[i].key, s,
+ strlen(layers[i].key)) &&
+ /* The last layer is free-form.
+* The "driver" key is not required (but accepted).
+*/
+ i != RTE_DIM(layers) - 1)
+ goto next_layer;
+ layers[i].str = s;
+ layers[i].kvlist = rte_kvargs_parse2(s, NULL, "/");
+ if (layers[i].kvlist == NULL) {
+ RTE_LOG(ERR, EAL, "Could not parse %s\n", s);
+ ret = -EINVAL;
+ goto get_out;
+ }
+ s = strchr(s, '/');
+ if (s != NULL)
+ s++;
+next_layer:
+ if (i >= RTE_DIM(layers)) {
+ RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
+ ret = -EINVAL;
+ goto get_out;
+ }
+ i++;
+ }
+
+ /* Parse each sub-list. */
+ for (i = 0; i < RTE_DIM(layers); i++) {
+ if (layers[i].kvlist == NULL)
+ continue;
+ kv = &layers[i].kvlist->pairs[0];
+ if (strcmp(kv->key, "bus") == 0) {
+ bus = rte_bus_find_by_name(kv->value);
+ if (bus == NULL) {
+ RTE_LOG(ERR, EAL, "Could not find bus \"%s\"\n",
+ kv->value);
+ ret = -EFAULT;
+ goto get_out;
+ }
+ } else if (strcmp(kv->key, "class") == 0) {
+ cls = rte_class_find_by_name(kv->value);
+ if (cls == NULL) {
+ RTE_LOG(ERR, EAL, "Could not find class
\"%s\"\n",
+ kv->value);
+ ret = -EFAULT;
+ goto get_out;
+ }
+ } else if (strcmp(kv->key, "driver") == 0) {
+ /* Ignore */
+ continue;
+ }
+ }
+
+ /* Fill devargs fields. */
+ da->busstr = layers[0].str;
+ da->clsstr = layers[1].str;
+ da->drvstr = layers[2].str;
+ da->bus = bus;
+ da->cls = cls;
+
+ /* If we own the data, clean up a bit
+
[dpdk-dev] [PATCH v10 09/27] eal/dev: add device iterator interface
A device iterator allows iterating over a set of devices.
This set is defined by the two descriptions offered,
* rte_bus
* rte_class
Only one description can be provided, or both. It is not allowed to
provide no description at all.
Each layer of abstraction then performs a filter based on the
description provided. This filtering allows iterating on their internal
set of devices, stopping when a match is valid and returning the current
iteration context.
This context allows starting the next iteration from the same point and
going forward.
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/include/rte_dev.h | 47 +
1 file changed, 47 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index 3879ff3ca..120df729f 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -285,6 +285,53 @@ __attribute__((used)) = str
static const char DRV_EXP_TAG(name, kmod_dep_export)[] \
__attribute__((used)) = str
+/**
+ * Iteration context.
+ *
+ * This context carries over the current iteration state.
+ */
+struct rte_dev_iterator {
+ const char *devstr; /**< device string. */
+ const char *busstr; /**< bus-related part of device string. */
+ const char *clsstr; /**< class-related part of device string. */
+ struct rte_bus *bus; /**< bus handle. */
+ struct rte_class *cls; /**< class handle. */
+ struct rte_device *device; /**< current position. */
+ void *class_device; /**< additional specialized context. */
+};
+
+/**
+ * Device iteration function.
+ *
+ * Find the next device matching properties passed in parameters.
+ * The function takes an additional ``start`` parameter, that is
+ * used as starting context when relevant.
+ *
+ * The function returns the current element in the iteration.
+ * This return value will potentially be used as a start parameter
+ * in subsequent calls to the function.
+ *
+ * The additional iterator parameter is only there if a specific
+ * implementation needs additional context. It must not be modified by
+ * the iteration function itself.
+ *
+ * @param start
+ * Starting iteration context.
+ *
+ * @param devstr
+ * Device description string.
+ *
+ * @param it
+ * Device iterator.
+ *
+ * @return
+ * The address of the current element matching the device description
+ * string.
+ */
+typedef void *(*rte_dev_iterate_t)(const void *start,
+ const char *devstr,
+ const struct rte_dev_iterator *it);
+
#ifdef __cplusplus
}
#endif
--
2.18.0
[dpdk-dev] [PATCH v10 06/27] eal: introduce device class abstraction
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/bsdapp/eal/Makefile | 1 +
lib/librte_eal/common/Makefile | 2 +-
lib/librte_eal/common/eal_common_class.c | 62 +++
lib/librte_eal/common/include/rte_class.h | 121 +
lib/librte_eal/common/include/rte_common.h | 1 +
lib/librte_eal/common/meson.build | 2 +
lib/librte_eal/linuxapp/eal/Makefile | 1 +
lib/librte_eal/rte_eal_version.map | 2 +
8 files changed, 191 insertions(+), 1 deletion(-)
create mode 100644 lib/librte_eal/common/eal_common_class.c
create mode 100644 lib/librte_eal/common/include/rte_class.h
diff --git a/lib/librte_eal/bsdapp/eal/Makefile
b/lib/librte_eal/bsdapp/eal/Makefile
index 3fd33f1e4..b0a1c880a 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -52,6 +52,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hypervisor.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_string_fns.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hexdump.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_devargs.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_class.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_bus.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_dev.c
SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_options.c
diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
index 48f870f24..750653093 100644
--- a/lib/librte_eal/common/Makefile
+++ b/lib/librte_eal/common/Makefile
@@ -11,7 +11,7 @@ INC += rte_per_lcore.h rte_random.h
INC += rte_tailq.h rte_interrupts.h rte_alarm.h
INC += rte_string_fns.h rte_version.h
INC += rte_eal_memconfig.h rte_malloc_heap.h
-INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h
+INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h rte_class.h
INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h
INC += rte_malloc.h rte_keepalive.h rte_time.h
INC += rte_service.h rte_service_component.h
diff --git a/lib/librte_eal/common/eal_common_class.c
b/lib/librte_eal/common/eal_common_class.c
new file mode 100644
index 0..aed4dd8fb
--- /dev/null
+++ b/lib/librte_eal/common/eal_common_class.c
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+
+struct rte_class_list rte_class_list =
+ TAILQ_HEAD_INITIALIZER(rte_class_list);
+
+__rte_experimental void
+rte_class_register(struct rte_class *class)
+{
+ RTE_VERIFY(class);
+ RTE_VERIFY(class->name && strlen(class->name));
+
+ TAILQ_INSERT_TAIL(&rte_class_list, class, next);
+ RTE_LOG(DEBUG, EAL, "Registered [%s] device class.\n", class->name);
+}
+
+__rte_experimental void
+rte_class_unregister(struct rte_class *class)
+{
+ TAILQ_REMOVE(&rte_class_list, class, next);
+ RTE_LOG(DEBUG, EAL, "Unregistered [%s] device class.\n", class->name);
+}
+
+struct rte_class *
+rte_class_find(const struct rte_class *start, rte_class_cmp_t cmp,
+ const void *data)
+{
+ struct rte_class *cls;
+
+ if (start != NULL)
+ cls = TAILQ_NEXT(start, next);
+ else
+ cls = TAILQ_FIRST(&rte_class_list);
+ while (cls != NULL) {
+ if (cmp(cls, data) == 0)
+ break;
+ cls = TAILQ_NEXT(cls, next);
+ }
+ return cls;
+}
+
+static int
+cmp_class_name(const struct rte_class *class, const void *_name)
+{
+ const char *name = _name;
+
+ return strcmp(class->name, name);
+}
+
+struct rte_class *
+rte_class_find_by_name(const char *name)
+{
+ return rte_class_find(NULL, cmp_class_name, (const void *)name);
+}
diff --git a/lib/librte_eal/common/include/rte_class.h
b/lib/librte_eal/common/include/rte_class.h
new file mode 100644
index 0..b5e550a34
--- /dev/null
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#ifndef _RTE_CLASS_H_
+#define _RTE_CLASS_H_
+
+/**
+ * @file
+ *
+ * DPDK device class interface.
+ *
+ * This file exposes API and interfaces of device classes.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+
+#include
+
+/** Double linked list of classes */
+TAILQ_HEAD(rte_class_list, rte_class);
+
+/**
+ * A structure describing a generic device class.
+ */
+struct rte_class {
+ TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */
+ const char *name; /**< Name of the class */
+};
+
+/**
+ * Class comparison function.
+ *
+ * @param cls
+ * Class under test.
+ *
+ * @param data
+ * Data to compare against.
+ *
+ * @return
+ * 0 if the class matches the data.
+ * !0 if the class does not match.
+ * <0 if ordering is possible and the class is lower than the data.
+ * >0 if ordering is possible and the class is greater than the data.
+ */
+typedef int (*rte_class
[dpdk-dev] [PATCH v10 14/27] kvargs: add generic string matching callback
This function can be used as a callback to
rte_kvargs_process.
This should reduce code duplication.
Signed-off-by: Gaetan Rivet
---
lib/librte_kvargs/rte_kvargs.c | 10 +
lib/librte_kvargs/rte_kvargs.h | 28
lib/librte_kvargs/rte_kvargs_version.map | 1 +
3 files changed, 39 insertions(+)
diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index 519f77679..8270d2939 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -193,3 +193,13 @@ rte_kvargs_parse2(const char *args, const char * const
valid_keys[],
free(copy);
return kvlist;
}
+
+__rte_experimental
+int
+rte_kvargs_strcmp(const char *key __rte_unused,
+ const char *value, void *opaque)
+{
+ const char *str = opaque;
+
+ return -abs(strcmp(str, value));
+}
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 98c4ed1bf..ac2999ef3 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -25,6 +25,8 @@
extern "C" {
#endif
+#include
+
/** Maximum number of key/value associations */
#define RTE_KVARGS_MAX 32
@@ -151,6 +153,32 @@ int rte_kvargs_process(const struct rte_kvargs *kvlist,
unsigned rte_kvargs_count(const struct rte_kvargs *kvlist,
const char *key_match);
+/**
+ * Generic kvarg handler for string comparison.
+ *
+ * This function can be used for a generic string comparison processing
+ * on a list of kvargs.
+ *
+ * @param key
+ * kvarg pair key.
+ *
+ * @param value
+ * kvarg pair value.
+ *
+ * @param opaque
+ * Opaque pointer to a string.
+ *
+ * @return
+ * 0 if the strings match.
+ * !0 otherwise or on error.
+ *
+ * Unless strcmp, comparison ordering is not kept.
+ * In order for rte_kvargs_process to stop processing on match error,
+ * a negative value is returned even if strcmp had returned a positive one.
+ */
+__rte_experimental
+int rte_kvargs_strcmp(const char *key, const char *value, void *opaque);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_kvargs/rte_kvargs_version.map
b/lib/librte_kvargs/rte_kvargs_version.map
index b9fe44b98..6a41a6b65 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -13,5 +13,6 @@ EXPERIMENTAL {
global:
rte_kvargs_parse2;
+ rte_kvargs_strcmp;
} DPDK_2.0;
--
2.18.0
[dpdk-dev] [PATCH v10 10/27] eal/class: add device iteration
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/include/rte_class.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_eal/common/include/rte_class.h
b/lib/librte_eal/common/include/rte_class.h
index e8176f5e1..9d5b06807 100644
--- a/lib/librte_eal/common/include/rte_class.h
+++ b/lib/librte_eal/common/include/rte_class.h
@@ -30,6 +30,7 @@ TAILQ_HEAD(rte_class_list, rte_class);
struct rte_class {
TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */
const char *name; /**< Name of the class */
+ rte_dev_iterate_t dev_iterate; /**< Device iterator. */
};
/**
--
2.18.0
[dpdk-dev] [PATCH v10 13/27] eal/dev: implement device iteration
Use the iteration hooks in the abstraction layers to perform the
requested filtering on the internal device lists.
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/eal_common_dev.c | 168
lib/librte_eal/common/include/rte_dev.h | 26
lib/librte_eal/rte_eal_version.map | 1 +
3 files changed, 195 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 5b7956d17..3d486a841 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -45,6 +45,28 @@ static struct dev_event_cb_list dev_event_cbs;
/* spinlock for device callbacks */
static rte_spinlock_t dev_event_lock = RTE_SPINLOCK_INITIALIZER;
+struct dev_next_ctx {
+ struct rte_dev_iterator *it;
+ const char *busstr;
+ const char *clsstr;
+};
+
+#define CTX(it, busstr, clsstr) \
+ (&(const struct dev_next_ctx){ \
+ .it = it, \
+ .busstr = busstr, \
+ .clsstr = clsstr, \
+ })
+
+#define ITCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->it)
+
+#define BUSCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->busstr)
+
+#define CLSCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->clsstr)
+
static int cmp_detached_dev_name(const struct rte_device *dev,
const void *_name)
{
@@ -398,3 +420,149 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,
get_out:
return -rte_errno;
}
+
+static char *
+dev_str_sane_copy(const char *str)
+{
+ size_t end;
+ char *copy;
+
+ end = strcspn(str, ",/");
+ if (str[end] == ',') {
+ copy = strdup(&str[end + 1]);
+ } else {
+ /* '/' or '\0' */
+ copy = strdup("");
+ }
+ if (copy == NULL) {
+ rte_errno = ENOMEM;
+ } else {
+ char *slash;
+
+ slash = strchr(copy, '/');
+ if (slash != NULL)
+ slash[0] = '\0';
+ }
+ return copy;
+}
+
+static int
+class_next_dev_cmp(const struct rte_class *cls,
+ const void *ctx)
+{
+ struct rte_dev_iterator *it;
+ const char *clsstr = NULL;
+ void *dev;
+
+ if (cls->dev_iterate == NULL)
+ return 1;
+ it = ITCTX(ctx);
+ clsstr = CLSCTX(ctx);
+ dev = it->class_device;
+ /* it->clsstr != NULL means a class
+* was specified in the devstr.
+*/
+ if (it->clsstr != NULL && cls != it->cls)
+ return 1;
+ /* If an error occurred previously,
+* no need to test further.
+*/
+ if (rte_errno != 0)
+ return -1;
+ dev = cls->dev_iterate(dev, clsstr, it);
+ it->class_device = dev;
+ return dev == NULL;
+}
+
+static int
+bus_next_dev_cmp(const struct rte_bus *bus,
+const void *ctx)
+{
+ struct rte_device *dev = NULL;
+ struct rte_class *cls = NULL;
+ struct rte_dev_iterator *it;
+ const char *busstr = NULL;
+
+ if (bus->dev_iterate == NULL)
+ return 1;
+ it = ITCTX(ctx);
+ busstr = BUSCTX(ctx);
+ dev = it->device;
+ /* it->busstr != NULL means a bus
+* was specified in the devstr.
+*/
+ if (it->busstr != NULL && bus != it->bus)
+ return 1;
+ /* If an error occurred previously,
+* no need to test further.
+*/
+ if (rte_errno != 0)
+ return -1;
+ if (it->clsstr == NULL) {
+ dev = bus->dev_iterate(dev, busstr, it);
+ goto end;
+ }
+ /* clsstr != NULL */
+ if (dev == NULL) {
+next_dev_on_bus:
+ dev = bus->dev_iterate(dev, busstr, it);
+ it->device = dev;
+ }
+ if (dev == NULL)
+ return 1;
+ if (it->cls != NULL)
+ cls = TAILQ_PREV(it->cls, rte_class_list, next);
+ cls = rte_class_find(cls, class_next_dev_cmp, ctx);
+ if (cls != NULL) {
+ it->cls = cls;
+ goto end;
+ }
+ goto next_dev_on_bus;
+end:
+ it->device = dev;
+ return dev == NULL;
+}
+__rte_experimental
+struct rte_device *
+rte_dev_iterator_next(struct rte_dev_iterator *it)
+{
+ struct rte_bus *bus = NULL;
+ int old_errno = rte_errno;
+ char *busstr = NULL;
+ char *clsstr = NULL;
+
+ rte_errno = 0;
+ if (it->busstr == NULL && it->clsstr == NULL) {
+ /* Invalid iterator. */
+ rte_errno = EINVAL;
+ return NULL;
+ }
+ if (it->bus != NULL)
+ bus = TAILQ_PREV(it->bus, rte_bus_list, next);
+ if (it->busstr != NULL) {
+ busstr = dev_str_sane_copy(it->busstr);
+ if (busstr == NULL)
+ goto out;
+ }
+ if (it->clsstr != NULL) {
+ clsstr =
[dpdk-dev] [PATCH v10 12/27] eal/dev: implement device iteration initialization
Parse a device description.
Split this description in their relevant part for each layers.
No dynamic allocation is performed.
Signed-off-by: Gaetan Rivet
---
lib/Makefile| 1 +
lib/librte_eal/bsdapp/eal/Makefile | 1 +
lib/librte_eal/common/eal_common_dev.c | 55 +
lib/librte_eal/common/include/rte_dev.h | 24 +++
lib/librte_eal/linuxapp/eal/Makefile| 1 +
lib/librte_eal/rte_eal_version.map | 1 +
6 files changed, 83 insertions(+)
diff --git a/lib/Makefile b/lib/Makefile
index 8a65525cd..afa604e20 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,6 +7,7 @@ DIRS-y += librte_compat
DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
DEPDIRS-librte_kvargs := librte_compat
DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
+DEPDIRS-librte_eal := librte_kvargs
DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
DEPDIRS-librte_pci := librte_eal
DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring
diff --git a/lib/librte_eal/bsdapp/eal/Makefile
b/lib/librte_eal/bsdapp/eal/Makefile
index b0a1c880a..67b10ae0d 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -18,6 +18,7 @@ CFLAGS += $(WERROR_FLAGS) -O3
LDLIBS += -lexecinfo
LDLIBS += -lpthread
LDLIBS += -lgcc_s
+LDLIBS += -lrte_kvargs
EXPORT_MAP := ../../rte_eal_version.map
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index ce4b51469..5b7956d17 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -10,9 +10,12 @@
#include
#include
+#include
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -343,3 +346,55 @@ dev_callback_process(char *device_name, enum
rte_dev_event_type event)
}
rte_spinlock_unlock(&dev_event_lock);
}
+
+__rte_experimental
+int
+rte_dev_iterator_init(struct rte_dev_iterator *it,
+ const char *devstr)
+{
+ struct rte_devargs da;
+ struct rte_class *cls = NULL;
+ struct rte_bus *bus = NULL;
+
+ /* Having both busstr and clsstr NULL is illegal,
+* marking this iterator as invalid unless
+* everything goes well.
+*/
+ it->busstr = NULL;
+ it->clsstr = NULL;
+
+ da.data = devstr;
+ if (rte_devargs_layers_parse(&da, devstr))
+ goto get_out;
+
+ bus = da.bus;
+ cls = da.cls;
+ /* The string should have at least
+* one layer specified.
+*/
+ if (bus == NULL && cls == NULL) {
+ RTE_LOG(ERR, EAL,
+ "Either bus or class must be specified.\n");
+ rte_errno = EINVAL;
+ goto get_out;
+ }
+ if (bus != NULL && bus->dev_iterate == NULL) {
+ RTE_LOG(ERR, EAL, "Bus %s not supported\n", bus->name);
+ rte_errno = ENOTSUP;
+ goto get_out;
+ }
+ if (cls != NULL && cls->dev_iterate == NULL) {
+ RTE_LOG(ERR, EAL, "Class %s not supported\n", cls->name);
+ rte_errno = ENOTSUP;
+ goto get_out;
+ }
+ it->busstr = da.busstr;
+ it->clsstr = da.clsstr;
+ it->devstr = devstr;
+ it->bus = bus;
+ it->cls = cls;
+ it->device = NULL;
+ it->class_device = NULL;
+get_out:
+ return -rte_errno;
+}
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index 120df729f..7b7bd83bc 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -332,6 +332,30 @@ typedef void *(*rte_dev_iterate_t)(const void *start,
const char *devstr,
const struct rte_dev_iterator *it);
+/**
+ * Initializes a device iterator.
+ *
+ * This iterator allows accessing a list of devices matching a criteria.
+ * The device matching is made among all buses and classes currently
registered,
+ * filtered by the device description given as parameter.
+ *
+ * This function will not allocate any memory. It is safe to stop the
+ * iteration at any moment and let the iterator go out of context.
+ *
+ * @param it
+ * Device iterator handle.
+ *
+ * @param str
+ * Device description string.
+ *
+ * @return
+ * 0 on successful initialization.
+ * <0 on error.
+ */
+__rte_experimental
+int
+rte_dev_iterator_init(struct rte_dev_iterator *it, const char *str);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_eal/linuxapp/eal/Makefile
b/lib/librte_eal/linuxapp/eal/Makefile
index babc8617a..885c48110 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -27,6 +27,7 @@ LDLIBS += -lrt
ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y)
LDLIBS += -lnuma
endif
+LDLIBS += -lrte_kvargs
# specific to linuxapp exec-env
SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) := eal.c
diff --git a/lib/librte_eal
[dpdk-dev] [PATCH v10 11/27] eal/bus: add device iteration
Signed-off-by: Gaetan Rivet
---
lib/librte_eal/common/include/rte_bus.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_eal/common/include/rte_bus.h
b/lib/librte_eal/common/include/rte_bus.h
index eb9eded4e..747baf140 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -211,6 +211,7 @@ struct rte_bus {
rte_bus_parse_t parse; /**< Parse a device name */
struct rte_bus_conf conf;/**< Bus configuration */
rte_bus_get_iommu_class_t get_iommu_class; /**< Get iommu class */
+ rte_dev_iterate_t dev_iterate; /**< Device iterator. */
};
/**
--
2.18.0
[dpdk-dev] [PATCH v10 15/27] bus/pci: implement device iteration and comparison
Signed-off-by: Gaetan Rivet
---
drivers/bus/pci/Makefile | 3 +-
drivers/bus/pci/meson.build | 6 +++-
drivers/bus/pci/pci_common.c | 3 +-
drivers/bus/pci/pci_params.c | 53
drivers/bus/pci/private.h| 25 +
5 files changed, 86 insertions(+), 4 deletions(-)
create mode 100644 drivers/bus/pci/pci_params.c
diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
index cf373068a..4de953f8f 100644
--- a/drivers/bus/pci/Makefile
+++ b/drivers/bus/pci/Makefile
@@ -26,10 +26,11 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
CFLAGS += -DALLOW_EXPERIMENTAL_API
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_pci
+LDLIBS += -lrte_ethdev -lrte_pci -lrte_kvargs
include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))
+SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 72939e598..23d6a5fec 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -3,7 +3,9 @@
deps += ['pci']
install_headers('rte_bus_pci.h')
-sources = files('pci_common.c', 'pci_common_uio.c')
+sources = files('pci_common.c',
+ 'pci_common_uio.c',
+ 'pci_params.c')
if host_machine.system() == 'linux'
sources += files('linux/pci.c',
'linux/pci_uio.c',
@@ -17,3 +19,5 @@ endif
# memseg walk is not part of stable API yet
allow_experimental_apis = true
+
+deps += ['kvargs']
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 94b0f4143..5b7854490 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -29,8 +29,6 @@
static void rte_pci_remove_device(struct rte_pci_device *pci_device);
-extern struct rte_pci_bus rte_pci_bus;
-
#define SYSFS_PCI_DEVICES "/sys/bus/pci/devices"
const char *rte_pci_get_sysfs_path(void)
@@ -437,6 +435,7 @@ struct rte_pci_bus rte_pci_bus = {
.unplug = pci_unplug,
.parse = pci_parse,
.get_iommu_class = rte_pci_get_iommu_class,
+ .dev_iterate = rte_pci_dev_iterate,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c
new file mode 100644
index 0..0fde75803
--- /dev/null
+++ b/drivers/bus/pci/pci_params.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include "private.h"
+
+enum pci_params {
+ RTE_PCI_PARAMS_MAX,
+};
+
+static const char * const pci_params_keys[] = {
+ [RTE_PCI_PARAMS_MAX] = NULL,
+};
+
+static int
+pci_dev_match(const struct rte_device *dev,
+ const void *_kvlist)
+{
+ const struct rte_kvargs *kvlist = _kvlist;
+
+ (void) dev;
+ (void) kvlist;
+ return 0;
+}
+
+void *
+rte_pci_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it __rte_unused)
+{
+ rte_bus_find_device_t find_device;
+ struct rte_kvargs *kvargs = NULL;
+ struct rte_device *dev;
+
+ if (str != NULL) {
+ kvargs = rte_kvargs_parse(str, pci_params_keys);
+ if (kvargs == NULL) {
+ RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ rte_errno = EINVAL;
+ return NULL;
+ }
+ }
+ find_device = rte_pci_bus.bus.find_device;
+ dev = find_device(start, pci_dev_match, kvargs);
+ rte_kvargs_free(kvargs);
+ return dev;
+}
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index 8ddd03e16..0e689fa74 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -10,6 +10,8 @@
#include
#include
+extern struct rte_pci_bus rte_pci_bus;
+
struct rte_pci_driver;
struct rte_pci_device;
@@ -166,4 +168,27 @@ rte_pci_match(const struct rte_pci_driver *pci_drv,
enum rte_iova_mode
rte_pci_get_iommu_class(void);
+/*
+ * Iterate over internal devices,
+ * matching any device against the provided
+ * string.
+ *
+ * @param start
+ * Iteration starting point.
+ *
+ * @param str
+ * Device string to match against.
+ *
+ * @param it
+ * (unused) iterator structure.
+ *
+ * @return
+ * A pointer to the next matching device if any.
+ * NULL otherwise.
+ */
+void *
+rte_pci_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it);
+
#endif /* _PCI_PRIVATE_H_ */
--
2.18.0
