[RFC v1] raw/ntb: add support for 6th Gen Intel Xeon
Add support for the 6th Gen Intel Xeon Scalable processors. Note that NTB
devices within the 6th Gen Intel Xeon compliant to PCIe 5.0 spec.
Signed-off-by: Junfeng Guo
---
Depends-on: series-30460 \
("raw/ntb: refactor to support NTB on 5th Gen Intel Xeon")
---
doc/guides/rawdevs/ntb.rst | 1 +
drivers/raw/ntb/ntb.c | 2 ++
drivers/raw/ntb/ntb.h | 1 +
drivers/raw/ntb/ntb_hw_intel.c | 66 +-
drivers/raw/ntb/ntb_hw_intel.h | 40 -
usertools/dpdk-devbind.py | 2 +-
6 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index ee452af4fd..e663b7a088 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -153,6 +153,7 @@ Limitation
This PMD is only supported on Intel Xeon Platforms:
+- 6th Generation Intel® Xeon® Scalable Processors. (NTB GEN5 device id: 0x0DB4)
- 5th Generation Intel® Xeon® Scalable Processors. (NTB GEN4 device id: 0x347E)
- 4th Generation Intel® Xeon® Scalable Processors. (NTB GEN4 device id: 0x347E)
- 3rd Generation Intel® Xeon® Scalable Processors. (NTB GEN4 device id: 0x347E)
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index 2a163eff60..f1e48b877d 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -26,6 +26,7 @@
static const struct rte_pci_id pci_id_ntb_map[] = {
{ RTE_PCI_DEVICE(NTB_INTEL_VENDOR_ID, NTB_INTEL_DEV_ID_B2B_GEN3) },
{ RTE_PCI_DEVICE(NTB_INTEL_VENDOR_ID, NTB_INTEL_DEV_ID_B2B_GEN4) },
+ { RTE_PCI_DEVICE(NTB_INTEL_VENDOR_ID, NTB_INTEL_DEV_ID_B2B_GEN5) },
{ .vendor_id = 0, /* sentinel */ },
};
@@ -1380,6 +1381,7 @@ ntb_init_hw(struct rte_rawdev *dev, struct rte_pci_device
*pci_dev)
switch (pci_dev->id.device_id) {
case NTB_INTEL_DEV_ID_B2B_GEN3:
case NTB_INTEL_DEV_ID_B2B_GEN4:
+ case NTB_INTEL_DEV_ID_B2B_GEN5:
hw->ntb_ops = &intel_ntb_ops;
break;
default:
diff --git a/drivers/raw/ntb/ntb.h b/drivers/raw/ntb/ntb.h
index d2e6d566ed..adbc164b48 100644
--- a/drivers/raw/ntb/ntb.h
+++ b/drivers/raw/ntb/ntb.h
@@ -19,6 +19,7 @@ extern int ntb_logtype;
/* Device IDs */
#define NTB_INTEL_DEV_ID_B2B_GEN3 0x201C
#define NTB_INTEL_DEV_ID_B2B_GEN4 0x347E
+#define NTB_INTEL_DEV_ID_B2B_GEN5 0x0DB4
/* Reserved to app to use. */
#define NTB_SPAD_USER "spad_user_"
diff --git a/drivers/raw/ntb/ntb_hw_intel.c b/drivers/raw/ntb/ntb_hw_intel.c
index 3e2094437f..76dce5e95f 100644
--- a/drivers/raw/ntb/ntb_hw_intel.c
+++ b/drivers/raw/ntb/ntb_hw_intel.c
@@ -98,7 +98,7 @@ intel_ntb4_check_ppd_for_ICX(struct ntb_hw *hw, uint32_t
reg_val)
}
static int
-intel_ntb4_check_ppd(struct ntb_hw *hw)
+intel_ntb4_5_check_ppd(struct ntb_hw *hw)
{
uint8_t revision_id;
uint32_t reg_val;
@@ -112,7 +112,7 @@ intel_ntb4_check_ppd(struct ntb_hw *hw)
return -EIO;
}
- reg_val = rte_read32(hw->hw_addr + XEON_NTB4_PPD1_OFFSET);
+ reg_val = rte_read32(hw->hw_addr + XEON_NTB4_5_PPD1_OFFSET);
/* Distinguish HW platform (3rd Gen Xeon) via PCI Revision ID */
if (revision_id <= NTB_PCI_DEV_REVISION_ICX_MAX &&
@@ -120,8 +120,8 @@ intel_ntb4_check_ppd(struct ntb_hw *hw)
return intel_ntb4_check_ppd_for_ICX(hw, reg_val);
/* Check connection topo type. Only support B2B. */
- switch (reg_val & XEON_NTB4_PPD_CONN_MASK) {
- case XEON_NTB4_PPD_CONN_B2B:
+ switch (reg_val & XEON_NTB4_5_PPD_CONN_MASK) {
+ case XEON_NTB4_5_PPD_CONN_B2B:
NTB_LOG(INFO, "Topo B2B (back to back) is using.");
break;
default:
@@ -130,12 +130,12 @@ intel_ntb4_check_ppd(struct ntb_hw *hw)
}
/* Check device config status. */
- switch (reg_val & XEON_NTB4_PPD_DEV_MASK) {
- case XEON_NTB4_PPD_DEV_DSD:
+ switch (reg_val & XEON_NTB4_5_PPD_DEV_MASK) {
+ case XEON_NTB4_5_PPD_DEV_DSD:
NTB_LOG(INFO, "DSD, Downstream Device.");
hw->topo = NTB_TOPO_B2B_DSD;
break;
- case XEON_NTB4_PPD_DEV_USD:
+ case XEON_NTB4_5_PPD_DEV_USD:
NTB_LOG(INFO, "USD, Upstream device.");
hw->topo = NTB_TOPO_B2B_USD;
break;
@@ -161,9 +161,9 @@ intel_ntb_dev_init(const struct rte_rawdev *dev)
if (is_gen3_ntb(hw->pci_dev))
/* PPD is in config space for NTB Gen3 */
ret = intel_ntb3_check_ppd(hw);
- else if (is_gen4_ntb(hw->pci_dev))
- /* PPD is in MMIO for NTB Gen4 */
- ret = intel_ntb4_check_ppd(hw);
+ else if (is_gen4_ntb(hw->pci_dev) || is_gen5_ntb(hw->pci_dev))
+ /* PPD is in MMIO for NTB Gen4/5 */
+ ret = intel_ntb4_5_check_ppd(hw);
else {
NTB_LOG(ERR, "Cannot init device for unsupported device.");
ret
[PATCH 1/3] common/cnxk: dma result to an offset of the event
Adds support to configure writing result to offset of the DMA
response event.
Signed-off-by: Amit Prakash Shukla
---
drivers/common/cnxk/roc_dpi.c | 6 +-
drivers/common/cnxk/roc_dpi.h | 2 +-
drivers/common/cnxk/roc_dpi_priv.h | 4
drivers/common/cnxk/roc_idev.c | 20
drivers/common/cnxk/roc_idev_priv.h | 3 +++
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c
index c241168294..1ee777d779 100644
--- a/drivers/common/cnxk/roc_dpi.c
+++ b/drivers/common/cnxk/roc_dpi.c
@@ -83,6 +83,9 @@ roc_dpi_configure(struct roc_dpi *roc_dpi, uint32_t chunk_sz,
uint64_t aura, uin
mbox_msg.s.aura = aura;
mbox_msg.s.sso_pf_func = idev_sso_pffunc_get();
mbox_msg.s.npa_pf_func = idev_npa_pffunc_get();
+ mbox_msg.s.wqecsoff = idev_dma_cs_offset_get();
+ if (mbox_msg.s.wqecsoff)
+ mbox_msg.s.wqecs = 1;
rc = send_msg_to_pf(&pci_dev->addr, (const char *)&mbox_msg,
sizeof(dpi_mbox_msg_t));
@@ -94,7 +97,7 @@ roc_dpi_configure(struct roc_dpi *roc_dpi, uint32_t chunk_sz,
uint64_t aura, uin
}
int
-roc_dpi_dev_init(struct roc_dpi *roc_dpi)
+roc_dpi_dev_init(struct roc_dpi *roc_dpi, uint8_t offset)
{
struct plt_pci_device *pci_dev = roc_dpi->pci_dev;
uint16_t vfid;
@@ -103,6 +106,7 @@ roc_dpi_dev_init(struct roc_dpi *roc_dpi)
vfid = ((pci_dev->addr.devid & 0x1F) << 3) | (pci_dev->addr.function &
0x7);
vfid -= 1;
roc_dpi->vfid = vfid;
+ idev_dma_cs_offset_set(offset);
return 0;
}
diff --git a/drivers/common/cnxk/roc_dpi.h b/drivers/common/cnxk/roc_dpi.h
index 4ebde5b8a6..978e2badb2 100644
--- a/drivers/common/cnxk/roc_dpi.h
+++ b/drivers/common/cnxk/roc_dpi.h
@@ -11,7 +11,7 @@ struct roc_dpi {
uint16_t vfid;
} __plt_cache_aligned;
-int __roc_api roc_dpi_dev_init(struct roc_dpi *roc_dpi);
+int __roc_api roc_dpi_dev_init(struct roc_dpi *roc_dpi, uint8_t offset);
int __roc_api roc_dpi_dev_fini(struct roc_dpi *roc_dpi);
int __roc_api roc_dpi_configure(struct roc_dpi *dpi, uint32_t chunk_sz,
uint64_t aura,
diff --git a/drivers/common/cnxk/roc_dpi_priv.h
b/drivers/common/cnxk/roc_dpi_priv.h
index 518a3e7351..52962c8bc0 100644
--- a/drivers/common/cnxk/roc_dpi_priv.h
+++ b/drivers/common/cnxk/roc_dpi_priv.h
@@ -31,6 +31,10 @@ typedef union dpi_mbox_msg_t {
uint64_t sso_pf_func : 16;
/* NPA PF function */
uint64_t npa_pf_func : 16;
+ /* WQE queue DMA completion status enable */
+ uint64_t wqecs : 1;
+ /* WQE queue DMA completion status offset */
+ uint64_t wqecsoff : 8;
} s;
} dpi_mbox_msg_t;
diff --git a/drivers/common/cnxk/roc_idev.c b/drivers/common/cnxk/roc_idev.c
index e6c6b34d78..7b922c8bae 100644
--- a/drivers/common/cnxk/roc_idev.c
+++ b/drivers/common/cnxk/roc_idev.c
@@ -301,6 +301,26 @@ idev_sso_set(struct roc_sso *sso)
__atomic_store_n(&idev->sso, sso, __ATOMIC_RELEASE);
}
+void
+idev_dma_cs_offset_set(uint8_t offset)
+{
+ struct idev_cfg *idev = idev_get_cfg();
+
+ if (idev != NULL)
+ idev->dma_cs_offset = offset;
+}
+
+uint8_t
+idev_dma_cs_offset_get(void)
+{
+ struct idev_cfg *idev = idev_get_cfg();
+
+ if (idev != NULL)
+ return idev->dma_cs_offset;
+
+ return 0;
+}
+
uint64_t
roc_idev_nix_inl_meta_aura_get(void)
{
diff --git a/drivers/common/cnxk/roc_idev_priv.h
b/drivers/common/cnxk/roc_idev_priv.h
index 80f8465e1c..cf63c58d92 100644
--- a/drivers/common/cnxk/roc_idev_priv.h
+++ b/drivers/common/cnxk/roc_idev_priv.h
@@ -37,6 +37,7 @@ struct idev_cfg {
struct roc_nix_list roc_nix_list;
plt_spinlock_t nix_inl_dev_lock;
plt_spinlock_t npa_dev_lock;
+ uint8_t dma_cs_offset;
};
/* Generic */
@@ -55,6 +56,8 @@ void idev_sso_pffunc_set(uint16_t sso_pf_func);
uint16_t idev_sso_pffunc_get(void);
struct roc_sso *idev_sso_get(void);
void idev_sso_set(struct roc_sso *sso);
+void idev_dma_cs_offset_set(uint8_t offset);
+uint8_t idev_dma_cs_offset_get(void);
/* idev lmt */
uint16_t idev_lmt_pffunc_get(void);
--
2.25.1
[PATCH 2/3] dma/cnxk: support for DMA event enqueue dequeue
Added cnxk driver support for dma event enqueue and dequeue.
Also added changes for work queue entry completion status.
Signed-off-by: Amit Prakash Shukla
---
doc/guides/eventdevs/cnxk.rst| 5 +
drivers/dma/cnxk/cnxk_dma_event_dp.h | 21 +++
drivers/dma/cnxk/cnxk_dmadev.c | 2 +-
drivers/dma/cnxk/cnxk_dmadev.h | 18 ++-
drivers/dma/cnxk/cnxk_dmadev_fp.c| 212 +++
drivers/dma/cnxk/meson.build | 9 +-
drivers/dma/cnxk/version.map | 9 ++
7 files changed, 273 insertions(+), 3 deletions(-)
create mode 100644 drivers/dma/cnxk/cnxk_dma_event_dp.h
create mode 100644 drivers/dma/cnxk/version.map
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index cccb8a0304..9ff1052c53 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -227,3 +227,8 @@ ethernet devices connected to event device to override this
applications can
use `force_rx_bp=1` device arguments.
Using unique mempool per each ethernet device is recommended when they are
connected to event device.
+
+DMA adapter new mode support
+
+
+DMA driver does not support DMA adapter configured in new mode.
diff --git a/drivers/dma/cnxk/cnxk_dma_event_dp.h
b/drivers/dma/cnxk/cnxk_dma_event_dp.h
new file mode 100644
index 00..a526d25665
--- /dev/null
+++ b/drivers/dma/cnxk/cnxk_dma_event_dp.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell.
+ */
+
+#ifndef _CNXK_DMA_EVENT_DP_H_
+#define _CNXK_DMA_EVENT_DP_H_
+
+#include
+
+#include
+#include
+
+__rte_internal
+uint16_t cn10k_dma_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t
nb_events);
+
+__rte_internal
+uint16_t cn9k_dma_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t
nb_events);
+
+__rte_internal
+uintptr_t cnxk_dma_adapter_dequeue(uintptr_t get_work1);
+#endif /* _CNXK_DMA_EVENT_DP_H_ */
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 1e7f49792c..a748331da1 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -592,7 +592,7 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv
__rte_unused, struct rte_pci_de
rdpi = &dpivf->rdpi;
rdpi->pci_dev = pci_dev;
- rc = roc_dpi_dev_init(rdpi);
+ rc = roc_dpi_dev_init(rdpi, offsetof(struct cnxk_dpi_compl_s, wqecs));
if (rc < 0)
goto err_out_free;
diff --git a/drivers/dma/cnxk/cnxk_dmadev.h b/drivers/dma/cnxk/cnxk_dmadev.h
index 350ae73b5c..332325d6b6 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.h
+++ b/drivers/dma/cnxk/cnxk_dmadev.h
@@ -19,6 +19,8 @@
#include
+#include "cnxk_dma_event_dp.h"
+
#define CNXK_DPI_MAX_POINTER 15
#define CNXK_DPI_STRM_INC(s, var) ((s).var = ((s).var + 1) &
(s).max_cnt)
#define CNXK_DPI_STRM_DEC(s, var) ((s).var = ((s).var - 1) == -1 ?
(s).max_cnt : \
@@ -40,6 +42,11 @@
*/
#define CNXK_DPI_REQ_CDATA 0xFF
+/* Set Completion data to 0xDEADBEEF when request submitted for SSO.
+ * This helps differentiate if the dequeue is called after cnxk enueue.
+ */
+#define CNXK_DPI_REQ_SSO_CDATA0xDEADBEEF
+
union cnxk_dpi_instr_cmd {
uint64_t u;
struct cn9k_dpi_instr_cmd {
@@ -85,7 +92,10 @@ union cnxk_dpi_instr_cmd {
struct cnxk_dpi_compl_s {
uint64_t cdata;
- void *cb_data;
+ void *op;
+ uint16_t dev_id;
+ uint16_t vchan;
+ uint32_t wqecs;
};
struct cnxk_dpi_cdesc_data_s {
@@ -95,6 +105,11 @@ struct cnxk_dpi_cdesc_data_s {
uint16_t tail;
};
+struct cnxk_dma_adapter_info {
+ bool enabled; /* Set if vchan queue is added to dma
adapter. */
+ struct rte_mempool *req_mp; /* DMA inflight request mempool. */
+};
+
struct cnxk_dpi_conf {
union cnxk_dpi_instr_cmd cmd;
struct cnxk_dpi_cdesc_data_s c_desc;
@@ -103,6 +118,7 @@ struct cnxk_dpi_conf {
uint16_t desc_idx;
struct rte_dma_stats stats;
uint64_t completed_offset;
+ struct cnxk_dma_adapter_info adapter_info;
};
struct cnxk_dpi_vf_s {
diff --git a/drivers/dma/cnxk/cnxk_dmadev_fp.c
b/drivers/dma/cnxk/cnxk_dmadev_fp.c
index 95df19a2db..85a8e1310e 100644
--- a/drivers/dma/cnxk/cnxk_dmadev_fp.c
+++ b/drivers/dma/cnxk/cnxk_dmadev_fp.c
@@ -5,6 +5,13 @@
#include
#include "cnxk_dmadev.h"
+#include
+
+#include
+#include
+#include
+
+rte_mcslock_t *dpi_ml;
static __plt_always_inline void
__dpi_cpy_scalar(uint64_t *src, uint64_t *dst, uint8_t n)
@@ -434,3 +441,208 @@ cn10k_dmadev_copy_sg(void *dev_private, uint16_t vchan,
const struct rte_dma_sge
return dpi_conf->desc_idx++;
}
+
+static inline uint64_t
+cnxk_dma_adapter_format_event(uint64_t event)
+{
+ uint64_t w0;
+ w0 = (event & 0xFFC0) >> 6 |
+(event & 0xFFF) | RTE_EVENT_TYPE_DMADEV << 28;
+
+ return w0;
+}
+
+uint16_t
+cn10k_dma_adapter_enqueue(void
[PATCH 3/3] event/cnxk: support DMA event functions
Added support of dma driver callback assignment to eventdev
enqueue and dequeue. The change also defines dma adapter
capabilities function.
Depends-on: patch-134955 ("lib/dmadev: get DMA device using device ID")
Signed-off-by: Amit Prakash Shukla
---
drivers/event/cnxk/cn10k_eventdev.c | 70 +
drivers/event/cnxk/cn10k_worker.h| 3 +
drivers/event/cnxk/cn9k_eventdev.c | 67
drivers/event/cnxk/cn9k_worker.h | 3 +
drivers/event/cnxk/cnxk_eventdev.h | 3 +
drivers/event/cnxk/cnxk_eventdev_adptr.c | 97
drivers/event/cnxk/meson.build | 3 +-
7 files changed, 244 insertions(+), 2 deletions(-)
diff --git a/drivers/event/cnxk/cn10k_eventdev.c
b/drivers/event/cnxk/cn10k_eventdev.c
index bb0c910553..498f97ff2e 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -8,6 +8,9 @@
#include "cn10k_cryptodev_ops.h"
#include "cnxk_eventdev.h"
#include "cnxk_worker.h"
+#include "cnxk_dma_event_dp.h"
+
+#include
#define CN10K_SET_EVDEV_DEQ_OP(dev, deq_op, deq_ops)
\
deq_op = deq_ops[dev->rx_offloads & (NIX_RX_OFFLOAD_MAX - 1)]
@@ -477,6 +480,8 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
else
event_dev->ca_enqueue =
cn10k_cpt_sg_ver1_crypto_adapter_enqueue;
+ event_dev->dma_enqueue = cn10k_dma_adapter_enqueue;
+
if (dev->tx_offloads & NIX_TX_MULTI_SEG_F)
CN10K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
sso_hws_tx_adptr_enq_seg);
else
@@ -1020,6 +1025,67 @@ cn10k_crypto_adapter_vec_limits(const struct
rte_eventdev *event_dev,
return 0;
}
+static int
+cn10k_dma_adapter_caps_get(const struct rte_eventdev *event_dev,
+ const int16_t dma_dev_id, uint32_t *caps)
+{
+ struct rte_dma_dev *dma_dev;
+
+ RTE_SET_USED(event_dev);
+
+ dma_dev = rte_dma_pmd_get_dev_by_id(dma_dev_id);
+ if (dma_dev == NULL)
+ return -EINVAL;
+
+ CNXK_VALID_DEV_OR_ERR_RET(dma_dev->device, "cnxk_dmadev_pci_driver",
EINVAL);
+
+ *caps = RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD;
+
+ return 0;
+}
+
+static int
+cn10k_dma_adapter_vchan_add(const struct rte_eventdev *event_dev,
+ const int16_t dma_dev_id, uint16_t vchan_id,
+ const struct rte_event *event)
+{
+ struct rte_dma_dev *dma_dev;
+ int ret;
+
+ RTE_SET_USED(event);
+ dma_dev = rte_dma_pmd_get_dev_by_id(dma_dev_id);
+ if (dma_dev == NULL)
+ return -EINVAL;
+
+ CNXK_VALID_DEV_OR_ERR_RET(dma_dev->device, "cnxk_dmadev_pci_driver",
EINVAL);
+
+ cn10k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
+
+ ret = cnxk_dma_adapter_vchan_add(event_dev, dma_dev_id, vchan_id);
+ cn10k_sso_set_priv_mem(event_dev, NULL);
+
+ return ret;
+}
+
+static int
+cn10k_dma_adapter_vchan_del(const struct rte_eventdev *event_dev,
+ const int16_t dma_dev_id, uint16_t vchan_id)
+{
+ struct rte_dma_dev *dma_dev;
+
+ RTE_SET_USED(event_dev);
+
+ dma_dev = rte_dma_pmd_get_dev_by_id(dma_dev_id);
+ if (dma_dev == NULL)
+ return -EINVAL;
+
+ CNXK_VALID_DEV_OR_ERR_RET(dma_dev->device, "cnxk_dmadev_pci_driver",
EINVAL);
+
+ return cnxk_dma_adapter_vchan_del(dma_dev_id, vchan_id);
+}
+
+
+
static struct eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
@@ -1061,6 +1127,10 @@ static struct eventdev_ops cn10k_sso_dev_ops = {
.crypto_adapter_queue_pair_del = cn10k_crypto_adapter_qp_del,
.crypto_adapter_vector_limits_get = cn10k_crypto_adapter_vec_limits,
+ .dma_adapter_caps_get = cn10k_dma_adapter_caps_get,
+ .dma_adapter_vchan_add = cn10k_dma_adapter_vchan_add,
+ .dma_adapter_vchan_del = cn10k_dma_adapter_vchan_del,
+
.xstats_get = cnxk_sso_xstats_get,
.xstats_reset = cnxk_sso_xstats_reset,
.xstats_get_names = cnxk_sso_xstats_get_names,
diff --git a/drivers/event/cnxk/cn10k_worker.h
b/drivers/event/cnxk/cn10k_worker.h
index 8aa916fa12..0036495d98 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -7,6 +7,7 @@
#include
#include "cn10k_cryptodev_event_dp.h"
+#include "cnxk_dma_event_dp.h"
#include "cn10k_rx.h"
#include "cnxk_worker.h"
#include "cn10k_eventdev.h"
@@ -236,6 +237,8 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws,
uint64_t *u64,
/* Mark vector mempool object as get */
RTE_MEMPOOL_CHECK_COOKIES(rte_mempool_from_obj((void *)u64[1]),
(void **)&u64[1], 1, 1);
+ } else if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_DMADEV) {
+ u64[1] = cnxk_dma_adapter_dequeue(u64[1
RE: Next year of LTSes
Hi, > -Original Message- > From: Luca Boccassi > Sent: 12/7/2023 17:50 > To: dev > Cc: Xueming(Steven) Li ; Kevin Traynor > ; Mcnamara, John ; NBU- > Contact-Thomas Monjalon (EXTERNAL) ; David > Marchand > Subject: Re: Next year of LTSes > > On Thu, 9 Nov 2023 at 10:30, Luca Boccassi wrote: > > > > Hi, > > > > We should start thinking about the next year of LTSes and how to organize. > > > > 20.11 will be EOL after the next upcoming release being prepared now, > > as it's now 3 years old. So long, and thanks for all the fixes. > > > > Currently Kevin is taking care of 21.11 and Xueming of 22.11. > > > > Xueming, what do you think about, from next year (ie, after the > > current set is done) me taking over 22.11, and you switching to 23.11? > > The reason is that Debian uses "even" releases due to release cadence, > > so just like I had vested interest for 20.11 for Debian 11, Debian 12 > > uses 22.11. > > Bumping the thread now that 23.11 is out Luca, thanks for the suggestion, I don't want you to always take the most challengeable branch. Nvidia internally using 22.11 as main development branch, I'd prefer to stick with 22.11. Will let you know once the backport done, so you can take more tests on Debian. How do you think?
Re: [PATCH v2 4/4] net/hns3: use stdatomic API
On 12/8/2023 7:24 AM, Jie Hai wrote: > On 2023/12/8 1:42, Ferruh Yigit wrote: >> On 12/7/2023 1:57 PM, Ferruh Yigit wrote: >>> On 12/7/2023 1:42 AM, Jie Hai wrote: Replace the use of gcc builtin __atomic_xxx intrinsics with corresponding rte_atomic_xxx optional stdatomic API. Signed-off-by: Jie Hai >>> >>> <...> >>> static void @@ -643,8 +643,8 @@ hns3vf_get_push_lsc_cap(struct hns3_hw *hw) uint16_t exp = HNS3_PF_PUSH_LSC_CAP_UNKNOWN; struct hns3_vf *vf = HNS3_DEV_HW_TO_VF(hw); - __atomic_store_n(&vf->pf_push_lsc_cap, HNS3_PF_PUSH_LSC_CAP_UNKNOWN, - __ATOMIC_RELEASE); + rte_atomic_load_explicit(&vf->pf_push_lsc_cap, + HNS3_PF_PUSH_LSC_CAP_UNKNOWN, rte_memory_order_release); >>> >>> I guess intension here is to use 'rte_atomic_store_explicit()', current >>> code cause a build error [1]. >>> >>> [1] >>> https://mails.dpdk.org/archives/test-report/2023-December/525759.html >>> >>> >> Another build error is when stdatomic enabled [2]. >> >> [2] >> meson setup --werror -Denable_stdatomic=true build && ninja -C build >> >> > Hi,Ferruh, > > Thanks, and I will fix it. > > Since both the following two patches[1][2](in different patchsets) uses > __atomic_XXX, > I will keep using __atomic_XX in the patches first. > After the two patches are accepted, resend the fixed patch[3] > and change all __atomic_XX to rte_atomic_XXX. > ack > [1][PATCH] net/hns3: fix VF multiple count on one reset > [2][PATCH] net/hns3: refactor handle mailbox function > [3][PATCH] net/hns3: use stdatomic API > > Best regards, > Jie Hai
Re: [PATCH v4 0/4] net/hns3: refactor mailbox
On 12/8/2023 6:55 AM, Jie Hai wrote: > This patchset refactors mailbox codes. > We will send a patch fix for all __atomic_xxx, so this > patchset still use __atomic_xxx. > > -- > v4: > 1. use __atomic_xxx instead of rte_atomic_XXX. > 2. use '__rte_packed' instead of '#pragma pack()'. > v3: > 1. fix the checkpatch warning on __atomic_xxx. > -- > > Dengdui Huang (4): > net/hns3: refactor VF mailbox message struct > net/hns3: refactor PF mailbox message struct > net/hns3: refactor send mailbox function > net/hns3: refactor handle mailbox function > Series applied to dpdk-next-net/main, thanks.
Re: [PATCH v3 0/3] net/hns3: bugfix on reset
On 12/8/2023 7:44 AM, Jie Hai wrote: > This patchset fixes some bugs on reset, and the replaces > of gcc builtin __atomic_xxx with rte_atomic_xxx is removed > and will send later separately. > > Dengdui Huang (3): > net/hns3: fix VF multiple count on one reset > net/hns3: fix disable command with firmware > net/hns3: fix incorrect reset level comparison > Series applied to dpdk-next-net/main, thanks.
[PATCH] examples/packet_ordering: fix segfault in disable_reorder mode
packet_ordering example works in two modes (--disable-reorder):
- When reorder is enabled: rx_thread - N*worker_thread - send_thread
- When reorder is disabled: rx_thread - N*worker_thread - tx_thread
N parallel worker_thread(s) generate out-of-order packets.
When reorder is enabled, send_thread uses sequence number generated in
rx_thread (Line 459) to enforce packet ordering. Otherwise rx_thread just sends
any packet it receives.
rx_thread writes sequence number into a dynamic field, which is only registered
by calling rte_reorder_create() (Line 741) when reorder is enabled. However,
rx_thread marks sequence number onto each packet no matter whether reorder is
enabled, overwriting the leading bytes in packet mbufs when reorder is
disabled, resulting in segfaults when PMD tries to DMA packets.
if (!disable_reorder) {...} is added to fix the bug.
---
examples/packet_ordering/main.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
index d2fd6f77e4..7688f541ba 100644
--- a/examples/packet_ordering/main.c
+++ b/examples/packet_ordering/main.c
@@ -455,8 +455,11 @@ rx_thread(struct rte_ring *ring_out)
app_stats.rx.rx_pkts += nb_rx_pkts;
/* mark sequence number */
- for (i = 0; i < nb_rx_pkts; )
- *rte_reorder_seqn(pkts[i++]) = seqn++;
+ if (!disable_reorder) {
+ for (i = 0; i < nb_rx_pkts;) {
+ *rte_reorder_seqn(pkts[i++]) =
seqn++;
+ }
+ }
/* enqueue to rx_to_workers ring */
ret = rte_ring_enqueue_burst(ring_out,
--
2.34.1
Re: [PATCH v1] net/memif: remove extra mbuf refcnt update in zero copy Tx
On 12/8/2023 2:38 AM, Liangxing Wang wrote:
> The refcnt update of stored mbufs in memif driver is redundant since
> those mbufs are only freed in eth_memif_tx_zc(). No other place
> can free those stored mbufs quietly. So remove the redundant mbuf
> refcnt update in dpdk memif driver to avoid extra heavy cost.
> Performance of dpdk memif zero copy tx is improved with this change.
>
As mentioned above, since free is called only from 'eth_memif_tx_zc()',
this change looks good to me.
Did you measure the performance improvement, if so can you please share it?
And addition to this being an optimization, it may be a required fix,
can you please check following case:
- When 'memif_tx_one_zc()' called, it has number of free slot
information as parameter
- If the mbuf is chained mbuf, only first mbuf reference is increased
- If number of segment in the mbuf chain is bigger than free slot,
function returns 0
- in this error case 'eth_memif_tx_zc()' breaks the sending look and returns
- In this scenario application gives the decision to either free the
mbuf or re-send it. But for this case application can't free the mbuf
because of reference count which may cause memory leak
- If application decides to re-send, reference count increased again, I
guess eventually 'memif_free_stored_mbufs()' will decrease the refcount
to be able to free it
Assuming above is not done intentionally to make sure all mbufs are sent.
This refcount prevent application discretion to drop packets, so your
change is required to fix this. Can you please double check if I am
missing anything?
> Signed-off-by: Liangxing Wang
> Reviewed-by: Ruifeng Wang
> ---
> drivers/net/memif/rte_eth_memif.c | 6 --
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/memif/rte_eth_memif.c
> b/drivers/net/memif/rte_eth_memif.c
> index 7cc8c0da91..962d390b90 100644
> --- a/drivers/net/memif/rte_eth_memif.c
> +++ b/drivers/net/memif/rte_eth_memif.c
> @@ -265,8 +265,6 @@ memif_free_stored_mbufs(struct pmd_process_private
> *proc_private, struct memif_q
> cur_tail = __atomic_load_n(&ring->tail, __ATOMIC_ACQUIRE);
> while (mq->last_tail != cur_tail) {
> RTE_MBUF_PREFETCH_TO_FREE(mq->buffers[(mq->last_tail + 1) &
> mask]);
> - /* Decrement refcnt and free mbuf. (current segment) */
> - rte_mbuf_refcnt_update(mq->buffers[mq->last_tail & mask], -1);
> rte_pktmbuf_free_seg(mq->buffers[mq->last_tail & mask]);
> mq->last_tail++;
> }
> @@ -825,10 +823,6 @@ memif_tx_one_zc(struct pmd_process_private
> *proc_private, struct memif_queue *mq
> next_in_chain:
> /* store pointer to mbuf to free it later */
> mq->buffers[slot & mask] = mbuf;
> - /* Increment refcnt to make sure the buffer is not freed before server
> - * receives it. (current segment)
> - */
> - rte_mbuf_refcnt_update(mbuf, 1);
> /* populate descriptor */
> d0 = &ring->desc[slot & mask];
> d0->length = rte_pktmbuf_data_len(mbuf);
[RFC v2 00/14] Detect superfluous newline in logs
Getting readable and consistent logs is important when running a DPDK
application, especially when troubleshooting.
A common issue with logs is when a DPDK change do not add (or on the
contrary add too many \n) in the format string.
This issue would only get noticed when actually hitting this log (which
may be a situation hard to reach).
This series proposes to introduce a new RTE_LOG_LINE helper that is
responsible for logging a one line message and spews a build error (with
gcc) if any \n is part of the format string.
Because this is still a RFC and a lot of changes are added in this v2, no ack
from the v1 has been kept.
Since the v1 discussion on the cover letter, I changed my mind, and made the
choice to break existing logging helpers exported in the public API.
The reasoning is that those should not be used in the first place:
logs should be produced only by the library that registers the logtype.
Some multiline logging for debugging and the test assert macros are
still present, but in this case an explicit call to RTE_LOG() is done.
This can be checked with a simple:
$ git grep 'RTE_LOG(' -- lib/ :^lib/log/
lib/acl/acl_bld.c: RTE_LOG(DEBUG, ACL, "Build phase for ACL \"%s\":\n"
lib/acl/acl_gen.c: RTE_LOG(DEBUG, ACL, "Gen phase for ACL \"%s\":\n"
lib/bpf/bpf_validate.c: RTE_LOG(DEBUG, BPF, "%s(%p) stats:\n"
lib/bpf/bpf_validate.c: RTE_LOG(DEBUG, BPF,
lib/eal/common/eal_common_debug.c: RTE_LOG(CRIT, EAL, "Error -
exiting with code: %d\n"
lib/eal/include/rte_test.h: RTE_LOG(ERR, EAL, "Test assert %s line
%d failed: " \
lib/ip_frag/ip_frag_common.h:#defineIP_FRAG_LOG(lvl, fmt, args...)
RTE_LOG(lvl, IPFRAG, fmt, ##args)
lib/sched/rte_sched.c: RTE_LOG(DEBUG, SCHED, "Low level config for pipe
profile %u:\n"
lib/sched/rte_sched.c: RTE_LOG(DEBUG, SCHED, "Low level config for subport
profile %u:\n"
Changes since RFC v1:
- rebased after Stephen log changes,
- added more fixes as I was making progress on the topic,
- added a check so dpdk developers stop using RTE_LOG(),
- added preparation patches, like "lib: replace logging helpers",
- converted all libraries, keeping some special cases with explicit
calls to RTE_LOG,
--
David Marchand
David Marchand (14):
hash: remove some dead code
regexdev: fix logtype register
lib: use dedicated logtypes
lib: add newline in logs
lib: remove redundant newline from logs
eal/linux: remove log paraphrasing the doc
bpf: remove log level in internal helper
lib: simplify multilines log messages
rcu: introduce a logging helper
vhost: improve log for memory dumping configuration
log: add a per line log helper
lib: convert to per line logging
lib: replace logging helpers
lib: use per line logging in helpers
devtools/checkpatches.sh | 8 +
drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 2 +-
lib/acl/acl_bld.c | 28 +-
lib/acl/acl_gen.c | 8 +-
lib/acl/rte_acl.c | 8 +-
lib/acl/tb_mem.c | 4 +-
lib/bbdev/rte_bbdev.c | 11 +-
lib/bpf/bpf.c | 2 +-
lib/bpf/bpf_convert.c | 16 +-
lib/bpf/bpf_exec.c | 12 +-
lib/bpf/bpf_impl.h | 5 +-
lib/bpf/bpf_jit_arm64.c| 8 +-
lib/bpf/bpf_jit_x86.c | 4 +-
lib/bpf/bpf_load.c | 2 +-
lib/bpf/bpf_load_elf.c | 24 +-
lib/bpf/bpf_pkt.c | 4 +-
lib/bpf/bpf_stub.c | 8 +-
lib/bpf/bpf_validate.c | 44 +-
lib/cfgfile/rte_cfgfile.c | 18 +-
lib/compressdev/rte_compressdev_internal.h | 5 +-
lib/compressdev/rte_compressdev_pmd.c | 4 +-
lib/cryptodev/rte_cryptodev.c | 4 +-
lib/cryptodev/rte_cryptodev.h | 16 +-
lib/dispatcher/rte_dispatcher.c| 12 +-
lib/dmadev/rte_dmadev.c| 8 +-
lib/eal/common/eal_common_bus.c| 22 +-
lib/eal/common/eal_common_class.c | 4 +-
lib/eal/common/eal_common_config.c | 2 +-
lib/eal/common/eal_common_debug.c | 6 +-
lib/eal/common/eal_common_dev.c| 80 +-
lib/eal/common/eal_common_devargs.c| 18 +-
lib/eal/common/eal_common_dynmem.c | 34 +-
lib/eal/common/eal_common_fbarray.c| 12 +-
lib/eal/common/eal_common_interrupts.c | 38 +-
lib/eal/common/eal_common_lcore.c | 26 +-
lib/eal/common/eal_common_memalloc.c | 12 +-
lib/eal/common/eal_common_memory.c | 66 +-
lib/eal/common/eal_common_memzone.c| 24 +-
lib/eal/common/eal_common_options.c| 236 +++---
lib/eal/common/eal_common_proc.c | 112 +--
lib/eal/common/eal_common_tailqs.c | 12 +-
lib/eal/common/eal_common_thread.c
[RFC v2 01/14] hash: remove some dead code
This macro is not used.
Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
lib/hash/rte_cuckoo_hash.h | 11 ---
1 file changed, 11 deletions(-)
diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
index f7afc4dd79..8ea793c66e 100644
--- a/lib/hash/rte_cuckoo_hash.h
+++ b/lib/hash/rte_cuckoo_hash.h
@@ -29,17 +29,6 @@
#define RETURN_IF_TRUE(cond, retval)
#endif
-#if defined(RTE_LIBRTE_HASH_DEBUG)
-#define ERR_IF_TRUE(cond, fmt, args...) do { \
- if (cond) { \
- RTE_LOG(ERR, HASH, fmt, ##args); \
- return; \
- } \
-} while (0)
-#else
-#define ERR_IF_TRUE(cond, fmt, args...)
-#endif
-
#include
#include
--
2.43.0
[RFC v2 02/14] regexdev: fix logtype register
This library logtype was not initialized so its logs would end up under
the 0 logtype, iow, RTE_LOGTYPE_EAL.
Fixes: b25246beaefc ("regexdev: add core functions")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
lib/regexdev/rte_regexdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index caec069182..d38a85eb0b 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -19,7 +19,7 @@ static struct {
struct rte_regexdev_data data[RTE_MAX_REGEXDEV_DEVS];
} *rte_regexdev_shared_data;
-int rte_regexdev_logtype;
+RTE_LOG_REGISTER_DEFAULT(rte_regexdev_logtype, INFO);
static uint16_t
regexdev_find_free_dev(void)
--
2.43.0
[RFC v2 03/14] lib: use dedicated logtypes
No printf!
When a dedicated log helper exists, use it.
And no usurpation please: a library should log under its logtype
(see the eventdev rx adapter update for example).
Note: the RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET macro is renamed for
consistency with the rest of eventdev (private) macros.
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
lib/cryptodev/rte_cryptodev.c | 2 +-
lib/ethdev/ethdev_driver.c | 4 ++--
lib/ethdev/ethdev_private.c | 2 +-
lib/ethdev/rte_class_eth.c | 2 +-
lib/eventdev/rte_event_dma_adapter.c| 4 ++--
lib/eventdev/rte_event_eth_rx_adapter.c | 12 ++--
lib/eventdev/rte_eventdev.c | 6 +++---
lib/mempool/rte_mempool_ops.c | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index b258827734..d8769f0b8d 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2682,7 +2682,7 @@ rte_cryptodev_driver_id_get(const char *name)
int driver_id = -1;
if (name == NULL) {
- RTE_LOG(DEBUG, CRYPTODEV, "name pointer NULL");
+ CDEV_LOG_DEBUG("name pointer NULL");
return -1;
}
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index fff4b7b4cd..55a9dcc565 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -487,7 +487,7 @@ rte_eth_devargs_parse(const char *dargs, struct
rte_eth_devargs *eth_da)
pair = &args.pairs[i];
if (strcmp("representor", pair->key) == 0) {
if (eth_da->type != RTE_ETH_REPRESENTOR_NONE) {
- RTE_LOG(ERR, EAL, "duplicated representor key:
%s\n",
+ RTE_ETHDEV_LOG(ERR, "duplicated representor
key: %s\n",
dargs);
result = -1;
goto parse_cleanup;
@@ -713,7 +713,7 @@ rte_eth_representor_id_get(uint16_t port_id,
if (info->ranges[i].controller != controller)
continue;
if (info->ranges[i].id_end < info->ranges[i].id_base) {
- RTE_LOG(WARNING, EAL, "Port %hu invalid representor ID
Range %u - %u, entry %d\n",
+ RTE_ETHDEV_LOG(WARNING, "Port %hu invalid representor
ID Range %u - %u, entry %d\n",
port_id, info->ranges[i].id_base,
info->ranges[i].id_end, i);
continue;
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index e98b7188b0..0e1c7b23c1 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -182,7 +182,7 @@ rte_eth_devargs_parse_representor_ports(char *str, void
*data)
RTE_DIM(eth_da->representor_ports));
done:
if (str == NULL)
- RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);
+ RTE_ETHDEV_LOG(ERR, "wrong representor format: %s\n", str);
return str == NULL ? -1 : 0;
}
diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
index b61dae849d..311beb17cb 100644
--- a/lib/ethdev/rte_class_eth.c
+++ b/lib/ethdev/rte_class_eth.c
@@ -165,7 +165,7 @@ eth_dev_iterate(const void *start,
valid_keys = eth_params_keys;
kvargs = rte_kvargs_parse(str, valid_keys);
if (kvargs == NULL) {
- RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ RTE_ETHDEV_LOG(ERR, "cannot parse argument list\n");
rte_errno = EINVAL;
return NULL;
}
diff --git a/lib/eventdev/rte_event_dma_adapter.c
b/lib/eventdev/rte_event_dma_adapter.c
index af4b5ad388..cbf9405438 100644
--- a/lib/eventdev/rte_event_dma_adapter.c
+++ b/lib/eventdev/rte_event_dma_adapter.c
@@ -1046,7 +1046,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t
dma_dev_id, uint16_t vchan,
sizeof(struct
dma_vchan_info),
0, adapter->socket_id);
if (dev_info->vchanq == NULL) {
- printf("Queue pair add not supported\n");
+ RTE_EDEV_LOG_ERR("Queue pair add not
supported");
return -ENOMEM;
}
}
@@ -1057,7 +1057,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t
dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->tqmap == NULL) {
- printf("tq pair add not supported\n");
+
[RFC v2 05/14] lib: remove redundant newline from logs
Fix places where two newline characters may be logged.
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
Changes since RFC v1:
- split fixes on direct calls to printf or RTE_LOG in a previous patch,
---
drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 2 +-
lib/bbdev/rte_bbdev.c | 6 +-
lib/cfgfile/rte_cfgfile.c | 14 ++--
lib/compressdev/rte_compressdev_pmd.c | 4 +-
lib/cryptodev/rte_cryptodev.c | 2 +-
lib/dispatcher/rte_dispatcher.c | 12 +--
lib/dmadev/rte_dmadev.c | 2 +-
lib/eal/windows/eal_memory.c| 2 +-
lib/eventdev/eventdev_pmd.h | 6 +-
lib/eventdev/rte_event_crypto_adapter.c | 12 +--
lib/eventdev/rte_event_dma_adapter.c| 14 ++--
lib/eventdev/rte_event_eth_rx_adapter.c | 28 +++
lib/eventdev/rte_event_eth_tx_adapter.c | 2 +-
lib/eventdev/rte_event_timer_adapter.c | 4 +-
lib/eventdev/rte_eventdev.c | 4 +-
lib/metrics/rte_metrics_telemetry.c | 2 +-
lib/mldev/rte_mldev.c | 102
lib/net/rte_net_crc.c | 6 +-
lib/node/ethdev_rx.c| 4 +-
lib/node/ip4_lookup.c | 2 +-
lib/node/ip6_lookup.c | 2 +-
lib/node/kernel_rx.c| 8 +-
lib/node/kernel_tx.c| 4 +-
lib/rcu/rte_rcu_qsbr.c | 4 +-
lib/rcu/rte_rcu_qsbr.h | 8 +-
lib/stack/rte_stack.c | 8 +-
lib/vhost/vhost_crypto.c| 6 +-
27 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 52d6d010c7..f21f9cc5a0 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -407,7 +407,7 @@ ipsec_mb_ipc_request(const struct rte_mp_msg *mp_msg, const
void *peer)
resp_param->result = ipsec_mb_qp_release(dev, qp_id);
break;
default:
- CDEV_LOG_ERR("invalid mp request type\n");
+ CDEV_LOG_ERR("invalid mp request type");
}
out:
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index cfebea09c7..e09bb97abb 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -1106,12 +1106,12 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t
queue_id, int epfd, int op,
intr_handle = dev->intr_handle;
if (intr_handle == NULL) {
- rte_bbdev_log(ERR, "Device %u intr handle unset\n", dev_id);
+ rte_bbdev_log(ERR, "Device %u intr handle unset", dev_id);
return -ENOTSUP;
}
if (queue_id >= RTE_MAX_RXTX_INTR_VEC_ID) {
- rte_bbdev_log(ERR, "Device %u queue_id %u is too big\n",
+ rte_bbdev_log(ERR, "Device %u queue_id %u is too big",
dev_id, queue_id);
return -ENOTSUP;
}
@@ -1120,7 +1120,7 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t
queue_id, int epfd, int op,
ret = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data);
if (ret && (ret != -EEXIST)) {
rte_bbdev_log(ERR,
- "dev %u q %u int ctl error op %d epfd %d vec
%u\n",
+ "dev %u q %u int ctl error op %d epfd %d vec
%u",
dev_id, queue_id, op, epfd, vec);
return ret;
}
diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
index eefba6e408..2f9cc0722a 100644
--- a/lib/cfgfile/rte_cfgfile.c
+++ b/lib/cfgfile/rte_cfgfile.c
@@ -137,7 +137,7 @@ rte_cfgfile_check_params(const struct
rte_cfgfile_parameters *params)
unsigned int i;
if (!params) {
- CFG_LOG(ERR, "missing cfgfile parameters\n");
+ CFG_LOG(ERR, "missing cfgfile parameters");
return -EINVAL;
}
@@ -150,7 +150,7 @@ rte_cfgfile_check_params(const struct
rte_cfgfile_parameters *params)
}
if (valid_comment == 0) {
- CFG_LOG(ERR, "invalid comment characters %c\n",
+ CFG_LOG(ERR, "invalid comment characters %c",
params->comment_character);
return -ENOTSUP;
}
@@ -188,7 +188,7 @@ rte_cfgfile_load_with_params(const char *filename, int
flags,
lineno++;
if ((len >= sizeof(buffer) - 1) && (buffer[len-1] != '\n')) {
CFG_LOG(ERR, " line %d - no \\n found on string. "
- "Check if line too long\n", lineno);
+ "Check if line too long", lineno);
goto error1;
}
/* skip parsing if comment character found */
@@ -209,7 +209,7 @@ rte_cfgfile_load_with_params(const char *filename, int
flags,
[RFC v2 04/14] lib: add newline in logs
Fix places leading to a log message not terminated with a newline.
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
lib/eal/common/eal_common_options.c | 2 +-
lib/eal/linux/eal_hugepage_info.c | 2 +-
lib/eal/linux/eal_interrupts.c | 2 +-
lib/ethdev/ethdev_pci.h | 2 +-
lib/ethdev/rte_ethdev.c | 40 ++---
lib/lpm/rte_lpm6.c | 6 ++---
lib/power/guest_channel.c | 2 +-
lib/power/rte_power_pmd_mgmt.c | 6 ++---
8 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/lib/eal/common/eal_common_options.c
b/lib/eal/common/eal_common_options.c
index a6d21f1cba..e9ba01fb89 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -2141,7 +2141,7 @@ rte_vect_set_max_simd_bitwidth(uint16_t bitwidth)
struct internal_config *internal_conf =
eal_get_internal_configuration();
if (internal_conf->max_simd_bitwidth.forced) {
- RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user
runtime override enabled");
+ RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user
runtime override enabled\n");
return -EPERM;
}
diff --git a/lib/eal/linux/eal_hugepage_info.c
b/lib/eal/linux/eal_hugepage_info.c
index 581d9dfc91..36a495fb1f 100644
--- a/lib/eal/linux/eal_hugepage_info.c
+++ b/lib/eal/linux/eal_hugepage_info.c
@@ -403,7 +403,7 @@ inspect_hugedir_cb(const struct walk_hugedir_data *whd)
struct stat st;
if (fstat(whd->file_fd, &st) < 0)
- RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s",
+ RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s\n",
__func__, whd->file_name, strerror(errno));
else
(*total_size) += st.st_size;
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d4919dff45..eabac24992 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -1542,7 +1542,7 @@ rte_intr_efd_enable(struct rte_intr_handle *intr_handle,
uint32_t nb_efd)
/* only check, initialization would be done in vdev driver.*/
if ((uint64_t)rte_intr_efd_counter_size_get(intr_handle) >
sizeof(union rte_intr_read_buffer)) {
- RTE_LOG(ERR, EAL, "the efd_counter_size is oversized");
+ RTE_LOG(ERR, EAL, "the efd_counter_size is
oversized\n");
return -EINVAL;
}
} else {
diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
index 320e3e0093..ddb559aa95 100644
--- a/lib/ethdev/ethdev_pci.h
+++ b/lib/ethdev/ethdev_pci.h
@@ -31,7 +31,7 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
struct rte_pci_device *pci_dev)
{
if ((eth_dev == NULL) || (pci_dev == NULL)) {
- RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p",
+ RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p\n",
(void *)eth_dev, (void *)pci_dev);
return;
}
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 3858983fcc..b9d99ece15 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -724,7 +724,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t
*port_id)
uint16_t pid;
if (name == NULL) {
- RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name");
+ RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name\n");
return -EINVAL;
}
@@ -2394,41 +2394,41 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id,
uint16_t rx_queue_id,
nb_rx_desc = cap.max_nb_desc;
if (nb_rx_desc > cap.max_nb_desc) {
RTE_ETHDEV_LOG(ERR,
- "Invalid value for nb_rx_desc(=%hu), should be: <= %hu",
+ "Invalid value for nb_rx_desc(=%hu), should be: <=
%hu\n",
nb_rx_desc, cap.max_nb_desc);
return -EINVAL;
}
if (conf->peer_count > cap.max_rx_2_tx) {
RTE_ETHDEV_LOG(ERR,
- "Invalid value for number of peers for Rx queue(=%u),
should be: <= %hu",
+ "Invalid value for number of peers for Rx queue(=%u),
should be: <= %hu\n",
conf->peer_count, cap.max_rx_2_tx);
return -EINVAL;
}
if (conf->use_locked_device_memory && !cap.rx_cap.locked_device_memory)
{
RTE_ETHDEV_LOG(ERR,
- "Attempt to use locked device memory for Rx queue,
which is not supported");
+ "Attempt to use locked device memory for Rx queue,
which is not supported\n");
return -EINVAL;
}
if (conf->use_rte_memory && !cap.rx_cap.rte_memory) {
RTE_ETHDEV_LOG(ERR
[RFC v2 06/14] eal/linux: remove log paraphrasing the doc
An error log message does not need to paraphrase the DPDK documentation.
Signed-off-by: David Marchand
---
lib/eal/linux/eal_timer.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
index 3a30284e3a..df9ad61ae9 100644
--- a/lib/eal/linux/eal_timer.c
+++ b/lib/eal/linux/eal_timer.c
@@ -152,11 +152,7 @@ rte_eal_hpet_init(int make_default)
}
eal_hpet = mmap(NULL, 1024, PROT_READ, MAP_SHARED, fd, 0);
if (eal_hpet == MAP_FAILED) {
- RTE_LOG(ERR, EAL, "ERROR: Cannot mmap "DEV_HPET"!\n"
- "Please enable CONFIG_HPET_MMAP in your kernel
configuration "
- "to allow HPET support.\n"
- "To run without using HPET, unset
RTE_LIBEAL_USE_HPET "
- "in your build configuration or use '--no-hpet'
EAL flag.\n");
+ RTE_LOG(ERR, EAL, "ERROR: Cannot mmap "DEV_HPET"!\n");
close(fd);
internal_conf->no_hpet = 1;
return -1;
--
2.43.0
[RFC v2 07/14] bpf: remove log level in internal helper
There is no other log level than debug, simplify this helper.
Signed-off-by: David Marchand
---
lib/bpf/bpf_validate.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
index 95b9ef99ef..f246b3c5eb 100644
--- a/lib/bpf/bpf_validate.c
+++ b/lib/bpf/bpf_validate.c
@@ -2178,18 +2178,18 @@ restore_eval_state(struct bpf_verifier *bvf, struct
inst_node *node)
}
static void
-log_eval_state(const struct bpf_verifier *bvf, const struct ebpf_insn *ins,
- uint32_t pc, int32_t loglvl)
+log_dbg_eval_state(const struct bpf_verifier *bvf, const struct ebpf_insn *ins,
+ uint32_t pc)
{
const struct bpf_eval_state *st;
const struct bpf_reg_val *rv;
- rte_log(loglvl, rte_bpf_logtype, "%s(pc=%u):\n", __func__, pc);
+ RTE_BPF_LOG(DEBUG, "%s(pc=%u):\n", __func__, pc);
st = bvf->evst;
rv = st->rv + ins->dst_reg;
- rte_log(loglvl, rte_bpf_logtype,
+ RTE_BPF_LOG(DEBUG,
"r%u={\n"
"\tv={type=%u, size=%zu},\n"
"\tmask=0x%" PRIx64 ",\n"
@@ -2269,7 +2269,7 @@ evaluate(struct bpf_verifier *bvf)
}
}
- log_eval_state(bvf, ins + idx, idx, RTE_LOG_DEBUG);
+ log_dbg_eval_state(bvf, ins + idx, idx);
bvf->evin = NULL;
}
--
2.43.0
[RFC v2 08/14] lib: simplify multilines log messages
Those error log messages don't need to span on multiple lines.
Signed-off-by: David Marchand
---
lib/acl/tb_mem.c| 2 +-
lib/bpf/bpf_stub.c | 4 ++--
lib/eal/windows/eal_hugepages.c | 4 ++--
lib/ethdev/rte_ethdev.c | 14 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c
index 6a9d96aaed..238d65692a 100644
--- a/lib/acl/tb_mem.c
+++ b/lib/acl/tb_mem.c
@@ -26,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)
size = sz + pool->alignment - 1;
block = calloc(1, size + sizeof(*pool->block));
if (block == NULL) {
- RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated "
+ RTE_LOG(ERR, ACL, "%s(%zu) failed, currently allocated "
"by pool: %zu bytes\n", __func__, sz, pool->alloc);
siglongjmp(pool->fail, -ENOMEM);
return NULL;
diff --git a/lib/bpf/bpf_stub.c b/lib/bpf/bpf_stub.c
index ebc5343896..e9f23304bc 100644
--- a/lib/bpf/bpf_stub.c
+++ b/lib/bpf/bpf_stub.c
@@ -19,7 +19,7 @@ rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char
*fname,
return NULL;
}
- RTE_BPF_LOG(ERR, "%s() is not supported with current config\n"
+ RTE_BPF_LOG(ERR, "%s() is not supported with current config, "
"rebuild with libelf installed\n",
__func__);
rte_errno = ENOTSUP;
@@ -36,7 +36,7 @@ rte_bpf_convert(const struct bpf_program *prog)
return NULL;
}
- RTE_BPF_LOG(ERR, "%s() is not supported with current config\n"
+ RTE_BPF_LOG(ERR, "%s() is not supported with current config, "
"rebuild with libpcap installed\n",
__func__);
rte_errno = ENOTSUP;
diff --git a/lib/eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
index b007dceb39..701cd0cb08 100644
--- a/lib/eal/windows/eal_hugepages.c
+++ b/lib/eal/windows/eal_hugepages.c
@@ -105,8 +105,8 @@ int
eal_hugepage_info_init(void)
{
if (hugepage_claim_privilege() < 0) {
- RTE_LOG(ERR, EAL, "Cannot claim hugepage privilege\n"
- "Verify that large-page support privilege is assigned to the
current user\n");
+ RTE_LOG(ERR, EAL, "Cannot claim hugepage privilege, "
+ "verify that large-page support privilege is assigned to the
current user\n");
return -1;
}
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index b9d99ece15..b21764e6fa 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -6709,8 +6709,8 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id,
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
- "Device with port_id=%u is not configured.\n"
- "Cannot get IP reassembly capability\n",
+ "Device with port_id=%u is not configured, "
+ "cannot get IP reassembly capability\n",
port_id);
return -EINVAL;
}
@@ -6745,8 +6745,8 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id,
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
- "Device with port_id=%u is not configured.\n"
- "Cannot get IP reassembly configuration\n",
+ "Device with port_id=%u is not configured, "
+ "cannot get IP reassembly configuration\n",
port_id);
return -EINVAL;
}
@@ -6779,15 +6779,15 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id,
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
- "Device with port_id=%u is not configured.\n"
- "Cannot set IP reassembly configuration\n",
+ "Device with port_id=%u is not configured, "
+ "cannot set IP reassembly configuration\n",
port_id);
return -EINVAL;
}
if (dev->data->dev_started != 0) {
RTE_ETHDEV_LOG(ERR,
- "Device with port_id=%u started,\n"
+ "Device with port_id=%u started, "
"cannot configure IP reassembly params.\n",
port_id);
return -EINVAL;
--
2.43.0
[RFC v2 09/14] rcu: introduce a logging helper
Signed-off-by: David Marchand
---
lib/rcu/rte_rcu_qsbr.c | 62 --
lib/rcu/rte_rcu_qsbr.h | 1 +
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index 41a44be4b9..5b6530788a 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -19,6 +19,9 @@
#include "rte_rcu_qsbr.h"
#include "rcu_qsbr_pvt.h"
+#define RCU_LOG(level, fmt, args...) \
+ RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args)
+
/* Get the memory size of QSBR variable */
size_t
rte_rcu_qsbr_get_memsize(uint32_t max_threads)
@@ -26,9 +29,7 @@ rte_rcu_qsbr_get_memsize(uint32_t max_threads)
size_t sz;
if (max_threads == 0) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid max_threads %u\n",
- __func__, max_threads);
+ RCU_LOG(ERR, "Invalid max_threads %u", max_threads);
rte_errno = EINVAL;
return 1;
@@ -52,8 +53,7 @@ rte_rcu_qsbr_init(struct rte_rcu_qsbr *v, uint32_t
max_threads)
size_t sz;
if (v == NULL) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return 1;
@@ -85,8 +85,7 @@ rte_rcu_qsbr_thread_register(struct rte_rcu_qsbr *v, unsigned
int thread_id)
uint64_t old_bmap, new_bmap;
if (v == NULL || thread_id >= v->max_threads) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return 1;
@@ -137,8 +136,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr *v,
unsigned int thread_id)
uint64_t old_bmap, new_bmap;
if (v == NULL || thread_id >= v->max_threads) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return 1;
@@ -211,8 +209,7 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v)
uint32_t i, t, id;
if (v == NULL || f == NULL) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return 1;
@@ -282,8 +279,7 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
(params->esize % 4 != 0)) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return NULL;
@@ -293,9 +289,10 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
*/
if ((params->trigger_reclaim_limit <= params->size) &&
(params->max_reclaim_size == 0)) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter, size = %u,
trigger_reclaim_limit = %u, max_reclaim_size = %u\n",
- __func__, params->size, params->trigger_reclaim_limit,
+ RCU_LOG(ERR,
+ "Invalid input parameter, size = %u,
trigger_reclaim_limit = %u, "
+ "max_reclaim_size = %u",
+ params->size, params->trigger_reclaim_limit,
params->max_reclaim_size);
rte_errno = EINVAL;
@@ -328,8 +325,7 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
__RTE_QSBR_TOKEN_SIZE + params->esize,
qs_fifo_size, SOCKET_ID_ANY, flags);
if (dq->r == NULL) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): defer queue create failed\n", __func__);
+ RCU_LOG(ERR, "defer queue create failed");
rte_free(dq);
return NULL;
}
@@ -354,8 +350,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
uint32_t cur_size;
if (dq == NULL || e == NULL) {
- rte_log(RTE_LOG_ERR, rte_rcu_log_type,
- "%s(): Invalid input parameter\n", __func__);
+ RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
return 1;
@@ -372,8 +367,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
*/
cur_size
[RFC v2 11/14] log: add a per line log helper
gcc builtin __builtin_strchr can be used as a static assertion to check
whether passed format strings contain a \n.
This can be useful to detect double \n in log messages.
Signed-off-by: David Marchand
---
Changes since RFC v1:
- added a check in checkpatches.sh,
---
devtools/checkpatches.sh | 8
lib/log/rte_log.h| 21 +
2 files changed, 29 insertions(+)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 10b79ca2bc..10d1bf490b 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -53,6 +53,14 @@ print_usage () {
check_forbidden_additions() { #
res=0
+ # refrain from new calls to RTE_LOG
+ awk -v FOLDERS="lib" \
+ -v EXPRESSIONS="RTE_LOG\\\(" \
+ -v RET_ON_FAIL=1 \
+ -v MESSAGE='Prefer RTE_LOG_LINE' \
+ -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+ "$1" || res=1
+
# refrain from new additions of rte_panic() and rte_exit()
# multiple folders and expressions are separated by spaces
awk -v FOLDERS="lib drivers" \
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 27fb6129a7..da7e672e81 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -17,6 +17,7 @@
extern "C" {
#endif
+#include
#include
#include
#include
@@ -358,6 +359,26 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \
0)
+#ifdef RTE_TOOLCHAIN_GCC
+#define RTE_LOG_CHECK_NO_NEWLINE(fmt) \
+ static_assert(!__builtin_strchr(fmt, '\n'), \
+ "This log format string contains a \\n")
+#else
+#define RTE_LOG_CHECK_NO_NEWLINE(...)
+#endif
+
+#define RTE_LOG_LINE(l, t, ...) do { \
+ RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__,)); \
+ RTE_LOG(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+} while (0)
+
+#define RTE_LOG_DP_LINE(l, t, ...) do { \
+ RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__,)); \
+ RTE_LOG_DP(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+} while (0)
+
#define RTE_LOG_REGISTER_IMPL(type, name, level) \
int type; \
RTE_INIT(__##type) \
--
2.43.0
[RFC v2 10/14] vhost: improve log for memory dumping configuration
Add the device name as a prefix of logs associated to madvise() calls.
Signed-off-by: David Marchand
---
lib/vhost/iotlb.c | 18 +-
lib/vhost/vhost.h | 2 +-
lib/vhost/vhost_user.c | 26 +-
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/vhost/iotlb.c b/lib/vhost/iotlb.c
index 87ac0e5126..10ab77262e 100644
--- a/lib/vhost/iotlb.c
+++ b/lib/vhost/iotlb.c
@@ -54,16 +54,16 @@ vhost_user_iotlb_share_page(struct vhost_iotlb_entry *a,
struct vhost_iotlb_entr
}
static void
-vhost_user_iotlb_set_dump(struct vhost_iotlb_entry *node)
+vhost_user_iotlb_set_dump(struct virtio_net *dev, struct vhost_iotlb_entry
*node)
{
uint64_t start;
start = node->uaddr + node->uoffset;
- mem_set_dump((void *)(uintptr_t)start, node->size, true,
RTE_BIT64(node->page_shift));
+ mem_set_dump(dev, (void *)(uintptr_t)start, node->size, true,
RTE_BIT64(node->page_shift));
}
static void
-vhost_user_iotlb_clear_dump(struct vhost_iotlb_entry *node,
+vhost_user_iotlb_clear_dump(struct virtio_net *dev, struct vhost_iotlb_entry
*node,
struct vhost_iotlb_entry *prev, struct vhost_iotlb_entry *next)
{
uint64_t start, end;
@@ -80,7 +80,7 @@ vhost_user_iotlb_clear_dump(struct vhost_iotlb_entry *node,
end = RTE_ALIGN_FLOOR(end, RTE_BIT64(node->page_shift));
if (end > start)
- mem_set_dump((void *)(uintptr_t)start, end - start, false,
+ mem_set_dump(dev, (void *)(uintptr_t)start, end - start, false,
RTE_BIT64(node->page_shift));
}
@@ -204,7 +204,7 @@ vhost_user_iotlb_cache_remove_all(struct virtio_net *dev)
vhost_user_iotlb_wr_lock_all(dev);
RTE_TAILQ_FOREACH_SAFE(node, &dev->iotlb_list, next, temp_node) {
- vhost_user_iotlb_clear_dump(node, NULL, NULL);
+ vhost_user_iotlb_clear_dump(dev, node, NULL, NULL);
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
@@ -230,7 +230,7 @@ vhost_user_iotlb_cache_random_evict(struct virtio_net *dev)
if (!entry_idx) {
struct vhost_iotlb_entry *next_node =
RTE_TAILQ_NEXT(node, next);
- vhost_user_iotlb_clear_dump(node, prev_node, next_node);
+ vhost_user_iotlb_clear_dump(dev, node, prev_node,
next_node);
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
@@ -285,7 +285,7 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev,
uint64_t iova, uint64_t ua
vhost_user_iotlb_pool_put(dev, new_node);
goto unlock;
} else if (node->iova > new_node->iova) {
- vhost_user_iotlb_set_dump(new_node);
+ vhost_user_iotlb_set_dump(dev, new_node);
TAILQ_INSERT_BEFORE(node, new_node, next);
dev->iotlb_cache_nr++;
@@ -293,7 +293,7 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev,
uint64_t iova, uint64_t ua
}
}
- vhost_user_iotlb_set_dump(new_node);
+ vhost_user_iotlb_set_dump(dev, new_node);
TAILQ_INSERT_TAIL(&dev->iotlb_list, new_node, next);
dev->iotlb_cache_nr++;
@@ -322,7 +322,7 @@ vhost_user_iotlb_cache_remove(struct virtio_net *dev,
uint64_t iova, uint64_t si
if (iova < node->iova + node->size) {
struct vhost_iotlb_entry *next_node =
RTE_TAILQ_NEXT(node, next);
- vhost_user_iotlb_clear_dump(node, prev_node, next_node);
+ vhost_user_iotlb_clear_dump(dev, node, prev_node,
next_node);
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index f8624fba3d..5f24911190 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -1062,6 +1062,6 @@ mbuf_is_consumed(struct rte_mbuf *m)
return true;
}
-void mem_set_dump(void *ptr, size_t size, bool enable, uint64_t alignment);
+void mem_set_dump(struct virtio_net *dev, void *ptr, size_t size, bool enable,
uint64_t alignment);
#endif /* _VHOST_NET_CDEV_H_ */
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index e36312181a..413f068bcd 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -763,7 +763,7 @@ hua_to_alignment(struct rte_vhost_memory *mem, void *ptr)
}
void
-mem_set_dump(void *ptr, size_t size, bool enable, uint64_t pagesz)
+mem_set_dump(struct virtio_net *dev, void *ptr, size_t size, bool enable,
uint64_t pagesz)
{
#ifdef MADV_DONTDUMP
void *start = RTE_PTR_ALIGN_FLOOR(ptr, pagesz);
@@ -771,8 +771,8 @@ mem_set_dump(void *ptr, size_t size, bool enable, uint64_t
pagesz)
size_t
[RFC v2 14/14] lib: use per line logging in helpers
Use RTE_LOG_LINE in existing macros that append a \n.
Signed-off-by: David Marchand
---
Changes since RFC v1:
- converted all logging helpers in lib/,
---
lib/bbdev/rte_bbdev.c | 5 +++--
lib/bpf/bpf_impl.h | 2 +-
lib/cfgfile/rte_cfgfile.c | 4 ++--
lib/compressdev/rte_compressdev_internal.h | 5 +++--
lib/cryptodev/rte_cryptodev.h | 16 +++-
lib/dmadev/rte_dmadev.c| 6 --
lib/ethdev/rte_ethdev.h| 3 +--
lib/eventdev/eventdev_pmd.h| 8
lib/eventdev/rte_event_timer_adapter.c | 17 ++---
lib/gpudev/gpudev.c| 6 --
lib/graph/graph_private.h | 5 +++--
lib/member/member.h| 4 ++--
lib/metrics/rte_metrics_telemetry.c| 4 ++--
lib/mldev/rte_mldev.h | 5 +++--
lib/net/rte_net_crc.c | 8
lib/node/node_private.h| 6 --
lib/pdump/rte_pdump.c | 5 ++---
lib/power/power_common.h | 2 +-
lib/rawdev/rte_rawdev_pmd.h| 4 ++--
lib/rcu/rte_rcu_qsbr.h | 8 +++-
lib/regexdev/rte_regexdev.h| 3 +--
lib/stack/stack_pvt.h | 4 ++--
lib/telemetry/telemetry.c | 4 +---
lib/vhost/vhost.h | 8
lib/vhost/vhost_crypto.c | 6 +++---
25 files changed, 76 insertions(+), 72 deletions(-)
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index e09bb97abb..13bde3c25b 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -28,10 +28,11 @@
/* BBDev library logging ID */
RTE_LOG_REGISTER_DEFAULT(bbdev_logtype, NOTICE);
+#define RTE_LOGTYPE_BBDEV bbdev_logtype
/* Helper macro for logging */
-#define rte_bbdev_log(level, fmt, ...) \
- rte_log(RTE_LOG_ ## level, bbdev_logtype, fmt "\n", ##__VA_ARGS__)
+#define rte_bbdev_log(level, ...) \
+ RTE_LOG_LINE(level, BBDEV, "" __VA_ARGS__)
#define rte_bbdev_log_debug(fmt, ...) \
rte_bbdev_log(DEBUG, RTE_STR(__LINE__) ":%s() " fmt, __func__, \
diff --git a/lib/bpf/bpf_impl.h b/lib/bpf/bpf_impl.h
index 30d83d2b40..17f38faec1 100644
--- a/lib/bpf/bpf_impl.h
+++ b/lib/bpf/bpf_impl.h
@@ -30,7 +30,7 @@ extern int rte_bpf_logtype;
#define RTE_LOGTYPE_BPF rte_bpf_logtype
#defineBPF_LOG(lvl, fmt, args...) \
- RTE_LOG(lvl, BPF, fmt "\n", ##args)
+ RTE_LOG_LINE(lvl, BPF, fmt, ##args)
static inline size_t
bpf_size(uint32_t bpf_op_sz)
diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
index 2f9cc0722a..6a5e4fd942 100644
--- a/lib/cfgfile/rte_cfgfile.c
+++ b/lib/cfgfile/rte_cfgfile.c
@@ -29,10 +29,10 @@ struct rte_cfgfile {
/* Setting up dynamic logging 8< */
RTE_LOG_REGISTER_DEFAULT(cfgfile_logtype, INFO);
+#define RTE_LOGTYPE_CFGFILE cfgfile_logtype
#define CFG_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, cfgfile_logtype, "%s(): " fmt "\n", \
- __func__, ## args)
+ RTE_LOG_LINE(level, CFGFILE, "%s(): " fmt, __func__, ## args)
/* >8 End of setting up dynamic logging */
/** when we resize a file structure, how many extra entries
diff --git a/lib/compressdev/rte_compressdev_internal.h
b/lib/compressdev/rte_compressdev_internal.h
index b3b193e3ee..01b7764282 100644
--- a/lib/compressdev/rte_compressdev_internal.h
+++ b/lib/compressdev/rte_compressdev_internal.h
@@ -21,9 +21,10 @@ extern "C" {
/* Logging Macros */
extern int compressdev_logtype;
+#define RTE_LOGTYPE_COMPRESSDEV compressdev_logtype
+
#define COMPRESSDEV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, compressdev_logtype, "%s(): " fmt "\n", \
- __func__, ##args)
+ RTE_LOG_LINE(level, COMPRESSDEV, "%s(): " fmt, __func__, ## args)
/**
* Dequeue processed packets from queue pair of a device.
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index aaeaf294e6..563f011299 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -31,23 +31,21 @@ extern const char **rte_cyptodev_names;
/* Logging Macros */
#define CDEV_LOG_ERR(...) \
- RTE_LOG(ERR, CRYPTODEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+ RTE_LOG_LINE(ERR, CRYPTODEV, \
+ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,), \
__func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
#define CDEV_LOG_INFO(...) \
- RTE_LOG(INFO, CRYPTODEV, \
- RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(INFO, CRYPTODEV, "" __VA_ARGS__)
#define CDEV_LOG_DEBUG(...) \
- RTE_LOG(DEBUG, CRYPTODEV, \
- RTE_FMT("%s() line %u: "
Re: [PATCH 1/1] Modified Programmer's Guide index for better organization and readability
Signed-off-by: David Young
Thanks!
David Young
Professional Copywriter/Technical Writer
Young Copy
+1 (678) 500-9550
https://www.youngcopy.com
On Thu, Dec 7, 2023 at 9:11 PM David Young wrote:
> ---
> doc/guides/prog_guide/bpf_lib.rst | 4 +-
> doc/guides/prog_guide/dmadev.rst | 6 +-
> doc/guides/prog_guide/efd_lib.rst | 4 +-
> .../prog_guide/env_abstraction_layer.rst | 4 +-
> doc/guides/prog_guide/ethdev/index.rst| 12 ++
> .../prog_guide/{ => ethdev}/poll_mode_drv.rst | 0
> .../prog_guide/{ => ethdev}/qos_framework.rst | 0
> .../prog_guide/{ => ethdev}/rte_flow.rst | 0
> .../{ => ethdev}/switch_representation.rst| 0
> .../{ => ethdev}/traffic_management.rst | 0
> .../traffic_metering_and_policing.rst | 0
> .../{ => eventdev}/event_crypto_adapter.rst | 0
> .../event_ethernet_rx_adapter.rst | 0
> .../event_ethernet_tx_adapter.rst | 0
> .../{ => eventdev}/event_timer_adapter.rst| 0
> .../prog_guide/{ => eventdev}/eventdev.rst| 2 +-
> doc/guides/prog_guide/eventdev/index.rst | 11 ++
> doc/guides/prog_guide/fib_lib.rst | 4 +-
> .../generic_receive_offload_lib.rst | 4 +-
> .../generic_segmentation_offload_lib.rst | 4 +-
> doc/guides/prog_guide/gpudev.rst | 4 +-
> doc/guides/prog_guide/index.rst | 145 --
> doc/guides/prog_guide/lpm6_lib.rst| 4 +-
> doc/guides/prog_guide/lpm_lib.rst | 4 +-
> doc/guides/prog_guide/mbuf_lib.rst| 6 +-
> doc/guides/prog_guide/mempool_lib.rst | 4 +-
> doc/guides/prog_guide/mldev.rst | 6 +-
> .../prog_guide/packet_classif_access_ctrl.rst | 4 +-
> doc/guides/prog_guide/packet_framework.rst| 4 +-
> doc/guides/prog_guide/rawdev.rst | 4 +-
> doc/guides/prog_guide/regexdev.rst| 4 +-
> doc/guides/prog_guide/rib_lib.rst | 4 +-
> ...y_dpdk_functions.rst => thread_safety.rst} | 4 +-
> 33 files changed, 166 insertions(+), 86 deletions(-)
> create mode 100644 doc/guides/prog_guide/ethdev/index.rst
> rename doc/guides/prog_guide/{ => ethdev}/poll_mode_drv.rst (100%)
> rename doc/guides/prog_guide/{ => ethdev}/qos_framework.rst (100%)
> rename doc/guides/prog_guide/{ => ethdev}/rte_flow.rst (100%)
> rename doc/guides/prog_guide/{ => ethdev}/switch_representation.rst (100%)
> rename doc/guides/prog_guide/{ => ethdev}/traffic_management.rst (100%)
> rename doc/guides/prog_guide/{ =>
> ethdev}/traffic_metering_and_policing.rst (100%)
> rename doc/guides/prog_guide/{ => eventdev}/event_crypto_adapter.rst
> (100%)
> rename doc/guides/prog_guide/{ => eventdev}/event_ethernet_rx_adapter.rst
> (100%)
> rename doc/guides/prog_guide/{ => eventdev}/event_ethernet_tx_adapter.rst
> (100%)
> rename doc/guides/prog_guide/{ => eventdev}/event_timer_adapter.rst (100%)
> rename doc/guides/prog_guide/{ => eventdev}/eventdev.rst (99%)
> create mode 100644 doc/guides/prog_guide/eventdev/index.rst
> rename doc/guides/prog_guide/{thread_safety_dpdk_functions.rst =>
> thread_safety.rst} (98%)
>
> diff --git a/doc/guides/prog_guide/bpf_lib.rst
> b/doc/guides/prog_guide/bpf_lib.rst
> index 1cf2d59429..8c820328b9 100644
> --- a/doc/guides/prog_guide/bpf_lib.rst
> +++ b/doc/guides/prog_guide/bpf_lib.rst
> @@ -1,8 +1,8 @@
> .. SPDX-License-Identifier: BSD-3-Clause
> Copyright(c) 2018 Intel Corporation.
>
> -Berkeley Packet Filter Library
> -==
> +Berkeley Packet Filter (BPF) Library
> +
>
> The DPDK provides an BPF library that gives the ability
> to load and execute Enhanced Berkeley Packet Filter (eBPF) bytecode within
> diff --git a/doc/guides/prog_guide/dmadev.rst
> b/doc/guides/prog_guide/dmadev.rst
> index 2aa26d33b8..2b31dc904f 100644
> --- a/doc/guides/prog_guide/dmadev.rst
> +++ b/doc/guides/prog_guide/dmadev.rst
> @@ -1,8 +1,10 @@
> .. SPDX-License-Identifier: BSD-3-Clause
> Copyright 2021 HiSilicon Limited
>
> -DMA Device Library
> -==
> +.. _direct_memory_access_dma:
> +
> +Direct Memory Access (DMA) Device Library
> +=
>
> The DMA library provides a DMA device framework for management and
> provisioning
> of hardware and software DMA poll mode drivers, defining generic API which
> diff --git a/doc/guides/prog_guide/efd_lib.rst
> b/doc/guides/prog_guide/efd_lib.rst
> index 2b355ff2a6..4bee7237be 100644
> --- a/doc/guides/prog_guide/efd_lib.rst
> +++ b/doc/guides/prog_guide/efd_lib.rst
> @@ -3,8 +3,8 @@
>
> .. _Efd_Library:
>
> -Elastic Flow Distributor Library
> -
> +Elastic Flow Distributor (EFD) Library
> +==
>
> Introduction
>
> diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst
> b/doc/guides/prog
[PATCH] ixgbe: fix interrupt clear mask for eimc register
32nd bit of the eimc register is reserved according to the datasheet
Signed-off-by: Simon Ellmann
---
drivers/net/ixgbe/base/ixgbe_type.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
b/drivers/net/ixgbe/base/ixgbe_type.h
index 1094df5891..03b299cd10 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -2023,7 +2023,7 @@ enum {
#define IXGBE_FTQF_QUEUE_ENABLE0x8000
/* Interrupt clear mask */
-#define IXGBE_IRQ_CLEAR_MASK 0x
+#define IXGBE_IRQ_CLEAR_MASK 0x7FFF
/* Interrupt Vector Allocation Registers */
#define IXGBE_IVAR_REG_NUM 25
--
2.43.0
Re: [PATCH v2 00/11] Add basic flow support for corenic firmware
On 12/5/2023 2:54 AM, Chaoyong He wrote: > Add the very basic rte_flow support for corenic firmware. > > --- > v2: > * Update the 'nfp.ini' document. > * Rebase to the latest main branch. > --- > > Chaoyong He (11): > net/nfp: move some source files > net/nfp: add the structures and functions for flow offload > net/nfp: add the control message channel > net/nfp: support flow API for CoreNIC firmware > net/nfp: support Ethernet flow item > net/nfp: support drop flow action > net/nfp: support IPv4 flow item > net/nfp: support IPv6 flow item > net/nfp: support TCP/UDP/SCTP flow items > net/nfp: support MARK flow action > net/nfp: support QUEUE flow action > Series applied to dpdk-next-net/main, thanks. Flower firmware already supports flow API, right? What is the difference of these two firmware? Are they both actively used?
Re: [RFC v2 01/14] hash: remove some dead code
On Fri, 8 Dec 2023 15:59:35 +0100
David Marchand wrote:
> This macro is not used.
>
> Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
> Cc: sta...@dpdk.org
>
> Signed-off-by: David Marchand
Reviewed-by: Stephen Hemminger
Re: [RFC v2 04/14] lib: add newline in logs
On Fri, 8 Dec 2023 15:59:38 +0100 David Marchand wrote: > Fix places leading to a log message not terminated with a newline. > > Cc: sta...@dpdk.org > > Signed-off-by: David Marchand Maybe a coccinelle fixup script would help in future. Acked-by: Stephen Hemminger
Re: [RFC v2 05/14] lib: remove redundant newline from logs
On Fri, 8 Dec 2023 15:59:39 +0100 David Marchand wrote: > Fix places where two newline characters may be logged. > > Cc: sta...@dpdk.org > > Signed-off-by: David Marchand > --- > Changes since RFC v1: > - split fixes on direct calls to printf or RTE_LOG in a previous patch, > > --- > drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 2 +- > lib/bbdev/rte_bbdev.c | 6 +- > lib/cfgfile/rte_cfgfile.c | 14 ++-- > lib/compressdev/rte_compressdev_pmd.c | 4 +- > lib/cryptodev/rte_cryptodev.c | 2 +- > lib/dispatcher/rte_dispatcher.c | 12 +-- > lib/dmadev/rte_dmadev.c | 2 +- > lib/eal/windows/eal_memory.c| 2 +- > lib/eventdev/eventdev_pmd.h | 6 +- > lib/eventdev/rte_event_crypto_adapter.c | 12 +-- > lib/eventdev/rte_event_dma_adapter.c| 14 ++-- > lib/eventdev/rte_event_eth_rx_adapter.c | 28 +++ > lib/eventdev/rte_event_eth_tx_adapter.c | 2 +- > lib/eventdev/rte_event_timer_adapter.c | 4 +- > lib/eventdev/rte_eventdev.c | 4 +- > lib/metrics/rte_metrics_telemetry.c | 2 +- > lib/mldev/rte_mldev.c | 102 > lib/net/rte_net_crc.c | 6 +- > lib/node/ethdev_rx.c| 4 +- > lib/node/ip4_lookup.c | 2 +- > lib/node/ip6_lookup.c | 2 +- > lib/node/kernel_rx.c| 8 +- > lib/node/kernel_tx.c| 4 +- > lib/rcu/rte_rcu_qsbr.c | 4 +- > lib/rcu/rte_rcu_qsbr.h | 8 +- > lib/stack/rte_stack.c | 8 +- > lib/vhost/vhost_crypto.c| 6 +- > 27 files changed, 135 insertions(+), 135 deletions(-) Acked-by: Stephen Hemminger
Re: [RFC v2 07/14] bpf: remove log level in internal helper
On Fri, 8 Dec 2023 15:59:41 +0100 David Marchand wrote: > There is no other log level than debug, simplify this helper. > > Signed-off-by: David Marchand Acked-by: Stephen Hemminger
Re: [RFC v2 08/14] lib: simplify multilines log messages
On Fri, 8 Dec 2023 15:59:42 +0100 David Marchand wrote: > Those error log messages don't need to span on multiple lines. > > Signed-off-by: David Marchand > --- > lib/acl/tb_mem.c| 2 +- > lib/bpf/bpf_stub.c | 4 ++-- > lib/eal/windows/eal_hugepages.c | 4 ++-- > lib/ethdev/rte_ethdev.c | 14 +++--- > 4 files changed, 12 insertions(+), 12 deletions(-) Could you fix these messages to not cross source lines as well? Feel free to shorten the wording as necessary.
Re: [RFC v2 10/14] vhost: improve log for memory dumping configuration
On Fri, 8 Dec 2023 15:59:44 +0100 David Marchand wrote: > Add the device name as a prefix of logs associated to madvise() calls. > > Signed-off-by: David Marchand > --- > lib/vhost/iotlb.c | 18 +- > lib/vhost/vhost.h | 2 +- > lib/vhost/vhost_user.c | 26 +- > 3 files changed, 23 insertions(+), 23 deletions(-) The logging part looks good, but looking at the code, the function mem_set_dump() has some things that should be addressed. Since it is global (but not exported) function the function name may potentially clash when used with static linkage. It should be renamed. Code is duplication of eal_mem_set_dump(). Would be better to have one version. Maybe rte_eal_mem_set_dump()? Acked-by: Stephen Hemminger
Re: [RFC v2 12/14] lib: convert to per line logging
On Fri, 8 Dec 2023 15:59:46 +0100 David Marchand wrote: > Convert many libraries that call RTE_LOG(... "\n", ...) to RTE_LOG_LINE. > > Note: > - for acl and sched libraries that still has some debug multilines > messages, a direct call to RTE_LOG is used: this will make it easier to > notice such special cases, > > Signed-off-by: David Marchand > --- > lib/acl/acl_bld.c | 28 +-- > lib/acl/acl_gen.c | 8 +- > lib/acl/rte_acl.c | 8 +- > lib/acl/tb_mem.c| 4 +- > lib/eal/common/eal_common_bus.c | 22 +- > lib/eal/common/eal_common_class.c | 4 +- > lib/eal/common/eal_common_config.c | 2 +- > lib/eal/common/eal_common_debug.c | 6 +- > lib/eal/common/eal_common_dev.c | 80 +++ > lib/eal/common/eal_common_devargs.c | 18 +- > lib/eal/common/eal_common_dynmem.c | 34 +-- > lib/eal/common/eal_common_fbarray.c | 12 +- > lib/eal/common/eal_common_interrupts.c | 38 ++-- > lib/eal/common/eal_common_lcore.c | 26 +-- > lib/eal/common/eal_common_memalloc.c| 12 +- > lib/eal/common/eal_common_memory.c | 66 +++--- > lib/eal/common/eal_common_memzone.c | 24 +-- > lib/eal/common/eal_common_options.c | 236 ++-- > lib/eal/common/eal_common_proc.c| 112 +- > lib/eal/common/eal_common_tailqs.c | 12 +- > lib/eal/common/eal_common_thread.c | 12 +- > lib/eal/common/eal_common_timer.c | 6 +- > lib/eal/common/eal_common_trace_utils.c | 2 +- > lib/eal/common/eal_trace.h | 4 +- > lib/eal/common/hotplug_mp.c | 54 ++--- > lib/eal/common/malloc_elem.c| 6 +- > lib/eal/common/malloc_heap.c| 40 ++-- > lib/eal/common/malloc_mp.c | 72 +++ > lib/eal/common/rte_keepalive.c | 2 +- > lib/eal/common/rte_malloc.c | 10 +- > lib/eal/common/rte_service.c| 8 +- > lib/eal/freebsd/eal.c | 74 +++ > lib/eal/freebsd/eal_alarm.c | 2 +- > lib/eal/freebsd/eal_dev.c | 8 +- > lib/eal/freebsd/eal_hugepage_info.c | 22 +- > lib/eal/freebsd/eal_interrupts.c| 60 +++--- > lib/eal/freebsd/eal_lcore.c | 2 +- > lib/eal/freebsd/eal_memalloc.c | 10 +- > lib/eal/freebsd/eal_memory.c| 34 +-- > lib/eal/freebsd/eal_thread.c| 2 +- > lib/eal/freebsd/eal_timer.c | 10 +- > lib/eal/linux/eal.c | 122 +-- > lib/eal/linux/eal_alarm.c | 2 +- > lib/eal/linux/eal_dev.c | 40 ++-- > lib/eal/linux/eal_hugepage_info.c | 38 ++-- > lib/eal/linux/eal_interrupts.c | 116 +- > lib/eal/linux/eal_lcore.c | 4 +- > lib/eal/linux/eal_memalloc.c| 120 +-- > lib/eal/linux/eal_memory.c | 208 +- > lib/eal/linux/eal_thread.c | 4 +- > lib/eal/linux/eal_timer.c | 10 +- > lib/eal/linux/eal_vfio.c| 270 +++ > lib/eal/linux/eal_vfio_mp_sync.c| 4 +- > lib/eal/riscv/rte_cycles.c | 4 +- > lib/eal/unix/eal_filesystem.c | 14 +- > lib/eal/unix/eal_firmware.c | 2 +- > lib/eal/unix/eal_unix_memory.c | 8 +- > lib/eal/unix/rte_thread.c | 34 +-- > lib/eal/windows/eal.c | 36 ++-- > lib/eal/windows/eal_alarm.c | 12 +- > lib/eal/windows/eal_debug.c | 8 +- > lib/eal/windows/eal_dev.c | 8 +- > lib/eal/windows/eal_hugepages.c | 10 +- > lib/eal/windows/eal_interrupts.c| 10 +- > lib/eal/windows/eal_lcore.c | 6 +- > lib/eal/windows/eal_memalloc.c | 50 ++--- > lib/eal/windows/eal_memory.c| 20 +- > lib/eal/windows/eal_windows.h | 4 +- > lib/eal/windows/include/rte_windows.h | 4 +- > lib/eal/windows/rte_thread.c| 28 +-- > lib/efd/rte_efd.c | 58 ++--- > lib/fib/rte_fib.c | 14 +- > lib/fib/rte_fib6.c | 14 +- > lib/hash/rte_cuckoo_hash.c | 52 ++--- > lib/hash/rte_fbk_hash.c | 4 +- > lib/hash/rte_hash_crc.c | 12 +- > lib/hash/rte_thash.c| 20 +- > lib/hash/rte_thash_gfni.c | 8 +- > lib/ip_frag/rte_ip_frag_common.c| 8 +- > lib/latencystats/rte_latencystats.c | 41 ++-- > lib/log/log.c | 6 +- > lib/lpm/rte_lpm.c | 12 +- > lib/lpm/rte_lpm6.c | 10 +- > lib/mbuf/rte_mbuf.c | 14 +- > lib/mbuf/rte_mbuf_dyn.c | 14 +- > lib/mbuf/rte_mbuf_pool_ops.c| 4 +- > lib/mempool/rte_me
Re: [v2] net/af_xdp: enable a sock path alongside use_cni
On Mon, 4 Dec 2023 18:41:18 +
Maryam Tahhan wrote:
> Hi Shibin
>
> I'm not really sure what you are suggesting, is to make an assumption on
> the path part where the socket resides (aka hard code it) and then try
> to build the full UDS path in DPDK?
>
> Yes the plugin is using constants ATM for certain parts of the UDS path,
> but that's not say that it's something that won't become configurable
> later on. Someone may not want to use "/tmp/afxdp_dp/" as the base
> directory. Then we'd have to change DPDK's implementation again. These
> are not really things that are configured by hand and are generated by
> initialization scripts (typically). I would rather build this with the
> idea that things can change in the future without having to change the
> DPDK implementation again.
> BR
> Maryam
In UNIX(7) man page:
abstract
an abstract socket address is distinguished (from a pathname
socket) by the fact that sun_path[0] is a null byte ('\0'). The
socket's address in this namespace is given by the additional
bytes in sun_path that are covered by the specified length of
the address structure. (Null bytes in the name have no special
significance.) The name has no connection with filesystem path‐
names. When the address of an abstract socket is returned, the
returned addrlen is greater than sizeof(sa_family_t) (i.e.,
greater than 2), and the name of the socket is contained in the
first (addrlen - sizeof(sa_family_t)) bytes of sun_path.
Something like this:
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 353c8688ec9c..f41632a9df5a 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -1362,7 +1362,10 @@ init_uds_sock(struct sockaddr_un *server)
}
server->sun_family = AF_UNIX;
- strlcpy(server->sun_path, UDS_SOCK, sizeof(server->sun_path));
+
+ /* Use an abstract socket (not in filesystem) */
+ memset(server.sun_path, '\0', sizeof(server.sun_path));
+ strlcpy(server->sun_path + 1, UDS_SOCK, sizeof(server->sun_path) - 1);
if (connect(sock, (struct sockaddr *)server, sizeof(struct
sockaddr_un)) < 0) {
close(sock);
@@ -1393,7 +1396,10 @@ send_msg(int sock, char *request, int *fd)
memset(&dst, 0, sizeof(dst));
dst.sun_family = AF_UNIX;
- strlcpy(dst.sun_path, UDS_SOCK, sizeof(dst.sun_path));
+
+ /* Use an abstract socket (not in filesystem) */
+ memset(server.sun_path, '\0', sizeof(server.sun_path));
+ strlcpy(server->sun_path + 1, UDS_SOCK, sizeof(server->sun_path) - 1);
/* Initialize message header structure */
memset(&msgh, 0, sizeof(msgh));
[PATCH v6] gro: fix reordering of packets in GRO layer
In the current implementation when packets is received with
special flag(s) set, only that packet is delivered out of order.
There could be already coalesced packets in the GRO table
beloging to the same flow but not handled.
This fix makes sure that the entire segment is delivered with the
special flag(s) set which is how the Linux GRO is also implemented
Signed-off-by: Kumara Parameshwaran
Co-authored-by: Kumara Parameshwaran
---
If the received packet is not a pure ACK packet, we check if
there are any previous packets in the flow, if present we indulge
the received packet also in the coalescing logic and update the flags
of the last recived packet to the entire segment which would avoid
re-ordering.
Lets say a case where P1(PSH), P2(ACK), P3(ACK) are received in burst
mode,
P1 contains PSH flag and since it does not contain any prior packets in
the flow
we copy it to unprocess_packets and P2(ACK) and P3(ACK) are merged
together.
In the existing case the P2,P3 would be delivered as single segment
first and the
unprocess_packets will be copied later which will cause reordering.
With the patch
copy the unprocess packets first and then the packets from the GRO
table.
Testing done
The csum test-pmd was modified to support the following
GET request of 10MB from client to server via test-pmd (static arp
entries added in client
and server). Enable GRO and TSO in test-pmd where the packets recived
from the client mac
would be sent to server mac and vice versa.
In above testing, without the patch the client observerd re-ordering of
25 packets
and with the patch there were no packet re-ordering observerd.
v2:
Fix warnings in commit and comment.
Do not consider packet as candidate to merge if it contains SYN/RST
flag.
v3:
Fix warnings.
v4:
Rebase with master.
v5:
Adding co-author email
v6:
Address review comments from the maintainer to restructure the code
and handle only special flags PSH,FIN
lib/gro/gro_tcp.h | 10 +++
lib/gro/gro_tcp4.c | 65 +-
2 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
index d926c4b8cc..d2073b02f3 100644
--- a/lib/gro/gro_tcp.h
+++ b/lib/gro/gro_tcp.h
@@ -187,4 +187,14 @@ is_same_common_tcp_key(struct cmn_tcp_key *k1, struct
cmn_tcp_key *k2)
return (!memcmp(k1, k2, sizeof(struct cmn_tcp_key)));
}
+static inline void
+update_tcp_hdr_flags(struct rte_tcp_hdr *tcp_hdr, struct rte_mbuf *pkt)
+{
+ struct rte_tcp_hdr *merged_tcp_hdr;
+
+ merged_tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
pkt->l2_len + pkt->l3_len);
+ merged_tcp_hdr->tcp_flags |= tcp_hdr->tcp_flags;
+
+}
+
#endif
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index 6645de592b..6745ebc45e 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -126,6 +126,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
uint32_t item_idx;
uint32_t i, max_flow_num, remaining_flow_num;
uint8_t find;
+ uint32_t item_start_idx;
/*
* Don't process the packet whose TCP header length is greater
@@ -139,13 +140,6 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
hdr_len = pkt->l2_len + pkt->l3_len + pkt->l4_len;
- /*
-* Don't process the packet which has FIN, SYN, RST, PSH, URG, ECE
-* or CWR set.
-*/
- if (tcp_hdr->tcp_flags != RTE_TCP_ACK_FLAG)
- return -1;
-
/* trim the tail padding bytes */
ip_tlen = rte_be_to_cpu_16(ipv4_hdr->total_length);
if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt->l2_len))
@@ -183,6 +177,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
if (tbl->flows[i].start_index != INVALID_ARRAY_INDEX) {
if (is_same_tcp4_flow(tbl->flows[i].key, key)) {
find = 1;
+ item_start_idx = tbl->flows[i].start_index;
break;
}
remaining_flow_num--;
@@ -190,28 +185,50 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
}
if (find == 0) {
- sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
- item_idx = insert_new_tcp_item(pkt, tbl->items, &tbl->item_num,
- tbl->max_item_num, start_time,
- INVALID_ARRAY_INDEX, sent_seq,
ip_id,
- is_atomic);
- if (item_idx == INVALID_ARRAY_INDEX)
+ /*
+* Add new flow to the table only if contains ACK flag with
data.
+* Do not add any pac
[PATCH v7] gro: fix reordering of packets in GRO layer
In the current implementation when packets is received with
special flag(s) set, only that packet is delivered out of order.
There could be already coalesced packets in the GRO table
beloging to the same flow but not handled.
This fix makes sure that the entire segment is delivered with the
special flag(s) set which is how the Linux GRO is also implemented
Signed-off-by: Kumara Parameshwaran
Co-authored-by: Kumara Parameshwaran
---
If the received packet is not a pure ACK packet, we check if
there are any previous packets in the flow, if present we indulge
the received packet also in the coalescing logic and update the flags
of the last recived packet to the entire segment which would avoid
re-ordering.
Lets say a case where P1(PSH), P2(ACK), P3(ACK) are received in burst
mode,
P1 contains PSH flag and since it does not contain any prior packets in
the flow
we copy it to unprocess_packets and P2(ACK) and P3(ACK) are merged
together.
In the existing case the P2,P3 would be delivered as single segment
first and the
unprocess_packets will be copied later which will cause reordering.
With the patch
copy the unprocess packets first and then the packets from the GRO
table.
Testing done
The csum test-pmd was modified to support the following
GET request of 10MB from client to server via test-pmd (static arp
entries added in client
and server). Enable GRO and TSO in test-pmd where the packets recived
from the client mac
would be sent to server mac and vice versa.
In above testing, without the patch the client observerd re-ordering of
25 packets
and with the patch there were no packet re-ordering observerd.
v2:
Fix warnings in commit and comment.
Do not consider packet as candidate to merge if it contains SYN/RST
flag.
v3:
Fix warnings.
v4:
Rebase with master.
v5:
Adding co-author email
v6:
Address review comments from the maintainer to restructure the code
and handle only special flags PSH,FIN
lib/gro/gro_tcp.h | 11
lib/gro/gro_tcp4.c | 65 +-
2 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
index d926c4b8cc..137a03bc96 100644
--- a/lib/gro/gro_tcp.h
+++ b/lib/gro/gro_tcp.h
@@ -187,4 +187,15 @@ is_same_common_tcp_key(struct cmn_tcp_key *k1, struct
cmn_tcp_key *k2)
return (!memcmp(k1, k2, sizeof(struct cmn_tcp_key)));
}
+static inline void
+update_tcp_hdr_flags(struct rte_tcp_hdr *tcp_hdr, struct rte_mbuf *pkt)
+{
+ struct rte_tcp_hdr *merged_tcp_hdr;
+
+ merged_tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
pkt->l2_len +
+ pkt->l3_len);
+ merged_tcp_hdr->tcp_flags |= tcp_hdr->tcp_flags;
+
+}
+
#endif
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index 6645de592b..7a68615031 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -126,6 +126,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
uint32_t item_idx;
uint32_t i, max_flow_num, remaining_flow_num;
uint8_t find;
+ uint32_t item_start_idx;
/*
* Don't process the packet whose TCP header length is greater
@@ -139,13 +140,6 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
hdr_len = pkt->l2_len + pkt->l3_len + pkt->l4_len;
- /*
-* Don't process the packet which has FIN, SYN, RST, PSH, URG, ECE
-* or CWR set.
-*/
- if (tcp_hdr->tcp_flags != RTE_TCP_ACK_FLAG)
- return -1;
-
/* trim the tail padding bytes */
ip_tlen = rte_be_to_cpu_16(ipv4_hdr->total_length);
if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt->l2_len))
@@ -183,6 +177,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
if (tbl->flows[i].start_index != INVALID_ARRAY_INDEX) {
if (is_same_tcp4_flow(tbl->flows[i].key, key)) {
find = 1;
+ item_start_idx = tbl->flows[i].start_index;
break;
}
remaining_flow_num--;
@@ -190,28 +185,50 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
}
if (find == 0) {
- sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
- item_idx = insert_new_tcp_item(pkt, tbl->items, &tbl->item_num,
- tbl->max_item_num, start_time,
- INVALID_ARRAY_INDEX, sent_seq,
ip_id,
- is_atomic);
- if (item_idx == INVALID_ARRAY_INDEX)
+ /*
+* Add new flow to the table only if contains A
[PATCH v8] gro: fix reordering of packets in GRO layer
In the current implementation when packets is received with
special flag(s) set, only that packet is delivered out of order.
There could be already coalesced packets in the GRO table
beloging to the same flow but not handled.
This fix makes sure that the entire segment is delivered with the
special flag(s) set which is how the Linux GRO is also implemented
Signed-off-by: Kumara Parameshwaran
Co-authored-by: Kumara Parameshwaran
---
If the received packet is not a pure ACK packet, we check if
there are any previous packets in the flow, if present we indulge
the received packet also in the coalescing logic and update the flags
of the last recived packet to the entire segment which would avoid
re-ordering.
Lets say a case where P1(PSH), P2(ACK), P3(ACK) are received in burst
mode,
P1 contains PSH flag and since it does not contain any prior packets in
the flow
we copy it to unprocess_packets and P2(ACK) and P3(ACK) are merged
together.
In the existing case the P2,P3 would be delivered as single segment
first and the
unprocess_packets will be copied later which will cause reordering.
With the patch
copy the unprocess packets first and then the packets from the GRO
table.
Testing done
The csum test-pmd was modified to support the following
GET request of 10MB from client to server via test-pmd (static arp
entries added in client
and server). Enable GRO and TSO in test-pmd where the packets recived
from the client mac
would be sent to server mac and vice versa.
In above testing, without the patch the client observerd re-ordering of
25 packets
and with the patch there were no packet re-ordering observerd.
v2:
Fix warnings in commit and comment.
Do not consider packet as candidate to merge if it contains SYN/RST
flag.
v3:
Fix warnings.
v4:
Rebase with master.
v5:
Adding co-author email
v6:
Address review comments from the maintainer to restructure the code
and handle only special flags PSH,FIN
v7:
Fix warnings and errors
v8:
Fix warnings and errors
lib/gro/gro_tcp.h | 11
lib/gro/gro_tcp4.c | 67 +-
2 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
index d926c4b8cc..137a03bc96 100644
--- a/lib/gro/gro_tcp.h
+++ b/lib/gro/gro_tcp.h
@@ -187,4 +187,15 @@ is_same_common_tcp_key(struct cmn_tcp_key *k1, struct
cmn_tcp_key *k2)
return (!memcmp(k1, k2, sizeof(struct cmn_tcp_key)));
}
+static inline void
+update_tcp_hdr_flags(struct rte_tcp_hdr *tcp_hdr, struct rte_mbuf *pkt)
+{
+ struct rte_tcp_hdr *merged_tcp_hdr;
+
+ merged_tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
pkt->l2_len +
+ pkt->l3_len);
+ merged_tcp_hdr->tcp_flags |= tcp_hdr->tcp_flags;
+
+}
+
#endif
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index 6645de592b..8af5a8d8a9 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -126,6 +126,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
uint32_t item_idx;
uint32_t i, max_flow_num, remaining_flow_num;
uint8_t find;
+ uint32_t item_start_idx;
/*
* Don't process the packet whose TCP header length is greater
@@ -139,13 +140,6 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
hdr_len = pkt->l2_len + pkt->l3_len + pkt->l4_len;
- /*
-* Don't process the packet which has FIN, SYN, RST, PSH, URG, ECE
-* or CWR set.
-*/
- if (tcp_hdr->tcp_flags != RTE_TCP_ACK_FLAG)
- return -1;
-
/* trim the tail padding bytes */
ip_tlen = rte_be_to_cpu_16(ipv4_hdr->total_length);
if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt->l2_len))
@@ -183,6 +177,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
if (tbl->flows[i].start_index != INVALID_ARRAY_INDEX) {
if (is_same_tcp4_flow(tbl->flows[i].key, key)) {
find = 1;
+ item_start_idx = tbl->flows[i].start_index;
break;
}
remaining_flow_num--;
@@ -190,28 +185,52 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
}
if (find == 0) {
- sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
- item_idx = insert_new_tcp_item(pkt, tbl->items, &tbl->item_num,
- tbl->max_item_num, start_time,
- INVALID_ARRAY_INDEX, sent_seq,
ip_id,
- is_atomic);
- if (item_idx == INVALID_ARRAY_INDEX)
+
[PATCH v9] gro: fix reordering of packets in GRO layer
In the current implementation when a packet is received with
special TCP flag(s) set, only that packet is delivered out of order.
There could be already coalesced packets in the GRO table
belonging to the same flow but not delivered.
This fix makes sure that the entire segment is delivered with the
special flag(s) set which is how the Linux GRO is also implemented
Signed-off-by: Kumara Parameshwaran
Co-authored-by: Kumara Parameshwaran
---
If the received packet is not a pure ACK packet, we check if
there are any previous packets in the flow, if present we indulge
the received packet also in the coalescing logic and update the flags
of the last recived packet to the entire segment which would avoid
re-ordering.
Lets say a case where P1(PSH), P2(ACK), P3(ACK) are received in burst
mode,
P1 contains PSH flag and since it does not contain any prior packets in
the flow
we copy it to unprocess_packets and P2(ACK) and P3(ACK) are merged
together.
In the existing case the P2,P3 would be delivered as single segment
first and the
unprocess_packets will be copied later which will cause reordering.
With the patch
copy the unprocess packets first and then the packets from the GRO
table.
Testing done
The csum test-pmd was modified to support the following
GET request of 10MB from client to server via test-pmd (static arp
entries added in client
and server). Enable GRO and TSO in test-pmd where the packets recived
from the client mac
would be sent to server mac and vice versa.
In above testing, without the patch the client observerd re-ordering of
25 packets
and with the patch there were no packet re-ordering observerd.
v2:
Fix warnings in commit and comment.
Do not consider packet as candidate to merge if it contains SYN/RST
flag.
v3:
Fix warnings.
v4:
Rebase with master.
v5:
Adding co-author email
v6:
Address review comments from the maintainer to restructure the code
and handle only special flags PSH,FIN
v7:
Fix warnings and errors
v8:
Fix warnings and errors
v9:
Fix commit message
lib/gro/gro_tcp.h | 11
lib/gro/gro_tcp4.c | 67 +-
2 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
index d926c4b8cc..137a03bc96 100644
--- a/lib/gro/gro_tcp.h
+++ b/lib/gro/gro_tcp.h
@@ -187,4 +187,15 @@ is_same_common_tcp_key(struct cmn_tcp_key *k1, struct
cmn_tcp_key *k2)
return (!memcmp(k1, k2, sizeof(struct cmn_tcp_key)));
}
+static inline void
+update_tcp_hdr_flags(struct rte_tcp_hdr *tcp_hdr, struct rte_mbuf *pkt)
+{
+ struct rte_tcp_hdr *merged_tcp_hdr;
+
+ merged_tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
pkt->l2_len +
+ pkt->l3_len);
+ merged_tcp_hdr->tcp_flags |= tcp_hdr->tcp_flags;
+
+}
+
#endif
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index 6645de592b..8af5a8d8a9 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -126,6 +126,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
uint32_t item_idx;
uint32_t i, max_flow_num, remaining_flow_num;
uint8_t find;
+ uint32_t item_start_idx;
/*
* Don't process the packet whose TCP header length is greater
@@ -139,13 +140,6 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
hdr_len = pkt->l2_len + pkt->l3_len + pkt->l4_len;
- /*
-* Don't process the packet which has FIN, SYN, RST, PSH, URG, ECE
-* or CWR set.
-*/
- if (tcp_hdr->tcp_flags != RTE_TCP_ACK_FLAG)
- return -1;
-
/* trim the tail padding bytes */
ip_tlen = rte_be_to_cpu_16(ipv4_hdr->total_length);
if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt->l2_len))
@@ -183,6 +177,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
if (tbl->flows[i].start_index != INVALID_ARRAY_INDEX) {
if (is_same_tcp4_flow(tbl->flows[i].key, key)) {
find = 1;
+ item_start_idx = tbl->flows[i].start_index;
break;
}
remaining_flow_num--;
@@ -190,28 +185,52 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
}
if (find == 0) {
- sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
- item_idx = insert_new_tcp_item(pkt, tbl->items, &tbl->item_num,
- tbl->max_item_num, start_time,
- INVALID_ARRAY_INDEX, sent_seq,
ip_id,
- is_atomic);
- if (
RE: [RFC v2 09/14] rcu: introduce a logging helper
> -Original Message-
> From: David Marchand
> Sent: Friday, December 8, 2023 9:00 AM
> To: dev@dpdk.org
> Cc: tho...@monjalon.net; ferruh.yi...@amd.com;
> bruce.richard...@intel.com; step...@networkplumber.org;
> m...@smartsharesystems.com; Honnappa Nagarahalli
>
> Subject: [RFC v2 09/14] rcu: introduce a logging helper
>
> Signed-off-by: David Marchand
Thank you, looks good
Reviewed-by: Honnappa Nagarahalli
> ---
> lib/rcu/rte_rcu_qsbr.c | 62 --
> lib/rcu/rte_rcu_qsbr.h | 1 +
> 2 files changed, 24 insertions(+), 39 deletions(-)
>
> diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c index
> 41a44be4b9..5b6530788a 100644
> --- a/lib/rcu/rte_rcu_qsbr.c
> +++ b/lib/rcu/rte_rcu_qsbr.c
> @@ -19,6 +19,9 @@
> #include "rte_rcu_qsbr.h"
> #include "rcu_qsbr_pvt.h"
>
> +#define RCU_LOG(level, fmt, args...) \
> + RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args)
> +
> /* Get the memory size of QSBR variable */ size_t
> rte_rcu_qsbr_get_memsize(uint32_t max_threads) @@ -26,9 +29,7 @@
> rte_rcu_qsbr_get_memsize(uint32_t max_threads)
> size_t sz;
>
> if (max_threads == 0) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid max_threads %u\n",
> - __func__, max_threads);
> + RCU_LOG(ERR, "Invalid max_threads %u", max_threads);
> rte_errno = EINVAL;
>
> return 1;
> @@ -52,8 +53,7 @@ rte_rcu_qsbr_init(struct rte_rcu_qsbr *v, uint32_t
> max_threads)
> size_t sz;
>
> if (v == NULL) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter\n", __func__);
> + RCU_LOG(ERR, "Invalid input parameter");
> rte_errno = EINVAL;
>
> return 1;
> @@ -85,8 +85,7 @@ rte_rcu_qsbr_thread_register(struct rte_rcu_qsbr *v,
> unsigned int thread_id)
> uint64_t old_bmap, new_bmap;
>
> if (v == NULL || thread_id >= v->max_threads) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter\n", __func__);
> + RCU_LOG(ERR, "Invalid input parameter");
> rte_errno = EINVAL;
>
> return 1;
> @@ -137,8 +136,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr
> *v, unsigned int thread_id)
> uint64_t old_bmap, new_bmap;
>
> if (v == NULL || thread_id >= v->max_threads) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter\n", __func__);
> + RCU_LOG(ERR, "Invalid input parameter");
> rte_errno = EINVAL;
>
> return 1;
> @@ -211,8 +209,7 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v)
> uint32_t i, t, id;
>
> if (v == NULL || f == NULL) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter\n", __func__);
> + RCU_LOG(ERR, "Invalid input parameter");
> rte_errno = EINVAL;
>
> return 1;
> @@ -282,8 +279,7 @@ rte_rcu_qsbr_dq_create(const struct
> rte_rcu_qsbr_dq_parameters *params)
> params->v == NULL || params->name == NULL ||
> params->size == 0 || params->esize == 0 ||
> (params->esize % 4 != 0)) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter\n", __func__);
> + RCU_LOG(ERR, "Invalid input parameter");
> rte_errno = EINVAL;
>
> return NULL;
> @@ -293,9 +289,10 @@ rte_rcu_qsbr_dq_create(const struct
> rte_rcu_qsbr_dq_parameters *params)
>*/
> if ((params->trigger_reclaim_limit <= params->size) &&
> (params->max_reclaim_size == 0)) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): Invalid input parameter, size = %u,
> trigger_reclaim_limit = %u, max_reclaim_size = %u\n",
> - __func__, params->size, params-
> >trigger_reclaim_limit,
> + RCU_LOG(ERR,
> + "Invalid input parameter, size = %u,
> trigger_reclaim_limit = %u, "
> + "max_reclaim_size = %u",
> + params->size, params->trigger_reclaim_limit,
> params->max_reclaim_size);
> rte_errno = EINVAL;
>
> @@ -328,8 +325,7 @@ rte_rcu_qsbr_dq_create(const struct
> rte_rcu_qsbr_dq_parameters *params)
> __RTE_QSBR_TOKEN_SIZE + params->esize,
> qs_fifo_size, SOCKET_ID_ANY, flags);
> if (dq->r == NULL) {
> - rte_log(RTE_LOG_ERR, rte_rcu_log_type,
> - "%s(): defer queue create failed\n", __func__);
> + RCU_LOG(ERR, "defer queue create failed");
> rte_free(dq);
> return NULL;
> }
> @@ -354,8 +350,7 @@ int rte_rcu_qsbr_dq_enq
RE: [PATCH v3 2/2] app/testpmd: add random item support
Hi Michael,
> Subject: [PATCH v3 2/2] app/testpmd: add random item support
>
> Add support for random item, usage example:
>
> pattern random spec value 0x1 mask value 0x3 / eth / end
>
> Flow rule with above pattern matching 25% of the traffic, it hits only when
> random value suffix is "01" and miss the others ("00", "10", "11").
>
> Signed-off-by: Michael Baum
Reviewed-by: Dariusz Sosnowski
Best regards,
Dariusz Sosnowski
RE: [PATCH v3 1/2] ethdev: add random item support
Hi Michael, > +Item: ``RANDOM`` > + > + > +Matches a random value. > + > +The rundom number is generated by PMD, s/rundom/random I'm not sure that mentioning PMD here is fully correct, because in my opinion it implies that SW generates it. HW, SW and system clock were mentioned as examples of sources of randomness in previous discussions on this API. Also, I think it's worth adding that "number == unsigned integer with at most 32 bits." It gives some leeway for any driver implementing this API - value is uint32_t but not all bits must be used. For example, some HW may support only 16-bit random number generation. Such HW might implement validation on mask, where mask with more than 16 bits would be rejected. What do you think about the following proposal based on those comments? "A random unsigned integer (at most 32-bit) is generated for each packet during flow rule processing, by either HW, SW or some external source. Application can match on either exact value or range of values." > +Application shouldn't assume that this value is kept during the life > +time of the packet. s/life time/lifetime Best regards, Dariusz Sosnowski
RE: [PATCH v3 1/2] ethdev: add random item support
> + RTE_FLOW_FIELD_RANDOM /**< Random value. */ I think that this new modify field type should be mentioned in release notes as well. Best regards, Dariusz Sosnowski
Re: [PATCH v2 03/11] net/nfp: add the control message channel
On 12/5/2023 2:54 AM, Chaoyong He wrote:
> diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
> new file mode 100644
> index 00..15e0bb60d8
> --- /dev/null
> +++ b/drivers/net/nfp/nfp_net_cmsg.h
> @@ -0,0 +1,37 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright (c) 2023 Corigine, Inc.
> + * All rights reserved.
> + */
> +
> +#ifndef __NFP_NET_CMSG_H__
> +#define __NFP_NET_CMSG_H__
> +
> +#include "nfp_net_common.h"
> +
> +enum nfp_net_cfg_mbox_cmd {
> + NFP_NET_CFG_MBOX_CMD_FS_ADD_V4, /* Add Flow Steer rule for V4
> table */
> + NFP_NET_CFG_MBOX_CMD_FS_DEL_V4, /* Delete Flow Steer rule for V4
> table */
> + NFP_NET_CFG_MBOX_CMD_FS_ADD_V6, /* Add Flow Steer rule for V4
> table */
> + NFP_NET_CFG_MBOX_CMD_FS_DEL_V6, /* Delete Flow Steer rule for V4
> table */
> + NFP_NET_CFG_MBOX_CMD_FS_ADD_ETHTYPE, /* Add Flow Steer rule for
> Ethtype table */
> + NFP_NET_CFG_MBOX_CMD_FS_DEL_ETHTYPE, /* Delete Flow Steer rule for
> Ethtype table */
> +};
> +
> +enum nfp_net_cfg_mbox_ret {
> + NFP_NET_CFG_MBOX_RET_FS_OK, /* No error happen */
> + NFP_NET_CFG_MBOX_RET_FS_ERR_NO_SPACE, /* Return error code no space
> */
> + NFP_NET_CFG_MBOX_RET_FS_ERR_MASK_FULL,/* Return error code mask
> table full */
> + NFP_NET_CFG_MBOX_RET_FS_ERR_CMD_INVALID, /* Return error code invalid
> cmd */
> +};
> +
> +/* 4B cmd, and up to 500B data. */
> +struct nfp_net_cmsg {
> + uint32_t cmd; /**< One of nfp_net_cfg_mbox_cmd */
> + uint32_t data[0];
> +};
>
Converted 'data' to flex array, 'uint32_t data[];' while merging,
since there is already an effort to switch all zero length array to C99
standard flex array:
https://patchwork.dpdk.org/project/dpdk/list/?series=30410
RE: [PATCH v2 1/2] net/mlx5/hws: add support for random number match
> The HW adds a random number per each hash, this value can be used for > statistic calculation over the packets, for example by setting one bit in the > mask > of that filed we will get half of the traffic in the flow, and so on with the > rest of > the mask. Looks like there's a typo - s/filed/field Other than that, LGTM. Best regards, Dariusz Sosnowski
RE: [PATCH v2 2/2] net/mlx5: add random item support
> +- Match on random value: > + > + - Supported only with HW Steering enabled (``dv_flow_en`` = 2). > + - Supported only in table with ``nb_flows=1``. > + - NIC ingress flow in group 0 is not supported. Shouldn't egress flow in group 0 be mentioned here as well? > +* **Updated NVIDIA mlx5 net driver.** > + > + * Added support for ``RTE_FLOW_ITEM_TYPE_RUNDOM`` flow item. Typo - s/RUNDOM/RANDOM Other than that, LGTM. Best regards, Dariusz Sosnowski
Re: [RFC v2 01/14] hash: remove some dead code
On Fri, Dec 08, 2023 at 03:59:35PM +0100, David Marchand wrote:
> This macro is not used.
>
> Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
> Cc: sta...@dpdk.org
>
> Signed-off-by: David Marchand
> ---
Reviewed-by: Tyler Retzlaff
Re: [RFC v2 02/14] regexdev: fix logtype register
On Fri, Dec 08, 2023 at 03:59:36PM +0100, David Marchand wrote:
> This library logtype was not initialized so its logs would end up under
> the 0 logtype, iow, RTE_LOGTYPE_EAL.
>
> Fixes: b25246beaefc ("regexdev: add core functions")
> Cc: sta...@dpdk.org
>
> Signed-off-by: David Marchand
> ---
Reviewed-by: Tyler Retzlaff
Re: [RFC v2 03/14] lib: use dedicated logtypes
On Fri, Dec 08, 2023 at 03:59:37PM +0100, David Marchand wrote: > No printf! > When a dedicated log helper exists, use it. > And no usurpation please: a library should log under its logtype > (see the eventdev rx adapter update for example). > > Note: the RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET macro is renamed for > consistency with the rest of eventdev (private) macros. > > Cc: sta...@dpdk.org > > Signed-off-by: David Marchand > --- Reviewed-by: Tyler Retzlaff
Re: [RFC v2 04/14] lib: add newline in logs
On Fri, Dec 08, 2023 at 03:59:38PM +0100, David Marchand wrote: > Fix places leading to a log message not terminated with a newline. > > Cc: sta...@dpdk.org > > Signed-off-by: David Marchand > --- Reviewed-by: Tyler Retzlaff
Re: [RFC v2 06/14] eal/linux: remove log paraphrasing the doc
On Fri, Dec 08, 2023 at 03:59:40PM +0100, David Marchand wrote: > An error log message does not need to paraphrase the DPDK documentation. > > Signed-off-by: David Marchand > --- Acked-by: Tyler Retzlaff
Re: [RFC v2 07/14] bpf: remove log level in internal helper
On Fri, Dec 08, 2023 at 03:59:41PM +0100, David Marchand wrote: > There is no other log level than debug, simplify this helper. > > Signed-off-by: David Marchand > --- Acked-by: Tyler Retzlaff
Re: [RFC v2 08/14] lib: simplify multilines log messages
On Fri, Dec 08, 2023 at 03:59:42PM +0100, David Marchand wrote: > Those error log messages don't need to span on multiple lines. > > Signed-off-by: David Marchand > --- Acked-by: Tyler Retzlaff
Re: [RFC v2 09/14] rcu: introduce a logging helper
On Fri, Dec 08, 2023 at 03:59:43PM +0100, David Marchand wrote: > Signed-off-by: David Marchand > --- Reviewed-by: Tyler Retzlaff > lib/rcu/rte_rcu_qsbr.c | 62 -- > lib/rcu/rte_rcu_qsbr.h | 1 + > 2 files changed, 24 insertions(+), 39 deletions(-) > > diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c > index 41a44be4b9..5b6530788a 100644 > --- a/lib/rcu/rte_rcu_qsbr.c > +++ b/lib/rcu/rte_rcu_qsbr.c > @@ -19,6 +19,9 @@ > #include "rte_rcu_qsbr.h" > #include "rcu_qsbr_pvt.h" > > +#define RCU_LOG(level, fmt, args...) \ > + RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args) > + Since you are looking in the area for all the versions of gcc/clang we use able to support the non-standard __VA_ARGS__ that discard the comma? I know that some versions of gcc do and if it does I would like to move to using __VA_ARGS__ instead of args so we can use the same thing with msvc.
RedHat QE's test result against DPDK stable 20.11.10-rc1
I tested below 18 scenarios on RHEL9 and didn't find any new dpdk issues. Guest with device assignment(PF) throughput testing(1G hugepage size): PASS Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS Guest with device assignment(VF) throughput testing: PASS PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS PVP vhost-user 2Q throughput testing: PASS PVP vhost-user 1Q - cross numa node throughput testing: PASS Guest with vhost-user 2 queues throughput testing: PASS vhost-user reconnect with dpdk-client, qemu-server qemu reconnect: PASS vhost-user reconnect with dpdk-client, qemu-server ovs reconnect: PASS PVP reconnect with dpdk-client, qemu-server: PASS PVP 1Q live migration testing: PASS PVP 1Q cross numa node live migration testing: PASS Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS Guest with ovs+dpdk+vhost-user 4Q live migration testing: PASS Host PF + DPDK testing: PASS Host VF + DPDK testing: PASS Test Versions: qemu-kvm-7.2.0 + kernel 5.14 + libvirt-9.0.0 # git log commit a98b988ea5301b4218de5a558d84dbf5dcde9a05 Author: Luca Boccassi Date: Fri Dec 1 11:45:44 2023 + version: 20.11.10-rc1 Signed-off-by: Luca Boccassi Test device : X540-AT2 NIC(ixgbe, 10G) Best Regards, YangHang Liu
Re: [PATCH] lib/dmadev: get DMA device using device ID
Hi Amit,
On 2023/12/8 15:55, Amit Prakash Shukla wrote:
> DMA library has a function to get DMA device based on device name but
> there is no function to get DMA device using device id.
>
> Added a function that lookup for the dma device using device id and
> returns the pointer to the same.
>
> Signed-off-by: Amit Prakash Shukla
> ---
> lib/dmadev/rte_dmadev.c | 9 +
> lib/dmadev/rte_dmadev_pmd.h | 14 ++
> lib/dmadev/version.map | 1 +
> 3 files changed, 24 insertions(+)
>
> diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
> index 4e5e420c82..83f49e77f2 100644
> --- a/lib/dmadev/rte_dmadev.c
> +++ b/lib/dmadev/rte_dmadev.c
> @@ -397,6 +397,15 @@ rte_dma_is_valid(int16_t dev_id)
> rte_dma_devices[dev_id].state != RTE_DMA_DEV_UNUSED;
> }
>
> +struct rte_dma_dev *
> +rte_dma_pmd_get_dev_by_id(const int dev_id)
> +{
> + if (!rte_dma_is_valid(dev_id))
> + return NULL;
> +
> + return &rte_dma_devices[dev_id];
> +}
> +
> uint16_t
> rte_dma_count_avail(void)
> {
> diff --git a/lib/dmadev/rte_dmadev_pmd.h b/lib/dmadev/rte_dmadev_pmd.h
> index c61cedfb23..f68c3ac6aa 100644
> --- a/lib/dmadev/rte_dmadev_pmd.h
> +++ b/lib/dmadev/rte_dmadev_pmd.h
> @@ -167,6 +167,20 @@ struct rte_dma_dev *rte_dma_pmd_allocate(const char
> *name, int numa_node,
> __rte_internal
> int rte_dma_pmd_release(const char *name);
>
> +/**
> + * @internal
> + * Get the rte_dma_dev structure device pointer for the device id.
> + *
> + * @param dev_id
> + * Device ID value to select the device structure.
> + *
> + * @return
> + * - rte_dma_dev structure pointer for the given device ID on success, NULL
> + * otherwise.
> + */
> +__rte_internal
> +struct rte_dma_dev *rte_dma_pmd_get_dev_by_id(const int dev_id);
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map
> index 2a3736514c..2cd57c43d3 100644
> --- a/lib/dmadev/version.map
> +++ b/lib/dmadev/version.map
> @@ -26,6 +26,7 @@ INTERNAL {
> rte_dma_fp_objs;
> rte_dma_pmd_allocate;
> rte_dma_pmd_release;
> + rte_dma_pmd_get_dev_by_id;
Should arranged alphabetically in version.map
With above fixed
Acked-by: Chengwen Feng
Thanks
>
> local: *;
> };
>
Re: [RFC v2 05/14] lib: remove redundant newline from logs
For lib/dmadev part Reviewed-by: Chengwen Feng On 2023/12/8 22:59, David Marchand wrote: > Fix places where two newline characters may be logged. > > Cc: sta...@dpdk.org > > Signed-off-by: David Marchand > --- > Changes since RFC v1: > - split fixes on direct calls to printf or RTE_LOG in a previous patch, > > --- > drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 2 +- > lib/bbdev/rte_bbdev.c | 6 +- > lib/cfgfile/rte_cfgfile.c | 14 ++-- > lib/compressdev/rte_compressdev_pmd.c | 4 +- > lib/cryptodev/rte_cryptodev.c | 2 +- > lib/dispatcher/rte_dispatcher.c | 12 +-- > lib/dmadev/rte_dmadev.c | 2 +- > lib/eal/windows/eal_memory.c| 2 +- > lib/eventdev/eventdev_pmd.h | 6 +- > lib/eventdev/rte_event_crypto_adapter.c | 12 +-- > lib/eventdev/rte_event_dma_adapter.c| 14 ++-- > lib/eventdev/rte_event_eth_rx_adapter.c | 28 +++ > lib/eventdev/rte_event_eth_tx_adapter.c | 2 +- > lib/eventdev/rte_event_timer_adapter.c | 4 +- > lib/eventdev/rte_eventdev.c | 4 +- > lib/metrics/rte_metrics_telemetry.c | 2 +- > lib/mldev/rte_mldev.c | 102 > lib/net/rte_net_crc.c | 6 +- > lib/node/ethdev_rx.c| 4 +- > lib/node/ip4_lookup.c | 2 +- > lib/node/ip6_lookup.c | 2 +- > lib/node/kernel_rx.c| 8 +- > lib/node/kernel_tx.c| 4 +- > lib/rcu/rte_rcu_qsbr.c | 4 +- > lib/rcu/rte_rcu_qsbr.h | 8 +- > lib/stack/rte_stack.c | 8 +- > lib/vhost/vhost_crypto.c| 6 +- > 27 files changed, 135 insertions(+), 135 deletions(-) > ...
Re: [RFC v2 14/14] lib: use per line logging in helpers
For lib/dmadev part Reviewed-by: Chengwen Feng On 2023/12/8 22:59, David Marchand wrote: > Use RTE_LOG_LINE in existing macros that append a \n. > > Signed-off-by: David Marchand > --- > Changes since RFC v1: > - converted all logging helpers in lib/, > > --- > lib/bbdev/rte_bbdev.c | 5 +++-- > lib/bpf/bpf_impl.h | 2 +- > lib/cfgfile/rte_cfgfile.c | 4 ++-- > lib/compressdev/rte_compressdev_internal.h | 5 +++-- > lib/cryptodev/rte_cryptodev.h | 16 +++- > lib/dmadev/rte_dmadev.c| 6 -- > lib/ethdev/rte_ethdev.h| 3 +-- > lib/eventdev/eventdev_pmd.h| 8 > lib/eventdev/rte_event_timer_adapter.c | 17 ++--- > lib/gpudev/gpudev.c| 6 -- > lib/graph/graph_private.h | 5 +++-- > lib/member/member.h| 4 ++-- > lib/metrics/rte_metrics_telemetry.c| 4 ++-- > lib/mldev/rte_mldev.h | 5 +++-- > lib/net/rte_net_crc.c | 8 > lib/node/node_private.h| 6 -- > lib/pdump/rte_pdump.c | 5 ++--- > lib/power/power_common.h | 2 +- > lib/rawdev/rte_rawdev_pmd.h| 4 ++-- > lib/rcu/rte_rcu_qsbr.h | 8 +++- > lib/regexdev/rte_regexdev.h| 3 +-- > lib/stack/stack_pvt.h | 4 ++-- > lib/telemetry/telemetry.c | 4 +--- > lib/vhost/vhost.h | 8 > lib/vhost/vhost_crypto.c | 6 +++--- > 25 files changed, 76 insertions(+), 72 deletions(-) > ...
Re: [RFC v2 11/14] log: add a per line log helper
Acked-by: Chengwen Feng
On 2023/12/8 22:59, David Marchand wrote:
> gcc builtin __builtin_strchr can be used as a static assertion to check
> whether passed format strings contain a \n.
> This can be useful to detect double \n in log messages.
>
> Signed-off-by: David Marchand
> ---
> Changes since RFC v1:
> - added a check in checkpatches.sh,
>
> ---
> devtools/checkpatches.sh | 8
> lib/log/rte_log.h| 21 +
> 2 files changed, 29 insertions(+)
>
> diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
> index 10b79ca2bc..10d1bf490b 100755
> --- a/devtools/checkpatches.sh
> +++ b/devtools/checkpatches.sh
> @@ -53,6 +53,14 @@ print_usage () {
> check_forbidden_additions() { #
> res=0
>
> + # refrain from new calls to RTE_LOG
> + awk -v FOLDERS="lib" \
> + -v EXPRESSIONS="RTE_LOG\\\(" \
> + -v RET_ON_FAIL=1 \
> + -v MESSAGE='Prefer RTE_LOG_LINE' \
> + -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
> + "$1" || res=1
> +
> # refrain from new additions of rte_panic() and rte_exit()
> # multiple folders and expressions are separated by spaces
> awk -v FOLDERS="lib drivers" \
> diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
> index 27fb6129a7..da7e672e81 100644
> --- a/lib/log/rte_log.h
> +++ b/lib/log/rte_log.h
> @@ -17,6 +17,7 @@
> extern "C" {
> #endif
>
> +#include
> #include
> #include
> #include
> @@ -358,6 +359,26 @@ int rte_vlog(uint32_t level, uint32_t logtype, const
> char *format, va_list ap)
>RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \
>0)
>
> +#ifdef RTE_TOOLCHAIN_GCC
> +#define RTE_LOG_CHECK_NO_NEWLINE(fmt) \
> + static_assert(!__builtin_strchr(fmt, '\n'), \
> + "This log format string contains a \\n")
> +#else
> +#define RTE_LOG_CHECK_NO_NEWLINE(...)
> +#endif
> +
> +#define RTE_LOG_LINE(l, t, ...) do { \
> + RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__,)); \
> + RTE_LOG(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
> + RTE_FMT_TAIL(__VA_ARGS__ ,))); \
> +} while (0)
> +
> +#define RTE_LOG_DP_LINE(l, t, ...) do { \
> + RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__,)); \
> + RTE_LOG_DP(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
> + RTE_FMT_TAIL(__VA_ARGS__ ,))); \
> +} while (0)
> +
> #define RTE_LOG_REGISTER_IMPL(type, name, level) \
> int type;\
> RTE_INIT(__##type) \
>
