Re: [PATCH 01/30] net/mlx5/hws: Definer, add mlx5dr context to definer_conv_data
The description of this patch does not match the change.
Also the change is going backward, using deprecated fields.
It does not make sense, I'll skip it.
29/10/2023 17:31, Gregory Etelson:
> New mlx5dr_context member replaces mlx5dr_cmd_query_caps.
> Capabilities structure is a member of mlx5dr_context.
>
> Signed-off-by: Gregory Etelson
> Acked-by: Ori Kam
> ---
> drivers/net/mlx5/hws/mlx5dr_definer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
> b/drivers/net/mlx5/hws/mlx5dr_definer.c
> index 95b5d4b70e..75ba46b966 100644
> --- a/drivers/net/mlx5/hws/mlx5dr_definer.c
> +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
> @@ -1092,7 +1092,7 @@ mlx5dr_definer_conv_item_gtp(struct
> mlx5dr_definer_conv_data *cd,
> return rte_errno;
> }
>
> - if (m->hdr.teid) {
> + if (m->teid) {
> if (!(caps->flex_protocols & MLX5_HCA_FLEX_GTPU_TEID_ENABLED)) {
> rte_errno = ENOTSUP;
> return rte_errno;
> @@ -1118,7 +1118,7 @@ mlx5dr_definer_conv_item_gtp(struct
> mlx5dr_definer_conv_data *cd,
> }
>
>
> - if (m->hdr.msg_type) {
> + if (m->msg_type) {
> if (!(caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) {
> rte_errno = ENOTSUP;
> return rte_errno;
>
Re: [PATCH 04/30] net/mlx5: add rte_device parameter to locate HWS registers
29/10/2023 17:31, Gregory Etelson:
> 1. Add rte_eth_dev parameter to the `flow_hw_get_reg_id()`
>
> 2. Add mlx5_flow_hw_get_reg_id()
>
> Signed-off-by: Gregory Etelson
> Acked-by: Ori Kam
> ---
This,
> -static void
> +void
> flow_rxq_mark_flag_set(struct rte_eth_dev *dev)
> {
and this,
> +void
> +flow_rxq_mark_flag_set(struct rte_eth_dev *dev);
are completely unrelated changes,
and probably unneeded.
[PATCH] doc: add prog action into default ini
Added prog action into nic feature default.ini.
Fixes: 8f1953f1914d ("ethdev: add flow API for P4-programmable devices")
Signed-off-by: Qi Zhang
---
doc/guides/nics/features/default.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/doc/guides/nics/features/default.ini
b/doc/guides/nics/features/default.ini
index e41a97b3bb..806cb033ff 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -188,6 +188,7 @@ passthru =
pf =
port_id =
port_representor =
+prog =
queue=
quota=
raw_decap=
--
2.31.1
[PATCH] doc: add prog action into default ini
Added prog action into nic feature default.ini.
Fixes: 8f1953f1914d ("ethdev: add flow API for P4-programmable devices")
Signed-off-by: Qi Zhang
---
doc/guides/nics/features/default.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/doc/guides/nics/features/default.ini
b/doc/guides/nics/features/default.ini
index e41a97b3bb..806cb033ff 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -188,6 +188,7 @@ passthru =
pf =
port_id =
port_representor =
+prog =
queue=
quota=
raw_decap=
--
2.31.1
[PATCH] doc: add prog action into default ini
Added prog action into nic feature default.ini.
Fixes: 8f1953f1914d ("ethdev: add flow API for P4-programmable devices")
Signed-off-by: Qi Zhang
---
doc/guides/nics/features/default.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/doc/guides/nics/features/default.ini
b/doc/guides/nics/features/default.ini
index e41a97b3bb..806cb033ff 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -188,6 +188,7 @@ passthru =
pf =
port_id =
port_representor =
+prog =
queue=
quota=
raw_decap=
--
2.31.1
Re: [PATCH v2] test/dma: fix for buffer auto free
Acked-by: Chengwen Feng
On 2023/11/4 2:30, Amit Prakash Shukla wrote:
> Buffer auto free test failed for more than 1 dma device as the device
> initialization for the test was been done only for the first dma
> device. This changeset fixes the same and also fixes the freeing of
> the uninitialised source buffer in error condition.
>
> Fixes: 877cb3e37426 ("dmadev: add buffer auto free offload")
>
> Signed-off-by: Amit Prakash Shukla
...
Re: [PATCH v6 1/2] bus/pci: add function to enable/disable PASID
Sorry I missed all previous versions…
+ARM guy
> On Nov 4, 2023, at 02:29, Abdullah Sevincer
> wrote:
>
> External email: Use caution opening links or attachments
>
>
> This commit implements an internal api to enable and disable PASID for
> a device e.g. device driver event/dlb2.
>
> For kernels when PASID enabled by default it breaks DLB functionality,
> hence disabling PASID is required for DLB to function properly.
>
> PASID capability is not exposed to users hence offset can not be
> retrieved by rte_pci_find_ext_capability() api. Therefore, api
> implemented in this commit accepts an offset for PASID with an enable
> flag which is used to enable/disable PASID.
>
> Signed-off-by: Abdullah Sevincer
Is PASID now part of PCIe spec? This APIs should both work for x86/arm?
Not sure ARM is OK with the naming, previously they are calling it more as
Sub Stream ID (SSID)
> ---
> drivers/bus/pci/pci_common.c | 7 +++
> drivers/bus/pci/rte_bus_pci.h | 13 +
> drivers/bus/pci/version.map | 1 +
> lib/pci/rte_pci.h | 4
> 4 files changed, 25 insertions(+)
>
> diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> index 921d957bf6..5aac2406f1 100644
> --- a/drivers/bus/pci/pci_common.c
> +++ b/drivers/bus/pci/pci_common.c
> @@ -938,6 +938,13 @@ rte_pci_set_bus_master(const struct rte_pci_device *dev,
> bool enable)
>return 0;
> }
>
> +int
> +rte_pci_pasid_ena_dis(const struct rte_pci_device *dev, off_t offset, bool
> enable)
> +{
> + uint16_t pasid = enable;
> + return rte_pci_write_config(dev, &pasid, sizeof(pasid), offset) < 0 ?
> -1 : 0;
> +}
> +
> struct rte_pci_bus rte_pci_bus = {
>.bus = {
>.scan = rte_pci_scan,
> diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
> index 21e234abf0..d45b7bf2ab 100644
> --- a/drivers/bus/pci/rte_bus_pci.h
> +++ b/drivers/bus/pci/rte_bus_pci.h
> @@ -295,6 +295,19 @@ void rte_pci_ioport_read(struct rte_pci_ioport *p,
> void rte_pci_ioport_write(struct rte_pci_ioport *p,
>const void *data, size_t len, off_t offset);
>
> +/**
> + * Enable/Disable PASID.
> + *
> + * @param dev
> + * A pointer to a rte_pci_device structure.
> + * @param offset
> + * Offset of the PASID external capability.
> + * @param enable
> + * Flag to enable or disable PASID.
> + */
> +__rte_internal
> +int rte_pci_pasid_ena_dis(const struct rte_pci_device *dev, off_t offset,
> bool enable);
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map
> index 74c5b075d5..01e6a09eb6 100644
> --- a/drivers/bus/pci/version.map
> +++ b/drivers/bus/pci/version.map
> @@ -36,6 +36,7 @@ INTERNAL {
>global:
>
>rte_pci_get_sysfs_path;
> + rte_pci_pasid_ena_dis;
>rte_pci_register;
>rte_pci_unregister;
> };
> diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
> index 69e932d910..d195f01950 100644
> --- a/lib/pci/rte_pci.h
> +++ b/lib/pci/rte_pci.h
> @@ -101,6 +101,10 @@ extern "C" {
> #define RTE_PCI_EXT_CAP_ID_ACS 0x0d/* Access Control Services */
> #define RTE_PCI_EXT_CAP_ID_SRIOV 0x10/* SR-IOV */
> #define RTE_PCI_EXT_CAP_ID_PRI 0x13/* Page Request Interface */
> +#define RTE_PCI_EXT_CAP_ID_PASID0x1B/* Process Address Space ID
> */
> +
> +/* Process Address Space ID */
> +#define RTE_PCI_PASID_CTRL 0x06/* PASID control register */
Align with old definitions will looks better. Using TAB?
Thanks,
Chenbo
>
> /* Advanced Error Reporting (RTE_PCI_EXT_CAP_ID_ERR) */
> #define RTE_PCI_ERR_UNCOR_STATUS 0x04/* Uncorrectable Error Status
> */
> --
> 2.25.1
>
RE: [PATCH v4] net/ice: fix crash on closing representor ports
> -Original Message-
> From: Ye, MingjinX
> Sent: Thursday, November 2, 2023 6:11 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming ; Zhou, YidingX
> ; Ye, MingjinX ;
> sta...@dpdk.org; Zhang, Qi Z
> Subject: [PATCH v4] net/ice: fix crash on closing representor ports
>
> Since the representor port needs to access the resource of the associated DCF
> when it is closing. Therefore, all the representor port should be closed
> first,
> and then close the associated DCF port.
>
> If the DCF port is closed before the representor port on PMD exit.
> This will result in accessing freed resources and eventually a core dump will
> occur.
>
> This patch fixes this issue by notifying each other to unassociate when the
> DCF port and the representor port are closed.
>
> Fixes: 5674465a32c8 ("net/ice: add DCF VLAN handling")
> Fixes: c7e1a1a3bfeb ("net/ice: refactor DCF VLAN handling")
> Fixes: da9cdcd1f372 ("net/ice: fix crash on representor port closing")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Mingjin Ye
> ---
> v2: Reformat code to remove unneeded fixlines.
> ---
> v3: New solution.
> ---
> v4: Optimize v2 patch.
> ---
> drivers/net/ice/ice_dcf_ethdev.c | 20
> drivers/net/ice/ice_dcf_ethdev.h | 2 ++
> drivers/net/ice/ice_dcf_vf_representor.c | 23 ++-
> 3 files changed, 40 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ice/ice_dcf_ethdev.c
> b/drivers/net/ice/ice_dcf_ethdev.c
> index 065ec728c2..63e63a23de 100644
> --- a/drivers/net/ice/ice_dcf_ethdev.c
> +++ b/drivers/net/ice/ice_dcf_ethdev.c
> @@ -1618,6 +1618,26 @@ ice_dcf_free_repr_info(struct ice_dcf_adapter
> *dcf_adapter)
> }
> }
>
> +int
> +ice_dcf_handle_vf_repr_uninit(struct ice_dcf_adapter *dcf_adapter,
> + uint16_t vf_id)
> +{
> + struct ice_dcf_repr_info *vf_rep_info;
> +
> + if (dcf_adapter->num_reprs >= vf_id) {
> + PMD_DRV_LOG(ERR, "Invalid VF id: %d", vf_id);
> + return -1;
> + }
> +
> + if (!dcf_adapter->repr_infos)
> + return 0;
> +
> + vf_rep_info = &dcf_adapter->repr_infos[vf_id];
> + vf_rep_info->vf_rep_eth_dev = NULL;
> +
> + return 0;
> +}
> +
> static int
> ice_dcf_init_repr_info(struct ice_dcf_adapter *dcf_adapter) { diff --git
> a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h
> index 4baaec4b8b..094e2a36db 100644
> --- a/drivers/net/ice/ice_dcf_ethdev.h
> +++ b/drivers/net/ice/ice_dcf_ethdev.h
> @@ -60,6 +60,7 @@ struct ice_dcf_vf_repr {
> struct rte_ether_addr mac_addr;
> uint16_t switch_domain_id;
> uint16_t vf_id;
> + bool dcf_valid;
>
> struct ice_dcf_vlan outer_vlan_info; /* DCF always handle outer VLAN
> */ }; @@ -81,5 +82,6 @@ int ice_dcf_vf_repr_uninit(struct rte_eth_dev
> *vf_rep_eth_dev); int ice_dcf_vf_repr_init_vlan(struct rte_eth_dev
> *vf_rep_eth_dev); void ice_dcf_vf_repr_stop_all(struct ice_dcf_adapter
> *dcf_adapter); bool ice_dcf_adminq_need_retry(struct ice_adapter *ad);
> +int ice_dcf_handle_vf_repr_uninit(struct ice_dcf_adapter *dcf_adapter,
> +uint16_t vf_id);
>
> #endif /* _ICE_DCF_ETHDEV_H_ */
> diff --git a/drivers/net/ice/ice_dcf_vf_representor.c
> b/drivers/net/ice/ice_dcf_vf_representor.c
> index b9fcfc80ad..167abaa780 100644
> --- a/drivers/net/ice/ice_dcf_vf_representor.c
> +++ b/drivers/net/ice/ice_dcf_vf_representor.c
> @@ -45,6 +45,9 @@ ice_dcf_vf_repr_dev_start(struct rte_eth_dev *dev)
> static int ice_dcf_vf_repr_dev_stop(struct rte_eth_dev *dev) {
> + struct ice_dcf_vf_repr *repr = dev->data->dev_private;
> +
> + repr->dcf_valid = false;
Is this correct ?
ice_dcf_handle_vf_repr_uninit will not be called,
if we stop a representor port (call ice_dcf_vf_repr_dev_stop), then close it
(call ice_dcf_vf_repr_uninit) while DCF still be active.
if you want to use dcf_valid as a notification flag sent from dcf to each
representors, never set it in a representer's own callback function.
Btw, besides set dcf_valid to true in ice_dcf_vf_repr_init, you may also
consider the case when a DCF reset happen, dcf_valid need to be reset to true
for each active representor.
...
> *init_param) int ice_dcf_vf_repr_uninit(struct rte_eth_dev *vf_rep_eth_dev)
> {
> + struct ice_dcf_vf_repr *repr = vf_rep_eth_dev->data->dev_private;
> + struct ice_dcf_adapter *dcf_adapter;
> +
> + if (repr->dcf_valid) {
> + dcf_adapter = repr->dcf_eth_dev->data->dev_private;
> + ice_dcf_handle_vf_repr_uninit(dcf_adapter, repr->vf_id);
> + }
> +
> vf_rep_eth_dev->data->mac_addrs = NULL;
>
> return 0;
Re: [PATCH v2 0/7] fix race-condition of proactive error handling mode
Friendly ping. On 2023/10/20 18:07, Chengwen Feng wrote: > This patch fixes race-condition of proactive error handling mode, the > discussion thread [1]. > > [1] > http://patchwork.dpdk.org/project/dpdk/patch/20230220060839.1267349-2-ashok.k.kal...@intel.com/ > > Chengwen Feng (7): > ethdev: fix race-condition of proactive error handling mode > net/hns3: replace fp ops config function > net/bnxt: fix race-condition when report error recovery > net/bnxt: use fp ops setup function > app/testpmd: add error recovery usage demo > app/testpmd: extract event handling to event.c > doc: testpmd support event handling section > > --- > v2: > - extract event handling to event.c and document it, which address > Ferruh's comment. > - add ack-by from Konstantin Ananyev and Dongdong Liu. > > app/test-pmd/event.c | 390 +++ > app/test-pmd/meson.build | 1 + > app/test-pmd/parameters.c| 36 +- > app/test-pmd/testpmd.c | 247 +--- > app/test-pmd/testpmd.h | 10 +- > doc/guides/prog_guide/poll_mode_drv.rst | 20 +- > doc/guides/testpmd_app_ug/event_handling.rst | 80 > doc/guides/testpmd_app_ug/index.rst | 1 + > drivers/net/bnxt/bnxt_cpr.c | 18 +- > drivers/net/bnxt/bnxt_ethdev.c | 9 +- > drivers/net/hns3/hns3_rxtx.c | 21 +- > lib/ethdev/ethdev_driver.c | 8 + > lib/ethdev/ethdev_driver.h | 10 + > lib/ethdev/rte_ethdev.h | 32 +- > lib/ethdev/version.map | 1 + > 15 files changed, 551 insertions(+), 333 deletions(-) > create mode 100644 app/test-pmd/event.c > create mode 100644 doc/guides/testpmd_app_ug/event_handling.rst >
RE: [PATCH] net/iavf: fix Tx preparation
> -Original Message-
> From: Yang, Qiming
> Sent: Thursday, November 2, 2023 2:45 PM
> To: Zhang, Qi Z ; Xing, Beilei
> Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> Subject: RE: [PATCH] net/iavf: fix Tx preparation
>
> Hi,
>
> > -Original Message-
> > From: Qi Zhang
> > Sent: Thursday, November 2, 2023 8:05 PM
> > To: Xing, Beilei
> > Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> > Subject: [PATCH] net/iavf: fix Tx preparation
> >
> > 1. check nb_segs > Tx ring size for TSO case.
> > 2. report nb_mtu_seg_max and nb_seg_max in dev_info.
> >
> > Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Qi Zhang
> > ---
> > drivers/net/iavf/iavf_ethdev.c | 2 ++
> > drivers/net/iavf/iavf_rxtx.c | 3 ++-
> > 2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/iavf/iavf_ethdev.c
> > b/drivers/net/iavf/iavf_ethdev.c index 98cc5c8ea8..0c6ab4ac5a 100644
> > --- a/drivers/net/iavf/iavf_ethdev.c
> > +++ b/drivers/net/iavf/iavf_ethdev.c
> > @@ -1207,6 +1207,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev,
> > struct rte_eth_dev_info *dev_info)
> > .nb_max = IAVF_MAX_RING_DESC,
> > .nb_min = IAVF_MIN_RING_DESC,
> > .nb_align = IAVF_ALIGN_RING_DESC,
> > + .nb_mtu_seg_max = IAVF_TX_MAX_MTU_SEG,
> > + .nb_seg_max = IAVF_MAX_RING_DESC,
> > };
> >
> > dev_info->err_handle_mode =
> > RTE_ETH_ERROR_HANDLE_MODE_PASSIVE;
> > diff --git a/drivers/net/iavf/iavf_rxtx.c
> > b/drivers/net/iavf/iavf_rxtx.c index
> > 610912f635..45f638c1d2 100644
> > --- a/drivers/net/iavf/iavf_rxtx.c
> > +++ b/drivers/net/iavf/iavf_rxtx.c
> > @@ -3656,7 +3656,8 @@ iavf_prep_pkts(__rte_unused void *tx_queue,
> > struct rte_mbuf **tx_pkts,
> > return i;
> > }
> > } else if ((m->tso_segsz < IAVF_MIN_TSO_MSS) ||
> > - (m->tso_segsz > IAVF_MAX_TSO_MSS)) {
> > + (m->tso_segsz > IAVF_MAX_TSO_MSS) ||
> > + (m->nb_segs > txq->nb_tx_desc)) {
> > /* MSS outside the range are considered malicious */
> > rte_errno = EINVAL;
> > return i;
> > --
> > 2.31.1
>
> Acked-by: Qiming Yang
Applied to dpdk-next-net-intel.
Thanks
Qi
RE: [PATCH v2] net/ice: fix Tx preparation
> -Original Message-
> From: Yang, Qiming
> Sent: Thursday, November 2, 2023 2:41 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org; sta...@dpdk.org
> Subject: RE: [PATCH v2] net/ice: fix Tx preparation
>
> Hi,
>
> > -Original Message-
> > From: Zhang, Qi Z
> > Sent: Thursday, November 2, 2023 10:22 PM
> > To: Yang, Qiming
> > Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> > Subject: [PATCH v2] net/ice: fix Tx preparation
> >
> > 1. Check nb_segs > 8 for NO TSO case
> > 2. Check nb_segs > Tx ring size for TSO case 3. report nb_mtu_seg_max
> > and nb_seg_max in dev_info.
> >
> > Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Qi Zhang
> > ---
> > drivers/net/ice/ice_ethdev.c | 2 ++
> > drivers/net/ice/ice_rxtx.c | 18 --
> > drivers/net/ice/ice_rxtx.h | 2 ++
> > 3 files changed, 20 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c
> > b/drivers/net/ice/ice_ethdev.c index
> > 6ef06b9926..3ccba4db80 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -3918,6 +3918,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
> > rte_eth_dev_info *dev_info)
> > .nb_max = ICE_MAX_RING_DESC,
> > .nb_min = ICE_MIN_RING_DESC,
> > .nb_align = ICE_ALIGN_RING_DESC,
> > + .nb_mtu_seg_max = ICE_TX_MTU_SEG_MAX,
> > + .nb_seg_max = ICE_MAX_RING_DESC,
> > };
> >
> > dev_info->speed_capa = RTE_ETH_LINK_SPEED_10M | diff --git
> > a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index
> > ee9cb7b955..73e47ae92d 100644
> > --- a/drivers/net/ice/ice_rxtx.c
> > +++ b/drivers/net/ice/ice_rxtx.c
> > @@ -3679,7 +3679,7 @@ ice_check_empty_mbuf(struct rte_mbuf
> *tx_pkt) }
> >
> > uint16_t
> > -ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
> > +ice_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
> > uint16_t nb_pkts)
> > {
> > int i, ret;
> > @@ -3690,9 +3690,23 @@ ice_prep_pkts(__rte_unused void *tx_queue,
> > struct rte_mbuf **tx_pkts,
> > m = tx_pkts[i];
> > ol_flags = m->ol_flags;
> >
> > - if (ol_flags & RTE_MBUF_F_TX_TCP_SEG &&
> > + if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG) &&
> > + /**
> > +* No TSO case: nb->segs, pkt_len to not exceed
> > +* the limites.
> > +*/
> > + (m->nb_segs > ICE_TX_MTU_SEG_MAX ||
> > +m->pkt_len > ICE_FRAME_SIZE_MAX)) {
> > + rte_errno = EINVAL;
> > + return i;
> > + } else if (ol_flags & RTE_MBUF_F_TX_TCP_SEG &&
> > + /** TSO case: tso_segsz, nb_segs, pkt_len not exceed
> > +* the limits.
> > +*/
> > (m->tso_segsz < ICE_MIN_TSO_MSS ||
> > m->tso_segsz > ICE_MAX_TSO_MSS ||
> > +m->nb_segs >
> > + ((struct ice_tx_queue *)tx_queue)->nb_tx_desc ||
> > m->pkt_len > ICE_MAX_TSO_FRAME_SIZE)) {
> > /**
> > * MSS outside the range are considered malicious diff
> --git
> > a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index
> > 268289716e..bd2c4abec9 100644
> > --- a/drivers/net/ice/ice_rxtx.h
> > +++ b/drivers/net/ice/ice_rxtx.h
> > @@ -56,6 +56,8 @@ extern int ice_timestamp_dynfield_offset;
> >
> > #define ICE_HEADER_SPLIT_ENA BIT(0)
> >
> > +#define ICE_TX_MTU_SEG_MAX 8
> > +
> > typedef void (*ice_rx_release_mbufs_t)(struct ice_rx_queue *rxq);
> > typedef void (*ice_tx_release_mbufs_t)(struct ice_tx_queue *txq);
> > typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,
> > --
> > 2.31.1
>
> Acked-by: Qiming Yang
Applied to dpdk-next-net-intel.
Thanks
Qi
RE: [PATCH v4] net/cpfl: support action prog
> -Original Message- > From: Qiao, Wenjing > Sent: Thursday, November 2, 2023 4:51 PM > To: Wu, Jingjing ; Xing, Beilei > ; > Zhang, Qi Z > Cc: dev@dpdk.org; Qiao, Wenjing > Subject: [PATCH v4] net/cpfl: support action prog > > From: Wenjing Qiao > > Parse JSON file and generate rules that instruct PMD to map an > RTE_FLOW_ACTION_TYPE_PROG to a low-level FXP representation, the > matching follows below guidelines. > > Use rte_flow_action_prog->name to match the name of a P4 action type > when provided in the JSON file. In cases where the JSON file lacks the P4 > action type's name but includes the P4 action type ID, PMD should attempt to > convert rte_flow_action_prog->name into a > uint32 value and then match it to the P4 action type ID. > > The same method applies when matching a rte_flow_action_prog_argument > to a field of an action type. > > Here's an example to create a rule that matches an IPV4/TCP header and > applies a VXLAN encapsulation which is represented by rte_flow_action_prog: > > flow create 0 ingress pattern eth src is 00:11:22:33:44:55 dst is > 00:01:00:00:03:14 / ipv4 src is 192.168.0.1 dst is 192.168.0.2 / tcp src is > 0x1451 > dst is 0x157c / end actions prog name vxlan_encap arguments src_addr > 0xC0A80002 dst_addr 0xC0A80003 src_mac 0x00010314 dst_mac > 0x00060314 src_port 0x1234 dst_port 0x4789 vni 0x50 end / > port_representor port_id 0 / end > > Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang The CI build error in patchwork is covered by below fix https://patchwork.dpdk.org/project/dpdk/patch/20231106091453.1599496-1-qi.z.zh...@intel.com/ Applied to dpdk-next-net-intel. Thanks Qi
Re: [PATCH v4 1/5] kvargs: add one new process API
On Sun, 5 Nov 2023 05:45:35 + Chengwen Feng wrote: > +* **Updated kvargs process API.** > + > + * Introduced rte_kvargs_process_opt() API, which inherits the function > +of rte_kvargs_process() and could handle both key=value and only-key > +cases. > + > + * Constraint rte_kvargs_process() API can only handle key=value cases, > +it will return -1 when handle only-key case (that is the matched key's > +value is NULL). > + Looks good but may I suggest some alternatives. Since this is an API and ABI change as was not announced, maybe a little late in the process for this release. And since unlikely to go in 23.11 need to do something better in 24.03. What about changing the args to rte_kvargs_process() to add an additional default value. Most callers don't have a default (use key-value) but the ones that take only-key would pass the default value. Then use ABI versioning to add the new arg and you would not have to introduce a new function. And add a legacy API version that does what current code does. All the drivers in DPDK would get the new API/ABI but any customer apps using rte_kvargs_process() would get the old version.
[Bug 1236] [dpdk-23.07]VM crash when start dpdk-l3fwd-power in VM with QEMU-8.0.0
https://bugs.dpdk.org/show_bug.cgi?id=1236 linglix.c...@intel.com changed: What|Removed |Added Resolution|--- |FIXED CC||linglix.c...@intel.com Status|UNCONFIRMED |RESOLVED --- Comment #3 from linglix.c...@intel.com --- Verified on dpdk-23.11.0-rc1(495846c12b) main branch PASSED. fix patch has been merged into main, efc3f842b3 net/virtio: fix link state interrupt vector setting -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH v3 1/3] test/dma: use unit test framework
Hi Gowrishankar,
Thanks for your works.
On 2023/11/3 23:38, Gowrishankar Muthukrishnan wrote:
> Use unit test framework to execute DMA tests.
>
> Signed-off-by: Gowrishankar Muthukrishnan
> Suggested-by: Chengwen Feng
> ---
> app/test/test_dmadev.c | 240 -
> app/test/test_dmadev_api.c | 89 --
> 2 files changed, 212 insertions(+), 117 deletions(-)
>
> diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
> index 216f84b6bb..780941fc1e 100644
> --- a/app/test/test_dmadev.c
> +++ b/app/test/test_dmadev.c
> @@ -22,7 +22,9 @@
> #define COPY_LEN 1024
>
> static struct rte_mempool *pool;
> +static int16_t test_dev_id;
> static uint16_t id_count;
> +static int vchan;
>
> enum {
> TEST_PARAM_REMOTE_ADDR = 0,
> @@ -61,13 +63,35 @@ print_err(const char *func, int lineno, const char
> *format, ...)
> va_end(ap);
> }
>
> +struct runtest_param {
> + const char *printable;
> + int (*test_fn)(int16_t dev_id, uint16_t vchan);
> + int iterations;
> + int16_t dev_id;
> + uint16_t vchan;
> + bool check_err_stats;
> +};
> +
> static int
> -runtest(const char *printable, int (*test_fn)(int16_t dev_id, uint16_t
> vchan), int iterations,
> - int16_t dev_id, uint16_t vchan, bool check_err_stats)
> +runtest(const void *args)
> {
> + int (*test_fn)(int16_t dev_id, uint16_t vchan);
> + const struct runtest_param *param = args;
> struct rte_dma_stats stats;
> + const char *printable;
> + bool check_err_stats;
> + int iterations;
> + int16_t dev_id;
> + uint16_t vchan;
> int i;
>
> + printable = param->printable;
> + iterations = param->iterations;
> + dev_id = param->dev_id;
> + vchan = param->vchan;
> + check_err_stats = param->check_err_stats;
> + test_fn = param->test_fn;
> +
> rte_dma_stats_reset(dev_id, vchan);
> printf("DMA Dev %d: Running %s Tests %s\n", dev_id, printable,
> check_err_stats ? " " : "(errors expected)");
> @@ -918,9 +942,21 @@ test_m2d_auto_free(int16_t dev_id, uint16_t vchan)
> }
>
> static int
> -test_dmadev_instance(int16_t dev_id)
> +test_dmadev_burst_setup(void)
> {
> -#define CHECK_ERRStrue
> + if (rte_dma_burst_capacity(test_dev_id, vchan) < 64) {
> + printf("DMA Dev %u: insufficient burst capacity (64 required),
> skipping tests\n",
> + test_dev_id);
> + return TEST_SKIPPED;
> + }
> +
> + return TEST_SUCCESS;
> +}
> +
> +static int
> +test_dmadev_setup(void)
> +{
> + int16_t dev_id = test_dev_id;
> struct rte_dma_stats stats;
> struct rte_dma_info info;
> const struct rte_dma_conf conf = { .nb_vchans = 1};
> @@ -928,16 +964,12 @@ test_dmadev_instance(int16_t dev_id)
> .direction = RTE_DMA_DIR_MEM_TO_MEM,
> .nb_desc = TEST_RINGSIZE,
> };
> - const int vchan = 0;
> int ret;
>
> ret = rte_dma_info_get(dev_id, &info);
> if (ret != 0)
> ERR_RETURN("Error with rte_dma_info_get()\n");
>
> - printf("\n### Test dmadev instance %u [%s]\n",
> - dev_id, info.dev_name);
> -
> if (info.max_vchans < 1)
> ERR_RETURN("Error, no channels available on device id %u\n",
> dev_id);
>
> @@ -976,20 +1008,123 @@ test_dmadev_instance(int16_t dev_id)
> if (pool == NULL)
> ERR_RETURN("Error with mempool creation\n");
>
> + return 0;
> +}
> +
> +static void
> +test_dmadev_teardown(void)
> +{
> + rte_mempool_free(pool);
> + rte_dma_stop(test_dev_id);
> + rte_dma_stats_reset(test_dev_id, vchan);
> + test_dev_id = -EINVAL;
> +}
> +
> +static int
> +test_dmadev_instance(int16_t dev_id)
> +{
> +#define CHECK_ERRStrue
suggest rm this define
> + enum {
> + TEST_COPY = 0,
> + TEST_START,
> + TEST_BURST,
> + TEST_ERR,
> + TEST_FILL,
> + TEST_M2D,
> + TEST_END
> + };
> +
> + struct runtest_param param[TEST_END];
> + struct rte_dma_info dev_info;
> + struct unit_test_suite *ts;
> + struct unit_test_case *tc;
> + int ret;
> +
> + if (rte_dma_info_get(dev_id, &dev_info) < 0)
> + return TEST_SKIPPED;
> +
> + test_dev_id = dev_id;
> + vchan = 0;
> +
> + ts = calloc(1, sizeof(struct unit_test_suite)
> + + sizeof(struct unit_test_case) * (TEST_END +
> 1));
> +
> + ts->suite_name = "DMA dev instance testsuite";
> + ts->setup = test_dmadev_setup;
> + ts->teardown = test_dmadev_teardown;
> +
> + param[TEST_COPY].printable = "copy";
> + param[TEST_COPY].test_fn = test_enqueue_copies;
> + param[TEST_COPY].iterations = 640;
> + param[TEST_COPY].dev_id = dev_id;
> + param[TEST_COPY].vchan = vchan;
> + param[TEST_COPY].check_err_stats =
Re: [PATCH v3 2/3] test/dma: test vchan reconfiguration
Hi Gowrishankar,
On 2023/11/3 23:38, Gowrishankar Muthukrishnan wrote:
> Reconfigure vchan count and validate if new count is effective.
I think it mainly due to multi-vchan, should point it out, suggest be: support
API with multiple vchan test
Thanks
Chengwen
>
> Signed-off-by: Gowrishankar Muthukrishnan
> ---
> app/test/test_dmadev_api.c | 63 +-
> 1 file changed, 55 insertions(+), 8 deletions(-)
>
> diff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c
> index da8fddb3ca..aa07d2b359 100644
> --- a/app/test/test_dmadev_api.c
> +++ b/app/test/test_dmadev_api.c
> @@ -260,7 +260,7 @@ test_dma_vchan_setup(void)
> }
>
> static int
> -setup_one_vchan(void)
> +setup_vchan(int nb_vchans)
> {
> struct rte_dma_vchan_conf vchan_conf = { 0 };
> struct rte_dma_info dev_info = { 0 };
> @@ -269,13 +269,15 @@ setup_one_vchan(void)
>
> ret = rte_dma_info_get(test_dev_id, &dev_info);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to obtain device info, %d", ret);
> - dev_conf.nb_vchans = 1;
> + dev_conf.nb_vchans = nb_vchans;
> ret = rte_dma_configure(test_dev_id, &dev_conf);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to configure, %d", ret);
> vchan_conf.direction = RTE_DMA_DIR_MEM_TO_MEM;
> vchan_conf.nb_desc = dev_info.min_desc;
> - ret = rte_dma_vchan_setup(test_dev_id, 0, &vchan_conf);
> - RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup vchan, %d", ret);
> + for (int i = 0; i < nb_vchans; i++) {
> + ret = rte_dma_vchan_setup(test_dev_id, i, &vchan_conf);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup vchan %d, %d", i,
> ret);
> + }
>
> return TEST_SUCCESS;
> }
> @@ -294,7 +296,7 @@ test_dma_start_stop(void)
> RTE_TEST_ASSERT(ret == -EINVAL, "Expected -EINVAL, %d", ret);
>
> /* Setup one vchan for later test */
> - ret = setup_one_vchan();
> + ret = setup_vchan(1);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
>
> ret = rte_dma_start(test_dev_id);
> @@ -312,6 +314,50 @@ test_dma_start_stop(void)
> return TEST_SUCCESS;
> }
>
> +static int
> +test_dma_reconfigure(void)
> +{
> + struct rte_dma_conf dev_conf = { 0 };
> + struct rte_dma_info dev_info = { 0 };
> + uint16_t cfg_vchans;
> + int ret;
> +
> + ret = rte_dma_info_get(test_dev_id, &dev_info);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to obtain device info, %d", ret);
> +
> + /* At least two vchans required for the test */
> + if (dev_info.max_vchans < 2)
> + return TEST_SKIPPED;
> +
> + /* Setup one vchan for later test */
> + ret = setup_vchan(1);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
> +
> + ret = rte_dma_start(test_dev_id);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to start, %d", ret);
> +
> + ret = rte_dma_stop(test_dev_id);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to stop, %d", ret);
> +
> + /* Check reconfigure and vchan setup after device stopped */
> + cfg_vchans = dev_conf.nb_vchans = (dev_info.max_vchans - 1);
> +
> + ret = setup_vchan(cfg_vchans);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
> +
> + ret = rte_dma_start(test_dev_id);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to start, %d", ret);
> +
> + ret = rte_dma_info_get(test_dev_id, &dev_info);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to obtain device info, %d", ret);
> + RTE_TEST_ASSERT_EQUAL(dev_info.nb_vchans, cfg_vchans, "incorrect
> reconfiguration");
> +
> + ret = rte_dma_stop(test_dev_id);
> + RTE_TEST_ASSERT_SUCCESS(ret, "Failed to stop, %d", ret);
> +
> + return TEST_SUCCESS;
> +}
> +
> static int
> test_dma_stats(void)
> {
> @@ -328,7 +374,7 @@ test_dma_stats(void)
> RTE_TEST_ASSERT(ret == -EINVAL, "Expected -EINVAL, %d", ret);
>
> /* Setup one vchan for later test */
> - ret = setup_one_vchan();
> + ret = setup_vchan(1);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
>
> /* Check for invalid vchan */
> @@ -400,7 +446,7 @@ test_dma_completed(void)
> int ret;
>
> /* Setup one vchan for later test */
> - ret = setup_one_vchan();
> + ret = setup_vchan(1);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
>
> ret = rte_dma_start(test_dev_id);
> @@ -459,7 +505,7 @@ test_dma_completed_status(void)
> int ret;
>
> /* Setup one vchan for later test */
> - ret = setup_one_vchan();
> + ret = setup_vchan(1);
> RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup one vchan, %d", ret);
>
> ret = rte_dma_start(test_dev_id);
> @@ -517,6 +563,7 @@ static struct unit_test_suite dma_api_testsuite = {
> TEST_CASE(test_dma_configure),
> TEST_CASE(test_dma_vchan_setup),
> TEST_CASE(test_dma_start_stop),
> + TES
[PATCH v5 1/1] build: add libarchive to external deps
In order to avoid linking with Libs.private, libarchive
is not added to ext_deps during the meson setup stage.
Since libarchive is not added to ext_deps, cross-compilation
or native compilation with libarchive installed in non-standard
location fails with errors related to "cannot find -larchive"
or "archive.h: No such file or directory". In order to fix the
build failures, user is required to define the 'c_args' and
'c_link_args' with '-I' and '-L'.
This patch adds libarchive to ext_deps and further would not
require setting c_args and c_link_args externally.
Fixes: 40edb9c0d36b ("eal: handle compressed firmware")
Cc: sta...@dpdk.org
Signed-off-by: Srikanth Yalavarthi
---
v5:
- Updated as per review comments
v4:
- Rebase over latest main
v3:
- Add to libarchive ext_deps
v2:
- Update ml/cnxk meson config
v1:
- Initial patch
config/meson.build | 5 -
lib/eal/meson.build | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 0968351740..250833d0a4 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -241,11 +241,6 @@ dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h')
or is_windows)
libarchive = dependency('libarchive', required: false, method: 'pkg-config')
if libarchive.found()
dpdk_conf.set('RTE_HAS_LIBARCHIVE', 1)
-# Push libarchive link dependency at the project level to support
-# statically linking dpdk apps. Details at:
-# https://inbox.dpdk.org/dev/20210605004024.660267a1@sovereign/
-add_project_link_arguments('-larchive', language: 'c')
-dpdk_extra_ldflags += '-larchive'
endif
# check for libbsd
diff --git a/lib/eal/meson.build b/lib/eal/meson.build
index 9942104386..e1d6c4cf17 100644
--- a/lib/eal/meson.build
+++ b/lib/eal/meson.build
@@ -21,6 +21,9 @@ endif
if dpdk_conf.has('RTE_USE_LIBBSD')
ext_deps += libbsd
endif
+if dpdk_conf.has('RTE_HAS_LIBARCHIVE')
+ext_deps += libarchive
+endif
if cc.has_function('getentropy', prefix : '#include ')
cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
endif
--
2.42.0
Re: [PATCH v2] app/testpmd: fix UDP cksum error for UFO enable
在 2023/11/3 18:42, Ferruh Yigit 写道:
On 11/3/2023 9:09 AM, lihuisong (C) wrote:
Hi Ferruh,
Thanks for you review.
在 2023/11/3 9:31, Ferruh Yigit 写道:
On 8/2/2023 3:55 AM, Huisong Li wrote:
The command "tso set " is used to enable UFO,
please
see commit ce8e6e742807 ("app/testpmd: support UFO in checksum engine")
The above patch configures the RTE_MBUF_F_TX_UDP_SEG to enable UFO
only if
tso_segsz is set.
"The above patch sets the RTE_MBUF_F_TX_UDP_SEG in mbuf ol_flags, only
by checking if 'tso_segsz' is set, but missing check if UFO offload
(RTE_ETH_TX_OFFLOAD_UDP_TSO) supported by device."
Ack
Then tx_prepare() may call rte_net_intel_cksum_prepare()
to compute pseudo header checksum (because some PMDs may supports TSO).
Not sure what do you mean by '(because some PMDs may supports TSO)'?
Do you mean something like following:
"RTE_MBUF_F_TX_UDP_SEG flag causes driver that supports TSO/UFO to
compute pseudo header checksum."
Ack
As a result, if the peer sends UDP packets, all packets with UDP
checksum
error are received for the PMDs only supported TSO.
"As a result, if device only supports TSO, but not UFO, UDP packet
checksum will be wrong."
Ack
So enabling UFO also depends on if driver has RTE_ETH_TX_OFFLOAD_UDP_TSO
capability. Similarly, TSO also need to do like this.
In addition, this patch also fixes cmd_tso_set_parsed() for UFO to make
it better to support TSO and UFO.
Fixes: ce8e6e742807 ("app/testpmd: support UFO in checksum engine")
Signed-off-by: Huisong Li
---
v2: add handle for tunnel TSO offload in process_inner_cksums
---
app/test-pmd/cmdline.c | 47 +
app/test-pmd/csumonly.c | 11 --
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0d0723f659..8be593d405 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4906,6 +4906,7 @@ cmd_tso_set_parsed(void *parsed_result,
{
struct cmd_tso_set_result *res = parsed_result;
struct rte_eth_dev_info dev_info;
+ uint64_t offloads;
int ret;
if (port_id_is_invalid(res->port_id, ENABLED_WARN))
@@ -4922,37 +4923,37 @@ cmd_tso_set_parsed(void *parsed_result,
if (ret != 0)
return;
- if ((ports[res->port_id].tso_segsz != 0) &&
- (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {
- fprintf(stderr, "Error: TSO is not supported by port %d\n",
- res->port_id);
- return;
+ if (ports[res->port_id].tso_segsz != 0) {
+ if ((dev_info.tx_offload_capa & (RTE_ETH_TX_OFFLOAD_TCP_TSO |
+ RTE_ETH_TX_OFFLOAD_UDP_TSO)) == 0) {
+ fprintf(stderr, "Error: both TSO and UFO are not
supported by port %d\n",
+ res->port_id);
+ return;
+ }
+ /* display warnings if configuration is not supported by the
NIC */
+ if ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO)
== 0)
+ fprintf(stderr, "Warning: port %d doesn't support TSO\n",
+ res->port_id);
+ if ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TSO)
== 0)
+ fprintf(stderr, "Warning: port %d doesn't support UFO\n",
+ res->port_id);
Requesting TSO/UFO by setting 'tso_segsz', but device capability missing
is an error case, so OK to have first message.
But only supporting TSO or UFO is not an error case, not sure about
logging this. But even it is logged, I think it shouldn't be to stderr
or it should say "Warning: ", a regular logging can be done.
All right, will fix it in next version.
}
if (ports[res->port_id].tso_segsz == 0) {
ports[res->port_id].dev_conf.txmode.offloads &=
- ~RTE_ETH_TX_OFFLOAD_TCP_TSO;
- printf("TSO for non-tunneled packets is disabled\n");
+ ~(RTE_ETH_TX_OFFLOAD_TCP_TSO | RTE_ETH_TX_OFFLOAD_UDP_TSO);
+ printf("TSO and UFO for non-tunneled packets is disabled\n");
} else {
- ports[res->port_id].dev_conf.txmode.offloads |=
- RTE_ETH_TX_OFFLOAD_TCP_TSO;
- printf("TSO segment size for non-tunneled packets is %d\n",
+ offloads = (dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_TCP_TSO) ?
+ RTE_ETH_TX_OFFLOAD_TCP_TSO : 0;
+ offloads |= (dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_UDP_TSO) ?
+ RTE_ETH_TX_OFFLOAD_UDP_TSO : 0;
+ ports[res->port_id].dev_conf.txmode.offloads |= offloads;
+ printf("segment size for non-tunneled packets is %d\n",
ports[res->port_id].tso_segsz);
}
- cmd_config_queue_tx_offloads(&ports[res->port_id]);
-
- /* display warnings if configuration is not supported by the NIC */
- ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
- if (ret != 0)
- return;
-
- if ((ports[res->port_id].tso_segsz != 0) &&
- (dev_info.tx_offload_ca
RE: [EXT] Re: [PATCH v4 1/1] build: add libarchive to external deps
> -Original Message-
> From: Bruce Richardson
> Sent: 03 November 2023 22:21
> To: Srikanth Yalavarthi
> Cc: David Marchand ; Aaron Conole
> ; Igor Russkikh ;
> dev@dpdk.org; Shivah Shankar Shankar Narayan Rao
> ; Anup Prabhu ;
> Prince Takkar ; sta...@dpdk.org
> Subject: [EXT] Re: [PATCH v4 1/1] build: add libarchive to external deps
>
> External Email
>
> --
> On Fri, Nov 03, 2023 at 09:38:53AM -0700, Srikanth Yalavarthi wrote:
> > In order to avoid linking with Libs.private, libarchive is not added
> > to ext_deps during the meson setup stage.
> >
> > Since libarchive is not added to ext_deps, cross-compilation or native
> > compilation with libarchive installed in non-standard location fails
> > with errors related to "cannot find -larchive"
> > or "archive.h: No such file or directory". In order to fix the build
> > failures, user is required to define the 'c_args' and 'c_link_args'
> > with '-I' and '-L'.
> >
> > This patch adds libarchive to ext_deps and further would not require
> > setting c_args and c_link_args externally.
> >
> > Fixes: 40edb9c0d36b ("eal: handle compressed firmware")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Srikanth Yalavarthi
>
> I think this is the cleanest solution to the problem you were having.
>
> Acked-by: Bruce Richardson
>
> One minor comment below. Patch is ok without taking it on board if you like.
>
> > ---
> > v4:
> > - Rebase over latest main
> > v3:
> > - Add to libarchive ext_deps
> > v2:
> > - Update ml/cnxk meson config
> > v1:
> > - Initial patch
> >
> > config/meson.build | 5 -
> > drivers/ml/cnxk/meson.build | 1 +
> > lib/eal/meson.build | 3 +++
> > 3 files changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/config/meson.build b/config/meson.build index
> > 0968351740..250833d0a4 100644
> > --- a/config/meson.build
> > +++ b/config/meson.build
> > @@ -241,11 +241,6 @@ dpdk_conf.set('RTE_BACKTRACE',
> > cc.has_header('execinfo.h') or is_windows) libarchive =
> > dependency('libarchive', required: false, method: 'pkg-config') if
> libarchive.found()
> > dpdk_conf.set('RTE_HAS_LIBARCHIVE', 1)
> > -# Push libarchive link dependency at the project level to support
> > -# statically linking dpdk apps. Details at:
> > -# https://urldefense.proofpoint.com/v2/url?u=https-
> 3A__inbox.dpdk.org_dev_20210605004024.660267a1-
> 40sovereign_&d=DwIBAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=SNPqUkGl0n_M
> s1iJa_6wD6LBwX8efL_NOyXvAX-iCMI&m=6Lg7j9wRNcl4gjqh1r9DHzydY-
> ufK1K63u-
> HpinJ3wSa4B3z1AUzWiaAsg3C5Cwp&s=PFchwx1MTzUrXGTLrJiy1bWDf4M7Y
> cSM8t3BNbGxLUg&e=
> > -add_project_link_arguments('-larchive', language: 'c')
> > -dpdk_extra_ldflags += '-larchive'
> > endif
> >
> > # check for libbsd
> > diff --git a/drivers/ml/cnxk/meson.build b/drivers/ml/cnxk/meson.build
> > index 0680a0faa5..921dc7e89b 100644
> > --- a/drivers/ml/cnxk/meson.build
> > +++ b/drivers/ml/cnxk/meson.build
> > @@ -67,6 +67,7 @@ sources += files(
> > 'mvtvm_ml_model.c',
> > )
> >
> > +ext_deps += libarchive
>
> minor nit - I don't think this is necessary. If libarchive is found, then
> DPDK eal
> will be linked against it, and so all other drivers should simply have that
> as a
> transitive dependency.
Agreed, this would not be necessary for libarchive. Removed in v5.
>
> Same probably applies to jansson.
Jansson is added to ext_deps by lib/metrics. However, 'lib/metrics' is optional
and can be disabled through -Ddisable_libs'
I think it would be good to add jansson_dep to ext_deps here to handle the case
when 'lib/metrics' is disabled.
Also, I am working on change that would remove Jansson as a dependency for
ml/cnxk. We will submit a separate patch for this.
>
> > ext_deps += jansson_dep
> > ext_deps += dlpack_dep
> > ext_deps += dmlc_dep
> > diff --git a/lib/eal/meson.build b/lib/eal/meson.build index
> > 9942104386..e1d6c4cf17 100644
> > --- a/lib/eal/meson.build
> > +++ b/lib/eal/meson.build
> > @@ -21,6 +21,9 @@ endif
> > if dpdk_conf.has('RTE_USE_LIBBSD')
> > ext_deps += libbsd
> > endif
> > +if dpdk_conf.has('RTE_HAS_LIBARCHIVE')
> > +ext_deps += libarchive
> > +endif
> > if cc.has_function('getentropy', prefix : '#include ')
> > cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
> > endif
> > --
> > 2.42.0
> >
Re: configuration of memseg lists number
On Sun, Nov 5, 2023 at 5:56 PM Avi Kivity wrote: > Thanks, it makes sense. I'll get around to it "eventually". > > On Thu, 2023-11-02 at 11:04 +0100, Thomas Monjalon wrote: > > Hello, > > While looking at Seastar, I see it uses this patch on top of DPDK: > > build: add meson options of max_memseg_lists > > RTE_MAX_MEMSEG_LISTS = 128 is not enough for high-memory machines, > in our case, we need to increase it to 8192. > so add an option so user can override it. > > https://github.com/scylladb/dpdk/commit/cafaa3cf457584de > > I think we could allow to configure this at runtime, > as we did already for RTE_MAX_MEMZONE: > we've added rte_memzone_max_set() / rte_memzone_max_get(). > > Opinions, comments, volunteers? > > Hi Thomas, Thank you for looking into it. I sent this patch[0] to DPDK 2 years ago. but i failed to find a solid proof to prove that we need such a massive number, and failed to follow-up on the suggestion[1] on calculating his number based on the lcores / numa node as I was trying to port the newer dpdk to seastar at that moment, so dropped the ball on my end, sorry for that. just revisited the places where we use RTE_MAX_MEMSEG_LISTS. it seems it would be a bigger effort to make it a run-time configurable option instead of a compile-time one. -- [0] https://inbox.dpdk.org/dev/20211013205417.84119-3-tchai...@gmail.com/ [1] https://inbox.dpdk.org/dev/2642296.XfZ1dg20Xv@thomas/ -- Regards Kefu Chai
Re: [PATCH v3 3/3] test/dma: add SG copy tests
Hi Gowrishankar,
On 2023/11/3 23:38, Gowrishankar Muthukrishnan wrote:
> Add scatter-gather copy tests.
>
> Signed-off-by: Vidya Sagar Velumuri
> Signed-off-by: Gowrishankar Muthukrishnan
> ---
> app/test/test_dmadev.c | 132 +-
> app/test/test_dmadev_api.c | 163 ++---
> app/test/test_dmadev_api.h | 2 +
> 3 files changed, 283 insertions(+), 14 deletions(-)
>
> diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
> index 780941fc1e..a2f3a7f999 100644
> --- a/app/test/test_dmadev.c
> +++ b/app/test/test_dmadev.c
> @@ -19,7 +19,7 @@
> #define ERR_RETURN(...) do { print_err(__func__, __LINE__, __VA_ARGS__);
> return -1; } while (0)
>
> #define TEST_RINGSIZE 512
> -#define COPY_LEN 1024
> +#define COPY_LEN 1032
The test MAX_SG_NUM is limit 4, so it could be 1/2/3/4 segment, and 1032 can
both div 1/2/3/4, but 1024 couldn't
I think this is why change 1024->1032.
Suggest add some comment about it.
>
> static struct rte_mempool *pool;
> static int16_t test_dev_id;
> @@ -396,6 +396,120 @@ test_stop_start(int16_t dev_id, uint16_t vchan)
> return 0;
> }
>
> +static int
> +test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan)
> +{
> + unsigned int src_len, dst_len, n_sge, len, i, j, k;
> + char orig_src[COPY_LEN], orig_dst[COPY_LEN];
> + struct rte_dma_info info = { 0 };
> + enum rte_dma_status_code status;
> + uint16_t id, n_src, n_dst;
> +
> + if (rte_dma_info_get(dev_id, &info) < 0)
> + ERR_RETURN("Failed to get dev info");
> +
> + n_sge = RTE_MIN(info.max_sges, TEST_SG_MAX);
> + len = COPY_LEN;
> +
> + for (n_src = 1; n_src <= n_sge; n_src++) {
> + src_len = len / n_src;
> + for (n_dst = 1; n_dst <= n_sge; n_dst++) {
> + dst_len = len / n_dst;
If the len % [1~n_dst] not zero, how to process it ?
I see, it was ensured by adjust copy_len value. Suggest add comments for it.
Also suggest extra above to one function.
> +
> + struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge];
> + struct rte_mbuf *src[n_sge], *dst[n_sge];
> + char *src_data[n_sge], *dst_data[n_sge];
> +
> + for (i = 0 ; i < COPY_LEN; i++)
> + orig_src[i] = rte_rand() & 0xFF;
> +
> + memset(orig_dst, 0, COPY_LEN);
> +
> + for (i = 0; i < n_src; i++) {
> + src[i] = rte_pktmbuf_alloc(pool);
> + RTE_ASSERT(src[i] != NULL);
> + sg_src[i].addr = rte_pktmbuf_iova(src[i]);
> + sg_src[i].length = src_len;
> + src_data[i] = rte_pktmbuf_mtod(src[i], char *);
> + }
> +
> + for (k = 0; k < n_dst; k++) {
> + dst[k] = rte_pktmbuf_alloc(pool);
> + RTE_ASSERT(dst[k] != NULL);
> + sg_dst[k].addr = rte_pktmbuf_iova(dst[k]);
> + sg_dst[k].length = dst_len;
> + dst_data[k] = rte_pktmbuf_mtod(dst[k], char *);
> + }
> +
> + for (i = 0; i < n_src; i++) {
> + for (j = 0; j < src_len; j++)
> + src_data[i][j] = orig_src[i * src_len +
> j];
> + }
> +
> + for (k = 0; k < n_dst; k++)
> + memset(dst_data[k], 0, dst_len);
> +
> + printf("\tsrc segs: %2d [seg len: %4d] - dst segs: %2d
> [seg len : %4d]\n",
> + n_src, src_len, n_dst, dst_len);
> +
> + id = rte_dma_copy_sg(dev_id, vchan, sg_src, sg_dst,
> n_src, n_dst,
> + RTE_DMA_OP_FLAG_SUBMIT);
> +
> + if (id != id_count)
> + ERR_RETURN("Error with rte_dma_copy_sg, got %u,
> expected %u\n",
> + id, id_count);
> +
> + /* Give time for copy to finish, then check it was done
> */
> + await_hw(dev_id, vchan);
> +
> + for (k = 0; k < n_dst; k++)
> + memcpy((&orig_dst[0] + k * dst_len),
> dst_data[k], dst_len);
> +
> + if (memcmp(orig_src, orig_dst, COPY_LEN))
> + ERR_RETURN("Data mismatch");
> +
> + /* Verify completion */
> + id = ~id;
> + if (rte_dma_completed(dev_id, vchan, 1, &id, NULL) != 1)
> + ERR_RETURN("Error with rte_dma_completed\n");
> +
> + /* Verify expected index(id_count) */
> + if (id != id_count)
> + ERR_RETURN("Error:i
Re: [PATCH v4 1/5] kvargs: add one new process API
Hi Stephen, On 2023/11/6 11:18, Stephen Hemminger wrote: > On Sun, 5 Nov 2023 05:45:35 + > Chengwen Feng wrote: > >> +* **Updated kvargs process API.** >> + >> + * Introduced rte_kvargs_process_opt() API, which inherits the function >> +of rte_kvargs_process() and could handle both key=value and only-key >> +cases. >> + >> + * Constraint rte_kvargs_process() API can only handle key=value cases, >> +it will return -1 when handle only-key case (that is the matched key's >> +value is NULL). >> + > > Looks good but may I suggest some alternatives. > > Since this is an API and ABI change as was not announced, maybe a little late > in the process for this release. And since unlikely to go in 23.11 need to do > something > better in 24.03. > > What about changing the args to rte_kvargs_process() to add an additional > default > value. Most callers don't have a default (use key-value) but the ones that > take only-key > would pass the default value. The API definition changed, it may need modify most drivers. Although it's a little late, better continue current. Thanks Chengwen > > Then use ABI versioning to add the new arg and you would not have to introduce > a new function. And add a legacy API version that does what current code does. > > All the drivers in DPDK would get the new API/ABI but any customer apps using > rte_kvargs_process() > would get the old version. > > > . >
Re: [PATCH v4 4/5] common/nfp: use new API to parse kvargs
Hi Stephen,
On 2023/11/6 11:19, Stephen Hemminger wrote:
> On Sun, 5 Nov 2023 05:45:38 +
> Chengwen Feng wrote:
>
>> if (rte_kvargs_count(kvargs, RTE_DEVARGS_KEY_CLASS) != 0) {
>> -rte_kvargs_process(kvargs, RTE_DEVARGS_KEY_CLASS,
>> -nfp_kvarg_dev_class_handler, &dev_class);
>> +rte_kvargs_process_opt(kvargs, RTE_DEVARGS_KEY_CLASS,
>> + nfp_kvarg_dev_class_handler, &dev_class);
>> }
>
> Since kvargs_process() already does a scan, the kvargs_count() cause an extra
> pass.
will fix in v5
Thanks
Chengwen
>
> .
>
Re: [PATCH 01/30] net/mlx5/hws: Definer, add mlx5dr context to definer_conv_data
On Sun, 5 Nov 2023, Thomas Monjalon wrote: External email: Use caution opening links or attachments The description of this patch does not match the change. Also the change is going backward, using deprecated fields. It does not make sense, I'll skip it. Hello Thomas, Patches in that series were superseded. Regards, Gregory
[PATCH v5 2/5] net/sfc: use new API to parse kvargs
The sfc_kvargs_process() and sfc_efx_dev_class_get() function could
handle both key=value and only-key, so they should use
rte_kvargs_process_opt() instead of rte_kvargs_process() to parse.
Signed-off-by: Chengwen Feng
---
drivers/common/sfc_efx/sfc_efx.c | 4 ++--
drivers/net/sfc/sfc_kvargs.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/common/sfc_efx/sfc_efx.c b/drivers/common/sfc_efx/sfc_efx.c
index 2dc5545760..3ebac909f1 100644
--- a/drivers/common/sfc_efx/sfc_efx.c
+++ b/drivers/common/sfc_efx/sfc_efx.c
@@ -52,8 +52,8 @@ sfc_efx_dev_class_get(struct rte_devargs *devargs)
return dev_class;
if (rte_kvargs_count(kvargs, RTE_DEVARGS_KEY_CLASS) != 0) {
- rte_kvargs_process(kvargs, RTE_DEVARGS_KEY_CLASS,
- sfc_efx_kvarg_dev_class_handler, &dev_class);
+ rte_kvargs_process_opt(kvargs, RTE_DEVARGS_KEY_CLASS,
+ sfc_efx_kvarg_dev_class_handler,
&dev_class);
}
rte_kvargs_free(kvargs);
diff --git a/drivers/net/sfc/sfc_kvargs.c b/drivers/net/sfc/sfc_kvargs.c
index 783cb43ae6..24bb896179 100644
--- a/drivers/net/sfc/sfc_kvargs.c
+++ b/drivers/net/sfc/sfc_kvargs.c
@@ -70,7 +70,7 @@ sfc_kvargs_process(struct sfc_adapter *sa, const char
*key_match,
if (sa->kvargs == NULL)
return 0;
- return -rte_kvargs_process(sa->kvargs, key_match, handler, opaque_arg);
+ return -rte_kvargs_process_opt(sa->kvargs, key_match, handler,
opaque_arg);
}
int
--
2.17.1
[PATCH v5 3/5] net/tap: use new API to parse kvargs
Some kvargs could be key=value or only-key, it should use
rte_kvargs_process_opt() instead of rte_kvargs_process() to handle
these kvargs.
Signed-off-by: Chengwen Feng
---
drivers/net/tap/rte_eth_tap.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index b41fa971cb..cdb52cf408 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2292,7 +2292,7 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev)
kvlist = rte_kvargs_parse(params, valid_arguments);
if (kvlist) {
if (rte_kvargs_count(kvlist, ETH_TAP_IFACE_ARG) == 1) {
- ret = rte_kvargs_process(kvlist,
+ ret = rte_kvargs_process_opt(kvlist,
ETH_TAP_IFACE_ARG,
&set_interface_name,
tun_name);
@@ -2496,10 +2496,10 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)
kvlist = rte_kvargs_parse(params, valid_arguments);
if (kvlist) {
if (rte_kvargs_count(kvlist, ETH_TAP_IFACE_ARG) == 1) {
- ret = rte_kvargs_process(kvlist,
-ETH_TAP_IFACE_ARG,
-&set_interface_name,
-tap_name);
+ ret = rte_kvargs_process_opt(kvlist,
+ETH_TAP_IFACE_ARG,
+
&set_interface_name,
+tap_name);
if (ret == -1)
goto leave;
}
--
2.17.1
[PATCH v5 4/5] common/nfp: use new API to parse kvargs
The nfp_parse_class_options() function could handle both key=value and
only-key, so it should use rte_kvargs_process_opt() instead of
rte_kvargs_process() to parse.
Signed-off-by: Chengwen Feng
---
drivers/common/nfp/nfp_common_pci.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/common/nfp/nfp_common_pci.c
b/drivers/common/nfp/nfp_common_pci.c
index 723035d0f7..5c36052f9d 100644
--- a/drivers/common/nfp/nfp_common_pci.c
+++ b/drivers/common/nfp/nfp_common_pci.c
@@ -170,10 +170,8 @@ nfp_parse_class_options(const struct rte_devargs *devargs)
if (kvargs == NULL)
return dev_class;
- if (rte_kvargs_count(kvargs, RTE_DEVARGS_KEY_CLASS) != 0) {
- rte_kvargs_process(kvargs, RTE_DEVARGS_KEY_CLASS,
- nfp_kvarg_dev_class_handler, &dev_class);
- }
+ rte_kvargs_process_opt(kvargs, RTE_DEVARGS_KEY_CLASS,
+ nfp_kvarg_dev_class_handler, &dev_class);
rte_kvargs_free(kvargs);
--
2.17.1
[PATCH v5 0/5] fix segment fault when parse args
The rte_kvargs_process() was used to parse key-value (e.g. socket_id=0), it also supports to parse only-key (e.g. socket_id). But many drivers's callback can only handle key-value, it will segment fault if handles only-key. so the patchset [1] was introduced. Because the patchset [1] modified too much drivers, therefore: 1) A new API rte_kvargs_process_opt() was introduced, it inherits the function of rte_kvargs_process() which could parse both key-value and only-key. 2) Constraint the rte_kvargs_process() can only parse key-value. This patchset also include one bugfix for kvargs of mvneta driver. [1] https://patches.dpdk.org/project/dpdk/patch/20230320092110.37295-1-fengcheng...@huawei.com/ Chengwen Feng (5): kvargs: add one new process API net/sfc: use new API to parse kvargs net/tap: use new API to parse kvargs common/nfp: use new API to parse kvargs net/mvneta: fix possible out-of-bounds write --- v5: remove redundant of rte_kvargs_count of 4/5 commit which address Stephen's comment. v4: refine API's define and impl which address Ferruh's comments. add common/nfp change commit. v3: introduce new API instead of modify too many drivers which address Ferruh's comments. doc/guides/rel_notes/release_23_11.rst | 13 drivers/common/nfp/nfp_common_pci.c| 6 ++-- drivers/common/sfc_efx/sfc_efx.c | 4 +-- drivers/net/mvneta/mvneta_ethdev.c | 3 ++ drivers/net/sfc/sfc_kvargs.c | 2 +- drivers/net/tap/rte_eth_tap.c | 10 +++--- lib/kvargs/rte_kvargs.c| 43 -- lib/kvargs/rte_kvargs.h| 37 -- lib/kvargs/version.map | 3 ++ 9 files changed, 97 insertions(+), 24 deletions(-) -- 2.17.1
[PATCH v5 1/5] kvargs: add one new process API
The rte_kvargs_process() was used to handle key=value (e.g.
socket_id=0), it also supports to handle only-key (e.g. socket_id).
But many drivers's callback can only handle key=value, it will segment
fault if handles only-key. so the patchset [1] was introduced.
Because the patchset [1] modified too much drivers, therefore:
1) A new API rte_kvargs_process_opt() was introduced, it inherits the
function of rte_kvargs_process() which could handle both key=value and
only-key cases.
2) Constraint the rte_kvargs_process() can only handle key=value cases,
it will return -1 when handle only-key case (that is the matched key's
value is NULL).
This patch also make sure the rte_kvargs_process_opt() and
rte_kvargs_process() API both return -1 when the kvlist parameter is
NULL.
[1]
https://patches.dpdk.org/project/dpdk/patch/20230320092110.37295-1-fengcheng...@huawei.com/
Signed-off-by: Chengwen Feng
---
doc/guides/rel_notes/release_23_11.rst | 13
lib/kvargs/rte_kvargs.c| 43 --
lib/kvargs/rte_kvargs.h| 37 --
lib/kvargs/version.map | 3 ++
4 files changed, 84 insertions(+), 12 deletions(-)
diff --git a/doc/guides/rel_notes/release_23_11.rst
b/doc/guides/rel_notes/release_23_11.rst
index 2213aeae7b..8db3bbbd2f 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -142,6 +142,19 @@ New Features
a group's miss actions, which are the actions to be performed on packets
that didn't match any of the flow rules in the group.
+* **Updated kvargs process API.**
+
+ * Introduced rte_kvargs_process_opt() API, which inherits the function
+of rte_kvargs_process() and could handle both key=value and only-key
+cases.
+
+ * Constraint rte_kvargs_process() API can only handle key=value cases,
+it will return -1 when handle only-key case (that is the matched key's
+value is NULL).
+
+ * Make sure rte_kvargs_process_opt() and rte_kvargs_process() API both
+return -1 when the kvlist parameter is NULL.
+
* **Updated Amazon ena (Elastic Network Adapter) net driver.**
* Upgraded ENA HAL to latest version.
diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c
index c77bb82feb..adc47f8898 100644
--- a/lib/kvargs/rte_kvargs.c
+++ b/lib/kvargs/rte_kvargs.c
@@ -167,31 +167,56 @@ rte_kvargs_count(const struct rte_kvargs *kvlist, const
char *key_match)
return ret;
}
-/*
- * For each matching key, call the given handler function.
- */
-int
-rte_kvargs_process(const struct rte_kvargs *kvlist,
- const char *key_match,
- arg_handler_t handler,
- void *opaque_arg)
+static int
+kvargs_process_common(const struct rte_kvargs *kvlist,
+ const char *key_match,
+ arg_handler_t handler,
+ void *opaque_arg,
+ bool support_only_key)
{
const struct rte_kvargs_pair *pair;
unsigned i;
if (kvlist == NULL)
- return 0;
+ return -1;
for (i = 0; i < kvlist->count; i++) {
pair = &kvlist->pairs[i];
if (key_match == NULL || strcmp(pair->key, key_match) == 0) {
+ if (!support_only_key && pair->value == NULL)
+ return -1;
if ((*handler)(pair->key, pair->value, opaque_arg) < 0)
return -1;
}
}
+
return 0;
}
+/*
+ * For each matching key in key/value, call the given handler function.
+ */
+int
+rte_kvargs_process(const struct rte_kvargs *kvlist,
+ const char *key_match,
+ arg_handler_t handler,
+ void *opaque_arg)
+{
+ return kvargs_process_common(kvlist, key_match, handler, opaque_arg,
false);
+}
+
+/*
+ * For each matching key in key/value or only-key, call the given handler
function.
+ */
+int
+rte_kvargs_process_opt(const struct rte_kvargs *kvlist,
+ const char *key_match,
+ arg_handler_t handler,
+ void *opaque_arg)
+{
+ return kvargs_process_common(kvlist, key_match, handler, opaque_arg,
true);
+}
+
/* free the rte_kvargs structure */
void
rte_kvargs_free(struct rte_kvargs *kvlist)
diff --git a/lib/kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
index 4900b750bc..ad0b609ad7 100644
--- a/lib/kvargs/rte_kvargs.h
+++ b/lib/kvargs/rte_kvargs.h
@@ -172,14 +172,17 @@ const char *rte_kvargs_get_with_value(const struct
rte_kvargs *kvlist,
const char *key, const char *value);
/**
- * Call a handler function for each key/value matching the key
+ * Call a handler function for each key=value matching the key
*
- * For each key/value association that matches the given key, calls the
+ * For each key=value association that matches the given key, cal
[PATCH v5 5/5] net/mvneta: fix possible out-of-bounds write
The mvneta_ifnames_get() function will save 'iface' value to ifnames,
it will out-of-bounds write if passed many iface pairs (e.g.
'iface=xxx,iface=xxx,...').
Fixes: 4ccc8d770d3b ("net/mvneta: add PMD skeleton")
Cc: sta...@dpdk.org
Signed-off-by: Chengwen Feng
Acked-by: Ferruh Yigit
---
drivers/net/mvneta/mvneta_ethdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/mvneta/mvneta_ethdev.c
b/drivers/net/mvneta/mvneta_ethdev.c
index daa69e533a..8032a712f4 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -91,6 +91,9 @@ mvneta_ifnames_get(const char *key __rte_unused, const char
*value,
{
struct mvneta_ifnames *ifnames = extra_args;
+ if (ifnames->idx >= NETA_NUM_ETH_PPIO)
+ return -EINVAL;
+
ifnames->names[ifnames->idx++] = value;
return 0;
--
2.17.1
