[dpdk-dev] [PATCH] crypto/dpaa_sec: fix to affine the thread portal affinity

[Hemant Agrawal]

DPAA requires the I/O shall be done in a HW portal context only.
The portal affinity is currently only being done in session create
and config APIs with the assumption that same thread will be used
for IO. This is causing issue.
This patch add support during I/O to check the HW portal affinity
and affine portal- if not affined already.

Fixes: 9a984458f755 ("crypto/dpaa_sec: rewrite Rx/Tx path")
Cc: sta...@dpdk.org

Signed-off-by: Hemant Agrawal 
---
 drivers/crypto/dpaa_sec/dpaa_sec.c | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c 
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 43363ba6ba..19d4684e24 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -1717,6 +1717,13 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op 
**ops,
uint32_t index, flags[DPAA_SEC_BURST] = {0};
struct qman_fq *inq[DPAA_SEC_BURST];
 
+   if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
+   if (rte_dpaa_portal_init((void *)0)) {
+   DPAA_SEC_ERR("Failure in affining portal");
+   return 0;
+   }
+   }
+
while (nb_ops) {
frames_to_send = (nb_ops > DPAA_SEC_BURST) ?
DPAA_SEC_BURST : nb_ops;
@@ -1917,6 +1924,13 @@ dpaa_sec_dequeue_burst(void *qp, struct rte_crypto_op 
**ops,
uint16_t num_rx;
struct dpaa_sec_qp *dpaa_qp = (struct dpaa_sec_qp *)qp;
 
+   if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
+   if (rte_dpaa_portal_init((void *)0)) {
+   DPAA_SEC_ERR("Failure in affining portal");
+   return 0;
+   }
+   }
+
num_rx = dpaa_sec_deq(dpaa_qp, ops, nb_ops);
 
dpaa_qp->rx_pkts += num_rx;
-- 
2.17.1

Re: [dpdk-dev] [pull-request]dpdk-next-net-eventdev - 21.05 - PRE-RC2

[Jerin Jacob]

On Sat, May 1, 2021 at 8:17 PM Jerin Jacob Kollanukkaran
 wrote:
>
> Pending items:
> - Based on the availability of the DLB2 driver, I may have another pull 
> request for rc2 or rc3.

Hi Thomas,

Please hold on to taking this series. Timothy sent the updated DLB2
driver. I will send new PR

>
>
> The following changes since commit 1b593b9c832e9b284cc59665fe662242a3fc1daf:
>
>   version: 21.05-rc1 (2021-04-22 00:28:57 +0200)
>
> are available in the Git repository at:
>
>   http://dpdk.org/git/next/dpdk-next-eventdev
>
> for you to fetch changes up to ddd1dd704cae619f16c0cab88fbf5b44514a9b65:
>
>   eventdev: fix memory leakage when create thread fail (2021-05-01 20:11:52 
> +0530)
>
> 
> Chengwen Feng (2):
>   eventdev: remove redundant setting thread name
>   eventdev: fix memory leakage when create thread fail
>
> Min Hu (Connor) (1):
>   app/testeventdev: fix buffer overflow
>
> Pavan Nikhilesh (16):
>   event/cnxk: add build infra and device setup
>   event/cnxk: add device probe
>   event/cnxk: add common configuration validation
>   event/cnxk: allocate event inflight buffers
>   event/cnxk: add devargs to configure getwork mode
>   event/cnxk: add SSO HW device operations
>   event/cnxk: add SSO GWS fastpath enqueue functions
>   event/cnxk: add SSO GWS dequeue fastpath functions
>   event/cnxk: add SSO selftest and dump
>   event/cnxk: add event port and queue xstats
>   event/cnxk: add devargs to disable NPA
>   event/cnxk: allow adapters to resize inflights
>   event/cnxk: add TIM bucket operations
>   event/cnxk: add timer arm routine
>   event/cnxk: add timer arm timeout burst
>   event/cnxk: add timer cancel function
>
> Shijith Thotton (19):
>   event/octeontx2: fix crypto adapter queue pair ops
>   event/octeontx2: configure crypto adapter xaq pool
>   event/cnxk: add device capabilities
>   event/cnxk: add device config
>   event/cnxk: support event queue configuration
>   event/cnxk: add devargs for inflight buffer count
>   event/cnxk: add devargs to control SSO HWGRP QoS
>   event/cnxk: support port configuration
>   event/cnxk: add event port link and unlink
>   event/cnxk: support device start
>   event/cnxk: support device stop and close
>   event/cnxk: support event timer
>   event/cnxk: add timer adapter capabilities
>   event/cnxk: create and free timer adapter
>   event/cnxk: add timer adapter info function
>   event/cnxk: add devargs for chunk size and rings
>   event/cnxk: add timer stats get and reset
>   event/cnxk: add timer adapter start and stop
>   event/cnxk: add devargs to control timer adapters
>
>
>  MAINTAINERS   |6 +
>  app/test-eventdev/evt_options.c   |4 +-
>  app/test-eventdev/parser.c|6 +-
>  app/test-eventdev/parser.h|2 +-
>  app/test/test_eventdev.c  |   14 +
>  doc/guides/eventdevs/cnxk.rst |  162 +++
>  doc/guides/eventdevs/index.rst|1 +
>  doc/guides/rel_notes/release_21_05.rst|2 +
>  drivers/common/cnxk/roc_sso.c |   63 +
>  drivers/common/cnxk/roc_sso.h |   19 +
>  drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |4 +-
>  drivers/event/cnxk/cn10k_eventdev.c   |  509 +++
>  drivers/event/cnxk/cn10k_worker.c |  115 ++
>  drivers/event/cnxk/cn10k_worker.h |  175 +++
>  drivers/event/cnxk/cn9k_eventdev.c|  578 
>  drivers/event/cnxk/cn9k_worker.c  |  236 
>  drivers/event/cnxk/cn9k_worker.h  |  297 
>  drivers/event/cnxk/cnxk_eventdev.c|  647 +
>  drivers/event/cnxk/cnxk_eventdev.h|  253 
>  drivers/event/cnxk/cnxk_eventdev_adptr.c  |   67 +
>  drivers/event/cnxk/cnxk_eventdev_selftest.c   | 1570 
> +
>  drivers/event/cnxk/cnxk_eventdev_stats.c  |  289 
>  drivers/event/cnxk/cnxk_tim_evdev.c   |  538 +++
>  drivers/event/cnxk/cnxk_tim_evdev.h   |  275 
>  drivers/event/cnxk/cnxk_tim_worker.c  |  191 +++
>  drivers/event/cnxk/cnxk_tim_worker.h  |  601 
>  drivers/event/cnxk/cnxk_worker.h  |  101 ++
>  drivers/event/cnxk/meson.build|   23 +
>  drivers/event/cnxk/version.map|3 +
>  drivers/event/meson.build |1 +
>  drivers/event/octeontx2/otx2_evdev_adptr.c|2 +-
>  drivers/event/octeontx2/otx2_evdev_crypto_adptr.c |  112 +-
>  lib/eventdev/rte_event_eth_rx_adapter.c   |5 +-
>  33 files changed, 6830 insertions(+), 41 deletions(-)
>  create m

Re: [dpdk-dev] [PATCH v3 01/33] event/cnxk: add build infra and device setup

[Jerin Jacob]

On Fri, Apr 30, 2021 at 7:23 PM  wrote:
>
> From: Pavan Nikhilesh 
>
> Add meson build infra structure along with the event device
> SSO initialization and teardown functions.
>
> Signed-off-by: Shijith Thotton 
> Signed-off-by: Pavan Nikhilesh 
> Acked-by: Ray Kinsella 
> ---

> +
> +deps += ['bus_pci', 'common_cnxk', 'net_cnxk']

Due to 'net_cnxk' dependency, this driver was not building at all.
Please remove this and send the updated series. I will make it as
"Change requested" in PW from accepted.

Re: [dpdk-dev] [PATCH v2] net/mlx5: workaround ASO memory region creation

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Michael Baum 
> Sent: Monday, April 26, 2021 3:48 PM
> To: dev@dpdk.org
> Cc: Matan Azrad ; Raslan Darawsheh
> ; Slava Ovsiienko ;
> sta...@dpdk.org
> Subject: [PATCH v2] net/mlx5: workaround ASO memory region creation
> 
> Due to kernel issue in direct MKEY creation using the DevX API for
> physical memory, this patch replaces the ASO MR creation to use Verbs
> API.
> 
> Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Michael Baum 
> Acked-by: Matan Azrad 
> ---
> v2:
> The second patch in the series did not work due to a FW issue, this issue does
> not exist in this patch.
> 
> drivers/common/mlx5/linux/mlx5_common_verbs.c |  1 -
>  drivers/common/mlx5/windows/mlx5_common_os.c  | 23 ---
>  drivers/net/mlx5/mlx5.h   | 10 +--
>  drivers/net/mlx5/mlx5_flow_aso.c  | 92 
> +++
>  4 files changed, 52 insertions(+), 74 deletions(-)
> 

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

[dpdk-dev] [PATCH] common/cnxk: rename depricated constant

[pbhagavatula]

From: Pavan Nikhilesh 

The PCI_ANY_ID constant is depricated and renamed as RTE_PCI_ANY_ID.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/common/cnxk/roc_platform.h | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/common/cnxk/roc_platform.h 
b/drivers/common/cnxk/roc_platform.h
index 97600e56f..29ab71240 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -165,22 +165,18 @@ extern int cnxk_logtype_tm;
 #define plt_tm_dbg(fmt, ...)   plt_dbg(tm, fmt, ##__VA_ARGS__)

 #ifdef __cplusplus
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   RTE_CLASS_ANY_ID,   \
-   PCI_VENDOR_ID_CAVIUM,   \
-   (dev),  \
-   PCI_ANY_ID, \
-   (subsystem_dev),\
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   RTE_CLASS_ANY_ID, PCI_VENDOR_ID_CAVIUM, (dev), RTE_PCI_ANY_ID, \
+   (subsystem_dev),   \
}
 #else
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   .class_id = RTE_CLASS_ANY_ID,   \
-   .vendor_id = PCI_VENDOR_ID_CAVIUM,  \
-   .device_id = (dev), \
-   .subsystem_vendor_id = PCI_ANY_ID,  \
-   .subsystem_device_id = (subsystem_dev), \
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   .class_id = RTE_CLASS_ANY_ID,  \
+   .vendor_id = PCI_VENDOR_ID_CAVIUM, .device_id = (dev), \
+   .subsystem_vendor_id = RTE_PCI_ANY_ID, \
+   .subsystem_device_id = (subsystem_dev),\
}
 #endif

--
2.17.1

[dpdk-dev] [PATCH v2] common/cnxk: rename deprecated constant

[pbhagavatula]

From: Pavan Nikhilesh 

The PCI_ANY_ID constant is deprecated and renamed as RTE_PCI_ANY_ID.

Signed-off-by: Pavan Nikhilesh 
---
 v2 Changes:
 - s/depricated/deprecated.

 drivers/common/cnxk/roc_platform.h | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/common/cnxk/roc_platform.h 
b/drivers/common/cnxk/roc_platform.h
index 97600e56f..29ab71240 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -165,22 +165,18 @@ extern int cnxk_logtype_tm;
 #define plt_tm_dbg(fmt, ...)   plt_dbg(tm, fmt, ##__VA_ARGS__)

 #ifdef __cplusplus
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   RTE_CLASS_ANY_ID,   \
-   PCI_VENDOR_ID_CAVIUM,   \
-   (dev),  \
-   PCI_ANY_ID, \
-   (subsystem_dev),\
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   RTE_CLASS_ANY_ID, PCI_VENDOR_ID_CAVIUM, (dev), RTE_PCI_ANY_ID, \
+   (subsystem_dev),   \
}
 #else
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   .class_id = RTE_CLASS_ANY_ID,   \
-   .vendor_id = PCI_VENDOR_ID_CAVIUM,  \
-   .device_id = (dev), \
-   .subsystem_vendor_id = PCI_ANY_ID,  \
-   .subsystem_device_id = (subsystem_dev), \
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   .class_id = RTE_CLASS_ANY_ID,  \
+   .vendor_id = PCI_VENDOR_ID_CAVIUM, .device_id = (dev), \
+   .subsystem_vendor_id = RTE_PCI_ANY_ID, \
+   .subsystem_device_id = (subsystem_dev),\
}
 #endif

--
2.17.1

[dpdk-dev] New PMD integration to next version release

[Supriya Shekhar Mane]

Hi Maintainers,

We want to open source the *Dakota Ethernet PMD*.
We are ready with changes to be open source.
We want to integrate our changes onto the next release: *19.11.9*
Kindly, guide us with the process and initiation of the same.

Regards,
Supriya Mane

-- 
Disclaimer:This message is intended only for the designated recipient(s). 
It may contain confidential or proprietary information and may be subject 
to other confidentiality protections. If you are not a designated 
recipient, you may not review, copy or distribute this message. Please 
notify the sender by e-mail and delete this message. GlobalEdge does not 
accept any liability for virus infected mails.

Re: [dpdk-dev] [PATCH v3] net/mlx5: add power monitoring support

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Alexander Kozyrev 
> Sent: Thursday, April 29, 2021 5:55 PM
> To: dev@dpdk.org
> Cc: Raslan Darawsheh ; Matan Azrad
> ; Slava Ovsiienko ;
> leif.y.johans...@ericsson.com
> Subject: [PATCH v3] net/mlx5: add power monitoring support
> 
> Support the PMD power management API in MLX5 driver.
> The monitor policy of this API puts a CPU core to sleep until a data in some
> monitored memory address is changed by the NIC.
> Implement the get_monitor_addr function to return an address of a CQE
> owner bit to monitor the arrival of a new packet.
> 
> Signed-off-by: Alexander Kozyrev 
> ---

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [EXT] Re: [PATCH] doc: announce modification in eventdev structure

[Akhil Goyal]

Hi Ray,
> > @@ -127,6 +127,10 @@ Deprecation Notices
> >values to the function ``rte_event_eth_rx_adapter_queue_add`` using
> >the structure ``rte_event_eth_rx_adapter_queue_add``.
> >
> > +* eventdev: The function pointer ``ca_enqueue`` in structure
> ``rte_eventdev``
> > +  will be moved after ``txa_enqueue`` so that all enqueue/dequeue
> > +  function pointers are adjacent to each other.
> > +
> >  * sched: To allow more traffic classes, flexible mapping of pipe queues to
> >traffic classes, and subport level configuration of pipes and queues
> >changes will be made to macros, data structures and API functions
> defined
> >
> 
> I admire the disipline - but since you are not actually removing ca_enqueue,
> just moving it in memory when the new ABI is declared in anycase, this is not
> required.
> 

Does it mean we can move elements in a structure without giving deprecation 
notice?

-akhil

Re: [dpdk-dev] [PATCH] app/testpmd: support meter color action in policy

[Dumitrescu, Cristian]

> -Original Message-
> From: Yigit, Ferruh 
> Sent: Friday, April 30, 2021 1:51 PM
> To: Haifei Luo ; ma...@nvidia.com; or...@nvidia.com;
> viachesl...@nvidia.com; Dumitrescu, Cristian
> 
> Cc: dev@dpdk.org; tho...@monjalon.net; rasl...@nvidia.com; Iremonger,
> Bernard ; Xing, Beilei
> ; Lu, Wenzhuo 
> Subject: Re: [PATCH] app/testpmd: support meter color action in policy
> 
> On 4/28/2021 3:10 PM, Haifei Luo wrote:
> > Currently action RTE_FLOW_ACTION_TYPE_METER_COLOR is defined.
> > Add the CLI for this action in meter policy: color type (types)
> > There are three types: green, yellow and red.
> >
> > Example for the new policy meter CLIs:
> >add port meter policy 0 1 g_actions color type green / end y_actions
> >  color type yellow / end r_actions color type red / end
> >
> > In the above command, the action type is
> RTE_FLOW_ACTION_TYPE_METER_COLOR,
> > the meter policy action list: green -> green, yellow -> yellow, red -> red.
> >
> 
> Ori can you please review this patch too?
> 
> +Cristian for meter.
> 

Cc Jasvinder

