[PATCH v25 04/13] common/zsda: add functions to operate hardware queue
Add functions to operate hardware queue,
such as queue start,stop and clear.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_device.c| 7 +
drivers/common/zsda/zsda_qp.c| 187 +++
drivers/common/zsda/zsda_qp.h| 40 ++
drivers/common/zsda/zsda_qp_common.h | 7 +
5 files changed, 242 insertions(+)
create mode 100644 drivers/common/zsda/zsda_qp.c
create mode 100644 drivers/common/zsda/zsda_qp.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 342d000c6d..4c910d7e7d 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -11,4 +11,5 @@ deps += ['bus_pci', 'mbuf']
sources += files(
'zsda_device.c',
'zsda_logs.c',
+ 'zsda_qp.c',
)
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index 18ca372f60..189614f881 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -2,6 +2,7 @@
* Copyright(c) 2024 ZTE Corporation
*/
+#include "zsda_qp.h"
#include "zsda_device.h"
/* per-process array of device data */
@@ -165,6 +166,12 @@ zsda_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
return -ENODEV;
}
+ ret = zsda_queue_init(zsda_pci_dev);
+ if (ret) {
+ ZSDA_LOG(ERR, "Failed! queue init.");
+ return ret;
+ }
+
return ret;
}
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
new file mode 100644
index 00..bc489f6296
--- /dev/null
+++ b/drivers/common/zsda/zsda_qp.c
@@ -0,0 +1,187 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include "zsda_qp.h"
+
+static uint8_t zsda_num_used_qps;
+
+static uint8_t
+zsda_used_qps_num_get(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ uint8_t num_used_qps;
+
+ num_used_qps = ZSDA_CSR_READ8(mmio_base + 0);
+
+ return num_used_qps;
+}
+
+static int
+zsda_check_write(uint8_t *addr, const uint32_t dst_value)
+{
+ int times = ZSDA_TIME_NUM;
+ uint32_t val;
+
+ val = ZSDA_CSR_READ32(addr);
+
+ while ((val != dst_value) && times--) {
+ val = ZSDA_CSR_READ32(addr);
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ }
+ if (val == dst_value)
+ return ZSDA_SUCCESS;
+ else
+ return ZSDA_FAILED;
+}
+
+static int
+zsda_admin_q_start(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_START, 0);
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_START, ZSDA_Q_START);
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_START, ZSDA_Q_START);
+
+ return ret;
+}
+
+static int __rte_unused
+zsda_admin_q_stop(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_STOP_RESP, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_STOP, ZSDA_Q_STOP);
+
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_STOP_RESP,
+ ZSDA_RESP_VALID);
+
+ if (ret)
+ ZSDA_LOG(INFO, "Failed! zsda_admin q stop");
+
+ return ret;
+}
+
+static int __rte_unused
+zsda_admin_q_clear(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_CLR_RESP, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_CLR, ZSDA_RESP_VALID);
+
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_CLR_RESP,
+ ZSDA_RESP_VALID);
+
+ if (ret)
+ ZSDA_LOG(INFO, "Failed! zsda_admin q clear");
+
+ return ret;
+}
+
+static int
+zsda_single_queue_start(uint8_t *mmio_base, const uint8_t id)
+{
+ uint8_t *addr_start = mmio_base + ZSDA_IO_Q_START + (4 * id);
+
+ ZSDA_CSR_WRITE32(addr_start, ZSDA_Q_START);
+ return zsda_check_write(addr_start, ZSDA_Q_START);
+}
+
+static int
+zsda_single_queue_stop(uint8_t *mmio_base, const uint8_t id)
+{
+ int ret;
+ uint8_t *addr_stop = mmio_base + ZSDA_IO_Q_STOP + (4 * id);
+ uint8_t *addr_resp = mmio_base + ZSDA_IO_Q_STOP_RESP + (4 * id);
+
+ ZSDA_CSR_WRITE32(addr_resp, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(addr_stop, ZSDA_Q_STOP);
+
+ ret = zsda_check_write(addr_resp, ZSDA_RESP_VALID);
+ ZSDA_CSR_WRITE32(addr_resp, ZSDA_RESP_INVALID);
+
+ return ret;
+}
+
+static int
+zsda_single_queue_clear(uint8_t *mmio_base, const uint8_t id)
+{
+ int ret;
+ uint8_t *addr_clear = mmio_base + ZSDA_IO_Q_CLR + (4 * id);
+ uint8_t *ad
Re: [PATCH v2] service: add service maintenance callback
On 1/7/2025 11:01 AM, Mattias Rönnblom wrote: > On 2024-12-31 11:02, Piotr Krzewinski wrote: >> Add option to register a callback running on service lcores >> along regular services, which gets information about the service loop. >> It enables doing maintenance work or power saving during periods when >> all registered services are idling. >> >> As an example application that is doing dequeue from multiple >> event ports using single service lcore (e.g. using rte dispatcher library) >> may want to wait for new events inside the maintenance callback when >> there is no work available on ANY of the ports. >> This is not possible using non zero dequeue timeout without increasing >> latency of work that is scheduled to other event ports. >> > > If the purpose of this mechanism is to allow user-defined power management, > we should try to find a more specific name. In a UNIX kernel, this kind of > thing happens in the "idle loop" (or "idle task"). The user would be > responsible for implementing the "idle governor" (to use Linux terminology). > > "idle hook", "idle callback", or "idle handler" maybe. > My initial idea, apart of power management aspects, was that such a hook could allow for some more complex but not time sensitive maintenance work to be done in periods of low traffic / low service core usage. Though it may be a bit far fetched and not a real use case. 'Idle hook/callback' name would fit this intention as well. > For an app using both eventdev+dispatcher lib and *other* non-trivial RTE > services, the issue is really that the work scheduler (i.e., the event > device) does not know about all work being performed. > > That said, a solution to that larger issue likely involves some extensive > rework of such an app, and potentially DPDK changes as well. The kind of > callback suggested in this RFC may well serve as a stop gap solution which > allows the implementation of some basic power management support. > Well, we have a deployment using discussed mechanism currently due to the limitations you point out, so I figured that there may be other users that would benefit from that option. > In the light of we (or at least I) don't really know what we are doing here, > maybe it's better to have this as a pure "iteration hook/callback", without > any particular opionion on how it should be used. > > Such a solution, with arrays of service call result codes and service ids, > would come with a little bit more complexity/overhead. > > Stephen and Jerin, your input would be greatly appreciated on this matter. > Especially the "bigger picture" question. > I am a bit afraid of the amount of refactoring in service framework required for this approach and that it would perhaps introduce significant overhead. I feel that tracking return codes from all the various services inside the hook would be a bit more troublesome from application perspective and does not enable many more usecases. But if there is general agreement that it is better option I can try to do some prototyping in this direction. > > The existence of this new API should probably be touched upon in the user > guide as well. And the release change log. Good idea, will fix in the next version once the naming/purpose and general idea is agreed upon. > > It should be made clear which thread (the service lcore's) runs this > callback, and when (after each iteration). > > It should be clear if multiple callbacks are allowed per lcore. > > What happens if a callback is already registered? > Thanks, will try to clarify in v3. >> + * @param callback Function callback to register >> + * @param lcore Id of the service core. > > It could be useful to have shorthand for "all current service cores". Either > a separate function, or a special lcore id for the above function. > > LCORE_ID_ANY could be used, but would make it look like you registered the > hook on any *one* service lcore, which wouldn't be the case. > > Maybe not worth the trouble. > Hard to say if there is any similar notion of SERVICE_LCORE_ALL anywhere and I didn't really see a need for it. >> + * @retval 0 Successfully registered the callback. >> + * -EINVAL Attempted to register an invalid callback or the > > What is an "invalid callback"? NULL? > Yes, NULL is the only invalid case. Best Regards, Piotr
Re: [PATCH v6 1/2] dts: add flow rule dataclass to testpmd shell
Thanks Dean! Looks good to me. Reviewed-by: Luca Vizzarro
Re: [PATCH 0/3] flexible IPv4 fragment action
On Wed, Jan 22, 2025 at 08:23:07AM +, Mingjin Ye wrote: > Support for distributing the first and other segments of an IPv4 > segmented packet to different RX queues. > > Mingjin Ye (3): > net/ice/base: add ipv4 fragment related field > net/ice: FDIR support IPv4 fragment masks > net/ice: ACL filter support for IPv4 fragment > > drivers/net/ice/base/ice_fdir.h| 2 + > drivers/net/ice/base/ice_flow.c| 5 +++ > drivers/net/ice/base/ice_flow.h| 1 + > drivers/net/ice/ice_acl_filter.c | 61 +++--- > drivers/net/ice/ice_ethdev.c | 1 - > drivers/net/ice/ice_fdir_filter.c | 15 ++-- > drivers/net/ice/ice_generic_flow.h | 2 + > 7 files changed, 77 insertions(+), 10 deletions(-) > This patchset has no documentation updates included in it. Does there not need to be some documentation for this new feature, or is the ability to filter segmented packets already covered as a standard flow feature elsewhere? /Bruce
Re: [PATCH v6 01/15] net/xsc: add xsc PMD framework
> +Yunsilicon xsc > +M: WanRenyong > +M: Na Na > +M: Rong Qian > +M: Xiaoxiong Zhang > +M: Dongwei Xu Looking at how the names are codified in email addresses, I feel "Renyong Wan" is the right form for your name in English format.
[PATCH] doc: add release not for af_packet
Add short release not about enhancements to af_packet. Signed-off-by: Stephen Hemminger --- doc/guides/rel_notes/release_25_03.rst | 5 + 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/release_25_03.rst b/doc/guides/rel_notes/release_25_03.rst index 85986ffa61..21ec44f0ab 100644 --- a/doc/guides/rel_notes/release_25_03.rst +++ b/doc/guides/rel_notes/release_25_03.rst @@ -63,6 +63,11 @@ New Features and even substantial part of its code. It can be viewed as an extension of rte_ring functionality. +* **Enhancements to af_packet net driver.** + + Added ability to option to configure receive packet fanout mode. + Improved statistics including failed receive buffer allocation + and missed packets. Removed Items - -- 2.45.2
Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number
Acked-by: Vladimir Medvedkin On 28/11/2024 01:53, Andre Muezerie wrote: MSVC issues the warnings below: 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) The code would be better off by using 64 bit numbers to begin with. That eliminates the need for a conversion to 64 bits later. 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) 1ULL should be used as the result of the bit shift gets multiplied by sizeof(uint32_t). Signed-off-by: Andre Muezerie --- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash_gf2_poly_math.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- Regards, Vladimir
[PATCH v25 12/13] compress/zsda: add zsda compressdev dequeue datapath
Add zsda compressdev dequeue datapath.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp.c | 56 ++
drivers/common/zsda/zsda_qp.h | 1 +
drivers/common/zsda/zsda_qp_common.h | 4 +
drivers/compress/zsda/zsda_comp.c | 155 ++
drivers/compress/zsda/zsda_comp.h | 9 ++
drivers/compress/zsda/zsda_comp_pmd.c | 11 +-
6 files changed, 235 insertions(+), 1 deletion(-)
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index c85b9ddb75..0ef7cac585 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -888,3 +888,59 @@ zsda_enqueue_burst(struct zsda_qp *qp, void **ops, const
uint16_t nb_ops)
return nb_send;
}
+
+static void
+zsda_dequeue(struct qp_srv *srv, void **ops, const uint16_t nb_ops, uint16_t
*nb)
+{
+ uint16_t head;
+ struct zsda_cqe *cqe;
+ struct zsda_queue *queue = &srv->rx_q;
+ struct zsda_op_cookie *cookie;
+ head = queue->head;
+
+ while (*nb < nb_ops) {
+ cqe = (struct zsda_cqe *)(
+ (uint8_t *)queue->base_addr + head * queue->msg_size);
+
+ if (!CQE_VALID(cqe->err1))
+ break;
+ cookie = srv->op_cookies[cqe->sid];
+
+ ops[*nb] = cookie->op;
+ if (srv->rx_cb(cookie, cqe) == ZSDA_SUCCESS)
+ srv->stats.dequeued_count++;
+ else {
+ ZSDA_LOG(ERR,
+"ERR! Cqe, opcode 0x%x, sid 0x%x, "
+"tx_real_length 0x%x, err0 0x%x, err1 0x%x",
+cqe->op_code, cqe->sid, cqe->tx_real_length,
+cqe->err0, cqe->err1);
+ srv->stats.dequeue_err_count++;
+ }
+ (*nb)++;
+ cookie->used = false;
+
+ head = zsda_modulo_16(head + 1, queue->modulo_mask);
+ queue->head = head;
+ WRITE_CSR_CQ_HEAD(queue->io_addr, queue->hw_queue_number, head);
+ memset(cqe, 0x0, sizeof(struct zsda_cqe));
+ }
+}
+
+uint16_t
+zsda_dequeue_burst(struct zsda_qp *qp, void **ops, const uint16_t nb_ops)
+{
+ uint16_t nb = 0;
+ uint32_t type = 0;
+ struct qp_srv *srv;
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (!qp->srv[type].used)
+ continue;
+ srv = &qp->srv[type];
+ zsda_dequeue(srv, ops, nb_ops, &nb);
+ if (nb >= nb_ops)
+ return nb_ops;
+ }
+ return nb;
+}
diff --git a/drivers/common/zsda/zsda_qp.h b/drivers/common/zsda/zsda_qp.h
index 96fc38ea09..45d37a7905 100644
--- a/drivers/common/zsda/zsda_qp.h
+++ b/drivers/common/zsda/zsda_qp.h
@@ -189,5 +189,6 @@ int zsda_task_queue_setup(struct zsda_pci_device
*zsda_pci_dev,
struct zsda_qp *qp, struct task_queue_info
*task_q_info);
uint16_t zsda_enqueue_burst(struct zsda_qp *qp, void **ops, const uint16_t
nb_ops);
+uint16_t zsda_dequeue_burst(struct zsda_qp *qp, void **ops, const uint16_t
nb_ops);
#endif /* _ZSDA_QP_H_ */
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index 49d317d007..be18bd60dd 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -51,6 +51,10 @@ enum zsda_service_type {
#define ZSDA_OPC_DECOMP_ZLIB 0x19 /* Decomp inflate-Zlib */
#define ZSDA_OPC_INVALID 0xff
+#define CQE_VALID(value) (value & 0x8000)
+#define CQE_ERR0(value) (value & 0x)
+#define CQE_ERR1(value) (value & 0x7FFF)
+
enum wqe_element_type {
WQE_ELM_TYPE_PHYS_ADDR = 1,
WQE_ELM_TYPE_LIST,
diff --git a/drivers/compress/zsda/zsda_comp.c
b/drivers/compress/zsda/zsda_comp.c
index 608c50c49a..af57c237b2 100644
--- a/drivers/compress/zsda/zsda_comp.c
+++ b/drivers/compress/zsda/zsda_comp.c
@@ -10,6 +10,83 @@
#define GZIP_TRAILER_SIZE 8
#define CHECKSUM_SIZE 4
+#define POLYNOMIAL 0xEDB88320
+static uint32_t crc32_table[8][256];
+static int table_config;
+
+static void
+crc32_table_build(void)
+{
+ for (uint32_t i = 0; i < 256; i++) {
+ uint32_t crc = i;
+ for (uint32_t j = 0; j < 8; j++)
+ crc = (crc >> 1) ^ ((crc & 1) ? POLYNOMIAL : 0);
+ crc32_table[0][i] = crc;
+ }
+
+ for (int i = 1; i < 8; i++) {
+ for (uint32_t j = 0; j < 256; j++)
+ crc32_table[i][j] = (crc32_table[i-1][j] >> 8) ^
+ crc32_table[0][crc32_table[i-1][j] &
0xFF];
+ }
+ table_config = 1;
+}
+
+static uint32_t
+zsda_crc32(const uint8_t *data, size_t length)
+{
+ uint32_t crc = 0x;
+
+ if (!table_config)
+ crc32_table_build();
+
+ while (length >= 8) {
+
[PATCH v25 06/13] compress/zsda: add zsda compressdev driver skeleton
Add zsda compressdev driver interface skeleton Signed-off-by: Hanxiao Li --- MAINTAINERS | 3 + doc/guides/compressdevs/features/zsda.ini | 6 + doc/guides/compressdevs/index.rst | 1 + doc/guides/compressdevs/zsda.rst | 171 ++ drivers/common/zsda/meson.build | 12 +- drivers/common/zsda/zsda_device.h | 5 + drivers/common/zsda/zsda_qp.c | 24 +++ drivers/common/zsda/zsda_qp.h | 10 ++ drivers/common/zsda/zsda_qp_common.h | 4 +- drivers/compress/zsda/zsda_comp_pmd.c | 128 drivers/compress/zsda/zsda_comp_pmd.h | 36 + 11 files changed, 398 insertions(+), 2 deletions(-) create mode 100644 doc/guides/compressdevs/features/zsda.ini create mode 100644 doc/guides/compressdevs/zsda.rst create mode 100644 drivers/compress/zsda/zsda_comp_pmd.c create mode 100644 drivers/compress/zsda/zsda_comp_pmd.h diff --git a/MAINTAINERS b/MAINTAINERS index 86864bc5f1..ff90c916a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1315,6 +1315,9 @@ F: doc/guides/compressdevs/features/zlib.ini ZTE Storage Data Accelerator(ZSDA) M: Hanxiao Li F: drivers/common/zsda/ +F: drivers/compress/zsda/ +F: doc/guides/compressdevs/zsda.rst +F: doc/guides/compressdevs/features/zsda.ini DMAdev Drivers -- diff --git a/doc/guides/compressdevs/features/zsda.ini b/doc/guides/compressdevs/features/zsda.ini new file mode 100644 index 00..5cc9a3b1a6 --- /dev/null +++ b/doc/guides/compressdevs/features/zsda.ini @@ -0,0 +1,6 @@ +; +; Refer to default.ini for the full list of available PMD features. +; +; Supported features of 'ZSDA' compression driver. +; +[Features] diff --git a/doc/guides/compressdevs/index.rst b/doc/guides/compressdevs/index.rst index 87ed4f72a4..bab226ffbc 100644 --- a/doc/guides/compressdevs/index.rst +++ b/doc/guides/compressdevs/index.rst @@ -17,3 +17,4 @@ Compression Device Drivers qat_comp uadk zlib +zsda diff --git a/doc/guides/compressdevs/zsda.rst b/doc/guides/compressdevs/zsda.rst new file mode 100644 index 00..da7117b45e --- /dev/null +++ b/doc/guides/compressdevs/zsda.rst @@ -0,0 +1,171 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2024 ZTE Corporation. + +ZTE Storage Data Accelerator (ZSDA) Poll Mode Driver +=== + +The ZSDA compression PMD provides poll mode compression & decompression driver +support for the following hardware accelerator devices: + +* ``ZTE Processing accelerators 1cf2`` + + +Features + + + +Installation + + +The ZSDA compression PMD is built by default with a standard DPDK build. + + + +Building PMDs on ZSDA +- + +A ZSDA device can host multiple acceleration services: + +* data compression + +These services are provided to DPDK applications via PMDs which register to +implement the compressdev APIs. The PMDs use common ZSDA driver code +which manages the ZSDA PCI device. + + +Configuring and Building the DPDK ZSDA PMDs +~~~ + +Further information on configuring, building and installing DPDK is described +:doc:`here <../linux_gsg/build_dpdk>`. + + +Build Configuration +~~~ +These is the build configuration options affecting ZSDA, and its default values: + +.. code-block:: console + + RTE_PMD_ZSDA_MAX_PCI_DEVICES=256 + + +Device and driver naming + + +* The zsda compressdev driver name is "compress_zsda". + The rte_compressdev_devices_get() returns the devices exposed by this driver. + +* Each zsda compression device has a unique name, in format + , e.g. ":cc:00.3_zsda". + This name can be passed to rte_compressdev_get_dev_id() to get the device_id. + + +Enable VFs +--- + +Instructions for installation are below, but first an explanation of the +relationships between the PF/VF devices and the PMDs visible to +DPDK applications. + +Each ZSDA PF device exposes a number of VF devices. Each VF device can +enable one compressdev PMD. + +These ZSDA PMDs share the same underlying device and pci-mgmt code, but are +enumerated independently on their respective APIs and appear as independent +devices to applications. + +.. Note:: + + Each VF can only be used by one DPDK process. It is not possible to share + the same VF across multiple processes, even if these processes are using + different acceleration services. + Conversely one DPDK process can use one or more ZSDA VFs and can expose + compressdev instances on each of those VFs. + + +The examples below are based on the 1cf2 device, if you have a different device +use the corresponding values in the above table. + +In BIOS ensure that SRIOV is enabled and either: + +* Disable VT-d or +* Enable VT-d and set ``"intel_iommu=on iommu=pt"`` in the grub file. + +you need to expose the Virtual Functions (VFs) using the sysfs
Re: [PATCH v2 0/3] Fix warnings when using gcc 15
On Tue, Jan 21, 2025 at 12:25 AM Stephen Hemminger wrote: > > Three fixes need to make current main branch build cleanly with > current pre-release of Gcc 15. > > Stephen Hemminger (3): > crypto/cnxk: fix gcc 15 warning > net/thunderx/base: fix build with Gcc 15 > examples/flow_filtering: fix gcc 15 overflow warning > > drivers/crypto/cnxk/cnxk_se.h | 2 +- > drivers/net/thunderx/base/nicvf_mbox.c| 42 +-- > .../snippets/snippet_match_mpls.c | 2 +- > 3 files changed, 23 insertions(+), 23 deletions(-) Tested with OBS builds on Fedora rawhide. Series applied, thanks Stephen. -- David Marchand
RE: [RFC PATCH] eventdev: adapter API to configure multiple Rx queues
>> >> >> >>> This RFC introduces a new API, >> >> >> >>> rte_event_eth_rx_adapter_queues_add(), >> >> >> >>> designed to enhance the flexibility of configuring multiple Rx >> >> >> >>> queues in eventdev Rx adapter. >> >> >> >>> >> >> >> >>> The existing rte_event_eth_rx_adapter_queue_add() API supports >> >> >> >>> adding multiple queues by specifying rx_queue_id = -1, but it >> >> >> >>> lacks the ability to >> >> >> >apply >> >> >> >>> specific configurations to each of the added queues. >> >> >> >>> >> >> >> >> >> >> >> >>The application can still use the existing >> >> >> >>rte_event_eth_rx_adapter_queue_add() API in a loop with >> >> >> >>different configurations for different queues. >> >> >> >> >> >> >> >>The proposed API is not enabling new features that cannot be >> >> >> >>achieved with the existing API. >> >> >> >>Adding new APIs without much usefulness causes unnecessary >> >> >> >>complexity/confusion for users. >> >> >> >> >> >> The eth_rx_adapter_queue_add eventdev PMD operation can be updated to >> support burst mode. Internally, both the new and existing APIs can utilize >> this >> updated operation. This enables applications to use either API and achieve >the >> same results while adding a single queue. For adding multiple RX queues to >the >> adapter, the new API can be used as it is not supported by the old API. >> > >Not all platforms implement the eventdev PMD operation for >eth_rx_adapter_queue_add, so this does not apply to all platforms. > Yes, but there are hardware PMDs that implement eth_rx_adapter_queue_add op, and I am looking for a solution that works for both cases. The idea is to use the new eventdev PMD operation (eth_rx_adapter_queues_add) within the rte_event_eth_rx_adapter_queue_add() API. The parameters of this API can be easily mapped to and supported by the new PMD operation. typedef int (*eventdev_eth_rx_adapter_queues_add_t)( const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev, int32_t rx_queue_id[], const struct rte_event_eth_rx_adapter_queue_conf queue_conf[], uint16_t nb_rx_queues); With this, the old PMD op (eth_rx_adapter_queue_add) can be removed. >> >> >> > >> >> >> >The new API was introduced because the existing API does not >> >> >> >support adding multiple queues with specific configurations. It >> >> >> >serves as a burst variant of the existing API, like many other APIs in >> DPDK. >> >> >> > >> >> > >> >> >The other burst APIs may be there for dataplane functionalities, but >> >> >may not be for the control plane functionalities. >> >> > >> >> >> >> rte_acl_add_rules() is an example of burst API in control path. >> >> >> > >> >I mean, In general, burst APIs are for data-plane functions. >> >This may be one of the rare cases where a burst API is in the control path. >> > >> >> >> >For better clarity, the API can be renamed to >> >> >> >rte_event_eth_rx_adapter_queue_add_burst() if needed. >> >> >> > >> >> >> >In hardware, adding each queue individually incurs significant >> >> >> >overheads, such as mailbox operations. A burst API helps to >> >> >> >amortize this overhead. Since real- world applications often call >> >> >> >the API with specific queue_ids, the burst API can provide >> >> >> >considerable >> benefits. >> >> >> >Testing shows a 75% reduction in time when adding multiple queues >> >> >> >to the RX adapter using the burst API on our platform. >> >> >> > >> >> > >> >> > As batching helps for a particular hardware device, this may not be >> >> >applicable for all platforms/cases. >> >> > Since queue_add is a control plane operation, latency may not be a >> >> >concern. >> >> >> >> In certain use cases, these APIs can be considered semi-fast path. >> >> For >> >instance, >> >> in an application that hotplugs a port on demand, configuring all >> >> available queues simultaneously can significantly reduce latency. >> >> >> > >> >As said earlier, this latency reduction (when trying to add multiple RX >> >queues to the Event Ethernet Rx adapter) may not apply to all >> platforms/cases. >> >This API is not for configuring queues but for adding the queues to the >> >RX adapter. >> > >> >> >How to specify a particular set(specific queue_ids) of rx_queues >> >> >that has a non- zero start index with the new proposed API? >> >> >> >> In the proposed API, >> >> int rte_event_eth_rx_adapter_queues_add( >> >> uint8_t id, uint16_t eth_dev_id, int32_t >> >> rx_queue_id[], >> >> const struct rte_event_eth_rx_adapter_queue_conf >> >> conf[], >> >> uint16_t nb_rx_queues); rx_queues_id is an >> >> array containing the receive queues ids, which can start from a >> >> non-zero value. The array index is used solely to locate the >> >> corresponding queue_conf. For example, rx_queues_id[i] will use conf[i]. >> >> >> > >> >Ok >> > >> >> > Since this is still not possible with the proposed API, the >> >> >existing queue_add API needs to be used with sp
Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number
On Wed, Nov 27, 2024 at 05:53:57PM -0800, Andre Muezerie wrote: > MSVC issues the warnings below: > > 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<': > result of 32-bit shift implicitly converted to 64 bits > (was 64-bit shift intended?) > > The code would be better off by using 64 bit numbers to begin with. > That eliminates the need for a conversion to 64 bits later. > > 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<': > result of 32-bit shift implicitly converted to 64 bits > (was 64-bit shift intended?) > > 1ULL should be used as the result of the bit shift gets multiplied > by sizeof(uint32_t). > > Signed-off-by: Andre Muezerie > --- Acked-by: Bruce Richardson > lib/hash/rte_thash.c | 2 +- > lib/hash/rte_thash_gf2_poly_math.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c > index fa78787143..f076311b57 100644 > --- a/lib/hash/rte_thash.c > +++ b/lib/hash/rte_thash.c > @@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const > char *name, uint32_t len, > offset; > > ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) + > - sizeof(uint32_t) * (1 << ctx->reta_sz_log), > + sizeof(uint32_t) * (1ULL << ctx->reta_sz_log), > RTE_CACHE_LINE_SIZE); Is there a reason not to use RTE_BIT64 here too?
[PATCH v3] eal: fix macros for MSVC: noinline, alwaysinline, hot
MSVC supports forcing code to be inlined or forcing code to not be inlined, like other compilers. It does not support the "hot" hint though. This patch fixes existing macros __rte_noinline and __rte_always_inline so that they also do what is expected from them when used with MSVC. __rte_hot is updated to become a noop when MSCS is used. Signed-off-by: Andre Muezerie --- lib/eal/include/rte_common.h | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index 40592f71b1..f344d54fce 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -427,7 +427,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) * Force a function to be inlined */ #ifdef RTE_TOOLCHAIN_MSVC -#define __rte_always_inline +#define __rte_always_inline __forceinline #else #define __rte_always_inline inline __attribute__((always_inline)) #endif @@ -435,12 +435,20 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) /** * Force a function to be noinlined */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_noinline __declspec(noinline) +#else #define __rte_noinline __attribute__((noinline)) +#endif /** * Hint function in the hot path */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_hot +#else #define __rte_hot __attribute__((hot)) +#endif /** * Hint function in the cold path -- 2.47.2.vfs.0.1
Re: [PATCH v2 2/2] drivers/net: fix void function returning a value
On Wed, Jan 22, 2025 at 07:20:44AM -0800, Andre Muezerie wrote: > This patch avoids warnings like the one below emitted by MSVC: > > ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139): > warning C4098: 'idpf_singleq_rearm': > 'void' function returning a value > > Signed-off-by: Andre Muezerie > --- > drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- > drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +- > drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +- > drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > Acked-by: Bruce Richardson
Re: [PATCH v2 1/2] drivers/common: fix void function returning a value
On Wed, Jan 22, 2025 at 07:20:43AM -0800, Andre Muezerie wrote: > This patch avoids warnings like the one below emitted by MSVC: > > ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139): > warning C4098: 'idpf_singleq_rearm': > 'void' function returning a value > > Signed-off-by: Andre Muezerie > --- > drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 > 1 file changed, 8 insertions(+), 4 deletions(-) > Acked-by: Bruce Richardson
RE: [EXTERNAL] Re: [PATCH] lib/eventdev: use correct format string for data type on log call
> -Original Message-
> From: Stephen Hemminger
> Sent: Friday, December 27, 2024 11:30 PM
> To: Andre Muezerie
> Cc: Amit Prakash Shukla ; Jerin Jacob
> ; dev@dpdk.org
> Subject: [EXTERNAL] Re: [PATCH] lib/eventdev: use correct format string for
> data type on log call
>
> On Fri, 27 Dec 2024 08: 18: 05 -0800 Andre Muezerie
> wrote: > From: Andre Muezerie
> > To: Amit Prakash Shukla
> , Jerin Jacob
>
> On Fri, 27 Dec 2024 08:18:05 -0800
> Andre Muezerie wrote:
>
> > From: Andre Muezerie
> > To: Amit Prakash Shukla , Jerin Jacob
> >
> > Cc: dev@dpdk.org, Andre Muezerie
> > Subject: [PATCH] lib/eventdev: use correct format string for data type
> > on log call
> > Date: Fri, 27 Dec 2024 08:18:05 -0800
> > X-Mailer: git-send-email 1.8.3.1
> >
> > The fix is to use the correct macro for the data type being logged.
> >
> > Signed-off-by: Andre Muezerie
>
> Acked-by: Stephen Hemminger
Updated the git commit as follows and applied to
dpdk-next-net-eventdev/for-main. Thanks
eventdev: fix format string data type of log call
The fix is to use the correct macro for the data type being logged.
Fixes: 112bf8055d90 ("eventdev/dma: support vchan add and delete")
Fixes: 2c6e23cd5e76 ("eventdev/dma: support adapter runtime params")
Cc: sta...@dpdk.org
Signed-off-by: Andre Muezerie
Acked-by: Stephen Hemminger
RE: [EXTERNAL] [PATCH v2] eventdev: add port attribute for independent enqueue
> -Original Message-
> From: pravin.pat...@intel.com
> Sent: Tuesday, December 17, 2024 2:03 AM
> To: dev@dpdk.org
> Cc: Jerin Jacob ; mike.ximing.c...@intel.com;
> bruce.richard...@intel.com; tho...@monjalon.net;
> david.march...@redhat.com; tirthendu.sar...@intel.com;
> pravin.pat...@intel.com
> Subject: [EXTERNAL] [PATCH v2] eventdev: add port attribute for independent
> enqueue
>
> From: Pravin Pathak Independent Enqueue
> support is added to DPDK 24. 11. Adding support for
> RTE_EVENT_PORT_ATTR_INDEPENDENT_ENQ attribute to
> rte_event_port_attr_get() which was missing Signed-off-by: Pravin Pathak
>
> From: Pravin Pathak
>
> Independent Enqueue support is added to DPDK 24.11.
> Adding support for RTE_EVENT_PORT_ATTR_INDEPENDENT_ENQ attribute to
> rte_event_port_attr_get() which was missing
>
> Signed-off-by: Pravin Pathak
Applied to dpdk-next-net-eventdev/for-main. Thanks
> ---
> lib/eventdev/rte_eventdev.c | 8 lib/eventdev/rte_eventdev.h | 4
>
> 2 files changed, 12 insertions(+)
>
> diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index
> ca295c87c4..61cff87b63 100644
> --- a/lib/eventdev/rte_eventdev.c
> +++ b/lib/eventdev/rte_eventdev.c
> @@ -880,6 +880,14 @@ rte_event_port_attr_get(uint8_t dev_id, uint8_t
> port_id, uint32_t attr_id,
> *attr_value = !!(config &
> RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL);
> break;
> }
> + case RTE_EVENT_PORT_ATTR_INDEPENDENT_ENQ:
> + {
> + uint32_t config;
> +
> + config = dev->data->ports_cfg[port_id].event_port_cfg;
> + *attr_value = !!(config &
> RTE_EVENT_PORT_CFG_INDEPENDENT_ENQ);
> + break;
> + }
> default:
> return -EINVAL;
> };
> diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h index
> fabd1490db..6400d6109f 100644
> --- a/lib/eventdev/rte_eventdev.h
> +++ b/lib/eventdev/rte_eventdev.h
> @@ -1318,6 +1318,10 @@ rte_event_port_quiesce(uint8_t dev_id, uint8_t
> port_id,
> * Port attribute id for the implicit release disable attribute of the port.
> */
> #define RTE_EVENT_PORT_ATTR_IMPLICIT_RELEASE_DISABLE 3
> +/**
> + * Port attribute id for the Independent Enqueue feature.
> + */
> +#define RTE_EVENT_PORT_ATTR_INDEPENDENT_ENQ 4
>
> /**
> * Get an attribute from a port.
> --
> 2.26.2
[PATCH v2 2/2] drivers/net: fix void function returning a value
This patch avoids warnings like the one below emitted by MSVC:
../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
warning C4098: 'idpf_singleq_rearm':
'void' function returning a value
Signed-off-by: Andre Muezerie
---
drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +-
drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +-
drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 19cf0ac718..3e95a6a1df 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -22,7 +22,7 @@
static __rte_always_inline void
i40e_rxq_rearm(struct i40e_rx_queue *rxq)
{
- return i40e_rxq_rearm_common(rxq, false);
+ i40e_rxq_rearm_common(rxq, false);
}
#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index 3b2750221b..ae7bcb582b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -24,7 +24,7 @@
static __rte_always_inline void
i40e_rxq_rearm(struct i40e_rx_queue *rxq)
{
- return i40e_rxq_rearm_common(rxq, true);
+ i40e_rxq_rearm_common(rxq, true);
}
#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index 49d41af953..cdb48438da 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -13,7 +13,7 @@
static __rte_always_inline void
iavf_rxq_rearm(struct iavf_rx_queue *rxq)
{
- return iavf_rxq_rearm_common(rxq, false);
+ iavf_rxq_rearm_common(rxq, false);
}
#define PKTLEN_SHIFT 10
diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c
b/drivers/net/ice/ice_rxtx_vec_avx2.c
index d6e88dbb29..02bfb9b15d 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -14,7 +14,7 @@
static __rte_always_inline void
ice_rxq_rearm(struct ice_rx_queue *rxq)
{
- return ice_rxq_rearm_common(rxq, false);
+ ice_rxq_rearm_common(rxq, false);
}
static __rte_always_inline __m256i
--
2.47.2.vfs.0.1
RE: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on cn20k
> -Original Message- > From: psathe...@marvell.com > Sent: Tuesday, November 12, 2024 3:29 PM > To: Nithin Kumar Dabilpuram ; Kiran Kumar > Kokkilagadda ; Sunil Kumar Kori > ; Satha Koteswara Rao Kottidi > ; Harman Kalra > Cc: dev@dpdk.org; Satheesh Paul Antonysamy > Subject: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on > cn20k > > From: Satheesh Paul Support for rte flow in cn20k. > Signed-off-by: Satheesh Paul Reviewed-by: Kiran > Kumar K --- drivers/net/cnxk/cn10k_flow. c | 227 > ++--- > From: Satheesh Paul > > Support for rte flow in cn20k. > > Signed-off-by: Satheesh Paul > Reviewed-by: Kiran Kumar K 1)Fix https://mails.dpdk.org/archives/test-report/2024-November/823929.html 2) Please rebase t [for-main]dell[dpdk-next-net-mrvl] $ git pw series apply 33903 Failed to apply patch: Applying: common/cnxk: support NPC flow on cn20k Using index info to reconstruct a base tree... M drivers/common/cnxk/roc_mbox.h M drivers/common/cnxk/roc_npc.h M drivers/common/cnxk/roc_npc_mcam_dump.c M drivers/common/cnxk/version.map Falling back to patching base and 3-way merge... Auto-merging drivers/common/cnxk/version.map Auto-merging drivers/common/cnxk/roc_npc_mcam_dump.c CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_npc_mcam_dump.c Auto-merging drivers/common/cnxk/roc_npc.h Auto-merging drivers/common/cnxk/roc_mbox.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config set advice.mergeConflict false" Patch failed at 0001 common/cnxk: support NPC flow on cn20k
RE: [EXTERNAL] [PATCH v2 1/2] common/cnxk: fix mailbox timeout issues
> -Original Message- > From: Harman Kalra > Sent: Thursday, November 14, 2024 3:02 PM > To: Nithin Kumar Dabilpuram ; Kiran Kumar > Kokkilagadda ; Sunil Kumar Kori > ; Satha Koteswara Rao Kottidi > ; Harman Kalra > Cc: dev@dpdk.org > Subject: [EXTERNAL] [PATCH v2 1/2] common/cnxk: fix mailbox timeout issues > > Found couple of reasons causing mailbox timeout: * msgs_acked value by 1)Two issues - please make it as two patches 2)fix https://mails.dpdk.org/archives/test-report/2024-November/825162.html 3)fix https://mails.dpdk.org/archives/test-report/2024-November/825257.html <>
Re: [PATCH v1] dts: fix checksum suite docstring/variable format
Reviewed-by: Paul Szczepanek
On 16/01/2025 18:43, Dean Marx wrote:
> Fixes checksum offload test suite docstring format
> by adding steps and verify sections. Changes variables
> formatted in camel case to snake case to fit python standards.
>
> Fixes: 8c9a7471a0e6 ("dts: add checksum offload test suite")
>
> Signed-off-by: Dean Marx
> ---
> dts/tests/TestSuite_checksum_offload.py | 127 ++--
> 1 file changed, 99 insertions(+), 28 deletions(-)
>
> diff --git a/dts/tests/TestSuite_checksum_offload.py
> b/dts/tests/TestSuite_checksum_offload.py
> index c1680bd388..4c9520917a 100644
> --- a/dts/tests/TestSuite_checksum_offload.py
> +++ b/dts/tests/TestSuite_checksum_offload.py
> @@ -57,7 +57,7 @@ def send_packets_and_verify(
> packet_list: List of Scapy packets to send and verify.
> load: Raw layer load attribute in the sent packet.
> should_receive: Indicates whether the packet should be received
> -by the traffic generator.
> +by the traffic generator.
> """
> for i in range(0, len(packet_list)):
> received_packets =
> self.send_packet_and_capture(packet=packet_list[i])
> @@ -70,15 +70,15 @@ def send_packets_and_verify(
> )
>
> def send_packet_and_verify_checksum(
> -self, packet: Packet, goodL4: bool, goodIP: bool, testpmd:
> TestPmdShell, id: str
> +self, packet: Packet, good_L4: bool, good_IP: bool, testpmd:
> TestPmdShell, id: str
> ) -> None:
> """Send packet and verify verbose output matches expected output.
>
> Args:
> packet: Scapy packet to send to DUT.
> -goodL4: Verifies RTE_MBUF_F_RX_L4_CKSUM_GOOD in verbose output
> +good_L4: Verifies RTE_MBUF_F_RX_L4_CKSUM_GOOD in verbose output
> if :data:`True`, or RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN if
> :data:`False`.
> -goodIP: Verifies RTE_MBUF_F_RX_IP_CKSUM_GOOD in verbose output
> +good_IP: Verifies RTE_MBUF_F_RX_IP_CKSUM_GOOD in verbose output
> if :data:`True`, or RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN if
> :data:`False`.
> testpmd: Testpmd shell session to analyze verbose output of.
> id: The destination mac address that matches the sent packet in
> verbose output.
> @@ -88,10 +88,10 @@ def send_packet_and_verify_checksum(
> verbose_output = testpmd.extract_verbose_output(testpmd.stop())
> for testpmd_packet in verbose_output:
> if testpmd_packet.dst_mac == id:
> -isIP = PacketOffloadFlag.RTE_MBUF_F_RX_IP_CKSUM_GOOD in
> packet.ol_flags
> -isL4 = PacketOffloadFlag.RTE_MBUF_F_RX_L4_CKSUM_GOOD in
> packet.ol_flags
> -self.verify(isL4 == goodL4, "Layer 4 checksum flag did not match
> expected checksum flag.")
> -self.verify(isIP == goodIP, "IP checksum flag did not match expected
> checksum flag.")
> +is_IP = PacketOffloadFlag.RTE_MBUF_F_RX_IP_CKSUM_GOOD in
> packet.ol_flags
> +is_L4 = PacketOffloadFlag.RTE_MBUF_F_RX_L4_CKSUM_GOOD in
> packet.ol_flags
> +self.verify(is_L4 == good_L4, "Layer 4 checksum flag did not match
> expected checksum flag.")
> +self.verify(is_IP == good_IP, "IP checksum flag did not match
> expected checksum flag.")
>
> def setup_hw_offload(self, testpmd: TestPmdShell) -> None:
> """Sets IP, UDP, and TCP layers to hardware offload.
> @@ -108,7 +108,18 @@ def setup_hw_offload(self, testpmd: TestPmdShell) ->
> None:
>
> @func_test
> def test_insert_checksums(self) -> None:
> -"""Enable checksum offload insertion and verify packet reception."""
> +"""Enable checksum offload insertion and verify packet reception.
> +
> +Steps:
> +Create a list of packets to send.
> +Launch testpmd with the necessary configuration.
> +Enable checksum hardware offload.
> +Send list of packets.
> +
> +Verify:
> +Verify packets are received.
> +Verify packet checksums match the expected flags.
> +"""
> mac_id = "00:00:00:00:00:01"
> payload = b"x"
> packet_list = [
> @@ -125,12 +136,22 @@ def test_insert_checksums(self) -> None:
> self.send_packets_and_verify(packet_list=packet_list,
> load=payload, should_receive=True)
> for i in range(0, len(packet_list)):
> self.send_packet_and_verify_checksum(
> -packet=packet_list[i], goodL4=True, goodIP=True,
> testpmd=testpmd, id=mac_id
> +packet=packet_list[i], good_L4=True, good_IP=True,
> testpmd=testpmd, id=mac_id
> )
>
> @func_test
> def test_no_insert_checksums(self) -> None:
> -"""Disable checksum offload insertion and verify packet reception."""
> +"""Disable checksum offload inser
Re: [EXTERNAL] [RFC v5 1/2] eventdev: add atomic queue to test-eventdev app
On Wed, 2025-01-22 at 10:20 +, Pavan Nikhilesh Bhagavatula wrote: > > Add an atomic queue test based on the order queue test that exclusively uses > > atomic queues. > > This makes it compatible with event devices such as the distributed software > > eventdev. > > > > The test detects if port maintenance is required. > > > > To verify atomicity, a spinlock is set up for each combination of queue and > > flow. > > It is taken whenever an event is dequeued for processing and released when > > processing is finished. > > The test will fail if a port attempts to take a lock which is already taken. > > > > Signed-off-by: Luka Jankovic > > --- > > v5: > > * Updated documentation for dpdk-test-eventdev > > v4: > > * Fix code style issues. > > * Remove unused imports. > > v3: > > * Use struct to avoid bit operations when accessing event u64. > > * Changed __rte_always_inline to inline for processing stages. > > * Introduce idle timeout constant. > > * Formatting and cleanup. > > v2: > > * Changed to only check queue, flow combination, not port, queue, flow. > > * Lock is only held when a packet is processed. > > * Utilize event u64 instead of mbuf. > > Hi Luka, > > This test fails on Marvell CNXK platform because HW assumes that value of > event.u64 > will be 8byte aligned and upper bits as per[1], for optimizations purposes. > Could you go back to using mbuf similar to ordered_atq/queue > > Thanks, > Pavan. Thanks for bringing it up, I wasn't aware. I will revert back to the mbuf implementation. > > > * General cleanup. > > [1] > https://docs.kernel.org/arch/arm64/memory.html
Re: [PATCH v6 2/2] dts: add flow create/delete to testpmd shell
Hi Dean, it looks mostly good, just some nits.
On 21/01/2025 20:41, Dean Marx wrote:
+def flow_create(self, flow_rule: FlowRule, port_id: int, verify: bool = True)
-> int:
+"""Creates a flow rule in the testpmd session.
+
+Args:
+flow_rule: :class:`FlowRule` object used for creating testpmd flow
rule.
+port_id: Integer representing the port to use.
+verify: If :data:`True`, the output of the command is scanned
+to ensure the flow rule was created successfully.
This line should be indented further.
+
+Raises:
+InteractiveCommandExecutionError: If flow rule is invalid.
+
+Returns:
+Id of created flow rule as an integer.
There is no reason to specify the type when it's already annotated as
part of the function signature.
+"""
+flow_output = self.send_command(f"flow create {port_id} {flow_rule}")
+if verify:
+if "created" not in flow_output:
+self._logger.debug(f"Failed to create flow
rule:\n{flow_output}")
+raise InteractiveCommandExecutionError(
+f"Failed to create flow rule:\n{flow_output}"
+)
With the check below here, we are already verifying the command
execution... as you are effectively testing the same output. Therefore
this verification above is redundant. I'd remove it, together with the
verify argument. Finally, I'd specify in the description of the
docstring that this function by returning the number of the created flow
it's implicitly verifying its execution.
+match = re.search(r"#(\d+)", flow_output)
+if match is not None:
+match_str = match.group(1)
+flow_id = int(match_str)
+return flow_id
+else:
+self._logger.debug(f"Failed to create flow rule:\n{flow_output}")
+raise InteractiveCommandExecutionError(f"Failed to create flow
rule:\n{flow_output}")
+
+def flow_delete(self, flow_id: int, port_id: int, verify: bool = True) ->
None:
+"""Deletes the specified flow rule from the testpmd session.
+
+Args:
+flow_id: :class:`FlowRule` id used for deleting testpmd flow rule.
I guess it's not really a FlowRule id. Just Flow id. So:
Id of the flow to remove.
+port_id: Integer representing the port to use.
+verify: If :data:`True`, the output of the command is scanned
+to ensure the flow rule was deleted successfully.
indent
Re: [PATCH v1] dts: fix checksum suite docstring/variable format
Looks good, thanks. Just one nit. Reviewed-by: Luca Vizzarro On 16/01/2025 18:43, Dean Marx wrote: @@ -57,7 +57,7 @@ def send_packets_and_verify( packet_list: List of Scapy packets to send and verify. load: Raw layer load attribute in the sent packet. should_receive: Indicates whether the packet should be received -by the traffic generator. +by the traffic generator. """ I am assuming this was unintentional? As it's meant to be the way it was before. Keep the indentation as it's not a new argument, but part of the previous one.
[PATCH v2 1/2] drivers/common: fix void function returning a value
This patch avoids warnings like the one below emitted by MSVC:
../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
warning C4098: 'idpf_singleq_rearm':
'void' function returning a value
Signed-off-by: Andre Muezerie
---
drivers/common/idpf/idpf_common_rxtx_avx512.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c
b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..9ea71c3718 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
rxdp += rxq->rxrearm_start;
- if (unlikely(cache == NULL))
- return idpf_singleq_rearm_common(rxq);
+ if (unlikely(cache == NULL)) {
+ idpf_singleq_rearm_common(rxq);
+ return;
+ }
/* We need to pull 'n' more MBUFs into the software ring from mempool
* We inline the mempool function here, so we can vectorize the copy
@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
rxdp += rx_bufq->rxrearm_start;
- if (unlikely(!cache))
- return idpf_splitq_rearm_common(rx_bufq);
+ if (unlikely(!cache)) {
+ idpf_splitq_rearm_common(rx_bufq);
+ return;
+ }
/* We need to pull 'n' more MBUFs into the software ring from mempool
* We inline the mempool function here, so we can vectorize the copy
--
2.47.2.vfs.0.1
[PATCH v2 0/2] fix void function returning a value
v2: * Updated commit messages to follow standard format. This patch avoids warnings like the one below emitted by MSVC, and is needed to get the code to compile cleanly with MSVC. ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139): warning C4098: 'idpf_singleq_rearm': 'void' function returning a value Andre Muezerie (2): drivers/common: fix void function returning a value drivers/net: fix void function returning a value drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 2 +- drivers/net/ice/ice_rxtx_vec_avx2.c | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) -- 2.47.2.vfs.0.1
[PATCH v25 09/13] compress/zsda: add zsda compressdev xform ops
Add zsda compressdev xform interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/compress/zsda/zsda_comp_pmd.c | 54 ++-
1 file changed, 52 insertions(+), 2 deletions(-)
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index ee3d6602ec..a8d2da0477 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -149,6 +149,56 @@ zsda_comp_stats_reset(struct rte_compressdev *dev)
zsda_stats_reset(dev->data->queue_pairs, dev->data->nb_queue_pairs);
}
+static int
+zsda_comp_private_xform_create(struct rte_compressdev *dev,
+ const struct rte_comp_xform *xform,
+ void **private_xform)
+{
+ struct zsda_comp_dev_private *zsda = dev->data->dev_private;
+
+ if (unlikely(private_xform == NULL)) {
+ ZSDA_LOG(ERR, "Failed! private_xform is NULL");
+ return -EINVAL;
+ }
+ if (unlikely(zsda->xformpool == NULL)) {
+ ZSDA_LOG(ERR, "Failed! zsda->xformpool is NULL");
+ return -ENOMEM;
+ }
+ if (rte_mempool_get(zsda->xformpool, private_xform)) {
+ ZSDA_LOG(ERR, "Failed! zsda->xformpool is NULL");
+ return -ENOMEM;
+ }
+
+ struct zsda_comp_xform *zsda_xform = *private_xform;
+ zsda_xform->type = xform->type;
+
+ if (zsda_xform->type == RTE_COMP_COMPRESS)
+ zsda_xform->checksum_type = xform->compress.chksum;
+ else
+ zsda_xform->checksum_type = xform->decompress.chksum;
+
+ if (zsda_xform->checksum_type == RTE_COMP_CHECKSUM_CRC32_ADLER32)
+ return -EINVAL;
+
+ return ZSDA_SUCCESS;
+}
+
+static int
+zsda_comp_private_xform_free(struct rte_compressdev *dev __rte_unused,
+void *private_xform)
+{
+ struct zsda_comp_xform *zsda_xform = private_xform;
+
+ if (zsda_xform) {
+ memset(zsda_xform, 0, zsda_comp_xform_size());
+ struct rte_mempool *mp = rte_mempool_from_obj(zsda_xform);
+
+ rte_mempool_put(mp, zsda_xform);
+ return ZSDA_SUCCESS;
+ }
+ return -EINVAL;
+}
+
static struct rte_compressdev_ops compress_zsda_ops = {
.dev_configure = zsda_comp_dev_config,
@@ -162,8 +212,8 @@ static struct rte_compressdev_ops compress_zsda_ops = {
.queue_pair_setup = NULL,
.queue_pair_release = NULL,
- .private_xform_create = NULL,
- .private_xform_free = NULL
+ .private_xform_create = zsda_comp_private_xform_create,
+ .private_xform_free = zsda_comp_private_xform_free,
};
/* An rte_driver is needed in the registration of the device with compressdev.
--
2.27.0
[PATCH v25 02/13] common/zsda: add zsdadev driver
Add basic zsdadev init and register PCI probe functions
Signed-off-by: Hanxiao Li
---
MAINTAINERS | 3 +
drivers/common/zsda/meson.build | 13 ++
drivers/common/zsda/zsda_device.c| 187 +++
drivers/common/zsda/zsda_device.h| 54
drivers/common/zsda/zsda_qp_common.h | 28
drivers/meson.build | 1 +
6 files changed, 286 insertions(+)
create mode 100644 drivers/common/zsda/meson.build
create mode 100644 drivers/common/zsda/zsda_device.c
create mode 100644 drivers/common/zsda/zsda_device.h
create mode 100644 drivers/common/zsda/zsda_qp_common.h
diff --git a/MAINTAINERS b/MAINTAINERS
index b86cdd266b..86864bc5f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1312,6 +1312,9 @@ F: drivers/compress/zlib/
F: doc/guides/compressdevs/zlib.rst
F: doc/guides/compressdevs/features/zlib.ini
+ZTE Storage Data Accelerator(ZSDA)
+M: Hanxiao Li
+F: drivers/common/zsda/
DMAdev Drivers
--
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
new file mode 100644
index 00..68bc549c27
--- /dev/null
+++ b/drivers/common/zsda/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 ZTE Corporation
+
+if is_windows
+build = false
+reason = 'not supported on Windows'
+subdir_done()
+endif
+
+deps += ['bus_pci', 'mbuf']
+sources += files(
+ 'zsda_device.c',
+ )
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
new file mode 100644
index 00..a7a3ff5440
--- /dev/null
+++ b/drivers/common/zsda/zsda_device.c
@@ -0,0 +1,187 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include "zsda_device.h"
+
+/* per-process array of device data */
+struct zsda_device_info zsda_devs[RTE_PMD_ZSDA_MAX_PCI_DEVICES];
+static int zsda_nb_pci_devices;
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_zsda_map[] = {
+ {
+ RTE_PCI_DEVICE(0x1cf2, 0x8050),
+ },
+ {
+ RTE_PCI_DEVICE(0x1cf2, 0x8051),
+ },
+ {.device_id = 0},
+};
+
+static struct zsda_pci_device *
+zsda_pci_dev_by_name_get(const char *name)
+{
+ unsigned int i;
+
+ if (name == NULL)
+ return NULL;
+
+ for (i = 0; i < RTE_PMD_ZSDA_MAX_PCI_DEVICES; i++) {
+ if (zsda_devs[i].mz &&
+ (strcmp(((struct zsda_pci_device *)zsda_devs[i].mz->addr)
+ ->name,
+ name) == 0))
+ return (struct zsda_pci_device *)zsda_devs[i].mz->addr;
+ }
+
+ return NULL;
+}
+
+static uint8_t
+zsda_pci_dev_free_id_get(void)
+{
+ uint32_t dev_id;
+
+ for (dev_id = 0; dev_id < RTE_PMD_ZSDA_MAX_PCI_DEVICES; dev_id++)
+ if (zsda_devs[dev_id].mz == NULL)
+ break;
+
+ return dev_id & (ZSDA_MAX_DEV - 1);
+}
+
+static struct zsda_pci_device *
+zsda_pci_dev_get(const struct rte_pci_device *pci_dev)
+{
+ char name[ZSDA_DEV_NAME_MAX_LEN];
+
+ rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+ return zsda_pci_dev_by_name_get(name);
+}
+
+static struct zsda_pci_device *
+zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
+{
+ struct zsda_pci_device *zsda_pci_dev;
+ uint8_t zsda_dev_id;
+ char name[ZSDA_DEV_NAME_MAX_LEN];
+ unsigned int socket_id = rte_socket_id();
+
+ rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+ snprintf(name + strlen(name), (ZSDA_DEV_NAME_MAX_LEN - strlen(name)),
+"_zsda");
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+ const struct rte_memzone *mz = rte_memzone_lookup(name);
+
+ if (mz == NULL)
+ return NULL;
+ zsda_pci_dev = mz->addr;
+ zsda_devs[zsda_pci_dev->zsda_dev_id].mz = mz;
+ zsda_devs[zsda_pci_dev->zsda_dev_id].pci_dev = pci_dev;
+ zsda_nb_pci_devices++;
+ return zsda_pci_dev;
+ }
+
+ if (zsda_pci_dev_by_name_get(name) != NULL)
+ return NULL;
+
+ zsda_dev_id = zsda_pci_dev_free_id_get();
+
+ if (zsda_dev_id == (RTE_PMD_ZSDA_MAX_PCI_DEVICES - 1))
+ return NULL;
+
+ zsda_devs[zsda_dev_id].mz =
+ rte_memzone_reserve(name, sizeof(struct zsda_pci_device),
+ (int)(socket_id & 0xfff), 0);
+
+ if (zsda_devs[zsda_dev_id].mz == NULL)
+ return NULL;
+
+ zsda_pci_dev = zsda_devs[zsda_dev_id].mz->addr;
+ memset(zsda_pci_dev, 0, sizeof(*zsda_pci_dev));
+ memcpy(zsda_pci_dev->name, name, ZSDA_DEV_NAME_MAX_LEN);
+ zsda_pci_dev->zsda_dev_id = zsda_dev_id;
+ zsda_pci_dev->pci_dev = pci_dev;
+ zsda_devs[zsda_dev_id].
[PATCH v25 01/13] config: add zsda device number
Add the number of zsda devices. Signed-off-by: Hanxiao Li --- config/rte_config.h | 4 1 file changed, 4 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index 3734db6bdc..86897de75e 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -119,6 +119,10 @@ #define RTE_PMD_QAT_COMP_SGL_MAX_SEGMENTS 16 #define RTE_PMD_QAT_COMP_IM_BUFFER_SIZE 65536 +/* ZSDA device */ +/* Max. number of ZSDA devices which can be attached */ +#define RTE_PMD_ZSDA_MAX_PCI_DEVICES 256 + /* virtio crypto defines */ #define RTE_MAX_VIRTIO_CRYPTO 32 -- 2.27.0
[PATCH v25 05/13] common/zsda: add definition and use of msg chan.
Add msg chan functions and the use to get
hardware information or operate hardware.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp.c| 307 +++
drivers/common/zsda/zsda_qp.h| 48 +
drivers/common/zsda/zsda_qp_common.h | 37
3 files changed, 392 insertions(+)
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index bc489f6296..6c1875746d 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -4,8 +4,50 @@
#include "zsda_qp.h"
+#define MAGIC_SEND 0xab
+#define MAGIC_RECV 0xcd
+#define ADMIN_VER 1
+
static uint8_t zsda_num_used_qps;
+static struct ring_size zsda_qp_hw_ring_size[ZSDA_MAX_SERVICES] = {
+};
+
+static const uint8_t crc8_table[256] = {
+ 0x00, 0x41, 0x13, 0x52, 0x26, 0x67, 0x35, 0x74, 0x4c, 0x0d, 0x5f, 0x1e,
+ 0x6a, 0x2b, 0x79, 0x38, 0x09, 0x48, 0x1a, 0x5b, 0x2f, 0x6e, 0x3c, 0x7d,
+ 0x45, 0x04, 0x56, 0x17, 0x63, 0x22, 0x70, 0x31, 0x12, 0x53, 0x01, 0x40,
+ 0x34, 0x75, 0x27, 0x66, 0x5e, 0x1f, 0x4d, 0x0c, 0x78, 0x39, 0x6b, 0x2a,
+ 0x1b, 0x5a, 0x08, 0x49, 0x3d, 0x7c, 0x2e, 0x6f, 0x57, 0x16, 0x44, 0x05,
+ 0x71, 0x30, 0x62, 0x23, 0x24, 0x65, 0x37, 0x76, 0x02, 0x43, 0x11, 0x50,
+ 0x68, 0x29, 0x7b, 0x3a, 0x4e, 0x0f, 0x5d, 0x1c, 0x2d, 0x6c, 0x3e, 0x7f,
+ 0x0b, 0x4a, 0x18, 0x59, 0x61, 0x20, 0x72, 0x33, 0x47, 0x06, 0x54, 0x15,
+ 0x36, 0x77, 0x25, 0x64, 0x10, 0x51, 0x03, 0x42, 0x7a, 0x3b, 0x69, 0x28,
+ 0x5c, 0x1d, 0x4f, 0x0e, 0x3f, 0x7e, 0x2c, 0x6d, 0x19, 0x58, 0x0a, 0x4b,
+ 0x73, 0x32, 0x60, 0x21, 0x55, 0x14, 0x46, 0x07, 0x48, 0x09, 0x5b, 0x1a,
+ 0x6e, 0x2f, 0x7d, 0x3c, 0x04, 0x45, 0x17, 0x56, 0x22, 0x63, 0x31, 0x70,
+ 0x41, 0x00, 0x52, 0x13, 0x67, 0x26, 0x74, 0x35, 0x0d, 0x4c, 0x1e, 0x5f,
+ 0x2b, 0x6a, 0x38, 0x79, 0x5a, 0x1b, 0x49, 0x08, 0x7c, 0x3d, 0x6f, 0x2e,
+ 0x16, 0x57, 0x05, 0x44, 0x30, 0x71, 0x23, 0x62, 0x53, 0x12, 0x40, 0x01,
+ 0x75, 0x34, 0x66, 0x27, 0x1f, 0x5e, 0x0c, 0x4d, 0x39, 0x78, 0x2a, 0x6b,
+ 0x6c, 0x2d, 0x7f, 0x3e, 0x4a, 0x0b, 0x59, 0x18, 0x20, 0x61, 0x33, 0x72,
+ 0x06, 0x47, 0x15, 0x54, 0x65, 0x24, 0x76, 0x37, 0x43, 0x02, 0x50, 0x11,
+ 0x29, 0x68, 0x3a, 0x7b, 0x0f, 0x4e, 0x1c, 0x5d, 0x7e, 0x3f, 0x6d, 0x2c,
+ 0x58, 0x19, 0x4b, 0x0a, 0x32, 0x73, 0x21, 0x60, 0x14, 0x55, 0x07, 0x46,
+ 0x77, 0x36, 0x64, 0x25, 0x51, 0x10, 0x42, 0x03, 0x3b, 0x7a, 0x28, 0x69,
+ 0x1d, 0x5c, 0x0e, 0x4f};
+
+static uint8_t
+zsda_crc8(const uint8_t *message, const int length)
+{
+ uint8_t crc = 0;
+ int i;
+
+ for (i = 0; i < length; i++)
+ crc = crc8_table[crc ^ message[i]];
+ return crc;
+}
+
static uint8_t
zsda_used_qps_num_get(const struct rte_pci_device *pci_dev)
{
@@ -164,6 +206,258 @@ zsda_queue_clear(const struct rte_pci_device *pci_dev)
return ret;
}
+static uint32_t
+zsda_reg_8_set(void *addr, const uint8_t val0, const uint8_t val1,
+ const uint8_t val2, const uint8_t val3)
+{
+ uint8_t val[4];
+
+ val[0] = val0;
+ val[1] = val1;
+ val[2] = val2;
+ val[3] = val3;
+ ZSDA_CSR_WRITE32(addr, *(uint32_t *)val);
+ return *(uint32_t *)val;
+}
+
+static uint8_t
+zsda_reg_8_get(void *addr, const int offset)
+{
+ uint32_t val = ZSDA_CSR_READ32(addr);
+
+ return *(((uint8_t *)&val) + offset);
+}
+
+static inline uint32_t
+zsda_modulo_32(uint32_t data, uint32_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+static inline uint16_t
+zsda_modulo_16(uint16_t data, uint16_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+static inline uint8_t
+zsda_modulo_8(uint8_t data, uint8_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+
+static int
+zsda_admin_msg_send(const struct rte_pci_device *pci_dev, void *req,
+ const uint32_t len)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ uint8_t wq_flag;
+ uint8_t crc;
+ uint16_t admin_db;
+ uint32_t retry = ZSDA_TIME_NUM;
+ int i;
+ uint16_t db;
+ int repeat = sizeof(struct zsda_admin_req) / sizeof(uint32_t);
+
+ if (len > ADMIN_BUF_DATA_LEN)
+ return -EINVAL;
+
+ for (i = 0; i < repeat; i++) {
+ ZSDA_CSR_WRITE32(((uint32_t *)(mmio_base + ZSDA_ADMIN_WQ) + i),
+*((uint32_t *)req + i));
+ }
+
+ crc = zsda_crc8((uint8_t *)req, ADMIN_BUF_DATA_LEN);
+ zsda_reg_8_set(mmio_base + ZSDA_ADMIN_WQ_BASE7, crc, ADMIN_VER,
MAGIC_SEND, 0);
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ rte_wmb();
+
+ admin_db = ZSDA_CSR_READ32(mmio_base + ZSDA_ADMIN_WQ_TAIL);
+ db = zsda_modulo_32(admin_db, 0x1ff);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_WQ_TAIL, db);
+
+ do {
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ wq_flag = zsda_reg_8_get(mmio_base + ZSDA_ADMIN_WQ_BASE7, 2);
+
[PATCH v25 00/13] drivers/zsda: introduce zsda drivers
v25: - replace the ``__rte_packed`` macro. - fix an extra line at end of file in patch 11. v24: - Try to resolve the issue in v23 by sending all patches at once v23: - modify funcitons name to move the verb to the end - move the qp_setup and qp_release calls in same patch - make the queue setup APIs common with one function. - Fix some code in original patch. v22: - modify misspelled errors. v21: - modify some errors. v20 - add release note which was forgot in last version v19: - delete cryptodev drivers and prepare to submit it next time. - only submit compressdev driver this time. - resplit the patches. v18: - add code in drivers/meson.build to compile zsda drivers. - make every patch compile without any warnings or errors. v17: - fix some spelling errors v16: - resplit patches. - complete documentation which is yet there in that patch. - every patch should compile without any warnings or errors. - delete unused comments. v15: - split to more patches. v14: - Uniform Byte Alignment. v13: - resolve some comiler warnings that are being suppressed. v12: - use RTE_LOG_LINE_PREFIX in logging macro. - delete the check for null with rte_mempool_free. - delete some unused initial values. v11: - use RTE_LOG_LINE in logging macro. - fix some known bugs. v10: - delete new blank line at EOF - Cleaning up some code in zsda_log.h v9: - add a new feature in default.ini. - Re-split the patch according to the new PMD guidelines https://patches.dpdk.org/project/dpdk/patch/20241006184 254.53499-1-nandinipersad...@gmail.com/ - Split SM4-XTS tests into a new series to releases. - Separate out datapath(enqueue/dequeue) as a separate patch. v8: - fix some errors in cryptodevs/features/zsda.ini. v7: - add release notes and some documentations. - add MAINTAINERS context in the patch where the file/folder is added. - add files in meason.build which are included in the patch only. - add a check for unsupported on Windows. - notice the implicit cast in C. - add cover letter. - compile each of the patches individually. Hanxiao Li (13): config: add zsda device number common/zsda: add zsdadev driver common/zsda: add logging macros common/zsda: add functions to operate hardware queue common/zsda: add definition and use of msg chan. compress/zsda: add zsda compressdev driver skeleton compress/zsda: add zsda compressdev dev ops compress/zsda: add zsda compressdev stats ops compress/zsda: add zsda compressdev xform ops compress/zsda: add zsda compressdev qp ops compress/zsda: add zsda compressdev enqueue datapath compress/zsda: add zsda compressdev dequeue datapath compress/zsda: add zsda compressdev capabilities MAINTAINERS | 6 + config/rte_config.h | 4 + doc/guides/compressdevs/features/zsda.ini | 15 + doc/guides/compressdevs/index.rst | 1 + doc/guides/compressdevs/zsda.rst | 194 + doc/guides/rel_notes/release_25_03.rst| 7 + drivers/common/zsda/meson.build | 26 + drivers/common/zsda/zsda_device.c | 209 + drivers/common/zsda/zsda_device.h | 59 ++ drivers/common/zsda/zsda_logs.c | 19 + drivers/common/zsda/zsda_logs.h | 27 + drivers/common/zsda/zsda_qp.c | 946 ++ drivers/common/zsda/zsda_qp.h | 194 + drivers/common/zsda/zsda_qp_common.c | 192 + drivers/common/zsda/zsda_qp_common.h | 202 + drivers/compress/zsda/zsda_comp.c | 388 + drivers/compress/zsda/zsda_comp.h | 45 + drivers/compress/zsda/zsda_comp_pmd.c | 419 ++ drivers/compress/zsda/zsda_comp_pmd.h | 41 + drivers/meson.build | 1 + 20 files changed, 2995 insertions(+) create mode 100644 doc/guides/compressdevs/features/zsda.ini create mode 100644 doc/guides/compressdevs/zsda.rst create mode 100644 drivers/common/zsda/meson.build create mode 100644 drivers/common/zsda/zsda_device.c create mode 100644 drivers/common/zsda/zsda_device.h create mode 100644 drivers/common/zsda/zsda_logs.c create mode 100644 drivers/common/zsda/zsda_logs.h create mode 100644 drivers/common/zsda/zsda_qp.c create mode 100644 drivers/common/zsda/zsda_qp.h create mode 100644 drivers/common/zsda/zsda_qp_common.c create mode 100644 drivers/common/zsda/zsda_qp_common.h create mode 100644 drivers/compress/zsda/zsda_comp.c create mode 100644 drivers/compress/zsda/zsda_comp.h create mode 100644 drivers/compress/zsda/zsda_comp_pmd.c create mode 100644 drivers/compress/zsda/zsda_comp_pmd.h -- 2.27.0
[PATCH v25 10/13] compress/zsda: add zsda compressdev qp ops
Add zsda compressdev qp interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp.c | 267 ++
drivers/common/zsda/zsda_qp.h | 84
drivers/common/zsda/zsda_qp_common.h | 40
drivers/compress/zsda/zsda_comp_pmd.c | 66 ++-
4 files changed, 455 insertions(+), 2 deletions(-)
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 2ddbf51665..66b212b39e 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -7,6 +7,8 @@
#define MAGIC_SEND 0xab
#define MAGIC_RECV 0xcd
#define ADMIN_VER 1
+#define RING_DIR_TX 0
+#define RING_DIR_RX 1
static uint8_t zsda_num_used_qps;
@@ -516,3 +518,268 @@ zsda_queue_init(struct zsda_pci_device *zsda_pci_dev)
return ret;
}
+
+struct zsda_qp_hw *
+zsda_qps_hw_per_service(struct zsda_pci_device *zsda_pci_dev,
+ enum zsda_service_type type)
+{
+ struct zsda_qp_hw *qp_hw = NULL;
+
+ if (type < ZSDA_SERVICE_INVALID)
+ qp_hw = &(zsda_pci_dev->zsda_hw_qps[type]);
+
+ return qp_hw;
+}
+
+static const struct rte_memzone *
+zsda_queue_dma_zone_reserve(const char *queue_name,
+ const unsigned int queue_size,
+ const unsigned int socket_id)
+{
+ const struct rte_memzone *mz;
+
+ mz = rte_memzone_lookup(queue_name);
+ if (mz != 0) {
+ if (((size_t)queue_size <= mz->len) &&
+ ((socket_id == (SOCKET_ID_ANY & 0x)) ||
+(socket_id == (mz->socket_id & 0x {
+ ZSDA_LOG(DEBUG,
+"re-use memzone already allocated for %s",
+queue_name);
+ return mz;
+ }
+ ZSDA_LOG(ERR, "Failed! queue_name exist");
+ return NULL;
+ }
+
+ mz = rte_memzone_reserve_aligned(queue_name, queue_size,
+ (int)(socket_id & 0xfff),
+ RTE_MEMZONE_IOVA_CONTIG, queue_size);
+
+ return mz;
+}
+
+static int
+zsda_queue_create(const uint8_t dev_id, struct zsda_queue *queue,
+ const struct zsda_qp_config *qp_conf, const uint8_t dir)
+{
+ void *io_addr;
+ const struct rte_memzone *qp_mz;
+ struct qinfo qcfg = {0};
+
+ uint16_t desc_size = ((dir == RING_DIR_TX) ? qp_conf->hw->tx_msg_size
+ : qp_conf->hw->rx_msg_size);
+ unsigned int queue_size_bytes = qp_conf->nb_descriptors * desc_size;
+
+ queue->hw_queue_number =
+ ((dir == RING_DIR_TX) ? qp_conf->hw->tx_ring_num
+ : qp_conf->hw->rx_ring_num);
+
+ struct rte_pci_device *pci_dev = zsda_devs[dev_id].pci_dev;
+ struct zsda_pci_device *zsda_dev =
+ (struct zsda_pci_device *)zsda_devs[dev_id].mz->addr;
+
+ zsda_queue_cfg_by_id_get(zsda_dev, queue->hw_queue_number, &qcfg);
+
+ if (dir == RING_DIR_TX)
+ snprintf(queue->memz_name, sizeof(queue->memz_name),
+"%s_%d_%s_%s_%d", pci_dev->driver->driver.name, dev_id,
+qp_conf->service_str, "qptxmem",
+queue->hw_queue_number);
+ else
+ snprintf(queue->memz_name, sizeof(queue->memz_name),
+"%s_%d_%s_%s_%d", pci_dev->driver->driver.name, dev_id,
+qp_conf->service_str, "qprxmem",
+queue->hw_queue_number);
+
+ qp_mz = zsda_queue_dma_zone_reserve(queue->memz_name, queue_size_bytes,
+ rte_socket_id());
+ if (qp_mz == NULL) {
+ ZSDA_LOG(ERR, "Failed! qp_mz is NULL");
+ return -ENOMEM;
+ }
+
+ queue->base_addr = qp_mz->addr;
+ queue->base_phys_addr = qp_mz->iova;
+ queue->modulo_mask = MAX_NUM_OPS;
+ queue->msg_size = desc_size;
+
+ queue->head = (dir == RING_DIR_TX) ? qcfg.wq_head : qcfg.cq_head;
+ queue->tail = (dir == RING_DIR_TX) ? qcfg.wq_tail : qcfg.cq_tail;
+
+ if ((queue->head == 0) && (queue->tail == 0))
+ qcfg.cycle += 1;
+
+ queue->valid = qcfg.cycle & (ZSDA_MAX_CYCLE - 1);
+ queue->queue_size = ZSDA_MAX_DESC;
+ queue->cycle_size = ZSDA_MAX_CYCLE;
+ queue->io_addr = pci_dev->mem_resource[0].addr;
+
+ memset(queue->base_addr, 0x0, queue_size_bytes);
+ io_addr = pci_dev->mem_resource[0].addr;
+
+ if (dir == RING_DIR_TX)
+ ZSDA_CSR_WQ_RING_BASE(io_addr, queue->hw_queue_number,
+ queue->base_phys_addr);
+ else
+ ZSDA_CSR_CQ_RING_BASE(io_addr, queue->hw_queue_number,
+ queue->base_phys_addr);
+
+ return 0;
+}
+
[PATCH v25 13/13] compress/zsda: add zsda compressdev capabilities
Add zsda compressdev capabilities
Signed-off-by: Hanxiao Li
---
doc/guides/compressdevs/features/zsda.ini | 9 +
doc/guides/compressdevs/zsda.rst | 23 +++
doc/guides/rel_notes/release_25_03.rst| 7 +++
drivers/compress/zsda/zsda_comp_pmd.c | 16 +++-
4 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/doc/guides/compressdevs/features/zsda.ini
b/doc/guides/compressdevs/features/zsda.ini
index 5cc9a3b1a6..3b087ea7f9 100644
--- a/doc/guides/compressdevs/features/zsda.ini
+++ b/doc/guides/compressdevs/features/zsda.ini
@@ -4,3 +4,12 @@
; Supported features of 'ZSDA' compression driver.
;
[Features]
+HW Accelerated = Y
+OOP SGL In SGL Out = Y
+OOP SGL In LB Out = Y
+OOP LB In SGL Out = Y
+Deflate= Y
+Adler32= Y
+Crc32 = Y
+Fixed = Y
+Dynamic= Y
diff --git a/doc/guides/compressdevs/zsda.rst b/doc/guides/compressdevs/zsda.rst
index da7117b45e..77de026a16 100644
--- a/doc/guides/compressdevs/zsda.rst
+++ b/doc/guides/compressdevs/zsda.rst
@@ -13,6 +13,29 @@ support for the following hardware accelerator devices:
Features
+ZSDA compression PMD has support for:
+
+Compression/Decompression algorithm:
+
+* DEFLATE - using Fixed and Dynamic Huffman encoding
+
+Checksum generation:
+
+* CRC32, Adler32
+
+Huffman code type:
+
+* FIXED
+* DYNAMIC
+
+
+Limitations
+---
+
+* Compressdev level 0, no compression, is not supported.
+* No BSD support as BSD ZSDA kernel driver not available.
+* Stateful is not supported.
+
Installation
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index 85986ffa61..59d9ea19d9 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -24,6 +24,13 @@ DPDK Release 25.03
New Features
+* **Added ZTE Storage Data Accelerator(ZSDA) device driver.**
+
+ Added a new compress driver for ZSDA devices to support
+ the deflate compression and decompression algorithm.
+
+ See the :doc:`../compressdevs/zsda` guide for more details on the new driver.
+
.. This section should contain new features added in this release.
Sample format:
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index dc8b07f5f7..fb3fa6679b 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -10,6 +10,20 @@
#include "zsda_comp_pmd.h"
#include "zsda_comp.h"
+static const struct rte_compressdev_capabilities zsda_comp_capabilities[] = {
+ {
+ .algo = RTE_COMP_ALGO_DEFLATE,
+ .comp_feature_flags = RTE_COMP_FF_HUFFMAN_DYNAMIC |
+
RTE_COMP_FF_OOP_SGL_IN_SGL_OUT |
+
RTE_COMP_FF_OOP_SGL_IN_LB_OUT |
+
RTE_COMP_FF_OOP_LB_IN_SGL_OUT |
+
RTE_COMP_FF_CRC32_CHECKSUM |
+
RTE_COMP_FF_ADLER32_CHECKSUM |
+
RTE_COMP_FF_SHAREABLE_PRIV_XFORM,
+ .window_size = {.min = 15, .max = 15, .increment = 0},
+ },
+};
+
static int
zsda_comp_xform_size(void)
{
@@ -358,7 +372,7 @@ zsda_comp_dev_create(struct zsda_pci_device *zsda_pci_dev)
comp_dev->zsda_pci_dev = zsda_pci_dev;
comp_dev->compressdev = compressdev;
- capabilities = NULL;
+ capabilities = zsda_comp_capabilities;
comp_dev->capa_mz = rte_memzone_lookup(capa_memz_name);
if (comp_dev->capa_mz == NULL) {
--
2.27.0
[PATCH v25 03/13] common/zsda: add logging macros
Add zxdh logging implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_device.c| 22 +++---
drivers/common/zsda/zsda_logs.c | 19 +++
drivers/common/zsda/zsda_logs.h | 27 +++
drivers/common/zsda/zsda_qp_common.h | 1 +
5 files changed, 63 insertions(+), 7 deletions(-)
create mode 100644 drivers/common/zsda/zsda_logs.c
create mode 100644 drivers/common/zsda/zsda_logs.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 68bc549c27..342d000c6d 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -10,4 +10,5 @@ endif
deps += ['bus_pci', 'mbuf']
sources += files(
'zsda_device.c',
+ 'zsda_logs.c',
)
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index a7a3ff5440..18ca372f60 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -26,9 +26,10 @@ zsda_pci_dev_by_name_get(const char *name)
{
unsigned int i;
- if (name == NULL)
+ if (name == NULL) {
+ ZSDA_LOG(ERR, "Failed! name is NULL.");
return NULL;
-
+ }
for (i = 0; i < RTE_PMD_ZSDA_MAX_PCI_DEVICES; i++) {
if (zsda_devs[i].mz &&
(strcmp(((struct zsda_pci_device *)zsda_devs[i].mz->addr)
@@ -76,8 +77,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
const struct rte_memzone *mz = rte_memzone_lookup(name);
- if (mz == NULL)
+ if (mz == NULL) {
+ ZSDA_LOG(ERR, "Secondary can't find %s mz", name);
return NULL;
+ }
zsda_pci_dev = mz->addr;
zsda_devs[zsda_pci_dev->zsda_dev_id].mz = mz;
zsda_devs[zsda_pci_dev->zsda_dev_id].pci_dev = pci_dev;
@@ -85,8 +88,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
return zsda_pci_dev;
}
- if (zsda_pci_dev_by_name_get(name) != NULL)
+ if (zsda_pci_dev_by_name_get(name) != NULL) {
+ ZSDA_LOG(ERR, "Failed! config");
return NULL;
+ }
zsda_dev_id = zsda_pci_dev_free_id_get();
@@ -97,9 +102,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
rte_memzone_reserve(name, sizeof(struct zsda_pci_device),
(int)(socket_id & 0xfff), 0);
- if (zsda_devs[zsda_dev_id].mz == NULL)
+ if (zsda_devs[zsda_dev_id].mz == NULL) {
+ ZSDA_LOG(ERR, "Failed! malloc");
return NULL;
-
+ }
zsda_pci_dev = zsda_devs[zsda_dev_id].mz->addr;
memset(zsda_pci_dev, 0, sizeof(*zsda_pci_dev));
memcpy(zsda_pci_dev->name, name, ZSDA_DEV_NAME_MAX_LEN);
@@ -154,8 +160,10 @@ zsda_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct zsda_pci_device *zsda_pci_dev;
zsda_pci_dev = zsda_pci_device_allocate(pci_dev);
- if (zsda_pci_dev == NULL)
+ if (zsda_pci_dev == NULL) {
+ ZSDA_LOG(ERR, "Failed! zsda_pci_dev is NULL");
return -ENODEV;
+ }
return ret;
}
diff --git a/drivers/common/zsda/zsda_logs.c b/drivers/common/zsda/zsda_logs.c
new file mode 100644
index 00..f76d9d9d0d
--- /dev/null
+++ b/drivers/common/zsda/zsda_logs.c
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include
+
+#include "zsda_logs.h"
+
+int
+zsda_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
+ const void *buf, unsigned int len)
+{
+ if (rte_log_can_log(logtype, level))
+ rte_hexdump(rte_log_get_stream(), title, buf, len);
+
+ return 0;
+}
+
+RTE_LOG_REGISTER_SUFFIX(zsda_logtype_gen, gen, NOTICE);
diff --git a/drivers/common/zsda/zsda_logs.h b/drivers/common/zsda/zsda_logs.h
new file mode 100644
index 00..9d77254773
--- /dev/null
+++ b/drivers/common/zsda/zsda_logs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#ifndef _ZSDA_LOGS_H_
+#define _ZSDA_LOGS_H_
+
+#include
+
+extern int zsda_logtype_gen;
+#define RTE_LOGTYPE_ZSDA_GEN zsda_logtype_gen
+
+#define ZSDA_LOG(level, ...) \
+ RTE_LOG_LINE_PREFIX(level, ZSDA_GEN, "%s(): ", \
+ __func__, __VA_ARGS__)
+
+/**
+ * zsda_hexdump_log - Dump out memory in a special hex dump format.
+ *
+ * Dump out the message buffer in a special hex dump output format with
+ * characters printed for each line of 16 hex values. The message will be sent
+ * to the stream used by the rte_log infrastructure.
+ */
+int zsda_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
+
[PATCH v25 07/13] compress/zsda: add zsda compressdev dev ops
add zsda compressdev dev interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_device.c | 9 +-
drivers/common/zsda/zsda_qp_common.c | 57 +++
drivers/common/zsda/zsda_qp_common.h | 37 +++
drivers/compress/zsda/zsda_comp_pmd.c | 133 +-
drivers/compress/zsda/zsda_comp_pmd.h | 5 +
6 files changed, 236 insertions(+), 6 deletions(-)
create mode 100644 drivers/common/zsda/zsda_qp_common.c
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 6ee2a68f4b..6e6d5ab006 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -12,6 +12,7 @@ sources += files(
'zsda_device.c',
'zsda_logs.c',
'zsda_qp.c',
+ 'zsda_qp_common.c',
)
zsda_compress = true
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index 189614f881..8a89dc7fc9 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -147,9 +147,12 @@ zsda_pci_device_release(const struct rte_pci_device
*pci_dev)
}
static int
-zsda_pci_dev_destroy(struct zsda_pci_device *zsda_pci_dev __rte_unused,
+zsda_pci_dev_destroy(struct zsda_pci_device *zsda_pci_dev,
const struct rte_pci_device *pci_dev)
{
+
+ zsda_comp_dev_destroy(zsda_pci_dev);
+
return zsda_pci_device_release(pci_dev);
}
@@ -172,6 +175,10 @@ zsda_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
return ret;
}
+ ret = zsda_comp_dev_create(zsda_pci_dev);
+ if (ret)
+ ZSDA_LOG(ERR, "Failed! dev create.");
+
return ret;
}
diff --git a/drivers/common/zsda/zsda_qp_common.c
b/drivers/common/zsda/zsda_qp_common.c
new file mode 100644
index 00..5a249be675
--- /dev/null
+++ b/drivers/common/zsda/zsda_qp_common.c
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include "zsda_qp_common.h"
+
+void
+zsda_queue_delete(const struct zsda_queue *queue)
+{
+ const struct rte_memzone *mz;
+
+ if (queue == NULL) {
+ ZSDA_LOG(DEBUG, "Invalid queue");
+ return;
+ }
+
+ mz = rte_memzone_lookup(queue->memz_name);
+ if (mz != NULL) {
+ memset(queue->base_addr, 0x0,
+ (uint16_t)(queue->queue_size * queue->msg_size));
+ rte_memzone_free(mz);
+ } else
+ ZSDA_LOG(DEBUG, "queue %s doesn't exist", queue->memz_name);
+}
+
+int
+zsda_queue_pair_release(struct zsda_qp **qp_addr)
+{
+ struct zsda_qp *qp = *qp_addr;
+ uint32_t i;
+ enum zsda_service_type type;
+
+ if (qp == NULL) {
+ ZSDA_LOG(DEBUG, "qp already freed");
+ return 0;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (!qp->srv[type].used)
+ continue;
+
+ zsda_queue_delete(&(qp->srv[type].tx_q));
+ zsda_queue_delete(&(qp->srv[type].rx_q));
+ qp->srv[type].used = false;
+ for (i = 0; i < qp->srv[type].nb_descriptors; i++)
+ rte_mempool_put(qp->srv[type].op_cookie_pool,
+ qp->srv[type].op_cookies[i]);
+
+ rte_mempool_free(qp->srv[type].op_cookie_pool);
+ rte_free(qp->srv[type].op_cookies);
+ }
+
+ rte_free(qp);
+ *qp_addr = NULL;
+
+ return ZSDA_SUCCESS;
+}
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index 414cea56cc..f2d2ea037d 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -72,4 +72,41 @@ struct __rte_packed_begin zsda_admin_resp_qcfg {
uint8_t data[14];
} __rte_packed_end;
+struct zsda_queue {
+ char memz_name[RTE_MEMZONE_NAMESIZE];
+ uint8_t *io_addr;
+ uint8_t *base_addr;/* Base address */
+ rte_iova_t base_phys_addr; /* Queue physical address */
+ uint16_t head; /* Shadow copy of the head */
+ uint16_t tail; /* Shadow copy of the tail */
+ uint16_t modulo_mask;
+ uint16_t msg_size;
+ uint16_t queue_size;
+ uint16_t cycle_size;
+ uint16_t pushed_wqe;
+
+ uint8_t hw_queue_number;
+ uint32_t csr_head; /* last written head value */
+ uint32_t csr_tail; /* last written tail value */
+
+ uint8_t valid;
+ uint16_t sid;
+};
+
+struct qp_srv {
+ bool used;
+ struct zsda_queue tx_q;
+ struct zsda_queue rx_q;
+ struct rte_mempool *op_cookie_pool;
+ void **op_cookies;
+ uint16_t nb_descriptors;
+};
+
+struct zsda_qp {
+ struct qp_srv srv[ZSDA_MAX_SERVICES];
+};
+
+void zsda_queue_delete(const struct zsd
[PATCH v25 08/13] compress/zsda: add zsda compressdev stats ops
Add zsda compressdev stats interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp_common.c | 63 +++
drivers/common/zsda/zsda_qp_common.h | 16 +++
drivers/compress/zsda/zsda_comp_pmd.c | 24 +-
3 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/drivers/common/zsda/zsda_qp_common.c
b/drivers/common/zsda/zsda_qp_common.c
index 5a249be675..577392871f 100644
--- a/drivers/common/zsda/zsda_qp_common.c
+++ b/drivers/common/zsda/zsda_qp_common.c
@@ -55,3 +55,66 @@ zsda_queue_pair_release(struct zsda_qp **qp_addr)
return ZSDA_SUCCESS;
}
+
+void
+zsda_stats_get(void **queue_pairs, const uint32_t nb_queue_pairs,
+ struct zsda_qp_stat *stats)
+{
+ enum zsda_service_type type;
+ uint32_t i;
+ struct zsda_qp *qp;
+
+ if ((stats == NULL) || (queue_pairs == NULL)) {
+ ZSDA_LOG(ERR, "Failed! stats or queue_pairs is NULL");
+ return;
+ }
+
+ for (i = 0; i < nb_queue_pairs; i++) {
+ qp = queue_pairs[i];
+
+ if (qp == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs[i] is NULL");
+ break;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (qp->srv[type].used) {
+ stats->enqueued_count +=
+ qp->srv[type].stats.enqueued_count;
+ stats->dequeued_count +=
+ qp->srv[type].stats.dequeued_count;
+ stats->enqueue_err_count +=
+ qp->srv[type].stats.enqueue_err_count;
+ stats->dequeue_err_count +=
+ qp->srv[type].stats.dequeue_err_count;
+ }
+ }
+ }
+}
+
+void
+zsda_stats_reset(void **queue_pairs, const uint32_t nb_queue_pairs)
+{
+ enum zsda_service_type type;
+ uint32_t i;
+ struct zsda_qp *qp;
+
+ if (queue_pairs == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs is NULL");
+ return;
+ }
+
+ for (i = 0; i < nb_queue_pairs; i++) {
+ qp = queue_pairs[i];
+
+ if (qp == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs[i] is NULL");
+ break;
+ }
+ for (type = 0; type < ZSDA_MAX_SERVICES; type++) {
+ if (qp->srv[type].used)
+ memset(&(qp->srv[type].stats), 0,
+ sizeof(struct zsda_qp_stat));
+ }
+ }
+}
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index f2d2ea037d..d054ac25ac 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -93,10 +93,23 @@ struct zsda_queue {
uint16_t sid;
};
+struct zsda_qp_stat {
+ /**< Count of all operations enqueued */
+ uint64_t enqueued_count;
+ /**< Count of all operations dequeued */
+ uint64_t dequeued_count;
+
+ /**< Total error count on operations enqueued */
+ uint64_t enqueue_err_count;
+ /**< Total error count on operations dequeued */
+ uint64_t dequeue_err_count;
+};
+
struct qp_srv {
bool used;
struct zsda_queue tx_q;
struct zsda_queue rx_q;
+ struct zsda_qp_stat stats;
struct rte_mempool *op_cookie_pool;
void **op_cookies;
uint16_t nb_descriptors;
@@ -108,5 +121,8 @@ struct zsda_qp {
void zsda_queue_delete(const struct zsda_queue *queue);
int zsda_queue_pair_release(struct zsda_qp **qp_addr);
+void zsda_stats_get(void **queue_pairs, const uint32_t nb_queue_pairs,
+ struct zsda_qp_stat *stats);
+void zsda_stats_reset(void **queue_pairs, const uint32_t nb_queue_pairs);
#endif /* _ZSDA_QP_COMMON_H_ */
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index 7e4e0372df..ee3d6602ec 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -129,6 +129,26 @@ zsda_comp_dev_info_get(struct rte_compressdev *dev,
}
}
+static void
+zsda_comp_stats_get(struct rte_compressdev *dev,
+ struct rte_compressdev_stats *stats)
+{
+ struct zsda_qp_stat stats_info = {0};
+
+ zsda_stats_get(dev->data->queue_pairs, dev->data->nb_queue_pairs,
+ &stats_info);
+ stats->enqueued_count = stats_info.enqueued_count;
+ stats->dequeued_count = stats_info.dequeued_count;
+ stats->enqueue_err_count = stats_info.enqueue_err_count;
+ stats->dequeue_err_count = stats_info.dequeue_err_count;
+}
+
+static void
+zsda_comp_stats_reset(struct rte_compressdev *dev)
+{
+ zsda_st
RE: [EXTERNAL] [RFC v5 1/2] eventdev: add atomic queue to test-eventdev app
> Add an atomic queue test based on the order queue test that exclusively uses > atomic queues. > This makes it compatible with event devices such as the distributed software > eventdev. > > The test detects if port maintenance is required. > > To verify atomicity, a spinlock is set up for each combination of queue and > flow. > It is taken whenever an event is dequeued for processing and released when > processing is finished. > The test will fail if a port attempts to take a lock which is already taken. > > Signed-off-by: Luka Jankovic > --- > v5: > * Updated documentation for dpdk-test-eventdev > v4: > * Fix code style issues. > * Remove unused imports. > v3: > * Use struct to avoid bit operations when accessing event u64. > * Changed __rte_always_inline to inline for processing stages. > * Introduce idle timeout constant. > * Formatting and cleanup. > v2: > * Changed to only check queue, flow combination, not port, queue, flow. > * Lock is only held when a packet is processed. > * Utilize event u64 instead of mbuf. Hi Luka, This test fails on Marvell CNXK platform because HW assumes that value of event.u64 will be 8byte aligned and upper bits as per[1], for optimizations purposes. Could you go back to using mbuf similar to ordered_atq/queue Thanks, Pavan. > * General cleanup. [1] https://docs.kernel.org/arch/arm64/memory.html
[PATCH v25 11/13] compress/zsda: add zsda compressdev enqueue datapath
Add zsda compressdev enqueue datapath.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 2 +-
drivers/common/zsda/zsda_qp.c | 105
drivers/common/zsda/zsda_qp.h | 13 +-
drivers/common/zsda/zsda_qp_common.c | 72
drivers/common/zsda/zsda_qp_common.h | 30
drivers/compress/zsda/zsda_comp.c | 233 ++
drivers/compress/zsda/zsda_comp.h | 36
drivers/compress/zsda/zsda_comp_pmd.c | 15 +-
8 files changed, 503 insertions(+), 3 deletions(-)
create mode 100644 drivers/compress/zsda/zsda_comp.c
create mode 100644 drivers/compress/zsda/zsda_comp.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 6e6d5ab006..152150e5ef 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -20,7 +20,7 @@ zsda_compress_path = 'compress/zsda'
zsda_compress_relpath = '../../' + zsda_compress_path
includes += include_directories(zsda_compress_relpath)
if zsda_compress
- foreach f: ['zsda_comp_pmd.c']
+ foreach f: ['zsda_comp_pmd.c', 'zsda_comp.c']
sources += files(join_paths(zsda_compress_relpath, f))
endforeach
endif
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 66b212b39e..c85b9ddb75 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -783,3 +783,108 @@ zsda_task_queue_setup(struct zsda_pci_device
*zsda_pci_dev,
return ret;
}
+
+static int
+zsda_free_cookie_find(const struct zsda_queue *queue, void **op_cookie,
+ uint16_t *idx)
+{
+ uint16_t old_tail = queue->tail;
+ uint16_t tail = queue->tail;
+ struct zsda_op_cookie *cookie;
+
+ do {
+ cookie = op_cookie[tail];
+ if (!cookie->used) {
+ *idx = tail & (queue->queue_size - 1);
+ return ZSDA_SUCCESS;
+ }
+ tail = zsda_modulo_16(tail++, queue->modulo_mask);
+ } while (old_tail != tail);
+
+ return -EINVAL;
+}
+
+static int
+zsda_enqueue(void *op, struct zsda_qp *qp)
+{
+ uint16_t new_tail;
+ enum zsda_service_type type;
+ void **op_cookie;
+ int ret = ZSDA_SUCCESS;
+ struct zsda_queue *queue;
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (qp->srv[type].used) {
+ if (!qp->srv[type].match(op))
+ continue;
+ queue = &qp->srv[type].tx_q;
+ op_cookie = qp->srv[type].op_cookies;
+
+ if (zsda_free_cookie_find(queue, op_cookie,
+ &new_tail)) {
+ ret = -EBUSY;
+ break;
+ }
+ ret = qp->srv[type].tx_cb(op, queue, op_cookie,
+ new_tail);
+ if (ret) {
+ qp->srv[type].stats.enqueue_err_count++;
+ ZSDA_LOG(ERR, "Failed! config wqe");
+ break;
+ }
+ qp->srv[type].stats.enqueued_count++;
+
+ queue->tail = zsda_modulo_16(new_tail + 1,
+queue->queue_size - 1);
+
+ if (new_tail > queue->tail)
+ queue->valid =
+ zsda_modulo_8(queue->valid + 1,
+ (uint8_t)(queue->cycle_size - 1));
+
+ queue->pushed_wqe++;
+ break;
+ }
+ }
+
+ return ret;
+}
+
+static void
+zsda_tx_tail_write(struct zsda_queue *queue)
+{
+ if (queue->pushed_wqe)
+ WRITE_CSR_WQ_TAIL(queue->io_addr, queue->hw_queue_number,
+ queue->tail);
+
+ queue->pushed_wqe = 0;
+}
+
+uint16_t
+zsda_enqueue_burst(struct zsda_qp *qp, void **ops, const uint16_t nb_ops)
+{
+ int ret = ZSDA_SUCCESS;
+ enum zsda_service_type type;
+ uint16_t i;
+ uint16_t nb_send = 0;
+ void *op;
+
+ if (nb_ops > ZSDA_MAX_DESC) {
+ ZSDA_LOG(ERR, "Enqueue number bigger than %d", ZSDA_MAX_DESC);
+ return 0;
+ }
+
+ for (i = 0; i < nb_ops; i++) {
+ op = ops[i];
+ ret = zsda_enqueue(op, qp);
+ if (ret < 0)
+ break;
+ nb_send++;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++)
+ if (qp->srv[type].used)
+ zsda_tx_tail_write(&qp->srv[type].tx_q);
+
+ return nb_send;
+}
diff --git a/drivers/common/zsda/zsda_qp.h b/drivers/common/zsda/zsda_qp.h
index c79bfb5d36..96fc38ea09
[PATCH 1/1] test/crypto: additional RSA tests for CNXK PMD
Include additional RSA tests for CNXK PMD. These tests validates
RSA operations using private key in exponent form.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test/test_cryptodev_asym.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index e2f74702ad..8448dad3df 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -3927,6 +3927,9 @@ static struct unit_test_suite
cryptodev_octeontx_asym_testsuite = {
test_rsa_enc_dec_crt),
TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
test_rsa_sign_verify_crt),
+ TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_rsa_enc_dec),
+ TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+ test_rsa_sign_verify),
TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_mod_exp),
TEST_CASE_NAMED_WITH_DATA(
"Modex test for zero padding",
--
2.25.1
RE: [PATCH v3] eal: fix macros for MSVC: noinline, alwaysinline, hot
> From: Andre Muezerie [mailto:andre...@linux.microsoft.com] > Sent: Wednesday, 22 January 2025 17.24 > > MSVC supports forcing code to be inlined or forcing code to not be > inlined, like other compilers. It does not support the "hot" hint > though. > > This patch fixes existing macros __rte_noinline and > __rte_always_inline so that they also do what is expected from them > when used with MSVC. __rte_hot is updated to become a noop when > MSCS is used. > > Signed-off-by: Andre Muezerie > --- Acked-by: Morten Brørup
RE: [PATCH v2 09/15] mempool: add allocation function attributes
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Wednesday, 22 January 2025 18.33 > > Use function attributes to catch cases where mempool is allocated > but not freed correctly. > > Signed-off-by: Stephen Hemminger > --- Reviewed-by: Morten Brørup
Re: [PATCH v3 1/7] dts: enable arch self-discovery
Reviewed-by: Nicholas Pratte
On Wed, Jan 15, 2025 at 9:19 AM Luca Vizzarro wrote:
>
> From: Nicholas Pratte
>
> The 'arch' attribute in the conf.yaml is unnecessary, as this can be
> readily discovered directly from any given node.
>
> Bugzilla ID: 1360
>
> Signed-off-by: Nicholas Pratte
> Signed-off-by: Luca Vizzarro
> Reviewed-by: Paul Szczepanek
> ---
> dts/conf.yaml| 2 --
> dts/framework/config/__init__.py | 2 --
> dts/framework/testbed_model/node.py | 3 +++
> dts/framework/testbed_model/os_session.py| 8
> dts/framework/testbed_model/posix_session.py | 4
> 5 files changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/dts/conf.yaml b/dts/conf.yaml
> index f83dbb0e90..80aba0d63a 100644
> --- a/dts/conf.yaml
> +++ b/dts/conf.yaml
> @@ -42,7 +42,6 @@ nodes:
>- name: "SUT 1"
> hostname: sut1.change.me.localhost
> user: dtsuser
> -arch: x86_64
> os: linux
> lcores: "" # use all the available logical cores
> use_first_core: false # tells DPDK to use any physical core
> @@ -68,7 +67,6 @@ nodes:
>- name: "TG 1"
> hostname: tg1.change.me.localhost
> user: dtsuser
> -arch: x86_64
> os: linux
> ports:
># sets up the physical link between "TG 1"@:00:08.0 and "SUT
> 1"@:00:08.0
> diff --git a/dts/framework/config/__init__.py
> b/dts/framework/config/__init__.py
> index 6bf4885815..1127c6474a 100644
> --- a/dts/framework/config/__init__.py
> +++ b/dts/framework/config/__init__.py
> @@ -191,8 +191,6 @@ class NodeConfiguration(FrozenModel):
> user: str
> #: The password of the user. The use of passwords is heavily
> discouraged, please use SSH keys.
> password: str | None = None
> -#: The architecture of the :class:`~framework.testbed_model.node.Node`.
> -arch: Architecture
> #: The operating system of the
> :class:`~framework.testbed_model.node.Node`.
> os: OS
> #: A comma delimited list of logical cores to use when running DPDK.
> diff --git a/dts/framework/testbed_model/node.py
> b/dts/framework/testbed_model/node.py
> index c6f12319ca..c56872aa99 100644
> --- a/dts/framework/testbed_model/node.py
> +++ b/dts/framework/testbed_model/node.py
> @@ -17,6 +17,7 @@
>
> from framework.config import (
> OS,
> +Architecture,
> DPDKBuildConfiguration,
> NodeConfiguration,
> TestRunConfiguration,
> @@ -57,6 +58,7 @@ class Node(ABC):
> main_session: OSSession
> config: NodeConfiguration
> name: str
> +arch: Architecture
> lcores: list[LogicalCore]
> ports: list[Port]
> _logger: DTSLogger
> @@ -79,6 +81,7 @@ def __init__(self, node_config: NodeConfiguration):
> self.name = node_config.name
> self._logger = get_dts_logger(self.name)
> self.main_session = create_session(self.config, self.name,
> self._logger)
> +self.arch = Architecture(self.main_session.get_arch_info())
>
> self._logger.info(f"Connected to node: {self.name}")
>
> diff --git a/dts/framework/testbed_model/os_session.py
> b/dts/framework/testbed_model/os_session.py
> index 28eccc05ed..30d781c355 100644
> --- a/dts/framework/testbed_model/os_session.py
> +++ b/dts/framework/testbed_model/os_session.py
> @@ -507,6 +507,14 @@ def get_node_info(self) -> OSSessionInfo:
> Node information.
> """
>
> +@abstractmethod
> +def get_arch_info(self) -> str:
> +"""Discover CPU architecture of the remote host.
> +
> +Returns:
> +Remote host CPU architecture.
> +"""
> +
> @abstractmethod
> def update_ports(self, ports: list[Port]) -> None:
> """Get additional information about ports from the operating system
> and update them.
> diff --git a/dts/framework/testbed_model/posix_session.py
> b/dts/framework/testbed_model/posix_session.py
> index 29e314db6e..220618cacc 100644
> --- a/dts/framework/testbed_model/posix_session.py
> +++ b/dts/framework/testbed_model/posix_session.py
> @@ -404,3 +404,7 @@ def get_node_info(self) -> OSSessionInfo:
> ).stdout.split("\n")
> kernel_version = self.send_command("uname -r",
> SETTINGS.timeout).stdout
> return OSSessionInfo(os_release_info[0].strip(),
> os_release_info[1].strip(), kernel_version)
> +
> +def get_arch_info(self) -> str:
> +"""Overrides :meth'~.os_session.OSSession.get_arch_info'."""
> +return self.send_command("uname -m").stdout.strip()
> --
> 2.43.0
>
Re: [PATCH v8 00/15] net/zxdh: updated net zxdh driver
How about this for a release note? From 7137087faa9c1278bc702b69cce6df5e246c5675 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 22 Jan 2025 10:05:54 -0800 Subject: [PATCH] doc: add release note for zxdh driver update Add summary of new features. Signed-off-by: Stephen Hemminger --- doc/guides/rel_notes/release_25_03.rst | 12 1 file changed, 12 insertions(+) diff --git a/doc/guides/rel_notes/release_25_03.rst b/doc/guides/rel_notes/release_25_03.rst index 85986ffa61..e20aa0b8ec 100644 --- a/doc/guides/rel_notes/release_25_03.rst +++ b/doc/guides/rel_notes/release_25_03.rst @@ -63,6 +63,18 @@ New Features and even substantial part of its code. It can be viewed as an extension of rte_ring functionality. +* **Updated ZXDH network driver.** + + * Added support for multiple queues. + * Added support SR-IOV VF. + * Scattered and gather for TX and RX. + * Link state and auto-negotiation. + * MAC address filtering. + * Multicast and Promiscuous mode. + * VLAN filtering and offload. + * Receive Side Scaling (RSS). + * Hardware statistcs. + * Jumbo frames. Removed Items - -- 2.45.2
[PATCH v2 15/15] sched: add allocation function attributes
Use function attributes to catch cases where sched port config
is allocated but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/sched/rte_sched.h | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index 222e6b3583..7ae570aa1b 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -310,16 +310,7 @@ struct rte_sched_port_params {
* Configuration
*/
-/**
- * Hierarchical scheduler port configuration
- *
- * @param params
- * Port scheduler configuration parameter structure
- * @return
- * Handle to port scheduler instance upon success or NULL otherwise.
- */
-struct rte_sched_port *
-rte_sched_port_config(struct rte_sched_port_params *params);
+struct rte_sched_port;
/**
* Hierarchical scheduler port free
@@ -331,6 +322,18 @@ rte_sched_port_config(struct rte_sched_port_params
*params);
void
rte_sched_port_free(struct rte_sched_port *port);
+/**
+ * Hierarchical scheduler port configuration
+ *
+ * @param params
+ * Port scheduler configuration parameter structure
+ * @return
+ * Handle to port scheduler instance upon success or NULL otherwise.
+ */
+struct rte_sched_port *
+rte_sched_port_config(struct rte_sched_port_params *params)
+ __rte_malloc __rte_dealloc(rte_sched_port_free, 1);
+
/**
* Hierarchical scheduler pipe profile add
*
--
2.45.2
Re: [PATCH v3 2/7] dts: simplify build options config
Reviewed-by: Nicholas Pratte
On Wed, Jan 15, 2025 at 9:19 AM Luca Vizzarro wrote:
>
> From: Nicholas Pratte
>
> The build options configuration contained redundant fields that were not
> in use, and there is no future scope for their use.
>
> Bugzilla ID: 1360
>
> Signed-off-by: Nicholas Pratte
> Signed-off-by: Luca Vizzarro
> Reviewed-by: Paul Szczepanek
> ---
> dts/conf.yaml| 3 --
> dts/framework/config/__init__.py | 43
> dts/framework/test_result.py | 2 +-
> dts/framework/testbed_model/cpu.py | 20 -
> dts/framework/testbed_model/node.py | 2 +-
> dts/framework/testbed_model/os_session.py| 4 +-
> dts/framework/testbed_model/posix_session.py | 2 +-
> dts/framework/testbed_model/sut_node.py | 6 ++-
> 8 files changed, 28 insertions(+), 54 deletions(-)
>
> diff --git a/dts/conf.yaml b/dts/conf.yaml
> index 80aba0d63a..4b6965b3d7 100644
> --- a/dts/conf.yaml
> +++ b/dts/conf.yaml
> @@ -14,9 +14,6 @@ test_runs:
>
># precompiled_build_dir: Commented out because `build_options` is
> defined.
>build_options:
> -arch: x86_64
> -os: linux
> -cpu: native
> # the combination of the following two makes CC="ccache gcc"
> compiler: gcc
> compiler_wrapper: ccache # Optional.
> diff --git a/dts/framework/config/__init__.py
> b/dts/framework/config/__init__.py
> index 1127c6474a..3fa8f4fa8f 100644
> --- a/dts/framework/config/__init__.py
> +++ b/dts/framework/config/__init__.py
> @@ -63,22 +63,6 @@ class FrozenModel(BaseModel):
> model_config = ConfigDict(frozen=True, extra="forbid")
>
>
> -@unique
> -class Architecture(StrEnum):
> -r"""The supported architectures of
> :class:`~framework.testbed_model.node.Node`\s."""
> -
> -#:
> -i686 = auto()
> -#:
> -x86_64 = auto()
> -#:
> -x86_32 = auto()
> -#:
> -arm64 = auto()
> -#:
> -ppc64le = auto()
> -
> -
> @unique
> class OS(StrEnum):
> r"""The supported operating systems of
> :class:`~framework.testbed_model.node.Node`\s."""
> @@ -91,22 +75,6 @@ class OS(StrEnum):
> windows = auto()
>
>
> -@unique
> -class CPUType(StrEnum):
> -r"""The supported CPUs of
> :class:`~framework.testbed_model.node.Node`\s."""
> -
> -#:
> -native = auto()
> -#:
> -armv8a = auto()
> -#:
> -dpaa2 = auto()
> -#:
> -thunderx = auto()
> -#:
> -xgene1 = auto()
> -
> -
> @unique
> class Compiler(StrEnum):
> r"""The supported compilers of
> :class:`~framework.testbed_model.node.Node`\s."""
> @@ -351,23 +319,12 @@ class DPDKBuildOptionsConfiguration(FrozenModel):
> The build options used for building DPDK.
> """
>
> -#: The target architecture to build for.
> -arch: Architecture
> -#: The target OS to build for.
> -os: OS
> -#: The target CPU to build for.
> -cpu: CPUType
> #: The compiler executable to use.
> compiler: Compiler
> #: This string will be put in front of the compiler when executing the
> build. Useful for adding
> #: wrapper commands, such as ``ccache``.
> compiler_wrapper: str = ""
>
> -@cached_property
> -def name(self) -> str:
> -"""The name of the compiler."""
> -return f"{self.arch}-{self.os}-{self.cpu}-{self.compiler}"
> -
>
> class DPDKUncompiledBuildConfiguration(BaseDPDKBuildConfiguration):
> """DPDK uncompiled build configuration."""
> diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
> index ba7c1c9804..381f72b974 100644
> --- a/dts/framework/test_result.py
> +++ b/dts/framework/test_result.py
> @@ -337,7 +337,7 @@ class DTSResult(BaseResult):
> """Stores environment information and test results from a DTS run.
>
> * Test run level information, such as testbed, the test suite list
> and
> - DPDK build configuration (compiler, target OS and cpu),
> + DPDK build compiler configuration,
> * Test suite and test case results,
> * All errors that are caught and recorded during DTS execution.
>
> diff --git a/dts/framework/testbed_model/cpu.py
> b/dts/framework/testbed_model/cpu.py
> index 46bf13960d..d19fa5d597 100644
> --- a/dts/framework/testbed_model/cpu.py
> +++ b/dts/framework/testbed_model/cpu.py
> @@ -1,5 +1,6 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2023 PANTHEON.tech s.r.o.
> +# Copyright(c) 2025 Arm Limited
>
> """CPU core representation and filtering.
>
> @@ -21,8 +22,25 @@
> from abc import ABC, abstractmethod
> from collections.abc import Iterable, ValuesView
> from dataclasses import dataclass
> +from enum import auto, unique
>
> -from framework.utils import expand_range
> +from framework.utils import StrEnum, expand_range
> +
> +
> +@unique
> +class Architecture(StrEnum):
> +r"""The supported architectures of
> :class:`~framework.testbed_model.node.Node`\s."""
> +
Re: [PATCH v8 00/15] net/zxdh: updated net zxdh driver
On Mon, 20 Jan 2025 11:47:08 +0800 Junlong Wang wrote: > V8: > - using __rte_packed_begin/__rte_packed_end replace __rte_packed. > > V7: > - resolved warning '-Waddress-of-packed-member' > in function 'zxdh_dev_rss_reta_update'. > > V6: > - Remove unnecessary __rte_packed in the virtqueue structure and others. > - Remove Some blank before or after log message, > and remove some end with period in log message. > > V5: > - Simplify the notify_data part in the zxdh_notify_queue function. > - Replace rte_zmalloc with rte_calloc in the rss_reta_update function. > - Remove unnecessary check in mtu_set function. > > V4: > - resolved ci compile issues. > > V3: > - use rte_zmalloc and rte_calloc to avoid memset. > - remove unnecessary initialization, which first usage will set. > - adjust some function which is always return 0, changed to void > and skip the ASSERTION later. > - resolved some WARNING:MACRO_ARG_UNUSED issues. > - resolved some other issues. > > V2: > - resolve code style and github-robot build issue. > > V1: > - updated net zxdh driver > provided insert/delete/get table code funcs. > provided link/mac/vlan/promiscuous/rss/mtu ops. Do you want to write a release note entry for this? Or shall I write it for you?
[PATCH v2 00/15] Add attributes to allocation functions
This patch series builds on the allocation function attributes added in 24.11 release. These annotations will allow for compiler to flag cases where a pointer is allocated with one function but incorrectly passed to a different free function. The current code base does this correctly now, but adding attributes will catch future bugs, or errors in user programs. For each of these patches, the free function prototype needs to be reordered to be before the function attribute of the allocator. Checkpatch perl script falsely complains in a couple patches because it doesn't really understand C syntax for attributes. v2 - fix issue with bitratestats prototypes Stephen Hemminger (15): fib: add allocation function attributes rib: annotate rib allocation functions hash: add allocation function attributes lpm: add allocation function attributes pipeline: add allocation function attributes acl: add allocation function attributes bitratestats: add allocation function attributes member: add allocation function attributes mempool: add allocation function attributes eventdev: add allocation function attributes ring: add allocation function attributes reorder: add allocation function attributes compressdev: add allocation function attributes telemetry: add allocation function attributes sched: add allocation function attributes lib/acl/rte_acl.h | 26 --- lib/bitratestats/rte_bitrate.h| 4 +-- lib/compressdev/rte_comp.h| 28 lib/eventdev/rte_event_ring.h | 27 +++ lib/fib/rte_fib.h | 26 --- lib/fib/rte_fib6.h| 24 +++--- lib/fib/trie.h| 7 ++-- lib/hash/rte_fbk_hash.h | 24 +++--- lib/hash/rte_hash.h | 21 ++-- lib/lpm/rte_lpm.h | 23 ++--- lib/lpm/rte_lpm6.h| 23 ++--- lib/member/rte_member.h | 24 +++--- lib/mempool/rte_mempool.h | 37 +++-- lib/pipeline/rte_port_in_action.h | 55 --- lib/pipeline/rte_table_action.h | 53 +++-- lib/reorder/rte_reorder.h | 23 ++--- lib/rib/rte_rib.h | 24 +++--- lib/rib/rte_rib6.h| 24 +++--- lib/ring/rte_ring.h | 22 +++-- lib/sched/rte_sched.h | 23 +++-- lib/telemetry/rte_telemetry.h | 21 ++-- 21 files changed, 288 insertions(+), 251 deletions(-) -- 2.45.2
[PATCH v2 01/15] fib: add allocation function attributes
Use function attributes to catch cases where fib table is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/fib/rte_fib.h | 26 +++---
lib/fib/rte_fib6.h | 24 +---
lib/fib/trie.h | 7 ---
3 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h
index 496d137d48..65c24d5459 100644
--- a/lib/fib/rte_fib.h
+++ b/lib/fib/rte_fib.h
@@ -17,8 +17,10 @@
#include
+#include
#include
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -128,6 +130,17 @@ struct rte_fib_rcu_config {
uint32_t reclaim_max;
};
+
+/**
+ * Free an FIB object.
+ *
+ * @param fib
+ * FIB object handle created by rte_fib_create().
+ * If fib is NULL, no operation is performed.
+ */
+void
+rte_fib_free(struct rte_fib *fib);
+
/**
* Create FIB
*
@@ -142,7 +155,8 @@ struct rte_fib_rcu_config {
* NULL otherwise with rte_errno set to an appropriate values.
*/
struct rte_fib *
-rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf);
+rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
+ __rte_malloc __rte_dealloc(rte_fib_free, 1);
/**
* Find an existing FIB object and return a pointer to it.
@@ -157,16 +171,6 @@ rte_fib_create(const char *name, int socket_id, struct
rte_fib_conf *conf);
struct rte_fib *
rte_fib_find_existing(const char *name);
-/**
- * Free an FIB object.
- *
- * @param fib
- * FIB object handle created by rte_fib_create().
- * If fib is NULL, no operation is performed.
- */
-void
-rte_fib_free(struct rte_fib *fib);
-
/**
* Add a route to the FIB.
*
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index 21f0492374..b03b24421c 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -82,6 +82,17 @@ struct rte_fib6_conf {
};
};
+
+/**
+ * Free an FIB object.
+ *
+ * @param fib
+ * FIB object handle created by rte_fib6_create().
+ * If fib is NULL, no operation is performed.
+ */
+void
+rte_fib6_free(struct rte_fib6 *fib);
+
/**
* Create FIB
*
@@ -96,7 +107,8 @@ struct rte_fib6_conf {
* NULL otherwise with rte_errno set to an appropriate values.
*/
struct rte_fib6 *
-rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf);
+rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
+ __rte_malloc __rte_dealloc(rte_fib6_free, 1);
/**
* Find an existing FIB object and return a pointer to it.
@@ -111,16 +123,6 @@ rte_fib6_create(const char *name, int socket_id, struct
rte_fib6_conf *conf);
struct rte_fib6 *
rte_fib6_find_existing(const char *name);
-/**
- * Free an FIB object.
- *
- * @param fib
- * FIB object handle created by rte_fib6_create().
- * If fib is NULL, no operation is performed.
- */
-void
-rte_fib6_free(struct rte_fib6 *fib);
-
/**
* Add a route to the FIB.
*
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index f87fc0f6d2..bcb161702b 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -129,12 +129,13 @@ LOOKUP_FUNC(2b, uint16_t, 1)
LOOKUP_FUNC(4b, uint32_t, 2)
LOOKUP_FUNC(8b, uint64_t, 3)
-void *
-trie_create(const char *name, int socket_id, struct rte_fib6_conf *conf);
-
void
trie_free(void *p);
+void *
+trie_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
+ __rte_malloc __rte_dealloc(trie_free, 1);
+
rte_fib6_lookup_fn_t
trie_get_lookup_fn(void *p, enum rte_fib6_lookup_type type);
--
2.45.2
[PATCH v2 03/15] hash: add allocation function attributes
Use function attributes to catch cases where hash table is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/hash/rte_fbk_hash.h | 24 +---
lib/hash/rte_hash.h | 21 +++--
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
index 1f0c1d1b6c..b1a43f37b4 100644
--- a/lib/hash/rte_fbk_hash.h
+++ b/lib/hash/rte_fbk_hash.h
@@ -322,6 +322,16 @@ rte_fbk_hash_get_load_factor(struct rte_fbk_hash_table *ht)
*/
struct rte_fbk_hash_table *rte_fbk_hash_find_existing(const char *name);
+
+/**
+ * Free all memory used by a hash table.
+ * Has no effect on hash tables allocated in memory zones
+ *
+ * @param ht
+ * Hash table to deallocate.
+ */
+void rte_fbk_hash_free(struct rte_fbk_hash_table *ht);
+
/**
* Create a new hash table for use with four byte keys.
*
@@ -339,17 +349,9 @@ struct rte_fbk_hash_table
*rte_fbk_hash_find_existing(const char *name);
*- EEXIST - a memzone with the same name already exists
*- ENOMEM - no appropriate memory area found in which to create memzone
*/
-struct rte_fbk_hash_table * \
-rte_fbk_hash_create(const struct rte_fbk_hash_params *params);
-
-/**
- * Free all memory used by a hash table.
- * Has no effect on hash tables allocated in memory zones
- *
- * @param ht
- * Hash table to deallocate.
- */
-void rte_fbk_hash_free(struct rte_fbk_hash_table *ht);
+struct rte_fbk_hash_table *
+rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
+ __rte_malloc __rte_dealloc(rte_fbk_hash_free, 1);
#ifdef __cplusplus
}
diff --git a/lib/hash/rte_hash.h b/lib/hash/rte_hash.h
index 05ab447e4a..736fb15885 100644
--- a/lib/hash/rte_hash.h
+++ b/lib/hash/rte_hash.h
@@ -125,6 +125,15 @@ struct rte_hash_rcu_config {
/** @internal A hash table structure. */
struct rte_hash;
+/**
+ * De-allocate all memory used by hash table.
+ *
+ * @param h
+ * Hash table to free, if NULL, the function does nothing.
+ */
+void
+rte_hash_free(struct rte_hash *h);
+
/**
* Create a new hash table.
*
@@ -143,7 +152,8 @@ struct rte_hash;
*- ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_hash *
-rte_hash_create(const struct rte_hash_parameters *params);
+rte_hash_create(const struct rte_hash_parameters *params)
+ __rte_malloc __rte_dealloc(rte_hash_free, 1);
/**
* Set a new hash compare function other than the default one.
@@ -171,15 +181,6 @@ void rte_hash_set_cmp_func(struct rte_hash *h,
rte_hash_cmp_eq_t func);
struct rte_hash *
rte_hash_find_existing(const char *name);
-/**
- * De-allocate all memory used by hash table.
- *
- * @param h
- * Hash table to free, if NULL, the function does nothing.
- */
-void
-rte_hash_free(struct rte_hash *h);
-
/**
* Reset all hash structure, by zeroing all entries.
* When RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF is enabled,
--
2.45.2
[PATCH v2 07/15] bitratestats: add allocation function attributes
Use function attributes to catch cases where bitratestats is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/bitratestats/rte_bitrate.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bitratestats/rte_bitrate.h b/lib/bitratestats/rte_bitrate.h
index 979a712837..0cd3a6227c 100644
--- a/lib/bitratestats/rte_bitrate.h
+++ b/lib/bitratestats/rte_bitrate.h
@@ -17,7 +17,6 @@ extern "C" {
*/
struct rte_stats_bitrates;
-
/**
* Allocate a bitrate statistics structure
*
@@ -25,7 +24,8 @@ struct rte_stats_bitrates;
* - Pointer to structure on success
* - NULL on error (zmalloc failure)
*/
-struct rte_stats_bitrates *rte_stats_bitrate_create(void);
+struct rte_stats_bitrates *rte_stats_bitrate_create(void)
+ __rte_malloc __rte_dealloc(rte_stats_bitrate_free, 1);
/**
* Free bitrate statistics structure
--
2.45.2
[PATCH v2 02/15] rib: annotate rib allocation functions
Add function attributes to catch cases where rib is allocated and not freed correctly. Signed-off-by: Stephen Hemminger --- lib/rib/rte_rib.h | 24 +--- lib/rib/rte_rib6.h | 24 +--- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lib/rib/rte_rib.h b/lib/rib/rte_rib.h index 2054d3cebd..f30b85d79a 100644 --- a/lib/rib/rte_rib.h +++ b/lib/rib/rte_rib.h @@ -230,6 +230,17 @@ rte_rib_get_nh(const struct rte_rib_node *node, uint64_t *nh); int rte_rib_set_nh(struct rte_rib_node *node, uint64_t nh); + +/** + * Free an RIB object. + * + * @param rib + * RIB object handle created with rte_rib_create(). + * If rib is NULL, no operation is performed. + */ +void +rte_rib_free(struct rte_rib *rib); + /** * Create RIB * @@ -245,7 +256,8 @@ rte_rib_set_nh(struct rte_rib_node *node, uint64_t nh); */ struct rte_rib * rte_rib_create(const char *name, int socket_id, - const struct rte_rib_conf *conf); + const struct rte_rib_conf *conf) + __rte_malloc __rte_dealloc(rte_rib_free, 1); /** * Find an existing RIB object and return a pointer to it. @@ -259,16 +271,6 @@ rte_rib_create(const char *name, int socket_id, struct rte_rib * rte_rib_find_existing(const char *name); -/** - * Free an RIB object. - * - * @param rib - * RIB object handle created with rte_rib_create(). - * If rib is NULL, no operation is performed. - */ -void -rte_rib_free(struct rte_rib *rib); - #ifdef __cplusplus } #endif diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h index a60756f798..d9514acf82 100644 --- a/lib/rib/rte_rib6.h +++ b/lib/rib/rte_rib6.h @@ -294,6 +294,17 @@ rte_rib6_get_nh(const struct rte_rib6_node *node, uint64_t *nh); int rte_rib6_set_nh(struct rte_rib6_node *node, uint64_t nh); + +/** + * Free an RIB object. + * + * @param rib + * RIB object handle created with rte_rib6_create(). + * If rib is NULL, no operation is performed. + */ +void +rte_rib6_free(struct rte_rib6 *rib); + /** * Create RIB * @@ -309,7 +320,8 @@ rte_rib6_set_nh(struct rte_rib6_node *node, uint64_t nh); */ struct rte_rib6 * rte_rib6_create(const char *name, int socket_id, - const struct rte_rib6_conf *conf); + const struct rte_rib6_conf *conf) + __rte_malloc __rte_dealloc(rte_rib6_free, 1); /** * Find an existing RIB object and return a pointer to it. @@ -323,16 +335,6 @@ rte_rib6_create(const char *name, int socket_id, struct rte_rib6 * rte_rib6_find_existing(const char *name); -/** - * Free an RIB object. - * - * @param rib - * RIB object handle created with rte_rib6_create(). - * If rib is NULL, no operation is performed. - */ -void -rte_rib6_free(struct rte_rib6 *rib); - #ifdef __cplusplus } #endif -- 2.45.2
[PATCH v2 04/15] lpm: add allocation function attributes
Use function attributes to catch cases where lpm table is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/lpm/rte_lpm.h | 23 ---
lib/lpm/rte_lpm6.h | 23 ---
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 329dc1aad4..7df64f06b1 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -140,6 +140,16 @@ struct rte_lpm_rcu_config {
*/
};
+/**
+ * Free an LPM object.
+ *
+ * @param lpm
+ * LPM object handle
+ * If lpm is NULL, no operation is performed.
+ */
+void
+rte_lpm_free(struct rte_lpm *lpm);
+
/**
* Create an LPM object.
*
@@ -161,7 +171,8 @@ struct rte_lpm_rcu_config {
*/
struct rte_lpm *
rte_lpm_create(const char *name, int socket_id,
- const struct rte_lpm_config *config);
+ const struct rte_lpm_config *config)
+ __rte_malloc __rte_dealloc(rte_lpm_free, 1);
/**
* Find an existing LPM object and return a pointer to it.
@@ -176,16 +187,6 @@ rte_lpm_create(const char *name, int socket_id,
struct rte_lpm *
rte_lpm_find_existing(const char *name);
-/**
- * Free an LPM object.
- *
- * @param lpm
- * LPM object handle
- * If lpm is NULL, no operation is performed.
- */
-void
-rte_lpm_free(struct rte_lpm *lpm);
-
/**
* Associate RCU QSBR variable with an LPM object.
*
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index 079187ca56..08b5618613 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -34,6 +34,16 @@ struct rte_lpm6_config {
int flags; /**< This field is currently unused. */
};
+/**
+ * Free an LPM object.
+ *
+ * @param lpm
+ * LPM object handle
+ * If lpm is NULL, no operation is performed.
+ */
+void
+rte_lpm6_free(struct rte_lpm6 *lpm);
+
/**
* Create an LPM object.
*
@@ -55,7 +65,8 @@ struct rte_lpm6_config {
*/
struct rte_lpm6 *
rte_lpm6_create(const char *name, int socket_id,
- const struct rte_lpm6_config *config);
+ const struct rte_lpm6_config *config)
+ __rte_malloc __rte_dealloc(rte_lpm6_free, 1);
/**
* Find an existing LPM object and return a pointer to it.
@@ -70,16 +81,6 @@ rte_lpm6_create(const char *name, int socket_id,
struct rte_lpm6 *
rte_lpm6_find_existing(const char *name);
-/**
- * Free an LPM object.
- *
- * @param lpm
- * LPM object handle
- * If lpm is NULL, no operation is performed.
- */
-void
-rte_lpm6_free(struct rte_lpm6 *lpm);
-
/**
* Add a rule to the LPM table.
*
--
2.45.2
[PATCH v2 05/15] pipeline: add allocation function attributes
Use function attributes to catch cases where pipeline is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/pipeline/rte_port_in_action.h | 55 ---
lib/pipeline/rte_table_action.h | 53 +++--
2 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/lib/pipeline/rte_port_in_action.h
b/lib/pipeline/rte_port_in_action.h
index 9d17bae988..ee6cc59fae 100644
--- a/lib/pipeline/rte_port_in_action.h
+++ b/lib/pipeline/rte_port_in_action.h
@@ -164,18 +164,6 @@ struct rte_port_in_action_lb_params {
*/
struct rte_port_in_action_profile;
-/**
- * Input port action profile create.
- *
- * @param[in] socket_id
- * CPU socket ID for the internal data structures memory allocation.
- * @return
- * Input port action profile handle on success, NULL otherwise.
- */
-__rte_experimental
-struct rte_port_in_action_profile *
-rte_port_in_action_profile_create(uint32_t socket_id);
-
/**
* Input port action profile free.
*
@@ -189,6 +177,19 @@ __rte_experimental
int
rte_port_in_action_profile_free(struct rte_port_in_action_profile *profile);
+/**
+ * Input port action profile create.
+ *
+ * @param[in] socket_id
+ * CPU socket ID for the internal data structures memory allocation.
+ * @return
+ * Input port action profile handle on success, NULL otherwise.
+ */
+__rte_experimental
+struct rte_port_in_action_profile *
+rte_port_in_action_profile_create(uint32_t socket_id)
+ __rte_malloc __rte_dealloc(rte_port_in_action_profile_free, 1);
+
/**
* Input port action profile action register.
*
@@ -236,6 +237,19 @@ rte_port_in_action_profile_freeze(struct
rte_port_in_action_profile *profile);
*/
struct rte_port_in_action;
+/**
+ * Input port action free.
+ *
+ * @param[in] action
+ * Handle to input port action object (needs to be valid).
+ * If action is NULL, no operation is performed.
+ * @return
+ * Always zero.
+ */
+__rte_experimental
+int
+rte_port_in_action_free(struct rte_port_in_action *action);
+
/**
* Input port action create.
*
@@ -252,21 +266,8 @@ struct rte_port_in_action;
*/
__rte_experimental
struct rte_port_in_action *
-rte_port_in_action_create(struct rte_port_in_action_profile *profile,
- uint32_t socket_id);
-
-/**
- * Input port action free.
- *
- * @param[in] action
- * Handle to input port action object (needs to be valid).
- * If action is NULL, no operation is performed.
- * @return
- * Always zero.
- */
-__rte_experimental
-int
-rte_port_in_action_free(struct rte_port_in_action *action);
+rte_port_in_action_create(struct rte_port_in_action_profile *profile, uint32_t
socket_id)
+ __rte_malloc __rte_dealloc(rte_port_in_action_free, 1);
/**
* Input port params get.
diff --git a/lib/pipeline/rte_table_action.h b/lib/pipeline/rte_table_action.h
index 47a7bdfc01..e8b4d8b33d 100644
--- a/lib/pipeline/rte_table_action.h
+++ b/lib/pipeline/rte_table_action.h
@@ -54,6 +54,7 @@
#include
+#include
#include
#include
#include
@@ -812,17 +813,6 @@ struct rte_table_action_decap_params {
*/
struct rte_table_action_profile;
-/**
- * Table action profile create.
- *
- * @param[in] common
- * Common action configuration.
- * @return
- * Table action profile handle on success, NULL otherwise.
- */
-__rte_experimental
-struct rte_table_action_profile *
-rte_table_action_profile_create(struct rte_table_action_common_config *common);
/**
* Table action profile free.
@@ -836,6 +826,19 @@ __rte_experimental
int
rte_table_action_profile_free(struct rte_table_action_profile *profile);
+/**
+ * Table action profile create.
+ *
+ * @param[in] common
+ * Common action configuration.
+ * @return
+ * Table action profile handle on success, NULL otherwise.
+ */
+__rte_experimental
+struct rte_table_action_profile *
+rte_table_action_profile_create(struct rte_table_action_common_config *common)
+ __rte_malloc __rte_dealloc(rte_table_action_profile_free, 1);
+
/**
* Table action profile action register.
*
@@ -881,6 +884,18 @@ rte_table_action_profile_freeze(struct
rte_table_action_profile *profile);
*/
struct rte_table_action;
+/**
+ * Table action free.
+ *
+ * @param[in] action
+ * Handle to table action object (needs to be valid).
+ * @return
+ * Zero on success, non-zero error code otherwise.
+ */
+__rte_experimental
+int
+rte_table_action_free(struct rte_table_action *action);
+
/**
* Table action create.
*
@@ -898,20 +913,8 @@ struct rte_table_action;
*/
__rte_experimental
struct rte_table_action *
-rte_table_action_create(struct rte_table_action_profile *profile,
- uint32_t socket_id);
-
-/**
- * Table action free.
- *
- * @param[in] action
- * Handle to table action object (needs to be valid).
- * @return
- * Zero on success, non-zero error code otherwise.
- */
-__rte_experimental
-int
-rte_table_action_free(struct rte_table_action *action);
+rte_table_action_create(struct rte_table_action_profile *p
[PATCH v2 06/15] acl: add allocation function attributes
Use function attributes to catch cases where acl table is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/acl/rte_acl.h | 26 +++---
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/lib/acl/rte_acl.h b/lib/acl/rte_acl.h
index ca75a6f220..b95f8778c3 100644
--- a/lib/acl/rte_acl.h
+++ b/lib/acl/rte_acl.h
@@ -133,6 +133,19 @@ struct rte_acl_param {
};
+/** @internal opaque ACL handle */
+struct rte_acl_ctx;
+
+/**
+ * De-allocate all memory used by ACL context.
+ *
+ * @param ctx
+ * ACL context to free
+ * If ctx is NULL, no operation is performed.
+ */
+void
+rte_acl_free(struct rte_acl_ctx *ctx);
+
/**
* Create a new ACL context.
*
@@ -145,7 +158,8 @@ struct rte_acl_param {
* - EINVAL - invalid parameter passed to function
*/
struct rte_acl_ctx *
-rte_acl_create(const struct rte_acl_param *param);
+rte_acl_create(const struct rte_acl_param *param)
+ __rte_malloc __rte_dealloc(rte_acl_free, 1);
/**
* Find an existing ACL context object and return a pointer to it.
@@ -160,16 +174,6 @@ rte_acl_create(const struct rte_acl_param *param);
struct rte_acl_ctx *
rte_acl_find_existing(const char *name);
-/**
- * De-allocate all memory used by ACL context.
- *
- * @param ctx
- * ACL context to free
- * If ctx is NULL, no operation is performed.
- */
-void
-rte_acl_free(struct rte_acl_ctx *ctx);
-
/**
* Add rules to an existing ACL context.
* This function is not multi-thread safe.
--
2.45.2
[PATCH v2 08/15] member: add allocation function attributes
Use function attributes to catch cases where member table is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/member/rte_member.h | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index 109bdd000b..0235bb0a81 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -341,6 +341,16 @@ struct __rte_cache_aligned rte_member_parameters {
struct rte_member_setsum *
rte_member_find_existing(const char *name);
+/**
+ * De-allocate memory used by set-summary.
+ *
+ * @param setsum
+ * Pointer to the set summary.
+ * If setsum is NULL, no operation is performed.
+ */
+void
+rte_member_free(struct rte_member_setsum *setsum);
+
/**
* Create set-summary (SS).
*
@@ -351,7 +361,8 @@ rte_member_find_existing(const char *name);
* Return value is NULL if the creation failed.
*/
struct rte_member_setsum *
-rte_member_create(const struct rte_member_parameters *params);
+rte_member_create(const struct rte_member_parameters *params)
+ __rte_malloc __rte_dealloc(rte_member_free, 1);
/**
* Lookup key in set-summary (SS).
@@ -528,17 +539,6 @@ int
rte_member_report_heavyhitter(const struct rte_member_setsum *setsum,
void **keys, uint64_t *counts);
-
-/**
- * De-allocate memory used by set-summary.
- *
- * @param setsum
- * Pointer to the set summary.
- * If setsum is NULL, no operation is performed.
- */
-void
-rte_member_free(struct rte_member_setsum *setsum);
-
/**
* Reset the set-summary tables. E.g. reset bits to be 0 in BF,
* reset set_id in each entry to be RTE_MEMBER_NO_MATCH in HT based SS.
--
2.45.2
[PATCH v2 10/15] eventdev: add allocation function attributes
Use function attributes to catch cases where eventdev is allocated but not freed correctly. Signed-off-by: Stephen Hemminger --- lib/eventdev/rte_event_ring.h | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h index 5769da269e..a8f308e4d6 100644 --- a/lib/eventdev/rte_event_ring.h +++ b/lib/eventdev/rte_event_ring.h @@ -247,7 +247,18 @@ int rte_event_ring_init(struct rte_event_ring *r, const char *name, unsigned int count, unsigned int flags); -/* + +/** + * De-allocate all memory used by the ring. + * + * @param r + * Pointer to ring to created with rte_event_ring_create(). + * If r is NULL, no operation is performed. + */ +void +rte_event_ring_free(struct rte_event_ring *r); + +/** * Create an event ring structure * * This function allocates memory and initializes an event ring inside that @@ -288,8 +299,8 @@ rte_event_ring_init(struct rte_event_ring *r, const char *name, *- ENOMEM - no appropriate memory area found in which to create memzone */ struct rte_event_ring * -rte_event_ring_create(const char *name, unsigned int count, int socket_id, - unsigned int flags); +rte_event_ring_create(const char *name, unsigned int count, int socket_id, unsigned int flags) + __rte_malloc __rte_dealloc(rte_event_ring_free, 1); /** * Search for an event ring based on its name @@ -304,16 +315,6 @@ rte_event_ring_create(const char *name, unsigned int count, int socket_id, struct rte_event_ring * rte_event_ring_lookup(const char *name); -/** - * De-allocate all memory used by the ring. - * - * @param r - * Pointer to ring to created with rte_event_ring_create(). - * If r is NULL, no operation is performed. - */ -void -rte_event_ring_free(struct rte_event_ring *r); - /** * Return the size of the event ring. * -- 2.45.2
Re: [PATCH v3 3/7] dts: infer use first core without config
Reviewed-by: Nicholas Pratte On Wed, Jan 15, 2025 at 9:19 AM Luca Vizzarro wrote: > > From: Nicholas Pratte > > To further the simplification of the user configuration, use_first_core > can be inferred from the lcores. If the user explicitly includes the > core 0 in the lcores range, it will only then be used. > > Bugzilla ID: 1360 > > Signed-off-by: Nicholas Pratte > Signed-off-by: Luca Vizzarro > Reviewed-by: Paul Szczepanek > --- > dts/conf.yaml | 3 +-- > dts/framework/config/__init__.py| 19 --- > dts/framework/testbed_model/node.py | 9 + > 3 files changed, 22 insertions(+), 9 deletions(-) > > diff --git a/dts/conf.yaml b/dts/conf.yaml > index 4b6965b3d7..c93eedbc94 100644 > --- a/dts/conf.yaml > +++ b/dts/conf.yaml > @@ -40,8 +40,7 @@ nodes: > hostname: sut1.change.me.localhost > user: dtsuser > os: linux > -lcores: "" # use all the available logical cores > -use_first_core: false # tells DPDK to use any physical core > +lcores: "" # use all available logical cores (Skips first core) > memory_channels: 4 # tells DPDK to use 4 memory channels > hugepages_2mb: # optional; if removed, will use system hugepage > configuration > number_of: 256 > diff --git a/dts/framework/config/__init__.py > b/dts/framework/config/__init__.py > index 3fa8f4fa8f..5dfa0cf0d4 100644 > --- a/dts/framework/config/__init__.py > +++ b/dts/framework/config/__init__.py > @@ -138,12 +138,12 @@ class > ScapyTrafficGeneratorConfig(TrafficGeneratorConfig): > #: A union type discriminating traffic generators by the `type` field. > TrafficGeneratorConfigTypes = Annotated[ScapyTrafficGeneratorConfig, > Field(discriminator="type")] > > -#: Comma-separated list of logical cores to use. An empty string means use > all lcores. > +#: Comma-separated list of logical cores to use. An empty string or > ```any``` means use all lcores. > LogicalCores = Annotated[ > str, > Field( > -examples=["1,2,3,4,5,18-22", "10-15"], > -pattern=r"^(([0-9]+|([0-9]+-[0-9]+))(,([0-9]+|([0-9]+-[0-9]+)))*)?$", > +examples=["1,2,3,4,5,18-22", "10-15", "any"], > + > pattern=r"^(([0-9]+|([0-9]+-[0-9]+))(,([0-9]+|([0-9]+-[0-9]+)))*)?$|any", > ), > ] > > @@ -161,15 +161,20 @@ class NodeConfiguration(FrozenModel): > password: str | None = None > #: The operating system of the > :class:`~framework.testbed_model.node.Node`. > os: OS > -#: A comma delimited list of logical cores to use when running DPDK. > -lcores: LogicalCores = "1" > -#: If :data:`True`, the first logical core won't be used. > -use_first_core: bool = False > +#: A comma delimited list of logical cores to use when running DPDK. > ```any```, an empty > +#: string or omitting this field means use any core except for the first > one. The first core > +#: will only be used if explicitly set. > +lcores: LogicalCores = "" > #: An optional hugepage configuration. > hugepages: HugepageConfiguration | None = Field(None, > alias="hugepages_2mb") > #: The ports that can be used in testing. > ports: list[PortConfig] = Field(min_length=1) > > +@property > +def use_first_core(self) -> bool: > +"""Returns :data:`True` if `lcores` explicitly selects the first > core.""" > +return "0" in self.lcores > + > > class SutNodeConfiguration(NodeConfiguration): > """:class:`~framework.testbed_model.sut_node.SutNode` specific > configuration.""" > diff --git a/dts/framework/testbed_model/node.py > b/dts/framework/testbed_model/node.py > index 08328ee482..b08b1cf14d 100644 > --- a/dts/framework/testbed_model/node.py > +++ b/dts/framework/testbed_model/node.py > @@ -91,6 +91,15 @@ def __init__(self, node_config: NodeConfiguration): > self.lcores, LogicalCoreList(self.config.lcores) > ).filter() > > +if LogicalCore(lcore=0, core=0, socket=0, node=0) in self.lcores: > +self._logger.info( > +""" > +WARNING: First core being used; > +using the first core is considered risky and should only > +be done by advanced users. > +""" > +) > + > self._other_sessions = [] > self._init_ports() > > -- > 2.43.0 >
RE: [PATCH v2] common/cnxk: fix atomic load in batch ops
> -Original Message-
> From: Nawal Kishor
> Sent: Monday, December 2, 2024 10:28 PM
> To: dev@dpdk.org; Nithin Kumar Dabilpuram ;
> Kiran Kumar Kokkilagadda ; Sunil Kumar Kori
> ; Satha Koteswara Rao Kottidi
> ; Harman Kalra ; Ashwin
> Sekhar T K ; Jerin Jacob
> Cc: Nawal Kishor
> Subject: [PATCH v2] common/cnxk: fix atomic load in batch ops
>
> In roc batch alloc wait code, __ATOMIC_RELAXED is changed to
> __ATOMIC_ACQUIRE in order to avoid potential out of order loads.
>
> Fixes: 50d08d3934ec ("common/cnxk: fix batch alloc completion poll logic")
>
> Signed-off-by: Nawal Kishor
Fixed the following issues and applied to dpdk-next-net-mrvl/for-main. Thanks
Is it candidate for Cc: sta...@dpdk.org backport?
common/cnxk: fix atomic load in batch ops
Contributor name/email mismatch with .mailmap:
Nawal Kishor is unknown in .mailmap
> ---
> v2: Fixed review comments
>
> drivers/common/cnxk/roc_npa.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h
> index f7cb4460e7..8525038810 100644
> --- a/drivers/common/cnxk/roc_npa.h
> +++ b/drivers/common/cnxk/roc_npa.h
> @@ -255,7 +255,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line,
> unsigned int wait_us)
> /* Batch alloc status code is updated in bits [5:6] of the first word
>* of the 128 byte cache line.
>*/
> - while (((__atomic_load_n(cache_line, __ATOMIC_RELAXED) >> 5) &
> 0x3) ==
> + while (((__atomic_load_n(cache_line, __ATOMIC_ACQUIRE) >> 5) &
> 0x3) ==
> ALLOC_CCODE_INVAL)
> if (wait_us && (plt_tsc_cycles() - start) >= ticks)
> break;
> --
> 2.34.1
[PATCH v2 09/15] mempool: add allocation function attributes
Use function attributes to catch cases where mempool is allocated but not freed correctly. Signed-off-by: Stephen Hemminger --- lib/mempool/rte_mempool.h | 37 - 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 7bdc92b812..c495cc012f 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -1012,6 +1012,20 @@ typedef void (rte_mempool_mem_cb_t)(struct rte_mempool *mp, */ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); +/** + * Free a mempool + * + * Unlink the mempool from global list, free the memory chunks, and all + * memory referenced by the mempool. The objects must not be used by + * other cores as they will be freed. + * + * @param mp + * A pointer to the mempool structure. + * If NULL then, the function does nothing. + */ +void +rte_mempool_free(struct rte_mempool *mp); + /** * Create a new mempool named *name* in memory. * @@ -1095,7 +1109,8 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, unsigned cache_size, unsigned private_data_size, rte_mempool_ctor_t *mp_init, void *mp_init_arg, rte_mempool_obj_cb_t *obj_init, void *obj_init_arg, - int socket_id, unsigned flags); + int socket_id, unsigned int flags) + __rte_malloc __rte_dealloc(rte_mempool_free, 1); /** * Create an empty mempool @@ -1132,22 +1147,10 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, * with rte_errno set appropriately. See rte_mempool_create() for details. */ struct rte_mempool * -rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, - unsigned cache_size, unsigned private_data_size, - int socket_id, unsigned flags); -/** - * Free a mempool - * - * Unlink the mempool from global list, free the memory chunks, and all - * memory referenced by the mempool. The objects must not be used by - * other cores as they will be freed. - * - * @param mp - * A pointer to the mempool structure. - * If NULL then, the function does nothing. - */ -void -rte_mempool_free(struct rte_mempool *mp); +rte_mempool_create_empty(const char *name, unsigned int n, unsigned int elt_size, +unsigned int cache_size, unsigned int private_data_size, +int socket_id, unsigned int flags) + __rte_malloc __rte_dealloc(rte_mempool_free, 1); /** * Add physically contiguous memory for objects in the pool at init -- 2.45.2
[PATCH v2 11/15] ring: add allocation function attributes
Use function attributes to catch cases where ring is allocated but not freed correctly. Signed-off-by: Stephen Hemminger --- lib/ring/rte_ring.h | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h index 63a71d5871..15340a1981 100644 --- a/lib/ring/rte_ring.h +++ b/lib/ring/rte_ring.h @@ -119,6 +119,16 @@ ssize_t rte_ring_get_memsize(unsigned int count); int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, unsigned int flags); + +/** + * De-allocate all memory used by the ring. + * + * @param r + * Ring to free. + * If NULL then, the function does nothing. + */ +void rte_ring_free(struct rte_ring *r); + /** * Create a new ring named *name* in memory. * @@ -183,16 +193,8 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, *- ENOMEM - no appropriate memory area found in which to create memzone */ struct rte_ring *rte_ring_create(const char *name, unsigned int count, -int socket_id, unsigned int flags); - -/** - * De-allocate all memory used by the ring. - * - * @param r - * Ring to free. - * If NULL then, the function does nothing. - */ -void rte_ring_free(struct rte_ring *r); +int socket_id, unsigned int flags) + __rte_malloc __rte_dealloc(rte_ring_free, 1); /** * Dump the status of the ring to a file. -- 2.45.2
[PATCH v2 14/15] telemetry: add allocation function attributes
Use function attributes to catch cases where telemetry data is allocated but not freed correctly. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- lib/telemetry/rte_telemetry.h | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h index 2ccfc73a5f..c4554e4028 100644 --- a/lib/telemetry/rte_telemetry.h +++ b/lib/telemetry/rte_telemetry.h @@ -414,16 +414,6 @@ __rte_experimental int rte_telemetry_register_cmd_arg(const char *cmd, telemetry_arg_cb fn, void *arg, const char *help); -/** - * Get a pointer to a container with memory allocated. The container is to be - * used embedded within an existing telemetry dict/array. - * - * @return - * Pointer to a container. - */ -struct rte_tel_data * -rte_tel_data_alloc(void); - /** * @internal * Free a container that has memory allocated. @@ -435,6 +425,17 @@ rte_tel_data_alloc(void); void rte_tel_data_free(struct rte_tel_data *data); +/** + * Get a pointer to a container with memory allocated. The container is to be + * used embedded within an existing telemetry dict/array. + * + * @return + * Pointer to a container. + */ +struct rte_tel_data * +rte_tel_data_alloc(void) + __rte_malloc __rte_dealloc(rte_tel_data_free, 1); + #ifdef __cplusplus } #endif -- 2.45.2
[PATCH v2 12/15] reorder: add allocation function attributes
Use function attributes to catch cases where reorder table is allocated but not freed correctly. Signed-off-by: Stephen Hemminger Acked-by: Volodymyr Fialko --- lib/reorder/rte_reorder.h | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/reorder/rte_reorder.h b/lib/reorder/rte_reorder.h index 56a6507f9f..2f26ed7df3 100644 --- a/lib/reorder/rte_reorder.h +++ b/lib/reorder/rte_reorder.h @@ -44,6 +44,16 @@ rte_reorder_seqn(struct rte_mbuf *mbuf) rte_reorder_seqn_t *); } +/** + * Free reorder buffer instance. + * + * @param b + * Pointer to reorder buffer instance. + * If b is NULL, no operation is performed. + */ +void +rte_reorder_free(struct rte_reorder_buffer *b); + /** * Create a new reorder buffer instance * @@ -64,7 +74,8 @@ rte_reorder_seqn(struct rte_mbuf *mbuf) *- EINVAL - invalid parameters */ struct rte_reorder_buffer * -rte_reorder_create(const char *name, unsigned socket_id, unsigned int size); +rte_reorder_create(const char *name, unsigned int socket_id, unsigned int size) + __rte_malloc __rte_dealloc(rte_reorder_free, 1); /** * Initializes given reorder buffer instance @@ -111,16 +122,6 @@ rte_reorder_find_existing(const char *name); void rte_reorder_reset(struct rte_reorder_buffer *b); -/** - * Free reorder buffer instance. - * - * @param b - * Pointer to reorder buffer instance. - * If b is NULL, no operation is performed. - */ -void -rte_reorder_free(struct rte_reorder_buffer *b); - /** * Insert given mbuf in reorder buffer in its correct position * -- 2.45.2
[PATCH v2 13/15] compressdev: add allocation function attributes
Use function attributes to catch cases where compressdev is allocated
but not freed correctly.
Signed-off-by: Stephen Hemminger
---
lib/compressdev/rte_comp.h | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index d66a4b1cb9..f86e773b28 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -480,6 +480,19 @@ struct __rte_cache_aligned rte_comp_op {
*/
};
+
+/**
+ * Free operation structure
+ * If operation has been allocate from a rte_mempool, then the operation will
+ * be returned to the mempool.
+ *
+ * @param op
+ * Compress operation pointer allocated from rte_comp_op_alloc()
+ * If op is NULL, no operation is performed.
+ */
+void
+rte_comp_op_free(struct rte_comp_op *op);
+
/**
* Creates an operation pool
*
@@ -501,7 +514,8 @@ struct __rte_cache_aligned rte_comp_op {
struct rte_mempool *
rte_comp_op_pool_create(const char *name,
unsigned int nb_elts, unsigned int cache_size,
- uint16_t user_size, int socket_id);
+ uint16_t user_size, int socket_id)
+ __rte_malloc __rte_dealloc(rte_comp_op_free, 1);
/**
* Allocate an operation from a mempool with default parameters set
@@ -533,18 +547,6 @@ int
rte_comp_op_bulk_alloc(struct rte_mempool *mempool,
struct rte_comp_op **ops, uint16_t nb_ops);
-/**
- * Free operation structure
- * If operation has been allocate from a rte_mempool, then the operation will
- * be returned to the mempool.
- *
- * @param op
- * Compress operation pointer allocated from rte_comp_op_alloc()
- * If op is NULL, no operation is performed.
- */
-void
-rte_comp_op_free(struct rte_comp_op *op);
-
/**
* Bulk free operation structures
* If operations have been allocated from an rte_mempool, then the operations
--
2.45.2
Re: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number
On Wed, Jan 22, 2025 at 04:12:49PM +, Bruce Richardson wrote: > On Wed, Nov 27, 2024 at 05:53:57PM -0800, Andre Muezerie wrote: > > MSVC issues the warnings below: > > > > 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<': > > result of 32-bit shift implicitly converted to 64 bits > > (was 64-bit shift intended?) > > > > The code would be better off by using 64 bit numbers to begin with. > > That eliminates the need for a conversion to 64 bits later. > > > > 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<': > > result of 32-bit shift implicitly converted to 64 bits > > (was 64-bit shift intended?) > > > > 1ULL should be used as the result of the bit shift gets multiplied > > by sizeof(uint32_t). > > > > Signed-off-by: Andre Muezerie > > --- > > Acked-by: Bruce Richardson > > > lib/hash/rte_thash.c | 2 +- > > lib/hash/rte_thash_gf2_poly_math.c | 6 +++--- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c > > index fa78787143..f076311b57 100644 > > --- a/lib/hash/rte_thash.c > > +++ b/lib/hash/rte_thash.c > > @@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const > > char *name, uint32_t len, > > offset; > > > > ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) + > > - sizeof(uint32_t) * (1 << ctx->reta_sz_log), > > + sizeof(uint32_t) * (1ULL << ctx->reta_sz_log), > > RTE_CACHE_LINE_SIZE); > > Is there a reason not to use RTE_BIT64 here too? Here we are calculating the size to be passed to the second argument of rte_zmalloc, which is of type size_t. size_t is implementation dependent, typically 4 bytes on 32-bit systems and 8 bytes on 64-bit systems, so using 1ULL seems more appropriate.
Re: [v25,13/13] compress/zsda: add zsda compressdev capabilities
Hi, Akhil:
There are warning and some errors in the patches.
The warning is
>_coding style issues_
>
>
>__rte_packed_begin and __rte_packed_end should always be used in pairs.
And the context in the patch is：
> struct __rte_packed_begin zsda_admin_req {
> uint16_t msg_type;
> uint8_t data[26];
>@@ -105,10 +114,30 @@ struct zsda_qp_stat {
> uint64_t dequeue_err_count;
> };
It's the locating information for the modified code.
So, the warning may be caused by a bug of checkpatches.sh
The errors are:
> ci/loongarch-unit-testing failUnit Testing FAIL
> 43/119 DPDK:fast-tests / eventdev_selftest_swTIMEOUT
> 80.08s exit status -15
and
>
>
>
> Not Found
>
>
> Not FoundThe requested resource was not found on this
> server.
>
>
For the both errors, I have no idea about the cause of the problem and how to
solve it.
I even don't modify the code about eventdev.
Thanks.
RE: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on cn20k
-Original Message- From: Jerin Jacob Sent: Wednesday, January 22, 2025 6:04 PM To: Satheesh Paul Antonysamy ; Nithin Kumar Dabilpuram ; Kiran Kumar Kokkilagadda ; Sunil Kumar Kori ; Satha Koteswara Rao Kottidi ; Harman Kalra Cc: dev@dpdk.org; Satheesh Paul Antonysamy Subject: RE: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on cn20k > -Original Message- > From: psathe...@marvell.com > Sent: Tuesday, November 12, 2024 3:29 PM > To: Nithin Kumar Dabilpuram ; Kiran Kumar > Kokkilagadda ; Sunil Kumar Kori > ; Satha Koteswara Rao Kottidi > ; Harman Kalra > Cc: dev@dpdk.org; Satheesh Paul Antonysamy > Subject: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte > flow on cn20k > > From: Satheesh Paul Support for rte flow in cn20k. > Signed-off-by: Satheesh Paul Reviewed-by: > Kiran Kumar K --- > drivers/net/cnxk/cn10k_flow. c | 227 > ++--- > From: Satheesh Paul > > Support for rte flow in cn20k. > > Signed-off-by: Satheesh Paul > Reviewed-by: Kiran Kumar K 1)Fix https://mails.dpdk.org/archives/test-report/2024-November/823929.html This checkpatch warning is a false alarm. 2) Please rebase t Ack. [for-main]dell[dpdk-next-net-mrvl] $ git pw series apply 33903 Failed to apply patch: Applying: common/cnxk: support NPC flow on cn20k Using index info to reconstruct a base tree... M drivers/common/cnxk/roc_mbox.h M drivers/common/cnxk/roc_npc.h M drivers/common/cnxk/roc_npc_mcam_dump.c M drivers/common/cnxk/version.map Falling back to patching base and 3-way merge... Auto-merging drivers/common/cnxk/version.map Auto-merging drivers/common/cnxk/roc_npc_mcam_dump.c CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_npc_mcam_dump.c Auto-merging drivers/common/cnxk/roc_npc.h Auto-merging drivers/common/cnxk/roc_mbox.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config set advice.mergeConflict false" Patch failed at 0001 common/cnxk: support NPC flow on cn20k
Re: [PATCH v6 01/15] net/xsc: add xsc PMD framework
On 2025/1/22 21:39, Thomas Monjalon wrote: >> +Yunsilicon xsc >> +M: WanRenyong >> +M: Na Na >> +M: Rong Qian >> +M: Xiaoxiong Zhang >> +M: Dongwei Xu > Looking at how the names are codified in email addresses, > I feel "Renyong Wan" is the right form for your name in English format. > > Hello Tomas Monjalon, Yes, you are right, but if I use "Renyong Wan" as my English name, every patch alway gets a misspelling warning from checkpatch. :( It's really annoying. If it isn't unacceptable to DPDK for using "WanRenyong" as my name, I don't mind of it too. Thank your for review. -- Best regards, WanRenyong
[dpdk-dev] [PATCH v4 2/2] net/cnxk: support rte flow on cn20k
From: Satheesh Paul
Support for rte flow in cn20k.
Signed-off-by: Satheesh Paul
Reviewed-by: Kiran Kumar K
---
drivers/net/cnxk/cn10k_flow.c | 227 ++---
drivers/net/cnxk/cn10k_flow.h | 10 +-
drivers/net/cnxk/cn20k_ethdev.c| 4 +
drivers/net/cnxk/cn20k_flow.c | 101 +++
drivers/net/cnxk/cn20k_flow.h | 21 +++
drivers/net/cnxk/cn9k_flow.c | 2 +-
drivers/net/cnxk/cnxk_ethdev_devargs.c | 10 +-
drivers/net/cnxk/cnxk_flow.c | 18 +-
drivers/net/cnxk/cnxk_flow.h | 5 +-
drivers/net/cnxk/cnxk_flow_common.c| 214 +++
drivers/net/cnxk/cnxk_flow_common.h| 19 +++
drivers/net/cnxk/meson.build | 2 +
12 files changed, 396 insertions(+), 237 deletions(-)
create mode 100644 drivers/net/cnxk/cn20k_flow.c
create mode 100644 drivers/net/cnxk/cn20k_flow.h
create mode 100644 drivers/net/cnxk/cnxk_flow_common.c
create mode 100644 drivers/net/cnxk/cnxk_flow_common.h
diff --git a/drivers/net/cnxk/cn10k_flow.c b/drivers/net/cnxk/cn10k_flow.c
index db5e427362..b95fb83f08 100644
--- a/drivers/net/cnxk/cn10k_flow.c
+++ b/drivers/net/cnxk/cn10k_flow.c
@@ -1,215 +1,29 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(C) 2020 Marvell.
*/
-#include "cn10k_flow.h"
+
#include "cn10k_ethdev.h"
#include "cn10k_rx.h"
#include "cnxk_ethdev_mcs.h"
+#include "cnxk_flow_common.h"
+#include
#include
-static int
-cn10k_mtr_connect(struct rte_eth_dev *eth_dev, uint32_t mtr_id)
-{
- return nix_mtr_connect(eth_dev, mtr_id);
-}
-
-static int
-cn10k_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t mtr_id)
-{
- struct rte_mtr_error mtr_error;
-
- return nix_mtr_destroy(eth_dev, mtr_id, &mtr_error);
-}
-
-static int
-cn10k_mtr_configure(struct rte_eth_dev *eth_dev,
- const struct rte_flow_action actions[])
-{
- uint32_t mtr_id = 0x, prev_mtr_id = 0x, next_mtr_id = 0x;
- const struct rte_flow_action_meter *mtr_conf;
- const struct rte_flow_action_queue *q_conf;
- const struct rte_flow_action_rss *rss_conf;
- struct cnxk_mtr_policy_node *policy;
- bool is_mtr_act = false;
- int tree_level = 0;
- int rc = -EINVAL, i;
-
- for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
- if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
- mtr_conf = (const struct rte_flow_action_meter
- *)(actions[i].conf);
- mtr_id = mtr_conf->mtr_id;
- is_mtr_act = true;
- }
- if (actions[i].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
- q_conf = (const struct rte_flow_action_queue
- *)(actions[i].conf);
- if (is_mtr_act)
- nix_mtr_rq_update(eth_dev, mtr_id, 1,
- &q_conf->index);
- }
- if (actions[i].type == RTE_FLOW_ACTION_TYPE_RSS) {
- rss_conf = (const struct rte_flow_action_rss
- *)(actions[i].conf);
- if (is_mtr_act)
- nix_mtr_rq_update(eth_dev, mtr_id,
- rss_conf->queue_num,
- rss_conf->queue);
- }
- }
-
- if (!is_mtr_act)
- return rc;
-
- prev_mtr_id = mtr_id;
- next_mtr_id = mtr_id;
- while (next_mtr_id != 0x) {
- rc = nix_mtr_validate(eth_dev, next_mtr_id);
- if (rc)
- return rc;
-
- rc = nix_mtr_policy_act_get(eth_dev, next_mtr_id, &policy);
- if (rc)
- return rc;
-
- rc = nix_mtr_color_action_validate(eth_dev, mtr_id,
- &prev_mtr_id, &next_mtr_id,
- policy, &tree_level);
- if (rc)
- return rc;
- }
-
- return nix_mtr_configure(eth_dev, mtr_id);
-}
-
-static int
-cn10k_rss_action_validate(struct rte_eth_dev *eth_dev,
- const struct rte_flow_attr *attr,
- const struct rte_flow_action *act)
-{
- const struct rte_flow_action_rss *rss;
-
- if (act == NULL)
- return -EINVAL;
-
- rss = (const struct rte_flow_action_rss *)act->conf;
-
- if (attr->egress) {
- plt_err("No support of RSS in egress");
- return -EINVAL;
- }
-
- if (eth_dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_RSS) {
- plt_err("multi-queue mode is disabled");
- return -ENOTSUP;
- }
-
- if (!rss || !r
[dpdk-dev] [PATCH v4 1/2] common/cnxk: support NPC flow on cn20k
From: Satheesh Paul
ROC changes to support NPC flow on cn20k.
Signed-off-by: Satheesh Paul
Reviewed-by: Kiran Kumar K
---
v2:
* Fixed generic platform compiler error.
v3:
* Removed compile time macros.
v4:
* Rebased the patches.
drivers/common/cnxk/roc_mbox.h | 144 +-
drivers/common/cnxk/roc_nix.h | 18 +-
drivers/common/cnxk/roc_nix_mcast.c | 40 +-
drivers/common/cnxk/roc_nix_vlan.c | 66 ++-
drivers/common/cnxk/roc_npc.c | 58 ++-
drivers/common/cnxk/roc_npc.h | 59 ++-
drivers/common/cnxk/roc_npc_mcam.c | 602 +++-
drivers/common/cnxk/roc_npc_mcam_dump.c | 279 +--
drivers/common/cnxk/roc_npc_priv.h | 91 ++--
drivers/common/cnxk/roc_npc_utils.c | 340 ++---
drivers/common/cnxk/version.map | 1 +
11 files changed, 1325 insertions(+), 373 deletions(-)
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index f362d55bc2..ab19387330 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -244,6 +244,22 @@ struct mbox_msghdr {
npc_get_field_hash_info_req, npc_get_field_hash_info_rsp)\
M(NPC_MCAM_GET_HIT_STATUS, 0x6015, npc_mcam_get_hit_status,\
npc_mcam_get_hit_status_req, npc_mcam_get_hit_status_rsp)\
+ M(NPC_MCAM_DEFRAG, 0x6016, npc_defrag, msg_req, msg_rsp) \
+ M(NPC_CN20K_GET_KEX_CFG, 0x6017, npc_cn20k_get_kex_cfg, msg_req, \
+ npc_cn20k_get_kex_cfg_rsp) \
+ M(NPC_CN20K_MCAM_GET_FREE_COUNT, 0x6018, npc_cn20k_get_free_count, \
+ msg_req, npc_cn20k_get_free_count_rsp) \
+ M(NPC_CN20K_MCAM_WRITE_ENTRY, 0x6019, npc_cn20k_mcam_write_entry,\
+ npc_cn20k_mcam_write_entry_req, msg_rsp) \
+ M(NPC_CN20K_MCAM_ALLOC_AND_WRITE_ENTRY, 0x601a,\
+ npc_cn20k_mcam_alloc_and_write_entry,\
+ npc_cn20k_mcam_alloc_and_write_entry_req,\
+ npc_mcam_alloc_and_write_entry_rsp) \
+ M(NPC_CN20K_MCAM_READ_ENTRY,0x601b, npc_cn20k_mcam_read_entry, \
+ npc_mcam_read_entry_req, npc_cn20k_mcam_read_entry_rsp) \
+ M(NPC_CN20K_MCAM_READ_BASE_RULE, 0x601c, \
+ npc_cn20k_read_base_steer_rule, msg_req, \
+ npc_cn20k_mcam_read_base_rule_rsp) \
/* NIX mbox IDs (range 0x8000 - 0x) */ \
M(NIX_LF_ALLOC, 0x8000, nix_lf_alloc, nix_lf_alloc_req,\
nix_lf_alloc_rsp)\
@@ -645,7 +661,7 @@ struct cgx_mac_addr_add_req {
*/
struct cgx_mac_addr_add_rsp {
struct mbox_msghdr hdr;
- uint8_t __io index;
+ uint32_t __io index;
};
/* Structure for requesting the operation to
@@ -653,7 +669,7 @@ struct cgx_mac_addr_add_rsp {
*/
struct cgx_mac_addr_del_req {
struct mbox_msghdr hdr;
- uint8_t __io index;
+ uint32_t __io index;
};
/* Structure for response against the operation to
@@ -661,7 +677,7 @@ struct cgx_mac_addr_del_req {
*/
struct cgx_max_dmac_entries_get_rsp {
struct mbox_msghdr hdr;
- uint8_t __io max_dmac_filters;
+ uint32_t __io max_dmac_filters;
};
struct cgx_link_user_info {
@@ -2485,6 +2501,14 @@ enum npc_af_status {
NPC_MCAM_ALLOC_FAILED = -703,
NPC_MCAM_PERM_DENIED = -704,
NPC_AF_ERR_HIGIG_CONFIG_FAIL = -705,
+ NPC_AF_ERR_HIGIG_NOT_SUPPORTED = -706,
+ NPC_FLOW_INTF_INVALID = -707,
+ NPC_FLOW_CHAN_INVALID = -708,
+ NPC_FLOW_NO_NIXLF = -709,
+ NPC_FLOW_NOT_SUPPORTED = -710,
+ NPC_FLOW_VF_PERM_DENIED = -711,
+ NPC_FLOW_VF_NOT_INIT = -712,
+ NPC_FLOW_VF_OVERLAP = -713,
};
struct npc_mcam_alloc_entry_req {
@@ -2494,9 +2518,12 @@ struct npc_mcam_alloc_entry_req {
#define NPC_MCAM_ANY_PRIO0
#define NPC_MCAM_LOWER_PRIO 1
#define NPC_MCAM_HIGHER_PRIO 2
- uint8_t __io priority; /* Lower or higher w.r.t ref_entry */
+ uint8_t __io ref_priority; /* Lower or higher w.r.t ref_entry */
uint16_t __io ref_entry;
uint16_t __io count; /* Number of entries requested */
+ uint8_t __io kw_type; /* Key type */
+ uint8_t __io virt;/* Request virtual index */
+ uint16_t __io rsvd[16]; /* Reserved */
};
struct npc_mcam_alloc_entry_rsp {
@@ -2508,6 +2535,7 @@ struct npc_mcam_alloc_entry_rsp {
uint16_t __io count; /* Number of entries allocated */
uint16_t __io free_count; /* Number of entries available */
uint16_t __io entry_list[NPC_MAX_NONCONTIG_ENTRIES];
+ uint16_t __io rsvd[16]; /* Reserved */
[DPDK/DTS Bug 1618] l2fwd testsuite match packets failing on Nvidia connectx-6
https://bugs.dpdk.org/show_bug.cgi?id=1618 Bug ID: 1618 Summary: l2fwd testsuite match packets failing on Nvidia connectx-6 Product: DPDK Version: 25.03 Hardware: Other OS: All Status: UNCONFIRMED Severity: major Priority: Normal Component: DTS Assignee: dev@dpdk.org Reporter: pr...@iol.unh.edu CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu Target Milestone: --- Hi, l2fwd runs correctly on NVIDIA cx5 (as tested when this testsuite was added last year). I added a config for NVIDIA cx6 today, and the testsuite errored, logging that 50 out of 50 packets were missing. The testsuite follows this process: 1. create packets with generate_random_packets() 2. Run send_packet_and_capture(), returns received packets list 3. Run get_expected_packets(), returns expected packets list. 4. Use match_all_packets(), which converts both lists of packets to a list of raw bytes and attempts to subtract the received packets against the expected packets, which should leave no packets remaining at the end (the pass condition). After digging a little, it looks like when running with the cx6, step #2 and step #3 from above produce the same list of 50 packets (same raw layer payload), though the L3 header values differ, which causes the packets to differ when matched against one another. For instance, here are two packets matched against each other on the cx6 test, which should match positively (but do not): received_packet: >>> expected_packet : >>> I expect this comes down to usage of _adjust_addresses() in #2, vs get_expected_packets() in #3. I am wondering whether the strategy employed in match_packets is good anyhow (its strategy is comparing raw packet bytes with no deep packet comparison). And, this is the only testsuite which is comparing packets in this manner. I propose to switch to comparing the two packet lists with the testsuite verify_packets() method. I have tested this verify method, and I will submit a patch for folks to comment on. -- You are receiving this mail because: You are the assignee for the bug.
RE: [PATCH v2] common/cnxk: fix atomic load in batch ops
Yes. It is a candidate for backport.
Thanks
Ashwin
> -Original Message-
> From: Jerin Jacob
> Sent: Wednesday, January 22, 2025 10:31 PM
> To: Nawal Kishor ; dev@dpdk.org; Nithin Kumar
> Dabilpuram ; Kiran Kumar Kokkilagadda
> ; Sunil Kumar Kori ; Satha
> Koteswara Rao Kottidi ; Harman Kalra
> ; Ashwin Sekhar T K
> Cc: Nawal Kishor
> Subject: RE: [PATCH v2] common/cnxk: fix atomic load in batch ops
>
>
>
> > -Original Message-
> > From: Nawal Kishor
> > Sent: Monday, December 2, 2024 10:28 PM
> > To: dev@dpdk.org; Nithin Kumar Dabilpuram ;
> > Kiran Kumar Kokkilagadda ; Sunil Kumar Kori
> > ; Satha Koteswara Rao Kottidi
> > ; Harman Kalra ; Ashwin
> > Sekhar T K ; Jerin Jacob
> > Cc: Nawal Kishor
> > Subject: [PATCH v2] common/cnxk: fix atomic load in batch ops
> >
> > In roc batch alloc wait code, __ATOMIC_RELAXED is changed to
> > __ATOMIC_ACQUIRE in order to avoid potential out of order loads.
> >
> > Fixes: 50d08d3934ec ("common/cnxk: fix batch alloc completion poll
> > logic")
> >
> > Signed-off-by: Nawal Kishor
>
> Fixed the following issues and applied to dpdk-next-net-mrvl/for-main.
> Thanks
>
> Is it candidate for Cc: sta...@dpdk.org backport?
> common/cnxk: fix atomic load in batch ops Contributor name/email
> mismatch with .mailmap:
> Nawal Kishor is unknown in .mailmap
>
>
> > ---
> > v2: Fixed review comments
> >
> > drivers/common/cnxk/roc_npa.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/common/cnxk/roc_npa.h
> > b/drivers/common/cnxk/roc_npa.h index f7cb4460e7..8525038810
> 100644
> > --- a/drivers/common/cnxk/roc_npa.h
> > +++ b/drivers/common/cnxk/roc_npa.h
> > @@ -255,7 +255,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line,
> > unsigned int wait_us)
> > /* Batch alloc status code is updated in bits [5:6] of the first word
> > * of the 128 byte cache line.
> > */
> > - while (((__atomic_load_n(cache_line, __ATOMIC_RELAXED) >> 5) &
> > 0x3) ==
> > + while (((__atomic_load_n(cache_line, __ATOMIC_ACQUIRE) >> 5) &
> > 0x3) ==
> >ALLOC_CCODE_INVAL)
> > if (wait_us && (plt_tsc_cycles() - start) >= ticks)
> > break;
> > --
> > 2.34.1
RE: [PATCH 2/2] lib/hash: avoid implicit conversion to 64 bit number
> From: Andre Muezerie [mailto:andre...@linux.microsoft.com] > Sent: Wednesday, 22 January 2025 22.37 > > On Wed, Jan 22, 2025 at 04:12:49PM +, Bruce Richardson wrote: > > On Wed, Nov 27, 2024 at 05:53:57PM -0800, Andre Muezerie wrote: > > > MSVC issues the warnings below: > > > > > > 1) ../lib/hash/rte_thash_gf2_poly_math.c(128): warning C4334: '<<': > > > result of 32-bit shift implicitly converted to 64 bits > > > (was 64-bit shift intended?) > > > > > > The code would be better off by using 64 bit numbers to begin with. > > > That eliminates the need for a conversion to 64 bits later. > > > > > > 2) ../lib/hash/rte_thash.c(568): warning C4334: '<<': > > > result of 32-bit shift implicitly converted to 64 bits > > > (was 64-bit shift intended?) > > > > > > 1ULL should be used as the result of the bit shift gets multiplied > > > by sizeof(uint32_t). > > > > > > Signed-off-by: Andre Muezerie > > > --- > > > > Acked-by: Bruce Richardson > > > > > lib/hash/rte_thash.c | 2 +- > > > lib/hash/rte_thash_gf2_poly_math.c | 6 +++--- > > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c > > > index fa78787143..f076311b57 100644 > > > --- a/lib/hash/rte_thash.c > > > +++ b/lib/hash/rte_thash.c > > > @@ -565,7 +565,7 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, > const char *name, uint32_t len, > > > offset; > > > > > > ent = rte_zmalloc(NULL, sizeof(struct rte_thash_subtuple_helper) > + > > > - sizeof(uint32_t) * (1 << ctx->reta_sz_log), > > > + sizeof(uint32_t) * (1ULL << ctx->reta_sz_log), > > > RTE_CACHE_LINE_SIZE); > > > > Is there a reason not to use RTE_BIT64 here too? > > Here we are calculating the size to be passed to the second argument of > rte_zmalloc, which is of type size_t. size_t is implementation > dependent, typically 4 bytes on 32-bit systems and 8 bytes on 64-bit > systems, so using 1ULL seems more appropriate. 1ULL makes it 8 byte on 32-bit systems too. Did you mean 1UL? How about reducing the formula to directly shift the sizeof() instead, i.e.: sizeof(uint32_t) << ctx->reta_sz_log,
RE: [EXTERNAL] Re: [v25,13/13] compress/zsda: add zsda compressdev capabilities
> Hi, Akhil:
>
> There are warning and some errors in the patches.
>
>
> The warning is
>
> >_coding style issues_
> >
> >
> >__rte_packed_begin and __rte_packed_end should always be used in pairs.
>
> And the context in the patch is：
>
> > struct __rte_packed_begin zsda_admin_req {
> > uint16_t msg_type;
> > uint8_t data[26];
> >@@ -105,10 +114,30 @@ struct zsda_qp_stat {
> > uint64_t dequeue_err_count;
> > };
>
> It's the locating information for the modified code.
> So, the warning may be caused by a bug of checkpatches.sh
>
@Andre Muezerie Can you please look into this checkpatch issue for
rte_packet_begin/end?
I think instead of doing grep on patch, it should grep the complete file.
>
> The errors are:
>
> > ci/loongarch-unit-testingfailUnit Testing FAIL
> > 43/119 DPDK:fast-tests / eventdev_selftest_swTIMEOUT
> > 80.08s
> exit status -15
>
> and
>
> >
> >
> >
> > Not Found
> >
> >
> > Not FoundThe requested resource was not found on this
> server.
> >
> >
>
> For the both errors, I have no idea about the cause of the problem and how to
> solve it.
> I even don't modify the code about eventdev.
>
> Thanks.
>
Re: [PATCH v8 00/15] net/zxdh: updated net zxdh driver
This release note looks good! Thank you so much! > How about this for a release note? > From 7137087faa9c1278bc702b69cce6df5e246c5675 Mon Sep 17 00:00:00 2001 > From: Stephen Hemminger > Date: Wed, 22 Jan 2025 10:05:54 -0800 > Subject: [PATCH] doc: add release note for zxdh driver update > Add summary of new features. > Signed-off-by: Stephen Hemminger > --- > doc/guides/rel_notes/release_25_03.rst | 12 > 1 file changed, 12 insertions(+) > diff --git a/doc/guides/rel_notes/release_25_03.rst > b/doc/guides/rel_notes/release_25_03.rst > index 85986ffa61..e20aa0b8ec 100644 > --- a/doc/guides/rel_notes/release_25_03.rst > +++ b/doc/guides/rel_notes/release_25_03.rst > @@ -63,6 +63,18 @@ New Features >and even substantial part of its code. >It can be viewed as an extension of rte_ring functionality. > +* **Updated ZXDH network driver.** > + > + * Added support for multiple queues. > + * Added support SR-IOV VF. > + * Scattered and gather for TX and RX. > + * Link state and auto-negotiation. > + * MAC address filtering. > + * Multicast and Promiscuous mode. > + * VLAN filtering and offload. > + * Receive Side Scaling (RSS). > + * Hardware statistcs. > + * Jumbo frames.
[DPDK/eventdev Bug 1576] [dpdk24.11-rc2] DPDK build failed with EXTRA_CFLAGS='-O1' on Redhat9.4
https://bugs.dpdk.org/show_bug.cgi?id=1576 tingtingx.l...@intel.com (tingtingx.l...@intel.com) changed: What|Removed |Added Resolution|--- |FIXED Status|UNCONFIRMED |RESOLVED --- Comment #3 from tingtingx.l...@intel.com (tingtingx.l...@intel.com) --- This issue has been fixed on higher versions of gcc(14.2+) And by the description of the following comment, will close this ticket. Comments from developers: The warning message is due to the fact that the assembly code generated by GCC may skip the initialization of the event variable at the O1 optimization, but was replaced by other instructions in O2 and O3, therefore it compiles fine. This issue does not need to be fixed considering the following reasons. 1. There is a rte_memcpy() at line number 699 which is copying response information as event into this. So, that will initialize all the event fields. We don't require to initialize events at the declaration. 2. O1 is an unusual, the default optimization level of DPDK is O3, the functions in the report are inline functions, they will be integrated into their callers at this level, skipping the initialization is not possible. 3. These warning messages appear only in the O1 optimization and not in O2 and O3. 4. The compiler in JIRA is GCC 11.4.1, and there are no warning messages when using Clang 19.1.3 and higher versions of GCC 14.2.1. -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH] Skip vfio in the scenario of non-privileged mode
On 2025/1/18 00:47, Stephen Hemminger wrote:
Caution: This is an external email. Please be very careful when clicking links
or opening attachments. See http://nok.it/nsb for additional information.
On Fri, 17 Jan 2025 15:28:47 +0800
Yang Ming wrote:
DPDK detect vfio container according the existence of vfio
module. But for container with non-privileged mode, there is
possibility that no VFIO_DIR(/dev/vfio) mapping from host to
container when host have both Intel NIC and Mellanox NIC but
this conntainer only allocate VFs from Mellanox NIC.
In this case, vfio kernel module has already been loaded from
the host.
This scenario will cause the error log occurs in DPDK primary
process as below:
'EAL: cannot open VFIO container, error 2 (No such file or
directory)'
'EAL: VFIO support could not be initialized'
Because `rte_vfio_enable()` call `rte_vfio_get_container_fd()`
to execute `vfio_container_fd = open(VFIO_CONTAINER_PATH,
O_RDWR);` but VFIO_CONTAINER_PATH(/dev/vfio/vfio) doesn't exist
in this container.
This scenario will also lead to the delay of DPDK secondary
process because `default_vfio_cfg->vfio_enabled = 0` and
`default_vfio_cfg->vfio_container_fd = -1`, socket error will
be set in DPDK primary process when it sync this info to
the secondary process.
This patch use to skip this kind of useless detection for this
scenario.
Signed-off-by: Yang Ming
---
lib/eal/linux/eal_vfio.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 7132e24cba..1679d29263 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -7,6 +7,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1083,6 +1084,7 @@ rte_vfio_enable(const char *modname)
/* initialize group list */
int i, j;
int vfio_available;
+ DIR *dir;
const struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -1119,6 +1121,15 @@ rte_vfio_enable(const char *modname)
return 0;
}
+ /* return 0 if VFIO directory not exist for container with non-privileged mode */
+ dir = opendir(VFIO_DIR);
+ if (dir == NULL) {
+ EAL_LOG(DEBUG,
+ "VFIO directory not exist, skipping VFIO support...");
+ return 0;
+ }
+ closedir(dir);
You need to test the non-container cases.
If vfio is loaded /dev/vfio is a character device (not a directory)
Also looks suspicious that VFIO_DIR is defined but never used currently.
Hi Stephen,
For non-container test, /dev/vfio/vfio will be character device, not
/dev/vfio.
Here is the command result on my testing environment with Intel NIC.
[root@computer-1 testuser]# ls -l /dev/vfio
total 0
crw-rw-rw-. 1 root root 10, 196 Jan 22 01:50 vfio
[root@computer-1 testuser]# dpdk-devbind.py -b vfio-pci :04:10.2
[root@computer-1 testuser]# ls -l /dev/vfio
total 0
crw---. 1 root root 239, 0 Jan 22 01:52 59
crw-rw-rw-. 1 root root 10, 196 Jan 22 01:50 vfio
[root@computer-1 testuser]# dpdk-devbind.py -b ixgbevf :04:10.2
[root@computer-1 testuser]# ls -l /dev/vfio
total 0
crw-rw-rw-. 1 root root 10, 196 Jan 22 01:50 vfio
Can you confirm your test scenario?
[PATCH 3/3] net/ice: ACL filter support for IPv4 fragment
Enable ACL filter on PF. Add support for FRAG_IPV4 pattern and queue
action.
Flow rule can be created by the following command:
flow create 0 ingress group 1 pattern eth /
ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x3FFF /
end actions queue index / end
Signed-off-by: Mingjin Ye
---
drivers/net/ice/ice_acl_filter.c | 61 +---
drivers/net/ice/ice_ethdev.c | 1 -
2 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/ice/ice_acl_filter.c
index 63a525b363..df2cc01b2d 100644
--- a/drivers/net/ice/ice_acl_filter.c
+++ b/drivers/net/ice/ice_acl_filter.c
@@ -30,7 +30,8 @@
#define ICE_ACL_INSET_ETH_IPV4 ( \
ICE_INSET_SMAC | ICE_INSET_DMAC | \
- ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST)
+ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+ ICE_INSET_IPV4_OFFSET)
#define ICE_ACL_INSET_ETH_IPV4_UDP ( \
ICE_ACL_INSET_ETH_IPV4 | \
ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)
@@ -214,6 +215,7 @@ ice_acl_prof_init(struct ice_pf *pf)
{
struct ice_hw *hw = ICE_PF_TO_HW(pf);
struct ice_flow_prof *prof_ipv4 = NULL;
+ struct ice_flow_prof *prof_ipv4_frag = NULL;
struct ice_flow_prof *prof_ipv4_udp = NULL;
struct ice_flow_prof *prof_ipv4_tcp = NULL;
struct ice_flow_prof *prof_ipv4_sctp = NULL;
@@ -234,6 +236,15 @@ ice_acl_prof_init(struct ice_pf *pf)
if (ret)
goto err_add_prof;
+ ice_memset(seg, 0, sizeof(*seg), ICE_NONDMA_MEM);
+ ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV_FRAG);
+ acl_add_prof_prepare(hw, seg, false, 0, 0);
+ ret = ice_flow_add_prof(hw, ICE_BLK_ACL, ICE_FLOW_RX,
+ ICE_FLTR_PTYPE_FRAG_IPV4,
+ seg, 1, NULL, 0, &prof_ipv4_frag);
+ if (ret)
+ goto err_add_prof_ipv4_udp_frag;
+
ice_memset(seg, 0, sizeof(*seg), ICE_NONDMA_MEM);
ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV4);
acl_add_prof_prepare(hw, seg, true,
@@ -272,6 +283,10 @@ ice_acl_prof_init(struct ice_pf *pf)
if (ret)
goto err_assoc_prof;
+ ret = ice_flow_assoc_prof(hw, ICE_BLK_ACL, prof_ipv4_frag, i);
+ if (ret)
+ goto err_assoc_prof;
+
ret = ice_flow_assoc_prof(hw, ICE_BLK_ACL, prof_ipv4_udp, i);
if (ret)
goto err_assoc_prof;
@@ -293,6 +308,8 @@ ice_acl_prof_init(struct ice_pf *pf)
err_add_prof_ipv4_tcp:
ice_flow_rem_prof(hw, ICE_BLK_ACL, ICE_FLTR_PTYPE_NONF_IPV4_UDP);
err_add_prof_ipv4_udp:
+ ice_flow_rem_prof(hw, ICE_BLK_ACL, ICE_FLTR_PTYPE_FRAG_IPV4);
+err_add_prof_ipv4_udp_frag:
ice_flow_rem_prof(hw, ICE_BLK_ACL, ICE_FLTR_PTYPE_NONF_IPV4_OTHER);
err_add_prof:
ice_free(hw, seg);
@@ -353,6 +370,7 @@ ice_acl_set_input_set(struct ice_acl_conf *filter, struct
ice_fdir_fltr *input)
ICE_NONDMA_TO_NONDMA);
break;
+ case ICE_FLTR_PTYPE_FRAG_IPV4:
case ICE_FLTR_PTYPE_NONF_IPV4_OTHER:
ice_memcpy(&input->ip.v4, &filter->input.ip.v4,
sizeof(struct ice_fdir_v4),
@@ -519,6 +537,12 @@ ice_acl_create_filter(struct ice_adapter *ad,
acts[0].data.acl_act.mdid = ICE_MDID_RX_PKT_DROP;
acts[0].data.acl_act.prio = 0x3;
acts[0].data.acl_act.value = CPU_TO_LE16(0x1);
+ } else if (filter->input.dest_ctl ==
+ ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QINDEX) {
+ acts[0].type = ICE_FLOW_ACT_FWD_QUEUE;
+ acts[0].data.acl_act.mdid = ICE_MDID_RX_DST_Q;
+ acts[0].data.acl_act.prio = 0x3;
+ acts[0].data.acl_act.value = CPU_TO_LE16(input->q_index);
}
input->acl_fltr = true;
@@ -531,7 +555,8 @@ ice_acl_create_filter(struct ice_adapter *ad,
return ret;
}
- if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {
+ if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER ||
+ flow_type == ICE_FLTR_PTYPE_FRAG_IPV4) {
ret = ice_acl_hw_set_conf(pf, input, acts, rule,
ICE_FLTR_PTYPE_NONF_IPV4_UDP, 1);
if (ret)
@@ -576,6 +601,7 @@ ice_acl_destroy_filter(struct ice_adapter *ad,
int ret = 0;
switch (rule->flow_type) {
+ case ICE_FLTR_PTYPE_FRAG_IPV4:
case ICE_FLTR_PTYPE_NONF_IPV4_OTHER:
for (i = 0; i < 4; i++) {
entry_id = rule->entry_id[i];
@@ -617,6 +643,8 @@ ice_acl_parse_action(__rte_unused struct ice_adapter *ad,
struct rte_flow_error *error,
struct ice_acl_conf *filter)
{
+ struct ice_pf *pf = &ad->pf;
+ const struct rte_flow_action_queue *act_q;
uint32_t dest_num
[PATCH 1/3] net/ice/base: add ipv4 fragment related field
Added support for the Flags and Fragment Offset fields of ipv4 fragments.
Field definitions are the same as in rte_ipv4_hdr.
Signed-off-by: Mingjin Ye
---
drivers/net/ice/base/ice_fdir.h | 2 ++
drivers/net/ice/base/ice_flow.c | 5 +
drivers/net/ice/base/ice_flow.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index 1bb8a14a5d..3461f8dfba 100644
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -56,6 +56,7 @@
#define ICE_IPV4_TOS_OFFSET15
#define ICE_IPV4_ID_OFFSET 18
#define ICE_IPV4_TTL_OFFSET22
+#define ICE_IPV4_FRAGMENT_OFFSET 20
#define ICE_IPV6_TC_OFFSET 14
#define ICE_IPV6_HLIM_OFFSET 21
#define ICE_IPV6_PROTO_OFFSET 20
@@ -181,6 +182,7 @@ struct ice_fdir_v4 {
u8 proto;
u8 ttl;
__be16 packet_id;
+ __be16 fragment_offset;
};
#define ICE_IPV6_ADDR_LEN_AS_U32 4
diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 0d64a5bb1e..60d640a26f 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -21,6 +21,7 @@
#define ICE_FLOW_FLD_SZ_SCTP_CHKSUM4
#define ICE_FLOW_FLD_SZ_IP_DSCP1
#define ICE_FLOW_FLD_SZ_IP_TTL 1
+#define ICE_FLOW_FLD_SZ_IP_FLAGS 2
#define ICE_FLOW_FLD_SZ_IP_PROT1
#define ICE_FLOW_FLD_SZ_PORT 2
#define ICE_FLOW_FLD_SZ_TCP_FLAGS 1
@@ -87,6 +88,9 @@ struct ice_flow_field_info
ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
/* ICE_FLOW_FIELD_IDX_IPV4_TTL */
ICE_FLOW_FLD_INFO_MSK(ICE_FLOW_SEG_HDR_NONE, 8,
ICE_FLOW_FLD_SZ_IP_TTL, 0xff00),
+ /* ICE_FLOW_FIELD_IDX_IPV4_OFFSET */
+ ICE_FLOW_FLD_INFO_MSK(ICE_FLOW_SEG_HDR_IPV_FRAG, 6,
+ ICE_FLOW_FLD_SZ_IP_FLAGS, 0x3fff),
/* ICE_FLOW_FIELD_IDX_IPV4_PROT */
ICE_FLOW_FLD_INFO_MSK(ICE_FLOW_SEG_HDR_NONE, 8,
ICE_FLOW_FLD_SZ_IP_PROT, 0x00ff),
@@ -1459,6 +1463,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct
ice_flow_prof_params *params,
prot_id = ICE_PROT_IPV4_IL_IL;
break;
case ICE_FLOW_FIELD_IDX_IPV4_ID:
+ case ICE_FLOW_FIELD_IDX_IPV4_OFFSET:
prot_id = ICE_PROT_IPV4_OF_OR_S;
break;
case ICE_FLOW_FIELD_IDX_IPV6_SA:
diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h
index 65b261beca..a87c0e4567 100644
--- a/drivers/net/ice/base/ice_flow.h
+++ b/drivers/net/ice/base/ice_flow.h
@@ -239,6 +239,7 @@ enum ice_flow_field {
ICE_FLOW_FIELD_IDX_IPV4_DSCP,
ICE_FLOW_FIELD_IDX_IPV6_DSCP,
ICE_FLOW_FIELD_IDX_IPV4_TTL,
+ ICE_FLOW_FIELD_IDX_IPV4_OFFSET,
ICE_FLOW_FIELD_IDX_IPV4_PROT,
ICE_FLOW_FIELD_IDX_IPV6_TTL,
ICE_FLOW_FIELD_IDX_IPV6_PROT,
--
2.25.1
[PATCH 2/3] net/ice: FDIR support IPv4 fragment masks
This patch supports enabling masks for IPv4 fragments in FDIR.
Flow rule can be created by the following command:
flow create 0 ingress group 2 pattern eth /
ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x3FFF /
end
Signed-off-by: Mingjin Ye
---
drivers/net/ice/ice_fdir_filter.c | 15 +++
drivers/net/ice/ice_generic_flow.h | 2 ++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ice/ice_fdir_filter.c
b/drivers/net/ice/ice_fdir_filter.c
index 406918fed5..247f55118a 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -24,7 +24,8 @@
#define ICE_FDIR_INSET_ETH_IPV4 (\
ICE_FDIR_INSET_ETH | \
ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_TOS | \
- ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_PKID)
+ ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_PKID | \
+ ICE_INSET_IPV4_OFFSET)
#define ICE_FDIR_INSET_ETH_IPV4_UDP (\
ICE_FDIR_INSET_ETH_IPV4 | \
@@ -930,6 +931,7 @@ ice_fdir_input_set_parse(uint64_t inset, enum
ice_flow_field *field)
{ICE_INSET_IPV4_TTL, ICE_FLOW_FIELD_IDX_IPV4_TTL},
{ICE_INSET_IPV4_PROTO, ICE_FLOW_FIELD_IDX_IPV4_PROT},
{ICE_INSET_IPV4_PKID, ICE_FLOW_FIELD_IDX_IPV4_ID},
+ {ICE_INSET_IPV4_OFFSET, ICE_FLOW_FIELD_IDX_IPV4_OFFSET},
{ICE_INSET_IPV6_SRC, ICE_FLOW_FIELD_IDX_IPV6_SA},
{ICE_INSET_IPV6_DST, ICE_FLOW_FIELD_IDX_IPV6_DA},
{ICE_INSET_IPV6_TC, ICE_FLOW_FIELD_IDX_IPV6_DSCP},
@@ -2022,7 +2024,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter
*ad,
ipv4_last->hdr.next_proto_id ||
ipv4_last->hdr.hdr_checksum ||
ipv4_last->hdr.src_addr ||
-ipv4_last->hdr.dst_addr)) {
+ipv4_last->hdr.dst_addr ||
+ipv4_last->hdr.fragment_offset)) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item, "Invalid IPv4 last.");
@@ -2047,19 +2050,23 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter
*ad,
*input_set |= ICE_INSET_IPV4_PROTO;
if (ipv4_mask->hdr.type_of_service == UINT8_MAX)
*input_set |= ICE_INSET_IPV4_TOS;
+ if ((ipv4_mask->hdr.fragment_offset &
+ rte_cpu_to_be_16(0x1FFF)) != 0)
+ *input_set |= ICE_INSET_IPV4_OFFSET;
p_v4->dst_ip = ipv4_spec->hdr.dst_addr;
p_v4->src_ip = ipv4_spec->hdr.src_addr;
p_v4->ttl = ipv4_spec->hdr.time_to_live;
p_v4->proto = ipv4_spec->hdr.next_proto_id;
p_v4->tos = ipv4_spec->hdr.type_of_service;
+ p_v4->fragment_offset = ipv4_spec->hdr.fragment_offset;
/* fragment Ipv4:
* spec is 0x2000, mask is 0x2000
*/
- if (ipv4_spec->hdr.fragment_offset ==
+ if (ipv4_spec->hdr.fragment_offset &
rte_cpu_to_be_16(RTE_IPV4_HDR_MF_FLAG) &&
- ipv4_mask->hdr.fragment_offset ==
+ ipv4_mask->hdr.fragment_offset &
rte_cpu_to_be_16(RTE_IPV4_HDR_MF_FLAG)) {
/* all IPv4 fragment packet has the same
* ethertype, if the spec and mask is valid,
diff --git a/drivers/net/ice/ice_generic_flow.h
b/drivers/net/ice/ice_generic_flow.h
index 391d615b9a..509eb4b705 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -54,6 +54,7 @@
#define ICE_PFCP_SEID BIT_ULL(42)
#define ICE_PFCP_S_FIELD BIT_ULL(41)
#define ICE_IP_PK_ID BIT_ULL(40)
+#define ICE_IP_OFFSET BIT_ULL(39)
/* input set */
@@ -72,6 +73,7 @@
#define ICE_INSET_IPV4_PROTO (ICE_PROT_IPV4 | ICE_IP_PROTO)
#define ICE_INSET_IPV4_TTL (ICE_PROT_IPV4 | ICE_IP_TTL)
#define ICE_INSET_IPV4_PKID(ICE_PROT_IPV4 | ICE_IP_PK_ID)
+#define ICE_INSET_IPV4_OFFSET (ICE_PROT_IPV4 | ICE_IP_OFFSET)
#define ICE_INSET_IPV6_SRC (ICE_PROT_IPV6 | ICE_IP_SRC)
#define ICE_INSET_IPV6_DST (ICE_PROT_IPV6 | ICE_IP_DST)
#define ICE_INSET_IPV6_NEXT_HDR(ICE_PROT_IPV6 | ICE_IP_PROTO)
--
2.25.1
[PATCH 0/3] flexible IPv4 fragment action
Support for distributing the first and other segments of an IPv4 segmented packet to different RX queues. Mingjin Ye (3): net/ice/base: add ipv4 fragment related field net/ice: FDIR support IPv4 fragment masks net/ice: ACL filter support for IPv4 fragment drivers/net/ice/base/ice_fdir.h| 2 + drivers/net/ice/base/ice_flow.c| 5 +++ drivers/net/ice/base/ice_flow.h| 1 + drivers/net/ice/ice_acl_filter.c | 61 +++--- drivers/net/ice/ice_ethdev.c | 1 - drivers/net/ice/ice_fdir_filter.c | 15 ++-- drivers/net/ice/ice_generic_flow.h | 2 + 7 files changed, 77 insertions(+), 10 deletions(-) -- 2.25.1
