date:20230329

On Wed, 29 Mar 2023 12:27:16 +0530
bharath paulraj  wrote:

> Hello Team,
> 
> I have two X710 NICs in the hypervisor and created the VFs on those NICs.
> PF is managed by the Linux kernel, while the VF is managed by DPDK. I am
> using the "test-pmd" application to test the bonding functionality,
> especially ACTIVE-BACKUP mode.
> I have created the bond interface and added the slaves in such a way that
> the one VFs from each of the PF is added to the bond interface. The goal is
> to achieve uninterrupted traffic flow even when one of the PF is down.
> As part of my testing, I made one of the PF admin down using the command
> "ip link set  down". Even after waiting for a few minutes, the
> link status is not propagated to the VF, and the link bonding still takes
> the PF which is down as the primary slave and tries to send the packet out
> of that interface.
> 
> While debugging I found out that the link status of VF is still up. Is this
> the expected behaviour? As per the link:
> https://www.intel.in/content/www/in/en/support/articles/36776/ethernet-products.html
> it is the expected behaviour. It may work well if the use case is VF-to-VF
> communication. But if the use case is to communicate to the other system -
> (Switch/Routers), then this behaviour will break the link bonding
> functionality, as the peer's interface would be operationally down, once
> the PF is made admin down.
> 
> 
> My use case:  PF is managed by Linux kernel is connected to the external
> Router, VF is added to the VM, and the DPDK application is supposed to
> send/read the packet from the VF.

Link state is controlled by Linux kernel driver, the DPDK driver
is just reflecting information from the kernel. Talk to the kernel
maintainers and/or Redhat.

Re: [PATCH v3 03/15] graph: move node process into inline function

On Wed, 29 Mar 2023 15:43:28 +0900
Zhirun Yan  wrote:

> +/**
> + * @internal
> + *
> + * Enqueue a given node to the tail of the graph reel.
> + *
> + * @param graph
> + *   Pointer Graph object.
> + * @param node
> + *   Pointer to node object to be enqueued.
> + */
> +static __rte_always_inline void
> +__rte_node_process(struct rte_graph *graph, struct rte_node *node)
> +{
> + uint64_t start;
> + uint16_t rc;
> + void **objs;
> +
> + RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
> + objs = node->objs;
> + rte_prefetch0(objs);
> +
> + if (rte_graph_has_stats_feature()) {
> + start = rte_rdtsc();
> + rc = node->process(graph, node, objs, node->idx);
> + node->total_cycles += rte_rdtsc() - start;
> + node->total_calls++;
> + node->total_objs += rc;
> + } else {
> + node->process(graph, node, objs, node->idx);
> + }
> + node->idx = 0;
> +}
> +

Why inline? Doing everything as inlines has long term ABI
impacts. And this is not a super critical performance path.

Re: [PATCH v3 03/15] graph: move node process into inline function

2023-03-29 Thread Jerin Jacob

On Wed, Mar 29, 2023 at 9:04 PM Stephen Hemminger
 wrote:
>
> On Wed, 29 Mar 2023 15:43:28 +0900
> Zhirun Yan  wrote:
>
> > +/**
> > + * @internal
> > + *
> > + * Enqueue a given node to the tail of the graph reel.
> > + *
> > + * @param graph
> > + *   Pointer Graph object.
> > + * @param node
> > + *   Pointer to node object to be enqueued.
> > + */
> > +static __rte_always_inline void
> > +__rte_node_process(struct rte_graph *graph, struct rte_node *node)
> > +{
> > + uint64_t start;
> > + uint16_t rc;
> > + void **objs;
> > +
> > + RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
> > + objs = node->objs;
> > + rte_prefetch0(objs);
> > +
> > + if (rte_graph_has_stats_feature()) {
> > + start = rte_rdtsc();
> > + rc = node->process(graph, node, objs, node->idx);
> > + node->total_cycles += rte_rdtsc() - start;
> > + node->total_calls++;
> > + node->total_objs += rc;
> > + } else {
> > + node->process(graph, node, objs, node->idx);
> > + }
> > + node->idx = 0;
> > +}
> > +
>
> Why inline? Doing everything as inlines has long term ABI
> impacts. And this is not a super critical performance path.

This is one of the real fast path routine.

Re: [PATCH] gro : ipv6 changes to support GRO for TCP/ipv6

2023-03-29 Thread kumaraparameshwaran rathinavel

Hi,

I would like to get a review on the following patch where support is added
for IPv6 GRO.

Thanks,
Param.


On Thu, Oct 20, 2022 at 5:43 PM Kumara Parameshwaran <
kumaraparames...@gmail.com> wrote:

