Re: [PATCH v3 0/9] net/intel: clean up base code build
On Thu, Mar 27, 2025 at 3:52 PM Bruce Richardson wrote: > > Simplify the build of the various intel base code directories, by > clearing compiler warnings so the files can be compiled directly along > with the regular driver files. > > v3: add fix for lock checker issues on FreeBSD > v2: added missing patch for fm10k > > Bruce Richardson (9): > net/fm10k/base: fix compilation warnings > net/iavf/base: remove unused meson.build file > net/ixgbe/base: correct definition of macro > net/ixgbe/base: fix compilation warnings > net/ixgbe/base: fix lock checker errors > net/i40e/base: fix unused value warnings > net/i40e/base: fix compiler warnings > net/ice/base: reduce warnings for unused variables > net/intel: simplify base code builds > > drivers/net/intel/e1000/base/meson.build| 9 ++- > drivers/net/intel/e1000/meson.build | 4 +-- > drivers/net/intel/fm10k/base/fm10k_mbx.c| 2 +- > drivers/net/intel/fm10k/base/fm10k_osdep.h | 2 +- > drivers/net/intel/fm10k/base/fm10k_pf.c | 8 +++--- > drivers/net/intel/fm10k/base/fm10k_type.h | 6 ++--- > drivers/net/intel/fm10k/base/meson.build| 21 ++- > drivers/net/intel/fm10k/meson.build | 4 +-- > drivers/net/intel/i40e/base/i40e_diag.c | 2 +- > drivers/net/intel/i40e/base/i40e_nvm.c | 2 +- > drivers/net/intel/i40e/base/i40e_osdep.h| 4 +-- > drivers/net/intel/i40e/base/i40e_type.h | 14 ++ > drivers/net/intel/i40e/base/meson.build | 23 ++-- > drivers/net/intel/i40e/i40e_ethdev.c| 1 + > drivers/net/intel/i40e/meson.build | 4 +-- > drivers/net/intel/iavf/base/meson.build | 10 --- > drivers/net/intel/ice/base/ice_osdep.h | 6 ++--- > drivers/net/intel/ice/base/ice_switch.c | 2 -- > drivers/net/intel/ice/base/ice_type.h | 2 +- > drivers/net/intel/ice/base/meson.build | 1 - > drivers/net/intel/ice/ice_fdir_filter.c | 2 +- > drivers/net/intel/idpf/base/meson.build | 2 +- > drivers/net/intel/idpf/meson.build | 7 ++--- > drivers/net/intel/ixgbe/base/ixgbe_common.c | 4 +-- > drivers/net/intel/ixgbe/base/ixgbe_e610.c | 2 ++ > drivers/net/intel/ixgbe/base/ixgbe_osdep.c | 20 -- > drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 29 - > drivers/net/intel/ixgbe/base/meson.build| 20 ++ > drivers/net/intel/ixgbe/meson.build | 4 +-- > 29 files changed, 69 insertions(+), 148 deletions(-) > delete mode 100644 drivers/net/intel/iavf/base/meson.build I see that you kept the base/meson.build in most drivers, though those only provides a list of base sources. Is this because you expect having to restore this special handling in the future? -- David Marchand
Re: [PATCH v3 5/9] net/ixgbe/base: fix lock checker errors
On Thu, Mar 27, 2025 at 3:53 PM Bruce Richardson
wrote:
>
> When building on FreeBSD, errors are reported in the base code by the
> lock checker (-Wthread-safety). For example:
>
> ../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex
> 'lock->mutex' is still held at the end of function
> [-Werror,-Wthread-safety-analysis]
>42 | }
> | ^
>
> These errors are due to the checker not recognising the lock wrapper
> functions. We can avoid these errors by converting these functions into
> macros.
>
> Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Bruce Richardson
This is the best solution, given that FreeBSD pthread is instrumented
with clang thread safety annotations.
As a sidenote, I don't see much value with the remaining
malloc/calloc/free wrappers in this osdep.c file.
I suspect this makes some other annotations non working.
--
David Marchand
[PATCH v4 3/9] net/ixgbe/base: correct definition of macro
The definition of IXGBE_LE32_TO_CPUS macro is meant to modify the value
in place - similar to the le32_to_cpus() macro in kernel. Fixing the
definition allows us to remove some warning flags, and removes the need
for the uintptr_t typecasts.
Fixes: aa4fc14d2cee ("ixgbe: update base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/ixgbe/base/ixgbe_common.c | 4 ++--
drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 2 +-
drivers/net/intel/ixgbe/base/meson.build| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_common.c
b/drivers/net/intel/ixgbe/base/ixgbe_common.c
index d6425c5b78..fbc9605e4d 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/intel/ixgbe/base/ixgbe_common.c
@@ -4610,7 +4610,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32
*buffer,
/* first pull in the header so we know the buffer length */
for (bi = 0; bi < dword_len; bi++) {
buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
- IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]);
+ IXGBE_LE32_TO_CPUS(&buffer[bi]);
}
/*
@@ -4646,7 +4646,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32
*buffer,
/* Pull in the rest of the buffer (bi is where we left off) */
for (; bi <= dword_len; bi++) {
buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
- IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]);
+ IXGBE_LE32_TO_CPUS(&buffer[bi]);
}
rel_out:
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
index cffc6a4ce8..6e5f7b4ae8 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
@@ -83,7 +83,7 @@ enum {
#define IXGBE_LE16_TO_CPU(_i) rte_le_to_cpu_16(_i)
#define IXGBE_LE32_TO_CPU(_i) rte_le_to_cpu_32(_i)
#define IXGBE_LE64_TO_CPU(_i) rte_le_to_cpu_64(_i)
-#define IXGBE_LE32_TO_CPUS(_i) rte_le_to_cpu_32(_i)
+#define IXGBE_LE32_TO_CPUS(_i) do { *_i = rte_le_to_cpu_32(*_i); } while(0)
#define IXGBE_CPU_TO_BE16(_i) rte_cpu_to_be_16(_i)
#define IXGBE_CPU_TO_BE32(_i) rte_cpu_to_be_32(_i)
#define IXGBE_BE32_TO_CPU(_i) rte_be_to_cpu_32(_i)
diff --git a/drivers/net/intel/ixgbe/base/meson.build
b/drivers/net/intel/ixgbe/base/meson.build
index 7e4fbdfa0f..f8b2ee6341 100644
--- a/drivers/net/intel/ixgbe/base/meson.build
+++ b/drivers/net/intel/ixgbe/base/meson.build
@@ -19,7 +19,7 @@ sources = [
'ixgbe_x550.c',
]
-error_cflags = ['-Wno-unused-value',
+error_cflags = [
'-Wno-unused-but-set-variable',
'-Wno-unused-parameter',
]
--
2.45.2
[PATCH v2] event/dlb2: consolidate AVX512 and SSE changes
Streamline code for AVX512 and SSE by consolidating the common code and
adding runtime check for selecting appropriate path based on CPU
capability.
Signed-off-by: Tirthendu Sarkar
---
v2:
- Addressed review comments [Bruce Richardson]
drivers/event/dlb2/dlb2.c| 199 -
drivers/event/dlb2/dlb2_avx512.c | 298 ---
drivers/event/dlb2/dlb2_priv.h | 9 +-
drivers/event/dlb2/dlb2_sse.c| 210 +-
4 files changed, 241 insertions(+), 475 deletions(-)
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 934fcafcfe..4c0b4686a4 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -90,6 +90,9 @@ static struct rte_event_dev_info evdev_dlb2_default_info = {
struct process_local_port_data
dlb2_port[DLB2_MAX_NUM_PORTS_ALL][DLB2_NUM_PORT_TYPES];
+static void
+(*dlb2_build_qes)(struct dlb2_enqueue_qe *qe, const struct rte_event ev[],
__m128i sse_qe[]);
+
static void
dlb2_free_qe_mem(struct dlb2_port *qm_port)
{
@@ -2069,9 +2072,9 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev,
if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512VL) &&
rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512)
- ev_port->qm_port.use_avx512 = true;
+ dlb2_build_qes = dlb2_build_qes_avx512;
else
- ev_port->qm_port.use_avx512 = false;
+ dlb2_build_qes = dlb2_build_qes_sse;
return 0;
}
@@ -2669,6 +2672,21 @@ dlb2_eventdev_start(struct rte_eventdev *dev)
return 0;
}
+static uint8_t cmd_byte_map[DLB2_NUM_PORT_TYPES][DLB2_NUM_HW_SCHED_TYPES] = {
+ {
+ /* Load-balanced cmd bytes */
+ [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
+ [RTE_EVENT_OP_FORWARD] = DLB2_FWD_CMD_BYTE,
+ [RTE_EVENT_OP_RELEASE] = DLB2_COMP_CMD_BYTE,
+ },
+ {
+ /* Directed cmd bytes */
+ [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
+ [RTE_EVENT_OP_FORWARD] = DLB2_NEW_CMD_BYTE,
+ [RTE_EVENT_OP_RELEASE] = DLB2_NOOP_CMD_BYTE,
+ },
+};
+
static inline uint32_t
dlb2_port_credits_get(struct dlb2_port *qm_port,
enum dlb2_hw_queue_types type)
@@ -2887,6 +2905,183 @@ dlb2_construct_token_pop_qe(struct dlb2_port *qm_port,
int idx)
qm_port->owed_tokens = 0;
}
+static inline void
+dlb2_event_build_hcws(struct dlb2_port *qm_port,
+ const struct rte_event ev[],
+ int num,
+ uint8_t *sched_type,
+ uint8_t *queue_id)
+{
+ struct dlb2_enqueue_qe *qe;
+ uint16_t sched_word[4];
+ __m128i sse_qe[2];
+ int i;
+
+ qe = qm_port->qe4;
+
+ sse_qe[0] = _mm_setzero_si128();
+ sse_qe[1] = _mm_setzero_si128();
+
+ switch (num) {
+ case 4:
+ /* Construct the metadata portion of two HCWs in one 128b SSE
+* register. HCW metadata is constructed in the SSE registers
+* like so:
+* sse_qe[0][63:0]: qe[0]'s metadata
+* sse_qe[0][127:64]: qe[1]'s metadata
+* sse_qe[1][63:0]: qe[2]'s metadata
+* sse_qe[1][127:64]: qe[3]'s metadata
+*/
+
+ /* Convert the event operation into a command byte and store it
+* in the metadata:
+* sse_qe[0][63:56] = cmd_byte_map[is_directed][ev[0].op]
+* sse_qe[0][127:120] = cmd_byte_map[is_directed][ev[1].op]
+* sse_qe[1][63:56] = cmd_byte_map[is_directed][ev[2].op]
+* sse_qe[1][127:120] = cmd_byte_map[is_directed][ev[3].op]
+*/
+#define DLB2_QE_CMD_BYTE 7
+ sse_qe[0] = _mm_insert_epi8(sse_qe[0],
+ cmd_byte_map[qm_port->is_directed][ev[0].op],
+ DLB2_QE_CMD_BYTE);
+ sse_qe[0] = _mm_insert_epi8(sse_qe[0],
+ cmd_byte_map[qm_port->is_directed][ev[1].op],
+ DLB2_QE_CMD_BYTE + 8);
+ sse_qe[1] = _mm_insert_epi8(sse_qe[1],
+ cmd_byte_map[qm_port->is_directed][ev[2].op],
+ DLB2_QE_CMD_BYTE);
+ sse_qe[1] = _mm_insert_epi8(sse_qe[1],
+ cmd_byte_map[qm_port->is_directed][ev[3].op],
+ DLB2_QE_CMD_BYTE + 8);
+
+ /* Store priority, scheduling type, and queue ID in the sched
+* word array because these values are re-used when the
+* destination is a directed queue.
+*/
+ sched_word[0] = EV_TO_DLB2_PRIO(ev[0].priority) << 10 |
+ sched_type[0] << 8 |
+ queue_id[0];
+ sched_word[1] = EV_TO_DLB2_PRIO(ev[
24.11.2 patches review and test
Hi all, Here is a list of patches targeted for stable release 24.11.2. The planned date for the final release is 14 April. 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=v24.11.2-rc1 These patches are located at branch 24.11 of dpdk-stable repo: https://dpdk.org/browse/dpdk-stable/ Thanks. Kevin --- Ajit Khaparde (2): net/bnxt: fix Rx handler net/bnxt: fix epoch bit calculation Aleksandr Loktionov (2): net/igc/base: fix MAC address hash bit shift net/e1000/base: fix MAC address hash bit shift Alex Vesker (1): net/mlx5/hws: fix DV FT type convert Alexander Kozyrev (1): net/mlx5/hws: fix fragmented packet type matching Amir Avivi (2): net/igc/base: fix iterator type net/e1000/base: fix iterator type Anatoly Burakov (4): net/e1000/base: correct mPHY access logic net/e1000: fix crashes in secondary processes net/ixgbe: fix crashes in secondary processes doc: add no-IOMMU mode in devbind tool guide Andre Muezerie (6): eal/x86: fix some intrinsics header include for Windows eventdev: fix format string data type in log messages net/bnxt: fix indication of allocation common/idpf: fix void function returning a value net/intel: fix void functions returning a value stack: fix pop in C11 implementation Andrew Boyer (1): doc: update ionic driver guide Ariel Otilibili (8): examples/flow_filtering: remove duplicate assignment net/sfc: remove unnecessary assignment net/octeon_ep: remove useless assignment net/enetfec: remove useless assignment buildtools: fix some Python regex syntax warnings use Python raw string notation eal/linux: remove useless assignments mempool: fix errno in empty create Arkadiusz Kusztal (3): test/crypto: fix check for OOP header data crypto/qat: fix SM3 state size common/qat: fix devargs parsing Barbara Skobiej (3): net/igc/base: fix data type in MAC hash net/e1000/base: fix data type in MAC hash net/e1000/base: fix reset for 82580 Bing Zhao (3): net/mlx5: fix leak of flow action data list net/mlx5: fix unneeded stub flow table allocation net/mlx5: fix flow group ID for action translation Bruce Richardson (9): net/iavf: remove reset of Tx prepare function pointer net/intel: fix build with icx event/dlb2: fix event weight handling in SSE code path test/dma: fix pointers in IOVA as PA mode net/iavf: check interrupt registration failure net/iavf: fix crash on app exit on FreeBSD eal: fix undetected NUMA nodes net/ixgbe: add checks for E610 VF dma/idxd: add device ids for new HW versions Carolyn Wyborny (1): net/e1000/base: skip management check for 82575 Chaoyong He (2): net/nfp: fix firmware load from flash net/nfp: fix init failure handling Chengwen Feng (2): app/testpmd: show all DCB priority TC map app/testpmd: avoid crash in DCB config Dan Nowlin (1): net/ixgbe/base: add missing buffer copy for ACI Dariusz Sosnowski (1): net/mlx5: fix NAT64 register selection David Marchand (7): random: defer seeding to EAL init power: defer lcore variable allocation eal/x86: defer power intrinsics variable allocation ci: build with MSVC in GHA net/mlx5: fix leak in HWS flow counter action ci: point at GitHub mirror ci: fix ccache for Ubuntu 22.04 Dean Marx (1): dts: fix pass rate edge case in results Dengdui Huang (3): net/hns3: fix mbuf freeing in simple Tx path net/hns3: fix copper port initialization net/hns3: fix reset timeout Dima Ruinskiy (5): net/igc/base: fix deadlock when writing i225 register net/igc/base: fix infinite loop net/igc/base: fix typo in LTR calculation net/igc/base: fix unused value net/e1000/base: fix unchecked return Gavin Hu (1): net/mlx5: fix polling CQEs Gowrishankar Muthukrishnan (5): crypto/virtio: fix data queues iteration vhost/crypto: skip fetch before vring init examples/vhost_crypto: fix user callbacks crypto/cnxk: fix asymmetric operation status code crypto/openssl: validate incorrect RSA signature Gregory Etelson (2): net/mlx5: fix IPIP tunnel verification net/mlx5: fix mark action validation in FDB mode Huisong Li (1): ethdev: fix functions available in new device event Jakub Buchocki (1): net/e1000/base: fix uninitialized variable Jianping Zhao (1): vhost: clear ring addresses when getting vring base Jie Hai (2): net/hns3: remove PVID info dump for VF net/hns3: rename RAS module Junfeng Guo (1): n
[PATCH v17 11/29] net/rnp: add RSS support operations
add support rss reta updata/query rss hash update/get
dev_configure add rss conf check.
Signed-off-by: Wenbo Cao
---
doc/guides/nics/features/rnp.ini| 4 +
doc/guides/nics/rnp.rst | 7 +
drivers/net/rnp/base/rnp_eth_regs.h | 16 ++
drivers/net/rnp/meson.build | 1 +
drivers/net/rnp/rnp.h | 7 +
drivers/net/rnp/rnp_ethdev.c| 23 ++
drivers/net/rnp/rnp_rss.c | 367
drivers/net/rnp/rnp_rss.h | 44
8 files changed, 469 insertions(+)
create mode 100644 drivers/net/rnp/rnp_rss.c
create mode 100644 drivers/net/rnp/rnp_rss.h
diff --git a/doc/guides/nics/features/rnp.ini b/doc/guides/nics/features/rnp.ini
index fd7d4b9d8d..2fc94825f5 100644
--- a/doc/guides/nics/features/rnp.ini
+++ b/doc/guides/nics/features/rnp.ini
@@ -8,5 +8,9 @@ Speed capabilities = Y
Queue start/stop = Y
Promiscuous mode = Y
Allmulticast mode= Y
+RSS hash = Y
+RSS key update = Y
+RSS reta update = Y
+Inner RSS= Y
Linux= Y
x86-64 = Y
diff --git a/doc/guides/nics/rnp.rst b/doc/guides/nics/rnp.rst
index 0ab9bba20b..5f9385720b 100644
--- a/doc/guides/nics/rnp.rst
+++ b/doc/guides/nics/rnp.rst
@@ -38,6 +38,9 @@ Features
- Multiple queues for TX and RX
+- Receiver Side Steering (RSS)
+ Receiver Side Steering (RSS) on IPv4, IPv6, IPv4-TCP/UDP/SCTP,
IPv6-TCP/UDP/SCTP
+ Inner RSS is only support for vxlan/nvgre
- Promiscuous mode
Prerequisites and Pre-conditions
@@ -70,6 +73,10 @@ Listed below are the rte_eth functions supported:
* ``rte_eth_dev_tx_queue_stop``
* ``rte_eth_dev_start``
* ``rte_eth_dev_stop``
+* ``rte_eth_dev_rss_hash_conf_get``
+* ``rte_eth_dev_rss_hash_update``
+* ``rte_eth_dev_rss_reta_query``
+* ``rte_eth_dev_rss_reta_update``
* ``rte_eth_promiscuous_disable``
* ``rte_eth_promiscuous_enable``
* ``rte_eth_allmulticast_enable``
diff --git a/drivers/net/rnp/base/rnp_eth_regs.h
b/drivers/net/rnp/base/rnp_eth_regs.h
index 60766d2035..be7ed5b886 100644
--- a/drivers/net/rnp/base/rnp_eth_regs.h
+++ b/drivers/net/rnp/base/rnp_eth_regs.h
@@ -32,7 +32,23 @@
#define RNP_MAC_MULTICASE_TBL_EN RTE_BIT32(2)
#define RNP_MAC_UNICASE_TBL_EN RTE_BIT32(3)
/* rss function ctrl */
+#define RNP_RSS_INNER_CTRL _ETH_(0x805c)
+#define RNP_INNER_RSS_EN (1)
+#define RNP_INNER_RSS_DIS (0)
#define RNP_RSS_REDIR_TB(n, id) _ETH_(0xe000 + ((n) * 0x200) + ((id) * 0x4))
+#define RNP_RSS_MRQC_ADDR _ETH_(0x92a0)
+/* RSS policy */
+#define RNP_RSS_HASH_CFG_MASK (0x3F3)
+#define RNP_RSS_HASH_IPV4_TCP RTE_BIT32(16)
+#define RNP_RSS_HASH_IPV4 RTE_BIT32(17)
+#define RNP_RSS_HASH_IPV6 RTE_BIT32(20)
+#define RNP_RSS_HASH_IPV6_TCP RTE_BIT32(21)
+#define RNP_RSS_HASH_IPV4_UDP RTE_BIT32(22)
+#define RNP_RSS_HASH_IPV6_UDP RTE_BIT32(23)
+#define RNP_RSS_HASH_IPV4_SCTP RTE_BIT32(24)
+#define RNP_RSS_HASH_IPV6_SCTP RTE_BIT32(25)
+/* rss hash key */
+#define RNP_RSS_KEY_TABLE(idx) _ETH_(0x92d0 + ((idx) * 0x4))
#define RNP_TC_PORT_OFFSET(lane) _ETH_(0xe840 + 0x04 * (lane))
diff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build
index f88fa89a53..e20cc88497 100644
--- a/drivers/net/rnp/meson.build
+++ b/drivers/net/rnp/meson.build
@@ -22,4 +22,5 @@ includes += include_directories('base')
sources = files(
'rnp_ethdev.c',
'rnp_rxtx.c',
+'rnp_rss.c',
)
diff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h
index 9440d9df58..755b6c7f41 100644
--- a/drivers/net/rnp/rnp.h
+++ b/drivers/net/rnp/rnp.h
@@ -111,6 +111,13 @@ struct rnp_eth_port {
struct rnp_tx_queue *tx_queues[RNP_MAX_RX_QUEUE_NUM];
struct rnp_hw *hw;
+ struct rte_eth_rss_conf rss_conf;
+ uint16_t last_rx_num;
+ bool rxq_num_changed;
+ bool reta_has_cfg;
+ bool hw_rss_en;
+ uint32_t indirtbl[RNP_RSS_INDIR_SIZE];
+
rte_spinlock_t rx_mac_lock;
bool port_stopped;
};
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 5603d767dc..6608c5c603 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -18,6 +18,7 @@
#include "base/rnp_dma_regs.h"
#include "base/rnp_mac_regs.h"
#include "rnp_rxtx.h"
+#include "rnp_rss.h"
static struct rte_eth_dev *
rnp_alloc_eth_port(struct rte_pci_device *pci, char *name)
@@ -235,6 +236,9 @@ static int rnp_dev_start(struct rte_eth_dev *eth_dev)
}
/* disable eth rx flow */
RNP_RX_ETH_DISABLE(hw, lane);
+ ret = rnp_dev_rss_configure(eth_dev);
+ if (ret)
+ return ret;
ret = rnp_rx_scattered_setup(eth_dev);
if (ret)
return ret;
@@ -302,6 +306,19 @@ static int rnp_disable_all_tx_queue(struct rte_eth_dev
*dev)
return ret;
}
+static int rnp_dev_configure(struct rte_eth_dev *eth_dev)
+{
+ struct rnp_eth_port *port = RNP_DEV_TO_PORT(eth_dev);
+
+
Re: [PATCH v3 5/9] net/ixgbe/base: fix lock checker errors
On Fri, Mar 28, 2025 at 09:20:16AM +0100, David Marchand wrote:
> On Thu, Mar 27, 2025 at 3:53 PM Bruce Richardson
> wrote:
> >
> > When building on FreeBSD, errors are reported in the base code by the
> > lock checker (-Wthread-safety). For example:
> >
> > ../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex
> > 'lock->mutex' is still held at the end of function
> > [-Werror,-Wthread-safety-analysis]
> >42 | }
> > | ^
> >
> > These errors are due to the checker not recognising the lock wrapper
> > functions. We can avoid these errors by converting these functions into
> > macros.
> >
> > Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Bruce Richardson
>
> This is the best solution, given that FreeBSD pthread is instrumented
> with clang thread safety annotations.
>
> As a sidenote, I don't see much value with the remaining
> malloc/calloc/free wrappers in this osdep.c file.
> I suspect this makes some other annotations non working.
>
Yes, I would tend to agree. Question is whether it is better to convert
them to macros or just move them to the header file as static inlines. I'd
tend towards the latter, because otherwise we'd need to use "," syntax to
avoid potentially introducing other warnings for unused "hw" variable.
Here are two option examples, WDYT of each?
static inline void *
ixgbe_malloc(struct ixgbe_hw __rte_unused *hw, size_t s) { return malloc(s); }
or
#define ixgbe_malloc(hw, s) ((void)hw, malloc(s))
/Bruce
[PATCH v6 0/8] Symbol versioning and export rework
So far, each DPDK library (or driver) exposing symbols in an ABI had to maintain a version.map and use some macros for symbol versioning, specially crafted with the GNU linker in mind. This series proposes to rework the whole principle, and instead rely on marking the symbol exports in the source code itself, then let it to the build framework to produce a version script adapted to the linker in use (think GNU linker vs MSVC linker). This greatly simplifies versioning symbols: a developer does not need to know anything about version.map, or that a versioned symbol must be renamed with _v26, annotated with __vsym, exported in a header etc... Checking symbol maps becomes unnecessary since generated by the build framework. Updating to a new ABI is just a matter of bumping the value in ABI_VERSION. -- David Marchand Changes since v5: - fixed Windows symbol exports for net/mlx5, Changes since RFC v4: - rebased on main, now that Bruce series is merged, - the export macros header has been moved to lib/eal/common/ and its inclusion is now mandatory (rather than an implicit -include), - reordered patches: symbol versioning is touched last and merged in the export header (replacing the legacy rte_function_versioning.h), Changes since RFC v3: - fixed/simplified documentation, - rebased on top of Bruce series for common handling of AVX sources, Changes since RFC v2: - updated RTE_VERSION_SYMBOL() (and friends) so that only the fonction signature is enclosed in the macro, - dropped invalid exports for some dead symbols or inline helpers, - updated documentation and tooling, - converted the whole tree (via a local script of mine), David Marchand (8): lib: remove incorrect exported symbols drivers: remove incorrect exported symbols buildtools: display version when listing symbols build: generate symbol maps build: mark exported symbols build: use dynamically generated version maps build: remove static version maps eal: rework function versioning macros .github/workflows/build.yml | 1 - MAINTAINERS | 9 +- buildtools/check-symbols.sh | 33 +- buildtools/gen-version-map.py | 105 buildtools/map-list-symbol.sh | 15 +- buildtools/map_to_win.py | 41 -- buildtools/meson.build| 2 +- devtools/check-spdx-tag.sh| 2 +- devtools/check-symbol-change.py | 90 +++ devtools/check-symbol-change.sh | 186 -- devtools/check-symbol-maps.sh | 115 devtools/checkpatches.sh | 4 +- devtools/update-abi.sh| 46 -- devtools/update_version_map_abi.py| 210 --- doc/api/doxy-api-index.md | 1 - doc/guides/contributing/abi_policy.rst| 21 +- doc/guides/contributing/abi_versioning.rst| 415 +++-- doc/guides/contributing/coding_style.rst | 7 - .../contributing/img/patch_cheatsheet.svg | 303 + doc/guides/contributing/patches.rst | 6 +- doc/guides/rel_notes/release_25_07.rst| 2 + drivers/baseband/acc/rte_acc100_pmd.c | 2 + drivers/baseband/acc/version.map | 10 - .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 2 + drivers/baseband/fpga_5gnr_fec/version.map| 11 - drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 2 + drivers/baseband/fpga_lte_fec/version.map | 10 - drivers/bus/auxiliary/auxiliary_common.c | 3 + drivers/bus/auxiliary/version.map | 8 - drivers/bus/cdx/cdx.c | 5 + drivers/bus/cdx/cdx_vfio.c| 5 + drivers/bus/cdx/version.map | 14 - drivers/bus/dpaa/dpaa_bus.c | 10 + drivers/bus/dpaa/dpaa_bus_symbols.c | 99 +++ drivers/bus/dpaa/meson.build | 1 + drivers/bus/dpaa/version.map | 109 drivers/bus/fslmc/fslmc_bus.c | 5 + drivers/bus/fslmc/fslmc_vfio.c| 13 + drivers/bus/fslmc/mc/dpbp.c | 8 + drivers/bus/fslmc/mc/dpci.c | 5 + drivers/bus/fslmc/mc/dpcon.c | 8 + drivers/bus/fslmc/mc/dpdmai.c | 10 + drivers/bus/fslmc/mc/dpio.c | 15 + drivers/bus/fslmc/mc/dpmng.c | 4 + drivers/bus/fslmc/mc/mc_sys.c | 2 + drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 4 + drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 3 + drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 12 + drivers/bus/fslmc/qbman/qbman_debug.c | 4 + drivers/bus/fslmc/qbman/qbman_portal.c| 43 ++ drivers/bus/fslmc/version.map | 129 drivers/bus/ifpga/ifpga_bus.c | 4 + drivers/bus/ifpga/version.map | 9 - drivers/bus/pci/b
[PATCH v6 1/8] lib: remove incorrect exported symbols
Declaring inline helpers in version.map is unnecessary.
There is no exported symbol and this will probably be treated as an
error by MSVC linker.
eal_log_journal has no implementation and can be removed.
Signed-off-by: David Marchand
---
lib/eventdev/version.map | 12
lib/graph/version.map| 17 -
lib/ipsec/version.map| 4
lib/log/log_internal.h | 3 ---
lib/log/version.map | 1 -
lib/pdcp/version.map | 4
lib/regexdev/version.map | 2 --
lib/vhost/version.map| 1 -
8 files changed, 44 deletions(-)
diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 44687255cb..bff08d6a62 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -102,9 +102,6 @@ DPDK_25 {
rte_event_timer_adapter_stats_get;
rte_event_timer_adapter_stats_reset;
rte_event_timer_adapter_stop;
- rte_event_timer_arm_burst;
- rte_event_timer_arm_tmo_tick_burst;
- rte_event_timer_cancel_burst;
rte_event_vector_pool_create;
local: *;
@@ -149,9 +146,7 @@ EXPERIMENTAL {
__rte_eventdev_trace_port_profile_switch;
# added in 24.11
- rte_event_port_preschedule_modify;
__rte_eventdev_trace_port_preschedule_modify;
- rte_event_port_preschedule;
__rte_eventdev_trace_port_preschedule;
# added in 25.03
@@ -166,14 +161,7 @@ INTERNAL {
event_dev_probing_finish;
rte_event_logtype;
rte_event_pmd_allocate;
- rte_event_pmd_get_named_dev;
- rte_event_pmd_is_valid_dev;
- rte_event_pmd_pci_probe;
- rte_event_pmd_pci_probe_named;
- rte_event_pmd_pci_remove;
rte_event_pmd_release;
rte_event_pmd_selftest_seqn_dynfield_offset;
- rte_event_pmd_vdev_init;
- rte_event_pmd_vdev_uninit;
rte_eventdevs;
};
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 44fadc00fd..d03d44434d 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -27,9 +27,7 @@ DPDK_25 {
rte_graph_node_get;
rte_graph_node_get_by_name;
rte_graph_obj_dump;
- rte_graph_walk;
rte_graph_worker_model_get;
- rte_graph_worker_model_no_check_get;
rte_graph_worker_model_set;
rte_node_clone;
rte_node_dump;
@@ -37,25 +35,10 @@ DPDK_25 {
rte_node_edge_get;
rte_node_edge_shrink;
rte_node_edge_update;
- rte_node_enqueue;
- rte_node_enqueue_next;
- rte_node_enqueue_x1;
- rte_node_enqueue_x2;
- rte_node_enqueue_x4;
rte_node_from_name;
rte_node_id_to_name;
rte_node_list_dump;
rte_node_max_count;
- rte_node_next_stream_get;
- rte_node_next_stream_move;
- rte_node_next_stream_put;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 24.11
- rte_node_xstat_increment;
-};
diff --git a/lib/ipsec/version.map b/lib/ipsec/version.map
index 308f9d2e0d..47e3df5bb6 100644
--- a/lib/ipsec/version.map
+++ b/lib/ipsec/version.map
@@ -1,9 +1,6 @@
DPDK_25 {
global:
- rte_ipsec_pkt_crypto_group;
- rte_ipsec_pkt_crypto_prepare;
- rte_ipsec_pkt_process;
rte_ipsec_sa_fini;
rte_ipsec_sa_init;
rte_ipsec_sa_size;
@@ -14,7 +11,6 @@ DPDK_25 {
rte_ipsec_sad_destroy;
rte_ipsec_sad_find_existing;
rte_ipsec_sad_lookup;
- rte_ipsec_ses_from_crypto;
rte_ipsec_session_prepare;
rte_ipsec_telemetry_sa_add;
rte_ipsec_telemetry_sa_del;
diff --git a/lib/log/log_internal.h b/lib/log/log_internal.h
index bba7041ea3..525e1397fd 100644
--- a/lib/log/log_internal.h
+++ b/lib/log/log_internal.h
@@ -29,9 +29,6 @@ int eal_log_save_pattern(const char *pattern, uint32_t level);
__rte_internal
int eal_log_syslog(const char *name);
-__rte_internal
-int eal_log_journal(const char *opt);
-
/*
* Convert log level to string.
*/
diff --git a/lib/log/version.map b/lib/log/version.map
index 09d8a4289b..603be493b3 100644
--- a/lib/log/version.map
+++ b/lib/log/version.map
@@ -27,7 +27,6 @@ INTERNAL {
eal_log_color;
eal_log_init;
- eal_log_journal; # WINDOWS_NO_EXPORT
eal_log_level2str;
eal_log_save_pattern;
eal_log_save_regexp;
diff --git a/lib/pdcp/version.map b/lib/pdcp/version.map
index 9c02303c45..72b2d4729b 100644
--- a/lib/pdcp/version.map
+++ b/lib/pdcp/version.map
@@ -3,13 +3,9 @@ EXPERIMENTAL {
# added in 23.07
rte_pdcp_control_pdu_create;
- rte_pdcp_en_from_cop;
rte_pdcp_entity_establish;
rte_pdcp_entity_release;
rte_pdcp_entity_suspend;
- rte_pdcp_pkt_post_process;
- rte_pdcp_pkt_pre_process;
- rte_pdcp_pkt_crypto_group;
rte_pdcp_t_reordering_expiry_handle;
local: *;
diff --git a/lib/regexdev/version.map b/lib/regexdev/version.map
index 4c0435180c..713a800ca4 100644
--- a/lib/regexdev/version.map
+
[PATCH v6 2/8] drivers: remove incorrect exported symbols
Declaring inline helpers in version.map is unnecessary.
There is no exported symbol and this will probably be treated as an
error by MSVC linker.
rte_dpaa2_dev_type is an enum token.
roc_se_ctx_swap has no implementation (leftover from a previous rework)
and can be removed.
Signed-off-by: David Marchand
---
drivers/bus/dpaa/version.map| 1 -
drivers/bus/fslmc/version.map | 2 --
drivers/common/cnxk/roc_se.h| 1 -
drivers/common/cnxk/version.map | 2 --
4 files changed, 6 deletions(-)
diff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map
index a17d57632e..8f09b72757 100644
--- a/drivers/bus/dpaa/version.map
+++ b/drivers/bus/dpaa/version.map
@@ -18,7 +18,6 @@ INTERNAL {
dpaa_update_link_speed;
dpaa_intr_disable;
dpaa_intr_enable;
- dpaa_seqn;
dpaa_svr_family;
dpaa_update_link_status;
fman_dealloc_bufs_mask_hi;
diff --git a/drivers/bus/fslmc/version.map b/drivers/bus/fslmc/version.map
index 2c36895285..ba3c7f36e3 100644
--- a/drivers/bus/fslmc/version.map
+++ b/drivers/bus/fslmc/version.map
@@ -22,7 +22,6 @@ INTERNAL {
dpaa2_get_mcp_ptr;
dpaa2_io_portal;
dpaa2_seqn_dynfield_offset;
- dpaa2_seqn;
dpaa2_svr_family;
dpbp_disable;
dpbp_enable;
@@ -108,7 +107,6 @@ INTERNAL {
qbman_swp_push_set;
qbman_swp_release;
rte_dpaa2_alloc_dpci_dev;
- rte_dpaa2_dev_type;
rte_dpaa2_free_dpci_dev;
rte_dpaa2_intr_disable;
rte_dpaa2_intr_enable;
diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index ede8d69c0e..f2c4056169 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -405,7 +405,6 @@ int __roc_api roc_se_auth_key_set(struct roc_se_ctx
*se_ctx, roc_se_auth_type ty
int __roc_api roc_se_ciph_key_set(struct roc_se_ctx *se_ctx,
roc_se_cipher_type type,
const uint8_t *key, uint16_t key_len);
-void __roc_api roc_se_ctx_swap(struct roc_se_ctx *se_ctx);
void __roc_api roc_se_ctx_init(struct roc_se_ctx *se_ctx);
void __roc_api roc_se_hmac_opad_ipad_gen(roc_se_auth_type auth_type, const
uint8_t *key,
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index cdbfc1d39a..7f40dcced2 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -164,7 +164,6 @@ INTERNAL {
roc_mcs_custom_tag_cfg_get;
roc_mcs_dev_init;
roc_mcs_dev_fini;
- roc_mcs_dev_get;
roc_mcs_event_cb_register;
roc_mcs_event_cb_unregister;
roc_mcs_flowid_entry_enable;
@@ -546,7 +545,6 @@ INTERNAL {
roc_tim_lf_enable;
roc_tim_lf_free;
roc_tim_lf_interval;
- roc_se_ctx_swap;
roc_ree_af_reg_read;
roc_ree_af_reg_write;
roc_ree_config_lf;
--
2.48.1
[PATCH v6 3/8] buildtools: display version when listing symbols
Display the version when a symbol was introduced.
This is needed for scripting the conversion from static to dynamically
generated version maps.
It is also useful when listing experimental symbols.
Signed-off-by: David Marchand
---
buildtools/map-list-symbol.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh
index 43f276c05f..eb98451d8e 100755
--- a/buildtools/map-list-symbol.sh
+++ b/buildtools/map-list-symbol.sh
@@ -73,7 +73,7 @@ for file in $@; do
if ("'$symbol'" == "all" || $1 == "'$symbol'") {
ret = 0;
if ("'$quiet'" == "") {
- print "'$file' "current_section" "$1;
+ print "'$file' "current_section" "$1"
"current_version;
}
if ("'$symbol'" != "all") {
exit 0;
--
2.48.1
[PATCH v6 8/8] eal: rework function versioning macros
For versioning symbols:
- MSVC uses pragmas on the symbol,
- GNU linker uses special asm directives,
To accommodate both GNU linker and MSVC linker, introduce new macros for
exporting and versioning symbols that will surround the whole function.
This has the advantage of hiding all the ugly details in the macros.
Now versioning a symbol is just a call to a single macro:
- RTE_VERSION_SYMBOL (resp. RTE_VERSION_EXPERIMENTAL_SYMBOL), for
keeping an old implementation code under a versioned function (resp.
experimental function),
- RTE_DEFAULT_SYMBOL, for declaring the new default versioned function,
and handling the static link special case, instead of
BIND_DEFAULT_SYMBOL + MAP_STATIC_SYMBOL,
This replaces the macros from rte_function_versioning.h that were
previously publicly exported.
Update lib/net accordingly.
Signed-off-by: David Marchand
---
Changes since RFC v4:
- moved new macros to eal_symbol_exports.h and simply dropped legacy
macros/header,
- added release notes update,
Changes since RFC v3:
- fixed documentation and simplified examples,
Changes since RFC v1:
- renamed and prefixed macros,
- reindented in prevision of second patch,
---
buildtools/gen-version-map.py | 15 +-
devtools/check-symbol-change.py| 8 +-
doc/api/doxy-api-index.md | 1 -
doc/guides/contributing/abi_versioning.rst | 192 ++---
doc/guides/rel_notes/release_25_07.rst | 2 +
lib/eal/common/eal_symbol_exports.h| 66 +++
lib/eal/include/rte_function_versioning.h | 99 ---
lib/net/net_crc.h | 15 --
lib/net/rte_net_crc.c | 29 +---
9 files changed, 135 insertions(+), 292 deletions(-)
delete mode 100644 lib/eal/include/rte_function_versioning.h
diff --git a/buildtools/gen-version-map.py b/buildtools/gen-version-map.py
index c7dfc9b8c2..7ee80ec640 100755
--- a/buildtools/gen-version-map.py
+++ b/buildtools/gen-version-map.py
@@ -13,10 +13,9 @@
export_exp_sym_regexp = re.compile(r"^RTE_EXPORT_EXPERIMENTAL_SYMBOL\(([^,]+),
([0-9]+.[0-9]+)\)")
export_int_sym_regexp = re.compile(r"^RTE_EXPORT_INTERNAL_SYMBOL\(([^)]+)\)")
export_sym_regexp = re.compile(r"^RTE_EXPORT_SYMBOL\(([^)]+)\)")
-# From rte_function_versioning.h
-ver_sym_regexp = re.compile(r"^VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+)\)")
-ver_exp_sym_regexp = re.compile(r"^VERSION_SYMBOL_EXPERIMENTAL\([^,]+,
([^,]+)\)")
-default_sym_regexp = re.compile(r"^BIND_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+)\)")
+ver_sym_regexp = re.compile(r"^RTE_VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+),")
+ver_exp_sym_regexp = re.compile(r"^RTE_VERSION_EXPERIMENTAL_SYMBOL\([^,]+,
([^,]+),")
+default_sym_regexp = re.compile(r"^RTE_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+),")
with open(abi_version_file) as f:
abi = 'DPDK_{}'.format(re.match("([0-9]+).[0-9]", f.readline()).group(1))
@@ -40,14 +39,14 @@
node = abi
symbol = export_sym_regexp.match(ln).group(1)
elif ver_sym_regexp.match(ln):
-node = 'DPDK_{}'.format(ver_sym_regexp.match(ln).group(2))
-symbol = ver_sym_regexp.match(ln).group(1)
+node = 'DPDK_{}'.format(ver_sym_regexp.match(ln).group(1))
+symbol = ver_sym_regexp.match(ln).group(2)
elif ver_exp_sym_regexp.match(ln):
node = 'EXPERIMENTAL'
symbol = ver_exp_sym_regexp.match(ln).group(1)
elif default_sym_regexp.match(ln):
-node = 'DPDK_{}'.format(default_sym_regexp.match(ln).group(2))
-symbol = default_sym_regexp.match(ln).group(1)
+node = 'DPDK_{}'.format(default_sym_regexp.match(ln).group(1))
+symbol = default_sym_regexp.match(ln).group(2)
if not symbol:
continue
diff --git a/devtools/check-symbol-change.py b/devtools/check-symbol-change.py
index d522fbb1ec..d59ecaddd7 100755
--- a/devtools/check-symbol-change.py
+++ b/devtools/check-symbol-change.py
@@ -12,10 +12,10 @@
export_exp_sym_regexp =
re.compile(r"^.RTE_EXPORT_EXPERIMENTAL_SYMBOL\(([^,]+),")
export_int_sym_regexp = re.compile(r"^.RTE_EXPORT_INTERNAL_SYMBOL\(([^)]+)\)")
export_sym_regexp = re.compile(r"^.RTE_EXPORT_SYMBOL\(([^)]+)\)")
-# TODO, handle versioned symbols from rte_function_versioning.h
-# ver_sym_regexp = re.compile(r"^VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+)\)")
-# ver_exp_sym_regexp = re.compile(r"^VERSION_SYMBOL_EXPERIMENTAL\([^,]+,
([^,]+)\)")
-# default_sym_regexp = re.compile(r"^BIND_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+)\)")
+# TODO, handle versioned symbols
+# ver_sym_regexp = re.compile(r"^.RTE_VERSION_SYMBOL\(([^,]+), [^,]+,
([^,]+),")
+# ver_exp_sym_regexp = re.compile(r"^.RTE_VERSION_EXPERIMENTAL_SYMBOL\([^,]+,
([^,]+),")
+# default_sym_regexp = re.compile(r"^.RTE_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+),")
symbols = {}
diff --git a/doc/api/doxy-api-index.md b/doc/api/dox
[PATCH v6 4/8] build: generate symbol maps
Rather than maintain a file in parallel of the code, symbols to be
exported can be marked with a token RTE_EXPORT_*SYMBOL.
>From those marks, the build framework generates map files only for
symbols actually compiled (which means that the WINDOWS_NO_EXPORT hack
becomes unnecessary).
The build framework directly creates a map file in the format that the
linker expects (rather than converting from GNU linker to MSVC linker).
Empty maps are allowed again as a replacement for drivers/version.map.
The symbol check is updated to only support the new format.
Signed-off-by: David Marchand
---
Changes since RFC v4:
- fixed MSVC export map (a msvc->mslinker update was missing),
- fixed join() error (with older meson? I don't see this on Fedora),
- explicit inclusion of header is now required,
- header has been renamed and moved to lib/eal/common/,
- because lib/log does not depend on EAL, added explicit
include_directories,
- symbol versioning update has been moved later in the series,
so updated gen-version-map.py accordingly,
- fixed bug when checking symbol removal,
Changes since RFC v3:
- polished python,
- fixed doc updates not belonging to this patch,
- renamed map files,
- changed msvc->mslinker as link mode,
- added parsing of AVX sources,
Changes since RFC v2:
- because of MSVC limitations wrt macro passed via cmdline,
used an internal header for defining RTE_EXPORT_* macros,
- updated documentation and tooling,
---
MAINTAINERS| 2 +
buildtools/gen-version-map.py | 106 ++
buildtools/map-list-symbol.sh | 10 +-
buildtools/meson.build | 1 +
devtools/check-symbol-change.py| 90
devtools/check-symbol-maps.sh | 14 --
devtools/checkpatches.sh | 2 +-
doc/guides/contributing/abi_versioning.rst | 227 ++---
drivers/meson.build| 96 +
drivers/version.map| 3 -
lib/eal/common/eal_symbol_exports.h| 16 ++
lib/meson.build| 94 ++---
12 files changed, 365 insertions(+), 296 deletions(-)
create mode 100755 buildtools/gen-version-map.py
create mode 100755 devtools/check-symbol-change.py
delete mode 100644 drivers/version.map
create mode 100644 lib/eal/common/eal_symbol_exports.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 4b01103f8e..42ea07854b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -95,6 +95,7 @@ F: devtools/check-maintainers.sh
F: devtools/check-forbidden-tokens.awk
F: devtools/check-git-log.sh
F: devtools/check-spdx-tag.sh
+F: devtools/check-symbol-change.py
F: devtools/check-symbol-change.sh
F: devtools/check-symbol-maps.sh
F: devtools/checkpatches.sh
@@ -127,6 +128,7 @@ F: config/
F: buildtools/check-symbols.sh
F: buildtools/chkincs/
F: buildtools/call-sphinx-build.py
+F: buildtools/gen-version-map.py
F: buildtools/get-cpu-count.py
F: buildtools/get-numa-count.py
F: buildtools/list-dir-globs.py
diff --git a/buildtools/gen-version-map.py b/buildtools/gen-version-map.py
new file mode 100755
index 00..c7dfc9b8c2
--- /dev/null
+++ b/buildtools/gen-version-map.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Red Hat, Inc.
+
+"""Generate a version map file used by GNU or MSVC linker."""
+
+import re
+import sys
+
+scriptname, link_mode, abi_version_file, output, *files = sys.argv
+
+# From eal_symbol_exports.h
+export_exp_sym_regexp = re.compile(r"^RTE_EXPORT_EXPERIMENTAL_SYMBOL\(([^,]+),
([0-9]+.[0-9]+)\)")
+export_int_sym_regexp = re.compile(r"^RTE_EXPORT_INTERNAL_SYMBOL\(([^)]+)\)")
+export_sym_regexp = re.compile(r"^RTE_EXPORT_SYMBOL\(([^)]+)\)")
+# From rte_function_versioning.h
+ver_sym_regexp = re.compile(r"^VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+)\)")
+ver_exp_sym_regexp = re.compile(r"^VERSION_SYMBOL_EXPERIMENTAL\([^,]+,
([^,]+)\)")
+default_sym_regexp = re.compile(r"^BIND_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+)\)")
+
+with open(abi_version_file) as f:
+abi = 'DPDK_{}'.format(re.match("([0-9]+).[0-9]", f.readline()).group(1))
+
+symbols = {}
+
+for file in files:
+with open(file, encoding="utf-8") as f:
+for ln in f.readlines():
+node = None
+symbol = None
+comment = ''
+if export_exp_sym_regexp.match(ln):
+node = 'EXPERIMENTAL'
+symbol = export_exp_sym_regexp.match(ln).group(1)
+comment = ' # added in
{}'.format(export_exp_sym_regexp.match(ln).group(2))
+elif export_int_sym_regexp.match(ln):
+node = 'INTERNAL'
+symbol = export_int_sym_regexp.match(ln).group(1)
+elif export_sym_regexp.match(ln):
+node = abi
+symbol = export_sym_regexp.match(ln).group(1)
+elif ver_sym_regexp.match(ln):
+node = 'DPDK_{}'.format(ver_sym_re
Re: [PATCH v3 5/9] net/ixgbe/base: fix lock checker errors
On Fri, Mar 28, 2025 at 10:43:48AM +, Bruce Richardson wrote:
> On Fri, Mar 28, 2025 at 09:20:16AM +0100, David Marchand wrote:
> > On Thu, Mar 27, 2025 at 3:53 PM Bruce Richardson
> > wrote:
> > >
> > > When building on FreeBSD, errors are reported in the base code by the
> > > lock checker (-Wthread-safety). For example:
> > >
> > > ../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex
> > > 'lock->mutex' is still held at the end of function
> > > [-Werror,-Wthread-safety-analysis]
> > >42 | }
> > > | ^
> > >
> > > These errors are due to the checker not recognising the lock wrapper
> > > functions. We can avoid these errors by converting these functions into
> > > macros.
> > >
> > > Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Bruce Richardson
> >
> > This is the best solution, given that FreeBSD pthread is instrumented
> > with clang thread safety annotations.
> >
> > As a sidenote, I don't see much value with the remaining
> > malloc/calloc/free wrappers in this osdep.c file.
> > I suspect this makes some other annotations non working.
> >
> Yes, I would tend to agree. Question is whether it is better to convert
> them to macros or just move them to the header file as static inlines. I'd
> tend towards the latter, because otherwise we'd need to use "," syntax to
> avoid potentially introducing other warnings for unused "hw" variable.
>
> Here are two option examples, WDYT of each?
>
> static inline void *
> ixgbe_malloc(struct ixgbe_hw __rte_unused *hw, size_t s) { return malloc(s); }
>
> or
>
> #define ixgbe_malloc(hw, s) ((void)hw, malloc(s))
>
Doing a new patch revision, actually using the macro syntax, since it keeps
all the changes consistent, with all 7 functions being converted to macros,
and allowing osdep.c to be removed.
/Bruce
[PATCH v4 9/9] net/intel: simplify base code builds
Now that base-code warning flags have been removed from a number of
drivers, we can simplify their build configuration by just including the
base code files in the regular list of driver files passed back. There
is no need to use pre-compiled objects.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/e1000/base/meson.build | 9 ++---
drivers/net/intel/e1000/meson.build | 4 ++--
drivers/net/intel/fm10k/base/meson.build | 9 ++---
drivers/net/intel/fm10k/meson.build | 4 ++--
drivers/net/intel/i40e/base/meson.build | 9 ++---
drivers/net/intel/i40e/meson.build | 4 ++--
drivers/net/intel/idpf/base/meson.build | 2 +-
drivers/net/intel/idpf/meson.build | 7 ---
drivers/net/intel/ixgbe/base/meson.build | 9 ++---
drivers/net/intel/ixgbe/meson.build | 4 ++--
10 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/drivers/net/intel/e1000/base/meson.build
b/drivers/net/intel/e1000/base/meson.build
index 8cbd9f62e6..4fe86dc6df 100644
--- a/drivers/net/intel/e1000/base/meson.build
+++ b/drivers/net/intel/e1000/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-sources = [
+base_sources = files(
'e1000_base.c',
'e1000_80003es2lan.c',
'e1000_82540.c',
@@ -21,9 +21,4 @@ sources = [
'e1000_osdep.c',
'e1000_phy.c',
'e1000_vf.c',
-]
-
-base_lib = static_library('e1000_base', sources,
-dependencies: static_rte_eal,
-c_args: cflags)
-base_objs = base_lib.extract_all_objects(recursive: true)
+)
diff --git a/drivers/net/intel/e1000/meson.build
b/drivers/net/intel/e1000/meson.build
index cd42c0042a..b52a843228 100644
--- a/drivers/net/intel/e1000/meson.build
+++ b/drivers/net/intel/e1000/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2017 Intel Corporation
subdir('base')
-objs = [base_objs]
-sources = files(
+sources += base_sources
+sources += files(
'e1000_logs.c',
'em_ethdev.c',
'em_rxtx.c',
diff --git a/drivers/net/intel/fm10k/base/meson.build
b/drivers/net/intel/fm10k/base/meson.build
index a2640d1ee8..c45b31d6b2 100644
--- a/drivers/net/intel/fm10k/base/meson.build
+++ b/drivers/net/intel/fm10k/base/meson.build
@@ -1,16 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-sources = [
+base_sources = files(
'fm10k_api.c',
'fm10k_common.c',
'fm10k_mbx.c',
'fm10k_pf.c',
'fm10k_tlv.c',
'fm10k_vf.c',
-]
-
-base_lib = static_library('fm10k_base', sources,
-dependencies: static_rte_eal,
-c_args: cflags)
-base_objs = base_lib.extract_all_objects(recursive: true)
+)
diff --git a/drivers/net/intel/fm10k/meson.build
b/drivers/net/intel/fm10k/meson.build
index 69566add96..e08a00cb49 100644
--- a/drivers/net/intel/fm10k/meson.build
+++ b/drivers/net/intel/fm10k/meson.build
@@ -8,9 +8,9 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
-sources = files(
+sources += base_sources
+sources += files(
'fm10k_ethdev.c',
'fm10k_rxtx.c',
)
diff --git a/drivers/net/intel/i40e/base/meson.build
b/drivers/net/intel/i40e/base/meson.build
index 766383101b..7b4882ad1d 100644
--- a/drivers/net/intel/i40e/base/meson.build
+++ b/drivers/net/intel/i40e/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2020 Intel Corporation
-sources = [
+base_sources = files(
'i40e_adminq.c',
'i40e_common.c',
'i40e_dcb.c',
@@ -9,9 +9,4 @@ sources = [
'i40e_hmc.c',
'i40e_lan_hmc.c',
'i40e_nvm.c',
-]
-
-base_lib = static_library('i40e_base', sources,
-dependencies: static_rte_eal,
-c_args: cflags)
-base_objs = base_lib.extract_all_objects(recursive: true)
+)
diff --git a/drivers/net/intel/i40e/meson.build
b/drivers/net/intel/i40e/meson.build
index 15993393fb..17b6715cd9 100644
--- a/drivers/net/intel/i40e/meson.build
+++ b/drivers/net/intel/i40e/meson.build
@@ -18,9 +18,9 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
endif
subdir('base')
-objs = [base_objs]
-sources = files(
+sources += base_sources
+sources += files(
'i40e_ethdev.c',
'i40e_rxtx.c',
'i40e_pf.c',
diff --git a/drivers/net/intel/idpf/base/meson.build
b/drivers/net/intel/idpf/base/meson.build
index 7316e0a805..78782e463e 100644
--- a/drivers/net/intel/idpf/base/meson.build
+++ b/drivers/net/intel/idpf/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2023 Intel Corporation
-sources += files(
+base_sources = files(
'idpf_controlq.c',
'idpf_controlq_setup.c',
)
diff --git a/drivers/net/intel/idpf/meson.build
b/drivers/net/intel/idpf/meson.build
index 4b272d02b1..a8690da87b 100644
--- a/drivers/net/intel/idpf/meson.build
+++ b/drivers/net/intel/idpf/meson.build
@@ -7,9 +7,12 @@ if is_windows
subdir_done()
endif
+subdir('base')
+
includes += incl
[PATCH v4 1/9] net/fm10k/base: fix compilation warnings
The fixes required to re-enable warnings in the fm10k base code are
trivial, so let's make the changes and get a clean compile without any
warning disable flags.
* provide definitions for the UNREFERENCED_PARAMETER macros
* fix the spelling of the work "fallthrough" in comments
* provide a definition of FM10K_READ_PCI_WORD in os_dep.h that marks the
parameters as used.
Fixes: 7223d200c227 ("fm10k: add base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/fm10k/base/fm10k_mbx.c | 2 +-
drivers/net/intel/fm10k/base/fm10k_osdep.h | 2 +-
drivers/net/intel/fm10k/base/fm10k_pf.c| 8
drivers/net/intel/fm10k/base/fm10k_type.h | 6 +++---
drivers/net/intel/fm10k/base/meson.build | 14 +-
5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/net/intel/fm10k/base/fm10k_mbx.c
b/drivers/net/intel/fm10k/base/fm10k_mbx.c
index 2bb0d82efe..9028403757 100644
--- a/drivers/net/intel/fm10k/base/fm10k_mbx.c
+++ b/drivers/net/intel/fm10k/base/fm10k_mbx.c
@@ -1602,7 +1602,7 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct
fm10k_mbx_info *mbx,
mbx->mbmem_reg = FM10K_MBMEM_VF(id, 0);
break;
}
- /* fallthough */
+ /* fallthrough */
default:
return FM10K_MBX_ERR_NO_MBX;
}
diff --git a/drivers/net/intel/fm10k/base/fm10k_osdep.h
b/drivers/net/intel/fm10k/base/fm10k_osdep.h
index a727a57481..5f8ff10474 100644
--- a/drivers/net/intel/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/intel/fm10k/base/fm10k_osdep.h
@@ -67,7 +67,7 @@ typedef uint64_t u64;
#define FM10K_PCI_REG_WRITE(reg, value) rte_write32((value), (reg))
/* not implemented */
-#define FM10K_READ_PCI_WORD(hw, reg) 0
+#define FM10K_READ_PCI_WORD(hw, reg) ((void)hw, (void)reg, 0)
#define FM10K_WRITE_MBX(hw, reg, value) FM10K_WRITE_REG(hw, reg, value)
#define FM10K_READ_MBX(hw, reg) FM10K_READ_REG(hw, reg)
diff --git a/drivers/net/intel/fm10k/base/fm10k_pf.c
b/drivers/net/intel/fm10k/base/fm10k_pf.c
index 439dd224de..b54116a4b5 100644
--- a/drivers/net/intel/fm10k/base/fm10k_pf.c
+++ b/drivers/net/intel/fm10k/base/fm10k_pf.c
@@ -1362,19 +1362,19 @@ STATIC u8 fm10k_iov_supported_xcast_mode_pf(struct
fm10k_vf_info *vf_info,
case FM10K_XCAST_MODE_PROMISC:
if (vf_flags & FM10K_VF_FLAG_PROMISC_CAPABLE)
return FM10K_XCAST_MODE_PROMISC;
- /* fallthough */
+ /* fallthrough */
case FM10K_XCAST_MODE_ALLMULTI:
if (vf_flags & FM10K_VF_FLAG_ALLMULTI_CAPABLE)
return FM10K_XCAST_MODE_ALLMULTI;
- /* fallthough */
+ /* fallthrough */
case FM10K_XCAST_MODE_MULTI:
if (vf_flags & FM10K_VF_FLAG_MULTI_CAPABLE)
return FM10K_XCAST_MODE_MULTI;
- /* fallthough */
+ /* fallthrough */
case FM10K_XCAST_MODE_NONE:
if (vf_flags & FM10K_VF_FLAG_NONE_CAPABLE)
return FM10K_XCAST_MODE_NONE;
- /* fallthough */
+ /* fallthrough */
default:
break;
}
diff --git a/drivers/net/intel/fm10k/base/fm10k_type.h
b/drivers/net/intel/fm10k/base/fm10k_type.h
index 84781ba9b2..437fb1c55e 100644
--- a/drivers/net/intel/fm10k/base/fm10k_type.h
+++ b/drivers/net/intel/fm10k/base/fm10k_type.h
@@ -83,9 +83,9 @@ struct fm10k_hw;
#define FM10K_NOT_IMPLEMENTED 0x7FFF
#define UNREFERENCED_XPARAMETER
-#define UNREFERENCED_1PARAMETER(_p) (_p)
-#define UNREFERENCED_2PARAMETER(_p, _q)do { (_p); (_q); } while (0)
-#define UNREFERENCED_3PARAMETER(_p, _q, _r) do { (_p); (_q); (_r); } while (0)
+#define UNREFERENCED_1PARAMETER(_p) (void)(_p)
+#define UNREFERENCED_2PARAMETER(_p, _q)do { (void)(_p);
(void)(_q); } while (0)
+#define UNREFERENCED_3PARAMETER(_p, _q, _r) do { (void)(_p); (void)(_q);
(void)(_r); } while (0)
/* Start of PF registers */
#define FM10K_CTRL 0x
diff --git a/drivers/net/intel/fm10k/base/meson.build
b/drivers/net/intel/fm10k/base/meson.build
index f24e453fd0..a2640d1ee8 100644
--- a/drivers/net/intel/fm10k/base/meson.build
+++ b/drivers/net/intel/fm10k/base/meson.build
@@ -10,19 +10,7 @@ sources = [
'fm10k_vf.c',
]
-error_cflags = [
-'-Wno-unused-parameter',
-'-Wno-unused-value',
-'-Wno-implicit-fallthrough',
-]
-c_args = cflags
-foreach flag: error_cflags
-if cc.has_argument(flag)
-c_args += flag
-endif
-endforeach
-
base_lib = static_library('fm10k_base', sources,
dependencies: static_rte_eal,
-c_args: c_args)
+c_args: cflags)
base_objs = base_lib.extract_all_objects(recursive: true)
--
2.45.2
[PATCH v4 8/9] net/ice/base: reduce warnings for unused variables
Improve base code macros to reduce the number of issues with unused
variables in the code. Issues still remain with unused-but-set
variables, but completely unused variable warnings are eliminated.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/ice/base/ice_osdep.h | 6 +++---
drivers/net/intel/ice/base/ice_switch.c | 2 --
drivers/net/intel/ice/base/ice_type.h | 2 +-
drivers/net/intel/ice/base/meson.build | 1 -
drivers/net/intel/ice/ice_fdir_filter.c | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/intel/ice/base/ice_osdep.h
b/drivers/net/intel/ice/base/ice_osdep.h
index 7b96fcde03..ad6cde9896 100644
--- a/drivers/net/intel/ice/base/ice_osdep.h
+++ b/drivers/net/intel/ice/base/ice_osdep.h
@@ -196,9 +196,9 @@ struct __rte_packed_begin ice_virt_mem {
u32 size;
} __rte_packed_end;
-#define ice_malloc(h, s)rte_zmalloc(NULL, s, 0)
-#define ice_calloc(h, c, s) rte_calloc(NULL, c, s, 0)
-#define ice_free(h, m) rte_free(m)
+#define ice_malloc(h, s)((void)h, rte_zmalloc(NULL, s, 0))
+#define ice_calloc(h, c, s) ((void)h, rte_calloc(NULL, c, s, 0))
+#define ice_free(h, m) ((void)h, rte_free(m))
#define ice_memset(a, b, c, d) memset((a), (b), (c))
#define ice_memcpy(a, b, c, d) rte_memcpy((a), (b), (c))
diff --git a/drivers/net/intel/ice/base/ice_switch.c
b/drivers/net/intel/ice/base/ice_switch.c
index a3786961e6..468a9f055d 100644
--- a/drivers/net/intel/ice/base/ice_switch.c
+++ b/drivers/net/intel/ice/base/ice_switch.c
@@ -8190,7 +8190,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct
ice_adv_lkup_elem *lkups,
struct ice_sw_recipe *rm;
u8 i;
int status = ICE_SUCCESS;
- u16 cnt;
if (!ice_is_prof_rule(rinfo->tun_type) && !lkups_cnt)
return ICE_ERR_PARAM;
@@ -9795,7 +9794,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct
ice_adv_lkup_elem *lkups,
bool remove_rule = false;
struct ice_lock *rule_lock; /* Lock to protect filter rule list */
u16 i, rid, vsi_handle;
- bool is_add = false;
int status = ICE_SUCCESS;
ice_memset(&lkup_exts, 0, sizeof(lkup_exts), ICE_NONDMA_MEM);
diff --git a/drivers/net/intel/ice/base/ice_type.h
b/drivers/net/intel/ice/base/ice_type.h
index 35f832eb9f..297a5ea890 100644
--- a/drivers/net/intel/ice/base/ice_type.h
+++ b/drivers/net/intel/ice/base/ice_type.h
@@ -153,7 +153,7 @@ static inline u32 ice_round_to_num(u32 N, u32 R)
#define ICE_DBG_USER BIT_ULL(31)
#define ICE_DBG_ALL0xULL
-#define __ALWAYS_UNUSED
+#define __ALWAYS_UNUSED __rte_unused
#define IS_ETHER_ADDR_EQUAL(addr1, addr2) \
(((bool)u16 *)(addr1))[0] == ((u16 *)(addr2))[0]))) && \
diff --git a/drivers/net/intel/ice/base/meson.build
b/drivers/net/intel/ice/base/meson.build
index 38d092c370..e7ba9c34bc 100644
--- a/drivers/net/intel/ice/base/meson.build
+++ b/drivers/net/intel/ice/base/meson.build
@@ -39,7 +39,6 @@ if is_ms_compiler
else
error_cflags = [
'-Wno-unused-but-set-variable',
-'-Wno-unused-variable',
'-Wno-unused-parameter',
]
endif
diff --git a/drivers/net/intel/ice/ice_fdir_filter.c
b/drivers/net/intel/ice/ice_fdir_filter.c
index 940fe171b6..2ff0090aca 100644
--- a/drivers/net/intel/ice/ice_fdir_filter.c
+++ b/drivers/net/intel/ice/ice_fdir_filter.c
@@ -1090,7 +1090,7 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum
ice_fltr_ptype flow,
return -EINVAL;
seg_tun = (struct ice_flow_seg_info *)
- ice_malloc(hw, sizeof(*seg_tun) * ICE_FD_HW_SEG_MAX);
+ ice_malloc(pf->adapter->hw, sizeof(*seg_tun) *
ICE_FD_HW_SEG_MAX);
if (!seg_tun) {
PMD_DRV_LOG(ERR, "No memory can be allocated");
return -ENOMEM;
--
2.45.2
[PATCH v4 4/9] net/ixgbe/base: fix compilation warnings
We can remove almost all of the "unused parameter" and "unused variable"
warnings by just improving the macro definitions in the osdep.h header.
Remaining two instances can be fixed by just one-line additions to the
code, so add those to give us a clean build with the warnings enabled.
Fixes: af75078fece3 ("first public release")
Fixes: c6cb313da739 ("net/ixgbe/base: add link management for E610")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/ixgbe/base/ixgbe_e610.c | 2 ++
drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 19 +++
drivers/net/intel/ixgbe/base/meson.build | 11 ---
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_e610.c
b/drivers/net/intel/ixgbe/base/ixgbe_e610.c
index 5474c3012a..7420c78d07 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_e610.c
+++ b/drivers/net/intel/ixgbe/base/ixgbe_e610.c
@@ -1054,6 +1054,7 @@ static void ixgbe_parse_vsi_func_caps(struct ixgbe_hw *hw,
struct ixgbe_hw_func_caps *func_p,
struct ixgbe_aci_cmd_list_caps_elem *cap)
{
+ UNREFERENCED_PARAMETER(cap);
func_p->guar_num_vsi = ixgbe_get_num_per_func(hw, IXGBE_MAX_VSI);
}
@@ -1770,6 +1771,7 @@ s32 ixgbe_aci_set_event_mask(struct ixgbe_hw *hw, u8
port_num, u16 mask)
struct ixgbe_aci_cmd_set_event_mask *cmd;
struct ixgbe_aci_desc desc;
+ UNREFERENCED_PARAMETER(port_num);
cmd = &desc.params.set_event_mask;
ixgbe_fill_dflt_direct_cmd_desc(&desc, ixgbe_aci_opc_set_event_mask);
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
index 6e5f7b4ae8..398c38bffd 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
@@ -57,13 +57,16 @@
/* Bunch of defines for shared code bogosity */
#ifndef UNREFERENCED_PARAMETER
-#define UNREFERENCED_PARAMETER(_p)
+#define UNREFERENCED_PARAMETER(_p) (void)(_p)
#endif
-#define UNREFERENCED_1PARAMETER(_p)
-#define UNREFERENCED_2PARAMETER(_p, _q)
-#define UNREFERENCED_3PARAMETER(_p, _q, _r)
-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s)
-#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t)
+#define UNREFERENCED_1PARAMETER(_p) (void)(_p)
+#define UNREFERENCED_2PARAMETER(_p, _q) do { (void)(_p); (void)(_q); } while(0)
+#define UNREFERENCED_3PARAMETER(_p, _q, _r) \
+ do { (void)(_p); (void)(_q); (void)(_r); } while(0)
+#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) \
+ do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); } while(0)
+#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) \
+ do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); (void)(_t); }
while(0)
/* Shared code error reporting */
enum {
@@ -130,8 +133,8 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr)
IXGBE_PCI_REG_ADDR((hw), (reg) + ((index) << 2))
/* Not implemented !! */
-#define IXGBE_READ_PCIE_WORD(hw, reg) 0
-#define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { } while(0)
+#define IXGBE_READ_PCIE_WORD(hw, reg) ((void)hw, (void)(reg), 0)
+#define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { (void)hw; (void)reg;
(void)value; } while(0)
#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
diff --git a/drivers/net/intel/ixgbe/base/meson.build
b/drivers/net/intel/ixgbe/base/meson.build
index f8b2ee6341..64e0bfd7be 100644
--- a/drivers/net/intel/ixgbe/base/meson.build
+++ b/drivers/net/intel/ixgbe/base/meson.build
@@ -19,17 +19,6 @@ sources = [
'ixgbe_x550.c',
]
-error_cflags = [
-'-Wno-unused-but-set-variable',
-'-Wno-unused-parameter',
-]
-c_args = cflags
-foreach flag: error_cflags
-if cc.has_argument(flag)
-c_args += flag
-endif
-endforeach
-
base_lib = static_library('ixgbe_base', sources,
dependencies: [static_rte_eal, static_rte_net],
c_args: c_args)
--
2.45.2
[PATCH v4 5/9] net/ixgbe/base: fix lock checker errors
When building on FreeBSD, errors are reported in the base code by the
lock checker (-Wthread-safety). For example:
../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex 'lock->mutex'
is still held at the end of function [-Werror,-Wthread-safety-analysis]
42 | }
| ^
These errors are due to the checker not recognising the lock wrapper
functions. We can avoid these errors by converting these functions into
macros. While converting the lock macros, we can also convert the memory
allocation functions too, which allows us to remove the osdep.c file
entirely from the build.
Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/ixgbe/base/ixgbe_osdep.c | 47 --
drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 18 +
drivers/net/intel/ixgbe/base/meson.build | 1 -
3 files changed, 10 insertions(+), 56 deletions(-)
delete mode 100644 drivers/net/intel/ixgbe/base/ixgbe_osdep.c
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.c
b/drivers/net/intel/ixgbe/base/ixgbe_osdep.c
deleted file mode 100644
index d3d7e8e116..00
--- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2024 Intel Corporation
- */
-
-#include
-
-#include
-
-#include "ixgbe_osdep.h"
-
-void *
-ixgbe_calloc(struct ixgbe_hw __rte_unused *hw, size_t count, size_t size)
-{
- return malloc(count * size);
-}
-
-void *
-ixgbe_malloc(struct ixgbe_hw __rte_unused *hw, size_t size)
-{
- return malloc(size);
-}
-
-void
-ixgbe_free(struct ixgbe_hw __rte_unused *hw, void *addr)
-{
- free(addr);
-}
-
-void ixgbe_init_lock(struct ixgbe_lock *lock)
-{
- pthread_mutex_init(&lock->mutex, NULL);
-}
-
-void ixgbe_destroy_lock(struct ixgbe_lock *lock)
-{
- pthread_mutex_destroy(&lock->mutex);
-}
-
-void ixgbe_acquire_lock(struct ixgbe_lock *lock)
-{
- pthread_mutex_lock(&lock->mutex);
-}
-
-void ixgbe_release_lock(struct ixgbe_lock *lock)
-{
- pthread_mutex_unlock(&lock->mutex);
-}
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
index 398c38bffd..53d0422193 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
@@ -11,6 +11,8 @@
#include
#include
#include
+#include
+
#include
#include
#include
@@ -50,7 +52,7 @@
#define false 0
#define true1
#ifndef RTE_EXEC_ENV_WINDOWS
-#define min(a,b) RTE_MIN(a,b)
+#define min(a,b) RTE_MIN(a,b)
#endif
#define EWARN(hw, S, ...) DEBUGOUT1(S, ##__VA_ARGS__)
@@ -163,13 +165,13 @@ struct ixgbe_lock {
pthread_mutex_t mutex;
};
-void *ixgbe_calloc(struct ixgbe_hw *hw, size_t count, size_t size);
-void *ixgbe_malloc(struct ixgbe_hw *hw, size_t size);
-void ixgbe_free(struct ixgbe_hw *hw, void *addr);
+#define ixgbe_calloc(hw, c, s) ((void)hw, calloc(c, s))
+#define ixgbe_malloc(hw, s) ((void)hw, malloc(s))
+#define ixgbe_free(hw, a) ((void)hw, free(a))
-void ixgbe_init_lock(struct ixgbe_lock *lock);
-void ixgbe_destroy_lock(struct ixgbe_lock *lock);
-void ixgbe_acquire_lock(struct ixgbe_lock *lock);
-void ixgbe_release_lock(struct ixgbe_lock *lock);
+#define ixgbe_init_lock(lock) pthread_mutex_init(&(lock)->mutex, NULL)
+#define ixgbe_destroy_lock(lock) pthread_mutex_destroy(&(lock)->mutex)
+#define ixgbe_acquire_lock(lock) pthread_mutex_lock(&(lock)->mutex)
+#define ixgbe_release_lock(lock) pthread_mutex_unlock(&(lock)->mutex)
#endif /* _IXGBE_OS_H_ */
diff --git a/drivers/net/intel/ixgbe/base/meson.build
b/drivers/net/intel/ixgbe/base/meson.build
index 64e0bfd7be..2af8a55e92 100644
--- a/drivers/net/intel/ixgbe/base/meson.build
+++ b/drivers/net/intel/ixgbe/base/meson.build
@@ -12,7 +12,6 @@ sources = [
'ixgbe_e610.c',
'ixgbe_hv_vf.c',
'ixgbe_mbx.c',
-'ixgbe_osdep.c',
'ixgbe_phy.c',
'ixgbe_vf.c',
'ixgbe_x540.c',
--
2.45.2
[PATCH v4 7/9] net/i40e/base: fix compiler warnings
Add a single-line fix to the base code, and then the remaining two
compiler warning disable flags can be removed from the driver base code
build file.
Fixes: 8db9e2a1b232 ("i40e: base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/i40e/base/i40e_diag.c | 2 +-
drivers/net/intel/i40e/base/meson.build | 13 +
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/intel/i40e/base/i40e_diag.c
b/drivers/net/intel/i40e/base/i40e_diag.c
index 4ca102cdd5..71b2e53e85 100644
--- a/drivers/net/intel/i40e/base/i40e_diag.c
+++ b/drivers/net/intel/i40e/base/i40e_diag.c
@@ -34,7 +34,7 @@ static enum i40e_status_code
i40e_diag_reg_pattern_test(struct i40e_hw *hw,
{
const u32 patterns[] = {0x5A5A5A5A, 0xA5A5A5A5, 0x, 0x};
u32 pat, val, orig_val;
- int i;
+ unsigned int i;
orig_val = rd32(hw, reg);
for (i = 0; i < ARRAY_SIZE(patterns); i++) {
diff --git a/drivers/net/intel/i40e/base/meson.build
b/drivers/net/intel/i40e/base/meson.build
index 2648e5d0c4..766383101b 100644
--- a/drivers/net/intel/i40e/base/meson.build
+++ b/drivers/net/intel/i40e/base/meson.build
@@ -11,18 +11,7 @@ sources = [
'i40e_nvm.c',
]
-error_cflags = [
-'-Wno-sign-compare',
-'-Wno-strict-aliasing',
-]
-c_args = cflags
-foreach flag: error_cflags
-if cc.has_argument(flag)
-c_args += flag
-endif
-endforeach
-
base_lib = static_library('i40e_base', sources,
dependencies: static_rte_eal,
-c_args: c_args)
+c_args: cflags)
base_objs = base_lib.extract_all_objects(recursive: true)
--
2.45.2
[PATCH v4 0/9] net/intel: clean up base code build
Simplify the build of the various intel base code directories, by clearing compiler warnings so the files can be compiled directly along with the regular driver files. v4: replace all functions in ixgbe_osdep.c with macros, removing file. v3: add fix for lock checker issues on FreeBSD v2: added missing patch for fm10k Bruce Richardson (9): net/fm10k/base: fix compilation warnings net/iavf/base: remove unused meson.build file net/ixgbe/base: correct definition of macro net/ixgbe/base: fix compilation warnings net/ixgbe/base: fix lock checker errors net/i40e/base: fix unused value warnings net/i40e/base: fix compiler warnings net/ice/base: reduce warnings for unused variables net/intel: simplify base code builds drivers/net/intel/e1000/base/meson.build| 9 +--- drivers/net/intel/e1000/meson.build | 4 +- drivers/net/intel/fm10k/base/fm10k_mbx.c| 2 +- drivers/net/intel/fm10k/base/fm10k_osdep.h | 2 +- drivers/net/intel/fm10k/base/fm10k_pf.c | 8 ++-- drivers/net/intel/fm10k/base/fm10k_type.h | 6 +-- drivers/net/intel/fm10k/base/meson.build| 21 + drivers/net/intel/fm10k/meson.build | 4 +- drivers/net/intel/i40e/base/i40e_diag.c | 2 +- drivers/net/intel/i40e/base/i40e_nvm.c | 2 +- drivers/net/intel/i40e/base/i40e_osdep.h| 4 +- drivers/net/intel/i40e/base/i40e_type.h | 14 +++--- drivers/net/intel/i40e/base/meson.build | 23 +- drivers/net/intel/i40e/i40e_ethdev.c| 1 + drivers/net/intel/i40e/meson.build | 4 +- drivers/net/intel/iavf/base/meson.build | 10 - drivers/net/intel/ice/base/ice_osdep.h | 6 +-- drivers/net/intel/ice/base/ice_switch.c | 2 - drivers/net/intel/ice/base/ice_type.h | 2 +- drivers/net/intel/ice/base/meson.build | 1 - drivers/net/intel/ice/ice_fdir_filter.c | 2 +- drivers/net/intel/idpf/base/meson.build | 2 +- drivers/net/intel/idpf/meson.build | 7 +-- drivers/net/intel/ixgbe/base/ixgbe_common.c | 4 +- drivers/net/intel/ixgbe/base/ixgbe_e610.c | 2 + drivers/net/intel/ixgbe/base/ixgbe_osdep.c | 47 - drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 39 + drivers/net/intel/ixgbe/base/meson.build| 21 + drivers/net/intel/ixgbe/meson.build | 4 +- 29 files changed, 75 insertions(+), 180 deletions(-) delete mode 100644 drivers/net/intel/iavf/base/meson.build delete mode 100644 drivers/net/intel/ixgbe/base/ixgbe_osdep.c -- 2.45.2
Re: [PATCH v3 0/9] net/intel: clean up base code build
On Fri, Mar 28, 2025 at 09:21:03AM +0100, David Marchand wrote: > On Thu, Mar 27, 2025 at 3:52 PM Bruce Richardson > wrote: > > > > Simplify the build of the various intel base code directories, by > > clearing compiler warnings so the files can be compiled directly along > > with the regular driver files. > > > > v3: add fix for lock checker issues on FreeBSD v2: added missing patch > > for fm10k > > > > Bruce Richardson (9): net/fm10k/base: fix compilation warnings > > net/iavf/base: remove unused meson.build file net/ixgbe/base: correct > > definition of macro net/ixgbe/base: fix compilation warnings > > net/ixgbe/base: fix lock checker errors net/i40e/base: fix unused value > > warnings net/i40e/base: fix compiler warnings net/ice/base: reduce > > warnings for unused variables net/intel: simplify base code builds > > > > drivers/net/intel/e1000/base/meson.build| 9 ++- > > drivers/net/intel/e1000/meson.build | 4 +-- > > drivers/net/intel/fm10k/base/fm10k_mbx.c| 2 +- > > drivers/net/intel/fm10k/base/fm10k_osdep.h | 2 +- > > drivers/net/intel/fm10k/base/fm10k_pf.c | 8 +++--- > > drivers/net/intel/fm10k/base/fm10k_type.h | 6 ++--- > > drivers/net/intel/fm10k/base/meson.build| 21 ++- > > drivers/net/intel/fm10k/meson.build | 4 +-- > > drivers/net/intel/i40e/base/i40e_diag.c | 2 +- > > drivers/net/intel/i40e/base/i40e_nvm.c | 2 +- > > drivers/net/intel/i40e/base/i40e_osdep.h| 4 +-- > > drivers/net/intel/i40e/base/i40e_type.h | 14 ++ > > drivers/net/intel/i40e/base/meson.build | 23 ++-- > > drivers/net/intel/i40e/i40e_ethdev.c| 1 + > > drivers/net/intel/i40e/meson.build | 4 +-- > > drivers/net/intel/iavf/base/meson.build | 10 --- > > drivers/net/intel/ice/base/ice_osdep.h | 6 ++--- > > drivers/net/intel/ice/base/ice_switch.c | 2 -- > > drivers/net/intel/ice/base/ice_type.h | 2 +- > > drivers/net/intel/ice/base/meson.build | 1 - > > drivers/net/intel/ice/ice_fdir_filter.c | 2 +- > > drivers/net/intel/idpf/base/meson.build | 2 +- > > drivers/net/intel/idpf/meson.build | 7 ++--- > > drivers/net/intel/ixgbe/base/ixgbe_common.c | 4 +-- > > drivers/net/intel/ixgbe/base/ixgbe_e610.c | 2 ++ > > drivers/net/intel/ixgbe/base/ixgbe_osdep.c | 20 -- > > drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 29 - > > drivers/net/intel/ixgbe/base/meson.build| 20 ++ > > drivers/net/intel/ixgbe/meson.build | 4 +-- 29 files changed, > > 69 insertions(+), 148 deletions(-) delete mode 100644 > > drivers/net/intel/iavf/base/meson.build > > I see that you kept the base/meson.build in most drivers, though those > only provides a list of base sources. Is this because you expect having > to restore this special handling in the future? > Not especially, no. I would hope we wouldn't need additional warning handling in future, though one never knows. I did consider removing them in this set, but have decided against it (for now anyway). I am planning on doing a follow-up set to move the handling of the base code builds to the "drivers/meson.build" file. At that point, I'll maybe decide to remove the files - though again I'm in two-minds about it, still. /Bruce
Re: [PATCH v3 5/9] net/ixgbe/base: fix lock checker errors
On Fri, Mar 28, 2025 at 11:44 AM Bruce Richardson
wrote:
>
> On Fri, Mar 28, 2025 at 09:20:16AM +0100, David Marchand wrote:
> > On Thu, Mar 27, 2025 at 3:53 PM Bruce Richardson
> > wrote:
> > >
> > > When building on FreeBSD, errors are reported in the base code by the
> > > lock checker (-Wthread-safety). For example:
> > >
> > > ../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex
> > > 'lock->mutex' is still held at the end of function
> > > [-Werror,-Wthread-safety-analysis]
> > >42 | }
> > > | ^
> > >
> > > These errors are due to the checker not recognising the lock wrapper
> > > functions. We can avoid these errors by converting these functions into
> > > macros.
> > >
> > > Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Bruce Richardson
> >
> > This is the best solution, given that FreeBSD pthread is instrumented
> > with clang thread safety annotations.
> >
> > As a sidenote, I don't see much value with the remaining
> > malloc/calloc/free wrappers in this osdep.c file.
> > I suspect this makes some other annotations non working.
> >
> Yes, I would tend to agree. Question is whether it is better to convert
> them to macros or just move them to the header file as static inlines. I'd
> tend towards the latter, because otherwise we'd need to use "," syntax to
> avoid potentially introducing other warnings for unused "hw" variable.
>
> Here are two option examples, WDYT of each?
>
> static inline void *
> ixgbe_malloc(struct ixgbe_hw __rte_unused *hw, size_t s) { return malloc(s); }
>
> or
>
> #define ixgbe_malloc(hw, s) ((void)hw, malloc(s))
I think we don't have much choice but to use macros, as attributes on
a symbol won't get inherited by an inline wrapper.
--
David Marchand
Re: [PATCH v4 8/9] net/ice/base: reduce warnings for unused variables
On 3/28/2025 12:16 PM, Bruce Richardson wrote: Improve base code macros to reduce the number of issues with unused variables in the code. Issues still remain with unused-but-set variables, but completely unused variable warnings are eliminated. Signed-off-by: Bruce Richardson --- Acked-by: Anatoly Burakov -- Thanks, Anatoly
Re: [PATCH v4 9/9] net/intel: simplify base code builds
On 3/28/2025 12:16 PM, Bruce Richardson wrote: Now that base-code warning flags have been removed from a number of drivers, we can simplify their build configuration by just including the base code files in the regular list of driver files passed back. There is no need to use pre-compiled objects. Signed-off-by: Bruce Richardson --- Acked-by: Anatoly Burakov -- Thanks, Anatoly
Re: [PATCH v5 2/4] net/intel: use common Tx queue structure
On Thu, Mar 27, 2025 at 09:34:35PM +0530, Shaiq Wani wrote:
> Merge in additional fields used by the idpf driver and then convert it
> over to using the common Tx queue structure
>
> Signed-off-by: Shaiq Wani
Acked-by: Bruce Richardson
Some comments inline below.
> ---
> drivers/net/intel/common/tx.h | 20 +++
> drivers/net/intel/cpfl/cpfl_ethdev.c | 3 +-
> drivers/net/intel/cpfl/cpfl_ethdev.h | 2 +-
> drivers/net/intel/cpfl/cpfl_rxtx.c| 26 -
> drivers/net/intel/cpfl/cpfl_rxtx.h| 3 +-
> drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h | 3 +-
> drivers/net/intel/idpf/idpf_common_rxtx.c | 36 ++--
> drivers/net/intel/idpf/idpf_common_rxtx.h | 58 +++
> .../net/intel/idpf/idpf_common_rxtx_avx2.c| 12 ++--
> .../net/intel/idpf/idpf_common_rxtx_avx512.c | 21 +++
> drivers/net/intel/idpf/idpf_common_virtchnl.c | 2 +-
> drivers/net/intel/idpf/idpf_common_virtchnl.h | 2 +-
> drivers/net/intel/idpf/idpf_ethdev.c | 3 +-
> drivers/net/intel/idpf/idpf_rxtx.c| 21 ---
> drivers/net/intel/idpf/idpf_rxtx.h| 1 +
> drivers/net/intel/idpf/idpf_rxtx_vec_common.h | 5 +-
> 16 files changed, 101 insertions(+), 117 deletions(-)
>
> static int
> -cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct idpf_tx_queue *txq,
> +cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
>uint16_t queue_idx, uint16_t nb_desc,
>unsigned int socket_id)
> {
> struct cpfl_vport *cpfl_vport = dev->data->dev_private;
> struct idpf_vport *vport = &cpfl_vport->base;
> const struct rte_memzone *mz;
> - struct idpf_tx_queue *cq;
> + struct ci_tx_queue *cq;
> int ret;
>
> cq = rte_zmalloc_socket("cpfl splitq cq",
> - sizeof(struct idpf_tx_queue),
> + sizeof(struct ci_tx_queue),
Minor nit, but this would be more maintainable I think as "sizeof(*cq)" so
if you have to change the type of cq again in future, only on line needs to
change.
> RTE_CACHE_LINE_SIZE,
> socket_id);
> if (cq == NULL) {
> @@ -528,7 +528,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
> queue_idx,
> struct cpfl_tx_queue *cpfl_txq;
> void
> -idpf_qc_split_tx_descq_reset(struct idpf_tx_queue *txq)
> +idpf_qc_split_tx_descq_reset(struct ci_tx_queue *txq)
> {
> struct idpf_tx_entry *txe;
> uint32_t i, size;
> @@ -223,7 +223,7 @@ idpf_qc_split_tx_descq_reset(struct idpf_tx_queue *txq)
> for (i = 0; i < size; i++)
> ((volatile char *)txq->desc_ring)[i] = 0;
>
> - txe = txq->sw_ring;
> + txe = (struct idpf_tx_entry *)txq->sw_ring;
As I comment on the next patch in the series, if you change the order of
these two patches, you won't need to introduce these new typecasts.
> prev = (uint16_t)(txq->sw_nb_desc - 1);
> for (i = 0; i < txq->sw_nb_desc; i++) {
> txe[i].mbuf = NULL;
> @@ -246,7 +246,7 @@ idpf_qc_split_tx_descq_reset(struct idpf_tx_queue *txq)
> }
Re: [PATCH v5 4/4] net/idpf: use common Tx free fn in idpf
On Thu, Mar 27, 2025 at 09:34:37PM +0530, Shaiq Wani wrote:
> Switch the idpf driver to use the common Tx free function for
> AVX2 and AVX512
>
> Signed-off-by: Shaiq Wani
> ---
> .../net/intel/idpf/idpf_common_rxtx_avx2.c| 68 +
> .../net/intel/idpf/idpf_common_rxtx_avx512.c | 237 +-
> 2 files changed, 22 insertions(+), 283 deletions(-)
>
Acked-by: Bruce Richardson
> diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
> b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
> index bce0257804..6399f357d3 100644
> --- a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
> +++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
> @@ -79,6 +79,14 @@ idpf_singleq_rx_rearm(struct idpf_rx_queue *rxq)
> IDPF_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
> }
>
> +static inline int
> +idpf_tx_desc_done(struct ci_tx_queue *txq, uint16_t idx)
> +{
> + return (txq->idpf_tx_ring[idx].qw1 &
Minor nit - watch indentation here, this is indented by two instead of 1.
[Next line is correctly indented at 3 levels, though, so don't adjust it]
> + rte_cpu_to_le_64(IDPF_TXD_QW1_DTYPE_M)) ==
> + rte_cpu_to_le_64(IDPF_TX_DESC_DTYPE_DESC_DONE);
> +}
> +
> static inline uint16_t
> _idpf_singleq_recv_raw_pkts_vec_avx2(struct idpf_rx_queue *rxq, struct
> rte_mbuf **rx_pkts,
>uint16_t nb_pkts)
> @@ -479,64 +487,6 @@ idpf_dp_singleq_recv_pkts_avx2(void *rx_queue, struct
> rte_mbuf **rx_pkts, uint16
> return _idpf_singleq_recv_raw_pkts_vec_avx2(rx_queue, rx_pkts, nb_pkts);
> }
>
> -static __rte_always_inline int
> -idpf_singleq_tx_free_bufs_vec(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;
> - struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) *
> txq->tx_rs_thresh);
> -
> - /* check DD bits on threshold descriptor */
> - if ((txq->idpf_tx_ring[txq->tx_next_dd].qw1 &
> - rte_cpu_to_le_64(IDPF_TXD_QW1_DTYPE_M)) !=
> - rte_cpu_to_le_64(IDPF_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->sw_ring_vec[txq->tx_next_dd - (n - 1)];
> - m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
> - if (likely(m)) {
> - free[0] = m;
> - nb_free = 1;
> - for (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 (i = 1; i < n; i++) {
> - m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
> - if (m)
> - rte_mempool_put(m->pool, m);
> - }
> - }
> -
> - /* 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 inline void
> idpf_singleq_vtx1(volatile struct idpf_base_tx_desc *txdp,
> struct rte_mbuf *pkt, uint64_t flags)
> @@ -621,7 +571,7 @@ idpf_singleq_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)
> - idpf_singleq_tx_free_bufs_vec(txq);
> + ci_tx_free_bufs_vec(txq, idpf_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/intel/idpf/idpf_common_rxtx_avx512.c
> b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
> index c0ec754642..dbbdc71e22 100644
> --- a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
> +++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
> @@ -122,6 +122,14 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
> IDPF_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
> }
>
> +static inline int
> +i
[PATCH v4 2/9] net/iavf/base: remove unused meson.build file
The meson.build file in the base folder was never used, as the base
files were just included in the main sources list for iavf.
Fixes: f1fdc9ddba5e ("drivers: move iavf common folder to iavf net")
Signed-off-by: Bruce Richardson
---
drivers/net/intel/iavf/base/meson.build | 10 --
1 file changed, 10 deletions(-)
delete mode 100644 drivers/net/intel/iavf/base/meson.build
diff --git a/drivers/net/intel/iavf/base/meson.build
b/drivers/net/intel/iavf/base/meson.build
deleted file mode 100644
index 273e88e921..00
--- a/drivers/net/intel/iavf/base/meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019-2021 Intel Corporation
-
-sources = files('iavf_adminq.c', 'iavf_common.c', 'iavf_impl.c')
-
-if cc.has_argument('-Wno-pointer-to-int-cast')
-cflags += '-Wno-pointer-to-int-cast'
-endif
-
-require_iova_in_mbuf = false
--
2.45.2
RE: [PATCH v16 00/28] [v16]drivers/net Add Support mucse N10 Pmd Driver
Hi Stephen, I wanted to extend my sincere thanks for your tremendous help and valuable advice during patch submit. The next submit will be soon. Thank for your patience and understanding. Regards Wenbo > -Original Message- > From: Stephen Hemminger > Sent: 2025年3月28日 1:29 > To: Wenbo Cao > Cc: tho...@monjalon.net; dev@dpdk.org; yao...@mucse.com > Subject: Re: [PATCH v16 00/28] [v16]drivers/net Add Support mucse N10 Pmd > Driver > > On Wed, 26 Feb 2025 15:41:47 +0800 > Wenbo Cao wrote: > > > For This patchset just to support the basic chip init work and user > > can just found the eth_dev, but can't control more. > > For Now just support 2*10g nic,the chip can support > > 2*10g,4*10g,4*1g,8*1g,8*10g. > > The Feature rx side can support rx-cksum-offload,rss,vlan-filter > > flow_clow,uncast_filter,mcast_filter,1588,Jumbo-frame > > The Feature tx side can support tx-cksum-offload,tso,vxlan-tso flow > > director base on ntuple pattern of tcp/udp/ip/ eth_hdr->type for sriov > > is also support. > > > > Because of the chip design defect, for multiple-port mode one pci-bdf > > will have multiple-port (max can have four ports) so this code must be > > care of one bdf init multiple-port. > > > > v16 > > * fixed rxq/txq stop/start not add to eth_ops as rnp doc descript. > > > > v15: > > * fixed scatter recv for jumbo frame test by dts mtu. > > > > v14: > > * add multicast mac filter feature for basic nic feature. > > * fixed pvs studio low,media,high level warning as the below cmd > > pvs-studio-analyzer analyze -f build/compile_commands.json -j 8 > > plog-converter -a GA:1,2,3 -t fullhtml PVS-Studio.log -o > > /root/report > > > > v13: > > * Supplementary document about n10 network card characteristics. > > * update release_25_03.rst. > > * fixed the code style advisea Stephen Hemminger. > > * fixed the code issue check PVS-stdio for Static compilation error. > > > > v12: > > * fixed __rte_packed __deprecated__ compile issue. > > > > v11: > > * fixed array-bounds issue when used rte_memcpy src addr is > > * not enough to hold align dst. > > * improve efficient_code advised by Stephen > > > > v10: > > * fixed mingw windows meson issue > > * rnp not support windows for now. > > > > v9: > > * fixed commit log format check by devtools. > > * fixed code compile issue. > > > > v8: > > * fixed codespell issue. > > * fixed MAINTAINERS file > > > > v7: > > * add support nic basic feature such as rss vlan strip/filter, > > * mtu-change recv/send scater-recv/mutltiple-send. > > * fixed code rationality, advised by Ferruh Yigit. > > v6: > > * fixed the doc(rst) format problem advise by Thomas Monjalon > > > > v5: > > * fixed the symbol name require by the style documentation > > > > v4: > > * one patch has been forgot to upload :( > > > > v3: > > * fixed http://dpdk.org/patch/129830 FreeBSD 13 compile Issue > > * change iobar type to void suggest by Stephen Hemminger > > * add KMOD_DEP support for vfio-pci > > * change run-cmd argument parse check for invalid extra_args > > > > v2: > > * fixed MAINTAIN maillist fullname format > > * fixed driver/net/meson the order issue of new driver to driver list > > * improve virtual point function usage suggest by Stephen Hemminger > > > > Wenbo Cao (29): > > net/rnp: add skeleton > > net/rnp: add ethdev probe and remove > > net/rnp: add log > > net/rnp: support mailbox basic operate > > net/rnp: add device init and uninit > > net/rnp: add get device information operation > > net/rnp: add support MAC promisc mode > > net/rnp: add queue setup and release operations > > net/rnp: add queue stop and start operations > > net/rnp: add support device start stop operations > > net/rnp: add RSS support operations > > net/rnp: add support link update operations > > net/rnp: add support link setup operations > > net/rnp: add Rx burst simple support > > net/rnp: add Tx burst simple support > > net/rnp: add MTU set operation > > net/rnp: add Rx scatter segment version > > net/rnp: add Tx multiple segment version > > net/rnp: add support basic stats operation > > net/rnp: add support xstats operation > > net/rnp: add unicast MAC filter operation > > net/rnp: add supported packet types > > net/rnp: add support Rx checksum offload > > net/rnp: add support Tx TSO offload > > net/rnp: support VLAN offloads > > net/rnp: add support VLAN filters operations > > net/rnp: add queue info operation > > net/rnp: support Rx/Tx burst mode info > > net/rnp: add multicast MAC filter operation > > > > .mailmap |1 + > > MAINTAINERS|6 + > > doc/guides/nics/features/rnp.ini | 34 + > > doc/guides/nics/img/mucse_nic_port.svg | 4023 > > doc/guides/nics/index.rst |1 + > > doc/guides/nics/rnp.rst| 130 + > > doc/guides/rel_notes/release_25_03.rst |
Re: [PATCH v4] rust: support raw DPDK API
Hello Bruce,
When using bindgen, are we better to take the approach (as in this patch)
of running it on everything in the headers and just excluding some things,
or taking the opposite conservative approach of just listing the functions
and defines we actually do want exposed (with wildcarding as necessary)?
When playing with rust apps on top of DPDK myself, I've tended toward the
latter scheme, but maybe for this effort we may want the former.
The current library produced a lot of warnings during compilation.
Many of these warnings were result of symbol duplication.
It looks like removing unnecessery duplicated symbols is the right way.
However, I could not activate regex symbol match in bindgen-0.71.1 cli utility.
At this stage I translate files from a shell script. This way I can translate
a single file on demand.
I'm not convinced by having this done as a post-install script. Instead I'd
tend towards having a rust crate hosted somewhere that does the bindgen as
part of the rust build.
I'm already implementing that approach.
+
+match pkgconfig.args(["--libs", "libdpdk"]).output() {
This work of using pkgconfig should not be necessary in the application
build.rs file. If we switch to actually producing a proper crate, the
pkgconfig handling and linking should be covered there (I would hope,
anyway).
I need pkgconfig for dynamic linker.
Regards,
Gregory
Re: [PATCH v5 2/4] net/intel: use common Tx queue structure
On Thu, Mar 27, 2025 at 09:34:35PM +0530, Shaiq Wani wrote:
> Merge in additional fields used by the idpf driver and then convert it
> over to using the common Tx queue structure
>
> Signed-off-by: Shaiq Wani
> ---
> drivers/net/intel/common/tx.h | 20 +++
> drivers/net/intel/cpfl/cpfl_ethdev.c | 3 +-
> drivers/net/intel/cpfl/cpfl_ethdev.h | 2 +-
> drivers/net/intel/cpfl/cpfl_rxtx.c| 26 -
> drivers/net/intel/cpfl/cpfl_rxtx.h| 3 +-
> drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h | 3 +-
> drivers/net/intel/idpf/idpf_common_rxtx.c | 36 ++--
> drivers/net/intel/idpf/idpf_common_rxtx.h | 58 +++
> .../net/intel/idpf/idpf_common_rxtx_avx2.c| 12 ++--
> .../net/intel/idpf/idpf_common_rxtx_avx512.c | 21 +++
> drivers/net/intel/idpf/idpf_common_virtchnl.c | 2 +-
> drivers/net/intel/idpf/idpf_common_virtchnl.h | 2 +-
> drivers/net/intel/idpf/idpf_ethdev.c | 3 +-
> drivers/net/intel/idpf/idpf_rxtx.c| 21 ---
> drivers/net/intel/idpf/idpf_rxtx.h| 1 +
> drivers/net/intel/idpf/idpf_rxtx_vec_common.h | 5 +-
> 16 files changed, 101 insertions(+), 117 deletions(-)
>
> diff --git a/drivers/net/intel/common/tx.h b/drivers/net/intel/common/tx.h
> index d9cf4474fc..af32f4deda 100644
> --- a/drivers/net/intel/common/tx.h
> +++ b/drivers/net/intel/common/tx.h
> @@ -35,6 +35,7 @@ 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 struct idpf_base_tx_desc *idpf_tx_ring;
> volatile union ixgbe_adv_tx_desc *ixgbe_tx_ring;
> };
> volatile uint8_t *qtx_tail; /* register address of tail */
> @@ -98,6 +99,25 @@ struct ci_tx_queue {
> uint8_t wthresh; /**< Write-back threshold reg. */
> uint8_t using_ipsec; /**< indicates that IPsec TX
> feature is in use */
> };
> + struct { /* idpf specific values */
> + volatile union {
> + struct idpf_flex_tx_sched_desc *desc_ring;
> + struct idpf_splitq_tx_compl_desc *compl_ring;
> + };
> + const struct idpf_txq_ops *idpf_ops;
> + struct ci_tx_queue *complq;
> + void **txqs; /*only valid for split queue mode*/
> + bool q_started; /* if tx queue has been started */
> +
> + /* only valid for split queue mode */
> + uint32_t tx_start_qid;
> + uint16_t sw_nb_desc;
> + uint16_t sw_tail;
> +#define IDPF_TX_CTYPE_NUM8
> + uint16_t ctype[IDPF_TX_CTYPE_NUM];
> + uint8_t expected_gen_id;
> +
Though not a blocker for merge, I'd still like to get this idpf structure
down in size a bit - it causes a 50% increase in the size of the overall
queue structure, from 128 bytes to 192 bytes in size.
There are a couple of ways I think we could cut this down a little:
* bool values only use 1 bytes in size, so we are wasting 3 bytes after the
q_started flag. Two thoughts here:
1. is the queue started state not already tracked somewhere in the ethdev
data or queue data?
2. Move this field down to the end, beside the expected_gen_id flag, to
free up 4 bytes
* If we change the ctype array from an array to a pointer, we can save 8
bytes. However, looking at the code, I'm also wondering how this is used:
- in scalar code we don't use the ctype array, but check instead for just
types 2 and 4
- in the avx512 code, we do use the ctypes array, incrementing values
that we get. However, from what I see, we only ever look at value 2 of
the array in that code. Am I missing something here? Do we really need
the array at all?
* The ops structure only contains a single function pointer for the release
structure, which either contains the default release function or the
AVX512 release function. However, with this patchset, the AVX2 code now
seems to be using the same descriptor format at the AVX512 code, so I
suspect that the release function may be wrong in those cases. Therefore,
I believe that the idpf_ops structure should be removed, and the existing
txq->vector_tx flag used instead to choose the release function. That would
save another 8 bytes, and correct the AVX2 path.
Regards,
/Bruce
Re: [PATCH v4 4/9] net/ixgbe/base: fix compilation warnings
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
We can remove almost all of the "unused parameter" and "unused variable"
warnings by just improving the macro definitions in the osdep.h header.
Remaining two instances can be fixed by just one-line additions to the
code, so add those to give us a clean build with the warnings enabled.
Fixes: af75078fece3 ("first public release")
Fixes: c6cb313da739 ("net/ixgbe/base: add link management for E610")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v5 3/4] net/intel: use common Tx entry structure
On Thu, Mar 27, 2025 at 09:34:36PM +0530, Shaiq Wani wrote:
> Used the common Tx entry structure and common Tx mbuf ring replenish fn
> in place of idpf-specific structure and function.
> The vector driver code paths (AVX2, AVX512) use the smaller SW
> ring structure.
>
> Signed-off-by: Shaiq Wani
> ---
Acked-by: Bruce Richardson
Minor nit: I would suggest making this patch 2, rather than patch 3, which
would avoid the need for the typecasts in the patch to convert to the
common queue structure.
> drivers/net/intel/idpf/idpf_common_rxtx.c | 26 -
> drivers/net/intel/idpf/idpf_common_rxtx.h | 10 ---
> .../net/intel/idpf/idpf_common_rxtx_avx2.c| 23 +--
> .../net/intel/idpf/idpf_common_rxtx_avx512.c | 28 ++-
> drivers/net/intel/idpf/idpf_rxtx.c| 2 +-
> 5 files changed, 30 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.c
> b/drivers/net/intel/idpf/idpf_common_rxtx.c
> index 48fc3ef7ae..4318b3fb3c 100644
> --- a/drivers/net/intel/idpf/idpf_common_rxtx.c
> +++ b/drivers/net/intel/idpf/idpf_common_rxtx.c
> @@ -210,7 +210,7 @@ idpf_qc_single_rx_queue_reset(struct idpf_rx_queue *rxq)
> void
> idpf_qc_split_tx_descq_reset(struct ci_tx_queue *txq)
> {
> - struct idpf_tx_entry *txe;
> + struct ci_tx_entry *txe;
> uint32_t i, size;
> uint16_t prev;
>
> @@ -223,7 +223,7 @@ idpf_qc_split_tx_descq_reset(struct ci_tx_queue *txq)
> for (i = 0; i < size; i++)
> ((volatile char *)txq->desc_ring)[i] = 0;
>
> - txe = (struct idpf_tx_entry *)txq->sw_ring;
> + txe = (struct ci_tx_entry *)txq->sw_ring;
No typecast is actually necessary here, since txq->sw_ring already of type
(struct ci_tx_entry). As I suggest above, if you switch the patch order,
you remove the need to have the (struct idpf_tx_entry *) cast at all - it
was just introduced in the previous patch in this set.
> prev = (uint16_t)(txq->sw_nb_desc - 1);
> for (i = 0; i < txq->sw_nb_desc; i++) {
> txe[i].mbuf = NULL;
Re: [PATCH v4 7/9] net/i40e/base: fix compiler warnings
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
Add a single-line fix to the base code, and then the remaining two
compiler warning disable flags can be removed from the driver base code
build file.
Fixes: 8db9e2a1b232 ("i40e: base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v4 6/9] net/i40e/base: fix unused value warnings
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
Fix warnings about unused values - parameters, variables, etc., and
remove the warning disable flags for them. Although modifying the
base-code files is not ideal, the changes required are minor, and only
affect two files from the imported base code.
Fixes: 8db9e2a1b232 ("i40e: base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/i40e/base/i40e_nvm.c | 2 +-
drivers/net/intel/i40e/base/i40e_osdep.h | 4 ++--
drivers/net/intel/i40e/base/i40e_type.h | 14 +-
drivers/net/intel/i40e/base/meson.build | 3 ---
drivers/net/intel/i40e/i40e_ethdev.c | 1 +
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/net/intel/i40e/base/i40e_nvm.c
b/drivers/net/intel/i40e/base/i40e_nvm.c
index 3e16a0d997..56dc4d9279 100644
--- a/drivers/net/intel/i40e/base/i40e_nvm.c
+++ b/drivers/net/intel/i40e/base/i40e_nvm.c
@@ -1743,7 +1743,7 @@ STATIC enum i40e_status_code
i40e_nvmupd_get_aq_result(struct i40e_hw *hw,
**/
STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
struct i40e_nvm_access *cmd,
- u8 *bytes, int *perrno)
+ u8 *bytes, __rte_unused int
*perrno)
I don't think we should be adding __rte_unused to base code, there's
probably a macro for it in osdep? If not, maybe add
UNREFERENCED_1PARAMETER in code?
For other parts,
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v4 1/9] net/fm10k/base: fix compilation warnings
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
The fixes required to re-enable warnings in the fm10k base code are
trivial, so let's make the changes and get a clean compile without any
warning disable flags.
* provide definitions for the UNREFERENCED_PARAMETER macros
* fix the spelling of the work "fallthrough" in comments
* provide a definition of FM10K_READ_PCI_WORD in os_dep.h that marks the
parameters as used.
Fixes: 7223d200c227 ("fm10k: add base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v5 0/4] net/intel: using common functions in idpf driver
On Thu, Mar 27, 2025 at 09:34:33PM +0530, Shaiq Wani wrote: > reworked the drivers to use the common functions > and structures from drivers/net/intel/common. > > Shaiq Wani (4): > net/intel: align Tx queue struct field names > net/intel: use common Tx queue structure > net/intel: use common Tx entry structure > net/idpf: use common Tx free fn in idpf > I like the idea behind these changes, so please keep my acks on v6 of this set, to fix some of the minor issues I've highlighted in the comments on the individual patches. Thanks, /Bruce
Re: DPDK for rust
Hello Morten, Thank you for raising these questions ! Do we want the DPDK project itself to support rust? Or should parts of this be a DPDK hosted project, like grout? Rust packages management is different. Also DPDK Rust code will eventually provide a different API. At this stage, DPDK hosted project looks like a good idea. For ease of use, that would mean hosting a cargo registry, no? That's correct - cargo registry is the native way. Also we may consider splitting the code between several crates. That approach can provide more flexible way to arrange files.
Re: [PATCH v2 1/3] net/ixgbe: use check for VF function
On Thu, Mar 27, 2025 at 03:12:17PM +, Anatoly Burakov wrote: > In a couple of places, we are using explicit mac type comparisons to > trigger a VF-specific path, but we already have a function that does the > same thing, so use it. > > Signed-off-by: Anatoly Burakov > --- Series-acked-by: Bruce Richardson Applied to dpdk-next-net-intel Thanks, /Bruce
Re: [PATCH v4 3/9] net/ixgbe/base: correct definition of macro
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
The definition of IXGBE_LE32_TO_CPUS macro is meant to modify the value
in place - similar to the le32_to_cpus() macro in kernel. Fixing the
definition allows us to remove some warning flags, and removes the need
for the uintptr_t typecasts.
Fixes: aa4fc14d2cee ("ixgbe: update base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
Reviewed-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v5 0/4] net/intel: using common functions in idpf driver
On Thu, Mar 27, 2025 at 09:34:33PM +0530, Shaiq Wani wrote: > reworked the drivers to use the common functions > and structures from drivers/net/intel/common. > > Shaiq Wani (4): > net/intel: align Tx queue struct field names > net/intel: use common Tx queue structure > net/intel: use common Tx entry structure > net/idpf: use common Tx free fn in idpf > Recheck-request: iol-unit-amd64-testing
Re: [PATCH v4 6/9] net/i40e/base: fix unused value warnings
On Fri, Mar 28, 2025 at 02:07:23PM +0100, Burakov, Anatoly wrote:
> On 3/28/2025 12:16 PM, Bruce Richardson wrote:
> >Fix warnings about unused values - parameters, variables, etc., and
> >remove the warning disable flags for them. Although modifying the
> >base-code files is not ideal, the changes required are minor, and only
> >affect two files from the imported base code.
> >
> >Fixes: 8db9e2a1b232 ("i40e: base driver")
> >Cc: sta...@dpdk.org
> >
> >Signed-off-by: Bruce Richardson
> >---
> > drivers/net/intel/i40e/base/i40e_nvm.c | 2 +-
> > drivers/net/intel/i40e/base/i40e_osdep.h | 4 ++--
> > drivers/net/intel/i40e/base/i40e_type.h | 14 +-
> > drivers/net/intel/i40e/base/meson.build | 3 ---
> > drivers/net/intel/i40e/i40e_ethdev.c | 1 +
> > 5 files changed, 13 insertions(+), 11 deletions(-)
> >
> >diff --git a/drivers/net/intel/i40e/base/i40e_nvm.c
> >b/drivers/net/intel/i40e/base/i40e_nvm.c
> >index 3e16a0d997..56dc4d9279 100644
> >--- a/drivers/net/intel/i40e/base/i40e_nvm.c
> >+++ b/drivers/net/intel/i40e/base/i40e_nvm.c
> >@@ -1743,7 +1743,7 @@ STATIC enum i40e_status_code
> >i40e_nvmupd_get_aq_result(struct i40e_hw *hw,
> > **/
> > STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
> > struct i40e_nvm_access *cmd,
> >-u8 *bytes, int *perrno)
> >+u8 *bytes, __rte_unused int
> >*perrno)
>
> I don't think we should be adding __rte_unused to base code, there's
> probably a macro for it in osdep? If not, maybe add
> UNREFERENCED_1PARAMETER in code?
+1 to this. MSVC does not have a direct equivalent to
__attribute__((__unused__))
so it makes sense to not expand usage of __rte_unused.
>
> For other parts,
>
> Acked-by: Anatoly Burakov
>
> --
> Thanks,
> Anatoly
Re: [PATCH v4 6/9] net/i40e/base: fix unused value warnings
On Fri, Mar 28, 2025 at 08:21:44AM -0700, Andre Muezerie wrote:
> On Fri, Mar 28, 2025 at 02:07:23PM +0100, Burakov, Anatoly wrote:
> > On 3/28/2025 12:16 PM, Bruce Richardson wrote:
> > >Fix warnings about unused values - parameters, variables, etc., and
> > >remove the warning disable flags for them. Although modifying the
> > >base-code files is not ideal, the changes required are minor, and only
> > >affect two files from the imported base code.
> > >
> > >Fixes: 8db9e2a1b232 ("i40e: base driver")
> > >Cc: sta...@dpdk.org
> > >
> > >Signed-off-by: Bruce Richardson
> > >---
> > > drivers/net/intel/i40e/base/i40e_nvm.c | 2 +-
> > > drivers/net/intel/i40e/base/i40e_osdep.h | 4 ++--
> > > drivers/net/intel/i40e/base/i40e_type.h | 14 +-
> > > drivers/net/intel/i40e/base/meson.build | 3 ---
> > > drivers/net/intel/i40e/i40e_ethdev.c | 1 +
> > > 5 files changed, 13 insertions(+), 11 deletions(-)
> > >
> > >diff --git a/drivers/net/intel/i40e/base/i40e_nvm.c
> > >b/drivers/net/intel/i40e/base/i40e_nvm.c
> > >index 3e16a0d997..56dc4d9279 100644
> > >--- a/drivers/net/intel/i40e/base/i40e_nvm.c
> > >+++ b/drivers/net/intel/i40e/base/i40e_nvm.c
> > >@@ -1743,7 +1743,7 @@ STATIC enum i40e_status_code
> > >i40e_nvmupd_get_aq_result(struct i40e_hw *hw,
> > > **/
> > > STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
> > > struct i40e_nvm_access *cmd,
> > >- u8 *bytes, int *perrno)
> > >+ u8 *bytes, __rte_unused int
> > >*perrno)
> >
> > I don't think we should be adding __rte_unused to base code, there's
> > probably a macro for it in osdep? If not, maybe add
> > UNREFERENCED_1PARAMETER in code?
>
> +1 to this. MSVC does not have a direct equivalent to
> __attribute__((__unused__))
> so it makes sense to not expand usage of __rte_unused.
>
Ok. Will change on apply, rather that doing a respin for that one small
change.
/Bruce
Re: [PATCH v5 0/4] net/intel: using common functions in idpf driver
On Fri, Mar 28, 2025 at 4:30 PM Bruce Richardson wrote: > > On Thu, Mar 27, 2025 at 09:34:33PM +0530, Shaiq Wani wrote: > > reworked the drivers to use the common functions > > and structures from drivers/net/intel/common. > > > > Shaiq Wani (4): > > net/intel: align Tx queue struct field names > > net/intel: use common Tx queue structure > > net/intel: use common Tx entry structure > > net/idpf: use common Tx free fn in idpf > > > Recheck-request: iol-unit-amd64-testing I also received a strange report on eal_flags_misc_autotest, so it is probably not an issue with this series. The test crashes with what smells like a double free for a memzone object, strange. -- David Marchand
Re: [PATCH v6 6/8] build: use dynamically generated version maps
David Marchand writes:
> Switch to dynamically generated version maps.
>
> As the map files get generated, tooling around checking, converting,
> updating etc.. static version maps can be removed.
>
> Signed-off-by: David Marchand
> ---
Ugh. replied to the wrong one. Anyway, my previous note still applies.
Acked-by: Aaron Conole
> .github/workflows/build.yml | 1 -
> MAINTAINERS | 7 -
> buildtools/check-symbols.sh | 33 +-
> buildtools/map-list-symbol.sh | 7 +-
> buildtools/map_to_win.py | 41 ---
> buildtools/meson.build| 1 -
> devtools/check-symbol-change.sh | 186 ---
> devtools/check-symbol-maps.sh | 101 --
> devtools/checkpatches.sh | 2 +-
> devtools/update-abi.sh| 46 ---
> devtools/update_version_map_abi.py| 210
> doc/guides/contributing/abi_policy.rst| 21 +-
> doc/guides/contributing/coding_style.rst | 7 -
> .../contributing/img/patch_cheatsheet.svg | 303 --
> doc/guides/contributing/patches.rst | 6 +-
> drivers/meson.build | 74 ++---
> lib/meson.build | 73 ++---
> 17 files changed, 188 insertions(+), 931 deletions(-)
> delete mode 100644 buildtools/map_to_win.py
> delete mode 100755 devtools/check-symbol-change.sh
> delete mode 100755 devtools/check-symbol-maps.sh
> delete mode 100755 devtools/update-abi.sh
> delete mode 100755 devtools/update_version_map_abi.py
>
> diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
> index 0cc4d12b0b..7a6b679fe5 100644
> --- a/.github/workflows/build.yml
> +++ b/.github/workflows/build.yml
> @@ -31,7 +31,6 @@ jobs:
> failed=
> devtools/check-doc-vs-code.sh upstream/${{ env.REF_GIT_BRANCH }} ||
> failed=true
> devtools/check-meson.py || failed=true
> -devtools/check-symbol-maps.sh || failed=true
> [ -z "$failed" ]
>ubuntu-vm-builds:
> name: ${{ join(matrix.config.*, '-') }}
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 42ea07854b..480972ef1e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -88,7 +88,6 @@ M: Thomas Monjalon
> F: MAINTAINERS
> F: devtools/build-dict.sh
> F: devtools/check-abi.sh
> -F: devtools/check-abi-version.sh
> F: devtools/check-doc-vs-code.sh
> F: devtools/check-dup-includes.sh
> F: devtools/check-maintainers.sh
> @@ -96,17 +95,13 @@ F: devtools/check-forbidden-tokens.awk
> F: devtools/check-git-log.sh
> F: devtools/check-spdx-tag.sh
> F: devtools/check-symbol-change.py
> -F: devtools/check-symbol-change.sh
> -F: devtools/check-symbol-maps.sh
> F: devtools/checkpatches.sh
> F: devtools/get-maintainer.sh
> F: devtools/git-log-fixes.sh
> F: devtools/load-devel-config
> F: devtools/parse-flow-support.sh
> F: devtools/process-iwyu.py
> -F: devtools/update-abi.sh
> F: devtools/update-patches.py
> -F: devtools/update_version_map_abi.py
> F: devtools/libabigail.abignore
> F: devtools/words-case.txt
> F: license/
> @@ -166,7 +161,6 @@ M: Tyler Retzlaff
> F: lib/eal/common/
> F: lib/eal/unix/
> F: lib/eal/include/
> -F: lib/eal/version.map
> F: doc/guides/prog_guide/env_abstraction_layer.rst
> F: app/test/test_alarm.c
> F: app/test/test_atomic.c
> @@ -396,7 +390,6 @@ Windows support
> M: Dmitry Kozlyuk
> M: Tyler Retzlaff
> F: lib/eal/windows/
> -F: buildtools/map_to_win.py
> F: doc/guides/windows_gsg/
>
> Windows memory allocation
> diff --git a/buildtools/check-symbols.sh b/buildtools/check-symbols.sh
> index b8ac24391e..0d6745ec14 100755
> --- a/buildtools/check-symbols.sh
> +++ b/buildtools/check-symbols.sh
> @@ -7,29 +7,12 @@ OBJFILE=$2
>
> ROOTDIR=$(readlink -f $(dirname $(readlink -f $0))/..)
> LIST_SYMBOL=$ROOTDIR/buildtools/map-list-symbol.sh
> -CHECK_SYMBOL_MAPS=$ROOTDIR/devtools/check-symbol-maps.sh
> -
> -# added check for "make -C test/" usage
> -if [ ! -e $MAPFILE ] || [ ! -f $OBJFILE ]
> -then
> - exit 0
> -fi
> -
> -if [ -d $MAPFILE ]
> -then
> - exit 0
> -fi
> -
> DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XX)
> trap 'rm -f "$DUMPFILE"' EXIT
> objdump -t $OBJFILE >$DUMPFILE
>
> ret=0
>
> -if ! $CHECK_SYMBOL_MAPS $MAPFILE; then
> - ret=1
> -fi
> -
> for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE |cut -d ' ' -f 3`
> do
> if grep -q "\.text.*[[:space:]]$SYM$" $DUMPFILE &&
> @@ -37,8 +20,7 @@ do
> $LIST_SYMBOL -s $SYM $MAPFILE | grep -q EXPERIMENTAL
> then
> cat >&2 <<- END_OF_MESSAGE
> - $SYM is not flagged as experimental
> - but is listed in version map
> + $SYM is not flagged as experimental but is exported as an
> experimental symbol
> Please add __rte_experimental to the definition of $SYM
> END_OF_MESSA
Re: [PATCH] net/ixgbe: fix missing checks for E610 VFs
Acked-by: Vladimir Medvedkin
On 21/03/2025 17:12, Bruce Richardson wrote:
A number of places in the ixgbe code check for a virtual function, but
these checks were missing the identifier for the E610 VF. Add them into
the conditionals.
Fixes: f678f3dea8fd ("net/ixgbe: fix missing VF PCI ID")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
index 3b7a6a6f0e..0c8a9ec763 100644
--- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
@@ -2767,6 +2767,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
* Modification to set VFTDT for virtual function if vf is detected
*/
if (hw->mac.type == ixgbe_mac_82599_vf ||
+ hw->mac.type == ixgbe_mac_E610_vf ||
hw->mac.type == ixgbe_mac_X540_vf ||
hw->mac.type == ixgbe_mac_X550_vf ||
hw->mac.type == ixgbe_mac_X550EM_x_vf ||
@@ -2987,6 +2988,7 @@ ixgbe_is_vf(struct rte_eth_dev *dev)
case ixgbe_mac_X550_vf:
case ixgbe_mac_X550EM_x_vf:
case ixgbe_mac_X550EM_a_vf:
+ case ixgbe_mac_E610_vf:
return 1;
default:
return 0;
@@ -3153,6 +3155,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
* Modified to setup VFRDT for Virtual Function
*/
if (hw->mac.type == ixgbe_mac_82599_vf ||
+ hw->mac.type == ixgbe_mac_E610_vf ||
hw->mac.type == ixgbe_mac_X540_vf ||
hw->mac.type == ixgbe_mac_X550_vf ||
hw->mac.type == ixgbe_mac_X550EM_x_vf ||
@@ -5835,6 +5838,7 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
case ixgbe_mac_X550_vf:
case ixgbe_mac_X550EM_x_vf:
case ixgbe_mac_X550EM_a_vf:
+ case ixgbe_mac_E610_vf:
switch (dev->data->dev_conf.rxmode.mq_mode) {
case RTE_ETH_MQ_RX_RSS:
case RTE_ETH_MQ_RX_DCB_RSS:
--
Regards,
Vladimir
Re: [PATCH] net/intel: allow fast-free to empty cache
On Mon, Mar 10, 2025 at 04:18:35PM +0100, Morten Brørup wrote: > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > Sent: Monday, 10 March 2025 14.26 > > > > When freeing transmitted mbufs, there is no reason to send the freed > > mbufs directly to the ring if the cache is empty - only if it is zero > > size (in which case the cache pointer is NULL). Therefore, remove the > > empty check and only check for a null cache pointer. > > > > Signed-off-by: Bruce Richardson > > --- > > drivers/net/intel/common/tx.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/intel/common/tx.h > > b/drivers/net/intel/common/tx.h > > index d9cf4474fc..d361fe64ab 100644 > > --- a/drivers/net/intel/common/tx.h > > +++ b/drivers/net/intel/common/tx.h > > @@ -143,7 +143,7 @@ ci_tx_free_bufs_vec(struct ci_tx_queue *txq, > > ci_desc_done_fn desc_done, bool ctx > > void **cache_objs; > > struct rte_mempool_cache *cache = > > rte_mempool_default_cache(mp, rte_lcore_id()); > > > > - if (!cache || cache->len == 0) > > + if (cache == NULL) > > goto normal; > > > > cache_objs = &cache->objs[cache->len]; > > -- > > 2.43.0 > > Yep, it did look strange. > Reviewed-by: Morten Brørup > Applied to dpdk-next-net-intel. /Bruce
Re: [PATCH v4 2/9] net/iavf/base: remove unused meson.build file
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
The meson.build file in the base folder was never used, as the base
files were just included in the main sources list for iavf.
Fixes: f1fdc9ddba5e ("drivers: move iavf common folder to iavf net")
Signed-off-by: Bruce Richardson
---
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
Re: [PATCH v5 6/8] build: use dynamically generated version maps
David Marchand writes:
> Switch to dynamically generated version maps.
>
> As the map files get generated, tooling around checking, converting,
> updating etc.. static version maps can be removed.
>
> Signed-off-by: David Marchand
> ---
Just a minor (non-blocking) nit below.
Otherwise,
Acked-by: Aaron Conole
> .github/workflows/build.yml | 1 -
> MAINTAINERS | 7 -
> buildtools/check-symbols.sh | 33 +-
> buildtools/map-list-symbol.sh | 7 +-
> buildtools/map_to_win.py | 41 ---
> buildtools/meson.build| 1 -
> devtools/check-symbol-change.sh | 186 ---
> devtools/check-symbol-maps.sh | 101 --
> devtools/checkpatches.sh | 2 +-
> devtools/update-abi.sh| 46 ---
> devtools/update_version_map_abi.py| 210
> doc/guides/contributing/abi_policy.rst| 21 +-
> doc/guides/contributing/coding_style.rst | 7 -
> .../contributing/img/patch_cheatsheet.svg | 303 --
> doc/guides/contributing/patches.rst | 6 +-
> drivers/meson.build | 74 ++---
> lib/meson.build | 73 ++---
> 17 files changed, 188 insertions(+), 931 deletions(-)
> delete mode 100644 buildtools/map_to_win.py
> delete mode 100755 devtools/check-symbol-change.sh
> delete mode 100755 devtools/check-symbol-maps.sh
> delete mode 100755 devtools/update-abi.sh
> delete mode 100755 devtools/update_version_map_abi.py
>
> diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
> index 0cc4d12b0b..7a6b679fe5 100644
> --- a/.github/workflows/build.yml
> +++ b/.github/workflows/build.yml
> @@ -31,7 +31,6 @@ jobs:
> failed=
> devtools/check-doc-vs-code.sh upstream/${{ env.REF_GIT_BRANCH }} ||
> failed=true
> devtools/check-meson.py || failed=true
> -devtools/check-symbol-maps.sh || failed=true
> [ -z "$failed" ]
>ubuntu-vm-builds:
> name: ${{ join(matrix.config.*, '-') }}
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 42ea07854b..480972ef1e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -88,7 +88,6 @@ M: Thomas Monjalon
> F: MAINTAINERS
> F: devtools/build-dict.sh
> F: devtools/check-abi.sh
> -F: devtools/check-abi-version.sh
> F: devtools/check-doc-vs-code.sh
> F: devtools/check-dup-includes.sh
> F: devtools/check-maintainers.sh
> @@ -96,17 +95,13 @@ F: devtools/check-forbidden-tokens.awk
> F: devtools/check-git-log.sh
> F: devtools/check-spdx-tag.sh
> F: devtools/check-symbol-change.py
> -F: devtools/check-symbol-change.sh
> -F: devtools/check-symbol-maps.sh
> F: devtools/checkpatches.sh
> F: devtools/get-maintainer.sh
> F: devtools/git-log-fixes.sh
> F: devtools/load-devel-config
> F: devtools/parse-flow-support.sh
> F: devtools/process-iwyu.py
> -F: devtools/update-abi.sh
> F: devtools/update-patches.py
> -F: devtools/update_version_map_abi.py
> F: devtools/libabigail.abignore
> F: devtools/words-case.txt
> F: license/
> @@ -166,7 +161,6 @@ M: Tyler Retzlaff
> F: lib/eal/common/
> F: lib/eal/unix/
> F: lib/eal/include/
> -F: lib/eal/version.map
> F: doc/guides/prog_guide/env_abstraction_layer.rst
> F: app/test/test_alarm.c
> F: app/test/test_atomic.c
> @@ -396,7 +390,6 @@ Windows support
> M: Dmitry Kozlyuk
> M: Tyler Retzlaff
> F: lib/eal/windows/
> -F: buildtools/map_to_win.py
> F: doc/guides/windows_gsg/
>
> Windows memory allocation
> diff --git a/buildtools/check-symbols.sh b/buildtools/check-symbols.sh
> index b8ac24391e..0d6745ec14 100755
> --- a/buildtools/check-symbols.sh
> +++ b/buildtools/check-symbols.sh
> @@ -7,29 +7,12 @@ OBJFILE=$2
>
> ROOTDIR=$(readlink -f $(dirname $(readlink -f $0))/..)
> LIST_SYMBOL=$ROOTDIR/buildtools/map-list-symbol.sh
> -CHECK_SYMBOL_MAPS=$ROOTDIR/devtools/check-symbol-maps.sh
> -
> -# added check for "make -C test/" usage
> -if [ ! -e $MAPFILE ] || [ ! -f $OBJFILE ]
> -then
> - exit 0
> -fi
> -
> -if [ -d $MAPFILE ]
> -then
> - exit 0
> -fi
> -
> DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XX)
> trap 'rm -f "$DUMPFILE"' EXIT
> objdump -t $OBJFILE >$DUMPFILE
>
> ret=0
>
> -if ! $CHECK_SYMBOL_MAPS $MAPFILE; then
> - ret=1
> -fi
> -
> for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE |cut -d ' ' -f 3`
> do
> if grep -q "\.text.*[[:space:]]$SYM$" $DUMPFILE &&
> @@ -37,8 +20,7 @@ do
> $LIST_SYMBOL -s $SYM $MAPFILE | grep -q EXPERIMENTAL
> then
> cat >&2 <<- END_OF_MESSAGE
> - $SYM is not flagged as experimental
> - but is listed in version map
> + $SYM is not flagged as experimental but is exported as an
> experimental symbol
> Please add __rte_experimental to the definition of $SYM
> END_OF_MESSAGE
> ret
Re: [PATCH v4 5/9] net/ixgbe/base: fix lock checker errors
On 3/28/2025 12:16 PM, Bruce Richardson wrote:
When building on FreeBSD, errors are reported in the base code by the
lock checker (-Wthread-safety). For example:
../drivers/net/intel/ixgbe/base/ixgbe_osdep.c:42:1: error: mutex 'lock->mutex'
is still held at the end of function [-Werror,-Wthread-safety-analysis]
42 | }
| ^
These errors are due to the checker not recognising the lock wrapper
functions. We can avoid these errors by converting these functions into
macros. While converting the lock macros, we can also convert the memory
allocation functions too, which allows us to remove the osdep.c file
entirely from the build.
Fixes: 30b19d1b5c43 ("net/ixgbe/base: add definitions for E610")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
Reviewed-by: Anatoly Burakov
--
Thanks,
Anatoly
[PATCH v4 6/9] net/i40e/base: fix unused value warnings
Fix warnings about unused values - parameters, variables, etc., and
remove the warning disable flags for them. Although modifying the
base-code files is not ideal, the changes required are minor, and only
affect two files from the imported base code.
Fixes: 8db9e2a1b232 ("i40e: base driver")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
---
drivers/net/intel/i40e/base/i40e_nvm.c | 2 +-
drivers/net/intel/i40e/base/i40e_osdep.h | 4 ++--
drivers/net/intel/i40e/base/i40e_type.h | 14 +-
drivers/net/intel/i40e/base/meson.build | 3 ---
drivers/net/intel/i40e/i40e_ethdev.c | 1 +
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/net/intel/i40e/base/i40e_nvm.c
b/drivers/net/intel/i40e/base/i40e_nvm.c
index 3e16a0d997..56dc4d9279 100644
--- a/drivers/net/intel/i40e/base/i40e_nvm.c
+++ b/drivers/net/intel/i40e/base/i40e_nvm.c
@@ -1743,7 +1743,7 @@ STATIC enum i40e_status_code
i40e_nvmupd_get_aq_result(struct i40e_hw *hw,
**/
STATIC enum i40e_status_code i40e_nvmupd_get_aq_event(struct i40e_hw *hw,
struct i40e_nvm_access *cmd,
- u8 *bytes, int *perrno)
+ u8 *bytes, __rte_unused int
*perrno)
{
u32 aq_total_len;
u32 aq_desc_len;
diff --git a/drivers/net/intel/i40e/base/i40e_osdep.h
b/drivers/net/intel/i40e/base/i40e_osdep.h
index c04f94732a..197f4678bf 100644
--- a/drivers/net/intel/i40e/base/i40e_osdep.h
+++ b/drivers/net/intel/i40e/base/i40e_osdep.h
@@ -184,8 +184,8 @@ struct __rte_packed_begin i40e_dma_mem {
const void *zone;
} __rte_packed_end;
-#define i40e_allocate_dma_mem(h, m, unused, s, a) \
- i40e_allocate_dma_mem_d(h, m, s, a)
+#define i40e_allocate_dma_mem(h, m, mt, s, a) \
+ i40e_allocate_dma_mem_d(h, m, mt, s, a)
#define i40e_free_dma_mem(h, m) i40e_free_dma_mem_d(h, m)
struct __rte_packed_begin i40e_virt_mem {
diff --git a/drivers/net/intel/i40e/base/i40e_type.h
b/drivers/net/intel/i40e/base/i40e_type.h
index 7cc746f82f..968e1982a6 100644
--- a/drivers/net/intel/i40e/base/i40e_type.h
+++ b/drivers/net/intel/i40e/base/i40e_type.h
@@ -14,11 +14,15 @@
#include "i40e_devids.h"
#define UNREFERENCED_XPARAMETER
-#define UNREFERENCED_1PARAMETER(_p) (_p);
-#define UNREFERENCED_2PARAMETER(_p, _q) (_p); (_q);
-#define UNREFERENCED_3PARAMETER(_p, _q, _r) (_p); (_q); (_r);
-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s);
-#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (_p); (_q); (_r); (_s);
(_t);
+#define UNREFERENCED_1PARAMETER(_p) (void)(_p)
+#define UNREFERENCED_2PARAMETER(_p, _q) \
+ do { (void)(_p); (void)(_q); } while (0)
+#define UNREFERENCED_3PARAMETER(_p, _q, _r) \
+ do { (void)(_p); (void)(_q); (void)(_r); } while (0)
+#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) \
+ do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); } while (0)
+#define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) \
+ do { (void)(_p); (void)(_q); (void)(_r); (void)(_s); (void)(_t); }
while (0)
#define BIT(a) (1UL << (a))
#define BIT_ULL(a) (1ULL << (a))
diff --git a/drivers/net/intel/i40e/base/meson.build
b/drivers/net/intel/i40e/base/meson.build
index a0912b1788..2648e5d0c4 100644
--- a/drivers/net/intel/i40e/base/meson.build
+++ b/drivers/net/intel/i40e/base/meson.build
@@ -13,10 +13,7 @@ sources = [
error_cflags = [
'-Wno-sign-compare',
-'-Wno-unused-value',
'-Wno-strict-aliasing',
-'-Wno-unused-but-set-variable',
-'-Wno-unused-parameter',
]
c_args = cflags
foreach flag: error_cflags
diff --git a/drivers/net/intel/i40e/i40e_ethdev.c
b/drivers/net/intel/i40e/i40e_ethdev.c
index 1c5ab35a8b..90eba3419f 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.c
+++ b/drivers/net/intel/i40e/i40e_ethdev.c
@@ -4694,6 +4694,7 @@ i40e_dev_rss_reta_query(struct rte_eth_dev *dev,
enum i40e_status_code
i40e_allocate_dma_mem_d(__rte_unused struct i40e_hw *hw,
struct i40e_dma_mem *mem,
+ __rte_unused enum i40e_memory_type mtype,
u64 size,
u32 alignment)
{
--
2.45.2