> > Signed-off-by: Haifei Luo 
> > ---
> >  app/test-pmd/cmdline_flow.c | 85
> +
> >  1 file changed, 85 insertions(+)
> >
> > diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> > index 5947341..1c587bb 100644
> > --- a/app/test-pmd/cmdline_flow.c
> > +++ b/app/test-pmd/cmdline_flow.c
> > @@ -348,6 +348,11 @@ enum index {
> > ACTION_PORT_ID_ORIGINAL,
> > ACTION_PORT_ID_ID,
> > ACTION_METER,
> > +   ACTION_METER_COLOR,
> > +   ACTION_METER_COLOR_TYPE,
> > +   ACTION_METER_COLOR_GREEN,
> > +   ACTION_METER_COLOR_YELLOW,
> > +   ACTION_METER_COLOR_RED,
> > ACTION_METER_ID,
> > ACTION_OF_SET_MPLS_TTL,
> > ACTION_OF_SET_MPLS_TTL_MPLS_TTL,
> > @@ -1377,6 +1382,7 @@ struct parse_action_priv {
> > ACTION_PHY_PORT,
> > ACTION_PORT_ID,
> > ACTION_METER,
> > +   ACTION_METER_COLOR,
> > ACTION_OF_SET_MPLS_TTL,
> > ACTION_OF_DEC_MPLS_TTL,
> > ACTION_OF_SET_NW_TTL,
> > @@ -1486,6 +1492,12 @@ struct parse_action_priv {
> > ZERO,
> >  };
> >
> > +static const enum index action_meter_color[] = {
> > +   ACTION_METER_COLOR_TYPE,
> > +   ACTION_NEXT,
> > +   ZERO,
> > +};
> > +
> >  static const enum index action_of_set_mpls_ttl[] = {
> > ACTION_OF_SET_MPLS_TTL_MPLS_TTL,
> > ACTION_NEXT,
> > @@ -1723,6 +1735,10 @@ static int parse_vc_conf(struct context *, const
> struct token *,
> >  static int parse_vc_item_ecpri_type(struct context *, const struct token *,
> > const char *, unsigned int,
> > void *, unsigned int);
> > +static int parse_vc_action_meter_color_type(struct context *,
> > +   const struct token *,
> > +   const char *, unsigned int, void *,
> > +   unsigned int);
> >  static int parse_vc_action_rss(struct context *, const struct token *,
> >const char *, unsigned int, void *,
> >unsigned int);
> > @@ -3801,6 +3817,37 @@ static int comp_set_modify_field_id(struct
> context *, const struct token *,
> > .next = NEXT(action_meter),
> > .call = parse_vc,
> > },
> > +   [ACTION_METER_COLOR] = {
> > +   .name = "color",
> > +   .help = "meter color for the packets",
> > +   .priv = PRIV_ACTION(METER_COLOR,
> > +   sizeof(struct rte_flow_action_meter_color)),
> > +   .next = NEXT(action_meter_color),
> > +   .call = parse_vc,
> > +   },
> > +   [ACTION_METER_COLOR_TYPE] = {
> > +   .name = "type",
> > +   .help = "specific meter color",
> > +   .next = NEXT(NEXT_ENTRY(ACTION_NEXT),
> > +
>   NEXT_ENTRY(ACTION_METER_COLOR_GREEN,
> > +   ACTION_METER_COLOR_YELLOW,
> > +   ACTION_METER_COLOR_RED)),
> > +   },
> > +   [ACTION_METER_COLOR_GREEN] = {
> > +   .name = "green",
> > +   .help = "meter color green",
> > +   .call = parse_vc_action_meter_color_type,
> > +   },
> > +   [ACTION_METER_COLOR_YELLOW] = {
> > +   .name = "yellow",
> > +   .help = "meter color yellow",
> > +   .call = parse_vc_action_meter_color_type,
> > +   },
> > +   [ACTION_METER_COLOR_RED] = {
> > +   .name = "red",
> > +   .help = "meter color red",
> > +   .call = parse_vc_action_meter_color_type,
> > +   },
> > [ACTION_METER_ID] = {
> > .name = "mtr_id",
> > .help = "meter id to use",
> > @@ -5318,6 +5365,44 @@ static int comp_set_modify_field_id(struct
> context *, const struct token *,
> > return len;
> >  }
> >
> > +/** Parse meter color action type. */
> > +static int
> > +parse_vc_action_meter_color_type(struct context *ctx, const struct
> token *token,
> > +

Re: [dpdk-dev] New PMD integration to next version release

[Zaheer R M]

Hello “DPDK Community”,

We are glad to inform you that we have developed 3 PMDs using DPDK version 
19.11.3

One of our premium customer has sponsored to develop DPDK-Ethernet-PMD using 
WPJ419 Compex Platform and is willing to Contribute to DPDK community.
WPJ419 board uses “Qualcomm Chipset -- Dakota”. There are several commercially 
available AP / routers based on this platform.
PMD we have developed has successfully completed “Beta Release” and we want to 
contribute as is to DPDK community.
We are ready with our changes and willing to contribute asap. Further releases 
shall be submitted in the form of patches.

We are planning to integrate DPDK-Ethernet-PMD to DPDK community in next stable 
release 19.11.9 i.e. by June 2021.
We have learnt that “A meeting happens at https://meet.jit.si/DPDK every two 
weeks” to discuss new topic.
Requesting “Technical Board” to add “DPDK-Ethernet-PMD for WPJ419 platform” 
topic in the agenda and notify scheduled meeting date and time.

With thanks and regards,
Zaheer RM

From: Supriya Shekhar Mane 
Sent: Monday, May 3, 2021 4:01 PM
To: dev@dpdk.org
Cc: Chandrakant Sharpa ; Zaheer R M 

Subject: New PMD integration to next version release

Hi Maintainers,

We want to open source the Dakota Ethernet PMD.
We are ready with changes to be open source.
We want to integrate our changes onto the next release: 19.11.9
Kindly, guide us with the process and initiation of the same.

Regards,
Supriya Mane

Disclaimer: "This message is intended only for the designated recipient(s). It 
may contain confidential or proprietary information and may be subject to other 
confidentiality protections. If you are not a designated recipient, you may not 
review, copy or distribute this message. Please notify the sender by e-mail and 
delete this message. GlobalEdge does not accept any liability for virus 
infected mails."

Re: [dpdk-dev] [PATCH] net/mlx5: fix the size of tcp flags for modify actions

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Wisam Monther 
> Sent: Wednesday, April 28, 2021 1:29 PM
> To: Matan Azrad ; Ori Kam ; Slava
> Ovsiienko ; Alexander Kozyrev
> ; Raslan Darawsheh ;
> dev@dpdk.org
> Cc: NBU-Contact-Thomas Monjalon ;
> sta...@dpdk.org
> Subject: [PATCH] net/mlx5: fix the size of tcp flags for modify actions
> 
> From RFC the size of the TCP flags is 9, while the defined current size is 6.
> 
> Fixes: 641dbe4fb053 ("net/mlx5: support modify field flow action")
> Cc: akozy...@nvidia.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Wisam Jaddo 
> Reviewed-by: Alexander Kozyrev 
> ---

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

[dpdk-dev] [PATCH v3 0/4] Offload flags fixes

[David Marchand]

The important part is the last patch on vhost handling of offloading
requests coming from a virtio guest interface.

The rest are small fixes that I accumulated while reviewing the mbuf
offload flags.

On this last patch, it has the potential of breaking existing
applications using the vhost library (OVS being impacted).
I did not mark it for backport.

Changes since v2:
- kept behavior untouched (to avoid breaking ABI) and introduced a new
  flag to select the new behavior,

Changes since v1:
- dropped patch on net/tap,
- added missing bits in example/vhost,
- relaxed checks on VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,

-- 
David Marchand

David Marchand (4):
  mbuf: mark old offload flag as deprecated
  net/virtio: do not touch Tx offload flags
  net/virtio: refactor Tx offload helper
  vhost: fix offload flags in Rx path

 doc/guides/prog_guide/vhost_lib.rst  |  12 ++
 doc/guides/rel_notes/release_21_05.rst   |   6 +
 drivers/net/vhost/rte_eth_vhost.c|   2 +-
 drivers/net/virtio/virtio_rxtx.c |   7 +-
 drivers/net/virtio/virtio_rxtx_packed_avx.h  |   2 +-
 drivers/net/virtio/virtio_rxtx_packed_neon.h |   2 +-
 drivers/net/virtio/virtqueue.h   |  81 
 examples/vhost/main.c|  44 ++---
 lib/mbuf/rte_mbuf_core.h |   3 +-
 lib/vhost/rte_vhost.h|   1 +
 lib/vhost/socket.c   |   5 +-
 lib/vhost/vhost.c|   6 +-
 lib/vhost/vhost.h|  14 +-
 lib/vhost/virtio_net.c   | 185 ---
 14 files changed, 268 insertions(+), 102 deletions(-)

-- 
2.23.0

[dpdk-dev] [PATCH v3 1/4] mbuf: mark old offload flag as deprecated

[David Marchand]

PKT_RX_EIP_CKSUM_BAD has been declared deprecated but there was no
warning to applications still using it.
Fix this by marking as deprecated with the newly introduced
RTE_DEPRECATED.

Fixes: e8a419d6de4b ("mbuf: rename outer IP checksum macro")

Signed-off-by: David Marchand 
Reviewed-by: Flavio Leitner 
Acked-by: Olivier Matz 
Acked-by: Lance Richardson 
Acked-by: Ajit Khaparde 
---
Changes since v1:
- updated commitlog following Olivier comment,

---
 lib/mbuf/rte_mbuf_core.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h
index c17dc95c51..bb38d7f581 100644
--- a/lib/mbuf/rte_mbuf_core.h
+++ b/lib/mbuf/rte_mbuf_core.h
@@ -83,7 +83,8 @@ extern "C" {
  * Deprecated.
  * This flag has been renamed, use PKT_RX_OUTER_IP_CKSUM_BAD instead.
  */
-#define PKT_RX_EIP_CKSUM_BAD PKT_RX_OUTER_IP_CKSUM_BAD
+#define PKT_RX_EIP_CKSUM_BAD \
+   RTE_DEPRECATED(PKT_RX_EIP_CKSUM_BAD) PKT_RX_OUTER_IP_CKSUM_BAD
 
 /**
  * A vlan has been stripped by the hardware and its tci is saved in
-- 
2.23.0

[dpdk-dev] [PATCH v3 2/4] net/virtio: do not touch Tx offload flags

[David Marchand]

Tx offload flags are of the application responsibility.
Leave the mbuf alone and use a local storage for implicit tcp checksum
offloading in case of TSO.

Signed-off-by: David Marchand 
Reviewed-by: Maxime Coquelin 
Acked-by: Flavio Leitner 
---
 drivers/net/virtio/virtqueue.h | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index e9992b745d..ed3b85080e 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -622,10 +622,12 @@ virtqueue_xmit_offload(struct virtio_net_hdr *hdr,
uint8_t offload)
 {
if (offload) {
+   uint64_t csum_l4 = cookie->ol_flags & PKT_TX_L4_MASK;
+
if (cookie->ol_flags & PKT_TX_TCP_SEG)
-   cookie->ol_flags |= PKT_TX_TCP_CKSUM;
+   csum_l4 |= PKT_TX_TCP_CKSUM;
 
-   switch (cookie->ol_flags & PKT_TX_L4_MASK) {
+   switch (csum_l4) {
case PKT_TX_UDP_CKSUM:
hdr->csum_start = cookie->l2_len + cookie->l3_len;
hdr->csum_offset = offsetof(struct rte_udp_hdr,
-- 
2.23.0

[dpdk-dev] [PATCH v3 3/4] net/virtio: refactor Tx offload helper

[David Marchand]

Purely cosmetic but it is rather odd to have an "offload" helper that
checks if it actually must do something.
We already have the same checks in most callers, so move this branch
in them.

Signed-off-by: David Marchand 
Reviewed-by: Flavio Leitner 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Maxime Coquelin 
---
 drivers/net/virtio/virtio_rxtx.c |  7 +-
 drivers/net/virtio/virtio_rxtx_packed_avx.h  |  2 +-
 drivers/net/virtio/virtio_rxtx_packed_neon.h |  2 +-
 drivers/net/virtio/virtqueue.h   | 83 +---
 4 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 8df913b0ba..34108fb946 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -448,7 +448,7 @@ virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,
if (!vq->hw->has_tx_offload)
virtqueue_clear_net_hdr(hdr);
else
-   virtqueue_xmit_offload(hdr, cookies[i], true);
+   virtqueue_xmit_offload(hdr, cookies[i]);
 
start_dp[idx].addr  = rte_mbuf_data_iova(cookies[i]) - 
head_size;
start_dp[idx].len   = cookies[i]->data_len + head_size;
@@ -495,7 +495,7 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,
if (!vq->hw->has_tx_offload)
virtqueue_clear_net_hdr(hdr);
else
-   virtqueue_xmit_offload(hdr, cookie, true);
+   virtqueue_xmit_offload(hdr, cookie);
 
dp->addr = rte_mbuf_data_iova(cookie) - head_size;
dp->len  = cookie->data_len + head_size;
@@ -581,7 +581,8 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct 
rte_mbuf *cookie,
idx = start_dp[idx].next;
}
 
-   virtqueue_xmit_offload(hdr, cookie, vq->hw->has_tx_offload);
+   if (vq->hw->has_tx_offload)
+   virtqueue_xmit_offload(hdr, cookie);
 
do {
start_dp[idx].addr  = rte_mbuf_data_iova(cookie);
diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h 
b/drivers/net/virtio/virtio_rxtx_packed_avx.h
index 228cf5437b..c819d2e4f2 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h
@@ -115,7 +115,7 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
virtio_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {
hdr = rte_pktmbuf_mtod_offset(tx_pkts[i],
struct virtio_net_hdr *, -head_size);
-   virtqueue_xmit_offload(hdr, tx_pkts[i], true);
+   virtqueue_xmit_offload(hdr, tx_pkts[i]);
}
}
 
diff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h 
b/drivers/net/virtio/virtio_rxtx_packed_neon.h
index d4257e68f0..f19e618635 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_neon.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h
@@ -134,7 +134,7 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
virtio_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {
hdr = rte_pktmbuf_mtod_offset(tx_pkts[i],
struct virtio_net_hdr *, -head_size);
-   virtqueue_xmit_offload(hdr, tx_pkts[i], true);
+   virtqueue_xmit_offload(hdr, tx_pkts[i]);
}
}
 
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index ed3b85080e..03957b2bd0 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -617,52 +617,44 @@ virtqueue_notify(struct virtqueue *vq)
 } while (0)
 
 static inline void
-virtqueue_xmit_offload(struct virtio_net_hdr *hdr,
-   struct rte_mbuf *cookie,
-   uint8_t offload)
+virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie)
 {
-   if (offload) {
-   uint64_t csum_l4 = cookie->ol_flags & PKT_TX_L4_MASK;
-
-   if (cookie->ol_flags & PKT_TX_TCP_SEG)
-   csum_l4 |= PKT_TX_TCP_CKSUM;
-
-   switch (csum_l4) {
-   case PKT_TX_UDP_CKSUM:
-   hdr->csum_start = cookie->l2_len + cookie->l3_len;
-   hdr->csum_offset = offsetof(struct rte_udp_hdr,
-   dgram_cksum);
-   hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-   break;
-
-   case PKT_TX_TCP_CKSUM:
-   hdr->csum_start = cookie->l2_len + cookie->l3_len;
-   hdr->csum_offset = offsetof(struct rte_tcp_hdr, cksum);
-   hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-   break;
-
-   default:
-   ASSIGN_UNLESS_EQUAL(hdr->csum_start, 0);
-   ASSIGN_UNLESS_EQUAL(hdr->csum_offset, 0);
-  

[dpdk-dev] [PATCH v3 4/4] vhost: fix offload flags in Rx path

[David Marchand]

The vhost library currently configures Tx offloading (PKT_TX_*) on any
packet received from a guest virtio device which asks for some offloading.

This is problematic, as Tx offloading is something that the application
must ask for: the application needs to configure devices
to support every used offloads (ip, tcp checksumming, tso..), and the
various l2/l3/l4 lengths must be set following any processing that
happened in the application itself.

On the other hand, the received packets are not marked wrt current
packet l3/l4 checksumming info.

Copy virtio rx processing to fix those offload flags with some
differences:
- accept VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,
- ignore anything but the VIRTIO_NET_HDR_F_NEEDS_CSUM flag (to comply with
  the virtio spec),

Some applications might rely on the current behavior, so it is left
untouched by default.
A new RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS flag is added to enable the
new behavior.

The vhost example has been updated for the new behavior: TSO is applied to
any packet marked LRO.

Fixes: 859b480d5afd ("vhost: add guest offload setting")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Maxime Coquelin 
---
Changes since v2:
- introduced a new flag to keep existing behavior as the default,
- packets with unrecognised offload are passed to the application with no
  offload metadata rather than dropped,
- ignored VIRTIO_NET_HDR_F_DATA_VALID since the virtio spec states that
  the virtio driver is not allowed to use this flag when transmitting
  packets,

Changes since v1:
- updated vhost example,
- restored VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP support,
- restored log on buggy offload request,

---
 doc/guides/prog_guide/vhost_lib.rst|  12 ++
 doc/guides/rel_notes/release_21_05.rst |   6 +
 drivers/net/vhost/rte_eth_vhost.c  |   2 +-
 examples/vhost/main.c  |  44 +++---
 lib/vhost/rte_vhost.h  |   1 +
 lib/vhost/socket.c |   5 +-
 lib/vhost/vhost.c  |   6 +-
 lib/vhost/vhost.h  |  14 +-
 lib/vhost/virtio_net.c | 185 ++---
 9 files changed, 222 insertions(+), 53 deletions(-)

diff --git a/doc/guides/prog_guide/vhost_lib.rst 
b/doc/guides/prog_guide/vhost_lib.rst
index dc29229167..042875a9ca 100644
--- a/doc/guides/prog_guide/vhost_lib.rst
+++ b/doc/guides/prog_guide/vhost_lib.rst
@@ -118,6 +118,18 @@ The following is an overview of some key Vhost API 
functions:
 
 It is disabled by default.
 
+  - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
+
+Since v16.04, the vhost library forwards checksum and gso requests for
+packets received from a virtio driver by filling Tx offload metadata in
+the mbuf. This behavior is inconsistent with other drivers but it is left
+untouched for existing applications that might rely on it.
+
+This flag disables the legacy behavior and instead ask vhost to simply
+populate Rx offload metadata in the mbuf.
+
+It is disabled by default.
+
 * ``rte_vhost_driver_set_features(path, features)``
 
   This function sets the feature bits the vhost-user driver supports. The
diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index b3224dc332..1cb06ce487 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -329,6 +329,12 @@ API Changes
   ``policer_action_recolor_supported`` and ``policer_action_drop_supported``
   have been removed.
 
+* vhost: The vhost library currently populates received mbufs from a virtio
+  driver with Tx offload flags while not filling Rx offload flags.
+  While this behavior is arguable, it is kept untouched.
+  A new flag ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` has been added to ask
+  for a behavior compliant with to the mbuf offload API.
+
 
 ABI Changes
 ---
diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index d198fc8a8e..281379d6a3 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1505,7 +1505,7 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
int ret = 0;
char *iface_name;
uint16_t queues;
-   uint64_t flags = 0;
+   uint64_t flags = RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
uint64_t disable_flags = 0;
int client_mode = 0;
int iommu_support = 0;
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index ff48ba270d..64295aaf7e 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1032,33 +1033,34 @@ find_local_dest(struct vhost_dev *vdev, struct rte_mbuf 
*m,
return 0;
 }
 
-static uint16_t
-get_psd_sum(void *l3_hdr, uint64_t ol_flags)
-{
-   if (ol_flags & PKT_TX_IPV4)
-   return rte_ipv4_phdr_cksum(l3_hdr, ol_flags);
-   else /* assume etherty

Re: [dpdk-dev] [PATCH v2] examples/vhost: fix potential overflow in args process

[Maxime Coquelin]

On 4/27/21 5:14 AM, Cheng Jiang wrote:
> Change the way passing args to fix potential overflow in args process.
> 
> Coverity issue: 363741
> Fixes: 965b06f0358 ("examples/vhost: enhance getopt_long usage")
> 
> Signed-off-by: Cheng Jiang 
> ---
> v2:
>  * Change the way passing args
>  * Change git log
> 
>  examples/vhost/main.c | 11 ---
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 

Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [dpdk-dev] [PATCH v3 1/4] mbuf: mark old offload flag as deprecated

[Maxime Coquelin]

On 5/3/21 3:26 PM, David Marchand wrote:
> PKT_RX_EIP_CKSUM_BAD has been declared deprecated but there was no
> warning to applications still using it.
> Fix this by marking as deprecated with the newly introduced
> RTE_DEPRECATED.
> 
> Fixes: e8a419d6de4b ("mbuf: rename outer IP checksum macro")
> 
> Signed-off-by: David Marchand 
> Reviewed-by: Flavio Leitner 
> Acked-by: Olivier Matz 
> Acked-by: Lance Richardson 
> Acked-by: Ajit Khaparde 
> ---
> Changes since v1:
> - updated commitlog following Olivier comment,
> 
> ---
>  lib/mbuf/rte_mbuf_core.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [dpdk-dev] [PATCH v3 1/4] mbuf: mark old offload flag as deprecated

[David Marchand]

On Mon, May 3, 2021 at 3:27 PM David Marchand  wrote:
>
> PKT_RX_EIP_CKSUM_BAD has been declared deprecated but there was no
> warning to applications still using it.
> Fix this by marking as deprecated with the newly introduced
> RTE_DEPRECATED.
>
> Fixes: e8a419d6de4b ("mbuf: rename outer IP checksum macro")
>
> Signed-off-by: David Marchand 
> Reviewed-by: Flavio Leitner 
> Acked-by: Olivier Matz 
> Acked-by: Lance Richardson 
> Acked-by: Ajit Khaparde 

Reviewed-by: Maxime Coquelin 

Applied to the main branch.
The rest of the series will go through next-virtio.


-- 
David Marchand

Re: [dpdk-dev] [PATCH 0/3] add lock-free stack support discovery

[David Marchand]

On Mon, Apr 12, 2021 at 10:29 AM Stanislaw Kardach  wrote:
>
> The lock-free stack implementation (RTE_STACK_F_LF) is supported only on a
> subset of platforms, namely x86_64 and arm64. Platforms supporting 128b 
> atomics
> have to opt-in to a generic or C11 implementations. All other platforms use a
> stubbed implementation for push/pop operations which are basically NOPs.
> However rte_stack_create() will not fail and application can proceed assuming
> it has a working lock-free stack.
>
> This means that among other things the stack_lf fast and perf tests will fail
> as if implementation is wrong (which one can argue is). Therefore this 
> patchset
> tries to give user a way to check whether a lock_free is supported or not both
> at compile time (build flag) and at runtime (ENOTSUP errno in 
> rte_stack_create).
>
> I have added cc to sta...@dpdk.org because check-git-log.sh suggested it. I'm
> not sure if adding a binary compatible change to API is worth sta...@dpdk.org.
>
> Cc: sta...@dpdk.org

The issue was hit while porting to a new architecture.
The feature is broken in existing stable releases and it won't get
fixed by this change.

I'd rather not backport it.

Opinions?


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2] vdpa/mlx5: improve interrupt management

[Maxime Coquelin]

On 5/2/21 12:45 PM, Matan Azrad wrote:
> The driver should notify the guest for each traffic burst detected by CQ
> polling.
> 
> The CQ polling trigger is defined by `event_mode` device argument,
> either by busy polling on all the CQs or by blocked call to HW
> completion event using DevX channel.
> 
> Also, the polling event modes can move to blocked call when the
> traffic rate is low.
> 
> The current blocked call uses the EAL interrupt API suffering a lot
> of overhead in the API management and serve all the drivers and
> libraries using only single thread.
> 
> Use blocking FD of the DevX channel in order to do blocked call
> directly by the DevX channel FD mechanism.
> 
> Signed-off-by: Matan Azrad 
> Acked-by: Xueming Li 
> ---
>  doc/guides/vdpadevs/mlx5.rst|   8 +-
>  drivers/vdpa/mlx5/mlx5_vdpa.c   |   8 +-
>  drivers/vdpa/mlx5/mlx5_vdpa.h   |   8 +-
>  drivers/vdpa/mlx5/mlx5_vdpa_event.c | 304 +++-
>  4 files changed, 130 insertions(+), 198 deletions(-)
> 
> v2:
> Rebased on top of latest updates by Thomas.
> 
> 

Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [dpdk-dev] [PATCH 0/3] add lock-free stack support discovery

[Olivier Matz]

On Mon, May 03, 2021 at 04:21:25PM +0200, David Marchand wrote:
> On Mon, Apr 12, 2021 at 10:29 AM Stanislaw Kardach  wrote:
> >
> > The lock-free stack implementation (RTE_STACK_F_LF) is supported only on a
> > subset of platforms, namely x86_64 and arm64. Platforms supporting 128b 
> > atomics
> > have to opt-in to a generic or C11 implementations. All other platforms use 
> > a
> > stubbed implementation for push/pop operations which are basically NOPs.
> > However rte_stack_create() will not fail and application can proceed 
> > assuming
> > it has a working lock-free stack.
> >
> > This means that among other things the stack_lf fast and perf tests will 
> > fail
> > as if implementation is wrong (which one can argue is). Therefore this 
> > patchset
> > tries to give user a way to check whether a lock_free is supported or not 
> > both
> > at compile time (build flag) and at runtime (ENOTSUP errno in 
> > rte_stack_create).
> >
> > I have added cc to sta...@dpdk.org because check-git-log.sh suggested it. 
> > I'm
> > not sure if adding a binary compatible change to API is worth 
> > sta...@dpdk.org.
> >
> > Cc: sta...@dpdk.org
> 
> The issue was hit while porting to a new architecture.
> The feature is broken in existing stable releases and it won't get
> fixed by this change.
> 
> I'd rather not backport it.
> 
> Opinions?

Agreed.

[dpdk-dev] [PATCH] regex/octeontx2: remove unused include directory

[Thomas Monjalon]

The variable inc_dir is not defined in this file.

Fixes: 4cd1c5fd9ed4 ("regex/octeontx2: introduce REE driver")
Cc: sta...@dpdk.org

Signed-off-by: Thomas Monjalon 
---
 drivers/regex/octeontx2/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/regex/octeontx2/meson.build 
b/drivers/regex/octeontx2/meson.build
index 4930ce00f4..3f81add5bf 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -12,7 +12,6 @@ lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
 ext_deps += lib
 ext_deps += cc.find_library('libstdc++', required: true)
-includes += include_directories(inc_dir)
 cflags += ['-DREE_COMPILER_SDK']
 endif
 
-- 
2.31.1

[dpdk-dev] [PATCH] devtools: allow to skip some build tests

[Thomas Monjalon]

Inserting "return 1" in .develconfig file will allow to skip
some build tests based on $DPDK_TARGET or other parameters.

Signed-off-by: Thomas Monjalon 
---
 devtools/test-meson-builds.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index daf817ac3e..d68d0e356e 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -87,7 +87,7 @@ load_env () # 
fi
echo "Using DPDK_TARGET $DPDK_TARGET" >&$verbose
# config input: $DPDK_TARGET
-   . $srcdir/devtools/load-devel-config
+   . $srcdir/devtools/load-devel-config || return 1
# config output: $DPDK_MESON_OPTIONS, $PATH, $PKG_CONFIG_PATH, etc
command -v $targetcc >/dev/null 2>&1 || return 1
 }
-- 
2.31.1

Re: [dpdk-dev] [PATCH v1] net/virtio: fix vectorized Rx queue stuck

[Maxime Coquelin]

On 4/14/21 4:14 PM, Xueming Li wrote:
> From: ".Xueming Li" 
> 
> When Rx queue worked in vectorized mode and rxd <= 512, under traffic of
> high PPS rate, testpmd often start and receive packets of rxd without
> further growth.
> 
> Testpmd started with rxq flush which tried to rx MAX_PKT_BURST(512)
> packets and drop. When Rx burst size >= Rx queue size, all descriptors
> in used queue consumed without rearm, device can't receive more packets.
> The next Rx burst returned at once since no used descriptors found,
> rearm logic was skipped, rx vq kept in starving state.
> 
> To avoid rx vq starving, this patch always check the available queue,
> rearm if needed even no used descriptor reported by device.
> 
> Fixes: fc3d66212fed ("virtio: add vector Rx")
> Cc: 谢华伟(此时此刻） 
> Fixes: 2d7c37194ee4 ("net/virtio: add NEON based Rx handler")
> Cc: jerin.ja...@caviumnetworks.com
> Fixes: 52b5a707e6ca ("net/virtio: add Altivec Rx")
> Cc: d...@linux.vnet.ibm.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Xueming Li 
> ---
>  drivers/net/virtio/virtio_rxtx_simple_altivec.c | 12 ++--
>  drivers/net/virtio/virtio_rxtx_simple_neon.c| 12 ++--
>  drivers/net/virtio/virtio_rxtx_simple_sse.c | 12 ++--
>  3 files changed, 18 insertions(+), 18 deletions(-)
> 

Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [dpdk-dev] Questions about API with no parameter check

[Morten Brørup]

> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Tyler Retzlaff
> Sent: Friday, April 30, 2021 2:16 AM
> 
> On Thu, Apr 29, 2021 at 09:49:24PM +0300, Dmitry Kozlyuk wrote:
> > 2021-04-29 09:16 (UTC-0700), Tyler Retzlaff:
> > > On Wed, Apr 07, 2021 at 05:10:00PM +0100, Ferruh Yigit wrote:
> > > > On 4/7/2021 4:25 PM, Hemant Agrawal wrote:
> > > > >>+1
> > > > >>But are we going to check all parameters?
> > > > >
> > > > >+1
> > > > >
> > > > >It may be better to limit the number of checks.
> > > > >
> > > >
> > > > +1 to verify input for APIs.
> > > >
> > > > Why not do all, what is the downside of checking all input for
> control path APIs?
> > >
> > > why not assert them then, what is the purpose of returning an error
> to a
> > > caller for a api contract violation like a `parameter shall not be
> NULL`
> > >
> > > * assert.h/cassert can be compiled away for those pundits who don't
> want
> > >   to see extra branches in their code
> > >
> > > * when not compiled away it gives you an immediate stack trace or
> dump to operate
> > >   on immediately identifying the problem instead of having to troll
> > >   through hoaky inconsistently formatted logging.
> > >
> > > * it catches callers who don't bother to check for error from
> return of
> > >   the function (debug builds) instead of some arbitrary failure at
> some
> > >   unrelated part of the code where the corrupted program state is
> relied
> > >   upon.
> > >
> > > we aren't running in kernel, we can crash.
> >
> > As library developers we can't assume stability requirements at call
> site.
> > There may be temporary files to clean up, for example,
> > or other threads in the middle of their work.
> 
> if a callers state is so incoherent that it is passing NULL to
> functions
> that contractually expect non-NULL it is already way past the point of
> no return. continuing to run only accomplishes destroying the state
> that
> might be used to diagnose the originating flaw in program logic.
> 
> if you return an error instead of fail fast at best you'll crash soon
> but
> more often then not you'll keep running and produce incorrect results
> or worst
> keep running security compromised.
> 
> about the only argument that can be made for having this silly error
> pattern that is valid is when many-party code is running inside the
> same
> process and you don't want someone elses bad code taking your process
> down. a problem that i am accutely aware of in allowing 3rd party code
> run
> in kernel space. (but this is mostly? mitigated by multi-process mode).
> 
> > As an application developer I'd hate to get a crash inside a library
> and
> > having to debug it. Usually installed are release versions with
> assertions
> > compiled away.
> >
> 
> so it wouldn't crash at all at least not at the point of failure. the
> only
> difference is i guess you wouldn't get a log message with what is being
> done
> now.
> 
> could we turn this around and have it tunable by policy instead of
> opting everyone in to this behavior maybe?  i'm just making some ideas
> up on
> the fly but couldn't we just have something that is compile time
> policy?
> 
> #ifdef EAL_FAILURE_POLICY_RETURN
> #define EAL_FAILURE(condition, error) \
> if ((condition)) { \
> return (error); \
> }
> #else
> #define EAL_FAILURE(condition, error) \
> assert(! (condition), (error));
> #endif
> 

I agree with the overall idea - it's better to fail immediately when a 
violation is detected. And more asserts are better than fewer.

However, I don't see the need for a completely new macro. For testing contract 
violations and similar, we already have RTE_VERIFY() and RTE_ASSERT(), where 
the latter can be controlled by RTE_ENABLE_ASSERT at compile time.

> also, i'll point out that lately there have been a lot of patches
> accepted that call functions and don't evaluate their return value and
> the reason is those functions really should never have been "failable".
> so we'll just see more of that as we stack on often compile time or
> immediate runtime failure returns. of course the compatibility of the
> code calling these functions is only as good as the implicit dependency
> on the implementation... until it changes and the application
> misbehaves.
> 
> i'll also throw another gripe in here that there are a lot of
> "deallocation" functions in dpdk that according to their api can fail
> again because of this kind of "oh i'll fail because i got a bad
> parameter design".
> 
> deallocation should never fail ever and i shouldn't need to write logic
> around a deallocation to handle failures. imagine if free failed?
> 
> p = malloc(...);
> if (p == NULL)
>  return -1;
> 
> ... do work with p ...
> 
> rv = free(p);
> if (rv != 0) ... what the hell? yet this pattern exists in a bunch of
> places. it's insane. (i'll quietly ignore the design error that free
> does accept NULL and is a noop standardized *facepalm*).
> 
> anyway, i guess i've ranted enough. there are some users who wou

[dpdk-dev] [PATCH v4 00/34] Marvell CNXK Event device Driver

[pbhagavatula]

From: Pavan Nikhilesh 

This patchset adds support for Marvell CN106XX SoC based on 'common/cnxk'
driver. In future, CN9K a.k.a octeontx2 will also be supported by same
driver when code is ready and 'event/octeontx2' will be deprecated.

v4 Changes:
- s/PCI_ANY_ID/RTE_PCI_ANY_ID.
- Remove dependency on net_cnxk
- Fix compilation issues with xstats patch.

v3 Changes:
- Fix documentation, copyright.
- Update release notes.

v2 Changes:
- Split Rx/Tx adapter into seperate patch set to remove dependency on net/cnxk
- Add missing xStats patch.
- Fix incorrect head wait operation.

Pavan Nikhilesh (17):
  common/cnxk: rename deprecated constant
  event/cnxk: add build infra and device setup
  event/cnxk: add platform specific device probe
  event/cnxk: add common configuration validation
  event/cnxk: allocate event inflight buffers
  event/cnxk: add devargs to configure getwork mode
  event/cnxk: add SSO HW device operations
  event/cnxk: add SSO GWS fastpath enqueue functions
  event/cnxk: add SSO GWS dequeue fastpath functions
  event/cnxk: add SSO selftest and dump
  event/cnxk: add event port and queue xstats
  event/cnxk: add devargs to disable NPA
  event/cnxk: allow adapters to resize inflights
  event/cnxk: add TIM bucket operations
  event/cnxk: add timer arm routine
  event/cnxk: add timer arm timeout burst
  event/cnxk: add timer cancel function

Shijith Thotton (17):
  event/cnxk: add device capabilities function
  event/cnxk: add platform specific device config
  event/cnxk: add event queue config functions
  event/cnxk: add devargs for inflight buffer count
  event/cnxk: add devargs to control SSO HWGRP QoS
  event/cnxk: add port config functions
  event/cnxk: add event port link and unlink
  event/cnxk: add device start function
  event/cnxk: add device stop and close functions
  event/cnxk: support event timer
  event/cnxk: add timer adapter capabilities
  event/cnxk: create and free timer adapter
  event/cnxk: add timer adapter info function
  event/cnxk: add devargs for chunk size and rings
  event/cnxk: add timer stats get and reset
  event/cnxk: add timer adapter start and stop
  event/cnxk: add devargs to control timer adapters

 MAINTAINERS |6 +
 app/test/test_eventdev.c|   14 +
 doc/guides/eventdevs/cnxk.rst   |  162 ++
 doc/guides/eventdevs/index.rst  |1 +
 doc/guides/rel_notes/release_21_05.rst  |2 +
 drivers/common/cnxk/roc_platform.h  |   24 +-
 drivers/common/cnxk/roc_sso.c   |   63 +
 drivers/common/cnxk/roc_sso.h   |   19 +
 drivers/common/cnxk/version.map |2 +
 drivers/event/cnxk/cn10k_eventdev.c |  509 ++
 drivers/event/cnxk/cn10k_worker.c   |  115 ++
 drivers/event/cnxk/cn10k_worker.h   |  175 +++
 drivers/event/cnxk/cn9k_eventdev.c  |  578 +++
 drivers/event/cnxk/cn9k_worker.c|  236 +++
 drivers/event/cnxk/cn9k_worker.h|  297 
 drivers/event/cnxk/cnxk_eventdev.c  |  647 
 drivers/event/cnxk/cnxk_eventdev.h  |  253 +++
 drivers/event/cnxk/cnxk_eventdev_adptr.c|   67 +
 drivers/event/cnxk/cnxk_eventdev_selftest.c | 1570 +++
 drivers/event/cnxk/cnxk_eventdev_stats.c|  289 
 drivers/event/cnxk/cnxk_tim_evdev.c |  538 +++
 drivers/event/cnxk/cnxk_tim_evdev.h |  275 
 drivers/event/cnxk/cnxk_tim_worker.c|  191 +++
 drivers/event/cnxk/cnxk_tim_worker.h|  601 +++
 drivers/event/cnxk/cnxk_worker.h|  101 ++
 drivers/event/cnxk/meson.build  |   23 +
 drivers/event/cnxk/version.map  |3 +
 drivers/event/meson.build   |1 +
 28 files changed, 6748 insertions(+), 14 deletions(-)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cn10k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.h
 create mode 100644 drivers/event/cnxk/cn9k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_adptr.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_selftest.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_stats.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.h
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_worker.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

--
2.17.1

[dpdk-dev] [PATCH v4 01/34] common/cnxk: rename deprecated constant

[pbhagavatula]

From: Pavan Nikhilesh 

The PCI_ANY_ID constant is deprecated and renamed as RTE_PCI_ANY_ID.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/common/cnxk/roc_platform.h | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/common/cnxk/roc_platform.h 
b/drivers/common/cnxk/roc_platform.h
index 97600e56f..29ab71240 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -165,22 +165,18 @@ extern int cnxk_logtype_tm;
 #define plt_tm_dbg(fmt, ...)   plt_dbg(tm, fmt, ##__VA_ARGS__)
 
 #ifdef __cplusplus
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   RTE_CLASS_ANY_ID,   \
-   PCI_VENDOR_ID_CAVIUM,   \
-   (dev),  \
-   PCI_ANY_ID, \
-   (subsystem_dev),\
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   RTE_CLASS_ANY_ID, PCI_VENDOR_ID_CAVIUM, (dev), RTE_PCI_ANY_ID, \
+   (subsystem_dev),   \
}
 #else
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   .class_id = RTE_CLASS_ANY_ID,   \
-   .vendor_id = PCI_VENDOR_ID_CAVIUM,  \
-   .device_id = (dev), \
-   .subsystem_vendor_id = PCI_ANY_ID,  \
-   .subsystem_device_id = (subsystem_dev), \
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   .class_id = RTE_CLASS_ANY_ID,  \
+   .vendor_id = PCI_VENDOR_ID_CAVIUM, .device_id = (dev), \
+   .subsystem_vendor_id = RTE_PCI_ANY_ID, \
+   .subsystem_device_id = (subsystem_dev),\
}
 #endif
 
-- 
2.17.1

[dpdk-dev] [PATCH v4 02/34] event/cnxk: add build infra and device setup

[pbhagavatula]

From: Pavan Nikhilesh 

Add meson build infra structure along with the event device
SSO initialization and teardown functions.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
Acked-by: Ray Kinsella 
---
 MAINTAINERS|  6 +++
 doc/guides/eventdevs/cnxk.rst  | 55 +
 doc/guides/eventdevs/index.rst |  1 +
 doc/guides/rel_notes/release_21_05.rst |  2 +
 drivers/event/cnxk/cnxk_eventdev.c | 68 ++
 drivers/event/cnxk/cnxk_eventdev.h | 39 +++
 drivers/event/cnxk/meson.build | 13 +
 drivers/event/cnxk/version.map |  3 ++
 drivers/event/meson.build  |  1 +
 9 files changed, 188 insertions(+)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 44f3d322e..5a2297e99 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1224,6 +1224,12 @@ M: Jerin Jacob 
 F: drivers/event/octeontx2/
 F: doc/guides/eventdevs/octeontx2.rst
 
+Marvell cnxk
+M: Pavan Nikhilesh 
+M: Shijith Thotton 
+F: drivers/event/cnxk/
+F: doc/guides/eventdevs/cnxk.rst
+
 NXP DPAA eventdev
 M: Hemant Agrawal 
 M: Nipun Gupta 
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
new file mode 100644
index 0..148280b85
--- /dev/null
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -0,0 +1,55 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2021 Marvell.
+
+Marvell cnxk SSO Eventdev Driver
+
+
+The SSO PMD (**librte_event_cnxk**) and provides poll mode
+eventdev driver support for the inbuilt event device found in the
+**Marvell OCTEON cnxk** SoC family.
+
+More information about OCTEON cnxk SoC can be found at `Marvell Official 
Website
+`_.
+
+Supported OCTEON cnxk SoCs
+--
+
+- CN9XX
+- CN10XX
+
+Features
+
+
+Features of the OCTEON cnxk SSO PMD are:
+
+- 256 Event queues
+- 26 (dual) and 52 (single) Event ports on CN9XX
+- 52 Event ports on CN10XX
+- HW event scheduler
+- Supports 1M flows per event queue
+- Flow based event pipelining
+- Flow pinning support in flow based event pipelining
+- Queue based event pipelining
+- Supports ATOMIC, ORDERED, PARALLEL schedule types per flow
+- Event scheduling QoS based on event queue priority
+- Open system with configurable amount of outstanding events limited only by
+  DRAM
+- HW accelerated dequeue timeout support to enable power management
+
+Prerequisites and Compilation procedure
+---
+
+   See :doc:`../platform/cnxk` for setup information.
+
+Debugging Options
+-
+
+.. _table_octeon_cnxk_event_debug_options:
+
+.. table:: OCTEON cnxk event device debug options
+
+   +---++---+
+   | # | Component  | EAL log command   |
+   +===++===+
+   | 1 | SSO| --log-level='pmd\.event\.cnxk,8'  |
+   +---++---+
diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index 738788d9e..214302539 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -11,6 +11,7 @@ application through the eventdev API.
 :maxdepth: 2
 :numbered:
 
+cnxk
 dlb2
 dpaa
 dpaa2
diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index b3224dc33..428615e4f 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -75,6 +75,8 @@ New Features
 net, crypto and event PMD's.
   * Added mempool/cnxk driver which provides the support for the integrated
 mempool device.
+  * Added event/cnxk driver which provides the support for integrated event
+device.
 
 * **Enhanced ethdev representor syntax.**
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
new file mode 100644
index 0..7ea782eaa
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+int
+cnxk_sso_init(struct rte_eventdev *event_dev)
+{
+   const struct rte_memzone *mz = NULL;
+   struct rte_pci_device *pci_dev;
+   struct cnxk_sso_evdev *dev;
+   int rc;
+
+   mz = rte_memzone_reserve(CNXK_SSO_MZ_NAME, sizeof(uint64_t),
+SOCKET_ID_ANY, 0);
+   if (mz == NULL) {
+   plt_err("Failed to create eventdev memzone");
+

[dpdk-dev] [PATCH v4 03/34] event/cnxk: add device capabilities function

[pbhagavatula]

From: Shijith Thotton 

Add the info_get function to return details on the queues, flow,
prioritization capabilities, etc. which this device has.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_eventdev.c | 24 
 drivers/event/cnxk/cnxk_eventdev.h |  4 
 2 files changed, 28 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 7ea782eaa..3a7053af6 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -4,6 +4,30 @@
 
 #include "cnxk_eventdev.h"
 
+void
+cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+ struct rte_event_dev_info *dev_info)
+{
+
+   dev_info->min_dequeue_timeout_ns = dev->min_dequeue_timeout_ns;
+   dev_info->max_dequeue_timeout_ns = dev->max_dequeue_timeout_ns;
+   dev_info->max_event_queues = dev->max_event_queues;
+   dev_info->max_event_queue_flows = (1ULL << 20);
+   dev_info->max_event_queue_priority_levels = 8;
+   dev_info->max_event_priority_levels = 1;
+   dev_info->max_event_ports = dev->max_event_ports;
+   dev_info->max_event_port_dequeue_depth = 1;
+   dev_info->max_event_port_enqueue_depth = 1;
+   dev_info->max_num_events = dev->max_num_events;
+   dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS |
+ RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
+ RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |
+ RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |
+ RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
+ RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
+}
+
 int
 cnxk_sso_init(struct rte_eventdev *event_dev)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 74d0990fa..9745bfd3e 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -17,6 +17,8 @@
 
 struct cnxk_sso_evdev {
struct roc_sso sso;
+   uint8_t max_event_queues;
+   uint8_t max_event_ports;
uint8_t is_timeout_deq;
uint8_t nb_event_queues;
uint8_t nb_event_ports;
@@ -35,5 +37,7 @@ cnxk_sso_pmd_priv(const struct rte_eventdev *event_dev)
 int cnxk_sso_init(struct rte_eventdev *event_dev);
 int cnxk_sso_fini(struct rte_eventdev *event_dev);
 int cnxk_sso_remove(struct rte_pci_device *pci_dev);
+void cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+  struct rte_event_dev_info *dev_info);
 
 #endif /* __CNXK_EVENTDEV_H__ */
-- 
2.17.1

[dpdk-dev] [PATCH v4 04/34] event/cnxk: add platform specific device probe

[pbhagavatula]

From: Pavan Nikhilesh 

Add platform specific event device probe and remove, also add
event device info get function.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cn10k_eventdev.c | 101 +++
 drivers/event/cnxk/cn9k_eventdev.c  | 102 
 drivers/event/cnxk/cnxk_eventdev.h  |   2 +
 drivers/event/cnxk/meson.build  |   5 +-
 4 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/cnxk/cn10k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn9k_eventdev.c

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
new file mode 100644
index 0..1216acaad
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+static void
+cn10k_sso_set_rsrc(void *arg)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   dev->max_event_ports = dev->sso.max_hws;
+   dev->max_event_queues =
+   dev->sso.max_hwgrp > RTE_EVENT_MAX_QUEUES_PER_DEV ?
+ RTE_EVENT_MAX_QUEUES_PER_DEV :
+ dev->sso.max_hwgrp;
+}
+
+static void
+cn10k_sso_info_get(struct rte_eventdev *event_dev,
+  struct rte_event_dev_info *dev_info)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+   dev_info->driver_name = RTE_STR(EVENTDEV_NAME_CN10K_PMD);
+   cnxk_sso_info_get(dev, dev_info);
+}
+
+static struct rte_eventdev_ops cn10k_sso_dev_ops = {
+   .dev_infos_get = cn10k_sso_info_get,
+};
+
+static int
+cn10k_sso_init(struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   if (RTE_CACHE_LINE_SIZE != 64) {
+   plt_err("Driver not compiled for CN9K");
+   return -EFAULT;
+   }
+
+   rc = roc_plt_init();
+   if (rc < 0) {
+   plt_err("Failed to initialize platform model");
+   return rc;
+   }
+
+   event_dev->dev_ops = &cn10k_sso_dev_ops;
+   /* For secondary processes, the primary has done all the work */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return 0;
+
+   rc = cnxk_sso_init(event_dev);
+   if (rc < 0)
+   return rc;
+
+   cn10k_sso_set_rsrc(cnxk_sso_pmd_priv(event_dev));
+   if (!dev->max_event_ports || !dev->max_event_queues) {
+   plt_err("Not enough eventdev resource queues=%d ports=%d",
+   dev->max_event_queues, dev->max_event_ports);
+   cnxk_sso_fini(event_dev);
+   return -ENODEV;
+   }
+
+   plt_sso_dbg("Initializing %s max_queues=%d max_ports=%d",
+   event_dev->data->name, dev->max_event_queues,
+   dev->max_event_ports);
+
+   return 0;
+}
+
+static int
+cn10k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+   return rte_event_pmd_pci_probe(pci_drv, pci_dev,
+  sizeof(struct cnxk_sso_evdev),
+  cn10k_sso_init);
+}
+
+static const struct rte_pci_id cn10k_pci_sso_map[] = {
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+   {
+   .vendor_id = 0,
+   },
+};
+
+static struct rte_pci_driver cn10k_pci_sso = {
+   .id_table = cn10k_pci_sso_map,
+   .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
+   .probe = cn10k_sso_probe,
+   .remove = cnxk_sso_remove,
+};
+
+RTE_PMD_REGISTER_PCI(event_cn10k, cn10k_pci_sso);
+RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
+RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
new file mode 100644
index 0..988d2425f
--- /dev/null
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+#define CN9K_DUAL_WS_NB_WS 2
+#define CN9K_DUAL_WS_PAIR_ID(x, id) (((x)*CN9K_DUAL_WS_NB_WS) + id)
+
+static void
+cn9k_sso_set_rsrc(void *arg)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   if (dev->dual_ws)
+   dev->max_event_ports = dev->sso.max_hws / CN9K_DUAL_WS_NB_WS;
+   else
+   dev->max_event_ports = dev->sso.max_hws;
+   dev->max_event_queues =
+   dev->sso.max_hwgrp > RTE_EVENT_MAX_QUEUES_PER_DEV ?
+ RTE_EVENT_MAX_QUEUES_PER_DEV :
+ dev->sso.max_hwgrp;
+}
+
+static

[dpdk-dev] [PATCH v4 05/34] event/cnxk: add common configuration validation

[pbhagavatula]

From: Pavan Nikhilesh 

Add configuration validation, port and queue configuration
functions.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_eventdev.c | 70 ++
 drivers/event/cnxk/cnxk_eventdev.h |  6 +++
 2 files changed, 76 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 3a7053af6..3eab1ed29 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -28,6 +28,76 @@ cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
  RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
 }
 
+int
+cnxk_sso_dev_validate(const struct rte_eventdev *event_dev)
+{
+   struct rte_event_dev_config *conf = &event_dev->data->dev_conf;
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   uint32_t deq_tmo_ns;
+
+   deq_tmo_ns = conf->dequeue_timeout_ns;
+
+   if (deq_tmo_ns == 0)
+   deq_tmo_ns = dev->min_dequeue_timeout_ns;
+   if (deq_tmo_ns < dev->min_dequeue_timeout_ns ||
+   deq_tmo_ns > dev->max_dequeue_timeout_ns) {
+   plt_err("Unsupported dequeue timeout requested");
+   return -EINVAL;
+   }
+
+   if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)
+   dev->is_timeout_deq = 1;
+
+   dev->deq_tmo_ns = deq_tmo_ns;
+
+   if (!conf->nb_event_queues || !conf->nb_event_ports ||
+   conf->nb_event_ports > dev->max_event_ports ||
+   conf->nb_event_queues > dev->max_event_queues) {
+   plt_err("Unsupported event queues/ports requested");
+   return -EINVAL;
+   }
+
+   if (conf->nb_event_port_dequeue_depth > 1) {
+   plt_err("Unsupported event port deq depth requested");
+   return -EINVAL;
+   }
+
+   if (conf->nb_event_port_enqueue_depth > 1) {
+   plt_err("Unsupported event port enq depth requested");
+   return -EINVAL;
+   }
+
+   dev->nb_event_queues = conf->nb_event_queues;
+   dev->nb_event_ports = conf->nb_event_ports;
+
+   return 0;
+}
+
+void
+cnxk_sso_queue_def_conf(struct rte_eventdev *event_dev, uint8_t queue_id,
+   struct rte_event_queue_conf *queue_conf)
+{
+   RTE_SET_USED(event_dev);
+   RTE_SET_USED(queue_id);
+
+   queue_conf->nb_atomic_flows = (1ULL << 20);
+   queue_conf->nb_atomic_order_sequences = (1ULL << 20);
+   queue_conf->event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES;
+   queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+}
+
+void
+cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, uint8_t port_id,
+  struct rte_event_port_conf *port_conf)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+   RTE_SET_USED(port_id);
+   port_conf->new_event_threshold = dev->max_num_events;
+   port_conf->dequeue_depth = 1;
+   port_conf->enqueue_depth = 1;
+}
+
 int
 cnxk_sso_init(struct rte_eventdev *event_dev)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 6bdf0b347..59d96a08f 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -22,6 +22,7 @@ struct cnxk_sso_evdev {
uint8_t is_timeout_deq;
uint8_t nb_event_queues;
uint8_t nb_event_ports;
+   uint32_t deq_tmo_ns;
uint32_t min_dequeue_timeout_ns;
uint32_t max_dequeue_timeout_ns;
int32_t max_num_events;
@@ -41,5 +42,10 @@ int cnxk_sso_fini(struct rte_eventdev *event_dev);
 int cnxk_sso_remove(struct rte_pci_device *pci_dev);
 void cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
   struct rte_event_dev_info *dev_info);
+int cnxk_sso_dev_validate(const struct rte_eventdev *event_dev);
+void cnxk_sso_queue_def_conf(struct rte_eventdev *event_dev, uint8_t queue_id,
+struct rte_event_queue_conf *queue_conf);
+void cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, uint8_t port_id,
+   struct rte_event_port_conf *port_conf);
 
 #endif /* __CNXK_EVENTDEV_H__ */
-- 
2.17.1

[dpdk-dev] [PATCH v4 06/34] event/cnxk: add platform specific device config

[pbhagavatula]

From: Shijith Thotton 

Add platform specific event device configuration that attaches the
requested number of SSO HWS(event ports) and HWGRP(event queues) LFs
to the RVU PF/VF.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c | 35 +++
 drivers/event/cnxk/cn9k_eventdev.c  | 37 +
 2 files changed, 72 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 1216acaad..779a2e026 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -16,6 +16,14 @@ cn10k_sso_set_rsrc(void *arg)
  dev->sso.max_hwgrp;
 }
 
+static int
+cn10k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
+}
+
 static void
 cn10k_sso_info_get(struct rte_eventdev *event_dev,
   struct rte_event_dev_info *dev_info)
@@ -26,8 +34,35 @@ cn10k_sso_info_get(struct rte_eventdev *event_dev,
cnxk_sso_info_get(dev, dev_info);
 }
 
+static int
+cn10k_sso_dev_configure(const struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   rc = cnxk_sso_dev_validate(event_dev);
+   if (rc < 0) {
+   plt_err("Invalid event device configuration");
+   return -EINVAL;
+   }
+
+   roc_sso_rsrc_fini(&dev->sso);
+
+   rc = cn10k_sso_rsrc_init(dev, dev->nb_event_ports,
+dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to initialize SSO resources");
+   return -ENODEV;
+   }
+
+   return rc;
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
+   .dev_configure = cn10k_sso_dev_configure,
+   .queue_def_conf = cnxk_sso_queue_def_conf,
+   .port_def_conf = cnxk_sso_port_def_conf,
 };
 
 static int
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 988d2425f..d042f58da 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -22,6 +22,17 @@ cn9k_sso_set_rsrc(void *arg)
  dev->sso.max_hwgrp;
 }
 
+static int
+cn9k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   if (dev->dual_ws)
+   hws = hws * CN9K_DUAL_WS_NB_WS;
+
+   return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
+}
+
 static void
 cn9k_sso_info_get(struct rte_eventdev *event_dev,
  struct rte_event_dev_info *dev_info)
@@ -32,8 +43,34 @@ cn9k_sso_info_get(struct rte_eventdev *event_dev,
cnxk_sso_info_get(dev, dev_info);
 }
 