> From: Kumara Parameshwaran 
>
> The patch adds GRO support for TCP/ipv6 packets. This does not
> include the support for vxlan, udp ipv6 packets.
>
> Signed-off-by: Kumara Parameshwaran 
> ---
> v1:
> * Changes to support GRO for TCP/ipv6 packets. This does not
> include
>   vxlan changes.
> * The GRO is performed only for ipv6 packets that does not contain
>  extension headers.
> * The logic for the TCP coalescing remains the same, in ipv6
> header
>   the source address, destination address, flow label, version
> fields
>   are expected to be the same.
> * Re-organised the code to reuse certain tcp functions for both
> ipv4 and
>   ipv6 flows.
>
>  lib/gro/gro_tcp.h| 155 
>  lib/gro/gro_tcp4.c   |   7 +-
>  lib/gro/gro_tcp4.h   | 152 +--
>  lib/gro/gro_tcp6.c   | 388 +++
>  lib/gro/gro_tcp6.h   | 150 +++
>  lib/gro/gro_vxlan_tcp4.c |   3 +-
>  lib/gro/gro_vxlan_tcp4.h |   3 +-
>  lib/gro/meson.build  |   1 +
>  lib/gro/rte_gro.c|  86 +++--
>  lib/gro/rte_gro.h|   3 +
>  10 files changed, 777 insertions(+), 171 deletions(-)
>  create mode 100644 lib/gro/gro_tcp.h
>  create mode 100644 lib/gro/gro_tcp6.c
>  create mode 100644 lib/gro/gro_tcp6.h
>
> diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
> new file mode 100644
> index 00..16bce9d098
> --- /dev/null
> +++ b/lib/gro/gro_tcp.h
> @@ -0,0 +1,155 @@
> +#ifndef _GRO_TCP_H_
> +#define _GRO_TCP_H_
> +
> +#include 
> +
> +/*
> + * The max length of a IPv4 packet, which includes the length of the L3
> + * header, the L4 header and the data payload.
> + */
> +#define MAX_IP_PKT_LENGTH UINT16_MAX
> +
> +/* The maximum TCP header length */
> +#define MAX_TCP_HLEN 60
> +#define INVALID_TCP_HDRLEN(len) \
> +   (((len) < sizeof(struct rte_tcp_hdr)) || ((len) > MAX_TCP_HLEN))
> +
> +struct gro_tcp_item {
> +   /*
> +* The first MBUF segment of the packet. If the value
> +* is NULL, it means the item is empty.
> +*/
> +   struct rte_mbuf *firstseg;
> +   /* The last MBUF segment of the packet */
> +   struct rte_mbuf *lastseg;
> +   /*
> +* The time when the first packet is inserted into the table.
> +* This value won't be updated, even if the packet is merged
> +* with other packets.
> +*/
> +   uint64_t start_time;
> +   /*
> +* next_pkt_idx is used to chain the packets that
> +* are in the same flow but can't be merged together
> +* (e.g. caused by packet reordering).
> +*/
> +   uint32_t next_pkt_idx;
> +   /* TCP sequence number of the packet */
> +   uint32_t sent_seq;
> +   /* IPv4 ID of the packet */
> +   uint16_t ip_id;
> +   /* the number of merged packets */
> +   uint16_t nb_merged;
> +   /* Indicate if IPv4 ID can be ignored */
> +   uint8_t is_atomic;
> +};
> +
> +/*
> + * Merge two TCP packets without updating checksums.
> + * If cmp is larger than 0, append the new packet to the
> + * original packet. Otherwise, pre-pend the new packet to
> + * the original packet.
> + */
> +static inline int
> +merge_two_tcp_packets(struct gro_tcp_item *item,
> +   struct rte_mbuf *pkt,
> +   int cmp,
> +   uint32_t sent_seq,
> +   uint16_t ip_id,
> +   uint16_t l2_offset)
> +{
> +   struct rte_mbuf *pkt_head, *pkt_tail, *lastseg;
> +   uint16_t hdr_len, l2_len;
> +
> +   if (cmp > 0) {
> +   pkt_head = item->firstseg;
> +   pkt_tail = pkt;
> +   } else {
> +   pkt_head = pkt;
> +   pkt_tail = item->firstseg;
> +   }
> +
> +   /* check if the IPv4 packet length is greater than the max value */
> +   hdr_len = l2_offset + pkt_head->l2_len + pkt_head->l3_len +
> +   pkt_head->l4_len;
> +   l2_len = l2_offset > 0 ? pkt_head->outer_l2_len : pkt_head->l2_len;
> +   if (unlikely(pkt_head->pkt_len - l2_len + pkt_tail->pkt_len -
> +   hdr_len > MAX_IP_PKT_LENGTH))
> +   return 0;
> +
> +   /* remove the packet header for the tail packet */
> +   rte_pktmbuf_adj(pkt_tail, hdr_len);
> +
> +   /* chain two packets together */
> +   if (cmp > 0) {
> +   item->lastseg->next = pkt;
> +   item->lastseg = rte_pktmbuf_lastseg(pkt);
> +   /* update IP ID to the larger value */
> +   item->ip_id = ip_id;
> +   } else {
> +   lastseg = rte_pktmbuf_lastseg(pkt);
> +   lastseg->next = item->firstseg;
> +   item->firstseg = pkt;
> +

Reminder - DPDK CI Community Testing Meeting - Tomorrow 3/30/23 @ 6am PDT/9am EDT/1300h GMT

2023-03-29 Thread Nathan Southern

Good Evening,

Tomorrow DPDK will be holding its CI Community Testing Meeting  - 6am
PDT/9am EDT/1300h GMT.

Zoom information to follow.

We look forward to seeing you there

Thanks,

Nathan


Nathan C. Southern, Project Coordinator

Data Plane Development Kit

The Linux Foundation

248.835.4812 (mobile)

nsouth...@linuxfoundation.org

Re: [PATCH v8 04/22] efd: replace RTE_LOGTYPE_EFD with dynamic type

On Tue, 21 Feb 2023 15:55:29 +0100
David Marchand  wrote:

> On Tue, Feb 21, 2023 at 12:36 AM Stephen Hemminger
>  wrote:
> >
> > Replace all uses of the global logtype with a dynamic log type.
> >
> > Signed-off-by: Stephen Hemminger 
> > ---
> >  lib/eal/common/eal_common_log.c | 1 -
> >  lib/eal/include/rte_log.h   | 2 +-
> >  lib/efd/rte_efd.c   | 4 
> >  3 files changed, 5 insertions(+), 2 deletions(-)  
> 
> [snip]
> 
> > diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
> > index 686a13775742..9edb11799c89 100644
> > --- a/lib/efd/rte_efd.c
> > +++ b/lib/efd/rte_efd.c
> > @@ -9,6 +9,7 @@
> >  #include 
> >  #include 
> >
> > +#include 
> >  #include 
> >  #include 
> >  #include   
> 
> This is unrelated, isn't it?

Not really, previously the hash library would cause cpuflags to be included.
But that doesn't happen now that the hash function is not inline there.

[PATCH v12 00/22] Covert static log types in libraries to dynamic

This patchset removes the main uses of static LOGTYPE's in DPDK
libraries. It starts with the easy one and goes on to the more complex ones.

There are several options on how to treat the old static types:
leave them there, mark as deprecated, or remove them.
This version removes them since there is no guarantee in current
DPDK policies that says they can't be removed.

Note: there is one patch in this series that will get
flagged incorrectly as an ABI change.

v12 - rebase and add table and pipeline libraries

v11 - fix include check on arm cross build

v10 - add necessary rte_compat.h in thash_gfni stub for arm

v9 - fix handling of crc32 alg in lib/hash.
 make it an internal global variable.
 fix gfni stubs for case where they are not used.

Stephen Hemminger (22):
  gso: don't log message on non TCP/UDP
  eal: drop no longer used GSO logtype
  log: drop unused RTE_LOGTYPE_TIMER
  efd: convert RTE_LOGTYPE_EFD to dynamic type
  mbuf: convert RTE_LOGTYPE_MBUF to dynamic type
  acl: convert RTE_LOGTYPE_ACL to dynamic type
  examples/power: replace use of RTE_LOGTYPE_POWER
  examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER
  power: convert RTE_LOGTYPE_POWER to dynamic type
  ring: convert RTE_LOGTYPE_RING to dynamic type
  mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type
  lpm: convert RTE_LOGTYPE_LPM to dynamic types
  kni: convert RTE_LOGTYPE_KNI to dynamic type
  sched: convert RTE_LOGTYPE_SCHED to dynamic type
  examples/ipsec-secgw: replace RTE_LOGTYPE_PORT
  port: convert RTE_LOGTYPE_PORT to dynamic type
  hash: move rte_thash_gfni stubs out of header file
  hash: move rte_hash_set_alg out header
  hash: convert RTE_LOGTYPE_HASH to dynamic type
  table: convert RTE_LOGTYPE_TABLE to dynamic type
  app/test: remove use of RTE_LOGTYPE_PIPELINE
  pipeline: convert RTE_LOGTYPE_PIPELINE to dynamic type

 app/test/test_acl.c |  3 +-
 app/test/test_table_acl.c   | 50 +++-
 app/test/test_table_pipeline.c  | 40 +--
 examples/distributor/main.c |  2 +-
 examples/ipsec-secgw/sa.c   |  6 +--
 examples/l3fwd-power/main.c | 17 +
 lib/acl/acl_bld.c   |  1 +
 lib/acl/acl_gen.c   |  1 +
 lib/acl/acl_log.h   |  4 ++
 lib/acl/rte_acl.c   |  4 ++
 lib/acl/tb_mem.c|  3 +-
 lib/eal/common/eal_common_log.c | 17 -
 lib/eal/include/rte_log.h   | 34 -
 lib/efd/rte_efd.c   |  4 ++
 lib/fib/fib_log.h   |  4 ++
 lib/fib/rte_fib.c   |  3 ++
 lib/fib/rte_fib6.c  |  2 +
 lib/gso/rte_gso.c   |  4 +-
 lib/gso/rte_gso.h   |  1 +
 lib/hash/meson.build|  9 -
 lib/hash/rte_crc_arm64.h|  8 ++--
 lib/hash/rte_crc_x86.h  | 10 ++---
 lib/hash/rte_cuckoo_hash.c  |  5 +++
 lib/hash/rte_fbk_hash.c |  5 +++
 lib/hash/rte_hash_crc.c | 68 +
 lib/hash/rte_hash_crc.h | 48 ++-
 lib/hash/rte_thash.c|  3 ++
 lib/hash/rte_thash_gfni.c   | 50 
 lib/hash/rte_thash_gfni.h   | 30 +--
 lib/hash/version.map| 11 ++
 lib/kni/rte_kni.c   |  3 ++
 lib/lpm/lpm_log.h   |  4 ++
 lib/lpm/rte_lpm.c   |  3 ++
 lib/lpm/rte_lpm6.c  |  1 +
 lib/mbuf/mbuf_log.h |  4 ++
 lib/mbuf/rte_mbuf.c |  4 ++
 lib/mbuf/rte_mbuf_dyn.c |  2 +
 lib/mbuf/rte_mbuf_pool_ops.c|  2 +
 lib/mempool/rte_mempool.c   |  2 +
 lib/mempool/rte_mempool.h   |  8 
 lib/mempool/version.map |  3 ++
 lib/pipeline/rte_pipeline.c |  2 +
 lib/pipeline/rte_pipeline.h |  5 +++
 lib/port/rte_port_ethdev.c  |  3 ++
 lib/port/rte_port_eventdev.c|  4 ++
 lib/port/rte_port_fd.c  |  3 ++
 lib/port/rte_port_frag.c|  3 ++
 lib/port/rte_port_kni.c |  3 ++
 lib/port/rte_port_ras.c |  3 ++
 lib/port/rte_port_ring.c|  3 ++
 lib/port/rte_port_sched.c   |  3 ++
 lib/port/rte_port_source_sink.c |  3 ++
 lib/port/rte_port_sym_crypto.c  |  3 ++
 lib/power/guest_channel.c   |  3 +-
 lib/power/power_common.c|  2 +
 lib/power/power_common.h|  3 +-
 lib/power/power_kvm_vm.c|  1 +
 lib/power/rte_power.c   |  1 +
 lib/rib/rib_log.h   |  4 ++
 lib/rib/rte_rib.c   |  3 ++
 lib/rib/rte_rib6.c  |  3 ++
 lib/ring/rte_ring.c |  3 ++
 lib/sched/rte_pie.c |  1 +
 lib/sched/rte_sched.c   |  5 +++
 lib/sched/rte_sched_log.h   |  4 ++
 lib/table/meson.build   |  1 +
 lib/table/rte_table.c   |  8 
 lib/table/rte_table.h   |  4 ++
 68 files changed, 391 insertions(+), 176 deletions(-)
 create mode 100644 lib/acl/acl_log.h
 create mode 100644 lib/fib/fib_log.h
 create mode 100644 lib/hash/rte_hash_crc.c
 create mode 100644 li

[PATCH v12 01/22] gso: don't log message on non TCP/UDP

If a large packet is passed into GSO routines of unknown protocol
then library would log a message.
Better to tell the application instead of logging.

Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO")
Reviewed-by: Jiayu Hu 
Signed-off-by: Stephen Hemminger 
---
 lib/gso/rte_gso.c | 4 +---
 lib/gso/rte_gso.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/gso/rte_gso.c b/lib/gso/rte_gso.c
index 4b59217c16ee..e29c7d884aed 100644
--- a/lib/gso/rte_gso.c
+++ b/lib/gso/rte_gso.c
@@ -80,9 +80,7 @@ rte_gso_segment(struct rte_mbuf *pkt,
ret = gso_udp4_segment(pkt, gso_size, direct_pool,
indirect_pool, pkts_out, nb_pkts_out);
} else {
-   /* unsupported packet, skip */
-   RTE_LOG(DEBUG, GSO, "Unsupported packet type\n");
-   ret = 0;
+   ret = -ENOTSUP; /* only UDP or TCP allowed */
}
 
if (ret < 0) {
diff --git a/lib/gso/rte_gso.h b/lib/gso/rte_gso.h
index 40922524df42..c0f9a1b66ff2 100644
--- a/lib/gso/rte_gso.h
+++ b/lib/gso/rte_gso.h
@@ -114,6 +114,7 @@ struct rte_gso_ctx {
  *  - The number of GSO segments filled in pkts_out on success.
  *  - Return 0 if it does not need to be GSO'd.
  *  - Return -ENOMEM if run out of memory in MBUF pools.
+ *  - Return -ENOTSUP for protocols that can not be segmented
  *  - Return -EINVAL for invalid parameters.
  */
 int rte_gso_segment(struct rte_mbuf *pkt,
-- 
2.39.2

[PATCH v12 02/22] eal: drop no longer used GSO logtype

The message that used this was replaced in previous patch.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index bd7b188ceb4a..894701e8c19c 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -368,7 +368,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
-   {RTE_LOGTYPE_GSO,"lib.gso"},
{RTE_LOGTYPE_USER1,  "user1"},
{RTE_LOGTYPE_USER2,  "user2"},
{RTE_LOGTYPE_USER3,  "user3"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 6d2b0856a565..11d517806054 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -46,7 +46,7 @@ extern "C" {
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
 #define RTE_LOGTYPE_EFD   18 /**< Log related to EFD. */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
-#define RTE_LOGTYPE_GSO   20 /**< Log related to GSO. */
+/* was RTE_LOGTYPE_GSO */
 
 /* these log types can be used in an application */
 #define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */
-- 
2.39.2

[PATCH v12 03/22] log: drop unused RTE_LOGTYPE_TIMER

The timer code does not use rte_log.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 894701e8c19c..5421da008f5b 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -352,7 +352,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
-   {RTE_LOGTYPE_TIMER,  "lib.timer"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 11d517806054..16d6ea31583d 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -30,7 +30,7 @@ extern "C" {
 #define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
 #define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
-#define RTE_LOGTYPE_TIMER  4 /**< Log related to timers. */
+/* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
-- 
2.39.2

[PATCH v12 04/22] efd: convert RTE_LOGTYPE_EFD to dynamic type

Replace all uses of the global logtype with a dynamic log type.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/efd/rte_efd.c   | 4 
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 5421da008f5b..25bb17938cc1 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -365,7 +365,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_MBUF,   "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
-   {RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
{RTE_LOGTYPE_USER1,  "user1"},
{RTE_LOGTYPE_USER2,  "user2"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 16d6ea31583d..0b39795b4d06 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -44,7 +44,7 @@ extern "C" {
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
 #define RTE_LOGTYPE_MBUF  16 /**< Log related to mbuf. */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
-#define RTE_LOGTYPE_EFD   18 /**< Log related to EFD. */
+/* was RTE_LOGTYPE_EFD */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
 /* was RTE_LOGTYPE_GSO */
 
diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index 686a13775742..9edb11799c89 100644
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -9,6 +9,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -28,6 +29,9 @@
 #include "rte_efd_arm64.h"
 #endif
 
+RTE_LOG_REGISTER_DEFAULT(efd_logtype, INFO);
+#define RTE_LOGTYPE_EFDefd_logtype
+
 #define EFD_KEY(key_idx, table) (table->keys + ((key_idx) * table->key_len))
 /** Hash function used to determine chunk_id and bin_id for a group */
 #define EFD_HASH(key, table) \
-- 
2.39.2

[PATCH v12 05/22] mbuf: convert RTE_LOGTYPE_MBUF to dynamic type

Introduce a new dynamic logtype for mbuf related messages.
Since this is used in multiple files put one macro in mbuf_log.h

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/mbuf/mbuf_log.h | 4 
 lib/mbuf/rte_mbuf.c | 4 
 lib/mbuf/rte_mbuf_dyn.c | 2 ++
 lib/mbuf/rte_mbuf_pool_ops.c| 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 lib/mbuf/mbuf_log.h

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 25bb17938cc1..d4389e436913 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -363,7 +363,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
-   {RTE_LOGTYPE_MBUF,   "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
{RTE_LOGTYPE_USER1,  "user1"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 0b39795b4d06..941fbe51fd30 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -42,7 +42,7 @@ extern "C" {
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
 #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
-#define RTE_LOGTYPE_MBUF  16 /**< Log related to mbuf. */
+/* was RTE_LOGTYPE_MBUF */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
 /* was RTE_LOGTYPE_EFD */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
diff --git a/lib/mbuf/mbuf_log.h b/lib/mbuf/mbuf_log.h
new file mode 100644
index ..d759a9a25501
--- /dev/null
+++ b/lib/mbuf/mbuf_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int mbuf_logtype;
+#define RTE_LOGTYPE_MBUF   mbuf_logtype
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 686e797c80c4..3eccc618270b 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -20,6 +20,10 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(mbuf_logtype, INFO);
+
 /*
  * pktmbuf pool constructor, given as a callback function to
  * rte_mempool_create(), or called directly if using
diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index 5049508bea6e..4fb1863a1043 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -17,6 +17,8 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
 #define RTE_MBUF_DYN_MZNAME "rte_mbuf_dyn"
 
 struct mbuf_dynfield_elt {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index 4c91f4ce8569..5318430126cb 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -8,6 +8,8 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
 int
 rte_mbuf_set_platform_mempool_ops(const char *ops_name)
 {
-- 
2.39.2

[PATCH v12 06/22] acl: convert RTE_LOGTYPE_ACL to dynamic type

Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC.
For ACL library use a dynamic type.
The one message using RTE_LOGTYPE_MALLOC should have been
under the ACL logtype anyway.

The test code should not have been using fixed log type
so just change that to stderr.

Signed-off-by: Stephen Hemminger 
---
 app/test/test_acl.c | 3 ++-
 lib/acl/acl_bld.c   | 1 +
 lib/acl/acl_gen.c   | 1 +
 lib/acl/acl_log.h   | 4 
 lib/acl/rte_acl.c   | 4 
 lib/acl/tb_mem.c| 3 ++-
 lib/eal/common/eal_common_log.c | 2 --
 lib/eal/include/rte_log.h   | 4 ++--
 8 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 lib/acl/acl_log.h

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 623f34682e69..75588978a720 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -154,7 +154,8 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx,
for (i = 0; i != num; i++) {
rc = acl_ipv4vlan_check_rule(rules + i);
if (rc != 0) {
-   RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n",
+   fprintf(stderr,
+   "%s: rule #%u is invalid\n",
__func__, i + 1);
return rc;
}
diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c
index 2816632803bd..f38e6478315f 100644
--- a/lib/acl/acl_bld.c
+++ b/lib/acl/acl_bld.c
@@ -5,6 +5,7 @@
 #include 
 #include "tb_mem.h"
 #include "acl.h"
+#include "acl_log.h"
 
 #defineACL_POOL_ALIGN  8
 #defineACL_POOL_ALLOC_MIN  0x80
diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c
index e759a2ca1598..54ec485d0c58 100644
--- a/lib/acl/acl_gen.c
+++ b/lib/acl/acl_gen.c
@@ -4,6 +4,7 @@
 
 #include 
 #include "acl.h"
+#include "acl_log.h"
 
 #defineQRANGE_MIN  ((uint8_t)INT8_MIN)
 
diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h
new file mode 100644
index ..b55573cbe207
--- /dev/null
+++ b/lib/acl/acl_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int acl_logtype;
+#define RTE_LOGTYPE_ACLacl_logtype
diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c
index a61c3ba188da..a29decb1f6ca 100644
--- a/lib/acl/rte_acl.c
+++ b/lib/acl/rte_acl.c
@@ -6,8 +6,12 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "acl.h"
+#include "acl_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO);
 
 TAILQ_HEAD(rte_acl_list, rte_tailq_entry);
 
diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c
index f14d7b4fa26e..6a9d96aaeda2 100644
--- a/lib/acl/tb_mem.c
+++ b/lib/acl/tb_mem.c
@@ -3,6 +3,7 @@
  */
 
 #include "tb_mem.h"
+#include "acl_log.h"
 
 /*
  *  Memory management routines for temporary memory.
@@ -25,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)
size = sz + pool->alignment - 1;
block = calloc(1, size + sizeof(*pool->block));
if (block == NULL) {
-   RTE_LOG(ERR, MALLOC, "%s(%zu)\n failed, currently allocated "
+   RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated "
"by pool: %zu bytes\n", __func__, sz, pool->alloc);
siglongjmp(pool->fail, -ENOMEM);
return NULL;
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index d4389e436913..9e853addb717 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,14 +349,12 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
-   {RTE_LOGTYPE_ACL,"lib.acl"},
{RTE_LOGTYPE_POWER,  "lib.power"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 941fbe51fd30..1408722b2c2f 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -27,7 +27,7 @@ extern "C" {
 
 /* SDK log type */
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
-#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
+/* was RTE_LOGTYPE_MALLOC */
 #define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
 /* was RTE_LOGTYPE_TIMER */
@@ -35,7 +35,7 @@ extern "C" {
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
 #define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
-#define RTE_LOGTYPE_ACL9 /**< Log

[PATCH v12 07/22] examples/power: replace use of RTE_LOGTYPE_POWER

Don't use static logtype in sample application.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 examples/distributor/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 21304d661873..542f76cf9664 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -679,7 +679,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   fprintf(stderr,
"Library initialization failed on core %u\n",
lcore_id);
/*
-- 
2.39.2

[PATCH v12 08/22] examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER

Convert to using a dynamic logtype for the application.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 examples/l3fwd-power/main.c | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 3f01cbd9e277..f3330fd735dd 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -51,7 +51,8 @@
 #include "perf_core.h"
 #include "main.h"
 
-#define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO);
+#define RTE_LOGTYPE_L3FWD_POWER l3fwd_power_logtype
 
 #define MAX_PKT_BURST 32
 
@@ -2236,7 +2237,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   RTE_LOG(ERR, L3FWD_POWER,
"Library initialization failed on core %u\n",
lcore_id);
return ret;
@@ -2246,8 +2247,8 @@ init_power_library(void)
if (env != PM_ENV_ACPI_CPUFREQ &&
env != PM_ENV_PSTATE_CPUFREQ &&
env != PM_ENV_CPPC_CPUFREQ) {
-   RTE_LOG(ERR, POWER,
-   "Only ACPI, PSTATE and CPPC mode are 
supported\n");
+   RTE_LOG(ERR, L3FWD_POWER,
+   "Only ACPI and PSTATE mode are supported\n");
return -1;
}
}
@@ -2264,7 +2265,7 @@ deinit_power_library(void)
/* deinit power management library */
ret = rte_power_exit(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   RTE_LOG(ERR, L3FWD_POWER,
"Library deinitialization failed on core %u\n",
lcore_id);
return ret;
@@ -2333,7 +2334,7 @@ update_telemetry(__rte_unused struct rte_timer *tim,
ret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index,
values, RTE_DIM(values));
if (ret < 0)
-   RTE_LOG(WARNING, POWER, "failed to update metrics\n");
+   RTE_LOG(WARNING, L3FWD_POWER, "failed to update metrics\n");
 }
 
 static int
@@ -2382,7 +2383,7 @@ launch_timer(unsigned int lcore_id)
rte_get_main_lcore());
}
 
-   RTE_LOG(INFO, POWER, "Bring up the Timer\n");
+   RTE_LOG(INFO, L3FWD_POWER, "Bring up the Timer\n");
 
telemetry_setup_timer();
 
@@ -2398,7 +2399,7 @@ launch_timer(unsigned int lcore_id)
}
}
 
-   RTE_LOG(INFO, POWER, "Timer_subsystem is done\n");
+   RTE_LOG(INFO, L3FWD_POWER, "Timer_subsystem is done\n");
 
return 0;
 }
-- 
2.39.2

[PATCH v12 10/22] ring: convert RTE_LOGTYPE_RING to dynamic type

The logtype for ring only used in library.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/ring/rte_ring.c | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 39e1e6680dea..5f15e312f15b 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,7 +349,6 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 7d4345acceca..31a2ee2f6b6f 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -28,7 +28,7 @@ extern "C" {
 /* SDK log type */
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
 /* was RTE_LOGTYPE_MALLOC */
-#define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
+/* was RTE_LOGTYPE_RING */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index 8ed455043dee..ae57acd7cd11 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -26,6 +26,9 @@
 #include "rte_ring.h"
 #include "rte_ring_elem.h"
 
+RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO);
+#define RTE_LOGTYPE_RING ring_logtype
+
 TAILQ_HEAD(rte_ring_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_ring_tailq = {
-- 
2.39.2

[PATCH v12 09/22] power: convert RTE_LOGTYPE_POWER to dynamic type

Use dynamic log type for power library.
Also replace use of RTE_LOGTYPE_USER1 with lib.power.guest.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/power/guest_channel.c   | 3 ++-
 lib/power/power_common.c| 2 ++
 lib/power/power_common.h| 3 ++-
 lib/power/power_kvm_vm.c| 1 +
 lib/power/rte_power.c   | 1 +
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 9e853addb717..39e1e6680dea 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -355,7 +355,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
-   {RTE_LOGTYPE_POWER,  "lib.power"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 1408722b2c2f..7d4345acceca 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -36,7 +36,7 @@ extern "C" {
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
 #define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
 /* was RTE_LOGTYPE_ACL */
-#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
+/* was RTE_LOGTYPE_POWER */
 #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
 #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
index 7b2ae0b6506f..4932a0528691 100644
--- a/lib/power/guest_channel.c
+++ b/lib/power/guest_channel.c
@@ -17,7 +17,8 @@
 
 #include "guest_channel.h"
 
-#define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER_SUFFIX(guest_channel_logtype, guest, INFO);
+#define RTE_LOGTYPE_GUEST_CHANNEL guest_channel_logtype
 
 /* Timeout for incoming message in milliseconds. */
 #define TIMEOUT 10
diff --git a/lib/power/power_common.c b/lib/power/power_common.c
index 1e09facb863f..bf77eafa886b 100644
--- a/lib/power/power_common.c
+++ b/lib/power/power_common.c
@@ -12,6 +12,8 @@
 
 #include "power_common.h"
 
+RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO);
+
 #define POWER_SYSFILE_SCALING_DRIVER   \
"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver"
 #define POWER_SYSFILE_GOVERNOR  \
diff --git a/lib/power/power_common.h b/lib/power/power_common.h
index c1c713927621..63a3a443509e 100644
--- a/lib/power/power_common.h
+++ b/lib/power/power_common.h
@@ -5,11 +5,12 @@
 #ifndef _POWER_COMMON_H_
 #define _POWER_COMMON_H_
 
-
 #include 
 
 #define RTE_POWER_INVALID_FREQ_INDEX (~0)
 
+extern int power_logtype;
+#define RTE_LOGTYPE_POWER power_logtype
 
 #ifdef RTE_LIBRTE_POWER_DEBUG
 #define POWER_DEBUG_TRACE(fmt, args...) \
diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
index 6a8109d44959..db031f43105a 100644
--- a/lib/power/power_kvm_vm.c
+++ b/lib/power/power_kvm_vm.c
@@ -8,6 +8,7 @@
 
 #include "rte_power_guest_channel.h"
 #include "guest_channel.h"
+#include "power_common.h"
 #include "power_kvm_vm.h"
 
 #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent"
diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c
index 63a43bd8f5ae..db0e7705a9ef 100644
--- a/lib/power/rte_power.c
+++ b/lib/power/rte_power.c
@@ -10,6 +10,7 @@
 #include "rte_power.h"
 #include "power_acpi_cpufreq.h"
 #include "power_cppc_cpufreq.h"
+#include "power_common.h"
 #include "power_kvm_vm.h"
 #include "power_pstate_cpufreq.h"
 
-- 
2.39.2

[PATCH v12 11/22] mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type

Convert from RTE_LOGTYPE_MEMPOOL to logtype_mempool.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/mempool/rte_mempool.c   | 2 ++
 lib/mempool/rte_mempool.h   | 8 
 lib/mempool/version.map | 3 +++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 5f15e312f15b..4025d2039d55 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,7 +349,6 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 31a2ee2f6b6f..9f86bfdd0198 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -29,7 +29,7 @@ extern "C" {
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
 /* was RTE_LOGTYPE_MALLOC */
 /* was RTE_LOGTYPE_RING */
-#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
+/* was RTE_LOGTYPE_MEMPOOL */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index cf5dea2304a7..b609a94fdf9d 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -31,6 +31,8 @@
 #include "mempool_trace.h"
 #include "rte_mempool.h"
 
+RTE_LOG_REGISTER_DEFAULT(rte_mempool_logtype, INFO);
+
 TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_mempool_tailq = {
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 9f530db24ba1..db01acc19b02 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -175,6 +176,13 @@ struct rte_mempool_objtlr {
 
 #endif
 
+
+/**
+ * @internal Logtype used for mempool related messages.
+ */
+extern int rte_mempool_logtype;
+#define RTE_LOGTYPE_MEMPOOLrte_mempool_logtype
+
 /**
  * A list of memory where objects are stored
  */
diff --git a/lib/mempool/version.map b/lib/mempool/version.map
index dff2d1cb..eb2c12127560 100644
--- a/lib/mempool/version.map
+++ b/lib/mempool/version.map
@@ -57,4 +57,7 @@ INTERNAL {
# added in 21.11
rte_mempool_event_callback_register;
rte_mempool_event_callback_unregister;
+
+   # added in 23.07
+   rte_mempool_logtype;
 };
-- 
2.39.2

[PATCH v12 12/22] lpm: convert RTE_LOGTYPE_LPM to dynamic types

Split lpm and lpm6 into separate log types since they
are in different files and user may want to change log
levels for IPv4 vs IPv6.

For rib and fib libraries give them own types as well.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/fib/fib_log.h   | 4 
 lib/fib/rte_fib.c   | 3 +++
 lib/fib/rte_fib6.c  | 2 ++
 lib/lpm/lpm_log.h   | 4 
 lib/lpm/rte_lpm.c   | 3 +++
 lib/lpm/rte_lpm6.c  | 1 +
 lib/rib/rib_log.h   | 4 
 lib/rib/rte_rib.c   | 3 +++
 lib/rib/rte_rib6.c  | 3 +++
 11 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 lib/fib/fib_log.h
 create mode 100644 lib/lpm/lpm_log.h
 create mode 100644 lib/rib/rib_log.h

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 4025d2039d55..6e2007e6ed4f 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 9f86bfdd0198..115a48bf05f5 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -33,7 +33,7 @@ extern "C" {
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
-#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
+/* was RTE_LOGTYPE_LPM */
 #define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
 /* was RTE_LOGTYPE_ACL */
 /* was RTE_LOGTYPE_POWER */
diff --git a/lib/fib/fib_log.h b/lib/fib/fib_log.h
new file mode 100644
index ..c731c820f621
--- /dev/null
+++ b/lib/fib/fib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int fib_logtype;
+#define RTE_LOGTYPE_LPM fib_logtype
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 0c3b20e00a5a..f88e71a59d5a 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -17,6 +17,9 @@
 #include 
 
 #include "dir24_8.h"
+#include "fib_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO);
 
 TAILQ_HEAD(rte_fib_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_fib_tailq = {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index 28c69b38999f..ab1d9604796f 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -17,6 +18,7 @@
 #include 
 
 #include "trie.h"
+#include "fib_log.h"
 
 TAILQ_HEAD(rte_fib6_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_fib6_tailq = {
diff --git a/lib/lpm/lpm_log.h b/lib/lpm/lpm_log.h
new file mode 100644
index ..a0621b70a5fe
--- /dev/null
+++ b/lib/lpm/lpm_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int lpm_logtype;
+#define RTE_LOGTYPE_LPM lpm_logtype
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index cdcd1b7f9e47..0ca82147866a 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -18,6 +18,9 @@
 #include 
 
 #include "rte_lpm.h"
+#include "lpm_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO);
 
 TAILQ_HEAD(rte_lpm_list, rte_tailq_entry);
 
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 8d21aeddb83c..873cc8bc267d 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -20,6 +20,7 @@
 #include 
 
 #include "rte_lpm6.h"
+#include "lpm_log.h"
 
 #define RTE_LPM6_TBL24_NUM_ENTRIES(1 << 24)
 #define RTE_LPM6_TBL8_GROUP_NUM_ENTRIES 256
diff --git a/lib/rib/rib_log.h b/lib/rib/rib_log.h
new file mode 100644
index ..f3ee513ca854
--- /dev/null
+++ b/lib/rib/rib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int rib_logtype;
+#define RTE_LOGTYPE_LPM rib_logtype
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 812a2597d117..a62e951a8e0e 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -16,6 +16,9 @@
 
 #include 
 
+RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO);
+#define RTE_LOGTYPE_LPM rib_logtype
+
 TAILQ_HEAD(rte_rib_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_rib_tailq = {
.name = "RTE_RIB",
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index ae44281ae105..5765995197f8 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -16,6 +17,8 @@
 
 #include 
 
+#include "rib_log.h"
+
 #define R

[PATCH v12 13/22] kni: convert RTE_LOGTYPE_KNI to dynamic type

Even though KNI will eventually disappear, fix the
logtype now.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/kni/rte_kni.c   | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 6e2007e6ed4f..70d5bb7b1951 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_KNI,"lib.kni"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 115a48bf05f5..dc2454a0d9de 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -34,7 +34,7 @@ extern "C" {
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
 /* was RTE_LOGTYPE_LPM */
-#define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
+/* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
 /* was RTE_LOGTYPE_POWER */
 #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
index bfa6a001ff59..b327bb28c45b 100644
--- a/lib/kni/rte_kni.c
+++ b/lib/kni/rte_kni.c
@@ -23,6 +23,9 @@
 #include 
 #include "rte_kni_fifo.h"
 
+RTE_LOG_REGISTER_DEFAULT(kni_logtype, INFO);
+#define RTE_LOGTYPE_KNI kni_logtype
+
 #define MAX_MBUF_BURST_NUM32
 
 /* Maximum number of ring entries */
-- 
2.39.2

[PATCH v12 14/22] sched: convert RTE_LOGTYPE_SCHED to dynamic type

Also can remove unused RTE_LOGTYPE_METER

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 2 --
 lib/eal/include/rte_log.h   | 4 ++--
 lib/sched/rte_pie.c | 1 +
 lib/sched/rte_sched.c   | 5 +
 lib/sched/rte_sched_log.h   | 4 
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 lib/sched/rte_sched_log.h

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 70d5bb7b1951..d4b7088b5cbb 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,8 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_METER,  "lib.meter"},
-   {RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index dc2454a0d9de..f185fcbc5a94 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -37,8 +37,8 @@ extern "C" {
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
 /* was RTE_LOGTYPE_POWER */
-#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
-#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
+/* was RTE_LOGTYPE_METER */
+/* was RTE_LOGTYPE_SCHED */
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
 #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 947e2a059f6f..cce0ce762da8 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 
+#include "rte_sched_log.h"
 #include "rte_pie.h"
 
 #ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index 19768d8c38b0..27e98e46df7a 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -16,9 +16,12 @@
 #include 
 
 #include "rte_sched.h"
+#include "rte_sched_log.h"
 #include "rte_sched_common.h"
+
 #include "rte_approx.h"
 
+
 #ifdef __INTEL_COMPILER
 #pragma warning(disable:2259) /* conversion may lose significant bits */
 #endif
@@ -3002,3 +3005,5 @@ rte_sched_port_dequeue(struct rte_sched_port *port, 
struct rte_mbuf **pkts, uint
 
return count;
 }
+
+RTE_LOG_REGISTER_DEFAULT(sched_logtype, INFO);
diff --git a/lib/sched/rte_sched_log.h b/lib/sched/rte_sched_log.h
new file mode 100644
index ..fde051f49d62
--- /dev/null
+++ b/lib/sched/rte_sched_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int sched_logtype;
+#define RTE_LOGTYPE_SCHED sched_logtype
-- 
2.39.2

[PATCH v12 15/22] examples/ipsec-secgw: replace RTE_LOGTYPE_PORT

Looks like some code got copy/paste in to the IPSEC gateway
example from another place. Shouldn't be using RTE_LOGTYPE_PORT
here.

Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload")
Acked-by: Akhil Goyal 
Signed-off-by: Stephen Hemminger 
---
 examples/ipsec-secgw/sa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 5f5d2685f64c..417bfb41cca5 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1130,7 +1130,7 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, 
uint32_t tso)
if (inbound) {
if ((dev_info.rx_offload_capa &
RTE_ETH_RX_OFFLOAD_SECURITY) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware RX IPSec offload is not supported\n");
return -EINVAL;
}
@@ -1138,13 +1138,13 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, 
uint32_t tso)
} else { /* outbound */
if ((dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_SECURITY) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware TX IPSec offload is not supported\n");
return -EINVAL;
}
if (tso && (dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware TCP TSO offload is not supported\n");
return -EINVAL;
}
-- 
2.39.2

[PATCH v12 17/22] hash: move rte_thash_gfni stubs out of header file

Having stubs in header file makes it harder to update
RTE_LOG(). Also modify to only print warning once.

Signed-off-by: Stephen Hemminger 
---
 lib/hash/meson.build  |  8 ++-
 lib/hash/rte_thash_gfni.c | 47 +++
 lib/hash/rte_thash_gfni.h | 30 -
 lib/hash/version.map  |  4 
 4 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 lib/hash/rte_thash_gfni.c

diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 2f757d45f9bc..e56ee8572564 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -17,7 +17,13 @@ indirect_headers += files(
 'rte_thash_x86_gfni.h',
 )
 
-sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c')
+sources = files(
+'rte_cuckoo_hash.c',
+'rte_fbk_hash.c',
+'rte_thash.c',
+'rte_thash_gfni.c'
+)
+
 deps += ['net']
 deps += ['ring']
 deps += ['rcu']
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
new file mode 100644
index ..eb334185725c
--- /dev/null
+++ b/lib/hash/rte_thash_gfni.c
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#ifndef RTE_THASH_GFNI_DEFINED
+
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx __rte_unused,
+  const uint8_t *key __rte_unused, int len __rte_unused)
+{
+   static bool warned;
+
+   if (!warned) {
+   warned = true;
+   RTE_LOG(ERR, HASH,
+   "%s is undefined under given arch\n", __func__);
+   }
+
+   return 0;
+}
+
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
+   int len __rte_unused, uint8_t *tuple[] __rte_unused,
+   uint32_t val[], uint32_t num)
+{
+   unsigned int i;
+
+   static bool warned;
+
+   if (!warned) {
+   warned = true;
+   RTE_LOG(ERR, HASH,
+   "%s is undefined under given arch\n", __func__);
+   }
+
+   for (i = 0; i < num; i++)
+   val[i] = 0;
+}
+
+#endif
diff --git a/lib/hash/rte_thash_gfni.h b/lib/hash/rte_thash_gfni.h
index ef90faa302d1..4fc92984077e 100644
--- a/lib/hash/rte_thash_gfni.h
+++ b/lib/hash/rte_thash_gfni.h
@@ -9,13 +9,14 @@
 extern "C" {
 #endif
 
+#include 
+
 #include 
-#include 
+#include 
+#include 
 
 #ifdef RTE_ARCH_X86
-
 #include 
-
 #endif
 
 #ifndef RTE_THASH_GFNI_DEFINED
@@ -38,13 +39,8 @@ extern "C" {
  *  Calculated Toeplitz hash value.
  */
 __rte_experimental
-static inline uint32_t
-rte_thash_gfni(const uint64_t *mtrx __rte_unused,
-   const uint8_t *key __rte_unused, int len __rte_unused)
-{
-   RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
-   return 0;
-}
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx, const uint8_t *key, int len);
 
 /**
  * Bulk implementation for Toeplitz hash.
@@ -67,17 +63,9 @@ rte_thash_gfni(const uint64_t *mtrx __rte_unused,
  *  Number of tuples to hash.
  */
 __rte_experimental
-static inline void
-rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
-   int len __rte_unused, uint8_t *tuple[] __rte_unused,
-   uint32_t val[], uint32_t num)
-{
-   unsigned int i;
-
-   RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
-   for (i = 0; i < num; i++)
-   val[i] = 0;
-}
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx, int len, uint8_t *tuple[],
+   uint32_t val[], uint32_t num);
 
 #endif /* RTE_THASH_GFNI_DEFINED */
 
diff --git a/lib/hash/version.map b/lib/hash/version.map
index bdcebd19c29b..f03b047b2eec 100644
--- a/lib/hash/version.map
+++ b/lib/hash/version.map
@@ -51,4 +51,8 @@ EXPERIMENTAL {
rte_thash_complete_matrix;
rte_thash_get_gfni_matrices;
rte_thash_gfni_supported;
+
+   # added in 22.07
+   rte_thash_gfni;
+   rte_thash_gfni_bulk;
 };
-- 
2.39.2

[PATCH v12 16/22] port: convert RTE_LOGTYPE_PORT to dynamic type

Split up the single static RTE_LOGTYPE_PORT into separate
sub types for each component: port.ethdev, port.evendev, ...

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/port/rte_port_ethdev.c  | 3 +++
 lib/port/rte_port_eventdev.c| 4 
 lib/port/rte_port_fd.c  | 3 +++
 lib/port/rte_port_frag.c| 3 +++
 lib/port/rte_port_kni.c | 3 +++
 lib/port/rte_port_ras.c | 3 +++
 lib/port/rte_port_ring.c| 3 +++
 lib/port/rte_port_sched.c   | 3 +++
 lib/port/rte_port_source_sink.c | 3 +++
 lib/port/rte_port_sym_crypto.c  | 3 +++
 12 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index d4b7088b5cbb..7f1d2c8a256d 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index f185fcbc5a94..b11aec69af78 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -39,7 +39,7 @@ extern "C" {
 /* was RTE_LOGTYPE_POWER */
 /* was RTE_LOGTYPE_METER */
 /* was RTE_LOGTYPE_SCHED */
-#define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
+/* was RTE_LOGTYPE_PORT */
 #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
 /* was RTE_LOGTYPE_MBUF */
diff --git a/lib/port/rte_port_ethdev.c b/lib/port/rte_port_ethdev.c
index 0da7890261e9..6685d304a6e9 100644
--- a/lib/port/rte_port_ethdev.c
+++ b/lib/port/rte_port_ethdev.c
@@ -10,6 +10,9 @@
 
 #include "rte_port_ethdev.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_ethdev_logtype, ethdev, INFO);
+#define RTE_LOGTYPE_PORT port_ethdev_logtype
+
 /*
  * Port ETHDEV Reader
  */
diff --git a/lib/port/rte_port_eventdev.c b/lib/port/rte_port_eventdev.c
index fd7dac9a5661..04447bd7f7bc 100644
--- a/lib/port/rte_port_eventdev.c
+++ b/lib/port/rte_port_eventdev.c
@@ -5,11 +5,15 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
 #include "rte_port_eventdev.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_eventdev_logtype, eventdev, INFO);
+#define RTE_LOGTYPE_PORT port_eventdev_logtype
+
 /*
  * Port EVENTDEV Reader
  */
diff --git a/lib/port/rte_port_fd.c b/lib/port/rte_port_fd.c
index 932ecd324e05..b2412e7706ee 100644
--- a/lib/port/rte_port_fd.c
+++ b/lib/port/rte_port_fd.c
@@ -10,6 +10,9 @@
 
 #include "rte_port_fd.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_fd_logtype, fd, INFO);
+#define RTE_LOGTYPE_PORT port_fd_logtype
+
 /*
  * Port FD Reader
  */
diff --git a/lib/port/rte_port_frag.c b/lib/port/rte_port_frag.c
index e1f1892176c4..9adcbba47da1 100644
--- a/lib/port/rte_port_frag.c
+++ b/lib/port/rte_port_frag.c
@@ -7,6 +7,9 @@
 
 #include "rte_port_frag.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_frag_logtype, frag, INFO);
+#define RTE_LOGTYPE_PORT port_frag_logtype
+
 /* Max number of fragments per packet allowed */
 #defineRTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80
 
diff --git a/lib/port/rte_port_kni.c b/lib/port/rte_port_kni.c
index 1c7a6cb200ea..d4ac08b4cff0 100644
--- a/lib/port/rte_port_kni.c
+++ b/lib/port/rte_port_kni.c
@@ -9,6 +9,9 @@
 
 #include "rte_port_kni.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_kni_logtype, kni, INFO);
+#define RTE_LOGTYPE_PORT port_kni_logtype
+
 /*
  * Port KNI Reader
  */
diff --git a/lib/port/rte_port_ras.c b/lib/port/rte_port_ras.c
index e5de57da42ea..5a610b1ba5b5 100644
--- a/lib/port/rte_port_ras.c
+++ b/lib/port/rte_port_ras.c
@@ -9,6 +9,9 @@
 
 #include "rte_port_ras.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_ras_logtype, ras, INFO);
+#define RTE_LOGTYPE_PORT port_ras_logtype
+
 #ifndef RTE_PORT_RAS_N_BUCKETS
 #define RTE_PORT_RAS_N_BUCKETS 4094
 #endif
diff --git a/lib/port/rte_port_ring.c b/lib/port/rte_port_ring.c
index 52b2d8e557f0..32a90e836579 100644
--- a/lib/port/rte_port_ring.c
+++ b/lib/port/rte_port_ring.c
@@ -10,6 +10,9 @@
 
 #include "rte_port_ring.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_ring_logtype, ring, INFO);
+#define RTE_LOGTYPE_PORT port_ring_logtype
+
 /*
  * Port RING Reader
  */
diff --git a/lib/port/rte_port_sched.c b/lib/port/rte_port_sched.c
index 8a7d815ef323..6e0a8aba5419 100644
--- a/lib/port/rte_port_sched.c
+++ b/lib/port/rte_port_sched.c
@@ -7,6 +7,9 @@
 
 #include "rte_port_sched.h"
 
+RTE_LOG_REGISTER_SUFFIX(port_sched_logtype, sched, INFO);
+#define RTE_LOGTYPE_PORT port_sched_logtype
+
 /*

[PATCH v12 18/22] hash: move rte_hash_set_alg out header

The code for setting algorithm for hash is not at all perf sensitive,
and doing it inline has a couple of problems. First, it means that if
multiple files include the header, then the initialization gets done
multiple times. But also, it makes it harder to fix usage of RTE_LOG().

Despite what the checking script say. This is not an ABI change, the
previous version inlined the same code; therefore both old and new code
will work the same.

Signed-off-by: Stephen Hemminger 
Acked-by: Ruifeng Wang 
---
 lib/hash/meson.build |  1 +
 lib/hash/rte_crc_arm64.h |  8 ++---
 lib/hash/rte_crc_x86.h   | 10 +++---
 lib/hash/rte_hash_crc.c  | 68 
 lib/hash/rte_hash_crc.h  | 48 ++--
 lib/hash/version.map |  7 +
 6 files changed, 88 insertions(+), 54 deletions(-)
 create mode 100644 lib/hash/rte_hash_crc.c

diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index e56ee8572564..c345c6f561fc 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -19,6 +19,7 @@ indirect_headers += files(
 
 sources = files(
 'rte_cuckoo_hash.c',
+'rte_hash_crc.c',
 'rte_fbk_hash.c',
 'rte_thash.c',
 'rte_thash_gfni.c'
diff --git a/lib/hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
index c9f52510871b..414fe065caa8 100644
--- a/lib/hash/rte_crc_arm64.h
+++ b/lib/hash/rte_crc_arm64.h
@@ -53,7 +53,7 @@ crc32c_arm64_u64(uint64_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u8(data, init_val);
 
return crc32c_1byte(data, init_val);
@@ -67,7 +67,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u16(data, init_val);
 
return crc32c_2bytes(data, init_val);
@@ -81,7 +81,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u32(data, init_val);
 
return crc32c_1word(data, init_val);
@@ -95,7 +95,7 @@ rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_8byte(uint64_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u64(data, init_val);
 
return crc32c_2words(data, init_val);
diff --git a/lib/hash/rte_crc_x86.h b/lib/hash/rte_crc_x86.h
index 205bc182be77..3b865e251db2 100644
--- a/lib/hash/rte_crc_x86.h
+++ b/lib/hash/rte_crc_x86.h
@@ -67,7 +67,7 @@ crc32c_sse42_u64(uint64_t data, uint64_t init_val)
 static inline uint32_t
 rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u8(data, init_val);
 
return crc32c_1byte(data, init_val);
@@ -81,7 +81,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u16(data, init_val);
 
return crc32c_2bytes(data, init_val);
@@ -95,7 +95,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u32(data, init_val);
 
return crc32c_1word(data, init_val);
@@ -110,11 +110,11 @@ static inline uint32_t
 rte_hash_crc_8byte(uint64_t data, uint32_t init_val)
 {
 #ifdef RTE_ARCH_X86_64
-   if (likely(crc32_alg == CRC32_SSE42_x64))
+   if (likely(rte_hash_crc32_alg == CRC32_SSE42_x64))
return crc32c_sse42_u64(data, init_val);
 #endif
 
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u64_mimic(data, init_val);
 
return crc32c_2words(data, init_val);
diff --git a/lib/hash/rte_hash_crc.c b/lib/hash/rte_hash_crc.c
new file mode 100644
index ..1439d8a71f6a
--- /dev/null
+++ b/lib/hash/rte_hash_crc.c
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include 
+#include 
+
+#include "rte_hash_crc.h"
+
+RTE_LOG_REGISTER_SUFFIX(hash_crc_logtype, crc, INFO);
+#define RTE_LOGTYPE_HASH_CRC hash_crc_logtype
+
+uint8_t rte_hash_crc32_alg = CRC32_SW;
+

[PATCH v12 19/22] hash: convert RTE_LOGTYPE_HASH to dynamic type

Use dynamic type for hash and add subtypes for crc and gfni.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/hash/rte_cuckoo_hash.c  | 5 +
 lib/hash/rte_fbk_hash.c | 5 +
 lib/hash/rte_thash.c| 3 +++
 lib/hash/rte_thash_gfni.c   | 3 +++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 7f1d2c8a256d..58f9c0ce629b 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -350,7 +350,6 @@ struct logtype {
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
-   {RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index b11aec69af78..4d1b892ab689 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -32,7 +32,7 @@ extern "C" {
 /* was RTE_LOGTYPE_MEMPOOL */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
-#define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
+/* was RTE_LOGTYPE_HASH */
 /* was RTE_LOGTYPE_LPM */
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 829b79c89a27..e2b07bfbad71 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -24,6 +24,11 @@
 #include 
 
 #include "rte_hash.h"
+
+/* needs to be before rte_cuckoo_hash.h */
+RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
+#define RTE_LOGTYPE_HASH hash_logtype
+
 #include "rte_cuckoo_hash.h"
 
 /* Mask of all flags supported by this version */
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 538b23a4030a..b4c4c191abdc 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -8,6 +8,8 @@
 #include 
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -18,6 +20,9 @@
 
 #include "rte_fbk_hash.h"
 
+RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO);
+#define RTE_LOGTYPE_HASH fbk_hash_logtype
+
 TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_fbk_hash_tailq = {
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 0249883b8d07..c1fd2e34c9d4 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -13,6 +13,9 @@
 #include 
 #include 
 
+RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO);
+#define RTE_LOGTYPE_HASH thash_logtype
+
 #define THASH_NAME_LEN 64
 #define TOEPLITZ_HASH_LEN  32
 
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
index eb334185725c..35206d575153 100644
--- a/lib/hash/rte_thash_gfni.c
+++ b/lib/hash/rte_thash_gfni.c
@@ -10,6 +10,9 @@
 
 #ifndef RTE_THASH_GFNI_DEFINED
 
+RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
+#define RTE_LOGTYPE_HASH hash_gfni_logtype
+
 uint32_t
 rte_thash_gfni(const uint64_t *mtrx __rte_unused,
   const uint8_t *key __rte_unused, int len __rte_unused)
-- 
2.39.2

[PATCH v12 21/22] app/test: remove use of RTE_LOGTYPE_PIPELINE

Instead of using static type PIPELINE for logging in test application
use stderr instead.  If not testing RTE_LOG() better to not use
it since log also goes to syslog.

Signed-off-by: Stephen Hemminger 
---
 app/test/test_table_acl.c  | 50 --
 app/test/test_table_pipeline.c | 40 +--
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index e66f06b84d0a..dff9bddfb948 100644
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -165,7 +165,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+   fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -178,7 +178,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+   fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -190,7 +190,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+   fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -202,7 +202,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+   fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -254,7 +254,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+   fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -267,7 +267,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+   fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -279,7 +279,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+   fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -291,7 +291,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+   fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -346,7 +346,7 @@ setup_acl_pipeline(void)
/* Pipeline configuration */
p = rte_pipeline_create(&pipeline_params);
if (p == NULL) {
-   RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n",
+   fprintf(stderr, "%s: Failed to configure pipeline\n",
__func__);
goto fail;
}
@@ -410,7 +410,7 @@ setup_acl_pipeline(void)
table_params.f_action_miss = NULL;
table_params.action_data_size = 0;
 
-   RTE_LOG(INFO, PIPELINE,

[PATCH v12 20/22] table: convert RTE_LOGTYPE_TABLE to dynamic type

Make an alias for RTE_LOGTYPE_TABLE in rte_table.h
and use it.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/table/meson.build   | 1 +
 lib/table/rte_table.c   | 8 
 lib/table/rte_table.h   | 4 
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 lib/table/rte_table.c

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 58f9c0ce629b..6c2d9bfc1950 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -350,7 +350,6 @@ struct logtype {
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
-   {RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 4d1b892ab689..6418479ee266 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -40,7 +40,7 @@ extern "C" {
 /* was RTE_LOGTYPE_METER */
 /* was RTE_LOGTYPE_SCHED */
 /* was RTE_LOGTYPE_PORT */
-#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
+/* was RTE_LOGTYPE_TABLE */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
 /* was RTE_LOGTYPE_MBUF */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
diff --git a/lib/table/meson.build b/lib/table/meson.build
index f8cef24b5918..e753b6fb23d8 100644
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -7,6 +7,7 @@ sources = files(
 'rte_swx_table_learner.c',
 'rte_swx_table_selector.c',
 'rte_swx_table_wm.c',
+'rte_table.c',
 'rte_table_acl.c',
 'rte_table_array.c',
 'rte_table_hash_cuckoo.c',
diff --git a/lib/table/rte_table.c b/lib/table/rte_table.c
new file mode 100644
index ..4a083f4aaf0c
--- /dev/null
+++ b/lib/table/rte_table.c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include 
+#include 
+
+RTE_LOG_REGISTER_DEFAULT(table_logtype, INFO);
diff --git a/lib/table/rte_table.h b/lib/table/rte_table.h
index 096ab8a7c824..42e9b58fbea5 100644
--- a/lib/table/rte_table.h
+++ b/lib/table/rte_table.h
@@ -265,6 +265,10 @@ struct rte_table_ops {
rte_table_op_stats_read f_stats;  /**< Stats */
 };
 
+/** Internal Logtype used */
+extern int table_logtype;
+#define RTE_LOGTYPE_TABLE table_logtype
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.39.2

[PATCH v12 22/22] pipeline: convert RTE_LOGTYPE_PIPELINE to dynamic type

Convert RTE_LOGTYPE_PIPELINE to a dynamic value.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/common/eal_common_log.c | 1 -
 lib/eal/include/rte_log.h   | 2 +-
 lib/pipeline/rte_pipeline.c | 2 ++
 lib/pipeline/rte_pipeline.h | 5 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 6c2d9bfc1950..704924e822d0 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -350,7 +350,6 @@ struct logtype {
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
-   {RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
{RTE_LOGTYPE_USER1,  "user1"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 6418479ee266..29db07881a5a 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -41,7 +41,7 @@ extern "C" {
 /* was RTE_LOGTYPE_SCHED */
 /* was RTE_LOGTYPE_PORT */
 /* was RTE_LOGTYPE_TABLE */
-#define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
+/* was RTE_LOGTYPE_PIPELINE */
 /* was RTE_LOGTYPE_MBUF */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
 /* was RTE_LOGTYPE_EFD */
diff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
index ff86c7cf96bf..3b9b083b390d 100644
--- a/lib/pipeline/rte_pipeline.c
+++ b/lib/pipeline/rte_pipeline.c
@@ -1612,3 +1612,5 @@ int rte_pipeline_table_stats_read(struct rte_pipeline *p, 
uint32_t table_id,
 
return 0;
 }
+
+RTE_LOG_REGISTER_DEFAULT(pipeline_logtype, INFO);
diff --git a/lib/pipeline/rte_pipeline.h b/lib/pipeline/rte_pipeline.h
index 3cfb6868f727..ebae08de644f 100644
--- a/lib/pipeline/rte_pipeline.h
+++ b/lib/pipeline/rte_pipeline.h
@@ -841,6 +841,11 @@ int rte_pipeline_ah_packet_hijack(struct rte_pipeline *p,
 int rte_pipeline_ah_packet_drop(struct rte_pipeline *p,
uint64_t pkts_mask);
 
+
+/** Internal Logtype used */
+extern int pipeline_logtype;
+#define RTE_LOGTYPE_PIPELINE pipeline_logtype
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.39.2

RE: [PATCH v3 04/15] graph: add get/set graph worker model APIs

2023-03-29 Thread Yan, Zhirun




> -Original Message-
> From: Stephen Hemminger 
> Sent: Wednesday, March 29, 2023 11:35 PM
> To: Yan, Zhirun 
> Cc: dev@dpdk.org; jer...@marvell.com; kirankum...@marvell.com;
> ndabilpu...@marvell.com; Liang, Cunming ; Wang,
> Haiyue 
> Subject: Re: [PATCH v3 04/15] graph: add get/set graph worker model APIs
> 
> On Wed, 29 Mar 2023 15:43:29 +0900
> Zhirun Yan  wrote:
> 
> > +
> > +/**
> > + * @warning
> > + * @b EXPERIMENTAL: this API may change, or be removed, without prior
> > +notice
> > + * Set the graph worker model
> > + *
> > + * @note This function does not perform any locking, and is only safe to 
> > call
> > + *before graph running.
> > + *
> > + * @param name
> > + *   Name of the graph worker model.
> > + *
> > + * @return
> > + *   0 on success, -1 otherwise.
> > + */
> > +inline int
> > +rte_graph_worker_model_set(enum rte_graph_worker_model model) {
> > +   if (model >= RTE_GRAPH_MODEL_LIST_END)
> > +   goto fail;
> > +
> > +   RTE_PER_LCORE(worker_model) = model;
> > +   return 0;
> > +
> > +fail:
> > +   RTE_PER_LCORE(worker_model) = RTE_GRAPH_MODEL_DEFAULT;
> > +   return -1;
> > +}
> > +
> 
> Once again, this doesn't have to be inline, could be a real API.

Thanks, I will remove inline in next version.

Regarding DPDK API's like rte_timer_subsystem_init/rte_hash_create etc. in VPP

2023-03-29 Thread Prashant Upadhyaya

Hi,

While trying to port some code to VPP (which uses DPDK as the backend
driver), I am running into a problem that calls to API's like
rte_timer_subsystem_init, rte_hash_create are failing while allocation
of memory.

This is presumably because VPP inits the EAL with the following arguments --

-in-memory --no-telemetry --file-prefix vpp

Is  there is something that can be done eg. passing some more parms in
the EAL initialization which hopefully wouldn't break VPP but will
also be friendly to the RTE timer and hash functions too, that would
be great, so requesting some advice here.

Regards
-Prashant

[PATCH v4 00/15] graph enhancement for multi-core dispatch

V4:
Fix CI build issues about undefined reference of sched apis.
Remove inline for model setting.

V3:
Fix CI build issues about TLS and typo.

V2:
Use git mv to keep git history.
Use TLS for per-thread local storage.
Change model name to mcore dispatch.
Change API with specific mode name.
Split big patch.
Fix CI issues.
Rebase l3fwd-graph example.
Update doc and maintainers files.


Currently, rte_graph supports RTC (Run-To-Completion) model within each
of a single core.
RTC is one of the typical model of packet processing. Others like
Pipeline or Hybrid are lack of support.

The patch set introduces a 'multicore dispatch' model selection which
is a self-reacting scheme according to the core affinity.
The new model enables a cross-core dispatching mechanism which employs a
scheduling work-queue to dispatch streams to other worker cores which
being associated with the destination node. When core flavor of the
destination node is a default 'current', the stream can be continue
executed as normal.

Example:
3-node graph targets 3-core budget

RTC:
Graph: node-0 -> node-1 -> node-2 @Core0.

+ - - - - - - - - - - - - - - - - - - - - - +
'Core #0/1/2'
'   '
' ++ +-+ ++ '
' | Node-0 | --> | Node-1  | --> | Node-2 | '
' ++ +-+ ++ '
'   '
+ - - - - - - - - - - - - - - - - - - - - - +

Dispatch:

Graph topo: node-0 -> Core1; node-1 -> node-2; node-2 -> node-3.
Config graph: node-0 @Core0; node-1/3 @Core1; node-2 @Core2.

.. code-block:: diff

+ - - - - - -+ +- - - - - - - - - - - - - + + - - - - - -+
'  Core #0   ' '  Core #1 ' '  Core #2   '
'' '  ' ''
' ++ ' ' ++++ ' ' ++ '
' | Node-0 | - - - ->| Node-1 || Node-3 |<- - - - | Node-2 | '
' ++ ' ' ++++ ' ' ++ '
'' ' |' '  ^ '
+ - - - - - -+ +- - -|- - - - - - - - - - + + - - -|- - -+
 | |
 + - - - - - - - - - - - - - - - - +


The patch set has been break down as below:

1. Split graph worker into common and default model part.
2. Inline graph node processing to make it reusable.
3. Add set/get APIs to choose worker model.
4. Introduce core affinity API to set the node run on specific worker core.
  (only use in new model)
5. Introduce graph affinity API to bind one graph with specific worker
  core.
6. Introduce graph clone API.
7. Introduce stream moving with scheduler work-queue in patch 8~12.
8. Add stats for new models.
9. Abstract default graph config process and integrate new model into
  example/l3fwd-graph. Add new parameters for model choosing.

We could run with new worker model by this:
./dpdk-l3fwd-graph -l 8,9,10,11 -n 4 -- -p 0x1 --config="(0,0,9)" -P
--model="dispatch"

References:
https://static.sched.com/hosted_files/dpdkuserspace22/a6/graph%20introduce%20remote%20dispatch%20for%20mult-core%20scaling.pdf


Zhirun Yan (15):
  graph: rename rte_graph_work as common
  graph: split graph worker into common and default model
  graph: move node process into inline function
  graph: add get/set graph worker model APIs
  graph: introduce graph node core affinity API
  graph: introduce graph bind unbind API
  graph: introduce graph clone API for other worker core
  graph: add struct for stream moving between cores
  graph: introduce stream moving cross cores
  graph: enable create and destroy graph scheduling workqueue
  graph: introduce graph walk by cross-core dispatch
  graph: enable graph multicore dispatch scheduler model
  graph: add stats for cross-core dispatching
  examples/l3fwd-graph: introduce multicore dispatch worker model
  doc: update multicore dispatch model in graph guides

 MAINTAINERS  |   1 +
 doc/guides/prog_guide/graph_lib.rst  |  59 ++-
 examples/l3fwd-graph/main.c  | 237 +---
 lib/graph/graph.c| 179 +
 lib/graph/graph_debug.c  |   6 +
 lib/graph/graph_populate.c   |   1 +
 lib/graph/graph_private.h|  44 +++
 lib/graph/graph_stats.c  |  74 +++-
 lib/graph/meson.build|   4 +-
 lib/graph/node.c |   1 +
 lib/graph/rte_graph.h|  44 +++
 lib/graph/rte_graph_model_dispatch.c | 179 +
 lib/graph/rte_graph_model_dispatch.h | 122 ++
 lib/graph/rte_graph_model_rtc.h  |  45 +++
 lib/graph/rte_graph_worker.c |  54 +++
 lib/graph/rte_graph_worker.h | 498 +
 lib/graph/rte_graph_worker_common.h  | 539 +++
 lib/graph/version.map|  10 +
 18 files changed, 1553 insertions

[PATCH v4 01/15] graph: rename rte_graph_work as common

Rename rte_graph_work.h to rte_graph_work_common.h for supporting
multiple graph worker model.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 MAINTAINERS | 1 +
 lib/graph/graph_pcap.c  | 2 +-
 lib/graph/graph_private.h   | 2 +-
 lib/graph/meson.build   | 2 +-
 lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} | 6 +++---
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 280058adfc..9d9467dd00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1714,6 +1714,7 @@ F: doc/guides/prog_guide/bpf_lib.rst
 Graph - EXPERIMENTAL
 M: Jerin Jacob 
 M: Kiran Kumar K 
+M: Zhirun Yan 
 F: lib/graph/
 F: doc/guides/prog_guide/graph_lib.rst
 F: app/test/test_graph*
diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 6c43330029..8a220370fa 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -10,7 +10,7 @@
 #include 
 #include 
 
-#include "rte_graph_worker.h"
+#include "rte_graph_worker_common.h"
 
 #include "graph_pcap_private.h"
 
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 7d1b30b8ac..f08dbc7e9d 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -12,7 +12,7 @@
 #include 
 
 #include "rte_graph.h"
-#include "rte_graph_worker.h"
+#include "rte_graph_worker_common.h"
 
 extern int rte_graph_logtype;
 
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 3526d1b5d4..4e2b612ad3 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,6 @@ sources = files(
 'graph_populate.c',
 'graph_pcap.c',
 )
-headers = files('rte_graph.h', 'rte_graph_worker.h')
+headers = files('rte_graph.h', 'rte_graph_worker_common.h')
 
 deps += ['eal', 'pcapng']
diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker_common.h
similarity index 99%
rename from lib/graph/rte_graph_worker.h
rename to lib/graph/rte_graph_worker_common.h
index 438595b15c..0bad2938f3 100644
--- a/lib/graph/rte_graph_worker.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -2,8 +2,8 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#ifndef _RTE_GRAPH_WORKER_H_
-#define _RTE_GRAPH_WORKER_H_
+#ifndef _RTE_GRAPH_WORKER_COMMON_H_
+#define _RTE_GRAPH_WORKER_COMMON_H_
 
 /**
  * @file rte_graph_worker.h
@@ -518,4 +518,4 @@ rte_node_next_stream_move(struct rte_graph *graph, struct 
rte_node *src,
 }
 #endif
 
-#endif /* _RTE_GRAPH_WORKER_H_ */
+#endif /* _RTE_GRAPH_WORKER_COIMMON_H_ */
-- 
2.37.2

[PATCH v4 02/15] graph: split graph worker into common and default model

To support multiple graph worker model, split graph into common
and default. Naming the current walk function as rte_graph_model_rtc
cause the default model is RTC(Run-to-completion).

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph_pcap.c  |  2 +-
 lib/graph/graph_private.h   |  2 +-
 lib/graph/meson.build   |  2 +-
 lib/graph/rte_graph_model_rtc.h | 61 +
 lib/graph/rte_graph_worker.h| 34 
 lib/graph/rte_graph_worker_common.h | 57 ---
 6 files changed, 98 insertions(+), 60 deletions(-)
 create mode 100644 lib/graph/rte_graph_model_rtc.h
 create mode 100644 lib/graph/rte_graph_worker.h

diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 8a220370fa..6c43330029 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -10,7 +10,7 @@
 #include 
 #include 
 
-#include "rte_graph_worker_common.h"
+#include "rte_graph_worker.h"
 
 #include "graph_pcap_private.h"
 
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index f08dbc7e9d..7d1b30b8ac 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -12,7 +12,7 @@
 #include 
 
 #include "rte_graph.h"
-#include "rte_graph_worker_common.h"
+#include "rte_graph_worker.h"
 
 extern int rte_graph_logtype;
 
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 4e2b612ad3..3526d1b5d4 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,6 @@ sources = files(
 'graph_populate.c',
 'graph_pcap.c',
 )
-headers = files('rte_graph.h', 'rte_graph_worker_common.h')
+headers = files('rte_graph.h', 'rte_graph_worker.h')
 
 deps += ['eal', 'pcapng']
diff --git a/lib/graph/rte_graph_model_rtc.h b/lib/graph/rte_graph_model_rtc.h
new file mode 100644
index 00..665560f831
--- /dev/null
+++ b/lib/graph/rte_graph_model_rtc.h
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "rte_graph_worker_common.h"
+
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ *   Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+static inline void
+rte_graph_walk_rtc(struct rte_graph *graph)
+{
+   const rte_graph_off_t *cir_start = graph->cir_start;
+   const rte_node_t mask = graph->cir_mask;
+   uint32_t head = graph->head;
+   struct rte_node *node;
+   uint64_t start;
+   uint16_t rc;
+   void **objs;
+
+   /*
+* Walk on the source node(s) ((cir_start - head) -> cir_start) and then
+* on the pending streams (cir_start -> (cir_start + mask) -> cir_start)
+* in a circular buffer fashion.
+*
+*  +-+ <= cir_start - head [number of source nodes]
+*  | |
+*  | ... | <= source nodes
+*  | |
+*  +-+ <= cir_start [head = 0] [tail = 0]
+*  | |
+*  | ... | <= pending streams
+*  | |
+*  +-+ <= cir_start + mask
+*/
+   while (likely(head != graph->tail)) {
+   node = (struct rte_node *)RTE_PTR_ADD(graph, 
cir_start[(int32_t)head++]);
+   RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
+   objs = node->objs;
+   rte_prefetch0(objs);
+
+   if (rte_graph_has_stats_feature()) {
+   start = rte_rdtsc();
+   rc = node->process(graph, node, objs, node->idx);
+   node->total_cycles += rte_rdtsc() - start;
+   node->total_calls++;
+   node->total_objs += rc;
+   } else {
+   node->process(graph, node, objs, node->idx);
+   }
+   node->idx = 0;
+   head = likely((int32_t)head > 0) ? head & mask : head;
+   }
+   graph->tail = 0;
+}
diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
new file mode 100644
index 00..7ea18ba80a
--- /dev/null
+++ b/lib/graph/rte_graph_worker.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_GRAPH_WORKER_H_
+#define _RTE_GRAPH_WORKER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rte_graph_model_rtc.h"
+
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ *   Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+__rte_experimental
+static inline void
+rte_graph_walk(struct rte_graph *graph)
+{
+   rte_graph_walk_rtc(graph);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_GRAPH_WORKER_H_ */
diff --git a/lib/graph/

[PATCH v4 03/15] graph: move node process into inline function

Node process is a single and reusable block, move the code into an inline
function.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/rte_graph_model_rtc.h | 20 ++---
 lib/graph/rte_graph_worker_common.h | 33 +
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/lib/graph/rte_graph_model_rtc.h b/lib/graph/rte_graph_model_rtc.h
index 665560f831..0dcb7151e9 100644
--- a/lib/graph/rte_graph_model_rtc.h
+++ b/lib/graph/rte_graph_model_rtc.h
@@ -20,9 +20,6 @@ rte_graph_walk_rtc(struct rte_graph *graph)
const rte_node_t mask = graph->cir_mask;
uint32_t head = graph->head;
struct rte_node *node;
-   uint64_t start;
-   uint16_t rc;
-   void **objs;
 
/*
 * Walk on the source node(s) ((cir_start - head) -> cir_start) and then
@@ -41,21 +38,8 @@ rte_graph_walk_rtc(struct rte_graph *graph)
 */
while (likely(head != graph->tail)) {
node = (struct rte_node *)RTE_PTR_ADD(graph, 
cir_start[(int32_t)head++]);
-   RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
-   objs = node->objs;
-   rte_prefetch0(objs);
-
-   if (rte_graph_has_stats_feature()) {
-   start = rte_rdtsc();
-   rc = node->process(graph, node, objs, node->idx);
-   node->total_cycles += rte_rdtsc() - start;
-   node->total_calls++;
-   node->total_objs += rc;
-   } else {
-   node->process(graph, node, objs, node->idx);
-   }
-   node->idx = 0;
-   head = likely((int32_t)head > 0) ? head & mask : head;
+   __rte_node_process(graph, node);
+   head = likely((int32_t)head > 0) ? head & mask : head;
}
graph->tail = 0;
 }
diff --git a/lib/graph/rte_graph_worker_common.h 
b/lib/graph/rte_graph_worker_common.h
index b58f8f6947..41428974db 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -130,6 +130,39 @@ void __rte_node_stream_alloc_size(struct rte_graph *graph,
 
 /* Fast path helper functions */
 
+/**
+ * @internal
+ *
+ * Enqueue a given node to the tail of the graph reel.
+ *
+ * @param graph
+ *   Pointer Graph object.
+ * @param node
+ *   Pointer to node object to be enqueued.
+ */
+static __rte_always_inline void
+__rte_node_process(struct rte_graph *graph, struct rte_node *node)
+{
+   uint64_t start;
+   uint16_t rc;
+   void **objs;
+
+   RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
+   objs = node->objs;
+   rte_prefetch0(objs);
+
+   if (rte_graph_has_stats_feature()) {
+   start = rte_rdtsc();
+   rc = node->process(graph, node, objs, node->idx);
+   node->total_cycles += rte_rdtsc() - start;
+   node->total_calls++;
+   node->total_objs += rc;
+   } else {
+   node->process(graph, node, objs, node->idx);
+   }
+   node->idx = 0;
+}
+
 /**
  * @internal
  *
-- 
2.37.2

[PATCH v4 04/15] graph: add get/set graph worker model APIs

Add new get/set APIs to configure graph worker model which is used to
determine which model will be chosen.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/meson.build   |  1 +
 lib/graph/rte_graph_worker.c| 54 +
 lib/graph/rte_graph_worker_common.h | 19 ++
 lib/graph/version.map   |  3 ++
 4 files changed, 77 insertions(+)
 create mode 100644 lib/graph/rte_graph_worker.c

diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 3526d1b5d4..9fab8243da 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -15,6 +15,7 @@ sources = files(
 'graph_stats.c',
 'graph_populate.c',
 'graph_pcap.c',
+'rte_graph_worker.c',
 )
 headers = files('rte_graph.h', 'rte_graph_worker.h')
 
diff --git a/lib/graph/rte_graph_worker.c b/lib/graph/rte_graph_worker.c
new file mode 100644
index 00..cabc101262
--- /dev/null
+++ b/lib/graph/rte_graph_worker.c
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "rte_graph_worker_common.h"
+
+RTE_DEFINE_PER_LCORE(enum rte_graph_worker_model, worker_model) = 
RTE_GRAPH_MODEL_DEFAULT;
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ * Set the graph worker model
+ *
+ * @note This function does not perform any locking, and is only safe to call
+ *before graph running.
+ *
+ * @param name
+ *   Name of the graph worker model.
+ *
+ * @return
+ *   0 on success, -1 otherwise.
+ */
+int
+rte_graph_worker_model_set(enum rte_graph_worker_model model)
+{
+   if (model >= RTE_GRAPH_MODEL_LIST_END)
+   goto fail;
+
+   RTE_PER_LCORE(worker_model) = model;
+   return 0;
+
+fail:
+   RTE_PER_LCORE(worker_model) = RTE_GRAPH_MODEL_DEFAULT;
+   return -1;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Get the graph worker model
+ *
+ * @param name
+ *   Name of the graph worker model.
+ *
+ * @return
+ *   Graph worker model on success.
+ */
+inline
+enum rte_graph_worker_model
+rte_graph_worker_model_get(void)
+{
+   return RTE_PER_LCORE(worker_model);
+}
diff --git a/lib/graph/rte_graph_worker_common.h 
b/lib/graph/rte_graph_worker_common.h
index 41428974db..1526da6e2c 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -95,6 +96,16 @@ struct rte_node {
struct rte_node *nodes[] __rte_cache_min_aligned; /**< Next nodes. */
 } __rte_cache_aligned;
 
+/** Graph worker models */
+enum rte_graph_worker_model {
+   RTE_GRAPH_MODEL_DEFAULT,
+   RTE_GRAPH_MODEL_RTC = RTE_GRAPH_MODEL_DEFAULT,
+   RTE_GRAPH_MODEL_MCORE_DISPATCH,
+   RTE_GRAPH_MODEL_LIST_END
+};
+
+RTE_DECLARE_PER_LCORE(enum rte_graph_worker_model, worker_model);
+
 /**
  * @internal
  *
@@ -490,6 +501,14 @@ rte_node_next_stream_move(struct rte_graph *graph, struct 
rte_node *src,
}
 }
 
+__rte_experimental
+enum rte_graph_worker_model
+rte_graph_worker_model_get(void);
+
+__rte_experimental
+int
+rte_graph_worker_model_set(enum rte_graph_worker_model model);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 13b838752d..eea73ec9ca 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -43,5 +43,8 @@ EXPERIMENTAL {
rte_node_next_stream_put;
rte_node_next_stream_move;
 
+   rte_graph_worker_model_set;
+   rte_graph_worker_model_get;
+
local: *;
 };
-- 
2.37.2

[PATCH v4 05/15] graph: introduce graph node core affinity API

Add lcore_id for node to hold affinity core id and impl
rte_graph_model_dispatch_lcore_affinity_set to set node affinity
with specific lcore.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph_private.h|  1 +
 lib/graph/meson.build|  1 +
 lib/graph/node.c |  1 +
 lib/graph/rte_graph_model_dispatch.c | 31 
 lib/graph/rte_graph_model_dispatch.h | 43 
 lib/graph/version.map|  2 ++
 6 files changed, 79 insertions(+)
 create mode 100644 lib/graph/rte_graph_model_dispatch.c
 create mode 100644 lib/graph/rte_graph_model_dispatch.h

diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 7d1b30b8ac..409eed3284 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -50,6 +50,7 @@ struct node {
STAILQ_ENTRY(node) next;  /**< Next node in the list. */
char name[RTE_NODE_NAMESIZE]; /**< Name of the node. */
uint64_t flags;   /**< Node configuration flag. */
+   unsigned int lcore_id;/**< Node runs on the Lcore ID */
rte_node_process_t process;   /**< Node process function. */
rte_node_init_t init; /**< Node init function. */
rte_node_fini_t fini; /**< Node fini function. */
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 9fab8243da..c729d984b6 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,7 @@ sources = files(
 'graph_populate.c',
 'graph_pcap.c',
 'rte_graph_worker.c',
+'rte_graph_model_dispatch.c',
 )
 headers = files('rte_graph.h', 'rte_graph_worker.h')
 
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 149414dcd9..339b4a0da5 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -100,6 +100,7 @@ __rte_node_register(const struct rte_node_register *reg)
goto free;
}
 
+   node->lcore_id = RTE_MAX_LCORE;
node->id = node_id++;
 
/* Add the node at tail */
diff --git a/lib/graph/rte_graph_model_dispatch.c 
b/lib/graph/rte_graph_model_dispatch.c
new file mode 100644
index 00..4a2f99496d
--- /dev/null
+++ b/lib/graph/rte_graph_model_dispatch.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "graph_private.h"
+#include "rte_graph_model_dispatch.h"
+
+int
+rte_graph_model_dispatch_lcore_affinity_set(const char *name, unsigned int 
lcore_id)
+{
+   struct node *node;
+   int ret = -EINVAL;
+
+   if (lcore_id >= RTE_MAX_LCORE)
+   return ret;
+
+   graph_spinlock_lock();
+
+   STAILQ_FOREACH(node, node_list_head_get(), next) {
+   if (strncmp(node->name, name, RTE_NODE_NAMESIZE) == 0) {
+   node->lcore_id = lcore_id;
+   ret = 0;
+   break;
+   }
+   }
+
+   graph_spinlock_unlock();
+
+   return ret;
+}
+
diff --git a/lib/graph/rte_graph_model_dispatch.h 
b/lib/graph/rte_graph_model_dispatch.h
new file mode 100644
index 00..179624e972
--- /dev/null
+++ b/lib/graph/rte_graph_model_dispatch.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_GRAPH_MODEL_DISPATCH_H_
+#define _RTE_GRAPH_MODEL_DISPATCH_H_
+
+/**
+ * @file rte_graph_model_dispatch.h
+ *
+ * @warning
+ * @b EXPERIMENTAL:
+ * All functions in this file may be changed or removed without prior notice.
+ *
+ * This API allows to set core affinity with the node.
+ */
+#include "rte_graph_worker_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Set lcore affinity with the node.
+ *
+ * @param name
+ *   Valid node name. In the case of the cloned node, the name will be
+ * "parent node name" + "-" + name.
+ * @param lcore_id
+ *   The lcore ID value.
+ *
+ * @return
+ *   0 on success, error otherwise.
+ */
+__rte_experimental
+int rte_graph_model_dispatch_lcore_affinity_set(const char *name,
+   unsigned int lcore_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_GRAPH_MODEL_DISPATCH_H_ */
diff --git a/lib/graph/version.map b/lib/graph/version.map
index eea73ec9ca..1f090be74e 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -46,5 +46,7 @@ EXPERIMENTAL {
rte_graph_worker_model_set;
rte_graph_worker_model_get;
 
+   rte_graph_model_dispatch_lcore_affinity_set;
+
local: *;
 };
-- 
2.37.2

[PATCH v4 06/15] graph: introduce graph bind unbind API

Add lcore_id for graph to hold affinity core id where graph would run on.
Add bind/unbind API to set/unset graph affinity attribute. lcore_id will
be set as MAX by default, it means not enable this attribute.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph.c | 59 +++
 lib/graph/graph_private.h |  2 ++
 lib/graph/rte_graph.h | 22 +++
 lib/graph/version.map |  2 ++
 4 files changed, 85 insertions(+)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index a839a2803b..b39a99aac6 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -254,6 +254,64 @@ graph_mem_fixup_secondary(struct rte_graph *graph)
return graph_mem_fixup_node_ctx(graph);
 }
 
+static __rte_always_inline bool
+graph_src_node_avail(struct graph *graph)
+{
+   struct graph_node *graph_node;
+
+   STAILQ_FOREACH(graph_node, &graph->node_list, next)
+   if ((graph_node->node->flags & RTE_NODE_SOURCE_F) &&
+   (graph_node->node->lcore_id == RTE_MAX_LCORE ||
+graph->lcore_id == graph_node->node->lcore_id))
+   return true;
+
+   return false;
+}
+
+int
+rte_graph_model_dispatch_core_bind(rte_graph_t id, int lcore)
+{
+   struct graph *graph;
+
+   GRAPH_ID_CHECK(id);
+   if (!rte_lcore_is_enabled(lcore))
+   SET_ERR_JMP(ENOLINK, fail,
+   "lcore %d not enabled\n",
+   lcore);
+
+   STAILQ_FOREACH(graph, &graph_list, next)
+   if (graph->id == id)
+   break;
+
+   graph->lcore_id = lcore;
+   graph->socket = rte_lcore_to_socket_id(lcore);
+
+   /* check the availability of source node */
+   if (!graph_src_node_avail(graph))
+   graph->graph->head = 0;
+
+   return 0;
+
+fail:
+   return -rte_errno;
+}
+
+void
+rte_graph_model_dispatch_core_unbind(rte_graph_t id)
+{
+   struct graph *graph;
+
+   GRAPH_ID_CHECK(id);
+   STAILQ_FOREACH(graph, &graph_list, next)
+   if (graph->id == id)
+   break;
+
+   graph->lcore_id = RTE_MAX_LCORE;
+
+fail:
+   return;
+}
+
 struct rte_graph *
 rte_graph_lookup(const char *name)
 {
@@ -340,6 +398,7 @@ rte_graph_create(const char *name, struct rte_graph_param 
*prm)
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_id;
+   graph->lcore_id = RTE_MAX_LCORE;
graph->num_pkt_to_capture = prm->num_pkt_to_capture;
if (prm->pcap_filename)
rte_strscpy(graph->pcap_filename, prm->pcap_filename, 
RTE_GRAPH_PCAP_FILE_SZ);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 409eed3284..ad1d058945 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -98,6 +98,8 @@ struct graph {
/**< Circular buffer mask for wrap around. */
rte_graph_t id;
/**< Graph identifier. */
+   unsigned int lcore_id;
+   /**< Lcore identifier where the graph prefer to run on. */
size_t mem_sz;
/**< Memory size of the graph. */
int socket;
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index c9a77297fc..c523809d1f 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -285,6 +285,28 @@ char *rte_graph_id_to_name(rte_graph_t id);
 __rte_experimental
 int rte_graph_export(const char *name, FILE *f);
 
+/**
+ * Bind graph with specific lcore
+ *
+ * @param id
+ *   Graph id to get the pointer of graph object
+ * @param lcore
+ * The lcore where the graph will run on
+ * @return
+ *   0 on success, error otherwise.
+ */
+__rte_experimental
+int rte_graph_model_dispatch_core_bind(rte_graph_t id, int lcore);
+
+/**
+ * Unbind graph with lcore
+ *
+ * @param id
+ * Graph id to get the pointer of graph object
+ */
+__rte_experimental
+void rte_graph_model_dispatch_core_unbind(rte_graph_t id);
+
 /**
  * Get graph object from its name.
  *
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 1f090be74e..7de6f08f59 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -18,6 +18,8 @@ EXPERIMENTAL {
rte_graph_node_get_by_name;
rte_graph_obj_dump;
rte_graph_walk;
+   rte_graph_model_dispatch_core_bind;
+   rte_graph_model_dispatch_core_unbind;
 
rte_graph_cluster_stats_create;
rte_graph_cluster_stats_destroy;
-- 
2.37.2

[PATCH v4 07/15] graph: introduce graph clone API for other worker core

This patch adds graph API for supporting to clone the graph object for
a specified worker core. The new graph will also clone all nodes.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph.c | 110 ++
 lib/graph/graph_private.h |   2 +
 lib/graph/rte_graph.h |  20 +++
 lib/graph/version.map |   1 +
 4 files changed, 133 insertions(+)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index b39a99aac6..90eaad0378 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -398,6 +398,7 @@ rte_graph_create(const char *name, struct rte_graph_param 
*prm)
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_id;
+   graph->parent_id = RTE_GRAPH_ID_INVALID;
graph->lcore_id = RTE_MAX_LCORE;
graph->num_pkt_to_capture = prm->num_pkt_to_capture;
if (prm->pcap_filename)
@@ -462,6 +463,115 @@ rte_graph_destroy(rte_graph_t id)
return rc;
 }
 
+static int
+clone_name(struct graph *graph, struct graph *parent_graph, const char *name)
+{
+   ssize_t sz, rc;
+
+#define SZ RTE_GRAPH_NAMESIZE
+   rc = rte_strscpy(graph->name, parent_graph->name, SZ);
+   if (rc < 0)
+   goto fail;
+   sz = rc;
+   rc = rte_strscpy(graph->name + sz, "-", RTE_MAX((int16_t)(SZ - sz), 0));
+   if (rc < 0)
+   goto fail;
+   sz += rc;
+   sz = rte_strscpy(graph->name + sz, name, RTE_MAX((int16_t)(SZ - sz), 
0));
+   if (sz < 0)
+   goto fail;
+
+   return 0;
+fail:
+   rte_errno = E2BIG;
+   return -rte_errno;
+}
+
+static rte_graph_t
+graph_clone(struct graph *parent_graph, const char *name)
+{
+   struct graph_node *graph_node;
+   struct graph *graph;
+
+   graph_spinlock_lock();
+
+   /* Don't allow to clone a node from a cloned graph */
+   if (parent_graph->parent_id != RTE_GRAPH_ID_INVALID)
+   SET_ERR_JMP(EEXIST, fail, "A cloned graph is not allowed to be 
cloned");
+
+   /* Create graph object */
+   graph = calloc(1, sizeof(*graph));
+   if (graph == NULL)
+   SET_ERR_JMP(ENOMEM, fail, "Failed to calloc cloned graph 
object");
+
+   /* Naming ceremony of the new graph. name is node->name + "-" + name */
+   if (clone_name(graph, parent_graph, name))
+   goto free;
+
+   /* Check for existence of duplicate graph */
+   if (rte_graph_from_name(graph->name) != RTE_GRAPH_ID_INVALID)
+   SET_ERR_JMP(EEXIST, free, "Found duplicate graph %s",
+   graph->name);
+
+   /* Clone nodes from parent graph firstly */
+   STAILQ_INIT(&graph->node_list);
+   STAILQ_FOREACH(graph_node, &parent_graph->node_list, next) {
+   if (graph_node_add(graph, graph_node->node))
+   goto graph_cleanup;
+   }
+
+   /* Just update adjacency list of all nodes in the graph */
+   if (graph_adjacency_list_update(graph))
+   goto graph_cleanup;
+
+   /* Initialize the graph object */
+   graph->src_node_count = parent_graph->src_node_count;
+   graph->node_count = parent_graph->node_count;
+   graph->parent_id = parent_graph->id;
+   graph->lcore_id = parent_graph->lcore_id;
+   graph->socket = parent_graph->socket;
+   graph->id = graph_id;
+
+   /* Allocate the Graph fast path memory and populate the data */
+   if (graph_fp_mem_create(graph))
+   goto graph_cleanup;
+
+   /* Call init() of the all the nodes in the graph */
+   if (graph_node_init(graph))
+   goto graph_mem_destroy;
+
+   /* All good, Lets add the graph to the list */
+   graph_id++;
+   STAILQ_INSERT_TAIL(&graph_list, graph, next);
+
+   graph_spinlock_unlock();
+   return graph->id;
+
+graph_mem_destroy:
+   graph_fp_mem_destroy(graph);
+graph_cleanup:
+   graph_cleanup(graph);
+free:
+   free(graph);
+fail:
+   graph_spinlock_unlock();
+   return RTE_GRAPH_ID_INVALID;
+}
+
+rte_graph_t
+rte_graph_clone(rte_graph_t id, const char *name)
+{
+   struct graph *graph;
+
+   GRAPH_ID_CHECK(id);
+   STAILQ_FOREACH(graph, &graph_list, next)
+   if (graph->id == id)
+   return graph_clone(graph, name);
+
+fail:
+   return RTE_GRAPH_ID_INVALID;
+}
+
 rte_graph_t
 rte_graph_from_name(const char *name)
 {
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index ad1d058945..d28a5af93e 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -98,6 +98,8 @@ struct graph {
/**< Circular buffer mask for wrap around. */
rte_graph_t id;
/**< Graph identifier. */
+   rte_graph_t parent_id;
+   /**< Parent graph identifier. */
unsigned int lcore_id;
/**< Lcore identifier where the graph prefer to run on. *

[PATCH v4 08/15] graph: add struct for stream moving between cores

Add graph_sched_wq_node to hold graph scheduling workqueue
node.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph.c   |  1 +
 lib/graph/graph_populate.c  |  1 +
 lib/graph/graph_private.h   | 12 
 lib/graph/rte_graph_worker_common.h | 21 +
 4 files changed, 35 insertions(+)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 90eaad0378..dd3d69dbf7 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -284,6 +284,7 @@ rte_graph_model_dispatch_core_bind(rte_graph_t id, int 
lcore)
break;
 
graph->lcore_id = lcore;
+   graph->graph->lcore_id = graph->lcore_id;
graph->socket = rte_lcore_to_socket_id(lcore);
 
/* check the availability of source node */
diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c
index 2c0844ce92..7dcf1420c1 100644
--- a/lib/graph/graph_populate.c
+++ b/lib/graph/graph_populate.c
@@ -89,6 +89,7 @@ graph_nodes_populate(struct graph *_graph)
}
node->id = graph_node->node->id;
node->parent_id = pid;
+   node->lcore_id = graph_node->node->lcore_id;
nb_edges = graph_node->node->nb_edges;
node->nb_edges = nb_edges;
off += sizeof(struct rte_node);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index d28a5af93e..b66b18ebbc 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -60,6 +60,18 @@ struct node {
char next_nodes[][RTE_NODE_NAMESIZE]; /**< Names of next nodes. */
 };
 
+/**
+ * @internal
+ *
+ * Structure that holds the graph scheduling workqueue node stream.
+ * Used for mcore dispatch model.
+ */
+struct graph_sched_wq_node {
+   rte_graph_off_t node_off;
+   uint16_t nb_objs;
+   void *objs[RTE_GRAPH_BURST_SIZE];
+} __rte_cache_aligned;
+
 /**
  * @internal
  *
diff --git a/lib/graph/rte_graph_worker_common.h 
b/lib/graph/rte_graph_worker_common.h
index 1526da6e2c..dc0a0b5554 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -30,6 +30,13 @@
 extern "C" {
 #endif
 
+/**
+ * @internal
+ *
+ * Singly-linked list head for graph schedule run-queue.
+ */
+SLIST_HEAD(rte_graph_rq_head, rte_graph);
+
 /**
  * @internal
  *
@@ -41,6 +48,15 @@ struct rte_graph {
uint32_t cir_mask;   /**< Circular buffer wrap around mask. */
rte_node_t nb_nodes; /**< Number of nodes in the graph. */
rte_graph_off_t *cir_start;  /**< Pointer to circular buffer. */
+   /* Graph schedule */
+   struct rte_graph_rq_head *rq __rte_cache_aligned; /* The run-queue */
+   struct rte_graph_rq_head rq_head; /* The head for run-queue list */
+
+   SLIST_ENTRY(rte_graph) rq_next;   /* The next for run-queue list */
+   unsigned int lcore_id;  /**< The graph running Lcore. */
+   struct rte_ring *wq;/**< The work-queue for pending streams. */
+   struct rte_mempool *mp; /**< The mempool for scheduling streams. */
+   /* Graph schedule area */
rte_graph_off_t nodes_start; /**< Offset at which node memory starts. */
rte_graph_t id; /**< Graph identifier. */
int socket; /**< Socket ID where memory is allocated. */
@@ -74,6 +90,11 @@ struct rte_node {
/** Original process function when pcap is enabled. */
rte_node_process_t original_process;
 
+   RTE_STD_C11
+   union {
+   /* Fast schedule area for mcore dispatch model */
+   unsigned int lcore_id;  /**< Node running lcore. */
+   };
/* Fast path area  */
 #define RTE_NODE_CTX_SZ 16
uint8_t ctx[RTE_NODE_CTX_SZ] __rte_cache_aligned; /**< Node Context. */
-- 
2.37.2

[PATCH v4 09/15] graph: introduce stream moving cross cores

This patch introduces key functions to allow a worker thread to
enable enqueue and move streams of objects to the next nodes over
different cores.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph_private.h|  27 +
 lib/graph/meson.build|   2 +-
 lib/graph/rte_graph_model_dispatch.c | 145 +++
 lib/graph/rte_graph_model_dispatch.h |  37 +++
 lib/graph/version.map|   2 +
 5 files changed, 212 insertions(+), 1 deletion(-)

diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index b66b18ebbc..e1a2a4bfd8 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -366,4 +366,31 @@ void graph_dump(FILE *f, struct graph *g);
  */
 void node_dump(FILE *f, struct node *n);
 
+/**
+ * @internal
+ *
+ * Create the graph schedule work queue. And all cloned graphs attached to the
+ * parent graph MUST be destroyed together for fast schedule design limitation.
+ *
+ * @param _graph
+ *   The graph object
+ * @param _parent_graph
+ *   The parent graph object which holds the run-queue head.
+ *
+ * @return
+ *   - 0: Success.
+ *   - <0: Graph schedule work queue related error.
+ */
+int graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph);
+
+/**
+ * @internal
+ *
+ * Destroy the graph schedule work queue.
+ *
+ * @param _graph
+ *   The graph object
+ */
+void graph_sched_wq_destroy(struct graph *_graph);
+
 #endif /* _RTE_GRAPH_PRIVATE_H_ */
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index c729d984b6..e21affa280 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -20,4 +20,4 @@ sources = files(
 )
 headers = files('rte_graph.h', 'rte_graph_worker.h')
 
-deps += ['eal', 'pcapng']
+deps += ['eal', 'pcapng', 'mempool', 'ring']
diff --git a/lib/graph/rte_graph_model_dispatch.c 
b/lib/graph/rte_graph_model_dispatch.c
index 4a2f99496d..a300fefb85 100644
--- a/lib/graph/rte_graph_model_dispatch.c
+++ b/lib/graph/rte_graph_model_dispatch.c
@@ -5,6 +5,151 @@
 #include "graph_private.h"
 #include "rte_graph_model_dispatch.h"
 
+int
+graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph)
+{
+   struct rte_graph *parent_graph = _parent_graph->graph;
+   struct rte_graph *graph = _graph->graph;
+   unsigned int wq_size;
+
+   wq_size = GRAPH_SCHED_WQ_SIZE(graph->nb_nodes);
+   wq_size = rte_align32pow2(wq_size + 1);
+
+   graph->wq = rte_ring_create(graph->name, wq_size, graph->socket,
+   RING_F_SC_DEQ);
+   if (graph->wq == NULL)
+   SET_ERR_JMP(EIO, fail, "Failed to allocate graph WQ");
+
+   graph->mp = rte_mempool_create(graph->name, wq_size,
+  sizeof(struct graph_sched_wq_node),
+  0, 0, NULL, NULL, NULL, NULL,
+  graph->socket, MEMPOOL_F_SP_PUT);
+   if (graph->mp == NULL)
+   SET_ERR_JMP(EIO, fail_mp,
+   "Failed to allocate graph WQ schedule entry");
+
+   graph->lcore_id = _graph->lcore_id;
+
+   if (parent_graph->rq == NULL) {
+   parent_graph->rq = &parent_graph->rq_head;
+   SLIST_INIT(parent_graph->rq);
+   }
+
+   graph->rq = parent_graph->rq;
+   SLIST_INSERT_HEAD(graph->rq, graph, rq_next);
+
+   return 0;
+
+fail_mp:
+   rte_ring_free(graph->wq);
+   graph->wq = NULL;
+fail:
+   return -rte_errno;
+}
+
+void
+graph_sched_wq_destroy(struct graph *_graph)
+{
+   struct rte_graph *graph = _graph->graph;
+
+   if (graph == NULL)
+   return;
+
+   rte_ring_free(graph->wq);
+   graph->wq = NULL;
+
+   rte_mempool_free(graph->mp);
+   graph->mp = NULL;
+}
+
+static __rte_always_inline bool
+__graph_sched_node_enqueue(struct rte_node *node, struct rte_graph *graph)
+{
+   struct graph_sched_wq_node *wq_node;
+   uint16_t off = 0;
+   uint16_t size;
+
+submit_again:
+   if (rte_mempool_get(graph->mp, (void **)&wq_node) < 0)
+   goto fallback;
+
+   size = RTE_MIN(node->idx, RTE_DIM(wq_node->objs));
+   wq_node->node_off = node->off;
+   wq_node->nb_objs = size;
+   rte_memcpy(wq_node->objs, &node->objs[off], size * sizeof(void *));
+
+   while (rte_ring_mp_enqueue_bulk_elem(graph->wq, (void *)&wq_node,
+ sizeof(wq_node), 1, NULL) == 0)
+   rte_pause();
+
+   off += size;
+   node->idx -= size;
+   if (node->idx > 0)
+   goto submit_again;
+
+   return true;
+
+fallback:
+   if (off != 0)
+   memmove(&node->objs[0], &node->objs[off],
+   node->idx * sizeof(void *));
+
+   return false;
+}
+
+bool __rte_noinline
+__rte_graph_sched_node_enqueue(struct rte_node *node,
+  struct rte_graph_rq_hea

[PATCH v4 10/15] graph: enable create and destroy graph scheduling workqueue

This patch enables to create and destroy scheduling workqueue into
common graph operations.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index dd3d69dbf7..1f1ee9b622 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -443,6 +443,10 @@ rte_graph_destroy(rte_graph_t id)
while (graph != NULL) {
tmp = STAILQ_NEXT(graph, next);
if (graph->id == id) {
+   /* Destroy the schedule work queue if has */
+   if (rte_graph_worker_model_get() == 
RTE_GRAPH_MODEL_MCORE_DISPATCH)
+   graph_sched_wq_destroy(graph);
+
/* Call fini() of the all the nodes in the graph */
graph_node_fini(graph);
/* Destroy graph fast path memory */
@@ -537,6 +541,11 @@ graph_clone(struct graph *parent_graph, const char *name)
if (graph_fp_mem_create(graph))
goto graph_cleanup;
 
+   /* Create the graph schedule work queue */
+   if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH &&
+   graph_sched_wq_create(graph, parent_graph))
+   goto graph_mem_destroy;
+
/* Call init() of the all the nodes in the graph */
if (graph_node_init(graph))
goto graph_mem_destroy;
-- 
2.37.2

[PATCH v4 11/15] graph: introduce graph walk by cross-core dispatch

This patch introduces the task scheduler mechanism to enable dispatching
tasks to another worker cores. Currently, there is only a local work
queue for one graph to walk. We introduce a scheduler worker queue in
each worker core for dispatching tasks. It will perform the walk on
scheduler work queue first, then handle the local work queue.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/rte_graph_model_dispatch.h | 42 
 1 file changed, 42 insertions(+)

diff --git a/lib/graph/rte_graph_model_dispatch.h 
b/lib/graph/rte_graph_model_dispatch.h
index 18fa7ce0ab..65b2cc6d87 100644
--- a/lib/graph/rte_graph_model_dispatch.h
+++ b/lib/graph/rte_graph_model_dispatch.h
@@ -73,6 +73,48 @@ __rte_experimental
 int rte_graph_model_dispatch_lcore_affinity_set(const char *name,
unsigned int lcore_id);
 
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ *   Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+__rte_experimental
+static inline void
+rte_graph_walk_mcore_dispatch(struct rte_graph *graph)
+{
+   const rte_graph_off_t *cir_start = graph->cir_start;
+   const rte_node_t mask = graph->cir_mask;
+   uint32_t head = graph->head;
+   struct rte_node *node;
+
+   if (graph->wq != NULL)
+   __rte_graph_sched_wq_process(graph);
+
+   while (likely(head != graph->tail)) {
+   node = (struct rte_node *)RTE_PTR_ADD(graph, 
cir_start[(int32_t)head++]);
+
+   /* skip the src nodes which not bind with current worker */
+   if ((int32_t)head < 0 && node->lcore_id != graph->lcore_id)
+   continue;
+
+   /* Schedule the node until all task/objs are done */
+   if (node->lcore_id != RTE_MAX_LCORE &&
+   graph->lcore_id != node->lcore_id && graph->rq != NULL &&
+   __rte_graph_sched_node_enqueue(node, graph->rq))
+   continue;
+
+   __rte_node_process(graph, node);
+
+   head = likely((int32_t)head > 0) ? head & mask : head;
+   }
+
+   graph->tail = 0;
+}
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.37.2

[PATCH v4 12/15] graph: enable graph multicore dispatch scheduler model

This patch enables to chose new scheduler model.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/rte_graph_worker.h | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
index 7ea18ba80a..d608c7513e 100644
--- a/lib/graph/rte_graph_worker.h
+++ b/lib/graph/rte_graph_worker.h
@@ -10,6 +10,7 @@ extern "C" {
 #endif
 
 #include "rte_graph_model_rtc.h"
+#include "rte_graph_model_dispatch.h"
 
 /**
  * Perform graph walk on the circular buffer and invoke the process function
@@ -24,7 +25,13 @@ __rte_experimental
 static inline void
 rte_graph_walk(struct rte_graph *graph)
 {
-   rte_graph_walk_rtc(graph);
+   int model = rte_graph_worker_model_get();
+
+   if (model == RTE_GRAPH_MODEL_DEFAULT ||
+   model == RTE_GRAPH_MODEL_RTC)
+   rte_graph_walk_rtc(graph);
+   else if (model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+   rte_graph_walk_mcore_dispatch(graph);
 }
 
 #ifdef __cplusplus
-- 
2.37.2

[PATCH v4 13/15] graph: add stats for cross-core dispatching

Add stats for cross-core dispatching scheduler if stats collection is
enabled.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 lib/graph/graph_debug.c  |  6 +++
 lib/graph/graph_stats.c  | 74 +---
 lib/graph/rte_graph.h|  2 +
 lib/graph/rte_graph_model_dispatch.c |  3 ++
 lib/graph/rte_graph_worker_common.h  |  2 +
 5 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c
index b84412f5dd..7dcf07b080 100644
--- a/lib/graph/graph_debug.c
+++ b/lib/graph/graph_debug.c
@@ -74,6 +74,12 @@ rte_graph_obj_dump(FILE *f, struct rte_graph *g, bool all)
fprintf(f, "   size=%d\n", n->size);
fprintf(f, "   idx=%d\n", n->idx);
fprintf(f, "   total_objs=%" PRId64 "\n", n->total_objs);
+   if (rte_graph_worker_model_get() == 
RTE_GRAPH_MODEL_MCORE_DISPATCH) {
+   fprintf(f, "   total_sched_objs=%" PRId64 "\n",
+   n->total_sched_objs);
+   fprintf(f, "   total_sched_fail=%" PRId64 "\n",
+   n->total_sched_fail);
+   }
fprintf(f, "   total_calls=%" PRId64 "\n", n->total_calls);
for (i = 0; i < n->nb_edges; i++)
fprintf(f, "  edge[%d] <%s>\n", i,
diff --git a/lib/graph/graph_stats.c b/lib/graph/graph_stats.c
index c0140ba922..aa22cc403c 100644
--- a/lib/graph/graph_stats.c
+++ b/lib/graph/graph_stats.c
@@ -40,13 +40,19 @@ struct rte_graph_cluster_stats {
struct cluster_node clusters[];
 } __rte_cache_aligned;
 
+#define boarder_model_dispatch()   
   \
+   fprintf(f, "+---+---+" \
+  "---+---+---+---+" \
+  "---+---+-" \
+  "--+\n")
+
 #define boarder()  
\
fprintf(f, "+---+---+" \
   "---+---+---+---+-" \
   "--+\n")
 
 static inline void
-print_banner(FILE *f)
+print_banner_default(FILE *f)
 {
boarder();
fprintf(f, "%-32s%-16s%-16s%-16s%-16s%-16s%-16s\n", "|Node", "|calls",
@@ -55,6 +61,27 @@ print_banner(FILE *f)
boarder();
 }
 
+static inline void
+print_banner_dispatch(FILE *f)
+{
+   boarder_model_dispatch();
+   fprintf(f, "%-32s%-16s%-16s%-16s%-16s%-16s%-16s%-16s%-16s\n",
+   "|Node", "|calls",
+   "|objs", "|sched objs", "|sched fail",
+   "|realloc_count", "|objs/call", "|objs/sec(10E6)",
+   "|cycles/call|");
+   boarder_model_dispatch();
+}
+
+static inline void
+print_banner(FILE *f)
+{
+   if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+   print_banner_dispatch(f);
+   else
+   print_banner_default(f);
+}
+
 static inline void
 print_node(FILE *f, const struct rte_graph_cluster_node_stats *stat)
 {
@@ -76,11 +103,21 @@ print_node(FILE *f, const struct 
rte_graph_cluster_node_stats *stat)
objs_per_sec = ts_per_hz ? (objs - prev_objs) / ts_per_hz : 0;
objs_per_sec /= 100;
 
-   fprintf(f,
-   "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
-   "|%-15.3f|%-15.6f|%-11.4f|\n",
-   stat->name, calls, objs, stat->realloc_count, objs_per_call,
-   objs_per_sec, cycles_per_call);
+   if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH) {
+   fprintf(f,
+   "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
+   "|%-15" PRIu64 "|%-15" PRIu64
+   "|%-15.3f|%-15.6f|%-11.4f|\n",
+   stat->name, calls, objs, stat->sched_objs,
+   stat->sched_fail, stat->realloc_count, objs_per_call,
+   objs_per_sec, cycles_per_call);
+   } else {
+   fprintf(f,
+   "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
+   "|%-15.3f|%-15.6f|%-11.4f|\n",
+   stat->name, calls, objs, stat->realloc_count, 
objs_per_call,
+   objs_per_sec, cycles_per_call);
+   }
 }
 
 static int
@@ -88,13 +125,20 @@ graph_cluster_stats_cb(bool is_first, bool is_last, void 
*cookie,
   const struct rte_graph_cluster_node_stats *stat)
 {
FILE *f = cookie;
+   int model;
+
+   model = rte_graph_worker_model_get();
 
if (unlikely(is_first))
print_banner(f);
if (stat->objs)
print_node(f, stat);
-

[PATCH v4 14/15] examples/l3fwd-graph: introduce multicore dispatch worker model

Add new parameter "model" to choose dispatch or rtc worker model.
And in dispatch model, the node will affinity to worker core successively.

Note:
only support one RX node for remote model in current implementation.

./dpdk-l3fwd-graph  -l 8,9,10,11 -n 4 -- -p 0x1 --config="(0,0,9)" -P
--model="dispatch"

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 examples/l3fwd-graph/main.c | 237 +---
 1 file changed, 195 insertions(+), 42 deletions(-)

diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index 5feeab4f0f..cfa78003f4 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -55,6 +55,9 @@
 
 #define NB_SOCKETS 8
 
+/* Graph module */
+#define WORKER_MODEL_RTC "rtc"
+#define WORKER_MODEL_MCORE_DISPATCH "dispatch"
 /* Static global variables used within this file. */
 static uint16_t nb_rxd = RX_DESC_DEFAULT;
 static uint16_t nb_txd = TX_DESC_DEFAULT;
@@ -88,6 +91,10 @@ struct lcore_rx_queue {
char node_name[RTE_NODE_NAMESIZE];
 };
 
+struct model_conf {
+   enum rte_graph_worker_model model;
+};
+
 /* Lcore conf */
 struct lcore_conf {
uint16_t n_rx_queue;
@@ -153,6 +160,19 @@ static struct ipv4_l3fwd_lpm_route 
ipv4_l3fwd_lpm_route_array[] = {
{RTE_IPV4(198, 18, 6, 0), 24, 6}, {RTE_IPV4(198, 18, 7, 0), 24, 7},
 };
 
+static int
+check_worker_model_params(void)
+{
+   if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH &&
+   nb_lcore_params > 1) {
+   printf("Exceeded max number of lcore params for remote model: 
%hu\n",
+  nb_lcore_params);
+   return -1;
+   }
+
+   return 0;
+}
+
 static int
 check_lcore_params(void)
 {
@@ -276,6 +296,7 @@ print_usage(const char *prgname)
"  --eth-dest=X,MM:MM:MM:MM:MM:MM: Ethernet destination for "
"port X\n"
"  --max-pkt-len PKTLEN: maximum packet length in decimal 
(64-9600)\n"
+   "  --model NAME: walking model name, dispatch or rtc(by 
default)\n"
"  --no-numa: Disable numa awareness\n"
"  --per-port-pool: Use separate buffer pool per port\n"
"  --pcap-enable: Enables pcap capture\n"
@@ -318,6 +339,20 @@ parse_max_pkt_len(const char *pktlen)
return len;
 }
 
+static int
+parse_worker_model(const char *model)
+{
+   if (strcmp(model, WORKER_MODEL_MCORE_DISPATCH) == 0) {
+   rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
+   return RTE_GRAPH_MODEL_MCORE_DISPATCH;
+   } else if (strcmp(model, WORKER_MODEL_RTC) == 0)
+   return RTE_GRAPH_MODEL_RTC;
+
+   rte_exit(EXIT_FAILURE, "Invalid worker model: %s", model);
+
+   return RTE_GRAPH_MODEL_LIST_END;
+}
+
 static int
 parse_portmask(const char *portmask)
 {
@@ -434,6 +469,8 @@ static const char short_options[] = "p:" /* portmask */
 #define CMD_LINE_OPT_PCAP_ENABLE   "pcap-enable"
 #define CMD_LINE_OPT_NUM_PKT_CAP   "pcap-num-cap"
 #define CMD_LINE_OPT_PCAP_FILENAME "pcap-file-name"
+#define CMD_LINE_OPT_WORKER_MODEL  "model"
+
 enum {
/* Long options mapped to a short option */
 
@@ -449,6 +486,7 @@ enum {
CMD_LINE_OPT_PARSE_PCAP_ENABLE,
CMD_LINE_OPT_PARSE_NUM_PKT_CAP,
CMD_LINE_OPT_PCAP_FILENAME_CAP,
+   CMD_LINE_OPT_WORKER_MODEL_TYPE,
 };
 
 static const struct option lgopts[] = {
@@ -460,6 +498,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_PCAP_ENABLE, 0, 0, CMD_LINE_OPT_PARSE_PCAP_ENABLE},
{CMD_LINE_OPT_NUM_PKT_CAP, 1, 0, CMD_LINE_OPT_PARSE_NUM_PKT_CAP},
{CMD_LINE_OPT_PCAP_FILENAME, 1, 0, CMD_LINE_OPT_PCAP_FILENAME_CAP},
+   {CMD_LINE_OPT_WORKER_MODEL, 1, 0, CMD_LINE_OPT_WORKER_MODEL_TYPE},
{NULL, 0, 0, 0},
 };
 
@@ -551,6 +590,11 @@ parse_args(int argc, char **argv)
printf("Pcap file name: %s\n", pcap_filename);
break;
 
+   case CMD_LINE_OPT_WORKER_MODEL_TYPE:
+   printf("Use new worker model: %s\n", optarg);
+   parse_worker_model(optarg);
+   break;
+
default:
print_usage(prgname);
return -1;
@@ -726,15 +770,15 @@ print_stats(void)
 static int
 graph_main_loop(void *conf)
 {
+   struct model_conf *mconf = conf;
struct lcore_conf *qconf;
struct rte_graph *graph;
uint32_t lcore_id;
 
-   RTE_SET_USED(conf);
-
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
graph = qconf->graph;
+   rte_graph_worker_model_set(mconf->model);
 
if (!graph) {
RTE_LOG(INFO, L3FWD_GRAPH, "Lcore %u has nothing to do\n",
@@ -788,6 +832,141 @@ config_port_max_pkt_len(struct rte_eth_conf *conf,
return 0;
 }
 
+static void
+graph_config_mcore_dispatch(struct rte_graph_param gra

[PATCH v4 15/15] doc: update multicore dispatch model in graph guides

Update graph documentation to introduce new multicore dispatch model.

Signed-off-by: Haiyue Wang 
Signed-off-by: Cunming Liang 
Signed-off-by: Zhirun Yan 
---
 doc/guides/prog_guide/graph_lib.rst | 59 +++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/doc/guides/prog_guide/graph_lib.rst 
b/doc/guides/prog_guide/graph_lib.rst
index 1cfdc86433..72e26f3a5a 100644
--- a/doc/guides/prog_guide/graph_lib.rst
+++ b/doc/guides/prog_guide/graph_lib.rst
@@ -189,14 +189,65 @@ In the above example, A graph object will be created with 
ethdev Rx
 node of port 0 and queue 0, all ipv4* nodes in the system,
 and ethdev tx node of all ports.
 
-Multicore graph processing
-~~
-In the current graph library implementation, specifically,
-``rte_graph_walk()`` and ``rte_node_enqueue*`` fast path API functions
+graph model chossing
+
+Currently, there are 2 different walking model. Use
+``rte_graph_worker_model_set()`` to set the walking model.
+
+RTC (Run-To-Completion)
+^^^
+This is the default graph walking model. specifically,
+``rte_graph_walk_rtc()`` and ``rte_node_enqueue*`` fast path API functions
 are designed to work on single-core to have better performance.
 The fast path API works on graph object, So the multi-core graph
 processing strategy would be to create graph object PER WORKER.
 
+Example:
+
+Graph: node-0 -> node-1 -> node-2 @Core0.
+
+.. code-block:: diff
+
++ - - - - - - - - - - - - - - - - - - - - - +
+'  Core #0  '
+'   '
+' ++ +-+ ++ '
+' | Node-0 | --> | Node-1  | --> | Node-2 | '
+' ++ +-+ ++ '
+'   '
++ - - - - - - - - - - - - - - - - - - - - - +
+
+Dispatch model
+^^
+The dispatch model enables a cross-core dispatching mechanism which employs
+a scheduling work-queue to dispatch streams to other worker cores which
+being associated with the destination node.
+
+Use ``rte_graph_model_dispatch_lcore_affinity_set()`` to set lcore affinity
+with the node.
+Each worker core will have a graph repetition. Use ``rte_graph_clone()`` to
+clone graph for each worker and use``rte_graph_model_dispatch_core_bind()``
+to bind graph with the worker core.
+
+Example:
+
+Graph topo: node-0 -> Core1; node-1 -> node-2; node-2 -> node-3.
+Config graph: node-0 @Core0; node-1/3 @Core1; node-2 @Core2.
+
+.. code-block:: diff
+
++ - - - - - -+ +- - - - - - - - - - - - - + + - - - - - -+
+'  Core #0   ' '  Core #1 ' '  Core #2   '
+'' '  ' ''
+' ++ ' ' ++++ ' ' ++ '
+' | Node-0 | - - - ->| Node-1 || Node-3 |<- - - - | Node-2 | '
+' ++ ' ' ++++ ' ' ++ '
+'' ' |' '  ^ '
++ - - - - - -+ +- - -|- - - - - - - - - - + + - - -|- - -+
+ | |
+ + - - - - - - - - - - - - - - - - +
+
+
 In fast path
 
 Typical fast-path code looks like below, where the application
-- 
2.37.2

[PATCH v5 0/3] Recycle buffers from Tx to Rx

Currently, the transmit side frees the buffers into the lcore cache and
the receive side allocates buffers from the lcore cache. The transmit
side typically frees 32 buffers resulting in 32*8=256B of stores to
lcore cache. The receive side allocates 32 buffers and stores them in
the receive side software ring, resulting in 32*8=256B of stores and
256B of load from the lcore cache.

This patch proposes a mechanism to avoid freeing to/allocating from
the lcore cache. i.e. the receive side will free the buffers from
transmit side directly into its software ring. This will avoid the 256B
of loads and stores introduced by the lcore cache. It also frees up the
cache lines used by the lcore cache. And we can call this mode as buffer
recycle mode.

In the latest version, buffer recycle mode is packaged as a separate API.
This allows for the users to change rxq/txq pairing in real time in data plane,
according to the analysis of the packet flow by the application, for example:
---
Step 1: upper application analyse the flow direction
Step 2: rxq_buf_recycle_info = rte_eth_rx_buf_recycle_info_get(rx_portid,
rx_queueid)
Step 3: rte_eth_dev_buf_recycle(rx_portid, rx_queueid, tx_portid, tx_queueid,
rxq_buf_recycle_info);
Step 4: rte_eth_rx_burst(rx_portid,rx_queueid);
Step 5: rte_eth_tx_burst(tx_portid,tx_queueid);
---
Above can support user to change rxq/txq pairing at runtime and user does not
need to
know the direction of flow in advance. This can effectively expand buffer
recycle mode's
use scenarios.

Furthermore, buffer recycle mode is no longer limited to the same pmd,
it can support moving buffers between different vendor pmds, even can put the
buffer
anywhere into your Rx buffer ring as long as the address of the buffer ring can
be provided.
In the latest version, we enable direct-rearm in i40e pmd and ixgbe pmd, and
also try to
use i40e driver in Rx, ixgbe driver in Tx, and then achieve 7-9% performance
improvement
by buffer recycle mode.

Difference between buffer recycle, ZC API used in mempool and general path
For general path:
Rx: 32 pkts memcpy from mempool cache to rx_sw_ring
Tx: 32 pkts memcpy from tx_sw_ring to temporary variable + 32
pkts memcpy from temporary variable to mempool cache
For ZC API used in mempool:
Rx: 32 pkts memcpy from mempool cache to rx_sw_ring
Tx: 32 pkts memcpy from tx_sw_ring to zero-copy mempool cache
Refer link:
http://patches.dpdk.org/project/dpdk/patch/20230221055205.22984-2-kamalakshitha.alig...@arm.com/
For buffer recycle:
Rx/Tx: 32 pkts memcpy from tx_sw_ring to rx_sw_ring
Thus we can see in the one loop, compared to general path, buffer recycle
reduce 32+32=64 pkts memcpy;
Compared to ZC API used in mempool, we can see buffer recycle reduce 32 pkts
memcpy in each loop.
So, buffer recycle has its own benefits.

Testing status:
(1) dpdk l3fwd test with multiple drivers:
port 0: 82599 NIC port 1: XL710 NIC
-
Without fast free With fast free
Thunderx2: +7.53% +13.54%
-

(2) dpdk l3fwd test with same driver:
port 0 && 1: XL710 NIC
-
Without fast free With fast free
Ampere altra: +12.61% +11.42%
n1sdp: +8.30% +3.85%
x86-sse:+8.43% +3.72%
-

(3) Performance comparison with ZC_mempool used
port 0 && 1: XL710 NIC
with fast free
-
With recycle buffer With zc_mempool
Ampere altra: 11.42% 3.54%
-

V2:
1. Use data-plane API to enable direct-rearm (Konstantin, Honnappa)
2. Add 'txq_data_get' API to get txq info for Rx (Konstantin)
3. Use input parameter to enable direct rearm in l3fwd (Konstantin)
4. Add condition detection for direct rearm API (Morten, Andrew Rybchenko)

V3:
1. Seperate Rx and Tx operation with two APIs in direct-rearm (Konstantin)
2. Delete L3fwd change for direct rearm (Jerin)
3. enable direct rearm in ixgbe driver in Arm

v4:
1. Rename direct-rearm as buffer recycle. Based on this, function name
and variable name are changed to let this mode more general for all
drivers. (Konstantin, Morten)
2. Add ring wrapping check (Konstantin)

v5:
1. some change for ethdev API (Morten)
2. add support for avx2, sse, altivec path

Feifei Wang (3):
ethdev: add API for buffer recycle mode
net/i40e: implement recycle buffer mode
net/ixgbe: implement recycle buffer mode

drivers/net/i40e/i40

[PATCH v5 1/3] ethdev: add API for buffer recycle mode

There are 4 upper APIs for buffer recycle mode:
1. 'rte_eth_rx_queue_buf_recycle_info_get'
This is to retrieve buffer ring information about given ports's Rx
queue in buffer recycle mode. And due to this, buffer recycle can
be no longer limited to the same driver in Rx and Tx.

2. 'rte_eth_dev_buf_recycle'
Users can call this API to enable buffer recycle mode in data path.
There are 2 internal APIs in it, which is separately for Rx and TX.

3. 'rte_eth_tx_buf_stash'
Internal API for buffer recycle mode. This is to stash Tx used
buffers into Rx buffer ring.

4. 'rte_eth_rx_descriptors_refill'
Internal API for buffer recycle mode. This is to refill Rx
descriptors.

Above all APIs are just implemented at the upper level.
For different APIs, we need to define specific functions separately.

Suggested-by: Honnappa Nagarahalli 
Suggested-by: Ruifeng Wang 
Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Honnappa Nagarahalli 
---
 lib/ethdev/ethdev_driver.h   |  10 ++
 lib/ethdev/ethdev_private.c  |   2 +
 lib/ethdev/rte_ethdev.c  |  33 +
 lib/ethdev/rte_ethdev.h  | 230 +++
 lib/ethdev/rte_ethdev_core.h |  15 ++-
 lib/ethdev/version.map   |   6 +
 6 files changed, 294 insertions(+), 2 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 2c9d615fb5..412f064975 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -59,6 +59,10 @@ struct rte_eth_dev {
eth_rx_descriptor_status_t rx_descriptor_status;
/** Check the status of a Tx descriptor */
eth_tx_descriptor_status_t tx_descriptor_status;
+   /** Stash Tx used buffers into RX ring in buffer recycle mode */
+   eth_tx_buf_stash_t tx_buf_stash;
+   /** Refill Rx descriptors in buffer recycle mode */
+   eth_rx_descriptors_refill_t rx_descriptors_refill;
 
/**
 * Device data that is shared between primary and secondary processes
@@ -504,6 +508,10 @@ typedef void (*eth_rxq_info_get_t)(struct rte_eth_dev *dev,
 typedef void (*eth_txq_info_get_t)(struct rte_eth_dev *dev,
uint16_t tx_queue_id, struct rte_eth_txq_info *qinfo);
 
+typedef void (*eth_rxq_buf_recycle_info_get_t)(struct rte_eth_dev *dev,
+   uint16_t rx_queue_id,
+   struct rte_eth_rxq_buf_recycle_info *rxq_buf_recycle_info);
+
 typedef int (*eth_burst_mode_get_t)(struct rte_eth_dev *dev,
uint16_t queue_id, struct rte_eth_burst_mode *mode);
 
@@ -1247,6 +1255,8 @@ struct eth_dev_ops {
eth_rxq_info_get_t rxq_info_get;
/** Retrieve Tx queue information */
eth_txq_info_get_t txq_info_get;
+   /** Get Rx queue buffer recycle information */
+   eth_rxq_buf_recycle_info_get_t rxq_buf_recycle_info_get;
eth_burst_mode_get_t   rx_burst_mode_get; /**< Get Rx burst mode */
eth_burst_mode_get_t   tx_burst_mode_get; /**< Get Tx burst mode */
eth_fw_version_get_t   fw_version_get; /**< Get firmware version */
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index 14ec8c6ccf..f8d0ae9226 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -277,6 +277,8 @@ eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
fpo->rx_queue_count = dev->rx_queue_count;
fpo->rx_descriptor_status = dev->rx_descriptor_status;
fpo->tx_descriptor_status = dev->tx_descriptor_status;
+   fpo->tx_buf_stash = dev->tx_buf_stash;
+   fpo->rx_descriptors_refill = dev->rx_descriptors_refill;
 
fpo->rxq.data = dev->data->rx_queues;
fpo->rxq.clbk = (void **)(uintptr_t)dev->post_rx_burst_cbs;
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 4d03255683..36c3a17588 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -5784,6 +5784,39 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t 
queue_id,
return 0;
 }
 
+int
+rte_eth_rx_queue_buf_recycle_info_get(uint16_t port_id, uint16_t queue_id,
+   struct rte_eth_rxq_buf_recycle_info *rxq_buf_recycle_info)
+{
+   struct rte_eth_dev *dev;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+
+   if (queue_id >= dev->data->nb_rx_queues) {
+   RTE_ETHDEV_LOG(ERR, "Invalid Rx queue_id=%u\n", queue_id);
+   return -EINVAL;
+   }
+
+   RTE_ASSERT(rxq_buf_recycle_info != NULL);
+
+   if (dev->data->rx_queues == NULL ||
+   dev->data->rx_queues[queue_id] == NULL) {
+   RTE_ETHDEV_LOG(ERR,
+  "Rx queue %"PRIu16" of device with port_id=%"
+  PRIu16" has not been setup\n",
+  queue_id, port_id);
+   return -EINVAL;
+   }
+
+   if (*dev->dev_ops->rxq_buf_recycle_info_get == NULL)
+   return -ENOTSUP;
+
+   dev->dev_ops->rxq_buf_recycle_info_get(dev, queue_id, 
rxq_bu

[PATCH v5 2/3] net/i40e: implement recycle buffer mode

Define specific function implementation for i40e driver.
Currently, recycle buffer mode can support 128bit
vector path and avx2 path. And can be enabled both in
fast free and no fast free mode.

Suggested-by: Honnappa Nagarahalli 
Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Honnappa Nagarahalli 
---
 drivers/net/i40e/i40e_ethdev.c |   1 +
 drivers/net/i40e/i40e_ethdev.h |   2 +
 drivers/net/i40e/i40e_rxtx.c   | 159 +
 drivers/net/i40e/i40e_rxtx.h   |   4 +
 4 files changed, 166 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index cb0070f94b..456fb256f5 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -496,6 +496,7 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
.flow_ops_get = i40e_dev_flow_ops_get,
.rxq_info_get = i40e_rxq_info_get,
.txq_info_get = i40e_txq_info_get,
+   .rxq_buf_recycle_info_get = i40e_rxq_buf_recycle_info_get,
.rx_burst_mode_get= i40e_rx_burst_mode_get,
.tx_burst_mode_get= i40e_tx_burst_mode_get,
.timesync_enable  = i40e_timesync_enable,
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 9b806d130e..83c5ff5859 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1355,6 +1355,8 @@ void i40e_rxq_info_get(struct rte_eth_dev *dev, uint16_t 
queue_id,
struct rte_eth_rxq_info *qinfo);
 void i40e_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
struct rte_eth_txq_info *qinfo);
+void i40e_rxq_buf_recycle_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+   struct rte_eth_rxq_buf_recycle_info *rxq_buf_recycle_info);
 int i40e_rx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
   struct rte_eth_burst_mode *mode);
 int i40e_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 788ffb51c2..55c788317f 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1536,6 +1536,134 @@ i40e_xmit_pkts_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
return nb_tx;
 }
 
+uint16_t
+i40e_tx_buf_stash_vec(void *tx_queue,
+   struct rte_eth_rxq_buf_recycle_info *rxq_buf_recycle_info)
+{
+   struct i40e_tx_queue *txq = tx_queue;
+   struct i40e_tx_entry *txep;
+   struct rte_mbuf **rxep;
+   struct rte_mbuf *m[RTE_I40E_TX_MAX_FREE_BUF_SZ];
+   int i, j, n;
+   uint16_t avail = 0;
+   uint16_t buf_ring_size = rxq_buf_recycle_info->buf_ring_size;
+   uint16_t mask = rxq_buf_recycle_info->buf_ring_size - 1;
+   uint16_t refill_request = rxq_buf_recycle_info->refill_request;
+   uint16_t refill_head = *rxq_buf_recycle_info->refill_head;
+   uint16_t receive_tail = *rxq_buf_recycle_info->receive_tail;
+
+   /* Get available recycling Rx buffers. */
+   avail = (buf_ring_size - (refill_head - receive_tail)) & mask;
+
+   /* Check Tx free thresh and Rx available space. */
+   if (txq->nb_tx_free > txq->tx_free_thresh || avail <= txq->tx_rs_thresh)
+   return 0;
+
+   /* check DD bits on threshold descriptor */
+   if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+   rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
+   rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
+   return 0;
+
+   n = txq->tx_rs_thresh;
+
+   /* Buffer recycle can only support no ring buffer wraparound.
+* Two case for this:
+*
+* case 1: The refill head of Rx buffer ring needs to be aligned with
+* buffer ring size. In this case, the number of Tx freeing buffers
+* should be equal to refill_request.
+*
+* case 2: The refill head of Rx ring buffer does not need to be aligned
+* with buffer ring size. In this case, the update of refill head can 
not
+* exceed the Rx buffer ring size.
+*/
+   if (refill_request != n ||
+   (!refill_request && (refill_head + n > buf_ring_size)))
+   return 0;
+
+   /* First buffer to free from S/W ring is at index
+* tx_next_dd - (tx_rs_thresh-1).
+*/
+   txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
+   rxep = rxq_buf_recycle_info->buf_ring;
+   rxep += refill_head;
+
+   if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) {
+   /* Directly put mbufs from Tx to Rx. */
+   for (i = 0; i < n; i++, rxep++, txep++)
+   *rxep = txep[0].mbuf;
+   } else {
+   for (i = 0, j = 0; i < n; i++) {
+   /* Avoid txq contains buffers from expected mempoo. */
+   if (unlikely(rxq_buf_recycle_info->mp
+

[PATCH v5 3/3] net/ixgbe: implement recycle buffer mode