RE: [PATCH] net/cpfl: reset devargs during the first probe

[Xing, Beilei]

> -Original Message-
> From: Wu, Jingjing 
> Sent: Thursday, October 12, 2023 2:54 PM
> To: Xing, Beilei 
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] net/cpfl: reset devargs during the first probe
> 
> 
> 
> > -Original Message-
> > From: Xing, Beilei 
> > Sent: Thursday, October 12, 2023 12:47 AM
> > To: Wu, Jingjing 
> > Cc: dev@dpdk.org; Xing, Beilei 
> > Subject: [PATCH] net/cpfl: reset devargs during the first probe
> >
> > From: Beilei Xing 
> 
> > Reset devargs during the first probe. Otherwise, probe again will be
> > affected.
> >
> > Fixes: a607312291b3 ("net/cpfl: support probe again")
> >
> > Signed-off-by: Beilei Xing 
> > ---
> >  drivers/net/cpfl/cpfl_ethdev.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/cpfl/cpfl_ethdev.c
> > b/drivers/net/cpfl/cpfl_ethdev.c index 762fbddfe6..890a027a1d 100644
> > --- a/drivers/net/cpfl/cpfl_ethdev.c
> > +++ b/drivers/net/cpfl/cpfl_ethdev.c
> > @@ -1611,11 +1611,12 @@ cpfl_parse_devargs(struct rte_pci_device
> > *pci_dev, struct cpfl_adapter_ext *adap
> > struct rte_kvargs *kvlist;
> > int ret;
> >
> > -   cpfl_args->req_vport_nb = 0;
> > -
> > if (devargs == NULL)
> > return 0;
> >
> > +   if (first)
> > +   memset(cpfl_args, 0, sizeof(struct cpfl_devargs));
> > +
> adapter is allocated by rte_zmalloc. It should be zero already.
> If I understand correctly, memset to 0 should be happened when first probe is
> done or before probe again but not at the beginning when first probe.

But 'struct cpfl_devargs devargs' is the member of adapter, if 'memset to 0' 
happens before probe again, adapter->devargs will only save the last devargs.

[PATCH v8 0/3] Add dispatcher library

[Mattias Rönnblom]

The purpose of the dispatcher library is to decouple different parts
of an eventdev-based application (e.g., processing pipeline stages),
sharing the same underlying event device.

The dispatcher replaces the conditional logic (often, a switch
statement) that typically follows an event device dequeue operation,
where events are dispatched to different parts of the application
based on event meta data, such as the queue id or scheduling type.

The concept is similar to a UNIX file descriptor event loop library.
Instead of tying callback functions to fds as for example libevent
does, the dispatcher relies on application-supplied matching callback
functions to decide where to deliver events.

A dispatcher is configured to dequeue events from a specific event
device, and ties into the service core framework, to do its (and the
application's) work.

The dispatcher provides a convenient way for an eventdev-based
application to use service cores for application-level processing, and
thus for sharing those cores with other DPDK services.

Although the dispatcher adds some overhead, experience suggests that
the net effect on the application (both synthetic benchmarks and more
real-world applications) may well be positive. This is primarily due
to clustering (see programming guide) reducing cache misses.

Benchmarking indicates that the overhead is ~10 cc/event (on a
large core), with a handful of often-used handlers.

The dispatcher does not support run-time reconfiguration.

The use of the dispatcher library is optional, and an eventdev-based
application may still opt to access the event device using direct
eventdev API calls, or by some other means.

Mattias Rönnblom (3):
  lib: introduce dispatcher library
  test: add dispatcher test suite
  doc: add dispatcher programming guide

 MAINTAINERS  |6 +
 app/test/meson.build |1 +
 app/test/test_dispatcher.c   | 1056 ++
 doc/api/doxy-api-index.md|1 +
 doc/api/doxy-api.conf.in |1 +
 doc/guides/prog_guide/dispatcher_lib.rst |  433 +
 doc/guides/prog_guide/index.rst  |1 +
 doc/guides/rel_notes/release_23_11.rst   |5 +
 lib/dispatcher/meson.build   |   13 +
 lib/dispatcher/rte_dispatcher.c  |  694 ++
 lib/dispatcher/rte_dispatcher.h  |  458 ++
 lib/dispatcher/version.map   |   20 +
 lib/meson.build  |2 +
 13 files changed, 2691 insertions(+)
 create mode 100644 app/test/test_dispatcher.c
 create mode 100644 doc/guides/prog_guide/dispatcher_lib.rst
 create mode 100644 lib/dispatcher/meson.build
 create mode 100644 lib/dispatcher/rte_dispatcher.c
 create mode 100644 lib/dispatcher/rte_dispatcher.h
 create mode 100644 lib/dispatcher/version.map

-- 
2.34.1

[PATCH v8 2/3] test: add dispatcher test suite

[Mattias Rönnblom]

Add unit tests for the dispatcher.

--

PATCH v8:
 o Adjust test code to match the fact that the dispatcher start and
   stop functions no longer return a value.

PATCH v7:
 o Skip (not fail) tests in case too few lcores are available or if
   the DSW event device is not available. (David Marchand)
 o Properly clean up resources in the above-mentioned scenarios.

PATCH v6:
 o Register test as "fast". (David Marchand)
 o Use single tab as indentation for continuation lines in multiple-line
   function prototypes. (David Marchand)
 o Add Signed-off-by line. (David Marchand)
 o Use DPDK atomics wrapper API instead of C11 atomics.

PATCH v5:
 o Update test suite to use pointer and not integer id when calling
   dispatcher functions.

PATCH v3:
 o Adapt the test suite to dispatcher API name changes.

PATCH v2:
 o Test finalize callback functionality.
 o Test handler and finalizer count upper limits.
 o Add statistics reset test.
 o Make sure dispatcher supply the proper event dev id and port id back
   to the application.

PATCH:
 o Extend test to cover often-used handler optimization feature.

RFC v4:
 o Adapt to non-const events in process function prototype.

Signed-off-by: Mattias Rönnblom 
---
 MAINTAINERS|1 +
 app/test/meson.build   |1 +
 app/test/test_dispatcher.c | 1056 
 3 files changed, 1058 insertions(+)
 create mode 100644 app/test/test_dispatcher.c

diff --git a/MAINTAINERS b/MAINTAINERS
index a7039b06dc..0e24da11fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1737,6 +1737,7 @@ F: lib/node/
 Dispatcher - EXPERIMENTAL
 M: Mattias Rönnblom 
 F: lib/dispatcher/
+F: app/test/test_dispatcher.c
 
 
 Test Applications
diff --git a/app/test/meson.build b/app/test/meson.build
index 20a9333c72..c238f4b21c 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -59,6 +59,7 @@ source_file_deps = {
 'test_cycles.c': [],
 'test_debug.c': [],
 'test_devargs.c': ['kvargs'],
+'test_dispatcher.c': ['dispatcher'],
 'test_distributor.c': ['distributor'],
 'test_distributor_perf.c': ['distributor'],
 'test_dmadev.c': ['dmadev', 'bus_vdev'],
diff --git a/app/test/test_dispatcher.c b/app/test/test_dispatcher.c
new file mode 100644
index 00..6eb3f572cf
--- /dev/null
+++ b/app/test/test_dispatcher.c
@@ -0,0 +1,1056 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Ericsson AB
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "test.h"
+
+#define NUM_WORKERS 3
+#define NUM_PORTS (NUM_WORKERS + 1)
+#define WORKER_PORT_ID(worker_idx) (worker_idx)
+#define DRIVER_PORT_ID (NUM_PORTS - 1)
+
+#define NUM_SERVICE_CORES NUM_WORKERS
+#define MIN_LCORES (NUM_SERVICE_CORES + 1)
+
+/* Eventdev */
+#define NUM_QUEUES 8
+#define LAST_QUEUE_ID (NUM_QUEUES - 1)
+#define MAX_EVENTS 4096
+#define NEW_EVENT_THRESHOLD (MAX_EVENTS / 2)
+#define DEQUEUE_BURST_SIZE 32
+#define ENQUEUE_BURST_SIZE 32
+
+#define NUM_EVENTS 1000
+#define NUM_FLOWS 16
+
+#define DSW_VDEV "event_dsw0"
+
+struct app_queue {
+   uint8_t queue_id;
+   uint64_t sn[NUM_FLOWS];
+   int dispatcher_reg_id;
+};
+
+struct cb_count {
+   uint8_t expected_event_dev_id;
+   uint8_t expected_event_port_id[RTE_MAX_LCORE];
+   RTE_ATOMIC(int) count;
+};
+
+struct test_app {
+   uint8_t event_dev_id;
+   struct rte_dispatcher *dispatcher;
+   uint32_t dispatcher_service_id;
+
+   unsigned int service_lcores[NUM_SERVICE_CORES];
+
+   int never_match_reg_id;
+   uint64_t never_match_count;
+   struct cb_count never_process_count;
+
+   struct app_queue queues[NUM_QUEUES];
+
+   int finalize_reg_id;
+   struct cb_count finalize_count;
+
+   bool running;
+
+   RTE_ATOMIC(int) completed_events;
+   RTE_ATOMIC(int) errors;
+};
+
+static struct test_app *
+test_app_create(void)
+{
+   int i;
+   struct test_app *app;
+
+   app = calloc(1, sizeof(struct test_app));
+
+   if (app == NULL)
+   return NULL;
+
+   for (i = 0; i < NUM_QUEUES; i++)
+   app->queues[i].queue_id = i;
+
+   return app;
+}
+
+static void
+test_app_free(struct test_app *app)
+{
+   free(app);
+}
+
+static int
+test_app_create_vdev(struct test_app *app)
+{
+   int rc;
+
+   rc = rte_vdev_init(DSW_VDEV, NULL);
+   if (rc < 0)
+   return TEST_SKIPPED;
+
+   rc = rte_event_dev_get_dev_id(DSW_VDEV);
+
+   app->event_dev_id = (uint8_t)rc;
+
+   return TEST_SUCCESS;
+}
+
+static int
+test_app_destroy_vdev(struct test_app *app)
+{
+   int rc;
+
+   rc = rte_event_dev_close(app->event_dev_id);
+   TEST_ASSERT_SUCCESS(rc, "Error while closing event device");
+
+   rc = rte_vdev_uninit(DSW_VDEV);
+   TEST_ASSERT_SUCCESS(rc, "Error while uninitializing virtual device");
+
+   return TEST_SUCCESS;
+}
+
+static int
+test_app_setup_event_dev(struct test_app *app)
+{
+   int rc;
+  

[PATCH v8 1/3] lib: introduce dispatcher library

[Mattias Rönnblom]

The purpose of the dispatcher library is to help reduce coupling in an
Eventdev-based DPDK application.

In addition, the dispatcher also provides a convenient and flexible
way for the application to use service cores for application-level
processing.

Signed-off-by: Mattias Rönnblom 
Tested-by: Peter Nilsson 
Reviewed-by: Heng Wang 

--

PATCH v8:
 o Since starting and stopping a dispatcher is always successful (save
   for an inconsistent dispatcher state), have the start and stop
   calls return void.
 o Fix merge conflict in the release notes file.

PATCH v6:
 o Use single tab as indentation for continuation lines in multiple-line
   function prototypes. (David Marchand)
 o Add dispatcher library release note. (David Marchand)
 o Various indentation and spelling improvements. (David Marchand)
 o Add direct ,  and  includes,
   instead of relying on . (David Marchand)
 o Avoid Doxygen post annotations for struct fields. (David Marchand)

PATCH v5:
 o Move from using an integer id to a pointer to reference a dispatcher
   instance, to simplify the API.
 o Fix bug where dispatcher stats retrieval function erroneously depended
   on the user-supplied stats buffer being all-zero.

PATCH v4:
 o Fix bugs in handler and finalizer unregistration. (Naga Harish)
 o Return -EINVAL in cases where NULL pointers were provided in
   calls requiring non-NULL pointers. (Naga Harish)
 o Add experimental warning for the whole API. (Jerin Jacob)

PATCH v3:
 o To underline its optional character and since it does not provide
   hardware abstraction, the event dispatcher is now a separate
   library.
 o Change name from rte_event_dispatcher -> rte_dispatcher, to make it
   shorter and to avoid the rte_event_* namespace.

PATCH v2:
 o Add dequeue batch count statistic.
 o Add statistics reset function to API.
 o Clarify MT safety guarantees (or lack thereof) in the API documentation.
 o Change loop variable type in evd_lcore_get_handler_by_id() to uint16_t,
   to be consistent with similar loops elsewhere in the dispatcher.
 o Fix variable names in finalizer unregister function.

PATCH:
 o Change prefix from RED to EVD, to avoid confusion with random
   early detection.

RFC v4:
 o Move handlers to per-lcore data structures.
 o Introduce mechanism which rearranges handlers so that often-used
   handlers tend to be tried first.
 o Terminate dispatch loop in case all events are delivered.
 o To avoid the dispatcher's service function hogging the CPU, process
   only one batch per call.
 o Have service function return -EAGAIN if no work is performed.
 o Events delivered in the process function is no longer marked 'const',
   since modifying them may be useful for the application and cause
   no difficulties for the dispatcher.
 o Various minor API documentation improvements.

RFC v3:
 o Add stats_get() function to the version.map file.
---
 MAINTAINERS|   4 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/rel_notes/release_23_11.rst |   5 +
 lib/dispatcher/meson.build |  13 +
 lib/dispatcher/rte_dispatcher.c| 694 +
 lib/dispatcher/rte_dispatcher.h| 458 
 lib/dispatcher/version.map |  20 +
 lib/meson.build|   2 +
 9 files changed, 1198 insertions(+)
 create mode 100644 lib/dispatcher/meson.build
 create mode 100644 lib/dispatcher/rte_dispatcher.c
 create mode 100644 lib/dispatcher/rte_dispatcher.h
 create mode 100644 lib/dispatcher/version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 9af332ae6b..a7039b06dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1734,6 +1734,10 @@ M: Nithin Dabilpuram 
 M: Pavan Nikhilesh 
 F: lib/node/
 
+Dispatcher - EXPERIMENTAL
+M: Mattias Rönnblom 
+F: lib/dispatcher/
+
 
 Test Applications
 -
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 732e2ecb28..30918995d3 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -157,6 +157,7 @@ The public API headers are grouped by topics:
 
 - **classification**
   [reorder](@ref rte_reorder.h),
+  [dispatcher](@ref rte_dispatcher.h),
   [distributor](@ref rte_distributor.h),
   [EFD](@ref rte_efd.h),
   [ACL](@ref rte_acl.h),
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index df801d32f9..93709e1d2c 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -34,6 +34,7 @@ INPUT   = @TOPDIR@/doc/api/doxy-api-index.md \
   @TOPDIR@/lib/cmdline \
   @TOPDIR@/lib/compressdev \
   @TOPDIR@/lib/cryptodev \
+  @TOPDIR@/lib/dispatcher \
   @TOPDIR@/lib/distributor \
   @TOPDIR@/lib/dmadev \
   @TOPDIR@/lib/efd \
diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rs

[PATCH v8 3/3] doc: add dispatcher programming guide

[Mattias Rönnblom]

Provide programming guide for the dispatcher library.

Signed-off-by: Mattias Rönnblom 

--

PATCH v7:
 o Mark pseudo code blocks as being type "none", to avoid Sphinx failures
   on non-Ubuntu systems. (David Marchand)
 o "Necessarily" necessarily needs to be spelled just so. (David Marchand)

PATCH v6:
 o Eliminate unneeded white space in code blocks. (David Marchand)

PATCH v5:
 o Update guide to match API changes related to dispatcher ids.

PATCH v3:
 o Adapt guide to the dispatcher API name changes.

PATCH:
 o Improve grammar and spelling.

RFC v4:
 o Extend event matching section of the programming guide.
 o Improve grammar and spelling.
---
 MAINTAINERS  |   1 +
 doc/guides/prog_guide/dispatcher_lib.rst | 433 +++
 doc/guides/prog_guide/index.rst  |   1 +
 3 files changed, 435 insertions(+)
 create mode 100644 doc/guides/prog_guide/dispatcher_lib.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index 0e24da11fe..affb4b9410 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1738,6 +1738,7 @@ Dispatcher - EXPERIMENTAL
 M: Mattias Rönnblom 
 F: lib/dispatcher/
 F: app/test/test_dispatcher.c
+F: doc/guides/prog_guide/dispatcher_lib.rst
 
 
 Test Applications
diff --git a/doc/guides/prog_guide/dispatcher_lib.rst 
b/doc/guides/prog_guide/dispatcher_lib.rst
new file mode 100644
index 00..6de1ea78b0
--- /dev/null
+++ b/doc/guides/prog_guide/dispatcher_lib.rst
@@ -0,0 +1,433 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2023 Ericsson AB.
+
+Dispatcher
+==
+
+Overview
+
+
+The purpose of the dispatcher is to help reduce coupling in an
+:doc:`Eventdev `-based DPDK application.
+
+In particular, the dispatcher addresses a scenario where an
+application's modules share the same event device and event device
+ports, and performs work on the same lcore threads.
+
+The dispatcher replaces the conditional logic that follows an event
+device dequeue operation, where events are dispatched to different
+parts of the application, typically based on fields in the
+``rte_event``, such as the ``queue_id``, ``sub_event_type``, or
+``sched_type``.
+
+Below is an excerpt from a fictitious application consisting of two
+modules; A and B. In this example, event-to-module routing is based
+purely on queue id, where module A expects all events to a certain
+queue id, and module B two other queue ids. [#Mapping]_
+
+.. code-block:: c
+
+for (;;) {
+struct rte_event events[MAX_BURST];
+unsigned int n;
+
+n = rte_event_dequeue_burst(dev_id, port_id, events,
+   MAX_BURST, 0);
+
+for (i = 0; i < n; i++) {
+const struct rte_event *event = &events[i];
+
+switch (event->queue_id) {
+case MODULE_A_QUEUE_ID:
+module_a_process(event);
+break;
+case MODULE_B_STAGE_0_QUEUE_ID:
+module_b_process_stage_0(event);
+break;
+case MODULE_B_STAGE_1_QUEUE_ID:
+module_b_process_stage_1(event);
+break;
+}
+}
+}
+
+The issue this example attempts to illustrate is that the centralized
+conditional logic has knowledge of things that should be private to
+the modules. In other words, this pattern leads to a violation of
+module encapsulation.
+
+The shared conditional logic contains explicit knowledge about what
+events should go where. In case, for example, the
+``module_a_process()`` is broken into two processing stages — a
+module-internal affair — the shared conditional code must be updated
+to reflect this change.
+
+The centralized event routing code becomes an issue in larger
+applications, where modules are developed by different organizations.
+This pattern also makes module reuse across different application more
+difficult. The part of the conditional logic relevant for a particular
+application may need to be duplicated across many module
+instantiations (e.g., applications and test setups).
+
+The dispatcher separates the mechanism (routing events to their
+receiver) from the policy (which events should go where).
+
+The basic operation of the dispatcher is as follows:
+
+* Dequeue a batch of events from the event device.
+* For each event determine which handler should receive the event, using
+  a set of application-provided, per-handler event matching callback
+  functions.
+* Provide events matching a particular handler, to that handler, using
+  its process callback.
+
+If the above application would have made use of the dispatcher, the
+code relevant for its module A may have looked something like this:
+
+.. code-block:: c
+
+static bool
+module_a_match(const struct rte_event *event, void *cb_data)
+{
+   return event->queue_id == MODULE_A_QUEUE_

RE: [PATCH] ethdev: remove init_color from METER_MARK action

[Ori Kam]

Hi Gregory,

> -Original Message-
> From: Gregory Etelson 
> Sent: Tuesday, August 8, 2023 1:01 PM
> 
> Indirect list API defines 2 types of action update:
> • Action mutable context is always shared between all flows
>   that referenced indirect actions list handle.
>   Action mutable context can be changed by explicit invocation
>   of indirect handle update function.
> • Flow mutable context is private to a flow.
>   Flow mutable context can be updated by indirect list handle
>   flow rule configuration.
> 
> `METER_MARK::init_color` is flow resource.
> Current flows implementation placed `init_color` in the
> `rte_flow_action_meter_mark` making it action level resource.
> 
> The patch removes `init_color` from the `rte_flow_action_meter_mark`
> structure.
> 
> API change:
> The patch removed:
> • struct rte_flow_action_meter_mark::init_color
> 
> • struct rte_flow_update_meter_mark::init_color_valid
> 
> Signed-off-by: Gregory Etelson 
> ---
>  app/test-pmd/cmdline_flow.c |  8 ---
>  app/test-pmd/config.c   |  1 -
>  drivers/net/mlx5/mlx5_flow_hw.c | 97 ++---
>  lib/ethdev/rte_flow.h   |  6 +-
>  4 files changed, 43 insertions(+), 69 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 94827bcc4a..54daede7cb 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -575,7 +575,6 @@ enum index {
>   ACTION_METER_POLICY,
>   ACTION_METER_POLICY_ID2PTR,
>   ACTION_METER_COLOR_MODE,
> - ACTION_METER_INIT_COLOR,
>   ACTION_METER_STATE,
>   ACTION_OF_DEC_NW_TTL,
>   ACTION_OF_POP_VLAN,
> @@ -2227,7 +2226,6 @@ static const enum index action_meter_mark[] = {
>   ACTION_METER_PROFILE,
>   ACTION_METER_POLICY,
>   ACTION_METER_COLOR_MODE,
> - ACTION_METER_INIT_COLOR,
>   ACTION_METER_STATE,
>   ACTION_NEXT,
>   ZERO,
> @@ -6175,12 +6173,6 @@ static const struct token token_list[] = {
>   .args = ARGS(ARGS_ENTRY(struct
> rte_flow_action_meter_mark, color_mode)),
>   .call = parse_vc_conf,
>   },
> - [ACTION_METER_INIT_COLOR] = {
> - .name = "mtr_init_color",
> - .help = "meter initial color",
> - .next = NEXT(action_meter_mark,
> NEXT_ENTRY(ITEM_METER_COLOR_NAME)),
> - .args = ARGS(ARGS_ENTRY(struct
> rte_flow_action_meter_mark, init_color)),
> - },
>   [ACTION_METER_STATE] = {
>   .name = "mtr_state",
>   .help = "meter state",
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index 11f3a22048..415da109dc 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -3179,7 +3179,6 @@ port_queue_action_handle_update(portid_t port_id,
>   if (mtr_update.meter_mark.policy)
>   mtr_update.policy_valid = 1;
>   mtr_update.color_mode_valid = 1;
> - mtr_update.init_color_valid = 1;
>   mtr_update.state_valid = 1;
>   update = &mtr_update;
>   break;
> diff --git a/drivers/net/mlx5/mlx5_flow_hw.c
> b/drivers/net/mlx5/mlx5_flow_hw.c
> index 5395969eb0..8ddef811ee 100644
> --- a/drivers/net/mlx5/mlx5_flow_hw.c
> +++ b/drivers/net/mlx5/mlx5_flow_hw.c
> @@ -1344,8 +1344,7 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev
> *dev, uint32_t queue,
>   aso_mtr->state = (queue == MLX5_HW_INV_QUEUE) ?
> ASO_METER_WAIT : ASO_METER_WAIT_ASYNC;
>   aso_mtr->offset = mtr_id - 1;
> - aso_mtr->init_color = (meter_mark->color_mode) ?
> - meter_mark->init_color : RTE_COLOR_GREEN;
> + aso_mtr->init_color = fm->color_aware ? RTE_COLORS :
> RTE_COLOR_GREEN;
>   /* Update ASO flow meter by wqe. */
>   if (mlx5_aso_meter_update_by_wqe(priv->sh, queue, aso_mtr,
>&priv->mtr_bulk, user_data, push)) {
> @@ -1380,9 +1379,6 @@ flow_hw_meter_mark_compile(struct rte_eth_dev
> *dev,
>   /* Compile METER_MARK action */
>   acts[aso_mtr_pos].action = pool->action;
>   acts[aso_mtr_pos].aso_meter.offset = aso_mtr->offset;
> - acts[aso_mtr_pos].aso_meter.init_color =
> - (enum mlx5dr_action_aso_meter_color)
> - rte_col_2_mlx5_col(aso_mtr->init_color);
>   *index = aso_mtr->fm.meter_id;
>   return 0;
>  }
> @@ -2068,9 +2064,6 @@ flow_hw_shared_action_construct(struct
> rte_eth_dev *dev, uint32_t queue,
>   return -1;
>   rule_act->action = pool->action;
>   rule_act->aso_meter.offset = aso_mtr->offset;
> - rule_act->aso_meter.init_color =
> - (enum mlx5dr_action_aso_meter_color)
> - rte_col_2_mlx5_col(aso_mtr->init_color);
>   break;
>   case MLX5_INDIRECT_ACTION_TYPE_QUOTA:
>   flow_hw_construct_quota(priv, rule_act, idx);
> @@ -2483,9 +2476,6 @@ flow_hw_actions_construct(struct rte_eth_de

Re: [EXT] Re: [PATCH 1/2] ethdev: add IPsec event subtype range for PMD specific code

[Ferruh Yigit]

On 10/10/2023 3:48 PM, Akhil Goyal wrote:
>> On 10/4/2023 1:59 PM, Nithin Dabilpuram wrote:
>>> Add IPsec event subtype range for PMD specific code in order
>>> to accommodate wide range of errors that PMD supports.
>>> These IPsec event subtypes are used when an error doesn't
>>> match the spec defined subtypes between
>> RTE_ETH_EVENT_IPSEC_UNKNOWN
>>> and RTE_ETH_EVENT_IPSEC_MAX. Adding this as -ve error range
>>> to avoid ABI breakage.
>>>
>>> Signed-off-by: Nithin Dabilpuram 
>>> ---
>>>  lib/ethdev/rte_ethdev.h | 4 
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
>>> index 8542257721..f949dfc83d 100644
>>> --- a/lib/ethdev/rte_ethdev.h
>>> +++ b/lib/ethdev/rte_ethdev.h
>>> @@ -3905,6 +3905,10 @@ struct rte_eth_event_macsec_desc {
>>>   * eth device.
>>>   */
>>>  enum rte_eth_event_ipsec_subtype {
>>> +   /**  PMD specific error start */
>>> +   RTE_ETH_EVENT_IPSEC_PMD_ERROR_START = -256,
>>> +   /**  PMD specific error end */
>>> +   RTE_ETH_EVENT_IPSEC_PMD_ERROR_END = -1,
>>> /** Unknown event type */
>>> RTE_ETH_EVENT_IPSEC_UNKNOWN = 0,
>>> /** Sequence number overflow */
>>>
>>
>> I don't see any problem to extend event subtype with custom error range,
>> @Akhil, @Anoob what do you think?
> 
> I believe it is ok to add the custom error range.
> It is just that the user will need to check the negative values too, which I 
> believe is ok.
> 
> Acked-by: Akhil Goyal 
> 
>
> Acked-by: Anoob Joseph 
>


Series applied to dpdk-next-net/main, thanks.

Re: [PATCH] ethdev: clarify device queue state after start and stop

[David Marchand]

Hello Ferruh,

On Thu, Sep 28, 2023 at 10:59 PM Ferruh Yigit  wrote:
>
> Drivers start/stop device queues on port start/stop, but not all drivers
> update queue state accordingly.
>
> This becomes more visible if a specific queue stopped explicitly and
> port stopped/started later, in this case although all queues are
> started, the state of that specific queue is stopped and it is
> misleading.
>
> Misrepresentation of queue state became a defect with commit [1] that
> does forwarding decision based on queue state and commit [2] that gets
> up to date queue state from ethdev/device before forwarding.
>
> [1]
> commit 3c4426db54fc ("app/testpmd: do not poll stopped queues")
>
> [2]
> commit 5028f207a4fa ("app/testpmd: fix secondary process packet forwarding")
>
> This patch documents that status of all queues of a device should be
> `RTE_ETH_QUEUE_STATE_STOPPED` after port stop and their status should
> be`RTE_ETH_QUEUE_STATE_STARTED` after port start.
>
> Also an unit test added to verify drivers.
>
> Signed-off-by: Ferruh Yigit 
> ---
> Cc: Jie Hai 
> Cc: Song Jiale 
> Cc: Yuan Peng 
> Cc: Raslan Darawsheh 
> Cc: Qiming Yang 
> Cc: Ivan Malov 
> Cc: Huisong Li 
>
> v1:
> * fix memset
> * remove commented out code
> * update unit test to skip queue state if
>   rte_eth_[rt]x_queue_info_get() is not supported
> ---
>  app/test/meson.build   |   1 +
>  app/test/test_ethdev_api.c | 184 +
>  lib/ethdev/rte_ethdev.h|   5 +
>  3 files changed, 190 insertions(+)
>  create mode 100644 app/test/test_ethdev_api.c
>
> diff --git a/app/test/meson.build b/app/test/meson.build
> index 05bae9216dbc..05bbe84868f6 100644
> --- a/app/test/meson.build
> +++ b/app/test/meson.build
> @@ -65,6 +65,7 @@ source_file_deps = {
>  'test_efd_perf.c': ['efd', 'hash'],
>  'test_errno.c': [],
>  'test_ethdev_link.c': ['ethdev'],
> +'test_ethdev_api.c': ['ethdev'],

Nit: aphabetical sort

>  'test_event_crypto_adapter.c': ['cryptodev', 'eventdev', 'bus_vdev'],
>  'test_event_eth_rx_adapter.c': ['ethdev', 'eventdev', 'bus_vdev'],
>  'test_event_eth_tx_adapter.c': ['bus_vdev', 'ethdev', 'net_ring', 
> 'eventdev'],
> diff --git a/app/test/test_ethdev_api.c b/app/test/test_ethdev_api.c
> new file mode 100644
> index ..68239f82ff33
> --- /dev/null
> +++ b/app/test/test_ethdev_api.c
> @@ -0,0 +1,184 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright (C) 2023, Advanced Micro Devices, Inc.
> + */
> +
> +#include 
> +#include 
> +
> +#include 
> +#include "test.h"
> +
> +#define NUM_RXQ2
> +#define NUM_TXQ2
> +#define NUM_RXD 512
> +#define NUM_TXD 512
> +#define NUM_MBUF 1024
> +#define MBUF_CACHE_SIZE 256
> +
> +static int32_t
> +ethdev_api_queue_status(void)
> +{
> +   struct rte_eth_dev_info dev_info;
> +   struct rte_eth_rxq_info rx_qinfo;
> +   struct rte_eth_txq_info tx_qinfo;
> +   struct rte_mempool *mbuf_pool;
> +   struct rte_eth_conf eth_conf;
> +   uint16_t port_id;
> +   int ret;
> +

Should we return TEST_SKIPPED if no ethdev port is present?
It seems more valid to me than returning TEST_SUCCESS.


> +   mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUF, 
> MBUF_CACHE_SIZE, 0,
> +   RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
> +
> +   RTE_ETH_FOREACH_DEV(port_id) {
> +   memset(ð_conf, 0, sizeof(eth_conf));
> +   ret = rte_eth_dev_configure(port_id, NUM_RXQ, NUM_TXQ, 
> ð_conf);
> +   TEST_ASSERT(ret == 0,
> +   "Port(%u) failed to configure.\n", port_id);
> +
> +   /* RxQ setup */
> +   for (uint16_t queue_id = 0; queue_id < NUM_RXQ; queue_id++) {
> +   ret = rte_eth_rx_queue_setup(port_id, queue_id, 
> NUM_RXD,
> +   rte_socket_id(), NULL,  mbuf_pool);
> +   TEST_ASSERT(ret == 0,
> +   "Port(%u), queue(%u) failed to setup RxQ.\n",
> +   port_id, queue_id);
> +   }
> +
> +   /* TxQ setup */
> +   for (uint16_t queue_id = 0; queue_id < NUM_TXQ; queue_id++) {
> +   ret = rte_eth_tx_queue_setup(port_id, queue_id, 
> NUM_TXD,
> +   rte_socket_id(), NULL);
> +   TEST_ASSERT(ret == 0,
> +   "Port(%u), queue(%u) failed to setup TxQ.\n",
> +   port_id, queue_id);
> +   }
> +
> +   ret = rte_eth_dev_info_get(port_id, &dev_info);
> +   TEST_ASSERT(ret == 0,
> +   "Port(%u) failed to get dev info.\n", port_id);
> +
> +   /* Initial RxQ */
> +   for (uint16_t queue_id = 0; queue_id < dev_info.nb_rx_queues; 
> queue_id++) {
> +   ret = rte_eth_rx_queue_info_get(port_id, queue_id, 
> &rx_qinfo);
> +   

RE: [PATCH v2 0/2] ethdev: add random item support

[Michael Baum]

On  Monday, 11 September 2023 20:53 Stephen Hemminger wrote: 
> 
> On Mon, 11 Sep 2023 18:55:45 +0200
> Morten Brørup  wrote:
> 
> > > From: Michael Baum [mailto:michae...@nvidia.com]
> > > Sent: Monday, 11 September 2023 08.42
> > >
> > > Add support for matching random value using new
> > > "rte_flow_item_random" structure.
> >
> > I get it. It can be used for things like stochastic sampling.
> >
> > However, it doesn't provide support for e.g. 1/100 or 1/500.
> >
> > So here's a suggestion:
> >
> > Instead of "value" (which is irrelevant) & "mask" (which is what
> > really controls the probability), wouldn't it be better if "value"
> > was an inverse probability (and "mask" was irrelevant)? E.g.
> > value=500 means that there is a 1 of 500 probability of a match.
> >
> > Would this kind of random item better serve the purpose?
> >
> > Or is the random item, in its current form, also required for other
> > purposes?
> >
> 
> For netem (Linux kernel) needed to support expressing a percent in fixed point
> number. The solution was to express it as:
> Percent = X / UINT32_MAX

I concur with the notion that numbers can be utilized for probability 
calculations. However, it's important to acknowledge that when employing 
numbers, we are essentially working with a superset of possibilities due to 
their inherent versatility.

To illustrate this, consider the scenario where we transmit a numerical value 
to an application and use that same value across different stages of the 
pipeline. Take, for instance, the following use case:

In the initial stage, there is a 20% probability of selecting a packet for 
sampling before proceeding with the pipeline.

Towards the end of the pipeline, if the packet was initially sampled, we sample 
it once more.

The challenge arises when attempting to replicate this process solely using a 
numerical value, as there is no guarantee that the same packet will be chosen 
both in the initial and final stages. Conversely, by duplicating the random 
number and using it as a reference for matching, we can effectively implement 
the aforementioned usage scenario.

I hope this clarifies the distinction and benefits of utilizing random numbers 
in our probability calculations.

[Bug 1297] iavf: vxlan tunnel inner tcp checksum offload result in inner ip checksum cleared to 0

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1297

Bug ID: 1297
   Summary: iavf: vxlan tunnel inner tcp checksum offload result
in inner ip checksum cleared to 0
   Product: DPDK
   Version: 22.11
  Hardware: x86
OS: Linux
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: dexia...@jaguarmicro.com
  Target Milestone: ---

when using iavf test vxlan tunnel inner tcp checksum offload, tcp checksum
offload result in inner ip checksum cleared to 0.

-- 
You are receiving this mail because:
You are the assignee for the bug.

RE: [PATCH v2 1/2] ethdev: add random item support

[Michael Baum]

11/09/2023 19:00, Thomas Monjalon:
> 
> 11/09/2023 09:41, Michael Baum:
> > Add support for a new item type "RTE_FLOW_ITEM_TYPE_RANDOM".
> > This item enables to match on some random value as a part of flow rule.
> >
> > Signed-off-by: Michael Baum 
> > ---
> > +Item: ``RANDOM``
> > +
> > +
> > +Matches a random value.
> > +
> > +This value is not based on the packet data/headers.
> > +Application shouldn't assume that this value is kept during the life
> > +time of the packet.
> > +
> > +- ``value``: Random value.
> 
> I think it is the opposite:
> the value is defined by the application, right?
> Then it matches randomly based on a number generator?
Generating the random number is the PMD responsibility, it may be performed by 
either HW or SW.
The application provides the random value/range to match on.

> 
> Please describe where the random is generated and what is the range.
Ack

> 
> We could also wonder why it is not integrated in the existing sampling item.
We don't have sample item, we have existing sample action.

Re: [PATCH] bus/vmbus: add support allow/block scan mode

[David Marchand]

On Thu, Jun 9, 2022 at 10:46 AM Xiaoming Jiang
 wrote:
>
> bus/vmbus: add support allow/block scan mode
>
> Signed-off-by: Xiaoming Jiang 

Acked-by: Long Li 
Acked-by: Huisong Li 

Applied, thanks Xiaoming.


-- 
David Marchand

Re: [PATCH] eventdev: fix symbol export for port maintenance

[Jerin Jacob]

> > >
> > > I can't say I know why it's needed, but the change seems consistent with
> > > other Eventdev trace points.
> >
> > The trace point framework in DPDK relies on a per trace point global
> > variable (whose name is __):
> >
> > #define __RTE_TRACE_POINT(_mode, _tp, _args, ...) \
> > extern rte_trace_point_t __##_tp; \
> > static __rte_always_inline void \
> > _tp _args \
> > { \
> > __rte_trace_point_emit_header_##_mode(&__##_tp); \
> > __VA_ARGS__ \
> > }
> >
> > When tracepoints are called from within a shared library code, and
> > because all symbols of a group of objects are visible, the tracepoint
> > symbols are resolved by the linker.
> > But when this tracepoint is called via an inline helper from some code
> > out of the shared library, this symbol must be exported in the shared
> > library map or it won't be visible to "external" users.
>
> Could we describe / mention this in the trace point library doc?
> Or maybe I read too quickly and there is already something but it was
> not obvious to me.

Following text is available in
https://doc.dpdk.org/guides/prog_guide/trace_lib.html as NOTE.
We may need to update to very specific on FP trace points.


The RTE_TRACE_POINT_REGISTER defines the placeholder for the
rte_trace_point_t tracepoint object. For generic tracepoint or for
tracepoint used in public header files, the user must export a
__ symbol in the library .map file for this
tracepoint to be used out of the library, in shared builds. For
example, __app_trace_string will be the exported symbol in the above
example.

>
>
> --
> David Marchand
>

Re: [PATCH 0/2] simplify building x86 code with AVX2 support

[David Marchand]

Hello Bruce,

On Thu, Jul 27, 2023 at 11:31 AM Bruce Richardson
 wrote:
>
> Inside our optimized vector drivers (and libs), there were always build
> time checks for various levels of instruction set support, most
> notably AVX2 and AVX-512 on x86 systems. One of the checks done in
> each case was verifying that the compiler used was able to generate
> AVX code appropriately. However, since this was originally done,
> our minimum compiler support has been updated and so we no longer
> need to check this - all supported compilers can generate AVX2.
> This allows us to simplify the build logic for the x86 vector code.
>
> In future, we can do similarly for AVX-512.
>
> Bruce Richardson (2):
>   build/x86: remove conditional checks for AVX2 support
>   build: remove unnecessary AVX2 compiler flag
>
>  drivers/net/bnxt/bnxt_ethdev.c  |  8 
>  drivers/net/bnxt/bnxt_rxr.h |  2 +-
>  drivers/net/bnxt/bnxt_txr.h |  2 +-
>  drivers/net/bnxt/meson.build| 26 +
>  drivers/net/enic/meson.build| 10 +++---
>  drivers/net/i40e/i40e_rxtx.c| 14 -
>  drivers/net/i40e/meson.build| 22 ++---
>  drivers/net/iavf/iavf_rxtx_vec_common.h |  2 +-
>  drivers/net/iavf/meson.build| 22 ++---
>  drivers/net/ice/meson.build | 21 ++--
>  lib/acl/meson.build | 23 +-
>  lib/acl/rte_acl.c   | 10 +++---
>  12 files changed, 49 insertions(+), 113 deletions(-)

Sorry, this series had fallen through the cracks... though I intended
to apply with other build update series.

It still applies fine, I ran my checks and I see nothing wrong with the series.
Applied, thanks for the cleanup.


-- 
David Marchand

Re: [PATCH v2] config/arm: update aarch32 build with gcc13

[Paul Szczepanek]

On 09/10/2023 10:53, Juraj Linkeš wrote:

The aarch32 with gcc13 fails with:

Compiler for C supports arguments -march=armv8-a: NO

../config/arm/meson.build:714:12: ERROR: Problem encountered: No
suitable armv8 march version found.

This is because we test -march=armv8-a alone (without the -mpfu option),
which is no longer supported in gcc13 aarch32 builds.

The most recent recommendation from the compiler team is to build with
-march=armv8-a+simd -mfpu=auto, which should work for compilers old and
new. The suggestion is to first check -march=armv8-a+simd and only then
check -mfpu=auto.

To address this, add a way to force the architecture (the value of
the -march option).

Signed-off-by: Juraj Linkeš 
Acked-by: Ruifeng Wang 
---
  config/arm/meson.build | 12 +---
  1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 3f22d8a2fc..5303d0e969 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -43,7 +43,9 @@ implementer_generic = {
  },
  'generic_aarch32': {
  'march': 'armv8-a',
-'compiler_options': ['-mfpu=neon'],
+'force_march': true,
+'march_features': ['simd'],
+'compiler_options': ['-mfpu=auto'],
  'flags': [
  ['RTE_ARCH_ARM_NEON_MEMCPY', false],
  ['RTE_ARCH_STRICT_ALIGN', true],
@@ -711,7 +713,11 @@ if update_flags
  endif
  endforeach
  if candidate_march == ''
-error('No suitable armv8 march version found.')
+if part_number_config.get('force_march', false)
+candidate_march = part_number_config['march']
+else
+error('No suitable armv8 march version found.')
+endif
This section is only used when no candidate is found, this would make it 
not really be a forced arch but more a fallback arch. If we want the 
user to be able to really force the march string we'd need to put the 
"is forced?" check higher. Am I reading the code right?

  endif
  if candidate_march != part_number_config['march']
  warning('Configuration march version is ' +
@@ -741,7 +747,7 @@ if update_flags
  # apply supported compiler options
  if part_number_config.has_key('compiler_options')
  foreach flag: part_number_config['compiler_options']
-if cc.has_argument(flag)
+if cc.has_multi_arguments(machine_args + [flag])
  machine_args += flag
  else
  warning('Configuration compiler option ' +

Re: [PATCH v8 0/3] Add dispatcher library

[David Marchand]

On Thu, Oct 12, 2023 at 10:55 AM Mattias Rönnblom
 wrote:
>
> The purpose of the dispatcher library is to decouple different parts
> of an eventdev-based application (e.g., processing pipeline stages),
> sharing the same underlying event device.
>
> The dispatcher replaces the conditional logic (often, a switch
> statement) that typically follows an event device dequeue operation,
> where events are dispatched to different parts of the application
> based on event meta data, such as the queue id or scheduling type.
>
> The concept is similar to a UNIX file descriptor event loop library.
> Instead of tying callback functions to fds as for example libevent
> does, the dispatcher relies on application-supplied matching callback
> functions to decide where to deliver events.
>
> A dispatcher is configured to dequeue events from a specific event
> device, and ties into the service core framework, to do its (and the
> application's) work.
>
> The dispatcher provides a convenient way for an eventdev-based
> application to use service cores for application-level processing, and
> thus for sharing those cores with other DPDK services.
>
> Although the dispatcher adds some overhead, experience suggests that
> the net effect on the application (both synthetic benchmarks and more
> real-world applications) may well be positive. This is primarily due
> to clustering (see programming guide) reducing cache misses.
>
> Benchmarking indicates that the overhead is ~10 cc/event (on a
> large core), with a handful of often-used handlers.
>
> The dispatcher does not support run-time reconfiguration.
>
> The use of the dispatcher library is optional, and an eventdev-based
> application may still opt to access the event device using direct
> eventdev API calls, or by some other means.
>
> Mattias Rönnblom (3):
>   lib: introduce dispatcher library
>   test: add dispatcher test suite
>   doc: add dispatcher programming guide
>
>  MAINTAINERS  |6 +
>  app/test/meson.build |1 +
>  app/test/test_dispatcher.c   | 1056 ++
>  doc/api/doxy-api-index.md|1 +
>  doc/api/doxy-api.conf.in |1 +
>  doc/guides/prog_guide/dispatcher_lib.rst |  433 +
>  doc/guides/prog_guide/index.rst  |1 +
>  doc/guides/rel_notes/release_23_11.rst   |5 +
>  lib/dispatcher/meson.build   |   13 +
>  lib/dispatcher/rte_dispatcher.c  |  694 ++
>  lib/dispatcher/rte_dispatcher.h  |  458 ++
>  lib/dispatcher/version.map   |   20 +
>  lib/meson.build  |2 +
>  13 files changed, 2691 insertions(+)
>  create mode 100644 app/test/test_dispatcher.c
>  create mode 100644 doc/guides/prog_guide/dispatcher_lib.rst
>  create mode 100644 lib/dispatcher/meson.build
>  create mode 100644 lib/dispatcher/rte_dispatcher.c
>  create mode 100644 lib/dispatcher/rte_dispatcher.h
>  create mode 100644 lib/dispatcher/version.map
>

Thanks for this latest revision, it lgtm.
I fixed a few grammar issues in the documentation and used simple ..
note:: blocks to be consistent with the rest of our docs.

Applied, thanks Mattias.


-- 
David Marchand

Re: [PATCH v3 1/2] doc: increase python max line length to 100

[Paul Szczepanek]

On 28/09/2023 13:18, Juraj Linkeš wrote:

Unify with C recommendations which allow line length of up to 100
characters.

Signed-off-by: Owen Hilyard 
Signed-off-by: Juraj Linkeš 
---
  .editorconfig| 2 +-
  doc/doc_build/meson-private/meson.lock   | 0
  doc/guides/contributing/coding_style.rst | 3 +++
  dts/pyproject.toml   | 4 ++--
  4 files changed, 6 insertions(+), 3 deletions(-)
  create mode 100644 doc/doc_build/meson-private/meson.lock

diff --git a/.editorconfig b/.editorconfig
index ab41c95085..1e7d74213f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,7 +16,7 @@ max_line_length = 100
  [*.py]
  indent_style = space
  indent_size = 4
-max_line_length = 79
+max_line_length = 100
  
  [meson.build]

  indent_style = space
diff --git a/doc/doc_build/meson-private/meson.lock 
b/doc/doc_build/meson-private/meson.lock
new file mode 100644
index 00..e69de29bb2
diff --git a/doc/guides/contributing/coding_style.rst 
b/doc/guides/contributing/coding_style.rst
index 648849899d..a42cd3d58d 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -880,6 +880,9 @@ All Python code should be compliant with
  `PEP8 (Style Guide for Python Code) 
`_.
  
  The ``pep8`` tool can be used for testing compliance with the guidelines.

+Note that line lengths are acceptable up to 100 characters, which is in line 
with C recommendations.
+
+..


Presumably the bare ".." is some accidental leftover markup.


  
  Integrating with the Build System

  -
diff --git a/dts/pyproject.toml b/dts/pyproject.toml
index 6762edfa6b..980ac3c7db 100644
--- a/dts/pyproject.toml
+++ b/dts/pyproject.toml
@@ -41,7 +41,7 @@ build-backend = "poetry.core.masonry.api"
  [tool.pylama]
  linters = "mccabe,pycodestyle,pyflakes"
  format = "pylint"
-max_line_length = 88 # 
https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length
+max_line_length = 100
  
  [tool.mypy]

  python_version = "3.10"
@@ -55,4 +55,4 @@ profile = "black"
  [tool.black]
  target-version = ['py310']
  include = '\.pyi?$'
-line-length = 88 # 
https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length
+line-length = 100


The rest looks good. Wholeheartedly support longer line length.

Re: [PATCH v6 00/12] VRB2 bbdev PMD introduction

[Maxime Coquelin]

On 10/10/23 22:20, Nicolas Chautru wrote:

v6: removed one empty line typo.
 Thanks

v5: missed a line in v4 patch 2/12.
 change to 9/12 with suggested refactor.

v4: updates based on Maxime's suggestions:
- FFT windowing exposure tweaked to show number of windows
as well in capacity to be more generic and future-proof.
- few code refactor notably to avoid code duplication
- cosmetic and doc update

v3: updates based on v2 review:
- split into smaller incremental commits
- FFT windowing exposed through a more generic structure
- refactor using wrapper functions to manage device variants
- removed custom dump function
- consider the request unsupport SO option as an error
instead of fall-back.
- cosmetic and doc update.
Thanks

v2: doc, comments and commit-log updates.

This serie includes changes to the VRB BBDEV PMD for 23.11.

This allows the VRB unified driver to support the new VRB2
implementation variant on GNR-D.

This also include minor change to the dev_info to expose FFT version
flexibility to expose information to the application on what windows
LUT is configured dynamically on the device.

Nicolas Chautru (12):
   bbdev: add FFT window width member in driver info
   baseband/acc: add FFT window width in the VRB PMD
   baseband/acc: remove the 4G SO capability for VRB1
   baseband/acc: allocate FCW memory separately
   baseband/acc: add support for MLD operation
   baseband/acc: refactor to allow unified driver extension
   baseband/acc: adding VRB2 device variant
   baseband/acc: add FEC capabilities for the VRB2 variant
   baseband/acc: add FFT support to VRB2 variant
   baseband/acc: add MLD support in VRB2 variant
   baseband/acc: add support for VRB2 engine error detection
   baseband/acc: add configure helper for VRB2

  doc/guides/bbdevs/features/vrb2.ini|   14 +
  doc/guides/bbdevs/index.rst|1 +
  doc/guides/bbdevs/vrb1.rst |4 -
  doc/guides/bbdevs/vrb2.rst |  206 
  doc/guides/rel_notes/release_23_11.rst |3 +
  drivers/baseband/acc/acc100_pmd.h  |2 +
  drivers/baseband/acc/acc_common.h  |  185 ++-
  drivers/baseband/acc/rte_acc100_pmd.c  |6 +-
  drivers/baseband/acc/rte_vrb_pmd.c | 1571 +---
  drivers/baseband/acc/vrb1_pf_enum.h|   17 +-
  drivers/baseband/acc/vrb2_pf_enum.h|  124 ++
  drivers/baseband/acc/vrb2_vf_enum.h|  121 ++
  drivers/baseband/acc/vrb_cfg.h |   16 +
  drivers/baseband/acc/vrb_pmd.h |  173 ++-
  lib/bbdev/rte_bbdev.h  |2 +
  lib/bbdev/rte_bbdev_op.h   |2 +
  16 files changed, 2258 insertions(+), 189 deletions(-)
  create mode 100644 doc/guides/bbdevs/features/vrb2.ini
  create mode 100644 doc/guides/bbdevs/vrb2.rst
  create mode 100644 drivers/baseband/acc/vrb2_pf_enum.h
  create mode 100644 drivers/baseband/acc/vrb2_vf_enum.h



Applied to next-baseband/for-main.

Thanks,
Maxime

Re: [PATCH v1 1/1] baseband/acc: fix ACC100 HARQ input is alignment

[Maxime Coquelin]

On 9/19/23 20:24, Hernan Vargas wrote:

Some constraints are imposed onto the ACC100 HARQ input size,
but that value is incorrectly aligned down when getting close to
max (Ncb-F) which is not required.
The wireless performance impact is negligeable but still causes a
few LLRs no to be combined at the very end of the circular buffer.

Fixes: 5802f36dd492 ("baseband/acc100: enforce additional check on FCW")
Cc: sta...@dpdk.org

Signed-off-by: Hernan Vargas 
---
  drivers/baseband/acc/rte_acc100_pmd.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/baseband/acc/rte_acc100_pmd.c 
b/drivers/baseband/acc/rte_acc100_pmd.c
index 5362d39c302f..c736f3e4201c 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -1218,7 +1218,7 @@ acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct 
acc_fcw_ld *fcw,
- op->ldpc_dec.n_filler);
  
  		/* Alignment on next 64B - Already enforced from HC output */

-   harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, 
ACC_HARQ_ALIGN_64B);
+   harq_in_length = RTE_ALIGN_CEIL(harq_in_length, 
ACC_HARQ_ALIGN_64B);
  
  		/* Stronger alignment requirement when in decompression mode */

if (fcw->hcin_decomp_mode > 0)


Applied to next-baseband/for-main.

Thanks,
Maxime

How to configure ethernet controller register with the dpdk

[Alireza Sadeghpour]

Hi,
I am trying to force an ethernet controller to UP state in the dpdk
environment. in order to do this I need to set some registers of the
ethernet controller.

is there any way to do this in the dpdk environment?

Re: [PATCH v3 0/5] document and simplify use of cmdline

[David Marchand]

On Wed, Oct 11, 2023 at 3:34 PM Bruce Richardson
 wrote:
>
> The DPDK commandline library is widely used by apps and examples within
> DPDK, but it is not documented in our programmers guide and it requires
> a lot of boilerplate code definitions in order to used. We can improve
> this situation by creating a simple python script to automatically
> generate the boilerplate from a list of commands.
>
> This patchset contains a new documentation chapter on cmdline library,
> going through step-by-step how to add commands and create the necessary
> token lists and parse contexts.
>
> Following that initial doc patch, the set then contains a
> boilerplate-generating script, as well as a set of three patches showing
> its use, by converting three examples to use the script instead of
> having the hard-coded boilerplate. Once the script is used, adding a new
> command becomes as simple as adding the desired command to the .list
> file, and then writing the required function which will be called for
> that command. No other boilerplate coding is necessary.
>
> Script obviously does not cover the full range of capabilities of the
> commandline lib, but does cover the most used parts. The code-saving to
> each of the examples by auto-generating the boilerplate is significant,
> and probably more examples with commandlines can be converted over in
> future.
>
> The "cmdline" example itself, is not converted over, as it should
> probably remain as a simple example of direct library use without the
> script.
>
> V3:
> * Added lots of documentation
> * Added support for help text for each command
> * Cleaned up script a little so it passes pycodestyle and most flake8
>   checks, when line-length is set to max 100.
> * Removed RFC tag, as I consider this patchset stable enough for
>   consideration in a release.
>
> V2-RFC:
> * Add support for IP addresses in commands
> * Move to buildtools directory and make installable
> * Convert 3 examples to use script, and eliminate their boilerplate
>
> Bruce Richardson (5):
>   doc/prog_guide: new chapter on cmdline library
>   buildtools: script to generate cmdline boilerplate
>   examples/simple_mp: auto-generate cmdline boilerplate
>   examples/hotplug_mp: auto-generate cmdline boilerplate
>   examples/bond: auto-generate cmdline boilerplate
>
>  app/test/commands.c   |   2 +
>  buildtools/dpdk-cmdline-gen.py| 167 +++
>  buildtools/meson.build|   7 +
>  doc/guides/prog_guide/cmdline.rst | 466 ++
>  doc/guides/prog_guide/index.rst   |   1 +
>  examples/bond/Makefile|  12 +-
>  examples/bond/commands.list   |   6 +
>  examples/bond/main.c  | 161 +-
>  examples/bond/main.h  |  10 -
>  examples/bond/meson.build |   8 +
>  examples/multi_process/hotplug_mp/Makefile|  12 +-
>  examples/multi_process/hotplug_mp/commands.c  | 147 +-
>  examples/multi_process/hotplug_mp/commands.h  |  10 -
>  .../multi_process/hotplug_mp/commands.list|   5 +
>  examples/multi_process/hotplug_mp/meson.build |   9 +
>  examples/multi_process/simple_mp/Makefile |  12 +-
>  examples/multi_process/simple_mp/meson.build  |   9 +
>  .../multi_process/simple_mp/mp_commands.c | 106 +---
>  .../multi_process/simple_mp/mp_commands.h |  14 -
>  .../multi_process/simple_mp/mp_commands.list  |   3 +
>  20 files changed, 745 insertions(+), 422 deletions(-)

Interesting series.
So if we remove the doc addition, this patch is removing loc, so +1 from me :-).

There is a problem though with externally building the examples.
Maybe the dpdk-cmdline-gen.py has not been exported in the install process.


>  create mode 100755 buildtools/dpdk-cmdline-gen.py
>  create mode 100644 doc/guides/prog_guide/cmdline.rst
>  create mode 100644 examples/bond/commands.list
>  delete mode 100644 examples/bond/main.h
>  delete mode 100644 examples/multi_process/hotplug_mp/commands.h
>  create mode 100644 examples/multi_process/hotplug_mp/commands.list
>  delete mode 100644 examples/multi_process/simple_mp/mp_commands.h
>  create mode 100644 examples/multi_process/simple_mp/mp_commands.list
>
> --
> 2.39.2
>


-- 
David Marchand

Re: [PATCH] vdpa/mlx5: fix unregister kick handler order

[Maxime Coquelin]

On 8/8/23 13:32, Yajun Wu wrote:

The mlx5_vdpa_virtq_kick_handler function may still be running and waiting
on virtq->virtq_lock while mlx5_vdpa_cqe_event_unset function is trying to
re-initialize the virtq->virtq_lock.

This causes mlx5_vdpa_virtq_kick_handler thread can't be wake up and can't
be unregister. Following print may loop forever when calling
rte_vhost_driver_unregister(socket_path):

 mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt
 mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt
 ...

The fix is to move mlx5_vdpa_virtq_unregister_intr_handle before
mlx5_vdpa_cqe_event_unset.

Fixes: 057f7d2084 ("vdpa/mlx5: optimize datapath-control synchronization")
Cc: sta...@dpdk.org

Signed-off-by: Yajun Wu 
Acked-by: Matan Azrad 
---
  drivers/vdpa/mlx5/mlx5_vdpa.c | 1 +
  drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index f1737f82a8..8b1de8bd62 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -282,6 +282,7 @@ _internal_mlx5_vdpa_dev_close(struct mlx5_vdpa_priv *priv,
int ret = 0;
int vid = priv->vid;
  
+	mlx5_vdpa_virtq_unreg_intr_handle_all(priv);

mlx5_vdpa_cqe_event_unset(priv);
if (priv->state == MLX5_VDPA_STATE_CONFIGURED) {
ret |= mlx5_vdpa_lm_log(priv);
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c 
b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
index 6e6624e5a3..1d84e422d4 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
@@ -190,7 +190,6 @@ mlx5_vdpa_c_thread_handle(void *arg)
pthread_mutex_unlock(&virtq->virtq_lock);
break;
case MLX5_VDPA_TASK_DEV_CLOSE_NOWAIT:
-   mlx5_vdpa_virtq_unreg_intr_handle_all(priv);
pthread_mutex_lock(&priv->steer_update_lock);
mlx5_vdpa_steer_unset(priv);
pthread_mutex_unlock(&priv->steer_update_lock);


Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [PATCH v3 0/5] document and simplify use of cmdline

[Bruce Richardson]

On Thu, Oct 12, 2023 at 03:21:08PM +0200, David Marchand wrote:
> On Wed, Oct 11, 2023 at 3:34 PM Bruce Richardson
>  wrote:
> >
> > The DPDK commandline library is widely used by apps and examples within
> > DPDK, but it is not documented in our programmers guide and it requires
> > a lot of boilerplate code definitions in order to used. We can improve
> > this situation by creating a simple python script to automatically
> > generate the boilerplate from a list of commands.
> >
> > This patchset contains a new documentation chapter on cmdline library,
> > going through step-by-step how to add commands and create the necessary
> > token lists and parse contexts.
> >
> > Following that initial doc patch, the set then contains a
> > boilerplate-generating script, as well as a set of three patches showing
> > its use, by converting three examples to use the script instead of
> > having the hard-coded boilerplate. Once the script is used, adding a new
> > command becomes as simple as adding the desired command to the .list
> > file, and then writing the required function which will be called for
> > that command. No other boilerplate coding is necessary.
> >
> > Script obviously does not cover the full range of capabilities of the
> > commandline lib, but does cover the most used parts. The code-saving to
> > each of the examples by auto-generating the boilerplate is significant,
> > and probably more examples with commandlines can be converted over in
> > future.
> >
> > The "cmdline" example itself, is not converted over, as it should
> > probably remain as a simple example of direct library use without the
> > script.
> >
> > V3:
> > * Added lots of documentation
> > * Added support for help text for each command
> > * Cleaned up script a little so it passes pycodestyle and most flake8
> >   checks, when line-length is set to max 100.
> > * Removed RFC tag, as I consider this patchset stable enough for
> >   consideration in a release.
> >
> > V2-RFC:
> > * Add support for IP addresses in commands
> > * Move to buildtools directory and make installable
> > * Convert 3 examples to use script, and eliminate their boilerplate
> >
> > Bruce Richardson (5):
> >   doc/prog_guide: new chapter on cmdline library
> >   buildtools: script to generate cmdline boilerplate
> >   examples/simple_mp: auto-generate cmdline boilerplate
> >   examples/hotplug_mp: auto-generate cmdline boilerplate
> >   examples/bond: auto-generate cmdline boilerplate
> >
> >  app/test/commands.c   |   2 +
> >  buildtools/dpdk-cmdline-gen.py| 167 +++
> >  buildtools/meson.build|   7 +
> >  doc/guides/prog_guide/cmdline.rst | 466 ++
> >  doc/guides/prog_guide/index.rst   |   1 +
> >  examples/bond/Makefile|  12 +-
> >  examples/bond/commands.list   |   6 +
> >  examples/bond/main.c  | 161 +-
> >  examples/bond/main.h  |  10 -
> >  examples/bond/meson.build |   8 +
> >  examples/multi_process/hotplug_mp/Makefile|  12 +-
> >  examples/multi_process/hotplug_mp/commands.c  | 147 +-
> >  examples/multi_process/hotplug_mp/commands.h  |  10 -
> >  .../multi_process/hotplug_mp/commands.list|   5 +
> >  examples/multi_process/hotplug_mp/meson.build |   9 +
> >  examples/multi_process/simple_mp/Makefile |  12 +-
> >  examples/multi_process/simple_mp/meson.build  |   9 +
> >  .../multi_process/simple_mp/mp_commands.c | 106 +---
> >  .../multi_process/simple_mp/mp_commands.h |  14 -
> >  .../multi_process/simple_mp/mp_commands.list  |   3 +
> >  20 files changed, 745 insertions(+), 422 deletions(-)
> 
> Interesting series.
> So if we remove the doc addition, this patch is removing loc, so +1 from me 
> :-).
> 
> There is a problem though with externally building the examples.
> Maybe the dpdk-cmdline-gen.py has not been exported in the install process.
> 
It has, but it's not visible to the external builds in github actions. The
following one-line fix should correct that, I believe.
I was testing it in my own github yesterday, but never sent a v4 series.

/Bruce

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index e0b62bac90..3db9d9de6e 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -174,6 +174,7 @@ fi
 if [ "$BUILD_EXAMPLES" = "true" ]; then
 [ -d install ] || DESTDIR=$(pwd)/install meson install -C build
 export LD_LIBRARY_PATH=$(dirname $(find $(pwd)/install -name 
librte_eal.so)):$LD_LIBRARY_PATH
+export PATH=$(dirname $(find $(pwd)/install -name dpdk-devbind.py)):$PATH
 export PKG_CONFIG_PATH=$(dirname $(find $(pwd)/install -name 
libdpdk.pc)):$PKG_CONFIG_PATH
 export PKGCONF="pkg-config --define-prefix"
 find build/examples -maxdepth 1 -type f -name "dpdk-*" |

Re: [PATCH] net/vhost: report TX errors in port stats

[Maxime Coquelin]

On 9/30/23 03:00, Andrey Ignatov wrote:

vhost device doesn't report TX errors what complicates debugging of
dropped packets. Add oerrors to port stats.

- before (testpmd `show port stats`):
   TX-packets: 18328512   TX-errors: 0  TX-bytes:  1173024768

- after:
   TX-packets: 1737728TX-errors: 131367616  TX-bytes:  111214592

Signed-off-by: Andrey Ignatov 
---
  drivers/net/vhost/rte_eth_vhost.c | 4 
  1 file changed, 4 insertions(+)

diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index 8d37ec9775..48a9a79efe 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1299,6 +1299,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct 
rte_eth_stats *stats)
unsigned i;
unsigned long rx_total = 0, tx_total = 0;
unsigned long rx_total_bytes = 0, tx_total_bytes = 0;
+   unsigned long tx_total_errors = 0;
struct vhost_queue *vq;
  
  	for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&

@@ -1323,12 +1324,15 @@ eth_stats_get(struct rte_eth_dev *dev, struct 
rte_eth_stats *stats)
  
  		stats->q_obytes[i] = vq->stats.bytes;

tx_total_bytes += stats->q_obytes[i];
+
+   tx_total_errors += vq->stats.missed_pkts;
}
  
  	stats->ipackets = rx_total;

stats->opackets = tx_total;
stats->ibytes = rx_total_bytes;
stats->obytes = tx_total_bytes;
+   stats->oerrors = tx_total_errors;
  
  	return 0;

  }


Applied to nex-virtio/for-next-net.

Thanks,
Maxime

Re: [PATCH v3] vhost: add IRQ suppression

[Maxime Coquelin]

On 9/29/23 12:38, Maxime Coquelin wrote:

Guest notifications offloading, which has been introduced
in v23.07, aims at offloading syscalls out of the datapath.

This patch optimizes the offloading by not offloading the
guest notification for a given virtqueue if one is already
being offloaded by the application.

With a single VDUSE device, we can already see few
notifications being suppressed when doing throughput
testing with Iperf3. We can expect to see much more being
suppressed when the offloading thread is under pressure.

Signed-off-by: Maxime Coquelin 
---

v3: s/0/false/ (David)

  lib/vhost/vhost.c |  4 
  lib/vhost/vhost.h | 27 +--
  2 files changed, 25 insertions(+), 6 deletions(-)


Applied to nex-virtio/for-next-net.

Thanks,
Maxime

Re: [PATCH] net/virtio: fix descriptors buffer addresses on 32 bits builds

[Maxime Coquelin]

On 9/20/23 15:01, Maxime Coquelin wrote:

With Virtio-user, the Virtio descriptor buffer address is the
virtual address of the mbuf's buffer. On 32 bits builds, it is
expected to be 32 bits.

With Virtio-PCI, the Virtio descriptor buffer address is the
physical address of the mbuf's buffer. On 32 bits builds running
on 64 bits kernel, it is expected to be up to 64 bits.

This patch introduces a new mask field in virtqueue's struct to
filter our the upper 4 bytes of the address only when necessary.
An optimization is introduced for 64 bits builds to remove the
masking, as the address is always 64 bits wide.

Fixes: ba55c94a7ebc ("net/virtio: revert forcing IOVA as VA mode for 
virtio-user")
Cc: sta...@dpdk.org

Reported-by: Sampath Peechu 
Signed-off-by: Maxime Coquelin 
---
  drivers/net/virtio/virtqueue.c |  2 ++
  drivers/net/virtio/virtqueue.h | 18 ++
  2 files changed, 16 insertions(+), 4 deletions(-)



Applied to nex-virtio/for-next-net.

Thanks,
Maxime

Re: [PATCH] vdpa/mlx5: fix unregister kick handler order

[Maxime Coquelin]

On 8/8/23 13:32, Yajun Wu wrote:

The mlx5_vdpa_virtq_kick_handler function may still be running and waiting
on virtq->virtq_lock while mlx5_vdpa_cqe_event_unset function is trying to
re-initialize the virtq->virtq_lock.

This causes mlx5_vdpa_virtq_kick_handler thread can't be wake up and can't
be unregister. Following print may loop forever when calling
rte_vhost_driver_unregister(socket_path):

 mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt
 mlx5_vdpa: Try again to unregister fd 154 of virtq 11 interrupt
 ...

The fix is to move mlx5_vdpa_virtq_unregister_intr_handle before
mlx5_vdpa_cqe_event_unset.

Fixes: 057f7d2084 ("vdpa/mlx5: optimize datapath-control synchronization")
Cc: sta...@dpdk.org

Signed-off-by: Yajun Wu 
Acked-by: Matan Azrad 
---
  drivers/vdpa/mlx5/mlx5_vdpa.c | 1 +
  drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)



Applied to nex-virtio/for-next-net.

Thanks,
Maxime

Re: [PATCH v3 0/5] document and simplify use of cmdline

[Bruce Richardson]

On Thu, Oct 12, 2023 at 03:21:08PM +0200, David Marchand wrote:
> On Wed, Oct 11, 2023 at 3:34 PM Bruce Richardson
>  wrote:
> >
> > The DPDK commandline library is widely used by apps and examples within
> > DPDK, but it is not documented in our programmers guide and it requires
> > a lot of boilerplate code definitions in order to used. We can improve
> > this situation by creating a simple python script to automatically
> > generate the boilerplate from a list of commands.
> >
> > This patchset contains a new documentation chapter on cmdline library,
> > going through step-by-step how to add commands and create the necessary
> > token lists and parse contexts.
> >
> > Following that initial doc patch, the set then contains a
> > boilerplate-generating script, as well as a set of three patches showing
> > its use, by converting three examples to use the script instead of
> > having the hard-coded boilerplate. Once the script is used, adding a new
> > command becomes as simple as adding the desired command to the .list
> > file, and then writing the required function which will be called for
> > that command. No other boilerplate coding is necessary.
> >
> > Script obviously does not cover the full range of capabilities of the
> > commandline lib, but does cover the most used parts. The code-saving to
> > each of the examples by auto-generating the boilerplate is significant,
> > and probably more examples with commandlines can be converted over in
> > future.
> >
> > The "cmdline" example itself, is not converted over, as it should
> > probably remain as a simple example of direct library use without the
> > script.
> >
> > V3:
> > * Added lots of documentation
> > * Added support for help text for each command
> > * Cleaned up script a little so it passes pycodestyle and most flake8
> >   checks, when line-length is set to max 100.
> > * Removed RFC tag, as I consider this patchset stable enough for
> >   consideration in a release.
> >
> > V2-RFC:
> > * Add support for IP addresses in commands
> > * Move to buildtools directory and make installable
> > * Convert 3 examples to use script, and eliminate their boilerplate
> >
> > Bruce Richardson (5):
> >   doc/prog_guide: new chapter on cmdline library
> >   buildtools: script to generate cmdline boilerplate
> >   examples/simple_mp: auto-generate cmdline boilerplate
> >   examples/hotplug_mp: auto-generate cmdline boilerplate
> >   examples/bond: auto-generate cmdline boilerplate
> >
> >  app/test/commands.c   |   2 +
> >  buildtools/dpdk-cmdline-gen.py| 167 +++
> >  buildtools/meson.build|   7 +
> >  doc/guides/prog_guide/cmdline.rst | 466 ++
> >  doc/guides/prog_guide/index.rst   |   1 +
> >  examples/bond/Makefile|  12 +-
> >  examples/bond/commands.list   |   6 +
> >  examples/bond/main.c  | 161 +-
> >  examples/bond/main.h  |  10 -
> >  examples/bond/meson.build |   8 +
> >  examples/multi_process/hotplug_mp/Makefile|  12 +-
> >  examples/multi_process/hotplug_mp/commands.c  | 147 +-
> >  examples/multi_process/hotplug_mp/commands.h  |  10 -
> >  .../multi_process/hotplug_mp/commands.list|   5 +
> >  examples/multi_process/hotplug_mp/meson.build |   9 +
> >  examples/multi_process/simple_mp/Makefile |  12 +-
> >  examples/multi_process/simple_mp/meson.build  |   9 +
> >  .../multi_process/simple_mp/mp_commands.c | 106 +---
> >  .../multi_process/simple_mp/mp_commands.h |  14 -
> >  .../multi_process/simple_mp/mp_commands.list  |   3 +
> >  20 files changed, 745 insertions(+), 422 deletions(-)
> 
> Interesting series.
> So if we remove the doc addition, this patch is removing loc, so +1 from me 
> :-).
> 
There's probably lots more LOC that can be removed beyond this, if we put
in a bit of effort looking. I just took three simple examples, and managed
to save ~100LOC each.

However, the big benefit I find is for anyone working on new apps - using a
script makes it S  much easier to add a commandline and then
subsequently to extend with new commands as you go! Just add the new command to
the list file, and write the new callback function and you're done.

Since cmdline library is not going to be going anywhere, anytime soon,
since it's so integrated into testpmd and dpdk-test, we might as well make
it useful for others.

/Bruce

Re: [PATCH] app/bbdev: fix link with NXP LA12XX

[Maxime Coquelin]

On 9/13/23 15:58, David Marchand wrote:

The LA12XX driver was not linked to the dpdk-test-bbdev tool because of
what looks like a rebase issue.

Fixes: 2b504721bfda ("app/bbdev: enable la12xx")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
---
  app/test-bbdev/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index cd6a5089d5..926e0a5271 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -23,6 +23,6 @@ endif
  if dpdk_conf.has('RTE_BASEBAND_ACC')
  deps += ['baseband_acc']
  endif
-if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_LA12XX')
+if dpdk_conf.has('RTE_BASEBAND_LA12XX')
  deps += ['baseband_la12xx']
  endif


Applied to next-baseband/for-main.

Thanks,
Maxime

Re: [PATCH v2] net/virtio: fixed missing next flag when sending packets in packed mode

[Maxime Coquelin]

Hi,

On 10/10/23 09:12, Maxime Coquelin wrote:

Hi,

Thanks for investigating the issue and proposing a fix!

On 10/10/23 04:08, liufengjiang.0426 wrote:

When the packets is sent in packed mode, and the packets data and
virtio-header are divided into two desc, set the next flag of
virtio-header desc


Fix the warning that a single line of commit log exceeds 75 chars


The changelog should not be part of the commit message.



Bugzilla ID: 1295
Fixes: 892dc798fa9c ("net/virtio: implement Tx path for packed queues")

Signed-off-by: liufengjiang.0426 


Could you please sign-off with your full name?


Gentle reminder. No need to resubmit, just reply here with your full
name.

Thanks!
Maxime





---


The changelog should be placed here.


  drivers/net/virtio/virtqueue.h | 1 +
  1 file changed, 1 insertion(+)

diff --git a/drivers/net/virtio/virtqueue.h 
b/drivers/net/virtio/virtqueue.h

index 9d4aba11a3..4e9f2d0358 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -672,6 +672,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx 
*txvq, struct rte_mbuf *cookie,

   */
  start_dp[idx].addr = txvq->hdr_mem + 
RTE_PTR_DIFF(&txr[idx].tx_hdr, txr);

  start_dp[idx].len = vq->hw->vtnet_hdr_size;
+    head_flags |= VRING_DESC_F_NEXT;
  hdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr;
  idx++;
  if (idx >= vq->vq_nentries) {


Otherwise, the fix look good to me.
With above small changes, it will be good for me.

Thanks,
Maxime

Re: [PATCH v3 1/2] doc: add modify_field action description

[Ferruh Yigit]

On 10/11/2023 12:30 PM, Suanming Mou wrote:
> This commit adds the missing modify_field action description to
> `testpmd_funcs.rst`.
> 
> Signed-off-by: Suanming Mou 
> 

For series,
Acked-by: Ferruh Yigit 


Series applied to dpdk-next-net/main, thanks.

Re: [PATCH] net/nfp: fix the initialization of physical representors

[Ferruh Yigit]

On 10/10/2023 7:03 AM, Chaoyong He wrote:
> From: Zerun Fu 
> 
> The former logic of initializing the array of physical port
> representors is according to 'nfp_idx', but referencing based
> on 'port_id'. This is a potential bug and will cause segment
> fault when these two values are not equal. Fix it by using the
> 'port_id' as index at all time.
> 
> Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework")
> Cc: chaoyong...@corigine.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Zerun Fu 
> Reviewed-by: Long Wu 
> Reviewed-by: Peng Zhang 
> Reviewed-by: Chaoyong He 
> 

Applied to dpdk-next-net/main, thanks.

[Bug 1298] memif disconnect thread vs. rx_burst worker thread(s) crash

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1298

Bug ID: 1298
   Summary: memif disconnect thread vs. rx_burst worker thread(s)
crash
   Product: DPDK
   Version: 21.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: bly...@gmail.com
  Target Milestone: ---

Hello,

We have run into a timing issue between threads when using the memif interface
type and need some guidance.

Our application has a DPDK based process operating (among other things) a memif
server interface. The problem is exposed when this memif interface receives a
memif.disconnect message from the remote client, while in the middle of an
rte_eth_rx_burst() on this same memif interface. As the IRQ message handling is
on its own thread as compared to the DPDK worker thread doing the rx_burst,
this resulted in a crash. The backtraces for which have been shared below.

How does one ensure there are guard rails in place to gracefully exit the
rx-burst when a disconnect occurs? Or, how do we properly modify the code such
that  we defer responding to the disconnect CB after the rx-burst operation has
completed?

We are utilizing DPDK 21.11.2. I have diff’d dpdks-stable:22.11.3 in
./drivers/net/memif, but I do not see anything obvious that would address this.
I did a similar diff for dpdk:23.07, but do not see anything obvious there
either.

-Mike

(gdb) thread 1
[Switching to thread 1 (Thread 0x7f17e2813600 (LWP 470))]
#0  0x7f17e374d225 in eth_memif_rx (queue=0x1189023b00,
bufs=0x7f17e28100e8, nb_pkts=32) at
../git/drivers/net/memif/rte_eth_memif.c:338
338 last_slot = __atomic_load_n(&ring->head,
__ATOMIC_ACQUIRE);
(gdb) bt
#0  0x7f17e374d225 in eth_memif_rx (queue=0x1189023b00,
bufs=0x7f17e28100e8, nb_pkts=32) at
../git/drivers/net/memif/rte_eth_memif.c:338
#1  0x0047e6fb in rte_eth_rx_burst (nb_pkts=32, rx_pkts=0x7f17e28100e8,
queue_id=0, port_id=) at /usr/include/rte_ethdev.h:5368
#2  pmd_main_loop () at ../git/swfw/api/src/swfwPmd.c:1086
#3  0x0047f309 in pmd_launch_one_lcore (dummy=) at
../git/my_process.c:1157
#4  0x7f17f7070e7c in eal_thread_loop (arg=) at
../git/lib/eal/linux/eal_thread.c:146
#5  0x7f17f4c3da72 in start_thread (arg=) at
pthread_create.c:442
#6  0x7f17f4cbf930 in clone3 () at
../sysdeps/unix/sysv/linux/x86_64/clone3.S:81
(gdb) l
333 ring_size = 1 << mq->log2_ring_size;
334 mask = ring_size - 1;
335
336 if (type == MEMIF_RING_C2S) {
337 cur_slot = mq->last_head;
338 last_slot = __atomic_load_n(&ring->head,
__ATOMIC_ACQUIRE);
339 } else {
340 cur_slot = mq->last_tail;
341 last_slot = __atomic_load_n(&ring->tail,
__ATOMIC_ACQUIRE);
342 }
(gdb) p ring->head
Cannot access memory at address 0x7f17d8e58006

(gdb) thread 19
[Switching to thread 19 (Thread 0x7f17f0804600 (LWP 468))]
#0  0x7f17f4caf97b in __GI___close (fd=494) at
../sysdeps/unix/sysv/linux/close.c:27
27return SYSCALL_CANCEL (close, fd);
(gdb) bt
#0  0x7f17f4caf97b in __GI___close (fd=494) at
../sysdeps/unix/sysv/linux/close.c:27
#1  0x7f17e374f01f in memif_free_regions (dev=dev@entry=0x7f17f727f000
) at ../git/drivers/net/memif/rte_eth_memif.c:882
#2  0x7f17e37475d0 in memif_disconnect (dev=0x7f17f727f000
) at ../git/drivers/net/memif/memif_socket.c:623
#3  0x7f17f7091bd2 in eal_intr_process_interrupts (nfds=,
events=) at ../git/lib/eal/linux/eal_interrupts.c:1026
#4  eal_intr_handle_interrupts (totalfds=, pfd=20) at
../git/lib/eal/linux/eal_interrupts.c:1100
#5  eal_intr_thread_main (arg=) at
../git/lib/eal/linux/eal_interrupts.c:1172
#6  0x7f17f4c3da72 in start_thread (arg=) at
pthread_create.c:442
#7  0x7f17f4cbf930 in clone3 () at
../sysdeps/unix/sysv/linux/x86_64/clone3.S:81

-- 
You are receiving this mail because:
You are the assignee for the bug.

[PATCH v2 1/3] examples/l3fwd: relax RSS requirement with option

[Trevor Tao]

Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS
by default, but some hw and/or virtual interface does not
support the RSS and offload mode presupposed, e.g., some
virtio interfaces in the cloud don't support
RSS and the error msg may like:

virtio_dev_configure(): RSS support requested but not supported by
the device
Port0 dev_configure = -95

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.

An option named "relax-rx-mode" is added to enable the relax action
here, and it's disabled by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/main.c | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 6063eb1399..36a2a77756 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -73,6 +73,7 @@ static enum L3FWD_LOOKUP_MODE lookup_mode;
 static int numa_on = 1; /**< NUMA is enabled by default. */
 static int parse_ptype; /**< Parse packet type using rx callback, and */
/**< disabled by default */
+static int relax_rx_mode; /**< Relax RX mode is disabled by default */
 static int per_port_pool; /**< Use separate buffer pools per port; disabled */
  /**< by default */
 
@@ -678,6 +679,7 @@ static const char short_options[] =
 #define CMD_LINE_OPT_MAX_PKT_LEN "max-pkt-len"
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
 #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+#define CMD_LINE_OPT_RELAX_RX_MODE "relax-rx-mode"
 #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
 #define CMD_LINE_OPT_MODE "mode"
 #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
@@ -705,6 +707,7 @@ enum {
CMD_LINE_OPT_MAX_PKT_LEN_NUM,
CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
CMD_LINE_OPT_PARSE_PTYPE_NUM,
+   CMD_LINE_OPT_RELAX_RX_MODE_NUM,
CMD_LINE_OPT_RULE_IPV4_NUM,
CMD_LINE_OPT_RULE_IPV6_NUM,
CMD_LINE_OPT_ALG_NUM,
@@ -728,6 +731,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, CMD_LINE_OPT_MAX_PKT_LEN_NUM},
{CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
{CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
+   {CMD_LINE_OPT_RELAX_RX_MODE, 0, 0, CMD_LINE_OPT_RELAX_RX_MODE_NUM},
{CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
{CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
@@ -853,6 +857,11 @@ parse_args(int argc, char **argv)
parse_ptype = 1;
break;
 
+   case CMD_LINE_OPT_RELAX_RX_MODE_NUM:
+   printf("Relax rx mode is enabled\n");
+   relax_rx_mode = 1;
+   break;
+
case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
printf("per port buffer pool is enabled\n");
per_port_pool = 1;
@@ -1257,8 +1266,16 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;
 
-   if (dev_info.max_rx_queues == 1)
+   if (dev_info.max_rx_queues == 1) {
local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
+   }
+
+   /* relax the rx rss requirement */
+   if (relax_rx_mode && 
!local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("warning: modified the rx mq_mode to 
RTE_ETH_MQ_RX_NONE base on"
+   " device capability\n");
+   local_port_conf.rxmode.mq_mode = 
RTE_ETH_MQ_RX_NONE;
+   }
 
if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
port_conf.rx_adv_conf.rss_conf.rss_hf) {
-- 
2.34.1

[PATCH v2 3/3] doc: add a relax rx mode requirement option

[Trevor Tao]

Add an option to enable the RX mode requirement relax
in release notes and l3fwd sample guide.

Signed-off-by: Trevor Tao 
---
 doc/guides/rel_notes/release_23_11.rst  | 2 ++
 doc/guides/sample_app_ug/l3_forward.rst | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rst
index f09ecd50fe..2f9e4a54c8 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -84,6 +84,8 @@ New Features
   default. The implementation using C11 standard atomic operations is enabled
   via the ``enable_stdatomic`` build option.
 
+* sample: Added a command option ``--relax-rx-mode`` in l3fwd example
+  to relax the rx RSS/Offload mode requirement if needed.
 
 Removed Items
 -
diff --git a/doc/guides/sample_app_ug/l3_forward.rst 
b/doc/guides/sample_app_ug/l3_forward.rst
index 1cc2c1dd1d..00283f070c 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -126,6 +126,8 @@ Where,
 
 * ``--parse-ptype:`` Optional, set to use software to analyze packet type. 
Without this option, hardware will check the packet type.
 
+* ``--relax-rx-mode:`` Optional, set to enable rx mode relax when RSS/offload 
is not fully supported by the hardware. When the IPv4 cksum offload is relaxed, 
it is calculated by the software instead. Without this option, the RSS and 
cksum offload will be forced.
+
 * ``--per-port-pool:`` Optional, set to use independent buffer pools per port. 
Without this option, single buffer pool is used for all ports.
 
 * ``--mode:`` Optional, Packet transfer mode for I/O, poll or eventdev.
@@ -140,7 +142,7 @@ Where,
 
 * ``--event-vector-tmo:`` Optional, Max timeout to form vector in nanoseconds 
if event vectorization is enabled.
 
-* ``--alg=:`` optional, ACL classify method to use, one of:
+* ``--alg=:`` Optional, ACL classify method to use, one of:
   ``scalar|sse|avx2|neon|altivec|avx512x16|avx512x32``
 
 * ``-E:`` Optional, enable exact match,
-- 
2.34.1

[PATCH v2 2/3] examples/l3fwd: relax the Offload requirement

[Trevor Tao]

Now the port Rx offload mode is set to RTE_ETH_RX_OFFLOAD_CHECKSUM
by default, but some hw and/or virtual interface does not support
the offload mode presupposed, e.g., some virtio interfaces in
the cloud may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/
RTE_ETH_RX_OFFLOAD_TCP_CKSUM,
but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:

Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads
capabilities 0x201d in rte_eth_dev_configure()

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.
A warning msg would be provided to user in case it happens here.

On the other side, enabling the software cksum check in case missing the
hw support.

The relax action for rx cksum offload is just enabled when relax_rx_mode is
true which is false by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/l3fwd.h | 12 ++--
 examples/l3fwd/l3fwd_em.h  |  2 +-
 examples/l3fwd/l3fwd_lpm.h |  2 +-
 examples/l3fwd/main.c  | 14 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index b55855c932..fd98ad3373 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -159,7 +159,7 @@ send_single_packet(struct lcore_conf *qconf,
 
 #ifdef DO_RFC_1812_CHECKS
 static inline int
-is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len, uint64_t 
ol_flags)
 {
/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
/*
@@ -170,7 +170,15 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t 
link_len)
return -1;
 
/* 2. The IP checksum must be correct. */
-   /* this is checked in H/W */
+   /* if this is not checked in H/W, check it. */
+   if ((ol_flags & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) == 0) {
+   uint16_t actual_cksum, expected_cksum;
+   actual_cksum = pkt->hdr_checksum;
+   pkt->hdr_checksum = 0;
+   expected_cksum = rte_ipv4_cksum(pkt);
+   if (actual_cksum != expected_cksum)
+   return -2;
+   }
 
/*
 * 3. The IP version number must be 4. If the version number is not 4
diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
index 7d051fc076..1fee2e2e6c 100644
--- a/examples/l3fwd/l3fwd_em.h
+++ b/examples/l3fwd/l3fwd_em.h
@@ -20,7 +20,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return BAD_PORT;
}
diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
index c61b969584..55b82a29bb 100644
--- a/examples/l3fwd/l3fwd_lpm.h
+++ b/examples/l3fwd/l3fwd_lpm.h
@@ -22,7 +22,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len), m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return;
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 36a2a77756..5f378ed812 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1286,6 +1286,20 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}
 
+   /* relax the rx offload requirement */
+   if ((local_port_conf.rxmode.offloads & 
dev_info.rx_offload_capa) !=
+   local_port_conf.rxmode.offloads) {
+   printf("Port %u requested Rx offloads 0x%"PRIx64" does 
not"
+   " match Rx offloads capabilities 0x%"PRIx64"\n",
+   portid, local_port_conf.rxmode.offloads,
+   dev_info.rx_offload_capa);
+   if (relax_rx_mode) {
+   local_port_conf.rxmode.offloads &= 
dev_info.rx_offload_capa;
+   printf("warning: modified the rx offload to 
0x%"PRIx64" based on device"
+   " capability\n", 
local_port_conf.rxmode.offloads);
+   }
+   }
+
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &local_port_conf);
if (ret < 0)
-- 
2.34.1

Re:Re: [PATCH v1 2/3] examples/l3fwd: relax the Offload requirement

[taozj888]

Hi Konstantin:
For your comments, please see my answer inline.
Thanks.




Trevor Tao

At 2023-10-09 17:03:11, "Konstantin Ananyev"  
wrote:
>02.10.2023 09:53, Trevor Tao пишет:
>> Now the port Rx offload mode is set to RTE_ETH_RX_OFFLOAD_CHECKSUM
>> by default, but some hw and/or virtual interface does not support
>> the offload mode presupposed, e.g., some virtio interfaces in
>> the cloud may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/
>> RTE_ETH_RX_OFFLOAD_TCP_CKSUM,
>> but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:
>> 
>> Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads
>> capabilities 0x201d in rte_eth_dev_configure()
>> 
>> So to enable the l3fwd running in that environment, the Rx mode requirement
>> can be relaxed to reflect the hardware feature reality here, and the l3fwd
>> can run smoothly then.
>> A warning msg would be provided to user in case it happens here.
>> 
>> On the other side, enabling the software cksum check in case missing the
>> hw support.
>> 
>> The relax action for rx cksum offload is just enabled when relax_rx_mode is
>> true which is false by default.
>> 
>> Signed-off-by: Trevor Tao 
>> ---
>>   examples/l3fwd/l3fwd.h | 12 ++--
>>   examples/l3fwd/l3fwd_em.h  |  2 +-
>>   examples/l3fwd/l3fwd_lpm.h |  2 +-
>>   examples/l3fwd/main.c  | 14 ++
>>   4 files changed, 26 insertions(+), 4 deletions(-)
>> 
>> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
>> index b55855c932..fd98ad3373 100644
>> --- a/examples/l3fwd/l3fwd.h
>> +++ b/examples/l3fwd/l3fwd.h
>> @@ -159,7 +159,7 @@ send_single_packet(struct lcore_conf *qconf,
>>   
>>   #ifdef DO_RFC_1812_CHECKS
>>   static inline int
>> -is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
>> +is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len, uint64_t 
>> ol_flags)
>>   {
>>  /* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
>>  /*
>> @@ -170,7 +170,15 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t 
>> link_len)
>>  return -1;
>>   
>>  /* 2. The IP checksum must be correct. */
>> -/* this is checked in H/W */
>> +/* if this is not checked in H/W, check it. */
>> +if ((ol_flags & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) == 0) {
>> +uint16_t actual_cksum, expected_cksum;
>> +actual_cksum = pkt->hdr_checksum;
>> +pkt->hdr_checksum = 0;
>> +expected_cksum = rte_ipv4_cksum(pkt);
>> +if (actual_cksum != expected_cksum)
>> +return -2;
>> +}
>>   
>>  /*
>>   * 3. The IP version number must be 4. If the version number is not 4
>> diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
>> index 7d051fc076..1fee2e2e6c 100644
>> --- a/examples/l3fwd/l3fwd_em.h
>> +++ b/examples/l3fwd/l3fwd_em.h
>> @@ -20,7 +20,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid,
>>   
>>   #ifdef DO_RFC_1812_CHECKS
>>  /* Check to make sure the packet is valid (RFC1812) */
>> -if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
>> +if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
>>  rte_pktmbuf_free(m);
>>  return BAD_PORT;
>>  }
>> diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
>> index c61b969584..5ddae7da0f 100644
>> --- a/examples/l3fwd/l3fwd_lpm.h
>> +++ b/examples/l3fwd/l3fwd_lpm.h
>> @@ -22,7 +22,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t 
>> portid,
>>   
>>   #ifdef DO_RFC_1812_CHECKS
>>  /* Check to make sure the packet is valid (RFC1812) */
>> -if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
>> +if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0, m->ol_flags) {
>

>Typo, pls fix.


>OK, I will fix it. Thanks.
>
>>  rte_pktmbuf_free(m);
>>  return;
>>  }
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index 2c8f528d00..a48ae7f62b 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -1284,6 +1284,20 @@ l3fwd_poll_resource_setup(void)
>>  local_port_conf.rx_adv_conf.rss_conf.rss_hf);
>>  }
>>   
>> +/* relax the rx offload requirement */
>> +if ((local_port_conf.rxmode.offloads & 
>> dev_info.rx_offload_capa) !=
>> +local_port_conf.rxmode.offloads) {
>
>
>Ok, but we relax only IP cksum.
>Though l3fwd tries to enable IP/TCP/UDP cksum.

>What if TCP/UDP is not supported, should we allow it or fail?


>I think the l3fwd just check the packet at the IP layer, and the TCP/UDP 
>should not bother us here, so I think it can be allowed to relax them if they 
>are not supported. 
What do think about it?
Thanks.




>
>
>> +printf("Port %u requested Rx offloads 0x%"PRIx64" does 
>> not"
>> +" match Rx offloads capabilities 0x%"PRIx64"\n",
>> + 

Re:Re: [PATCH v1 1/3] examples/l3fwd: relax RSS requirement with option

[taozj888]

Hi Konstantin:


For your comments, please see my answers inline.
Thanks.


Trevor Tao

At 2023-10-09 16:43:01, "Konstantin Ananyev"  
wrote:
>Hi Trevor,
>
>> Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS
>> by default, but some hw and/or virtual interface does not
>> support the RSS and offload mode presupposed, e.g., some
>> virtio interfaces in the cloud don't support
>> RSS and the error msg may like:
>> 
>> virtio_dev_configure(): RSS support requested but not supported by
>> the device
>> Port0 dev_configure = -95
>> 
>> So to enable the l3fwd running in that environment, the Rx mode requirement
>> can be relaxed to reflect the hardware feature reality here, and the l3fwd
>> can run smoothly then.
>> 
>> An option named "relax-rx-mode" is added to enable the relax action
>> here, and it's disabled by default.
>> 
>> Signed-off-by: Trevor Tao 
>> ---
>>   examples/l3fwd/main.c | 19 +--
>>   1 file changed, 17 insertions(+), 2 deletions(-)
>> 
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index 6063eb1399..2c8f528d00 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -73,6 +73,7 @@ static enum L3FWD_LOOKUP_MODE lookup_mode;
>>   static int numa_on = 1; /**< NUMA is enabled by default. */
>>   static int parse_ptype; /**< Parse packet type using rx callback, and */
>>  /**< disabled by default */
>> +static int relax_rx_mode; /**< Relax RX mode is disabled by default */
>>   static int per_port_pool; /**< Use separate buffer pools per port; 
>> disabled */
>>/**< by default */
>>   
>> @@ -678,6 +679,7 @@ static const char short_options[] =
>>   #define CMD_LINE_OPT_MAX_PKT_LEN "max-pkt-len"
>>   #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
>>   #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
>> +#define CMD_LINE_OPT_RELAX_RX_MODE "relax-rx-mode"
>>   #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
>>   #define CMD_LINE_OPT_MODE "mode"
>>   #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
>> @@ -705,6 +707,7 @@ enum {
>>  CMD_LINE_OPT_MAX_PKT_LEN_NUM,
>>  CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
>>  CMD_LINE_OPT_PARSE_PTYPE_NUM,
>> +CMD_LINE_OPT_RELAX_RX_MODE_NUM,
>>  CMD_LINE_OPT_RULE_IPV4_NUM,
>>  CMD_LINE_OPT_RULE_IPV6_NUM,
>>  CMD_LINE_OPT_ALG_NUM,
>> @@ -728,6 +731,7 @@ static const struct option lgopts[] = {
>>  {CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, CMD_LINE_OPT_MAX_PKT_LEN_NUM},
>>  {CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
>>  {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
>> +{CMD_LINE_OPT_RELAX_RX_MODE, 0, 0, CMD_LINE_OPT_RELAX_RX_MODE_NUM},
>>  {CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
>>  {CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
>>  {CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
>> @@ -853,6 +857,11 @@ parse_args(int argc, char **argv)
>>  parse_ptype = 1;
>>  break;
>>   
>> +case CMD_LINE_OPT_RELAX_RX_MODE_NUM:
>> +printf("Relax rx mode is enabled\n");
>> +relax_rx_mode = 1;
>> +break;
>> +
>>  case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
>>  printf("per port buffer pool is enabled\n");
>>  per_port_pool = 1;
>> @@ -1257,8 +1266,14 @@ l3fwd_poll_resource_setup(void)
>>  local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
>>  dev_info.flow_type_rss_offloads;
>>   
>> -if (dev_info.max_rx_queues == 1)
>> -local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
>> +/* relax the rx rss requirement */
>> +if (dev_info.max_rx_queues == 1 || 
>> !local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
>> +if (relax_rx_mode) {
>> +printf("warning: modified the rx mq_mode to 
>> RTE_ETH_MQ_RX_NONE base on"
>> +" device capability\n");
>> +local_port_conf.rxmode.mq_mode = 
>> RTE_ETH_MQ_RX_NONE;
>> +}
>> +}
>
>But that way we change current behavior - always use MQ_RX_NONE
>for devices with just one RX queue.
>Was it intended?
>Might be it should be:
>   if (dev_info.max_rx_queues == 1)
>   local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
>
>+  /* relax the rx rss requirement */
>+  if (relax_rx_mode &&
>+  !local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
>+  printf("...");
>+  local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
>+  }
>

>?
>OK, I will change it as what you gave here though I think there is no 
>difference between the max_rx_queue is 1 and rss_hf is 0, both of them mean 
>that RSS is not supported.
Thanks. 
>
>
>>   
>>  if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !

[PATCH] net/mlx5: fix MPRQ stride size check

[Alexander Kozyrev]

We should only check that MPRQ stride size is bigger than the mbuf size
in case no devarg configuration has been provided. Headroom check was
indtroduced recently and removed this condition inadvertently.
Restore this condition and only check if mprq_log_stride_size is not set.

Fixes: 8e7925aa77 ("net/mlx5: fix MPRQ stride size to accommodate the headroom")

Signed-off-by: Alexander Kozyrev 
---
 drivers/net/mlx5/mlx5.c |  2 +-
 drivers/net/mlx5/mlx5_rxq.c | 25 ++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 997df595d0..d10b5c8510 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2616,7 +2616,7 @@ mlx5_port_args_config(struct mlx5_priv *priv, struct 
mlx5_kvargs_ctrl *mkvlist,
config->mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN;
config->mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS;
config->mprq.log_stride_num = MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM;
-   config->mprq.log_stride_size = MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE;
+   config->mprq.log_stride_size = MLX5_ARG_UNSET;
config->log_hp_size = MLX5_ARG_UNSET;
config->std_delay_drop = 0;
config->hp_delay_drop = 0;
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 8ef7860e16..fd2d8c0a3d 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1605,18 +1605,19 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t 
idx, uint16_t desc,
*actual_log_stride_num = config->mprq.log_stride_num;
}
/* Checks if chosen size of stride is in supported range. */
-   if (config->mprq.log_stride_size > log_max_stride_size ||
-   config->mprq.log_stride_size < log_min_stride_size) {
-   *actual_log_stride_size = log_def_stride_size;
-   DRV_LOG(WARNING,
-   "Port %u Rx queue %u size of a stride for Multi-Packet 
RQ is out of range, setting default value (%u)",
-   dev->data->port_id, idx,
-   RTE_BIT32(log_def_stride_size));
+   if (config->mprq.log_stride_size != (uint32_t)MLX5_ARG_UNSET) {
+   if (config->mprq.log_stride_size > log_max_stride_size ||
+   config->mprq.log_stride_size < log_min_stride_size) {
+   *actual_log_stride_size = log_def_stride_size;
+   DRV_LOG(WARNING,
+   "Port %u Rx queue %u size of a stride for 
Multi-Packet RQ is out of range, setting default value (%u)",
+   dev->data->port_id, idx,
+   RTE_BIT32(log_def_stride_size));
+   } else {
+   *actual_log_stride_size = config->mprq.log_stride_size;
+   }
} else {
-   *actual_log_stride_size = config->mprq.log_stride_size;
-   }
-   /* Make the stride fit the mbuf size by default. */
-   if (*actual_log_stride_size == MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE) {
+   /* Make the stride fit the mbuf size by default. */
if (min_mbuf_size <= RTE_BIT32(log_max_stride_size)) {
DRV_LOG(WARNING,
"Port %u Rx queue %u size of a stride for 
Multi-Packet RQ is adjusted to match the mbuf size (%u)",
@@ -1675,6 +1676,8 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, 
uint16_t desc,
" min_stride_sz = %u, max_stride_sz = %u).\n"
"Rx segment is %senabled. External mempool is %sused.",
dev->data->port_id, min_mbuf_size, desc, priv->rxqs_n,
+   config->mprq.log_stride_size == 
(uint32_t)MLX5_ARG_UNSET ?
+   RTE_BIT32(MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE) :
RTE_BIT32(config->mprq.log_stride_size),
RTE_BIT32(config->mprq.log_stride_num),
config->mprq.min_rxqs_num,
-- 
2.18.2

Re: [PATCH v5 00/40] support setting and querying RSS algorithms

[Stephen Hemminger]

On Wed, 11 Oct 2023 17:27:25 +0800
Jie Hai  wrote:

> This patchset is to support setting and querying RSS algorithms.
> 
> --
> v5:
> 1. rewrite some comments.
> 2. check RSS algorithm for drivers supporting RSS.
> 3. change field "func" of rss_conf to "algorithm".
> 4. fix commit log for [PATCH v4 4/7].
> 5. add Acked-by Reshma Pattan.
> 6. add symmetric_toeplitz_sort for showing.
> 7. change "hf" to "hash function" for showing.
> 
> v4:
> 1. recomment some definitions related to RSS.
> 2. allocate static memory for rss_key instead of dynamic.
> 3. use array of strings to get the name of rss algorithm.
> 4. add display of rss algorithm with testpmd.
> 
> v3:
> 1. fix commit log for PATCH [1/5].
> 2. make RSS ABI changes description to start the actual text at the margin.
> 3. move defnition of enum rte_eth_hash_function to rte_ethdev.h.
> 4. fix some comment codes.
> 
> v2:
> 1. return error if "func" is invalid.
> 2. modify the comments of the "func" field.
> 3. modify commit log of patch [3/5].
> 4. use malloc instead of rte_malloc.
> 5. adjust display format of RSS info.
> 6. remove the string display of rss_hf.
> 
> Huisong Li (1):
>   net/hns3: support setting and querying RSS hash function
> 
> Jie Hai (39):
>   ethdev: overwrite some comment related to RSS
>   ethdev: support setting and querying RSS algorithm
>   net/atlantic: check RSS hash algorithms
>   net/axgbe: check RSS hash algorithms
>   net/bnx2x: check RSS hash algorithms
>   net/bnxt: check RSS hash algorithms
>   net/bonding: check RSS hash algorithms
>   net/cnxk: check RSS hash algorithms
>   net/cpfl: check RSS hash algorithms
>   net/cxgbe: check RSS hash algorithms
>   net/dpaa: check RSS hash algorithms
>   net/dpaa2: check RSS hash algorithms
>   net/ena: check RSS hash algorithms
>   net/enic: check RSS hash algorithms
>   net/fm10k: check RSS hash algorithms
>   net/hinic: check RSS hash algorithms
>   net/i40e: check RSS hash algorithms
>   net/iavf: check RSS hash algorithms
>   net/ice: check RSS hash algorithms
>   net/idpf: check RSS hash algorithms
>   net/igc: check RSS hash algorithms
>   net/ionic: check RSS hash algorithms
>   net/ixgbe: check RSS hash algorithms
>   net/mana: check RSS hash algorithms
>   net/mlx5: check RSS hash algorithms
>   net/mvpp2: check RSS hash algorithms
>   net/netvsc: check RSS hash algorithms
>   net/ngbe: : check RSS hash algorithms
>   net/nfp: check RSS hash algorithms
>   net/null: check RSS hash algorithms
>   net/qede: check RSS hash algorithms
>   net/sfc: check RSS hash algorithms
>   net/tap: check RSS hash algorithms
>   net/thunderx: check RSS hash algorithms
>   net/txgbe: check RSS hash algorithms
>   app/proc-info: fix never show RSS info
>   app/proc-info: adjust the display format of RSS info
>   app/proc-info: support querying RSS hash algorithm
>   app/testpmd: add RSS hash algorithms display
> 
>  app/proc-info/main.c   | 32 ++-
>  app/test-pmd/cmdline.c | 29 ++---
>  app/test-pmd/config.c  | 38 -
>  app/test-pmd/testpmd.h |  2 +-
>  doc/guides/rel_notes/release_23_11.rst |  2 +
>  drivers/net/atlantic/atl_ethdev.c  |  2 +
>  drivers/net/axgbe/axgbe_ethdev.c   |  9 +
>  drivers/net/bnx2x/bnx2x_ethdev.c   |  4 ++
>  drivers/net/bnxt/bnxt_ethdev.c |  6 +++
>  drivers/net/bonding/rte_eth_bond_pmd.c |  6 +++
>  drivers/net/cnxk/cnxk_ethdev.c |  5 +++
>  drivers/net/cnxk/cnxk_ethdev_ops.c |  3 ++
>  drivers/net/cpfl/cpfl_ethdev.c |  6 +++
>  drivers/net/cxgbe/cxgbe_ethdev.c   |  9 -
>  drivers/net/dpaa/dpaa_ethdev.c |  7 
>  drivers/net/dpaa2/dpaa2_ethdev.c   |  7 
>  drivers/net/ena/ena_rss.c  |  3 ++
>  drivers/net/enic/enic_ethdev.c |  1 +
>  drivers/net/enic/enic_main.c   |  3 ++
>  drivers/net/fm10k/fm10k_ethdev.c   |  9 -
>  drivers/net/hinic/hinic_pmd_ethdev.c   |  3 ++
>  drivers/net/hinic/hinic_pmd_rx.c   |  3 ++
>  drivers/net/hns3/hns3_rss.c| 47 -
>  drivers/net/i40e/i40e_ethdev.c |  7 
>  drivers/net/iavf/iavf_ethdev.c |  6 +++
>  drivers/net/ice/ice_dcf.c  |  3 ++
>  drivers/net/ice/ice_dcf_ethdev.c   |  3 ++
>  drivers/net/ice/ice_ethdev.c   |  7 
>  drivers/net/idpf/idpf_ethdev.c |  6 +++
>  drivers/net/igc/igc_ethdev.c   |  4 ++
>  drivers/net/igc/igc_txrx.c |  5 +++
>  drivers/net/ionic/ionic_ethdev.c   |  6 +++
>  drivers/net/ixgbe/ixgbe_ethdev.c   | 12 +-
>  drivers/net/ixgbe/ixgbe_rxtx.c |  4 ++
>  drivers/net/mana/mana.c| 11 -
>  drivers/net/mlx5/mlx5_ethdev.c |  4 ++
>  drivers/net/mlx5/mlx5_rss.c|  3 +-
>  drivers/net/mvpp2/mrvl_ethdev.c|  3 ++
>  drivers/net/netvsc/hn_ethdev.c |  6 +++
>  drivers/net/nfp/nfp_common.c   |  9 -
>  drivers/net/ngbe/n

Re: [PATCH 3/6] Section 3: Setting up a System to Run DPDK Applications

[Dave Young]

I asked the following in the Slack channel, responding to Stephen and
Thomas so asking in this thread as well to confirm:

To confirm, the three steps in 3.1.1 Memory Setup: Reservering Hugepages at
http://170.249.220.94/getting_started_guide/system_setup.html#system-setup-for-linux
can be replaced with the following:

Memory Setup: Reserving Hugepages
To simplify the hugepages setup, use the `dpdk-hugepages` script:
sudo dpdk-hugepages --setup

To confirm, the instructions in 3.1.2 Device Setup: VFIO at
http://170.249.220.94/getting_started_guide/system_setup.html#device-setup-vfio
can be replaced with the following:

Device Setup: VFIO
For VFIO setup, please refer to the `Kernel Documentation for VFIO <
https://www.kernel.org/doc/html/latest/driver-api/vfio.html>`_.

Thanks!
David Young
Professional Copywriter/Technical Writer
Young Copy
+1 (678) 500-9550
https://www.youngcopy.com


On Mon, Sep 25, 2023 at 8:22 AM Bruce Richardson 
wrote:

> On Mon, Sep 25, 2023 at 12:31:34PM +0100, Ferruh Yigit wrote:
> > On 9/20/2023 4:48 PM, David Young wrote:
> > > ---
> > >  .../getting_started_guide/system_setup.rst| 195 ++
> > >  1 file changed, 195 insertions(+)
> > >  create mode 100644 doc/guides/getting_started_guide/system_setup.rst
> > >
> > > diff --git a/doc/guides/getting_started_guide/system_setup.rst
> b/doc/guides/getting_started_guide/system_setup.rst
> > > new file mode 100644
> > > index 00..fa9d249ec7
> > > --- /dev/null
> > > +++ b/doc/guides/getting_started_guide/system_setup.rst
> > > @@ -0,0 +1,195 @@
> > > +..  SPDX-License-Identifier: BSD-3-Clause
> > > +Copyright(c) 2010-2025 Intel Corporation.
> > > +
> > > +.. _memory_setup:
> > > +
> > > +.. |reg| unicode:: U+000AE
> > > +
> > > +Setting up a System to Run DPDK Applications
> > > +
> > > +
> > > +This section provides step-by-step instructions for setting up your
> system to run DPDK applications. It covers system configurations for Linux,
> FreeBSD, and Windows. Each section details the necessary memory and device
> setups for these operating systems.
> > > +
> > > +Navigate to the section that corresponds to your operating system to
> begin the setup process.
> > > +
> >
> > Not sure above sentences adds value.
> >
> >
> >
> > > +.. contents:: Table of Contents
> > > +   :local:
> > > +
> > > +System Setup for Linux
> > > +--
> > > +
> > > +Memory Setup: Reserving Hugepages
> > > +^
> > > +
> > > +For Linux, DPDK requires hugepages be reserved for its use on the
> system. To check if hugepages are are on your system, you can run the
> following command::
> > > +
> > > +grep HugePages_Total /proc/meminfo
> > > +
> > > +If hugepages are not reserved, you will need to reserve them by
> following these steps:
> > > +
> > > +1. Determine the number of hugepages you want to allocate. For
> example, to allocate 1024 hugepages of 2MB each, you can use the following
> command::
> > > +
> > > +echo 1024 | sudo tee
> /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
> > > +
> > > +2. To make the hugepages configuration persistent across reboots, add
> the following line to your `/etc/sysctl.conf` file, adjusting the number of
> hugepages as needed::
> > > +
> > > +vm.nr_hugepages = 1024
> > > +
> > > +3. Most distributions make hugepages available via `/dev/hugepages`,
> so this step may not be necessary. If you need to manually mount the
> hugepages filesystem, add the following line to your `/etc/fstab` file::
> > > +
> > > +nodev /mnt/huge hugetlbfs defaults 0 0
> > > +
> > > +   Then, create the mount directory and mount the filesystem::
> > > +
> > > +mkdir -p /mnt/huge
> > > +mount -a
> > > +
> > >
> >
> >
> > We have './usertools/dpdk-hugepages.py' script for this, which I am
> > using regularly.
> >
> > Script is wrapper to what described above, so I think good to explain
> > basics, but also may worth mentioning from script, it is more user
> > friendly than above instructions.
> >
> Actually, if script can do all the basics - something I believe Stephen and
> Thomas also pointed out on a slack review earlier - then we should just
> drop the manual steps from here. If we think the script is sufficiently
> robust, we can drop them from the doc entirely, or if not, move them to an
> appendix which we reference here.
>
> /Bruce
>

Re: [PATCH 2/6] Section 2: Install and Build DPDK

[Dave Young]

Tyler, can you provide an example of the OS specific section/title you're
thinking would make sense to use?

Can you confirm the following?

1. The Clang-LLVM C compiler (version >= 16.0.x)
2. Meson Build system (Required version: 0.57.0)
3. Updated commands:

# Previous Command
meson -Dexamples=helloworld build
# Updated Command
meson setup -Dexamples=helloworld build

# Previous Command
ninja -C build
# Updated Command
meson compile -C build

4. Since Ninja is bundled with Meson 0.57.0, a separate section for its
installation may not be necessary. Is this correct?

Thanks!
David Young
Professional Copywriter/Technical Writer
Young Copy
+1 (678) 500-9550
https://www.youngcopy.com


On Mon, Sep 25, 2023 at 12:05 PM Tyler Retzlaff <
roret...@linux.microsoft.com> wrote:

> On Wed, Sep 20, 2023 at 11:48:06AM -0400, David Young wrote:
> > ---
> >  .../building_from_sources.rst | 108 ++
> >  .../install_and_build/index.rst   |  15 +++
> >  .../installing_prebuilt_packages.rst  |  54 +
> >  .../windows_install_build.rst |  93 +++
> >  4 files changed, 270 insertions(+)
> >  create mode 100644
> doc/guides/getting_started_guide/install_and_build/building_from_sources.rst
> >  create mode 100644
> doc/guides/getting_started_guide/install_and_build/index.rst
> >  create mode 100644
> doc/guides/getting_started_guide/install_and_build/installing_prebuilt_packages.rst
> >  create mode 100644
> doc/guides/getting_started_guide/install_and_build/windows_install_build.rst
> >
> > diff --git
> a/doc/guides/getting_started_guide/install_and_build/building_from_sources.rst
> b/doc/guides/getting_started_guide/install_and_build/building_from_sources.rst
> > new file mode 100644
> > index 00..e4ee8e436d
> > --- /dev/null
> > +++
> b/doc/guides/getting_started_guide/install_and_build/building_from_sources.rst
> > @@ -0,0 +1,108 @@
> > +..  SPDX-License-Identifier: BSD-3-Clause
> > +Copyright(c) 2010-2025 Intel Corporation.
> > +
> > +.. _building_from_sources:
> > +
> > +Building and Installing DPDK from Sources
> > +=
> > +
> > +This chapter provides a comprehensive guide for building DPDK from
> sources on both
> > +Linux and FreeBSD platforms. It covers the necessary steps,
> prerequisites,
> > +and considerations for different architectures and compilers.
>
> when the title of the section is general it shouldn't mention a specific
> OS in the content. if the content is OS specific then the parent section
> or the title of the section should identify to which OS it applies. in
> general it would be nice to convey that windows is an equally supported
> platform to the other operating systems.
>
> i know it's a bit of a dance i hope you can help interpret what i'm
> trying to convey.
>
> > +
> > +Required Tools
> > +--
> > +
> > +To build DPDK, you'll need the following tools:
> > +
> > +- A C compiler like ``gcc`` (version 5+) or ``clang`` (version 3.6+)
> > +- ``pkg-config`` or ``pkgconf``
> > +- Python 3.6 or later
> > +- ``meson`` (version 0.53.2+) and ``ninja``
> > +- ``pyelftools`` (version 0.22+)
> > +
> > +Here's how to install them:
> > +
> > +Linux
> > +^
> > +
> > +Alpine
> > +
> > +.. code-block:: bash
> > +
> > +   sudo apk add alpine-sdk bsd-compat-headers
> > +   pip install meson ninja
> > +
> > +Debian and Ubuntu and derivatives
> > +
> > +.. code-block:: bash
> > +
> > +   sudo apt install build-essential
> > +   pip install meson ninja
> > +
> > +Fedora and RedHat Enterprise Linux RHEL
> > +
> > +.. code-block:: bash
> > +
> > +   sudo dnf groupinstall "Development Tools"
> > +   pip install meson ninja
> > +
> > +openSUSE
> > +
> > +.. code-block:: bash
> > +
> > +   sudo zypper install -t pattern devel_basis python3-pyelftools
> > +   pip install meson ninja
> > +
> > +FreeBSD
> > +^^^
> > +
> > +FreeBSD (as root)
> > +
> > +.. code-block:: bash
> > +
> > +   pkg install meson pkgconf py38-pyelftools
> > +
> > +Note: If you're using FreeBSD, you'll also need kernel sources. Make
> sure they're included during the FreeBSD installation.
> > +
> > +Getting the DPDK Source
> > +---
> > +
> > +Download the DPDK source code from the official repository
> > +``https://fast.dpdk.org/rel/`` .
> > +
> > +Use ``wget`` to grab the DPDK version::
> > +
> > +wget https://fast.dpdk.org/rel/dpdk-.tar.xz
> > +
> > +Extract the downloaded archive:
> > +
> > +.. code-block:: bash
> > +
> > +   tar -xvf dpdk-.tar.gz
> > +
> > +Navigate to the DPDK directory:
> > +
> > +.. code-block:: bash
> > +
> > +   cd dpdk-
> > +
> > +Building DPDK
> > +-
> > +
> > +Configure the build based on your needs, hardware, and environment.
> > +This might include setting specific flags or options. For example:
> “meson setup -Dbuildtype=debugoptimized build”. Then compile using “ninja”
> and install using “meson instal

Re: [PATCH v5 14/40] net/enic: check RSS hash algorithms

[John Daley (johndale)]

> also 'enicpmd_dev_configure()' looks like can be updated.
Where would it be updated? With the patch, the check will be done at the bottom 
of the function in call to enic_init_rss_nic_cfg -> enic_set_niccfg



From: Ferruh Yigit 
Date: Wednesday, October 11, 2023 at 10:32 AM
To: Jie Hai , dev@dpdk.org , John Daley 
(johndale) , Hyong Youb Kim (hyonkim) 
Cc: lihuis...@huawei.com , fengcheng...@huawei.com 
, liudongdo...@huawei.com 
Subject: Re: [PATCH v5 14/40] net/enic: check RSS hash algorithms
On 10/11/2023 10:27 AM, Jie Hai wrote:
> A new field 'algorithm' has been added to rss_conf, check it
> in case of ignoring unsupported values.
>
> Signed-off-by: Jie Hai 
> ---
>  drivers/net/enic/enic_ethdev.c | 1 +
>  drivers/net/enic/enic_main.c   | 3 +++
>  2 files changed, 4 insertions(+)
>
> diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
> index cdf091559196..164f423a85c8 100644
> --- a/drivers/net/enic/enic_ethdev.c
> +++ b/drivers/net/enic/enic_ethdev.c
> @@ -834,6 +834,7 @@ static int enicpmd_dev_rss_hash_conf_get(struct 
> rte_eth_dev *dev,
>ENICPMD_FUNC_TRACE();
>if (rss_conf == NULL)
>return -EINVAL;
> +
>

unintended change.

also 'enicpmd_dev_configure()' looks like can be updated.


>if (rss_conf->rss_key != NULL &&
>rss_conf->rss_key_len < ENIC_RSS_HASH_KEY_SIZE) {
>dev_err(enic, "rss_hash_conf_get: wrong rss_key_len. given=%u"
> diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
> index 19a99a82c501..2eafe7637b3a 100644
> --- a/drivers/net/enic/enic_main.c
> +++ b/drivers/net/enic/enic_main.c
> @@ -1428,6 +1428,9 @@ int enic_set_rss_conf(struct enic *enic, struct 
> rte_eth_rss_conf *rss_conf)
>}
>}
>
> + if (rss_enable && rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
> + return -EINVAL;
> +
>ret = enic_set_niccfg(enic, ENIC_RSS_DEFAULT_CPU, rss_hash_type,
>  ENIC_RSS_HASH_BITS, ENIC_RSS_BASE_CPU,
>  rss_enable);

DPDK Release Status Meeting 2023-10-12

[Mcnamara, John]

Release status meeting minutes 2023-10-12
=

Agenda:
* Release Dates
* Subtrees
* Roadmaps
* LTS
* Defects
* Opens

Participants:
* AMD
* ARM
* Intel
* Marvell
* Nvidia
* Red Hat

Release Dates
-

The following are the current working dates for 23.11:

* V1:  12 August 2023
* RC1: 11 October 2023 - Trending 16 October
* RC2: 27 October 2023
* RC3:  3 November 2023
* Release: 15 November 2023


Subtrees


* next-net
  * Mainly in sync with main for RC1
  * However some eth_dev patches remaining
  * Question around PTP patches

* next-net-intel
  * All the main feature for CPF and IPF merged and awaiting pull.

* next-net-mlx
  * Waiting for pull.

* next-net-mvl
  * PR sent.
  * Some patches for RC2.

* next-eventdev
  * PR sent.

* next-baseband
  * Preparing PR.

* next-virtio
  * No big fixes.
  * Some fixes.

* next-crypto
  * RC1 patches merged to main.

* main
  * Merged AMD power series.
  * Working on dispatcher library, should be ready for RC1.
https://patchwork.dpdk.org/project/dpdk/list/?series=29250
  * Looking at patches for DMA dev and Graph nodes.
  * RC1 targeted for Monday 16th October


Proposed Schedule for 2023
--

See also http://core.dpdk.org/roadmap/#dates

23.11

  * Proposal deadline (RFC/v1 patches): 12 August 2023
  * API freeze (-rc1): 11 October 2023
  * PMD features freeze (-rc2): 27 October 2023
  * Builtin applications features freeze (-rc3): 3 November 2023
  * Release: 15 November 2023


LTS
---

LTS in the current cycle have been released.

* 22.11.2 - Released
* 21.11.5 - Released
* 20.11.9 - Released
* 19.11.15
  * Will only be updated with CVE and critical fixes.


* Distros
  * v22.11 in Debian 12
  * Ubuntu 22.04-LTS contains 21.11
  * Ubuntu 23.04 contains 22.11

Defects
---

* Bugzilla links, 'Bugs',  added for hosted projects
  * https://www.dpdk.org/hosted-projects/



DPDK Release Status Meetings


The DPDK Release Status Meeting is intended for DPDK Committers to discuss the
status of the master tree and sub-trees, and for project managers to track
progress or milestone dates.

The meeting occurs on every Thursday at 9:30 UTC over Jitsi on 
https://meet.jit.si/DPDK

You don't need an invite to join the meeting but if you want a calendar 
reminder just
send an email to "John McNamara john.mcnam...@intel.com" for the invite.

[PATCH v3] net/iavf: support no data path polling mode

[Mingjin Ye]

Currently, during a PF to VF reset due to an action such as changing
trust settings on a VF, the DPDK application running with iavf PMD
loses connectivity, and the only solution is to reset the DPDK
application.

Instead of forcing a reset of the DPDK application to restore
connectivity, the iavf PMD driver handles the PF to VF reset event
normally by performing all necessary steps to bring the VF back
online.

To minimize downtime, a devargs "no-poll-on-link-down" is introduced
in iavf PMD. When this flag is set, the PMD switches to no-poll mode
when the link state is down (rx/tx bursts return to 0 immediately).
When the link state returns to normal, the PMD switches to normal
rx/tx burst state.

NOTE: The DPDK application needs to handle the
RTE_ETH_EVENT_INTR_RESET event posted by the iavf PMD and reset
the vf upon receipt of this event.

Signed-off-by: Mingjin Ye 
---
V3: Remove redundant code.
---
 doc/guides/nics/intel_vf.rst   |  3 ++
 drivers/net/iavf/iavf.h|  4 +++
 drivers/net/iavf/iavf_ethdev.c | 16 +-
 drivers/net/iavf/iavf_rxtx.c   | 53 ++
 drivers/net/iavf/iavf_rxtx.h   |  1 +
 drivers/net/iavf/iavf_vchnl.c  | 20 +
 6 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 7613e1c5e5..19c461c3de 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -104,6 +104,9 @@ For more detail on SR-IOV, please refer to the following 
documents:
 Enable vf auto-reset by setting the ``devargs`` parameter like ``-a 
18:01.0,auto_reset=1`` when IAVF is backed
 by an Intel® E810 device or an Intel® 700 Series Ethernet device.
 
+Enable vf no-poll-on-link-down by setting the ``devargs`` parameter like 
``-a 18:01.0,no-poll-on-link-down=1`` when IAVF is backed
+by an Intel® E810 device or an Intel® 700 Series Ethernet device.
+
 The PCIE host-interface of Intel Ethernet Switch FM1 Series VF 
infrastructure
 
^
 
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 04774ce124..c115f3444e 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -308,6 +308,7 @@ struct iavf_devargs {
uint16_t quanta_size;
uint32_t watchdog_period;
uint8_t  auto_reset;
+   uint16_t no_poll_on_link_down;
 };
 
 struct iavf_security_ctx;
@@ -326,6 +327,9 @@ struct iavf_adapter {
uint32_t ptype_tbl[IAVF_MAX_PKT_TYPE] __rte_cache_min_aligned;
bool stopped;
bool closed;
+   bool no_poll;
+   eth_rx_burst_t rx_pkt_burst;
+   eth_tx_burst_t tx_pkt_burst;
uint16_t fdir_ref_cnt;
struct iavf_devargs devargs;
 };
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 5b2634a4e3..98cc5c8ea8 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -38,7 +38,7 @@
 #define IAVF_QUANTA_SIZE_ARG   "quanta_size"
 #define IAVF_RESET_WATCHDOG_ARG"watchdog_period"
 #define IAVF_ENABLE_AUTO_RESET_ARG "auto_reset"
-
+#define IAVF_NO_POLL_ON_LINK_DOWN_ARG "no-poll-on-link-down"
 uint64_t iavf_timestamp_dynflag;
 int iavf_timestamp_dynfield_offset = -1;
 
@@ -47,6 +47,7 @@ static const char * const iavf_valid_args[] = {
IAVF_QUANTA_SIZE_ARG,
IAVF_RESET_WATCHDOG_ARG,
IAVF_ENABLE_AUTO_RESET_ARG,
+   IAVF_NO_POLL_ON_LINK_DOWN_ARG,
NULL
 };
 
@@ -2291,6 +2292,7 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
struct rte_kvargs *kvlist;
int ret;
int watchdog_period = -1;
+   uint16_t no_poll_on_link_down;
 
if (!devargs)
return 0;
@@ -2324,6 +2326,15 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
else
ad->devargs.watchdog_period = watchdog_period;
 
+   ret = rte_kvargs_process(kvlist, IAVF_NO_POLL_ON_LINK_DOWN_ARG,
+&parse_u16, &no_poll_on_link_down);
+   if (ret)
+   goto bail;
+   if (no_poll_on_link_down == 0)
+   ad->devargs.no_poll_on_link_down = 0;
+   else
+   ad->devargs.no_poll_on_link_down = 1;
+
if (ad->devargs.quanta_size != 0 &&
(ad->devargs.quanta_size < 256 || ad->devargs.quanta_size > 4096 ||
 ad->devargs.quanta_size & 0x40)) {
@@ -2337,6 +2348,9 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
if (ret)
goto bail;
 
+   if (ad->devargs.auto_reset != 0)
+   ad->devargs.no_poll_on_link_down = 1;
+
 bail:
rte_kvargs_free(kvlist);
return ret;
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 0484988d13..7feadee7d0 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -777,6 +777,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
IAVF_DEV_PRIVATE_TO

RE: [PATCH v3 0/8] Enhance the bond framework to support offload

[Chaoyong He]

A gentle ping ~

As this patch series add new APIs, hoping it will catch up deadline of 
23.11-RC1 (API freeze).

Thanks.

> -Original Message-
> From: Chaoyong He
> Sent: Sunday, October 8, 2023 9:51 AM
> To: dev@dpdk.org
> Cc: oss-drivers ; Chaoyong He
> 
> Subject: [PATCH v3 0/8] Enhance the bond framework to support offload
> 
> This patch series try to enhance the bond framework to support the offload
> feature better:
> * Add new API to make the member port can access some information of the
>   bond port which belongs.
> * Add new API to get the result of whether bond port is created by the
>   member port.
> * Add two command line argument to control if enable member port
>   notification and dedicated queue features.
> * Add logic to support add ports which share the same PCI address into
>   bond port.
> * Also modify the testpmd application to test the new APIs and logics
>   added by this patch series.
> 
> ---
> v2:
> * Fix compile error on github-robot by removing the redundancy function
>   declaration in the header file.
> v3:
> * Use the hole in the structure for the new added flag data field.
> ---
> 
> 
> Long Wu (8):
>   ethdev: add member notification for bonding port
>   ethdev: add API to get hardware creation of bonding port
>   net/bonding: modify interface comment format
>   net/bonding: add bonding port arguments
>   net/bonding: support add port by data name
>   net/bonding: create new rte flow header file
>   net/bonding: support checking valid bonding port ID
>   net/bonding: add commands for bonding port notification
> 
>  .../link_bonding_poll_mode_drv_lib.rst|  19 ++
>  drivers/net/bonding/bonding_testpmd.c | 128 ++
>  drivers/net/bonding/eth_bond_8023ad_private.h |  52 ++--
>  drivers/net/bonding/eth_bond_private.h|  24 +-
>  drivers/net/bonding/rte_eth_bond.h| 238 +-
>  drivers/net/bonding/rte_eth_bond_8023ad.h |  76 --
>  drivers/net/bonding/rte_eth_bond_alb.h|  34 ++-
>  drivers/net/bonding/rte_eth_bond_api.c| 123 +
>  drivers/net/bonding/rte_eth_bond_args.c   |  47 
>  drivers/net/bonding/rte_eth_bond_flow.c   |   1 +
>  drivers/net/bonding/rte_eth_bond_flow.h   |  22 ++
>  drivers/net/bonding/rte_eth_bond_pmd.c|  89 ++-
>  drivers/net/bonding/version.map   |   5 +
>  lib/ethdev/ethdev_driver.h|  38 +++
>  14 files changed, 766 insertions(+), 130 deletions(-)  create mode 100644
> drivers/net/bonding/rte_eth_bond_flow.h
> 
> --
> 2.39.1

RE: [PATCH v4] app/test: append 'allow' parameters to secondary processes

[Huang, ZhiminX]

> -Original Message-
> From: Mingjin Ye 
> Sent: Wednesday, September 27, 2023 11:42 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming ; Zhou, YidingX
> ; Ye, MingjinX ;
> sta...@dpdk.org
> Subject: [PATCH v4] app/test: append 'allow' parameters to secondary
> processes
> 
> The 'allow' parameters are not passed to the secondary process, and all
> devices will be loaded by default. When the primary process specifies the
> 'allow' parameters and does not specify all devices that use the vfio-pci 
> driver,
> the secondary process will not load the devices as expected, which will return
> incorrect test results.
> 
> This patch fixes this issue by appending the 'allow' parameters to the
> secondary process.
> 
> Fixes: 086eb64db39e ("test/pdump: add unit test for pdump library")
> Fixes: 148f963fb532 ("xen: core library changes")
> Fixes: af75078fece3 ("first public release")
> Fixes: b8d5e544e73e ("test: add procfs error message for multi-process
> launch")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Mingjin Ye 
> ---
Verified multiple pcis with the '-a' parameter.
Tested-by: Zhimin Huang 

[PATCH v2 2/3] examples/l3fwd: relax the Offload requirement

[Trevor Tao]

Now the port Rx offload mode is set to RTE_ETH_RX_OFFLOAD_CHECKSUM
by default, but some hw and/or virtual interface does not support
the offload mode presupposed, e.g., some virtio interfaces in
the cloud may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/
RTE_ETH_RX_OFFLOAD_TCP_CKSUM,
but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:

Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads
capabilities 0x201d in rte_eth_dev_configure()

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.
A warning msg would be provided to user in case it happens here.

On the other side, enabling the software cksum check in case missing the
hw support.

The relax action for rx cksum offload is just enabled when relax_rx_mode is
true which is false by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/l3fwd.h | 12 ++--
 examples/l3fwd/l3fwd_em.h  |  2 +-
 examples/l3fwd/l3fwd_lpm.h |  2 +-
 examples/l3fwd/main.c  | 14 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index b55855c932..fd98ad3373 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -159,7 +159,7 @@ send_single_packet(struct lcore_conf *qconf,
 
 #ifdef DO_RFC_1812_CHECKS
 static inline int
-is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len, uint64_t 
ol_flags)
 {
/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
/*
@@ -170,7 +170,15 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t 
link_len)
return -1;
 
/* 2. The IP checksum must be correct. */
-   /* this is checked in H/W */
+   /* if this is not checked in H/W, check it. */
+   if ((ol_flags & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) == 0) {
+   uint16_t actual_cksum, expected_cksum;
+   actual_cksum = pkt->hdr_checksum;
+   pkt->hdr_checksum = 0;
+   expected_cksum = rte_ipv4_cksum(pkt);
+   if (actual_cksum != expected_cksum)
+   return -2;
+   }
 
/*
 * 3. The IP version number must be 4. If the version number is not 4
diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
index 7d051fc076..1fee2e2e6c 100644
--- a/examples/l3fwd/l3fwd_em.h
+++ b/examples/l3fwd/l3fwd_em.h
@@ -20,7 +20,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return BAD_PORT;
}
diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
index c61b969584..4ee61e8d88 100644
--- a/examples/l3fwd/l3fwd_lpm.h
+++ b/examples/l3fwd/l3fwd_lpm.h
@@ -22,7 +22,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return;
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 36a2a77756..5f378ed812 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1286,6 +1286,20 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}
 
+   /* relax the rx offload requirement */
+   if ((local_port_conf.rxmode.offloads & 
dev_info.rx_offload_capa) !=
+   local_port_conf.rxmode.offloads) {
+   printf("Port %u requested Rx offloads 0x%"PRIx64" does 
not"
+   " match Rx offloads capabilities 0x%"PRIx64"\n",
+   portid, local_port_conf.rxmode.offloads,
+   dev_info.rx_offload_capa);
+   if (relax_rx_mode) {
+   local_port_conf.rxmode.offloads &= 
dev_info.rx_offload_capa;
+   printf("warning: modified the rx offload to 
0x%"PRIx64" based on device"
+   " capability\n", 
local_port_conf.rxmode.offloads);
+   }
+   }
+
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &local_port_conf);
if (ret < 0)
-- 
2.34.1

[PATCH v2 3/3] doc: add a relax rx mode requirement option

[Trevor Tao]

Add an option to enable the RX mode requirement relax
in release notes and l3fwd sample guide.

Signed-off-by: Trevor Tao 
---
 doc/guides/rel_notes/release_23_11.rst  | 2 ++
 doc/guides/sample_app_ug/l3_forward.rst | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rst
index f09ecd50fe..2f9e4a54c8 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -84,6 +84,8 @@ New Features
   default. The implementation using C11 standard atomic operations is enabled
   via the ``enable_stdatomic`` build option.
 
+* sample: Added a command option ``--relax-rx-mode`` in l3fwd example
+  to relax the rx RSS/Offload mode requirement if needed.
 
 Removed Items
 -
diff --git a/doc/guides/sample_app_ug/l3_forward.rst 
b/doc/guides/sample_app_ug/l3_forward.rst
index 1cc2c1dd1d..00283f070c 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -126,6 +126,8 @@ Where,
 
 * ``--parse-ptype:`` Optional, set to use software to analyze packet type. 
Without this option, hardware will check the packet type.
 
+* ``--relax-rx-mode:`` Optional, set to enable rx mode relax when RSS/offload 
is not fully supported by the hardware. When the IPv4 cksum offload is relaxed, 
it is calculated by the software instead. Without this option, the RSS and 
cksum offload will be forced.
+
 * ``--per-port-pool:`` Optional, set to use independent buffer pools per port. 
Without this option, single buffer pool is used for all ports.
 
 * ``--mode:`` Optional, Packet transfer mode for I/O, poll or eventdev.
@@ -140,7 +142,7 @@ Where,
 
 * ``--event-vector-tmo:`` Optional, Max timeout to form vector in nanoseconds 
if event vectorization is enabled.
 
-* ``--alg=:`` optional, ACL classify method to use, one of:
+* ``--alg=:`` Optional, ACL classify method to use, one of:
   ``scalar|sse|avx2|neon|altivec|avx512x16|avx512x32``
 
 * ``-E:`` Optional, enable exact match,
-- 
2.34.1

[PATCH v2 0/3] example/l3fwd: relax l3fwd rx RSS/Offload if needed

[Trevor Tao]

This series tries to relax l3fwd rx RSS/Offload mode requirement if they
are not supported by underlying hw or virtual devices, there is an
option named relax_rx_mode added to enable this option.

Trevor Tao (3):
  examples/l3fwd: relax RSS requirement with option
  examples/l3fwd: relax the Offload requirement
  doc: add a relax rx mode requirement option

 doc/guides/rel_notes/release_23_11.rst  |  2 ++
 doc/guides/sample_app_ug/l3_forward.rst |  4 ++-
 examples/l3fwd/l3fwd.h  | 12 +++--
 examples/l3fwd/l3fwd_em.h   |  2 +-
 examples/l3fwd/l3fwd_lpm.h  |  2 +-
 examples/l3fwd/main.c   | 33 -
 6 files changed, 49 insertions(+), 6 deletions(-)

-- 
2.34.1

[PATCH v2 1/3] examples/l3fwd: relax RSS requirement with option

[Trevor Tao]

Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS
by default, but some hw and/or virtual interface does not
support the RSS and offload mode presupposed, e.g., some
virtio interfaces in the cloud don't support
RSS and the error msg may like:

virtio_dev_configure(): RSS support requested but not supported by
the device
Port0 dev_configure = -95

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.

An option named "relax-rx-mode" is added to enable the relax action
here, and it's disabled by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/main.c | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 6063eb1399..36a2a77756 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -73,6 +73,7 @@ static enum L3FWD_LOOKUP_MODE lookup_mode;
 static int numa_on = 1; /**< NUMA is enabled by default. */
 static int parse_ptype; /**< Parse packet type using rx callback, and */
/**< disabled by default */
+static int relax_rx_mode; /**< Relax RX mode is disabled by default */
 static int per_port_pool; /**< Use separate buffer pools per port; disabled */
  /**< by default */
 
@@ -678,6 +679,7 @@ static const char short_options[] =
 #define CMD_LINE_OPT_MAX_PKT_LEN "max-pkt-len"
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
 #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+#define CMD_LINE_OPT_RELAX_RX_MODE "relax-rx-mode"
 #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
 #define CMD_LINE_OPT_MODE "mode"
 #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
@@ -705,6 +707,7 @@ enum {
CMD_LINE_OPT_MAX_PKT_LEN_NUM,
CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
CMD_LINE_OPT_PARSE_PTYPE_NUM,
+   CMD_LINE_OPT_RELAX_RX_MODE_NUM,
CMD_LINE_OPT_RULE_IPV4_NUM,
CMD_LINE_OPT_RULE_IPV6_NUM,
CMD_LINE_OPT_ALG_NUM,
@@ -728,6 +731,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, CMD_LINE_OPT_MAX_PKT_LEN_NUM},
{CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
{CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
+   {CMD_LINE_OPT_RELAX_RX_MODE, 0, 0, CMD_LINE_OPT_RELAX_RX_MODE_NUM},
{CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
{CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
@@ -853,6 +857,11 @@ parse_args(int argc, char **argv)
parse_ptype = 1;
break;
 
+   case CMD_LINE_OPT_RELAX_RX_MODE_NUM:
+   printf("Relax rx mode is enabled\n");
+   relax_rx_mode = 1;
+   break;
+
case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
printf("per port buffer pool is enabled\n");
per_port_pool = 1;
@@ -1257,8 +1266,16 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;
 
-   if (dev_info.max_rx_queues == 1)
+   if (dev_info.max_rx_queues == 1) {
local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
+   }
+
+   /* relax the rx rss requirement */
+   if (relax_rx_mode && 
!local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("warning: modified the rx mq_mode to 
RTE_ETH_MQ_RX_NONE base on"
+   " device capability\n");
+   local_port_conf.rxmode.mq_mode = 
RTE_ETH_MQ_RX_NONE;
+   }
 
if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
port_conf.rx_adv_conf.rss_conf.rss_hf) {
-- 
2.34.1

[PATCH v2 3/3] doc: add a relax rx mode requirement option

[Trevor Tao]

Add an option to enable the RX mode requirement relax
in release notes and l3fwd sample guide.

Signed-off-by: Trevor Tao 
---
 doc/guides/rel_notes/release_23_11.rst  | 2 ++
 doc/guides/sample_app_ug/l3_forward.rst | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rst
index f09ecd50fe..2f9e4a54c8 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -84,6 +84,8 @@ New Features
   default. The implementation using C11 standard atomic operations is enabled
   via the ``enable_stdatomic`` build option.
 
+* sample: Added a command option ``--relax-rx-mode`` in l3fwd example
+  to relax the rx RSS/Offload mode requirement if needed.
 
 Removed Items
 -
diff --git a/doc/guides/sample_app_ug/l3_forward.rst 
b/doc/guides/sample_app_ug/l3_forward.rst
index 1cc2c1dd1d..00283f070c 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -126,6 +126,8 @@ Where,
 
 * ``--parse-ptype:`` Optional, set to use software to analyze packet type. 
Without this option, hardware will check the packet type.
 
+* ``--relax-rx-mode:`` Optional, set to enable rx mode relax when RSS/offload 
is not fully supported by the hardware. When the IPv4 cksum offload is relaxed, 
it is calculated by the software instead. Without this option, the RSS and 
cksum offload will be forced.
+
 * ``--per-port-pool:`` Optional, set to use independent buffer pools per port. 
Without this option, single buffer pool is used for all ports.
 
 * ``--mode:`` Optional, Packet transfer mode for I/O, poll or eventdev.
@@ -140,7 +142,7 @@ Where,
 
 * ``--event-vector-tmo:`` Optional, Max timeout to form vector in nanoseconds 
if event vectorization is enabled.
 
-* ``--alg=:`` optional, ACL classify method to use, one of:
+* ``--alg=:`` Optional, ACL classify method to use, one of:
   ``scalar|sse|avx2|neon|altivec|avx512x16|avx512x32``
 
 * ``-E:`` Optional, enable exact match,
-- 
2.34.1

[PATCH v2 1/3] examples/l3fwd: relax RSS requirement with option

[Trevor Tao]

Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS
by default, but some hw and/or virtual interface does not
support the RSS and offload mode presupposed, e.g., some
virtio interfaces in the cloud don't support
RSS and the error msg may like:

virtio_dev_configure(): RSS support requested but not supported by
the device
Port0 dev_configure = -95

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.

An option named "relax-rx-mode" is added to enable the relax action
here, and it's disabled by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/main.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 6063eb1399..89ad546a5e 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -73,6 +73,7 @@ static enum L3FWD_LOOKUP_MODE lookup_mode;
 static int numa_on = 1; /**< NUMA is enabled by default. */
 static int parse_ptype; /**< Parse packet type using rx callback, and */
/**< disabled by default */
+static int relax_rx_mode; /**< Relax RX mode is disabled by default */
 static int per_port_pool; /**< Use separate buffer pools per port; disabled */
  /**< by default */
 
@@ -678,6 +679,7 @@ static const char short_options[] =
 #define CMD_LINE_OPT_MAX_PKT_LEN "max-pkt-len"
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
 #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+#define CMD_LINE_OPT_RELAX_RX_MODE "relax-rx-mode"
 #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
 #define CMD_LINE_OPT_MODE "mode"
 #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
@@ -705,6 +707,7 @@ enum {
CMD_LINE_OPT_MAX_PKT_LEN_NUM,
CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
CMD_LINE_OPT_PARSE_PTYPE_NUM,
+   CMD_LINE_OPT_RELAX_RX_MODE_NUM,
CMD_LINE_OPT_RULE_IPV4_NUM,
CMD_LINE_OPT_RULE_IPV6_NUM,
CMD_LINE_OPT_ALG_NUM,
@@ -728,6 +731,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, CMD_LINE_OPT_MAX_PKT_LEN_NUM},
{CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
{CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
+   {CMD_LINE_OPT_RELAX_RX_MODE, 0, 0, CMD_LINE_OPT_RELAX_RX_MODE_NUM},
{CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
{CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
@@ -853,6 +857,11 @@ parse_args(int argc, char **argv)
parse_ptype = 1;
break;
 
+   case CMD_LINE_OPT_RELAX_RX_MODE_NUM:
+   printf("Relax rx mode is enabled\n");
+   relax_rx_mode = 1;
+   break;
+
case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
printf("per port buffer pool is enabled\n");
per_port_pool = 1;
@@ -1260,6 +1269,13 @@ l3fwd_poll_resource_setup(void)
if (dev_info.max_rx_queues == 1)
local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
 
+   /* relax the rx rss requirement */
+   if (relax_rx_mode && 
!local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("warning: modified the rx mq_mode to 
RTE_ETH_MQ_RX_NONE base on"
+   " device capability\n");
+   local_port_conf.rxmode.mq_mode = 
RTE_ETH_MQ_RX_NONE;
+   }
+
if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
port_conf.rx_adv_conf.rss_conf.rss_hf) {
printf("Port %u modified RSS hash function based on 
hardware support,"
-- 
2.34.1

[PATCH v2 2/3] examples/l3fwd: relax the Offload requirement

[Trevor Tao]

Now the port Rx offload mode is set to RTE_ETH_RX_OFFLOAD_CHECKSUM
by default, but some hw and/or virtual interface does not support
the offload mode presupposed, e.g., some virtio interfaces in
the cloud may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/
RTE_ETH_RX_OFFLOAD_TCP_CKSUM,
but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:

Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads
capabilities 0x201d in rte_eth_dev_configure()

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.
A warning msg would be provided to user in case it happens here.

On the other side, enabling the software cksum check in case missing the
hw support.

The relax action for rx cksum offload is just enabled when relax_rx_mode is
true which is false by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/l3fwd.h | 12 ++--
 examples/l3fwd/l3fwd_em.h  |  2 +-
 examples/l3fwd/l3fwd_lpm.h |  2 +-
 examples/l3fwd/main.c  | 14 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index b55855c932..fd98ad3373 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -159,7 +159,7 @@ send_single_packet(struct lcore_conf *qconf,
 
 #ifdef DO_RFC_1812_CHECKS
 static inline int
-is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len, uint64_t 
ol_flags)
 {
/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
/*
@@ -170,7 +170,15 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t 
link_len)
return -1;
 
/* 2. The IP checksum must be correct. */
-   /* this is checked in H/W */
+   /* if this is not checked in H/W, check it. */
+   if ((ol_flags & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) == 0) {
+   uint16_t actual_cksum, expected_cksum;
+   actual_cksum = pkt->hdr_checksum;
+   pkt->hdr_checksum = 0;
+   expected_cksum = rte_ipv4_cksum(pkt);
+   if (actual_cksum != expected_cksum)
+   return -2;
+   }
 
/*
 * 3. The IP version number must be 4. If the version number is not 4
diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
index 7d051fc076..1fee2e2e6c 100644
--- a/examples/l3fwd/l3fwd_em.h
+++ b/examples/l3fwd/l3fwd_em.h
@@ -20,7 +20,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return BAD_PORT;
}
diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
index c61b969584..4ee61e8d88 100644
--- a/examples/l3fwd/l3fwd_lpm.h
+++ b/examples/l3fwd/l3fwd_lpm.h
@@ -22,7 +22,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return;
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 89ad546a5e..2b815375a9 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1285,6 +1285,20 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}
 
+   /* relax the rx offload requirement */
+   if ((local_port_conf.rxmode.offloads & 
dev_info.rx_offload_capa) !=
+   local_port_conf.rxmode.offloads) {
+   printf("Port %u requested Rx offloads 0x%"PRIx64" does 
not"
+   " match Rx offloads capabilities 0x%"PRIx64"\n",
+   portid, local_port_conf.rxmode.offloads,
+   dev_info.rx_offload_capa);
+   if (relax_rx_mode) {
+   local_port_conf.rxmode.offloads &= 
dev_info.rx_offload_capa;
+   printf("warning: modified the rx offload to 
0x%"PRIx64" based on device"
+   " capability\n", 
local_port_conf.rxmode.offloads);
+   }
+   }
+
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &local_port_conf);
if (ret < 0)
-- 
2.34.1

[PATCH v2 0/3] example/l3fwd: relax l3fwd rx RSS/Offload if needed

[Trevor Tao]

This series tries to relax l3fwd rx RSS/Offload mode requirement if they
are not supported by underlying hw or virtual devices, there is an
option named relax_rx_mode added to enable this option.

Trevor Tao (3):
  examples/l3fwd: relax RSS requirement with option
  examples/l3fwd: relax the Offload requirement
  doc: add a relax rx mode requirement option

 doc/guides/rel_notes/release_23_11.rst  |  2 ++
 doc/guides/sample_app_ug/l3_forward.rst |  4 +++-
 examples/l3fwd/l3fwd.h  | 12 --
 examples/l3fwd/l3fwd_em.h   |  2 +-
 examples/l3fwd/l3fwd_lpm.h  |  2 +-
 examples/l3fwd/main.c   | 30 +
 6 files changed, 47 insertions(+), 5 deletions(-)

-- 
2.34.1

[PATCH v2 1/3] examples/l3fwd: relax RSS requirement with option

[Trevor Tao]

Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS
by default, but some hw and/or virtual interface does not
support the RSS and offload mode presupposed, e.g., some
virtio interfaces in the cloud don't support
RSS and the error msg may like:

virtio_dev_configure(): RSS support requested but not supported by
the device
Port0 dev_configure = -95

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.

An option named "relax-rx-mode" is added to enable the relax action
here, and it's disabled by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/main.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 6063eb1399..89ad546a5e 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -73,6 +73,7 @@ static enum L3FWD_LOOKUP_MODE lookup_mode;
 static int numa_on = 1; /**< NUMA is enabled by default. */
 static int parse_ptype; /**< Parse packet type using rx callback, and */
/**< disabled by default */
+static int relax_rx_mode; /**< Relax RX mode is disabled by default */
 static int per_port_pool; /**< Use separate buffer pools per port; disabled */
  /**< by default */
 
@@ -678,6 +679,7 @@ static const char short_options[] =
 #define CMD_LINE_OPT_MAX_PKT_LEN "max-pkt-len"
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
 #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+#define CMD_LINE_OPT_RELAX_RX_MODE "relax-rx-mode"
 #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
 #define CMD_LINE_OPT_MODE "mode"
 #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
@@ -705,6 +707,7 @@ enum {
CMD_LINE_OPT_MAX_PKT_LEN_NUM,
CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
CMD_LINE_OPT_PARSE_PTYPE_NUM,
+   CMD_LINE_OPT_RELAX_RX_MODE_NUM,
CMD_LINE_OPT_RULE_IPV4_NUM,
CMD_LINE_OPT_RULE_IPV6_NUM,
CMD_LINE_OPT_ALG_NUM,
@@ -728,6 +731,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, CMD_LINE_OPT_MAX_PKT_LEN_NUM},
{CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
{CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
+   {CMD_LINE_OPT_RELAX_RX_MODE, 0, 0, CMD_LINE_OPT_RELAX_RX_MODE_NUM},
{CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
{CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
{CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
@@ -853,6 +857,11 @@ parse_args(int argc, char **argv)
parse_ptype = 1;
break;
 
+   case CMD_LINE_OPT_RELAX_RX_MODE_NUM:
+   printf("Relax rx mode is enabled\n");
+   relax_rx_mode = 1;
+   break;
+
case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
printf("per port buffer pool is enabled\n");
per_port_pool = 1;
@@ -1260,6 +1269,13 @@ l3fwd_poll_resource_setup(void)
if (dev_info.max_rx_queues == 1)
local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
 
+   /* relax the rx rss requirement */
+   if (relax_rx_mode && 
!local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("warning: modified the rx mq_mode to 
RTE_ETH_MQ_RX_NONE base on"
+   " device capability\n");
+   local_port_conf.rxmode.mq_mode = 
RTE_ETH_MQ_RX_NONE;
+   }
+
if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
port_conf.rx_adv_conf.rss_conf.rss_hf) {
printf("Port %u modified RSS hash function based on 
hardware support,"
-- 
2.34.1

[PATCH v2 3/3] doc: add a relax rx mode requirement option

[Trevor Tao]

Add an option to enable the RX mode requirement relax
in release notes and l3fwd sample guide.

Signed-off-by: Trevor Tao 
---
 doc/guides/rel_notes/release_23_11.rst  | 251 +---
 doc/guides/sample_app_ug/l3_forward.rst |   4 +-
 2 files changed, 230 insertions(+), 25 deletions(-)

diff --git a/doc/guides/rel_notes/release_23_11.rst 
b/doc/guides/rel_notes/release_23_11.rst
index f09ecd50fe..3f1d5039c3 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -20,26 +20,14 @@ DPDK Release 23.11
   ninja -C build doc
   xdg-open build/doc/guides/html/rel_notes/release_23_11.html
 
-* Build Requirements: From DPDK 23.11 onwards,
-  building DPDK will require a C compiler which supports the C11 standard,
-  including support for C11 standard atomics.
-
-  More specifically, the requirements will be:
 
-  * Support for flag "-std=c11" (or similar)
-  * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
+New Features
+
 
-  Please note:
+   * **Added support for models with multiple I/O in mldev library.**
 
-  * C11, including standard atomics, is supported from GCC version 5 onwards,
-and is the default language version in that release
-(Ref: https://gcc.gnu.org/gcc-5/changes.html)
-  * C11 is the default compilation mode in Clang from version 3.6,
-which also added support for standard atomics
-(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
+ Added support in mldev library for models with multiple inputs and 
outputs.
 
-New Features
-
 
 .. This section should contain new features added in this release.
Sample format:
@@ -72,18 +60,177 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===
 
-* build: Enabling deprecated libraries is now done using the new
-  ``enable_deprecated_libraries`` build option.
+* **Build requirements increased for C11.**
+
+  From DPDK 23.11 onwards,
+  building DPDK will require a C compiler which supports the C11 standard,
+  including support for C11 standard atomics.
+
+  More specifically, the requirements will be:
 
-* build: Optional libraries can now be selected with the new ``enable_libs``
-  build option similarly to the existing ``enable_drivers`` build option.
+  * Support for flag "-std=c11" (or similar)
+  * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
 
-* eal: Introduced a new API for atomic operations. This new API serves as a
-  wrapper for transitioning to standard atomic operations as described in the
-  C11 standard. This API implementation points at the compiler intrinsics by
-  default. The implementation using C11 standard atomic operations is enabled
+  Please note:
+
+  * C11, including standard atomics, is supported from GCC version 5 onwards,
+and is the default language version in that release
+(Ref: https://gcc.gnu.org/gcc-5/changes.html)
+  * C11 is the default compilation mode in Clang from version 3.6,
+which also added support for standard atomics
+(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
+
+* **Added new build options.**
+
+  * Enabling deprecated libraries is now done using
+the new ``enable_deprecated_libraries`` build option.
+  * Optional libraries can now be selected with the new ``enable_libs``
+build option similarly to the existing ``enable_drivers`` build option.
+
+* **Introduced a new API for atomic operations.**
+
+  This new API serves as a wrapper for transitioning
+  to standard atomic operations as described in the C11 standard.
+  This API implementation points at the compiler intrinsics by default.
+  The implementation using C11 standard atomic operations is enabled
   via the ``enable_stdatomic`` build option.
 
+* **Added support for power intrinsics with AMD processors.**
+
+* **Added support for allow/block list in vmbus bus driver.***
+
+  The ``vmbus`` bus driver now supports -a and -b EAL options for selecting
+  devices.
+
+* **Added mbuf recycling support.**
+
+  Added ``rte_eth_recycle_rx_queue_info_get`` and ``rte_eth_recycle_mbufs``
+  functions which allow the user to copy used mbufs from the Tx mbuf ring
+  into the Rx mbuf ring. This feature supports the case that the Rx Ethernet
+  device is different from the Tx Ethernet device with respective driver
+  callback functions in ``rte_eth_recycle_mbufs``.
+
+* **Added amd-pstate driver support to the power management library.**
+
+  Added support for amd-pstate driver which works on AMD EPYC processors.
+
+* **Added a flow action type for P4-defined actions.**
+
+  For P4-programmable devices, hardware pipeline can be configured through
+  a new "PROG" action type and its associated custom arguments.
+  Such P4 pipeline, not using the standard blocks of the flow API,
+  can be managed with ``RTE_FLOW_ITEM_TYPE_FLEX`` and 
``RTE_FLOW_ACTION_TYPE_PROG``.
+
+* **Added

[PATCH v2 2/3] examples/l3fwd: relax the Offload requirement

[Trevor Tao]

Now the port Rx offload mode is set to RTE_ETH_RX_OFFLOAD_CHECKSUM
by default, but some hw and/or virtual interface does not support
the offload mode presupposed, e.g., some virtio interfaces in
the cloud may only partly support RTE_ETH_RX_OFFLOAD_UDP_CKSUM/
RTE_ETH_RX_OFFLOAD_TCP_CKSUM,
but not RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:

Ethdev port_id=0 requested Rx offloads 0xe does not match Rx offloads
capabilities 0x201d in rte_eth_dev_configure()

So to enable the l3fwd running in that environment, the Rx mode requirement
can be relaxed to reflect the hardware feature reality here, and the l3fwd
can run smoothly then.
A warning msg would be provided to user in case it happens here.

On the other side, enabling the software cksum check in case missing the
hw support.

The relax action for rx cksum offload is just enabled when relax_rx_mode is
true which is false by default.

Signed-off-by: Trevor Tao 
---
 examples/l3fwd/l3fwd.h | 12 ++--
 examples/l3fwd/l3fwd_em.h  |  2 +-
 examples/l3fwd/l3fwd_lpm.h |  2 +-
 examples/l3fwd/main.c  | 14 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index b55855c932..fd98ad3373 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -159,7 +159,7 @@ send_single_packet(struct lcore_conf *qconf,
 
 #ifdef DO_RFC_1812_CHECKS
 static inline int
-is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
+is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len, uint64_t 
ol_flags)
 {
/* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
/*
@@ -170,7 +170,15 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t 
link_len)
return -1;
 
/* 2. The IP checksum must be correct. */
-   /* this is checked in H/W */
+   /* if this is not checked in H/W, check it. */
+   if ((ol_flags & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) == 0) {
+   uint16_t actual_cksum, expected_cksum;
+   actual_cksum = pkt->hdr_checksum;
+   pkt->hdr_checksum = 0;
+   expected_cksum = rte_ipv4_cksum(pkt);
+   if (actual_cksum != expected_cksum)
+   return -2;
+   }
 
/*
 * 3. The IP version number must be 4. If the version number is not 4
diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
index 7d051fc076..1fee2e2e6c 100644
--- a/examples/l3fwd/l3fwd_em.h
+++ b/examples/l3fwd/l3fwd_em.h
@@ -20,7 +20,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return BAD_PORT;
}
diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
index c61b969584..4ee61e8d88 100644
--- a/examples/l3fwd/l3fwd_lpm.h
+++ b/examples/l3fwd/l3fwd_lpm.h
@@ -22,7 +22,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
 
 #ifdef DO_RFC_1812_CHECKS
/* Check to make sure the packet is valid (RFC1812) */
-   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len) < 0) {
+   if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt_len, m->ol_flags) < 0) {
rte_pktmbuf_free(m);
return;
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 89ad546a5e..2b815375a9 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1285,6 +1285,20 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}
 
+   /* relax the rx offload requirement */
+   if ((local_port_conf.rxmode.offloads & 
dev_info.rx_offload_capa) !=
+   local_port_conf.rxmode.offloads) {
+   printf("Port %u requested Rx offloads 0x%"PRIx64" does 
not"
+   " match Rx offloads capabilities 0x%"PRIx64"\n",
+   portid, local_port_conf.rxmode.offloads,
+   dev_info.rx_offload_capa);
+   if (relax_rx_mode) {
+   local_port_conf.rxmode.offloads &= 
dev_info.rx_offload_capa;
+   printf("warning: modified the rx offload to 
0x%"PRIx64" based on device"
+   " capability\n", 
local_port_conf.rxmode.offloads);
+   }
+   }
+
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &local_port_conf);
if (ret < 0)
-- 
2.34.1

[PATCH v2 0/3] example/l3fwd: relax l3fwd rx RSS/Offload if needed

[Trevor Tao]

This series tries to relax l3fwd rx RSS/Offload mode requirement if they
are not supported by underlying hw or virtual devices, there is an
option named relax_rx_mode added to enable this option.

Trevor Tao (3):
  examples/l3fwd: relax RSS requirement with option
  examples/l3fwd: relax the Offload requirement
  doc: add a relax rx mode requirement option

 doc/guides/rel_notes/release_23_11.rst  | 251 +---
 doc/guides/sample_app_ug/l3_forward.rst |   4 +-
 examples/l3fwd/l3fwd.h  |  12 +-
 examples/l3fwd/l3fwd_em.h   |   2 +-
 examples/l3fwd/l3fwd_lpm.h  |   2 +-
 examples/l3fwd/main.c   |  30 +++
 6 files changed, 272 insertions(+), 29 deletions(-)

-- 
2.34.1

RE: [PATCH v12 1/2] mempool cache: add zero-copy get and put functions

[Morten Brørup]

> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Monday, 31 July 2023 14.17
> 
> Olivier, Andrew, any comments?

What is the status with this patch series? The DPDK 23.11 deadline is coming up 
very soon.

> 
> 
> 21/07/2023 18:28, Dharmik Thakkar:
> > From: Morten Brørup 
> >
> > Zero-copy access to mempool caches is beneficial for PMD performance.
> > Furthermore, having a zero-copy mempool API is considered a
> precondition
> > for fixing a certain category of bugs, present in some PMDs: For
> > performance reasons, some PMDs had bypassed the mempool API in order
> to
> > achieve zero-copy access to the mempool cache. This can only be fixed
> > in those PMDs without a performance regression if the mempool library
> > offers zero-copy access APIs, so the PMDs can use the proper mempool
> > API instead of copy-pasting code from the mempool library.
> > Furthermore, the copy-pasted code in those PMDs has not been kept up
> to
> > date with the improvements of the mempool library, so when they bypass
> > the mempool API, mempool trace is missing and mempool statistics is
> not
> > updated.
> >
> > Bugzilla ID: 1052
> >
> > Signed-off-by: Morten Brørup 
> > Signed-off-by: Kamalakshitha Aligeri 
> > Signed-off-by: Dharmik Thakkar 
> > Reviewed-by: Ruifeng Wang 
> > Acked-by: Konstantin Ananyev 
> > Acked-by: Chengwen Feng 
> 
> 
> 

[PATCH v3 00/11] Unify the PMD coding style

[Chaoyong He]

This patch series aims to unify the coding style of NFP PMD, make the
logics following the same rules, to make it easier to understand and
extend.
Also prepare for the upcoming vDPA PMD patch series.

---
v2:
* Add some missing modification.
v3:
* Remove the '\t' character in the log statement as the advice of
  reviewer.
---

Chaoyong He (11):
  net/nfp: explicitly compare to null and 0
  net/nfp: unify the indent coding style
  net/nfp: unify the type of integer variable
  net/nfp: standard the local variable coding style
  net/nfp: adjust the log statement
  net/nfp: standard the comment style
  net/nfp: standard the blank character
  net/nfp: unify the guide line of header file
  net/nfp: rename some parameter and variable
  net/nfp: adjust logic to make it more readable
  net/nfp: refact the meson build file

 drivers/net/nfp/flower/nfp_conntrack.c|   4 +-
 drivers/net/nfp/flower/nfp_flower.c   |  27 +-
 drivers/net/nfp/flower/nfp_flower.h   |  34 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.c  |  18 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.h  |  62 +-
 drivers/net/nfp/flower/nfp_flower_ctrl.c  |  39 +-
 drivers/net/nfp/flower/nfp_flower_ctrl.h  |   6 +-
 .../net/nfp/flower/nfp_flower_representor.c   |  46 +-
 .../net/nfp/flower/nfp_flower_representor.h   |   8 +-
 drivers/net/nfp/meson.build   |  23 +-
 drivers/net/nfp/nfd3/nfp_nfd3.h   |  39 +-
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c|  34 +-
 drivers/net/nfp/nfdk/nfp_nfdk.h   |  49 +-
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c|  14 +-
 drivers/net/nfp/nfp_common.c  | 775 +-
 drivers/net/nfp/nfp_common.h  | 169 ++--
 drivers/net/nfp/nfp_cpp_bridge.c  | 139 ++--
 drivers/net/nfp/nfp_cpp_bridge.h  |   8 +-
 drivers/net/nfp/nfp_ctrl.h|  46 +-
 drivers/net/nfp/nfp_ethdev.c  | 325 
 drivers/net/nfp/nfp_ethdev_vf.c   | 195 ++---
 drivers/net/nfp/nfp_flow.c| 251 +++---
 drivers/net/nfp/nfp_flow.h|  23 +-
 drivers/net/nfp/nfp_ipsec.h   |  12 +-
 drivers/net/nfp/nfp_logs.h|   7 +-
 drivers/net/nfp/nfp_rxtx.c| 296 +++
 drivers/net/nfp/nfp_rxtx.h|  36 +-
 drivers/net/nfp/nfpcore/nfp_resource.h|   2 +-
 28 files changed, 1299 insertions(+), 1388 deletions(-)

-- 
2.39.1

[PATCH v3 01/11] net/nfp: explicitly compare to null and 0

[Chaoyong He]

To compliance with the coding standard, make the pointer variable
explicitly comparing to 'NULL' and the integer variable explicitly
comparing to '0'.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.c  |   6 +-
 drivers/net/nfp/flower/nfp_flower_ctrl.c |   6 +-
 drivers/net/nfp/nfp_common.c | 144 +++
 drivers/net/nfp/nfp_cpp_bridge.c |   2 +-
 drivers/net/nfp/nfp_ethdev.c |  38 +++---
 drivers/net/nfp/nfp_ethdev_vf.c  |  14 +--
 drivers/net/nfp/nfp_flow.c   |  90 +++---
 drivers/net/nfp/nfp_rxtx.c   |  28 ++---
 8 files changed, 165 insertions(+), 163 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 98e6f7f927..3ddaf0f28d 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -69,7 +69,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)
new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;
 
/* If an error when reconfig we avoid to change hw state */
-   if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
+   if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
return;
 
hw->ctrl = new_ctrl;
@@ -100,7 +100,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
 
update |= NFP_NET_CFG_UPDATE_RSS;
 
-   if (hw->cap & NFP_NET_CFG_CTRL_RSS2)
+   if ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RSS2;
else
new_ctrl |= NFP_NET_CFG_CTRL_RSS;
@@ -110,7 +110,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
 
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
 
-   if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
+   if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
 
nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c 
b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index c5282053cf..b564e7cd73 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -103,7 +103,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,
}
 
/* Filling the received mbuf with packet info */
-   if (hw->rx_offset)
+   if (hw->rx_offset != 0)
mb->data_off = RTE_PKTMBUF_HEADROOM + hw->rx_offset;
else
mb->data_off = RTE_PKTMBUF_HEADROOM + 
NFP_DESC_META_LEN(rxds);
@@ -195,7 +195,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower 
*app_fw_flower,
 
lmbuf = &txq->txbufs[txq->wr_p].mbuf;
RTE_MBUF_PREFETCH_TO_FREE(*lmbuf);
-   if (*lmbuf)
+   if (*lmbuf != NULL)
rte_pktmbuf_free_seg(*lmbuf);
 
*lmbuf = mbuf;
@@ -337,7 +337,7 @@ nfp_flower_ctrl_vnic_nfdk_xmit(struct nfp_app_fw_flower 
*app_fw_flower,
}
 
txq->wr_p = D_IDX(txq, txq->wr_p + used_descs);
-   if (txq->wr_p % NFDK_TX_DESC_BLOCK_CNT)
+   if (txq->wr_p % NFDK_TX_DESC_BLOCK_CNT != 0)
txq->data_pending += mbuf->pkt_len;
else
txq->data_pending = 0;
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 5683afc40a..36752583dd 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -221,7 +221,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update)
new = nn_cfg_readl(hw, NFP_NET_CFG_UPDATE);
if (new == 0)
break;
-   if (new & NFP_NET_CFG_UPDATE_ERR) {
+   if ((new & NFP_NET_CFG_UPDATE_ERR) != 0) {
PMD_INIT_LOG(ERR, "Reconfig error: 0x%08x", new);
return -1;
}
@@ -390,18 +390,18 @@ nfp_net_configure(struct rte_eth_dev *dev)
rxmode = &dev_conf->rxmode;
txmode = &dev_conf->txmode;
 
-   if (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+   if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0)
rxmode->offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
/* Checking TX mode */
-   if (txmode->mq_mode) {
+   if (txmode->mq_mode != RTE_ETH_MQ_TX_NONE) {
PMD_INIT_LOG(INFO, "TX mq_mode DCB and VMDq not supported");
return -EINVAL;
}
 
/* Checking RX mode */
-   if (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG &&
-   !(hw->cap & NFP_NET_CFG_CTRL_RSS_ANY)) {
+   if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 &&
+   (hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
PMD_INIT_LOG(INFO, "RSS not supported");
return -EINVAL;
}
@@ -493,11 +493,11 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)
update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |
 NFP_NET_CFG_UPDATE_MSIX;
 

[PATCH v3 02/11] net/nfp: unify the indent coding style

[Chaoyong He]

Each parameter of function should occupy one line, and indent two TAB
character.
All the statement which span multi line should indent two TAB character.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.c   |   5 +-
 drivers/net/nfp/flower/nfp_flower_ctrl.c  |   7 +-
 .../net/nfp/flower/nfp_flower_representor.c   |   2 +-
 drivers/net/nfp/nfdk/nfp_nfdk.h   |   2 +-
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c|   4 +-
 drivers/net/nfp/nfp_common.c  | 250 +-
 drivers/net/nfp/nfp_common.h  |  81 --
 drivers/net/nfp/nfp_cpp_bridge.c  |  56 ++--
 drivers/net/nfp/nfp_ethdev.c  |  82 +++---
 drivers/net/nfp/nfp_ethdev_vf.c   |  66 +++--
 drivers/net/nfp/nfp_flow.c|  36 +--
 drivers/net/nfp/nfp_rxtx.c|  86 +++---
 drivers/net/nfp/nfp_rxtx.h|  10 +-
 13 files changed, 358 insertions(+), 329 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 3ddaf0f28d..3352693d71 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -63,7 +63,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)
 
new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE;
update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |
-NFP_NET_CFG_UPDATE_MSIX;
+   NFP_NET_CFG_UPDATE_MSIX;
 
if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;
@@ -330,7 +330,8 @@ nfp_flower_pf_xmit_pkts(void *tx_queue,
 }
 
 static int
-nfp_flower_init_vnic_common(struct nfp_net_hw *hw, const char *vnic_type)
+nfp_flower_init_vnic_common(struct nfp_net_hw *hw,
+   const char *vnic_type)
 {
int err;
uint32_t start_q;
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c 
b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index b564e7cd73..4967cc2375 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -64,9 +64,8 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,
 */
new_mb = rte_pktmbuf_alloc(rxq->mem_pool);
if (unlikely(new_mb == NULL)) {
-   PMD_RX_LOG(ERR,
-   "RX mbuf alloc failed port_id=%u queue_id=%hu",
-   rxq->port_id, rxq->qidx);
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u 
queue_id=%hu",
+   rxq->port_id, rxq->qidx);
nfp_net_mbuf_alloc_failed(rxq);
break;
}
@@ -141,7 +140,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,
rte_wmb();
if (nb_hold >= rxq->rx_free_thresh) {
PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu",
-   rxq->port_id, rxq->qidx, nb_hold, avail);
+   rxq->port_id, rxq->qidx, nb_hold, avail);
nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold);
nb_hold = 0;
}
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index e4c5d765e7..013ecbc998 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -830,7 +830,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower)
snprintf(flower_repr.name, sizeof(flower_repr.name),
"%s_repr_vf%d", pci_name, i);
 
-/* This will also allocate private memory for the device*/
+   /* This will also allocate private memory for the device*/
ret = rte_eth_dev_create(eth_dev->device, flower_repr.name,
sizeof(struct nfp_flower_representor),
NULL, NULL, nfp_flower_repr_init, &flower_repr);
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index 75ecb361ee..99675b6bd7 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -143,7 +143,7 @@ nfp_net_nfdk_free_tx_desc(struct nfp_net_txq *txq)
free_desc = txq->rd_p - txq->wr_p;
 
return (free_desc > NFDK_TX_DESC_STOP_CNT) ?
-   (free_desc - NFDK_TX_DESC_STOP_CNT) : 0;
+   (free_desc - NFDK_TX_DESC_STOP_CNT) : 0;
 }
 
 /*
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c 
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index d4bd5edb0a..2426ffb261 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -101,9 +101,7 @@ static inline uint16_t
 nfp_net_nfdk_headlen_to_segs(uint16_t headlen)
 {
/* First descriptor fits less data, so adjust for that */
-   return DIV_ROUND_UP(head

[PATCH v3 03/11] net/nfp: unify the type of integer variable

[Chaoyong He]

Unify the type of integer variable to the DPDK prefer style.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.c  |  2 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.c | 16 +-
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c   |  6 ++--
 drivers/net/nfp/nfp_common.c | 37 +---
 drivers/net/nfp/nfp_common.h | 16 +-
 drivers/net/nfp/nfp_ethdev.c | 24 +++
 drivers/net/nfp/nfp_ethdev_vf.c  |  2 +-
 drivers/net/nfp/nfp_flow.c   |  8 ++---
 drivers/net/nfp/nfp_rxtx.c   | 12 
 drivers/net/nfp/nfp_rxtx.h   |  2 +-
 10 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 3352693d71..7dd1423aaf 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -26,7 +26,7 @@ nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)
 {
struct nfp_net_hw *hw;
uint64_t enabled_queues = 0;
-   int i;
+   uint16_t i;
struct nfp_flower_representor *repr;
 
repr = dev->data->dev_private;
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c 
b/drivers/net/nfp/flower/nfp_flower_cmsg.c
index 6b9532f5b6..5d6912b079 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.c
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c
@@ -64,10 +64,10 @@ nfp_flower_cmsg_mac_repr_init(struct rte_mbuf *mbuf,
 
 static void
 nfp_flower_cmsg_mac_repr_fill(struct rte_mbuf *m,
-   unsigned int idx,
-   unsigned int nbi,
-   unsigned int nbi_port,
-   unsigned int phys_port)
+   uint8_t idx,
+   uint32_t nbi,
+   uint32_t nbi_port,
+   uint32_t phys_port)
 {
struct nfp_flower_cmsg_mac_repr *msg;
 
@@ -81,11 +81,11 @@ nfp_flower_cmsg_mac_repr_fill(struct rte_mbuf *m,
 int
 nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower)
 {
-   int i;
+   uint8_t i;
uint16_t cnt;
-   unsigned int nbi;
-   unsigned int nbi_port;
-   unsigned int phys_port;
+   uint32_t nbi;
+   uint32_t nbi_port;
+   uint32_t phys_port;
struct rte_mbuf *mbuf;
struct nfp_eth_table *nfp_eth_table;
 
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c 
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 64928254d8..5a84629ed7 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -227,9 +227,9 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,
uint16_t nb_pkts,
bool repr_flag)
 {
-   int i;
-   int pkt_size;
-   int dma_size;
+   uint16_t i;
+   uint32_t pkt_size;
+   uint16_t dma_size;
uint8_t offset;
uint64_t dma_addr;
uint16_t free_descs;
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 9719a9212b..cb2c2afbd7 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -199,7 +199,7 @@ static int
 __nfp_net_reconfig(struct nfp_net_hw *hw,
uint32_t update)
 {
-   int cnt;
+   uint32_t cnt;
uint32_t new;
struct timespec wait;
 
@@ -229,7 +229,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
}
if (cnt >= NFP_NET_POLL_TIMEOUT) {
PMD_INIT_LOG(ERR, "Reconfig timeout for 0x%08x after"
-   " %dms", update, cnt);
+   " %ums", update, cnt);
return -EIO;
}
nanosleep(&wait, 0); /* waiting for a 1ms */
@@ -466,7 +466,7 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)
 {
struct nfp_net_hw *hw;
uint64_t enabled_queues = 0;
-   int i;
+   uint16_t i;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -575,7 +575,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,
struct rte_intr_handle *intr_handle)
 {
struct nfp_net_hw *hw;
-   int i;
+   uint16_t i;
 
if (rte_intr_vec_list_alloc(intr_handle, "intr_vec",
dev->data->nb_rx_queues) != 0) {
@@ -832,7 +832,7 @@ int
 nfp_net_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats)
 {
-   int i;
+   uint16_t i;
struct nfp_net_hw *hw;
struct rte_eth_stats nfp_dev_stats;
 
@@ -923,7 +923,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev,
 int
 nfp_net_stats_reset(struct rte_eth_dev *dev)
 {
-   int i;
+   uint16_t i;
struct nfp_net_hw *hw;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -1398,7 +1398,7 @@ nfp_rx_queue_intr_enable(struct rte_eth_dev *dev,
 {
struct rte_pci_device *pci_dev;
struct nfp_net_hw *hw;
-   int base = 0;
+   uint16_t base = 0;
 
hw 

[PATCH v3 04/11] net/nfp: standard the local variable coding style

[Chaoyong He]

There should only declare one local variable in each line, and the local
variable should obey the unify sequence.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.c |  6 +-
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c  |  4 +-
 drivers/net/nfp/nfp_common.c| 97 -
 drivers/net/nfp/nfp_common.h|  3 +-
 drivers/net/nfp/nfp_cpp_bridge.c| 39 
 drivers/net/nfp/nfp_ethdev.c| 47 +++---
 drivers/net/nfp/nfp_ethdev_vf.c | 23 +++
 drivers/net/nfp/nfp_flow.c  | 28 -
 drivers/net/nfp/nfp_rxtx.c  | 38 +--
 9 files changed, 154 insertions(+), 131 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 7dd1423aaf..7a4e671178 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -24,9 +24,9 @@
 static void
 nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)
 {
+   uint16_t i;
struct nfp_net_hw *hw;
uint64_t enabled_queues = 0;
-   uint16_t i;
struct nfp_flower_representor *repr;
 
repr = dev->data->dev_private;
@@ -50,9 +50,9 @@ nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)
 static void
 nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)
 {
-   struct nfp_net_hw *hw;
+   uint32_t update;
uint32_t new_ctrl;
-   uint32_t update = 0;
+   struct nfp_net_hw *hw;
struct nfp_flower_representor *repr;
 
repr = dev->data->dev_private;
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c 
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 5a84629ed7..699f65ebef 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -228,13 +228,13 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,
bool repr_flag)
 {
uint16_t i;
+   uint8_t offset;
uint32_t pkt_size;
uint16_t dma_size;
-   uint8_t offset;
uint64_t dma_addr;
uint16_t free_descs;
-   uint16_t issued_descs;
struct rte_mbuf *pkt;
+   uint16_t issued_descs;
struct nfp_net_hw *hw;
struct rte_mbuf **lmbuf;
struct nfp_net_txq *txq;
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index cb2c2afbd7..18291a1cde 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -375,10 +375,10 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *hw,
 int
 nfp_net_configure(struct rte_eth_dev *dev)
 {
+   struct nfp_net_hw *hw;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
struct rte_eth_txmode *txmode;
-   struct nfp_net_hw *hw;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -464,9 +464,9 @@ nfp_net_enbable_rxvlan_cap(struct nfp_net_hw *hw,
 void
 nfp_net_enable_queues(struct rte_eth_dev *dev)
 {
+   uint16_t i;
struct nfp_net_hw *hw;
uint64_t enabled_queues = 0;
-   uint16_t i;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -488,8 +488,9 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)
 void
 nfp_net_disable_queues(struct rte_eth_dev *dev)
 {
+   uint32_t update;
+   uint32_t new_ctrl;
struct nfp_net_hw *hw;
-   uint32_t new_ctrl, update = 0;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -528,9 +529,10 @@ void
 nfp_net_write_mac(struct nfp_net_hw *hw,
uint8_t *mac)
 {
-   uint32_t mac0 = *(uint32_t *)mac;
+   uint32_t mac0;
uint16_t mac1;
 
+   mac0 = *(uint32_t *)mac;
nn_writel(rte_cpu_to_be_32(mac0), hw->ctrl_bar + NFP_NET_CFG_MACADDR);
 
mac += 4;
@@ -543,8 +545,9 @@ int
 nfp_net_set_mac_addr(struct rte_eth_dev *dev,
struct rte_ether_addr *mac_addr)
 {
+   uint32_t ctrl;
+   uint32_t update;
struct nfp_net_hw *hw;
-   uint32_t update, ctrl;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
@@ -574,8 +577,8 @@ int
 nfp_configure_rx_interrupt(struct rte_eth_dev *dev,
struct rte_intr_handle *intr_handle)
 {
-   struct nfp_net_hw *hw;
uint16_t i;
+   struct nfp_net_hw *hw;
 
if (rte_intr_vec_list_alloc(intr_handle, "intr_vec",
dev->data->nb_rx_queues) != 0) {
@@ -615,11 +618,11 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,
 uint32_t
 nfp_check_offloads(struct rte_eth_dev *dev)
 {
+   uint32_t ctrl = 0;
struct nfp_net_hw *hw;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
struct rte_eth_txmode *txmode;
-   uint32_t ctrl = 0;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -682,9 +685,10 @@ nfp_check_offloads(struct rte_eth_dev *dev)
 int
 nfp_net_promisc_enable(struct rte_eth_dev *dev)
 {
-   uint32_t new_ctrl, update = 0

[PATCH v3 05/11] net/nfp: adjust the log statement

[Chaoyong He]

Add log statement to the important control logic, and remove verbose
info log statement.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower_ctrl.c  | 10 +---
 .../net/nfp/flower/nfp_flower_representor.c   |  4 +-
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c|  2 -
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c|  2 -
 drivers/net/nfp/nfp_common.c  | 59 ---
 drivers/net/nfp/nfp_cpp_bridge.c  | 28 -
 drivers/net/nfp/nfp_ethdev.c  | 21 +--
 drivers/net/nfp/nfp_ethdev_vf.c   | 17 +-
 drivers/net/nfp/nfp_logs.h|  1 -
 drivers/net/nfp/nfp_rxtx.c| 22 ++-
 10 files changed, 50 insertions(+), 116 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c 
b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index 4967cc2375..d1c350ae93 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -88,15 +88,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,
 * responsibility of avoiding it. But we have
 * to give some info about the error
 */
-   PMD_RX_LOG(ERR,
-   "mbuf overflow likely due to the RX offset.\n"
-   "\t\tYour mbuf size should have extra space for"
-   " RX offset=%u bytes.\n"
-   "\t\tCurrently you just have %u bytes available"
-   " but the received packet is %u bytes long",
-   hw->rx_offset,
-   rxq->mbuf_size - hw->rx_offset,
-   mb->data_len);
+   PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX 
offset.");
rte_pktmbuf_free(mb);
break;
}
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 013ecbc998..bf794a1d70 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -464,7 +464,7 @@ nfp_flower_repr_rx_burst(void *rx_queue,
total_dequeue = rte_ring_dequeue_burst(repr->ring, (void *)rx_pkts,
nb_pkts, &available);
if (total_dequeue != 0) {
-   PMD_RX_LOG(DEBUG, "Representor Rx burst for %s, port_id: 0x%x, "
+   PMD_RX_LOG(DEBUG, "Representor Rx burst for %s, port_id: %#x, "
"received: %u, available: %u", repr->name,
repr->port_id, total_dequeue, available);
 
@@ -510,7 +510,7 @@ nfp_flower_repr_tx_burst(void *tx_queue,
pf_tx_queue = dev->data->tx_queues[0];
sent = nfp_flower_pf_xmit_pkts(pf_tx_queue, tx_pkts, nb_pkts);
if (sent != 0) {
-   PMD_TX_LOG(DEBUG, "Representor Tx burst for %s, port_id: 0x%x 
transmitted: %u",
+   PMD_TX_LOG(DEBUG, "Representor Tx burst for %s, port_id: %#x 
transmitted: %hu",
repr->name, repr->port_id, sent);
repr->repr_stats.opackets += sent;
}
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c 
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 699f65ebef..51755f4324 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -381,8 +381,6 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-   PMD_INIT_FUNC_TRACE();
-
nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);
 
/* Validating number of descriptors */
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c 
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 2426ffb261..dae87ac6df 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -455,8 +455,6 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-   PMD_INIT_FUNC_TRACE();
-
nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);
 
/* Validating number of descriptors */
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 18291a1cde..f48e1930dc 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -207,7 +207,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
hw->qcp_cfg);
 
if (hw->qcp_cfg == NULL) {
-   PMD_INIT_LOG(ERR, "Bad configuration queue pointer");
+   PMD_DRV_LOG(ERR, "Bad configuration queue pointer");
return -ENXIO;
}
 
@@ -224,15 +224,15 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
if (new == 0)
break;
if ((new & NFP_NET_CFG_UPDATE_ERR) != 0) {
- 

[PATCH v3 06/11] net/nfp: standard the comment style

[Chaoyong He]

Follow the DPDK coding style, use the kdoc comment style.
Also delete some comment which are not valid anymore and add some
comment to help understand logic.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_conntrack.c|   4 +-
 drivers/net/nfp/flower/nfp_flower.c   |  10 +-
 drivers/net/nfp/flower/nfp_flower.h   |  28 ++--
 drivers/net/nfp/flower/nfp_flower_cmsg.c  |   2 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.h  |  56 +++
 drivers/net/nfp/flower/nfp_flower_ctrl.c  |  16 +-
 .../net/nfp/flower/nfp_flower_representor.c   |  42 +++--
 .../net/nfp/flower/nfp_flower_representor.h   |   2 +-
 drivers/net/nfp/nfd3/nfp_nfd3.h   |  33 ++--
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c|  24 ++-
 drivers/net/nfp/nfdk/nfp_nfdk.h   |  41 ++---
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c|   8 +-
 drivers/net/nfp/nfp_common.c  | 152 --
 drivers/net/nfp/nfp_common.h  |  61 +++
 drivers/net/nfp/nfp_cpp_bridge.c  |   6 +-
 drivers/net/nfp/nfp_ctrl.h|  34 ++--
 drivers/net/nfp/nfp_ethdev.c  |  40 +++--
 drivers/net/nfp/nfp_ethdev_vf.c   |  15 +-
 drivers/net/nfp/nfp_flow.c|  62 +++
 drivers/net/nfp/nfp_flow.h|  10 +-
 drivers/net/nfp/nfp_ipsec.h   |  12 +-
 drivers/net/nfp/nfp_rxtx.c| 125 ++
 drivers/net/nfp/nfp_rxtx.h|  18 +--
 23 files changed, 354 insertions(+), 447 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_conntrack.c 
b/drivers/net/nfp/flower/nfp_conntrack.c
index 7b84b12546..f89003be8b 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.c
+++ b/drivers/net/nfp/flower/nfp_conntrack.c
@@ -667,8 +667,8 @@ nfp_ct_flow_entry_get(struct nfp_ct_zone_entry *ze,
 {
bool ret;
uint8_t loop;
-   uint8_t item_cnt = 1;  /* the RTE_FLOW_ITEM_TYPE_END */
-   uint8_t action_cnt = 1;/* the RTE_FLOW_ACTION_TYPE_END */
+   uint8_t item_cnt = 1;  /* The RTE_FLOW_ITEM_TYPE_END */
+   uint8_t action_cnt = 1;/* The RTE_FLOW_ACTION_TYPE_END */
struct nfp_flow_priv *priv;
struct nfp_ct_map_entry *me;
struct nfp_ct_flow_entry *fe;
diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 7a4e671178..4453ae7b5e 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -208,7 +208,7 @@ nfp_flower_pf_close(struct rte_eth_dev *dev)
nfp_net_reset_rx_queue(this_rx_q);
}
 
-   /* Cancel possible impending LSC work here before releasing the port*/
+   /* Cancel possible impending LSC work here before releasing the port */
rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void 
*)dev);
 
nn_cfg_writeb(hw, NFP_NET_CFG_LSC, 0xff);
@@ -488,7 +488,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
 
/*
 * Tracking mbuf size for detecting a potential mbuf overflow 
due to
-* RX offset
+* RX offset.
 */
rxq->mem_pool = mp;
rxq->mbuf_size = rxq->mem_pool->elt_size;
@@ -535,7 +535,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
 
/*
 * Telling the HW about the physical address of the RX ring and 
number
-* of descriptors in log2 format
+* of descriptors in log2 format.
 */
nn_cfg_writeq(hw, NFP_NET_CFG_RXR_ADDR(i), rxq->dma);
nn_cfg_writeb(hw, NFP_NET_CFG_RXR_SZ(i), 
rte_log2_u32(CTRL_VNIC_NB_DESC));
@@ -600,7 +600,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)
 
/*
 * Telling the HW about the physical address of the TX ring and 
number
-* of descriptors in log2 format
+* of descriptors in log2 format.
 */
nn_cfg_writeq(hw, NFP_NET_CFG_TXR_ADDR(i), txq->dma);
nn_cfg_writeb(hw, NFP_NET_CFG_TXR_SZ(i), 
rte_log2_u32(CTRL_VNIC_NB_DESC));
@@ -758,7 +758,7 @@ nfp_flower_enable_services(struct nfp_app_fw_flower 
*app_fw_flower)
app_fw_flower->ctrl_vnic_id = service_id;
PMD_INIT_LOG(INFO, "%s registered", flower_service.name);
 
-   /* Map them to available service cores*/
+   /* Map them to available service cores */
ret = nfp_map_service(service_id);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Could not map %s", flower_service.name);
diff --git a/drivers/net/nfp/flower/nfp_flower.h 
b/drivers/net/nfp/flower/nfp_flower.h
index 244b6daa37..0b4e38cedd 100644
--- a/drivers/net/nfp/flower/nfp_flower.h
+++ b/drivers/net/nfp/flower/nfp_flower.h
@@ -53,49 +53,49 @@ struct nfp_flower_nfd_func {
 
 /* The flower application's p

[PATCH v3 07/11] net/nfp: standard the blank character

[Chaoyong He]

Use space character to align instead of TAB character.
There should one blank line to split the block of logic, no more no less.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_common.c   | 39 +
 drivers/net/nfp/nfp_common.h   |  6 +--
 drivers/net/nfp/nfp_cpp_bridge.c   |  5 +++
 drivers/net/nfp/nfp_ctrl.h |  6 +--
 drivers/net/nfp/nfp_ethdev.c   | 58 +-
 drivers/net/nfp/nfp_ethdev_vf.c| 49 +++---
 drivers/net/nfp/nfp_flow.c | 27 +++-
 drivers/net/nfp/nfp_flow.h |  7 
 drivers/net/nfp/nfp_rxtx.c |  7 ++--
 drivers/net/nfp/nfpcore/nfp_resource.h |  2 +-
 10 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 130f004b4d..a102c6f272 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -36,6 +36,7 @@ enum nfp_xstat_group {
NFP_XSTAT_GROUP_NET,
NFP_XSTAT_GROUP_MAC
 };
+
 struct nfp_xstat {
char name[RTE_ETH_XSTATS_NAME_SIZE];
int offset;
@@ -184,6 +185,7 @@ nfp_net_notify_port_speed(struct nfp_net_hw *hw,
nn_cfg_writew(hw, NFP_NET_CFG_STS_NSP_LINK_RATE, 
NFP_NET_CFG_STS_LINK_RATE_UNKNOWN);
return;
}
+
/*
 * Link is up so write the link speed from the eth_table to
 * NFP_NET_CFG_STS_NSP_LINK_RATE.
@@ -223,17 +225,21 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
new = nn_cfg_readl(hw, NFP_NET_CFG_UPDATE);
if (new == 0)
break;
+
if ((new & NFP_NET_CFG_UPDATE_ERR) != 0) {
PMD_DRV_LOG(ERR, "Reconfig error: %#08x", new);
return -1;
}
+
if (cnt >= NFP_NET_POLL_TIMEOUT) {
PMD_DRV_LOG(ERR, "Reconfig timeout for %#08x after %u 
ms",
update, cnt);
return -EIO;
}
+
nanosleep(&wait, 0); /* Waiting for a 1ms */
}
+
PMD_DRV_LOG(DEBUG, "Ack DONE");
return 0;
 }
@@ -387,7 +393,6 @@ nfp_net_configure(struct rte_eth_dev *dev)
struct rte_eth_txmode *txmode;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-
dev_conf = &dev->data->dev_conf;
rxmode = &dev_conf->rxmode;
txmode = &dev_conf->txmode;
@@ -560,11 +565,13 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)
ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;
+
/* Signal the NIC about the change */
if (nfp_net_reconfig(hw, ctrl, update) != 0) {
PMD_DRV_LOG(ERR, "MAC address update failed");
return -EIO;
}
+
return 0;
 }
 
@@ -832,13 +839,11 @@ nfp_net_stats_get(struct rte_eth_dev *dev,
 
nfp_dev_stats.q_ipackets[i] =
nn_cfg_readq(hw, NFP_NET_CFG_RXR_STATS(i));
-
nfp_dev_stats.q_ipackets[i] -=
hw->eth_stats_base.q_ipackets[i];
 
nfp_dev_stats.q_ibytes[i] =
nn_cfg_readq(hw, NFP_NET_CFG_RXR_STATS(i) + 
0x8);
-
nfp_dev_stats.q_ibytes[i] -=
hw->eth_stats_base.q_ibytes[i];
}
@@ -850,42 +855,34 @@ nfp_net_stats_get(struct rte_eth_dev *dev,
 
nfp_dev_stats.q_opackets[i] =
nn_cfg_readq(hw, NFP_NET_CFG_TXR_STATS(i));
-
nfp_dev_stats.q_opackets[i] -= hw->eth_stats_base.q_opackets[i];
 
nfp_dev_stats.q_obytes[i] =
nn_cfg_readq(hw, NFP_NET_CFG_TXR_STATS(i) + 
0x8);
-
nfp_dev_stats.q_obytes[i] -= hw->eth_stats_base.q_obytes[i];
}
 
nfp_dev_stats.ipackets = nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_FRAMES);
-
nfp_dev_stats.ipackets -= hw->eth_stats_base.ipackets;
 
nfp_dev_stats.ibytes = nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_OCTETS);
-
nfp_dev_stats.ibytes -= hw->eth_stats_base.ibytes;
 
nfp_dev_stats.opackets =
nn_cfg_readq(hw, NFP_NET_CFG_STATS_TX_FRAMES);
-
nfp_dev_stats.opackets -= hw->eth_stats_base.opackets;
 
nfp_dev_stats.obytes =
nn_cfg_readq(hw, NFP_NET_CFG_STATS_TX_OCTETS);
-
nfp_dev_stats.obytes -= hw->eth_stats_base.obytes;
 
/* Reading general device stats */
nfp_dev_stats.ierrors =
nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_ERRORS);
-
nfp_dev_stats.ierrors -= hw->eth_stats_base.ierrors;
 
nfp_dev_stats.oerrors =
nn_cfg_readq(hw, NFP_NET_CFG_STATS

[PATCH v3 08/11] net/nfp: unify the guide line of header file

[Chaoyong He]

Unify the guide line of header file, we choose '__FOO_BAR_H__' style.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.h | 6 +++---
 drivers/net/nfp/flower/nfp_flower_cmsg.h| 6 +++---
 drivers/net/nfp/flower/nfp_flower_ctrl.h| 6 +++---
 drivers/net/nfp/flower/nfp_flower_representor.h | 6 +++---
 drivers/net/nfp/nfd3/nfp_nfd3.h | 6 +++---
 drivers/net/nfp/nfdk/nfp_nfdk.h | 6 +++---
 drivers/net/nfp/nfp_common.h| 6 +++---
 drivers/net/nfp/nfp_cpp_bridge.h| 8 +++-
 drivers/net/nfp/nfp_ctrl.h  | 6 +++---
 drivers/net/nfp/nfp_flow.h  | 6 +++---
 drivers/net/nfp/nfp_logs.h  | 6 +++---
 drivers/net/nfp/nfp_rxtx.h  | 6 +++---
 12 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.h 
b/drivers/net/nfp/flower/nfp_flower.h
index 0b4e38cedd..b7ea830209 100644
--- a/drivers/net/nfp/flower/nfp_flower.h
+++ b/drivers/net/nfp/flower/nfp_flower.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_FLOWER_H_
-#define _NFP_FLOWER_H_
+#ifndef __NFP_FLOWER_H__
+#define __NFP_FLOWER_H__
 
 #include "../nfp_common.h"
 
@@ -118,4 +118,4 @@ int nfp_flower_pf_stop(struct rte_eth_dev *dev);
 uint32_t nfp_flower_pkt_add_metadata(struct nfp_app_fw_flower *app_fw_flower,
struct rte_mbuf *mbuf, uint32_t port_id);
 
-#endif /* _NFP_FLOWER_H_ */
+#endif /* __NFP_FLOWER_H__ */
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h 
b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index cb019171b6..c2938fb6f6 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_CMSG_H_
-#define _NFP_CMSG_H_
+#ifndef __NFP_CMSG_H__
+#define __NFP_CMSG_H__
 
 #include "../nfp_flow.h"
 #include "nfp_flower.h"
@@ -989,4 +989,4 @@ int nfp_flower_cmsg_qos_delete(struct nfp_app_fw_flower 
*app_fw_flower,
 int nfp_flower_cmsg_qos_stats(struct nfp_app_fw_flower *app_fw_flower,
struct nfp_cfg_head *head);
 
-#endif /* _NFP_CMSG_H_ */
+#endif /* __NFP_CMSG_H__ */
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.h 
b/drivers/net/nfp/flower/nfp_flower_ctrl.h
index f73a024266..4c94d36847 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.h
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_FLOWER_CTRL_H_
-#define _NFP_FLOWER_CTRL_H_
+#ifndef __NFP_FLOWER_CTRL_H__
+#define __NFP_FLOWER_CTRL_H__
 
 #include "nfp_flower.h"
 
@@ -13,4 +13,4 @@ uint16_t nfp_flower_ctrl_vnic_xmit(struct nfp_app_fw_flower 
*app_fw_flower,
struct rte_mbuf *mbuf);
 void nfp_flower_ctrl_vnic_xmit_register(struct nfp_app_fw_flower 
*app_fw_flower);
 
-#endif /* _NFP_FLOWER_CTRL_H_ */
+#endif /* __NFP_FLOWER_CTRL_H__ */
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.h 
b/drivers/net/nfp/flower/nfp_flower_representor.h
index eda19cbb16..bcb4c3cdb5 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.h
+++ b/drivers/net/nfp/flower/nfp_flower_representor.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_FLOWER_REPRESENTOR_H_
-#define _NFP_FLOWER_REPRESENTOR_H_
+#ifndef __NFP_FLOWER_REPRESENTOR_H__
+#define __NFP_FLOWER_REPRESENTOR_H__
 
 #include "nfp_flower.h"
 
@@ -24,4 +24,4 @@ struct nfp_flower_representor {
 
 int nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower);
 
-#endif /* _NFP_FLOWER_REPRESENTOR_H_ */
+#endif /* __NFP_FLOWER_REPRESENTOR_H__ */
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3.h b/drivers/net/nfp/nfd3/nfp_nfd3.h
index 0b0ca361f4..3ba562cc3f 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3.h
+++ b/drivers/net/nfp/nfd3/nfp_nfd3.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_NFD3_H_
-#define _NFP_NFD3_H_
+#ifndef __NFP_NFD3_H__
+#define __NFP_NFD3_H__
 
 #include "../nfp_rxtx.h"
 
@@ -84,4 +84,4 @@ int nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
unsigned int socket_id,
const struct rte_eth_txconf *tx_conf);
 
-#endif /* _NFP_NFD3_H_ */
+#endif /* __NFP_NFD3_H__ */
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index 04bd3c7600..2767fd51cd 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef _NFP_NFDK_H_
-#define _NFP_NFDK_H_
+#ifndef __NFP_NFDK_H__
+#define __NFP_NFDK_H__
 
 #include "../nfp_rxtx.h"
 
@@ -178,4 +178,4 @@ int nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
 int nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
struct rte_mbuf *pkt);
 
-#endif /* _NFP_NFDK_H_ */
+#endif /* __NFP_NFDK_H__ */
diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h
index 5439865c5e..cd0ca50c6b 100644
--- a/drivers/net/nfp/nfp_c

[PATCH v3 09/11] net/nfp: rename some parameter and variable

[Chaoyong He]

Rename some parameter and variable to make the logic easier to
understand.
Also avoid the mix use of lowercase and uppercase in macro name.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_common.h| 20 ++--
 drivers/net/nfp/nfp_ethdev_vf.c |  8 
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h
index cd0ca50c6b..aad3c29ba8 100644
--- a/drivers/net/nfp/nfp_common.h
+++ b/drivers/net/nfp/nfp_common.h
@@ -19,9 +19,9 @@
 #define NFP_QCP_QUEUE_ADD_RPTR  0x
 #define NFP_QCP_QUEUE_ADD_WPTR  0x0004
 #define NFP_QCP_QUEUE_STS_LO0x0008
-#define NFP_QCP_QUEUE_STS_LO_READPTR_mask (0x3)
+#define NFP_QCP_QUEUE_STS_LO_READPTR_MASK (0x3)
 #define NFP_QCP_QUEUE_STS_HI0x000c
-#define NFP_QCP_QUEUE_STS_HI_WRITEPTR_mask(0x3)
+#define NFP_QCP_QUEUE_STS_HI_WRITEPTR_MASK(0x3)
 
 /* Interrupt definitions */
 #define NFP_NET_IRQ_LSC_IDX 0
@@ -303,7 +303,7 @@ nn_cfg_writeq(struct nfp_net_hw *hw,
 /**
  * Add the value to the selected pointer of a queue.
  *
- * @param q
+ * @param queue
  *   Base address for queue structure
  * @param ptr
  *   Add to the read or write pointer
@@ -311,7 +311,7 @@ nn_cfg_writeq(struct nfp_net_hw *hw,
  *   Value to add to the queue pointer
  */
 static inline void
-nfp_qcp_ptr_add(uint8_t *q,
+nfp_qcp_ptr_add(uint8_t *queue,
enum nfp_qcp_ptr ptr,
uint32_t val)
 {
@@ -322,19 +322,19 @@ nfp_qcp_ptr_add(uint8_t *q,
else
off = NFP_QCP_QUEUE_ADD_WPTR;
 
-   nn_writel(rte_cpu_to_le_32(val), q + off);
+   nn_writel(rte_cpu_to_le_32(val), queue + off);
 }
 
 /**
  * Read the current read/write pointer value for a queue.
  *
- * @param q
+ * @param queue
  *   Base address for queue structure
  * @param ptr
  *   Read or Write pointer
  */
 static inline uint32_t
-nfp_qcp_read(uint8_t *q,
+nfp_qcp_read(uint8_t *queue,
enum nfp_qcp_ptr ptr)
 {
uint32_t off;
@@ -345,12 +345,12 @@ nfp_qcp_read(uint8_t *q,
else
off = NFP_QCP_QUEUE_STS_HI;
 
-   val = rte_cpu_to_le_32(nn_readl(q + off));
+   val = rte_cpu_to_le_32(nn_readl(queue + off));
 
if (ptr == NFP_QCP_READ_PTR)
-   return val & NFP_QCP_QUEUE_STS_LO_READPTR_mask;
+   return val & NFP_QCP_QUEUE_STS_LO_READPTR_MASK;
else
-   return val & NFP_QCP_QUEUE_STS_HI_WRITEPTR_mask;
+   return val & NFP_QCP_QUEUE_STS_HI_WRITEPTR_MASK;
 }
 
 static inline uint32_t
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 7096695de6..7fb7b3efc5 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -396,7 +396,7 @@ nfp_vf_pci_uninit(struct rte_eth_dev *eth_dev)
 }
 
 static int
-eth_nfp_vf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+nfp_vf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
 {
return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -404,7 +404,7 @@ eth_nfp_vf_pci_probe(struct rte_pci_driver *pci_drv 
__rte_unused,
 }
 
 static int
-eth_nfp_vf_pci_remove(struct rte_pci_device *pci_dev)
+nfp_vf_pci_remove(struct rte_pci_device *pci_dev)
 {
return rte_eth_dev_pci_generic_remove(pci_dev, nfp_vf_pci_uninit);
 }
@@ -412,8 +412,8 @@ eth_nfp_vf_pci_remove(struct rte_pci_device *pci_dev)
 static struct rte_pci_driver rte_nfp_net_vf_pmd = {
.id_table = pci_id_nfp_vf_net_map,
.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
-   .probe = eth_nfp_vf_pci_probe,
-   .remove = eth_nfp_vf_pci_remove,
+   .probe = nfp_vf_pci_probe,
+   .remove = nfp_vf_pci_remove,
 };
 
 RTE_PMD_REGISTER_PCI(net_nfp_vf, rte_nfp_net_vf_pmd);
-- 
2.39.1

[PATCH v3 10/11] net/nfp: adjust logic to make it more readable

[Chaoyong He]

Adjust some logic to make it easier to understand.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_common.c | 87 +---
 drivers/net/nfp/nfp_cpp_bridge.c |  5 +-
 drivers/net/nfp/nfp_ctrl.h   |  2 -
 drivers/net/nfp/nfp_ethdev.c | 23 -
 drivers/net/nfp/nfp_ethdev_vf.c  | 15 +++---
 drivers/net/nfp/nfp_rxtx.c   |  2 +-
 6 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index a102c6f272..2d834b29d9 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -453,7 +453,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw)
 }
 
 static inline void
-nfp_net_enbable_rxvlan_cap(struct nfp_net_hw *hw,
+nfp_net_enable_rxvlan_cap(struct nfp_net_hw *hw,
uint32_t *ctrl)
 {
if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0)
@@ -467,19 +467,19 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)
 {
uint16_t i;
struct nfp_net_hw *hw;
-   uint64_t enabled_queues = 0;
+   uint64_t enabled_queues;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
/* Enabling the required TX queues in the device */
+   enabled_queues = 0;
for (i = 0; i < dev->data->nb_tx_queues; i++)
enabled_queues |= (1 << i);
 
nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, enabled_queues);
 
-   enabled_queues = 0;
-
/* Enabling the required RX queues in the device */
+   enabled_queues = 0;
for (i = 0; i < dev->data->nb_rx_queues; i++)
enabled_queues |= (1 << i);
 
@@ -619,33 +619,33 @@ uint32_t
 nfp_check_offloads(struct rte_eth_dev *dev)
 {
uint32_t ctrl = 0;
+   uint64_t rx_offload;
+   uint64_t tx_offload;
struct nfp_net_hw *hw;
struct rte_eth_conf *dev_conf;
-   struct rte_eth_rxmode *rxmode;
-   struct rte_eth_txmode *txmode;
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
dev_conf = &dev->data->dev_conf;
-   rxmode = &dev_conf->rxmode;
-   txmode = &dev_conf->txmode;
+   rx_offload = dev_conf->rxmode.offloads;
+   tx_offload = dev_conf->txmode.offloads;
 
-   if ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) != 0) {
+   if ((rx_offload & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) != 0) {
if ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)
ctrl |= NFP_NET_CFG_CTRL_RXCSUM;
}
 
-   if ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)
-   nfp_net_enbable_rxvlan_cap(hw, &ctrl);
+   if ((rx_offload & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)
+   nfp_net_enable_rxvlan_cap(hw, &ctrl);
 
-   if ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0) {
+   if ((rx_offload & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0) {
if ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)
ctrl |= NFP_NET_CFG_CTRL_RXQINQ;
}
 
hw->mtu = dev->data->mtu;
 
-   if ((txmode->offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) != 0) {
+   if ((tx_offload & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) != 0) {
if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)
ctrl |= NFP_NET_CFG_CTRL_TXVLAN_V2;
else if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)
@@ -661,14 +661,14 @@ nfp_check_offloads(struct rte_eth_dev *dev)
ctrl |= NFP_NET_CFG_CTRL_L2MC;
 
/* TX checksum offload */
-   if ((txmode->offloads & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM) != 0 ||
-   (txmode->offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) != 0 
||
-   (txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) != 0)
+   if ((tx_offload & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM) != 0 ||
+   (tx_offload & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) != 0 ||
+   (tx_offload & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) != 0)
ctrl |= NFP_NET_CFG_CTRL_TXCSUM;
 
/* LSO offload */
-   if ((txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_TSO) != 0 ||
-   (txmode->offloads & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) 
!= 0) {
+   if ((tx_offload & RTE_ETH_TX_OFFLOAD_TCP_TSO) != 0 ||
+   (tx_offload & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) != 0) {
if ((hw->cap & NFP_NET_CFG_CTRL_LSO) != 0)
ctrl |= NFP_NET_CFG_CTRL_LSO;
else
@@ -676,7 +676,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)
}
 
/* RX gather */
-   if ((txmode->offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS) != 0)
+   if ((tx_offload & RTE_ETH_TX_OFFLOAD_MULTI_SEGS) != 0)
ctrl |= NFP_NET_CFG_CTRL_GATHER;
 
return ctrl;
@@ -766,11 +766,10 @@ nfp_net_link_update(struct rte_eth_dev *dev,
 
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-   /* Read link status */

[PATCH v3 11/11] net/nfp: refact the meson build file

[Chaoyong He]

Make the source files follow the alphabeta sequence.
Also update the copyright header line.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/meson.build | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 7627c3e3f1..40e9ef8524 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
+# Copyright(c) 2018 Corigine, Inc.
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
 reason = 'only supported on 64-bit Linux'
 endif
+
 sources = files(
 'flower/nfp_conntrack.c',
 'flower/nfp_flower.c',
@@ -13,30 +14,30 @@ sources = files(
 'flower/nfp_flower_representor.c',
 'nfd3/nfp_nfd3_dp.c',
 'nfdk/nfp_nfdk_dp.c',
-'nfpcore/nfp_nsp.c',
 'nfpcore/nfp_cppcore.c',
-'nfpcore/nfp_resource.c',
-'nfpcore/nfp_mip.c',
-'nfpcore/nfp_nffw.c',
-'nfpcore/nfp_rtsym.c',
-'nfpcore/nfp_nsp_cmds.c',
 'nfpcore/nfp_crc.c',
 'nfpcore/nfp_dev.c',
+'nfpcore/nfp_hwinfo.c',
+'nfpcore/nfp_mip.c',
 'nfpcore/nfp_mutex.c',
+'nfpcore/nfp_nffw.c',
+'nfpcore/nfp_nsp.c',
+'nfpcore/nfp_nsp_cmds.c',
 'nfpcore/nfp_nsp_eth.c',
-'nfpcore/nfp_hwinfo.c',
+'nfpcore/nfp_resource.c',
+'nfpcore/nfp_rtsym.c',
 'nfpcore/nfp_target.c',
 'nfpcore/nfp6000_pcie.c',
 'nfp_common.c',
-'nfp_ctrl.c',
-'nfp_rxtx.c',
 'nfp_cpp_bridge.c',
-'nfp_ethdev_vf.c',
+'nfp_ctrl.c',
 'nfp_ethdev.c',
+'nfp_ethdev_vf.c',
 'nfp_flow.c',
 'nfp_ipsec.c',
 'nfp_logs.c',
 'nfp_mtr.c',
+'nfp_rxtx.c',
 )
 
 deps += ['hash', 'security']
-- 
2.39.1