+static int
+cn9k_sso_dev_configure(const struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   rc = cnxk_sso_dev_validate(event_dev);
+   if (rc < 0) {
+   plt_err("Invalid event device configuration");
+   return -EINVAL;
+   }
+
+   roc_sso_rsrc_fini(&dev->sso);
+
+   rc = cn9k_sso_rsrc_init(dev, dev->nb_event_ports, dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to initialize SSO resources");
+   return -ENODEV;
+   }
+
+   return rc;
+}
+
 static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.dev_infos_get = cn9k_sso_info_get,
+   .dev_configure = cn9k_sso_dev_configure,
+   .queue_def_conf = cnxk_sso_queue_def_conf,
+   .port_def_conf = cnxk_sso_port_def_conf,
 };
 
 static int
-- 
2.17.1

[dpdk-dev] [PATCH v4 07/34] event/cnxk: add event queue config functions

[pbhagavatula]

From: Shijith Thotton 

Add setup and release functions for event queues i.e.
SSO HWGRPs.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c |  2 ++
 drivers/event/cnxk/cn9k_eventdev.c  |  2 ++
 drivers/event/cnxk/cnxk_eventdev.c  | 19 +++
 drivers/event/cnxk/cnxk_eventdev.h  |  3 +++
 4 files changed, 26 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 779a2e026..557f26b8f 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -62,6 +62,8 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
.queue_def_conf = cnxk_sso_queue_def_conf,
+   .queue_setup = cnxk_sso_queue_setup,
+   .queue_release = cnxk_sso_queue_release,
.port_def_conf = cnxk_sso_port_def_conf,
 };
 
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index d042f58da..eba1bfbf0 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -70,6 +70,8 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.dev_infos_get = cn9k_sso_info_get,
.dev_configure = cn9k_sso_dev_configure,
.queue_def_conf = cnxk_sso_queue_def_conf,
+   .queue_setup = cnxk_sso_queue_setup,
+   .queue_release = cnxk_sso_queue_release,
.port_def_conf = cnxk_sso_port_def_conf,
 };
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 3eab1ed29..e22479a19 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -86,6 +86,25 @@ cnxk_sso_queue_def_conf(struct rte_eventdev *event_dev, 
uint8_t queue_id,
queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
 }
 
+int
+cnxk_sso_queue_setup(struct rte_eventdev *event_dev, uint8_t queue_id,
+const struct rte_event_queue_conf *queue_conf)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+   plt_sso_dbg("Queue=%d prio=%d", queue_id, queue_conf->priority);
+   /* Normalize <0-255> to <0-7> */
+   return roc_sso_hwgrp_set_priority(&dev->sso, queue_id, 0xFF, 0xFF,
+ queue_conf->priority / 32);
+}
+
+void
+cnxk_sso_queue_release(struct rte_eventdev *event_dev, uint8_t queue_id)
+{
+   RTE_SET_USED(event_dev);
+   RTE_SET_USED(queue_id);
+}
+
 void
 cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, uint8_t port_id,
   struct rte_event_port_conf *port_conf)
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 59d96a08f..426219c85 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -45,6 +45,9 @@ void cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
 int cnxk_sso_dev_validate(const struct rte_eventdev *event_dev);
 void cnxk_sso_queue_def_conf(struct rte_eventdev *event_dev, uint8_t queue_id,
 struct rte_event_queue_conf *queue_conf);
+int cnxk_sso_queue_setup(struct rte_eventdev *event_dev, uint8_t queue_id,
+const struct rte_event_queue_conf *queue_conf);
+void cnxk_sso_queue_release(struct rte_eventdev *event_dev, uint8_t queue_id);
 void cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, uint8_t port_id,
struct rte_event_port_conf *port_conf);
 
-- 
2.17.1

[dpdk-dev] [PATCH v4 08/34] event/cnxk: allocate event inflight buffers

[pbhagavatula]

From: Pavan Nikhilesh 

Allocate buffers in DRAM that hold inflight events.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c |   7 ++
 drivers/event/cnxk/cn9k_eventdev.c  |   7 ++
 drivers/event/cnxk/cnxk_eventdev.c  | 105 
 drivers/event/cnxk/cnxk_eventdev.h  |  14 +++-
 4 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 557f26b8f..9c5ddea76 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -55,6 +55,13 @@ cn10k_sso_dev_configure(const struct rte_eventdev *event_dev)
return -ENODEV;
}
 
+   rc = cnxk_sso_xaq_allocate(dev);
+   if (rc < 0)
+   goto cnxk_rsrc_fini;
+
+   return 0;
+cnxk_rsrc_fini:
+   roc_sso_rsrc_fini(&dev->sso);
return rc;
 }
 
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index eba1bfbf0..954fea01f 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -63,6 +63,13 @@ cn9k_sso_dev_configure(const struct rte_eventdev *event_dev)
return -ENODEV;
}
 
+   rc = cnxk_sso_xaq_allocate(dev);
+   if (rc < 0)
+   goto cnxk_rsrc_fini;
+
+   return 0;
+cnxk_rsrc_fini:
+   roc_sso_rsrc_fini(&dev->sso);
return rc;
 }
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index e22479a19..34a8bce05 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -28,12 +28,107 @@ cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
  RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
 }
 
+int
+cnxk_sso_xaq_allocate(struct cnxk_sso_evdev *dev)
+{
+   char pool_name[RTE_MEMZONE_NAMESIZE];
+   uint32_t xaq_cnt, npa_aura_id;
+   const struct rte_memzone *mz;
+   struct npa_aura_s *aura;
+   static int reconfig_cnt;
+   int rc;
+
+   if (dev->xaq_pool) {
+   rc = roc_sso_hwgrp_release_xaq(&dev->sso, dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to release XAQ %d", rc);
+   return rc;
+   }
+   rte_mempool_free(dev->xaq_pool);
+   dev->xaq_pool = NULL;
+   }
+
+   /*
+* Allocate memory for Add work backpressure.
+*/
+   mz = rte_memzone_lookup(CNXK_SSO_FC_NAME);
+   if (mz == NULL)
+   mz = rte_memzone_reserve_aligned(CNXK_SSO_FC_NAME,
+sizeof(struct npa_aura_s) +
+RTE_CACHE_LINE_SIZE,
+0, 0, RTE_CACHE_LINE_SIZE);
+   if (mz == NULL) {
+   plt_err("Failed to allocate mem for fcmem");
+   return -ENOMEM;
+   }
+
+   dev->fc_iova = mz->iova;
+   dev->fc_mem = mz->addr;
+
+   aura = (struct npa_aura_s *)((uintptr_t)dev->fc_mem +
+RTE_CACHE_LINE_SIZE);
+   memset(aura, 0, sizeof(struct npa_aura_s));
+
+   aura->fc_ena = 1;
+   aura->fc_addr = dev->fc_iova;
+   aura->fc_hyst_bits = 0; /* Store count on all updates */
+
+   /* Taken from HRM 14.3.3(4) */
+   xaq_cnt = dev->nb_event_queues * CNXK_SSO_XAQ_CACHE_CNT;
+   xaq_cnt += (dev->sso.iue / dev->sso.xae_waes) +
+  (CNXK_SSO_XAQ_SLACK * dev->nb_event_queues);
+
+   plt_sso_dbg("Configuring %d xaq buffers", xaq_cnt);
+   /* Setup XAQ based on number of nb queues. */
+   snprintf(pool_name, 30, "cnxk_xaq_buf_pool_%d", reconfig_cnt);
+   dev->xaq_pool = (void *)rte_mempool_create_empty(
+   pool_name, xaq_cnt, dev->sso.xaq_buf_size, 0, 0,
+   rte_socket_id(), 0);
+
+   if (dev->xaq_pool == NULL) {
+   plt_err("Unable to create empty mempool.");
+   rte_memzone_free(mz);
+   return -ENOMEM;
+   }
+
+   rc = rte_mempool_set_ops_byname(dev->xaq_pool,
+   rte_mbuf_platform_mempool_ops(), aura);
+   if (rc != 0) {
+   plt_err("Unable to set xaqpool ops.");
+   goto alloc_fail;
+   }
+
+   rc = rte_mempool_populate_default(dev->xaq_pool);
+   if (rc < 0) {
+   plt_err("Unable to set populate xaqpool.");
+   goto alloc_fail;
+   }
+   reconfig_cnt++;
+   /* When SW does addwork (enqueue) check if there is space in XAQ by
+* comparing fc_addr above against the xaq_lmt calculated below.
+* There should be a minimum headroom (CNXK_SSO_XAQ_SLACK / 2) for SSO
+* to request XAQ to cache them even before enqueue is called.
+*/
+   dev->xaq_lmt =
+   xaq_cnt - (CNXK_SSO_XAQ_SLACK / 2 * dev->nb_event_que

[dpdk-dev] [PATCH v4 09/34] event/cnxk: add devargs for inflight buffer count

[pbhagavatula]

From: Shijith Thotton 

The number of events for a *open system* event device is specified
as -1 as per the eventdev specification.
Since, SSO inflight events are only limited by DRAM size, the
xae_cnt devargs parameter is introduced to provide upper limit for
in-flight events.

Example:
--dev "0002:0e:00.0,xae_cnt=8192"

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 doc/guides/eventdevs/cnxk.rst   | 14 ++
 drivers/event/cnxk/cn10k_eventdev.c |  1 +
 drivers/event/cnxk/cn9k_eventdev.c  |  1 +
 drivers/event/cnxk/cnxk_eventdev.c  | 24 ++--
 drivers/event/cnxk/cnxk_eventdev.h  | 15 +++
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index 148280b85..b556681ff 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -41,6 +41,20 @@ Prerequisites and Compilation procedure
 
See :doc:`../platform/cnxk` for setup information.
 
+
+Runtime Config Options
+--
+
+- ``Maximum number of in-flight events`` (default ``8192``)
+
+  In **Marvell OCTEON cnxk** the max number of in-flight events are only 
limited
+  by DRAM size, the ``xae_cnt`` devargs parameter is introduced to provide
+  upper limit for in-flight events.
+
+  For example::
+
+-a 0002:0e:00.0,xae_cnt=16384
+
 Debugging Options
 -
 
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 9c5ddea76..020905290 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -143,3 +143,4 @@ static struct rte_pci_driver cn10k_pci_sso = {
 RTE_PMD_REGISTER_PCI(event_cn10k, cn10k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "=");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 954fea01f..50f6fef01 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -146,3 +146,4 @@ static struct rte_pci_driver cn9k_pci_sso = {
 RTE_PMD_REGISTER_PCI(event_cn9k, cn9k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn9k, cn9k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=");
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 34a8bce05..fddd71a8d 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -75,8 +75,11 @@ cnxk_sso_xaq_allocate(struct cnxk_sso_evdev *dev)
 
/* Taken from HRM 14.3.3(4) */
xaq_cnt = dev->nb_event_queues * CNXK_SSO_XAQ_CACHE_CNT;
-   xaq_cnt += (dev->sso.iue / dev->sso.xae_waes) +
-  (CNXK_SSO_XAQ_SLACK * dev->nb_event_queues);
+   if (dev->xae_cnt)
+   xaq_cnt += dev->xae_cnt / dev->sso.xae_waes;
+   else
+   xaq_cnt += (dev->sso.iue / dev->sso.xae_waes) +
+  (CNXK_SSO_XAQ_SLACK * dev->nb_event_queues);
 
plt_sso_dbg("Configuring %d xaq buffers", xaq_cnt);
/* Setup XAQ based on number of nb queues. */
@@ -222,6 +225,22 @@ cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, 
uint8_t port_id,
port_conf->enqueue_depth = 1;
 }
 
+static void
+cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
+{
+   struct rte_kvargs *kvlist;
+
+   if (devargs == NULL)
+   return;
+   kvlist = rte_kvargs_parse(devargs->args, NULL);
+   if (kvlist == NULL)
+   return;
+
+   rte_kvargs_process(kvlist, CNXK_SSO_XAE_CNT, &parse_kvargs_value,
+  &dev->xae_cnt);
+   rte_kvargs_free(kvlist);
+}
+
 int
 cnxk_sso_init(struct rte_eventdev *event_dev)
 {
@@ -242,6 +261,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev)
dev->sso.pci_dev = pci_dev;
 
*(uint64_t *)mz->addr = (uint64_t)dev;
+   cnxk_sso_parse_devargs(dev, pci_dev->device.devargs);
 
/* Initialize the base cnxk_dev object */
rc = roc_sso_dev_init(&dev->sso);
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 4abe4548d..202c6e6a7 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -5,6 +5,8 @@
 #ifndef __CNXK_EVENTDEV_H__
 #define __CNXK_EVENTDEV_H__
 
+#include 
+#include 
 #include 
 #include 
 
@@ -12,6 +14,8 @@
 
 #include "roc_api.h"
 
+#define CNXK_SSO_XAE_CNT "xae_cnt"
+
 #define USEC2NSEC(__us) ((__us)*1E3)
 
 #define CNXK_SSO_FC_NAME   "cnxk_evdev_xaq_fc"
@@ -35,10 +39,21 @@ struct cnxk_sso_evdev {
uint64_t nb_xaq_cfg;
rte_iova_t fc_iova;
struct rte_mempool *xaq_pool;
+   /* Dev args */
+   uint32_t xae_cnt;
/* CN9K */
uint8_t dual_ws;
 } __rte_cache_aligned;
 
+static inline

[dpdk-dev] [PATCH v4 10/34] event/cnxk: add devargs to control SSO HWGRP QoS

[pbhagavatula]

From: Shijith Thotton 

SSO HWGRPs i.e. queue uses DRAM & SRAM buffers to hold in-flight
events. By default the buffers are assigned to the SSO HWGRPs to
satisfy minimum HW requirements. SSO is free to assign the remaining
buffers to HWGRPs based on a preconfigured threshold.
We can control the QoS of SSO HWGRP by modifying the above mentioned
thresholds. HWGRPs that have higher importance can be assigned higher
thresholds than the rest.

Example:
--dev "0002:0e:00.0,qos=[1-50-50-50]" // [Qx-XAQ-TAQ-IAQ]

Qx  -> Event queue Aka SSO GGRP.
XAQ -> DRAM In-flights.
TAQ & IAQ -> SRAM In-flights.

The values need to be expressed in terms of percentages, 0 represents
default.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst   | 16 ++
 drivers/event/cnxk/cn10k_eventdev.c |  3 +-
 drivers/event/cnxk/cn9k_eventdev.c  |  3 +-
 drivers/event/cnxk/cnxk_eventdev.c  | 78 +
 drivers/event/cnxk/cnxk_eventdev.h  | 12 -
 5 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index b556681ff..0583e5fdd 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -55,6 +55,22 @@ Runtime Config Options
 
 -a 0002:0e:00.0,xae_cnt=16384
 
+- ``Event Group QoS support``
+
+  SSO GGRPs i.e. queue uses DRAM & SRAM buffers to hold in-flight
+  events. By default the buffers are assigned to the SSO GGRPs to
+  satisfy minimum HW requirements. SSO is free to assign the remaining
+  buffers to GGRPs based on a preconfigured threshold.
+  We can control the QoS of SSO GGRP by modifying the above mentioned
+  thresholds. GGRPs that have higher importance can be assigned higher
+  thresholds than the rest. The dictionary format is as follows
+  [Qx-XAQ-TAQ-IAQ][Qz-XAQ-TAQ-IAQ] expressed in percentages, 0 represents
+  default.
+
+  For example::
+
+-a 0002:0e:00.0,qos=[1-50-50-50]
+
 Debugging Options
 -
 
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 020905290..0b39c6c09 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -143,4 +143,5 @@ static struct rte_pci_driver cn10k_pci_sso = {
 RTE_PMD_REGISTER_PCI(event_cn10k, cn10k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "=");
+RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "="
+ CNXK_SSO_GGRP_QOS "=");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 50f6fef01..ab165c850 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -146,4 +146,5 @@ static struct rte_pci_driver cn9k_pci_sso = {
 RTE_PMD_REGISTER_PCI(event_cn9k, cn9k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn9k, cn9k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=");
+RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "="
+ CNXK_SSO_GGRP_QOS "=");
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index fddd71a8d..e93aaccd8 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -225,6 +225,82 @@ cnxk_sso_port_def_conf(struct rte_eventdev *event_dev, 
uint8_t port_id,
port_conf->enqueue_depth = 1;
 }
 
+static void
+parse_queue_param(char *value, void *opaque)
+{
+   struct cnxk_sso_qos queue_qos = {0};
+   uint8_t *val = (uint8_t *)&queue_qos;
+   struct cnxk_sso_evdev *dev = opaque;
+   char *tok = strtok(value, "-");
+   struct cnxk_sso_qos *old_ptr;
+
+   if (!strlen(value))
+   return;
+
+   while (tok != NULL) {
+   *val = atoi(tok);
+   tok = strtok(NULL, "-");
+   val++;
+   }
+
+   if (val != (&queue_qos.iaq_prcnt + 1)) {
+   plt_err("Invalid QoS parameter expected [Qx-XAQ-TAQ-IAQ]");
+   return;
+   }
+
+   dev->qos_queue_cnt++;
+   old_ptr = dev->qos_parse_data;
+   dev->qos_parse_data = rte_realloc(
+   dev->qos_parse_data,
+   sizeof(struct cnxk_sso_qos) * dev->qos_queue_cnt, 0);
+   if (dev->qos_parse_data == NULL) {
+   dev->qos_parse_data = old_ptr;
+   dev->qos_queue_cnt--;
+   return;
+   }
+   dev->qos_parse_data[dev->qos_queue_cnt - 1] = queue_qos;
+}
+
+static void
+parse_qos_list(const char *value, void *opaque)
+{
+   char *s = strdup(value);
+   char *start = NULL;
+   char *end = NULL;
+   char *f = s;
+
+   while (*s) {
+   if (*s == '[')
+   start = s;
+   else if (*s == ']')
+ 

[dpdk-dev] [PATCH v4 11/34] event/cnxk: add port config functions

[pbhagavatula]

From: Shijith Thotton 

Add SSO HWS a.k.a event port setup and release functions.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c | 121 +++
 drivers/event/cnxk/cn9k_eventdev.c  | 147 
 drivers/event/cnxk/cnxk_eventdev.c  |  65 
 drivers/event/cnxk/cnxk_eventdev.h  |  91 +
 4 files changed, 424 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 0b39c6c09..fcdc1cf84 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -4,6 +4,91 @@
 
 #include "cnxk_eventdev.h"
 
+static void
+cn10k_init_hws_ops(struct cn10k_sso_hws *ws, uintptr_t base)
+{
+   ws->tag_wqe_op = base + SSOW_LF_GWS_WQE0;
+   ws->getwrk_op = base + SSOW_LF_GWS_OP_GET_WORK0;
+   ws->updt_wqe_op = base + SSOW_LF_GWS_OP_UPD_WQP_GRP1;
+   ws->swtag_norm_op = base + SSOW_LF_GWS_OP_SWTAG_NORM;
+   ws->swtag_untag_op = base + SSOW_LF_GWS_OP_SWTAG_UNTAG;
+   ws->swtag_flush_op = base + SSOW_LF_GWS_OP_SWTAG_FLUSH;
+   ws->swtag_desched_op = base + SSOW_LF_GWS_OP_SWTAG_DESCHED;
+}
+
+static uint32_t
+cn10k_sso_gw_mode_wdata(struct cnxk_sso_evdev *dev)
+{
+   uint32_t wdata = BIT(16) | 1;
+
+   switch (dev->gw_mode) {
+   case CN10K_GW_MODE_NONE:
+   default:
+   break;
+   case CN10K_GW_MODE_PREF:
+   wdata |= BIT(19);
+   break;
+   case CN10K_GW_MODE_PREF_WFE:
+   wdata |= BIT(20) | BIT(19);
+   break;
+   }
+
+   return wdata;
+}
+
+static void *
+cn10k_sso_init_hws_mem(void *arg, uint8_t port_id)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn10k_sso_hws *ws;
+
+   /* Allocate event port memory */
+   ws = rte_zmalloc("cn10k_ws",
+sizeof(struct cn10k_sso_hws) + RTE_CACHE_LINE_SIZE,
+RTE_CACHE_LINE_SIZE);
+   if (ws == NULL) {
+   plt_err("Failed to alloc memory for port=%d", port_id);
+   return NULL;
+   }
+
+   /* First cache line is reserved for cookie */
+   ws = (struct cn10k_sso_hws *)((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
+   ws->base = roc_sso_hws_base_get(&dev->sso, port_id);
+   cn10k_init_hws_ops(ws, ws->base);
+   ws->hws_id = port_id;
+   ws->swtag_req = 0;
+   ws->gw_wdata = cn10k_sso_gw_mode_wdata(dev);
+   ws->lmt_base = dev->sso.lmt_base;
+
+   return ws;
+}
+
+static void
+cn10k_sso_hws_setup(void *arg, void *hws, uintptr_t *grps_base)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn10k_sso_hws *ws = hws;
+   uint64_t val;
+
+   rte_memcpy(ws->grps_base, grps_base,
+  sizeof(uintptr_t) * CNXK_SSO_MAX_HWGRP);
+   ws->fc_mem = dev->fc_mem;
+   ws->xaq_lmt = dev->xaq_lmt;
+
+   /* Set get_work timeout for HWS */
+   val = NSEC2USEC(dev->deq_tmo_ns) - 1;
+   plt_write64(val, ws->base + SSOW_LF_GWS_NW_TIM);
+}
+
+static void
+cn10k_sso_hws_release(void *arg, void *hws)
+{
+   struct cn10k_sso_hws *ws = hws;
+
+   RTE_SET_USED(arg);
+   memset(ws, 0, sizeof(*ws));
+}
+
 static void
 cn10k_sso_set_rsrc(void *arg)
 {
@@ -59,12 +144,46 @@ cn10k_sso_dev_configure(const struct rte_eventdev 
*event_dev)
if (rc < 0)
goto cnxk_rsrc_fini;
 
+   rc = cnxk_setup_event_ports(event_dev, cn10k_sso_init_hws_mem,
+   cn10k_sso_hws_setup);
+   if (rc < 0)
+   goto cnxk_rsrc_fini;
+
return 0;
 cnxk_rsrc_fini:
roc_sso_rsrc_fini(&dev->sso);
+   dev->nb_event_ports = 0;
return rc;
 }
 
+static int
+cn10k_sso_port_setup(struct rte_eventdev *event_dev, uint8_t port_id,
+const struct rte_event_port_conf *port_conf)
+{
+
+   RTE_SET_USED(port_conf);
+   return cnxk_sso_port_setup(event_dev, port_id, cn10k_sso_hws_setup);
+}
+
+static void
+cn10k_sso_port_release(void *port)
+{
+   struct cnxk_sso_hws_cookie *gws_cookie = cnxk_sso_hws_get_cookie(port);
+   struct cnxk_sso_evdev *dev;
+
+   if (port == NULL)
+   return;
+
+   dev = cnxk_sso_pmd_priv(gws_cookie->event_dev);
+   if (!gws_cookie->configured)
+   goto free;
+
+   cn10k_sso_hws_release(dev, port);
+   memset(gws_cookie, 0, sizeof(*gws_cookie));
+free:
+   rte_free(gws_cookie);
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
@@ -72,6 +191,8 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.queue_setup = cnxk_sso_queue_setup,
.queue_release = cnxk_sso_queue_release,
.port_def_conf = cnxk_sso_port_def_conf,
+   .port_setup = cn10k_sso_port_setup,
+   .port_release = cn10k_sso_port_release,
 };
 
 static int
diff --git a/drivers/e

[dpdk-dev] [PATCH v4 12/34] event/cnxk: add event port link and unlink

[pbhagavatula]

From: Shijith Thotton 

Add platform specific event port, queue link and unlink APIs.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c |  64 +-
 drivers/event/cnxk/cn9k_eventdev.c  | 101 
 drivers/event/cnxk/cnxk_eventdev.c  |  36 ++
 drivers/event/cnxk/cnxk_eventdev.h  |  12 +++-
 4 files changed, 210 insertions(+), 3 deletions(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index fcdc1cf84..db8fe8169 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -63,6 +63,24 @@ cn10k_sso_init_hws_mem(void *arg, uint8_t port_id)
return ws;
 }
 
+static int
+cn10k_sso_hws_link(void *arg, void *port, uint16_t *map, uint16_t nb_link)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn10k_sso_hws *ws = port;
+
+   return roc_sso_hws_link(&dev->sso, ws->hws_id, map, nb_link);
+}
+
+static int
+cn10k_sso_hws_unlink(void *arg, void *port, uint16_t *map, uint16_t nb_link)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn10k_sso_hws *ws = port;
+
+   return roc_sso_hws_unlink(&dev->sso, ws->hws_id, map, nb_link);
+}
+
 static void
 cn10k_sso_hws_setup(void *arg, void *hws, uintptr_t *grps_base)
 {
@@ -83,9 +101,12 @@ cn10k_sso_hws_setup(void *arg, void *hws, uintptr_t 
*grps_base)
 static void
 cn10k_sso_hws_release(void *arg, void *hws)
 {
+   struct cnxk_sso_evdev *dev = arg;
struct cn10k_sso_hws *ws = hws;
+   int i;
 
-   RTE_SET_USED(arg);
+   for (i = 0; i < dev->nb_event_queues; i++)
+   roc_sso_hws_unlink(&dev->sso, ws->hws_id, (uint16_t *)&i, 1);
memset(ws, 0, sizeof(*ws));
 }
 
@@ -149,6 +170,12 @@ cn10k_sso_dev_configure(const struct rte_eventdev 
*event_dev)
if (rc < 0)
goto cnxk_rsrc_fini;
 
+   /* Restore any prior port-queue mapping. */
+   cnxk_sso_restore_links(event_dev, cn10k_sso_hws_link);
+
+   dev->configured = 1;
+   rte_mb();
+
return 0;
 cnxk_rsrc_fini:
roc_sso_rsrc_fini(&dev->sso);
@@ -184,6 +211,38 @@ cn10k_sso_port_release(void *port)
rte_free(gws_cookie);
 }
 
+static int
+cn10k_sso_port_link(struct rte_eventdev *event_dev, void *port,
+   const uint8_t queues[], const uint8_t priorities[],
+   uint16_t nb_links)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   uint16_t hwgrp_ids[nb_links];
+   uint16_t link;
+
+   RTE_SET_USED(priorities);
+   for (link = 0; link < nb_links; link++)
+   hwgrp_ids[link] = queues[link];
+   nb_links = cn10k_sso_hws_link(dev, port, hwgrp_ids, nb_links);
+
+   return (int)nb_links;
+}
+
+static int
+cn10k_sso_port_unlink(struct rte_eventdev *event_dev, void *port,
+ uint8_t queues[], uint16_t nb_unlinks)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   uint16_t hwgrp_ids[nb_unlinks];
+   uint16_t unlink;
+
+   for (unlink = 0; unlink < nb_unlinks; unlink++)
+   hwgrp_ids[unlink] = queues[unlink];
+   nb_unlinks = cn10k_sso_hws_unlink(dev, port, hwgrp_ids, nb_unlinks);
+
+   return (int)nb_unlinks;
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
@@ -193,6 +252,9 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.port_def_conf = cnxk_sso_port_def_conf,
.port_setup = cn10k_sso_port_setup,
.port_release = cn10k_sso_port_release,
+   .port_link = cn10k_sso_port_link,
+   .port_unlink = cn10k_sso_port_unlink,
+   .timeout_ticks = cnxk_sso_timeout_ticks,
 };
 
 static int
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index b8c74633b..a0d76335f 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -18,6 +18,54 @@ cn9k_init_hws_ops(struct cn9k_sso_hws_state *ws, uintptr_t 
base)
ws->swtag_desched_op = base + SSOW_LF_GWS_OP_SWTAG_DESCHED;
 }
 
+static int
+cn9k_sso_hws_link(void *arg, void *port, uint16_t *map, uint16_t nb_link)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn9k_sso_hws_dual *dws;
+   struct cn9k_sso_hws *ws;
+   int rc;
+
+   if (dev->dual_ws) {
+   dws = port;
+   rc = roc_sso_hws_link(&dev->sso,
+ CN9K_DUAL_WS_PAIR_ID(dws->hws_id, 0), map,
+ nb_link);
+   rc |= roc_sso_hws_link(&dev->sso,
+  CN9K_DUAL_WS_PAIR_ID(dws->hws_id, 1),
+  map, nb_link);
+   } else {
+   ws = port;
+   rc = roc_sso_hws_link(&dev->sso, ws->hws_id, map, nb_link);
+   }
+
+   return rc;
+}
+
+static int
+cn9k_sso_

[dpdk-dev] [PATCH v4 13/34] event/cnxk: add devargs to configure getwork mode

[pbhagavatula]

From: Pavan Nikhilesh 

Add devargs to configure the platform specific getwork mode.

CN9K getwork mode by default is set to use dual workslot mode.
Add option to force single workslot mode.
Example:
--dev "0002:0e:00.0,single_ws=1"

CN10K supports multiple getwork prefetch modes, by default the
prefetch mode is set to none.
Add option to select getwork prefetch mode
Example:
--dev "0002:1e:00.0,gw_mode=1"

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst   | 18 ++
 drivers/event/cnxk/cn10k_eventdev.c |  3 ++-
 drivers/event/cnxk/cn9k_eventdev.c  |  3 ++-
 drivers/event/cnxk/cnxk_eventdev.c  |  6 ++
 drivers/event/cnxk/cnxk_eventdev.h  |  6 --
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index 0583e5fdd..f48452982 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -55,6 +55,24 @@ Runtime Config Options
 
 -a 0002:0e:00.0,xae_cnt=16384
 
+- ``CN9K Getwork mode``
+
+  CN9K ``single_ws`` devargs parameter is introduced to select single workslot
+  mode in SSO and disable the default dual workslot mode.
+
+  For example::
+
+-a 0002:0e:00.0,single_ws=1
+
+- ``CN10K Getwork mode``
+
+  CN10K supports multiple getwork prefetch modes, by default the prefetch
+  mode is set to none.
+
+  For example::
+
+-a 0002:0e:00.0,gw_mode=1
+
 - ``Event Group QoS support``
 
   SSO GGRPs i.e. queue uses DRAM & SRAM buffers to hold in-flight
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index db8fe8169..6522351ca 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -327,4 +327,5 @@ RTE_PMD_REGISTER_PCI(event_cn10k, cn10k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "="
- CNXK_SSO_GGRP_QOS "=");
+ CNXK_SSO_GGRP_QOS "="
+ CN10K_SSO_GW_MODE "=");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index a0d76335f..00c5565e7 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -395,4 +395,5 @@ RTE_PMD_REGISTER_PCI(event_cn9k, cn9k_pci_sso);
 RTE_PMD_REGISTER_PCI_TABLE(event_cn9k, cn9k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "="
- CNXK_SSO_GGRP_QOS "=");
+ CNXK_SSO_GGRP_QOS "="
+ CN9K_SSO_SINGLE_WS "=1");
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index e68079997..2a387ff95 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -406,6 +406,7 @@ static void
 cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
 {
struct rte_kvargs *kvlist;
+   uint8_t single_ws = 0;
 
if (devargs == NULL)
return;
@@ -417,6 +418,11 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct 
rte_devargs *devargs)
   &dev->xae_cnt);
rte_kvargs_process(kvlist, CNXK_SSO_GGRP_QOS, &parse_sso_kvargs_dict,
   dev);
+   rte_kvargs_process(kvlist, CN9K_SSO_SINGLE_WS, &parse_kvargs_value,
+  &single_ws);
+   rte_kvargs_process(kvlist, CN10K_SSO_GW_MODE, &parse_kvargs_value,
+  &dev->gw_mode);
+   dev->dual_ws = !single_ws;
rte_kvargs_free(kvlist);
 }
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 97a944d88..437cdf3db 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -14,8 +14,10 @@
 
 #include "roc_api.h"
 
-#define CNXK_SSO_XAE_CNT  "xae_cnt"
-#define CNXK_SSO_GGRP_QOS "qos"
+#define CNXK_SSO_XAE_CNT   "xae_cnt"
+#define CNXK_SSO_GGRP_QOS  "qos"
+#define CN9K_SSO_SINGLE_WS "single_ws"
+#define CN10K_SSO_GW_MODE  "gw_mode"
 
 #define NSEC2USEC(__ns)((__ns) / 1E3)
 #define USEC2NSEC(__us)((__us)*1E3)
-- 
2.17.1

[dpdk-dev] [PATCH v4 14/34] event/cnxk: add SSO HW device operations

[pbhagavatula]

From: Pavan Nikhilesh 

Add SSO HW device operations used for enqueue/dequeue.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_worker.c  |   7 +
 drivers/event/cnxk/cn10k_worker.h  | 151 +
 drivers/event/cnxk/cn9k_worker.c   |   7 +
 drivers/event/cnxk/cn9k_worker.h   | 249 +
 drivers/event/cnxk/cnxk_eventdev.h |  10 ++
 drivers/event/cnxk/cnxk_worker.h   | 101 
 drivers/event/cnxk/meson.build |   4 +-
 7 files changed, 528 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/cnxk/cn10k_worker.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.h
 create mode 100644 drivers/event/cnxk/cn9k_worker.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_worker.h

