[PATCH] test/dispatcher: transfer impl_opaque field

[Mattias Rönnblom]

The dispatcher tests failed to transfer the impl_opaque rte_event
field between the dequeued and enqueued event, in violation with the
Eventdev API contract.

Fixes: ecca8a0be606 ("lib: introduce dispatcher library")
Cc: sta...@dpdk.org

Signed-off-by: Mattias Rönnblom 
---
 app/test/test_dispatcher.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/test/test_dispatcher.c b/app/test/test_dispatcher.c
index 6eb3f572cf..a5fdf4a64c 100644
--- a/app/test/test_dispatcher.c
+++ b/app/test/test_dispatcher.c
@@ -385,6 +385,7 @@ test_app_process_queue(uint8_t p_event_dev_id, uint8_t 
p_event_port_id,
.sched_type = RTE_SCHED_TYPE_ATOMIC,
.op = RTE_EVENT_OP_FORWARD,
.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
+   .impl_opaque = in_event->impl_opaque,
.u64 = sn
};
}
-- 
2.43.0

Re: [PATCH] devtools: enhance the license check

[Stephen Hemminger]

On Wed, 11 Dec 2024 10:00:38 +0100
David Marchand  wrote:

> On Tue, Dec 10, 2024 at 6:00 PM Stephen Hemminger
>  wrote:
> >
> > On Tue, 10 Dec 2024 10:10:39 +0100
> > David Marchand  wrote:
> >  
> > > +no_license_list=\
> > > +':^.git* :^.mailmap :^.ci/* :^README :^MAINTAINERS :^VERSION 
> > > :^ABI_VERSION :^*/Kbuild '\
> > > +':^*/README* :^license/ :^config/ :^buildtools/ :^*/poetry.lock '\
> > > +':^kernel/linux/uapi/.gitignore :^kernel/linux/uapi/version :^*.cocci 
> > > :^*.abignore '\
> > > +':^*.map :^*.ini :^*.data :^*.json :^*.cfg :^*.txt :^*.svg :^*.png'
> > > +  
> >
> > What is poetry.lock?  
> 
> I don't know.
> It looks like some python packaging config for dts, and it is a generated 
> file.
> # This file is automatically @generated by Poetry 1.8.3 and should not
> be changed by hand.
> 
> Cc: dts maintainers.
> 
> 

Put it in .gitignore then please, and the script will ignore that.

Re: DPDK CI Testing Meeting schedule updates

[Patrick Robb]

On Mon, Nov 25, 2024 at 10:47 AM Patrick Robb  wrote:

> Hello,
>
> I have a couple reminders/updates for the schedule of the upcoming DPDK CI
> Testing meetings.
>
> 1. The meeting which was scheduled to happen this Thursday, November 28,
> is cancelled due to the American Thanksgiving Holiday. To "make up" for
> this, I will add a brief CI Labs discussion topic to the DTS meeting
> happening next Thursday, November 5.
>
> 2. There is a conflict between the November 12 DPDK Ci Meeting, and a
> joint Governing Board and Tech Board meeting about 2025 objectives. I am
> moving the DPDK CI meeting back 1 hour to 15:00 UTC to avoid this conflict.
> Ensuing meetings will return to the normal 14:00 UTC timeslot.
>
> Correction, I meant December 12 (tomorrow), not November 12.



> 3. The December 26 DPDK CI meeting is cancelled due to Winter Holidays.
>
> Since a number of CI meetings are being affected due to randomness, and
> the DTS meetings are relatively unaffected, I will be sure to leave some
> space for CI lab discussion during those DTS meetings.
>
> Thanks.
>
>

Re: [PATCH] devtools: enhance the license check

[Thomas Monjalon]

11/12/2024 15:55, Stephen Hemminger:
> On Wed, 11 Dec 2024 10:00:38 +0100
> David Marchand  wrote:
> 
> > On Tue, Dec 10, 2024 at 6:00 PM Stephen Hemminger
> >  wrote:
> > >
> > > On Tue, 10 Dec 2024 10:10:39 +0100
> > > David Marchand  wrote:
> > >  
> > > > +no_license_list=\
> > > > +':^.git* :^.mailmap :^.ci/* :^README :^MAINTAINERS :^VERSION 
> > > > :^ABI_VERSION :^*/Kbuild '\
> > > > +':^*/README* :^license/ :^config/ :^buildtools/ :^*/poetry.lock '\
> > > > +':^kernel/linux/uapi/.gitignore :^kernel/linux/uapi/version :^*.cocci 
> > > > :^*.abignore '\
> > > > +':^*.map :^*.ini :^*.data :^*.json :^*.cfg :^*.txt :^*.svg :^*.png'
> > > > +  
> > >
> > > What is poetry.lock?  
> > 
> > I don't know.
> > It looks like some python packaging config for dts, and it is a generated 
> > file.
> > # This file is automatically @generated by Poetry 1.8.3 and should not
> > be changed by hand.
> > 
> > Cc: dts maintainers.
> > 
> > 
> 
> Put it in .gitignore then please, and the script will ignore that.

How is it related?

I don't like adding versioned files to .gitignore.
(this poetry file is in the repository)

Re: 23.11.3 patches review and test

[Xueming Li]

Hi Yanghang,

Thanks for the quick verification and response!

Best Regards,
Xueming


From: Yanghang Liu 
Sent: Wednesday, December 11, 2024 7:24 PM
To: Xueming Li 
Cc: sta...@dpdk.org ; dev@dpdk.org ; Abhishek 
Marathe ; Ali Alnubani ; 
David Christensen ; Hemant Agrawal 
; Ian Stokes ; Jerin Jacob 
; John McNamara ; Ju-Hyoung Lee 
; Kevin Traynor ; Luca Boccassi 
; Pei Zhang ; Raslan Darawsheh 
; NBU-Contact-Thomas Monjalon (EXTERNAL) 
; benjamin.wal...@intel.com ; 
qian.q...@intel.com ; yuan.p...@intel.com 
; zhaoyan.c...@intel.com 
Subject: Re: 23.11.3 patches review and test

I tested below 18 scenarios on RHEL 9.4 and didn't find any new dpdk issues.

  *   VM with device assignment(PF) throughput testing(1G hugepage size): PASS
  *   VM with device assignment(PF) throughput testing(2M hugepage size) : PASS
  *   VM with device assignment(VF) throughput testing: PASS
  *   PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
  *   PVP vhost-user 2Q throughput testing: PASS
  *   PVP vhost-user 1Q - cross numa node throughput testing: PASS
  *   VM with vhost-user 2 queues throughput testing: PASS
  *   vhost-user reconnect with dpdk-client, qemu-server(qemu reconnect): PASS
  *   vhost-user reconnect with dpdk-client, qemu-server(ovs reconnect): PASS
  *   PVP  reconnect with dpdk-client, qemu-server: PASS
  *   PVP 1Q live migration testing: PASS
  *   PVP 1Q cross numa node live migration testing: PASS
  *   VM with ovs+dpdk+vhost-user 1Q live migration testing: PASS
  *   VM with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
  *   VM with ovs+dpdk+vhost-user 2Q live migration testing: PASS
  *   VM with ovs+dpdk+vhost-user 4Q live migration testing: PASS
  *   Host PF + DPDK testing: PASS
  *   Host VF + DPDK testing: PASS

Test Versions:

  *   qemu-kvm-8.2
  *   kernel 5.14
  *   libvirt 10.0
  *   ovs 3.1
  *   git describe
 *   v23.11.3-rc1
  *   git log

commit 67b9d0a29a1269b482ff7fd1eb48ee88ae9e5892 (HEAD, tag: v23.11.3-rc1, 
origin/23.11)
Author: Xueming Li mailto:xuemi...@nvidia.com>>
Date:   Tue Dec 10 22:31:07 2024 +0800

version: 23.11.3-rc1
Signed-off-by: Xueming Li mailto:xuemi...@nvidia.com>>

  *   Test device : X540-AT2 NIC(ixgbe, 10G)

Tested-by: Yanghang Liu mailto:yangh...@redhat.com>>

On Tue, Dec 10, 2024 at 10:50 PM Xueming Li 
mailto:xuemi...@nvidia.com>> wrote:
Hi all,

Here is a list of patches targeted for stable release 23.11.3.

The planned date for the final release is 17th December.

Please help with testing and validation of your use cases and report
any issues/results with reply-all to this mail. For the final release
the fixes and reported validations will be added to the release notes.

A release candidate tarball can be found at:

https://dpdk.org/browse/dpdk-stable/tag/?id=v23.11.3-rc1

These patches are located at branch 23.11 of dpdk-stable repo:
https://dpdk.org/browse/dpdk-stable/

Thanks.

Xueming Li mailto:xuemi...@nvidia.com>>

---
Ajit Khaparde (1):
  net/bnxt: fix TCP and UDP checksum flags

Alan Elder (1):
  net/netvsc: fix using Tx queue higher than Rx queues

Aleksandr Loktionov (1):
  net/i40e/base: fix misleading debug logs and comments

Alexander Kozyrev (3):
  common/mlx5: fix error CQE handling for 128 bytes CQE
  net/mlx5: fix shared queue port number in vector Rx
  net/mlx5: fix miniCQEs number calculation

Anatoly Burakov (2):
  net/i40e/base: fix setting flags in init function
  net/i40e/base: add missing X710TL device check

Andre Muezerie (1):
  rcu: fix implicit conversion in bit shift

Arkadiusz Kusztal (2):
  crypto/qat: fix modexp/inv length
  crypto/qat: fix ECDSA session handling

Artur Tyminski (1):
  net/i40e/base: fix DDP loading with reserved track ID

Barbara Skobiej (3):
  net/ixgbe/base: fix unchecked return value
  net/i40e/base: fix unchecked return value
  net/i40e/base: fix loop bounds

Bill Xiang (2):
  vhost: fix offset while mapping log base address
  vdpa: update used flags in used ring relay

Bing Zhao (5):
  net/mlx5: workaround list management of Rx queue control
  net/mlx5: fix Rx queue control management
  net/mlx5: fix default RSS flows creation order
  net/mlx5: fix Rx queue reference count in flushing flows
  net/mlx5: fix shared Rx queue control release

Brian Dooley (1):
  test/crypto: fix synchronous API calls

Bruce Richardson (11):
  eal/x86: fix 32-bit write combining store
  net/iavf: delay VF reset command
  net/i40e: fix AVX-512 pointer copy on 32-bit
  net/ice: fix AVX-512 pointer copy on 32-bit
  net/iavf: fix AVX-512 pointer copy on 32-bit
  common/idpf: fix AVX-512 pointer copy on 32-bit
  build: remove version check on compiler links function
  net/ice: detect stopping a flow director queue twice
  app/dumpcap: remove unused struct array
  eventdev: fix possible array underflow/overflow
  

Re: [RFC 0/8] ioring: network driver

[Stephen Hemminger]

On Wed, 11 Dec 2024 11:34:39 +
Konstantin Ananyev  wrote:

> > This is first draft of new simplified TAP device that uses
> > the Linux kernel ioring API to provide a read/write ring
> > with kernel.
> > 
> > This is split from tap device because there are so many
> > unnecessary things in existing tap, and supporting ioring is
> > better without ifdefs etc. The default name of the tap
> > device is different that other uses in DPDK but the driver
> > tries to keep the same relevant devargs as before.
> > 
> > This driver will only provide features that match what kernel
> > does, so no flow support etc. The next version will add checksum
> > and multi-segment packets. Some of the doc files may need update
> > as well.  
> 
> Makes sense to me, though didn't properly look inside.
> One thing - probably add  a 'tap' into the name,
> 'tap_ioiring' or so, otherwise 'ioring' is a bit too generic 
> and might be confusing.

There are some userspaces that look for "e*" in name for some setups.
But names are totally abitrary

Re: [PATCH v2 01/15] net/zxdh: zxdh np init implementation

[Stephen Hemminger]

On Tue, 10 Dec 2024 13:53:19 +0800
Junlong Wang  wrote:

> (np)network Processor initialize resources in host,
> and initialize a channel for some tables insert/get/del.
> 
> Signed-off-by: Junlong Wang 

This mostly looks good, just some small stuff.

> ---
>  drivers/net/zxdh/meson.build   |   1 +
>  drivers/net/zxdh/zxdh_ethdev.c | 238 --
>  drivers/net/zxdh/zxdh_ethdev.h |  27 +++
>  drivers/net/zxdh/zxdh_msg.c|  45 +
>  drivers/net/zxdh/zxdh_msg.h|  37 
>  drivers/net/zxdh/zxdh_np.c | 347 +
>  drivers/net/zxdh/zxdh_np.h | 198 +++
>  drivers/net/zxdh/zxdh_pci.c|   2 +-
>  drivers/net/zxdh/zxdh_pci.h|   6 +-
>  drivers/net/zxdh/zxdh_queue.c  |   2 +-
>  drivers/net/zxdh/zxdh_queue.h  |  14 +-
>  11 files changed, 884 insertions(+), 33 deletions(-)
>  create mode 100644 drivers/net/zxdh/zxdh_np.c
>  create mode 100644 drivers/net/zxdh/zxdh_np.h
> 
> diff --git a/drivers/net/zxdh/meson.build b/drivers/net/zxdh/meson.build
> index c9960f4c73..ab24a3145c 100644
> --- a/drivers/net/zxdh/meson.build
> +++ b/drivers/net/zxdh/meson.build
> @@ -19,4 +19,5 @@ sources = files(
>  'zxdh_msg.c',
>  'zxdh_pci.c',
>  'zxdh_queue.c',
> +'zxdh_np.c',
>  )
> diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
> index c786198535..c54d1f6669 100644
> --- a/drivers/net/zxdh/zxdh_ethdev.c
> +++ b/drivers/net/zxdh/zxdh_ethdev.c
> @@ -5,6 +5,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #include "zxdh_ethdev.h"
>  #include "zxdh_logs.h"
> @@ -12,8 +13,15 @@
>  #include "zxdh_msg.h"
>  #include "zxdh_common.h"
>  #include "zxdh_queue.h"
> +#include "zxdh_np.h"
>  
>  struct zxdh_hw_internal zxdh_hw_internal[RTE_MAX_ETHPORTS];

If you want to support primary/secondary in future,
variables in BSS are not shared between primary and secondary process

> +struct zxdh_shared_data *zxdh_shared_data;
> +const char *ZXDH_PMD_SHARED_DATA_MZ = "zxdh_pmd_shared_data";
> +rte_spinlock_t zxdh_shared_data_lock = RTE_SPINLOCK_INITIALIZER;
> +struct zxdh_dtb_shared_data g_dtb_data;

The shared data will be a problem if you support multiple devices.
Or is this really a singleton device with only one bus and slot.

> +
> +#define ZXDH_INVALID_DTBQUE  0x
>  
>  uint16_t
>  zxdh_vport_to_vfid(union zxdh_virport_num v)
>
> +static int
> +zxdh_np_dtb_res_init(struct rte_eth_dev *dev)
> +{
> + struct zxdh_hw *hw = dev->data->dev_private;
> + struct zxdh_bar_offset_params param = {0};
> + struct zxdh_bar_offset_res res = {0};
> + int ret = 0;
> +
> + if (g_dtb_data.init_done) {
> + PMD_DRV_LOG(DEBUG, "DTB res already init done, dev %s no need 
> init",
> + dev->device->name);
> + return 0;
> + }
> + g_dtb_data.queueid = ZXDH_INVALID_DTBQUE;
> + g_dtb_data.bind_device = dev;
> + g_dtb_data.dev_refcnt++;
> + g_dtb_data.init_done = 1;
> +
> + ZXDH_DEV_INIT_CTRL_T *dpp_ctrl = rte_malloc(NULL, sizeof(*dpp_ctrl) +
> + sizeof(ZXDH_DTB_ADDR_INFO_T) * 256, 0);
> +
> + if (dpp_ctrl == NULL) {
> + PMD_DRV_LOG(ERR, "dev %s annot allocate memory for dpp_ctrl", 
> dev->device->name);
> + ret = -ENOMEM;
> + goto free_res;
> + }
> + memset(dpp_ctrl, 0, sizeof(*dpp_ctrl) + sizeof(ZXDH_DTB_ADDR_INFO_T) * 
> 256);

You could use rte_zmalloc() and avoid having to do memset.

> +
> + dpp_ctrl->queue_id = 0xff;
> + dpp_ctrl->vport = hw->vport.vport;
> + dpp_ctrl->vector = ZXDH_MSIX_INTR_DTB_VEC;
> + strcpy((char *)dpp_ctrl->port_name, dev->device->name);

Why the cast, port_name is already character. Should use strlcpy() incase 
device name
is bigger than port_name.

> + dpp_ctrl->pcie_vir_addr = (uint32_t)hw->bar_addr[0];
> +
> + param.pcie_id = hw->pcie_id;
> + param.virt_addr = hw->bar_addr[0] + ZXDH_CTRLCH_OFFSET;
> + param.type = ZXDH_URI_NP;
> +
> + ret = zxdh_get_bar_offset(¶m, &res);
> + if (ret) {
> + PMD_DRV_LOG(ERR, "dev %s get npbar offset failed", 
> dev->device->name);
> + goto free_res;
> + }
> + dpp_ctrl->np_bar_len = res.bar_length;
> + dpp_ctrl->np_bar_offset = res.bar_offset;
> +
> + if (!g_dtb_data.dtb_table_conf_mz) {
> + const struct rte_memzone *conf_mz = 
> rte_memzone_reserve_aligned("zxdh_dtb_table_conf_mz",
> + ZXDH_DTB_TABLE_CONF_SIZE, SOCKET_ID_ANY, 0, 
> RTE_CACHE_LINE_SIZE);
> +
> + if (conf_mz == NULL) {
> + PMD_DRV_LOG(ERR,
> + "dev %s annot allocate memory for dtb table 
> conf",
> + dev->device->name);
> + ret = -ENOMEM;
> + goto free_res;
> + }
> + dpp_ctrl->down_vir_addr = conf_mz->addr_64;
> + dpp_ctrl->down_phy_addr = conf_mz->i

Re: [PATCH 16/21] lib/log: ensure code structure does not change

[Andre Muezerie]

On Tue, Dec 10, 2024 at 07:13:21PM -0800, Stephen Hemminger wrote:
> On Tue, 10 Dec 2024 18:05:46 -0800
> Andre Muezerie  wrote:
> 
> > Add "do { } while (0)" to macros used to remove logging calls, to
> > ensure there's no code structure change when enabling/disabling
> > logging.
> > 
> > Signed-off-by: Andre Muezerie 
> > ---
> >  lib/log/rte_log.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
> > index 3735137150..6b00caab88 100644
> > --- a/lib/log/rte_log.h
> > +++ b/lib/log/rte_log.h
> > @@ -364,7 +364,7 @@ int rte_vlog(uint32_t level, uint32_t logtype, const 
> > char *format, va_list ap)
> > static_assert(!__builtin_strchr(fmt, '\n'), \
> > "This log format string contains a \\n")
> >  #else
> > -#define RTE_LOG_CHECK_NO_NEWLINE(...)
> > +#define RTE_LOG_CHECK_NO_NEWLINE(...) do { } while (0)
> >  #endif
> >  
> >  /**
> 
> NAK
> this is a change since static_assert() can be put anywhere like outside
> of code blocks. This patch is not needed.

Understood. I'll remove these changes from the series then.

Re: 21.11.9 patches review and test

[Kevin Traynor]

On 09/12/2024 03:44, Yanghang Liu wrote:
> I tested below 18 scenarios on RHEL 9.2 and didn't find any new dpdk issues.
> 

Thanks Yanghang. I will add a note about the validation to the release
notes.

Kevin.

>- VM with device assignment(PF) throughput testing(1G hugepage size):
>PASS
>- VM with device assignment(PF) throughput testing(2M hugepage size) :
>PASS
>- VM with device assignment(VF) throughput testing: PASS
>- PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
>- PVP vhost-user 2Q throughput testing: PASS
>- PVP vhost-user 1Q - cross numa node throughput testing: PASS
>- VM with vhost-user 2 queues throughput testing: PASS
>- vhost-user reconnect with dpdk-client, qemu-server(qemu reconnect):
>PASS
>- vhost-user reconnect with dpdk-client, qemu-server(ovs reconnect): PASS
>- PVP  reconnect with dpdk-client, qemu-server: PASS
>- PVP 1Q live migration testing: PASS
>- PVP 1Q cross numa node live migration testing: PASS
>- VM with ovs+dpdk+vhost-user 1Q live migration testing: PASS
>- VM with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
>- VM with ovs+dpdk+vhost-user 2Q live migration testing: PASS
>- VM with ovs+dpdk+vhost-user 4Q live migration testing: PASS
>- Host PF + DPDK testing: PASS
>- Host VF + DPDK testing: PASS
> 
> 
> Test Versions:
> 
>- qemu-kvm-7.2
>- kernel 5.14
>- libvirt 9.0
>- git describe
>   - v21.11.9-rc1
>- git log
> 
> commit f197f1e13ccfb74c92ad05602443dd0984f39540
> 
> Author: Kevin Traynor 
> 
> Date:   Wed Dec 4 15:24:08 2024 +
> 
> version: 21.11.9-rc1
> 
> Signed-off-by: Kevin Traynor 
> 
> 
>- Test device : X540-AT2 NIC(ixgbe, 10G)
> 
> Tested-by: Yanghang Liu 
> 
> 
> On Wed, Dec 4, 2024 at 11:58 PM Kevin Traynor  wrote:
> 
>> Hi all,
>>
>> Here is a list of patches targeted for stable release 21.11.9.
>>
>> The planned date for the final release is 17th December 2024.
>>
>> Please help with testing and validation of your use cases and report
>> any issues/results with reply-all to this mail. For the final release
>> the fixes and reported validations will be added to the release notes.
>>
>> A release candidate tarball can be found at:
>>
>> https://dpdk.org/browse/dpdk-stable/tag/?id=v21.11.9-rc1
>>
>> These patches are located at branch 21.11 of dpdk-stable repo:
>> https://dpdk.org/browse/dpdk-stable/
>>
>> Thanks.
>>
>> Kevin
>>

[PATCH v2 1/8] net/ioring: introduce new driver

[Stephen Hemminger]

Add basic driver initialization, documentation, and device creation
and basic documentation.

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/ioring.ini |   9 +
 doc/guides/nics/index.rst   |   1 +
 doc/guides/nics/ioring.rst  |  66 +++
 drivers/net/ioring/meson.build  |  15 ++
 drivers/net/ioring/rte_eth_ioring.c | 262 
 drivers/net/meson.build |   1 +
 6 files changed, 354 insertions(+)
 create mode 100644 doc/guides/nics/features/ioring.ini
 create mode 100644 doc/guides/nics/ioring.rst
 create mode 100644 drivers/net/ioring/meson.build
 create mode 100644 drivers/net/ioring/rte_eth_ioring.c

diff --git a/doc/guides/nics/features/ioring.ini 
b/doc/guides/nics/features/ioring.ini
new file mode 100644
index 00..c4c57caaa4
--- /dev/null
+++ b/doc/guides/nics/features/ioring.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'ioring' driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux   = Y
+x86-64   = Y
+Usage doc= Y
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index 50688d9f64..e4d243622e 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -41,6 +41,7 @@ Network Interface Controller Drivers
 igc
 intel_vf
 ionic
+ioring
 ipn3ke
 ixgbe
 mana
diff --git a/doc/guides/nics/ioring.rst b/doc/guides/nics/ioring.rst
new file mode 100644
index 00..7d37a6bb37
--- /dev/null
+++ b/doc/guides/nics/ioring.rst
@@ -0,0 +1,66 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+
+IORING Poll Mode Driver
+===
+
+The IORING Poll Mode Driver (PMD) is a simplified and improved version of the 
TAP PMD. It is a
+virtual device that uses Linux ioring to inject packets into the Linux kernel.
+It is useful when writing DPDK applications, that need to support interaction
+with the Linux TCP/IP stack for control plane or tunneling.
+
+The IORING PMD creates a kernel network device that can be
+managed by standard tools such as ``ip`` and ``ethtool`` commands.
+
+From a DPDK application, the IORING device looks like a DPDK ethdev.
+It supports the standard DPDK API's to query for information, statistics,
+and send/receive packets.
+
+Requirements
+
+
+The IORING requires the io_uring library (liburing) which provides the helper
+functions to manage io_uring with the kernel.
+
+For more info on io_uring, please see:
+
+https://kernel.dk/io_uring.pdf
+
+
+Arguments
+-
+
+IORING devices are created with the command line ``--vdev=net_ioring0`` option.
+This option may be specified more than once by repeating with a different 
``net_ioringX`` device.
+
+By default, the Linux interfaces are named ``enio0``, ``enio1``, etc.
+The interface name can be specified by adding the ``iface=foo0``, for example::
+
+   --vdev=net_ioring0,iface=io0 --vdev=net_ioring1,iface=io1, ...
+
+The PMD inherits the MAC address assigned by the kernel which will be
+a locally assigned random Ethernet address.
+
+Normally, when the DPDK application exits, the IORING device is removed.
+But this behavior can be overridden by the use of the persist flag, example::
+
+  --vdev=net_ioring0,iface=io0,persist ...
+
+
+Multi-process sharing
+-
+
+The IORING device does not support secondary process (yet).
+
+
+Limitations
+---
+
+- IO uring requires io_uring support. This was add in Linux kernl version 5.1
+  Also, IO uring maybe disabled in some environments or by security policies.
+
+- Since IORING device uses a file descriptor to talk to the kernel,
+  the same number of queues must be specified for receive and transmit.
+
+- No flow support. Receive queue selection for incoming packets is determined
+  by the Linux kernel. See kernel documentation for more info:
+  https://www.kernel.org/doc/html/latest/networking/scaling.html
diff --git a/drivers/net/ioring/meson.build b/drivers/net/ioring/meson.build
new file mode 100644
index 00..264554d069
--- /dev/null
+++ b/drivers/net/ioring/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Stephen Hemminger
+
+if not is_linux
+build = false
+reason = 'only supported on Linux'
+endif
+
+dep = dependency('liburing', required:false)
+reason = 'missing dependency, "liburing"'
+build = dep.found()
+ext_deps += dep
+
+sources = files('rte_eth_ioring.c')
+require_iova_in_mbuf = false
diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
new file mode 100644
index 00..7b62c47f54
--- /dev/null
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -0,0 +1,262 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) Stephen Hemminger
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#in

[PATCH v2 2/8] net/ioring: implement link state

[Stephen Hemminger]

Add hooks to set kernel link up/down and report state.

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/ioring.ini |  1 +
 drivers/net/ioring/rte_eth_ioring.c | 84 +
 2 files changed, 85 insertions(+)

diff --git a/doc/guides/nics/features/ioring.ini 
b/doc/guides/nics/features/ioring.ini
index c4c57caaa4..d4bf70cb4f 100644
--- a/doc/guides/nics/features/ioring.ini
+++ b/doc/guides/nics/features/ioring.ini
@@ -4,6 +4,7 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+Link status  = Y
 Linux   = Y
 x86-64   = Y
 Usage doc= Y
diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index 7b62c47f54..fa3e748cda 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -47,6 +47,53 @@ struct pmd_internals {
struct rte_ether_addr eth_addr; /* address assigned by kernel */
 };
 
+static int
+eth_dev_change_flags(struct rte_eth_dev *dev, uint16_t flags, uint16_t mask)
+{
+   struct pmd_internals *pmd = dev->data->dev_private;
+
+   int sock = socket(AF_INET, SOCK_DGRAM, 0);
+   if (sock < 0)
+   return -errno;
+
+   struct ifreq ifr = { };
+   strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
+
+   int ret = ioctl(sock, SIOCGIFFLAGS, &ifr);
+   if (ret < 0)
+   goto error;
+
+   /* NB: ifr.ifr_flags is type short */
+   ifr.ifr_flags &= mask;
+   ifr.ifr_flags |= flags;
+
+   ret = ioctl(sock, SIOCSIFFLAGS, &ifr);
+error:
+   close(sock);
+   return (ret < 0) ? -errno : 0;
+}
+
+static int
+eth_dev_get_flags(struct rte_eth_dev *dev, short *flags)
+{
+   struct pmd_internals *pmd = dev->data->dev_private;
+
+   int sock = socket(AF_INET, SOCK_DGRAM, 0);
+   if (sock < 0)
+   return -errno;
+
+   struct ifreq ifr = { };
+   strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
+
+   int ret = ioctl(sock, SIOCGIFFLAGS, &ifr);
+   if (ret == 0)
+   *flags = ifr.ifr_flags;
+
+   close(sock);
+   return (ret < 0) ? -errno : 0;
+}
+
+
 /* Creates a new tap device, name returned in ifr */
 static int
 tap_open(const char *name, struct ifreq *ifr, uint8_t persist)
@@ -103,6 +150,39 @@ tap_open(const char *name, struct ifreq *ifr, uint8_t 
persist)
return -1;
 }
 
+
+static int
+eth_dev_set_link_up(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, IFF_UP, 0);
+}
+
+static int
+eth_dev_set_link_down(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, 0, ~IFF_UP);
+}
+
+static int
+eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
+{
+   struct rte_eth_link *eth_link = &dev->data->dev_link;
+   short flags = 0;
+
+   if (eth_dev_get_flags(dev, &flags) < 0) {
+   PMD_LOG(ERR, "ioctl(SIOCGIFFLAGS): %s", strerror(errno));
+   return -1;
+   }
+
+   *eth_link = (struct rte_eth_link) {
+   .link_speed = RTE_ETH_SPEED_NUM_UNKNOWN,
+   .link_duplex = RTE_ETH_LINK_FULL_DUPLEX,
+   .link_status = (flags & IFF_UP) ? RTE_ETH_LINK_UP : 
RTE_ETH_LINK_DOWN,
+   .link_autoneg = RTE_ETH_LINK_FIXED,
+   };
+   return 0;
+};
+
 static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
@@ -126,8 +206,12 @@ eth_dev_close(struct rte_eth_dev *dev)
 
 static const struct eth_dev_ops ops = {
.dev_close  = eth_dev_close,
+   .link_update= eth_link_update,
+   .dev_set_link_up= eth_dev_set_link_up,
+   .dev_set_link_down  = eth_dev_set_link_down,
 };
 
