RE: [dpdk-dev] Question Regarding FIPS Validation in DPDK
> -Original Message- > From: dev On Behalf Of Brandon Lo > Sent: Wednesday, November 3, 2021 5:45 PM > To: Kovacevic, Marko > Cc: dev > Subject: [dpdk-dev] Question Regarding FIPS Validation in DPDK > > Hello, > > I have been able to use Cisco's libacvp tool to retrieve test vectors from > the NIST ACVP API. > However, after building the dpdk-fips_validation example and reading > through its documentation, it seems like the example application is unable > to parse the request files due to them being in a different format. > Currently, the ACVP API will supply request files in json format. > > The example app documentation says that the request file must be in CAVS > 21.0 format. I have not been able to find a specification for this format > to compare. > Does the current version of the dpdk-fips_validation example support the > API's test vectors in json format? At the time the dpdk-fips_validation tool was written the test vectors weren't available in JSON format, and, to the best of my knowledge, there was a format specification (which is why there is different parsing for different algorithms). We (the community) should probably move to the JSON format. Adding Fan Zhang since I think this was discussion in the community previously. John
Re: [PATCH v10 9/9] app/test: enable subset of unit tests on Windows
Hello, On Wed, Dec 1, 2021 at 7:45 PM Jie Zhou wrote: > @@ -158,34 +152,17 @@ test_sources = files( > ) > > test_deps = [ > -'acl', > 'bus_pci', > 'bus_vdev', > -'bpf', > +'bitratestats', There is some issue with your rebase. Please don't reintroduce mandatory dependencies. This is probably the reason for the CI failures at UNH. > 'cfgfile', > 'cmdline', -- David Marchand
[PATCH v2 1/2] net/ixgbe: add vector Rx parameter check
Under the circumstance that `rx_tail` wrap back to zero
and the advance speed of `rx_tail` is greater than `rxrearm_start`,
`rx_tail` will catch up with `rxrearm_start` and surpass it.
This may cause some mbufs be reused by application.
So we need to make some restrictions to ensure that
`rx_tail` will not exceed `rxrearm_start`.
e.g.
RDH: 972 RDT: 991 rxrearm_nb: 991 rxrearm_start: 992 rx_tail: 959
RDH: 1004 RDT: 1023 rxrearm_nb: 991 rxrearm_start: 0 rx_tail: 991
RDH: 12 RDT: 31 rxrearm_nb: 991 rxrearm_start: 32 rx_tail: 1023
RDH: 31 RDT: 63 rxrearm_nb: 960 rxrearm_start: 64 rx_tail: 0
RDH: 95 RDT: 95 rxrearm_nb: 1016 rxrearm_start: 96 rx_tail: 88
RDH: 95 RDT: 127 rxrearm_nb: 991 rxrearm_start: 128 rx_tail: 95
...
RDH: 908 RDT: 927 rxrearm_nb: 991 rxrearm_start: 928 rx_tail: 895
RDH: 940 RDT: 959 rxrearm_nb: 991 rxrearm_start: 960 rx_tail: 927
RDH: 980 RDT: 991 rxrearm_nb: 991 rxrearm_start: 992 rx_tail: 959
RDH: 991 RDT: 991 rxrearm_nb: 1026 rxrearm_start: 992 rx_tail: 994
when `rx_tail` catches up with `rxrearm_start`,
2(994 - 992) mbufs be reused by application !
Bugzilla ID: 882
Fixes: 5a3cca342417 ("net/ixgbe: fix vector Rx")
Cc: jia@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Bin Zheng
---
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index 1eed949495..5811749b95 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -364,6 +364,17 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
uint8_t vlan_flags;
uint16_t udp_p_flag = 0; /* Rx Descriptor UDP header present */
+ /*
+* Under the circumstance that `rx_tail` wrap back to zero
+* and the advance speed of `rx_tail` is greater than `rxrearm_start`,
+* `rx_tail` will catch up with `rxrearm_start` and surpass it.
+* This may cause some mbufs be reused by applicaion.
+*
+* So we need to make some restrictions to ensure that
+* `rx_tail` will not exceed `rxrearm_start`.
+*/
+ nb_pkts = RTE_MIN(nb_pkts, RTE_IXGBE_RXQ_REARM_THRESH);
+
/* nb_pkts has to be floor-aligned to RTE_IXGBE_DESCS_PER_LOOP */
nb_pkts = RTE_ALIGN_FLOOR(nb_pkts, RTE_IXGBE_DESCS_PER_LOOP);
--
2.25.1
[PATCH v2 2/2] net/ixgbe: fix spelling mistakes
fix comment spelling mistakes Signed-off-by: Bin Zheng --- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c index 5811749b95..4654d0adec 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c @@ -368,7 +368,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, * Under the circumstance that `rx_tail` wrap back to zero * and the advance speed of `rx_tail` is greater than `rxrearm_start`, * `rx_tail` will catch up with `rxrearm_start` and surpass it. -* This may cause some mbufs be reused by applicaion. +* This may cause some mbufs be reused by application. * * So we need to make some restrictions to ensure that * `rx_tail` will not exceed `rxrearm_start`. -- 2.25.1
Re: [PATCH] ip_frag: add IPv4 options fragment and unit test data
Hi, On Thu, 2 Dec 2021 10:24:40 +0800, Huichao Cai wrote: > > Substituting options with NOOP might cause rte_ipv4_fragment_packet to > > produce more fragments than necessary, since options with copied flag unset > > will still occupy space in IPv4 header. > --The "ip_options_fragment" just make a replacement and doesn't change the > length of the IPv4 header.So I don't quite understand why it leads to produce > more fragments. If options with copied flag unset are not copied, then IPv4 headers in the fragments (despite 1st fragment) will be shorter. This leaves more byte space for the payload and in effect fragmentation might produce less fragments. Best regards, Dariusz Sosnowski
Re:Re: [PATCH] ip_frag: add IPv4 options fragment and unit test data
If options with copied flag unset are not copied, then IPv4 headers in the fragments (despite 1st fragment) will be shorter. This leaves more byte space for the payload and in effect fragmentation might produce less fragments. --Do I need to modify it this way?
RE: Re:Re: [PATCH] ip_frag: add IPv4 options fragment and unit test data
I didn't look at it in detail yet, just wonder would be real gain in terms of space? From: Huichao Cai Sent: Thursday, December 2, 2021 11:39 AM To: Dariusz Sosnowski Cc: Ananyev, Konstantin ; dev@dpdk.org Subject: Re:Re: [PATCH] ip_frag: add IPv4 options fragment and unit test data If options with copied flag unset are not copied, then IPv4 headers in the fragments (despite 1st fragment) will be shorter. This leaves more byte space for the payload and in effect fragmentation might produce less fragments. --Do I need to modify it this way?
Re:RE: Re:Re: [PATCH] ip_frag: add IPv4 options fragment and unit test data
Perhaps performance is more important.This code comes from the linux kernel(5.10.9 and so on). :) It is more performance-focused based on comments. :)
[PATCH] examples/ipsec-secgw: fix event dev start sequence
Start eventdev after complete initialization of event dev,
rx adapter and tx adapter.
Fixes: e0b0e55c8f15 ("examples/ipsec-secgw: add framework for event helper")
Cc: ano...@marvell.com
Cc: sta...@dpdk.org
Signed-off-by: Nithin Dabilpuram
---
examples/ipsec-secgw/event_helper.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/examples/ipsec-secgw/event_helper.c
b/examples/ipsec-secgw/event_helper.c
index e8600f5..ab96773 100644
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -716,6 +716,16 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)
}
}
+ return 0;
+}
+
+static int
+eh_start_eventdev(struct eventmode_conf *em_conf)
+{
+ struct eventdev_params *eventdev_config;
+ int nb_eventdev = em_conf->nb_eventdev;
+ int i, ret;
+
/* Start event devices */
for (i = 0; i < nb_eventdev; i++) {
@@ -1688,6 +1698,13 @@ eh_devs_init(struct eh_conf *conf)
return ret;
}
+ /* Start eventdev */
+ ret = eh_start_eventdev(em_conf);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to start event dev %d", ret);
+ return ret;
+ }
+
/* Start eth devices after setting up adapter */
RTE_ETH_FOREACH_DEV(port_id) {
--
2.8.4
RE: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
> From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Thursday, 2 December 2021 08.19 > > 01/12/2021 22:37, Tyler Retzlaff: > > On Wed, Nov 24, 2021 at 06:04:56PM +, Bruce Richardson wrote: > > > if (ret < 0 && rte_errno == EAGAIN) > > > > i only urge that this be explicit as opposed to a range i.e. ret == - > 1 > > preferred over ret < 0 > > I don't understand why you think it is important to limit return value > to -1. > Why "if (ret == -1)" is better than "if (ret < 0)" ? Speaking for myself: For clarity. It leaves no doubt that "it failed" is represented by the return value -1, and that the function does not return errno values such as -EINVAL. -Morten
[PATCH v2] dma/idxd: add allow/block list support
Add support for allow or block list for devices bound
to the kernel driver.
When used the allow or block list applies as an additional
condition to the name prefix.
Signed-off-by: Radu Nicolau
Reviewed-by: Bruce Richardson
Acked-by: Bruce Richardson
---
v2: corrected doc
doc/guides/dmadevs/idxd.rst | 8
drivers/dma/idxd/idxd_bus.c | 30 ++
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/doc/guides/dmadevs/idxd.rst b/doc/guides/dmadevs/idxd.rst
index d4a210b854..a4681b2c5a 100644
--- a/doc/guides/dmadevs/idxd.rst
+++ b/doc/guides/dmadevs/idxd.rst
@@ -117,6 +117,14 @@ the value used as the DPDK ``--file-prefix`` parameter may
be used as a workqueu
name prefix, instead of ``dpdk_``, allowing each DPDK application instance to
only
use a subset of configured queues.
+Additionally, the -a (allowlist) or -b (blocklist) commandline parameters are
+also available to further restrict the device list that will be used. If the
-a option is used,
+then any device that passes the ``dpdk_`` or ``--file-prefix`` prefix
condition must also be present in the allow list.
+Similarly, when the block list is used, any device that passes the prefix
condition must not be in the block list.
+For example, to only use ``wq0.3``, assuming the name prefix condition is met::
+
+ $ dpdk-test -a wq0.3
+
Once probed successfully, irrespective of kernel driver, the device will
appear as a ``dmadev``,
that is a "DMA device type" inside DPDK, and can be accessed using APIs from
the
``rte_dmadev`` library.
diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
index 08639e9dce..13cb967f6d 100644
--- a/drivers/dma/idxd/idxd_bus.c
+++ b/drivers/dma/idxd/idxd_bus.c
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -244,8 +245,18 @@ idxd_probe_dsa(struct rte_dsa_device *dev)
return 0;
}
+static int search_devargs(const char *name)
+{
+ struct rte_devargs *devargs;
+ RTE_EAL_DEVARGS_FOREACH(dsa_bus.bus.name, devargs) {
+ if (strcmp(devargs->name, name) == 0)
+ return 1;
+ }
+ return 0;
+}
+
static int
-is_for_this_process_use(const char *name)
+is_for_this_process_use(struct rte_dsa_device *dev, const char *name)
{
char *runtime_dir = strdup(rte_eal_get_runtime_dir());
char *prefix = basename(runtime_dir);
@@ -257,6 +268,13 @@ is_for_this_process_use(const char *name)
if (strncmp(name, prefix, prefixlen) == 0 && name[prefixlen] == '_')
retval = 1;
+ if (retval && dsa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_UNDEFINED) {
+ if (dsa_bus.bus.conf.scan_mode == RTE_BUS_SCAN_ALLOWLIST)
+ retval = search_devargs(dev->device.name);
+ else
+ retval = !search_devargs(dev->device.name);
+ }
+
free(runtime_dir);
return retval;
}
@@ -273,7 +291,8 @@ dsa_probe(void)
read_wq_string(dev, "name", name, sizeof(name))
< 0)
continue;
- if (strncmp(type, "user", 4) == 0 &&
is_for_this_process_use(name)) {
+ if (strncmp(type, "user", 4) == 0 &&
+ is_for_this_process_use(dev, name)) {
dev->device.driver = &dsa_bus.driver;
idxd_probe_dsa(dev);
continue;
@@ -370,8 +389,11 @@ dsa_addr_parse(const char *name, void *addr)
return -1;
}
- wq->device_id = device_id;
- wq->wq_id = wq_id;
+ if (wq != NULL) {
+ wq->device_id = device_id;
+ wq->wq_id = wq_id;
+ }
+
return 0;
}
--
2.25.1
RE: [PATCH v2 2/2] net/ixgbe: fix spelling mistakes
> -Original Message- > From: Bin Zheng > Sent: Thursday, December 2, 2021 17:20 > To: dev@dpdk.org > Cc: Wang, Haiyue ; lian...@liangbit.com; Bin Zheng > > Subject: [PATCH v2 2/2] net/ixgbe: fix spelling mistakes > > fix comment spelling mistakes > > Signed-off-by: Bin Zheng > --- > drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c > b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c > index 5811749b95..4654d0adec 100644 > --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c > +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c > @@ -368,7 +368,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct > rte_mbuf **rx_pkts, >* Under the circumstance that `rx_tail` wrap back to zero >* and the advance speed of `rx_tail` is greater than `rxrearm_start`, >* `rx_tail` will catch up with `rxrearm_start` and surpass it. > - * This may cause some mbufs be reused by applicaion. > + * This may cause some mbufs be reused by application. This is your patch 1's, just submit the 1 & 2 by one patch. >* >* So we need to make some restrictions to ensure that >* `rx_tail` will not exceed `rxrearm_start`. > -- > 2.25.1
Re: [PATCH v2] dma/idxd: add allow/block list support
On 02/12/2021 12:50, Radu Nicolau wrote: Add support for allow or block list for devices bound to the kernel driver. When used the allow or block list applies as an additional condition to the name prefix. Signed-off-by: Radu Nicolau Reviewed-by: Bruce Richardson Acked-by: Bruce Richardson --- v2: corrected doc doc/guides/dmadevs/idxd.rst | 8 drivers/dma/idxd/idxd_bus.c | 30 ++ 2 files changed, 34 insertions(+), 4 deletions(-) Acked-by: Kevin Laatz
RE: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
> > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > Sent: Thursday, 2 December 2021 08.19 > > > > 01/12/2021 22:37, Tyler Retzlaff: > > > On Wed, Nov 24, 2021 at 06:04:56PM +, Bruce Richardson wrote: > > > > if (ret < 0 && rte_errno == EAGAIN) > > > > > > i only urge that this be explicit as opposed to a range i.e. ret == - > > 1 > > > preferred over ret < 0 > > > > I don't understand why you think it is important to limit return value > > to -1. > > Why "if (ret == -1)" is better than "if (ret < 0)" ? > > Speaking for myself: > > For clarity. It leaves no doubt that "it failed" is represented by the return > value -1, and that the function does not return errno values such as > -EINVAL. > But why '< 0' gives you less clarity? Negative value means failure - seems perfectly clear to me.
[PATCH] net/virtio: fix Tx queue 0 override by queue 128
Both Rx queue and Tx queue are VirtQ in virtio, VQ index is 256 for Tx
queue 128. Uint8 type of TxQ VQ index overflows and overrides Tx queue 0
data.
This patch fixes VQ index type with uint16 type.
Fixes: c1f86306a026 ("virtio: add new driver")
Cc: sta...@dpdk.org
Signed-off-by: Xueming Li
---
drivers/net/virtio/virtio_rxtx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 2e115ded023..f0eafd29dc1 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -814,7 +814,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
unsigned int socket_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
- uint8_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
+ uint16_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
struct virtio_hw *hw = dev->data->dev_private;
struct virtqueue *vq = hw->vqs[vq_idx];
struct virtnet_tx *txvq;
@@ -858,7 +858,7 @@ int
virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,
uint16_t queue_idx)
{
- uint8_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
+ uint16_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
struct virtio_hw *hw = dev->data->dev_private;
struct virtqueue *vq = hw->vqs[vq_idx];
--
2.34.0
RE: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
> From: Ananyev, Konstantin [mailto:konstantin.anan...@intel.com] > Sent: Thursday, 2 December 2021 14.01 > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > > Sent: Thursday, 2 December 2021 08.19 > > > > > > 01/12/2021 22:37, Tyler Retzlaff: > > > > On Wed, Nov 24, 2021 at 06:04:56PM +, Bruce Richardson wrote: > > > > > if (ret < 0 && rte_errno == EAGAIN) > > > > > > > > i only urge that this be explicit as opposed to a range i.e. ret > == - > > > 1 > > > > preferred over ret < 0 > > > > > > I don't understand why you think it is important to limit return > value > > > to -1. > > > Why "if (ret == -1)" is better than "if (ret < 0)" ? > > > > Speaking for myself: > > > > For clarity. It leaves no doubt that "it failed" is represented by > the return value -1, and that the function does not return errno values > such as > > -EINVAL. > > > > But why '< 0' gives you less clarity? > Negative value means failure - seems perfectly clear to me. I disagree: Negative value does not mean failure. Only -1 means failure. There is no -2 return value. There is no -EINVAL return value. Testing for (ret < 0) might confuse someone to think that other values than -1 could be returned as indication of failure, which is not the case when following the convention where the functions set errno and return -1 in case of failure. It would be different if following a convention where the functions return -errno in case of failure. In this case, testing (ret < 0) would be appropriate. So explicitly testing (ret == -1) clarifies which of the two conventions are relevant.
RE: [dpdk-dev] Question Regarding FIPS Validation in DPDK
> -Original Message- > From: Mcnamara, John > Sent: Thursday, December 2, 2021 8:45 AM > To: Brandon Lo ; Zhang, Roy Fan > Cc: dev ; Kovacevic, Marko > Subject: RE: [dpdk-dev] Question Regarding FIPS Validation in DPDK > > > -Original Message- > > From: dev On Behalf Of Brandon Lo > > Sent: Wednesday, November 3, 2021 5:45 PM > > To: Kovacevic, Marko > > Cc: dev > > Subject: [dpdk-dev] Question Regarding FIPS Validation in DPDK > > > > Hello, > > > > I have been able to use Cisco's libacvp tool to retrieve test vectors > > from the NIST ACVP API. > > However, after building the dpdk-fips_validation example and reading > > through its documentation, it seems like the example application is > > unable to parse the request files due to them being in a different > format. > > Currently, the ACVP API will supply request files in json format. > > > > The example app documentation says that the request file must be in > > CAVS > > 21.0 format. I have not been able to find a specification for this > > format to compare. > > Does the current version of the dpdk-fips_validation example support > > the API's test vectors in json format? > > > At the time the dpdk-fips_validation tool was written the test vectors > weren't available in JSON format, and, to the best of my knowledge, there > was a format specification (which is why there is different parsing for > different algorithms). We (the community) should probably move to the JSON > format. Adding Fan Zhang since I think this was discussion in the > community previously. Sorry I meant to say " to the best of my knowledge, there *wasn't* a format specification" available. John
[PATCH v2] net/axgbe: use PCI root complex device to distinguish AMD hardware
"bus/pci: optimize bus scan" broke axgbe on V1000/R1000.
RV root complex pci device does not have any kernel driver assigned
so it is removed from pci scan list which is used in
"net/axgbe: add a HW quirk for register definitions".
Get root complex device id directly from pci sysfs instead of
pci scan list.
Fixes: 991e0b1dbc4a (net/axgbe: add a HW quirk for register definitions)
Cc: sta...@dpdk.org
Signed-off-by: Chandubabu Namburu
---
drivers/net/axgbe/axgbe_ethdev.c | 39
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index 7d40c18a86..7b8d94ca3c 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -10,6 +10,8 @@
#include "axgbe_regs.h"
#include "rte_time.h"
+#include "eal_filesystem.h"
+
static int eth_axgbe_dev_init(struct rte_eth_dev *eth_dev);
static int axgbe_dev_configure(struct rte_eth_dev *dev);
static int axgbe_dev_start(struct rte_eth_dev *dev);
@@ -2117,28 +2119,27 @@ static void axgbe_default_config(struct axgbe_port
*pdata)
pdata->power_down = 0;
}
-static int
-pci_device_cmp(const struct rte_device *dev, const void *_pci_id)
+/*
+ * Return PCI root complex device id on success else 0
+ */
+static uint16_t
+get_pci_rc_devid(void)
{
- const struct rte_pci_device *pdev = RTE_DEV_TO_PCI_CONST(dev);
- const struct rte_pci_id *pcid = _pci_id;
+ char pci_sysfs[PATH_MAX];
+ const struct rte_pci_addr pci_rc_addr = {0, 0, 0, 0};
+ unsigned long device_id;
- if (pdev->id.vendor_id == AMD_PCI_VENDOR_ID &&
- pdev->id.device_id == pcid->device_id)
- return 0;
- return 1;
-}
+ snprintf(pci_sysfs, sizeof(pci_sysfs), "%s/" PCI_PRI_FMT "/device",
+rte_pci_get_sysfs_path(), pci_rc_addr.domain,
+pci_rc_addr.bus, pci_rc_addr.devid, pci_rc_addr.function);
-static bool
-pci_search_device(int device_id)
-{
- struct rte_bus *pci_bus;
- struct rte_pci_id dev_id;
+ /* get device id */
+ if (eal_parse_sysfs_value(pci_sysfs, &device_id) < 0) {
+ PMD_INIT_LOG(ERR, "Error in reading PCI sysfs\n");
+ return 0;
+ }
- dev_id.device_id = device_id;
- pci_bus = rte_bus_find_by_name("pci");
- return (pci_bus != NULL) &&
- (pci_bus->find_device(NULL, pci_device_cmp, &dev_id) != NULL);
+ return (uint16_t)device_id;
}
/*
@@ -2180,7 +2181,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
/*
* Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
*/
- if (pci_search_device(AMD_PCI_RV_ROOT_COMPLEX_ID)) {
+ if ((get_pci_rc_devid()) == AMD_PCI_RV_ROOT_COMPLEX_ID) {
pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
} else {
--
2.25.1
Re: [PATCH] version: 22.03-rc0
On Tue, Nov 30, 2021 at 8:51 PM David Marchand wrote: > > On Tue, Nov 30, 2021 at 4:35 PM Thomas Monjalon wrote: > > > > 29/11/2021 14:16, David Marchand: > > > Start a new release cycle with empty release notes. > > > Bump version and ABI minor. > > > Enable ABI checks using latest libabigail. > > > > > > Signed-off-by: David Marchand > > [...] > > > - LIBABIGAIL_VERSION: libabigail-1.8 > > > + LIBABIGAIL_VERSION: libabigail-2.0 > > > > What is the reason for this update? Can we still use the old version? > > Nothing prevents from using the old version, I just used this chance > to bump the version. > > I talked with Dodji, 2.0 is the version used in Fedora for ABI checks. > This version comes with enhancements and at least a fix for a bug we > got when writing exception rules in dpdk: > https://sourceware.org/bugzilla/show_bug.cgi?id=28060 I ran more checks with 2.0 and unfortunately, I get an issue with dpdk on Fedora 35 libabigail. 2.0 built in Ubuntu does not seem affected, but I prefer to be safe, stick to 1.8 version and wait for Dodji to have a look. v2 on the way. -- David Marchand
[PATCH] tap:remove maintainer
I no longer have the bandwidth to support the TAP PMD, so I am removing myself as the maintainer so as to not hold up commits. Signed-off-by: Keith Wiles --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 18d9edaf88..b43285b6ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -989,7 +989,7 @@ F: doc/guides/nics/pcap_ring.rst F: doc/guides/nics/features/pcap.ini Tap PMD -M: Keith Wiles +M: F: drivers/net/tap/ F: doc/guides/nics/tap.rst F: doc/guides/nics/features/tap.ini -- 2.30.1 (Apple Git-130)
[PATCH] tap:remove maintainer
I no longer have the bandwidth to support the TAP PMD, so I am removing myself as the maintainer so as to not hold up commits. Signed-off-by: Wiles, Keith --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 18d9edaf88..b43285b6ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -989,7 +989,7 @@ F: doc/guides/nics/pcap_ring.rst F: doc/guides/nics/features/pcap.ini Tap PMD -M: Keith Wiles +M: F: drivers/net/tap/ F: doc/guides/nics/tap.rst F: doc/guides/nics/features/tap.ini -- 2.30.1 (Apple Git-130)
[PATCH v2] version: 22.03-rc0
Start a new release cycle with empty release notes.
Bump version and ABI minor.
Enable ABI checks.
Signed-off-by: David Marchand
Acked-by: Thomas Monjalon
---
Changes since v1:
- stick to libabigail 1.8,
---
.github/workflows/build.yml| 4 +-
.travis.yml| 21 +++-
ABI_VERSION| 2 +-
VERSION| 2 +-
doc/guides/rel_notes/index.rst | 1 +
doc/guides/rel_notes/release_22_03.rst | 138 +
6 files changed, 163 insertions(+), 5 deletions(-)
create mode 100644 doc/guides/rel_notes/release_22_03.rst
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e9c4be6d0..6cf997d6ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
LIBABIGAIL_VERSION: libabigail-1.8
MINI: ${{ matrix.config.mini != '' }}
PPC64LE: ${{ matrix.config.cross == 'ppc64le' }}
- REF_GIT_TAG: none
+ REF_GIT_TAG: v21.11
RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }}
strategy:
@@ -40,7 +40,7 @@ jobs:
- os: ubuntu-18.04
compiler: gcc
library: shared
-checks: doc+tests
+checks: abi+doc+tests
- os: ubuntu-18.04
compiler: clang
library: static
diff --git a/.travis.yml b/.travis.yml
index 4bb5bf629e..0838f80d3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ script: ./.ci/${TRAVIS_OS_NAME}-build.sh
env:
global:
- LIBABIGAIL_VERSION=libabigail-1.8
-- REF_GIT_TAG=none
+- REF_GIT_TAG=v21.11
jobs:
include:
@@ -61,6 +61,14 @@ jobs:
packages:
- *required_packages
- *doc_packages
+ - env: DEF_LIB="shared" ABI_CHECKS=true
+arch: amd64
+compiler: gcc
+addons:
+ apt:
+packages:
+ - *required_packages
+ - *libabigail_build_packages
# x86_64 clang jobs
- env: DEF_LIB="static"
arch: amd64
@@ -137,6 +145,17 @@ jobs:
packages:
- *required_packages
- *doc_packages
+ - env: DEF_LIB="shared" ABI_CHECKS=true
+dist: focal
+arch: arm64-graviton2
+virt: vm
+group: edge
+compiler: gcc
+addons:
+ apt:
+packages:
+ - *required_packages
+ - *libabigail_build_packages
# aarch64 clang jobs
- env: DEF_LIB="static"
dist: focal
diff --git a/ABI_VERSION b/ABI_VERSION
index b090fe57f6..70a91e23ec 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-22.0
+22.1
diff --git a/VERSION b/VERSION
index b570734337..25bb269237 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-21.11.0
+22.03.0-rc0
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 78861ee57b..876ffd28f6 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
:maxdepth: 1
:numbered:
+release_22_03
release_21_11
release_21_08
release_21_05
diff --git a/doc/guides/rel_notes/release_22_03.rst
b/doc/guides/rel_notes/release_22_03.rst
new file mode 100644
index 00..6d99d1eaa9
--- /dev/null
+++ b/doc/guides/rel_notes/release_22_03.rst
@@ -0,0 +1,138 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright 2021 The DPDK contributors
+
+.. include::
+
+DPDK Release 22.03
+==
+
+.. **Read this first.**
+
+ The text in the sections below explains how to update the release notes.
+
+ Use proper spelling, capitalization and punctuation in all sections.
+
+ Variable and config names should be quoted as fixed width text:
+ ``LIKE_THIS``.
+
+ Build the docs and view the output file to ensure the changes are correct::
+
+ ninja -C build doc
+ xdg-open build/doc/guides/html/rel_notes/release_22_03.html
+
+
+New Features
+
+
+.. This section should contain new features added in this release.
+ Sample format:
+
+ * **Add a title in the past tense with a full stop.**
+
+ Add a short 1-2 sentence description in the past tense.
+ The description should be enough to allow someone scanning
+ the release notes to understand the new feature.
+
+ If the feature adds a lot of sub-features you can use a bullet list
+ like this:
+
+ * Added feature foo to do something.
+ * Enhanced feature bar to do something else.
+
+ Refer to the previous release notes for examples.
+
+ Suggested order in release notes items:
+ * Core libs (EAL, mempool, ring, mbuf, buses)
+ * Device abstraction libs and PMDs (ordered alphabetically by vendor name)
+ - ethdev (lib, PMDs)
+ - cryptodev (lib, PMDs)
+ - eventdev (lib, PMDs)
+ - etc
+ * Other libs
+ * Apps, Examples, Tools (if significant)
+
+ This section is a comment. Do not overwrite or remove it.
+ Also, make sure to start the actual text at the margin.
+ =
Minutes of Technical Board Meeting, 2021-12-01
Members Attending = - Aaron - Bruce - David - Ferruh - Hemant - Honnappa - Jerin - Konstantin - Maxime - Olivier - Stephen (Chair) - Thomas NOTE: The technical board meetings every second Wednesday at https://meet.jit.si/DPDK at 3 pm UTC. Meetings are public, and DPDK community members are welcome to attend. NOTE: Next meeting will be on Wednesday 2021-12-01 @3pm UTC, and will be chaired by Thomas. 1. Governing board == Jerin's slides for governing board were reviewed with no new feedback. 2. Review the default maximum number of cores = Continued discussion about the default number of cores from last meeting. The proposed patch only addressed AMD EPYC platform but the issue is more general since today's limit of 128 cores will be on many high end two socket x86 system. A suggestion is to increase this to default maximum 256 cores for all x86 platforms; to avoid any out of the box user experience issues. Users can remap lcores today from the command line to run with up to 128 cores used (out of a much larger set). But this requires users explicitly configuring the command line. Suggestion was made to have an new command line flag to automatically create the mapping; based on the lcore command line. Something like the following dpdk-XXX --cpu-offset 128 --lcores 0-2 would be same as: dpdk-XXX -lcores 0@128,1,@129,2@130 Olivier will investigate 3. Review of outdated examples. === Discussion of future status of examples that are not being maintained: - ioat was removed in 21.11. - ntb should be moved to different directory to indicate that it is vendor specific. - vmdq examples might be candidate for deprecation. Bruce to check with Intel - performance-thread should be deprecated and removed. - flow filtering and flow classify examples overlap. 4. LTS release maintenance == The current LTS release and maintenance schedule on web site needs update. The plan is for LTS releases to come immediately after the main DPDK release. Now that main DPDK releases are three times a year, the LTS release schedule needs to be updated as well. The other issues is extending the LTS releases to 3 years instead of just 2. General consensus was that this is good idea but will require additional resources from LTS maintainers and vendor validation teams. Will wait for confirmation before committing to longer cycle. For the 21.11 LTS, Kevin was approved by Techboard as LTS maintainer. 5. KNI deprecation == Deprecation was previously discussed by TB, discused in more detail. Ferruh proposed time line is: - 22.11 move to kmod repository KNI library and example won't be built by default - 23.11 final removal Approved, Ferruh to follow up with more patches.
Re: [PATCH v2] version: 22.03-rc0
02/12/2021 19:11, David Marchand: > Start a new release cycle with empty release notes. > Bump version and ABI minor. > Enable ABI checks. > > Signed-off-by: David Marchand > Acked-by: Thomas Monjalon > --- > Changes since v1: > - stick to libabigail 1.8, OK it looks reasonnable.
Re: please help backporting some patches to stable release 19.11.11
Hi Christian, On 12/2/21 14:45, Christian Ehrhardt wrote: On Tue, Nov 30, 2021 at 5:56 PM wrote: Hi commit authors (and maintainers), Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh I didn't apply following commits from DPDK main to 19.11 stable branch, as conflicts or build errors occur. Can authors check your patches in the following list and either: - Backport your patches to the 19.11 branch, or - Indicate that the patch should not be backported Please do either of the above by December the 14th 2021 (More time than usual as backports get harder). Sorry, but to meet some deadlines by test/verification I need to reduce the time for backports to make it into -rc1 to the 9th of December. That still is 7 days out from now and still longer than usual. You can find the a temporary work-in-progress branch of the coming 19.11.11 release at: https://github.com/cpaelzer/dpdk-stable-queue It is recommended to backport on top of that to minimize further conflicts or misunderstandings. Some notes on stable backports: A backport should contain a reference to the DPDK main branch commit in it's commit message in the following fashion: [ upstream commit ] For example: https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb When sending the backported patch, please indicate the target branch in the subject line, as we have multiple branches, for example: [PATCH 19.11] foo/bar: fix baz With git format-patch, this can be achieved by appending the parameter: --subject-prefix='PATCH 19.11' Send the backported patch to "sta...@dpdk.org" but not "dev@dpdk.org". FYI, branch 19.11 is located at tree: https://git.dpdk.org/dpdk-stable Thanks. Christian Ehrhardt --- ... b72099be7f David Marchand net/virtio-user: fix init when using existing tap This commit should not be backported. We deliberately omitted adding the Fixes tag and Cc'ing sta...@dpdk.org so that it is not automatically backported. Regards, Maxime
Re: [PATCH v2] version: 22.03-rc0
On Thu, Dec 2, 2021 at 7:11 PM David Marchand wrote: > > Start a new release cycle with empty release notes. > Bump version and ABI minor. > Enable ABI checks. > > Signed-off-by: David Marchand > Acked-by: Thomas Monjalon Applied, thanks. -- David Marchand
Re: [PATCH v10 9/9] app/test: enable subset of unit tests on Windows
On Thu, Dec 02, 2021 at 10:17:48AM +0100, David Marchand wrote: > Hello, > > On Wed, Dec 1, 2021 at 7:45 PM Jie Zhou wrote: > > @@ -158,34 +152,17 @@ test_sources = files( > > ) > > > > test_deps = [ > > -'acl', > > 'bus_pci', > > 'bus_vdev', > > -'bpf', > > +'bitratestats', > > There is some issue with your rebase. > Please don't reintroduce mandatory dependencies. > > This is probably the reason for the CI failures at UNH. > > > > 'cfgfile', > > 'cmdline', > > > -- > David Marchand Thank you David! Yes, it seems from a rebase error. Removed this mandatory dependency on bitratestats in V10.
[PATCH v11 1/9] eal/windows: return ENOTSUP for not supported API
UT memory_autotest on Windows has 2 failed cases on eal APIs
eal_memalloc_get_seg_fd and eal_memalloc_get_seg_fd_offset. These 2
APIs are not supported on Windows yet. Should return ENOTSUP such that
in test_memory.c these 2 ENOTSUP cases will not be marked as failures,
same as other ENOTSUP cases.
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
lib/eal/windows/eal_memalloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
index 55d6dcc71c..aa7589b81d 100644
--- a/lib/eal/windows/eal_memalloc.c
+++ b/lib/eal/windows/eal_memalloc.c
@@ -17,7 +17,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx)
RTE_SET_USED(list_idx);
RTE_SET_USED(seg_idx);
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
@@ -28,7 +28,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx,
size_t *offset)
RTE_SET_USED(seg_idx);
RTE_SET_USED(offset);
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
static int
@@ -428,7 +428,7 @@ eal_memalloc_sync_with_primary(void)
{
/* No multi-process support. */
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
--
2.31.0.vfs.0.1
[PATCH v11 0/9] app/test: enable subset of tests on Windows
This patchset is to enable a subset of unit tests on windows. It mainly
includes:
- Replace POSIX specific codes
- Add test stubs for not supported ones on Windows
- Fix some lib and tests per failures investigation
- Replace .sh script with .py script for meson.build
- Enable build and run subset of unit tests on Windows
Future work:
- Work with CI/CD lab to onboard unit tests on Windows to catch regression
- Enable more tests
---
V2 changes:
- Fix compilation error on FreeBSD
- Fix email mismatch issue
- Add a missing space around "*"
---
V3 changes:
- Fix a misc c coding style issue
- Revise some commit title and message body
- Fix violations of PEP8 in new added Python scripts
- Add error handling in get_coremask.py
- Fix has_hugepage.py to check system support of hugepages
instead of checking privileges
- Fix test meson.build to run Python scripts using py3
- Consolidate lists of source files, test dep, etc. across all
platforms, with conditional extending on some platform(s)
---
V4 changes:
- Remove building of ip_frag, rib, and reorder libraries on Windows.
These three libs usually can be built on Windows without change.
However, in between the time of V3 and V4, there is regression in
upstream caused build failures of these three libs. Will separately
investigate and enable these libraries.
- Remove previous patch#2 (Enable mempool/stack on Windows) from this
patchset as it was separated out and merged as patch-19314.
- Consolidate the source files, deps, tests lists across platforms as
much as possible.
---
V5 changes:
- Remove a space between function name and open parenthesis '('
- Add back a header mistakenly deleted
---
V6 changes:
- Fix inconsistent static vs. non-static declarations
---
V7 changes:
- Remove get_coremask.py as it is not needed any more in meson.build
- Remove enablement of efd and lpm and their corresponding unit tests.
The enablement of these two libs and their UTs will be in separate
patches after this patch set.
V8 changes:
- Fix coding style issue of using C99 // comments
---
V9 changes:
- Fix has_hugepage.py with adding failure handling on Linux, using
proper variable name to follow Python convention, and removing
unnecessary comment.
- Enable previously skipped test_cmdline_socket_fns test cases
- Revise title and message, and add Fixes info for current Patch#3
- Combine 2 patches (previous #2 and #3 in V8) into one and with
more detailed message
---
V10 changes:
- Fix indentation
---
V11 changes:
- Remove mandatory dependency on bitratestats, latencystats,
and metrics libs in test meson.build, which was reintroduced
at rebase in V9.
Jie Zhou (9):
eal/windows: return ENOTSUP for not supported API
app/test: remove POSIX-specific code
app/test: fix incorrect errno variable
app/test: skip interrupt tests on Windows
app/test: skip two logs_autotest cases on Windows
app/test: differentiate a strerror on different OS
app/test: remove two alarm_autotest cases
app/test: replace .sh script with .py script
app/test: enable subset of unit tests on Windows
app/test/commands.c | 2 -
app/test/has-hugepage.sh | 11 ---
app/test/has_hugepage.py | 26 +
app/test/meson.build | 118 ---
app/test/packet_burst_generator.c| 1 +
app/test/process.h | 4 +-
app/test/test.c | 5 +-
app/test/test_acl.c | 12 +++
app/test/test_alarm.c| 4 +
app/test/test_bpf.c | 15 ++-
app/test/test_byteorder.c| 2 +-
app/test/test_cksum.c| 12 +++
app/test/test_cmdline.c | 2 +
app/test/test_cmdline_ipaddr.c | 5 +
app/test/test_cmdline_lib.c | 13 ++-
app/test/test_crc.c | 1 -
app/test/test_cryptodev.c| 4 +
app/test/test_cryptodev_asym.c | 4 +
app/test/test_cryptodev_blockcipher.c| 4 +
app/test/test_cryptodev_security_ipsec.c | 4 +
app/test/test_cryptodev_security_pdcp.c | 4 +
app/test/test_debug.c| 17 +++-
app/test/test_distributor.c | 13 +++
app/test/test_distributor_perf.c | 13 +++
app/test/test_dmadev.c | 14 ++-
app/test/test_dmadev_api.c | 4 +
app/test/test_eal_flags.c| 90 +
app/test/test_eal_fs.c | 12 +++
app/test/test_efd.c | 15 ++-
app/test/test_efd_perf.c | 16 ++-
app/test/test_errno.c| 12 ++-
app/test/test_event_crypto_adapter.c | 15 ++-
app/test/test_event_eth_rx_adapter.c | 25 -
app/test/test_event_et
[PATCH v11 3/9] app/test: fix incorrect errno variable
Fix incorrect errno variable used in memory autotest.
Use rte_errno instead.
Fixes: 086d426406bd ("app/test: fix memory autotests on FreeBSD")
Cc: bruce.richard...@intel.com
Signed-off-by: Jie Zhou
---
app/test/test_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_memory.c b/app/test/test_memory.c
index dbf6871e71..140ac3f3cf 100644
--- a/app/test/test_memory.c
+++ b/app/test/test_memory.c
@@ -63,7 +63,7 @@ check_seg_fds(const struct rte_memseg_list *msl, const struct
rte_memseg *ms,
/* we're able to get memseg fd - try getting its offset */
ret = rte_memseg_get_fd_offset_thread_unsafe(ms, &offset);
if (ret < 0) {
- if (errno == ENOTSUP)
+ if (rte_errno == ENOTSUP)
return 1;
return -1;
}
--
2.31.0.vfs.0.1
[PATCH v11 4/9] app/test: skip interrupt tests on Windows
Even though test_interrupts.c can compile on Windows, skip interrupt
tests for now since majority of eal_interrupt on Windows are stubs.
Will remove the skip after interrupt being fully enabled on Windows.
Signed-off-by: Jie Zhou
---
app/test/test_interrupts.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 2a05399f96..eec9b2805b 100644
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -12,6 +12,15 @@
#include "test.h"
+#ifdef RTE_EXEC_ENV_WINDOWS
+static int
+test_interrupt(void)
+{
+ printf("Interrupt on Windows is not fully supported yet, skipping
test\n");
+ return TEST_SKIPPED;
+}
+#else
+
#define TEST_INTERRUPT_CHECK_INTERVAL 100 /* ms */
/* predefined interrupt handle types */
@@ -590,5 +599,6 @@ test_interrupt(void)
return ret;
}
+#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/
REGISTER_TEST_COMMAND(interrupt_autotest, test_interrupt);
--
2.31.0.vfs.0.1
[PATCH v11 2/9] app/test: remove POSIX-specific code
- Remove header inclusion of netinet/in.h and terminos.h
- Include rte_os_shim.h
- Replace sleep and usleep with rte_delay_us_sleep
- Use NUL on Windows as /dev/null for Linux
- Exclude tests not supported on Windows yet, e.g. multi-process, and
IP address parsing (the test cases use linux netinet/in.h u6_addr
and better have a separate patch to add such tests on Windows)
Signed-off-by: Jie Zhou
---
app/test/commands.c | 2 --
app/test/packet_burst_generator.c | 1 +
app/test/process.h| 4 +++-
app/test/test.c | 5 -
app/test/test_byteorder.c | 2 +-
app/test/test_cmdline.c | 2 ++
app/test/test_cmdline_lib.c | 13 +
app/test/test_crc.c | 1 -
app/test/test_pmd_perf.c | 6 +-
app/test/test_ring_stress_impl.h | 2 +-
app/test/test_telemetry_data.c| 2 ++
11 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/app/test/commands.c b/app/test/commands.c
index 2dced3bc44..887cabad64 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -8,8 +8,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/app/test/packet_burst_generator.c
b/app/test/packet_burst_generator.c
index 8ac24577ba..6b42b9b83b 100644
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -5,6 +5,7 @@
#include
#include
#include
+#include
#include "packet_burst_generator.h"
diff --git a/app/test/process.h b/app/test/process.h
index 5b10cf64df..1f073b9c5c 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -7,12 +7,14 @@
#include /* errno */
#include /* PATH_MAX */
+#ifndef RTE_EXEC_ENV_WINDOWS
#include /* basename et al */
+#include
+#endif
#include /* NULL */
#include /* strerror */
#include /* readlink */
#include
-#include
#include /* strlcpy */
diff --git a/app/test/test.c b/app/test/test.c
index 5194131026..e69cae3eea 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
@@ -63,7 +62,9 @@ do_recursive_call(void)
const char *env_var;
int (*action_fn)(void);
} actions[] = {
+#ifndef RTE_EXEC_ENV_WINDOWS
{ "run_secondary_instances", test_mp_secondary },
+#endif
#ifdef RTE_LIB_PDUMP
#ifdef RTE_NET_RING
{ "run_pdump_server_tests", test_pdump },
@@ -82,7 +83,9 @@ do_recursive_call(void)
{ "test_file_prefix", no_action },
{ "test_no_huge_flag", no_action },
#ifdef RTE_LIB_TIMER
+#ifndef RTE_EXEC_ENV_WINDOWS
{ "timer_secondary_spawn_wait", test_timer_secondary },
+#endif
#endif
};
diff --git a/app/test/test_byteorder.c b/app/test/test_byteorder.c
index 03c08d9abf..de14ed539e 100644
--- a/app/test/test_byteorder.c
+++ b/app/test/test_byteorder.c
@@ -46,7 +46,7 @@ test_byteorder(void)
return -1;
res_u16 = rte_bswap16(0x1337);
- printf("const %"PRIx16" -> %"PRIx16"\n", 0x1337, res_u16);
+ printf("const %"PRIx16" -> %"PRIx16"\n", (uint16_t)0x1337, res_u16);
if (res_u16 != 0x3713)
return -1;
diff --git a/app/test/test_cmdline.c b/app/test/test_cmdline.c
index 115bee966d..9a76bd299f 100644
--- a/app/test/test_cmdline.c
+++ b/app/test/test_cmdline.c
@@ -31,6 +31,7 @@ test_cmdline(void)
return -1;
if (test_parse_num_invalid_param() < 0)
return -1;
+#ifndef RTE_EXEC_ENV_WINDOWS
printf("Testing parsing IP addresses...\n");
if (test_parse_ipaddr_valid() < 0)
return -1;
@@ -38,6 +39,7 @@ test_cmdline(void)
return -1;
if (test_parse_ipaddr_invalid_param() < 0)
return -1;
+#endif
printf("Testing parsing strings...\n");
if (test_parse_string_valid() < 0)
return -1;
diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
index f50ccdb599..fcd58cb76a 100644
--- a/app/test/test_cmdline_lib.c
+++ b/app/test/test_cmdline_lib.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
@@ -22,6 +21,12 @@
#include "test_cmdline.h"
+#ifndef RTE_EXEC_ENV_WINDOWS
+#define NULL_INPUT "/dev/null"
+#else
+#define NULL_INPUT "NUL"
+#endif
+
//
/* static functions required for some tests */
static void
@@ -156,10 +161,10 @@ test_cmdline_socket_fns(void)
cl = cmdline_stdin_new(&ctx, NULL);
if (cl != NULL)
goto error;
- cl = cmdline_file_new(NULL, "prompt", "/dev/null");
+ cl = cmdline_file_new(NULL, "prompt", NULL_INPUT);
if (cl != NULL)
goto error;
- cl = cmdline_file_new(&ctx, NULL, "/dev/null");
+ cl = cmdline_file_new(&ctx, NULL, NULL_INPUT);
if (c
[PATCH v11 5/9] app/test: skip two logs_autotest cases on Windows
DPDK logs_autotest on Windows failed at "dynamic log types" tests.
The failures are on 2 test cases for rte_log_set_level_regexp API,
due to regular expression is not supported on Windows in DPDK yet
and regcomp/regexec are just stubs on Windows (in regex.h).
In app\test\test_logs.c, ifndef these two test cases, and for the
rte_log_set_level_pattern validation case following these two cases,
differentiate the expected log level passed into macro CHECK_LEVELS
Now logs_autotest completes for all dynamic log types and static log types.
Signed-off-by: Jie Zhou
---
app/test/test_logs.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index 7abb6eeca2..7c001c1ab3 100644
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -113,6 +113,7 @@ test_logs(void)
rte_log_set_level(logtype1, RTE_LOG_ERR);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
+#ifndef RTE_EXEC_ENV_WINDOWS
rte_log_set_level_regexp("type$", RTE_LOG_EMERG);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
@@ -121,7 +122,10 @@ test_logs(void)
rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_EMERG, RTE_LOG_EMERG);
-
+#else
+ ret = rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG);
+ CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
+#endif
/* set logtype level low to so we can test global level */
rte_log_set_level_pattern("logtype*", RTE_LOG_DEBUG);
CHECK_LEVELS(RTE_LOG_DEBUG, RTE_LOG_DEBUG, RTE_LOG_DEBUG);
--
2.31.0.vfs.0.1
[PATCH v11 8/9] app/test: replace .sh script with .py script
- Add python script to check if system supports hugepages
- Remove corresponding .sh script
- Replace calling of .sh with corresponding .py in meson.build
Signed-off-by: Jie Zhou
---
app/test/has-hugepage.sh | 11 ---
app/test/has_hugepage.py | 26 ++
app/test/meson.build | 2 +-
3 files changed, 27 insertions(+), 12 deletions(-)
delete mode 100755 app/test/has-hugepage.sh
create mode 100644 app/test/has_hugepage.py
diff --git a/app/test/has-hugepage.sh b/app/test/has-hugepage.sh
deleted file mode 100755
index d600fad319..00
--- a/app/test/has-hugepage.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-if [ "$(uname)" = "Linux" ] ; then
- cat /proc/sys/vm/nr_hugepages || echo 0
-elif [ "$(uname)" = "FreeBSD" ] ; then
- echo 1 # assume FreeBSD always has hugepages
-else
- echo 0
-fi
diff --git a/app/test/has_hugepage.py b/app/test/has_hugepage.py
new file mode 100644
index 00..f8e7087d1c
--- /dev/null
+++ b/app/test/has_hugepage.py
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2021 Microsoft Corporation
+"""This script checks if the system supports huge pages"""
+
+import platform
+import ctypes
+
+os_name = platform.system()
+if os_name == "Linux":
+try:
+with open("/proc/sys/vm/nr_hugepages") as file_o:
+content = file_o.read()
+print(content)
+except:
+print("0")
+
+elif os_name == "FreeBSD":
+# Assume FreeBSD always has hugepages enabled
+print("1")
+elif os_name == "Windows":
+if ctypes.windll.kernel32.GetLargePageMinimum() > 0:
+print("1")
+else:
+print("0")
+else:
+print("0")
diff --git a/app/test/meson.build b/app/test/meson.build
index 2b480adfba..97ee83029e 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -492,7 +492,7 @@ dpdk_test = executable('dpdk-test',
driver_install_path),
install: true)
-has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
+has_hugepage = run_command(py3, 'has_hugepage.py').stdout().strip() != '0'
message('hugepage availability: @0@'.format(has_hugepage))
# some perf tests (eg: memcpy perf autotest)take very long
--
2.31.0.vfs.0.1
[PATCH v11 6/9] app/test: differentiate a strerror on different OS
On Windows, strerror returns just "Unknown error" for errnum greater
than MAX_ERRNO, while linux and freebsd returns "Unknown error ",
which is the current expectation for errno_autotest. Differentiate
the error string on Windows to remove a "duplicate error code" failure.
Signed-off-by: Jie Zhou
---
app/test/test_errno.c | 12 +++-
lib/eal/common/eal_common_errno.c | 4
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 3ff0456a58..0db4fbc8b3 100644
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -18,13 +18,19 @@ test_errno(void)
{
const char *rte_retval;
const char *libc_retval;
+
+#ifndef RTE_EXEC_ENV_WINDOWS
#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD has a colon in the string, unlike linux */
const char unknown_code_result[] = "Unknown error: %d";
#else
const char unknown_code_result[] = "Unknown error %d";
#endif
- char expected_libc_retval[sizeof(unknown_code_result)+3];
+ char expected_libc_retval[sizeof(unknown_code_result) + 3];
+#else
+ /* Windows doesn't return error number for error greater than
MAX_errno*/
+ static const char expected_libc_retval[] = "Unknown error";
+#endif
/* use a small selection of standard errors for testing */
int std_errs[] = {EAGAIN, EBADF, EACCES, EINTR, EINVAL};
@@ -54,11 +60,13 @@ test_errno(void)
rte_retval, libc_retval);
if (strcmp(rte_retval, libc_retval) == 0)
return -1;
+#ifndef RTE_EXEC_ENV_WINDOWS
/* generate appropriate error string for unknown error number
* and then check that this is what we got back. If not, we have
* a duplicate error number that conflicts with errno.h */
snprintf(expected_libc_retval, sizeof(expected_libc_retval),
unknown_code_result, rte_errs[i]);
+#endif
if ((strcmp(expected_libc_retval, libc_retval) != 0) &&
(strcmp("", libc_retval) != 0)){
printf("Error, duplicate error code %d\n", rte_errs[i]);
@@ -69,8 +77,10 @@ test_errno(void)
/* ensure that beyond RTE_MAX_ERRNO, we always get an unknown code */
rte_retval = rte_strerror(RTE_MAX_ERRNO + 1);
libc_retval = strerror(RTE_MAX_ERRNO + 1);
+#ifndef RTE_EXEC_ENV_WINDOWS
snprintf(expected_libc_retval, sizeof(expected_libc_retval),
unknown_code_result, RTE_MAX_ERRNO + 1);
+#endif
printf("rte_strerror: '%s', strerror: '%s'\n",
rte_retval, libc_retval);
if ((strcmp(rte_retval, libc_retval) != 0) ||
diff --git a/lib/eal/common/eal_common_errno.c
b/lib/eal/common/eal_common_errno.c
index f86802705a..4c4abb802e 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -37,7 +37,11 @@ rte_strerror(int errnum)
/* since some implementations of strerror_r throw an error
* themselves if errnum is too big, we handle that case here */
if (errnum >= RTE_MAX_ERRNO)
+#ifdef RTE_EXEC_ENV_WINDOWS
+ snprintf(ret, RETVAL_SZ, "Unknown error%s", sep);
+#else
snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum);
+#endif
else
switch (errnum){
case E_RTE_SECONDARY:
--
2.31.0.vfs.0.1
[PATCH v11 9/9] app/test: enable subset of unit tests on Windows
- For fast tests and perf tests, add test stubs to skip not supported
ones.
- For driver tests, for now skip on Windows totally to avoid
unnecessary amount of test stubs. For example, there are about 30
cryptodev related tests (even though in the meson for CI it only
listed about half) which will be enabled by "patch-18949: app/test:
enable crypto unit tests on Windows".
- For dump tests, currently the tests hang on Windows which require
further investigation. Keep the dump test list just for non-Windows
for easier tracking.
Signed-off-by: Jie Zhou
---
app/test/meson.build | 114 ---
app/test/test_acl.c | 12 +++
app/test/test_bpf.c | 15 ++-
app/test/test_cksum.c| 12 +++
app/test/test_cmdline_ipaddr.c | 5 +
app/test/test_cryptodev.c| 4 +
app/test/test_cryptodev_asym.c | 4 +
app/test/test_cryptodev_blockcipher.c| 4 +
app/test/test_cryptodev_security_ipsec.c | 4 +
app/test/test_cryptodev_security_pdcp.c | 4 +
app/test/test_debug.c| 17 +++-
app/test/test_distributor.c | 13 +++
app/test/test_distributor_perf.c | 13 +++
app/test/test_dmadev.c | 14 ++-
app/test/test_dmadev_api.c | 4 +
app/test/test_eal_flags.c| 90 ++
app/test/test_eal_fs.c | 12 +++
app/test/test_efd.c | 15 ++-
app/test/test_efd_perf.c | 16 +++-
app/test/test_event_crypto_adapter.c | 15 ++-
app/test/test_event_eth_rx_adapter.c | 25 -
app/test/test_event_eth_tx_adapter.c | 12 +++
app/test/test_event_ring.c | 16 +++-
app/test/test_event_timer_adapter.c | 16 +++-
app/test/test_eventdev.c | 20 +++-
app/test/test_external_mem.c | 18 +++-
app/test/test_fib.c | 22 -
app/test/test_fib6.c | 24 -
app/test/test_fib6_perf.c| 16 +++-
app/test/test_fib_perf.c | 15 ++-
app/test/test_flow_classify.c| 13 +++
app/test/test_func_reentrancy.c | 12 +++
app/test/test_graph.c| 18 +++-
app/test/test_graph_perf.c | 16 +++-
app/test/test_hash_perf.c| 12 +++
app/test/test_ipfrag.c | 16 +++-
app/test/test_ipsec.c| 15 ++-
app/test/test_ipsec_perf.c | 15 ++-
app/test/test_ipsec_sad.c| 14 ++-
app/test/test_kni.c | 10 +-
app/test/test_lcores.c | 12 +++
app/test/test_lpm.c | 14 ++-
app/test/test_lpm6.c | 14 ++-
app/test/test_lpm6_perf.c| 14 ++-
app/test/test_lpm_perf.c | 13 ++-
app/test/test_malloc.c | 17 +++-
app/test/test_mbuf.c | 13 ++-
app/test/test_member.c | 16 +++-
app/test/test_member_perf.c | 16 +++-
app/test/test_memcpy_perf.c | 18 +++-
app/test/test_mempool_perf.c | 12 +++
app/test/test_mp_secondary.c | 12 +++
app/test/test_pie.c | 30 +-
app/test/test_rawdev.c | 17 +++-
app/test/test_rcu_qsbr_perf.c| 12 +++
app/test/test_reciprocal_division.c | 12 +++
app/test/test_reciprocal_division_perf.c | 12 +++
app/test/test_red.c | 29 +-
app/test/test_reorder.c | 15 ++-
app/test/test_rib.c | 22 -
app/test/test_rib6.c | 22 -
app/test/test_sched.c| 14 ++-
app/test/test_security.c | 16 +++-
app/test/test_table.c| 13 +++
app/test/test_table_acl.c| 3 +
app/test/test_table_combined.c | 4 +
app/test/test_table_pipeline.c | 4 +
app/test/test_table_ports.c | 4 +
app/test/test_table_tables.c | 4 +
app/test/test_timer_secondary.c | 13 +++
app/test/test_trace.c| 32 ++-
71 files changed, 1035 insertions(+), 126 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index 97ee83029e..0c927403c8 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -1,12 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-if is_windows
-build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
if not get_option('tests')
subdir_done()
endif
@@ -158,34 +152,14 @@ test_sources = files(
)
test_deps = [
-'acl',
'bus_pci',
'bus_vdev',
-'bpf',
'cfgfile',
'cmdline',
-'cryptodev',
-'distributor',
-
[PATCH v11 7/9] app/test: remove two alarm_autotest cases
Remove two alarm_autotest test cases which do bogus range check
on Windows.
Signed-off-by: Jie Zhou
---
app/test/test_alarm.c | 4
1 file changed, 4 insertions(+)
diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index b4034339b8..70e97a3109 100644
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -10,6 +10,7 @@
#include "test.h"
+#ifndef RTE_EXEC_ENV_WINDOWS
static volatile int flag;
static void
@@ -18,6 +19,7 @@ test_alarm_callback(void *cb_arg)
flag = 1;
printf("Callback setting flag - OK. [cb_arg = %p]\n", cb_arg);
}
+#endif
static int
test_alarm(void)
@@ -27,6 +29,7 @@ test_alarm(void)
return 0;
#endif
+#ifndef RTE_EXEC_ENV_WINDOWS
/* check if it will fail to set alarm with wrong us value */
printf("check if it will fail to set alarm with wrong ms values\n");
if (rte_eal_alarm_set(0, test_alarm_callback,
@@ -39,6 +42,7 @@ test_alarm(void)
printf("should not be successful with (UINT64_MAX-1) us
value\n");
return -1;
}
+#endif
/* check if it will fail to set alarm with null callback parameter */
printf("check if it will fail to set alarm with null callback
parameter\n");
--
2.31.0.vfs.0.1
[Bug 893] no_hugetlbfs should not mean legacy_mem on iommu/vfio platforms
https://bugs.dpdk.org/show_bug.cgi?id=893 Bug ID: 893 Summary: no_hugetlbfs should not mean legacy_mem on iommu/vfio platforms Product: DPDK Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: core Assignee: dev@dpdk.org Reporter: niketkan...@google.com Target Milestone: --- >From my reading of the code and docs this is what I understand: 1. Huge pages are needed by DPDK so that user pages are always present and pinned. 2. In systems with IOMMU and VFIO support, there should be no need for huge pages. VFIO_IOMMU_MAP_DMA on any aligned buffer should do the same pinning. --no-hugetlbfs today means that the system is also in --legacy-mem (which means no dynamic allocation, 1 fixed heap of 64MB MEMSIZE_IF_NO_HUGE). I think this is restrictive. On systems with IOMMU/VFIO support --no-hugetlbfs should also support dynamic(non legacy behavior) allocation. -- You are receiving this mail because: You are the assignee for the bug.
Re: please help backporting some patches to stable release 19.11.11
On Thu, Dec 2, 2021 at 9:18 PM Maxime Coquelin wrote: > > Hi Christian, > > On 12/2/21 14:45, Christian Ehrhardt wrote: > > On Tue, Nov 30, 2021 at 5:56 PM wrote: > >> > >> Hi commit authors (and maintainers), > >> > >> Despite being selected by the DPDK maintenance tool > >> ./devtools/git-log-fixes.sh > >> I didn't apply following commits from DPDK main to 19.11 > >> stable branch, as conflicts or build errors occur. > >> > >> Can authors check your patches in the following list and either: > >> - Backport your patches to the 19.11 branch, or > >> - Indicate that the patch should not be backported > >> > >> Please do either of the above by December the 14th 2021 (More time than > >> usual as backports get harder). > > > > Sorry, but to meet some deadlines by test/verification I need to reduce the > > time for backports to make it into -rc1 to the 9th of December. > > > > That still is 7 days out from now and still longer than usual. > > > > > >> You can find the a temporary work-in-progress branch of the coming 19.11.11 > >> release at: > >> https://github.com/cpaelzer/dpdk-stable-queue > >> It is recommended to backport on top of that to minimize further conflicts > >> or > >> misunderstandings. > >> > >> Some notes on stable backports: > >> > >> A backport should contain a reference to the DPDK main branch commit > >> in it's commit message in the following fashion: > >> [ upstream commit ] > >> > >> For example: > >> > >> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb > >> > >> When sending the backported patch, please indicate the target branch in the > >> subject line, as we have multiple branches, for example: > >> [PATCH 19.11] foo/bar: fix baz > >> > >> With git format-patch, this can be achieved by appending the parameter: > >> --subject-prefix='PATCH 19.11' > >> > >> Send the backported patch to "sta...@dpdk.org" but not "dev@dpdk.org". > >> > >> FYI, branch 19.11 is located at tree: > >> https://git.dpdk.org/dpdk-stable > >> > >> Thanks. > >> > >> Christian Ehrhardt > >> > >> --- > >> > > ... > > >> b72099be7f David Marchand net/virtio-user: fix init when using existing > >> tap > This commit should not be backported. Hi Maxime, thanks for the info. > We deliberately omitted adding the Fixes tag and Cc'ing sta...@dpdk.org > so that it is not automatically backported. The tooling by default also picks up anything that has "fix" in the subject. But I start realizing that nowadays the community is much better at properly using "Fixes:" and "stable@". And OTOH explaining the same to David just a few minutes ago makes me feel that we should probably remove those kind of patches from the automatic candidate list. > Regards, > Maxime > -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd
[PATCH v3] kni: fix ioctl signature
From: Markus Theil
Fix kni's ioctl signature to correctly match the kernel's
structs. This shaves off the (void*) casts and uses struct file*
instead of struct inode*. With the correct signature, control flow
integrity checkers are no longer confused at this point.
Signed-off-by: Markus Theil
Tested-by: Michael Pfeiffer
---
v3: adapt to suggestions from Stephen Hemminger (use unsigned int)
v2: adapt to suggestions from Ferruh Yigit
kernel/linux/kni/kni_misc.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index f10dcd069d..cc5172fefc 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -482,10 +482,10 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,
return ret;
}
-static int
-kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param)
+static long
+kni_ioctl(struct file *file, unsigned int ioctl_num, unsigned long ioctl_param)
{
- int ret = -EINVAL;
+ long ret = -EINVAL;
struct net *net = current->nsproxy->net_ns;
pr_debug("IOCTL num=0x%0x param=0x%0lx\n", ioctl_num, ioctl_param);
@@ -511,8 +511,8 @@ kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned
long ioctl_param)
return ret;
}
-static int
-kni_compat_ioctl(struct inode *inode, uint32_t ioctl_num,
+static long
+kni_compat_ioctl(struct file *file, unsigned int ioctl_num,
unsigned long ioctl_param)
{
/* 32 bits app on 64 bits OS to be supported later */
@@ -525,8 +525,8 @@ static const struct file_operations kni_fops = {
.owner = THIS_MODULE,
.open = kni_open,
.release = kni_release,
- .unlocked_ioctl = (void *)kni_ioctl,
- .compat_ioctl = (void *)kni_compat_ioctl,
+ .unlocked_ioctl = kni_ioctl,
+ .compat_ioctl = kni_compat_ioctl,
};
static struct miscdevice kni_misc = {
--
2.34.1
[PATCH] net/kni: reset rte_kni_conf struct before initialization
When kni driver calls eth_kni_start to start device, some fields such
as min_mtu and max_mtu of rte_kni_conf are not initialized. It will
cause kni_ioctl_create create a kni netdevice with a random min_mtu
and max_mtu value. This is unexpected and in some time we could not
change the kni device mtu with ip link command.
Fixes: ff1e35fb5f8 ("kni: calculate MTU from mbuf size")
Signed-off-by: Harold Huang
---
drivers/net/kni/rte_eth_kni.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index c428caf441..23b15edfac 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -128,6 +128,7 @@ eth_kni_start(struct rte_eth_dev *dev)
const char *name = dev->device->name + 4; /* remove net_ */
mb_pool = internals->rx_queues[0].mb_pool;
+ memset(&conf, 0, sizeof(conf));
strlcpy(conf.name, name, RTE_KNI_NAMESIZE);
conf.force_bind = 0;
conf.group_id = port_id;
--
2.18.2
[PATCH v2 1/2] devtools: don't include headline "fix" in backports
From: Christian Ehrhardt It was important in the past to select anything with "fix" in the headline, but recently more often created false positives and work to sort tihngs out than identifying many helpful patches. The community and processes aroudn DPDK matured enough that developers (rightfully) expect to rely on "Fixes:" and "stable@" marking for backprots. Therefore do no more include patches that just include the word fix in the backport candidate list. Signed-off-by: Christian Ehrhardt --- devtools/git-log-fixes.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 210c8dcf25..27ec9088d4 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -13,7 +13,7 @@ print_help () cat <<- END_OF_HELP Find fixes to backport on previous versions. - It looks for the word "fix" in the headline or a tag "Fixes" or "Reverts". + It looks for a tag "Fixes" or "Reverts" and for recipient sta...@dpdk.org. The oldest bug origin is printed as well as partially fixed versions. END_OF_HELP } @@ -109,8 +109,7 @@ while read id headline ; do origins=$(origin_filter $id) stable=$(stable_tag $id) fixes=$(fixes_tag $id) - [ "$stable" = "S" ] || [ "$fixes" = "F" ] || [ -n "$origins" ] || \ - echo "$headline" | grep -q fix || continue + [ "$stable" = "S" ] || [ "$fixes" = "F" ] || [ -n "$origins" ] || continue version=$(commit_version $id) if [ -n "$origins" ] ; then origver="$(origin_version $origins)" -- 2.34.0
[PATCH v2 2/2] devtools: report commit id on partial fixes
From: Christian Ehrhardt The candidate list for backports lists partial fixes like: "(21.02 (partially fixed in 21.08))" That is useful to identify fixes menat for later releases, but indirectly applying to older ones as well. While the devscript has no access to the stable tree to fully check if the respective interim commit is present there, reporting the commit id will still help to check it later - because only if the interim commit id is in the stable tree, then also the new fix is a real candidate for backporting. The above would become "(21.02 (partially fixed in c30751afc360 @ 21.08))" Signed-off-by: Christian Ehrhardt --- devtools/git-log-fixes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 27ec9088d4..a1b548948a 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -76,7 +76,7 @@ origin_version () # ... # look chained fix of fix recursively local rootver="$(origin_version $roothashes)" [ -n "$rootver" ] || continue - echo "$rootver (partially fixed in $origver)" + echo "$rootver (partially fixed in $origin @ $origver)" else echo "$origver" fi -- 2.34.0