diff --git a/drivers/event/cnxk/cn10k_worker.c 
b/drivers/event/cnxk/cn10k_worker.c
new file mode 100644
index 0..63b587301
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_worker.c
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cn10k_worker.h"
+#include "cnxk_eventdev.h"
+#include "cnxk_worker.h"
diff --git a/drivers/event/cnxk/cn10k_worker.h 
b/drivers/event/cnxk/cn10k_worker.h
new file mode 100644
index 0..04517055d
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -0,0 +1,151 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef __CN10K_WORKER_H__
+#define __CN10K_WORKER_H__
+
+#include "cnxk_eventdev.h"
+#include "cnxk_worker.h"
+
+/* SSO Operations */
+
+static __rte_always_inline uint8_t
+cn10k_sso_hws_new_event(struct cn10k_sso_hws *ws, const struct rte_event *ev)
+{
+   const uint32_t tag = (uint32_t)ev->event;
+   const uint8_t new_tt = ev->sched_type;
+   const uint64_t event_ptr = ev->u64;
+   const uint16_t grp = ev->queue_id;
+
+   rte_atomic_thread_fence(__ATOMIC_ACQ_REL);
+   if (ws->xaq_lmt <= *ws->fc_mem)
+   return 0;
+
+   cnxk_sso_hws_add_work(event_ptr, tag, new_tt, ws->grps_base[grp]);
+   return 1;
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const struct rte_event *ev)
+{
+   const uint32_t tag = (uint32_t)ev->event;
+   const uint8_t new_tt = ev->sched_type;
+   const uint8_t cur_tt = CNXK_TT_FROM_TAG(plt_read64(ws->tag_wqe_op));
+
+   /* CNXK model
+* cur_tt/new_tt SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED
+*
+* SSO_TT_ORDEREDnorm   norm untag
+* SSO_TT_ATOMIC norm   norm   untag
+* SSO_TT_UNTAGGED   norm   norm NOOP
+*/
+
+   if (new_tt == SSO_TT_UNTAGGED) {
+   if (cur_tt != SSO_TT_UNTAGGED)
+   cnxk_sso_hws_swtag_untag(ws->swtag_untag_op);
+   } else {
+   cnxk_sso_hws_swtag_norm(tag, new_tt, ws->swtag_norm_op);
+   }
+   ws->swtag_req = 1;
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_fwd_group(struct cn10k_sso_hws *ws, const struct rte_event *ev,
+   const uint16_t grp)
+{
+   const uint32_t tag = (uint32_t)ev->event;
+   const uint8_t new_tt = ev->sched_type;
+
+   plt_write64(ev->u64, ws->updt_wqe_op);
+   cnxk_sso_hws_swtag_desched(tag, new_tt, grp, ws->swtag_desched_op);
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws,
+   const struct rte_event *ev)
+{
+   const uint8_t grp = ev->queue_id;
+
+   /* Group hasn't changed, Use SWTAG to forward the event */
+   if (CNXK_GRP_FROM_TAG(plt_read64(ws->tag_wqe_op)) == grp)
+   cn10k_sso_hws_fwd_swtag(ws, ev);
+   else
+   /*
+* Group has been changed for group based work pipelining,
+* Use deschedule/add_work operation to transfer the event to
+* new group/core
+*/
+   cn10k_sso_hws_fwd_group(ws, ev, grp);
+}
+
+static __rte_always_inline uint16_t
+cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct rte_event *ev)
+{
+   union {
+   __uint128_t get_work;
+   uint64_t u64[2];
+   } gw;
+
+   gw.get_work = ws->gw_wdata;
+#if defined(RTE_ARCH_ARM64) && !defined(__clang__)
+   asm volatile(
+   PLT_CPU_FEATURE_PREAMBLE
+   "caspl %[wdata], %H[wdata], %[wdata], %H[wdata], [%[gw_loc]]\n"
+   : [wdata] "+r"(gw.get_work)
+   : [gw_loc] "r"(ws->getwrk_op)
+   : "memory");
+#else
+   plt_write64(gw.u64[0], ws->getwrk_op);
+   do {
+   roc_load_pair(gw.u64[0], gw.u64[1], ws->tag_wqe_op);
+   } while (gw.u64[0] & BIT_ULL(63));
+#endif
+   gw.u64[0] = (gw.u64[0] & (0x3ull << 32)) << 6 |
+   (gw.u64[0] & (0x3FFull << 36)) << 4 |
+   (gw.u64[0] & 0x);
+
+ 

[dpdk-dev] [PATCH v4 15/34] event/cnxk: add SSO GWS fastpath enqueue functions

[pbhagavatula]

From: Pavan Nikhilesh 

Add SSO GWS fastpath event device enqueue functions.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c |  16 +++-
 drivers/event/cnxk/cn10k_worker.c   |  54 ++
 drivers/event/cnxk/cn10k_worker.h   |  12 +++
 drivers/event/cnxk/cn9k_eventdev.c  |  25 ++-
 drivers/event/cnxk/cn9k_worker.c| 112 
 drivers/event/cnxk/cn9k_worker.h|  24 ++
 6 files changed, 241 insertions(+), 2 deletions(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 6522351ca..a1b44744b 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -2,7 +2,9 @@
  * Copyright(C) 2021 Marvell.
  */
 
+#include "cn10k_worker.h"
 #include "cnxk_eventdev.h"
+#include "cnxk_worker.h"
 
 static void
 cn10k_init_hws_ops(struct cn10k_sso_hws *ws, uintptr_t base)
@@ -130,6 +132,16 @@ cn10k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
 }
 
+static void
+cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
+{
+   PLT_SET_USED(event_dev);
+   event_dev->enqueue = cn10k_sso_hws_enq;
+   event_dev->enqueue_burst = cn10k_sso_hws_enq_burst;
+   event_dev->enqueue_new_burst = cn10k_sso_hws_enq_new_burst;
+   event_dev->enqueue_forward_burst = cn10k_sso_hws_enq_fwd_burst;
+}
+
 static void
 cn10k_sso_info_get(struct rte_eventdev *event_dev,
   struct rte_event_dev_info *dev_info)
@@ -276,8 +288,10 @@ cn10k_sso_init(struct rte_eventdev *event_dev)
 
event_dev->dev_ops = &cn10k_sso_dev_ops;
/* For secondary processes, the primary has done all the work */
-   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+   cn10k_sso_fp_fns_set(event_dev);
return 0;
+   }
 
rc = cnxk_sso_init(event_dev);
if (rc < 0)
diff --git a/drivers/event/cnxk/cn10k_worker.c 
b/drivers/event/cnxk/cn10k_worker.c
index 63b587301..9b5cb7be6 100644
--- a/drivers/event/cnxk/cn10k_worker.c
+++ b/drivers/event/cnxk/cn10k_worker.c
@@ -5,3 +5,57 @@
 #include "cn10k_worker.h"
 #include "cnxk_eventdev.h"
 #include "cnxk_worker.h"
+
+uint16_t __rte_hot
+cn10k_sso_hws_enq(void *port, const struct rte_event *ev)
+{
+   struct cn10k_sso_hws *ws = port;
+
+   switch (ev->op) {
+   case RTE_EVENT_OP_NEW:
+   return cn10k_sso_hws_new_event(ws, ev);
+   case RTE_EVENT_OP_FORWARD:
+   cn10k_sso_hws_forward_event(ws, ev);
+   break;
+   case RTE_EVENT_OP_RELEASE:
+   cnxk_sso_hws_swtag_flush(ws->tag_wqe_op, ws->swtag_flush_op);
+   break;
+   default:
+   return 0;
+   }
+
+   return 1;
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_enq_burst(void *port, const struct rte_event ev[],
+   uint16_t nb_events)
+{
+   RTE_SET_USED(nb_events);
+   return cn10k_sso_hws_enq(port, ev);
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_enq_new_burst(void *port, const struct rte_event ev[],
+   uint16_t nb_events)
+{
+   struct cn10k_sso_hws *ws = port;
+   uint16_t i, rc = 1;
+
+   for (i = 0; i < nb_events && rc; i++)
+   rc = cn10k_sso_hws_new_event(ws, &ev[i]);
+
+   return nb_events;
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_enq_fwd_burst(void *port, const struct rte_event ev[],
+   uint16_t nb_events)
+{
+   struct cn10k_sso_hws *ws = port;
+
+   RTE_SET_USED(nb_events);
+   cn10k_sso_hws_forward_event(ws, ev);
+
+   return 1;
+}
diff --git a/drivers/event/cnxk/cn10k_worker.h 
b/drivers/event/cnxk/cn10k_worker.h
index 04517055d..48158b320 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -148,4 +148,16 @@ cn10k_sso_hws_get_work_empty(struct cn10k_sso_hws *ws, 
struct rte_event *ev)
return !!gw.u64[1];
 }
 
+/* CN10K Fastpath functions. */
+uint16_t __rte_hot cn10k_sso_hws_enq(void *port, const struct rte_event *ev);
+uint16_t __rte_hot cn10k_sso_hws_enq_burst(void *port,
+  const struct rte_event ev[],
+  uint16_t nb_events);
+uint16_t __rte_hot cn10k_sso_hws_enq_new_burst(void *port,
+  const struct rte_event ev[],
+  uint16_t nb_events);
+uint16_t __rte_hot cn10k_sso_hws_enq_fwd_burst(void *port,
+  const struct rte_event ev[],
+  uint16_t nb_events);
+
 #endif
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 00c5565e7..61a4d0823 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -2,7 +2,9 @@
  * Copyright(C) 2021 Marvell.
  */
 

[dpdk-dev] [PATCH v4 16/34] event/cnxk: add SSO GWS dequeue fastpath functions

[pbhagavatula]

From: Pavan Nikhilesh 

Add SSO GWS event dequeue fastpath functions.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c |  10 ++-
 drivers/event/cnxk/cn10k_worker.c   |  54 +
 drivers/event/cnxk/cn10k_worker.h   |  12 +++
 drivers/event/cnxk/cn9k_eventdev.c  |  15 
 drivers/event/cnxk/cn9k_worker.c| 117 
 drivers/event/cnxk/cn9k_worker.h|  24 ++
 6 files changed, 231 insertions(+), 1 deletion(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index a1b44744b..37a7c8a8e 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -135,11 +135,19 @@ cn10k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
 static void
 cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 {
-   PLT_SET_USED(event_dev);
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
event_dev->enqueue = cn10k_sso_hws_enq;
event_dev->enqueue_burst = cn10k_sso_hws_enq_burst;
event_dev->enqueue_new_burst = cn10k_sso_hws_enq_new_burst;
event_dev->enqueue_forward_burst = cn10k_sso_hws_enq_fwd_burst;
+
+   event_dev->dequeue = cn10k_sso_hws_deq;
+   event_dev->dequeue_burst = cn10k_sso_hws_deq_burst;
+   if (dev->is_timeout_deq) {
+   event_dev->dequeue = cn10k_sso_hws_tmo_deq;
+   event_dev->dequeue_burst = cn10k_sso_hws_tmo_deq_burst;
+   }
 }
 
 static void
diff --git a/drivers/event/cnxk/cn10k_worker.c 
b/drivers/event/cnxk/cn10k_worker.c
index 9b5cb7be6..e2aa534c6 100644
--- a/drivers/event/cnxk/cn10k_worker.c
+++ b/drivers/event/cnxk/cn10k_worker.c
@@ -59,3 +59,57 @@ cn10k_sso_hws_enq_fwd_burst(void *port, const struct 
rte_event ev[],
 
return 1;
 }
+
+uint16_t __rte_hot
+cn10k_sso_hws_deq(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+{
+   struct cn10k_sso_hws *ws = port;
+
+   RTE_SET_USED(timeout_ticks);
+
+   if (ws->swtag_req) {
+   ws->swtag_req = 0;
+   cnxk_sso_hws_swtag_wait(ws->tag_wqe_op);
+   return 1;
+   }
+
+   return cn10k_sso_hws_get_work(ws, ev);
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_deq_burst(void *port, struct rte_event ev[], uint16_t nb_events,
+   uint64_t timeout_ticks)
+{
+   RTE_SET_USED(nb_events);
+
+   return cn10k_sso_hws_deq(port, ev, timeout_ticks);
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_tmo_deq(void *port, struct rte_event *ev, uint64_t timeout_ticks)
+{
+   struct cn10k_sso_hws *ws = port;
+   uint16_t ret = 1;
+   uint64_t iter;
+
+   if (ws->swtag_req) {
+   ws->swtag_req = 0;
+   cnxk_sso_hws_swtag_wait(ws->tag_wqe_op);
+   return ret;
+   }
+
+   ret = cn10k_sso_hws_get_work(ws, ev);
+   for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)
+   ret = cn10k_sso_hws_get_work(ws, ev);
+
+   return ret;
+}
+
+uint16_t __rte_hot
+cn10k_sso_hws_tmo_deq_burst(void *port, struct rte_event ev[],
+   uint16_t nb_events, uint64_t timeout_ticks)
+{
+   RTE_SET_USED(nb_events);
+
+   return cn10k_sso_hws_tmo_deq(port, ev, timeout_ticks);
+}
diff --git a/drivers/event/cnxk/cn10k_worker.h 
b/drivers/event/cnxk/cn10k_worker.h
index 48158b320..2f093a8dd 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -160,4 +160,16 @@ uint16_t __rte_hot cn10k_sso_hws_enq_fwd_burst(void *port,
   const struct rte_event ev[],
   uint16_t nb_events);
 
+uint16_t __rte_hot cn10k_sso_hws_deq(void *port, struct rte_event *ev,
+uint64_t timeout_ticks);
+uint16_t __rte_hot cn10k_sso_hws_deq_burst(void *port, struct rte_event ev[],
+  uint16_t nb_events,
+  uint64_t timeout_ticks);
+uint16_t __rte_hot cn10k_sso_hws_tmo_deq(void *port, struct rte_event *ev,
+uint64_t timeout_ticks);
+uint16_t __rte_hot cn10k_sso_hws_tmo_deq_burst(void *port,
+  struct rte_event ev[],
+  uint16_t nb_events,
+  uint64_t timeout_ticks);
+
 #endif
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 61a4d0823..6ba3d1466 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -162,12 +162,27 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
event_dev->enqueue_new_burst = cn9k_sso_hws_enq_new_burst;
event_dev->enqueue_forward_burst = cn9k_sso_hws_enq_fwd_burst;
 
+   event_dev->dequeue = cn9k_sso_hws_deq;
+   event_dev->dequeue_burst = cn9k_sso_hws_deq_burst;
+   if (dev->deq_tmo_ns) {

[dpdk-dev] [PATCH v4 17/34] event/cnxk: add device start function

[pbhagavatula]

From: Shijith Thotton 

Add eventdev start function along with few cleanup API's to maintain
sanity.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cn10k_eventdev.c | 127 
 drivers/event/cnxk/cn9k_eventdev.c  | 113 +
 drivers/event/cnxk/cnxk_eventdev.c  |  64 ++
 drivers/event/cnxk/cnxk_eventdev.h  |   7 ++
 4 files changed, 311 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 37a7c8a8e..8d6b1e48a 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -112,6 +112,117 @@ cn10k_sso_hws_release(void *arg, void *hws)
memset(ws, 0, sizeof(*ws));
 }
 
+static void
+cn10k_sso_hws_flush_events(void *hws, uint8_t queue_id, uintptr_t base,
+  cnxk_handle_event_t fn, void *arg)
+{
+   struct cn10k_sso_hws *ws = hws;
+   uint64_t cq_ds_cnt = 1;
+   uint64_t aq_cnt = 1;
+   uint64_t ds_cnt = 1;
+   struct rte_event ev;
+   uint64_t val, req;
+
+   plt_write64(0, base + SSO_LF_GGRP_QCTL);
+
+   req = queue_id; /* GGRP ID */
+   req |= BIT_ULL(18); /* Grouped */
+   req |= BIT_ULL(16); /* WAIT */
+
+   aq_cnt = plt_read64(base + SSO_LF_GGRP_AQ_CNT);
+   ds_cnt = plt_read64(base + SSO_LF_GGRP_MISC_CNT);
+   cq_ds_cnt = plt_read64(base + SSO_LF_GGRP_INT_CNT);
+   cq_ds_cnt &= 0x3FFF3FFF;
+
+   while (aq_cnt || cq_ds_cnt || ds_cnt) {
+   plt_write64(req, ws->getwrk_op);
+   cn10k_sso_hws_get_work_empty(ws, &ev);
+   if (fn != NULL && ev.u64 != 0)
+   fn(arg, ev);
+   if (ev.sched_type != SSO_TT_EMPTY)
+   cnxk_sso_hws_swtag_flush(ws->tag_wqe_op,
+ws->swtag_flush_op);
+   do {
+   val = plt_read64(ws->base + SSOW_LF_GWS_PENDSTATE);
+   } while (val & BIT_ULL(56));
+   aq_cnt = plt_read64(base + SSO_LF_GGRP_AQ_CNT);
+   ds_cnt = plt_read64(base + SSO_LF_GGRP_MISC_CNT);
+   cq_ds_cnt = plt_read64(base + SSO_LF_GGRP_INT_CNT);
+   /* Extract cq and ds count */
+   cq_ds_cnt &= 0x3FFF3FFF;
+   }
+
+   plt_write64(0, ws->base + SSOW_LF_GWS_OP_GWC_INVAL);
+   rte_mb();
+}
+
+static void
+cn10k_sso_hws_reset(void *arg, void *hws)
+{
+   struct cnxk_sso_evdev *dev = arg;
+   struct cn10k_sso_hws *ws = hws;
+   uintptr_t base = ws->base;
+   uint64_t pend_state;
+   union {
+   __uint128_t wdata;
+   uint64_t u64[2];
+   } gw;
+   uint8_t pend_tt;
+
+   /* Wait till getwork/swtp/waitw/desched completes. */
+   do {
+   pend_state = plt_read64(base + SSOW_LF_GWS_PENDSTATE);
+   } while (pend_state & (BIT_ULL(63) | BIT_ULL(62) | BIT_ULL(58) |
+  BIT_ULL(56) | BIT_ULL(54)));
+   pend_tt = CNXK_TT_FROM_TAG(plt_read64(base + SSOW_LF_GWS_WQE0));
+   if (pend_tt != SSO_TT_EMPTY) { /* Work was pending */
+   if (pend_tt == SSO_TT_ATOMIC || pend_tt == SSO_TT_ORDERED)
+   cnxk_sso_hws_swtag_untag(base +
+SSOW_LF_GWS_OP_SWTAG_UNTAG);
+   plt_write64(0, base + SSOW_LF_GWS_OP_DESCHED);
+   }
+
+   /* Wait for desched to complete. */
+   do {
+   pend_state = plt_read64(base + SSOW_LF_GWS_PENDSTATE);
+   } while (pend_state & BIT_ULL(58));
+
+   switch (dev->gw_mode) {
+   case CN10K_GW_MODE_PREF:
+   while (plt_read64(base + SSOW_LF_GWS_PRF_WQE0) & BIT_ULL(63))
+   ;
+   break;
+   case CN10K_GW_MODE_PREF_WFE:
+   while (plt_read64(base + SSOW_LF_GWS_PRF_WQE0) &
+  SSOW_LF_GWS_TAG_PEND_GET_WORK_BIT)
+   continue;
+   plt_write64(0, base + SSOW_LF_GWS_OP_GWC_INVAL);
+   break;
+   case CN10K_GW_MODE_NONE:
+   default:
+   break;
+   }
+
+   if (CNXK_TT_FROM_TAG(plt_read64(base + SSOW_LF_GWS_PRF_WQE0)) !=
+   SSO_TT_EMPTY) {
+   plt_write64(BIT_ULL(16) | 1, ws->getwrk_op);
+   do {
+   roc_load_pair(gw.u64[0], gw.u64[1], ws->tag_wqe_op);
+   } while (gw.u64[0] & BIT_ULL(63));
+   pend_tt = CNXK_TT_FROM_TAG(plt_read64(base + SSOW_LF_GWS_WQE0));
+   if (pend_tt != SSO_TT_EMPTY) { /* Work was pending */
+   if (pend_tt == SSO_TT_ATOMIC ||
+   pend_tt == SSO_TT_ORDERED)
+   cnxk_sso_hws_swtag_untag(
+   base + SSOW_LF_GWS_OP_SWTAG_UNTAG);
+   plt_write64(0, base + SSOW_LF_GWS_OP_DESCHED);
+   }

[dpdk-dev] [PATCH v4 18/34] event/cnxk: add device stop and close functions

[pbhagavatula]

From: Shijith Thotton 

Add event device stop and close callback functions.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cn10k_eventdev.c | 15 +
 drivers/event/cnxk/cn9k_eventdev.c  | 14 +
 drivers/event/cnxk/cnxk_eventdev.c  | 48 +
 drivers/event/cnxk/cnxk_eventdev.h  |  6 
 4 files changed, 83 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 8d6b1e48a..5b7cd672c 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -388,6 +388,19 @@ cn10k_sso_start(struct rte_eventdev *event_dev)
return rc;
 }
 
+static void
+cn10k_sso_stop(struct rte_eventdev *event_dev)
+{
+   cnxk_sso_stop(event_dev, cn10k_sso_hws_reset,
+ cn10k_sso_hws_flush_events);
+}
+
+static int
+cn10k_sso_close(struct rte_eventdev *event_dev)
+{
+   return cnxk_sso_close(event_dev, cn10k_sso_hws_unlink);
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
@@ -402,6 +415,8 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.timeout_ticks = cnxk_sso_timeout_ticks,
 
.dev_start = cn10k_sso_start,
+   .dev_stop = cn10k_sso_stop,
+   .dev_close = cn10k_sso_close,
 };
 
 static int
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 20919e3a0..f13f50f42 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -463,6 +463,18 @@ cn9k_sso_start(struct rte_eventdev *event_dev)
return rc;
 }
 
+static void
+cn9k_sso_stop(struct rte_eventdev *event_dev)
+{
+   cnxk_sso_stop(event_dev, cn9k_sso_hws_reset, cn9k_sso_hws_flush_events);
+}
+
+static int
+cn9k_sso_close(struct rte_eventdev *event_dev)
+{
+   return cnxk_sso_close(event_dev, cn9k_sso_hws_unlink);
+}
+
 static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.dev_infos_get = cn9k_sso_info_get,
.dev_configure = cn9k_sso_dev_configure,
@@ -477,6 +489,8 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.timeout_ticks = cnxk_sso_timeout_ticks,
 
.dev_start = cn9k_sso_start,
+   .dev_stop = cn9k_sso_stop,
+   .dev_close = cn9k_sso_close,
 };
 
 static int
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 5feae5288..a3900315a 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -390,6 +390,54 @@ cnxk_sso_start(struct rte_eventdev *event_dev, 
cnxk_sso_hws_reset_t reset_fn,
return 0;
 }
 
+void
+cnxk_sso_stop(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn,
+ cnxk_sso_hws_flush_t flush_fn)
+{
+   plt_sso_dbg();
+   cnxk_sso_cleanup(event_dev, reset_fn, flush_fn, false);
+   rte_mb();
+}
+
+int
+cnxk_sso_close(struct rte_eventdev *event_dev, cnxk_sso_unlink_t unlink_fn)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   uint16_t all_queues[CNXK_SSO_MAX_HWGRP];
+   uint16_t i;
+   void *ws;
+
+   if (!dev->configured)
+   return 0;
+
+   for (i = 0; i < dev->nb_event_queues; i++)
+   all_queues[i] = i;
+
+   for (i = 0; i < dev->nb_event_ports; i++) {
+   ws = event_dev->data->ports[i];
+   unlink_fn(dev, ws, all_queues, dev->nb_event_queues);
+   rte_free(cnxk_sso_hws_get_cookie(ws));
+   event_dev->data->ports[i] = NULL;
+   }
+
+   roc_sso_rsrc_fini(&dev->sso);
+   rte_mempool_free(dev->xaq_pool);
+   rte_memzone_free(rte_memzone_lookup(CNXK_SSO_FC_NAME));
+
+   dev->fc_iova = 0;
+   dev->fc_mem = NULL;
+   dev->xaq_pool = NULL;
+   dev->configured = false;
+   dev->is_timeout_deq = 0;
+   dev->nb_event_ports = 0;
+   dev->max_num_events = -1;
+   dev->nb_event_queues = 0;
+   dev->min_dequeue_timeout_ns = USEC2NSEC(1);
+   dev->max_dequeue_timeout_ns = USEC2NSEC(0x3FF);
+
+   return 0;
+}
+
 static void
 parse_queue_param(char *value, void *opaque)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index f175c23bb..3011af153 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -48,6 +48,8 @@ typedef void (*cnxk_sso_hws_setup_t)(void *dev, void *ws, 
uintptr_t *grp_base);
 typedef void (*cnxk_sso_hws_release_t)(void *dev, void *ws);
 typedef int (*cnxk_sso_link_t)(void *dev, void *ws, uint16_t *map,
   uint16_t nb_link);
+typedef int (*cnxk_sso_unlink_t)(void *dev, void *ws, uint16_t *map,
+uint16_t nb_link);
 typedef void (*cnxk_handle_event_t)(void *arg, struct rte_event ev);
 typedef void (*cnxk_sso_hws_reset_t)(void *arg, void *ws);
 typedef void (*cnxk_sso_hws_flush_t)(void *ws, uin

[dpdk-dev] [PATCH v4 19/34] event/cnxk: add SSO selftest and dump

[pbhagavatula]

From: Pavan Nikhilesh 

Add selftest to verify sanity of SSO and also add function to
dump internal state of SSO.

Signed-off-by: Pavan Nikhilesh 
---
 app/test/test_eventdev.c|   14 +
 drivers/event/cnxk/cn10k_eventdev.c |8 +
 drivers/event/cnxk/cn9k_eventdev.c  |   10 +-
 drivers/event/cnxk/cnxk_eventdev.c  |8 +
 drivers/event/cnxk/cnxk_eventdev.h  |5 +
 drivers/event/cnxk/cnxk_eventdev_selftest.c | 1570 +++
 drivers/event/cnxk/meson.build  |1 +
 7 files changed, 1615 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_selftest.c

diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
index bcfaa53cb..843d9766b 100644
--- a/app/test/test_eventdev.c
+++ b/app/test/test_eventdev.c
@@ -1036,6 +1036,18 @@ test_eventdev_selftest_dlb2(void)
return test_eventdev_selftest_impl("dlb2_event", "");
 }
 
+static int
+test_eventdev_selftest_cn9k(void)
+{
+   return test_eventdev_selftest_impl("event_cn9k", "");
+}
+
+static int
+test_eventdev_selftest_cn10k(void)
+{
+   return test_eventdev_selftest_impl("event_cn10k", "");
+}
+
 REGISTER_TEST_COMMAND(eventdev_common_autotest, test_eventdev_common);
 REGISTER_TEST_COMMAND(eventdev_selftest_sw, test_eventdev_selftest_sw);
 REGISTER_TEST_COMMAND(eventdev_selftest_octeontx,
@@ -1044,3 +1056,5 @@ REGISTER_TEST_COMMAND(eventdev_selftest_octeontx2,
test_eventdev_selftest_octeontx2);
 REGISTER_TEST_COMMAND(eventdev_selftest_dpaa2, test_eventdev_selftest_dpaa2);
 REGISTER_TEST_COMMAND(eventdev_selftest_dlb2, test_eventdev_selftest_dlb2);
+REGISTER_TEST_COMMAND(eventdev_selftest_cn9k, test_eventdev_selftest_cn9k);
+REGISTER_TEST_COMMAND(eventdev_selftest_cn10k, test_eventdev_selftest_cn10k);
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 5b7cd672c..a0c6d32cc 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -401,6 +401,12 @@ cn10k_sso_close(struct rte_eventdev *event_dev)
return cnxk_sso_close(event_dev, cn10k_sso_hws_unlink);
 }
 
+static int
+cn10k_sso_selftest(void)
+{
+   return cnxk_sso_selftest(RTE_STR(event_cn10k));
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
@@ -414,9 +420,11 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.port_unlink = cn10k_sso_port_unlink,
.timeout_ticks = cnxk_sso_timeout_ticks,
 
+   .dump = cnxk_sso_dump,
.dev_start = cn10k_sso_start,
.dev_stop = cn10k_sso_stop,
.dev_close = cn10k_sso_close,
+   .dev_selftest = cn10k_sso_selftest,
 };
 
 static int
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index f13f50f42..48991e522 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -222,7 +222,7 @@ cn9k_sso_hws_reset(void *arg, void *hws)
}
 }
 
-static void
+void
 cn9k_sso_set_rsrc(void *arg)
 {
struct cnxk_sso_evdev *dev = arg;
@@ -475,6 +475,12 @@ cn9k_sso_close(struct rte_eventdev *event_dev)
return cnxk_sso_close(event_dev, cn9k_sso_hws_unlink);
 }
 
+static int
+cn9k_sso_selftest(void)
+{
+   return cnxk_sso_selftest(RTE_STR(event_cn9k));
+}
+
 static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.dev_infos_get = cn9k_sso_info_get,
.dev_configure = cn9k_sso_dev_configure,
@@ -488,9 +494,11 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.port_unlink = cn9k_sso_port_unlink,
.timeout_ticks = cnxk_sso_timeout_ticks,
 
+   .dump = cnxk_sso_dump,
.dev_start = cn9k_sso_start,
.dev_stop = cn9k_sso_stop,
.dev_close = cn9k_sso_close,
+   .dev_selftest = cn9k_sso_selftest,
 };
 
 static int
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index a3900315a..0f084176c 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -326,6 +326,14 @@ cnxk_sso_timeout_ticks(struct rte_eventdev *event_dev, 
uint64_t ns,
return 0;
 }
 