+
 static int
 ioring_create(struct rte_eth_dev *dev, const char *tap_name, uint8_t persist)
 {
-- 
2.45.2

[PATCH v2 3/8] net/ioring: implement control functions

[Stephen Hemminger]

These internal ops, just force changes to kernel visible net device.

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/ioring.ini |  3 ++
 drivers/net/ioring/rte_eth_ioring.c | 69 +
 2 files changed, 72 insertions(+)

diff --git a/doc/guides/nics/features/ioring.ini 
b/doc/guides/nics/features/ioring.ini
index d4bf70cb4f..199c7cd31c 100644
--- a/doc/guides/nics/features/ioring.ini
+++ b/doc/guides/nics/features/ioring.ini
@@ -5,6 +5,9 @@
 ;
 [Features]
 Link status  = Y
+MTU update   = Y
+Promiscuous mode = Y
+Allmulticast mode= Y
 Linux   = Y
 x86-64   = Y
 Usage doc= Y
diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index fa3e748cda..de10a4d83f 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -163,6 +164,30 @@ eth_dev_set_link_down(struct rte_eth_dev *dev)
return eth_dev_change_flags(dev, 0, ~IFF_UP);
 }
 
+static int
+eth_dev_promiscuous_enable(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, IFF_PROMISC, ~0);
+}
+
+static int
+eth_dev_promiscuous_disable(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, 0, ~IFF_PROMISC);
+}
+
+static int
+eth_dev_allmulticast_enable(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, IFF_ALLMULTI, ~0);
+}
+
+static int
+eth_dev_allmulticast_disable(struct rte_eth_dev *dev)
+{
+   return eth_dev_change_flags(dev, 0, ~IFF_ALLMULTI);
+}
+
 static int
 eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 {
@@ -183,6 +208,44 @@ eth_link_update(struct rte_eth_dev *dev, int 
wait_to_complete __rte_unused)
return 0;
 };
 
+static int
+eth_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+   struct pmd_internals *pmd = dev->data->dev_private;
+   struct ifreq ifr = { .ifr_mtu = mtu };
+   int ret;
+
+   strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
+
+   ret = ioctl(pmd->ctl_sock, SIOCSIFMTU, &ifr);
+   if (ret < 0) {
+   PMD_LOG(ERR, "ioctl(SIOCSIFMTU) failed: %s", strerror(errno));
+   ret = -errno;
+   }
+
+   return ret;
+}
+
+static int
+eth_dev_macaddr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
+{
+   struct pmd_internals *pmd = dev->data->dev_private;
+   struct ifreq ifr = { };
+   int ret;
+
+   strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
+   ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
+   memcpy(ifr.ifr_hwaddr.sa_data, addr, sizeof(*addr));
+
+   ret = ioctl(pmd->ctl_sock, SIOCSIFHWADDR, &ifr);
+   if (ret < 0) {
+   PMD_LOG(ERR, "ioctl(SIOCSIFHWADDR) failed: %s", 
strerror(errno));
+   ret = -errno;
+   }
+
+   return ret;
+}
+
 static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
@@ -209,6 +272,12 @@ static const struct eth_dev_ops ops = {
.link_update= eth_link_update,
.dev_set_link_up= eth_dev_set_link_up,
.dev_set_link_down  = eth_dev_set_link_down,
+   .mac_addr_set   = eth_dev_macaddr_set,
+   .mtu_set= eth_dev_mtu_set,
+   .promiscuous_enable = eth_dev_promiscuous_enable,
+   .promiscuous_disable= eth_dev_promiscuous_disable,
+   .allmulticast_enable= eth_dev_allmulticast_enable,
+   .allmulticast_disable   = eth_dev_allmulticast_disable,
 };
 
 
-- 
2.45.2

[PATCH v2 0/8] ioring: network driver

[Stephen Hemminger]

This is initial work of new simplified TAP device that uses
the Linux kernel ioring API to provide a read/write ring
with kernel.

This is split from tap device because there are so many
unnecessary things in existing tap, and supporting ioring is
better without ifdefs etc. The default name of the tap
device is different that other uses in DPDK but the driver
tries to keep the same relevant devargs as before.

This driver will only provide features that match what kernel
does, so no flow support etc. The next version will add checksum
and multi-segment packets. Some of the doc files may need update
as well.

Stephen Hemminger (8):
  net/ioring: introduce new driver
  net/ioring: implement link state
  net/ioring: implement control functions
  net/ioring: implement management functions
  net/ioring: implement primary secondary fd passing
  net/ioring: implement receive and transmit
  net/ioring: add VLAN support
  net/ioring: implement statistics

 doc/guides/nics/features/ioring.ini |   16 +
 doc/guides/nics/index.rst   |1 +
 doc/guides/nics/ioring.rst  |   66 ++
 drivers/net/ioring/meson.build  |   15 +
 drivers/net/ioring/rte_eth_ioring.c | 1068 +++
 drivers/net/meson.build |1 +
 6 files changed, 1167 insertions(+)
 create mode 100644 doc/guides/nics/features/ioring.ini
 create mode 100644 doc/guides/nics/ioring.rst
 create mode 100644 drivers/net/ioring/meson.build
 create mode 100644 drivers/net/ioring/rte_eth_ioring.c

-- 
2.45.2

[PATCH v2 4/8] net/ioring: implement management functions

[Stephen Hemminger]

Add start, stop, configure and info functions.

Signed-off-by: Stephen Hemminger 
---
 drivers/net/ioring/rte_eth_ioring.c | 72 ++---
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index de10a4d83f..b5d9c12bdf 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -212,12 +212,16 @@ static int
 eth_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
struct pmd_internals *pmd = dev->data->dev_private;
+
+   int sock = socket(AF_INET, SOCK_DGRAM, 0);
+   if (sock < 0)
+   return -errno;
+
struct ifreq ifr = { .ifr_mtu = mtu };
-   int ret;
 
strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
 
-   ret = ioctl(pmd->ctl_sock, SIOCSIFMTU, &ifr);
+   int ret = ioctl(sock, SIOCSIFMTU, &ifr);
if (ret < 0) {
PMD_LOG(ERR, "ioctl(SIOCSIFMTU) failed: %s", strerror(errno));
ret = -errno;
@@ -230,14 +234,17 @@ static int
 eth_dev_macaddr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
 {
struct pmd_internals *pmd = dev->data->dev_private;
-   struct ifreq ifr = { };
-   int ret;
 
+   int sock = socket(AF_INET, SOCK_DGRAM, 0);
+   if (sock < 0)
+   return -errno;
+
+   struct ifreq ifr = { };
strlcpy(ifr.ifr_name, pmd->ifname, IFNAMSIZ);
ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
memcpy(ifr.ifr_hwaddr.sa_data, addr, sizeof(*addr));
 
-   ret = ioctl(pmd->ctl_sock, SIOCSIFHWADDR, &ifr);
+   int ret = ioctl(sock, SIOCSIFHWADDR, &ifr);
if (ret < 0) {
PMD_LOG(ERR, "ioctl(SIOCSIFHWADDR) failed: %s", 
strerror(errno));
ret = -errno;
@@ -246,6 +253,56 @@ eth_dev_macaddr_set(struct rte_eth_dev *dev, struct 
rte_ether_addr *addr)
return ret;
 }
 
+static int
+eth_dev_start(struct rte_eth_dev *dev)
+{
+   dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
+   eth_dev_set_link_up(dev);
+
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+   dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+   dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+   }
+
+   return 0;
+}
+
+static int
+eth_dev_stop(struct rte_eth_dev *dev)
+{
+   dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
+   eth_dev_set_link_down(dev);
+
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+   dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+   dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+   }
+
+   return 0;
+}
+
+static int
+eth_dev_configure(struct rte_eth_dev *dev)
+{
+   /* rx/tx must be paired */
+   if (dev->data->nb_rx_queues != dev->data->nb_tx_queues)
+   return -EINVAL;
+
+   return 0;
+}
+
+static int
+eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+{
+   struct pmd_internals *pmd = dev->data->dev_private;
+
+   dev_info->if_index = if_nametoindex(pmd->ifname);
+   dev_info->max_mac_addrs = 1;
+   dev_info->max_rx_pktlen = RTE_ETHER_MAX_LEN;
+
+   return 0;
+}
+
 static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
@@ -263,11 +320,14 @@ eth_dev_close(struct rte_eth_dev *dev)
close(pmd->keep_fd);
pmd->keep_fd = -1;
}
-
return 0;
 }
 
 static const struct eth_dev_ops ops = {
+   .dev_start  = eth_dev_start,
+   .dev_stop   = eth_dev_stop,
+   .dev_configure  = eth_dev_configure,
+   .dev_infos_get  = eth_dev_info,
.dev_close  = eth_dev_close,
.link_update= eth_link_update,
.dev_set_link_up= eth_dev_set_link_up,
-- 
2.45.2

[PATCH v2 6/8] net/ioring: implement receive and transmit

[Stephen Hemminger]

Use io_uring to read and write from TAP device.

Signed-off-by: Stephen Hemminger 
---
 drivers/net/ioring/rte_eth_ioring.c | 365 +++-
 1 file changed, 364 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index ddef57adfb..8dd717cb9d 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -2,6 +2,7 @@
  * Copyright (c) Stephen Hemminger
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -9,8 +10,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -27,6 +30,13 @@
 #include 
 #include 
 
+#define IORING_DEFAULT_BURST   64
+#define IORING_NUM_BUFFERS 1024
+#define IORING_MAX_QUEUES  128
+
+
+static_assert(IORING_MAX_QUEUES <= RTE_MP_MAX_FD_NUM, "Max queues exceeds MP 
fd limit");
+
 #define IORING_DEFAULT_IFNAME  "enio%d"
 #define IORING_MP_KEY  "ioring_mp_send_fds"
 
@@ -34,6 +44,20 @@ RTE_LOG_REGISTER_DEFAULT(ioring_logtype, NOTICE);
 #define RTE_LOGTYPE_IORING ioring_logtype
 #define PMD_LOG(level, ...) RTE_LOG_LINE_PREFIX(level, IORING, "%s(): ", 
__func__, __VA_ARGS__)
 
+#ifdef RTE_ETHDEV_DEBUG_RX
+#define PMD_RX_LOG(level, ...) \
+   RTE_LOG_LINE_PREFIX(level, IORING, "%s() rx: ", __func__, __VA_ARGS__)
+#else
+#define PMD_RX_LOG(...) do { } while (0)
+#endif
+
+#ifdef RTE_ETHDEV_DEBUG_TX
+#define PMD_TX_LOG(level, ...) \
+   RTE_LOG_LINE_PREFIX(level, IORING, "%s() tx: ", __func__, __VA_ARGS__)
+#else
+#define PMD_TX_LOG(...) do { } while (0)
+#endif
+
 #define IORING_IFACE_ARG   "iface"
 #define IORING_PERSIST_ARG "persist"
 
@@ -43,6 +67,30 @@ static const char * const valid_arguments[] = {
NULL
 };
 
+struct rx_queue {
+   struct rte_mempool *mb_pool;/* rx buffer pool */
+   struct io_uring io_ring;/* queue of posted read's */
+   uint16_t port_id;
+   uint16_t queue_id;
+
+   uint64_t rx_packets;
+   uint64_t rx_bytes;
+   uint64_t rx_nombuf;
+   uint64_t rx_errors;
+};
+
+struct tx_queue {
+   struct io_uring io_ring;
+
+   uint16_t port_id;
+   uint16_t queue_id;
+   uint16_t free_thresh;
+
+   uint64_t tx_packets;
+   uint64_t tx_bytes;
+   uint64_t tx_errors;
+};
+
 struct pmd_internals {
int keep_fd;/* keep alive file descriptor */
char ifname[IFNAMSIZ];  /* name assigned by kernel */
@@ -300,6 +348,15 @@ eth_dev_info(struct rte_eth_dev *dev, struct 
rte_eth_dev_info *dev_info)
dev_info->if_index = if_nametoindex(pmd->ifname);
dev_info->max_mac_addrs = 1;
dev_info->max_rx_pktlen = RTE_ETHER_MAX_LEN;
+   dev_info->max_rx_queues = IORING_MAX_QUEUES;
+   dev_info->max_tx_queues = IORING_MAX_QUEUES;
+   dev_info->min_rx_bufsize = 0;
+
+   dev_info->default_rxportconf = (struct rte_eth_dev_portconf) {
+   .burst_size = IORING_DEFAULT_BURST,
+   .ring_size = IORING_NUM_BUFFERS,
+   .nb_queues = 1,
+   };
 
return 0;
 }
@@ -311,6 +368,14 @@ eth_dev_close(struct rte_eth_dev *dev)
 
PMD_LOG(INFO, "Closing %s", pmd->ifname);
 
+   int *fds = dev->process_private;
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+   if (fds[i] == -1)
+   continue;
+   close(fds[i]);
+   fds[i] = -1;
+   }
+
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
 
@@ -324,6 +389,297 @@ eth_dev_close(struct rte_eth_dev *dev)
return 0;
 }
 
+/* Setup another fd to TAP device for the queue */
+static int
+eth_queue_setup(struct rte_eth_dev *dev, const char *name, uint16_t queue_id)
+{
+   int *fds = dev->process_private;
+
+   if (fds[queue_id] != -1)
+   return 0;   /* already setup */
+
+   struct ifreq ifr = { };
+   int tap_fd = tap_open(name, &ifr, 0);
+   if (tap_fd < 0) {
+   PMD_LOG(ERR, "tap_open failed");
+   return -1;
+   }
+
+   PMD_LOG(DEBUG, "opened %d for queue %u", tap_fd, queue_id);
+   fds[queue_id] = tap_fd;
+   return 0;
+}
+
+static int
+eth_queue_fd(uint16_t port_id, uint16_t queue_id)
+{
+   struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+   int *fds = dev->process_private;
+
+   return fds[queue_id];
+}
+
+/* setup an submit queue to read mbuf */
+static inline void
+eth_rx_submit(struct rx_queue *rxq, int fd, struct rte_mbuf *mb)
+{
+   struct io_uring_sqe *sqe = io_uring_get_sqe(&rxq->io_ring);
+
+   if (unlikely(sqe == NULL)) {
+   PMD_LOG(DEBUG, "io_uring no rx sqe");
+   rxq->rx_errors++;
+   } else {
+   void *base = rte_pktmbuf_mtod(mb, void *);
+   size_t len = mb->buf_len;
+
+   io_uring_prep_read(sqe, fd, base, len, 0);
+   io_uring_sqe_set_data(sqe, mb);
+ 

[PATCH v2 5/8] net/ioring: implement primary secondary fd passing

[Stephen Hemminger]

Add support for communicating fd's from primary to secondary.

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/ioring.ini |   1 +
 drivers/net/ioring/rte_eth_ioring.c | 136 +++-
 2 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/ioring.ini 
b/doc/guides/nics/features/ioring.ini
index 199c7cd31c..da47062adb 100644
--- a/doc/guides/nics/features/ioring.ini
+++ b/doc/guides/nics/features/ioring.ini
@@ -8,6 +8,7 @@ Link status  = Y
 MTU update   = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
+Multiprocess aware   = Y
 Linux   = Y
 x86-64   = Y
 Usage doc= Y
diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index b5d9c12bdf..ddef57adfb 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -28,6 +28,7 @@
 #include 
 
 #define IORING_DEFAULT_IFNAME  "enio%d"
+#define IORING_MP_KEY  "ioring_mp_send_fds"
 
 RTE_LOG_REGISTER_DEFAULT(ioring_logtype, NOTICE);
 #define RTE_LOGTYPE_IORING ioring_logtype
@@ -400,6 +401,84 @@ parse_iface_arg(const char *key __rte_unused, const char 
*value, void *extra_arg
return 0;
 }
 
+/* Secondary process requests rxq fds from primary. */
+static int
+ioring_request_fds(const char *name, struct rte_eth_dev *dev)
+{
+   struct rte_mp_msg request = { };
+
+   strlcpy(request.name, IORING_MP_KEY, sizeof(request.name));
+   strlcpy((char *)request.param, name, RTE_MP_MAX_PARAM_LEN);
+   request.len_param = strlen(name);
+
+   /* Send the request and receive the reply */
+   PMD_LOG(DEBUG, "Sending multi-process IPC request for %s", name);
+
+   struct timespec timeout = {.tv_sec = 1, .tv_nsec = 0};
+   struct rte_mp_reply replies;
+   int ret = rte_mp_request_sync(&request, &replies, &timeout);
+   if (ret < 0 || replies.nb_received != 1) {
+   PMD_LOG(ERR, "Failed to request fds from primary: %s",
+   rte_strerror(rte_errno));
+   return -1;
+   }
+
+   struct rte_mp_msg *reply = replies.msgs;
+   PMD_LOG(DEBUG, "Received multi-process IPC reply for %s", name);
+   if (dev->data->nb_rx_queues != reply->num_fds) {
+   PMD_LOG(ERR, "Incorrect number of fds received: %d != %d",
+   reply->num_fds, dev->data->nb_rx_queues);
+   return -EINVAL;
+   }
+
+   int *fds = dev->process_private;
+   for (int i = 0; i < reply->num_fds; i++)
+   fds[i] = reply->fds[i];
+
+   free(reply);
+   return 0;
+}
+
+/* Primary process sends rxq fds to secondary. */
+static int
+ioring_mp_send_fds(const struct rte_mp_msg *request, const void *peer)
+{
+   const char *request_name = (const char *)request->param;
+
+   PMD_LOG(DEBUG, "Received multi-process IPC request for %s", 
request_name);
+
+   /* Find the requested port */
+   struct rte_eth_dev *dev = rte_eth_dev_get_by_name(request_name);
+   if (!dev) {
+   PMD_LOG(ERR, "Failed to get port id for %s", request_name);
+   return -1;
+   }
+
+   /* Populate the reply with the xsk fd for each queue */
+   struct rte_mp_msg reply = { };
+   if (dev->data->nb_rx_queues > RTE_MP_MAX_FD_NUM) {
+   PMD_LOG(ERR, "Number of rx queues (%d) exceeds max number of 
fds (%d)",
+  dev->data->nb_rx_queues, RTE_MP_MAX_FD_NUM);
+   return -EINVAL;
+   }
+
+   int *fds = dev->process_private;
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++)
+   reply.fds[reply.num_fds++] = fds[i];
+
+   /* Send the reply */
+   strlcpy(reply.name, request->name, sizeof(reply.name));
+   strlcpy((char *)reply.param, request_name, RTE_MP_MAX_PARAM_LEN);
+   reply.len_param = strlen(request_name);
+
+   PMD_LOG(DEBUG, "Sending multi-process IPC reply for %s", request_name);
+   if (rte_mp_reply(&reply, peer) < 0) {
+   PMD_LOG(ERR, "Failed to reply to multi-process IPC request");
+   return -1;
+   }
+   return 0;
+}
+
 static int
 ioring_probe(struct rte_vdev_device *vdev)
 {
@@ -407,14 +486,43 @@ ioring_probe(struct rte_vdev_device *vdev)
const char *params = rte_vdev_device_args(vdev);
struct rte_kvargs *kvlist = NULL;
struct rte_eth_dev *eth_dev = NULL;
+   int *fds = NULL;
char tap_name[IFNAMSIZ] = IORING_DEFAULT_IFNAME;
uint8_t persist = 0;
int ret;
 
PMD_LOG(INFO, "Initializing %s", name);
 
-   if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-   return -1; /* TODO */
+   if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+   struct rte_eth_dev *eth_dev;
+
+   eth_dev = rte_eth_dev_attach_secondary(name);
+   if (!eth_dev) {
+   PMD_LOG(ERR, "Failed to p

[PATCH v2 8/8] net/ioring: implement statistics

[Stephen Hemminger]

Add support for basic statistics

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/ioring.ini |  2 +
 drivers/net/ioring/rte_eth_ioring.c | 57 +
 2 files changed, 59 insertions(+)

diff --git a/doc/guides/nics/features/ioring.ini 
b/doc/guides/nics/features/ioring.ini
index da47062adb..c9a4582d0e 100644
--- a/doc/guides/nics/features/ioring.ini
+++ b/doc/guides/nics/features/ioring.ini
@@ -9,6 +9,8 @@ MTU update   = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Multiprocess aware   = Y
+Basic stats  = Y
+Stats per queue  = Y
 Linux   = Y
 x86-64   = Y
 Usage doc= Y
diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index a7f38e0d5c..97f7bc72d3 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -365,6 +365,61 @@ eth_dev_info(struct rte_eth_dev *dev, struct 
rte_eth_dev_info *dev_info)
return 0;
 }
 
+static int
+eth_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+{
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+   const struct rx_queue *rxq = dev->data->rx_queues[i];
+
+   stats->ipackets += rxq->rx_packets;
+   stats->ibytes += rxq->rx_bytes;
+   stats->ierrors += rxq->rx_errors;
+   stats->rx_nombuf += rxq->rx_nombuf;
+
+   if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+   stats->q_ipackets[i] = rxq->rx_packets;
+   stats->q_ibytes[i] = rxq->rx_bytes;
+   }
+   }
+
+   for (uint16_t i = 0; i < dev->data->nb_tx_queues; i++) {
+   const struct tx_queue *txq = dev->data->tx_queues[i];
+
+   stats->opackets += txq->tx_packets;
+   stats->obytes += txq->tx_bytes;
+   stats->oerrors += txq->tx_errors;
+
+   if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+   stats->q_opackets[i] = txq->tx_packets;
+   stats->q_obytes[i] = txq->tx_bytes;
+   }
+   }
+
+   return 0;
+}
+
+static int
+eth_dev_stats_reset(struct rte_eth_dev *dev)
+{
+   for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+   struct rx_queue *rxq = dev->data->rx_queues[i];
+
+   rxq->rx_packets = 0;
+   rxq->rx_bytes = 0;
+   rxq->rx_nombuf = 0;
+   rxq->rx_errors = 0;
+   }
+
+   for (uint16_t i = 0; i < dev->data->nb_tx_queues; i++) {
+   struct tx_queue *txq = dev->data->tx_queues[i];
+
+   txq->tx_packets = 0;
+   txq->tx_bytes = 0;
+   txq->tx_errors = 0;
+   }
+   return 0;
+}
+
 static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
