net/tap: tests, cleanups, and error path fixes
Subsystems (2)
cover net/tap: tests, cleanups, and error path fixes
Add a unit test suite for the TAP PMD, clean up minor code issues, and fix several resource leaks and a use-after-free on error paths.
Stephen Hemminger (10):
test: add unit tests for TAP PMD
net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 896 ++++++++++++++++++++++++++++++++++ drivers/net/tap/rte_eth_tap.c | 99 ++-- drivers/net/tap/tap_flow.c | 23 +- 4 files changed, 957 insertions(+), 62 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Signature · 1 line
2.51.0
PATCH 1/10 test: add unit tests for TAP PMD
Add a standalone test suite for the TAP PMD, modeled on the existing test_pmd_ring tests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.
--- app/test/meson.build | 1 + app/test/test_pmd_tap.c | 896 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 897 insertions(+) create mode 100644 app/test/test_pmd_tap.c
app/test/meson.build +1 -0
@@ -144,6 +144,7 @@ source_file_deps = { 'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps, 'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'], 'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'], + 'test_pmd_tap.c': ['ethdev', 'net_tap', 'bus_vdev'], 'test_pmu.c': ['pmu'], 'test_power.c': ['power', 'power_acpi', 'power_kvm_vm', 'power_intel_pstate', 'power_amd_pstate', 'power_cppc'],
app/test/test_pmd_tap.c new file +896 -0
896 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH 01/10] test: add unit tests for TAP PMD
app/test/test_pmd_tap.c line 3
Quoted 5 lines · On Sun, 15 Feb 2026 11:52:19 -0800 Stephen Hemminger…
+++
b/app/test/test_pmd_tap.capp/test/test_pmd_tap.c new file +3
-0@@ -0,0 +1,896 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2024 Intel Corporation +*/
Should be Intel copyright ;-)
PATCH 2/10 net/tap: replace runtime speed capability with constant
In reply to Stephen HemmingerThe TAP/TUN virtual device always operates at 10G. The link speed is set in the static initializer for pmd_link, so the runtime assignments in rte_pmd_tap_probe() and rte_pmd_tun_probe() are redundant.
Replace tap_dev_speed_capa(), which dynamically computed speed capabilities against pmd_link.link_speed, with a compile-time constant TAP_SPEED_CAPA. Remove the unused 'speed' variable and redundant assignments.
--- drivers/net/tap/rte_eth_tap.c | 48 ++++++----------------------------- 1 file changed, 8 insertions(+), 40 deletions(-)
drivers/net/tap/rte_eth_tap.c +8 -40
@@ -891,39 +891,13 @@ tap_dev_configure(struct rte_eth_dev *dev)return 0 ; } -static uint32_t -tap_dev_speed_capa (void ) -{ -uint32_t speed = pmd_link.link_speed; -uint32_t capa =0 ; - -if (speed >=RTE_ETH_SPEED_NUM_10M ) - capa |=RTE_ETH_LINK_SPEED_10M ; -if (speed >=RTE_ETH_SPEED_NUM_100M ) - capa |=RTE_ETH_LINK_SPEED_100M ; -if (speed >=RTE_ETH_SPEED_NUM_1G ) - capa |=RTE_ETH_LINK_SPEED_1G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_2_5G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_5G ; -if (speed >=RTE_ETH_SPEED_NUM_10G ) - capa |=RTE_ETH_LINK_SPEED_10G ; -if (speed >=RTE_ETH_SPEED_NUM_20G ) - capa |=RTE_ETH_LINK_SPEED_20G ; -if (speed >=RTE_ETH_SPEED_NUM_25G ) - capa |=RTE_ETH_LINK_SPEED_25G ; -if (speed >=RTE_ETH_SPEED_NUM_40G ) - capa |=RTE_ETH_LINK_SPEED_40G ; -if (speed >=RTE_ETH_SPEED_NUM_50G ) - capa |=RTE_ETH_LINK_SPEED_50G ; -if (speed >=RTE_ETH_SPEED_NUM_56G ) - capa |=RTE_ETH_LINK_SPEED_56G ; -if (speed >=RTE_ETH_SPEED_NUM_100G ) - capa |=RTE_ETH_LINK_SPEED_100G ; - -return capa; -} +/* Speed capabilities for virtual TAP/TUN device (always 10G) */ +#define TAP_SPEED_CAPA (RTE_ETH_LINK_SPEED_10M | \ + RTE_ETH_LINK_SPEED_100M | \ + RTE_ETH_LINK_SPEED_1G | \ + RTE_ETH_LINK_SPEED_2_5G | \ + RTE_ETH_LINK_SPEED_5G | \ + RTE_ETH_LINK_SPEED_10G)static int tap_dev_info (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info)
@@ -936,7 +910,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->max_tx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->min_rx_bufsize =0 ; - dev_info->speed_capa =tap_dev_speed_capa (); + dev_info->speed_capa =TAP_SPEED_CAPA ; dev_info->rx_queue_offload_capa =TAP_RX_OFFLOAD ; dev_info->rx_offload_capa = dev_info->rx_queue_offload_capa; dev_info->tx_queue_offload_capa =TAP_TX_OFFLOAD ;
@@ -2325,7 +2299,6 @@ set_mac_type(const char *key __rte_unused,* Open a TUN interface device. TUN PMD * 1) sets tap_type as false * 2) intakes iface as argument. -* 3) as interface is virtual set speed to 10G */ static int rte_pmd_tun_probe (struct rte_vdev_device *dev)
@@ -2373,7 +2346,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } } } - pmd_link.link_speed =RTE_ETH_SPEED_NUM_10G ;TAP_LOG (DEBUG ,"Initializing pmd_tun for %s" , name);
@@ -2495,7 +2467,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -int speed;char tap_name[RTE_ETH_NAME_MAX_LEN ];char remote_iface[RTE_ETH_NAME_MAX_LEN ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };
@@ -2545,8 +2516,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)return 0 ; } - speed =RTE_ETH_SPEED_NUM_10G ; -/* use tap%d which causes kernel to choose next available */ strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN );memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN );
@@ -2587,7 +2556,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) persist =1 ; } } - pmd_link.link_speed = speed;TAP_LOG (DEBUG ,"Initializing pmd_tap for %s" , name);
Signature · 1 line
2.51.0
PATCH 3/10 net/tap: clarify TUN/TAP flag assignment
In reply to Stephen HemmingerReplace a ternary expression that relied on operator precedence between '?:' and '|' with an explicit if/else. No functional change.
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -154,8 +154,11 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* Do not set IFF_NO_PI as packet information header will be needed * to check if a received packet has been truncated. */ - ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ; +if (pmd->type ==ETH_TUNTAP_TYPE_TAP ) + ifr.ifr_flags =IFF_TAP ; +else + ifr.ifr_flags =IFF_TUN |IFF_POINTOPOINT ; +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );
Signature · 1 line
2.51.0
RE: [PATCH 03/10] net/tap: clarify TUN/TAP flag assignment
Quoted 17 lines
Replace a ternary expression that relied on operator precedence between '?:' and '|' with an explicit if/else. No functional change.
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/net/tap/rte_eth_tap.c +0
-0@@ -154,8 +154,11 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) * Do not set IFF_NO_PI as packet information header will beneeded
drivers/net/tap/rte_eth_tap.c tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) · line 158
Quoted 4 lines
drivers/net/tap/rte_eth_tap.c +0
-2* to check if a received packet has been truncated. */ - ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ;
For unconditional assignment, I prefer ternary expression over if/else. If you want to improve readability instead of relying on operator precedence, suggest:
ifr.ifr_flags = (pmd->type == ETH_TUNTAP_TYPE_TAP) ? IFF_TAP : (IFF_TUN | IFF_POINTOPOINT);
Quoted 10 lines
drivers/net/tap/rte_eth_tap.c +5
-1+if (pmd->type ==ETH_TUNTAP_TYPE_TAP ) + ifr.ifr_flags =IFF_TAP ; +else + ifr.ifr_flags =IFF_TUN |IFF_POINTOPOINT ; +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR ); --2.51.0
Re: [PATCH 03/10] net/tap: clarify TUN/TAP flag assignment
Quoted 23 lines · On Sun, 15 Feb 2026 22:45:53 +0100 Morten Brørup <[email protected]>…
Quoted 15 lines
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/net/tap/rte_eth_tap.c +0
-0@@ -154,8 +154,11 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) * Do not set IFF_NO_PI as packet information header will beneeded
drivers/net/tap/rte_eth_tap.c tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) · line 158
Quoted 4 lines
drivers/net/tap/rte_eth_tap.c +0
-2* to check if a received packet has been truncated. */ - ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ;For unconditional assignment, I prefer ternary expression over if/else. If you want to improve readability instead of relying on operator precedence, suggest:
Quoted 2 lines
ifr.ifr_flags = (pmd->type == ETH_TUNTAP_TYPE_TAP) ? IFF_TAP : (IFF_TUN | IFF_POINTOPOINT);
I was pre-conditioned by MS style guide lines that always called out excessive use of ternary as confusing
RE: [PATCH 03/10] net/tap: clarify TUN/TAP flag assignment
Quoted 29 lines
From: Stephen Hemminger [mailto:[email protected]]
Sent: Monday, 16 February 2026 01.48Quoted 6 lines · On Sun, 15 Feb 2026 22:45:53 +0100 Morten Brørup <[email protected]>…
Quoted 6 lines
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)Quoted 15 lines
drivers/net/tap/rte_eth_tap.c tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) · line 158
Quoted 13 lines
drivers/net/tap/rte_eth_tap.c +0
-0@@ -154,8 +154,11 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) * Do not set IFF_NO_PI as packet information header will beneeded
drivers/net/tap/rte_eth_tap.c +0
-2* to check if a received packet has been truncated. */ - ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ;For unconditional assignment, I prefer ternary expression over
if/else.
Quoted 1 line
If you want to improve readability instead of relying on operator
Quoted 8 lines
precedence, suggest:
Quoted 3 lines
ifr.ifr_flags = (pmd->type == ETH_TUNTAP_TYPE_TAP) ? IFF_TAP : (IFF_TUN | IFF_POINTOPOINT);I was pre-conditioned by MS style guide lines that always called out excessive use of ternary as confusing
Just tested on Godbolt; GCC, Clang and MSVC emits similar code for ternary and if/else, so it's only a matter of preference.
Since it's an unconditional assignment, I prefer ternary.
Ternary also works when initializing a variable with its declaration. And with assigning field values to structures.
Well... it's your code, so I'll leave you with the decision. ;-)
PATCH 4/10 net/tap: extend fixed MAC range to 16 bits
In reply to Stephen HemmingerThe generated fixed MAC address stored the interface index in a single byte, which wraps after 256 devices and produces duplicate MACs under repeated hot-plug. Spread the index across the last two bytes of the address, extending the unique range to 65536.
--- drivers/net/tap/rte_eth_tap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -5
@@ -2276,13 +2276,13 @@ set_mac_type(const char *key __rte_unused,return 0 ;if (!strncasecmp (ETH_TAP_MAC_FIXED , value,strlen (ETH_TAP_MAC_FIXED ))) { -static int iface_idx; +static uint16_t iface_idx;/* fixed mac = 02:64:74:61:70:<iface_idx> */ -memcpy ((char *)user_mac->addr_bytes,"\002dtap" , -RTE_ETHER_ADDR_LEN ); - user_mac->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] = - iface_idx++ +'0' ; +memcpy ((char *)user_mac->addr_bytes,"\002dtap" ,RTE_ETHER_ADDR_LEN ); + user_mac->addr_bytes[4 ] = iface_idx >>8 ; + user_mac->addr_bytes[5 ] = (uint8_t )iface_idx; + ++iface_idx; goto success; }
Signature · 1 line
2.51.0
PATCH 5/10 net/tap: skip checksum on truncated L4 headers
In reply to Stephen HemmingerAdd a bounds check before accessing the UDP or TCP header in tap_verify_csum(). A single-segment packet whose L4 header extends past rte_pktmbuf_data_len() would cause an out-of-bounds read.
--- drivers/net/tap/rte_eth_tap.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +9 -2
@@ -342,7 +342,7 @@ tap_verify_csum(struct rte_mbuf *mbuf)* greater than the total received size */ if (l2_len +rte_be_to_cpu_16 (iph->total_length) > -rte_pktmbuf_data_len (mbuf)) +rte_pktmbuf_data_len (mbuf))return ; cksum = ~rte_raw_cksum (iph, l3_len);
@@ -357,7 +357,7 @@ tap_verify_csum(struct rte_mbuf *mbuf)* greater than the total received size */ if (l2_len + l3_len +rte_be_to_cpu_16 (iph->payload_len) > -rte_pktmbuf_data_len (mbuf)) +rte_pktmbuf_data_len (mbuf))return ; }else {/* - RTE_PTYPE_L3_IPV4_EXT_UNKNOWN cannot happen because
@@ -367,8 +367,15 @@ tap_verify_csum(struct rte_mbuf *mbuf)*/ return ; } +if (l4 ==RTE_PTYPE_L4_UDP || l4 ==RTE_PTYPE_L4_TCP ) {int cksum_ok; +const unsigned int l4_min_len = (l4 ==RTE_PTYPE_L4_UDP ) + ?sizeof (struct rte_udp_hdr ) :sizeof (struct rte_tcp_hdr ); + +/* Don't verify checksum if L4 header is truncated */ +if (l2_len + l3_len + l4_min_len >rte_pktmbuf_data_len (mbuf)) +return ; l4_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len + l3_len);/* Don't verify checksum for multi-segment packets. */
Signature · 1 line
2.51.0
PATCH 6/10 net/tap: fix resource leaks in tap create error path
In reply to Stephen HemmingerCorrect two leaks in eth_dev_tap_create():
- process_private was never freed on error_exit. Add free() before releasing the port.
- If the process_private malloc failed, the function returned -1 directly without releasing the ethdev port allocated by rte_eth_vdev_allocate(). Jump to a new error_exit_nodev_release label instead.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -2012,7 +2012,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, process_private =malloc (sizeof (struct pmd_process_private ));if (process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto error_exit_nodev_release; }memset (process_private,0 ,sizeof (struct pmd_process_private ));
@@ -2202,9 +2202,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,close (pmd->nlsk_fd);if (pmd->ka_fd !=-1 )close (pmd->ka_fd); +rte_intr_instance_free (pmd->intr_handle); +free (dev->process_private); + +error_exit_nodev_release:/* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs =NULL ; -rte_intr_instance_free (pmd->intr_handle);rte_eth_dev_release_port (dev); error_exit_nodev:
Signature · 1 line
2.51.0
PATCH 7/10 net/tap: fix resource leaks in secondary process probe
In reply to Stephen HemmingerFour error paths in the secondary-process branch of rte_pmd_tap_probe() returned -1 without cleanup:
- primary process not alive: leaked eth_dev
- process_private malloc failure: leaked eth_dev
- tap_mp_attach_queues failure: leaked eth_dev and process_private
- rte_mp_action_register failure: leaked eth_dev and process_private
Add secondary_fail and secondary_fail_pp labels to free process_private and release the ethdev port.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -4
@@ -2502,31 +2502,38 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) eth_dev->tx_pkt_burst = pmd_tx_burst;if (!rte_eal_primary_proc_alive (NULL )) {TAP_LOG (ERR ,"Primary process is missing" ); -return -1 ; + goto secondary_fail; } eth_dev->process_private =malloc (sizeof (struct pmd_process_private ));if (eth_dev->process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto secondary_fail; }memset (eth_dev->process_private,0 ,sizeof (struct pmd_process_private )); ret =tap_mp_attach_queues (name, eth_dev);if (ret !=0 ) -return -1 ; + goto secondary_fail_pp;if (!tap_devices_count) { ret =rte_mp_action_register (TAP_MP_REQ_START_RXTX , tap_mp_req_start_rxtx);if (ret <0 && rte_errno !=ENOTSUP ) {TAP_LOG (ERR ,"tap: Failed to register IPC callback: %s" ,strerror (rte_errno)); -return -1 ; + goto secondary_fail_pp; } } tap_devices_count++;rte_eth_dev_probing_finish (eth_dev);return 0 ; + +secondary_fail_pp: +free (eth_dev->process_private); + eth_dev->process_private =NULL ; +secondary_fail: +rte_eth_dev_release_port (eth_dev); +return -1 ; }/* use tap%d which causes kernel to choose next available */
Signature · 1 line
2.51.0
PATCH 8/10 net/tap: free IPC reply buffer on queue count mismatch
In reply to Stephen HemmingerIn tap_mp_attach_queues(), if the reply queue count does not match the number of received file descriptors, the function returns -1 without freeing the reply buffer allocated by rte_mp_request_sync(). Add the missing free().
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tap/rte_eth_tap.c +1 -0
@@ -2407,6 +2407,7 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)/* Attach the queues from received file descriptors */ if (reply_param->q_count != reply->num_fds) {TAP_LOG (ERR ,"Unexpected number of fds received" ); +free (reply);return -1 ; }
Signature · 1 line
2.51.0
PATCH 9/10 net/tap: fix use-after-free on remote flow creation failure
In reply to Stephen HemmingerAfter a local TC filter rule is installed and the flow is inserted into pmd->flows, failure during remote flow creation jumps to the fail label which frees the flow without removing it from the list and without deleting the kernel-side TC rule.
Send RTM_DELTFILTER to clean up the local rule and call LIST_REMOVE before freeing.
Bugzilla ID: 1881
--- drivers/net/tap/tap_flow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tap/tap_flow.c +13 -6
@@ -1293,7 +1293,7 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"cannot allocate memory for rte_flow" ); - goto fail; + goto fail_remove; } msg = &remote_flow->msg;/* set the rule if_index for the remote netdevice */
@@ -1307,14 +1307,14 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"rte flow rule validation failed" ); - goto fail; + goto fail_remove; } err =tap_nl_send (pmd->nlsk_fd, &msg->nh);if (err <0 ) {rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failure sending nl request" ); - goto fail; + goto fail_remove; } err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {
@@ -1325,15 +1325,22 @@ tap_flow_create(struct rte_eth_dev *dev, error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , "overlapping rules or Kernel too old for flower support"); - goto fail; + goto fail_remove; } flow->remote_flow = remote_flow; }return flow; + +fail_remove: +/* Delete the local TC rule that was already installed */ + flow->msg.nh.nlmsg_flags =NLM_F_REQUEST |NLM_F_ACK ; + flow->msg.nh.nlmsg_type =RTM_DELTFILTER ; +if (tap_nl_send (pmd->nlsk_fd, &flow->msg.nh) >=0 ) +tap_nl_recv_ack (pmd->nlsk_fd); +LIST_REMOVE (flow, next); fail:rte_free (remote_flow); -if (flow) -tap_flow_free (pmd, flow); +tap_flow_free (pmd, flow);return NULL ; }
Signature · 1 line
2.51.0
PATCH 10/10 net/tap: free remote flow when implicit rule already exists
In reply to Stephen HemmingerWhen tap_flow_implicit_create() gets EEXIST from the kernel, the allocated remote_flow is never freed. Add rte_free() on that path.
Bugzilla ID: 1880
--- drivers/net/tap/tap_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap/tap_flow.c +3 -1
@@ -1625,8 +1625,10 @@ int tap_flow_implicit_create(struct pmd_internals *pmd, err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {/* Silently ignore re-entering existing rule */ -if (errno ==EEXIST ) +if (errno ==EEXIST ) { +rte_free (remote_flow); goto success; + }TAP_LOG (ERR ,"Kernel refused TC filter rule creation (%d): %s" , errno,strerror (errno));
Signature · 1 line
2.51.0
v2 cover net/tap: test, cleanups and error path fixes
In reply to Stephen HemmingerAdd a unit test suite for the TAP PMD, clean up minor code issues, and fix several resource leaks and a use-after-free on error paths.
v2
- fix typos in previous version
- preserve same fixed MAC address as original
Stephen Hemminger (11):
test: add unit tests for TAP PMD
net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists net/tap: track device by ifindex instead of name
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 901 ++++++++++++++++++++++++++++++++++ drivers/net/tap/rte_eth_tap.c | 291 +++++------ drivers/net/tap/rte_eth_tap.h | 2 - drivers/net/tap/tap_flow.c | 23 +- 5 files changed, 1069 insertions(+), 149 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Signature · 1 line
2.51.0
PATCH v2 1/11 test: add unit tests for TAP PMD
Add a standalone test suite for the TAP PMD, modeled on the existing test_pmd_ring tests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.
--- app/test/meson.build | 1 + app/test/test_pmd_tap.c | 901 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 902 insertions(+) create mode 100644 app/test/test_pmd_tap.c
app/test/meson.build +1 -0
@@ -144,6 +144,7 @@ source_file_deps = { 'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps, 'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'], 'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'], + 'test_pmd_tap.c': ['ethdev', 'net_tap', 'bus_vdev'], 'test_pmu.c': ['pmu'], 'test_power.c': ['power', 'power_acpi', 'power_kvm_vm', 'power_intel_pstate', 'power_amd_pstate', 'power_cppc'],
app/test/test_pmd_tap.c new file +901 -0
901 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v2 2/11 net/tap: replace runtime speed capability with constant
In reply to Stephen HemmingerThe TAP/TUN virtual device always operates at 10G. The link speed is set in the static initializer for pmd_link, so the runtime assignments in rte_pmd_tap_probe() and rte_pmd_tun_probe() are redundant.
Replace tap_dev_speed_capa(), which dynamically computed speed capabilities against pmd_link.link_speed, with a compile-time constant TAP_SPEED_CAPA. Remove the unused 'speed' variable and redundant assignments.
--- drivers/net/tap/rte_eth_tap.c | 48 ++++++----------------------------- 1 file changed, 8 insertions(+), 40 deletions(-)
drivers/net/tap/rte_eth_tap.c +8 -40
@@ -891,39 +891,13 @@ tap_dev_configure(struct rte_eth_dev *dev)return 0 ; } -static uint32_t -tap_dev_speed_capa (void ) -{ -uint32_t speed = pmd_link.link_speed; -uint32_t capa =0 ; - -if (speed >=RTE_ETH_SPEED_NUM_10M ) - capa |=RTE_ETH_LINK_SPEED_10M ; -if (speed >=RTE_ETH_SPEED_NUM_100M ) - capa |=RTE_ETH_LINK_SPEED_100M ; -if (speed >=RTE_ETH_SPEED_NUM_1G ) - capa |=RTE_ETH_LINK_SPEED_1G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_2_5G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_5G ; -if (speed >=RTE_ETH_SPEED_NUM_10G ) - capa |=RTE_ETH_LINK_SPEED_10G ; -if (speed >=RTE_ETH_SPEED_NUM_20G ) - capa |=RTE_ETH_LINK_SPEED_20G ; -if (speed >=RTE_ETH_SPEED_NUM_25G ) - capa |=RTE_ETH_LINK_SPEED_25G ; -if (speed >=RTE_ETH_SPEED_NUM_40G ) - capa |=RTE_ETH_LINK_SPEED_40G ; -if (speed >=RTE_ETH_SPEED_NUM_50G ) - capa |=RTE_ETH_LINK_SPEED_50G ; -if (speed >=RTE_ETH_SPEED_NUM_56G ) - capa |=RTE_ETH_LINK_SPEED_56G ; -if (speed >=RTE_ETH_SPEED_NUM_100G ) - capa |=RTE_ETH_LINK_SPEED_100G ; - -return capa; -} +/* Speed capabilities for virtual TAP/TUN device (always 10G) */ +#define TAP_SPEED_CAPA (RTE_ETH_LINK_SPEED_10M | \ + RTE_ETH_LINK_SPEED_100M | \ + RTE_ETH_LINK_SPEED_1G | \ + RTE_ETH_LINK_SPEED_2_5G | \ + RTE_ETH_LINK_SPEED_5G | \ + RTE_ETH_LINK_SPEED_10G)static int tap_dev_info (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info)
@@ -936,7 +910,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->max_tx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->min_rx_bufsize =0 ; - dev_info->speed_capa =tap_dev_speed_capa (); + dev_info->speed_capa =TAP_SPEED_CAPA ; dev_info->rx_queue_offload_capa =TAP_RX_OFFLOAD ; dev_info->rx_offload_capa = dev_info->rx_queue_offload_capa; dev_info->tx_queue_offload_capa =TAP_TX_OFFLOAD ;
@@ -2325,7 +2299,6 @@ set_mac_type(const char *key __rte_unused,* Open a TUN interface device. TUN PMD * 1) sets tap_type as false * 2) intakes iface as argument. -* 3) as interface is virtual set speed to 10G */ static int rte_pmd_tun_probe (struct rte_vdev_device *dev)
@@ -2373,7 +2346,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } } } - pmd_link.link_speed =RTE_ETH_SPEED_NUM_10G ;TAP_LOG (DEBUG ,"Initializing pmd_tun for %s" , name);
@@ -2495,7 +2467,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -int speed;char tap_name[RTE_ETH_NAME_MAX_LEN ];char remote_iface[RTE_ETH_NAME_MAX_LEN ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };
@@ -2545,8 +2516,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)return 0 ; } - speed =RTE_ETH_SPEED_NUM_10G ; -/* use tap%d which causes kernel to choose next available */ strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN );memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN );
@@ -2587,7 +2556,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) persist =1 ; } } - pmd_link.link_speed = speed;TAP_LOG (DEBUG ,"Initializing pmd_tap for %s" , name);
Signature · 1 line
2.51.0
PATCH v2 3/11 net/tap: clarify TUN/TAP flag assignment
In reply to Stephen HemmingerAdd parentheses in the ternary expression that relied on operator precedence between '?:' and '|'. No functional change.
--- drivers/net/tap/rte_eth_tap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/tap/rte_eth_tap.c +2 -1
@@ -155,7 +155,8 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* to check if a received packet has been truncated. */ ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ; +IFF_TAP : (IFF_TUN |IFF_POINTOPOINT ); +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );
Signature · 1 line
2.51.0
PATCH v2 4/11 net/tap: extend fixed MAC range to 16 bits
In reply to Stephen HemmingerThe generated fixed MAC address stored the interface index in a single byte, which wraps after 256 devices and produces duplicate MACs under repeated hot-plug. Spread the index across the last two bytes of the address, extending the unique range to 65536.
--- drivers/net/tap/rte_eth_tap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/tap/rte_eth_tap.c +9 -7
@@ -2274,13 +2274,15 @@ set_mac_type(const char *key __rte_unused,return 0 ;if (!strncasecmp (ETH_TAP_MAC_FIXED , value,strlen (ETH_TAP_MAC_FIXED ))) { -static int iface_idx; - -/* fixed mac = 02:64:74:61:70:<iface_idx> */ -memcpy ((char *)user_mac->addr_bytes,"\002dtap" , -RTE_ETHER_ADDR_LEN ); - user_mac->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] = - iface_idx++ +'0' ; +static uint16_t iface_idx; + +/* fixed mac that is locally assigned based off of iface_idx. */ + user_mac->addr_bytes[0 ] =RTE_ETHER_LOCAL_ADMIN_ADDR ;/* 0x2 */ + user_mac->addr_bytes[1 ] ='d' ; + user_mac->addr_bytes[2 ] ='t' ; + user_mac->addr_bytes[3 ] ='a' ; + user_mac->addr_bytes[4 ] ='p' + (iface_idx >>8 ); + user_mac->addr_bytes[5 ] ='0' + (uint8_t )iface_idx++; goto success; }
Signature · 1 line
2.51.0
PATCH v2 5/11 net/tap: skip checksum on truncated L4 headers
In reply to Stephen HemmingerAdd a bounds check before accessing the UDP or TCP header in tap_verify_csum(). A single-segment packet whose L4 header extends past rte_pktmbuf_data_len() would cause an out-of-bounds read.
--- drivers/net/tap/rte_eth_tap.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/tap/rte_eth_tap.c +7 -0
@@ -365,8 +365,15 @@ tap_verify_csum(struct rte_mbuf *mbuf)*/ return ; } +if (l4 ==RTE_PTYPE_L4_UDP || l4 ==RTE_PTYPE_L4_TCP ) {int cksum_ok; +const unsigned int l4_min_len = (l4 ==RTE_PTYPE_L4_UDP ) + ?sizeof (struct rte_udp_hdr ) :sizeof (struct rte_tcp_hdr ); + +/* Don't verify checksum if L4 header is truncated */ +if (l2_len + l3_len + l4_min_len >rte_pktmbuf_data_len (mbuf)) +return ; l4_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len + l3_len);/* Don't verify checksum for multi-segment packets. */
Signature · 1 line
2.51.0
PATCH v2 6/11 net/tap: fix resource leaks in tap create error path
In reply to Stephen HemmingerCorrect two leaks in eth_dev_tap_create():
- process_private was never freed on error_exit. Add free() before releasing the port.
- If the process_private malloc failed, the function returned -1 directly without releasing the ethdev port allocated by rte_eth_vdev_allocate(). Jump to a new error_exit_nodev_release label instead.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -2010,7 +2010,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, process_private =malloc (sizeof (struct pmd_process_private ));if (process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto error_exit_nodev_release; }memset (process_private,0 ,sizeof (struct pmd_process_private ));
@@ -2200,9 +2200,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,close (pmd->nlsk_fd);if (pmd->ka_fd !=-1 )close (pmd->ka_fd); +rte_intr_instance_free (pmd->intr_handle); +free (dev->process_private); + +error_exit_nodev_release:/* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs =NULL ; -rte_intr_instance_free (pmd->intr_handle);rte_eth_dev_release_port (dev); error_exit_nodev:
Signature · 1 line
2.51.0
PATCH v2 7/11 net/tap: fix resource leaks in secondary process probe
In reply to Stephen HemmingerFour error paths in the secondary-process branch of rte_pmd_tap_probe() returned -1 without cleanup:
- primary process not alive: leaked eth_dev
- process_private malloc failure: leaked eth_dev
- tap_mp_attach_queues failure: leaked eth_dev and process_private
- rte_mp_action_register failure: leaked eth_dev and process_private
Add secondary_fail and secondary_fail_pp labels to free process_private and release the ethdev port.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -4
@@ -2502,31 +2502,38 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) eth_dev->tx_pkt_burst = pmd_tx_burst;if (!rte_eal_primary_proc_alive (NULL )) {TAP_LOG (ERR ,"Primary process is missing" ); -return -1 ; + goto secondary_fail; } eth_dev->process_private =malloc (sizeof (struct pmd_process_private ));if (eth_dev->process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto secondary_fail; }memset (eth_dev->process_private,0 ,sizeof (struct pmd_process_private )); ret =tap_mp_attach_queues (name, eth_dev);if (ret !=0 ) -return -1 ; + goto secondary_fail_pp;if (!tap_devices_count) { ret =rte_mp_action_register (TAP_MP_REQ_START_RXTX , tap_mp_req_start_rxtx);if (ret <0 && rte_errno !=ENOTSUP ) {TAP_LOG (ERR ,"tap: Failed to register IPC callback: %s" ,strerror (rte_errno)); -return -1 ; + goto secondary_fail_pp; } } tap_devices_count++;rte_eth_dev_probing_finish (eth_dev);return 0 ; + +secondary_fail_pp: +free (eth_dev->process_private); + eth_dev->process_private =NULL ; +secondary_fail: +rte_eth_dev_release_port (eth_dev); +return -1 ; }/* use tap%d which causes kernel to choose next available */
Signature · 1 line
2.51.0
PATCH v2 8/11 net/tap: free IPC reply buffer on queue count mismatch
In reply to Stephen HemmingerIn tap_mp_attach_queues(), if the reply queue count does not match the number of received file descriptors, the function returns -1 without freeing the reply buffer allocated by rte_mp_request_sync(). Add the missing free().
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tap/rte_eth_tap.c +1 -0
@@ -2407,6 +2407,7 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)/* Attach the queues from received file descriptors */ if (reply_param->q_count != reply->num_fds) {TAP_LOG (ERR ,"Unexpected number of fds received" ); +free (reply);return -1 ; }
Signature · 1 line
2.51.0
PATCH v2 9/11 net/tap: fix use-after-free on remote flow creation failure
In reply to Stephen HemmingerAfter a local TC filter rule is installed and the flow is inserted into pmd->flows, failure during remote flow creation jumps to the fail label which frees the flow without removing it from the list and without deleting the kernel-side TC rule.
Send RTM_DELTFILTER to clean up the local rule and call LIST_REMOVE before freeing.
Bugzilla ID: 1881
--- drivers/net/tap/tap_flow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tap/tap_flow.c +13 -6
@@ -1293,7 +1293,7 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"cannot allocate memory for rte_flow" ); - goto fail; + goto fail_remove; } msg = &remote_flow->msg;/* set the rule if_index for the remote netdevice */
@@ -1307,14 +1307,14 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"rte flow rule validation failed" ); - goto fail; + goto fail_remove; } err =tap_nl_send (pmd->nlsk_fd, &msg->nh);if (err <0 ) {rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failure sending nl request" ); - goto fail; + goto fail_remove; } err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {
@@ -1325,15 +1325,22 @@ tap_flow_create(struct rte_eth_dev *dev, error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , "overlapping rules or Kernel too old for flower support"); - goto fail; + goto fail_remove; } flow->remote_flow = remote_flow; }return flow; + +fail_remove: +/* Delete the local TC rule that was already installed */ + flow->msg.nh.nlmsg_flags =NLM_F_REQUEST |NLM_F_ACK ; + flow->msg.nh.nlmsg_type =RTM_DELTFILTER ; +if (tap_nl_send (pmd->nlsk_fd, &flow->msg.nh) >=0 ) +tap_nl_recv_ack (pmd->nlsk_fd); +LIST_REMOVE (flow, next); fail:rte_free (remote_flow); -if (flow) -tap_flow_free (pmd, flow); +tap_flow_free (pmd, flow);return NULL ; }
Signature · 1 line
2.51.0
PATCH v2 10/11 net/tap: free remote flow when implicit rule already exists
In reply to Stephen HemmingerWhen tap_flow_implicit_create() gets EEXIST from the kernel, the allocated remote_flow is never freed. Add rte_free() on that path.
Bugzilla ID: 1880
--- drivers/net/tap/tap_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap/tap_flow.c +3 -1
@@ -1625,8 +1625,10 @@ int tap_flow_implicit_create(struct pmd_internals *pmd, err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {/* Silently ignore re-entering existing rule */ -if (errno ==EEXIST ) +if (errno ==EEXIST ) { +rte_free (remote_flow); goto success; + }TAP_LOG (ERR ,"Kernel refused TC filter rule creation (%d): %s" , errno,strerror (errno));
Signature · 1 line
2.51.0
PATCH v2 11/11 net/tap: track device by ifindex instead of name
In reply to Stephen HemmingerRemove name and remote_iface strings from pmd_internals. The interface name can change at any time due to udev or admin action, making cached names unreliable.
Resolve ifindex once at creation via TUNGETIFF on the keep-alive fd. For per-queue opens, recover the name on demand with if_indextoname(). In tap_netns_change(), use TUNGETIFF to get the current kernel name before resolving the new ifindex, fixing a bug where a rename during namespace move would lose the device.
Log messages now use dev->device->name (DPDK vdev name) or the ifindex, following the pattern established by the rtap PMD.
Bugzilla ID: 1880
--- drivers/net/tap/rte_eth_tap.c | 194 +++++++++++++++++++--------------- drivers/net/tap/rte_eth_tap.h | 2 - 2 files changed, 108 insertions(+), 88 deletions(-)
drivers/net/tap/rte_eth_tap.c +108 -86
@@ -130,6 +130,9 @@ static int tap_intr_handle_set(struct rte_eth_dev *dev, int set);* @param[in] pmd * Pointer to private structure. * +* @param[in] ifname +* Name of the TUN/TAP interface to open or create. +* * @param[in] is_keepalive * Keepalive flag *
@@ -140,7 +143,8 @@ static int tap_intr_handle_set(struct rte_eth_dev *dev, int set);* -1 on failure, fd on success */ static int -tun_alloc (struct pmd_internals *pmd,int is_keepalive,int persistent) +tun_alloc (struct pmd_internals *pmd,const char *ifname, +int is_keepalive,int persistent) {struct ifreq ifr;#ifdef IFF_MULTI_QUEUE
@@ -157,7 +161,7 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ?IFF_TAP : (IFF_TUN |IFF_POINTOPOINT ); -strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); +strlcpy (ifr.ifr_name, ifname,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );if (fd <0 ) {
@@ -199,12 +203,7 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent) goto error; } -/* -* Name passed to kernel might be wildcard like dtun%d -* and need to find the resulting device. -*/ -TAP_LOG (DEBUG ,"Device name is '%s'" , ifr.ifr_name); -strlcpy (pmd->name, ifr.ifr_name,RTE_ETH_NAME_MAX_LEN ); +TAP_LOG (DEBUG ,"Opened TUN/TAP '%s'" , ifr.ifr_name);if (is_keepalive) {/*
@@ -879,8 +878,6 @@ tap_dev_stop(struct rte_eth_dev *dev)static int tap_dev_configure (struct rte_eth_dev *dev) { -struct pmd_internals *pmd = dev->data->dev_private; -if (dev->data->nb_rx_queues != dev->data->nb_tx_queues) { TAP_LOG(ERR, "%s: number of rx queues %d must be equal to number of tx queues %d",
@@ -890,12 +887,6 @@ tap_dev_configure(struct rte_eth_dev *dev)return -1 ; } -TAP_LOG (INFO ,"%s: %s: TX configured queues number: %u" , - dev->device->name, pmd->name, dev->data->nb_tx_queues); - -TAP_LOG (INFO ,"%s: %s: RX configured queues number: %u" , - dev->device->name, pmd->name, dev->data->nb_rx_queues); -return 0 ; }
@@ -1371,17 +1362,18 @@ tap_mac_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)return 0 ; } -static int tap_carrier_set (struct pmd_internals *pmd,int carrier) +static int tap_carrier_set (struct rte_eth_dev *dev,int carrier) { +struct pmd_internals *pmd = dev->data->dev_private;#ifdef TUNSETCARRIER int ret =ioctl (pmd->ka_fd,TUNSETCARRIER , &carrier);if (ret <0 ) {TAP_LOG (ERR ,"%s: ioctl(TUNSETCARRIER) failed: %s" , - pmd->name,strerror (errno)); + dev->device->name,strerror (errno));return ret; }#else - (void )pmd; + (void )dev; (void )carrier;#endif return 0 ;
@@ -1407,9 +1399,9 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev) dev->device->name);if (ret <0 || ret >= (int )sizeof (pool_name)) {TAP_LOG (ERR , -"%s: failed to create mbuf pool name for device %s," +"%s: failed to create mbuf pool name," "device name too long or output error, ret: %d" , - pmd->name, dev->device->name, ret); + dev->device->name, ret);return -ENAMETOOLONG ; } pmd->gso_ctx_mp = rte_pktmbuf_pool_create(pool_name,
@@ -1418,8 +1410,8 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev) SOCKET_ID_ANY);if (!pmd->gso_ctx_mp) {TAP_LOG (ERR , -"%s: failed to create mbuf pool for device %s" , - pmd->name, dev->device->name); +"%s: failed to create mbuf pool" , + dev->device->name);return -1 ; } }
@@ -1450,18 +1442,27 @@ tap_setup_queue(struct rte_eth_dev *dev, fd = process_private->fds[qid];if (fd !=-1 ) {/* fd for this queue already exists */ -TAP_LOG (DEBUG ,"%s: fd %d for %s queue qid %d exists" , - pmd->name, fd, dir, qid); +TAP_LOG (DEBUG ,"%s: fd %d for %s queue %d exists" , + dev->device->name, fd, dir, qid); gso_ctx =NULL ; }else { - fd =tun_alloc (pmd,0 ,0 ); +char ifname[IFNAMSIZ ]; + +if (if_indextoname (pmd->if_index, ifname) ==NULL ) { +TAP_LOG (ERR ,"%s: ifindex %d not found" , + dev->device->name, pmd->if_index); +return -1 ; + } + + fd =tun_alloc (pmd, ifname,0 ,0 );if (fd <0 ) { -TAP_LOG (ERR ,"%s: tun_alloc() failed." , pmd->name); +TAP_LOG (ERR ,"%s: tun_alloc() failed" , + dev->device->name);return -1 ; } -TAP_LOG (DEBUG ,"%s: add %s queue for qid %d fd %d" , - pmd->name, dir, qid, fd); +TAP_LOG (DEBUG ,"%s: add %s queue %d fd %d" , + dev->device->name, dir, qid, fd); process_private->fds[qid] = fd; }
@@ -1555,12 +1556,12 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, }/* set carrier after creating at least one rxq */ - ret =tap_carrier_set (internals,1 ); + ret =tap_carrier_set (dev,1 );if (ret <0 ) goto error; -TAP_LOG (DEBUG ," RX TUNTAP device name %s, qid %d on fd %d" , - internals->name, rx_queue_id, +TAP_LOG (DEBUG ," RX %s qid %d on fd %d" , + dev->device->name, rx_queue_id, process_private->fds[rx_queue_id]);return 0 ;
@@ -1603,8 +1604,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,if (ret ==-1 )return -1 ;TAP_LOG (DEBUG , -" TX TUNTAP device name %s, qid %d on fd %d csum %s" , - internals->name, tx_queue_id, +" TX %s qid %d on fd %d csum %s" , + dev->device->name, tx_queue_id, process_private->fds[tx_queue_id], txq->csum ?"on" :"off" );
@@ -1647,40 +1648,46 @@ tap_netns_change(struct rte_eth_dev *dev) {struct pmd_internals *pmd = dev->data->dev_private;#ifdef TUNGETDEVNETNS -int netns_fd, orig_netns_fd, new_nlsk_fd; +struct ifreq ifr = {0 }; +int netns_fd, orig_netns_fd, new_nlsk_fd, new_ifindex; netns_fd =ioctl (pmd->ka_fd,TUNGETDEVNETNS );if (netns_fd <0 ) { -TAP_LOG (INFO ,"%s: interface deleted" , pmd->name); +TAP_LOG (INFO ,"ifindex %d: interface deleted" , + pmd->if_index);return 0 ; } -/* Interface was moved to another namespace */ - pmd->if_index =0 ; -/* Save current namespace */ orig_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY );if (orig_netns_fd <0 ) { -TAP_LOG (ERR ,"%s: failed to open original netns: %s" , - pmd->name,strerror (errno)); +TAP_LOG (ERR ,"ifindex %d: failed to open original netns: %s" , + pmd->if_index,strerror (errno));close (netns_fd);return -1 ; }/* Switch to new namespace */ if (setns (netns_fd,CLONE_NEWNET ) <0 ) { -TAP_LOG (ERR ,"%s: failed to enter new netns: %s" , - pmd->name,strerror (errno)); +TAP_LOG (ERR ,"ifindex %d: failed to enter new netns: %s" , + pmd->if_index,strerror (errno));close (netns_fd);close (orig_netns_fd);return -1 ; }/* -* Update ifindex by querying interface name. -* The interface now has a new ifindex in the new namespace. +* Get the current name from the TUN fd and resolve to the new +* ifindex. TUNGETIFF always returns the current kernel name +* regardless of any renames. */ - pmd->if_index =if_nametoindex (pmd->name); +if (ioctl (pmd->ka_fd,TUNGETIFF , &ifr) <0 ) { +TAP_LOG (ERR ,"ifindex %d: TUNGETIFF failed: %s" , + pmd->if_index,strerror (errno)); + new_ifindex =0 ; + }else { + new_ifindex =if_nametoindex (ifr.ifr_name); + }/* Recreate netlink socket in new namespace */ new_nlsk_fd =tap_nl_init (0 );
@@ -1688,32 +1695,31 @@ tap_netns_change(struct rte_eth_dev *dev)/* Recreate LSC interrupt netlink socket in new namespace */ rte_intr_callback_unregister_pending (pmd->intr_handle, tap_dev_intr_handler, dev,NULL );if (tap_lsc_intr_handle_set (dev,1 ) <0 ) -TAP_LOG (WARNING ,"%s: failed to recreate LSC interrupt socket" , - pmd->name); +TAP_LOG (WARNING ,"ifindex %d: failed to recreate LSC socket" , + pmd->if_index);/* Force carrier back after switching netns */ -tap_carrier_set (pmd,1 ); +tap_carrier_set (dev,1 );/* Switch back to original namespace */ if (setns (orig_netns_fd,CLONE_NEWNET ) <0 ) -TAP_LOG (ERR ,"%s: failed to return to original netns: %s" , - pmd->name,strerror (errno)); +TAP_LOG (ERR ,"ifindex %d: failed to return to original netns: %s" , + pmd->if_index,strerror (errno));close (orig_netns_fd);close (netns_fd); -if (pmd->if_index ==0 ) { -TAP_LOG (WARNING ,"%s: interface moved to another namespace, " -"failed to get new ifindex" , - pmd->name); +if (new_ifindex ==0 ) { +TAP_LOG (WARNING ,"ifindex %d: moved to new namespace, " +"failed to get new ifindex" , pmd->if_index);if (new_nlsk_fd >=0 )close (new_nlsk_fd);return -1 ; }if (new_nlsk_fd <0 ) { -TAP_LOG (WARNING ,"%s: failed to recreate netlink socket in new namespace" , - pmd->name); +TAP_LOG (WARNING ,"ifindex %d: failed to recreate netlink socket" , + pmd->if_index);return -1 ; }
@@ -1721,12 +1727,13 @@ tap_netns_change(struct rte_eth_dev *dev)if (pmd->nlsk_fd >=0 )tap_nl_final (pmd->nlsk_fd); pmd->nlsk_fd = new_nlsk_fd; + pmd->if_index = new_ifindex; -TAP_LOG (INFO ,"%s: interface moved to another namespace, new ifindex: %u" , - pmd->name, pmd->if_index); +TAP_LOG (INFO ,"interface moved to new namespace, new ifindex: %u" , + pmd->if_index);#else -TAP_LOG (WARNING ,"%s: interface deleted or moved to another namespace" , - pmd->name); +TAP_LOG (WARNING ,"ifindex %d: interface deleted or moved" , + pmd->if_index);#endif return 0 ;
@@ -2017,7 +2024,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, pmd = dev->data->dev_private; dev->process_private = process_private; pmd->dev = dev; -strlcpy (pmd->name, tap_name,sizeof (pmd->name)); pmd->type = type; pmd->ka_fd =-1 ; pmd->nlsk_fd =-1 ;
@@ -2069,12 +2075,34 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,* This keep-alive file descriptor will guarantee that the TUN device * exists even when all of its queues are closed */ - pmd->ka_fd =tun_alloc (pmd,1 , persist); + pmd->ka_fd =tun_alloc (pmd, tap_name,1 , persist);if (pmd->ka_fd ==-1 ) {TAP_LOG (ERR ,"Unable to create %s interface" , tuntap_name); goto error_exit; } -TAP_LOG (DEBUG ,"allocated %s" , pmd->name); + +/* +* Get the kernel-assigned name from the TUN fd and resolve the +* ifindex. From this point on, the device is tracked by ifindex +* which is stable even if the interface is renamed. +*/ + { +struct ifreq ifr = {0 }; + +if (ioctl (pmd->ka_fd,TUNGETIFF , &ifr) <0 ) { +TAP_LOG (ERR ,"Unable to get interface name: %s" , +strerror (errno)); + goto error_exit; + } + pmd->if_index =if_nametoindex (ifr.ifr_name); +if (pmd->if_index ==0 ) { +TAP_LOG (ERR ,"Unable to get ifindex for '%s'" , + ifr.ifr_name); + goto error_exit; + } +TAP_LOG (DEBUG ,"Created '%s' ifindex %d" , + ifr.ifr_name, pmd->if_index); + }/* * Create netlink socket for interface control.
@@ -2082,13 +2110,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,*/ pmd->nlsk_fd =tap_nl_init (0 );if (pmd->nlsk_fd ==-1 ) { -TAP_LOG (ERR ,"%s: failed to create netlink socket." , pmd->name); - goto error_exit; - } - - pmd->if_index =if_nametoindex (pmd->name); -if (!pmd->if_index) { -TAP_LOG (ERR ,"%s: failed to get if_index." , pmd->name); +TAP_LOG (ERR ,"ifindex %d: failed to create netlink socket" , + pmd->if_index); goto error_exit; }
@@ -2111,13 +2134,13 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,* - implicit rules */ if (qdisc_create_multiq (pmd->nlsk_fd, pmd->if_index) <0 ) { -TAP_LOG (ERR ,"%s: failed to create multiq qdisc." , - pmd->name); +TAP_LOG (ERR ,"ifindex %d: failed to create multiq qdisc" , + pmd->if_index); goto disable_rte_flow; }if (qdisc_create_ingress (pmd->nlsk_fd, pmd->if_index) <0 ) { -TAP_LOG (ERR ,"%s: failed to create ingress qdisc." , - pmd->name); +TAP_LOG (ERR ,"ifindex %d: failed to create ingress qdisc" , + pmd->if_index); goto disable_rte_flow; }
@@ -2126,11 +2149,10 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,if (strlen (remote_iface)) { pmd->remote_if_index =if_nametoindex (remote_iface);if (!pmd->remote_if_index) { -TAP_LOG (ERR ,"%s: failed to get %s if_index." , - pmd->name, remote_iface); +TAP_LOG (ERR ,"ifindex %d: failed to get ifindex for remote '%s'" , + pmd->if_index, remote_iface); goto error_remote; } -strlcpy (pmd->remote_iface, remote_iface,RTE_ETH_NAME_MAX_LEN );/* Save state of remote device */ if (tap_nl_get_flags(pmd->nlsk_fd, pmd->remote_if_index,
@@ -2139,14 +2161,14 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,/* Replicate remote MAC address */ if (tap_nl_get_mac (pmd->nlsk_fd, pmd->remote_if_index, &pmd->eth_addr) <0 ) { -TAP_LOG (ERR ,"%s: failed to get %s MAC address." , - pmd->name, pmd->remote_iface); +TAP_LOG (ERR ,"ifindex %d: failed to get remote MAC" , + pmd->if_index); goto error_remote; }if (tap_nl_set_mac (pmd->nlsk_fd, pmd->if_index, &pmd->eth_addr) <0 ) { -TAP_LOG (ERR ,"%s: failed to set %s MAC address." , - pmd->name, remote_iface); +TAP_LOG (ERR ,"ifindex %d: failed to set local MAC" , + pmd->if_index); goto error_remote; }
@@ -2158,8 +2180,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,qdisc_flush (pmd->nlsk_fd, pmd->remote_if_index);if (qdisc_create_ingress (pmd->nlsk_fd, pmd->remote_if_index) <0 ) { -TAP_LOG (ERR ,"%s: failed to create ingress qdisc." , - pmd->remote_iface); +TAP_LOG (ERR ,"remote ifindex %d: failed to create ingress qdisc" , + pmd->remote_if_index); goto error_remote; }LIST_INIT (&pmd->implicit_flows);
@@ -2168,8 +2190,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, tap_flow_implicit_create(pmd, TAP_REMOTE_BROADCAST) < 0 || tap_flow_implicit_create(pmd, TAP_REMOTE_BROADCASTV6) < 0) {TAP_LOG (ERR , -"%s: failed to create implicit rules." , - pmd->name); +"ifindex %d: failed to create implicit rules" , + pmd->if_index); goto error_remote; } }
drivers/net/tap/rte_eth_tap.h +0 -2
@@ -68,8 +68,6 @@ struct tx_queue {struct pmd_internals {struct rte_eth_dev *dev;/* Ethernet device. */ -char remote_iface[RTE_ETH_NAME_MAX_LEN ];/* Remote netdevice name */ -char name[RTE_ETH_NAME_MAX_LEN ];/* Internal Tap device name */ int type;/* Type field - TUN|TAP */ int persist;/* 1 if keep link up, else 0 */ struct rte_ether_addr eth_addr;/* Mac address of the device port */
Signature · 1 line
2.51.0
Re: [PATCH v2 11/11] net/tap: track device by ifindex instead of name
Quoted 11 lines · On Mon, 16 Feb 2026 15:02:35 -0800 Stephen Hemminger…
Remove name and
remote_ifacestrings frompmd_internals. The interface name can change at any time due to udev or admin action, making cached names unreliable.Resolve ifindex once at creation via TUNGETIFF on the keep-alive fd. For per-queue opens, recover the name on demand with
if_indextoname(). Intap_netns_change(), use TUNGETIFF to get the current kernel name before resolving the new ifindex, fixing a bug where a rename during namespace move would lose the device.
Quoted 7 lines
Log messages now use
dev->device->name(DPDK vdev name) or the ifindex, following the pattern established by the rtap PMD.Bugzilla ID: 1880
Signed-off-by Stephen Hemminger <[email protected]>---
This patch is not ready and needs to be dropped
cover net/mlx5: fix several correctness bugs
In reply to Stephen HemmingerFound these during a code review of the mlx5 driver. I don't have ConnectX hardware to test, so sending as RFC for maintainers to verify and test.
Summary:
1/4 NULL pointer dereference in mlx5_txq_start() - txq_ctrl is
dereferenced before the NULL check one line later.
2/4 DevX queue counter leak in hairpin counter setup - the
counter object is not freed when the subsequent modify call fails.
3/4 Use-after-free in ASO age and CT management init - on queue
init failure the management structure is freed but the pointer is not NULLed, so a retry dereferences freed memory.
4/4 64-bit counter truncation - uint64_t* cast to uint32_t*
leaves the upper 32 bits uninitialised, producing wrong hairpin queue statistics.
Stephen Hemminger (4):
net/mlx5: fix NULL dereference in Tx queue start net/mlx5: fix counter leak in hairpin queue setup net/mlx5: fix use-after-free in ASO management init net/mlx5: fix counter truncation in queue counter read
drivers/net/mlx5/mlx5.c | 13 ++++++++++++- drivers/net/mlx5/mlx5_trigger.c | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/4 net/mlx5: fix NULL dereference in Tx queue start
mlx5_txq_get() can return NULL for an unconfigured queue index, but the result is dereferenced to initialise txq_data before the NULL check on the following line. Move the txq_data assignment after the NULL guard.
--- drivers/net/mlx5/mlx5_trigger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/mlx5/mlx5_trigger.c +2 -1
@@ -59,10 +59,11 @@ mlx5_txq_start(struct rte_eth_dev *dev)for (cnt = log_max_wqe; cnt >0 ; cnt -=1 ) {for (i =0 ; i != priv->txqs_n; ++i) {struct mlx5_txq_ctrl *txq_ctrl =mlx5_txq_get (dev, i); -struct mlx5_txq_data *txq_data = &txq_ctrl->txq; +struct mlx5_txq_data *txq_data;if (!txq_ctrl)continue ; + txq_data = &txq_ctrl->txq;if (txq_data->elts_n != cnt) {mlx5_txq_release (dev, i);continue ;
Signature · 1 line
2.51.0
Re: [RFT 1/4] net/mlx5: fix NULL dereference in Tx queue start
Quoted 9 lines · Stephen Hemminger
mlx5_txq_get()can return NULL for an unconfigured queue index, but the result is dereferenced to initialisetxq_databefore the NULL check on the following line. Move thetxq_dataassignment after the NULL guard.Fixes 6f356d3840e6 ("net/mlx5: pass DevX object info in Tx queue start")Signed-off-by Stephen Hemminger <[email protected]>
PATCH 2/4 net/mlx5: fix counter leak in hairpin queue setup
In reply to Stephen HemmingerWhen rxq_obj_modify_counter_set_id() fails in mlx5_enable_per_queue_hairpin_counter(), the freshly allocated DevX queue counter object is not destroyed before returning. Destroy it on the error path.
--- drivers/net/mlx5/mlx5.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/mlx5/mlx5.c +2 -0
@@ -3704,6 +3704,8 @@ mlx5_enable_per_queue_hairpin_counter(struct rte_eth_dev *dev, uint64_t id)if (ret) {DRV_LOG (ERR ,"failed to modify rq object for port %u" "%s" , priv->dev_data->port_id,strerror (rte_errno)); +mlx5_devx_cmd_destroy (rxq->q_counter); + rxq->q_counter =NULL ;return ret; }
Signature · 1 line
2.51.0
Re: [RFT 2/4] net/mlx5: fix counter leak in hairpin queue setup
Quoted 9 lines · Stephen Hemminger
When
rxq_obj_modify_counter_set_id()fails inmlx5_enable_per_queue_hairpin_counter(), the freshly allocated DevX queue counter object is not destroyed before returning. Destroy it on the error path.Fixes f0c0731b6d40 ("net/mlx5: add counters for hairpin drop")Signed-off-by Stephen Hemminger <[email protected]>
PATCH 3/4 net/mlx5: fix use-after-free in ASO management init
In reply to Stephen Hemmingermlx5_flow_aso_age_mng_init() and mlx5_flow_aso_ct_mng_init() each allocate a management structure, then call mlx5_aso_queue_init(). If the queue init fails, the structure is freed but the pointer in the shared context (sh->aso_age_mng / sh->ct_mng) is not set to NULL.
A subsequent call to the same init function sees the non-NULL pointer, skips re-allocation, and returns success, leaving the caller operating on freed memory.
Set the pointer to NULL after freeing in both error paths.
--- drivers/net/mlx5/mlx5.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/mlx5/mlx5.c +2 -0
@@ -459,6 +459,7 @@ mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh) err =mlx5_aso_queue_init (sh,ASO_OPC_MOD_FLOW_HIT ,1 );if (err) {mlx5_free (sh->aso_age_mng); + sh->aso_age_mng =NULL ;return -1 ; }rte_rwlock_init (&sh->aso_age_mng->resize_rwl);
@@ -823,6 +824,7 @@ mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh) err =mlx5_aso_queue_init (sh,ASO_OPC_MOD_CONNECTION_TRACKING ,MLX5_ASO_CT_SQ_NUM );if (err) {mlx5_free (sh->ct_mng); + sh->ct_mng =NULL ;/* rte_errno should be extracted from the failure. */ rte_errno =EINVAL ;return -rte_errno;
Signature · 1 line
2.51.0
Re: [RFT 3/4] net/mlx5: fix use-after-free in ASO management init
Quoted 10 lines · Stephen Hemminger
mlx5_flow_aso_age_mng_init()andmlx5_flow_aso_ct_mng_init()each allocate a management structure, then callmlx5_aso_queue_init(). If the queue init fails, the structure is freed but the pointer in the shared context (sh->aso_age_mng/sh->ct_mng) is not set to NULL.A subsequent call to the same init function sees the non-NULL pointer, skips re-allocation, and returns success, leaving the caller operating on freed memory.
Quoted 6 lines
Set the pointer to NULL after freeing in both error paths.
Fixes f935ed4b645a ("net/mlx5: support flow hit action for aging")Signed-off-by Stephen Hemminger <[email protected]>
PATCH 4/4 net/mlx5: fix counter truncation in queue counter read
In reply to Stephen Hemmingermlx5_read_queue_counter() casts its uint64_t *stat argument to uint32_t * before passing it to mlx5_devx_cmd_queue_counter_query(). The query function writes a single uint32_t, so:
- On little-endian (x86): only the low 32 bits of *stat are written; the upper 32 bits retain whatever value they had before the call (stack garbage or a stale value).
- On big-endian (PowerPC): the write hits the wrong half of the 64-bit word entirely.
Use a local uint32_t for the query and widen to uint64_t on assignment.
--- drivers/net/mlx5/mlx5.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/mlx5/mlx5.c +8 -1
@@ -3783,6 +3783,9 @@ int mlx5_read_queue_counter(struct mlx5_devx_obj *q_counter, const char *ctr_name, uint64_t *stat) { + uint32_t val; +int ret; +if (rte_eal_process_type () ==RTE_PROC_SECONDARY ) {DRV_LOG (WARNING ,"DevX %s counter is not supported in the secondary process" , ctr_name);
@@ -3792,7 +3795,11 @@ mlx5_read_queue_counter(struct mlx5_devx_obj *q_counter, const char *ctr_name,if (q_counter ==NULL )return -EINVAL ; -return mlx5_devx_cmd_queue_counter_query (q_counter,0 , (uint32_t *)stat); + ret =mlx5_devx_cmd_queue_counter_query (q_counter,0 , &val); +if (ret ==0 ) + *stat = val; + +return ret; }/**
Signature · 1 line
2.51.0
Re: [RFT 4/4] net/mlx5: fix counter truncation in queue counter read
Quoted 10 lines · Stephen Hemminger
mlx5_read_queue_counter()casts itsuint64_t*stat argument touint32_t* before passing it tomlx5_devx_cmd_queue_counter_query(). The query function writes a singleuint32_t, so:- On little-endian (x86): only the low 32 bits of *stat are written; the upper 32 bits retain whatever value they had before the call (stack garbage or a stale value).
- On big-endian (PowerPC): the write hits the wrong half of the 64-bit word entirely.
Quoted 7 lines
Use a local
uint32_tfor the query and widen touint64_ton assignment.Fixes f0c0731b6d40 ("net/mlx5: add counters for hairpin drop")Signed-off-by Stephen Hemminger <[email protected]>
Re: [RFT 0/4] net/mlx5: fix several correctness bugs
In reply to Stephen HemmingerHi,
Quoted 27 lines · Stephen Hemminger
Found these during a code review of the mlx5 driver. I don't have ConnectX hardware to test, so sending as RFC for maintainers to verify and test.
Summary:
1/4 NULL pointer dereference in
mlx5_txq_start()-txq_ctrlis
dereferenced before the NULL check one line later.2/4 DevX queue counter leak in hairpin counter setup - the
counter object is not freed when the subsequent modify call fails.3/4 Use-after-free in ASO age and CT management init - on queue
init failure the management structure is freed but the pointer is not NULLed, so a retry dereferences freed memory.4/4 64-bit counter truncation - uint64_t* cast to uint32_t*
leaves the upper 32 bits uninitialised, producing wrong hairpin queue statistics.Stephen Hemminger (4):
net/mlx5: fix NULL dereference in Tx queue start net/mlx5: fix counter leak in hairpin queue setup net/mlx5: fix use-after-free in ASO management init net/mlx5: fix counter truncation in queue counter read
Quoted 4 lines
drivers/net/mlx5/mlx5.c | 13 ++++++++++++- drivers/net/mlx5/mlx5_trigger.c | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-)
Series applied to next-net-mlx,
Kindest regards
Raslan Darawsheh
v3 cover net/tap: bug fixes and add test
In reply to Stephen HemmingerAdd a unit test suite for the TAP PMD, clean up minor code issues, and fix several resource leaks and a use-after-free on error paths.
v3
- drop not ready full ifindex change
- fix AI review feedback in test code
v2
- fix typos in previous version
- preserve same fixed MAC address as original
Stephen Hemminger (10):
test: add unit tests for TAP PMD
net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 906 ++++++++++++++++++++++++++++++++++ drivers/net/tap/rte_eth_tap.c | 97 ++-- drivers/net/tap/tap_flow.c | 23 +- 4 files changed, 966 insertions(+), 61 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Signature · 1 line
2.51.0
PATCH v3 1/10 test: add unit tests for TAP PMD
Add a standalone test suite for the TAP PMD, modeled on the existing test_pmd_ring tests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.
--- app/test/meson.build | 1 + app/test/test_pmd_tap.c | 906 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 907 insertions(+) create mode 100644 app/test/test_pmd_tap.c
app/test/meson.build +1 -0
@@ -144,6 +144,7 @@ source_file_deps = { 'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps, 'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'], 'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'], + 'test_pmd_tap.c': ['ethdev', 'net_tap', 'bus_vdev'], 'test_pmu.c': ['pmu'], 'test_power.c': ['power', 'power_acpi', 'power_kvm_vm', 'power_intel_pstate', 'power_amd_pstate', 'power_cppc'],
app/test/test_pmd_tap.c new file +906 -0
906 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 2/10 net/tap: replace runtime speed capability with constant
In reply to Stephen HemmingerThe TAP/TUN virtual device always operates at 10G. The link speed is set in the static initializer for pmd_link, so the runtime assignments in rte_pmd_tap_probe() and rte_pmd_tun_probe() are redundant.
Replace tap_dev_speed_capa(), which dynamically computed speed capabilities against pmd_link.link_speed, with a compile-time constant TAP_SPEED_CAPA. Remove the unused 'speed' variable and redundant assignments.
--- drivers/net/tap/rte_eth_tap.c | 48 ++++++----------------------------- 1 file changed, 8 insertions(+), 40 deletions(-)
drivers/net/tap/rte_eth_tap.c +8 -40
@@ -891,39 +891,13 @@ tap_dev_configure(struct rte_eth_dev *dev)return 0 ; } -static uint32_t -tap_dev_speed_capa (void ) -{ -uint32_t speed = pmd_link.link_speed; -uint32_t capa =0 ; - -if (speed >=RTE_ETH_SPEED_NUM_10M ) - capa |=RTE_ETH_LINK_SPEED_10M ; -if (speed >=RTE_ETH_SPEED_NUM_100M ) - capa |=RTE_ETH_LINK_SPEED_100M ; -if (speed >=RTE_ETH_SPEED_NUM_1G ) - capa |=RTE_ETH_LINK_SPEED_1G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_2_5G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_5G ; -if (speed >=RTE_ETH_SPEED_NUM_10G ) - capa |=RTE_ETH_LINK_SPEED_10G ; -if (speed >=RTE_ETH_SPEED_NUM_20G ) - capa |=RTE_ETH_LINK_SPEED_20G ; -if (speed >=RTE_ETH_SPEED_NUM_25G ) - capa |=RTE_ETH_LINK_SPEED_25G ; -if (speed >=RTE_ETH_SPEED_NUM_40G ) - capa |=RTE_ETH_LINK_SPEED_40G ; -if (speed >=RTE_ETH_SPEED_NUM_50G ) - capa |=RTE_ETH_LINK_SPEED_50G ; -if (speed >=RTE_ETH_SPEED_NUM_56G ) - capa |=RTE_ETH_LINK_SPEED_56G ; -if (speed >=RTE_ETH_SPEED_NUM_100G ) - capa |=RTE_ETH_LINK_SPEED_100G ; - -return capa; -} +/* Speed capabilities for virtual TAP/TUN device (always 10G) */ +#define TAP_SPEED_CAPA (RTE_ETH_LINK_SPEED_10M | \ + RTE_ETH_LINK_SPEED_100M | \ + RTE_ETH_LINK_SPEED_1G | \ + RTE_ETH_LINK_SPEED_2_5G | \ + RTE_ETH_LINK_SPEED_5G | \ + RTE_ETH_LINK_SPEED_10G)static int tap_dev_info (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info)
@@ -936,7 +910,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->max_tx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->min_rx_bufsize =0 ; - dev_info->speed_capa =tap_dev_speed_capa (); + dev_info->speed_capa =TAP_SPEED_CAPA ; dev_info->rx_queue_offload_capa =TAP_RX_OFFLOAD ; dev_info->rx_offload_capa = dev_info->rx_queue_offload_capa; dev_info->tx_queue_offload_capa =TAP_TX_OFFLOAD ;
@@ -2325,7 +2299,6 @@ set_mac_type(const char *key __rte_unused,* Open a TUN interface device. TUN PMD * 1) sets tap_type as false * 2) intakes iface as argument. -* 3) as interface is virtual set speed to 10G */ static int rte_pmd_tun_probe (struct rte_vdev_device *dev)
@@ -2373,7 +2346,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } } } - pmd_link.link_speed =RTE_ETH_SPEED_NUM_10G ;TAP_LOG (DEBUG ,"Initializing pmd_tun for %s" , name);
@@ -2495,7 +2467,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -int speed;char tap_name[RTE_ETH_NAME_MAX_LEN ];char remote_iface[RTE_ETH_NAME_MAX_LEN ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };
@@ -2545,8 +2516,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)return 0 ; } - speed =RTE_ETH_SPEED_NUM_10G ; -/* use tap%d which causes kernel to choose next available */ strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN );memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN );
@@ -2587,7 +2556,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) persist =1 ; } } - pmd_link.link_speed = speed;TAP_LOG (DEBUG ,"Initializing pmd_tap for %s" , name);
Signature · 1 line
2.51.0
PATCH v3 3/10 net/tap: clarify TUN/TAP flag assignment
In reply to Stephen HemmingerAdd parentheses in the ternary expression that relied on operator precedence between '?:' and '|'. No functional change.
--- drivers/net/tap/rte_eth_tap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/tap/rte_eth_tap.c +2 -1
@@ -155,7 +155,8 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* to check if a received packet has been truncated. */ ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ; +IFF_TAP : (IFF_TUN |IFF_POINTOPOINT ); +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );
Signature · 1 line
2.51.0
PATCH v3 4/10 net/tap: extend fixed MAC range to 16 bits
In reply to Stephen HemmingerThe generated fixed MAC address stored the interface index in a single byte, which wraps after 256 devices and produces duplicate MACs under repeated hot-plug. Spread the index across the last two bytes of the address, extending the unique range to 65536.
--- drivers/net/tap/rte_eth_tap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/tap/rte_eth_tap.c +9 -7
@@ -2274,13 +2274,15 @@ set_mac_type(const char *key __rte_unused,return 0 ;if (!strncasecmp (ETH_TAP_MAC_FIXED , value,strlen (ETH_TAP_MAC_FIXED ))) { -static int iface_idx; - -/* fixed mac = 02:64:74:61:70:<iface_idx> */ -memcpy ((char *)user_mac->addr_bytes,"\002dtap" , -RTE_ETHER_ADDR_LEN ); - user_mac->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] = - iface_idx++ +'0' ; +static uint16_t iface_idx; + +/* fixed mac that is locally assigned based off of iface_idx. */ + user_mac->addr_bytes[0 ] =RTE_ETHER_LOCAL_ADMIN_ADDR ;/* 0x2 */ + user_mac->addr_bytes[1 ] ='d' ; + user_mac->addr_bytes[2 ] ='t' ; + user_mac->addr_bytes[3 ] ='a' ; + user_mac->addr_bytes[4 ] ='p' + (iface_idx >>8 ); + user_mac->addr_bytes[5 ] ='0' + (uint8_t )iface_idx++; goto success; }
Signature · 1 line
2.51.0
PATCH v3 5/10 net/tap: skip checksum on truncated L4 headers
In reply to Stephen HemmingerAdd a bounds check before accessing the UDP or TCP header in tap_verify_csum(). A single-segment packet whose L4 header extends past rte_pktmbuf_data_len() would cause an out-of-bounds read.
--- drivers/net/tap/rte_eth_tap.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/tap/rte_eth_tap.c +7 -0
@@ -365,8 +365,15 @@ tap_verify_csum(struct rte_mbuf *mbuf)*/ return ; } +if (l4 ==RTE_PTYPE_L4_UDP || l4 ==RTE_PTYPE_L4_TCP ) {int cksum_ok; +const unsigned int l4_min_len = (l4 ==RTE_PTYPE_L4_UDP ) + ?sizeof (struct rte_udp_hdr ) :sizeof (struct rte_tcp_hdr ); + +/* Don't verify checksum if L4 header is truncated */ +if (l2_len + l3_len + l4_min_len >rte_pktmbuf_data_len (mbuf)) +return ; l4_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len + l3_len);/* Don't verify checksum for multi-segment packets. */
Signature · 1 line
2.51.0
PATCH v3 6/10 net/tap: fix resource leaks in tap create error path
In reply to Stephen HemmingerCorrect two leaks in eth_dev_tap_create():
- process_private was never freed on error_exit. Add free() before releasing the port.
- If the process_private malloc failed, the function returned -1 directly without releasing the ethdev port allocated by rte_eth_vdev_allocate(). Jump to a new error_exit_nodev_release label instead.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -2010,7 +2010,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, process_private =malloc (sizeof (struct pmd_process_private ));if (process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto error_exit_nodev_release; }memset (process_private,0 ,sizeof (struct pmd_process_private ));
@@ -2200,9 +2200,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,close (pmd->nlsk_fd);if (pmd->ka_fd !=-1 )close (pmd->ka_fd); +rte_intr_instance_free (pmd->intr_handle); +free (dev->process_private); + +error_exit_nodev_release:/* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs =NULL ; -rte_intr_instance_free (pmd->intr_handle);rte_eth_dev_release_port (dev); error_exit_nodev:
Signature · 1 line
2.51.0
PATCH v3 7/10 net/tap: fix resource leaks in secondary process probe
In reply to Stephen HemmingerFour error paths in the secondary-process branch of rte_pmd_tap_probe() returned -1 without cleanup:
- primary process not alive: leaked eth_dev
- process_private malloc failure: leaked eth_dev
- tap_mp_attach_queues failure: leaked eth_dev and process_private
- rte_mp_action_register failure: leaked eth_dev and process_private
Add secondary_fail and secondary_fail_pp labels to free process_private and release the ethdev port.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -4
@@ -2502,31 +2502,38 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) eth_dev->tx_pkt_burst = pmd_tx_burst;if (!rte_eal_primary_proc_alive (NULL )) {TAP_LOG (ERR ,"Primary process is missing" ); -return -1 ; + goto secondary_fail; } eth_dev->process_private =malloc (sizeof (struct pmd_process_private ));if (eth_dev->process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto secondary_fail; }memset (eth_dev->process_private,0 ,sizeof (struct pmd_process_private )); ret =tap_mp_attach_queues (name, eth_dev);if (ret !=0 ) -return -1 ; + goto secondary_fail_pp;if (!tap_devices_count) { ret =rte_mp_action_register (TAP_MP_REQ_START_RXTX , tap_mp_req_start_rxtx);if (ret <0 && rte_errno !=ENOTSUP ) {TAP_LOG (ERR ,"tap: Failed to register IPC callback: %s" ,strerror (rte_errno)); -return -1 ; + goto secondary_fail_pp; } } tap_devices_count++;rte_eth_dev_probing_finish (eth_dev);return 0 ; + +secondary_fail_pp: +free (eth_dev->process_private); + eth_dev->process_private =NULL ; +secondary_fail: +rte_eth_dev_release_port (eth_dev); +return -1 ; }/* use tap%d which causes kernel to choose next available */
Signature · 1 line
2.51.0
PATCH v3 8/10 net/tap: free IPC reply buffer on queue count mismatch
In reply to Stephen HemmingerIn tap_mp_attach_queues(), if the reply queue count does not match the number of received file descriptors, the function returns -1 without freeing the reply buffer allocated by rte_mp_request_sync(). Add the missing free().
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tap/rte_eth_tap.c +1 -0
@@ -2407,6 +2407,7 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)/* Attach the queues from received file descriptors */ if (reply_param->q_count != reply->num_fds) {TAP_LOG (ERR ,"Unexpected number of fds received" ); +free (reply);return -1 ; }
Signature · 1 line
2.51.0
PATCH v3 9/10 net/tap: fix use-after-free on remote flow creation failure
In reply to Stephen HemmingerAfter a local TC filter rule is installed and the flow is inserted into pmd->flows, failure during remote flow creation jumps to the fail label which frees the flow without removing it from the list and without deleting the kernel-side TC rule.
Send RTM_DELTFILTER to clean up the local rule and call LIST_REMOVE before freeing.
Bugzilla ID: 1881
--- drivers/net/tap/tap_flow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tap/tap_flow.c +13 -6
@@ -1293,7 +1293,7 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"cannot allocate memory for rte_flow" ); - goto fail; + goto fail_remove; } msg = &remote_flow->msg;/* set the rule if_index for the remote netdevice */
@@ -1307,14 +1307,14 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"rte flow rule validation failed" ); - goto fail; + goto fail_remove; } err =tap_nl_send (pmd->nlsk_fd, &msg->nh);if (err <0 ) {rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failure sending nl request" ); - goto fail; + goto fail_remove; } err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {
@@ -1325,15 +1325,22 @@ tap_flow_create(struct rte_eth_dev *dev, error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , "overlapping rules or Kernel too old for flower support"); - goto fail; + goto fail_remove; } flow->remote_flow = remote_flow; }return flow; + +fail_remove: +/* Delete the local TC rule that was already installed */ + flow->msg.nh.nlmsg_flags =NLM_F_REQUEST |NLM_F_ACK ; + flow->msg.nh.nlmsg_type =RTM_DELTFILTER ; +if (tap_nl_send (pmd->nlsk_fd, &flow->msg.nh) >=0 ) +tap_nl_recv_ack (pmd->nlsk_fd); +LIST_REMOVE (flow, next); fail:rte_free (remote_flow); -if (flow) -tap_flow_free (pmd, flow); +tap_flow_free (pmd, flow);return NULL ; }
Signature · 1 line
2.51.0
PATCH v3 10/10 net/tap: free remote flow when implicit rule already exists
In reply to Stephen HemmingerWhen tap_flow_implicit_create() gets EEXIST from the kernel, the allocated remote_flow is never freed. Add rte_free() on that path.
Bugzilla ID: 1880
--- drivers/net/tap/tap_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap/tap_flow.c +3 -1
@@ -1625,8 +1625,10 @@ int tap_flow_implicit_create(struct pmd_internals *pmd, err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {/* Silently ignore re-entering existing rule */ -if (errno ==EEXIST ) +if (errno ==EEXIST ) { +rte_free (remote_flow); goto success; + }TAP_LOG (ERR ,"Kernel refused TC filter rule creation (%d): %s" , errno,strerror (errno));
Signature · 1 line
2.51.0
cover net/tap: cleanups and bug fixes
In reply to Stephen HemmingerPatches 1-3 are minor cleanups: replace the runtime speed capability function with a compile-time constant (TAP is always 10G), clarify TUN/TAP flag operator precedence with parentheses, and extend the fixed MAC index to 16 bits to avoid duplicates after 256 hot-plug cycles.
Patches 4-9 fix bugs tagged for stable: a bounds check to prevent an out-of-bounds read on truncated L4 headers; resource leaks in the primary and secondary process probe error paths; a missing free of the IPC reply buffer on queue count mismatch; a use-after-free with an orphaned kernel TC rule when remote flow creation fails; and a leaked remote_flow allocation on EEXIST from an implicit rule.
Patch 10 adds a unit test suite for the TAP PMD modeled on the ring PMD tests, covering configuration, link, stats, MTU, MAC, promisc, allmulti, queue start/stop, link up/down, stop/start, and multi-queue.
v4 - fix build on clang
Stephen Hemminger (10):
net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists
test: add unit tests for TAP PMD
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 907 ++++++++++++++++++++++++++++++++++ drivers/net/tap/rte_eth_tap.c | 97 ++-- drivers/net/tap/tap_flow.c | 23 +- 4 files changed, 967 insertions(+), 61 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Signature · 1 line
2.51.0
PATCH v4 1/10 net/tap: replace runtime speed capability with constant
The TAP/TUN virtual device always operates at 10G. The link speed is set in the static initializer for pmd_link, so the runtime assignments in rte_pmd_tap_probe() and rte_pmd_tun_probe() are redundant.
Replace tap_dev_speed_capa(), which dynamically computed speed capabilities against pmd_link.link_speed, with a compile-time constant TAP_SPEED_CAPA. Remove the unused 'speed' variable and redundant assignments.
--- drivers/net/tap/rte_eth_tap.c | 48 ++++++----------------------------- 1 file changed, 8 insertions(+), 40 deletions(-)
drivers/net/tap/rte_eth_tap.c +8 -40
@@ -891,39 +891,13 @@ tap_dev_configure(struct rte_eth_dev *dev)return 0 ; } -static uint32_t -tap_dev_speed_capa (void ) -{ -uint32_t speed = pmd_link.link_speed; -uint32_t capa =0 ; - -if (speed >=RTE_ETH_SPEED_NUM_10M ) - capa |=RTE_ETH_LINK_SPEED_10M ; -if (speed >=RTE_ETH_SPEED_NUM_100M ) - capa |=RTE_ETH_LINK_SPEED_100M ; -if (speed >=RTE_ETH_SPEED_NUM_1G ) - capa |=RTE_ETH_LINK_SPEED_1G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_2_5G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_5G ; -if (speed >=RTE_ETH_SPEED_NUM_10G ) - capa |=RTE_ETH_LINK_SPEED_10G ; -if (speed >=RTE_ETH_SPEED_NUM_20G ) - capa |=RTE_ETH_LINK_SPEED_20G ; -if (speed >=RTE_ETH_SPEED_NUM_25G ) - capa |=RTE_ETH_LINK_SPEED_25G ; -if (speed >=RTE_ETH_SPEED_NUM_40G ) - capa |=RTE_ETH_LINK_SPEED_40G ; -if (speed >=RTE_ETH_SPEED_NUM_50G ) - capa |=RTE_ETH_LINK_SPEED_50G ; -if (speed >=RTE_ETH_SPEED_NUM_56G ) - capa |=RTE_ETH_LINK_SPEED_56G ; -if (speed >=RTE_ETH_SPEED_NUM_100G ) - capa |=RTE_ETH_LINK_SPEED_100G ; - -return capa; -} +/* Speed capabilities for virtual TAP/TUN device (always 10G) */ +#define TAP_SPEED_CAPA (RTE_ETH_LINK_SPEED_10M | \ + RTE_ETH_LINK_SPEED_100M | \ + RTE_ETH_LINK_SPEED_1G | \ + RTE_ETH_LINK_SPEED_2_5G | \ + RTE_ETH_LINK_SPEED_5G | \ + RTE_ETH_LINK_SPEED_10G)static int tap_dev_info (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info)
@@ -936,7 +910,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->max_tx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->min_rx_bufsize =0 ; - dev_info->speed_capa =tap_dev_speed_capa (); + dev_info->speed_capa =TAP_SPEED_CAPA ; dev_info->rx_queue_offload_capa =TAP_RX_OFFLOAD ; dev_info->rx_offload_capa = dev_info->rx_queue_offload_capa; dev_info->tx_queue_offload_capa =TAP_TX_OFFLOAD ;
@@ -2325,7 +2299,6 @@ set_mac_type(const char *key __rte_unused,* Open a TUN interface device. TUN PMD * 1) sets tap_type as false * 2) intakes iface as argument. -* 3) as interface is virtual set speed to 10G */ static int rte_pmd_tun_probe (struct rte_vdev_device *dev)
@@ -2373,7 +2346,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } } } - pmd_link.link_speed =RTE_ETH_SPEED_NUM_10G ;TAP_LOG (DEBUG ,"Initializing pmd_tun for %s" , name);
@@ -2495,7 +2467,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -int speed;char tap_name[RTE_ETH_NAME_MAX_LEN ];char remote_iface[RTE_ETH_NAME_MAX_LEN ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };
@@ -2545,8 +2516,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)return 0 ; } - speed =RTE_ETH_SPEED_NUM_10G ; -/* use tap%d which causes kernel to choose next available */ strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN );memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN );
@@ -2587,7 +2556,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) persist =1 ; } } - pmd_link.link_speed = speed;TAP_LOG (DEBUG ,"Initializing pmd_tap for %s" , name);
Signature · 1 line
2.51.0
PATCH v4 2/10 net/tap: clarify TUN/TAP flag assignment
In reply to Stephen HemmingerAdd parentheses in the ternary expression that relied on operator precedence between '?:' and '|'. No functional change.
--- drivers/net/tap/rte_eth_tap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/tap/rte_eth_tap.c +2 -1
@@ -155,7 +155,8 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* to check if a received packet has been truncated. */ ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ; +IFF_TAP : (IFF_TUN |IFF_POINTOPOINT ); +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );
Signature · 1 line
2.51.0
PATCH v4 3/10 net/tap: extend fixed MAC range to 16 bits
In reply to Stephen HemmingerThe generated fixed MAC address stored the interface index in a single byte, which wraps after 256 devices and produces duplicate MACs under repeated hot-plug. Spread the index across the last two bytes of the address, extending the unique range to 65536.
--- drivers/net/tap/rte_eth_tap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/tap/rte_eth_tap.c +9 -7
@@ -2274,13 +2274,15 @@ set_mac_type(const char *key __rte_unused,return 0 ;if (!strncasecmp (ETH_TAP_MAC_FIXED , value,strlen (ETH_TAP_MAC_FIXED ))) { -static int iface_idx; - -/* fixed mac = 02:64:74:61:70:<iface_idx> */ -memcpy ((char *)user_mac->addr_bytes,"\002dtap" , -RTE_ETHER_ADDR_LEN ); - user_mac->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] = - iface_idx++ +'0' ; +static uint16_t iface_idx; + +/* fixed mac that is locally assigned based off of iface_idx. */ + user_mac->addr_bytes[0 ] =RTE_ETHER_LOCAL_ADMIN_ADDR ;/* 0x2 */ + user_mac->addr_bytes[1 ] ='d' ; + user_mac->addr_bytes[2 ] ='t' ; + user_mac->addr_bytes[3 ] ='a' ; + user_mac->addr_bytes[4 ] ='p' + (iface_idx >>8 ); + user_mac->addr_bytes[5 ] ='0' + (uint8_t )iface_idx++; goto success; }
Signature · 1 line
2.51.0
PATCH v4 4/10 net/tap: skip checksum on truncated L4 headers
In reply to Stephen HemmingerAdd a bounds check before accessing the UDP or TCP header in tap_verify_csum(). A single-segment packet whose L4 header extends past rte_pktmbuf_data_len() would cause an out-of-bounds read.
--- drivers/net/tap/rte_eth_tap.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/tap/rte_eth_tap.c +7 -0
@@ -365,8 +365,15 @@ tap_verify_csum(struct rte_mbuf *mbuf)*/ return ; } +if (l4 ==RTE_PTYPE_L4_UDP || l4 ==RTE_PTYPE_L4_TCP ) {int cksum_ok; +const unsigned int l4_min_len = (l4 ==RTE_PTYPE_L4_UDP ) + ?sizeof (struct rte_udp_hdr ) :sizeof (struct rte_tcp_hdr ); + +/* Don't verify checksum if L4 header is truncated */ +if (l2_len + l3_len + l4_min_len >rte_pktmbuf_data_len (mbuf)) +return ; l4_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len + l3_len);/* Don't verify checksum for multi-segment packets. */
Signature · 1 line
2.51.0
PATCH v4 5/10 net/tap: fix resource leaks in tap create error path
In reply to Stephen HemmingerCorrect two leaks in eth_dev_tap_create():
- process_private was never freed on error_exit. Add free() before releasing the port.
- If the process_private malloc failed, the function returned -1 directly without releasing the ethdev port allocated by rte_eth_vdev_allocate(). Jump to a new error_exit_nodev_release label instead.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -2010,7 +2010,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, process_private =malloc (sizeof (struct pmd_process_private ));if (process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto error_exit_nodev_release; }memset (process_private,0 ,sizeof (struct pmd_process_private ));
@@ -2200,9 +2200,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,close (pmd->nlsk_fd);if (pmd->ka_fd !=-1 )close (pmd->ka_fd); +rte_intr_instance_free (pmd->intr_handle); +free (dev->process_private); + +error_exit_nodev_release:/* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs =NULL ; -rte_intr_instance_free (pmd->intr_handle);rte_eth_dev_release_port (dev); error_exit_nodev:
Signature · 1 line
2.51.0
PATCH v4 6/10 net/tap: fix resource leaks in secondary process probe
In reply to Stephen HemmingerFour error paths in the secondary-process branch of rte_pmd_tap_probe() returned -1 without cleanup:
- primary process not alive: leaked eth_dev
- process_private malloc failure: leaked eth_dev
- tap_mp_attach_queues failure: leaked eth_dev and process_private
- rte_mp_action_register failure: leaked eth_dev and process_private
Add secondary_fail and secondary_fail_pp labels to free process_private and release the ethdev port.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -4
@@ -2502,31 +2502,38 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) eth_dev->tx_pkt_burst = pmd_tx_burst;if (!rte_eal_primary_proc_alive (NULL )) {TAP_LOG (ERR ,"Primary process is missing" ); -return -1 ; + goto secondary_fail; } eth_dev->process_private =malloc (sizeof (struct pmd_process_private ));if (eth_dev->process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto secondary_fail; }memset (eth_dev->process_private,0 ,sizeof (struct pmd_process_private )); ret =tap_mp_attach_queues (name, eth_dev);if (ret !=0 ) -return -1 ; + goto secondary_fail_pp;if (!tap_devices_count) { ret =rte_mp_action_register (TAP_MP_REQ_START_RXTX , tap_mp_req_start_rxtx);if (ret <0 && rte_errno !=ENOTSUP ) {TAP_LOG (ERR ,"tap: Failed to register IPC callback: %s" ,strerror (rte_errno)); -return -1 ; + goto secondary_fail_pp; } } tap_devices_count++;rte_eth_dev_probing_finish (eth_dev);return 0 ; + +secondary_fail_pp: +free (eth_dev->process_private); + eth_dev->process_private =NULL ; +secondary_fail: +rte_eth_dev_release_port (eth_dev); +return -1 ; }/* use tap%d which causes kernel to choose next available */
Signature · 1 line
2.51.0
PATCH v4 7/10 net/tap: free IPC reply buffer on queue count mismatch
In reply to Stephen HemmingerIn tap_mp_attach_queues(), if the reply queue count does not match the number of received file descriptors, the function returns -1 without freeing the reply buffer allocated by rte_mp_request_sync(). Add the missing free().
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tap/rte_eth_tap.c +1 -0
@@ -2407,6 +2407,7 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)/* Attach the queues from received file descriptors */ if (reply_param->q_count != reply->num_fds) {TAP_LOG (ERR ,"Unexpected number of fds received" ); +free (reply);return -1 ; }
Signature · 1 line
2.51.0
PATCH v4 8/10 net/tap: fix use-after-free on remote flow creation failure
In reply to Stephen HemmingerAfter a local TC filter rule is installed and the flow is inserted into pmd->flows, failure during remote flow creation jumps to the fail label which frees the flow without removing it from the list and without deleting the kernel-side TC rule.
Send RTM_DELTFILTER to clean up the local rule and call LIST_REMOVE before freeing.
Bugzilla ID: 1881
--- drivers/net/tap/tap_flow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tap/tap_flow.c +13 -6
@@ -1293,7 +1293,7 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"cannot allocate memory for rte_flow" ); - goto fail; + goto fail_remove; } msg = &remote_flow->msg;/* set the rule if_index for the remote netdevice */
@@ -1307,14 +1307,14 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"rte flow rule validation failed" ); - goto fail; + goto fail_remove; } err =tap_nl_send (pmd->nlsk_fd, &msg->nh);if (err <0 ) {rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failure sending nl request" ); - goto fail; + goto fail_remove; } err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {
@@ -1325,15 +1325,22 @@ tap_flow_create(struct rte_eth_dev *dev, error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , "overlapping rules or Kernel too old for flower support"); - goto fail; + goto fail_remove; } flow->remote_flow = remote_flow; }return flow; + +fail_remove: +/* Delete the local TC rule that was already installed */ + flow->msg.nh.nlmsg_flags =NLM_F_REQUEST |NLM_F_ACK ; + flow->msg.nh.nlmsg_type =RTM_DELTFILTER ; +if (tap_nl_send (pmd->nlsk_fd, &flow->msg.nh) >=0 ) +tap_nl_recv_ack (pmd->nlsk_fd); +LIST_REMOVE (flow, next); fail:rte_free (remote_flow); -if (flow) -tap_flow_free (pmd, flow); +tap_flow_free (pmd, flow);return NULL ; }
Signature · 1 line
2.51.0
PATCH v4 9/10 net/tap: free remote flow when implicit rule already exists
In reply to Stephen HemmingerWhen tap_flow_implicit_create() gets EEXIST from the kernel, the allocated remote_flow is never freed. Add rte_free() on that path.
Bugzilla ID: 1880
--- drivers/net/tap/tap_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap/tap_flow.c +3 -1
@@ -1625,8 +1625,10 @@ int tap_flow_implicit_create(struct pmd_internals *pmd, err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {/* Silently ignore re-entering existing rule */ -if (errno ==EEXIST ) +if (errno ==EEXIST ) { +rte_free (remote_flow); goto success; + }TAP_LOG (ERR ,"Kernel refused TC filter rule creation (%d): %s" , errno,strerror (errno));
Signature · 1 line
2.51.0
PATCH v4 10/10 test: add unit tests for TAP PMD
In reply to Stephen HemmingerAdd a standalone test suite for the TAP PMD, modeled on the existing test_pmd_ring tests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.
--- app/test/meson.build | 1 + app/test/test_pmd_tap.c | 907 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 908 insertions(+) create mode 100644 app/test/test_pmd_tap.c
app/test/meson.build +1 -0
@@ -144,6 +144,7 @@ source_file_deps = { 'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps, 'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'], 'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'], + 'test_pmd_tap.c': ['ethdev', 'net_tap', 'bus_vdev'], 'test_pmu.c': ['pmu'], 'test_power.c': ['power', 'power_acpi', 'power_kvm_vm', 'power_intel_pstate', 'power_amd_pstate', 'power_cppc'],
app/test/test_pmd_tap.c new file +907 -0
907 lines not on this page · raw message
Signature · 1 line
2.51.0
v5 cover net/tap: cleanups, bug fixes, and VLA removal
In reply to Stephen HemmingerPatches 1-2 are documentation and bug fixes that stand alone: update the features matrix to match current driver capabilities, and fix queue statistics to count all queues regardless of the queue stat counter limit.
Patch 3 fixes interface name buffers to use IFNAMSIZ instead of RTE_ETH_NAME_MAX_LEN, since these are Linux kernel interface names not DPDK device names.
Patches 4-6 are minor cleanups: replace the runtime speed capability function with a compile-time constant (TAP is always 10G), clarify TUN/TAP flag operator precedence with parentheses, and extend the fixed MAC index to 16 bits to avoid duplicates after 256 hot-plug cycles.
Patches 7-12 fix bugs tagged for stable: a bounds check to prevent an out-of-bounds read on truncated L4 headers; resource leaks in the primary and secondary process probe error paths; a missing free of the IPC reply buffer on queue count mismatch; a use-after-free with an orphaned kernel TC rule when remote flow creation fails; and a leaked remote_flow allocation on EEXIST from an implicit rule.
Patches 13-18 restructure the driver internals: dynamically allocate queue structures instead of embedding fixed-size arrays in pmd_internals; replace the pointer-to-VLA iovec with a flexible array member sized from MTU and mbuf geometry; replace the Tx per-packet VLA with a fixed-size stack array capped at 128 segments; remove the VLA in flow item validation; consolidate per-queue statistics into a common structure; and enable -Wvla warnings.
Patch 19 adds a unit test suite for the TAP PMD covering configuration, link, stats, MTU, MAC, promisc, allmulti, queue start/stop, link up/down, stop/start, and multi-queue.
v5 - use IFNAMSIZ for interface name buffers
- dynamically allocate queue structures
- compute Rx scatter segments from MTU instead of nb_rx_desc
- use flex array for Rx iovecs, fixed stack array for Tx
- consolidate queue statistics
Stephen Hemminger (19):
net/tap: fix handling of queue stats
doc: update tap features
net/tap: use correct length for interface names net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists net/tap: dynamically allocate queue structures net/tap: remove VLA in flow item validation net/tap: fix Rx descriptor vs scatter segment confusion net/tap: replace use of VLA in transmit burst net/tap: consolidate queue statistics
net/tap: enable VLA warnings
test: add unit tests for TAP PMD
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 1143 ++++++++++++++++++++++++++++++ doc/guides/nics/features/tap.ini | 14 +- drivers/net/tap/meson.build | 1 - drivers/net/tap/rte_eth_tap.c | 411 ++++++----- drivers/net/tap/rte_eth_tap.h | 28 +- drivers/net/tap/tap_flow.c | 36 +- 7 files changed, 1424 insertions(+), 210 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Signature · 1 line
2.51.0
PATCH v5 1/19 net/tap: fix handling of queue stats
Drivers are supposed to account for packets in all queues. If RTE_ETHDEV_QUEUE_STAT_CNTRS is configured to a small value, the TAP PMD would skip counting some queues in the accumulated totals.
Also, use memset to clear stats since that is more future proof if new stats are added.
--- drivers/net/tap/rte_eth_tap.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -22
@@ -956,17 +956,15 @@ static int tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats, struct eth_queue_stats *qstats) { - unsigned int i, imax; -unsigned long rx_total =0 , tx_total =0 , tx_err_total =0 ; -unsigned long rx_bytes_total =0 , tx_bytes_total =0 ; -unsigned long rx_nombuf =0 , ierrors =0 ; + unsigned int i; +uint64_t rx_total =0 , tx_total =0 , tx_err_total =0 ; +uint64_t rx_bytes_total =0 , tx_bytes_total =0 ; +uint64_t rx_nombuf =0 , ierrors =0 ;const struct pmd_internals *pmd = dev->data->dev_private;/* rx queue statistics */ - imax = (dev->data->nb_rx_queues <RTE_ETHDEV_QUEUE_STAT_CNTRS ) ? - dev->data->nb_rx_queues :RTE_ETHDEV_QUEUE_STAT_CNTRS ; -for (i =0 ; i < imax; i++) { -if (qstats !=NULL ) { +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { qstats->q_ipackets[i] = pmd->rxq[i].stats.ipackets; qstats->q_ibytes[i] = pmd->rxq[i].stats.ibytes; }
@@ -977,11 +975,8 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats, }/* tx queue statistics */ - imax = (dev->data->nb_tx_queues <RTE_ETHDEV_QUEUE_STAT_CNTRS ) ? - dev->data->nb_tx_queues :RTE_ETHDEV_QUEUE_STAT_CNTRS ; - -for (i =0 ; i < imax; i++) { -if (qstats !=NULL ) { +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { qstats->q_opackets[i] = pmd->txq[i].stats.opackets; qstats->q_obytes[i] = pmd->txq[i].stats.obytes; }
@@ -1003,18 +998,12 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats,static int tap_stats_reset (struct rte_eth_dev *dev) { -int i; +unsigned int i;struct pmd_internals *pmd = dev->data->dev_private;for (i =0 ; i <RTE_PMD_TAP_MAX_QUEUES ; i++) { - pmd->rxq[i].stats.ipackets =0 ; - pmd->rxq[i].stats.ibytes =0 ; - pmd->rxq[i].stats.ierrors =0 ; - pmd->rxq[i].stats.rx_nombuf =0 ; - - pmd->txq[i].stats.opackets =0 ; - pmd->txq[i].stats.errs =0 ; - pmd->txq[i].stats.obytes =0 ; +memset (&pmd->rxq[i].stats,0 ,sizeof (struct pkt_stats )); +memset (&pmd->txq[i].stats,0 ,sizeof (struct pkt_stats )); }return 0 ;
Signature · 1 line
2.51.0
PATCH v5 2/19 doc: update tap features
In reply to Stephen HemmingerThe features matrix for TAP PMD did not match what is currently available in the driver.
Also, reorder to match the order in default.ini
--- doc/guides/nics/features/tap.ini | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
doc/guides/nics/features/tap.ini +9 -5
@@ -8,16 +8,20 @@ Speed capabilities = P Link status = Y Link status event = Y Rx interrupt = Y +Queue start/stop = Y +MTU update = Y +Scattered Rx = Y Promiscuous mode = Y Allmulticast mode = Y -Basic stats = Y +Unicast MAC filter = P +Multicast MAC filter = Y +RSS hash = P +Flow control = P L3 checksum offload = Y L4 checksum offload = Y -MTU update = Y -Multicast MAC filter = Y -Unicast MAC filter = Y Packet type parsing = Y -Flow control = Y +Basic stats = Y +Multiprocess aware = Y Linux = Y ARMv7 = Y ARMv8 = Y
Signature · 1 line
2.51.0
PATCH v5 3/19 net/tap: use correct length for interface names
In reply to Stephen HemmingerThe interface names in the driver internals are Linux kernel network interface names which have a maximum size of 16; not DPDK device names which can take up to 64 characters.
--- drivers/net/tap/rte_eth_tap.c | 28 ++++++++++++++-------------- drivers/net/tap/rte_eth_tap.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/tap/rte_eth_tap.c +14 -14
@@ -203,7 +203,7 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* and need to find the resulting device. */ TAP_LOG (DEBUG ,"Device name is '%s'" , ifr.ifr_name); -strlcpy (pmd->name, ifr.ifr_name,RTE_ETH_NAME_MAX_LEN ); +strlcpy (pmd->name, ifr.ifr_name,IFNAMSIZ );if (is_keepalive) {/*
@@ -1994,7 +1994,7 @@ static const struct eth_dev_ops ops = {static int eth_dev_tap_create (struct rte_vdev_device *vdev,const char *tap_name, -char *remote_iface,struct rte_ether_addr *mac_addr, +const char *remote_iface,struct rte_ether_addr *mac_addr,enum rte_tuntap_type type,int persist) {int numa_node =rte_socket_id ();
@@ -2137,7 +2137,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, pmd->name, remote_iface); goto error_remote; } -strlcpy (pmd->remote_iface, remote_iface,RTE_ETH_NAME_MAX_LEN ); +strlcpy (pmd->remote_iface, remote_iface,IFNAMSIZ );/* Save state of remote device */ if (tap_nl_get_flags(pmd->nlsk_fd, pmd->remote_if_index,
@@ -2250,10 +2250,10 @@ set_interface_name(const char *key __rte_unused, value);return -1 ; } -strlcpy (name, value,RTE_ETH_NAME_MAX_LEN ); +strlcpy (name, value,IFNAMSIZ ); }else {/* use tap%d which causes kernel to choose next available */ -strlcpy (name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN ); +strlcpy (name,DEFAULT_TAP_NAME "%d" ,IFNAMSIZ ); }return 0 ; }
@@ -2271,7 +2271,7 @@ set_remote_iface(const char *key __rte_unused, value);return -1 ; } -strlcpy (name, value,RTE_ETH_NAME_MAX_LEN ); +strlcpy (name, value,IFNAMSIZ ); }return 0 ;
@@ -2322,13 +2322,13 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -char tun_name[RTE_ETH_NAME_MAX_LEN ]; -char remote_iface[RTE_ETH_NAME_MAX_LEN ]; +char tun_name[IFNAMSIZ ]; +char remote_iface[IFNAMSIZ ];struct rte_eth_dev *eth_dev; name =rte_vdev_device_name (dev); params =rte_vdev_device_args (dev); -memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN ); +memset (remote_iface,0 ,IFNAMSIZ );if (rte_eal_process_type () ==RTE_PROC_SECONDARY &&strlen (params) ==0 ) {
@@ -2344,7 +2344,7 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) }/* use tun%d which causes kernel to choose next available */ -strlcpy (tun_name,DEFAULT_TUN_NAME "%d" ,RTE_ETH_NAME_MAX_LEN ); +strlcpy (tun_name,DEFAULT_TUN_NAME "%d" ,IFNAMSIZ );if (params && (params[0 ] !='\0' )) {TAP_LOG (DEBUG ,"parameters (%s)" , params);
@@ -2485,8 +2485,8 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)int ret;struct rte_kvargs *kvlist =NULL ;int speed; -char tap_name[RTE_ETH_NAME_MAX_LEN ]; -char remote_iface[RTE_ETH_NAME_MAX_LEN ]; +char tap_name[IFNAMSIZ ]; +char remote_iface[IFNAMSIZ ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };struct rte_eth_dev *eth_dev;int tap_devices_count_increased =0 ;
@@ -2537,8 +2537,8 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) speed =RTE_ETH_SPEED_NUM_10G ;/* use tap%d which causes kernel to choose next available */ -strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,RTE_ETH_NAME_MAX_LEN ); -memset (remote_iface,0 ,RTE_ETH_NAME_MAX_LEN ); +strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,IFNAMSIZ ); +memset (remote_iface,0 ,IFNAMSIZ );if (params && (params[0 ] !='\0' )) {TAP_LOG (DEBUG ,"parameters (%s)" , params);
drivers/net/tap/rte_eth_tap.h +2 -2
@@ -68,8 +68,8 @@ struct tx_queue {struct pmd_internals {struct rte_eth_dev *dev;/* Ethernet device. */ -char remote_iface[RTE_ETH_NAME_MAX_LEN ];/* Remote netdevice name */ -char name[RTE_ETH_NAME_MAX_LEN ];/* Internal Tap device name */ +char remote_iface[IFNAMSIZ ];/* Remote netdevice name */ +char name[IFNAMSIZ ];/* Internal Tap device name */ int type;/* Type field - TUN|TAP */ int persist;/* 1 if keep link up, else 0 */ struct rte_ether_addr eth_addr;/* Mac address of the device port */
Signature · 1 line
2.51.0
PATCH v5 4/19 net/tap: replace runtime speed capability with constant
In reply to Stephen HemmingerThe TAP/TUN virtual device always operates at 10G. The link speed is set in the static initializer for pmd_link, so the runtime assignments in rte_pmd_tap_probe() and rte_pmd_tun_probe() are redundant.
Replace tap_dev_speed_capa(), which dynamically computed speed capabilities against pmd_link.link_speed, with a compile-time constant TAP_SPEED_CAPA. Remove the unused 'speed' variable and redundant assignments.
--- drivers/net/tap/rte_eth_tap.c | 48 ++++++----------------------------- 1 file changed, 8 insertions(+), 40 deletions(-)
drivers/net/tap/rte_eth_tap.c +8 -40
@@ -891,39 +891,13 @@ tap_dev_configure(struct rte_eth_dev *dev)return 0 ; } -static uint32_t -tap_dev_speed_capa (void ) -{ -uint32_t speed = pmd_link.link_speed; -uint32_t capa =0 ; - -if (speed >=RTE_ETH_SPEED_NUM_10M ) - capa |=RTE_ETH_LINK_SPEED_10M ; -if (speed >=RTE_ETH_SPEED_NUM_100M ) - capa |=RTE_ETH_LINK_SPEED_100M ; -if (speed >=RTE_ETH_SPEED_NUM_1G ) - capa |=RTE_ETH_LINK_SPEED_1G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_2_5G ; -if (speed >=RTE_ETH_SPEED_NUM_5G ) - capa |=RTE_ETH_LINK_SPEED_5G ; -if (speed >=RTE_ETH_SPEED_NUM_10G ) - capa |=RTE_ETH_LINK_SPEED_10G ; -if (speed >=RTE_ETH_SPEED_NUM_20G ) - capa |=RTE_ETH_LINK_SPEED_20G ; -if (speed >=RTE_ETH_SPEED_NUM_25G ) - capa |=RTE_ETH_LINK_SPEED_25G ; -if (speed >=RTE_ETH_SPEED_NUM_40G ) - capa |=RTE_ETH_LINK_SPEED_40G ; -if (speed >=RTE_ETH_SPEED_NUM_50G ) - capa |=RTE_ETH_LINK_SPEED_50G ; -if (speed >=RTE_ETH_SPEED_NUM_56G ) - capa |=RTE_ETH_LINK_SPEED_56G ; -if (speed >=RTE_ETH_SPEED_NUM_100G ) - capa |=RTE_ETH_LINK_SPEED_100G ; - -return capa; -} +/* Speed capabilities for virtual TAP/TUN device (always 10G) */ +#define TAP_SPEED_CAPA (RTE_ETH_LINK_SPEED_10M | \ + RTE_ETH_LINK_SPEED_100M | \ + RTE_ETH_LINK_SPEED_1G | \ + RTE_ETH_LINK_SPEED_2_5G | \ + RTE_ETH_LINK_SPEED_5G | \ + RTE_ETH_LINK_SPEED_10G)static int tap_dev_info (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info)
@@ -936,7 +910,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->max_tx_queues =RTE_PMD_TAP_MAX_QUEUES ; dev_info->min_rx_bufsize =0 ; - dev_info->speed_capa =tap_dev_speed_capa (); + dev_info->speed_capa =TAP_SPEED_CAPA ; dev_info->rx_queue_offload_capa =TAP_RX_OFFLOAD ; dev_info->rx_offload_capa = dev_info->rx_queue_offload_capa; dev_info->tx_queue_offload_capa =TAP_TX_OFFLOAD ;
@@ -2314,7 +2288,6 @@ set_mac_type(const char *key __rte_unused,* Open a TUN interface device. TUN PMD * 1) sets tap_type as false * 2) intakes iface as argument. -* 3) as interface is virtual set speed to 10G */ static int rte_pmd_tun_probe (struct rte_vdev_device *dev)
@@ -2362,7 +2335,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } } } - pmd_link.link_speed =RTE_ETH_SPEED_NUM_10G ;TAP_LOG (DEBUG ,"Initializing pmd_tun for %s" , name);
@@ -2484,7 +2456,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)const char *name, *params;int ret;struct rte_kvargs *kvlist =NULL ; -int speed;char tap_name[IFNAMSIZ ];char remote_iface[IFNAMSIZ ];struct rte_ether_addr user_mac = { .addr_bytes = {0 } };
@@ -2534,8 +2505,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)return 0 ; } - speed =RTE_ETH_SPEED_NUM_10G ; -/* use tap%d which causes kernel to choose next available */ strlcpy (tap_name,DEFAULT_TAP_NAME "%d" ,IFNAMSIZ );memset (remote_iface,0 ,IFNAMSIZ );
@@ -2576,7 +2545,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) persist =1 ; } } - pmd_link.link_speed = speed;TAP_LOG (DEBUG ,"Initializing pmd_tap for %s" , name);
Signature · 1 line
2.51.0
PATCH v5 5/19 net/tap: clarify TUN/TAP flag assignment
In reply to Stephen HemmingerAdd parentheses in the ternary expression that relied on operator precedence between '?:' and '|'. No functional change.
--- drivers/net/tap/rte_eth_tap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/tap/rte_eth_tap.c +2 -1
@@ -155,7 +155,8 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive, int persistent)* to check if a received packet has been truncated. */ ifr.ifr_flags = (pmd->type ==ETH_TUNTAP_TYPE_TAP ) ? -IFF_TAP :IFF_TUN |IFF_POINTOPOINT ; +IFF_TAP : (IFF_TUN |IFF_POINTOPOINT ); +strlcpy (ifr.ifr_name, pmd->name,IFNAMSIZ ); fd =open (TUN_TAP_DEV_PATH ,O_RDWR );
Signature · 1 line
2.51.0
PATCH v5 6/19 net/tap: extend fixed MAC range to 16 bits
In reply to Stephen HemmingerThe generated fixed MAC address stored the interface index in a single byte, which wraps after 256 devices and produces duplicate MACs under repeated hot-plug. Spread the index across the last two bytes of the address, extending the unique range to 65536.
--- drivers/net/tap/rte_eth_tap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/tap/rte_eth_tap.c +9 -7
@@ -2263,13 +2263,15 @@ set_mac_type(const char *key __rte_unused,return 0 ;if (!strncasecmp (ETH_TAP_MAC_FIXED , value,strlen (ETH_TAP_MAC_FIXED ))) { -static int iface_idx; - -/* fixed mac = 02:64:74:61:70:<iface_idx> */ -memcpy ((char *)user_mac->addr_bytes,"\002dtap" , -RTE_ETHER_ADDR_LEN ); - user_mac->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] = - iface_idx++ +'0' ; +static uint16_t iface_idx; + +/* fixed mac that is locally assigned based off of iface_idx. */ + user_mac->addr_bytes[0 ] =RTE_ETHER_LOCAL_ADMIN_ADDR ;/* 0x2 */ + user_mac->addr_bytes[1 ] ='d' ; + user_mac->addr_bytes[2 ] ='t' ; + user_mac->addr_bytes[3 ] ='a' ; + user_mac->addr_bytes[4 ] ='p' + (iface_idx >>8 ); + user_mac->addr_bytes[5 ] ='0' + (uint8_t )iface_idx++; goto success; }
Signature · 1 line
2.51.0
PATCH v5 7/19 net/tap: skip checksum on truncated L4 headers
In reply to Stephen HemmingerAdd a bounds check before accessing the UDP or TCP header in tap_verify_csum(). A single-segment packet whose L4 header extends past rte_pktmbuf_data_len() would cause an out-of-bounds read.
--- drivers/net/tap/rte_eth_tap.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/tap/rte_eth_tap.c +7 -0
@@ -365,8 +365,15 @@ tap_verify_csum(struct rte_mbuf *mbuf)*/ return ; } +if (l4 ==RTE_PTYPE_L4_UDP || l4 ==RTE_PTYPE_L4_TCP ) {int cksum_ok; +const unsigned int l4_min_len = (l4 ==RTE_PTYPE_L4_UDP ) + ?sizeof (struct rte_udp_hdr ) :sizeof (struct rte_tcp_hdr ); + +/* Don't verify checksum if L4 header is truncated */ +if (l2_len + l3_len + l4_min_len >rte_pktmbuf_data_len (mbuf)) +return ; l4_hdr = rte_pktmbuf_mtod_offset(mbuf, void *, l2_len + l3_len);/* Don't verify checksum for multi-segment packets. */
Signature · 1 line
2.51.0
PATCH v5 8/19 net/tap: fix resource leaks in tap create error path
In reply to Stephen HemmingerCorrect two leaks in eth_dev_tap_create():
- process_private was never freed on error_exit. Add free() before releasing the port.
- If the process_private malloc failed, the function returned -1 directly without releasing the ethdev port allocated by rte_eth_vdev_allocate(). Jump to a new error_exit_nodev_release label instead.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +5 -2
@@ -1999,7 +1999,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, process_private =malloc (sizeof (struct pmd_process_private ));if (process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto error_exit_nodev_release; }memset (process_private,0 ,sizeof (struct pmd_process_private ));
@@ -2189,9 +2189,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,close (pmd->nlsk_fd);if (pmd->ka_fd !=-1 )close (pmd->ka_fd); +rte_intr_instance_free (pmd->intr_handle); +free (dev->process_private); + +error_exit_nodev_release:/* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs =NULL ; -rte_intr_instance_free (pmd->intr_handle);rte_eth_dev_release_port (dev); error_exit_nodev:
Signature · 1 line
2.51.0
PATCH v5 9/19 net/tap: fix resource leaks in secondary process probe
In reply to Stephen HemmingerFour error paths in the secondary-process branch of rte_pmd_tap_probe() returned -1 without cleanup:
- primary process not alive: leaked eth_dev
- process_private malloc failure: leaked eth_dev
- tap_mp_attach_queues failure: leaked eth_dev and process_private
- rte_mp_action_register failure: leaked eth_dev and process_private
Add secondary_fail and secondary_fail_pp labels to free process_private and release the ethdev port.
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/tap/rte_eth_tap.c +11 -4
@@ -2491,31 +2491,38 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) eth_dev->tx_pkt_burst = pmd_tx_burst;if (!rte_eal_primary_proc_alive (NULL )) {TAP_LOG (ERR ,"Primary process is missing" ); -return -1 ; + goto secondary_fail; } eth_dev->process_private =malloc (sizeof (struct pmd_process_private ));if (eth_dev->process_private ==NULL ) {TAP_LOG (ERR ,"Failed to alloc memory for process private" ); -return -1 ; + goto secondary_fail; }memset (eth_dev->process_private,0 ,sizeof (struct pmd_process_private )); ret =tap_mp_attach_queues (name, eth_dev);if (ret !=0 ) -return -1 ; + goto secondary_fail_pp;if (!tap_devices_count) { ret =rte_mp_action_register (TAP_MP_REQ_START_RXTX , tap_mp_req_start_rxtx);if (ret <0 && rte_errno !=ENOTSUP ) {TAP_LOG (ERR ,"tap: Failed to register IPC callback: %s" ,strerror (rte_errno)); -return -1 ; + goto secondary_fail_pp; } } tap_devices_count++;rte_eth_dev_probing_finish (eth_dev);return 0 ; + +secondary_fail_pp: +free (eth_dev->process_private); + eth_dev->process_private =NULL ; +secondary_fail: +rte_eth_dev_release_port (eth_dev); +return -1 ; }/* use tap%d which causes kernel to choose next available */
Signature · 1 line
2.51.0
PATCH v5 10/19 net/tap: free IPC reply buffer on queue count mismatch
In reply to Stephen HemmingerIn tap_mp_attach_queues(), if the reply queue count does not match the number of received file descriptors, the function returns -1 without freeing the reply buffer allocated by rte_mp_request_sync(). Add the missing free().
Bugzilla ID: 1881
--- drivers/net/tap/rte_eth_tap.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tap/rte_eth_tap.c +1 -0
@@ -2396,6 +2396,7 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev)/* Attach the queues from received file descriptors */ if (reply_param->q_count != reply->num_fds) {TAP_LOG (ERR ,"Unexpected number of fds received" ); +free (reply);return -1 ; }
Signature · 1 line
2.51.0
PATCH v5 11/19 net/tap: fix use-after-free on remote flow creation failure
In reply to Stephen HemmingerAfter a local TC filter rule is installed and the flow is inserted into pmd->flows, failure during remote flow creation jumps to the fail label which frees the flow without removing it from the list and without deleting the kernel-side TC rule.
Send RTM_DELTFILTER to clean up the local rule and call LIST_REMOVE before freeing.
Bugzilla ID: 1881
--- drivers/net/tap/tap_flow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tap/tap_flow.c +13 -6
@@ -1293,7 +1293,7 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"cannot allocate memory for rte_flow" ); - goto fail; + goto fail_remove; } msg = &remote_flow->msg;/* set the rule if_index for the remote netdevice */
@@ -1307,14 +1307,14 @@ tap_flow_create(struct rte_eth_dev *dev,rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"rte flow rule validation failed" ); - goto fail; + goto fail_remove; } err =tap_nl_send (pmd->nlsk_fd, &msg->nh);if (err <0 ) {rte_flow_error_set ( error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failure sending nl request" ); - goto fail; + goto fail_remove; } err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {
@@ -1325,15 +1325,22 @@ tap_flow_create(struct rte_eth_dev *dev, error,ENOMEM ,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , "overlapping rules or Kernel too old for flower support"); - goto fail; + goto fail_remove; } flow->remote_flow = remote_flow; }return flow; + +fail_remove: +/* Delete the local TC rule that was already installed */ + flow->msg.nh.nlmsg_flags =NLM_F_REQUEST |NLM_F_ACK ; + flow->msg.nh.nlmsg_type =RTM_DELTFILTER ; +if (tap_nl_send (pmd->nlsk_fd, &flow->msg.nh) >=0 ) +tap_nl_recv_ack (pmd->nlsk_fd); +LIST_REMOVE (flow, next); fail:rte_free (remote_flow); -if (flow) -tap_flow_free (pmd, flow); +tap_flow_free (pmd, flow);return NULL ; }
Signature · 1 line
2.51.0
PATCH v5 12/19 net/tap: free remote flow when implicit rule already exists
In reply to Stephen HemmingerWhen tap_flow_implicit_create() gets EEXIST from the kernel, the allocated remote_flow is never freed. Add rte_free() on that path.
Bugzilla ID: 1880
--- drivers/net/tap/tap_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap/tap_flow.c +3 -1
@@ -1625,8 +1625,10 @@ int tap_flow_implicit_create(struct pmd_internals *pmd, err =tap_nl_recv_ack (pmd->nlsk_fd);if (err <0 ) {/* Silently ignore re-entering existing rule */ -if (errno ==EEXIST ) +if (errno ==EEXIST ) { +rte_free (remote_flow); goto success; + }TAP_LOG (ERR ,"Kernel refused TC filter rule creation (%d): %s" , errno,strerror (errno));
Signature · 1 line
2.51.0
PATCH v5 13/19 net/tap: dynamically allocate queue structures
In reply to Stephen HemmingerReplace embedded rxq/txq arrays in pmd_internals with per-queue allocations using rte_zmalloc_socket during queue setup. Queue structures are freed in queue release and device close.
This reduces the size of pmd_internals and allocates queue resources.
Can safely remove some redundant checks in rx_queue_setup since these checks are already done in the ethdev layer.
--- drivers/net/tap/rte_eth_tap.c | 130 +++++++++++++++++++++++----------- drivers/net/tap/rte_eth_tap.h | 3 +- 2 files changed, 90 insertions(+), 43 deletions(-)
drivers/net/tap/rte_eth_tap.c +89 -41
@@ -942,29 +942,36 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats,uint64_t rx_total =0 , tx_total =0 , tx_err_total =0 ;uint64_t rx_bytes_total =0 , tx_bytes_total =0 ;uint64_t rx_nombuf =0 , ierrors =0 ; -const struct pmd_internals *pmd = dev->data->dev_private;/* rx queue statistics */ for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct rx_queue *rxq = dev->data->rx_queues[i]; + +if (rxq ==NULL ) +continue ;if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { - qstats->q_ipackets[i] = pmd->rxq[i].stats.ipackets; - qstats->q_ibytes[i] = pmd->rxq[i].stats.ibytes; + qstats->q_ipackets[i] = rxq->stats.ipackets; + qstats->q_ibytes[i] = rxq->stats.ibytes; } - rx_total += pmd->rxq[i].stats.ipackets; - rx_bytes_total += pmd->rxq[i].stats.ibytes; - rx_nombuf += pmd->rxq[i].stats.rx_nombuf; - ierrors += pmd->rxq[i].stats.ierrors; + rx_total += rxq->stats.ipackets; + rx_bytes_total += rxq->stats.ibytes; + rx_nombuf += rxq->stats.rx_nombuf; + ierrors += rxq->stats.ierrors; }/* tx queue statistics */ for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct tx_queue *txq = dev->data->tx_queues[i]; + +if (txq ==NULL ) +continue ;if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { - qstats->q_opackets[i] = pmd->txq[i].stats.opackets; - qstats->q_obytes[i] = pmd->txq[i].stats.obytes; + qstats->q_opackets[i] = txq->stats.opackets; + qstats->q_obytes[i] = txq->stats.obytes; } - tx_total += pmd->txq[i].stats.opackets; - tx_bytes_total += pmd->txq[i].stats.obytes; - tx_err_total += pmd->txq[i].stats.errs; + tx_total += txq->stats.opackets; + tx_bytes_total += txq->stats.obytes; + tx_err_total += txq->stats.errs; } tap_stats->ipackets = rx_total;
@@ -981,11 +988,19 @@ static int tap_stats_reset(struct rte_eth_dev *dev) {unsigned int i; -struct pmd_internals *pmd = dev->data->dev_private; -for (i =0 ; i <RTE_PMD_TAP_MAX_QUEUES ; i++) { -memset (&pmd->rxq[i].stats,0 ,sizeof (struct pkt_stats )); -memset (&pmd->txq[i].stats,0 ,sizeof (struct pkt_stats )); +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct rx_queue *rxq = dev->data->rx_queues[i]; + +if (rxq !=NULL ) +memset (&rxq->stats,0 ,sizeof (struct pkt_stats )); + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct tx_queue *txq = dev->data->tx_queues[i]; + +if (txq !=NULL ) +memset (&txq->stats,0 ,sizeof (struct pkt_stats )); }return 0 ;
@@ -1028,14 +1043,21 @@ tap_dev_close(struct rte_eth_dev *dev)#endif for (i =0 ; i <RTE_PMD_TAP_MAX_QUEUES ; i++) { -struct rx_queue *rxq = &internals->rxq[i]; +struct rx_queue *rxq = dev->data->rx_queues[i];tap_queue_close (process_private, i); -tap_rxq_pool_free (rxq->pool); -rte_free (rxq->iovecs); - rxq->pool =NULL ; - rxq->iovecs =NULL ; +if (rxq !=NULL ) { +tap_rxq_pool_free (rxq->pool); +rte_free (rxq->iovecs); +rte_free (rxq); + dev->data->rx_queues[i] =NULL ; + } + +if (dev->data->tx_queues[i] !=NULL ) { +rte_free (dev->data->tx_queues[i]); + dev->data->tx_queues[i] =NULL ; + } }if (internals->remote_if_index) {
@@ -1094,11 +1116,12 @@ tap_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)tap_rxq_pool_free (rxq->pool);rte_free (rxq->iovecs); - rxq->pool =NULL ; - rxq->iovecs =NULL ;if (dev->data->tx_queues[qid] ==NULL )tap_queue_close (process_private, qid); + +rte_free (rxq); + dev->data->rx_queues[qid] =NULL ; } static void
@@ -1113,6 +1136,9 @@ tap_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) process_private = rte_eth_devices[txq->out_port].process_private;if (dev->data->rx_queues[qid] ==NULL )tap_queue_close (process_private, qid); + +rte_free (txq); + dev->data->tx_queues[qid] =NULL ; } static int
@@ -1424,16 +1450,14 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)static int tap_setup_queue (struct rte_eth_dev *dev, -struct pmd_internals *internals,uint16_t qid,int is_rx) {int fd, ret;struct pmd_internals *pmd = dev->data->dev_private;struct pmd_process_private *process_private = dev->process_private; -struct rx_queue *rx = &internals->rxq[qid]; -struct tx_queue *tx = &internals->txq[qid]; -struct rte_gso_ctx *gso_ctx = is_rx ?NULL : &tx->gso_ctx; +struct tx_queue *tx = dev->data->tx_queues[qid]; +struct rte_gso_ctx *gso_ctx = (is_rx || tx ==NULL ) ?NULL : &tx->gso_ctx;const char *dir = is_rx ?"rx" :"tx" ; fd = process_private->fds[qid];
@@ -1455,16 +1479,16 @@ tap_setup_queue(struct rte_eth_dev *dev, process_private->fds[qid] = fd; } - tx->mtu = &dev->data->mtu; - rx->rxmode = &dev->data->dev_conf.rxmode; +if (tx !=NULL ) { + tx->mtu = &dev->data->mtu; + tx->type = pmd->type; + }if (gso_ctx) { ret =tap_gso_ctx_setup (gso_ctx, dev);if (ret)return -1 ; } - tx->type = pmd->type; -return fd; }
@@ -1478,8 +1502,8 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, {struct pmd_internals *internals = dev->data->dev_private;struct pmd_process_private *process_private = dev->process_private; -struct rx_queue *rxq = &internals->rxq[rx_queue_id]; -struct rte_mbuf **tmp = &rxq->pool; +struct rx_queue *rxq; +struct rte_mbuf **tmp;long iov_max =sysconf (_SC_IOV_MAX);if (iov_max <=0 ) {
@@ -1502,23 +1526,35 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,return -1 ; } + rxq =rte_zmalloc_socket (dev->device->name,sizeof (*rxq),0 , + socket_id); +if (!rxq) { +TAP_LOG (ERR , +"%s: Couldn't allocate rx queue structure" , + dev->device->name); +return -ENOMEM ; + } + tmp = &rxq->pool; + rxq->mp = mp; rxq->trigger_seen =1 ;/* force initial burst */ rxq->in_port = dev->data->port_id; rxq->queue_id = rx_queue_id; rxq->nb_rx_desc = nb_desc; + rxq->rxmode = &dev->data->dev_conf.rxmode; iovecs =rte_zmalloc_socket (dev->device->name,sizeof (*iovecs),0 , socket_id);if (!iovecs) {TAP_LOG (WARNING ,"%s: Couldn't allocate %d RX descriptors" , dev->device->name, nb_desc); +rte_free (rxq);return -ENOMEM ; } rxq->iovecs = iovecs; dev->data->rx_queues[rx_queue_id] = rxq; - fd =tap_setup_queue (dev, internals, rx_queue_id,1 ); + fd =tap_setup_queue (dev, rx_queue_id,1 );if (fd ==-1 ) { ret = fd; goto error;
@@ -1556,9 +1592,9 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, error:tap_rxq_pool_free (rxq->pool); - rxq->pool =NULL ;rte_free (rxq->iovecs); - rxq->iovecs =NULL ; +rte_free (rxq); + dev->data->rx_queues[rx_queue_id] =NULL ;return ret; }
@@ -1566,7 +1602,7 @@ static int tap_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused, - unsigned int socket_id __rte_unused, + unsigned int socket_id, const struct rte_eth_txconf *tx_conf) { struct pmd_internals *internals = dev->data->dev_private;
@@ -1577,8 +1613,17 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,if (tx_queue_id >= dev->data->nb_tx_queues)return -1 ; - dev->data->tx_queues[tx_queue_id] = &internals->txq[tx_queue_id]; - txq = dev->data->tx_queues[tx_queue_id]; + + txq =rte_zmalloc_socket (dev->device->name,sizeof (*txq),0 , + socket_id); +if (!txq) { +TAP_LOG (ERR , +"%s: Couldn't allocate tx queue structure" , + dev->device->name); +return -ENOMEM ; + } + + dev->data->tx_queues[tx_queue_id] = txq; txq->out_port = dev->data->port_id; txq->queue_id = tx_queue_id;
@@ -1588,9 +1633,12 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,RTE_ETH_TX_OFFLOAD_UDP_CKSUM | RTE_ETH_TX_OFFLOAD_TCP_CKSUM)); - ret =tap_setup_queue (dev, internals, tx_queue_id,0 ); -if (ret ==-1 ) + ret =tap_setup_queue (dev, tx_queue_id,0 ); +if (ret ==-1 ) { +rte_free (txq); + dev->data->tx_queues[tx_queue_id] =NULL ;return -1 ; + } TAP_LOG(DEBUG, " TX TUNTAP device name %s, qid %d on fd %d csum %s", internals->name, tx_queue_id,
drivers/net/tap/rte_eth_tap.h +1 -2
@@ -88,8 +88,7 @@ struct pmd_internals { LIST_HEAD(tap_implicit_flows, rte_flow) implicit_flows;#endif -struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES ];/* List of RX queues */ -struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES ];/* List of TX queues */ +struct rte_intr_handle *intr_handle;/* LSC interrupt handle. */ int ka_fd;/* keep-alive file descriptor */ struct rte_mempool *gso_ctx_mp;/* Mempool for GSO packets */
Signature · 1 line
2.51.0
PATCH v5 14/19 net/tap: remove VLA in flow item validation
In reply to Stephen HemmingerReplace variable length arrays in tap_flow_item_validate() with fixed size buffers. The size parameter comes from flow item struct sizes which are all small (largest is rte_flow_item_ipv6 at ~44 bytes).
Define TAP_FLOW_ITEM_MAX_SIZE (128) as the upper bound with a safety check to reject unexpected sizes.
--- drivers/net/tap/tap_flow.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/tap/tap_flow.c +11 -2
@@ -706,6 +706,13 @@ tap_flow_create_tcp(const struct rte_flow_item *item, struct convert_data *info)* @return * 0 on success. */ +/* +* Maximum size of a flow item in bytes. +* Must be larger than all supported rte_flow_item_* structures +* (currently the largest is rte_flow_item_ipv6 at ~44 bytes). +*/ +#define TAP_FLOW_ITEM_MAX_SIZE 128 + static int tap_flow_item_validate(const struct rte_flow_item *item, unsigned int size,
@@ -754,11 +761,13 @@ tap_flow_item_validate(const struct rte_flow_item *item,* TC does not support range so anything else is invalid. */ if (item->spec && item->last) { -uint8_t spec[size]; -uint8_t last[size]; +uint8_t spec[TAP_FLOW_ITEM_MAX_SIZE ]; +uint8_t last[TAP_FLOW_ITEM_MAX_SIZE ];const uint8_t *apply = default_mask;unsigned int i; +if (size >TAP_FLOW_ITEM_MAX_SIZE ) +return -1 ;if (item->mask) apply = item->mask;for (i =0 ; i < size; ++i) {
Signature · 1 line
2.51.0
PATCH v5 15/19 net/tap: fix Rx descriptor vs scatter segment confusion
In reply to Stephen HemmingerThe TAP PMD was reusing the nb_rx_desc queue setup parameter to control the maximum number of scatter segments per received packet. Since the driver reads one packet at a time from the kernel fd via readv(), it has no descriptor ring and nb_rx_desc as a queue depth has no meaning here. This meant applications could inadvertently affect scatter receive behavior by changing the queue size parameter.
Compute the required number of scatter segments from the MTU and the mempool buffer size instead, capping at TAP_MAX_RX_SEGS (128). The nb_rx_desc parameter is now ignored.
While here, convert the iovecs pointer-to-VLA in struct rx_queue to a flexible array member. This eliminates the separate iovec allocation, removes the on-stack VLA from queue setup, reduces pointer indirection on the receive path, and simplifies all cleanup paths to a single free.
Replace the runtime sysconf(_SC_IOV_MAX) check with a compile-time static_assert against IOV_MAX from limits.h.
This is a bug fix, but too big a change to backport to earlier releases.
--- drivers/net/tap/rte_eth_tap.c | 111 ++++++++++++++++++++-------------- drivers/net/tap/rte_eth_tap.h | 4 +- 2 files changed, 66 insertions(+), 49 deletions(-)
drivers/net/tap/rte_eth_tap.c +64 -47
@@ -35,6 +35,7 @@#include <linux/if_tun.h> #include <linux/sched.h> #include <fcntl.h> +#include <limits.h> #include <tap_rss.h> #include <rte_eth_tap.h>
@@ -69,7 +70,17 @@static_assert (RTE_PMD_TAP_MAX_QUEUES <=RTE_MP_MAX_FD_NUM ,"TAP max queues exceeds MP fd limit" ); -#define TAP_IOV_DEFAULT_MAX 1024 +/* +* Upper bound on the number of scatter segments per received packet. +* Actual value is computed at queue setup from MTU and mbuf data size. +* One extra iovec slot is reserved for the tun_pi header, so the total +* iovec count passed to readv() is max_rx_segs + 1, which must not +* exceed IOV_MAX. +*/ +#define TAP_MAX_RX_SEGS 128 + +static_assert (TAP_MAX_RX_SEGS +1 <=IOV_MAX , +"TAP_MAX_RX_SEGS + 1 (for tun_pi) must not exceed IOV_MAX" );#define TAP_RX_OFFLOAD (RTE_ETH_RX_OFFLOAD_SCATTER | \ RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \
@@ -444,9 +455,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)int len; len =readv (process_private->fds[rxq->queue_id], - *rxq->iovecs, -1 + (rxq->rxmode->offloads &RTE_ETH_RX_OFFLOAD_SCATTER ? - rxq->nb_rx_desc :1 )); + rxq->iovecs,1 + rxq->max_rx_segs);if (len < (int )sizeof (struct tun_pi ))break ;
@@ -483,9 +492,9 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) new_tail->next = seg->next;/* iovecs[0] is reserved for packet info (pi) */ - (*rxq->iovecs)[mbuf->nb_segs].iov_len = + rxq->iovecs[mbuf->nb_segs].iov_len = buf->buf_len - data_off; - (*rxq->iovecs)[mbuf->nb_segs].iov_base = + rxq->iovecs[mbuf->nb_segs].iov_base = (char *)buf->buf_addr + data_off; seg->data_len =RTE_MIN (seg->buf_len - data_off, len);
@@ -1049,7 +1058,6 @@ tap_dev_close(struct rte_eth_dev *dev)if (rxq !=NULL ) {tap_rxq_pool_free (rxq->pool); -rte_free (rxq->iovecs);rte_free (rxq); dev->data->rx_queues[i] =NULL ; }
@@ -1115,7 +1123,6 @@ tap_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid) process_private = rte_eth_devices[rxq->in_port].process_private;tap_rxq_pool_free (rxq->pool); -rte_free (rxq->iovecs);if (dev->data->tx_queues[qid] ==NULL )tap_queue_close (process_private, qid);
@@ -1495,7 +1502,7 @@ tap_setup_queue(struct rte_eth_dev *dev,static int tap_rx_queue_setup (struct rte_eth_dev *dev,uint16_t rx_queue_id, -uint16_t nb_rx_desc, + uint16_t nb_rx_desc __rte_unused,unsigned int socket_id, const struct rte_eth_rxconf *rx_conf __rte_unused,struct rte_mempool *mp)
@@ -1504,30 +1511,51 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,struct pmd_process_private *process_private = dev->process_private;struct rx_queue *rxq;struct rte_mbuf **tmp; -long iov_max =sysconf (_SC_IOV_MAX); +uint16_t max_rx_segs; +const uint32_t max_rx_pktlen = dev->data->mtu +RTE_ETHER_HDR_LEN +RTE_ETHER_CRC_LEN ; +const uint16_t seg_size =rte_pktmbuf_data_room_size (mp); +uint16_t data_off =RTE_PKTMBUF_HEADROOM ; +int ret =0 ; -if (iov_max <=0 ) { -TAP_LOG (WARNING , -"_SC_IOV_MAX is not defined. Using %d as default" , -TAP_IOV_DEFAULT_MAX ); - iov_max =TAP_IOV_DEFAULT_MAX ; +/* +* The nb_rx_desc parameter is ignored: the TAP PMD reads one packet +* at a time from the kernel fd, so there is no descriptor ring. +* +* Compute the number of scatter segments needed to receive the +* largest possible packet (MTU + L2 overhead). The first segment +* has headroom reserved, subsequent segments use the full data area. +*/ +if (seg_size <=RTE_PKTMBUF_HEADROOM ) { +TAP_LOG (ERR ,"%s: mbuf pool has no usable data room" , dev->device->name); +return -EINVAL ; } -uint16_t nb_desc =RTE_MIN (nb_rx_desc, iov_max -1 ); -struct iovec (*iovecs)[nb_desc +1 ]; -int data_off =RTE_PKTMBUF_HEADROOM ; -int ret =0 ; -int fd; -int i; -if (rx_queue_id >= dev->data->nb_rx_queues || !mp) { +const uint16_t first_seg_size = seg_size -RTE_PKTMBUF_HEADROOM ; +if (max_rx_pktlen > first_seg_size) + max_rx_segs =1 + (max_rx_pktlen - first_seg_size + seg_size -1 ) / + seg_size; +else + max_rx_segs =1 ; + +if (max_rx_segs >TAP_MAX_RX_SEGS ) { +TAP_LOG (ERR , +"%s: MTU %u requires %u scatter segments, max is %u" , + dev->device->name, dev->data->mtu, + max_rx_segs,TAP_MAX_RX_SEGS ); +return -EINVAL ; + } + +if (max_rx_segs >1 && + !(dev->data->dev_conf.rxmode.offloads &RTE_ETH_RX_OFFLOAD_SCATTER )) { +/* non-fatal since applications might be doing it wrong now */ TAP_LOG (WARNING , -"nb_rx_queues %d too small or mempool NULL" , - dev->data->nb_rx_queues); -return -1 ; +"%s: MTU %u requires %u scatter segments, but offload not set" , + dev->device->name, dev->data->mtu, max_rx_segs); } - rxq =rte_zmalloc_socket (dev->device->name,sizeof (*rxq),0 , - socket_id); + rxq =rte_zmalloc_socket (dev->device->name, +sizeof (*rxq) + (max_rx_segs +1 ) *sizeof (struct iovec ), +RTE_CACHE_LINE_SIZE , socket_id);if (!rxq) { TAP_LOG(ERR, "%s: Couldn't allocate rx queue structure",
@@ -1540,30 +1568,20 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, rxq->trigger_seen =1 ;/* force initial burst */ rxq->in_port = dev->data->port_id; rxq->queue_id = rx_queue_id; - rxq->nb_rx_desc = nb_desc; + rxq->max_rx_segs = max_rx_segs; rxq->rxmode = &dev->data->dev_conf.rxmode; - iovecs =rte_zmalloc_socket (dev->device->name,sizeof (*iovecs),0 , - socket_id); -if (!iovecs) { -TAP_LOG (WARNING , -"%s: Couldn't allocate %d RX descriptors" , - dev->device->name, nb_desc); -rte_free (rxq); -return -ENOMEM ; - } - rxq->iovecs = iovecs; dev->data->rx_queues[rx_queue_id] = rxq; - fd =tap_setup_queue (dev, rx_queue_id,1 ); +int fd =tap_setup_queue (dev, rx_queue_id,1 );if (fd ==-1 ) { ret = fd; goto error; } - (*rxq->iovecs)[0 ].iov_len =sizeof (struct tun_pi ); - (*rxq->iovecs)[0 ].iov_base = &rxq->pi; + rxq->iovecs[0 ].iov_len =sizeof (struct tun_pi ); + rxq->iovecs[0 ].iov_base = &rxq->pi; -for (i =1 ; i <= nb_desc; i++) { +for (uint16_t i =1 ; i <= max_rx_segs; i++) { *tmp =rte_pktmbuf_alloc (rxq->mp);if (!*tmp) { TAP_LOG(WARNING,
@@ -1572,8 +1590,8 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, ret = -ENOMEM ; goto error; } - (*rxq->iovecs)[i].iov_len = (*tmp)->buf_len - data_off; - (*rxq->iovecs)[i].iov_base = + rxq->iovecs[i].iov_len = (*tmp)->buf_len - data_off; + rxq->iovecs[i].iov_base = (char *)(*tmp)->buf_addr + data_off; data_off =0 ; tmp = &(*tmp)->next;
@@ -1592,7 +1610,6 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, error:tap_rxq_pool_free (rxq->pool); -rte_free (rxq->iovecs);rte_free (rxq); dev->data->rx_queues[rx_queue_id] =NULL ;return ret;
@@ -1614,8 +1631,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,if (tx_queue_id >= dev->data->nb_tx_queues)return -1 ; - txq =rte_zmalloc_socket (dev->device->name,sizeof (*txq),0 , - socket_id); + txq =rte_zmalloc_socket (dev->device->name,sizeof (*txq), +RTE_CACHE_LINE_SIZE , socket_id);if (!txq) { TAP_LOG(ERR, "%s: Couldn't allocate tx queue structure",
drivers/net/tap/rte_eth_tap.h +2 -2
@@ -49,11 +49,11 @@ struct rx_queue {uint16_t in_port;/* Port ID */ uint16_t queue_id;/* queue ID*/ struct pkt_stats stats;/* Stats for this RX queue */ -uint16_t nb_rx_desc;/* max number of mbufs available */ +uint16_t max_rx_segs;/* max scatter segments per packet */ struct rte_eth_rxmode *rxmode;/* RX features */ struct rte_mbuf *pool;/* mbufs pool for this queue */ -struct iovec (*iovecs)[];/* descriptors for this queue */ struct tun_pi pi;/* packet info for iovecs */ +struct iovec iovecs[];/* iov[0] = pi, iov[1..max_rx_segs] = data */ };struct tx_queue {
Signature · 1 line
2.51.0
PATCH v5 16/19 net/tap: replace use of VLA in transmit burst
In reply to Stephen HemmingerReplace the per-packet variable-length iovec array on the stack with a fixed-size array of TAP_MAX_TX_SEGS + 1 (129) entries, hoisted to function scope in tap_write_mbufs(). Packets with more than 128 segments are dropped.
This eliminates the last VLA in the driver.
--- drivers/net/tap/rte_eth_tap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/net/tap/rte_eth_tap.c +12 -2
@@ -79,9 +79,15 @@ static_assert(RTE_PMD_TAP_MAX_QUEUES <= RTE_MP_MAX_FD_NUM, "TAP max queues excee*/ #define TAP_MAX_RX_SEGS 128 +/* Limit on the number of segments per mbuf on Tx */ +#define TAP_MAX_TX_SEGS 128 +static_assert (TAP_MAX_RX_SEGS +1 <=IOV_MAX ,"TAP_MAX_RX_SEGS + 1 (for tun_pi) must not exceed IOV_MAX" ); +static_assert (TAP_MAX_TX_SEGS +1 <=IOV_MAX , +"TAP_MAX_TX_SEGS + 1 (for tun_pi) must not exceed IOV_MAX" ); +#define TAP_RX_OFFLOAD (RTE_ETH_RX_OFFLOAD_SCATTER | \ RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \
@@ -533,13 +539,13 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, uint16_t *num_packets, unsigned long *num_tx_bytes) { struct pmd_process_private *process_private; +struct iovec iovecs[TAP_MAX_TX_SEGS +1 ];int i; process_private = rte_eth_devices[txq->out_port].process_private;for (i =0 ; i < num_mbufs; i++) {struct rte_mbuf *mbuf = pmbufs[i]; -struct iovec iovecs[mbuf->nb_segs +2 ];struct tun_pi pi = { .flags =0 , .proto =0x00 };struct rte_mbuf *seg = mbuf;uint64_t l4_ol_flags;
@@ -641,6 +647,10 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, } skip_l4_cksum: +/* tun_pi header + packet segments must fit in iovecs */ +if (unlikely (mbuf->nb_segs >TAP_MAX_TX_SEGS )) +return -1 ; +for (j =0 ; j < mbuf->nb_segs; j++) { iovecs[k].iov_len =rte_pktmbuf_data_len (seg); iovecs[k].iov_base = rte_pktmbuf_mtod(seg, void *);
@@ -669,7 +679,7 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)uint16_t num_packets =0 ;unsigned long num_tx_bytes =0 ;uint32_t max_size; -int i; +unsigned int i;if (unlikely (nb_pkts ==0 ))return 0 ;
Signature · 1 line
2.51.0
PATCH v5 17/19 net/tap: consolidate queue statistics
In reply to Stephen HemmingerThe per-queue packet statistics had structure elements for both transmit and receive but each queue structure was only used in one direction. Rearrange and get the correct statistic based on context.
The rx_nombuf statistic can be accumulated in the device structure and rte_eth_stats_get() handles it from there.
--- drivers/net/tap/rte_eth_tap.c | 48 +++++++++++++++++------------------ drivers/net/tap/rte_eth_tap.h | 17 +++++-------- 2 files changed, 31 insertions(+), 34 deletions(-)
drivers/net/tap/rte_eth_tap.c +24 -24
@@ -467,7 +467,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)/* Packet couldn't fit in the provided mbuf */ if (unlikely (rxq->pi.flags &TUN_PKT_STRIP )) { - rxq->stats.ierrors++; + rxq->stats.errors++;continue ; }
@@ -479,7 +479,8 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)struct rte_mbuf *buf =rte_pktmbuf_alloc (rxq->mp);if (unlikely (!buf)) { - rxq->stats.rx_nombuf++; + rte_eth_devices[rxq->in_port].data->rx_mbuf_alloc_failed++; +/* No new buf has been allocated: do nothing */ if (!new_tail || !seg) goto end;
@@ -524,8 +525,8 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) num_rx_bytes += mbuf->pkt_len; } end: - rxq->stats.ipackets += num_rx; - rxq->stats.ibytes += num_rx_bytes; + rxq->stats.packets += num_rx; + rxq->stats.bytes += num_rx_bytes;if (trigger && num_rx < nb_pkts) rxq->trigger_seen = trigger;
@@ -709,7 +710,7 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) tso_segsz = mbuf_in->tso_segsz + hdrs_len;if (unlikely (tso_segsz == hdrs_len) || tso_segsz > *txq->mtu) { - txq->stats.errs++; + txq->stats.errors++;break ; } gso_ctx->gso_size = tso_segsz;
@@ -747,7 +748,7 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ret =tap_write_mbufs (txq, num_mbufs, mbuf, &num_packets, &num_tx_bytes);if (ret ==-1 ) { - txq->stats.errs++; + txq->stats.errors++;/* free tso mbufs */ if (num_tso_mbufs >0 )rte_pktmbuf_free_bulk (mbuf, num_tso_mbufs);
@@ -765,9 +766,9 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } } - txq->stats.opackets += num_packets; - txq->stats.errs += nb_pkts - num_tx; - txq->stats.obytes += num_tx_bytes; + txq->stats.packets += num_packets; + txq->stats.errors += nb_pkts - num_tx; + txq->stats.bytes += num_tx_bytes;return num_tx; }
@@ -960,7 +961,7 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats,unsigned int i;uint64_t rx_total =0 , tx_total =0 , tx_err_total =0 ;uint64_t rx_bytes_total =0 , tx_bytes_total =0 ; -uint64_t rx_nombuf =0 , ierrors =0 ; +uint64_t ierrors =0 ;/* rx queue statistics */ for (i =0 ; i < dev->data->nb_rx_queues; i++) {
@@ -969,13 +970,12 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats,if (rxq ==NULL )continue ;if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { - qstats->q_ipackets[i] = rxq->stats.ipackets; - qstats->q_ibytes[i] = rxq->stats.ibytes; + qstats->q_ipackets[i] = rxq->stats.packets; + qstats->q_ibytes[i] = rxq->stats.bytes; } - rx_total += rxq->stats.ipackets; - rx_bytes_total += rxq->stats.ibytes; - rx_nombuf += rxq->stats.rx_nombuf; - ierrors += rxq->stats.ierrors; + rx_total += rxq->stats.packets; + rx_bytes_total += rxq->stats.bytes; + ierrors += rxq->stats.errors; }/* tx queue statistics */
@@ -985,21 +985,21 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats,if (txq ==NULL )continue ;if (qstats !=NULL && i <RTE_ETHDEV_QUEUE_STAT_CNTRS ) { - qstats->q_opackets[i] = txq->stats.opackets; - qstats->q_obytes[i] = txq->stats.obytes; + qstats->q_opackets[i] = txq->stats.packets; + qstats->q_obytes[i] = txq->stats.bytes; } - tx_total += txq->stats.opackets; - tx_bytes_total += txq->stats.obytes; - tx_err_total += txq->stats.errs; + tx_total += txq->stats.packets; + tx_bytes_total += txq->stats.bytes; + tx_err_total += txq->stats.errors; } tap_stats->ipackets = rx_total; tap_stats->ibytes = rx_bytes_total; tap_stats->ierrors = ierrors; - tap_stats->rx_nombuf = rx_nombuf; tap_stats->opackets = tx_total; tap_stats->oerrors = tx_err_total; tap_stats->obytes = tx_bytes_total; +return 0 ; }
@@ -1012,14 +1012,14 @@ tap_stats_reset(struct rte_eth_dev *dev)struct rx_queue *rxq = dev->data->rx_queues[i];if (rxq !=NULL ) -memset (&rxq->stats,0 ,sizeof (struct pkt_stats )); +memset (&rxq->stats,0 ,sizeof (rxq->stats)); }for (i =0 ; i < dev->data->nb_tx_queues; i++) {struct tx_queue *txq = dev->data->tx_queues[i];if (txq !=NULL ) -memset (&txq->stats,0 ,sizeof (struct pkt_stats )); +memset (&txq->stats,0 ,sizeof (txq->stats)); }return 0 ;
drivers/net/tap/rte_eth_tap.h +7 -10
@@ -9,6 +9,7 @@#include <sys/queue.h> #include <sys/uio.h> #include <inttypes.h> +#include <limits.h> #include <net/if.h> #include <linux/if_tun.h>
@@ -33,14 +34,10 @@ enum rte_tuntap_type { ETH_TUNTAP_TYPE_MAX, }; -struct pkt_stats { -uint64_t opackets;/* Number of output packets */ -uint64_t ipackets;/* Number of input packets */ -uint64_t obytes;/* Number of bytes on output */ -uint64_t ibytes;/* Number of bytes on input */ -uint64_t errs;/* Number of TX error packets */ -uint64_t ierrors;/* Number of RX error packets */ -uint64_t rx_nombuf;/* Nb of RX mbuf alloc failures */ +struct queue_stats { +uint64_t packets; +uint64_t bytes; +uint64_t errors; };struct rx_queue {
@@ -48,7 +45,7 @@ struct rx_queue {uint32_t trigger_seen;/* Last seen Rx trigger value */ uint16_t in_port;/* Port ID */ uint16_t queue_id;/* queue ID*/ -struct pkt_stats stats;/* Stats for this RX queue */ +struct queue_stats stats;/* Stats for this RX queue */ uint16_t max_rx_segs;/* max scatter segments per packet */ struct rte_eth_rxmode *rxmode;/* RX features */ struct rte_mbuf *pool;/* mbufs pool for this queue */
@@ -60,7 +57,7 @@ struct tx_queue {int type;/* Type field - TUN|TAP */ uint16_t *mtu;/* Pointer to MTU from dev_data */ uint16_t csum:1; /* Enable checksum offloading */ -struct pkt_stats stats;/* Stats for this TX queue */ +struct queue_stats stats;/* Stats for this TX queue */ struct rte_gso_ctx gso_ctx;/* GSO context */ uint16_t out_port;/* Port ID */ uint16_t queue_id;/* queue ID*/
Signature · 1 line
2.51.0
PATCH v5 18/19 net/tap: enable VLA warnings
In reply to Stephen HemmingerThe TAP driver no longer has any VLA's.
--- drivers/net/tap/meson.build | 1 - 1 file changed, 1 deletion(-)
drivers/net/tap/meson.build +0 -1
@@ -16,7 +16,6 @@ deps = ['bus_vdev', 'gso', 'hash'] max_queues = '-DTAP_MAX_QUEUES=64' cflags += max_queues -cflags += no_wvla_cflag require_iova_in_mbuf = false
Signature · 1 line
2.51.0
PATCH v5 19/19 test: add unit tests for TAP PMD
In reply to Stephen HemmingerAdd a standalone test suite for the TAP PMD, modeled on the existing test_pmd_ring tests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.
--- app/test/meson.build | 1 + app/test/test_pmd_tap.c | 1143 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1144 insertions(+) create mode 100644 app/test/test_pmd_tap.c
app/test/meson.build +1 -0
@@ -144,6 +144,7 @@ source_file_deps = { 'test_pmd_perf.c': ['ethdev', 'net'] + packet_burst_generator_deps, 'test_pmd_ring.c': ['net_ring', 'ethdev', 'bus_vdev'], 'test_pmd_ring_perf.c': ['ethdev', 'net_ring', 'bus_vdev'], + 'test_pmd_tap.c': ['ethdev', 'net_tap', 'bus_vdev'], 'test_pmu.c': ['pmu'], 'test_power.c': ['power', 'power_acpi', 'power_kvm_vm', 'power_intel_pstate', 'power_amd_pstate', 'power_cppc'],
app/test/test_pmd_tap.c new file +1143 -0
1,143 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH v5 19/19] test: add unit tests for TAP PMD
Hello Stephen,
Quoted 7 lines · Stephen Hemminger
Add a standalone test suite for the TAP PMD, modeled on the existing
test_pmd_ringtests. Exercises device configuration, link status, stats, MTU, MAC address, promiscuous/allmulticast modes, queue start/stop, link up/down, device stop/start, and multi-queue setup.Signed-off-by Stephen Hemminger <[email protected]>
This new test triggers failures in OBS:
[ 373s] 74/107 DPDK:fast-tests / tap_pmd_autotest
RUNNING
[ 373s] >>> LD_LIBRARY_PATH=/usr/src/packages/BUILD/obj-x86_64-linux-gnu/lib:/usr/src/packages/BUILD/obj-x86_64-linux-gnu/drivers MALLOC_PERTURB_=52 DPDK_TEST=tap_pmd_autotest/usr/src/packages/BUILD/obj-x86_64-linux-gnu/app/dpdk-test --no-huge
-m 2048 -d /usr/src/packages/BUILD/obj-x86_64-linux-gnu/drivers
[ 373s] ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
[ 373s] EAL: Detected CPU lcores: 12 [ 373s] EAL: Detected NUMA nodes: 1 [ 373s] EAL: Detected shared linkage of DPDK [ 373s] EAL: Multi-process socket /tmp/dpdk/rte/mp_socket [ 373s] EAL: Selected IOVA mode 'VA' [ 373s] APP: HPET is not enabled, using TSC as default timer [ 373s] RTE>>tap_pmd_autotest [ 373s] TAP: tun_alloc(): Unable to open /dev/net/tun interface [ 373s] TAP: eth_dev_tap_create(): Unable to create TAP interface [ 373s] TAP: eth_dev_tap_create(): TAP Unable to initialize net_tap0 [ 373s] + ------------------------------------------------------- + [ 373s] + Test Suite : TAP PMD Unit Test Suite [ 373s] Setting up TAP PMD test [ 373s] Error: failed to create TAP device net_tap0: Invalid argument [ 373s] + ------------------------------------------------------- + [ 373s] + Test Suite Summary : TAP PMD Unit Test Suite [ 373s] + ------------------------------------------------------- + [ 373s] + Tests Total : 17 [ 373s] + Tests Skipped : 0 [ 373s] + Tests Executed : 0 [ 373s] + Tests Unsupported: 0 [ 373s] + Tests Passed : 0 [ 373s] + Tests Failed : 17 [ 373s] + ------------------------------------------------------- + [ 373s] Test Failed [ 373s] RTE>>―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― [ 373s] 74/107 DPDK:fast-tests / tap_pmd_autotest
FAIL 0.23s (exit status 255 or signal 127
SIGinvalid)
Signature · 1 line
David Marchand
Stephen Hemminger
AppliedRe: [PATCH v5 00/19] net/tap: cleanups, bug fixes, and VLA removal
In reply to Stephen HemmingerQuoted 62 lines · On Sun, 22 Feb 2026 09:30:35 -0800 Stephen Hemminger…
Patches 1-2 are documentation and bug fixes that stand alone: update the features matrix to match current driver capabilities, and fix queue statistics to count all queues regardless of the queue stat counter limit.
Patch 3 fixes interface name buffers to use IFNAMSIZ instead of
RTE_ETH_NAME_MAX_LEN, since these are Linux kernel interface names not DPDK device names.Patches 4-6 are minor cleanups: replace the runtime speed capability function with a compile-time constant (TAP is always 10G), clarify TUN/TAP flag operator precedence with parentheses, and extend the fixed MAC index to 16 bits to avoid duplicates after 256 hot-plug cycles.
Patches 7-12 fix bugs tagged for stable: a bounds check to prevent an out-of-bounds read on truncated L4 headers; resource leaks in the primary and secondary process probe error paths; a missing free of the IPC reply buffer on queue count mismatch; a use-after-free with an orphaned kernel TC rule when remote flow creation fails; and a leaked
remote_flowallocation on EEXIST from an implicit rule.Patches 13-18 restructure the driver internals: dynamically allocate queue structures instead of embedding fixed-size arrays in
pmd_internals; replace the pointer-to-VLA iovec with a flexible array member sized from MTU and mbuf geometry; replace the Tx per-packet VLA with a fixed-size stack array capped at 128 segments; remove the VLA in flow item validation; consolidate per-queue statistics into a common structure; and enable -Wvla warnings.Patch 19 adds a unit test suite for the TAP PMD covering configuration, link, stats, MTU, MAC, promisc, allmulti, queue start/stop, link up/down, stop/start, and multi-queue.
v5 - use IFNAMSIZ for interface name buffers
- dynamically allocate queue structures
- compute Rx scatter segments from MTU instead ofnb_rx_desc
- use flex array for Rx iovecs, fixed stack array for Tx
- consolidate queue statisticsStephen Hemminger (19):
net/tap: fix handling of queue stats
doc: update tap features
net/tap: use correct length for interface names net/tap: replace runtime speed capability with constant net/tap: clarify TUN/TAP flag assignment
net/tap: extend fixed MAC range to 16 bits net/tap: skip checksum on truncated L4 headers net/tap: fix resource leaks in tap create error path net/tap: fix resource leaks in secondary process probe net/tap: free IPC reply buffer on queue count mismatch net/tap: fix use-after-free on remote flow creation failure net/tap: free remote flow when implicit rule already exists net/tap: dynamically allocate queue structures net/tap: remove VLA in flow item validation net/tap: fix Rx descriptor vs scatter segment confusion net/tap: replace use of VLA in transmit burst net/tap: consolidate queue statistics
net/tap: enable VLA warnings
test: add unit tests for TAP PMD
Quoted 10 lines
app/test/meson.build | 1 + app/test/test_pmd_tap.c | 1143 ++++++++++++++++++++++++++++++ doc/guides/nics/features/tap.ini | 14 +- drivers/net/tap/meson.build | 1 - drivers/net/tap/rte_eth_tap.c | 411 ++++++----- drivers/net/tap/rte_eth_tap.h | 28 +- drivers/net/tap/tap_flow.c | 36 +- 7 files changed, 1424 insertions(+), 210 deletions(-) create mode 100644 app/test/test_pmd_tap.c
Applied to next-net.