+void
+cnxk_sso_dump(struct rte_eventdev *event_dev, FILE *f)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+   roc_sso_dump(&dev->sso, dev->sso.nb_hws, dev->sso.nb_hwgrp, f);
+}
+
 static void
 cnxk_handle_event(void *arg, struct rte_event event)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 3011af153..9af04bc3d 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -211,5 +211,10 @@ void cnxk_sso_stop(struct rte_eventdev *event_dev,
   cnxk_sso_hws_reset_t reset_fn,
   cnxk_sso_hws_flush_t flush_fn);
 int cnxk_sso_close(struct rte_eventdev *event_dev, cnxk_sso_unlink_t 
unlink_fn);
+int cnxk_sso_selftest(const cha

[dpdk-dev] [PATCH v4 20/34] event/cnxk: add event port and queue xstats

[pbhagavatula]

From: Pavan Nikhilesh 

Add support for retrieving statistics from SSO HWS and HWGRP.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/common/cnxk/roc_sso.c|  63 +
 drivers/common/cnxk/roc_sso.h|  19 ++
 drivers/common/cnxk/version.map  |   2 +
 drivers/event/cnxk/cnxk_eventdev.h   |  15 ++
 drivers/event/cnxk/cnxk_eventdev_stats.c | 289 +++
 drivers/event/cnxk/meson.build   |   3 +-
 6 files changed, 390 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_stats.c

diff --git a/drivers/common/cnxk/roc_sso.c b/drivers/common/cnxk/roc_sso.c
index 80d032039..1ccf2626b 100644
--- a/drivers/common/cnxk/roc_sso.c
+++ b/drivers/common/cnxk/roc_sso.c
@@ -279,6 +279,69 @@ roc_sso_hws_unlink(struct roc_sso *roc_sso, uint8_t hws, 
uint16_t hwgrp[],
return nb_hwgrp;
 }
 
+int
+roc_sso_hws_stats_get(struct roc_sso *roc_sso, uint8_t hws,
+ struct roc_sso_hws_stats *stats)
+{
+   struct dev *dev = &roc_sso_to_sso_priv(roc_sso)->dev;
+   struct sso_hws_stats *req_rsp;
+   int rc;
+
+   req_rsp = (struct sso_hws_stats *)mbox_alloc_msg_sso_hws_get_stats(
+   dev->mbox);
+   if (req_rsp == NULL) {
+   rc = mbox_process(dev->mbox);
+   if (rc < 0)
+   return rc;
+   req_rsp = (struct sso_hws_stats *)
+   mbox_alloc_msg_sso_hws_get_stats(dev->mbox);
+   if (req_rsp == NULL)
+   return -ENOSPC;
+   }
+   req_rsp->hws = hws;
+   rc = mbox_process_msg(dev->mbox, (void **)&req_rsp);
+   if (rc)
+   return rc;
+
+   stats->arbitration = req_rsp->arbitration;
+   return 0;
+}
+
+int
+roc_sso_hwgrp_stats_get(struct roc_sso *roc_sso, uint8_t hwgrp,
+   struct roc_sso_hwgrp_stats *stats)
+{
+   struct dev *dev = &roc_sso_to_sso_priv(roc_sso)->dev;
+   struct sso_grp_stats *req_rsp;
+   int rc;
+
+   req_rsp = (struct sso_grp_stats *)mbox_alloc_msg_sso_grp_get_stats(
+   dev->mbox);
+   if (req_rsp == NULL) {
+   rc = mbox_process(dev->mbox);
+   if (rc < 0)
+   return rc;
+   req_rsp = (struct sso_grp_stats *)
+   mbox_alloc_msg_sso_grp_get_stats(dev->mbox);
+   if (req_rsp == NULL)
+   return -ENOSPC;
+   }
+   req_rsp->grp = hwgrp;
+   rc = mbox_process_msg(dev->mbox, (void **)&req_rsp);
+   if (rc)
+   return rc;
+
+   stats->aw_status = req_rsp->aw_status;
+   stats->dq_pc = req_rsp->dq_pc;
+   stats->ds_pc = req_rsp->ds_pc;
+   stats->ext_pc = req_rsp->ext_pc;
+   stats->page_cnt = req_rsp->page_cnt;
+   stats->ts_pc = req_rsp->ts_pc;
+   stats->wa_pc = req_rsp->wa_pc;
+   stats->ws_pc = req_rsp->ws_pc;
+   return 0;
+}
+
 int
 roc_sso_hwgrp_hws_link_status(struct roc_sso *roc_sso, uint8_t hws,
  uint16_t hwgrp)
diff --git a/drivers/common/cnxk/roc_sso.h b/drivers/common/cnxk/roc_sso.h
index f85799ba8..a6030e7d8 100644
--- a/drivers/common/cnxk/roc_sso.h
+++ b/drivers/common/cnxk/roc_sso.h
@@ -12,6 +12,21 @@ struct roc_sso_hwgrp_qos {
uint8_t taq_prcnt;
 };
 
+struct roc_sso_hws_stats {
+   uint64_t arbitration;
+};
+
+struct roc_sso_hwgrp_stats {
+   uint64_t ws_pc;
+   uint64_t ext_pc;
+   uint64_t wa_pc;
+   uint64_t ts_pc;
+   uint64_t ds_pc;
+   uint64_t dq_pc;
+   uint64_t aw_status;
+   uint64_t page_cnt;
+};
+
 struct roc_sso {
struct plt_pci_device *pci_dev;
/* Public data. */
@@ -61,5 +76,9 @@ uintptr_t __roc_api roc_sso_hwgrp_base_get(struct roc_sso 
*roc_sso,
 /* Debug */
 void __roc_api roc_sso_dump(struct roc_sso *roc_sso, uint8_t nb_hws,
uint16_t hwgrp, FILE *f);
+int __roc_api roc_sso_hwgrp_stats_get(struct roc_sso *roc_sso, uint8_t hwgrp,
+ struct roc_sso_hwgrp_stats *stats);
+int __roc_api roc_sso_hws_stats_get(struct roc_sso *roc_sso, uint8_t hws,
+   struct roc_sso_hws_stats *stats);
 
 #endif /* _ROC_SSOW_H_ */
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 5f2264f23..8e67c83a6 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -183,8 +183,10 @@ INTERNAL {
roc_sso_hwgrp_qos_config;
roc_sso_hwgrp_release_xaq;
roc_sso_hwgrp_set_priority;
+   roc_sso_hwgrp_stats_get;
roc_sso_hws_base_get;
roc_sso_hws_link;
+   roc_sso_hws_stats_get;
roc_sso_hws_unlink;
roc_sso_ns_to_gw;
roc_sso_rsrc_fini;
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 9af04bc3d..abe36f21f 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_e

[dpdk-dev] [PATCH v4 21/34] event/cnxk: support event timer

[pbhagavatula]

From: Shijith Thotton 

Add event timer adapter a.k.a TIM initialization on SSO probe.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst   |  6 
 drivers/event/cnxk/cnxk_eventdev.c  |  3 ++
 drivers/event/cnxk/cnxk_eventdev.h  |  2 ++
 drivers/event/cnxk/cnxk_tim_evdev.c | 47 +
 drivers/event/cnxk/cnxk_tim_evdev.h | 44 +++
 drivers/event/cnxk/meson.build  |  1 +
 6 files changed, 103 insertions(+)
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.h

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index f48452982..e6f81f8b1 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -35,6 +35,10 @@ Features of the OCTEON cnxk SSO PMD are:
 - Open system with configurable amount of outstanding events limited only by
   DRAM
 - HW accelerated dequeue timeout support to enable power management
+- HW managed event timers support through TIM, with high precision and
+  time granularity of 2.5us on CN9K and 1us on CN10K.
+- Up to 256 TIM rings a.k.a event timer adapters.
+- Up to 8 rings traversed in parallel.
 
 Prerequisites and Compilation procedure
 ---
@@ -101,3 +105,5 @@ Debugging Options
+===++===+
| 1 | SSO| --log-level='pmd\.event\.cnxk,8'  |
+---++---+
+   | 2 | TIM| --log-level='pmd\.event\.cnxk\.timer,8'   |
+   +---++---+
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 0f084176c..85bb12e00 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -582,6 +582,8 @@ cnxk_sso_init(struct rte_eventdev *event_dev)
dev->nb_event_queues = 0;
dev->nb_event_ports = 0;
 
+   cnxk_tim_init(&dev->sso);
+
return 0;
 
 error:
@@ -598,6 +600,7 @@ cnxk_sso_fini(struct rte_eventdev *event_dev)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
 
+   cnxk_tim_fini();
roc_sso_rsrc_fini(&dev->sso);
roc_sso_dev_fini(&dev->sso);
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index abe36f21f..1c61063c9 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -14,6 +14,8 @@
 
 #include "roc_api.h"
 
+#include "cnxk_tim_evdev.h"
+
 #define CNXK_SSO_XAE_CNT   "xae_cnt"
 #define CNXK_SSO_GGRP_QOS  "qos"
 #define CN9K_SSO_SINGLE_WS "single_ws"
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
new file mode 100644
index 0..46461b885
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+#include "cnxk_tim_evdev.h"
+
+void
+cnxk_tim_init(struct roc_sso *sso)
+{
+   const struct rte_memzone *mz;
+   struct cnxk_tim_evdev *dev;
+   int rc;
+
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return;
+
+   mz = rte_memzone_reserve(RTE_STR(CNXK_TIM_EVDEV_NAME),
+sizeof(struct cnxk_tim_evdev), 0, 0);
+   if (mz == NULL) {
+   plt_tim_dbg("Unable to allocate memory for TIM Event device");
+   return;
+   }
+   dev = mz->addr;
+
+   dev->tim.roc_sso = sso;
+   rc = roc_tim_init(&dev->tim);
+   if (rc < 0) {
+   plt_err("Failed to initialize roc tim resources");
+   rte_memzone_free(mz);
+   return;
+   }
+   dev->nb_rings = rc;
+   dev->chunk_sz = CNXK_TIM_RING_DEF_CHUNK_SZ;
+}
+
+void
+cnxk_tim_fini(void)
+{
+   struct cnxk_tim_evdev *dev = tim_priv_get();
+
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return;
+
+   roc_tim_fini(&dev->tim);
+   rte_memzone_free(rte_memzone_lookup(RTE_STR(CNXK_TIM_EVDEV_NAME)));
+}
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
new file mode 100644
index 0..5ddc94ed4
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef __CNXK_TIM_EVDEV_H__
+#define __CNXK_TIM_EVDEV_H__
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "roc_api.h"
+
+#define CNXK_TIM_EVDEV_NAME   cnxk_tim_eventdev
+#define CNXK_TIM_RING_DEF_CHUNK_SZ (4096)
+
+struct cnxk_tim_evdev {
+   struct roc_tim tim;
+   struct rte_eventdev *event_dev;
+   uint16_t nb_rings;
+   uint32_t chunk_sz;
+};
+
+static inline struct cnxk_tim

[dpdk-dev] [PATCH v4 22/34] event/cnxk: add timer adapter capabilities

[pbhagavatula]

From: Shijith Thotton 

Add function to retrieve event timer adapter capabilities.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cn10k_eventdev.c |  2 ++
 drivers/event/cnxk/cn9k_eventdev.c  |  2 ++
 drivers/event/cnxk/cnxk_tim_evdev.c | 22 +-
 drivers/event/cnxk/cnxk_tim_evdev.h |  6 +-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index a0c6d32cc..0981085e8 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -420,6 +420,8 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.port_unlink = cn10k_sso_port_unlink,
.timeout_ticks = cnxk_sso_timeout_ticks,
 
+   .timer_adapter_caps_get = cnxk_tim_caps_get,
+
.dump = cnxk_sso_dump,
.dev_start = cn10k_sso_start,
.dev_stop = cn10k_sso_stop,
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 48991e522..d9882ebb9 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -494,6 +494,8 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.port_unlink = cn9k_sso_port_unlink,
.timeout_ticks = cnxk_sso_timeout_ticks,
 
+   .timer_adapter_caps_get = cnxk_tim_caps_get,
+
.dump = cnxk_sso_dump,
.dev_start = cn9k_sso_start,
.dev_stop = cn9k_sso_stop,
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 46461b885..265bee533 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -5,6 +5,26 @@
 #include "cnxk_eventdev.h"
 #include "cnxk_tim_evdev.h"
 
+int
+cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
+ uint32_t *caps,
+ const struct rte_event_timer_adapter_ops **ops)
+{
+   struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
+
+   RTE_SET_USED(flags);
+   RTE_SET_USED(ops);
+
+   if (dev == NULL)
+   return -ENODEV;
+
+   /* Store evdev pointer for later use. */
+   dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
+   *caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;
+
+   return 0;
+}
+
 void
 cnxk_tim_init(struct roc_sso *sso)
 {
@@ -37,7 +57,7 @@ cnxk_tim_init(struct roc_sso *sso)
 void
 cnxk_tim_fini(void)
 {
-   struct cnxk_tim_evdev *dev = tim_priv_get();
+   struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
 
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return;
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index 5ddc94ed4..ece66ab25 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -27,7 +27,7 @@ struct cnxk_tim_evdev {
 };
 
 static inline struct cnxk_tim_evdev *
-tim_priv_get(void)
+cnxk_tim_priv_get(void)
 {
const struct rte_memzone *mz;
 
@@ -38,6 +38,10 @@ tim_priv_get(void)
return mz->addr;
 }
 
+int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
+ uint32_t *caps,
+ const struct rte_event_timer_adapter_ops **ops);
+
 void cnxk_tim_init(struct roc_sso *sso);
 void cnxk_tim_fini(void);
 
-- 
2.17.1

[dpdk-dev] [PATCH v4 23/34] event/cnxk: create and free timer adapter

[pbhagavatula]

From: Shijith Thotton 

When the application calls timer adapter create the following is used:
- Allocate a TIM LF based on number of LF's provisioned.
- Verify the config parameters supplied.
- Allocate memory required for
* Buckets based on min and max timeout supplied.
* Allocate the chunk pool based on the number of timers.

On Free:
- Free the allocated bucket and chunk memory.
- Free the TIM lf allocated.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_tim_evdev.c | 174 
 drivers/event/cnxk/cnxk_tim_evdev.h | 128 +++-
 2 files changed, 300 insertions(+), 2 deletions(-)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 265bee533..655540a72 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -5,6 +5,177 @@
 #include "cnxk_eventdev.h"
 #include "cnxk_tim_evdev.h"
 
+static struct rte_event_timer_adapter_ops cnxk_tim_ops;
+
+static int
+cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
+ struct rte_event_timer_adapter_conf *rcfg)
+{
+   unsigned int cache_sz = (tim_ring->nb_chunks / 1.5);
+   unsigned int mp_flags = 0;
+   char pool_name[25];
+   int rc;
+
+   cache_sz /= rte_lcore_count();
+   /* Create chunk pool. */
+   if (rcfg->flags & RTE_EVENT_TIMER_ADAPTER_F_SP_PUT) {
+   mp_flags = MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET;
+   plt_tim_dbg("Using single producer mode");
+   tim_ring->prod_type_sp = true;
+   }
+
+   snprintf(pool_name, sizeof(pool_name), "cnxk_tim_chunk_pool%d",
+tim_ring->ring_id);
+
+   if (cache_sz > RTE_MEMPOOL_CACHE_MAX_SIZE)
+   cache_sz = RTE_MEMPOOL_CACHE_MAX_SIZE;
+   cache_sz = cache_sz != 0 ? cache_sz : 2;
+   tim_ring->nb_chunks += (cache_sz * rte_lcore_count());
+   tim_ring->chunk_pool = rte_mempool_create_empty(
+   pool_name, tim_ring->nb_chunks, tim_ring->chunk_sz, cache_sz, 0,
+   rte_socket_id(), mp_flags);
+
+   if (tim_ring->chunk_pool == NULL) {
+   plt_err("Unable to create chunkpool.");
+   return -ENOMEM;
+   }
+
+   rc = rte_mempool_set_ops_byname(tim_ring->chunk_pool,
+   rte_mbuf_platform_mempool_ops(), NULL);
+   if (rc < 0) {
+   plt_err("Unable to set chunkpool ops");
+   goto free;
+   }
+
+   rc = rte_mempool_populate_default(tim_ring->chunk_pool);
+   if (rc < 0) {
+   plt_err("Unable to set populate chunkpool.");
+   goto free;
+   }
+   tim_ring->aura =
+   roc_npa_aura_handle_to_aura(tim_ring->chunk_pool->pool_id);
+   tim_ring->ena_dfb = 0;
+
+   return 0;
+
+free:
+   rte_mempool_free(tim_ring->chunk_pool);
+   return rc;
+}
+
+static int
+cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
+{
+   struct rte_event_timer_adapter_conf *rcfg = &adptr->data->conf;
+   struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
+   struct cnxk_tim_ring *tim_ring;
+   int rc;
+
+   if (dev == NULL)
+   return -ENODEV;
+
+   if (adptr->data->id >= dev->nb_rings)
+   return -ENODEV;
+
+   tim_ring = rte_zmalloc("cnxk_tim_prv", sizeof(struct cnxk_tim_ring), 0);
+   if (tim_ring == NULL)
+   return -ENOMEM;
+
+   rc = roc_tim_lf_alloc(&dev->tim, adptr->data->id, NULL);
+   if (rc < 0) {
+   plt_err("Failed to create timer ring");
+   goto tim_ring_free;
+   }
+
+   if (NSEC2TICK(RTE_ALIGN_MUL_CEIL(
+ rcfg->timer_tick_ns,
+ cnxk_tim_min_resolution_ns(cnxk_tim_cntfrq())),
+ cnxk_tim_cntfrq()) <
+   cnxk_tim_min_tmo_ticks(cnxk_tim_cntfrq())) {
+   if (rcfg->flags & RTE_EVENT_TIMER_ADAPTER_F_ADJUST_RES)
+   rcfg->timer_tick_ns = TICK2NSEC(
+   cnxk_tim_min_tmo_ticks(cnxk_tim_cntfrq()),
+   cnxk_tim_cntfrq());
+   else {
+   rc = -ERANGE;
+   goto tim_hw_free;
+   }
+   }
+   tim_ring->ring_id = adptr->data->id;
+   tim_ring->clk_src = (int)rcfg->clk_src;
+   tim_ring->tck_nsec = RTE_ALIGN_MUL_CEIL(
+   rcfg->timer_tick_ns,
+   cnxk_tim_min_resolution_ns(cnxk_tim_cntfrq()));
+   tim_ring->max_tout = rcfg->max_tmo_ns;
+   tim_ring->nb_bkts = (tim_ring->max_tout / tim_ring->tck_nsec);
+   tim_ring->nb_timers = rcfg->nb_timers;
+   tim_ring->chunk_sz = dev->chunk_sz;
+
+   tim_ring->nb_chunks = tim_ring->nb_timers;
+   tim_ring->nb_chunk_slots = CNXK_TIM_NB_CHUNK_SLOTS(tim_ring->chunk_sz);
+   /* Create buckets. */
+   

[dpdk-dev] [PATCH v4 24/34] event/cnxk: add devargs to disable NPA

[pbhagavatula]

From: Pavan Nikhilesh 

If the chunks are allocated from NPA then TIM can automatically free
them when traversing the list of chunks.
Add devargs to disable NPA and use software mempool to manage chunks.

Example:
--dev "0002:0e:00.0,tim_disable_npa=1"

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 doc/guides/eventdevs/cnxk.rst   | 10 
 drivers/event/cnxk/cn10k_eventdev.c |  3 +-
 drivers/event/cnxk/cn9k_eventdev.c  |  3 +-
 drivers/event/cnxk/cnxk_eventdev.h  |  9 +++
 drivers/event/cnxk/cnxk_tim_evdev.c | 86 +
 drivers/event/cnxk/cnxk_tim_evdev.h |  5 ++
 6 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index e6f81f8b1..c2d6ed2fb 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -93,6 +93,16 @@ Runtime Config Options
 
 -a 0002:0e:00.0,qos=[1-50-50-50]
 
+- ``TIM disable NPA``
+
+  By default chunks are allocated from NPA then TIM can automatically free
+  them when traversing the list of chunks. The ``tim_disable_npa`` devargs
+  parameter disables NPA and uses software mempool to manage chunks
+
+  For example::
+
+-a 0002:0e:00.0,tim_disable_npa=1
+
 Debugging Options
 -
 
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 0981085e8..a2ef1fa73 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -502,4 +502,5 @@ RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "="
  CNXK_SSO_GGRP_QOS "="
- CN10K_SSO_GW_MODE "=");
+ CN10K_SSO_GW_MODE "="
+ CNXK_TIM_DISABLE_NPA "=1");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index d9882ebb9..3a0caa009 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -571,4 +571,5 @@ RTE_PMD_REGISTER_PCI_TABLE(event_cn9k, cn9k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "="
  CNXK_SSO_GGRP_QOS "="
- CN9K_SSO_SINGLE_WS "=1");
+ CN9K_SSO_SINGLE_WS "=1"
+ CNXK_TIM_DISABLE_NPA "=1");
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 1c61063c9..77835e463 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -159,6 +159,15 @@ struct cnxk_sso_hws_cookie {
bool configured;
 } __rte_cache_aligned;
 
+static inline int
+parse_kvargs_flag(const char *key, const char *value, void *opaque)
+{
+   RTE_SET_USED(key);
+
+   *(uint8_t *)opaque = !!atoi(value);
+   return 0;
+}
+
 static inline int
 parse_kvargs_value(const char *key, const char *value, void *opaque)
 {
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 655540a72..d93b37e4f 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -31,30 +31,43 @@ cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
cache_sz = RTE_MEMPOOL_CACHE_MAX_SIZE;
cache_sz = cache_sz != 0 ? cache_sz : 2;
tim_ring->nb_chunks += (cache_sz * rte_lcore_count());
-   tim_ring->chunk_pool = rte_mempool_create_empty(
-   pool_name, tim_ring->nb_chunks, tim_ring->chunk_sz, cache_sz, 0,
-   rte_socket_id(), mp_flags);
-
-   if (tim_ring->chunk_pool == NULL) {
-   plt_err("Unable to create chunkpool.");
-   return -ENOMEM;
-   }
+   if (!tim_ring->disable_npa) {
+   tim_ring->chunk_pool = rte_mempool_create_empty(
+   pool_name, tim_ring->nb_chunks, tim_ring->chunk_sz,
+   cache_sz, 0, rte_socket_id(), mp_flags);
+
+   if (tim_ring->chunk_pool == NULL) {
+   plt_err("Unable to create chunkpool.");
+   return -ENOMEM;
+   }
 
-   rc = rte_mempool_set_ops_byname(tim_ring->chunk_pool,
-   rte_mbuf_platform_mempool_ops(), NULL);
-   if (rc < 0) {
-   plt_err("Unable to set chunkpool ops");
-   goto free;
-   }
+   rc = rte_mempool_set_ops_byname(tim_ring->chunk_pool,
+   rte_mbuf_platform_mempool_ops(),
+   NULL);
+   if (rc < 0) {
+   plt_err("Unable to set chunkpool ops");
+   goto free;
+   }
 
-   rc = rte_mempool_populate_default(tim_ring->chunk_pool);
-   i

[dpdk-dev] [PATCH v4 25/34] event/cnxk: allow adapters to resize inflights

[pbhagavatula]

From: Pavan Nikhilesh 

Add internal SSO functions to allow event adapters to resize SSO buffers
that are used to hold in-flight events in DRAM.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_eventdev.c   | 33 
 drivers/event/cnxk/cnxk_eventdev.h   |  7 +++
 drivers/event/cnxk/cnxk_eventdev_adptr.c | 67 
 drivers/event/cnxk/cnxk_tim_evdev.c  |  5 ++
 drivers/event/cnxk/meson.build   |  1 +
 5 files changed, 113 insertions(+)
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_adptr.c

diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 85bb12e00..7189ee3a7 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -77,6 +77,9 @@ cnxk_sso_xaq_allocate(struct cnxk_sso_evdev *dev)
xaq_cnt = dev->nb_event_queues * CNXK_SSO_XAQ_CACHE_CNT;
if (dev->xae_cnt)
xaq_cnt += dev->xae_cnt / dev->sso.xae_waes;
+   else if (dev->adptr_xae_cnt)
+   xaq_cnt += (dev->adptr_xae_cnt / dev->sso.xae_waes) +
+  (CNXK_SSO_XAQ_SLACK * dev->nb_event_queues);
else
xaq_cnt += (dev->sso.iue / dev->sso.xae_waes) +
   (CNXK_SSO_XAQ_SLACK * dev->nb_event_queues);
@@ -125,6 +128,36 @@ cnxk_sso_xaq_allocate(struct cnxk_sso_evdev *dev)
return rc;
 }
 
+int
+cnxk_sso_xae_reconfigure(struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc = 0;
+
+   if (event_dev->data->dev_started)
+   event_dev->dev_ops->dev_stop(event_dev);
+
+   rc = roc_sso_hwgrp_release_xaq(&dev->sso, dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to release XAQ %d", rc);
+   return rc;
+   }
+
+   rte_mempool_free(dev->xaq_pool);
+   dev->xaq_pool = NULL;
+   rc = cnxk_sso_xaq_allocate(dev);
+   if (rc < 0) {
+   plt_err("Failed to alloc XAQ %d", rc);
+   return rc;
+   }
+
+   rte_mb();
+   if (event_dev->data->dev_started)
+   event_dev->dev_ops->dev_start(event_dev);
+
+   return 0;
+}
+
 int
 cnxk_setup_event_ports(const struct rte_eventdev *event_dev,
   cnxk_sso_init_hws_mem_t init_hws_fn,
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 77835e463..668e51d62 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -81,6 +81,10 @@ struct cnxk_sso_evdev {
uint64_t nb_xaq_cfg;
rte_iova_t fc_iova;
struct rte_mempool *xaq_pool;
+   uint64_t adptr_xae_cnt;
+   uint16_t tim_adptr_ring_cnt;
+   uint16_t *timer_adptr_rings;
+   uint64_t *timer_adptr_sz;
/* Dev args */
uint32_t xae_cnt;
uint8_t qos_queue_cnt;
@@ -190,7 +194,10 @@ cnxk_sso_hws_get_cookie(void *ws)
 }
 
 /* Configuration functions */
+int cnxk_sso_xae_reconfigure(struct rte_eventdev *event_dev);
 int cnxk_sso_xaq_allocate(struct cnxk_sso_evdev *dev);
+void cnxk_sso_updt_xae_cnt(struct cnxk_sso_evdev *dev, void *data,
+  uint32_t event_type);
 
 /* Common ops API. */
 int cnxk_sso_init(struct rte_eventdev *event_dev);
diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c 
b/drivers/event/cnxk/cnxk_eventdev_adptr.c
new file mode 100644
index 0..89a1d82c1
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c
@@ -0,0 +1,67 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+void
+cnxk_sso_updt_xae_cnt(struct cnxk_sso_evdev *dev, void *data,
+ uint32_t event_type)
+{
+   int i;
+
+   switch (event_type) {
+   case RTE_EVENT_TYPE_TIMER: {
+   struct cnxk_tim_ring *timr = data;
+   uint16_t *old_ring_ptr;
+   uint64_t *old_sz_ptr;
+
+   for (i = 0; i < dev->tim_adptr_ring_cnt; i++) {
+   if (timr->ring_id != dev->timer_adptr_rings[i])
+   continue;
+   if (timr->nb_timers == dev->timer_adptr_sz[i])
+   return;
+   dev->adptr_xae_cnt -= dev->timer_adptr_sz[i];
+   dev->adptr_xae_cnt += timr->nb_timers;
+   dev->timer_adptr_sz[i] = timr->nb_timers;
+
+   return;
+   }
+
+   dev->tim_adptr_ring_cnt++;
+   old_ring_ptr = dev->timer_adptr_rings;
+   old_sz_ptr = dev->timer_adptr_sz;
+
+   dev->timer_adptr_rings = rte_realloc(
+   dev->timer_adptr_rings,
+   sizeof(uint16_t) * dev->tim_adptr_ring_cnt, 0);
+   if (dev->timer_adptr_rings == NULL) {
+   dev->adptr_xae_cnt += timr->nb_timers;
+   

[dpdk-dev] [PATCH v4 26/34] event/cnxk: add timer adapter info function

[pbhagavatula]

From: Shijith Thotton 

Add TIM event timer adapter info get function.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_tim_evdev.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 1eb39a789..2fefa56f5 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -76,6 +76,18 @@ cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
return rc;
 }
 
+static void
+cnxk_tim_ring_info_get(const struct rte_event_timer_adapter *adptr,
+  struct rte_event_timer_adapter_info *adptr_info)
+{
+   struct cnxk_tim_ring *tim_ring = adptr->data->adapter_priv;
+
+   adptr_info->max_tmo_ns = tim_ring->max_tout;
+   adptr_info->min_resolution_ns = tim_ring->tck_nsec;
+   rte_memcpy(&adptr_info->conf, &adptr->data->conf,
+  sizeof(struct rte_event_timer_adapter_conf));
+}
+
 static int
 cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
 {
@@ -218,6 +230,7 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, 
uint64_t flags,
 
cnxk_tim_ops.init = cnxk_tim_ring_create;
cnxk_tim_ops.uninit = cnxk_tim_ring_free;
+   cnxk_tim_ops.get_info = cnxk_tim_ring_info_get;
 
/* Store evdev pointer for later use. */
dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
-- 
2.17.1

[dpdk-dev] [PATCH v4 27/34] event/cnxk: add devargs for chunk size and rings

[pbhagavatula]

From: Shijith Thotton 

Add devargs to control default chunk size and max numbers of
timer rings to attach to a given RVU PF.

Example:
--dev "0002:1e:00.0,tim_chnk_slots=1024"
--dev "0002:1e:00.0,tim_rings_lmt=4"

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst   | 23 +++
 drivers/event/cnxk/cn10k_eventdev.c |  4 +++-
 drivers/event/cnxk/cn9k_eventdev.c  |  4 +++-
 drivers/event/cnxk/cnxk_tim_evdev.c | 14 +-
 drivers/event/cnxk/cnxk_tim_evdev.h |  4 
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index c2d6ed2fb..a8199aac7 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -103,6 +103,29 @@ Runtime Config Options
 
 -a 0002:0e:00.0,tim_disable_npa=1
 
+- ``TIM modify chunk slots``
+
+  The ``tim_chnk_slots`` devargs can be used to modify number of chunk slots.
+  Chunks are used to store event timers, a chunk can be visualised as an array
+  where the last element points to the next chunk and rest of them are used to
+  store events. TIM traverses the list of chunks and enqueues the event timers
+  to SSO. The default value is 255 and the max value is 4095.
+
+  For example::
+
+-a 0002:0e:00.0,tim_chnk_slots=1023
+
+- ``TIM limit max rings reserved``
+
+  The ``tim_rings_lmt`` devargs can be used to limit the max number of TIM
+  rings i.e. event timer adapter reserved on probe. Since, TIM rings are HW
+  resources we can avoid starving other applications by not grabbing all the
+  rings.
+
+  For example::
+
+-a 0002:0e:00.0,tim_rings_lmt=5
+
 Debugging Options
 -
 
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index a2ef1fa73..cadc792a7 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -503,4 +503,6 @@ RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "="
  CNXK_SSO_GGRP_QOS "="
  CN10K_SSO_GW_MODE "="
- CNXK_TIM_DISABLE_NPA "=1");
+ CNXK_TIM_DISABLE_NPA "=1"
+ CNXK_TIM_CHNK_SLOTS "="
+ CNXK_TIM_RINGS_LMT "=");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 3a0caa009..e503f6b1c 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -572,4 +572,6 @@ RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "="
  CNXK_SSO_GGRP_QOS "="
  CN9K_SSO_SINGLE_WS "=1"
- CNXK_TIM_DISABLE_NPA "=1");
+ CNXK_TIM_DISABLE_NPA "=1"
+ CNXK_TIM_CHNK_SLOTS "="
+ CNXK_TIM_RINGS_LMT "=");
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 2fefa56f5..e06fe2f52 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -253,6 +253,10 @@ cnxk_tim_parse_devargs(struct rte_devargs *devargs, struct 
cnxk_tim_evdev *dev)
 
rte_kvargs_process(kvlist, CNXK_TIM_DISABLE_NPA, &parse_kvargs_flag,
   &dev->disable_npa);
+   rte_kvargs_process(kvlist, CNXK_TIM_CHNK_SLOTS, &parse_kvargs_value,
+  &dev->chunk_slots);
+   rte_kvargs_process(kvlist, CNXK_TIM_RINGS_LMT, &parse_kvargs_value,
+  &dev->min_ring_cnt);
 
rte_kvargs_free(kvlist);
 }
@@ -278,6 +282,7 @@ cnxk_tim_init(struct roc_sso *sso)
cnxk_tim_parse_devargs(sso->pci_dev->device.devargs, dev);
 
dev->tim.roc_sso = sso;
+   dev->tim.nb_lfs = dev->min_ring_cnt;
rc = roc_tim_init(&dev->tim);
if (rc < 0) {
plt_err("Failed to initialize roc tim resources");
@@ -285,7 +290,14 @@ cnxk_tim_init(struct roc_sso *sso)
return;
}
dev->nb_rings = rc;
-   dev->chunk_sz = CNXK_TIM_RING_DEF_CHUNK_SZ;
+
+   if (dev->chunk_slots && dev->chunk_slots <= CNXK_TIM_MAX_CHUNK_SLOTS &&
+   dev->chunk_slots >= CNXK_TIM_MIN_CHUNK_SLOTS) {
+   dev->chunk_sz =
+   (dev->chunk_slots + 1) * CNXK_TIM_CHUNK_ALIGNMENT;
+   } else {
+   dev->chunk_sz = CNXK_TIM_RING_DEF_CHUNK_SZ;
+   }
 }
 
 void
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index 4896ed67a..9496634c8 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -34,6 +34,8 @@
 #define CN9K_TIM_MIN_TMO_TKS (256)
 
 #define CNXK_TIM_DISABLE_NPA "tim_disable_npa"
+#define CNXK_TIM_CHNK_SLOTS  "tim_chnk_slots"
+

[dpdk-dev] [PATCH v4 28/34] event/cnxk: add TIM bucket operations

[pbhagavatula]

From: Pavan Nikhilesh 

Add TIM bucket operations used for event timer arm and cancel.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_tim_evdev.h  |  30 +++
 drivers/event/cnxk/cnxk_tim_worker.c |   6 ++
 drivers/event/cnxk/cnxk_tim_worker.h | 123 +++
 drivers/event/cnxk/meson.build   |   1 +
 4 files changed, 160 insertions(+)
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.h

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index 9496634c8..f6895417a 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -37,6 +37,36 @@
 #define CNXK_TIM_CHNK_SLOTS  "tim_chnk_slots"
 #define CNXK_TIM_RINGS_LMT   "tim_rings_lmt"
 
+#define TIM_BUCKET_W1_S_CHUNK_REMAINDER (48)
+#define TIM_BUCKET_W1_M_CHUNK_REMAINDER
\
+   ((1ULL << (64 - TIM_BUCKET_W1_S_CHUNK_REMAINDER)) - 1)
+#define TIM_BUCKET_W1_S_LOCK (40)
+#define TIM_BUCKET_W1_M_LOCK   
\
+   ((1ULL << (TIM_BUCKET_W1_S_CHUNK_REMAINDER - TIM_BUCKET_W1_S_LOCK)) - 1)
+#define TIM_BUCKET_W1_S_RSVD (35)
+#define TIM_BUCKET_W1_S_BSK  (34)
+#define TIM_BUCKET_W1_M_BSK
\
+   ((1ULL << (TIM_BUCKET_W1_S_RSVD - TIM_BUCKET_W1_S_BSK)) - 1)
+#define TIM_BUCKET_W1_S_HBT (33)
+#define TIM_BUCKET_W1_M_HBT
\
+   ((1ULL << (TIM_BUCKET_W1_S_BSK - TIM_BUCKET_W1_S_HBT)) - 1)
+#define TIM_BUCKET_W1_S_SBT (32)
+#define TIM_BUCKET_W1_M_SBT
\
+   ((1ULL << (TIM_BUCKET_W1_S_HBT - TIM_BUCKET_W1_S_SBT)) - 1)
+#define TIM_BUCKET_W1_S_NUM_ENTRIES (0)
+#define TIM_BUCKET_W1_M_NUM_ENTRIES
\
+   ((1ULL << (TIM_BUCKET_W1_S_SBT - TIM_BUCKET_W1_S_NUM_ENTRIES)) - 1)
+
+#define TIM_BUCKET_SEMA (TIM_BUCKET_CHUNK_REMAIN)
+
+#define TIM_BUCKET_CHUNK_REMAIN
\
+   (TIM_BUCKET_W1_M_CHUNK_REMAINDER << TIM_BUCKET_W1_S_CHUNK_REMAINDER)
+
+#define TIM_BUCKET_LOCK (TIM_BUCKET_W1_M_LOCK << TIM_BUCKET_W1_S_LOCK)
+
+#define TIM_BUCKET_SEMA_WLOCK  
\
+   (TIM_BUCKET_CHUNK_REMAIN | (1ull << TIM_BUCKET_W1_S_LOCK))
+
 struct cnxk_tim_evdev {
struct roc_tim tim;
struct rte_eventdev *event_dev;
diff --git a/drivers/event/cnxk/cnxk_tim_worker.c 
b/drivers/event/cnxk/cnxk_tim_worker.c
new file mode 100644
index 0..49ee85245
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_tim_worker.c
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_tim_evdev.h"
+#include "cnxk_tim_worker.h"
diff --git a/drivers/event/cnxk/cnxk_tim_worker.h 
b/drivers/event/cnxk/cnxk_tim_worker.h
new file mode 100644
index 0..d56e67360
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_tim_worker.h
@@ -0,0 +1,123 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#ifndef __CNXK_TIM_WORKER_H__
+#define __CNXK_TIM_WORKER_H__
+
+#include "cnxk_tim_evdev.h"
+
+static inline uint8_t
+cnxk_tim_bkt_fetch_lock(uint64_t w1)
+{
+   return (w1 >> TIM_BUCKET_W1_S_LOCK) & TIM_BUCKET_W1_M_LOCK;
+}
+
+static inline int16_t
+cnxk_tim_bkt_fetch_rem(uint64_t w1)
+{
+   return (w1 >> TIM_BUCKET_W1_S_CHUNK_REMAINDER) &
+  TIM_BUCKET_W1_M_CHUNK_REMAINDER;
+}
+
+static inline int16_t
+cnxk_tim_bkt_get_rem(struct cnxk_tim_bkt *bktp)
+{
+   return __atomic_load_n(&bktp->chunk_remainder, __ATOMIC_ACQUIRE);
+}
+
+static inline void
+cnxk_tim_bkt_set_rem(struct cnxk_tim_bkt *bktp, uint16_t v)
+{
+   __atomic_store_n(&bktp->chunk_remainder, v, __ATOMIC_RELAXED);
+}
+
+static inline void
+cnxk_tim_bkt_sub_rem(struct cnxk_tim_bkt *bktp, uint16_t v)
+{
+   __atomic_fetch_sub(&bktp->chunk_remainder, v, __ATOMIC_RELAXED);
+}
+
+static inline uint8_t
+cnxk_tim_bkt_get_hbt(uint64_t w1)
+{
+   return (w1 >> TIM_BUCKET_W1_S_HBT) & TIM_BUCKET_W1_M_HBT;
+}
+
+static inline uint8_t
+cnxk_tim_bkt_get_bsk(uint64_t w1)
+{
+   return (w1 >> TIM_BUCKET_W1_S_BSK) & TIM_BUCKET_W1_M_BSK;
+}
+
+static inline uint64_t
+cnxk_tim_bkt_clr_bsk(struct cnxk_tim_bkt *bktp)
+{
+   /* Clear everything except lock. */
+   const uint64_t v = TIM_BUCKET_W1_M_LOCK << TIM_BUCKET_W1_S_LOCK;
+
+   return __atomic_fetch_and(&bktp->w1, v, __ATOMIC_ACQ_REL);
+}
+
+static inline uint64_t
+cnxk_tim_bkt_fetch_sema_lock(struct cnxk_tim_bkt *bktp)
+{
+   return __atomic_fetch_add(&bktp->w1, TIM_BUCKET_SEMA_WLOCK,
+ __ATOMIC_ACQUIRE);
+}
+
+static inline uint64_t
+cnxk_tim_bkt_fetch_sema(struct cnxk_tim_bkt *bktp)
+{
+   return __atomic_fetch_add(&bktp->w1, TIM_BUCKET_SEMA, __ATOMIC_RELAXED);
+}
+
+stati

[dpdk-dev] [PATCH v4 29/34] event/cnxk: add timer arm routine

[pbhagavatula]

From: Pavan Nikhilesh 

Add event timer arm routine.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_tim_evdev.c  |  18 ++
 drivers/event/cnxk/cnxk_tim_evdev.h  |  23 ++
 drivers/event/cnxk/cnxk_tim_worker.c |  95 +
 drivers/event/cnxk/cnxk_tim_worker.h | 300 +++
 4 files changed, 436 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index e06fe2f52..ecc952a6a 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -76,6 +76,21 @@ cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
return rc;
 }
 
+static void
+cnxk_tim_set_fp_ops(struct cnxk_tim_ring *tim_ring)
+{
+   uint8_t prod_flag = !tim_ring->prod_type_sp;
+
+   /* [DFB/FB] [SP][MP]*/
+   const rte_event_timer_arm_burst_t arm_burst[2][2] = {
+#define FP(_name, _f2, _f1, flags) [_f2][_f1] = cnxk_tim_arm_burst_##_name,
+   TIM_ARM_FASTPATH_MODES
+#undef FP
+   };
+
+   cnxk_tim_ops.arm_burst = arm_burst[tim_ring->ena_dfb][prod_flag];
+}
+
 static void
 cnxk_tim_ring_info_get(const struct rte_event_timer_adapter *adptr,
   struct rte_event_timer_adapter_info *adptr_info)
@@ -173,6 +188,9 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
plt_write64((uint64_t)tim_ring->bkt, tim_ring->base + TIM_LF_RING_BASE);
plt_write64(tim_ring->aura, tim_ring->base + TIM_LF_RING_AURA);
 
+   /* Set fastpath ops. */
+   cnxk_tim_set_fp_ops(tim_ring);
+
/* Update SSO xae count. */
cnxk_sso_updt_xae_cnt(cnxk_sso_pmd_priv(dev->event_dev), tim_ring,
  RTE_EVENT_TYPE_TIMER);
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index f6895417a..1f2aad17a 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "roc_api.h"
 
@@ -37,6 +38,11 @@
 #define CNXK_TIM_CHNK_SLOTS  "tim_chnk_slots"
 #define CNXK_TIM_RINGS_LMT   "tim_rings_lmt"
 
+#define CNXK_TIM_SP 0x1
+#define CNXK_TIM_MP 0x2
+#define CNXK_TIM_ENA_FB 0x10
+#define CNXK_TIM_ENA_DFB 0x20
+
 #define TIM_BUCKET_W1_S_CHUNK_REMAINDER (48)
 #define TIM_BUCKET_W1_M_CHUNK_REMAINDER
\
((1ULL << (64 - TIM_BUCKET_W1_S_CHUNK_REMAINDER)) - 1)
@@ -107,10 +113,14 @@ struct cnxk_tim_ring {
uintptr_t base;
uint16_t nb_chunk_slots;
uint32_t nb_bkts;
+   uint64_t last_updt_cyc;
+   uint64_t ring_start_cyc;
uint64_t tck_int;
uint64_t tot_int;
struct cnxk_tim_bkt *bkt;
struct rte_mempool *chunk_pool;
+   struct rte_reciprocal_u64 fast_div;
+   struct rte_reciprocal_u64 fast_bkt;
uint64_t arm_cnt;
uint8_t prod_type_sp;
uint8_t disable_npa;
@@ -201,6 +211,19 @@ cnxk_tim_cntfrq(void)
 }
 #endif
 
+#define TIM_ARM_FASTPATH_MODES 
\
+   FP(sp, 0, 0, CNXK_TIM_ENA_DFB | CNXK_TIM_SP)   \
+   FP(mp, 0, 1, CNXK_TIM_ENA_DFB | CNXK_TIM_MP)   \
+   FP(fb_sp, 1, 0, CNXK_TIM_ENA_FB | CNXK_TIM_SP) \
+   FP(fb_mp, 1, 1, CNXK_TIM_ENA_FB | CNXK_TIM_MP)
+
+#define FP(_name, _f2, _f1, flags) 
\
+   uint16_t cnxk_tim_arm_burst_##_name(   \
+   const struct rte_event_timer_adapter *adptr,   \
+   struct rte_event_timer **tim, const uint16_t nb_timers);
+TIM_ARM_FASTPATH_MODES
+#undef FP
+
 int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
  uint32_t *caps,
  const struct rte_event_timer_adapter_ops **ops);
diff --git a/drivers/event/cnxk/cnxk_tim_worker.c 
b/drivers/event/cnxk/cnxk_tim_worker.c
index 49ee85245..268f845c8 100644
--- a/drivers/event/cnxk/cnxk_tim_worker.c
+++ b/drivers/event/cnxk/cnxk_tim_worker.c
@@ -4,3 +4,98 @@
 
 #include "cnxk_tim_evdev.h"
 #include "cnxk_tim_worker.h"