@@ -735,6 +790,8 @@ static const struct eth_dev_ops ops = {
.promiscuous_disable= eth_dev_promiscuous_disable,
.allmulticast_enable= eth_dev_allmulticast_enable,
.allmulticast_disable   = eth_dev_allmulticast_disable,
+   .stats_get  = eth_dev_stats_get,
+   .stats_reset= eth_dev_stats_reset,
.rx_queue_setup = eth_rx_queue_setup,
.rx_queue_release   = eth_rx_queue_release,
.tx_queue_setup = eth_tx_queue_setup,
-- 
2.45.2

[PATCH v2 7/8] net/ioring: add VLAN support

[Stephen Hemminger]

Add support for VLAN insert and stripping.

Signed-off-by: Stephen Hemminger 
---
 drivers/net/ioring/rte_eth_ioring.c | 45 +++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ioring/rte_eth_ioring.c 
b/drivers/net/ioring/rte_eth_ioring.c
index 8dd717cb9d..a7f38e0d5c 100644
--- a/drivers/net/ioring/rte_eth_ioring.c
+++ b/drivers/net/ioring/rte_eth_ioring.c
@@ -34,6 +34,8 @@
 #define IORING_NUM_BUFFERS 1024
 #define IORING_MAX_QUEUES  128
 
+#define IORING_TX_OFFLOAD  RTE_ETH_TX_OFFLOAD_VLAN_INSERT
+#define IORING_RX_OFFLOAD  RTE_ETH_RX_OFFLOAD_VLAN_STRIP
 
 static_assert(IORING_MAX_QUEUES <= RTE_MP_MAX_FD_NUM, "Max queues exceeds MP 
fd limit");
 
@@ -70,6 +72,7 @@ static const char * const valid_arguments[] = {
 struct rx_queue {
struct rte_mempool *mb_pool;/* rx buffer pool */
struct io_uring io_ring;/* queue of posted read's */
+   uint64_t offloads;
uint16_t port_id;
uint16_t queue_id;
 
@@ -81,6 +84,7 @@ struct rx_queue {
 
 struct tx_queue {
struct io_uring io_ring;
+   uint64_t offloads;
 
uint16_t port_id;
uint16_t queue_id;
@@ -471,6 +475,9 @@ eth_ioring_rx(void *queue, struct rte_mbuf **bufs, uint16_t 
nb_pkts)
goto resubmit;
}
 
+   if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
+   rte_vlan_strip(mb);
+
mb->pkt_len = len;
mb->data_len = len;
mb->port = rxq->port_id;
@@ -495,8 +502,7 @@ eth_ioring_rx(void *queue, struct rte_mbuf **bufs, uint16_t 
nb_pkts)
 
 static int
 eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t 
nb_rx_desc,
-  unsigned int socket_id,
-  const struct rte_eth_rxconf *rx_conf __rte_unused,
+  unsigned int socket_id, const struct rte_eth_rxconf *rx_conf,
   struct rte_mempool *mb_pool)
 {
struct pmd_internals *pmd = dev->data->dev_private;
@@ -515,6 +521,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t 
queue_id, uint16_t nb_rx_de
return -1;
}
 
+   rxq->offloads = rx_conf->offloads;
rxq->mb_pool = mb_pool;
rxq->port_id = dev->data->port_id;
rxq->queue_id = queue_id;
@@ -583,6 +590,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t 
queue_id,
 
txq->port_id = dev->data->port_id;
txq->queue_id = queue_id;
+   txq->offloads = tx_conf->offloads;
txq->free_thresh = tx_conf->tx_free_thresh;
dev->data->tx_queues[queue_id] = txq;
 
@@ -637,6 +645,38 @@ eth_ioring_tx_cleanup(struct tx_queue *txq)
txq->tx_bytes += tx_bytes;
 }
 
+static uint16_t
+eth_ioring_tx_prepare(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
+{
+   uint16_t nb_tx;
+   int error;
+
+   for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {
+   struct rte_mbuf *m = tx_pkts[nb_tx];
+
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+   error = rte_validate_tx_offload(m);
+   if (unlikely(error)) {
+   rte_errno = -error;
+   break;
+   }
+#endif
+   /* Do VLAN tag insertion */
+   if (unlikely(m->ol_flags & RTE_MBUF_F_TX_VLAN)) {
+   error = rte_vlan_insert(&m);
+   /* rte_vlan_insert() may change pointer */
+   tx_pkts[nb_tx] = m;
+
+   if (unlikely(error)) {
+   rte_errno = -error;
+   break;
+   }
+   }
+   }
+
+   return nb_tx;
+}
+
 static uint16_t
 eth_ioring_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 {
@@ -740,6 +780,7 @@ ioring_create(struct rte_eth_dev *dev, const char 
*tap_name, uint8_t persist)
PMD_LOG(DEBUG, "%s setup", ifr.ifr_name);
 
dev->rx_pkt_burst = eth_ioring_rx;
+   dev->tx_pkt_prepare = eth_ioring_tx_prepare;
dev->tx_pkt_burst = eth_ioring_tx;
 
return 0;
-- 
2.45.2

[DPDK/testpmd Bug 1595] failed to compile DPDK

[bugzilla]

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

Bug ID: 1595
   Summary: failed to compile DPDK
   Product: DPDK
   Version: 24.07
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: testpmd
  Assignee: dev@dpdk.org
  Reporter: pdamo...@nvidia.com
  Target Milestone: ---

failed to compile DPDK
FAILED: lib/librte_net.a.p/net_net_crc_sse.c.obj
"clang" "-Ilib\librte_net.a.p" "-Ilib" "-I..\lib" "-Ilib\net" "-I..\lib\net"
"-I." "-I.." "-Iconfig" "-I..\config" "-Ilib\eal\include"
"-I..\lib\eal\include" "-Ilib\eal\windows\include"
"-I..\lib\eal\windows\include" "-Ilib\eal\x86\include"
"-I..\lib\eal\x86\include" "-Ilib\eal\common" "-I..\lib\eal\common" "-Ilib\eal"
"-I..\lib\eal" "-Ilib\log" "-I..\lib\log" "-Ilib\kvargs" "-I..\lib\kvargs"
"-Ilib\mbuf" "-I..\lib\mbuf" "-Ilib\mempool" "-I..\lib\mempool" "-Ilib\ring"
"-I..\lib\ring" "-Ilib\metrics" "-I..\lib\metrics" "-Ilib\telemetry"
"-I..\lib\telemetry" "-IC:\Program Files\Mellanox\MLNX_WinOF2_DevX_SDK\inc"
"-Xclang" "-fcolor-diagnostics" "-pipe" "-D_FILE_OFFSET_BITS=64" "-Wall"
"-Winvalid-pch" "-Wextra" "-std=c11" "-g" "-include" "rte_config.h"
"-Wcast-qual" "-Wdeprecated" "-Wformat" "-Wformat-nonliteral"
"-Wformat-security" "-Wmissing-declarations" "-Wmissing-prototypes"
"-Wnested-externs" "-Wold-style-definition" "-Wpointer-arith" "-Wsign-compare"
"-Wstrict-prototypes" "-Wundef" "-Wwrite-strings"
"-Wno-address-of-packed-member" "-Wno-missing-field-initializers"
"-D_GNU_SOURCE" "-D_WIN32_WINNT=0x0A00" "-D_CRT_SECURE_NO_WARNINGS"
"-march=native" "-mrtm" "-DALLOW_EXPERIMENTAL_API" "-DALLOW_INTERNAL_API"
"-DCC_X86_64_SSE42_PCLMULQDQ_SUPPORT" "-DCC_X86_64_AVX512_VPCLMULQDQ_SUPPORT"
"-DRTE_LOG_DEFAULT_LOGTYPE=lib.net" "-DRTE_ANNOTATE_LOCKS" "-Wthread-safety"
-MD -MQ lib/librte_net.a.p/net_net_crc_sse.c.obj -MF
"lib\librte_net.a.p\net_net_crc_sse.c.obj.d" -o
lib/librte_net.a.p/net_net_crc_sse.c.obj "-c" ../lib/net/net_crc_sse.c
../lib/net/net_crc_sse.c:49:17: error: call to undeclared function
'_mm_clmulepi64_si128'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
__m128i tmp0 = _mm_clmulepi64_si128(fold, precomp, 0x01);
   ^
../lib/net/net_crc_sse.c:49:17: note: did you mean '_mm_cvtsi64_si128'?
C:\Program Files\LLVM\lib\clang\16\include\emmintrin.h:3308:46: note:
'_mm_cvtsi64_si128' declared here
static __inline__ __m128i __DEFAULT_FN_ATTRS _mm_cvtsi64_si128(long long __a) {
 ^
../lib/net/net_crc_sse.c:49:10: error: initializing '__m128i' (vector of 2
'long long' values) with an expression of incompatible type 'int'
__m128i tmp0 = _mm_clmulepi64_si128(fold, precomp, 0x01);
^  ~
../lib/net/net_crc_sse.c:50:10: error: initializing '__m128i' (vector of 2
'long long' values) with an expression of incompatible type 'int'
__m128i tmp1 = _mm_clmulepi64_si128(fold, precomp, 0x10);
^  ~
../lib/net/net_crc_sse.c:73:9: error: call to undeclared function
'_mm_clmulepi64_si128'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
tmp0 = _mm_clmulepi64_si128(data128, precomp, 0x00);
   ^
../lib/net/net_crc_sse.c:73:7: error: assigning to '__m128i' (vector of 2 'long
long' values) from incompatible type 'int'
tmp0 = _mm_clmulepi64_si128(data128, precomp, 0x00);
 ^ 
../lib/net/net_crc_sse.c:79:7: error: assigning to '__m128i' (vector of 2 'long
long' values) from incompatible type 'int'
tmp1 = _mm_clmulepi64_si128(tmp2, precomp, 0x10);
 ^ ~
../lib/net/net_crc_sse.c:110:9: error: call to undeclared function
'_mm_clmulepi64_si128'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
tmp1 = _mm_clmulepi64_si128(tmp0, precomp, 0x00);
   ^
../lib/net/net_crc_sse.c:110:7: error: assigning to '__m128i' (vector of 2
'long long' values) from incompatible type 'int'
tmp1 = _mm_clmulepi64_si128(tmp0, precomp, 0x00);
 ^ ~
../lib/net/net_crc_sse.c:114:7: error: assigning to '__m128i' (vector of 2
'long long' values) from incompatible type 'int'
tmp2 = _mm_clmulepi64_si128(tmp1, precomp, 0x10);
 ^ ~
../lib/net/net_crc_sse.c:240:10: error: call to undeclared function
'_mm_clmulepi64_si128'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
temp = _mm_clmulepi64_si128(a, k, 0x01);
   ^
../lib/net/net_crc_sse.c:240:8: error: assigning to '__m128i' 

[PATCH v3 02/22] net/_common_intel: provide common Tx entry structures

[Bruce Richardson]

The Tx entry structures, both vector and scalar, are common across Intel
drivers, so provide a single definition to be used everywhere.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h| 27 +++
 .../net/i40e/i40e_recycle_mbufs_vec_common.c  |  2 +-
 drivers/net/i40e/i40e_rxtx.c  | 18 ++---
 drivers/net/i40e/i40e_rxtx.h  | 14 +++---
 drivers/net/i40e/i40e_rxtx_vec_altivec.c  |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c   |  6 ++---
 drivers/net/i40e/i40e_rxtx_vec_common.h   |  4 +--
 drivers/net/i40e/i40e_rxtx_vec_neon.c |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c  |  2 +-
 drivers/net/iavf/iavf_rxtx.c  | 12 -
 drivers/net/iavf/iavf_rxtx.h  | 14 +++---
 drivers/net/iavf/iavf_rxtx_vec_avx2.c |  2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx512.c   | 10 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h   |  4 +--
 drivers/net/iavf/iavf_rxtx_vec_sse.c  |  2 +-
 drivers/net/ice/ice_dcf_ethdev.c  |  2 +-
 drivers/net/ice/ice_rxtx.c| 16 +--
 drivers/net/ice/ice_rxtx.h| 13 ++---
 drivers/net/ice/ice_rxtx_vec_avx2.c   |  2 +-
 drivers/net/ice/ice_rxtx_vec_avx512.c |  6 ++---
 drivers/net/ice/ice_rxtx_vec_common.h |  6 ++---
 drivers/net/ice/ice_rxtx_vec_sse.c|  2 +-
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c| 16 +--
 drivers/net/ixgbe/ixgbe_rxtx.h| 22 +++
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h |  8 +++---
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c|  2 +-
 29 files changed, 105 insertions(+), 117 deletions(-)
 create mode 100644 drivers/net/_common_intel/tx.h

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
new file mode 100644
index 00..384352b9db
--- /dev/null
+++ b/drivers/net/_common_intel/tx.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_TX_H_
+#define _COMMON_INTEL_TX_H_
+
+#include 
+#include 
+
+/**
+ * Structure associated with each descriptor of the TX ring of a TX queue.
+ */
+struct ci_tx_entry {
+   struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
+   uint16_t next_id; /* Index of next descriptor in ring. */
+   uint16_t last_id; /* Index of last scattered descriptor. */
+};
+
+/**
+ * Structure associated with each descriptor of the TX ring of a TX queue in 
vector Tx.
+ */
+struct ci_tx_entry_vec {
+   struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
+};
+
+#endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c 
b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
index 14424c9921..260d238ce4 100644
--- a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
+++ b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
@@ -56,7 +56,7 @@ i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue,
struct rte_eth_recycle_rxq_info *recycle_rxq_info)
 {
struct i40e_tx_queue *txq = tx_queue;
-   struct i40e_tx_entry *txep;
+   struct ci_tx_entry *txep;
struct rte_mbuf **rxep;
int i, n;
uint16_t nb_recycle_mbufs;
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 839c8a5442..2e1f07d2a1 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -378,7 +378,7 @@ i40e_build_ctob(uint32_t td_cmd,
 static inline int
 i40e_xmit_cleanup(struct i40e_tx_queue *txq)
 {
-   struct i40e_tx_entry *sw_ring = txq->sw_ring;
+   struct ci_tx_entry *sw_ring = txq->sw_ring;
volatile struct i40e_tx_desc *txd = txq->tx_ring;
uint16_t last_desc_cleaned = txq->last_desc_cleaned;
uint16_t nb_tx_desc = txq->nb_tx_desc;
@@ -1081,8 +1081,8 @@ uint16_t
 i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
struct i40e_tx_queue *txq;
-   struct i40e_tx_entry *sw_ring;
-   struct i40e_tx_entry *txe, *txn;
+   struct ci_tx_entry *sw_ring;
+   struct ci_tx_entry *txe, *txn;
volatile struct i40e_tx_desc *txd;
volatile struct i40e_tx_desc *txr;
struct rte_mbuf *tx_pkt;
@@ -1331,7 +1331,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 static __rte_always_inline int
 i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 {
-   struct i40e_tx_entry *txep;
+   struct ci_tx_entry *txep;
uint16_t tx_rs_thresh = txq->tx_rs_thresh;
uint16_t i = 0, j = 0;
struct rte_mbuf *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
@@ -1418,7 +1418,7 @@ i40e_tx_fill_hw_ring(struct i40e_tx_queue *txq,
 uint16_t nb_pkts)

[PATCH v3 01/22] net/_common_intel: add pkt reassembly fn for intel drivers

[Bruce Richardson]

The code for reassembling a single, multi-mbuf packet from multiple
buffers received from the NIC is duplicated across many drivers. Rather
than having multiple copies of this function, we can create an
"_common_intel" directory to hold such functions and consolidate
multiple functions down to a single one for easier maintenance.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/rx.h| 79 +++
 drivers/net/i40e/i40e_rxtx_vec_altivec.c  |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c   |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h   | 64 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c  |  4 +-
 drivers/net/i40e/meson.build  |  2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c |  8 +--
 drivers/net/iavf/iavf_rxtx_vec_avx512.c   |  8 +--
 drivers/net/iavf/iavf_rxtx_vec_common.h   | 65 +--
 drivers/net/iavf/iavf_rxtx_vec_sse.c  |  8 +--
 drivers/net/iavf/meson.build  |  2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c   |  4 +-
 drivers/net/ice/ice_rxtx_vec_avx512.c |  8 +--
 drivers/net/ice/ice_rxtx_vec_common.h | 66 +--
 drivers/net/ice/ice_rxtx_vec_sse.c|  4 +-
 drivers/net/ice/meson.build   |  2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 63 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  4 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c|  4 +-
 drivers/net/ixgbe/meson.build |  2 +-
 22 files changed, 121 insertions(+), 292 deletions(-)
 create mode 100644 drivers/net/_common_intel/rx.h

diff --git a/drivers/net/_common_intel/rx.h b/drivers/net/_common_intel/rx.h
new file mode 100644
index 00..5bd2fea7e3
--- /dev/null
+++ b/drivers/net/_common_intel/rx.h
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_RX_H_
+#define _COMMON_INTEL_RX_H_
+
+#include 
+#include 
+#include 
+
+#define CI_RX_BURST 32
+
+static inline uint16_t
+ci_rx_reassemble_packets(struct rte_mbuf **rx_bufs, uint16_t nb_bufs, uint8_t 
*split_flags,
+   struct rte_mbuf **pkt_first_seg, struct rte_mbuf **pkt_last_seg,
+   const uint8_t crc_len)
+{
+   struct rte_mbuf *pkts[CI_RX_BURST] = {0}; /*finished pkts*/
+   struct rte_mbuf *start = *pkt_first_seg;
+   struct rte_mbuf *end = *pkt_last_seg;
+   unsigned int pkt_idx, buf_idx;
+
+   for (buf_idx = 0, pkt_idx = 0; buf_idx < nb_bufs; buf_idx++) {
+   if (end) {
+   /* processing a split packet */
+   end->next = rx_bufs[buf_idx];
+   rx_bufs[buf_idx]->data_len += crc_len;
+
+   start->nb_segs++;
+   start->pkt_len += rx_bufs[buf_idx]->data_len;
+   end = end->next;
+
+   if (!split_flags[buf_idx]) {
+   /* it's the last packet of the set */
+   start->hash = end->hash;
+   start->vlan_tci = end->vlan_tci;
+   start->ol_flags = end->ol_flags;
+   /* we need to strip crc for the whole packet */
+   start->pkt_len -= crc_len;
+   if (end->data_len > crc_len) {
+   end->data_len -= crc_len;
+   } else {
+   /* free up last mbuf */
+   struct rte_mbuf *secondlast = start;
+
+   start->nb_segs--;
+   while (secondlast->next != end)
+   secondlast = secondlast->next;
+   secondlast->data_len -= (crc_len - 
end->data_len);
+   secondlast->next = NULL;
+   rte_pktmbuf_free_seg(end);
+   }
+   pkts[pkt_idx++] = start;
+   start = NULL;
+   end = NULL;
+   }
+   } else {
+   /* not processing a split packet */
+   if (!split_flags[buf_idx]) {
+   /* not a split packet, save and skip */
+   pkts[pkt_idx++] = rx_bufs[buf_idx];
+   continue;
+   }
+   start = rx_bufs[buf_idx];
+   end = start;
+   rx_bufs[buf_idx]->data_len += crc_len;
+   rx_bufs[buf_idx]->pkt_len += crc_len;
+   }
+   }
+
+   /* save the partial packet for ne

[PATCH v3 00/22] Reduce code duplication across Intel NIC drivers

[Bruce Richardson]

This RFC attempts to reduce the amount of code duplication across a
number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and ice.

The first patch extract a function from the Rx side, otherwise the
majority of the changes are on the Tx side, leading to a converged Tx
queue structure across the 4 drivers, and a large number of common
functions.

v2->v3:
* Fix incorrect/unadjusted memset in patch 8, leading to incorrect
  threshold tracking in ixgbe.

v1->v2:
* Fix two additional checkpatch issues that were flagged.
* Added in patch 21, which performs additional cleanup that is possible
  once all vector drivers use the same mbuf free/release process.
  [This brings the patchset to having over twice as many lines removed
  as added (1887 vs 930), and close to having a net removal of 1kloc]

RFC->v1:
* Moved the location of the common code from "common/intel_eth" to
  "net/_common_intel", and added only ".." to the driver include path so
  that the paths included "_common_intel" in them, to make it clear it's
  not driver-local headers.
* Due to change in location, structure/fn prefix changes from "ieth" to
  "ci" for "common intel".
* Removed the seeming-arbitrary split of vector and non-vector code -
  since much of the code taken from vector files was scalar code which
  was used by the vector drivers.
* Split code into separate Rx and Tx files.
* Fixed multiple checkpatch issues (but not all).
* Attempted to improve name standardization, by using "_vec" as a common
  suffix for all vector-related fns and data. Previously, some names had
  "vec" in the middle, others had just "_v" suffix or full word "vector"
  as suffix.
* Other minor changes...

Bruce Richardson (22):
  net/_common_intel: add pkt reassembly fn for intel drivers
  net/_common_intel: provide common Tx entry structures
  net/_common_intel: add Tx mbuf ring replenish fn
  drivers/net: align Tx queue struct field names
  drivers/net: add prefix for driver-specific structs
  net/_common_intel: merge ice and i40e Tx queue struct
  net/iavf: use common Tx queue structure
  net/ixgbe: convert Tx queue context cache field to ptr
  net/ixgbe: use common Tx queue structure
  net/_common_intel: pack Tx queue structure
  net/_common_intel: add post-Tx buffer free function
  net/_common_intel: add Tx buffer free fn for AVX-512
  net/iavf: use common Tx free fn for AVX-512
  net/ice: move Tx queue mbuf cleanup fn to common
  net/i40e: use common Tx queue mbuf cleanup fn
  net/ixgbe: use common Tx queue mbuf cleanup fn
  net/iavf: use common Tx queue mbuf cleanup fn
  net/ice: use vector SW ring for all vector paths
  net/i40e: use vector SW ring for all vector paths
  net/iavf: use vector SW ring for all vector paths
  net/_common_intel: remove unneeded code
  net/ixgbe: use common Tx backlog entry fn

 drivers/net/_common_intel/rx.h|  79 ++
 drivers/net/_common_intel/tx.h| 249 ++
 drivers/net/i40e/i40e_ethdev.c|   4 +-
 drivers/net/i40e/i40e_ethdev.h|   8 +-
 drivers/net/i40e/i40e_fdir.c  |  10 +-
 .../net/i40e/i40e_recycle_mbufs_vec_common.c  |   6 +-
 drivers/net/i40e/i40e_rxtx.c  | 192 +-
 drivers/net/i40e/i40e_rxtx.h  |  61 +
 drivers/net/i40e/i40e_rxtx_vec_altivec.c  |  26 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c |  26 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c   | 144 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h   | 144 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c |  26 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c  |  26 +-
 drivers/net/i40e/meson.build  |   2 +-
 drivers/net/iavf/iavf.h   |   2 +-
 drivers/net/iavf/iavf_ethdev.c|   4 +-
 drivers/net/iavf/iavf_rxtx.c  | 180 +
 drivers/net/iavf/iavf_rxtx.h  |  61 +
 drivers/net/iavf/iavf_rxtx_vec_avx2.c |  47 ++--
 drivers/net/iavf/iavf_rxtx_vec_avx512.c   | 214 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h   | 160 +--
 drivers/net/iavf/iavf_rxtx_vec_sse.c  |  56 ++--
 drivers/net/iavf/iavf_vchnl.c |   8 +-
 drivers/net/iavf/meson.build  |   2 +-
 drivers/net/ice/ice_dcf.c |   4 +-
 drivers/net/ice/ice_dcf_ethdev.c  |  21 +-
 drivers/net/ice/ice_diagnose.c|   2 +-
 drivers/net/ice/ice_ethdev.c  |   2 +-
 drivers/net/ice/ice_ethdev.h  |   7 +-
 drivers/net/ice/ice_rxtx.c| 163 +---
 drivers/net/ice/ice_rxtx.h|  52 +---
 drivers/net/ice/ice_rxtx_vec_avx2.c   |  26 +-
 drivers/net/ice/ice_rxtx_vec_avx512.c | 153 +--
 drivers/net/ice/ice_rxtx_vec_common.h | 190 +
 drivers/net/ice/ice_rxtx_vec_sse.c|  32 +--
 drivers/net/ice/meson.build

[PATCH v3 05/22] drivers/net: add prefix for driver-specific structs

[Bruce Richardson]

In preparation for merging the Tx structs for multiple drivers into a
single struct, rename the driver-specific pointers in each struct to
have a prefix on it, to avoid conflicts.

Signed-off-by: Bruce Richardson 
---
 drivers/net/i40e/i40e_fdir.c  |  6 +--
 .../net/i40e/i40e_recycle_mbufs_vec_common.c  |  2 +-
 drivers/net/i40e/i40e_rxtx.c  | 30 ++--
 drivers/net/i40e/i40e_rxtx.h  |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c  |  6 +--
 drivers/net/i40e/i40e_rxtx_vec_avx2.c |  6 +--
 drivers/net/i40e/i40e_rxtx_vec_avx512.c   |  8 ++--
 drivers/net/i40e/i40e_rxtx_vec_common.h   |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c |  6 +--
 drivers/net/i40e/i40e_rxtx_vec_sse.c  |  6 +--
 drivers/net/iavf/iavf_rxtx.c  | 24 +-
 drivers/net/iavf/iavf_rxtx.h  |  4 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c |  6 +--
 drivers/net/iavf/iavf_rxtx_vec_avx512.c   | 14 +++---
 drivers/net/iavf/iavf_rxtx_vec_common.h   |  2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c  |  6 +--
 drivers/net/ice/ice_dcf_ethdev.c  |  4 +-
 drivers/net/ice/ice_rxtx.c| 48 +--
 drivers/net/ice/ice_rxtx.h|  4 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c   |  6 +--
 drivers/net/ice/ice_rxtx_vec_avx512.c |  8 ++--
 drivers/net/ice/ice_rxtx_vec_common.h |  4 +-
 drivers/net/ice/ice_rxtx_vec_sse.c|  6 +--
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c| 22 -
 drivers/net/ixgbe/ixgbe_rxtx.h|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h |  6 +--
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  6 +--
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c|  6 +--
 29 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 47f79ecf11..c600167634 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1383,7 +1383,7 @@ i40e_find_available_buffer(struct rte_eth_dev *dev)
volatile struct i40e_tx_desc *tmp_txdp;
 
tmp_tail = txq->tx_tail;
-   tmp_txdp = &txq->tx_ring[tmp_tail + 1];
+   tmp_txdp = &txq->i40e_tx_ring[tmp_tail + 1];
 
do {
if ((tmp_txdp->cmd_type_offset_bsz &
@@ -1640,7 +1640,7 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
 
PMD_DRV_LOG(INFO, "filling filter programming descriptor.");
fdirdp = (volatile struct i40e_filter_program_desc *)
-   (&txq->tx_ring[txq->tx_tail]);
+   (&txq->i40e_tx_ring[txq->tx_tail]);
 
fdirdp->qindex_flex_ptype_vsi =
rte_cpu_to_le_32((fdir_action->rx_queue <<
@@ -1710,7 +1710,7 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
fdirdp->fd_id = rte_cpu_to_le_32(filter->soft_id);
 
PMD_DRV_LOG(INFO, "filling transmit descriptor.");
-   txdp = &txq->tx_ring[txq->tx_tail + 1];
+   txdp = &txq->i40e_tx_ring[txq->tx_tail + 1];
txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[txq->tx_tail >> 
1]);
 
td_cmd = I40E_TX_DESC_CMD_EOP |
diff --git a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c 
b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
index 260d238ce4..8679e5c1fd 100644
--- a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
+++ b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
@@ -75,7 +75,7 @@ i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue,
return 0;
 
/* check DD bits on threshold descriptor */
-   if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+   if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
return 0;
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index b0bb20fe9a..34ef931859 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -379,7 +379,7 @@ static inline int
 i40e_xmit_cleanup(struct i40e_tx_queue *txq)
 {
struct ci_tx_entry *sw_ring = txq->sw_ring;
-   volatile struct i40e_tx_desc *txd = txq->tx_ring;
+   volatile struct i40e_tx_desc *txd = txq->i40e_tx_ring;
uint16_t last_desc_cleaned = txq->last_desc_cleaned;
uint16_t nb_tx_desc = txq->nb_tx_desc;
uint16_t desc_to_clean_to;
@@ -1103,7 +1103,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 
txq = tx_queue;
sw_ring = txq->sw_ring;
-   txr = txq->tx_ring;
+   txr = txq->i40e_tx_ring;
tx_id = txq->tx_tail;
txe = &sw_ring[tx_id];
 
@@ -1338,7 +1338,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *

[PATCH v3 03/22] net/_common_intel: add Tx mbuf ring replenish fn

[Bruce Richardson]

Move the short function used to place mbufs on the SW Tx ring to common
code to avoid duplication.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h   |  7 +++
 drivers/net/i40e/i40e_rxtx_vec_altivec.c |  4 ++--
 drivers/net/i40e/i40e_rxtx_vec_avx2.c|  4 ++--
 drivers/net/i40e/i40e_rxtx_vec_common.h  | 10 --
 drivers/net/i40e/i40e_rxtx_vec_neon.c|  4 ++--
 drivers/net/i40e/i40e_rxtx_vec_sse.c |  4 ++--
 drivers/net/iavf/iavf_rxtx_vec_avx2.c|  4 ++--
 drivers/net/iavf/iavf_rxtx_vec_common.h  | 10 --
 drivers/net/iavf/iavf_rxtx_vec_sse.c |  4 ++--
 drivers/net/ice/ice_rxtx_vec_avx2.c  |  4 ++--
 drivers/net/ice/ice_rxtx_vec_common.h| 10 --
 drivers/net/ice/ice_rxtx_vec_sse.c   |  4 ++--
 12 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 384352b9db..5397007411 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -24,4 +24,11 @@ struct ci_tx_entry_vec {
struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
+static __rte_always_inline void
+ci_tx_backlog_entry(struct ci_tx_entry *txep, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
+{
+   for (uint16_t i = 0; i < (int)nb_pkts; ++i)
+   txep[i].mbuf = tx_pkts[i];
+}
+
 #endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c 
b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index ca1038eaa6..80f07a3e10 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -575,7 +575,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry(txep, tx_pkts, n);
 
for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
vtx1(txdp, *tx_pkts, flags);
@@ -592,7 +592,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
txep = &txq->sw_ring[tx_id];
}
 
-   tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index e8441de759..b26bae4757 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -765,7 +765,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry(txep, tx_pkts, n);
 
vtx(txdp, tx_pkts, n - 1, flags);
tx_pkts += (n - 1);
@@ -783,7 +783,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
txep = &txq->sw_ring[tx_id];
}
 
-   tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h 
b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 619fb89110..325e99c1a4 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -84,16 +84,6 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)
return txq->tx_rs_thresh;
 }
 
-static __rte_always_inline void
-tx_backlog_entry(struct ci_tx_entry *txep,
-struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-   int i;
-
-   for (i = 0; i < (int)nb_pkts; ++i)
-   txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _i40e_rx_queue_release_mbufs_vec(struct i40e_rx_queue *rxq)
 {
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c 
b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 9b90a32e28..26bc345a0a 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -702,7 +702,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry(txep, tx_pkts, n);
 
for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
vtx1(txdp, *tx_pkts, flags);
@@ -719,7 +719,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
txep = &txq->sw_ring[tx_id];
}
 
-   tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c 
b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index e1fa2ed543..ebc32b0d27 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@

[PATCH v3 06/22] net/_common_intel: merge ice and i40e Tx queue struct

[Bruce Richardson]

The queue structures of i40e and ice drivers are virtually identical, so
merge them into a common struct. This should allow easier function
merging in future using that common struct.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h| 55 +
 drivers/net/i40e/i40e_ethdev.c|  4 +-
 drivers/net/i40e/i40e_ethdev.h|  4 +-
 drivers/net/i40e/i40e_fdir.c  |  4 +-
 .../net/i40e/i40e_recycle_mbufs_vec_common.c  |  2 +-
 drivers/net/i40e/i40e_rxtx.c  | 58 +-
 drivers/net/i40e/i40e_rxtx.h  | 50 ++--
 drivers/net/i40e/i40e_rxtx_vec_altivec.c  |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c   |  6 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h   |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c |  4 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c  |  4 +-
 drivers/net/ice/ice_dcf.c |  4 +-
 drivers/net/ice/ice_dcf_ethdev.c  | 10 ++--
 drivers/net/ice/ice_diagnose.c|  2 +-
 drivers/net/ice/ice_ethdev.c  |  2 +-
 drivers/net/ice/ice_ethdev.h  |  4 +-
 drivers/net/ice/ice_rxtx.c| 60 +--
 drivers/net/ice/ice_rxtx.h| 41 +
 drivers/net/ice/ice_rxtx_vec_avx2.c   |  4 +-
 drivers/net/ice/ice_rxtx_vec_avx512.c |  8 +--
 drivers/net/ice/ice_rxtx_vec_common.h |  8 +--
 drivers/net/ice/ice_rxtx_vec_sse.c|  6 +-
 24 files changed, 165 insertions(+), 185 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 5397007411..c965f5ee6c 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -8,6 +8,9 @@
 #include 
 #include 
 
+/* forward declaration of the common intel (ci) queue structure */
+struct ci_tx_queue;
+
 /**
  * Structure associated with each descriptor of the TX ring of a TX queue.
  */
@@ -24,6 +27,58 @@ struct ci_tx_entry_vec {
struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
+typedef void (*ice_tx_release_mbufs_t)(struct ci_tx_queue *txq);
+
+struct ci_tx_queue {
+   union { /* TX ring virtual address */
+   volatile struct ice_tx_desc *ice_tx_ring;
+   volatile struct i40e_tx_desc *i40e_tx_ring;
+   };
+   volatile uint8_t *qtx_tail;   /* register address of tail */
+   struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
+   rte_iova_t tx_ring_dma;/* TX ring DMA address */
+   uint16_t nb_tx_desc;   /* number of TX descriptors */
+   uint16_t tx_tail; /* current value of tail register */
+   uint16_t nb_tx_used; /* number of TX desc used since RS bit set */
+   /* index to last TX descriptor to have been cleaned */
+   uint16_t last_desc_cleaned;
+   /* Total number of TX descriptors ready to be allocated. */
+   uint16_t nb_tx_free;
+   /* Start freeing TX buffers if there are less free descriptors than
+* this value.
+*/
+   uint16_t tx_free_thresh;
+   /* Number of TX descriptors to use before RS bit is set. */
+   uint16_t tx_rs_thresh;
+   uint8_t pthresh;   /**< Prefetch threshold register. */
+   uint8_t hthresh;   /**< Host threshold register. */
+   uint8_t wthresh;   /**< Write-back threshold reg. */
+   uint16_t port_id;  /* Device port identifier. */
+   uint16_t queue_id; /* TX queue index. */
+   uint16_t reg_idx;
+   uint64_t offloads;
+   uint16_t tx_next_dd;
+   uint16_t tx_next_rs;
+   uint64_t mbuf_errors;
+   bool tx_deferred_start; /* don't start this queue in dev start */
+   bool q_set; /* indicate if tx queue has been configured */
+   union {  /* the VSI this queue belongs to */
+   struct ice_vsi *ice_vsi;
+   struct i40e_vsi *i40e_vsi;
+   };
+   const struct rte_memzone *mz;
+
+   union {
+   struct { /* ICE driver specific values */
+   ice_tx_release_mbufs_t tx_rel_mbufs;
+   uint32_t q_teid; /* TX schedule node id. */
+   };
+   struct { /* I40E driver specific values */
+   uint8_t dcb_tc;
+   };
+   };
+};
+
 static __rte_always_inline void
 ci_tx_backlog_entry(struct ci_tx_entry *txep, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 {
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 30dcdc68a8..bf5560ccc8 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3685,7 +3685,7 @@ i40e_dev_update_mbuf_stats(struct rte_eth_dev *ethdev,
struct i40e_mbuf_stats *mbuf_stats)
 {
uint16_t idx;
-   struct i40e_tx_queue *txq;
+   struct c

[PATCH v3 04/22] drivers/net: align Tx queue struct field names

[Bruce Richardson]

Across the various Intel drivers sometimes different names are given to
fields in the Tx queue structure which have the same function. Do some
renaming to align things better for future merging.

Signed-off-by: Bruce Richardson 
---
 drivers/net/i40e/i40e_rxtx.c|  6 +--
 drivers/net/i40e/i40e_rxtx.h|  2 +-
 drivers/net/iavf/iavf_rxtx.c| 60 -
 drivers/net/iavf/iavf_rxtx.h| 14 +++---
 drivers/net/iavf/iavf_rxtx_vec_avx2.c   | 19 
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 57 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h | 24 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c| 18 
 drivers/net/iavf/iavf_vchnl.c   |  2 +-
 drivers/net/ixgbe/base/ixgbe_osdep.h|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c  | 16 +++
 drivers/net/ixgbe/ixgbe_rxtx.h  |  6 +--
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c |  2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c  |  2 +-
 14 files changed, 116 insertions(+), 114 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 2e1f07d2a1..b0bb20fe9a 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2549,7 +2549,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
txq->vsi = vsi;
txq->tx_deferred_start = tx_conf->tx_deferred_start;
 
-   txq->tx_ring_phys_addr = tz->iova;
+   txq->tx_ring_dma = tz->iova;
txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
 
/* Allocate software ring */
@@ -2923,7 +2923,7 @@ i40e_tx_queue_init(struct i40e_tx_queue *txq)
/* clear the context structure first */
memset(&tx_ctx, 0, sizeof(tx_ctx));
tx_ctx.new_context = 1;
-   tx_ctx.base = txq->tx_ring_phys_addr / I40E_QUEUE_BASE_ADDR_UNIT;
+   tx_ctx.base = txq->tx_ring_dma / I40E_QUEUE_BASE_ADDR_UNIT;
tx_ctx.qlen = txq->nb_tx_desc;
 
 #ifdef RTE_LIBRTE_IEEE1588
@@ -3209,7 +3209,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
txq->reg_idx = pf->fdir.fdir_vsi->base_queue;
txq->vsi = pf->fdir.fdir_vsi;
 
-   txq->tx_ring_phys_addr = tz->iova;
+   txq->tx_ring_dma = tz->iova;
txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
 
/*
diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index 0f5d3cb0b7..f420c98687 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -129,7 +129,7 @@ struct i40e_rx_queue {
  */
 struct i40e_tx_queue {
uint16_t nb_tx_desc; /**< number of TX descriptors */
-   uint64_t tx_ring_phys_addr; /**< TX ring DMA address */
+   rte_iova_t tx_ring_dma; /**< TX ring DMA address */
volatile struct i40e_tx_desc *tx_ring; /**< TX ring virtual address */
struct ci_tx_entry *sw_ring; /**< virtual address of SW ring */
uint16_t tx_tail; /**< current value of tail register */
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index e337f20073..adaaeb4625 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -216,8 +216,8 @@ static inline bool
 check_tx_vec_allow(struct iavf_tx_queue *txq)
 {
if (!(txq->offloads & IAVF_TX_NO_VECTOR_FLAGS) &&
-   txq->rs_thresh >= IAVF_VPMD_TX_MAX_BURST &&
-   txq->rs_thresh <= IAVF_VPMD_TX_MAX_FREE_BUF) {
+   txq->tx_rs_thresh >= IAVF_VPMD_TX_MAX_BURST &&
+   txq->tx_rs_thresh <= IAVF_VPMD_TX_MAX_FREE_BUF) {
PMD_INIT_LOG(DEBUG, "Vector tx can be enabled on this txq.");
return true;
}
@@ -309,13 +309,13 @@ reset_tx_queue(struct iavf_tx_queue *txq)
}
 
txq->tx_tail = 0;
-   txq->nb_used = 0;
+   txq->nb_tx_used = 0;
 
txq->last_desc_cleaned = txq->nb_tx_desc - 1;
-   txq->nb_free = txq->nb_tx_desc - 1;
+   txq->nb_tx_free = txq->nb_tx_desc - 1;
 
-   txq->next_dd = txq->rs_thresh - 1;
-   txq->next_rs = txq->rs_thresh - 1;
+   txq->tx_next_dd = txq->tx_rs_thresh - 1;
+   txq->tx_next_rs = txq->tx_rs_thresh - 1;
 }
 
 static int
@@ -845,8 +845,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
 
txq->nb_tx_desc = nb_desc;
-   txq->rs_thresh = tx_rs_thresh;
-   txq->free_thresh = tx_free_thresh;
+   txq->tx_rs_thresh = tx_rs_thresh;
+   txq->tx_free_thresh = tx_free_thresh;
txq->queue_id = queue_idx;
txq->port_id = dev->data->port_id;
txq->offloads = offloads;
@@ -881,7 +881,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
rte_free(txq);
return -ENOMEM;
}
-   txq->tx_ring_phys_addr = mz->iova;
+   txq->tx_ring_dma = mz->iova;
txq->tx_ring = (struct iavf_tx_desc *)mz->addr;
 
txq->mz = mz;
@@ -2387,7 +2387,7 @@ iavf_xmit_cleanup(struct iavf_tx_queue *txq)
 
volatile struct iavf_tx_desc *txd = txq->tx_ring;
 
-   desc_to_clean_to = (uint16_t)(last_desc_clea

[PATCH v3 08/22] net/ixgbe: convert Tx queue context cache field to ptr

[Bruce Richardson]

Rather than having a two element array of context cache values inside
the Tx queue structure, convert it to a pointer to a cache at the end of
the structure. This makes future merging of the structure easier as we
don't need the "ixgbe_advctx_info" struct defined when defining a
combined queue structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/ixgbe/ixgbe_rxtx.c| 7 ---
 drivers/net/ixgbe/ixgbe_rxtx.h| 4 ++--
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index f7ddbba1b6..2ca26cd132 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -2522,8 +2522,7 @@ ixgbe_reset_tx_queue(struct ixgbe_tx_queue *txq)
txq->last_desc_cleaned = (uint16_t)(txq->nb_tx_desc - 1);
txq->nb_tx_free = (uint16_t)(txq->nb_tx_desc - 1);
txq->ctx_curr = 0;
-   memset((void *)&txq->ctx_cache, 0,
-   IXGBE_CTX_NUM * sizeof(struct ixgbe_advctx_info));
+   memset(txq->ctx_cache, 0, IXGBE_CTX_NUM * sizeof(struct 
ixgbe_advctx_info));
 }
 
 static const struct ixgbe_txq_ops def_txq_ops = {
@@ -2741,10 +2740,12 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
 
/* First allocate the tx queue data structure */
-   txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct 
ixgbe_tx_queue),
+   txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct 
ixgbe_tx_queue) +
+   sizeof(struct ixgbe_advctx_info) * 
IXGBE_CTX_NUM,
 RTE_CACHE_LINE_SIZE, socket_id);
if (txq == NULL)
return -ENOMEM;
+   txq->ctx_cache = RTE_PTR_ADD(txq, sizeof(struct ixgbe_tx_queue));
 
/*
 * Allocate TX ring hardware descriptors. A memzone large enough to
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h
index f6bae37cf3..847cacf7b5 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx.h
@@ -215,8 +215,8 @@ struct ixgbe_tx_queue {
uint8_t wthresh;   /**< Write-back threshold reg. */
uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */
uint32_tctx_curr;  /**< Hardware context states. */
-   /** Hardware context0 history. */
-   struct ixgbe_advctx_info ctx_cache[IXGBE_CTX_NUM];
+   /** Hardware context history. */
+   struct ixgbe_advctx_info *ctx_cache;
const struct ixgbe_txq_ops *ops;   /**< txq ops */
booltx_deferred_start; /**< not in global dev start. */
 #ifdef RTE_LIB_SECURITY
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index cc51bf6eed..ec334b5f65 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -176,8 +176,7 @@ _ixgbe_reset_tx_queue_vec(struct ixgbe_tx_queue *txq)
txq->last_desc_cleaned = (uint16_t)(txq->nb_tx_desc - 1);
txq->nb_tx_free = (uint16_t)(txq->nb_tx_desc - 1);
txq->ctx_curr = 0;
-   memset((void *)&txq->ctx_cache, 0,
-   IXGBE_CTX_NUM * sizeof(struct ixgbe_advctx_info));
+   memset(txq->ctx_cache, 0, IXGBE_CTX_NUM * sizeof(struct 
ixgbe_advctx_info));
 }
 
 static inline int
-- 
2.43.0

[PATCH v3 12/22] net/_common_intel: add Tx buffer free fn for AVX-512

[Bruce Richardson]

AVX-512 code paths for ice and i40e drivers are common, and differ from
the regular post-Tx free function in that the SW ring from which the
buffers are freed does not contain anything other than the mbuf pointer.
Merge these into a common function in intel_common to reduce
duplication.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h  |  92 +++
 drivers/net/i40e/i40e_rxtx_vec_avx512.c | 114 +--
 drivers/net/ice/ice_rxtx_vec_avx512.c   | 117 +---
 3 files changed, 94 insertions(+), 229 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index a930309c05..84ff839672 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -178,4 +178,96 @@ ci_tx_free_bufs(struct ci_tx_queue *txq, ci_desc_done_fn 
desc_done)
return txq->tx_rs_thresh;
 }
 
+static __rte_always_inline int
+ci_tx_free_bufs_vec(struct ci_tx_queue *txq, ci_desc_done_fn desc_done)
+{
+   int nb_free = 0;
+   struct rte_mbuf *free[IETH_VPMD_TX_MAX_FREE_BUF];
+   struct rte_mbuf *m;
+
+   /* check DD bits on threshold descriptor */
+   if (!desc_done(txq, txq->tx_next_dd))
+   return 0;
+
+   const uint32_t n = txq->tx_rs_thresh;
+
+   /* first buffer to free from S/W ring is at index
+* tx_next_dd - (tx_rs_thresh - 1)
+*/
+   struct ci_tx_entry_vec *txep = txq->sw_ring_vec;
+   txep += txq->tx_next_dd - (n - 1);
+
+   if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE && (n & 31) == 0) 
{
+   struct rte_mempool *mp = txep[0].mbuf->pool;
+   void **cache_objs;
+   struct rte_mempool_cache *cache = rte_mempool_default_cache(mp, 
rte_lcore_id());
+
+   if (!cache || cache->len == 0)
+   goto normal;
+
+   cache_objs = &cache->objs[cache->len];
+
+   if (n > RTE_MEMPOOL_CACHE_MAX_SIZE) {
+   rte_mempool_ops_enqueue_bulk(mp, (void *)txep, n);
+   goto done;
+   }
+
+   /* The cache follows the following algorithm
+*   1. Add the objects to the cache
+*   2. Anything greater than the cache min value (if it
+*   crosses the cache flush threshold) is flushed to the ring.
+*/
+   /* Add elements back into the cache */
+   uint32_t copied = 0;
+   /* n is multiple of 32 */
+   while (copied < n) {
+   memcpy(&cache_objs[copied], &txep[copied], 32 * 
sizeof(void *));
+   copied += 32;
+   }
+   cache->len += n;
+
+   if (cache->len >= cache->flushthresh) {
+   rte_mempool_ops_enqueue_bulk(mp, 
&cache->objs[cache->size],
+   cache->len - cache->size);
+   cache->len = cache->size;
+   }
+   goto done;
+   }
+
+normal:
+   m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
+   if (likely(m)) {
+   free[0] = m;
+   nb_free = 1;
+   for (uint32_t i = 1; i < n; i++) {
+   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
+   if (likely(m)) {
+   if (likely(m->pool == free[0]->pool)) {
+   free[nb_free++] = m;
+   } else {
+   rte_mempool_put_bulk(free[0]->pool, 
(void *)free, nb_free);
+   free[0] = m;
+   nb_free = 1;
+   }
+   }
+   }
+   rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);
+   } else {
+   for (uint32_t i = 1; i < n; i++) {
+   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
+   if (m)
+   rte_mempool_put(m->pool, m);
+   }
+   }
+
+done:
+   /* buffers were freed, update counters */
+   txq->nb_tx_free = (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh);
+   txq->tx_next_dd = (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh);
+   if (txq->tx_next_dd >= txq->nb_tx_desc)
+   txq->tx_next_dd = (uint16_t)(txq->tx_rs_thresh - 1);
+
+   return txq->tx_rs_thresh;
+}
+
 #endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index a3f6d1667f..9bb2a44231 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -754,118 +754,6 @@ i40e_recv_scattered_pkts_vec_avx512(void *rx_queue,
rx_pkts + retval, nb_pkts);
 }
 
-static __rte_always_inline int
-i40e_tx_free_bufs_avx512(struct c

[PATCH v3 11/22] net/_common_intel: add post-Tx buffer free function

[Bruce Richardson]

The actions taken for post-Tx buffer free for the SSE and AVX drivers
for i40e, iavf and ice drivers are all common, so centralize those in
common/intel_eth driver.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h  | 71 
 drivers/net/i40e/i40e_rxtx_vec_common.h | 72 -
 drivers/net/iavf/iavf_rxtx_vec_common.h | 61 -
 drivers/net/ice/ice_rxtx_vec_common.h   | 61 -
 4 files changed, 98 insertions(+), 167 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index c372d2838b..a930309c05 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -7,6 +7,7 @@
 
 #include 
 #include 
+#include 
 
 /* forward declaration of the common intel (ci) queue structure */
 struct ci_tx_queue;
@@ -107,4 +108,74 @@ ci_tx_backlog_entry(struct ci_tx_entry *txep, struct 
rte_mbuf **tx_pkts, uint16_
txep[i].mbuf = tx_pkts[i];
 }
 
+#define IETH_VPMD_TX_MAX_FREE_BUF 64
+
+typedef int (*ci_desc_done_fn)(struct ci_tx_queue *txq, uint16_t idx);
+
+static __rte_always_inline int
+ci_tx_free_bufs(struct ci_tx_queue *txq, ci_desc_done_fn desc_done)
+{
+   struct ci_tx_entry *txep;
+   uint32_t n;
+   uint32_t i;
+   int nb_free = 0;
+   struct rte_mbuf *m, *free[IETH_VPMD_TX_MAX_FREE_BUF];
+
+   /* check DD bits on threshold descriptor */
+   if (!desc_done(txq, txq->tx_next_dd))
+   return 0;
+
+   n = txq->tx_rs_thresh;
+
+/* first buffer to free from S/W ring is at index
+ * tx_next_dd - (tx_rs_thresh-1)
+ */
+   txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
+
+   if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) {
+   for (i = 0; i < n; i++) {
+   free[i] = txep[i].mbuf;
+   /* no need to reset txep[i].mbuf in vector path */
+   }
+   rte_mempool_put_bulk(free[0]->pool, (void **)free, n);
+   goto done;
+   }
+
+   m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
+   if (likely(m != NULL)) {
+   free[0] = m;
+   nb_free = 1;
+   for (i = 1; i < n; i++) {
+   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
+   if (likely(m != NULL)) {
+   if (likely(m->pool == free[0]->pool)) {
+   free[nb_free++] = m;
+   } else {
+   rte_mempool_put_bulk(free[0]->pool,
+(void *)free,
+nb_free);
+   free[0] = m;
+   nb_free = 1;
+   }
+   }
+   }
+   rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);
+   } else {
+   for (i = 1; i < n; i++) {
+   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
+   if (m != NULL)
+   rte_mempool_put(m->pool, m);
+   }
+   }
+
+done:
+   /* buffers were freed, update counters */
+   txq->nb_tx_free = (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh);
+   txq->tx_next_dd = (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh);
+   if (txq->tx_next_dd >= txq->nb_tx_desc)
+   txq->tx_next_dd = (uint16_t)(txq->tx_rs_thresh - 1);
+
+   return txq->tx_rs_thresh;
+}
+
 #endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h 
b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 57d6263ccf..907d32dd0b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -16,72 +16,18 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 
+static inline int
+i40e_tx_desc_done(struct ci_tx_queue *txq, uint16_t idx)
+{
+   return (txq->i40e_tx_ring[idx].cmd_type_offset_bsz &
+   rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) ==
+   rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE);
+}
+
 static __rte_always_inline int
 i40e_tx_free_bufs(struct ci_tx_queue *txq)
 {
-   struct ci_tx_entry *txep;
-   uint32_t n;
-   uint32_t i;
-   int nb_free = 0;
-   struct rte_mbuf *m, *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
-
-   /* check DD bits on threshold descriptor */
-   if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
-   rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
-   rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
-   return 0;
-
-   n = txq->tx_rs_thresh;
-
-/* first buffer to free from S/W ring is at index
- * tx_next_dd - (tx_rs_thresh-1)
- */
-   txep = &txq->

[PATCH v3 09/22] net/ixgbe: use common Tx queue structure

[Bruce Richardson]

Merge in additional fields used by the ixgbe driver and then convert it
over to using the common Tx queue structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h| 14 +++-
 drivers/net/ixgbe/ixgbe_ethdev.c  |  4 +-
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c| 64 +--
 drivers/net/ixgbe/ixgbe_rxtx.h| 56 ++--
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 26 
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   | 14 ++--
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c| 14 ++--
 8 files changed, 80 insertions(+), 114 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index c4a1a0c816..51ae3b051d 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -34,9 +34,13 @@ struct ci_tx_queue {
volatile struct i40e_tx_desc *i40e_tx_ring;
volatile struct iavf_tx_desc *iavf_tx_ring;
volatile struct ice_tx_desc *ice_tx_ring;
+   volatile union ixgbe_adv_tx_desc *ixgbe_tx_ring;
};
volatile uint8_t *qtx_tail;   /* register address of tail */
-   struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
+   union {
+   struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
+   struct ci_tx_entry_vec *sw_ring_vec;
+   };
rte_iova_t tx_ring_dma;/* TX ring DMA address */
uint16_t nb_tx_desc;   /* number of TX descriptors */
uint16_t tx_tail; /* current value of tail register */
@@ -87,6 +91,14 @@ struct ci_tx_queue {
uint8_t tc;
bool use_ctx;  /* with ctx info, each pkt needs two 
descriptors */
};
+   struct { /* ixgbe specific values */
+   const struct ixgbe_txq_ops *ops;
+   struct ixgbe_advctx_info *ctx_cache;
+   uint32_t ctx_curr;
+#ifdef RTE_LIB_SECURITY
+   uint8_t using_ipsec;  /**< indicates that IPsec TX 
feature is in use */
+#endif
+   };
};
 };
 
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 8bee97d191..5f18fbaad5 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1118,7 +1118,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void 
*init_params __rte_unused)
 * RX and TX function.
 */
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-   struct ixgbe_tx_queue *txq;
+   struct ci_tx_queue *txq;
/* TX queue function in primary, set by last queue initialized
 * Tx queue may not initialized by primary process
 */
@@ -1623,7 +1623,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
 * RX function
 */
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-   struct ixgbe_tx_queue *txq;
+   struct ci_tx_queue *txq;
/* TX queue function in primary, set by last queue initialized
 * Tx queue may not initialized by primary process
 */
diff --git a/drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c 
b/drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c
index a878db3150..3fd05ed5eb 100644
--- a/drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c
+++ b/drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c
@@ -51,7 +51,7 @@ uint16_t
 ixgbe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
struct rte_eth_recycle_rxq_info *recycle_rxq_info)
 {
-   struct ixgbe_tx_queue *txq = tx_queue;
+   struct ci_tx_queue *txq = tx_queue;
struct ci_tx_entry *txep;
struct rte_mbuf **rxep;
int i, n;
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 2ca26cd132..344ef85685 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -98,7 +98,7 @@
  * Return the total number of buffers freed.
  */
 static __rte_always_inline int
-ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
+ixgbe_tx_free_bufs(struct ci_tx_queue *txq)
 {
struct ci_tx_entry *txep;
uint32_t status;
@@ -195,7 +195,7 @@ tx1(volatile union ixgbe_adv_tx_desc *txdp, struct rte_mbuf 
**pkts)
  * Copy mbuf pointers to the S/W ring.
  */
 static inline void
-ixgbe_tx_fill_hw_ring(struct ixgbe_tx_queue *txq, struct rte_mbuf **pkts,
+ixgbe_tx_fill_hw_ring(struct ci_tx_queue *txq, struct rte_mbuf **pkts,
  uint16_t nb_pkts)
 {
volatile union ixgbe_adv_tx_desc *txdp = 
&txq->ixgbe_tx_ring[txq->tx_tail];
@@ -231,7 +231,7 @@ static inline uint16_t
 tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 uint16_t nb_pkts)
 {
-   struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue;
+   struct ci_

[PATCH v3 13/22] net/iavf: use common Tx free fn for AVX-512

[Bruce Richardson]

Switch the iavf driver to use the common Tx free function. This requires
one additional parameter to that function, since iavf sometimes uses
context descriptors which means that we have double the descriptors per
SW ring slot.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h  |   6 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c |   2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 119 +---
 drivers/net/ice/ice_rxtx_vec_avx512.c   |   2 +-
 4 files changed, 7 insertions(+), 122 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 84ff839672..26aef528fa 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -179,7 +179,7 @@ ci_tx_free_bufs(struct ci_tx_queue *txq, ci_desc_done_fn 
desc_done)
 }
 
 static __rte_always_inline int
-ci_tx_free_bufs_vec(struct ci_tx_queue *txq, ci_desc_done_fn desc_done)
+ci_tx_free_bufs_vec(struct ci_tx_queue *txq, ci_desc_done_fn desc_done, bool 
ctx_descs)
 {
int nb_free = 0;
struct rte_mbuf *free[IETH_VPMD_TX_MAX_FREE_BUF];
@@ -189,13 +189,13 @@ ci_tx_free_bufs_vec(struct ci_tx_queue *txq, 
ci_desc_done_fn desc_done)
if (!desc_done(txq, txq->tx_next_dd))
return 0;
 
-   const uint32_t n = txq->tx_rs_thresh;
+   const uint32_t n = txq->tx_rs_thresh >> ctx_descs;
 
/* first buffer to free from S/W ring is at index
 * tx_next_dd - (tx_rs_thresh - 1)
 */
struct ci_tx_entry_vec *txep = txq->sw_ring_vec;
-   txep += txq->tx_next_dd - (n - 1);
+   txep += (txq->tx_next_dd >> ctx_descs) - (n - 1);
 
if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE && (n & 31) == 0) 
{
struct rte_mempool *mp = txep[0].mbuf->pool;
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index 9bb2a44231..c555c3491d 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -829,7 +829,7 @@ i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct 
rte_mbuf **tx_pkts,
uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
 
if (txq->nb_tx_free < txq->tx_free_thresh)
-   ci_tx_free_bufs_vec(txq, i40e_tx_desc_done);
+   ci_tx_free_bufs_vec(txq, i40e_tx_desc_done, false);
 
nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
if (unlikely(nb_pkts == 0))
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c 
b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 9cf7171524..8543490c70 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -1844,121 +1844,6 @@ 
iavf_recv_scattered_pkts_vec_avx512_flex_rxd_offload(void *rx_queue,
true);
 }
 
-static __rte_always_inline int
-iavf_tx_free_bufs_avx512(struct ci_tx_queue *txq)
-{
-   struct ci_tx_entry_vec *txep;
-   uint32_t n;
-   uint32_t i;
-   int nb_free = 0;
-   struct rte_mbuf *m, *free[IAVF_VPMD_TX_MAX_FREE_BUF];
-
-   /* check DD bits on threshold descriptor */
-   if ((txq->iavf_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
-rte_cpu_to_le_64(IAVF_TXD_QW1_DTYPE_MASK)) !=
-   rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE))
-   return 0;
-
-   n = txq->tx_rs_thresh >> txq->use_ctx;
-
-/* first buffer to free from S/W ring is at index
- * tx_next_dd - (tx_rs_thresh-1)
- */
-   txep = (void *)txq->sw_ring;
-   txep += (txq->tx_next_dd >> txq->use_ctx) - (n - 1);
-
-   if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE && (n & 31) == 0) 
{
-   struct rte_mempool *mp = txep[0].mbuf->pool;
-   struct rte_mempool_cache *cache = rte_mempool_default_cache(mp,
-   rte_lcore_id());
-   void **cache_objs;
-
-   if (!cache || cache->len == 0)
-   goto normal;
-
-   cache_objs = &cache->objs[cache->len];
-
-   if (n > RTE_MEMPOOL_CACHE_MAX_SIZE) {
-   rte_mempool_ops_enqueue_bulk(mp, (void *)txep, n);
-   goto done;
-   }
-
-   /* The cache follows the following algorithm
-*   1. Add the objects to the cache
-*   2. Anything greater than the cache min value (if it 
crosses the
-*   cache flush threshold) is flushed to the ring.
-*/
-   /* Add elements back into the cache */
-   uint32_t copied = 0;
-   /* n is multiple of 32 */
-   while (copied < n) {
-#ifdef RTE_ARCH_64
-   const __m512i a = _mm512_loadu_si512(&txep[copied]);
-   const __m512i b = _mm512_loadu_si512(&txep[copied + 8]);
-   const __m512i c = _mm

[PATCH v3 14/22] net/ice: move Tx queue mbuf cleanup fn to common

[Bruce Richardson]

The functions to loop over the Tx queue and clean up all the mbufs on
it, e.g. for queue shutdown, is not device specific and so can move into
the common_intel headers. Only complication is ensuring that the
correct ring format, either minimal vector or full structure, is used.
Ice driver currently uses two functions and a function pointer to help
with this - though actually one of those functions uses a further check
inside it - so we can simplify this down to just one common function,
with a flag set in the appropriate place. This avoids checking for
AVX-512-specific functions, which were the only function using the
smaller struct in this driver.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h| 49 -
 drivers/net/ice/ice_dcf_ethdev.c  |  5 +--
 drivers/net/ice/ice_ethdev.h  |  3 +-
 drivers/net/ice/ice_rxtx.c| 33 +
 drivers/net/ice/ice_rxtx_vec_common.h | 51 ---
 drivers/net/ice/ice_rxtx_vec_sse.c|  4 ---
 6 files changed, 60 insertions(+), 85 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 26aef528fa..1bf2a61b2f 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -65,6 +65,8 @@ struct ci_tx_queue {
rte_iova_t tx_ring_dma;/* TX ring DMA address */
bool tx_deferred_start; /* don't start this queue in dev start */
bool q_set; /* indicate if tx queue has been configured */
+   bool vector_tx; /* port is using vector TX */
+   bool vector_sw_ring;/* port is using vectorized SW ring 
(ieth_tx_entry_vec) */
union {  /* the VSI this queue belongs to */
struct i40e_vsi *i40e_vsi;
struct iavf_vsi *iavf_vsi;
@@ -74,7 +76,6 @@ struct ci_tx_queue {
 
union {
struct { /* ICE driver specific values */
-   ice_tx_release_mbufs_t tx_rel_mbufs;
uint32_t q_teid; /* TX schedule node id. */
};
struct { /* I40E driver specific values */
@@ -270,4 +271,50 @@ ci_tx_free_bufs_vec(struct ci_tx_queue *txq, 
ci_desc_done_fn desc_done, bool ctx
return txq->tx_rs_thresh;
 }
 
+#define IETH_FREE_BUFS_LOOP(txq, swr, start) do { \
+   uint16_t i = start; \
+   if (txq->tx_tail < i) { \
+   for (; i < txq->nb_tx_desc; i++) { \
+   rte_pktmbuf_free_seg(swr[i].mbuf); \
+   swr[i].mbuf = NULL; \
+   } \
+   i = 0; \
+   } \
+   for (; i < txq->tx_tail; i++) { \
+   rte_pktmbuf_free_seg(swr[i].mbuf); \
+   swr[i].mbuf = NULL; \
+   } \
+} while (0)
+
+static inline void
+ci_txq_release_all_mbufs(struct ci_tx_queue *txq)
+{
+   if (unlikely(!txq || !txq->sw_ring))
+   return;
+
+   if (!txq->vector_tx) {
+   for (uint16_t i = 0; i < txq->nb_tx_desc; i++) {
+   if (txq->sw_ring[i].mbuf != NULL) {
+   rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
+   txq->sw_ring[i].mbuf = NULL;
+   }
+   }
+   return;
+   }
+
+   /**
+*  vPMD tx will not set sw_ring's mbuf to NULL after free,
+*  so need to free remains more carefully.
+*/
+   const uint16_t start = txq->tx_next_dd - txq->tx_rs_thresh + 1;
+
+   if (txq->vector_sw_ring) {
+   struct ci_tx_entry_vec *swr = txq->sw_ring_vec;
+   IETH_FREE_BUFS_LOOP(txq, swr, start);
+   } else {
+   struct ci_tx_entry *swr = txq->sw_ring;
+   IETH_FREE_BUFS_LOOP(txq, swr, start);
+   }
+}
+
 #endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index a0c065d78c..c20399cd84 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -24,6 +24,7 @@
 #include "ice_generic_flow.h"
 #include "ice_dcf_ethdev.h"
 #include "ice_rxtx.h"
+#include "_common_intel/tx.h"
 
 #define DCF_NUM_MACADDR_MAX  64
 
@@ -500,7 +501,7 @@ ice_dcf_tx_queue_stop(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
}
 
txq = dev->data->tx_queues[tx_queue_id];
-   txq->tx_rel_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
reset_tx_queue(txq);
dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
 
@@ -650,7 +651,7 @@ ice_dcf_stop_queues(struct rte_eth_dev *dev)
txq = dev->data->tx_queues[i];
if (!txq)
continue;
-   txq->tx_rel_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
reset_tx_queue(txq);
dev->data->tx_queue_s

[PATCH v3 10/22] net/_common_intel: pack Tx queue structure

[Bruce Richardson]

Move some fields about to better pack the Tx queue structure and make
sure all data used by the vector codepaths is on the first cacheline of
the structure. Checking with "pahole" on 64-bit build, only one 6-byte
hole is left in the structure - on second cacheline - after this patch.

As part of the reordering, move the p/h/wthresh values to the
ixgbe-specific part of the union. That is the only driver which actually
uses those values. i40e and ice drivers just record the values for later
return, so we can drop them from the Tx queue structure for those
drivers and just report the defaults in all cases.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h | 12 +---
 drivers/net/i40e/i40e_rxtx.c   |  9 +++--
 drivers/net/ice/ice_rxtx.c |  9 +++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 51ae3b051d..c372d2838b 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -41,7 +41,6 @@ struct ci_tx_queue {
struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
struct ci_tx_entry_vec *sw_ring_vec;
};
-   rte_iova_t tx_ring_dma;/* TX ring DMA address */
uint16_t nb_tx_desc;   /* number of TX descriptors */
uint16_t tx_tail; /* current value of tail register */
uint16_t nb_tx_used; /* number of TX desc used since RS bit set */
@@ -55,16 +54,14 @@ struct ci_tx_queue {
uint16_t tx_free_thresh;
/* Number of TX descriptors to use before RS bit is set. */
uint16_t tx_rs_thresh;
-   uint8_t pthresh;   /**< Prefetch threshold register. */
-   uint8_t hthresh;   /**< Host threshold register. */
-   uint8_t wthresh;   /**< Write-back threshold reg. */
uint16_t port_id;  /* Device port identifier. */
uint16_t queue_id; /* TX queue index. */
uint16_t reg_idx;
-   uint64_t offloads;
uint16_t tx_next_dd;
uint16_t tx_next_rs;
+   uint64_t offloads;
uint64_t mbuf_errors;
+   rte_iova_t tx_ring_dma;/* TX ring DMA address */
bool tx_deferred_start; /* don't start this queue in dev start */
bool q_set; /* indicate if tx queue has been configured */
union {  /* the VSI this queue belongs to */
@@ -95,9 +92,10 @@ struct ci_tx_queue {
const struct ixgbe_txq_ops *ops;
struct ixgbe_advctx_info *ctx_cache;
uint32_t ctx_curr;
-#ifdef RTE_LIB_SECURITY
+   uint8_t pthresh;   /**< Prefetch threshold register. */
+   uint8_t hthresh;   /**< Host threshold register. */
+   uint8_t wthresh;   /**< Write-back threshold reg. */
uint8_t using_ipsec;  /**< indicates that IPsec TX 
feature is in use */
-#endif
};
};
 };
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 305bc53480..539b170266 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2539,9 +2539,6 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
txq->nb_tx_desc = nb_desc;
txq->tx_rs_thresh = tx_rs_thresh;
txq->tx_free_thresh = tx_free_thresh;
-   txq->pthresh = tx_conf->tx_thresh.pthresh;
-   txq->hthresh = tx_conf->tx_thresh.hthresh;
-   txq->wthresh = tx_conf->tx_thresh.wthresh;
txq->queue_id = queue_idx;
txq->reg_idx = reg_idx;
txq->port_id = dev->data->port_id;
@@ -3310,9 +3307,9 @@ i40e_txq_info_get(struct rte_eth_dev *dev, uint16_t 
queue_id,
 
qinfo->nb_desc = txq->nb_tx_desc;
 
-   qinfo->conf.tx_thresh.pthresh = txq->pthresh;
-   qinfo->conf.tx_thresh.hthresh = txq->hthresh;
-   qinfo->conf.tx_thresh.wthresh = txq->wthresh;
+   qinfo->conf.tx_thresh.pthresh = I40E_DEFAULT_TX_PTHRESH;
+   qinfo->conf.tx_thresh.hthresh = I40E_DEFAULT_TX_HTHRESH;
+   qinfo->conf.tx_thresh.wthresh = I40E_DEFAULT_TX_WTHRESH;
 
qinfo->conf.tx_free_thresh = txq->tx_free_thresh;
qinfo->conf.tx_rs_thresh = txq->tx_rs_thresh;
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index bcc7c7a016..e2e147ba3e 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1492,9 +1492,6 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
txq->nb_tx_desc = nb_desc;
txq->tx_rs_thresh = tx_rs_thresh;
txq->tx_free_thresh = tx_free_thresh;
-   txq->pthresh = tx_conf->tx_thresh.pthresh;
-   txq->hthresh = tx_conf->tx_thresh.hthresh;
-   txq->wthresh = tx_conf->tx_thresh.wthresh;
txq->queue_id = queue_idx;
 
txq->reg_idx = vsi->base_queue + queue_idx;
@@ -1583,9 +1580,9 @@ ice_txq_info_get(struct rte_eth_dev *dev, uint16_t 
queue_id,
 
qinfo->nb_desc = txq->nb_tx_desc;
 
-   qinfo->conf.tx_th

[PATCH v3 16/22] net/ixgbe: use common Tx queue mbuf cleanup fn

[Bruce Richardson]

Update driver to use the common cleanup function.

Signed-off-by: Bruce Richardson 
---
 drivers/net/ixgbe/ixgbe_rxtx.c| 22 +++---
 drivers/net/ixgbe/ixgbe_rxtx.h|  1 -
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 28 ++-
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  7 --
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c|  7 --
 5 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 344ef85685..bf9d461b06 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -2334,21 +2334,6 @@ ixgbe_recv_pkts_lro_bulk_alloc(void *rx_queue, struct 
rte_mbuf **rx_pkts,
  *
  **/
 
-static void __rte_cold
-ixgbe_tx_queue_release_mbufs(struct ci_tx_queue *txq)
-{
-   unsigned i;
-
-   if (txq->sw_ring != NULL) {
-   for (i = 0; i < txq->nb_tx_desc; i++) {
-   if (txq->sw_ring[i].mbuf != NULL) {
-   rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
-   txq->sw_ring[i].mbuf = NULL;
-   }
-   }
-   }
-}
-
 static int
 ixgbe_tx_done_cleanup_full(struct ci_tx_queue *txq, uint32_t free_cnt)
 {
@@ -2472,7 +2457,7 @@ static void __rte_cold
 ixgbe_tx_queue_release(struct ci_tx_queue *txq)
 {
if (txq != NULL && txq->ops != NULL) {
-   txq->ops->release_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
txq->ops->free_swring(txq);
rte_memzone_free(txq->mz);
rte_free(txq);
@@ -2526,7 +2511,6 @@ ixgbe_reset_tx_queue(struct ci_tx_queue *txq)
 }
 
 static const struct ixgbe_txq_ops def_txq_ops = {
-   .release_mbufs = ixgbe_tx_queue_release_mbufs,
.free_swring = ixgbe_tx_free_swring,
.reset = ixgbe_reset_tx_queue,
 };
@@ -3380,7 +3364,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
struct ci_tx_queue *txq = dev->data->tx_queues[i];
 
if (txq != NULL) {
-   txq->ops->release_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
txq->ops->reset(txq);
dev->data->tx_queue_state[i] = 
RTE_ETH_QUEUE_STATE_STOPPED;
}
@@ -5655,7 +5639,7 @@ ixgbe_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
}
 
if (txq->ops != NULL) {
-   txq->ops->release_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
txq->ops->reset(txq);
}
dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h
index 4333e5bf2f..11689eb432 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx.h
@@ -181,7 +181,6 @@ struct ixgbe_advctx_info {
 };
 
 struct ixgbe_txq_ops {
-   void (*release_mbufs)(struct ci_tx_queue *txq);
void (*free_swring)(struct ci_tx_queue *txq);
void (*reset)(struct ci_tx_queue *txq);
 };
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index 06e760867c..2b12bdcc9c 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -78,32 +78,6 @@ tx_backlog_entry(struct ci_tx_entry_vec *txep,
txep[i].mbuf = tx_pkts[i];
 }
 
-static inline void
-_ixgbe_tx_queue_release_mbufs_vec(struct ci_tx_queue *txq)
-{
-   unsigned int i;
-   struct ci_tx_entry_vec *txe;
-   const uint16_t max_desc = (uint16_t)(txq->nb_tx_desc - 1);
-
-   if (txq->sw_ring == NULL || txq->nb_tx_free == max_desc)
-   return;
-
-   /* release the used mbufs in sw_ring */
-   for (i = txq->tx_next_dd - (txq->tx_rs_thresh - 1);
-i != txq->tx_tail;
-i = (i + 1) % txq->nb_tx_desc) {
-   txe = &txq->sw_ring_vec[i];
-   rte_pktmbuf_free_seg(txe->mbuf);
-   }
-   txq->nb_tx_free = max_desc;
-
-   /* reset tx_entry */
-   for (i = 0; i < txq->nb_tx_desc; i++) {
-   txe = &txq->sw_ring_vec[i];
-   txe->mbuf = NULL;
-   }
-}
-
 static inline void
 _ixgbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq)
 {
@@ -207,6 +181,8 @@ ixgbe_txq_vec_setup_default(struct ci_tx_queue *txq,
/* leave the first one for overflow */
txq->sw_ring_vec = txq->sw_ring_vec + 1;
txq->ops = txq_ops;
+   txq->vector_tx = 1;
+   txq->vector_sw_ring = 1;
 
return 0;
 }
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
index cb749a3760..2ccb399b64 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
@@ -633,12 +633,6 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 

[PATCH v3 15/22] net/i40e: use common Tx queue mbuf cleanup fn

[Bruce Richardson]

Update driver to be similar to the "ice" driver and use the common mbuf
ring cleanup code on shutdown of a Tx queue.

Signed-off-by: Bruce Richardson 
---
 drivers/net/i40e/i40e_ethdev.h |  4 +-
 drivers/net/i40e/i40e_rxtx.c   | 70 --
 drivers/net/i40e/i40e_rxtx.h   |  1 -
 3 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index d351193ed9..ccc8732d7d 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1260,12 +1260,12 @@ struct i40e_adapter {
 
/* For RSS reta table update */
uint8_t rss_reta_updated;
-#ifdef RTE_ARCH_X86
+
+   /* used only on x86, zero on other architectures */
bool rx_use_avx2;
bool rx_use_avx512;
bool tx_use_avx2;
bool tx_use_avx512;
-#endif
 };
 
 /**
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 539b170266..b70919c5dc 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1875,6 +1875,7 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
int err;
struct ci_tx_queue *txq;
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   const struct i40e_adapter *ad = 
I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
 
PMD_INIT_FUNC_TRACE();
 
@@ -1889,6 +1890,9 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
PMD_DRV_LOG(WARNING, "TX queue %u is deferred start",
tx_queue_id);
 
+   txq->vector_tx = ad->tx_vec_allowed;
+   txq->vector_sw_ring = ad->tx_use_avx512;
+
/*
 * tx_queue_id is queue id application refers to, while
 * rxq->reg_idx is the real queue index.
@@ -1929,7 +1933,7 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
return err;
}
 
-   i40e_tx_queue_release_mbufs(txq);
+   ci_txq_release_all_mbufs(txq);
i40e_reset_tx_queue(txq);
dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
 
@@ -2604,7 +2608,7 @@ i40e_tx_queue_release(void *txq)
return;
}
 
-   i40e_tx_queue_release_mbufs(q);
+   ci_txq_release_all_mbufs(q);
rte_free(q->sw_ring);
rte_memzone_free(q->mz);
rte_free(q);
@@ -2701,66 +2705,6 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq)
rxq->rxrearm_nb = 0;
 }
 
-void
-i40e_tx_queue_release_mbufs(struct ci_tx_queue *txq)
-{
-   struct rte_eth_dev *dev;
-   uint16_t i;
-
-   if (!txq || !txq->sw_ring) {
-   PMD_DRV_LOG(DEBUG, "Pointer to txq or sw_ring is NULL");
-   return;
-   }
-
-   dev = &rte_eth_devices[txq->port_id];
-
-   /**
-*  vPMD tx will not set sw_ring's mbuf to NULL after free,
-*  so need to free remains more carefully.
-*/
-#ifdef CC_AVX512_SUPPORT
-   if (dev->tx_pkt_burst == i40e_xmit_pkts_vec_avx512) {
-   struct ci_tx_entry_vec *swr = (void *)txq->sw_ring;
-
-   i = txq->tx_next_dd - txq->tx_rs_thresh + 1;
-   if (txq->tx_tail < i) {
-   for (; i < txq->nb_tx_desc; i++) {
-   rte_pktmbuf_free_seg(swr[i].mbuf);
-   swr[i].mbuf = NULL;
-   }
-   i = 0;
-   }
-   for (; i < txq->tx_tail; i++) {
-   rte_pktmbuf_free_seg(swr[i].mbuf);
-   swr[i].mbuf = NULL;
-   }
-   return;
-   }
-#endif
-   if (dev->tx_pkt_burst == i40e_xmit_pkts_vec_avx2 ||
-   dev->tx_pkt_burst == i40e_xmit_pkts_vec) {
-   i = txq->tx_next_dd - txq->tx_rs_thresh + 1;
-   if (txq->tx_tail < i) {
-   for (; i < txq->nb_tx_desc; i++) {
-   rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
-   txq->sw_ring[i].mbuf = NULL;
-   }
-   i = 0;
-   }
-   for (; i < txq->tx_tail; i++) {
-   rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
-   txq->sw_ring[i].mbuf = NULL;
-   }
-   } else {
-   for (i = 0; i < txq->nb_tx_desc; i++) {
-   if (txq->sw_ring[i].mbuf) {
-   rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
-   txq->sw_ring[i].mbuf = NULL;
-   }
-   }
-   }
-}
-
 static int
 i40e_tx_done_cleanup_full(struct ci_tx_queue *txq,
uint32_t free_cnt)
@@ -3127,7 +3071,7 @@ i40e_dev_clear_queues(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++) {
if (!dev->data->tx_queues[i])
 

[PATCH v3 22/22] net/ixgbe: use common Tx backlog entry fn

[Bruce Richardson]

Remove the custom vector Tx backlog entry function and use the standard
intel_common one, now that all vector drivers are using the same,
smaller ring structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 10 --
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  4 ++--
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c|  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index 53d1fed6f8..9c3752a12a 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -68,16 +68,6 @@ ixgbe_tx_free_bufs(struct ci_tx_queue *txq)
return txq->tx_rs_thresh;
 }
 
-static __rte_always_inline void
-tx_backlog_entry(struct ci_tx_entry_vec *txep,
-struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-   int i;
-
-   for (i = 0; i < (int)nb_pkts; ++i)
-   txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _ixgbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq)
 {
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
index 2ccb399b64..f879f6fa9a 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
@@ -597,7 +597,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
vtx1(txdp, *tx_pkts, flags);
@@ -614,7 +614,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
txep = &txq->sw_ring_vec[tx_id];
}
 
-   tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c 
b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index fa26365f06..915358e16b 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -720,7 +720,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
 
-   tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
vtx1(txdp, *tx_pkts, flags);
@@ -737,7 +737,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
txep = &txq->sw_ring_vec[tx_id];
}
 
-   tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
-- 
2.43.0

Re: [PATCH] devtools: enhance the license check

[Patrick Robb]

https://python-poetry.org/docs/basic-usage/#committing-your-poetrylock-file-to-version-control

I agree at first glance it appears like poetry.lock should go in the
.gitignore. However, the official docs state that in the case of developing
an application (like DTS), one should commit the generated poetry.lock file
to version control, as it provides a universal lock on python dependencies,
across all minor versions of python specified in the pyproject.toml, and it
also speeds up the dependency resolution process.

I gather from reading some posts online that some folks do opt to
.gitignore their poetry.lock files for shippable applications, relying
solely on the pyproject.toml as a source of truth for dependency versions.
But, again this approach does not guarantee common dependencies across all
the python minor versions supported by the project.

I will bring this up at the CI call tomorrow morning for feedback though.

On Wed, Dec 11, 2024 at 10:01 AM Thomas Monjalon 
wrote:

> 11/12/2024 15:55, Stephen Hemminger:
> > On Wed, 11 Dec 2024 10:00:38 +0100
> > David Marchand  wrote:
> >
> > > On Tue, Dec 10, 2024 at 6:00 PM Stephen Hemminger
> > >  wrote:
> > > >
> > > > On Tue, 10 Dec 2024 10:10:39 +0100
> > > > David Marchand  wrote:
> > > >
> > > > > +no_license_list=\
> > > > > +':^.git* :^.mailmap :^.ci/* :^README :^MAINTAINERS :^VERSION
> :^ABI_VERSION :^*/Kbuild '\
> > > > > +':^*/README* :^license/ :^config/ :^buildtools/ :^*/poetry.lock '\
> > > > > +':^kernel/linux/uapi/.gitignore :^kernel/linux/uapi/version
> :^*.cocci :^*.abignore '\
> > > > > +':^*.map :^*.ini :^*.data :^*.json :^*.cfg :^*.txt :^*.svg
> :^*.png'
> > > > > +
> > > >
> > > > What is poetry.lock?
> > >
> > > I don't know.
> > > It looks like some python packaging config for dts, and it is a
> generated file.
> > > # This file is automatically @generated by Poetry 1.8.3 and should not
> > > be changed by hand.
> > >
> > > Cc: dts maintainers.
> > >
> > >
> >
> > Put it in .gitignore then please, and the script will ignore that.
>
> How is it related?
>
> I don't like adding versioned files to .gitignore.
> (this poetry file is in the repository)
>
>
>

Re: [PATCH 00/21] use portable variadic macros

[Andre Muezerie]

On Tue, Dec 10, 2024 at 07:14:56PM -0800, Stephen Hemminger wrote:
> On Tue, 10 Dec 2024 18:05:30 -0800
> Andre Muezerie  wrote:
> 
> > 1) Use portable variadic macros
> > 
> > Many places are using a GCC extension related to variadic macros,
> > where a name prepends the ellipsis. This results in a warning like
> > the one below when compiling the code with MSVC:
> > 
> > app\test-pmd\testpmd.h(1314): error C2608:
> > invalid token '...' in macro parameter list
> > 
> > Variadic macros became a standard part of the C language with C99.
> > GCC, Clang and MSVC handle them properly.
> > 
> > The fix is to remove the prefix name (args... becomes ...) and use
> > __VA_ARGS__.
> 
> Could you add a coccinelle script and/or a checkpatch check to
> make sure that there are no new usages of ellipsis arg to deal with?

There is already a test for this in checkpatches.sh. Its message is:
MESSAGE='Do not use variadic argument pack in macros'

This test was probably added after these instances were written.

[PATCH v2 08/14] drivers/crypto: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/crypto/caam_jr/caam_jr_log.h  | 28 +--
 drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 28 +--
 drivers/crypto/dpaa_sec/dpaa_sec_log.h| 28 +--
 drivers/crypto/virtio/virtio_logs.h   | 60 +++
 4 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_log.h 
b/drivers/crypto/caam_jr/caam_jr_log.h
index 7c50119106..18de668e10 100644
--- a/drivers/crypto/caam_jr/caam_jr_log.h
+++ b/drivers/crypto/caam_jr/caam_jr_log.h
@@ -18,24 +18,24 @@ extern int caam_jr_logtype;
 
 #define PMD_INIT_FUNC_TRACE() CAAM_JR_DEBUG(" >>")
 
-#define CAAM_JR_INFO(fmt, args...) \
-   CAAM_JR_LOG(INFO, fmt, ## args)
-#define CAAM_JR_ERR(fmt, args...) \
-   CAAM_JR_LOG(ERR, fmt, ## args)
-#define CAAM_JR_WARN(fmt, args...) \
-   CAAM_JR_LOG(WARNING, fmt, ## args)
+#define CAAM_JR_INFO(fmt, ...) \
+   CAAM_JR_LOG(INFO, fmt, ## __VA_ARGS__)
+#define CAAM_JR_ERR(fmt, ...) \
+   CAAM_JR_LOG(ERR, fmt, ## __VA_ARGS__)
+#define CAAM_JR_WARN(fmt, ...) \
+   CAAM_JR_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define CAAM_JR_DP_LOG(level, ...) \
RTE_LOG_DP_LINE(level, CAAM_JR, __VA_ARGS__)
 
-#define CAAM_JR_DP_DEBUG(fmt, args...) \
-   CAAM_JR_DP_LOG(DEBUG, fmt, ## args)
-#define CAAM_JR_DP_INFO(fmt, args...) \
-   CAAM_JR_DP_LOG(INFO, fmt, ## args)
-#define CAAM_JR_DP_WARN(fmt, args...) \
-   CAAM_JR_DP_LOG(WARNING, fmt, ## args)
-#define CAAM_JR_DP_ERR(fmt, args...) \
-   CAAM_JR_DP_LOG(ERR, fmt, ## args)
+#define CAAM_JR_DP_DEBUG(fmt, ...) \
+   CAAM_JR_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define CAAM_JR_DP_INFO(fmt, ...) \
+   CAAM_JR_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define CAAM_JR_DP_WARN(fmt, ...) \
+   CAAM_JR_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
+#define CAAM_JR_DP_ERR(fmt, ...) \
+   CAAM_JR_DP_LOG(ERR, fmt, ## __VA_ARGS__)
 
 #endif /* _CAAM_JR_LOG_H_ */
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h 
b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h
index 53a5ebc760..5f2a0bf8e1 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h
@@ -19,25 +19,25 @@ extern int dpaa2_logtype_sec;
 
 #define PMD_INIT_FUNC_TRACE() DPAA2_SEC_DEBUG(">>")
 
-#define DPAA2_SEC_INFO(fmt, args...) \
-   DPAA2_SEC_LOG(INFO, fmt, ## args)
-#define DPAA2_SEC_ERR(fmt, args...) \
-   DPAA2_SEC_LOG(ERR, fmt, ## args)
-#define DPAA2_SEC_WARN(fmt, args...) \
-   DPAA2_SEC_LOG(WARNING, fmt, ## args)
+#define DPAA2_SEC_INFO(fmt, ...) \
+   DPAA2_SEC_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_SEC_ERR(fmt, ...) \
+   DPAA2_SEC_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_SEC_WARN(fmt, ...) \
+   DPAA2_SEC_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA2_SEC_DP_LOG(level, ...) \
RTE_LOG_DP_LINE(level, DPAA2_SEC, __VA_ARGS__)
 
-#define DPAA2_SEC_DP_DEBUG(fmt, args...) \
-   DPAA2_SEC_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA2_SEC_DP_INFO(fmt, args...) \
-   DPAA2_SEC_DP_LOG(INFO, fmt, ## args)
-#define DPAA2_SEC_DP_WARN(fmt, args...) \
-   DPAA2_SEC_DP_LOG(WARNING, fmt, ## args)
-#define DPAA2_SEC_DP_ERR(fmt, args...) \
-   DPAA2_SEC_DP_LOG(ERR, fmt, ## args)
+#define DPAA2_SEC_DP_DEBUG(fmt, ...) \
+   DPAA2_SEC_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA2_SEC_DP_INFO(fmt, ...) \
+   DPAA2_SEC_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_SEC_DP_WARN(fmt, ...) \
+   DPAA2_SEC_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
+#define DPAA2_SEC_DP_ERR(fmt, ...) \
+   DPAA2_SEC_DP_LOG(ERR, fmt, ## __VA_ARGS__)
 
 
 #endif /* _DPAA2_SEC_LOGS_H_ */
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_log.h 
b/drivers/crypto/dpaa_sec/dpaa_sec_log.h
index 6ac02d07e1..0413bcd6d3 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h
+++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h
@@ -19,24 +19,24 @@ extern int dpaa_logtype_sec;
 
 #define PMD_INIT_FUNC_TRACE() DPAA_SEC_DEBUG(" >>")
 
-#define DPAA_SEC_INFO(fmt, args...) \
-   DPAA_SEC_LOG(INFO, fmt, ## args)
-#define DPAA_SEC_ERR(fmt, args...) \
-   DPAA_SEC_LOG(ERR, fmt, ## args)
-#define DPAA_SEC_WARN(fmt, args...) \
-   DPAA_SEC_LOG(WARNING, fmt, ## args)
+#define DPAA_SEC_INFO(fmt, ...) \
+   DPAA_SEC_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_SEC_ERR(fmt, ...) \
+   DPAA_SEC_LOG(ERR,

[PATCH v2 07/14] drivers/compress: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/compress/octeontx/otx_zip.h  |  8 
 drivers/compress/zlib/zlib_pmd_private.h | 12 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/compress/octeontx/otx_zip.h 
b/drivers/compress/octeontx/otx_zip.h
index bf09e2f58c..6265664ead 100644
--- a/drivers/compress/octeontx/otx_zip.h
+++ b/drivers/compress/octeontx/otx_zip.h
@@ -80,10 +80,10 @@ extern int octtx_zip_logtype_driver;
 #define ZIP_PMD_LOG(level, ...) \
RTE_LOG_LINE_PREFIX(level, OCTTX_ZIP_DRIVER, "%s(): ", __func__, 
__VA_ARGS__)
 
-#define ZIP_PMD_INFO(fmt, args...) \
-   ZIP_PMD_LOG(INFO, fmt, ## args)
-#define ZIP_PMD_ERR(fmt, args...) \
-   ZIP_PMD_LOG(ERR, fmt, ## args)
+#define ZIP_PMD_INFO(fmt, ...) \
+   ZIP_PMD_LOG(INFO, fmt, ## __VA_ARGS__)
+#define ZIP_PMD_ERR(fmt, ...) \
+   ZIP_PMD_LOG(ERR, fmt, ## __VA_ARGS__)
 
 /* resources required to process stream */
 enum NUM_BUFS_PER_STREAM {
diff --git a/drivers/compress/zlib/zlib_pmd_private.h 
b/drivers/compress/zlib/zlib_pmd_private.h
index 7f6a57c6c5..fd8c4c55a4 100644
--- a/drivers/compress/zlib/zlib_pmd_private.h
+++ b/drivers/compress/zlib/zlib_pmd_private.h
@@ -19,12 +19,12 @@ extern int zlib_logtype_driver;
 #define ZLIB_PMD_LOG(level, ...) \
RTE_LOG_LINE_PREFIX(level, ZLIB_DRIVER, "%s(): ", __func__, __VA_ARGS__)
 
-#define ZLIB_PMD_INFO(fmt, args...) \
-   ZLIB_PMD_LOG(INFO, fmt, ## args)
-#define ZLIB_PMD_ERR(fmt, args...) \
-   ZLIB_PMD_LOG(ERR, fmt, ## args)
-#define ZLIB_PMD_WARN(fmt, args...) \
-   ZLIB_PMD_LOG(WARNING, fmt, ## args)
+#define ZLIB_PMD_INFO(fmt, ...) \
+   ZLIB_PMD_LOG(INFO, fmt, ## __VA_ARGS__)
+#define ZLIB_PMD_ERR(fmt, ...) \
+   ZLIB_PMD_LOG(ERR, fmt, ## __VA_ARGS__)
+#define ZLIB_PMD_WARN(fmt, ...) \
+   ZLIB_PMD_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 struct zlib_private {
struct rte_mempool *mp;
-- 
2.47.0.vfs.0.3

[PATCH v2 01/14] app/test-acl: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 app/test-acl/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index 41ce83db08..3a791b3ccf 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -423,9 +423,9 @@ static const char cb_port_delim[] = ":";
 
 static char line[LINE_MAX];
 
-#definedump_verbose(lvl, fh, fmt, args...) do { \
+#definedump_verbose(lvl, fh, fmt, ...) do { \
if ((lvl) <= (int32_t)config.verbose)\
-   fprintf(fh, fmt, ##args);\
+   fprintf(fh, fmt, ##__VA_ARGS__); \
 } while (0)
 
 
-- 
2.47.0.vfs.0.3

[PATCH v2 00/14] use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

v2:
 * Removed "do { } while (0)" that was added to macros in v1. As a
result, the patchset is now smaller.

Andre Muezerie (14):
  app/test-acl: use portable variadic macros
  app/test-eventdev: use portable variadic macros
  app/test-mldev: use portable variadic macros
  app/test-pmd: use portable variadic macros
  drivers/bus: use portable variadic macros
  drivers/common: use portable variadic macros
  drivers/compress: use portable variadic macros
  drivers/crypto: use portable variadic macros
  drivers/dma: use portable variadic macros
  drivers/event: use portable variadic macros
  drivers/mempool: use portable variadic macros
  drivers/net: use portable variadic macros
  drivers/raw: use portable variadic macros
  drivers/vdpa: use portable variadic macros

 app/test-acl/main.c   |  4 +-
 app/test-eventdev/evt_common.h| 12 ++--
 app/test-mldev/ml_common.h|  7 ++-
 app/test-pmd/testpmd.h|  4 +-
 drivers/bus/cdx/cdx_logs.h| 12 ++--
 drivers/bus/dpaa/include/fman.h   |  4 +-
 drivers/bus/dpaa/rte_dpaa_logs.h  | 18 +++---
 drivers/bus/fslmc/fslmc_logs.h| 12 ++--
 drivers/bus/fslmc/qbman/include/compat.h  | 14 ++---
 drivers/bus/ifpga/ifpga_logs.h| 16 ++---
 drivers/bus/uacce/uacce.c |  8 +--
 drivers/common/dpaax/compat.h | 16 ++---
 drivers/common/dpaax/dpaax_logs.h | 18 +++---
 drivers/common/idpf/base/idpf_osdep.h |  8 ++-
 drivers/compress/octeontx/otx_zip.h   |  8 +--
 drivers/compress/zlib/zlib_pmd_private.h  | 12 ++--
 drivers/crypto/caam_jr/caam_jr_log.h  | 28 -
 drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 28 -
 drivers/crypto/dpaa_sec/dpaa_sec_log.h| 28 -
 drivers/crypto/virtio/virtio_logs.h   | 60 +--
 drivers/dma/dpaa/dpaa_qdma_logs.h | 24 
 drivers/dma/dpaa2/dpaa2_qdma_logs.h   | 24 
 drivers/dma/idxd/idxd_internal.h  |  8 +--
 drivers/dma/ioat/ioat_internal.h  |  8 +--
 drivers/event/dlb2/dlb2_log.h |  8 +--
 drivers/event/dlb2/pf/base/dlb2_osdep.h   | 12 ++--
 drivers/event/dpaa/dpaa_eventdev.h| 16 ++---
 drivers/event/dpaa2/dpaa2_eventdev_logs.h | 12 ++--
 drivers/event/dsw/dsw_evdev.h |  8 +--
 drivers/event/sw/sw_evdev_log.h   | 12 ++--
 drivers/mempool/dpaa/dpaa_mempool.h   | 20 +++
 drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 30 +-
 drivers/net/ark/ark_logs.h|  4 +-
 drivers/net/bnxt/tf_core/cfa_tcam_mgr.h   | 12 ++--
 drivers/net/bnxt/tf_core/tfp.h|  8 +--
 drivers/net/bnxt/tf_ulp/bnxt_tf_common.h  |  4 +-
 drivers/net/dpaa/dpaa_ethdev.h| 16 ++---
 drivers/net/dpaa/fmlib/fm_ext.h   |  4 +-
 drivers/net/dpaa2/dpaa2_pmd_logs.h| 28 -
 drivers/net/e1000/base/e1000_osdep.h  | 10 ++--
 drivers/net/ena/base/ena_plat_dpdk.h  | 14 ++---
 drivers/net/enetc/enetc_logs.h| 32 +-
 drivers/net/enetfec/enet_pmd_logs.h   | 18 +++---
 drivers/net/enic/enic_compat.h| 16 ++---
 drivers/net/fm10k/base/fm10k_osdep.h  | 10 ++--
 drivers/net/hns3/hns3_logs.h  | 20 +++
 drivers/net/i40e/base/i40e_osdep.h|  2 +-
 drivers/net/ice/base/ice_osdep.h  |  4 +-
 drivers/net/igc/base/igc_osdep.h  | 10 ++--
 drivers/net/ipn3ke/ipn3ke_logs.h  | 16 ++---
 drivers/net/ixgbe/base/ixgbe_osdep.h  | 30 +-
 drivers/net/ngbe/base/ngbe_osdep.h|  2 +-
 drivers/net/ngbe/ngbe_logs.h  |  2 +-
 drivers/net/pfe/pfe_logs.h| 18 +++---
 drivers/net/qede/qede_ethdev.h|  4 +-
 drivers/net/qede/qede_logs.h  | 16 ++---
 drivers/net/sfc/sfc_debug.h   |  4 +-
 drivers/net/txgbe/base/txgbe_osdep.h  |  2 +-
 drivers/net/txgbe/txgbe_logs.h|  2 +-
 drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h| 24 
 drivers/raw/ifpga/base/opae_debug.h   |  4 +-
 drivers/raw/ifpga/base/opae_osdep.h   | 20 +++
 .../raw/ifpga/base/osdep_rte/osdep_generic.h  |  4 +-
 drivers/raw/ifpga/ifpga_rawdev.h  | 16 ++---
 drivers/raw/skeleton/skeleton_rawdev.h| 16 ++

[PATCH v2 03/14] app/test-mldev: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 app/test-mldev/ml_common.h | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/test-mldev/ml_common.h b/app/test-mldev/ml_common.h
index 8d7cc9eeb7..45faed352c 100644
--- a/app/test-mldev/ml_common.h
+++ b/app/test-mldev/ml_common.h
@@ -14,11 +14,12 @@
 
 #define ML_STR_FMT 20
 
-#define ml_err(fmt, args...) fprintf(stderr, CLRED "error: %s() " fmt CLNRM 
"\n", __func__, ##args)
+#define ml_err(fmt, ...) \
+   fprintf(stderr, CLRED "error: %s() " fmt CLNRM "\n", __func__, 
##__VA_ARGS__)
 
-#define ml_info(fmt, args...) fprintf(stdout, CLYEL "" fmt CLNRM "\n", ##args)
+#define ml_info(fmt, ...) fprintf(stdout, CLYEL "" fmt CLNRM "\n", 
##__VA_ARGS__)
 
-#define ml_dump(str, fmt, val...) printf("\t%-*s : " fmt "\n", ML_STR_FMT, 
str, ##val)
+#define ml_dump(str, fmt, ...) printf("\t%-*s : " fmt "\n", ML_STR_FMT, str, 
##__VA_ARGS__)
 
 #define ml_dump_begin(str) printf("\t%-*s :\n\t{\n", ML_STR_FMT, str)
 
-- 
2.47.0.vfs.0.3

[PATCH v2 04/14] app/test-pmd: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 app/test-pmd/testpmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 314482e69c..260e4761bd 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1311,7 +1311,7 @@ RTE_INIT(__##c) \
 #endif
 #endif /* __GCC__ */
 
-#define TESTPMD_LOG(level, fmt, args...) \
-   rte_log(RTE_LOG_ ## level, testpmd_logtype, "testpmd: " fmt, ## args)
+#define TESTPMD_LOG(level, fmt, ...) \
+   rte_log(RTE_LOG_ ## level, testpmd_logtype, "testpmd: " fmt, ## 
__VA_ARGS__)
 
 #endif /* _TESTPMD_H_ */
-- 
2.47.0.vfs.0.3

[PATCH v2 02/14] app/test-eventdev: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 app/test-eventdev/evt_common.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h
index 901b8ba55d..63b782f11a 100644
--- a/app/test-eventdev/evt_common.h
+++ b/app/test-eventdev/evt_common.h
@@ -18,16 +18,16 @@
 #define CLGRN  "\x1b[32m"
 #define CLYEL  "\x1b[33m"
 
-#define evt_err(fmt, args...) \
-   fprintf(stderr, CLRED"error: %s() "fmt CLNRM "\n", __func__, ## args)
+#define evt_err(fmt, ...) \
+   fprintf(stderr, CLRED"error: %s() "fmt CLNRM "\n", __func__, ## 
__VA_ARGS__)
 
-#define evt_info(fmt, args...) \
-   fprintf(stdout, CLYEL""fmt CLNRM "\n", ## args)
+#define evt_info(fmt, ...) \
+   fprintf(stdout, CLYEL""fmt CLNRM "\n", ## __VA_ARGS__)
 
 #define EVT_STR_FMT 20
 
-#define evt_dump(str, fmt, val...) \
-   printf("\t%-*s : "fmt"\n", EVT_STR_FMT, str, ## val)
+#define evt_dump(str, fmt, ...) \
+   printf("\t%-*s : "fmt"\n", EVT_STR_FMT, str, ## __VA_ARGS__)
 
 #define evt_dump_begin(str) printf("\t%-*s : {", EVT_STR_FMT, str)
 
-- 
2.47.0.vfs.0.3

[PATCH v2 12/14] drivers/net: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/net/ark/ark_logs.h   |  4 +--
 drivers/net/bnxt/tf_core/cfa_tcam_mgr.h  | 12 -
 drivers/net/bnxt/tf_core/tfp.h   |  8 +++---
 drivers/net/bnxt/tf_ulp/bnxt_tf_common.h |  4 +--
 drivers/net/dpaa/dpaa_ethdev.h   | 16 ++--
 drivers/net/dpaa/fmlib/fm_ext.h  |  4 +--
 drivers/net/dpaa2/dpaa2_pmd_logs.h   | 28 ++---
 drivers/net/e1000/base/e1000_osdep.h | 10 
 drivers/net/ena/base/ena_plat_dpdk.h | 14 +--
 drivers/net/enetc/enetc_logs.h   | 32 
 drivers/net/enetfec/enet_pmd_logs.h  | 18 ++---
 drivers/net/enic/enic_compat.h   | 16 ++--
 drivers/net/fm10k/base/fm10k_osdep.h | 10 
 drivers/net/hns3/hns3_logs.h | 20 +++
 drivers/net/i40e/base/i40e_osdep.h   |  2 +-
 drivers/net/ice/base/ice_osdep.h |  4 +--
 drivers/net/igc/base/igc_osdep.h | 10 
 drivers/net/ipn3ke/ipn3ke_logs.h | 16 ++--
 drivers/net/ixgbe/base/ixgbe_osdep.h | 30 +++---
 drivers/net/ngbe/base/ngbe_osdep.h   |  2 +-
 drivers/net/ngbe/ngbe_logs.h |  2 +-
 drivers/net/pfe/pfe_logs.h   | 18 ++---
 drivers/net/qede/qede_ethdev.h   |  4 +--
 drivers/net/qede/qede_logs.h | 16 ++--
 drivers/net/sfc/sfc_debug.h  |  4 +--
 drivers/net/txgbe/base/txgbe_osdep.h |  2 +-
 drivers/net/txgbe/txgbe_logs.h   |  2 +-
 27 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
index ca46d86c99..fb0f3eee5f 100644
--- a/drivers/net/ark/ark_logs.h
+++ b/drivers/net/ark/ark_logs.h
@@ -20,8 +20,8 @@
 
 extern int ark_logtype;
 
-#define ARK_PMD_LOG(level, fmt, args...)   \
-   rte_log(RTE_LOG_ ##level, ark_logtype, "ARK: " fmt, ## args)
+#define ARK_PMD_LOG(level, fmt, ...)   \
+   rte_log(RTE_LOG_ ##level, ark_logtype, "ARK: " fmt, ## __VA_ARGS__)
 
 
 /* Debug macro to enable core debug code */
diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h 
b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
index 6ac1156fbf..5801bf89eb 100644
--- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
+++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
@@ -25,13 +25,13 @@
 #endif
 
 /* Use TFP_DRV_LOG definition in tfp.h */
-#define CFA_TCAM_MGR_LOG(level, fmt, args...)  \
-   TFP_DRV_LOG(level, fmt, ## args)
-#define CFA_TCAM_MGR_LOG_DIR(level, dir, fmt, args...) \
-   TFP_DRV_LOG(level, "%s: " fmt, tf_dir_2_str(dir), ## args)
-#define CFA_TCAM_MGR_LOG_DIR_TYPE(level, dir, type, fmt, args...)  \
+#define CFA_TCAM_MGR_LOG(level, fmt, ...)  \
+   TFP_DRV_LOG(level, fmt, ## __VA_ARGS__)
+#define CFA_TCAM_MGR_LOG_DIR(level, dir, fmt, ...) \
+   TFP_DRV_LOG(level, "%s: " fmt, tf_dir_2_str(dir), ## __VA_ARGS__)
+#define CFA_TCAM_MGR_LOG_DIR_TYPE(level, dir, type, fmt, ...)  \
TFP_DRV_LOG(level, "%s: %s " fmt, tf_dir_2_str(dir),\
-   cfa_tcam_mgr_tbl_2_str(type), ## args)
+   cfa_tcam_mgr_tbl_2_str(type), ## __VA_ARGS__)
 
 #define CFA_TCAM_MGR_LOG_0(level, fmt) \
TFP_DRV_LOG(level, fmt)
diff --git a/drivers/net/bnxt/tf_core/tfp.h b/drivers/net/bnxt/tf_core/tfp.h
index 92f76004da..2103552d88 100644
--- a/drivers/net/bnxt/tf_core/tfp.h
+++ b/drivers/net/bnxt/tf_core/tfp.h
@@ -28,12 +28,12 @@ struct tfp_spinlock_parms {
rte_spinlock_t slock;
 };
 
-#define TFP_DRV_LOG_RAW(level, fmt, args...) \
+#define TFP_DRV_LOG_RAW(level, fmt, ...) \
rte_log(RTE_LOG_ ## level, bnxt_logtype_driver, "%s(): " fmt, \
-   __func__, ## args)
+   __func__, ## __VA_ARGS__)
 
-#define TFP_DRV_LOG(level, fmt, args...) \
-   TFP_DRV_LOG_RAW(level, fmt, ## args)
+#define TFP_DRV_LOG(level, fmt, ...) \
+   TFP_DRV_LOG_RAW(level, fmt, ## __VA_ARGS__)
 
 /**
  * @file
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h 
b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
index 4d9a1a7790..7fc70a3603 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
@@ -15,9 +15,9 @@
RTE_LOG(lvl, BNXT, "%s(): " fmt, __func__, ## __VA_ARGS__)
 
 #ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#define BNXT_DRV_INF(fmt, args...) RTE_LOG(INFO, fmt, ## args)
+#define BNXT_DRV_INF(fmt, ...) RTE_LOG(INFO, fmt, ## __VA_ARGS__)
 #else
-#d

[PATCH v2 10/14] drivers/event: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/event/dlb2/dlb2_log.h |  8 
 drivers/event/dlb2/pf/base/dlb2_osdep.h   | 12 ++--
 drivers/event/dpaa/dpaa_eventdev.h| 16 
 drivers/event/dpaa2/dpaa2_eventdev_logs.h | 12 ++--
 drivers/event/dsw/dsw_evdev.h |  8 
 drivers/event/sw/sw_evdev_log.h   | 12 ++--
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/drivers/event/dlb2/dlb2_log.h b/drivers/event/dlb2/dlb2_log.h
index c9ce87681c..321ecdfd05 100644
--- a/drivers/event/dlb2/dlb2_log.h
+++ b/drivers/event/dlb2/dlb2_log.h
@@ -12,11 +12,11 @@ extern int eventdev_dlb2_log_level;
 #define DLB2_LOG_IMPL(level, ...) \
RTE_LOG_LINE_PREFIX(level, EVENTDEV_DLB2, "%s", __func__, __VA_ARGS__)
 
-#define DLB2_LOG_INFO(fmt, args...) \
-   DLB2_LOG_IMPL(INFO, fmt, ## args)
+#define DLB2_LOG_INFO(fmt, ...) \
+   DLB2_LOG_IMPL(INFO, fmt, ## __VA_ARGS__)
 
-#define DLB2_LOG_ERR(fmt, args...) \
-   DLB2_LOG_IMPL(ERR, fmt, ## args)
+#define DLB2_LOG_ERR(fmt, ...) \
+   DLB2_LOG_IMPL(ERR, fmt, ## __VA_ARGS__)
 
 /* remove debug logs at compile time unless actually debugging */
 #define DLB2_LOG_LINE_DBG(...) \
diff --git a/drivers/event/dlb2/pf/base/dlb2_osdep.h 
b/drivers/event/dlb2/pf/base/dlb2_osdep.h
index 16c5e3b797..382a49090a 100644
--- a/drivers/event/dlb2/pf/base/dlb2_osdep.h
+++ b/drivers/event/dlb2/pf/base/dlb2_osdep.h
@@ -40,14 +40,14 @@
DLB2_PCI_REG_WRITE(DLB2_FUNC_REG_ADDR((hw), (reg)), (value))
 
 /* Map to PMDs logging interface */
-#define DLB2_ERR(dev, fmt, args...) \
-   RTE_LOG(ERR, EVENTDEV_DLB2, "%s" fmt, __func__, ## args)
+#define DLB2_ERR(dev, fmt, ...) \
+   RTE_LOG(ERR, EVENTDEV_DLB2, "%s" fmt, __func__, ## __VA_ARGS__)
 
-#define DLB2_INFO(dev, fmt, args...) \
-   RTE_LOG(INFO, EVENTDEV_DLB2, "%s" fmt, __func__, ## args)
+#define DLB2_INFO(dev, fmt, ...) \
+   RTE_LOG(INFO, EVENTDEV_DLB2, "%s" fmt, __func__, ## __VA_ARGS__)
 
-#define DLB2_DEBUG(dev, fmt, args...) \
-   RTE_LOG_DP(DEBUG, EVENTDEV_DLB2, fmt, ## args)
+#define DLB2_DEBUG(dev, fmt, ...) \
+   RTE_LOG_DP(DEBUG, EVENTDEV_DLB2, fmt, ## __VA_ARGS__)
 
 /**
  * os_udelay() - busy-wait for a number of microseconds
diff --git a/drivers/event/dpaa/dpaa_eventdev.h 
b/drivers/event/dpaa/dpaa_eventdev.h
index 5831ccb4e8..047c9781bd 100644
--- a/drivers/event/dpaa/dpaa_eventdev.h
+++ b/drivers/event/dpaa/dpaa_eventdev.h
@@ -82,13 +82,13 @@ struct dpaa_eventdev {
 
 #define EVENTDEV_INIT_FUNC_TRACE() DPAA_EVENTDEV_LOG(DEBUG, " >>")
 
-#define DPAA_EVENTDEV_DEBUG(fmt, args...) \
-   DPAA_EVENTDEV_LOG(DEBUG, fmt, ## args)
-#define DPAA_EVENTDEV_ERR(fmt, args...) \
-   DPAA_EVENTDEV_LOG(ERR, fmt, ## args)
-#define DPAA_EVENTDEV_INFO(fmt, args...) \
-   DPAA_EVENTDEV_LOG(INFO, fmt, ## args)
-#define DPAA_EVENTDEV_WARN(fmt, args...) \
-   DPAA_EVENTDEV_LOG(WARNING, fmt, ## args)
+#define DPAA_EVENTDEV_DEBUG(fmt, ...) \
+   DPAA_EVENTDEV_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA_EVENTDEV_ERR(fmt, ...) \
+   DPAA_EVENTDEV_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA_EVENTDEV_INFO(fmt, ...) \
+   DPAA_EVENTDEV_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_EVENTDEV_WARN(fmt, ...) \
+   DPAA_EVENTDEV_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* __DPAA_EVENTDEV_H__ */
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h 
b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
index 12317ae39f..7145ac30b9 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
@@ -16,12 +16,12 @@ extern int dpaa2_logtype_event;
 
 #define EVENTDEV_INIT_FUNC_TRACE() DPAA2_EVENTDEV_DEBUG(" >>")
 
-#define DPAA2_EVENTDEV_INFO(fmt, args...) \
-   DPAA2_EVENTDEV_LOG(INFO, fmt, ## args)
-#define DPAA2_EVENTDEV_ERR(fmt, args...) \
-   DPAA2_EVENTDEV_LOG(ERR, fmt, ## args)
-#define DPAA2_EVENTDEV_WARN(fmt, args...) \
-   DPAA2_EVENTDEV_LOG(WARNING, fmt, ## args)
+#define DPAA2_EVENTDEV_INFO(fmt, ...) \
+   DPAA2_EVENTDEV_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_EVENTDEV_ERR(fmt, ...) \
+   DPAA2_EVENTDEV_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_EVENTDEV_WARN(fmt, ...) \
+   DPAA2_EVENTDEV_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #define dpaa2_evdev_info(fmt, ...) DPAA2_EVENTDEV_LOG(INFO, fmt, ##__VA_ARGS__)
 #define dpaa2_evdev_dbg(fmt, ...) DPAA2_EVENTDEV_LOG(DEBUG, fmt, ##__VA_ARGS__)
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index c

[PATCH v2 09/14] drivers/dma: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/dma/dpaa/dpaa_qdma_logs.h   | 24 
 drivers/dma/dpaa2/dpaa2_qdma_logs.h | 24 
 drivers/dma/idxd/idxd_internal.h|  8 
 drivers/dma/ioat/ioat_internal.h|  8 
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/drivers/dma/dpaa/dpaa_qdma_logs.h 
b/drivers/dma/dpaa/dpaa_qdma_logs.h
index 2d77255fd8..cbed89485f 100644
--- a/drivers/dma/dpaa/dpaa_qdma_logs.h
+++ b/drivers/dma/dpaa/dpaa_qdma_logs.h
@@ -16,22 +16,22 @@ extern int dpaa_qdma_logtype;
 
 #define DPAA_QDMA_FUNC_TRACE() DPAA_QDMA_DEBUG(">>")
 
-#define DPAA_QDMA_INFO(fmt, args...) \
-   DPAA_QDMA_LOG(INFO, fmt, ## args)
-#define DPAA_QDMA_ERR(fmt, args...) \
-   DPAA_QDMA_LOG(ERR, fmt, ## args)
-#define DPAA_QDMA_WARN(fmt, args...) \
-   DPAA_QDMA_LOG(WARNING, fmt, ## args)
+#define DPAA_QDMA_INFO(fmt, ...) \
+   DPAA_QDMA_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_ERR(fmt, ...) \
+   DPAA_QDMA_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_WARN(fmt, ...) \
+   DPAA_QDMA_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA_QDMA_DP_LOG(level, ...) \
RTE_LOG_DP_LINE(level, DPAA_QDMA, __VA_ARGS__)
 
-#define DPAA_QDMA_DP_DEBUG(fmt, args...) \
-   DPAA_QDMA_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA_QDMA_DP_INFO(fmt, args...) \
-   DPAA_QDMA_DP_LOG(INFO, fmt, ## args)
-#define DPAA_QDMA_DP_WARN(fmt, args...) \
-   DPAA_QDMA_DP_LOG(WARNING, fmt, ## args)
+#define DPAA_QDMA_DP_DEBUG(fmt, ...) \
+   DPAA_QDMA_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_DP_INFO(fmt, ...) \
+   DPAA_QDMA_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_DP_WARN(fmt, ...) \
+   DPAA_QDMA_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* __DPAA_QDMA_LOGS_H__ */
diff --git a/drivers/dma/dpaa2/dpaa2_qdma_logs.h 
b/drivers/dma/dpaa2/dpaa2_qdma_logs.h
index 62ef60bcf2..50a865a56a 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma_logs.h
+++ b/drivers/dma/dpaa2/dpaa2_qdma_logs.h
@@ -20,23 +20,23 @@ extern int dpaa2_qdma_logtype;
 
 #define DPAA2_QDMA_FUNC_TRACE() DPAA2_QDMA_DEBUG(">>")
 
-#define DPAA2_QDMA_INFO(fmt, args...) \
-   DPAA2_QDMA_LOG(INFO, fmt, ## args)
-#define DPAA2_QDMA_ERR(fmt, args...) \
-   DPAA2_QDMA_LOG(ERR, fmt, ## args)
-#define DPAA2_QDMA_WARN(fmt, args...) \
-   DPAA2_QDMA_LOG(WARNING, fmt, ## args)
+#define DPAA2_QDMA_INFO(fmt, ...) \
+   DPAA2_QDMA_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_ERR(fmt, ...) \
+   DPAA2_QDMA_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_WARN(fmt, ...) \
+   DPAA2_QDMA_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA2_QDMA_DP_LOG(level, ...) \
RTE_LOG_DP_LINE(level, DPAA2_QDMA, __VA_ARGS__)
 
-#define DPAA2_QDMA_DP_DEBUG(fmt, args...) \
-   DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA2_QDMA_DP_INFO(fmt, args...) \
-   DPAA2_QDMA_DP_LOG(INFO, fmt, ## args)
-#define DPAA2_QDMA_DP_WARN(fmt, args...) \
-   DPAA2_QDMA_DP_LOG(WARNING, fmt, ## args)
+#define DPAA2_QDMA_DP_DEBUG(fmt, ...) \
+   DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_DP_INFO(fmt, ...) \
+   DPAA2_QDMA_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_DP_WARN(fmt, ...) \
+   DPAA2_QDMA_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #ifdef __cplusplus
 }
diff --git a/drivers/dma/idxd/idxd_internal.h b/drivers/dma/idxd/idxd_internal.h
index 99dc2b367e..b80a113455 100644
--- a/drivers/dma/idxd/idxd_internal.h
+++ b/drivers/dma/idxd/idxd_internal.h
@@ -25,10 +25,10 @@ extern int idxd_pmd_logtype;
 #define IDXD_PMD_LOG(level, ...) \
RTE_LOG_LINE_PREFIX(level, IDXD_PMD, "%s(): ", __func__, __VA_ARGS__)
 
-#define IDXD_PMD_DEBUG(fmt, args...)  IDXD_PMD_LOG(DEBUG, fmt, ## args)
-#define IDXD_PMD_INFO(fmt, args...)   IDXD_PMD_LOG(INFO, fmt, ## args)
-#define IDXD_PMD_ERR(fmt, args...)IDXD_PMD_LOG(ERR, fmt, ## args)
-#define IDXD_PMD_WARN(fmt, args...)   IDXD_PMD_LOG(WARNING, fmt, ## args)
+#define IDXD_PMD_DEBUG(fmt, ...)  IDXD_PMD_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_INFO(fmt, ...)   IDXD_PMD_LOG(INFO, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_ERR(fmt, ...)IDXD_PMD_LOG(ERR, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_WARN(fmt, ...)   IDXD_PMD_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 struct idxd_pci_common {
rte_spinlock_t lk;
diff --git a/drivers/dma/ioat/i

[PATCH v2 13/14] drivers/raw: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h| 24 +--
 drivers/raw/ifpga/base/opae_debug.h   |  4 ++--
 drivers/raw/ifpga/base/opae_osdep.h   | 20 
 .../raw/ifpga/base/osdep_rte/osdep_generic.h  |  4 ++--
 drivers/raw/ifpga/ifpga_rawdev.h  | 16 ++---
 drivers/raw/skeleton/skeleton_rawdev.h| 16 ++---
 drivers/raw/skeleton/skeleton_rawdev_test.c   |  8 +++
 7 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h 
b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h
index 66108e0667..d223895e1c 100644
--- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h
+++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h
@@ -20,23 +20,23 @@ extern int dpaa2_cmdif_logtype;
 
 #define DPAA2_CMDIF_FUNC_TRACE() DPAA2_CMDIF_DEBUG(">>")
 
-#define DPAA2_CMDIF_INFO(fmt, args...) \
-   DPAA2_CMDIF_LOG(INFO, fmt, ## args)
-#define DPAA2_CMDIF_ERR(fmt, args...) \
-   DPAA2_CMDIF_LOG(ERR, fmt, ## args)
-#define DPAA2_CMDIF_WARN(fmt, args...) \
-   DPAA2_CMDIF_LOG(WARNING, fmt, ## args)
+#define DPAA2_CMDIF_INFO(fmt, ...) \
+   DPAA2_CMDIF_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_CMDIF_ERR(fmt, ...) \
+   DPAA2_CMDIF_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_CMDIF_WARN(fmt, ...) \
+   DPAA2_CMDIF_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA2_CMDIF_DP_LOG(level, ...) \
RTE_LOG_DP_LINE(level, DPAA2_CMDIF, __VA_ARGS__)
 
-#define DPAA2_CMDIF_DP_DEBUG(fmt, args...) \
-   DPAA2_CMDIF_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA2_CMDIF_DP_INFO(fmt, args...) \
-   DPAA2_CMDIF_DP_LOG(INFO, fmt, ## args)
-#define DPAA2_CMDIF_DP_WARN(fmt, args...) \
-   DPAA2_CMDIF_DP_LOG(WARNING, fmt, ## args)
+#define DPAA2_CMDIF_DP_DEBUG(fmt, ...) \
+   DPAA2_CMDIF_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA2_CMDIF_DP_INFO(fmt, ...) \
+   DPAA2_CMDIF_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_CMDIF_DP_WARN(fmt, ...) \
+   DPAA2_CMDIF_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #ifdef __cplusplus
 }
diff --git a/drivers/raw/ifpga/base/opae_debug.h 
b/drivers/raw/ifpga/base/opae_debug.h
index a03dff926a..a802897fea 100644
--- a/drivers/raw/ifpga/base/opae_debug.h
+++ b/drivers/raw/ifpga/base/opae_debug.h
@@ -6,9 +6,9 @@
 #define _OPAE_DEBUG_H_
 
 #ifdef OPAE_HW_DEBUG
-#define opae_log(fmt, args...) printf(fmt, ## args)
+#define opae_log(fmt, ...) printf(fmt, ## __VA_ARGS__)
 #else
-#define opae_log(fme, args...) do {} while (0)
+#define opae_log(fme, ...) do {} while (0)
 #endif
 
 void opae_manager_dump(struct opae_manager *mgr);
diff --git a/drivers/raw/ifpga/base/opae_osdep.h 
b/drivers/raw/ifpga/base/opae_osdep.h
index cb780b1fed..10329ecf18 100644
--- a/drivers/raw/ifpga/base/opae_osdep.h
+++ b/drivers/raw/ifpga/base/opae_osdep.h
@@ -54,14 +54,14 @@ struct uuid {
 #define SET_FIELD(m, v) (((v) << (__builtin_ffsll(m) - 1)) & (m))
 #define GET_FIELD(m, v) (((v) & (m)) >> (__builtin_ffsll(m) - 1))
 
-#define dev_err(x, args...) dev_printf(ERR, args)
-#define dev_info(x, args...) dev_printf(INFO, args)
-#define dev_warn(x, args...) dev_printf(WARNING, args)
-#define dev_debug(x, args...) dev_printf(DEBUG, args)
+#define dev_err(x, ...) dev_printf(ERR, __VA_ARGS__)
+#define dev_info(x, ...) dev_printf(INFO, __VA_ARGS__)
+#define dev_warn(x, ...) dev_printf(WARNING, __VA_ARGS__)
+#define dev_debug(x, ...) dev_printf(DEBUG, __VA_ARGS__)
 
-#define pr_err(y, args...) dev_err(0, y, ##args)
-#define pr_warn(y, args...) dev_warn(0, y, ##args)
-#define pr_info(y, args...) dev_info(0, y, ##args)
+#define pr_err(y, ...) dev_err(0, y, ##__VA_ARGS__)
+#define pr_warn(y, ...) dev_warn(0, y, ##__VA_ARGS__)
+#define pr_info(y, ...) dev_info(0, y, ##__VA_ARGS__)
 
 #ifndef WARN_ON
 #define WARN_ON(x) do { \
@@ -80,13 +80,13 @@ struct uuid {
 #define time_before(a, b)  time_after(b, a)
 #define opae_memset(a, b, c)memset((a), (b), (c))
 
-#define readx_poll_timeout(op, val, cond, invl, timeout, args...) \
-__extension__ ({  \
+#define readx_poll_timeout(op, val, cond, invl, timeout, ...) \
+__extension__ ({  \
unsigned long __wait = 0; \
unsigned long __invl = (invl);\
unsigned long __timeout = (timeout);  

[PATCH v2 05/14] drivers/bus: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/bus/cdx/cdx_logs.h   | 12 ++--
 drivers/bus/dpaa/include/fman.h  |  4 ++--
 drivers/bus/dpaa/rte_dpaa_logs.h | 18 +-
 drivers/bus/fslmc/fslmc_logs.h   | 12 ++--
 drivers/bus/fslmc/qbman/include/compat.h | 14 +++---
 drivers/bus/ifpga/ifpga_logs.h   | 16 
 drivers/bus/uacce/uacce.c|  8 
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/drivers/bus/cdx/cdx_logs.h b/drivers/bus/cdx/cdx_logs.h
index 18b4010746..2d5c213417 100644
--- a/drivers/bus/cdx/cdx_logs.h
+++ b/drivers/bus/cdx/cdx_logs.h
@@ -15,11 +15,11 @@ extern int cdx_logtype_bus;
 #define CDX_BUS_DEBUG(...) \
RTE_LOG_LINE_PREFIX(DEBUG, CDX_BUS, "%s(): ", __func__, __VA_ARGS__)
 
-#define CDX_BUS_INFO(fmt, args...) \
-   CDX_BUS_LOG(INFO, fmt, ## args)
-#define CDX_BUS_ERR(fmt, args...) \
-   CDX_BUS_LOG(ERR, fmt, ## args)
-#define CDX_BUS_WARN(fmt, args...) \
-   CDX_BUS_LOG(WARNING, fmt, ## args)
+#define CDX_BUS_INFO(fmt, ...) \
+   CDX_BUS_LOG(INFO, fmt, ## __VA_ARGS__)
+#define CDX_BUS_ERR(fmt, ...) \
+   CDX_BUS_LOG(ERR, fmt, ## __VA_ARGS__)
+#define CDX_BUS_WARN(fmt, ...) \
+   CDX_BUS_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* CDX_LOGS_H */
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 01ef503117..134f0dc8ff 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -477,10 +477,10 @@ extern int fman_ccsr_map_fd;
 #define fman_if_for_each_bpool(bp, __if) \
list_for_each_entry(bp, &(__if)->bpool_list, node)
 
-#define FMAN_ERR(rc, fmt, args...) \
+#define FMAN_ERR(rc, fmt, ...) \
do { \
_errno = (rc); \
-   RTE_LOG_LINE(ERR, DPAA_BUS, fmt "(%d)", ##args, errno); \
+   RTE_LOG_LINE(ERR, DPAA_BUS, fmt "(%d)", ##__VA_ARGS__, errno); \
} while (0)
 
 #define FMAN_IP_REV_1  0xC30C4
diff --git a/drivers/bus/dpaa/rte_dpaa_logs.h b/drivers/bus/dpaa/rte_dpaa_logs.h
index 1e61b4e76b..235c617edd 100644
--- a/drivers/bus/dpaa/rte_dpaa_logs.h
+++ b/drivers/bus/dpaa/rte_dpaa_logs.h
@@ -16,13 +16,13 @@ extern int dpaa_logtype_bus;
RTE_LOG_LINE(level, DPAA_BUS, __VA_ARGS__)
 
 #ifdef RTE_LIBRTE_DPAA_DEBUG_BUS
-#define DPAA_BUS_HWWARN(cond, fmt, args...) \
+#define DPAA_BUS_HWWARN(cond, fmt, ...) \
do {\
if (cond) \
-   DPAA_BUS_LOG(DEBUG, "WARN: " fmt, ##args); \
+   DPAA_BUS_LOG(DEBUG, "WARN: " fmt, ##__VA_ARGS__); \
} while (0)
 #else
-#define DPAA_BUS_HWWARN(cond, fmt, args...) do { } while (0)
+#define DPAA_BUS_HWWARN(cond, fmt, ...) do { } while (0)
 #endif
 
 #define DPAA_BUS_DEBUG(...) \
@@ -30,11 +30,11 @@ extern int dpaa_logtype_bus;
 
 #define BUS_INIT_FUNC_TRACE() DPAA_BUS_DEBUG(" >>")
 
-#define DPAA_BUS_INFO(fmt, args...) \
-   DPAA_BUS_LOG(INFO, fmt, ## args)
-#define DPAA_BUS_ERR(fmt, args...) \
-   DPAA_BUS_LOG(ERR, fmt, ## args)
-#define DPAA_BUS_WARN(fmt, args...) \
-   DPAA_BUS_LOG(WARNING, fmt, ## args)
+#define DPAA_BUS_INFO(fmt, ...) \
+   DPAA_BUS_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_BUS_ERR(fmt, ...) \
+   DPAA_BUS_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA_BUS_WARN(fmt, ...) \
+   DPAA_BUS_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* _DPAA_LOGS_H_ */
diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h
index ac0cd3dc29..412d160d11 100644
--- a/drivers/bus/fslmc/fslmc_logs.h
+++ b/drivers/bus/fslmc/fslmc_logs.h
@@ -17,11 +17,11 @@ extern int dpaa2_logtype_bus;
 #define DPAA2_BUS_DEBUG(...) \
RTE_LOG_LINE_PREFIX(DEBUG, DPAA2_BUS, "%s(): ", __func__, __VA_ARGS__)
 
-#define DPAA2_BUS_INFO(fmt, args...) \
-   DPAA2_BUS_LOG(INFO, fmt, ## args)
-#define DPAA2_BUS_ERR(fmt, args...) \
-   DPAA2_BUS_LOG(ERR, fmt, ## args)
-#define DPAA2_BUS_WARN(fmt, args...) \
-   DPAA2_BUS_LOG(WARNING, fmt, ## args)
+#define DPAA2_BUS_INFO(fmt, ...) \
+   DPAA2_BUS_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_BUS_ERR(fmt, ...) \
+   DPAA2_BUS_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_BUS_WARN(fmt, ...) \
+   DPAA2_BUS_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* _FSLMC_LOGS_H_ */
diff --git a/drivers/bus/fslmc/qbman/include/compat.h 
b/drivers/bus/fslmc/qbman/include/compat.h
index 4ac3254bc7..f3d61bb4a0 100644
--- a/drivers/bus/fslmc/qbman/include/compat.h
+++ b/drivers/bus/fslmc/qbm

[PATCH v2 06/14] drivers/common: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/common/dpaax/compat.h | 16 
 drivers/common/dpaax/dpaax_logs.h | 18 +-
 drivers/common/idpf/base/idpf_osdep.h |  8 +---
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index 7c8d82c2b2..a7df70d5e6 100644
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h
@@ -70,28 +70,28 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 /* Debugging */
-#define prflush(fmt, args...) \
+#define prflush(fmt, ...) \
do { \
-   printf(fmt, ##args); \
+   printf(fmt, ##__VA_ARGS__); \
fflush(stdout); \
} while (0)
 #ifndef pr_crit
-#define pr_crit(fmt, args...)   prflush("CRIT:" fmt, ##args)
+#define pr_crit(fmt, ...)   prflush("CRIT:" fmt, ##__VA_ARGS__)
 #endif
 #ifndef pr_err
-#define pr_err(fmt, args...)prflush("ERR:" fmt, ##args)
+#define pr_err(fmt, ...)prflush("ERR:" fmt, ##__VA_ARGS__)
 #endif
 #ifndef pr_warn
-#define pr_warn(fmt, args...)   prflush("WARN:" fmt, ##args)
+#define pr_warn(fmt, ...)   prflush("WARN:" fmt, ##__VA_ARGS__)
 #endif
 #ifndef pr_info
-#define pr_info(fmt, args...)   prflush(fmt, ##args)
+#define pr_info(fmt, ...)   prflush(fmt, ##__VA_ARGS__)
 #endif
 #ifndef pr_debug
 #ifdef RTE_LIBRTE_DPAA_DEBUG_BUS
-#define pr_debug(fmt, args...) printf(fmt, ##args)
+#define pr_debug(fmt, ...) printf(fmt, ##__VA_ARGS__)
 #else
-#define pr_debug(fmt, args...) {}
+#define pr_debug(fmt, ...) {}
 #endif
 #endif
 
diff --git a/drivers/common/dpaax/dpaax_logs.h 
b/drivers/common/dpaax/dpaax_logs.h
index 6ed29fb2ea..90f0c98863 100644
--- a/drivers/common/dpaax/dpaax_logs.h
+++ b/drivers/common/dpaax/dpaax_logs.h
@@ -11,13 +11,13 @@ extern int dpaax_logger;
 #define RTE_LOGTYPE_DPAAX_LOGGER dpaax_logger
 
 #ifdef RTE_LIBRTE_DPAAX_DEBUG
-#define DPAAX_HWWARN(cond, fmt, args...) \
+#define DPAAX_HWWARN(cond, fmt, ...) \
do {\
if (cond) \
-   DPAAX_LOG(DEBUG, "WARN: " fmt, ##args); \
+   DPAAX_LOG(DEBUG, "WARN: " fmt, ##__VA_ARGS__); \
} while (0)
 #else
-#define DPAAX_HWWARN(cond, fmt, args...) do { } while (0)
+#define DPAAX_HWWARN(cond, fmt, ...) do { } while (0)
 #endif
 
 #define DPAAX_LOG(level, ...) \
@@ -27,11 +27,11 @@ extern int dpaax_logger;
 #define DPAAX_DEBUG(...) \
RTE_LOG_LINE_PREFIX(DEBUG, DPAAX_LOGGER, "%s(): ", __func__, 
__VA_ARGS__)
 
-#define DPAAX_INFO(fmt, args...) \
-   DPAAX_LOG(INFO, fmt, ## args)
-#define DPAAX_ERR(fmt, args...) \
-   DPAAX_LOG(ERR, fmt, ## args)
-#define DPAAX_WARN(fmt, args...) \
-   DPAAX_LOG(WARNING, fmt, ## args)
+#define DPAAX_INFO(fmt, ...) \
+   DPAAX_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAAX_ERR(fmt, ...) \
+   DPAAX_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAAX_WARN(fmt, ...) \
+   DPAAX_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* _DPAAX_LOGS_H_ */
diff --git a/drivers/common/idpf/base/idpf_osdep.h 
b/drivers/common/idpf/base/idpf_osdep.h
index cf9e553906..250f0ec500 100644
--- a/drivers/common/idpf/base/idpf_osdep.h
+++ b/drivers/common/idpf/base/idpf_osdep.h
@@ -42,7 +42,7 @@ typedef uint64_t  s64;
 typedef struct idpf_lock idpf_lock;
 
 #define __iomem
-#define hw_dbg(hw, S, A...)do {} while (0)
+#define hw_dbg(hw, S, ...) do {} while (0)
 #define upper_32_bits(n)   ((u32)(((n) >> 16) >> 16))
 #define lower_32_bits(n)   ((u32)(n))
 #define low_16_bits(x) ((x) & 0x)
@@ -122,8 +122,10 @@ typedef struct idpf_lock idpf_lock;
##__VA_ARGS__); \
} while (0)
 
-#define idpf_info(hw, fmt, args...) idpf_debug(hw, IDPF_DBG_ALL, fmt, ##args)
-#define idpf_warn(hw, fmt, args...) idpf_debug(hw, IDPF_DBG_ALL, fmt, ##args)
+#define idpf_info(hw, fmt, ...) \
+   idpf_debug(hw, IDPF_DBG_ALL, fmt, ##__VA_ARGS__)
+#define idpf_warn(hw, fmt, ...) \
+   idpf_debug(hw, IDPF_DBG_ALL, fmt, ##__VA_ARGS__)
 #define idpf_debug_array(hw, type, rowsize, groupsize, buf, len)   \
do {\
struct idpf_hw *hw_l = hw;  \
-- 
2.47.0.vfs.0.3

[PATCH v2 11/14] drivers/mempool: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/mempool/dpaa/dpaa_mempool.h   | 20 ++---
 drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 30 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/mempool/dpaa/dpaa_mempool.h 
b/drivers/mempool/dpaa/dpaa_mempool.h
index 135520922f..0877068fdd 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.h
+++ b/drivers/mempool/dpaa/dpaa_mempool.h
@@ -65,15 +65,15 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info;
 
 #define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>")
 
-#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \
-   RTE_LOG_DP(DEBUG, DPAA_MEMPOOL, fmt, ## args)
-#define DPAA_MEMPOOL_DEBUG(fmt, args...) \
-   DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)
-#define DPAA_MEMPOOL_ERR(fmt, args...) \
-   DPAA_MEMPOOL_LOG(ERR, fmt, ## args)
-#define DPAA_MEMPOOL_INFO(fmt, args...) \
-   DPAA_MEMPOOL_LOG(INFO, fmt, ## args)
-#define DPAA_MEMPOOL_WARN(fmt, args...) \
-   DPAA_MEMPOOL_LOG(WARNING, fmt, ## args)
+#define DPAA_MEMPOOL_DPDEBUG(fmt, ...) \
+   RTE_LOG_DP(DEBUG, DPAA_MEMPOOL, fmt, ## __VA_ARGS__)
+#define DPAA_MEMPOOL_DEBUG(fmt, ...) \
+   DPAA_MEMPOOL_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA_MEMPOOL_ERR(fmt, ...) \
+   DPAA_MEMPOOL_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA_MEMPOOL_INFO(fmt, ...) \
+   DPAA_MEMPOOL_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_MEMPOOL_WARN(fmt, ...) \
+   DPAA_MEMPOOL_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h 
b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
index d69ef17a04..1ba7983206 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
@@ -15,22 +15,22 @@ extern int dpaa2_logtype_mempool;
 #define DPAA2_MEMPOOL_DEBUG(...) \
RTE_LOG_LINE_PREFIX(DEBUG, DPAA2_MEMPOOL, "%s(): ", __func__, 
__VA_ARGS__)
 
-#define DPAA2_MEMPOOL_INFO(fmt, args...) \
-   DPAA2_MEMPOOL_LOG(INFO, fmt, ## args)
-#define DPAA2_MEMPOOL_ERR(fmt, args...) \
-   DPAA2_MEMPOOL_LOG(ERR, fmt, ## args)
-#define DPAA2_MEMPOOL_WARN(fmt, args...) \
-   DPAA2_MEMPOOL_LOG(WARNING, fmt, ## args)
+#define DPAA2_MEMPOOL_INFO(fmt, ...) \
+   DPAA2_MEMPOOL_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_MEMPOOL_ERR(fmt, ...) \
+   DPAA2_MEMPOOL_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_MEMPOOL_WARN(fmt, ...) \
+   DPAA2_MEMPOOL_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
-#define DPAA2_MEMPOOL_DP_LOG(level, fmt, args...) \
-   RTE_LOG_DP(level, DPAA2_MEMPOOL, fmt, ## args)
-
-#define DPAA2_MEMPOOL_DP_DEBUG(fmt, args...) \
-   DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA2_MEMPOOL_DP_INFO(fmt, args...) \
-   DPAA2_MEMPOOL_DP_LOG(INFO, fmt, ## args)
-#define DPAA2_MEMPOOL_DP_WARN(fmt, args...) \
-   DPAA2_MEMPOOL_DP_LOG(WARNING, fmt, ## args)
+#define DPAA2_MEMPOOL_DP_LOG(level, fmt, ...) \
+   RTE_LOG_DP(level, DPAA2_MEMPOOL, fmt, ## __VA_ARGS__)
+
+#define DPAA2_MEMPOOL_DP_DEBUG(fmt, ...) \
+   DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA2_MEMPOOL_DP_INFO(fmt, ...) \
+   DPAA2_MEMPOOL_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_MEMPOOL_DP_WARN(fmt, ...) \
+   DPAA2_MEMPOOL_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* _DPAA2_HW_MEMPOOL_LOGS_H_ */
-- 
2.47.0.vfs.0.3

[PATCH v3 07/22] net/iavf: use common Tx queue structure

[Bruce Richardson]

Merge in the few additional fields used by iavf driver and convert it to
using the common Tx queue structure also.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h  | 15 +++-
 drivers/net/iavf/iavf.h |  2 +-
 drivers/net/iavf/iavf_ethdev.c  |  4 +-
 drivers/net/iavf/iavf_rxtx.c| 42 ++---
 drivers/net/iavf/iavf_rxtx.h| 49 +++--
 drivers/net/iavf/iavf_rxtx_vec_avx2.c   |  4 +-
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 14 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h |  8 ++--
 drivers/net/iavf/iavf_rxtx_vec_sse.c|  8 ++--
 drivers/net/iavf/iavf_vchnl.c   |  6 +--
 10 files changed, 62 insertions(+), 90 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index c965f5ee6c..c4a1a0c816 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -31,8 +31,9 @@ typedef void (*ice_tx_release_mbufs_t)(struct ci_tx_queue 
*txq);
 
 struct ci_tx_queue {
union { /* TX ring virtual address */
-   volatile struct ice_tx_desc *ice_tx_ring;
volatile struct i40e_tx_desc *i40e_tx_ring;
+   volatile struct iavf_tx_desc *iavf_tx_ring;
+   volatile struct ice_tx_desc *ice_tx_ring;
};
volatile uint8_t *qtx_tail;   /* register address of tail */
struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
@@ -63,8 +64,9 @@ struct ci_tx_queue {
bool tx_deferred_start; /* don't start this queue in dev start */
bool q_set; /* indicate if tx queue has been configured */
union {  /* the VSI this queue belongs to */
-   struct ice_vsi *ice_vsi;
struct i40e_vsi *i40e_vsi;
+   struct iavf_vsi *iavf_vsi;
+   struct ice_vsi *ice_vsi;
};
const struct rte_memzone *mz;
 
@@ -76,6 +78,15 @@ struct ci_tx_queue {
struct { /* I40E driver specific values */
uint8_t dcb_tc;
};
+   struct { /* iavf driver specific values */
+   uint16_t ipsec_crypto_pkt_md_offset;
+   uint8_t rel_mbufs_type;
+#define IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG1 BIT(0)
+#define IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2 BIT(1)
+   uint8_t vlan_flag;
+   uint8_t tc;
+   bool use_ctx;  /* with ctx info, each pkt needs two 
descriptors */
+   };
};
 };
 
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index ad526c644c..956c60ef45 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -98,7 +98,7 @@
 
 struct iavf_adapter;
 struct iavf_rx_queue;
-struct iavf_tx_queue;
+struct ci_tx_queue;
 
 
 struct iavf_ipsec_crypto_stats {
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 7f80cd6258..328c224c93 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -954,7 +954,7 @@ static int
 iavf_start_queues(struct rte_eth_dev *dev)
 {
struct iavf_rx_queue *rxq;
-   struct iavf_tx_queue *txq;
+   struct ci_tx_queue *txq;
int i;
uint16_t nb_txq, nb_rxq;
 
@@ -1885,7 +1885,7 @@ iavf_dev_update_mbuf_stats(struct rte_eth_dev *ethdev,
struct iavf_mbuf_stats *mbuf_stats)
 {
uint16_t idx;
-   struct iavf_tx_queue *txq;
+   struct ci_tx_queue *txq;
 
for (idx = 0; idx < ethdev->data->nb_tx_queues; idx++) {
txq = ethdev->data->tx_queues[idx];
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 6eda91e76b..7e381b2a17 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -213,7 +213,7 @@ check_rx_vec_allow(struct iavf_rx_queue *rxq)
 }
 
 static inline bool
-check_tx_vec_allow(struct iavf_tx_queue *txq)
+check_tx_vec_allow(struct ci_tx_queue *txq)
 {
if (!(txq->offloads & IAVF_TX_NO_VECTOR_FLAGS) &&
txq->tx_rs_thresh >= IAVF_VPMD_TX_MAX_BURST &&
@@ -282,7 +282,7 @@ reset_rx_queue(struct iavf_rx_queue *rxq)
 }
 
 static inline void
-reset_tx_queue(struct iavf_tx_queue *txq)
+reset_tx_queue(struct ci_tx_queue *txq)
 {
struct ci_tx_entry *txe;
uint32_t i, size;
@@ -388,7 +388,7 @@ release_rxq_mbufs(struct iavf_rx_queue *rxq)
 }
 
 static inline void
-release_txq_mbufs(struct iavf_tx_queue *txq)
+release_txq_mbufs(struct ci_tx_queue *txq)
 {
uint16_t i;
 
@@ -778,7 +778,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
struct iavf_info *vf =
IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
struct iavf_vsi *vsi = &vf->vsi;
-   struct iavf_tx_queue *txq;
+   struct ci_tx_queue *txq;
const struct rte_memzone *mz;
uint32_t ring_size;
uint16_t tx_rs_thresh, tx_free_thresh;
@@ -814,7 +814,7 @@ i

[PATCH v3 17/22] net/iavf: use common Tx queue mbuf cleanup fn

[Bruce Richardson]

Adjust iavf driver to also use the common mbuf freeing functions on Tx
queue release/cleanup. The implementation is complicated a little by the
need to integrate the additional "has_ctx" parameter for the iavf code,
but changes in other drivers are minimal - just a constant "false"
parameter.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h  | 27 +-
 drivers/net/i40e/i40e_rxtx.c|  6 ++--
 drivers/net/iavf/iavf_rxtx.c| 37 ++---
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 24 ++--
 drivers/net/iavf/iavf_rxtx_vec_common.h | 18 
 drivers/net/iavf/iavf_rxtx_vec_sse.c|  9 ++
 drivers/net/ice/ice_dcf_ethdev.c|  4 +--
 drivers/net/ice/ice_rxtx.c  |  6 ++--
 drivers/net/ixgbe/ixgbe_rxtx.c  |  6 ++--
 9 files changed, 31 insertions(+), 106 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 1bf2a61b2f..310b51adcf 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -271,23 +271,23 @@ ci_tx_free_bufs_vec(struct ci_tx_queue *txq, 
ci_desc_done_fn desc_done, bool ctx
return txq->tx_rs_thresh;
 }
 
-#define IETH_FREE_BUFS_LOOP(txq, swr, start) do { \
+#define IETH_FREE_BUFS_LOOP(swr, nb_desc, start, end) do { \
uint16_t i = start; \
-   if (txq->tx_tail < i) { \
-   for (; i < txq->nb_tx_desc; i++) { \
+   if (end < i) { \
+   for (; i < nb_desc; i++) { \
rte_pktmbuf_free_seg(swr[i].mbuf); \
swr[i].mbuf = NULL; \
} \
i = 0; \
} \
-   for (; i < txq->tx_tail; i++) { \
+   for (; i < end; i++) { \
rte_pktmbuf_free_seg(swr[i].mbuf); \
swr[i].mbuf = NULL; \
} \
 } while (0)
 
 static inline void
-ci_txq_release_all_mbufs(struct ci_tx_queue *txq)
+ci_txq_release_all_mbufs(struct ci_tx_queue *txq, bool use_ctx)
 {
if (unlikely(!txq || !txq->sw_ring))
return;
@@ -306,15 +306,14 @@ ci_txq_release_all_mbufs(struct ci_tx_queue *txq)
 *  vPMD tx will not set sw_ring's mbuf to NULL after free,
 *  so need to free remains more carefully.
 */
-   const uint16_t start = txq->tx_next_dd - txq->tx_rs_thresh + 1;
-
-   if (txq->vector_sw_ring) {
-   struct ci_tx_entry_vec *swr = txq->sw_ring_vec;
-   IETH_FREE_BUFS_LOOP(txq, swr, start);
-   } else {
-   struct ci_tx_entry *swr = txq->sw_ring;
-   IETH_FREE_BUFS_LOOP(txq, swr, start);
-   }
+   const uint16_t start = (txq->tx_next_dd - txq->tx_rs_thresh + 1) >> 
use_ctx;
+   const uint16_t nb_desc = txq->nb_tx_desc >> use_ctx;
+   const uint16_t end = txq->tx_tail >> use_ctx;
+
+   if (txq->vector_sw_ring)
+   IETH_FREE_BUFS_LOOP(txq->sw_ring_vec, nb_desc, start, end);
+   else
+   IETH_FREE_BUFS_LOOP(txq->sw_ring, nb_desc, start, end);
 }
 
 #endif /* _COMMON_INTEL_TX_H_ */
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index b70919c5dc..081d743e62 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1933,7 +1933,7 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
return err;
}
 
-   ci_txq_release_all_mbufs(txq);
+   ci_txq_release_all_mbufs(txq, false);
i40e_reset_tx_queue(txq);
dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
 
@@ -2608,7 +2608,7 @@ i40e_tx_queue_release(void *txq)
return;
}
 
-   ci_txq_release_all_mbufs(q);
+   ci_txq_release_all_mbufs(q, false);
rte_free(q->sw_ring);
rte_memzone_free(q->mz);
rte_free(q);
@@ -3071,7 +3071,7 @@ i40e_dev_clear_queues(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++) {
if (!dev->data->tx_queues[i])
continue;
-   ci_txq_release_all_mbufs(dev->data->tx_queues[i]);
+   ci_txq_release_all_mbufs(dev->data->tx_queues[i], false);
i40e_reset_tx_queue(dev->data->tx_queues[i]);
}
 
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 7e381b2a17..f0ab881ac5 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -387,24 +387,6 @@ release_rxq_mbufs(struct iavf_rx_queue *rxq)
rxq->rx_nb_avail = 0;
 }
 
-static inline void
-release_txq_mbufs(struct ci_tx_queue *txq)
-{
-   uint16_t i;
-
-   if (!txq || !txq->sw_ring) {
-   PMD_DRV_LOG(DEBUG, "Pointer to rxq or sw_ring is NULL");
-   return;
-   }
-
-   for (i = 0; i < txq->nb_tx_desc; i++) {
-   if (txq->sw

RE: [RFC 0/8] ioring: network driver

[Konstantin Ananyev]

> This is first draft of new simplified TAP device that uses
> the Linux kernel ioring API to provide a read/write ring
> with kernel.
> 
> This is split from tap device because there are so many
> unnecessary things in existing tap, and supporting ioring is
> better without ifdefs etc. The default name of the tap
> device is different that other uses in DPDK but the driver
> tries to keep the same relevant devargs as before.
> 
> This driver will only provide features that match what kernel
> does, so no flow support etc. The next version will add checksum
> and multi-segment packets. Some of the doc files may need update
> as well.

Makes sense to me, though didn't properly look inside.
One thing - probably add  a 'tap' into the name,
'tap_ioiring' or so, otherwise 'ioring' is a bit too generic 
and might be confusing.

> Stephen Hemminger (8):
>   net/ioring: introduce new driver
>   net/ioring: implement link state
>   net/ioring: implement control functions
>   net/ioring: implement management functions
>   net/ioring: implement primary secondary fd passing
>   net/ioring: implement receive and transmit
>   net/ioring: add VLAN support
>   net/ioring: implement statistics
> 
>  doc/guides/nics/features/ioring.ini |   14 +
>  doc/guides/nics/index.rst   |1 +
>  doc/guides/nics/ioring.rst  |   66 ++
>  drivers/net/ioring/meson.build  |   12 +
>  drivers/net/ioring/rte_eth_ioring.c | 1067 +++
>  drivers/net/meson.build |1 +
>  6 files changed, 1161 insertions(+)
>  create mode 100644 doc/guides/nics/features/ioring.ini
>  create mode 100644 doc/guides/nics/ioring.rst
>  create mode 100644 drivers/net/ioring/meson.build
>  create mode 100644 drivers/net/ioring/rte_eth_ioring.c
> 
> --
> 2.45.2

Re: 23.11.3 patches review and test

[Yanghang Liu]

I tested below 18 scenarios on RHEL 9.4 and didn't find any new dpdk issues.

   - VM with device assignment(PF) throughput testing(1G hugepage size):
   PASS
   - VM with device assignment(PF) throughput testing(2M hugepage size) :
   PASS
   - VM with device assignment(VF) throughput testing: PASS
   - PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
   - PVP vhost-user 2Q throughput testing: PASS
   - PVP vhost-user 1Q - cross numa node throughput testing: PASS
   - VM with vhost-user 2 queues throughput testing: PASS
   - vhost-user reconnect with dpdk-client, qemu-server(qemu reconnect):
   PASS
   - vhost-user reconnect with dpdk-client, qemu-server(ovs reconnect): PASS
   - PVP  reconnect with dpdk-client, qemu-server: PASS
   - PVP 1Q live migration testing: PASS
   - PVP 1Q cross numa node live migration testing: PASS
   - VM with ovs+dpdk+vhost-user 1Q live migration testing: PASS
   - VM with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
   - VM with ovs+dpdk+vhost-user 2Q live migration testing: PASS
   - VM with ovs+dpdk+vhost-user 4Q live migration testing: PASS
   - Host PF + DPDK testing: PASS
   - Host VF + DPDK testing: PASS


Test Versions:

   - qemu-kvm-8.2
   - kernel 5.14
   - libvirt 10.0
   - ovs 3.1
   - git describe
  - v23.11.3-rc1
   - git log

commit 67b9d0a29a1269b482ff7fd1eb48ee88ae9e5892 (HEAD, tag: v23.11.3-rc1,
origin/23.11)
Author: Xueming Li 
Date:   Tue Dec 10 22:31:07 2024 +0800

version: 23.11.3-rc1
Signed-off-by: Xueming Li 


   - Test device : X540-AT2 NIC(ixgbe, 10G)

Tested-by: Yanghang Liu 

On Tue, Dec 10, 2024 at 10:50 PM Xueming Li  wrote:

> Hi all,
>
> Here is a list of patches targeted for stable release 23.11.3.
>
> The planned date for the final release is 17th December.
>
> Please help with testing and validation of your use cases and report
> any issues/results with reply-all to this mail. For the final release
> the fixes and reported validations will be added to the release notes.
>
> A release candidate tarball can be found at:
>
> https://dpdk.org/browse/dpdk-stable/tag/?id=v23.11.3-rc1
>
> These patches are located at branch 23.11 of dpdk-stable repo:
> https://dpdk.org/browse/dpdk-stable/
>
> Thanks.
>
> Xueming Li 
>
> ---
> Ajit Khaparde (1):
>   net/bnxt: fix TCP and UDP checksum flags
>
> Alan Elder (1):
>   net/netvsc: fix using Tx queue higher than Rx queues
>
> Aleksandr Loktionov (1):
>   net/i40e/base: fix misleading debug logs and comments
>
> Alexander Kozyrev (3):
>   common/mlx5: fix error CQE handling for 128 bytes CQE
>   net/mlx5: fix shared queue port number in vector Rx
>   net/mlx5: fix miniCQEs number calculation
>
> Anatoly Burakov (2):
>   net/i40e/base: fix setting flags in init function
>   net/i40e/base: add missing X710TL device check
>
> Andre Muezerie (1):
>   rcu: fix implicit conversion in bit shift
>
> Arkadiusz Kusztal (2):
>   crypto/qat: fix modexp/inv length
>   crypto/qat: fix ECDSA session handling
>
> Artur Tyminski (1):
>   net/i40e/base: fix DDP loading with reserved track ID
>
> Barbara Skobiej (3):
>   net/ixgbe/base: fix unchecked return value
>   net/i40e/base: fix unchecked return value
>   net/i40e/base: fix loop bounds
>
> Bill Xiang (2):
>   vhost: fix offset while mapping log base address
>   vdpa: update used flags in used ring relay
>
> Bing Zhao (5):
>   net/mlx5: workaround list management of Rx queue control
>   net/mlx5: fix Rx queue control management
>   net/mlx5: fix default RSS flows creation order
>   net/mlx5: fix Rx queue reference count in flushing flows
>   net/mlx5: fix shared Rx queue control release
>
> Brian Dooley (1):
>   test/crypto: fix synchronous API calls
>
> Bruce Richardson (11):
>   eal/x86: fix 32-bit write combining store
>   net/iavf: delay VF reset command
>   net/i40e: fix AVX-512 pointer copy on 32-bit
>   net/ice: fix AVX-512 pointer copy on 32-bit
>   net/iavf: fix AVX-512 pointer copy on 32-bit
>   common/idpf: fix AVX-512 pointer copy on 32-bit
>   build: remove version check on compiler links function
>   net/ice: detect stopping a flow director queue twice
>   app/dumpcap: remove unused struct array
>   eventdev: fix possible array underflow/overflow
>   net/iavf: add segment-length check to Tx prep
>
> Chaoyong He (2):
>   net/nfp: fix link change return value
>   net/nfp: fix pause frame setting check
>
> Chengwen Feng (7):
>   examples/eventdev: fix queue crash with generic pipeline
>   ethdev: verify queue ID in Tx done cleanup
>   net/hns3: verify reset type from firmware
>   dmadev: fix potential null pointer access
>   net/hns3: restrict tunnel flow rule to one header
>   net/hns3: register VLAN flow match mode parameter
>   net/mvneta: fix possible out-of-bounds write
>
> Danylo Vodopianov (1):
>   app/testpmd: fix aged flow destro

[PATCH v3 20/22] net/iavf: use vector SW ring for all vector paths

[Bruce Richardson]

The AVX-512 code path used a smaller SW ring structure only containing
the mbuf pointer, but no other fields. The other fields are only used in
the scalar code path, so update all vector driver code paths (AVX2, SSE)
to use the smaller, faster structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/iavf/iavf_rxtx.c|  7 ---
 drivers/net/iavf/iavf_rxtx_vec_avx2.c   | 12 ++--
 drivers/net/iavf/iavf_rxtx_vec_avx512.c |  8 
 drivers/net/iavf/iavf_rxtx_vec_common.h |  6 --
 drivers/net/iavf/iavf_rxtx_vec_sse.c| 14 +++---
 5 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index f0ab881ac5..6692f6992b 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -4193,14 +4193,7 @@ iavf_set_tx_function(struct rte_eth_dev *dev)
txq = dev->data->tx_queues[i];
if (!txq)
continue;
-#ifdef CC_AVX512_SUPPORT
-   if (use_avx512)
-   iavf_txq_vec_setup_avx512(txq);
-   else
-   iavf_txq_vec_setup(txq);
-#else
iavf_txq_vec_setup(txq);
-#endif
}
 
if (no_poll_on_link_down) {
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c 
b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index fdb98b417a..b847886081 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -1736,14 +1736,14 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 {
struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
volatile struct iavf_tx_desc *txdp;
-   struct ci_tx_entry *txep;
+   struct ci_tx_entry_vec *txep;
uint16_t n, nb_commit, tx_id;
/* bit2 is reserved and must be set to 1 according to Spec */
uint64_t flags = IAVF_TX_DESC_CMD_EOP | IAVF_TX_DESC_CMD_ICRC;
uint64_t rs = IAVF_TX_DESC_CMD_RS | flags;
 
if (txq->nb_tx_free < txq->tx_free_thresh)
-   iavf_tx_free_bufs(txq);
+   ci_tx_free_bufs_vec(txq, iavf_tx_desc_done, false);
 
nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
if (unlikely(nb_pkts == 0))
@@ -1752,13 +1752,13 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
tx_id = txq->tx_tail;
txdp = &txq->iavf_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
 
txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   ci_tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
iavf_vtx(txdp, tx_pkts, n - 1, flags, offload);
tx_pkts += (n - 1);
@@ -1773,10 +1773,10 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
/* avoid reach the end of ring */
txdp = &txq->iavf_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
}
 
-   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
iavf_vtx(txdp, tx_pkts, nb_commit, flags, offload);
 
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c 
b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 007759e451..641f3311eb 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -2357,14 +2357,6 @@ iavf_xmit_pkts_vec_avx512(void *tx_queue, struct 
rte_mbuf **tx_pkts,
return iavf_xmit_pkts_vec_avx512_cmn(tx_queue, tx_pkts, nb_pkts, false);
 }
 
-int __rte_cold
-iavf_txq_vec_setup_avx512(struct ci_tx_queue *txq)
-{
-   txq->vector_tx = true;
-   txq->vector_sw_ring = true;
-   return 0;
-}
-
 uint16_t
 iavf_xmit_pkts_vec_avx512_offload(void *tx_queue, struct rte_mbuf **tx_pkts,
  uint16_t nb_pkts)
diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h 
b/drivers/net/iavf/iavf_rxtx_vec_common.h
index 6f94587eee..c69399a173 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_common.h
+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
@@ -24,12 +24,6 @@ iavf_tx_desc_done(struct ci_tx_queue *txq, uint16_t idx)
rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE);
 }
 
-static __rte_always_inline int
-iavf_tx_free_bufs(struct ci_tx_queue *txq)
-{
-   return ci_tx_free_bufs(txq, iavf_tx_desc_done);
-}
-
 static inline void
 _iavf_rx_queue_release_mbufs_vec(struct iavf_rx_queue *rxq)
 {
diff --git a/drivers/net/iavf/iavf_rxtx_vec_sse.c 
b/drivers/net/iavf/iavf_rxtx_vec_sse.c
index 3adf2a59e4..9f7db80bfd 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_sse.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_sse.c
@@ -1368,14 +1368,14 @@ iavf_xm

[PATCH v3 19/22] net/i40e: use vector SW ring for all vector paths

[Bruce Richardson]

The AVX-512 code path used a smaller SW ring structure only containing
the mbuf pointer, but no other fields. The other fields are only used in
the scalar code path, so update all vector driver code paths (AVX2, SSE,
Neon, Altivec) to use the smaller, faster structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/i40e/i40e_rxtx.c |  8 +---
 drivers/net/i40e/i40e_rxtx_vec_altivec.c | 12 ++--
 drivers/net/i40e/i40e_rxtx_vec_avx2.c| 12 ++--
 drivers/net/i40e/i40e_rxtx_vec_avx512.c  | 14 ++
 drivers/net/i40e/i40e_rxtx_vec_common.h  |  6 --
 drivers/net/i40e/i40e_rxtx_vec_neon.c| 12 ++--
 drivers/net/i40e/i40e_rxtx_vec_sse.c | 12 ++--
 7 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 081d743e62..745c467912 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1891,7 +1891,7 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
tx_queue_id);
 
txq->vector_tx = ad->tx_vec_allowed;
-   txq->vector_sw_ring = ad->tx_use_avx512;
+   txq->vector_sw_ring = txq->vector_tx;
 
/*
 * tx_queue_id is queue id application refers to, while
@@ -3550,9 +3550,11 @@ i40e_set_tx_function(struct rte_eth_dev *dev)
}
}
 
+   if (rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128)
+   ad->tx_vec_allowed = false;
+
if (ad->tx_simple_allowed) {
-   if (ad->tx_vec_allowed &&
-   rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
+   if (ad->tx_vec_allowed) {
 #ifdef RTE_ARCH_X86
if (ad->tx_use_avx512) {
 #ifdef CC_AVX512_SUPPORT
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c 
b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index 500bba2cef..b6900a3e15 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -553,14 +553,14 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
 {
struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
volatile struct i40e_tx_desc *txdp;
-   struct ci_tx_entry *txep;
+   struct ci_tx_entry_vec *txep;
uint16_t n, nb_commit, tx_id;
uint64_t flags = I40E_TD_CMD;
uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
int i;
 
if (txq->nb_tx_free < txq->tx_free_thresh)
-   i40e_tx_free_bufs(txq);
+   ci_tx_free_bufs_vec(txq, i40e_tx_desc_done, false);
 
nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
nb_commit = nb_pkts;
@@ -569,13 +569,13 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
 
tx_id = txq->tx_tail;
txdp = &txq->i40e_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
 
txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   ci_tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
vtx1(txdp, *tx_pkts, flags);
@@ -589,10 +589,10 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf 
**tx_pkts,
 
/* avoid reach the end of ring */
txdp = &txq->i40e_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
}
 
-   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c 
b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 29bef64287..2477573c01 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -745,13 +745,13 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 {
struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
volatile struct i40e_tx_desc *txdp;
-   struct ci_tx_entry *txep;
+   struct ci_tx_entry_vec *txep;
uint16_t n, nb_commit, tx_id;
uint64_t flags = I40E_TD_CMD;
uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
 
if (txq->nb_tx_free < txq->tx_free_thresh)
-   i40e_tx_free_bufs(txq);
+   ci_tx_free_bufs_vec(txq, i40e_tx_desc_done, false);
 
nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
if (unlikely(nb_pkts == 0))
@@ -759,13 +759,13 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
tx_id = txq->tx_tail;
txdp = &txq->i40e_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
 
txq->nb_tx_free = (uint16_t

[PATCH v3 18/22] net/ice: use vector SW ring for all vector paths

[Bruce Richardson]

The AVX-512 code path used a smaller SW ring structure only containing
the mbuf pointer, but no other fields. The other fields are only used in
the scalar code path, so update all vector driver code paths to use the
smaller, faster structure.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h|  7 +++
 drivers/net/ice/ice_rxtx.c|  2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c   | 12 ++--
 drivers/net/ice/ice_rxtx_vec_avx512.c | 14 ++
 drivers/net/ice/ice_rxtx_vec_common.h |  6 --
 drivers/net/ice/ice_rxtx_vec_sse.c| 12 ++--
 6 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index 310b51adcf..aa42b9b49f 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -109,6 +109,13 @@ ci_tx_backlog_entry(struct ci_tx_entry *txep, struct 
rte_mbuf **tx_pkts, uint16_
txep[i].mbuf = tx_pkts[i];
 }
 
+static __rte_always_inline void
+ci_tx_backlog_entry_vec(struct ci_tx_entry_vec *txep, struct rte_mbuf 
**tx_pkts, uint16_t nb_pkts)
+{
+   for (uint16_t i = 0; i < nb_pkts; ++i)
+   txep[i].mbuf = tx_pkts[i];
+}
+
 #define IETH_VPMD_TX_MAX_FREE_BUF 64
 
 typedef int (*ci_desc_done_fn)(struct ci_tx_queue *txq, uint16_t idx);
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index ad0ddf6a88..77cb6688a7 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -825,7 +825,7 @@ ice_tx_queue_start(struct rte_eth_dev *dev, uint16_t 
tx_queue_id)
 
/* record what kind of descriptor cleanup we need on teardown */
txq->vector_tx = ad->tx_vec_allowed;
-   txq->vector_sw_ring = ad->tx_use_avx512;
+   txq->vector_sw_ring = txq->vector_tx;
 
dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
 
diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c 
b/drivers/net/ice/ice_rxtx_vec_avx2.c
index 12ffa0fa9a..98bab322b4 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -858,7 +858,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 {
struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
volatile struct ice_tx_desc *txdp;
-   struct ci_tx_entry *txep;
+   struct ci_tx_entry_vec *txep;
uint16_t n, nb_commit, tx_id;
uint64_t flags = ICE_TD_CMD;
uint64_t rs = ICE_TX_DESC_CMD_RS | ICE_TD_CMD;
@@ -867,7 +867,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
nb_pkts = RTE_MIN(nb_pkts, txq->tx_rs_thresh);
 
if (txq->nb_tx_free < txq->tx_free_thresh)
-   ice_tx_free_bufs_vec(txq);
+   ci_tx_free_bufs_vec(txq, ice_tx_desc_done, false);
 
nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
if (unlikely(nb_pkts == 0))
@@ -875,13 +875,13 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
tx_id = txq->tx_tail;
txdp = &txq->ice_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
 
txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   ci_tx_backlog_entry(txep, tx_pkts, n);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
ice_vtx(txdp, tx_pkts, n - 1, flags, offload);
tx_pkts += (n - 1);
@@ -896,10 +896,10 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
/* avoid reach the end of ring */
txdp = &txq->ice_tx_ring[tx_id];
-   txep = &txq->sw_ring[tx_id];
+   txep = &txq->sw_ring_vec[tx_id];
}
 
-   ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
+   ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
ice_vtx(txdp, tx_pkts, nb_commit, flags, offload);
 
diff --git a/drivers/net/ice/ice_rxtx_vec_avx512.c 
b/drivers/net/ice/ice_rxtx_vec_avx512.c
index f6ec593f96..481f784e34 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx512.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx512.c
@@ -924,16 +924,6 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf 
**pkt,
}
 }
 
-static __rte_always_inline void
-ice_tx_backlog_entry_avx512(struct ci_tx_entry_vec *txep,
-   struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-   int i;
-
-   for (i = 0; i < (int)nb_pkts; ++i)
-   txep[i].mbuf = tx_pkts[i];
-}
-
 static __rte_always_inline uint16_t
 ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts, bool do_offload)
@@ -964,7 +954,7 @@ ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct 
rte_mbuf **tx_pkts,
 
n = (uint16_t)(txq->nb_tx_desc - tx_id);
if (nb_commit >= n) {
-   ice_tx

[PATCH v3 21/22] net/_common_intel: remove unneeded code

[Bruce Richardson]

With all drivers using the common Tx structure updated so that their
vector paths all use the simplified Tx mbuf ring format, it's no longer
necessary to have a separate flag for the ring format and for use of a
vector driver.

Remove the former flag and base all decisions off the vector flag. With
that done, we go from having only two paths to consider for releasing
all mbufs in the ring, not three. That allows further simpification of
the "ci_txq_release_all_mbufs" function.

The separate function to free buffers from the vector driver not using
the simplified ring format can similarly be removed as no longer
necessary.

Signed-off-by: Bruce Richardson 
---
 drivers/net/_common_intel/tx.h| 97 +++
 drivers/net/i40e/i40e_rxtx.c  |  1 -
 drivers/net/iavf/iavf_rxtx_vec_sse.c  |  1 -
 drivers/net/ice/ice_rxtx.c|  1 -
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h |  1 -
 5 files changed, 10 insertions(+), 91 deletions(-)

diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
index aa42b9b49f..d9cf4474fc 100644
--- a/drivers/net/_common_intel/tx.h
+++ b/drivers/net/_common_intel/tx.h
@@ -66,7 +66,6 @@ struct ci_tx_queue {
bool tx_deferred_start; /* don't start this queue in dev start */
bool q_set; /* indicate if tx queue has been configured */
bool vector_tx; /* port is using vector TX */
-   bool vector_sw_ring;/* port is using vectorized SW ring 
(ieth_tx_entry_vec) */
union {  /* the VSI this queue belongs to */
struct i40e_vsi *i40e_vsi;
struct iavf_vsi *iavf_vsi;
@@ -120,72 +119,6 @@ ci_tx_backlog_entry_vec(struct ci_tx_entry_vec *txep, 
struct rte_mbuf **tx_pkts,
 
 typedef int (*ci_desc_done_fn)(struct ci_tx_queue *txq, uint16_t idx);
 
-static __rte_always_inline int
-ci_tx_free_bufs(struct ci_tx_queue *txq, ci_desc_done_fn desc_done)
-{
-   struct ci_tx_entry *txep;
-   uint32_t n;
-   uint32_t i;
-   int nb_free = 0;
-   struct rte_mbuf *m, *free[IETH_VPMD_TX_MAX_FREE_BUF];
-
-   /* check DD bits on threshold descriptor */
-   if (!desc_done(txq, txq->tx_next_dd))
-   return 0;
-
-   n = txq->tx_rs_thresh;
-
-/* first buffer to free from S/W ring is at index
- * tx_next_dd - (tx_rs_thresh-1)
- */
-   txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
-
-   if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) {
-   for (i = 0; i < n; i++) {
-   free[i] = txep[i].mbuf;
-   /* no need to reset txep[i].mbuf in vector path */
-   }
-   rte_mempool_put_bulk(free[0]->pool, (void **)free, n);
-   goto done;
-   }
-
-   m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
-   if (likely(m != NULL)) {
-   free[0] = m;
-   nb_free = 1;
-   for (i = 1; i < n; i++) {
-   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
-   if (likely(m != NULL)) {
-   if (likely(m->pool == free[0]->pool)) {
-   free[nb_free++] = m;
-   } else {
-   rte_mempool_put_bulk(free[0]->pool,
-(void *)free,
-nb_free);
-   free[0] = m;
-   nb_free = 1;
-   }
-   }
-   }
-   rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);
-   } else {
-   for (i = 1; i < n; i++) {
-   m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
-   if (m != NULL)
-   rte_mempool_put(m->pool, m);
-   }
-   }
-
-done:
-   /* buffers were freed, update counters */
-   txq->nb_tx_free = (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh);
-   txq->tx_next_dd = (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh);
-   if (txq->tx_next_dd >= txq->nb_tx_desc)
-   txq->tx_next_dd = (uint16_t)(txq->tx_rs_thresh - 1);
-
-   return txq->tx_rs_thresh;
-}
-
 static __rte_always_inline int
 ci_tx_free_bufs_vec(struct ci_tx_queue *txq, ci_desc_done_fn desc_done, bool 
ctx_descs)
 {
@@ -278,21 +211,6 @@ ci_tx_free_bufs_vec(struct ci_tx_queue *txq, 
ci_desc_done_fn desc_done, bool ctx
return txq->tx_rs_thresh;
 }
 
-#define IETH_FREE_BUFS_LOOP(swr, nb_desc, start, end) do { \
-   uint16_t i = start; \
-   if (end < i) { \
-   for (; i < nb_desc; i++) { \
-   rte_pktmbuf_free_seg(swr[i].mbuf); \
-   swr[i].mbuf = NULL; \
-   } \

[PATCH v2 14/14] drivers/vdpa: use portable variadic macros

[Andre Muezerie]

Many places are using a GCC extension related to variadic macros,
where a name prepends the ellipsis. This results in a warning like
the one below when compiling the code with MSVC:

app\test-pmd\testpmd.h(1314): error C2608:
invalid token '...' in macro parameter list

Variadic macros became a standard part of the C language with C99.
GCC, Clang and MSVC handle them properly.

The fix is to remove the prefix name (args... becomes ...) and use
__VA_ARGS__.

Signed-off-by: Andre Muezerie 
---
 drivers/vdpa/ifc/base/ifcvf_osdep.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/vdpa/ifc/base/ifcvf_osdep.h 
b/drivers/vdpa/ifc/base/ifcvf_osdep.h
index ba7d684c25..bbbde153ee 100644
--- a/drivers/vdpa/ifc/base/ifcvf_osdep.h
+++ b/drivers/vdpa/ifc/base/ifcvf_osdep.h
@@ -16,8 +16,8 @@
 extern int ifcvf_vdpa_logtype;
 #define RTE_LOGTYPE_IFCVF_VDPA ifcvf_vdpa_logtype
 
-#define WARNINGOUT(S, args...)  RTE_LOG(WARNING, IFCVF_VDPA, S, ##args)
-#define DEBUGOUT(S, args...)RTE_LOG(DEBUG, IFCVF_VDPA, S, ##args)
+#define WARNINGOUT(S, ...)  RTE_LOG(WARNING, IFCVF_VDPA, S, ##__VA_ARGS__)
+#define DEBUGOUT(S, ...)RTE_LOG(DEBUG, IFCVF_VDPA, S, ##__VA_ARGS__)
 #define STATIC  static
 
 #define msec_delay(x)  rte_delay_us_sleep(1000 * (x))
-- 
2.47.0.vfs.0.3

Re: GCP cloud : Virtio-PMD performance Issue

[Mukul Sinha]

Hi Maxime,
We have run perf top on dpdk-20.05 vs dpdk-22.11 but nothing of difference
in the top-hitter api's. In our analysis virtio-PMD CPU performance's not a
bottleneck (infact its more performant now) but its the GCP hypervisor
which isn't able to cope up with 3 times the Tx traffic load.

On Fri, Dec 6, 2024 at 1:54 PM Maxime Coquelin 
wrote:

> Hi Mukul,
>
> On 12/5/24 23:54, Mukul Sinha wrote:
> > Thanks @maxime.coque...@redhat.com 
> > Have included dev@dpdk.org 
> >
> >
> > On Fri, Dec 6, 2024 at 2:11 AM Maxime Coquelin
> > mailto:maxime.coque...@redhat.com>> wrote:
> >
> > Hi Mukul,
> >
> > DPDK upstream mailing lists should be added to this e-mail.
> > I am not allowed to provide off-list support, all discussions should
> > happen upstream.
> >
> > If this is reproduced with downtream DPDK provided with RHEL and you
> > have a RHEL subscription, please use the Red Hat issue tracker.
> >
> > Thanks for your understanding,
> > Maxime
> >
> > On 12/5/24 21:36, Mukul Sinha wrote:
> >  > + Varun
> >  >
> >  > On Fri, Dec 6, 2024 at 2:04 AM Mukul Sinha
> > mailto:mukul.si...@broadcom.com>
> >  >  > >> wrote:
> >  >
> >  > Hi GCP & Virtio-PMD dev teams,
> >  > We are from VMware NSX Advanced Load Balancer Team whereby in
> >  > GCP-cloud (*custom-8-8192 VM instance type 8core8G*) we are
> > triaging
> >  > an issue of TCP profile application throughput performance
> with
> >  > single dispatcher core single Rx/Tx queue (queue depth: 2048)
> the
> >  > throughput performance we get using dpdk-22.11 virtio-PMD
> code is
> >  > degraded significantly when compared to when using dpdk-20.05
> PMD
> >  > We see high amount of Tx packet drop counter incrementing on
> >  > virtio-NIC pointing to issue that the GCP hypervisor side is
> > unable
> >  > to drain the packets faster (No drops are seen on Rx side)
> >  > The behavior is like this :
> >  > _Using dpdk-22.11_
> >  > At 75% CPU usage itself we start seeing huge number of Tx
> packet
> >  > drops reported (no Rx drops) causing TCP restransmissions
> > eventually
> >  > bringing down the effective throughput numbers
> >  > _Using dpdk-20.05_
> >  > even at ~95% CPU usage without any packet drops (neither Rx
> > nor Tx)
> >  > we are able to get a much better throughput
> >  >
> >  > To improve performance numbers with dpdk-22.11 we have tried
> >  > increasing the queue depth to 4096 but that din't help.
> >  > If with dpdk-22.11 we move from single core Rx/Tx queue=1 to
> > single
> >  > core Rx/Tx queue=2 we are able to get slightly better numbers
> > (but
> >  > still doesnt match the numbers obtained using dpdk-20.05
> > single core
> >  > Rx/Tx queue=1). This again corroborates the fact the GCP
> > hypervisor
> >  > is the bottleneck here.
> >  >
> >  > To root-cause this issue we were able to replicate this
> behavior
> >  > using native DPDK testpmd as shown below (cmds used):-
> >  > Hugepage size: 2 MB
> >  >   ./app/dpdk-testpmd -l 0-1 -n 1 -- -i --nb-cores=1 --txd=2048
> >  > --rxd=2048 --rxq=1 --txq=1  --portmask=0x3
> >  > set fwd mac
> >  > set fwd flowgen
> >  > set txpkts 1518
> >  > start
> >  > stop
> >  >
> >  > Testpmd traffic run (for packet-size=1518) for exact same
> >  > time-interval of 15 seconds:
> >  >
> >  > _22.11_
> >  >-- Forward statistics for port 0
> >  >   --
> >  >RX-packets: 2  RX-dropped: 0
> > RX-total: 2
> >  >TX-packets: 19497570 *TX-dropped: 364674686 *TX-total:
> > 384172256
> >  >
> >  >
> >
>  
> >  > _20.05_
> >  >-- Forward statistics for port 0
> >  >   --
> >  >RX-packets: 3  RX-dropped: 0
> > RX-total: 3
> >  >TX-packets: 19480319   TX-dropped: 0
> TX-total:
> >  > 19480319
> >  >
> >  >
> >
>  
> >  >
> >  > As you can see
> >  > dpdk-22.11
> >  > Packets generated : 384 million Packets serviced : ~19.5
> > million :
> >  > Tx-dropped : 364 million
> >  > dpdk-20.05
> >  > Packets generated : ~19.5 million Packets serviced : ~19.5
> > million :
> >  > Tx-dropped : 0
> >  >
> >  > Actual serviced traffic rem

Re: [PATCH] devtools: enhance the license check

[David Marchand]

On Tue, Dec 10, 2024 at 6:00 PM Stephen Hemminger
 wrote:
>
> On Tue, 10 Dec 2024 10:10:39 +0100
> David Marchand  wrote:
>
> > +no_license_list=\
> > +':^.git* :^.mailmap :^.ci/* :^README :^MAINTAINERS :^VERSION :^ABI_VERSION 
> > :^*/Kbuild '\
> > +':^*/README* :^license/ :^config/ :^buildtools/ :^*/poetry.lock '\
> > +':^kernel/linux/uapi/.gitignore :^kernel/linux/uapi/version :^*.cocci 
> > :^*.abignore '\
> > +':^*.map :^*.ini :^*.data :^*.json :^*.cfg :^*.txt :^*.svg :^*.png'
> > +
>
> What is poetry.lock?

I don't know.
It looks like some python packaging config for dts, and it is a generated file.
# This file is automatically @generated by Poetry 1.8.3 and should not
be changed by hand.

Cc: dts maintainers.


-- 
David Marchand

[DPDK/meson Bug 1593] [dpdk-22.11.7-rc1]meson_tests/driver link_bonding_autotest test failed

[bugzilla]

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

Xu,Hailin (hailinx...@intel.com) changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 CC||hailinx...@intel.com
 Status|UNCONFIRMED |RESOLVED

--- Comment #1 from Xu,Hailin (hailinx...@intel.com) ---
same as Bug 1589, They are the same bad commit

*** This bug has been marked as a duplicate of bug 1589 ***

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

[DPDK/meson Bug 1594] [dpdk-21.11.9-rc1] unit_tests_eal/link_bonding: link_bonding_autotest test failed

[bugzilla]

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

Xu,Hailin (hailinx...@intel.com) changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|UNCONFIRMED |RESOLVED
 CC||hailinx...@intel.com

--- Comment #1 from Xu,Hailin (hailinx...@intel.com) ---
same as Bug 1589, They are the same bad commit

*** This bug has been marked as a duplicate of bug 1589 ***

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

[DPDK/core Bug 1596] devbind no longer works unless VFIO_UNSAFE is enabled

[bugzilla]

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

Bug ID: 1596
   Summary: devbind no longer works unless VFIO_UNSAFE is enabled
   Product: DPDK
   Version: 24.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: major
  Priority: Normal
 Component: core
  Assignee: dev@dpdk.org
  Reporter: step...@networkplumber.org
  Target Milestone: ---

Debian (and probably lots of other distributions), do not enable unsafe VFIO
option (CONFIG_VFIO_NOIOMMU). If that is true, then the module parameter does
not exist.

This causes DPDK devbind to fail:
Error: failed to check unsafe noiommu mode - Cannot open
/sys/module/vfio/parameters/enable_unsafe_noiommu_mode: [Errno 2] No such file
or directory: '/sys/module/vfio/parameters/enable_unsafe_noiommu_mode'


This regression is caused by the commit.

commit 6ca0f1c8450d6e28926cad33c6500ad487f4cfdb
Author: Fidaullah Noonari 
Date:   Wed Oct 2 11:13:12 2024 -0700

usertools/devbind: support VFIO non-IOMMU mode

This patch adds noiommu option to dpdk-devbind.
If the no IOMMU is detected, then if noiommu flag is set
the vfio-pci unsafe_noiommu_mode flag is set.

Signed-off-by: Fidaullah Noonari 
Signed-off-by: Stephen Hemminger 
Acked-by: Bruce Richardson 

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

Re: [PATCH v2 01/15] net/zxdh: zxdh np init implementation

[Junlong Wang]

>>  struct zxdh_hw_internal zxdh_hw_internal[RTE_MAX_ETHPORTS];

>If you want to support primary/secondary in future,
>variables in BSS are not shared between primary and secondary process

This structure mainly registers some PCI ops and 
will not be shared between primary/secondary processes.

>> +struct zxdh_shared_data *zxdh_shared_data;
>> +const char *ZXDH_PMD_SHARED_DATA_MZ = "zxdh_pmd_shared_data";
>> +rte_spinlock_t zxdh_shared_data_lock = RTE_SPINLOCK_INITIALIZER;
>> +struct zxdh_dtb_shared_data g_dtb_data;

>The shared data will be a problem if you support multiple devices.
>Or is this really a singleton device with only one bus and slot.

In our latest version, we have optimized by placing this structure in a 
private data area 
and initializing each device independently.
Can we update later?

>> +static uint32_t
>> +zxdh_np_dtb_soft_init(uint32_t dev_id)
>> +{
>> +ZXDH_DTB_MGR_T *p_dtb_mgr = NULL;
>> +
>> +p_dtb_mgr = zxdh_np_dtb_mgr_get(dev_id);
>> +if (p_dtb_mgr == NULL) {
>> +p_dpp_dtb_mgr[dev_id] = (ZXDH_DTB_MGR_T 
>> *)malloc(sizeof(ZXDH_DTB_MGR_T));

>malloc() returns void *, cast here is not needed.
>Why does DTB_MGR_T come from malloc when most of other data is using 
>rte_malloc()?
>
>It will matter if you support multiprocess

 I didn't realize it, it was originally intended to use rte_malloc.

 Thank you for your comments. 
 And other issues will modifyed according to the comments.

Re: [PATCH 2/3] power: defer lcore variable allocation

[David Marchand]

On Fri, Dec 6, 2024 at 12:29 PM Mattias Rönnblom  wrote:
> I would wrap all RTE_LCORE_VAR_LCORE() and RTE_LCORE_VAR().
>
> static struct pmd_core_cfg *
> get_cfg_lcore(unsigned int lcore_id)
> {
> assure_lcore_cfgs_alloced();
> return RTE_LCORE_VAR_LCORE(lcore_cfgs, lcore_id);
> }
>
> static struct pmd_core_cfg *
> get_cfg(void)
> {
> get_cfg_lcore(rte_lcore_id());
> }
>
> Add
>
> static void
> assure_lcore_cfgs_alloced(unsigned int lcore_id)
> {
> if (lcore_cfgs != NULL)

==

> lcore_cfgs_alloc();
> }
>
> ..or maybe better merge assure_lcore_cfgs_alloced() and lcore_cfgs_alloc().
>
> Makes it a little harder to make mistakes.

clb_multiwait, clb_pause and clb_scale_freq callbacks can only be
reached after a successful call to
rte_power_ethdev_pmgmt_queue_enable.
Triggering an allocation in them means we are hiding a (internal)
programatic error as allocation and use of a lcore variable are
clearly separated atm.
If we keep the lcore var api as is, I would add an assert() (maybe
under a debug build option) in RTE_LCORE_VAR macros themselves, as
calling with a NULL handle means the initialisation path in some
code/RTE_LCORE_VAR API use was incorrect.


Or because you propose to add the same type of helpers in both this
patch and the next, I am considering the other way: hide the
allocation in the RTE_LCORE_VAR* macros.
Checking for already allocated var in RTE_LCORE_VAR_ALLOC seems fine.
But the "fast path" RTE_LCORE_VAR would have an unwanted branch in most cases.


> A somewhat unrelated question: why is pmd_core_cfg cache-line aligned? I
> don't think it should be.

Before the conversion to per lcore variable, it was probably useful
(avoiding false sharing).
With the conversion, indeed, it looks like a waste of space.
It seems worth a separate fix.


-- 
David Marchand

Re: [PATCH v2 01/15] net/zxdh: zxdh np init implementation

[Junlong Wang]

>> (np)network Processor initialize resources in host,
>> and initialize a channel for some tables insert/get/del.
>> 
>> Signed-off-by: Junlong Wang 

> This mostly looks good, just some small stuff.

Hi, Stephen

May I ask a question.
There are modification suggestions for the first patch of v2 now. 
Will the remaining patches continue to be reviewed.

If there are any, we would like to modify them together.
If not, we will modify the first patch and create a v3 version.

Thanks.