+
+static inline int
+cnxk_tim_arm_checks(const struct cnxk_tim_ring *const tim_ring,
+   struct rte_event_timer *const tim)
+{
+   if (unlikely(tim->state)) {
+   tim->state = RTE_EVENT_TIMER_ERROR;
+   rte_errno = EALREADY;
+   goto fail;
+   }
+
+   if (unlikely(!tim->timeout_ticks ||
+tim->timeout_ticks > tim_ring->nb_bkts)) {
+   tim->state = tim->timeout_ticks ?
+  RTE_EVENT_TIMER_ERROR_TOOLATE :
+  RTE_EVENT_TIMER_ERROR_TOOEARLY;
+   rte_errno = EINVAL;
+   goto fail;
+   }
+
+   return 0;
+
+fail:
+   return -EINVAL;
+}
+
+static inline void

Re: [dpdk-dev] [PATCH v3 0/4] Offload flags fixes

[Maxime Coquelin]

Hi David,

On 5/3/21 3:26 PM, David Marchand wrote:
> The important part is the last patch on vhost handling of offloading
> requests coming from a virtio guest interface.
> 
> The rest are small fixes that I accumulated while reviewing the mbuf
> offload flags.
> 
> On this last patch, it has the potential of breaking existing
> applications using the vhost library (OVS being impacted).
> I did not mark it for backport.
> 
> Changes since v2:
> - kept behavior untouched (to avoid breaking ABI) and introduced a new
>   flag to select the new behavior,
> 
> Changes since v1:
> - dropped patch on net/tap,
> - added missing bits in example/vhost,
> - relaxed checks on VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,
> 

Patch 4 does not apply on top of next-virtio/main branch.
Could you please send a rebased version?

Thanks,
Maxime

[dpdk-dev] [PATCH v4 30/34] event/cnxk: add timer arm timeout burst

[pbhagavatula]

From: Pavan Nikhilesh 

Add event timer arm timeout burst function.
All the timers requested to be armed have the same timeout.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_tim_evdev.c  |   7 ++
 drivers/event/cnxk/cnxk_tim_evdev.h  |  12 +++
 drivers/event/cnxk/cnxk_tim_worker.c |  53 ++
 drivers/event/cnxk/cnxk_tim_worker.h | 141 +++
 4 files changed, 213 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index ecc952a6a..68c3b3049 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -88,7 +88,14 @@ cnxk_tim_set_fp_ops(struct cnxk_tim_ring *tim_ring)
 #undef FP
};
 
+   const rte_event_timer_arm_tmo_tick_burst_t arm_tmo_burst[2] = {
+#define FP(_name, _f1, flags) [_f1] = cnxk_tim_arm_tmo_tick_burst_##_name,
+   TIM_ARM_TMO_FASTPATH_MODES
+#undef FP
+   };
+
cnxk_tim_ops.arm_burst = arm_burst[tim_ring->ena_dfb][prod_flag];
+   cnxk_tim_ops.arm_tmo_tick_burst = arm_tmo_burst[tim_ring->ena_dfb];
 }
 
 static void
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index 1f2aad17a..b66aac17c 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -217,6 +217,10 @@ cnxk_tim_cntfrq(void)
FP(fb_sp, 1, 0, CNXK_TIM_ENA_FB | CNXK_TIM_SP) \
FP(fb_mp, 1, 1, CNXK_TIM_ENA_FB | CNXK_TIM_MP)
 
+#define TIM_ARM_TMO_FASTPATH_MODES 
\
+   FP(dfb, 0, CNXK_TIM_ENA_DFB)   \
+   FP(fb, 1, CNXK_TIM_ENA_FB)
+
 #define FP(_name, _f2, _f1, flags) 
\
uint16_t cnxk_tim_arm_burst_##_name(   \
const struct rte_event_timer_adapter *adptr,   \
@@ -224,6 +228,14 @@ cnxk_tim_cntfrq(void)
 TIM_ARM_FASTPATH_MODES
 #undef FP
 
+#define FP(_name, _f1, flags)  
\
+   uint16_t cnxk_tim_arm_tmo_tick_burst_##_name(  \
+   const struct rte_event_timer_adapter *adptr,   \
+   struct rte_event_timer **tim, const uint64_t timeout_tick, \
+   const uint16_t nb_timers);
+TIM_ARM_TMO_FASTPATH_MODES
+#undef FP
+
 int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
  uint32_t *caps,
  const struct rte_event_timer_adapter_ops **ops);
diff --git a/drivers/event/cnxk/cnxk_tim_worker.c 
b/drivers/event/cnxk/cnxk_tim_worker.c
index 268f845c8..717c53fb7 100644
--- a/drivers/event/cnxk/cnxk_tim_worker.c
+++ b/drivers/event/cnxk/cnxk_tim_worker.c
@@ -99,3 +99,56 @@ cnxk_tim_timer_arm_burst(const struct 
rte_event_timer_adapter *adptr,
}
 TIM_ARM_FASTPATH_MODES
 #undef FP
+
+static __rte_always_inline uint16_t
+cnxk_tim_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
+   struct rte_event_timer **tim,
+   const uint64_t timeout_tick,
+   const uint16_t nb_timers, const uint8_t flags)
+{
+   struct cnxk_tim_ent entry[CNXK_TIM_MAX_BURST] __rte_cache_aligned;
+   struct cnxk_tim_ring *tim_ring = adptr->data->adapter_priv;
+   uint16_t set_timers = 0;
+   uint16_t arr_idx = 0;
+   uint16_t idx;
+   int ret;
+
+   if (unlikely(!timeout_tick || timeout_tick > tim_ring->nb_bkts)) {
+   const enum rte_event_timer_state state =
+   timeout_tick ? RTE_EVENT_TIMER_ERROR_TOOLATE :
+RTE_EVENT_TIMER_ERROR_TOOEARLY;
+   for (idx = 0; idx < nb_timers; idx++)
+   tim[idx]->state = state;
+
+   rte_errno = EINVAL;
+   return 0;
+   }
+
+   cnxk_tim_sync_start_cyc(tim_ring);
+   while (arr_idx < nb_timers) {
+   for (idx = 0; idx < CNXK_TIM_MAX_BURST && (arr_idx < nb_timers);
+idx++, arr_idx++) {
+   cnxk_tim_format_event(tim[arr_idx], &entry[idx]);
+   }
+   ret = cnxk_tim_add_entry_brst(tim_ring, timeout_tick,
+ &tim[set_timers], entry, idx,
+ flags);
+   set_timers += ret;
+   if (ret != idx)
+   break;
+   }
+
+   return set_timers;
+}
+
+#define FP(_name, _f1, _flags) 
\
+   uint16_t __rte_noinline cnxk_tim_arm_tmo_tick_burst_##_name(   \
+   const struct rte_event_timer_adapter *adptr,   \
+   struct rte_event_timer **tim, const uint64_t timeout_tick, \
+   const uint16_t nb_ti

[dpdk-dev] [PATCH v4 31/34] event/cnxk: add timer cancel function

[pbhagavatula]

From: Pavan Nikhilesh 

Add function to cancel event timer that has been armed.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_tim_evdev.c  |  1 +
 drivers/event/cnxk/cnxk_tim_evdev.h  |  5 
 drivers/event/cnxk/cnxk_tim_worker.c | 30 ++
 drivers/event/cnxk/cnxk_tim_worker.h | 37 
 4 files changed, 73 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 68c3b3049..62a15a4a1 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -96,6 +96,7 @@ cnxk_tim_set_fp_ops(struct cnxk_tim_ring *tim_ring)
 
cnxk_tim_ops.arm_burst = arm_burst[tim_ring->ena_dfb][prod_flag];
cnxk_tim_ops.arm_tmo_tick_burst = arm_tmo_burst[tim_ring->ena_dfb];
+   cnxk_tim_ops.cancel_burst = cnxk_tim_timer_cancel_burst;
 }
 
 static void
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index b66aac17c..001f448d5 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -236,6 +236,11 @@ TIM_ARM_FASTPATH_MODES
 TIM_ARM_TMO_FASTPATH_MODES
 #undef FP
 
+uint16_t
+cnxk_tim_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
+   struct rte_event_timer **tim,
+   const uint16_t nb_timers);
+
 int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
  uint32_t *caps,
  const struct rte_event_timer_adapter_ops **ops);
diff --git a/drivers/event/cnxk/cnxk_tim_worker.c 
b/drivers/event/cnxk/cnxk_tim_worker.c
index 717c53fb7..98ff143c3 100644
--- a/drivers/event/cnxk/cnxk_tim_worker.c
+++ b/drivers/event/cnxk/cnxk_tim_worker.c
@@ -152,3 +152,33 @@ cnxk_tim_timer_arm_tmo_brst(const struct 
rte_event_timer_adapter *adptr,
}
 TIM_ARM_TMO_FASTPATH_MODES
 #undef FP
+
+uint16_t
+cnxk_tim_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
+   struct rte_event_timer **tim,
+   const uint16_t nb_timers)
+{
+   uint16_t index;
+   int ret;
+
+   RTE_SET_USED(adptr);
+   rte_atomic_thread_fence(__ATOMIC_ACQUIRE);
+   for (index = 0; index < nb_timers; index++) {
+   if (tim[index]->state == RTE_EVENT_TIMER_CANCELED) {
+   rte_errno = EALREADY;
+   break;
+   }
+
+   if (tim[index]->state != RTE_EVENT_TIMER_ARMED) {
+   rte_errno = EINVAL;
+   break;
+   }
+   ret = cnxk_tim_rm_entry(tim[index]);
+   if (ret) {
+   rte_errno = -ret;
+   break;
+   }
+   }
+
+   return index;
+}
diff --git a/drivers/event/cnxk/cnxk_tim_worker.h 
b/drivers/event/cnxk/cnxk_tim_worker.h
index 56cb4cdd9..7caeb1a8f 100644
--- a/drivers/event/cnxk/cnxk_tim_worker.h
+++ b/drivers/event/cnxk/cnxk_tim_worker.h
@@ -561,4 +561,41 @@ cnxk_tim_add_entry_brst(struct cnxk_tim_ring *const 
tim_ring,
return nb_timers;
 }
 
+static int
+cnxk_tim_rm_entry(struct rte_event_timer *tim)
+{
+   struct cnxk_tim_ent *entry;
+   struct cnxk_tim_bkt *bkt;
+   uint64_t lock_sema;
+
+   if (tim->impl_opaque[1] == 0 || tim->impl_opaque[0] == 0)
+   return -ENOENT;
+
+   entry = (struct cnxk_tim_ent *)(uintptr_t)tim->impl_opaque[0];
+   if (entry->wqe != tim->ev.u64) {
+   tim->impl_opaque[0] = 0;
+   tim->impl_opaque[1] = 0;
+   return -ENOENT;
+   }
+
+   bkt = (struct cnxk_tim_bkt *)(uintptr_t)tim->impl_opaque[1];
+   lock_sema = cnxk_tim_bkt_inc_lock(bkt);
+   if (cnxk_tim_bkt_get_hbt(lock_sema) ||
+   !cnxk_tim_bkt_get_nent(lock_sema)) {
+   tim->impl_opaque[0] = 0;
+   tim->impl_opaque[1] = 0;
+   cnxk_tim_bkt_dec_lock(bkt);
+   return -ENOENT;
+   }
+
+   entry->w0 = 0;
+   entry->wqe = 0;
+   tim->state = RTE_EVENT_TIMER_CANCELED;
+   tim->impl_opaque[0] = 0;
+   tim->impl_opaque[1] = 0;
+   cnxk_tim_bkt_dec_lock(bkt);
+
+   return 0;
+}
+
 #endif /* __CNXK_TIM_WORKER_H__ */
-- 
2.17.1

[dpdk-dev] [PATCH v4 33/34] event/cnxk: add timer adapter start and stop

[pbhagavatula]

From: Shijith Thotton 

Add event timer adapter start and stop functions.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cnxk_tim_evdev.c | 71 -
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index a73ca33d8..19b71b4f5 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -246,6 +246,73 @@ cnxk_tim_ring_free(struct rte_event_timer_adapter *adptr)
return 0;
 }
 
+static void
+cnxk_tim_calibrate_start_tsc(struct cnxk_tim_ring *tim_ring)
+{
+#define CNXK_TIM_CALIB_ITER 1E6
+   uint32_t real_bkt, bucket;
+   int icount, ecount = 0;
+   uint64_t bkt_cyc;
+
+   for (icount = 0; icount < CNXK_TIM_CALIB_ITER; icount++) {
+   real_bkt = plt_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
+   bkt_cyc = cnxk_tim_cntvct();
+   bucket = (bkt_cyc - tim_ring->ring_start_cyc) /
+tim_ring->tck_int;
+   bucket = bucket % (tim_ring->nb_bkts);
+   tim_ring->ring_start_cyc =
+   bkt_cyc - (real_bkt * tim_ring->tck_int);
+   if (bucket != real_bkt)
+   ecount++;
+   }
+   tim_ring->last_updt_cyc = bkt_cyc;
+   plt_tim_dbg("Bucket mispredict %3.2f distance %d\n",
+   100 - (((double)(icount - ecount) / (double)icount) * 100),
+   bucket - real_bkt);
+}
+
+static int
+cnxk_tim_ring_start(const struct rte_event_timer_adapter *adptr)
+{
+   struct cnxk_tim_ring *tim_ring = adptr->data->adapter_priv;
+   struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
+   int rc;
+
+   if (dev == NULL)
+   return -ENODEV;
+
+   rc = roc_tim_lf_enable(&dev->tim, tim_ring->ring_id,
+  &tim_ring->ring_start_cyc, NULL);
+   if (rc < 0)
+   return rc;
+
+   tim_ring->tck_int = NSEC2TICK(tim_ring->tck_nsec, cnxk_tim_cntfrq());
+   tim_ring->tot_int = tim_ring->tck_int * tim_ring->nb_bkts;
+   tim_ring->fast_div = rte_reciprocal_value_u64(tim_ring->tck_int);
+   tim_ring->fast_bkt = rte_reciprocal_value_u64(tim_ring->nb_bkts);
+
+   cnxk_tim_calibrate_start_tsc(tim_ring);
+
+   return rc;
+}
+
+static int
+cnxk_tim_ring_stop(const struct rte_event_timer_adapter *adptr)
+{
+   struct cnxk_tim_ring *tim_ring = adptr->data->adapter_priv;
+   struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
+   int rc;
+
+   if (dev == NULL)
+   return -ENODEV;
+
+   rc = roc_tim_lf_disable(&dev->tim, tim_ring->ring_id);
+   if (rc < 0)
+   plt_err("Failed to disable timer ring");
+
+   return rc;
+}
+
 static int
 cnxk_tim_stats_get(const struct rte_event_timer_adapter *adapter,
   struct rte_event_timer_adapter_stats *stats)
@@ -278,13 +345,14 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, 
uint64_t flags,
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
 
RTE_SET_USED(flags);
-   RTE_SET_USED(ops);
 
if (dev == NULL)
return -ENODEV;
 
cnxk_tim_ops.init = cnxk_tim_ring_create;
cnxk_tim_ops.uninit = cnxk_tim_ring_free;
+   cnxk_tim_ops.start = cnxk_tim_ring_start;
+   cnxk_tim_ops.stop = cnxk_tim_ring_stop;
cnxk_tim_ops.get_info = cnxk_tim_ring_info_get;
 
if (dev->enable_stats) {
@@ -295,6 +363,7 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, 
uint64_t flags,
/* Store evdev pointer for later use. */
dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
*caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;
+   *ops = &cnxk_tim_ops;
 
return 0;
 }
-- 
2.17.1

[dpdk-dev] [PATCH v4 32/34] event/cnxk: add timer stats get and reset

[pbhagavatula]

From: Shijith Thotton 

Add event timer adapter statistics get and reset functions.
Stats are disabled by default and can be enabled through devargs.

Example:
--dev "0002:1e:00.0,tim_stats_ena=1"

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst|  9 +
 drivers/event/cnxk/cn10k_eventdev.c  |  3 +-
 drivers/event/cnxk/cn9k_eventdev.c   |  3 +-
 drivers/event/cnxk/cnxk_tim_evdev.c  | 50 
 drivers/event/cnxk/cnxk_tim_evdev.h  | 38 ++---
 drivers/event/cnxk/cnxk_tim_worker.c | 11 --
 6 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index a8199aac7..11145dd7d 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -115,6 +115,15 @@ Runtime Config Options
 
 -a 0002:0e:00.0,tim_chnk_slots=1023
 
+- ``TIM enable arm/cancel statistics``
+
+  The ``tim_stats_ena`` devargs can be used to enable arm and cancel stats of
+  event timer adapter.
+
+  For example::
+
+-a 0002:0e:00.0,tim_stats_ena=1
+
 - ``TIM limit max rings reserved``
 
   The ``tim_rings_lmt`` devargs can be used to limit the max number of TIM
diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index cadc792a7..bf4052c76 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -505,4 +505,5 @@ RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT 
"="
  CN10K_SSO_GW_MODE "="
  CNXK_TIM_DISABLE_NPA "=1"
  CNXK_TIM_CHNK_SLOTS "="
- CNXK_TIM_RINGS_LMT "=");
+ CNXK_TIM_RINGS_LMT "="
+ CNXK_TIM_STATS_ENA "=1");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index e503f6b1c..0684417ea 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -574,4 +574,5 @@ RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT 
"="
  CN9K_SSO_SINGLE_WS "=1"
  CNXK_TIM_DISABLE_NPA "=1"
  CNXK_TIM_CHNK_SLOTS "="
- CNXK_TIM_RINGS_LMT "=");
+ CNXK_TIM_RINGS_LMT "="
+ CNXK_TIM_STATS_ENA "=1");
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 62a15a4a1..a73ca33d8 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -81,21 +81,25 @@ cnxk_tim_set_fp_ops(struct cnxk_tim_ring *tim_ring)
 {
uint8_t prod_flag = !tim_ring->prod_type_sp;
 
-   /* [DFB/FB] [SP][MP]*/
-   const rte_event_timer_arm_burst_t arm_burst[2][2] = {
-#define FP(_name, _f2, _f1, flags) [_f2][_f1] = cnxk_tim_arm_burst_##_name,
+   /* [STATS] [DFB/FB] [SP][MP]*/
+   const rte_event_timer_arm_burst_t arm_burst[2][2][2] = {
+#define FP(_name, _f3, _f2, _f1, flags)
\
+   [_f3][_f2][_f1] = cnxk_tim_arm_burst_##_name,
TIM_ARM_FASTPATH_MODES
 #undef FP
};
 
-   const rte_event_timer_arm_tmo_tick_burst_t arm_tmo_burst[2] = {
-#define FP(_name, _f1, flags) [_f1] = cnxk_tim_arm_tmo_tick_burst_##_name,
+   const rte_event_timer_arm_tmo_tick_burst_t arm_tmo_burst[2][2] = {
+#define FP(_name, _f2, _f1, flags) 
\
+   [_f2][_f1] = cnxk_tim_arm_tmo_tick_burst_##_name,
TIM_ARM_TMO_FASTPATH_MODES
 #undef FP
};
 
-   cnxk_tim_ops.arm_burst = arm_burst[tim_ring->ena_dfb][prod_flag];
-   cnxk_tim_ops.arm_tmo_tick_burst = arm_tmo_burst[tim_ring->ena_dfb];
+   cnxk_tim_ops.arm_burst =
+   arm_burst[tim_ring->enable_stats][tim_ring->ena_dfb][prod_flag];
+   cnxk_tim_ops.arm_tmo_tick_burst =
+   arm_tmo_burst[tim_ring->enable_stats][tim_ring->ena_dfb];
cnxk_tim_ops.cancel_burst = cnxk_tim_timer_cancel_burst;
 }
 
@@ -159,6 +163,7 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
tim_ring->nb_timers = rcfg->nb_timers;
tim_ring->chunk_sz = dev->chunk_sz;
tim_ring->disable_npa = dev->disable_npa;
+   tim_ring->enable_stats = dev->enable_stats;
 
if (tim_ring->disable_npa) {
tim_ring->nb_chunks =
@@ -241,6 +246,30 @@ cnxk_tim_ring_free(struct rte_event_timer_adapter *adptr)
return 0;
 }
 
+static int
+cnxk_tim_stats_get(const struct rte_event_timer_adapter *adapter,
+  struct rte_event_timer_adapter_stats *stats)
+{
+   struct cnxk_tim_ring *tim_ring = adapter->data->adapter_priv;
+   uint64_t bkt_cyc = cnxk_tim_cntvct() - tim_ring->ring_start_cyc;
+
+   stats->evtim_exp_count =
+   __atomic_load_n(&tim_ring->arm_cnt, __ATO

[dpdk-dev] [PATCH v4 34/34] event/cnxk: add devargs to control timer adapters

[pbhagavatula]

From: Shijith Thotton 

Add devargs to control each event timer adapter i.e. TIM rings internal
parameters uniquely. The following dict format is expected
[ring-chnk_slots-disable_npa-stats_ena]. 0 represents default values.

Example:
--dev "0002:1e:00.0,tim_ring_ctl=[2-1023-1-0]"

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 doc/guides/eventdevs/cnxk.rst   | 11 
 drivers/event/cnxk/cnxk_tim_evdev.c | 96 -
 drivers/event/cnxk/cnxk_tim_evdev.h | 10 +++
 3 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index 11145dd7d..1bd935abc 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -135,6 +135,17 @@ Runtime Config Options
 
 -a 0002:0e:00.0,tim_rings_lmt=5
 
+- ``TIM ring control internal parameters``
+
+  When using multiple TIM rings the ``tim_ring_ctl`` devargs can be used to
+  control each TIM rings internal parameters uniquely. The following dict
+  format is expected [ring-chnk_slots-disable_npa-stats_ena]. 0 represents
+  default values.
+
+  For Example::
+
+-a 0002:0e:00.0,tim_ring_ctl=[2-1023-1-0]
+
 Debugging Options
 -
 
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 19b71b4f5..9d40e336d 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -121,7 +121,7 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
struct rte_event_timer_adapter_conf *rcfg = &adptr->data->conf;
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
struct cnxk_tim_ring *tim_ring;
-   int rc;
+   int i, rc;
 
if (dev == NULL)
return -ENODEV;
@@ -165,6 +165,20 @@ cnxk_tim_ring_create(struct rte_event_timer_adapter *adptr)
tim_ring->disable_npa = dev->disable_npa;
tim_ring->enable_stats = dev->enable_stats;
 
+   for (i = 0; i < dev->ring_ctl_cnt; i++) {
+   struct cnxk_tim_ctl *ring_ctl = &dev->ring_ctl_data[i];
+
+   if (ring_ctl->ring == tim_ring->ring_id) {
+   tim_ring->chunk_sz =
+   ring_ctl->chunk_slots ?
+   ((uint32_t)(ring_ctl->chunk_slots + 1) *
+CNXK_TIM_CHUNK_ALIGNMENT) :
+ tim_ring->chunk_sz;
+   tim_ring->enable_stats = ring_ctl->enable_stats;
+   tim_ring->disable_npa = ring_ctl->disable_npa;
+   }
+   }
+
if (tim_ring->disable_npa) {
tim_ring->nb_chunks =
tim_ring->nb_timers /
@@ -368,6 +382,84 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, 
uint64_t flags,
return 0;
 }
 
+static void
+cnxk_tim_parse_ring_param(char *value, void *opaque)
+{
+   struct cnxk_tim_evdev *dev = opaque;
+   struct cnxk_tim_ctl ring_ctl = {0};
+   char *tok = strtok(value, "-");
+   struct cnxk_tim_ctl *old_ptr;
+   uint16_t *val;
+
+   val = (uint16_t *)&ring_ctl;
+
+   if (!strlen(value))
+   return;
+
+   while (tok != NULL) {
+   *val = atoi(tok);
+   tok = strtok(NULL, "-");
+   val++;
+   }
+
+   if (val != (&ring_ctl.enable_stats + 1)) {
+   plt_err("Invalid ring param expected 
[ring-chunk_sz-disable_npa-enable_stats]");
+   return;
+   }
+
+   dev->ring_ctl_cnt++;
+   old_ptr = dev->ring_ctl_data;
+   dev->ring_ctl_data =
+   rte_realloc(dev->ring_ctl_data,
+   sizeof(struct cnxk_tim_ctl) * dev->ring_ctl_cnt, 0);
+   if (dev->ring_ctl_data == NULL) {
+   dev->ring_ctl_data = old_ptr;
+   dev->ring_ctl_cnt--;
+   return;
+   }
+
+   dev->ring_ctl_data[dev->ring_ctl_cnt - 1] = ring_ctl;
+}
+
+static void
+cnxk_tim_parse_ring_ctl_list(const char *value, void *opaque)
+{
+   char *s = strdup(value);
+   char *start = NULL;
+   char *end = NULL;
+   char *f = s;
+
+   while (*s) {
+   if (*s == '[')
+   start = s;
+   else if (*s == ']')
+   end = s;
+
+   if (start && start < end) {
+   *end = 0;
+   cnxk_tim_parse_ring_param(start + 1, opaque);
+   start = end;
+   s = end;
+   }
+   s++;
+   }
+
+   free(f);
+}
+
+static int
+cnxk_tim_parse_kvargs_dict(const char *key, const char *value, void *opaque)
+{
+   RTE_SET_USED(key);
+
+   /* Dict format [ring-chunk_sz-disable_npa-enable_stats] use '-' as ','
+* isn't allowed. 0 represents default.
+*/
+   cnxk_tim_parse_ring_ctl_list(value, opaque);
+
+   return 0;
+}
+
 

Re: [dpdk-dev] [EXT] [PATCH] regex/octeontx2: remove unused include directory

[Guy Kaneti]

> -Original Message-
> From: Thomas Monjalon 
> Sent: Monday, May 3, 2021 5:46 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Guy Kaneti 
> Subject: [EXT] [PATCH] regex/octeontx2: remove unused include directory
> 
> External Email
> 
> --
> The variable inc_dir is not defined in this file.
> 
> Fixes: 4cd1c5fd9ed4 ("regex/octeontx2: introduce REE driver")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Thomas Monjalon 
> ---
>  drivers/regex/octeontx2/meson.build | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/regex/octeontx2/meson.build
> b/drivers/regex/octeontx2/meson.build
> index 4930ce00f4..3f81add5bf 100644
> --- a/drivers/regex/octeontx2/meson.build
> +++ b/drivers/regex/octeontx2/meson.build
> @@ -12,7 +12,6 @@ lib = cc.find_library('librxp_compiler', required: false)  
> if
> lib.found()
>  ext_deps += lib
>  ext_deps += cc.find_library('libstdc++', required: true)
> -includes += include_directories(inc_dir)
>  cflags += ['-DREE_COMPILER_SDK']
>  endif
> 

Acked-by: Guy Kaneti 

Re: [dpdk-dev] [PATCH v3 0/4] Offload flags fixes

[David Marchand]

On Mon, May 3, 2021 at 5:24 PM Maxime Coquelin
 wrote:
> On 5/3/21 3:26 PM, David Marchand wrote:
> > The important part is the last patch on vhost handling of offloading
> > requests coming from a virtio guest interface.
> >
> > The rest are small fixes that I accumulated while reviewing the mbuf
> > offload flags.
> >
> > On this last patch, it has the potential of breaking existing
> > applications using the vhost library (OVS being impacted).
> > I did not mark it for backport.
> >
> > Changes since v2:
> > - kept behavior untouched (to avoid breaking ABI) and introduced a new
> >   flag to select the new behavior,
> >
> > Changes since v1:
> > - dropped patch on net/tap,
> > - added missing bits in example/vhost,
> > - relaxed checks on VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,
> >
>
> Patch 4 does not apply on top of next-virtio/main branch.
> Could you please send a rebased version?

The conflict is with Balazs rework.
Ok, preparing v4.


-- 
David Marchand

Re: [dpdk-dev] New PMD integration to next version release

[Stephen Hemminger]

On Mon, 3 May 2021 16:00:42 +0530
Supriya Shekhar Mane  wrote:

> Hi Maintainers,
> 
> We want to open source the *Dakota Ethernet PMD*.
> We are ready with changes to be open source.
> We want to integrate our changes onto the next release: *19.11.9*
> Kindly, guide us with the process and initiation of the same.
> 
> Regards,
> Supriya Mane
> 


The 19.11 branch is in stable long-term-support mode, and adding
new drivers is not supported.

The DPDK current release is 21.02 and 21.05 is in final release process.
You should submit your driver based on the current main branch which
is 21.05 and then it will likely be picked up for 21.08 release.

[dpdk-dev] [PATCH] telemetry: remove internal symbol from public header

[jerinj]

From: Jerin Jacob 

Remove TELEMETRY_MAX_CALLBACKS symbol from public
rte_telemetry.h header file.

Signed-off-by: Jerin Jacob 
---
 lib/telemetry/rte_telemetry.h | 2 --
 lib/telemetry/telemetry.c | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
index 031db9e968..c08146e142 100644
--- a/lib/telemetry/rte_telemetry.h
+++ b/lib/telemetry/rte_telemetry.h
@@ -10,8 +10,6 @@
 #ifndef _RTE_TELEMETRY_H_
 #define _RTE_TELEMETRY_H_
 
-/** Maximum number of telemetry callbacks. */
-#define TELEMETRY_MAX_CALLBACKS 64
 /** Maximum length for string used in object. */
 #define RTE_TEL_MAX_STRING_LEN 64
 /** Maximum length of string. */
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 386d0080bc..c06de45531 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -27,6 +27,9 @@
 #define MAX_OUTPUT_LEN (1024 * 16)
 #define MAX_CONNECTIONS 10
 
+/** Maximum number of telemetry callbacks. */
+#define TELEMETRY_MAX_CALLBACKS 64
+
 #ifndef RTE_EXEC_ENV_WINDOWS
 static void *
 client_handler(void *socket);
-- 
2.31.1

[dpdk-dev] [PATCH v4 0/3] Offload flags fixes

[David Marchand]

The important part is the last patch on vhost handling of offloading
requests coming from a virtio guest interface.

The rest are small fixes that I accumulated while reviewing the mbuf
offload flags.

On this last patch, it has the potential of breaking existing
applications using the vhost library (OVS being impacted).
I did not mark it for backport.

Changes since v3:
- patch 1 went through the main repo,
- rebased on next-virtio,

Changes since v2:
- kept behavior untouched (to avoid breaking ABI) and introduced a new
  flag to select the new behavior,

Changes since v1:
- dropped patch on net/tap,
- added missing bits in example/vhost,
- relaxed checks on VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,

-- 
David Marchand

David Marchand (3):
  net/virtio: do not touch Tx offload flags
  net/virtio: refactor Tx offload helper
  vhost: fix offload flags in Rx path

 doc/guides/prog_guide/vhost_lib.rst  |  12 ++
 doc/guides/rel_notes/release_21_05.rst   |   6 +
 drivers/net/vhost/rte_eth_vhost.c|   2 +-
 drivers/net/virtio/virtio_rxtx.c |   7 +-
 drivers/net/virtio/virtio_rxtx_packed_avx.h  |   2 +-
 drivers/net/virtio/virtio_rxtx_packed_neon.h |   2 +-
 drivers/net/virtio/virtqueue.h   |  81 
 examples/vhost/main.c|  44 ++---
 lib/vhost/rte_vhost.h|   1 +
 lib/vhost/socket.c   |   5 +-
 lib/vhost/vhost.c|   6 +-
 lib/vhost/vhost.h|  14 +-
 lib/vhost/virtio_net.c   | 185 ---
 13 files changed, 266 insertions(+), 101 deletions(-)

-- 
2.23.0

[dpdk-dev] [PATCH v4 1/3] net/virtio: do not touch Tx offload flags

[David Marchand]

Tx offload flags are of the application responsibility.
Leave the mbuf alone and use a local storage for implicit tcp checksum
offloading in case of TSO.

Signed-off-by: David Marchand 
Reviewed-by: Maxime Coquelin 
Acked-by: Flavio Leitner 
---
 drivers/net/virtio/virtqueue.h | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index e9992b745d..ed3b85080e 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -622,10 +622,12 @@ virtqueue_xmit_offload(struct virtio_net_hdr *hdr,
uint8_t offload)
 {
if (offload) {
+   uint64_t csum_l4 = cookie->ol_flags & PKT_TX_L4_MASK;
+
if (cookie->ol_flags & PKT_TX_TCP_SEG)
-   cookie->ol_flags |= PKT_TX_TCP_CKSUM;
+   csum_l4 |= PKT_TX_TCP_CKSUM;
 
-   switch (cookie->ol_flags & PKT_TX_L4_MASK) {
+   switch (csum_l4) {
case PKT_TX_UDP_CKSUM:
hdr->csum_start = cookie->l2_len + cookie->l3_len;
hdr->csum_offset = offsetof(struct rte_udp_hdr,
-- 
2.23.0

[dpdk-dev] [PATCH v4 2/3] net/virtio: refactor Tx offload helper

[David Marchand]

Purely cosmetic but it is rather odd to have an "offload" helper that
checks if it actually must do something.
We already have the same checks in most callers, so move this branch
in them.

Signed-off-by: David Marchand 
Reviewed-by: Flavio Leitner 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Maxime Coquelin 
---
 drivers/net/virtio/virtio_rxtx.c |  7 +-
 drivers/net/virtio/virtio_rxtx_packed_avx.h  |  2 +-
 drivers/net/virtio/virtio_rxtx_packed_neon.h |  2 +-
 drivers/net/virtio/virtqueue.h   | 83 +---
 4 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 8df913b0ba..34108fb946 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -448,7 +448,7 @@ virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,
if (!vq->hw->has_tx_offload)
virtqueue_clear_net_hdr(hdr);
else
-   virtqueue_xmit_offload(hdr, cookies[i], true);
+   virtqueue_xmit_offload(hdr, cookies[i]);
 
start_dp[idx].addr  = rte_mbuf_data_iova(cookies[i]) - 
head_size;
start_dp[idx].len   = cookies[i]->data_len + head_size;
@@ -495,7 +495,7 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,
if (!vq->hw->has_tx_offload)
virtqueue_clear_net_hdr(hdr);
else
-   virtqueue_xmit_offload(hdr, cookie, true);
+   virtqueue_xmit_offload(hdr, cookie);
 
dp->addr = rte_mbuf_data_iova(cookie) - head_size;
dp->len  = cookie->data_len + head_size;
@@ -581,7 +581,8 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct 
rte_mbuf *cookie,
idx = start_dp[idx].next;
}
 
-   virtqueue_xmit_offload(hdr, cookie, vq->hw->has_tx_offload);
+   if (vq->hw->has_tx_offload)
+   virtqueue_xmit_offload(hdr, cookie);
 
do {
start_dp[idx].addr  = rte_mbuf_data_iova(cookie);
diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h 
b/drivers/net/virtio/virtio_rxtx_packed_avx.h
index 228cf5437b..c819d2e4f2 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h
@@ -115,7 +115,7 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
virtio_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {
hdr = rte_pktmbuf_mtod_offset(tx_pkts[i],
struct virtio_net_hdr *, -head_size);
-   virtqueue_xmit_offload(hdr, tx_pkts[i], true);
+   virtqueue_xmit_offload(hdr, tx_pkts[i]);
}
}
 
diff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h 
b/drivers/net/virtio/virtio_rxtx_packed_neon.h
index d4257e68f0..f19e618635 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_neon.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h
@@ -134,7 +134,7 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,
virtio_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {
hdr = rte_pktmbuf_mtod_offset(tx_pkts[i],
struct virtio_net_hdr *, -head_size);
-   virtqueue_xmit_offload(hdr, tx_pkts[i], true);
+   virtqueue_xmit_offload(hdr, tx_pkts[i]);
}
}
 
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index ed3b85080e..03957b2bd0 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -617,52 +617,44 @@ virtqueue_notify(struct virtqueue *vq)
 } while (0)
 
 static inline void
-virtqueue_xmit_offload(struct virtio_net_hdr *hdr,
-   struct rte_mbuf *cookie,
-   uint8_t offload)
+virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie)
 {
-   if (offload) {
-   uint64_t csum_l4 = cookie->ol_flags & PKT_TX_L4_MASK;
-
-   if (cookie->ol_flags & PKT_TX_TCP_SEG)
-   csum_l4 |= PKT_TX_TCP_CKSUM;
-
-   switch (csum_l4) {
-   case PKT_TX_UDP_CKSUM:
-   hdr->csum_start = cookie->l2_len + cookie->l3_len;
-   hdr->csum_offset = offsetof(struct rte_udp_hdr,
-   dgram_cksum);
-   hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-   break;
-
-   case PKT_TX_TCP_CKSUM:
-   hdr->csum_start = cookie->l2_len + cookie->l3_len;
-   hdr->csum_offset = offsetof(struct rte_tcp_hdr, cksum);
-   hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-   break;
-
-   default:
-   ASSIGN_UNLESS_EQUAL(hdr->csum_start, 0);
-   ASSIGN_UNLESS_EQUAL(hdr->csum_offset, 0);
-  

[dpdk-dev] [PATCH v4 3/3] vhost: fix offload flags in Rx path

[David Marchand]

The vhost library currently configures Tx offloading (PKT_TX_*) on any
packet received from a guest virtio device which asks for some offloading.

This is problematic, as Tx offloading is something that the application
must ask for: the application needs to configure devices
to support every used offloads (ip, tcp checksumming, tso..), and the
various l2/l3/l4 lengths must be set following any processing that
happened in the application itself.

On the other hand, the received packets are not marked wrt current
packet l3/l4 checksumming info.

Copy virtio rx processing to fix those offload flags with some
differences:
- accept VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP,
- ignore anything but the VIRTIO_NET_HDR_F_NEEDS_CSUM flag (to comply with
  the virtio spec),

Some applications might rely on the current behavior, so it is left
untouched by default.
A new RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS flag is added to enable the
new behavior.

The vhost example has been updated for the new behavior: TSO is applied to
any packet marked LRO.

Fixes: 859b480d5afd ("vhost: add guest offload setting")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Maxime Coquelin 
---
Changes since v3:
- rebased on next-virtio,

Changes since v2:
- introduced a new flag to keep existing behavior as the default,
- packets with unrecognised offload are passed to the application with no
  offload metadata rather than dropped,
- ignored VIRTIO_NET_HDR_F_DATA_VALID since the virtio spec states that
  the virtio driver is not allowed to use this flag when transmitting
  packets,

Changes since v1:
- updated vhost example,
- restored VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP support,
- restored log on buggy offload request,

---
 doc/guides/prog_guide/vhost_lib.rst|  12 ++
 doc/guides/rel_notes/release_21_05.rst |   6 +
 drivers/net/vhost/rte_eth_vhost.c  |   2 +-
 examples/vhost/main.c  |  44 +++---
 lib/vhost/rte_vhost.h  |   1 +
 lib/vhost/socket.c |   5 +-
 lib/vhost/vhost.c  |   6 +-
 lib/vhost/vhost.h  |  14 +-
 lib/vhost/virtio_net.c | 185 ++---
 9 files changed, 222 insertions(+), 53 deletions(-)

diff --git a/doc/guides/prog_guide/vhost_lib.rst 
b/doc/guides/prog_guide/vhost_lib.rst
index 7afa351675..d18fb98910 100644
--- a/doc/guides/prog_guide/vhost_lib.rst
+++ b/doc/guides/prog_guide/vhost_lib.rst
@@ -118,6 +118,18 @@ The following is an overview of some key Vhost API 
functions:
 
 It is disabled by default.
 
+  - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS``
+
+Since v16.04, the vhost library forwards checksum and gso requests for
+packets received from a virtio driver by filling Tx offload metadata in
+the mbuf. This behavior is inconsistent with other drivers but it is left
+untouched for existing applications that might rely on it.
+
+This flag disables the legacy behavior and instead ask vhost to simply
+populate Rx offload metadata in the mbuf.
+
+It is disabled by default.
+
 * ``rte_vhost_driver_set_features(path, features)``
 
   This function sets the feature bits the vhost-user driver supports. The
diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index a5f21f8425..6b7b0810a5 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -337,6 +337,12 @@ API Changes
   ``policer_action_recolor_supported`` and ``policer_action_drop_supported``
   have been removed.
 
+* vhost: The vhost library currently populates received mbufs from a virtio
+  driver with Tx offload flags while not filling Rx offload flags.
+  While this behavior is arguable, it is kept untouched.
+  A new flag ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` has been added to ask
+  for a behavior compliant with to the mbuf offload API.
+
 
 ABI Changes
 ---
diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index d198fc8a8e..281379d6a3 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1505,7 +1505,7 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
int ret = 0;
char *iface_name;
uint16_t queues;
-   uint64_t flags = 0;
+   uint64_t flags = RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
uint64_t disable_flags = 0;
int client_mode = 0;
int iommu_support = 0;
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 0bee1f3321..d2179eadb9 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1029,33 +1030,34 @@ find_local_dest(struct vhost_dev *vdev, struct rte_mbuf 
*m,
return 0;
 }
 
-static uint16_t
-get_psd_sum(void *l3_hdr, uint64_t ol_flags)
-{
-   if (ol_flags & PKT_TX_IPV4)
-   return rte_ipv4_phdr_cksum(l3_h

Re: [dpdk-dev] [EXTERNAL] Re: [PATCH v6 02/10] eal: add thread attributes

[Tyler Retzlaff]

-Original Message-
From: Thomas Monjalon  
Sent: Thursday, April 29, 2021 12:48 AM


29/04/2021 02:50, Dmitry Kozlyuk:
> > 2021-04-02 18:39 (UTC-0700), Narcisa Ana Maria Vasile:
> > > +int
> > > +rte_thread_attr_init(rte_thread_attr_t *attr) {
> > > + if (attr == NULL) {
> > > + RTE_LOG(DEBUG, EAL,
> > > + "Unable to init thread attributes, invalid parameter\n");
> > > + return EINVAL;
> > > + }
> > 
> > This message doesn't add value for debugging: caller already knows 
> > that attribute initialization failed (that's what function attempts to 
> > do) and that the parameter is invalid (EINVAL).
> > I'd remove it (same applies below).
> > If you find it useful to keep, an extra indent missing (also more below).

> Recently in ethdev we added more messages like this for NULL parameters.
> I agree it is not a lot useful but I understand that lazy developers may like 
> it ;)

Shouldn't this specific case be an assert?  Unless we are trying to maintain 
compatibility with existing badly designed semantics.
The whole calling pattern is non-sensible, the caller passes an NULL parameter 
to a function where the input contract is non-NULL and then proceeds to handle 
the error by doing what that could possibly be useful exactly?

Re: [dpdk-dev] [EXTERNAL] Re: [PATCH v6 06/10] eal: add thread lifetime management

[Dmitry Malloy]

Thread cancellation is a pain point. Emulating it properly is nearly impossible 
(without hooking into various OS calls which are supposed to be "cancellation 
points"). I do like the cancellation token idea, but I'm not sure how existing 
clients, who rely on existing phtread_cancel() semantic, will react to that - 
it will require a code re-write. 

How about we defer fixing this to another follow-up change? 

-Original Message-
From: Dmitry Kozlyuk  
Sent: Thursday, April 29, 2021 1:44 PM
To: Narcisa Ana Maria Vasile 
Cc: dev@dpdk.org; thomas ; Khoa To ; 
Narcisa Ana Maria Vasile ; Dmitry Malloy 
; Tyler Retzlaff ; 
tal...@nvidia.com; Omar Cardona ; 
bruce.richard...@intel.com; david.march...@redhat.com; Kadam, Pallavi 

Subject: [EXTERNAL] Re: [PATCH v6 06/10] eal: add thread lifetime management

2021-04-02 18:39 (UTC-0700), Narcisa Ana Maria Vasile:
[...]
> diff --git a/lib/librte_eal/windows/rte_thread.c 
> b/lib/librte_eal/windows/rte_thread.c
> index f61103bbc..86bbd7bc2 100644
> --- a/lib/librte_eal/windows/rte_thread.c
> +++ b/lib/librte_eal/windows/rte_thread.c
> @@ -329,6 +329,131 @@ rte_thread_attr_set_priority(rte_thread_attr_t 
> *thread_attr,
>   return 0;
>  }
>  
> +int
> +rte_thread_create(rte_thread_t *thread_id,
> +   const rte_thread_attr_t *thread_attr,
> +   void *(*thread_func)(void *), void *args) {
> + int ret = 0;
> + HANDLE thread_handle = NULL;
> + GROUP_AFFINITY thread_affinity;
> +
> + thread_handle = CreateThread(NULL, 0,
> + (LPTHREAD_START_ROUTINE)(ULONG_PTR)thread_func,

thread_func returns void* (8 bytes), LPTHREAD_START_ROUTING returns DWORD (4 
byte), is this cast safe?
It seems to be on x86, can't say for ARM64.

> + args, 0, thread_id);
> + if (thread_handle == NULL) {
> + ret = rte_thread_translate_win32_error();
> + RTE_LOG_WIN32_ERR("CreateThread()");
> + goto cleanup;
> + }

After this point, in case of errors the thread remains running, while the 
function reports failure. It's better to create the thread suspended, configure 
its attributes (destroying the thread on failure), then resume (start) the 
thread.

> +
> + if (thread_attr != NULL) {
> + if (CPU_COUNT(&thread_attr->cpuset) > 0) {
> + ret = 
> rte_convert_cpuset_to_affinity(&thread_attr->cpuset, &thread_affinity);
> + if (ret != 0) {
> + RTE_LOG(DEBUG, EAL, "Unable to convert cpuset 
> to thread affinity\n");
> + goto cleanup;
> + }
> +
> + if (!SetThreadGroupAffinity(thread_handle, 
> &thread_affinity, NULL)) {
> + ret = rte_thread_translate_win32_error();
> + RTE_LOG_WIN32_ERR("SetThreadGroupAffinity()");
> + goto cleanup;
> + }
> + }
> + ret = rte_thread_set_priority(*thread_id, 
> thread_attr->priority);
> + if (ret != 0) {
> + RTE_LOG(DEBUG, EAL, "Unable to set thread priority\n");
> + goto cleanup;
> + }
> + }
> +
> + return 0;
> +
> +cleanup:
> + if (thread_handle != NULL) {
> + CloseHandle(thread_handle);
> + thread_handle = NULL;
> + }
> + return ret;
> +}

[...]
> +
> +int
> +rte_thread_cancel(rte_thread_t thread_id) {
> + int ret = 0;
> + HANDLE thread_handle = NULL;
> +
> + thread_handle = OpenThread(THREAD_TERMINATE, FALSE, thread_id);
> + if (thread_handle == NULL) {
> + ret = rte_thread_translate_win32_error();
> + RTE_LOG_WIN32_ERR("OpenThread()");
> + goto cleanup;
> + }
> +
> + /*
> +  * TODO: Behavior is different between POSIX and Windows threads.
> +  * POSIX threads wait for a cancellation point.
> +  * Current Windows emulation kills thread at any point.
> +  */
> + ret = TerminateThread(thread_handle, 0);

This is not acceptable.
There is a handful of pthread_cancel() usages in DPDK.
The threads they cancel take spinlocks and mutexes, so interrupt at arbitrary 
point may cause a deadlock.

UserCancellation points Notes
--- -
net/ipn3ke  libfdt functions?
net/kni usleep  Linux-only
raw/ifpga   open/read/write/close
vdpa/ifcread
vdpa/mlx5   usleep, nanosleep
lib/eventdevrte_epoll_wait  no pthread CP

Possible solutions:

1. Make specific DPDK functions cancellation points for this API and ensure 
DPDK users of pthread_cancel() call it.  This way is almost non-invasive, but 
it's more work in EAL.

2. Divert from pthread style: add cancellation token concept, so that DPDK 
users can check themselves if they're cancelled. This is invasive, but very 
explicit and f

Re: [dpdk-dev] [PATCH v9 01/10] lib: build libraries that testpmd depends on

[Tal Shnaiderman]

> Subject: [PATCH v9 01/10] lib: build libraries that testpmd depends on
> 
> External email: Use caution opening links or attachments
> 
> 
> Enable building libraries that testpmd depends on
> 

You should mention the change is for Windows only.

> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  lib/meson.build | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/lib/meson.build b/lib/meson.build index c9a20f65b..2d499b238
> 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -76,8 +76,15 @@ if is_windows
>  'ethdev',
>  'pci',
>  'cmdline',
> +'metrics',
>  'hash',
> +'timer',
> +'bitratestats',
>  'cfgfile',
> +'gro',
> +'gso',
> +'latencystats',
> +'pdump',
>  ] # only supported libraries for windows  endif
> 
> --
> 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 02/10] eal/windows: add necessary macros

[Tal Shnaiderman]

> Subject: [PATCH v9 02/10] eal/windows: add necessary macros
> 
> External email: Use caution opening links or attachments
> 
> 
> Add required macros by testpmd on Windows in rte_os_shim.h
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  lib/eal/windows/include/rte_os_shim.h | 9 +
>  1 file changed, 9 insertions(+)
> 
> diff --git a/lib/eal/windows/include/rte_os_shim.h
> b/lib/eal/windows/include/rte_os_shim.h
> index 433fa02c4..e60f27400 100644
> --- a/lib/eal/windows/include/rte_os_shim.h
> +++ b/lib/eal/windows/include/rte_os_shim.h
> @@ -20,6 +20,7 @@
> 
>  #define strdup(str) _strdup(str)
>  #define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr)
> +#define strcasecmp _stricmp
>  #define strncasecmp(s1, s2, count) _strnicmp(s1, s2, count)
> 
>  #define open(path, flags, ...) _open(path, flags, ##__VA_ARGS__) @@ -
> 36,6 +37,14 @@
>  #define IPPROTO_SCTP   132
>  #endif
> 
> +#ifndef IPDEFTTL
> +#define IPDEFTTL 64
> +#endif
> +
> +#ifndef S_ISREG
> +#define S_ISREG(mode)  (((mode)&S_IFMT) == S_IFREG) #endif
> +
>  #ifdef RTE_TOOLCHAIN_GCC
> 
>  #define TIME_UTC 1
> --
> 2.30.0.vfs.0.2

Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH v9 04/10] eal/Windows: add clock_gettime on Windows

[Tal Shnaiderman]

> Subject: [PATCH v9 04/10] eal/Windows: add clock_gettime on Windows
> 
> External email: Use caution opening links or attachments
> 
> 
> Add clock_gettime on Windows in rte_os_shim.h
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/config.c |  1 +

Unneeded change

>  lib/eal/windows/include/rte_os_shim.h | 38
> +++
>  2 files changed, 39 insertions(+)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> e189062ef..0e86ed02f 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -205,6 +205,7 @@ nic_stats_display(portid_t port_id)
>"%-"PRIu64"\n", stats.opackets, stats.oerrors, stats.obytes);
> 
> diff_ns = 0;
> +
> if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) {
> uint64_t ns;
> 
> diff --git a/lib/eal/windows/include/rte_os_shim.h
> b/lib/eal/windows/include/rte_os_shim.h
> index e60f27400..ec1087290 100644
> --- a/lib/eal/windows/include/rte_os_shim.h
> +++ b/lib/eal/windows/include/rte_os_shim.h
> @@ -75,4 +75,42 @@ rte_timespec_get(struct timespec *now, int base)
> 
>  #endif /* RTE_TOOLCHAIN_GCC */
> 
> +/* Identifier for system-wide realtime clock. */
> +#define CLOCK_REALTIME  0
> +/* Monotonic system-wide clock. */
> +#define CLOCK_MONOTONIC 1
> +/* High-resolution timer from the CPU. */
> +#define CLOCK_PROCESS_CPUTIME_ID2
> +/* Thread-specific CPU-time clock. */
> +#define CLOCK_THREAD_CPUTIME_ID 3
> +
> +#define NS_PER_SEC 1E9
> +
> +typedef int clockid_t;
> +
> +static inline int
> +rte_clock_gettime(clockid_t clock_id, struct timespec *tp) {
> +   LARGE_INTEGER pf, pc;
> +   LONGLONG nsec;
> +   switch (clock_id) {
> +   case CLOCK_REALTIME:
> +   if (timespec_get(tp, TIME_UTC) != TIME_UTC)
> +   return -1;
> +   return 0;
> +   case CLOCK_MONOTONIC:
> +   if (QueryPerformanceFrequency(&pf) == 0)
> +   return -1;
> +   if (QueryPerformanceCounter(&pc) == 0)
> +   return -1;
> +   nsec = pc.QuadPart * NS_PER_SEC / pf.QuadPart;
> +   tp->tv_sec = nsec / NS_PER_SEC;
> +   tp->tv_nsec = nsec - tp->tv_sec * NS_PER_SEC;
> +   return 0;
> +   default:
> +   return -1;
> +   }
> +}
> +#define clock_gettime(clock_id, tp) rte_clock_gettime(clock_id, tp)
> +
>  #endif /* _RTE_OS_SHIM_ */
> --
> 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 05/10] app/testpmd: resolve name collisions

[Tal Shnaiderman]

> Subject: [PATCH v9 05/10] app/testpmd: resolve name collisions
> 
> External email: Use caution opening links or attachments
> 
> 
> Resolve name collisions with Windows types
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/cmdline_flow.c | 512 ++--
>  1 file changed, 256 insertions(+), 256 deletions(-)
> 
Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH v9 07/10] app/testpmd: replace POSIX specific code

[Tal Shnaiderman]

> Subject: [PATCH v9 07/10] app/testpmd: replace POSIX specific code
> 
> External email: Use caution opening links or attachments
> 
> 
> - Make printf format OS independent
>  - Replace htons with RTE_BE16
>  - Replace POSIX specific inet_aton with OS independent inet_pton
>  - Replace sleep with rte_delay_us_sleep
>  - Repalce random with rte_rand
>  - #ifndef mman related code for now
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/cmdline.c |  3 +--
>  app/test-pmd/csumonly.c|  2 +-
>  app/test-pmd/icmpecho.c|  4 ++--
>  app/test-pmd/ieee1588fwd.c |  8   app/test-pmd/parameters.c  |
> 10 +++---
>  app/test-pmd/testpmd.c | 21 -
>  app/test-pmd/testpmd.h |  2 +-
>  7 files changed, 36 insertions(+), 14 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> d804ee233..f0636ca9b 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c



> @@ -8,7 +8,6 @@
> @@ pmd_test_exit(void)
>  NULL);
> }
> }
> +#endif
> if (ports != NULL) {
> no_link_check = 1;
> RTE_ETH_FOREACH_DEV(pt_id) { @@ -3762,7 +3777,9 @@
> signal_handler(int signum)
> f_quit = 1;
> /* exit with the expected status */
> signal(signum, SIG_DFL);
> +#ifndef RTE_EXEC_ENV_WINDOWS
> kill(getpid(), signum);
> +#endif

signal() doesn't need to be inside the ifndef?

> }
>  }
> 
> @@ -3837,10 +3854,12 @@ main(int argc, char** argv)
> if (argc > 1)
> launch_args_parse(argc, argv);
> 
> +#ifndef RTE_EXEC_ENV_WINDOWS
> if (do_mlockall && mlockall(MCL_CURRENT | MCL_FUTURE)) {
> TESTPMD_LOG(NOTICE, "mlockall() failed with error \"%s\"\n",
> strerror(errno));
> }
> +#endif
> 
> if (tx_first && interactive)
> rte_exit(EXIT_FAILURE, "--tx-first cannot be used on "
> @@ -3961,7 +3980,7 @@ main(int argc, char** argv)
> }
> /* Sleep to avoid unnecessary checks */
> prev_time = cur_time;
> -   sleep(1);
> +   rte_delay_us_sleep(100);

Please use US_PER_S

> }
> }
> 
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> 1d104213b..a4115861b 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -763,7 +763,7 @@ inc_tx_burst_stats(struct fwd_stream *fs, uint16_t
> nb_tx)  }
> 
>  /* Prototypes */
> -unsigned int parse_item_list(char* str, const char* item_name,
> +unsigned int parse_item_list(const char *str, const char *item_name,
> unsigned int max_items,
> unsigned int *parsed_items, int check_unique_values); 
>  void
> launch_args_parse(int argc, char** argv);
> --
> 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type

[Tal Shnaiderman]

> Subject: [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type
> 

I think you should name this patch " app/testpmd: fix parse_fec_mode misleading 
return type name"

Do we need a fixes/CC stable tags here?

> External email: Use caution opening links or attachments
> 
> 
> Fix parse_fec_mode to return fec_capa instead of mode
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/cmdline.c | 6 +++---
>  app/test-pmd/config.c  | 4 ++--
>  app/test-pmd/testpmd.h | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> 12efbc0ca..d804ee233 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -16984,17 +16984,17 @@ cmd_set_port_fec_mode_parsed(  {
> struct cmd_set_port_fec_mode *res = parsed_result;
> uint16_t port_id = res->port_id;
> -   uint32_t mode;
> +   uint32_t fec_capa;
> int ret;
> 
> -   ret = parse_fec_mode(res->fec_value, &mode);
> +   ret = parse_fec_mode(res->fec_value, &fec_capa);
> if (ret < 0) {
> printf("Unknown fec mode: %s for Port %d\n", res->fec_value,
> port_id);
> return;
> }
> 
> -   ret = rte_eth_fec_set(port_id, mode);
> +   ret = rte_eth_fec_set(port_id, fec_capa);
> if (ret == -ENOTSUP) {
> printf("Function not implemented\n");
> return;
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> 0e86ed02f..c626d5ce8 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -3549,13 +3549,13 @@ set_tx_pkt_split(const char *name)  }
> 
>  int
> -parse_fec_mode(const char *name, uint32_t *mode)
> +parse_fec_mode(const char *name, uint32_t *fec_capa)
>  {
> uint8_t i;
> 
> for (i = 0; i < RTE_DIM(fec_mode_name); i++) {
> if (strcmp(fec_mode_name[i].name, name) == 0) {
> -   *mode =
> RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> +   *fec_capa =
> + RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> return 0;
> }
> }
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> 6ca872db8..1d104213b 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -886,7 +886,7 @@ void show_tx_pkt_segments(void);  void
> set_tx_pkt_times(unsigned int *tx_times);  void show_tx_pkt_times(void);
> void set_tx_pkt_split(const char *name); -int parse_fec_mode(const char
> *name, enum rte_eth_fec_mode *mode);
> +int parse_fec_mode(const char *name, uint32_t *fec_capa);
>  void show_fec_capability(uint32_t num, struct rte_eth_fec_capa
> *speed_fec_capa);  void set_nb_pkt_per_burst(uint16_t pkt_burst);  char
> *list_pkt_forwarding_modes(void);
> --
> 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 10/10] app/testpmd: enable building testpmd on Windows

[Tal Shnaiderman]

> Subject: [PATCH v9 10/10] app/testpmd: enable building testpmd on
> Windows
> 
> External email: Use caution opening links or attachments
> 
> 
> From: Jie Zhou 
> 
> - Disable unsupported Apps on Windows
> - Enable building of testpmd on Windows
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/meson.build| 4 
>  app/pdump/meson.build  | 6 ++
>  app/proc-info/meson.build  | 6 ++
>  app/test-acl/meson.build   | 6 ++
>  app/test-bbdev/meson.build | 6 ++
>  app/test-cmdline/meson.build   | 6 ++
>  app/test-compress-perf/meson.build | 6 ++
>  app/test-crypto-perf/meson.build   | 6 ++
>  app/test-eventdev/meson.build  | 6 ++
>  app/test-fib/meson.build   | 6 ++
>  app/test-flow-perf/meson.build | 6 ++
>  app/test-pipeline/meson.build  | 6 ++
>  app/test-regex/meson.build | 6 ++
>  app/test-sad/meson.build   | 6 ++
>  app/test/meson.build   | 6 ++
>  15 files changed, 84 insertions(+), 4 deletions(-)
> 

Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH v9 09/10] app/testpmd: fix unused function warnings

[Tal Shnaiderman]

> Subject: [PATCH v9 09/10] app/testpmd: fix unused function warnings
> 
> External email: Use caution opening links or attachments
> 
> 
> Function print_fdir_mask and print_fdir_flex_payload is only called when
> either i40e or ixgbe presents. Add #if defined to remove "unused function"
> compilation warning.
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/config.c | 82 +--
>  1 file changed, 41 insertions(+), 41 deletions(-)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> c626d5ce8..4eecad38f 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -4365,6 +4365,47 @@ set_record_burst_stats(uint8_t on_off)
> record_burst_stats = on_off;
>  }
> 
> +static char*
> +flowtype_to_str(uint16_t flow_type)
> +{
> +   struct flow_type_info {
> +   char str[32];
> +   uint16_t ftype;
> +   };
> +
> +   uint8_t i;
> +   static struct flow_type_info flowtype_str_table[] = {
> +   {"raw", RTE_ETH_FLOW_RAW},
> +   {"ipv4", RTE_ETH_FLOW_IPV4},
> +   {"ipv4-frag", RTE_ETH_FLOW_FRAG_IPV4},
> +   {"ipv4-tcp", RTE_ETH_FLOW_NONFRAG_IPV4_TCP},
> +   {"ipv4-udp", RTE_ETH_FLOW_NONFRAG_IPV4_UDP},
> +   {"ipv4-sctp", RTE_ETH_FLOW_NONFRAG_IPV4_SCTP},
> +   {"ipv4-other", RTE_ETH_FLOW_NONFRAG_IPV4_OTHER},
> +   {"ipv6", RTE_ETH_FLOW_IPV6},
> +   {"ipv6-frag", RTE_ETH_FLOW_FRAG_IPV6},
> +   {"ipv6-tcp", RTE_ETH_FLOW_NONFRAG_IPV6_TCP},
> +   {"ipv6-udp", RTE_ETH_FLOW_NONFRAG_IPV6_UDP},
> +   {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
> +   {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
> +   {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
> +   {"port", RTE_ETH_FLOW_PORT},
> +   {"vxlan", RTE_ETH_FLOW_VXLAN},
> +   {"geneve", RTE_ETH_FLOW_GENEVE},
> +   {"nvgre", RTE_ETH_FLOW_NVGRE},
> +   {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE},
> +   };
> +
> +   for (i = 0; i < RTE_DIM(flowtype_str_table); i++) {
> +   if (flowtype_str_table[i].ftype == flow_type)
> +   return flowtype_str_table[i].str;
> +   }
> +
> +   return NULL;
> +}
> +
> +#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
> +
>  static inline void
>  print_fdir_mask(struct rte_eth_fdir_masks *mask)  { @@ -4424,47 +4465,6
> @@ print_fdir_flex_payload(struct rte_eth_fdir_flex_conf *flex_conf,
> uint32_t num)
> printf("\n");
>  }
> 
> -static char *
> -flowtype_to_str(uint16_t flow_type)
> -{
> -   struct flow_type_info {
> -   char str[32];
> -   uint16_t ftype;
> -   };
> -
> -   uint8_t i;
> -   static struct flow_type_info flowtype_str_table[] = {
> -   {"raw", RTE_ETH_FLOW_RAW},
> -   {"ipv4", RTE_ETH_FLOW_IPV4},
> -   {"ipv4-frag", RTE_ETH_FLOW_FRAG_IPV4},
> -   {"ipv4-tcp", RTE_ETH_FLOW_NONFRAG_IPV4_TCP},
> -   {"ipv4-udp", RTE_ETH_FLOW_NONFRAG_IPV4_UDP},
> -   {"ipv4-sctp", RTE_ETH_FLOW_NONFRAG_IPV4_SCTP},
> -   {"ipv4-other", RTE_ETH_FLOW_NONFRAG_IPV4_OTHER},
> -   {"ipv6", RTE_ETH_FLOW_IPV6},
> -   {"ipv6-frag", RTE_ETH_FLOW_FRAG_IPV6},
> -   {"ipv6-tcp", RTE_ETH_FLOW_NONFRAG_IPV6_TCP},
> -   {"ipv6-udp", RTE_ETH_FLOW_NONFRAG_IPV6_UDP},
> -   {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
> -   {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
> -   {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
> -   {"port", RTE_ETH_FLOW_PORT},
> -   {"vxlan", RTE_ETH_FLOW_VXLAN},
> -   {"geneve", RTE_ETH_FLOW_GENEVE},
> -   {"nvgre", RTE_ETH_FLOW_NVGRE},
> -   {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE},
> -   };
> -
> -   for (i = 0; i < RTE_DIM(flowtype_str_table); i++) {
> -   if (flowtype_str_table[i].ftype == flow_type)
> -   return flowtype_str_table[i].str;
> -   }
> -
> -   return NULL;
> -}
> -
> -#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
> -
>  static inline void
>  print_fdir_flex_mask(struct rte_eth_fdir_flex_conf *flex_conf, uint32_t
> num)  {
> --
> 2.30.0.vfs.0.2

Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH v9 03/10] eal/windows: add device event stubs

[Tal Shnaiderman]

> Subject: [PATCH v9 03/10] eal/windows: add device event stubs
> 
> External email: Use caution opening links or attachments
> 
> 
> Add device event stubs in eal_dev.c for Windows
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  lib/eal/windows/eal_dev.c   | 33 +
>  lib/eal/windows/meson.build |  1 +
>  2 files changed, 34 insertions(+)
>  create mode 100644 lib/eal/windows/eal_dev.c
> 
> diff --git a/lib/eal/windows/eal_dev.c b/lib/eal/windows/eal_dev.c new file
> mode 100644 index 0..35191056f
> --- /dev/null
> +++ b/lib/eal/windows/eal_dev.c
> @@ -0,0 +1,33 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation  */
> +
> +#include 
> +
> +int
> +rte_dev_event_monitor_start(void)
> +{
> +   RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
> +   return -1;
> +}
> +
> +int
> +rte_dev_event_monitor_stop(void)
> +{
> +   RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
> +   return -1;
> +}
> +
> +int
> +rte_dev_hotplug_handle_enable(void)
> +{
> +   RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
> +   return -1;
> +}
> +
> +int
> +rte_dev_hotplug_handle_disable(void)
> +{
> +   RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
> +   return -1;
> +}
> diff --git a/lib/eal/windows/meson.build b/lib/eal/windows/meson.build
> index ff9cbec41..fc12fefd0 100644
> --- a/lib/eal/windows/meson.build
> +++ b/lib/eal/windows/meson.build
> @@ -7,6 +7,7 @@ sources += files(
>  'eal.c',
>  'eal_alarm.c',
>  'eal_debug.c',
> +'eal_dev.c',
>  'eal_file.c',
>  'eal_hugepages.c',
>  'eal_interrupts.c',
> --
> 2.30.0.vfs.0.2

Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH v9 08/10] app/testpmd: fix headers inclusion

[Tal Shnaiderman]

> Subject: [PATCH v9 08/10] app/testpmd: fix headers inclusion
> 
> External email: Use caution opening links or attachments
> 
> 
> - Include rte_os_shim.h in testpmd.h
> - Remove redundant headers
> 
> Signed-off-by: Jie Zhou 
> Signed-off-by: Jie Zhou 
> ---
>  app/test-pmd/cmdline.c  | 3 ---
>  app/test-pmd/cmdline_flow.c | 2 --
>  app/test-pmd/parameters.c   | 1 -
>  app/test-pmd/testpmd.h  | 1 +
>  4 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> f0636ca9b..2fbef3320 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -10,9 +10,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
> -#include 
> -
>  #include 
> 
>  #include 
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 888b9179b..a3cd4773a 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -10,8 +10,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
> -#include 
> 
>  #include 
>  #include 
> diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index
> 4c3cbbac3..5e69d2aa8 100644
> --- a/app/test-pmd/parameters.c
> +++ b/app/test-pmd/parameters.c
> @@ -19,7 +19,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
> 
>  #include 
>  #include 
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> a4115861b..f96eec71a 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -11,6 +11,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
> 
> --
> 2.30.0.vfs.0.2

Acked-by: Tal Shnaiderman 

Re: [dpdk-dev] [PATCH 0/3] add lock-free stack support discovery

[Stanisław Kardach]

On Mon, 3 May 2021, 16:28 Olivier Matz,  wrote:

> On Mon, May 03, 2021 at 04:21:25PM +0200, David Marchand wrote:
> > On Mon, Apr 12, 2021 at 10:29 AM Stanislaw Kardach 
> wrote:
> > >
> > > The lock-free stack implementation (RTE_STACK_F_LF) is supported only
> on a
> > > subset of platforms, namely x86_64 and arm64. Platforms supporting
> 128b atomics
> > > have to opt-in to a generic or C11 implementations. All other
> platforms use a
> > > stubbed implementation for push/pop operations which are basically
> NOPs.
> > > However rte_stack_create() will not fail and application can proceed
> assuming
> > > it has a working lock-free stack.
> > >
> > > This means that among other things the stack_lf fast and perf tests
> will fail
> > > as if implementation is wrong (which one can argue is). Therefore this
> patchset
> > > tries to give user a way to check whether a lock_free is supported or
> not both
> > > at compile time (build flag) and at runtime (ENOTSUP errno in
> rte_stack_create).
> > >
> > > I have added cc to sta...@dpdk.org because check-git-log.sh suggested
> it. I'm
> > > not sure if adding a binary compatible change to API is worth
> sta...@dpdk.org.
> > >
> > > Cc: sta...@dpdk.org
> >
> > The issue was hit while porting to a new architecture.
> > The feature is broken in existing stable releases and it won't get
> > fixed by this change.
> >
> > I'd rather not backport it.
> >
> > Opinions?
>
> Agreed.
>
Agreed.

>

Re: [dpdk-dev] [PATCH] doc/contributing/documentation: add info about including code

[Thomas Monjalon]

21/04/2021 11:11, Conor Walsh:
> +  The following will include a snippet from the skeleton sample app::
> +
> +  .. literalinclude:: ../../../examples/skeleton/basicfwd.c
> +:language: c
> +:start-after: Display the port MAC address.
> +:end-before: Enable RX in promiscuous mode for the Ethernet device.
> +:dedent: 1

I would prefer indenting the options with 3 spaces
to make them aligned with literalinclude.

[...]
> +* ``start-after`` and ``end-before`` can use any text within a given file,
> +  however it may be difficult to find unique text within your code to mark 
> the
> +  start and end of your snippets. In these cases, it is recommended to 
> include
> +  explicit tags in your code to denote these locations for documentation 
> purposes.
> +
> +  This can be done as follows:
> +
> +  .. code-block:: c
> +
> +/* #guide_doc: Example feature being documented. */
> +...
> +/* #guide_doc: End of example feature being documented. */

I think we can standardize this usage in a beautiful syntax.
My proposal, using the scissor sign:

/* Foo bar >8 */
foo(bar);
/* 8< End of foo bar */

.. literalinclude:: foobar.c
   :language: C
   :start-after: Foo bar >8
   :end-before: 8< End of foo bar

Another idea:

/*~ Foo bar */
foo(bar);
/*~ End of foo bar */

.. literalinclude:: foobar.c
   :language: C
   :start-after: ~ Foo bar
   :end-before: ~ End of foo bar

Maybe we don't need any markup for the start line and keep it natural:

/* Foo bar */
foo(bar);
/* end: Foo bar */

.. literalinclude:: foobar.c
   :language: C
   :start-after: Foo bar
   :end-before: end: Foo bar

Re: [dpdk-dev] [PATCH v4 04/12] raw/ioat: add explicit padding to descriptor struct

[Thomas Monjalon]

30/04/2021 17:06, Bruce Richardson:
> Add an explicit padding field to the end of the descriptor structure so
> that when the batch descriptor is defined on the stack for perform-ops, the
> unused space is all zeroed appropriately.
> 
> Signed-off-by: Bruce Richardson 
> ---
> --- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
> +++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
> - /* 28 bytes of padding here */
> + uint16_t intr_handle; /* completion interrupt handle */

This is more than padding.
Does it deserve its own commit?

> +
> + /* remaining 26 bytes are reserved */
> + uint16_t __reserved[13];
>  } __rte_aligned(64);

Re: [dpdk-dev] [PATCH v4 08/12] raw/ioat: add bus driver for device scanning automatically

[Thomas Monjalon]

30/04/2021 17:06, Bruce Richardson:
> Rather than using a vdev with args, DPDK can scan and initialize the
> devices automatically using a bus-type driver. This bus does not need to
> worry about registering device drivers, rather it can initialize the
> devices directly on probe.
> 
> The device instances (queues) to use are detected from /dev with the
> additional info about them got from /sys.
> 
> Signed-off-by: Bruce Richardson 
> ---
> --- a/doc/guides/rawdevs/ioat.rst
> +++ b/doc/guides/rawdevs/ioat.rst
> @@ -78,7 +78,7 @@ Example configuration for a work queue::
>  
>  $ accel-config config-wq dsa0/wq0.0 --group-id=0 \
> --mode=dedicated --priority=10 --wq-size=8 \
> -   --type=user --name=app1
> +   --type=user --name=dpdk_app1

It looks to belong to commit "make workqueue name configurable in script".

>  Once the devices have been configured, they need to be enabled::
>  
> @@ -114,15 +114,18 @@ the device driver on the EAL commandline, via the 
> ``allowlist`` or ``-a`` flag e
>  
>   $ dpdk-test -a ,max_queues=4
>  
> -If the device is bound to the IDXD kernel driver (and previously configured 
> with sysfs),
> -then a specific work queue needs to be passed to the application via a vdev 
> parameter.
> -This vdev parameter take the driver name and work queue name as parameters.
> -For example, to use work queue 0 on Intel\ |reg| DSA instance 0::
> -
> -$ dpdk-test --no-pci --vdev=rawdev_idxd,wq=0.0
> -
> -Once probed successfully, the device will appear as a ``rawdev``, that is a
> -"raw device type" inside DPDK, and can be accessed using APIs from the
> +For devices bound to the IDXD kernel driver,
> +the DPDK ioat driver will automatically perform a scan for available 
> workqueues to use.
> +Any workqueues found listed in ``/dev/dsa`` on the system will be checked in 
> ``/sys``,
> +and any which have ``dpdk_`` prefix in their name will be automatically 
> probed by the
> +driver to make them available to the application.
> +Alternatively, to support use by multiple DPDK processes simultaneously,
> +the value used as the DPDK ``--file-prefix`` parameter may be used as a 
> workqueue name prefix,
> +instead of ``dpdk_``,
> +allowing each DPDK application instance to only use a subset of configured 
> queues.
> +
> +Once probed successfully, irrespective of kernel driver, the device will 
> appear as a ``rawdev``,
> +that is a "raw device type" inside DPDK, and can be accessed using APIs from 
> the
>  ``rte_rawdev`` library.
[...]
> --- a/drivers/raw/ioat/meson.build
> +++ b/drivers/raw/ioat/meson.build
> @@ -4,13 +4,13 @@
>  build = dpdk_conf.has('RTE_ARCH_X86')
>  reason = 'only supported on x86'
>  sources = files(
> +'idxd_bus.c',
>  'idxd_pci.c',
> -'idxd_vdev.c',
>  'ioat_common.c',
>  'ioat_rawdev.c',
>  'ioat_rawdev_test.c',
>  )
> -deps += ['bus_pci', 'bus_vdev', 'mbuf', 'rawdev']
> +deps += ['bus_pci', 'mbuf', 'rawdev']

OK to remove the vdev dependency by creating a bus singleton.

You may want to allow iterating devices of the bus
by implementing .dev_iterate callback.

Re: [dpdk-dev] [PATCH v4 09/12] raw/ioat: move idxd functions to separate file

[Thomas Monjalon]

30/04/2021 17:06, Bruce Richardson:
> Split the rte_ioat_rawdev_fns.h file into two separate headers, so that the
> data structures for the original ioat devices and the newer idxd ones can
> be kept separate from each other. This makes code management and rework
> easier.
> 
> Signed-off-by: Bruce Richardson 
> ---
> --- /dev/null
> +++ b/drivers/raw/ioat/rte_idxd_rawdev_fns.h
> @@ -0,0 +1,275 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Intel Corporation
> + */
> +#ifndef _RTE_IDXD_RAWDEV_FNS_H_
> +#define _RTE_IDXD_RAWDEV_FNS_H_

Please add a doxygen @file to explain the purpose of this file.
The same is needed for rte_ioat_rawdev_fns.h.
We miss the explanation of the difference between ioat and idxd.

Re: [dpdk-dev] [PATCH v9 01/10] lib: build libraries that testpmd depends on

[Jie Zhou]

On Mon, May 03, 2021 at 05:36:30PM +, Tal Shnaiderman wrote:
> > Subject: [PATCH v9 01/10] lib: build libraries that testpmd depends on
> > 
> > External email: Use caution opening links or attachments
> > 
> > 
> > Enable building libraries that testpmd depends on
> > 
> 
> You should mention the change is for Windows only.

Will explicitly mention the change is for Windows only in V10.

> 
> > Signed-off-by: Jie Zhou 
> > Signed-off-by: Jie Zhou 
> > ---
> >  lib/meson.build | 7 +++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/lib/meson.build b/lib/meson.build index c9a20f65b..2d499b238
> > 100644
> > --- a/lib/meson.build
> > +++ b/lib/meson.build
> > @@ -76,8 +76,15 @@ if is_windows
> >  'ethdev',
> >  'pci',
> >  'cmdline',
> > +'metrics',
> >  'hash',
> > +'timer',
> > +'bitratestats',
> >  'cfgfile',
> > +'gro',
> > +'gso',
> > +'latencystats',
> > +'pdump',
> >  ] # only supported libraries for windows  endif
> > 
> > --
> > 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 07/10] app/testpmd: replace POSIX specific code

[Jie Zhou]

On Mon, May 03, 2021 at 05:37:52PM +, Tal Shnaiderman wrote:
> > Subject: [PATCH v9 07/10] app/testpmd: replace POSIX specific code
> > 
> > External email: Use caution opening links or attachments
> > 
> > 
> > - Make printf format OS independent
> >  - Replace htons with RTE_BE16
> >  - Replace POSIX specific inet_aton with OS independent inet_pton
> >  - Replace sleep with rte_delay_us_sleep
> >  - Repalce random with rte_rand
> >  - #ifndef mman related code for now
> > 
> > Signed-off-by: Jie Zhou 
> > Signed-off-by: Jie Zhou 
> > ---
> >  app/test-pmd/cmdline.c |  3 +--
> >  app/test-pmd/csumonly.c|  2 +-
> >  app/test-pmd/icmpecho.c|  4 ++--
> >  app/test-pmd/ieee1588fwd.c |  8   app/test-pmd/parameters.c  |
> > 10 +++---
> >  app/test-pmd/testpmd.c | 21 -
> >  app/test-pmd/testpmd.h |  2 +-
> >  7 files changed, 36 insertions(+), 14 deletions(-)
> > 
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > d804ee233..f0636ca9b 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> 
> 
> 
> > @@ -8,7 +8,6 @@
> > @@ pmd_test_exit(void)
> >  NULL);
> > }
> > }
> > +#endif
> > if (ports != NULL) {
> > no_link_check = 1;
> > RTE_ETH_FOREACH_DEV(pt_id) { @@ -3762,7 +3777,9 @@
> > signal_handler(int signum)
> > f_quit = 1;
> > /* exit with the expected status */
> > signal(signum, SIG_DFL);
> > +#ifndef RTE_EXEC_ENV_WINDOWS
> > kill(getpid(), signum);
> > +#endif
> 
> signal() doesn't need to be inside the ifndef?

Should be. Thanks for spotting that.

> 
> > }
> >  }
> > 
> > @@ -3837,10 +3854,12 @@ main(int argc, char** argv)
> > if (argc > 1)
> > launch_args_parse(argc, argv);
> > 
> > +#ifndef RTE_EXEC_ENV_WINDOWS
> > if (do_mlockall && mlockall(MCL_CURRENT | MCL_FUTURE)) {
> > TESTPMD_LOG(NOTICE, "mlockall() failed with error \"%s\"\n",
> > strerror(errno));
> > }
> > +#endif
> > 
> > if (tx_first && interactive)
> > rte_exit(EXIT_FAILURE, "--tx-first cannot be used on "
> > @@ -3961,7 +3980,7 @@ main(int argc, char** argv)
> > }
> > /* Sleep to avoid unnecessary checks */
> > prev_time = cur_time;
> > -   sleep(1);
> > +   rte_delay_us_sleep(100);
> 
> Please use US_PER_S

Fix is V10. Thanks.

> 
> > }
> > }
> > 
> > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> > 1d104213b..a4115861b 100644
> > --- a/app/test-pmd/testpmd.h
> > +++ b/app/test-pmd/testpmd.h
> > @@ -763,7 +763,7 @@ inc_tx_burst_stats(struct fwd_stream *fs, uint16_t
> > nb_tx)  }
> > 
> >  /* Prototypes */
> > -unsigned int parse_item_list(char* str, const char* item_name,
> > +unsigned int parse_item_list(const char *str, const char *item_name,
> > unsigned int max_items,
> > unsigned int *parsed_items, int 
> > check_unique_values);  void
> > launch_args_parse(int argc, char** argv);
> > --
> > 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type

[Jie Zhou]

On Mon, May 03, 2021 at 05:38:21PM +, Tal Shnaiderman wrote:
> > Subject: [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type
> > 
> 
> I think you should name this patch " app/testpmd: fix parse_fec_mode 
> misleading return type name"
> 
> Do we need a fixes/CC stable tags here?

Will add CC stable, but not sure how to find the original patch which 
introduced this.

> 
> > External email: Use caution opening links or attachments
> > 
> > 
> > Fix parse_fec_mode to return fec_capa instead of mode
> > 
> > Signed-off-by: Jie Zhou 
> > Signed-off-by: Jie Zhou 
> > ---
> >  app/test-pmd/cmdline.c | 6 +++---
> >  app/test-pmd/config.c  | 4 ++--
> >  app/test-pmd/testpmd.h | 2 +-
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > 12efbc0ca..d804ee233 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -16984,17 +16984,17 @@ cmd_set_port_fec_mode_parsed(  {
> > struct cmd_set_port_fec_mode *res = parsed_result;
> > uint16_t port_id = res->port_id;
> > -   uint32_t mode;
> > +   uint32_t fec_capa;
> > int ret;
> > 
> > -   ret = parse_fec_mode(res->fec_value, &mode);
> > +   ret = parse_fec_mode(res->fec_value, &fec_capa);
> > if (ret < 0) {
> > printf("Unknown fec mode: %s for Port %d\n", res->fec_value,
> > port_id);
> > return;
> > }
> > 
> > -   ret = rte_eth_fec_set(port_id, mode);
> > +   ret = rte_eth_fec_set(port_id, fec_capa);
> > if (ret == -ENOTSUP) {
> > printf("Function not implemented\n");
> > return;
> > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> > 0e86ed02f..c626d5ce8 100644
> > --- a/app/test-pmd/config.c
> > +++ b/app/test-pmd/config.c
> > @@ -3549,13 +3549,13 @@ set_tx_pkt_split(const char *name)  }
> > 
> >  int
> > -parse_fec_mode(const char *name, uint32_t *mode)
> > +parse_fec_mode(const char *name, uint32_t *fec_capa)
> >  {
> > uint8_t i;
> > 
> > for (i = 0; i < RTE_DIM(fec_mode_name); i++) {
> > if (strcmp(fec_mode_name[i].name, name) == 0) {
> > -   *mode =
> > RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> > +   *fec_capa =
> > + RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> > return 0;
> > }
> > }
> > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> > 6ca872db8..1d104213b 100644
> > --- a/app/test-pmd/testpmd.h
> > +++ b/app/test-pmd/testpmd.h
> > @@ -886,7 +886,7 @@ void show_tx_pkt_segments(void);  void
> > set_tx_pkt_times(unsigned int *tx_times);  void show_tx_pkt_times(void);
> > void set_tx_pkt_split(const char *name); -int parse_fec_mode(const char
> > *name, enum rte_eth_fec_mode *mode);
> > +int parse_fec_mode(const char *name, uint32_t *fec_capa);
> >  void show_fec_capability(uint32_t num, struct rte_eth_fec_capa
> > *speed_fec_capa);  void set_nb_pkt_per_burst(uint16_t pkt_burst);  char
> > *list_pkt_forwarding_modes(void);
> > --
> > 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type

[Jie Zhou]

On Mon, May 03, 2021 at 02:43:32PM -0700, Jie Zhou wrote:
> On Mon, May 03, 2021 at 05:38:21PM +, Tal Shnaiderman wrote:
> > > Subject: [PATCH v9 06/10] app/testpmd: fix parse_fec_mode return type
> > > 
> > 
> > I think you should name this patch " app/testpmd: fix parse_fec_mode 
> > misleading return type name"
> > 
> > Do we need a fixes/CC stable tags here?
> 
> Will add CC stable, but not sure how to find the original patch which 
> introduced this.

Found the patch which introduced this. Will add the Fixes and Cc in V10.
> 
> > 
> > > External email: Use caution opening links or attachments
> > > 
> > > 
> > > Fix parse_fec_mode to return fec_capa instead of mode
> > > 
> > > Signed-off-by: Jie Zhou 
> > > Signed-off-by: Jie Zhou 
> > > ---
> > >  app/test-pmd/cmdline.c | 6 +++---
> > >  app/test-pmd/config.c  | 4 ++--
> > >  app/test-pmd/testpmd.h | 2 +-
> > >  3 files changed, 6 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> > > 12efbc0ca..d804ee233 100644
> > > --- a/app/test-pmd/cmdline.c
> > > +++ b/app/test-pmd/cmdline.c
> > > @@ -16984,17 +16984,17 @@ cmd_set_port_fec_mode_parsed(  {
> > > struct cmd_set_port_fec_mode *res = parsed_result;
> > > uint16_t port_id = res->port_id;
> > > -   uint32_t mode;
> > > +   uint32_t fec_capa;
> > > int ret;
> > > 
> > > -   ret = parse_fec_mode(res->fec_value, &mode);
> > > +   ret = parse_fec_mode(res->fec_value, &fec_capa);
> > > if (ret < 0) {
> > > printf("Unknown fec mode: %s for Port %d\n", 
> > > res->fec_value,
> > > port_id);
> > > return;
> > > }
> > > 
> > > -   ret = rte_eth_fec_set(port_id, mode);
> > > +   ret = rte_eth_fec_set(port_id, fec_capa);
> > > if (ret == -ENOTSUP) {
> > > printf("Function not implemented\n");
> > > return;
> > > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> > > 0e86ed02f..c626d5ce8 100644
> > > --- a/app/test-pmd/config.c
> > > +++ b/app/test-pmd/config.c
> > > @@ -3549,13 +3549,13 @@ set_tx_pkt_split(const char *name)  }
> > > 
> > >  int
> > > -parse_fec_mode(const char *name, uint32_t *mode)
> > > +parse_fec_mode(const char *name, uint32_t *fec_capa)
> > >  {
> > > uint8_t i;
> > > 
> > > for (i = 0; i < RTE_DIM(fec_mode_name); i++) {
> > > if (strcmp(fec_mode_name[i].name, name) == 0) {
> > > -   *mode =
> > > RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> > > +   *fec_capa =
> > > + RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
> > > return 0;
> > > }
> > > }
> > > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index
> > > 6ca872db8..1d104213b 100644
> > > --- a/app/test-pmd/testpmd.h
> > > +++ b/app/test-pmd/testpmd.h
> > > @@ -886,7 +886,7 @@ void show_tx_pkt_segments(void);  void
> > > set_tx_pkt_times(unsigned int *tx_times);  void show_tx_pkt_times(void);
> > > void set_tx_pkt_split(const char *name); -int parse_fec_mode(const char
> > > *name, enum rte_eth_fec_mode *mode);
> > > +int parse_fec_mode(const char *name, uint32_t *fec_capa);
> > >  void show_fec_capability(uint32_t num, struct rte_eth_fec_capa
> > > *speed_fec_capa);  void set_nb_pkt_per_burst(uint16_t pkt_burst);  char
> > > *list_pkt_forwarding_modes(void);
> > > --
> > > 2.30.0.vfs.0.2

Re: [dpdk-dev] [PATCH 1/3] eal/windows: fix use of incorrect thread ID

[Tyler Retzlaff]

On Sun, May 02, 2021 at 05:33:31AM +0300, Dmitry Kozlyuk wrote:
> Interrupt thread ID retained its value after interrupt thread finish.
> Other interrupt routines could then operate on the wrong thread.
> Clear interrupt thread ID before thread termination.
> 
> Fixes: 5c016fc0205a ("eal/windows: add interrupt thread skeleton")
> Cc: sta...@dpdk.org

Acked-by: Tyler Retzlaff 

> 
> Signed-off-by: Dmitry Kozlyuk 
> ---
>  lib/eal/windows/eal_interrupts.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/lib/eal/windows/eal_interrupts.c 
> b/lib/eal/windows/eal_interrupts.c
> index 1d4cf794df..9cde02b003 100644
> --- a/lib/eal/windows/eal_interrupts.c
> +++ b/lib/eal/windows/eal_interrupts.c
> @@ -46,8 +46,11 @@ eal_intr_thread_main(LPVOID arg __rte_unused)
>   eal_intr_process(&events[i]);
>   }
>  
> + intr_thread = 0;
> +
>   CloseHandle(intr_iocp);
>   intr_iocp = NULL;
> +
>   return NULL;
>  }
>  
> -- 
> 2.29.3

Re: [dpdk-dev] [PATCH] examples/rxtx_callbacks: fix port ID format specifier

[Tyler Retzlaff]

On Sun, May 02, 2021 at 05:56:56AM +0300, Dmitry Kozlyuk wrote:
> Use "%u" and a cast as in other places when port ID is formatted.
> This fixes -Wformat warning with clang 10.0.0 on Windows.
> 
> Fixes: f8244c6399d9 ("ethdev: increase port id range")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Dmitry Kozlyuk 
> ---
>  examples/rxtx_callbacks/main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c
> index b57b2fc6bc..9574b6ea0d 100644
> --- a/examples/rxtx_callbacks/main.c
> +++ b/examples/rxtx_callbacks/main.c
> @@ -329,8 +329,8 @@ main(int argc, char *argv[])
>   /* initialize all ports */
>   RTE_ETH_FOREACH_DEV(portid)
>   if (port_init(portid, mbuf_pool) != 0)
> - rte_exit(EXIT_FAILURE, "Cannot init port %"PRIu8"\n",
> - portid);

how come not just `% " PRIu16 "\n"' ?

what was the -Wformat clang on windows complaint?

[dpdk-dev] [PATCH v5 00/35] Marvell CNXK Event device Driver

[pbhagavatula]

From: Pavan Nikhilesh 

This patchset adds support for Marvell CN106XX SoC based on 'common/cnxk'
driver. In future, CN9K a.k.a octeontx2 will also be supported by same
driver when code is ready and 'event/octeontx2' will be deprecated.

v5 Changes:
- Update inline asm extension prefix.

v4 Changes:
- s/PCI_ANY_ID/RTE_PCI_ANY_ID.
- Remove dependency on net_cnxk
- Fix compilation issues with xstats patch.

v3 Changes:
- Fix documentation, copyright.
- Update release notes.

v2 Changes:
- Split Rx/Tx adapter into seperate patch set to remove dependency on net/cnxk
- Add missing xStats patch.
- Fix incorrect head wait operation.

Pavan Nikhilesh (18):
  common/cnxk: rename deprecated constant
  common/cnxk: update inline asm prefix
  event/cnxk: add build infra and device setup
  event/cnxk: add platform specific device probe
  event/cnxk: add common configuration validation
  event/cnxk: allocate event inflight buffers
  event/cnxk: add devargs to configure getwork mode
  event/cnxk: add SSO HW device operations
  event/cnxk: add SSO GWS fastpath enqueue functions
  event/cnxk: add SSO GWS dequeue fastpath functions
  event/cnxk: add SSO selftest and dump
  event/cnxk: add event port and queue xstats
  event/cnxk: add devargs to disable NPA
  event/cnxk: allow adapters to resize inflights
  event/cnxk: add TIM bucket operations
  event/cnxk: add timer arm routine
  event/cnxk: add timer arm timeout burst
  event/cnxk: add timer cancel function

Shijith Thotton (17):
  event/cnxk: add device capabilities function
  event/cnxk: add platform specific device config
  event/cnxk: add event queue config functions
  event/cnxk: add devargs for inflight buffer count
  event/cnxk: add devargs to control SSO HWGRP QoS
  event/cnxk: add port config functions
  event/cnxk: add event port link and unlink
  event/cnxk: add device start function
  event/cnxk: add device stop and close functions
  event/cnxk: support event timer
  event/cnxk: add timer adapter capabilities
  event/cnxk: create and free timer adapter
  event/cnxk: add timer adapter info function
  event/cnxk: add devargs for chunk size and rings
  event/cnxk: add timer stats get and reset
  event/cnxk: add timer adapter start and stop
  event/cnxk: add devargs to control timer adapters

 MAINTAINERS |6 +
 app/test/test_eventdev.c|   14 +
 doc/guides/eventdevs/cnxk.rst   |  162 ++
 doc/guides/eventdevs/index.rst  |1 +
 doc/guides/rel_notes/release_21_05.rst  |2 +
 drivers/common/cnxk/roc_platform.h  |   33 +-
 drivers/common/cnxk/roc_sso.c   |   63 +
 drivers/common/cnxk/roc_sso.h   |   19 +
 drivers/common/cnxk/version.map |2 +
 drivers/event/cnxk/cn10k_eventdev.c |  509 ++
 drivers/event/cnxk/cn10k_worker.c   |  115 ++
 drivers/event/cnxk/cn10k_worker.h   |  175 +++
 drivers/event/cnxk/cn9k_eventdev.c  |  578 +++
 drivers/event/cnxk/cn9k_worker.c|  236 +++
 drivers/event/cnxk/cn9k_worker.h|  297 
 drivers/event/cnxk/cnxk_eventdev.c  |  647 
 drivers/event/cnxk/cnxk_eventdev.h  |  253 +++
 drivers/event/cnxk/cnxk_eventdev_adptr.c|   67 +
 drivers/event/cnxk/cnxk_eventdev_selftest.c | 1570 +++
 drivers/event/cnxk/cnxk_eventdev_stats.c|  289 
 drivers/event/cnxk/cnxk_tim_evdev.c |  538 +++
 drivers/event/cnxk/cnxk_tim_evdev.h |  275 
 drivers/event/cnxk/cnxk_tim_worker.c|  191 +++
 drivers/event/cnxk/cnxk_tim_worker.h|  601 +++
 drivers/event/cnxk/cnxk_worker.h|  101 ++
 drivers/event/cnxk/meson.build  |   23 +
 drivers/event/cnxk/version.map  |3 +
 drivers/event/meson.build   |1 +
 28 files changed, 6755 insertions(+), 16 deletions(-)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cn10k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.h
 create mode 100644 drivers/event/cnxk/cn9k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_adptr.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_selftest.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_stats.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.h
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_worker.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

--
2.17.1

[dpdk-dev] [PATCH v5 01/35] common/cnxk: rename deprecated constant

[pbhagavatula]

From: Pavan Nikhilesh 

The PCI_ANY_ID constant is deprecated and renamed as RTE_PCI_ANY_ID.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/common/cnxk/roc_platform.h | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/common/cnxk/roc_platform.h 
b/drivers/common/cnxk/roc_platform.h
index 97600e56f..29ab71240 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -165,22 +165,18 @@ extern int cnxk_logtype_tm;
 #define plt_tm_dbg(fmt, ...)   plt_dbg(tm, fmt, ##__VA_ARGS__)
 
 #ifdef __cplusplus
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   RTE_CLASS_ANY_ID,   \
-   PCI_VENDOR_ID_CAVIUM,   \
-   (dev),  \
-   PCI_ANY_ID, \
-   (subsystem_dev),\
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   RTE_CLASS_ANY_ID, PCI_VENDOR_ID_CAVIUM, (dev), RTE_PCI_ANY_ID, \
+   (subsystem_dev),   \
}
 #else
-#define CNXK_PCI_ID(subsystem_dev, dev)\
-   {   \
-   .class_id = RTE_CLASS_ANY_ID,   \
-   .vendor_id = PCI_VENDOR_ID_CAVIUM,  \
-   .device_id = (dev), \
-   .subsystem_vendor_id = PCI_ANY_ID,  \
-   .subsystem_device_id = (subsystem_dev), \
+#define CNXK_PCI_ID(subsystem_dev, dev)
\
+   {  \
+   .class_id = RTE_CLASS_ANY_ID,  \
+   .vendor_id = PCI_VENDOR_ID_CAVIUM, .device_id = (dev), \
+   .subsystem_vendor_id = RTE_PCI_ANY_ID, \
+   .subsystem_device_id = (subsystem_dev),\
}
 #endif
 
-- 
2.17.1

[dpdk-dev] [PATCH v5 02/35] common/cnxk: update inline asm prefix

[pbhagavatula]

From: Pavan Nikhilesh 

Update inline asm prefix to prevent overriding cpu type, instead express
the additional extensions required.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/common/cnxk/roc_platform.h | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/common/cnxk/roc_platform.h 
b/drivers/common/cnxk/roc_platform.h
index 29ab71240..7864fa4ff 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -23,9 +23,14 @@
 #include "roc_bits.h"
 
 #if defined(__ARM_FEATURE_SVE)
-#define PLT_CPU_FEATURE_PREAMBLE ".cpu generic+crc+lse+sve\n"
+#define PLT_CPU_FEATURE_PREAMBLE   
\
+   ".arch_extension crc\n"\
+   ".arch_extension lse\n"\
+   ".arch_extension sve\n"
 #else
-#define PLT_CPU_FEATURE_PREAMBLE ".cpu generic+crc+lse\n"
+#define PLT_CPU_FEATURE_PREAMBLE   
\
+   ".arch_extension crc\n"\
+   ".arch_extension lse\n"
 #endif
 
 #define PLT_ASSERT  RTE_ASSERT
-- 
2.17.1

[dpdk-dev] [PATCH v5 03/35] event/cnxk: add build infra and device setup

[pbhagavatula]

From: Pavan Nikhilesh 

Add meson build infra structure along with the event device
SSO initialization and teardown functions.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
Acked-by: Ray Kinsella 
---
 MAINTAINERS|  6 +++
 doc/guides/eventdevs/cnxk.rst  | 55 +
 doc/guides/eventdevs/index.rst |  1 +
 doc/guides/rel_notes/release_21_05.rst |  2 +
 drivers/event/cnxk/cnxk_eventdev.c | 68 ++
 drivers/event/cnxk/cnxk_eventdev.h | 39 +++
 drivers/event/cnxk/meson.build | 13 +
 drivers/event/cnxk/version.map |  3 ++
 drivers/event/meson.build  |  1 +
 9 files changed, 188 insertions(+)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 44f3d322e..5a2297e99 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1224,6 +1224,12 @@ M: Jerin Jacob 
 F: drivers/event/octeontx2/
 F: doc/guides/eventdevs/octeontx2.rst
 
+Marvell cnxk
+M: Pavan Nikhilesh 
+M: Shijith Thotton 
+F: drivers/event/cnxk/
+F: doc/guides/eventdevs/cnxk.rst
+
 NXP DPAA eventdev
 M: Hemant Agrawal 
 M: Nipun Gupta 
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
new file mode 100644
index 0..148280b85
--- /dev/null
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -0,0 +1,55 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2021 Marvell.
+
+Marvell cnxk SSO Eventdev Driver
+
+
+The SSO PMD (**librte_event_cnxk**) and provides poll mode
+eventdev driver support for the inbuilt event device found in the
+**Marvell OCTEON cnxk** SoC family.
+
+More information about OCTEON cnxk SoC can be found at `Marvell Official 
Website
+`_.
+
+Supported OCTEON cnxk SoCs
+--
+
+- CN9XX
+- CN10XX
+
+Features
+
+
+Features of the OCTEON cnxk SSO PMD are:
+
+- 256 Event queues
+- 26 (dual) and 52 (single) Event ports on CN9XX
+- 52 Event ports on CN10XX
+- HW event scheduler
+- Supports 1M flows per event queue
+- Flow based event pipelining
+- Flow pinning support in flow based event pipelining
+- Queue based event pipelining
+- Supports ATOMIC, ORDERED, PARALLEL schedule types per flow
+- Event scheduling QoS based on event queue priority
+- Open system with configurable amount of outstanding events limited only by
+  DRAM
+- HW accelerated dequeue timeout support to enable power management
+
+Prerequisites and Compilation procedure
+---
+
+   See :doc:`../platform/cnxk` for setup information.
+
+Debugging Options
+-
+
+.. _table_octeon_cnxk_event_debug_options:
+
+.. table:: OCTEON cnxk event device debug options
+
+   +---++---+
+   | # | Component  | EAL log command   |
+   +===++===+
+   | 1 | SSO| --log-level='pmd\.event\.cnxk,8'  |
+   +---++---+
diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index 738788d9e..214302539 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -11,6 +11,7 @@ application through the eventdev API.
 :maxdepth: 2
 :numbered:
 
+cnxk
 dlb2
 dpaa
 dpaa2
diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index b3224dc33..428615e4f 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -75,6 +75,8 @@ New Features
 net, crypto and event PMD's.
   * Added mempool/cnxk driver which provides the support for the integrated
 mempool device.
+  * Added event/cnxk driver which provides the support for integrated event
+device.
 
 * **Enhanced ethdev representor syntax.**
 
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
new file mode 100644
index 0..7ea782eaa
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+int
+cnxk_sso_init(struct rte_eventdev *event_dev)
+{
+   const struct rte_memzone *mz = NULL;
+   struct rte_pci_device *pci_dev;
+   struct cnxk_sso_evdev *dev;
+   int rc;
+
+   mz = rte_memzone_reserve(CNXK_SSO_MZ_NAME, sizeof(uint64_t),
+SOCKET_ID_ANY, 0);
+   if (mz == NULL) {
+   plt_err("Failed to create eventdev memzone");
+

[dpdk-dev] [PATCH v5 04/35] event/cnxk: add device capabilities function

[pbhagavatula]

From: Shijith Thotton 

Add the info_get function to return details on the queues, flow,
prioritization capabilities, etc. which this device has.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_eventdev.c | 24 
 drivers/event/cnxk/cnxk_eventdev.h |  4 
 2 files changed, 28 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index 7ea782eaa..3a7053af6 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -4,6 +4,30 @@
 
 #include "cnxk_eventdev.h"
 
+void
+cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+ struct rte_event_dev_info *dev_info)
+{
+
+   dev_info->min_dequeue_timeout_ns = dev->min_dequeue_timeout_ns;
+   dev_info->max_dequeue_timeout_ns = dev->max_dequeue_timeout_ns;
+   dev_info->max_event_queues = dev->max_event_queues;
+   dev_info->max_event_queue_flows = (1ULL << 20);
+   dev_info->max_event_queue_priority_levels = 8;
+   dev_info->max_event_priority_levels = 1;
+   dev_info->max_event_ports = dev->max_event_ports;
+   dev_info->max_event_port_dequeue_depth = 1;
+   dev_info->max_event_port_enqueue_depth = 1;
+   dev_info->max_num_events = dev->max_num_events;
+   dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS |
+ RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
+ RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |
+ RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |
+ RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
+ RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
+}
+
 int
 cnxk_sso_init(struct rte_eventdev *event_dev)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 74d0990fa..9745bfd3e 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -17,6 +17,8 @@
 
 struct cnxk_sso_evdev {
struct roc_sso sso;
+   uint8_t max_event_queues;
+   uint8_t max_event_ports;
uint8_t is_timeout_deq;
uint8_t nb_event_queues;
uint8_t nb_event_ports;
@@ -35,5 +37,7 @@ cnxk_sso_pmd_priv(const struct rte_eventdev *event_dev)
 int cnxk_sso_init(struct rte_eventdev *event_dev);
 int cnxk_sso_fini(struct rte_eventdev *event_dev);
 int cnxk_sso_remove(struct rte_pci_device *pci_dev);
+void cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+  struct rte_event_dev_info *dev_info);
 
 #endif /* __CNXK_EVENTDEV_H__ */
-- 
2.17.1

[dpdk-dev] [PATCH v5 05/35] event/cnxk: add platform specific device probe

[pbhagavatula]

From: Pavan Nikhilesh 

Add platform specific event device probe and remove, also add
event device info get function.

Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Shijith Thotton 
---
 drivers/event/cnxk/cn10k_eventdev.c | 101 +++
 drivers/event/cnxk/cn9k_eventdev.c  | 102 
 drivers/event/cnxk/cnxk_eventdev.h  |   2 +
 drivers/event/cnxk/meson.build  |   5 +-
 4 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/cnxk/cn10k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn9k_eventdev.c

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
new file mode 100644
index 0..1216acaad
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+static void
+cn10k_sso_set_rsrc(void *arg)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   dev->max_event_ports = dev->sso.max_hws;
+   dev->max_event_queues =
+   dev->sso.max_hwgrp > RTE_EVENT_MAX_QUEUES_PER_DEV ?
+ RTE_EVENT_MAX_QUEUES_PER_DEV :
+ dev->sso.max_hwgrp;
+}
+
+static void
+cn10k_sso_info_get(struct rte_eventdev *event_dev,
+  struct rte_event_dev_info *dev_info)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+   dev_info->driver_name = RTE_STR(EVENTDEV_NAME_CN10K_PMD);
+   cnxk_sso_info_get(dev, dev_info);
+}
+
+static struct rte_eventdev_ops cn10k_sso_dev_ops = {
+   .dev_infos_get = cn10k_sso_info_get,
+};
+
+static int
+cn10k_sso_init(struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   if (RTE_CACHE_LINE_SIZE != 64) {
+   plt_err("Driver not compiled for CN9K");
+   return -EFAULT;
+   }
+
+   rc = roc_plt_init();
+   if (rc < 0) {
+   plt_err("Failed to initialize platform model");
+   return rc;
+   }
+
+   event_dev->dev_ops = &cn10k_sso_dev_ops;
+   /* For secondary processes, the primary has done all the work */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return 0;
+
+   rc = cnxk_sso_init(event_dev);
+   if (rc < 0)
+   return rc;
+
+   cn10k_sso_set_rsrc(cnxk_sso_pmd_priv(event_dev));
+   if (!dev->max_event_ports || !dev->max_event_queues) {
+   plt_err("Not enough eventdev resource queues=%d ports=%d",
+   dev->max_event_queues, dev->max_event_ports);
+   cnxk_sso_fini(event_dev);
+   return -ENODEV;
+   }
+
+   plt_sso_dbg("Initializing %s max_queues=%d max_ports=%d",
+   event_dev->data->name, dev->max_event_queues,
+   dev->max_event_ports);
+
+   return 0;
+}
+
+static int
+cn10k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+   return rte_event_pmd_pci_probe(pci_drv, pci_dev,
+  sizeof(struct cnxk_sso_evdev),
+  cn10k_sso_init);
+}
+
+static const struct rte_pci_id cn10k_pci_sso_map[] = {
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+   CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+   {
+   .vendor_id = 0,
+   },
+};
+
+static struct rte_pci_driver cn10k_pci_sso = {
+   .id_table = cn10k_pci_sso_map,
+   .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
+   .probe = cn10k_sso_probe,
+   .remove = cnxk_sso_remove,
+};
+
+RTE_PMD_REGISTER_PCI(event_cn10k, cn10k_pci_sso);
+RTE_PMD_REGISTER_PCI_TABLE(event_cn10k, cn10k_pci_sso_map);
+RTE_PMD_REGISTER_KMOD_DEP(event_cn10k, "vfio-pci");
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
new file mode 100644
index 0..988d2425f
--- /dev/null
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "cnxk_eventdev.h"
+
+#define CN9K_DUAL_WS_NB_WS 2
+#define CN9K_DUAL_WS_PAIR_ID(x, id) (((x)*CN9K_DUAL_WS_NB_WS) + id)
+
+static void
+cn9k_sso_set_rsrc(void *arg)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   if (dev->dual_ws)
+   dev->max_event_ports = dev->sso.max_hws / CN9K_DUAL_WS_NB_WS;
+   else
+   dev->max_event_ports = dev->sso.max_hws;
+   dev->max_event_queues =
+   dev->sso.max_hwgrp > RTE_EVENT_MAX_QUEUES_PER_DEV ?
+ RTE_EVENT_MAX_QUEUES_PER_DEV :
+ dev->sso.max_hwgrp;
+}
+
+static