* [RFC 00/11] Fix dev_ops dereferences
@ 2025-02-17 18:53 Stephen Hemminger
2025-02-17 18:54 ` [RFC 01/11] ethdev: remove unnecessary deref on function pointers Stephen Hemminger
` (13 more replies)
0 siblings, 14 replies; 52+ messages in thread
From: Stephen Hemminger @ 2025-02-17 18:53 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
A common pattern in DPDK internals is to have an array of function
pointers. When using these pointers an unnecessary derefence is done;
this is allowed in C because of a historical quirk but unnecessary.
The PVS Studio checker flags these as:
https://pvs-studio.com/en/docs/warnings/v516/
This leads to a large number of warnings marked as High severity.
This patchset simplifies the source and gets rid of these warnings.
It should have no impact on the resulting binary.
Stephen Hemminger (11):
ethdev: remove unnecessary deref on function pointers
eventdev: remover unnecessary deref on function pointers
net/ixgbe: remove unnecessary dereference
net/memif: remove unnecessary deref of function pointers
cryptodev: remove unnecessary deref of function pointers
crypto/scheduler: remove unnecessary dereference
compressdev: remove unnecessary deref of function pointers
dmadev: remove unnecessary deref of function pointers
rawdev: remove unnecessary deref of function pointers
mldev: remove unnecessary deref of function pointers
regexdev: remove unnecessary deref of function pointers
drivers/crypto/scheduler/scheduler_pmd_ops.c | 5 +-
drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 +-
drivers/net/memif/rte_eth_memif.c | 6 +-
lib/compressdev/rte_compressdev.c | 56 +--
lib/cryptodev/rte_cryptodev.c | 72 ++-
lib/dmadev/rte_dmadev.c | 38 +-
lib/ethdev/ethdev_driver.c | 16 +-
lib/ethdev/ethdev_private.c | 4 +-
lib/ethdev/rte_ethdev.c | 489 +++++++++----------
lib/ethdev/rte_ethdev_cman.c | 8 +-
lib/eventdev/rte_event_crypto_adapter.c | 36 +-
lib/eventdev/rte_event_dma_adapter.c | 16 +-
lib/eventdev/rte_event_eth_rx_adapter.c | 50 +-
lib/eventdev/rte_eventdev.c | 164 +++----
lib/mldev/rte_mldev.c | 88 ++--
lib/rawdev/rte_rawdev.c | 99 ++--
lib/regexdev/rte_regexdev.c | 72 +--
17 files changed, 575 insertions(+), 649 deletions(-)
--
2.47.2
^ permalink raw reply [flat|nested] 52+ messages in thread* [RFC 01/11] ethdev: remove unnecessary deref on function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 02/11] eventdev: remover " Stephen Hemminger ` (12 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->rx_queue_start and dev->dev_ops->rx_queue_start are equivalent. Remove the unnecessary asterisk and parenthesis. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 489 ++++++++++++++++------------------- lib/ethdev/rte_ethdev_cman.c | 8 +- 4 files changed, 241 insertions(+), 276 deletions(-) diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c index 13d328d97b..e1976db05f 100644 --- a/lib/ethdev/ethdev_driver.c +++ b/lib/ethdev/ethdev_driver.c @@ -749,11 +749,10 @@ rte_eth_hairpin_queue_peer_bind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_bind == NULL) + if (dev->dev_ops->hairpin_queue_peer_bind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_bind)(dev, cur_queue, - peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_bind(dev, cur_queue, peer_info, direction); } int @@ -764,11 +763,10 @@ rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_unbind == NULL) + if (dev->dev_ops->hairpin_queue_peer_unbind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_unbind)(dev, cur_queue, - direction); + return dev->dev_ops->hairpin_queue_peer_unbind(dev, cur_queue, direction); } int @@ -785,11 +783,11 @@ rte_eth_hairpin_queue_peer_update(uint16_t peer_port, uint16_t peer_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[peer_port]; - if (*dev->dev_ops->hairpin_queue_peer_update == NULL) + if (dev->dev_ops->hairpin_queue_peer_update == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_update)(dev, peer_queue, - cur_info, peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_update(dev, peer_queue, + cur_info, peer_info, direction); } int diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index eed8c78747..cc7fd97d4a 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -398,7 +398,7 @@ eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->rx_queue_release != NULL) - (*dev->dev_ops->rx_queue_release)(dev, qid); + dev->dev_ops->rx_queue_release(dev, qid); rxq[qid] = NULL; } @@ -411,7 +411,7 @@ eth_dev_txq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->tx_queue_release != NULL) - (*dev->dev_ops->tx_queue_release)(dev, qid); + dev->dev_ops->tx_queue_release(dev, qid); txq[qid] = NULL; } diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index c4079bb924..ed9b7dba55 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -859,7 +859,7 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_start == NULL) + if (dev->dev_ops->rx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -896,7 +896,7 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_stop == NULL) + if (dev->dev_ops->rx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -940,7 +940,7 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_start == NULL) + if (dev->dev_ops->tx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -977,7 +977,7 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_stop == NULL) + if (dev->dev_ops->tx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -1308,7 +1308,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -1567,7 +1567,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, goto rollback; } - diag = (*dev->dev_ops->dev_configure)(dev); + diag = dev->dev_ops->dev_configure(dev); if (diag != 0) { RTE_ETHDEV_LOG_LINE(ERR, "Port%u dev_configure = %d", port_id, diag); @@ -1630,12 +1630,12 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, /* replay MAC address configuration including default MAC */ addr = &dev->data->mac_addrs[0]; - if (*dev->dev_ops->mac_addr_set != NULL) - (*dev->dev_ops->mac_addr_set)(dev, addr); - else if (*dev->dev_ops->mac_addr_add != NULL) - (*dev->dev_ops->mac_addr_add)(dev, addr, 0, pool); + if (dev->dev_ops->mac_addr_set != NULL) + dev->dev_ops->mac_addr_set(dev, addr); + else if (dev->dev_ops->mac_addr_add != NULL) + dev->dev_ops->mac_addr_add(dev, addr, 0, pool); - if (*dev->dev_ops->mac_addr_add != NULL) { + if (dev->dev_ops->mac_addr_add != NULL) { for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1648,8 +1648,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, do { if (pool_mask & UINT64_C(1)) - (*dev->dev_ops->mac_addr_add)(dev, - addr, i, pool); + dev->dev_ops->mac_addr_add(dev, addr, i, pool); pool_mask >>= 1; pool++; } while (pool_mask); @@ -1668,9 +1667,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_promiscuous_get(port_id) == 1 && - *dev->dev_ops->promiscuous_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_enable)(dev)); + dev->dev_ops->promiscuous_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable promiscuous mode for device (port %u): %s", @@ -1678,9 +1676,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_promiscuous_get(port_id) == 0 && - *dev->dev_ops->promiscuous_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_disable)(dev)); + dev->dev_ops->promiscuous_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable promiscuous mode for device (port %u): %s", @@ -1703,9 +1700,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_allmulticast_get(port_id) == 1 && - *dev->dev_ops->allmulticast_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_enable)(dev)); + dev->dev_ops->allmulticast_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable allmulticast mode for device (port %u): %s", @@ -1713,9 +1709,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_allmulticast_get(port_id) == 0 && - *dev->dev_ops->allmulticast_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_disable)(dev)); + dev->dev_ops->allmulticast_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable allmulticast mode for device (port %u): %s", @@ -1766,7 +1761,7 @@ rte_eth_dev_start(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -1794,7 +1789,7 @@ rte_eth_dev_start(uint16_t port_id) (restore_flags & RTE_ETH_RESTORE_MAC_ADDR)) eth_dev_mac_restore(dev, &dev_info); - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -1816,9 +1811,9 @@ rte_eth_dev_start(uint16_t port_id) } if (dev->data->dev_conf.intr_conf.lsc == 0) { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); } /* expose selection of PMD fast-path functions */ @@ -1837,7 +1832,7 @@ rte_eth_dev_stop(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -1850,7 +1845,7 @@ rte_eth_dev_stop(uint16_t port_id) /* point fast-path functions to dummy ones */ eth_dev_fp_ops_reset(rte_eth_fp_ops + port_id); - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; rte_ethdev_trace_stop(port_id, ret); @@ -1867,9 +1862,9 @@ rte_eth_dev_set_link_up(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_up == NULL) + if (dev->dev_ops->dev_set_link_up == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_up)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_up(dev)); rte_ethdev_trace_set_link_up(port_id, ret); @@ -1885,9 +1880,9 @@ rte_eth_dev_set_link_down(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_down == NULL) + if (dev->dev_ops->dev_set_link_down == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_down)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_down(dev)); rte_ethdev_trace_set_link_down(port_id, ret); @@ -1902,9 +1897,9 @@ rte_eth_speed_lanes_get(uint16_t port_id, uint32_t *lane) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get == NULL) + if (dev->dev_ops->speed_lanes_get == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_get)(dev, lane)); + return eth_err(port_id, dev->dev_ops->speed_lanes_get(dev, lane)); } int @@ -1918,7 +1913,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get_capa == NULL) + if (dev->dev_ops->speed_lanes_get_capa == NULL) return -ENOTSUP; if (speed_lanes_capa == NULL && num > 0) { @@ -1928,7 +1923,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, return -EINVAL; } - ret = (*dev->dev_ops->speed_lanes_get_capa)(dev, speed_lanes_capa, num); + ret = dev->dev_ops->speed_lanes_get_capa(dev, speed_lanes_capa, num); return ret; } @@ -1941,9 +1936,9 @@ rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_set == NULL) + if (dev->dev_ops->speed_lanes_set == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_set)(dev, speed_lanes_capa)); + return eth_err(port_id, dev->dev_ops->speed_lanes_set(dev, speed_lanes_capa)); } int @@ -1968,9 +1963,9 @@ rte_eth_dev_close(uint16_t port_id) return -EINVAL; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - *lasterr = (*dev->dev_ops->dev_close)(dev); + *lasterr = dev->dev_ops->dev_close(dev); if (*lasterr != 0) lasterr = &binerr; @@ -1989,7 +1984,7 @@ rte_eth_dev_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; ret = rte_eth_dev_stop(port_id); @@ -2017,7 +2012,7 @@ rte_eth_dev_is_removed(uint16_t port_id) if (dev->state == RTE_ETH_DEV_REMOVED) return 1; - if (*dev->dev_ops->is_removed == NULL) + if (dev->dev_ops->is_removed == NULL) return 0; ret = dev->dev_ops->is_removed(dev); @@ -2254,7 +2249,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_queue_setup == NULL) + if (dev->dev_ops->rx_queue_setup == NULL) return -ENOTSUP; if (rx_conf != NULL && @@ -2436,8 +2431,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return ret; } - ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, - socket_id, &local_conf, mp); + ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc, socket_id, &local_conf, mp); if (!ret) { if (!dev->data->min_rx_buf_size || dev->data->min_rx_buf_size > mbp_buf_size) @@ -2484,7 +2478,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->rx_hairpin_queue_setup == NULL) + if (dev->dev_ops->rx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_rx_desc == 0) @@ -2542,8 +2536,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_rxq_release(dev, rx_queue_id); - ret = (*dev->dev_ops->rx_hairpin_queue_setup)(dev, rx_queue_id, - nb_rx_desc, conf); + ret = dev->dev_ops->rx_hairpin_queue_setup(dev, rx_queue_id, nb_rx_desc, conf); if (ret == 0) dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2573,7 +2566,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_queue_setup == NULL) + if (dev->dev_ops->tx_queue_setup == NULL) return -ENOTSUP; if (tx_conf != NULL && @@ -2654,7 +2647,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, } rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf); - return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev, + return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev, tx_queue_id, nb_tx_desc, socket_id, &local_conf)); } @@ -2687,7 +2680,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->tx_hairpin_queue_setup == NULL) + if (dev->dev_ops->tx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_tx_desc == 0) @@ -2745,8 +2738,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_txq_release(dev, tx_queue_id); - ret = (*dev->dev_ops->tx_hairpin_queue_setup) - (dev, tx_queue_id, nb_tx_desc, conf); + ret = dev->dev_ops->tx_hairpin_queue_setup(dev, tx_queue_id, nb_tx_desc, conf); if (ret == 0) dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2772,9 +2764,9 @@ rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_bind == NULL) + if (dev->dev_ops->hairpin_bind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_bind)(dev, rx_port); + ret = dev->dev_ops->hairpin_bind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to bind hairpin Tx %d" " to Rx %d (%d - all ports)", @@ -2799,9 +2791,9 @@ rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_unbind == NULL) + if (dev->dev_ops->hairpin_unbind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_unbind)(dev, rx_port); + ret = dev->dev_ops->hairpin_unbind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to unbind hairpin Tx %d" " from Rx %d (%d - all ports)", @@ -2836,11 +2828,10 @@ rte_eth_hairpin_get_peer_ports(uint16_t port_id, uint16_t *peer_ports, return -EINVAL; } - if (*dev->dev_ops->hairpin_get_peer_ports == NULL) + if (dev->dev_ops->hairpin_get_peer_ports == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports, - len, direction); + ret = dev->dev_ops->hairpin_get_peer_ports(dev, peer_ports, len, direction); if (ret < 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to get %d hairpin peer %s ports", port_id, direction ? "Rx" : "Tx"); @@ -2926,12 +2917,11 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) return ret; #endif - if (*dev->dev_ops->tx_done_cleanup == NULL) + if (dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; /* Call driver to free pending mbufs. */ - ret = (*dev->dev_ops->tx_done_cleanup)(dev->data->tx_queues[queue_id], - free_cnt); + ret = dev->dev_ops->tx_done_cleanup(dev->data->tx_queues[queue_id], free_cnt); ret = eth_err(port_id, ret); rte_eth_trace_tx_done_cleanup(port_id, queue_id, free_cnt, ret); @@ -2951,10 +2941,10 @@ rte_eth_promiscuous_enable(uint16_t port_id) if (dev->data->promiscuous == 1) return 0; - if (*dev->dev_ops->promiscuous_enable == NULL) + if (dev->dev_ops->promiscuous_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->promiscuous_enable)(dev); + diag = dev->dev_ops->promiscuous_enable(dev); dev->data->promiscuous = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -2977,11 +2967,11 @@ rte_eth_promiscuous_disable(uint16_t port_id) if (dev->data->promiscuous == 0) return 0; - if (*dev->dev_ops->promiscuous_disable == NULL) + if (dev->dev_ops->promiscuous_disable == NULL) return -ENOTSUP; dev->data->promiscuous = 0; - diag = (*dev->dev_ops->promiscuous_disable)(dev); + diag = dev->dev_ops->promiscuous_disable(dev); if (diag != 0) dev->data->promiscuous = 1; @@ -3018,9 +3008,9 @@ rte_eth_allmulticast_enable(uint16_t port_id) if (dev->data->all_multicast == 1) return 0; - if (*dev->dev_ops->allmulticast_enable == NULL) + if (dev->dev_ops->allmulticast_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->allmulticast_enable)(dev); + diag = dev->dev_ops->allmulticast_enable(dev); dev->data->all_multicast = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -3043,10 +3033,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) if (dev->data->all_multicast == 0) return 0; - if (*dev->dev_ops->allmulticast_disable == NULL) + if (dev->dev_ops->allmulticast_disable == NULL) return -ENOTSUP; dev->data->all_multicast = 0; - diag = (*dev->dev_ops->allmulticast_disable)(dev); + diag = dev->dev_ops->allmulticast_disable(dev); if (diag != 0) dev->data->all_multicast = 1; @@ -3088,9 +3078,9 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 1); + dev->dev_ops->link_update(dev, 1); *eth_link = dev->data->dev_link; } @@ -3116,9 +3106,9 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); *eth_link = dev->data->dev_link; } @@ -3243,10 +3233,10 @@ rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats) memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; - ret = eth_err(port_id, (*dev->dev_ops->stats_get)(dev, stats)); + ret = eth_err(port_id, dev->dev_ops->stats_get(dev, stats)); rte_eth_trace_stats_get(port_id, stats, ret); @@ -3262,9 +3252,9 @@ rte_eth_stats_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev); + ret = dev->dev_ops->stats_reset(dev); if (ret != 0) return eth_err(port_id, ret); @@ -3302,7 +3292,7 @@ eth_dev_get_xstats_count(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; if (dev->dev_ops->xstats_get_names != NULL) { - count = (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + count = dev->dev_ops->xstats_get_names(dev, NULL, 0); if (count < 0) return eth_err(port_id, count); } else @@ -3438,8 +3428,7 @@ eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy, - xstats_names + m, k); + rc = dev->dev_ops->xstats_get_names_by_id(dev, ids_copy, xstats_names + m, k); if (rc < 0) return rc; m += rc; @@ -3567,7 +3556,7 @@ rte_eth_xstats_get_names(uint16_t port_id, /* If there are any driver-specific xstats, append them * to end of list. */ - cnt_driver_entries = (*dev->dev_ops->xstats_get_names)( + cnt_driver_entries = dev->dev_ops->xstats_get_names( dev, xstats_names + cnt_used_entries, size - cnt_used_entries); @@ -3658,8 +3647,7 @@ eth_xtats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values + m, k); + rc = dev->dev_ops->xstats_get_by_id(dev, ids_copy, values + m, k); if (rc < 0) return rc; m += rc; @@ -3776,7 +3764,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats, /* Retrieve the xstats from the driver at the end of the * xstats struct. */ - xcount = (*dev->dev_ops->xstats_get)(dev, + xcount = dev->dev_ops->xstats_get(dev, (n > count) ? xstats + count : NULL, (n > count) ? n - count : 0); @@ -3816,7 +3804,7 @@ rte_eth_xstats_reset(uint16_t port_id) /* implemented by the driver */ if (dev->dev_ops->xstats_reset != NULL) { - int ret = eth_err(port_id, (*dev->dev_ops->xstats_reset)(dev)); + int ret = eth_err(port_id, dev->dev_ops->xstats_reset(dev)); rte_eth_trace_xstats_reset(port_id, ret); @@ -3844,12 +3832,12 @@ rte_eth_xstats_set_counter(uint16_t port_id, uint64_t id, int on_off) if (rte_eth_xstats_query_state(port_id, id) == 1) return -EEXIST; if (dev->dev_ops->xstats_enable != NULL) - return (*dev->dev_ops->xstats_enable)(dev, id - basic_count); + return dev->dev_ops->xstats_enable(dev, id - basic_count); } else { if (rte_eth_xstats_query_state(port_id, id) == 0) return 0; if (dev->dev_ops->xstats_disable != NULL) - return (*dev->dev_ops->xstats_disable)(dev, id - basic_count); + return dev->dev_ops->xstats_disable(dev, id - basic_count); } return -ENOTSUP; @@ -3871,7 +3859,7 @@ rte_eth_xstats_query_state(uint16_t port_id, uint64_t id) /* implemented by the driver */ if (dev->dev_ops->xstats_query_state != NULL) - return (*dev->dev_ops->xstats_query_state)(dev, id - basic_count); + return dev->dev_ops->xstats_query_state(dev, id - basic_count); return -ENOTSUP; } @@ -3894,9 +3882,9 @@ eth_dev_set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, if (stat_idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS) return -EINVAL; - if (*dev->dev_ops->queue_stats_mapping_set == NULL) + if (dev->dev_ops->queue_stats_mapping_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_stats_mapping_set) (dev, queue_id, stat_idx, is_rx); + return dev->dev_ops->queue_stats_mapping_set(dev, queue_id, stat_idx, is_rx); } int @@ -3947,10 +3935,9 @@ rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size) return -EINVAL; } - if (*dev->dev_ops->fw_version_get == NULL) + if (dev->dev_ops->fw_version_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fw_version_get)(dev, - fw_version, fw_size)); + ret = eth_err(port_id, dev->dev_ops->fw_version_get(dev, fw_version, fw_size)); rte_ethdev_trace_fw_version_get(port_id, fw_version, fw_size, ret); @@ -3995,9 +3982,9 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) dev_info->rss_algo_capa = RTE_ETH_HASH_ALGO_CAPA_MASK(DEFAULT); dev_info->max_rx_bufsize = UINT32_MAX; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->dev_infos_get)(dev, dev_info); + diag = dev->dev_ops->dev_infos_get(dev, dev_info); if (diag != 0) { /* Cleanup already filled in device information */ memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -4063,10 +4050,9 @@ rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL) + if (dev->dev_ops->dev_supported_ptypes_get == NULL) return 0; - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (!all_ptypes) return 0; @@ -4116,15 +4102,14 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL || - *dev->dev_ops->dev_ptypes_set == NULL) { + if (dev->dev_ops->dev_supported_ptypes_get == NULL || + dev->dev_ops->dev_ptypes_set == NULL) { ret = 0; goto ptype_unknown; } if (ptype_mask == 0) { - ret = (*dev->dev_ops->dev_ptypes_set)(dev, - ptype_mask); + ret = dev->dev_ops->dev_ptypes_set(dev, ptype_mask); goto ptype_unknown; } @@ -4143,8 +4128,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, goto ptype_unknown; } - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (all_ptypes == NULL) { ret = 0; goto ptype_unknown; @@ -4173,7 +4157,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, if (set_ptypes != NULL && j < num) set_ptypes[j] = RTE_PTYPE_UNKNOWN; - return (*dev->dev_ops->dev_ptypes_set)(dev, ptype_mask); + return dev->dev_ops->dev_ptypes_set(dev, ptype_mask); ptype_unknown: if (num > 0) @@ -4261,7 +4245,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->mtu_set == NULL) + if (dev->dev_ops->mtu_set == NULL) return -ENOTSUP; /* @@ -4270,7 +4254,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) * that are populated within the call to rte_eth_dev_info_get() * which relies on dev->dev_ops->dev_infos_get. */ - if (*dev->dev_ops->dev_infos_get != NULL) { + if (dev->dev_ops->dev_infos_get != NULL) { ret = rte_eth_dev_info_get(port_id, &dev_info); if (ret != 0) return ret; @@ -4287,7 +4271,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) return -EINVAL; } - ret = (*dev->dev_ops->mtu_set)(dev, mtu); + ret = dev->dev_ops->mtu_set(dev, mtu); if (ret == 0) dev->data->mtu = mtu; @@ -4319,10 +4303,10 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) port_id, vlan_id); return -EINVAL; } - if (*dev->dev_ops->vlan_filter_set == NULL) + if (dev->dev_ops->vlan_filter_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); + ret = dev->dev_ops->vlan_filter_set(dev, vlan_id, on); if (ret == 0) { struct rte_vlan_filter_conf *vfc; int vidx; @@ -4359,9 +4343,9 @@ rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; - (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); + dev->dev_ops->vlan_strip_queue_set(dev, rx_queue_id, on); rte_ethdev_trace_set_vlan_strip_on_queue(port_id, rx_queue_id, on); @@ -4379,10 +4363,9 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_tpid_set == NULL) + if (dev->dev_ops->vlan_tpid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, - tpid)); + ret = eth_err(port_id, dev->dev_ops->vlan_tpid_set(dev, vlan_type, tpid)); rte_ethdev_trace_set_vlan_ether_type(port_id, vlan_type, tpid, ret); @@ -4469,10 +4452,10 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) return -EINVAL; } - if (*dev->dev_ops->vlan_offload_set == NULL) + if (dev->dev_ops->vlan_offload_set == NULL) return -ENOTSUP; dev->data->dev_conf.rxmode.offloads = dev_offloads; - ret = (*dev->dev_ops->vlan_offload_set)(dev, mask); + ret = dev->dev_ops->vlan_offload_set(dev, mask); if (ret) { /* hit an error restore original values */ dev->data->dev_conf.rxmode.offloads = orig_offloads; @@ -4522,9 +4505,9 @@ rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_pvid_set == NULL) + if (dev->dev_ops->vlan_pvid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on)); + ret = eth_err(port_id, dev->dev_ops->vlan_pvid_set(dev, pvid, on)); rte_ethdev_trace_set_vlan_pvid(port_id, pvid, on, ret); @@ -4547,10 +4530,10 @@ rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_get == NULL) + if (dev->dev_ops->flow_ctrl_get == NULL) return -ENOTSUP; memset(fc_conf, 0, sizeof(*fc_conf)); - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_get(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_get(port_id, fc_conf, ret); @@ -4578,9 +4561,9 @@ rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_set == NULL) + if (dev->dev_ops->flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_set(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_set(port_id, fc_conf, ret); @@ -4610,10 +4593,9 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, } /* High water, low water validation are device specific */ - if (*dev->dev_ops->priority_flow_ctrl_set == NULL) + if (dev->dev_ops->priority_flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_set) - (dev, pfc_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_set(dev, pfc_conf)); rte_ethdev_trace_priority_flow_ctrl_set(port_id, pfc_conf, ret); @@ -4686,10 +4668,9 @@ rte_eth_dev_priority_flow_ctrl_queue_info_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_info_get) - (dev, pfc_queue_info)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_queue_info_get(dev, pfc_queue_info)); rte_ethdev_trace_priority_flow_ctrl_queue_info_get(port_id, pfc_queue_info, ret); @@ -4762,10 +4743,9 @@ rte_eth_dev_priority_flow_ctrl_queue_configure(uint16_t port_id, return ret; } - if (*dev->dev_ops->priority_flow_ctrl_queue_config == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_config == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_config) - (dev, pfc_queue_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_queue_config(dev, pfc_queue_conf)); rte_ethdev_trace_priority_flow_ctrl_queue_configure(port_id, pfc_queue_conf, ret); @@ -4859,10 +4839,9 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, return -ENOTSUP; } - if (*dev->dev_ops->reta_update == NULL) + if (dev->dev_ops->reta_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_update(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_update(port_id, reta_conf, reta_size, ret); @@ -4892,10 +4871,9 @@ rte_eth_dev_rss_reta_query(uint16_t port_id, if (ret < 0) return ret; - if (*dev->dev_ops->reta_query == NULL) + if (dev->dev_ops->reta_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_query)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_query(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_query(port_id, reta_conf, reta_size, ret); @@ -4959,10 +4937,9 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->rss_hash_update == NULL) + if (dev->dev_ops->rss_hash_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_update(dev, rss_conf)); rte_ethdev_trace_rss_hash_update(port_id, rss_conf, ret); @@ -5001,10 +4978,9 @@ rte_eth_dev_rss_hash_conf_get(uint16_t port_id, rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_DEFAULT; - if (*dev->dev_ops->rss_hash_conf_get == NULL) + if (dev->dev_ops->rss_hash_conf_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_conf_get)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_conf_get(dev, rss_conf)); rte_ethdev_trace_rss_hash_conf_get(port_id, rss_conf, ret); @@ -5062,10 +5038,9 @@ rte_eth_dev_udp_tunnel_port_add(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_add == NULL) + if (dev->dev_ops->udp_tunnel_port_add == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_add)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_add(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_add(port_id, udp_tunnel, ret); @@ -5094,10 +5069,9 @@ rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_del == NULL) + if (dev->dev_ops->udp_tunnel_port_del == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_del)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_del(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_delete(port_id, udp_tunnel, ret); @@ -5113,9 +5087,9 @@ rte_eth_led_on(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_on == NULL) + if (dev->dev_ops->dev_led_on == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_on)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_on(dev)); rte_eth_trace_led_on(port_id, ret); @@ -5131,9 +5105,9 @@ rte_eth_led_off(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_off == NULL) + if (dev->dev_ops->dev_led_off == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_off(dev)); rte_eth_trace_led_off(port_id, ret); @@ -5158,9 +5132,9 @@ rte_eth_fec_get_capability(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->fec_get_capability == NULL) + if (dev->dev_ops->fec_get_capability == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->fec_get_capability)(dev, speed_fec_capa, num); + ret = dev->dev_ops->fec_get_capability(dev, speed_fec_capa, num); rte_eth_trace_fec_get_capability(port_id, speed_fec_capa, num, ret); @@ -5183,9 +5157,9 @@ rte_eth_fec_get(uint16_t port_id, uint32_t *fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_get == NULL) + if (dev->dev_ops->fec_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_get)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_get(dev, fec_capa)); rte_eth_trace_fec_get(port_id, fec_capa, ret); @@ -5206,9 +5180,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_set == NULL) + if (dev->dev_ops->fec_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_set(dev, fec_capa)); rte_eth_trace_fec_set(port_id, fec_capa, ret); @@ -5260,7 +5234,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -EINVAL; } - if (*dev->dev_ops->mac_addr_add == NULL) + if (dev->dev_ops->mac_addr_add == NULL) return -ENOTSUP; if (rte_is_zero_ether_addr(addr)) { @@ -5290,7 +5264,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, } /* Update NIC */ - ret = (*dev->dev_ops->mac_addr_add)(dev, addr, index, pool); + ret = dev->dev_ops->mac_addr_add(dev, addr, index, pool); if (ret == 0) { /* Update address in NIC data structure */ @@ -5323,7 +5297,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return -EINVAL; } - if (*dev->dev_ops->mac_addr_remove == NULL) + if (dev->dev_ops->mac_addr_remove == NULL) return -ENOTSUP; index = eth_dev_get_mac_addr_index(port_id, addr); @@ -5336,7 +5310,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return 0; /* Do nothing if address wasn't found */ /* Update NIC */ - (*dev->dev_ops->mac_addr_remove)(dev, index); + dev->dev_ops->mac_addr_remove(dev, index); /* Update address in NIC data structure */ rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]); @@ -5369,7 +5343,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) if (!rte_is_valid_assigned_ether_addr(addr)) return -EINVAL; - if (*dev->dev_ops->mac_addr_set == NULL) + if (dev->dev_ops->mac_addr_set == NULL) return -ENOTSUP; /* Keep address unique in dev->data->mac_addrs[]. */ @@ -5381,7 +5355,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) return -EEXIST; } - ret = (*dev->dev_ops->mac_addr_set)(dev, addr); + ret = dev->dev_ops->mac_addr_set(dev, addr); if (ret < 0) return ret; @@ -5467,9 +5441,9 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr, } } - if (*dev->dev_ops->uc_hash_table_set == NULL) + if (dev->dev_ops->uc_hash_table_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on); + ret = dev->dev_ops->uc_hash_table_set(dev, addr, on); if (ret == 0) { /* Update address in NIC data structure */ if (on) @@ -5496,9 +5470,9 @@ rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->uc_all_hash_table_set == NULL) + if (dev->dev_ops->uc_all_hash_table_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->uc_all_hash_table_set)(dev, on)); + ret = eth_err(port_id, dev->dev_ops->uc_all_hash_table_set(dev, on)); rte_ethdev_trace_uc_all_hash_table_set(port_id, on, ret); @@ -5536,10 +5510,9 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, return -EINVAL; } - if (*dev->dev_ops->set_queue_rate_limit == NULL) + if (dev->dev_ops->set_queue_rate_limit == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_queue_rate_limit)(dev, - queue_idx, tx_rate)); + ret = eth_err(port_id, dev->dev_ops->set_queue_rate_limit(dev, queue_idx, tx_rate)); rte_eth_trace_set_queue_rate_limit(port_id, queue_idx, tx_rate, ret); @@ -5568,10 +5541,9 @@ int rte_eth_rx_avail_thresh_set(uint16_t port_id, uint16_t queue_id, port_id); return -EINVAL; } - if (*dev->dev_ops->rx_queue_avail_thresh_set == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_set)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_avail_thresh_set(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_set(port_id, queue_id, avail_thresh, ret); @@ -5592,10 +5564,10 @@ int rte_eth_rx_avail_thresh_query(uint16_t port_id, uint16_t *queue_id, if (*queue_id >= dev->data->nb_rx_queues) *queue_id = 0; - if (*dev->dev_ops->rx_queue_avail_thresh_query == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_query)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_query(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_query(port_id, *queue_id, ret); @@ -5886,9 +5858,9 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_enable == NULL) + if (dev->dev_ops->rx_queue_intr_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_enable(dev, queue_id)); rte_ethdev_trace_rx_intr_enable(port_id, queue_id, ret); @@ -5909,9 +5881,9 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_disable == NULL) + if (dev->dev_ops->rx_queue_intr_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_disable(dev, queue_id)); rte_ethdev_trace_rx_intr_disable(port_id, queue_id, ret); @@ -6189,7 +6161,7 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rxq_info_get == NULL) + if (dev->dev_ops->rxq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6237,7 +6209,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->txq_info_get == NULL) + if (dev->dev_ops->txq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6263,7 +6235,7 @@ rte_eth_recycle_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, if (unlikely(ret != 0)) return ret; - if (*dev->dev_ops->recycle_rxq_info_get == NULL) + if (dev->dev_ops->recycle_rxq_info_get == NULL) return -ENOTSUP; dev->dev_ops->recycle_rxq_info_get(dev, queue_id, recycle_rxq_info); @@ -6293,7 +6265,7 @@ rte_eth_rx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_burst_mode_get == NULL) + if (dev->dev_ops->rx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6326,7 +6298,7 @@ rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_burst_mode_get == NULL) + if (dev->dev_ops->tx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6359,7 +6331,7 @@ rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->get_monitor_addr == NULL) + if (dev->dev_ops->get_monitor_addr == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->get_monitor_addr(dev->data->rx_queues[queue_id], pmc)); @@ -6380,7 +6352,7 @@ rte_eth_dev_set_mc_addr_list(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->set_mc_addr_list == NULL) + if (dev->dev_ops->set_mc_addr_list == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr)); @@ -6400,9 +6372,9 @@ rte_eth_timesync_enable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_enable == NULL) + if (dev->dev_ops->timesync_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_enable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_enable(dev)); rte_eth_trace_timesync_enable(port_id, ret); @@ -6418,9 +6390,9 @@ rte_eth_timesync_disable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_disable == NULL) + if (dev->dev_ops->timesync_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_disable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_disable(dev)); rte_eth_trace_timesync_disable(port_id, ret); @@ -6444,11 +6416,10 @@ rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp, return -EINVAL; } - if (*dev->dev_ops->timesync_read_rx_timestamp == NULL) + if (dev->dev_ops->timesync_read_rx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_rx_timestamp) - (dev, timestamp, flags)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_rx_timestamp(dev, timestamp, flags)); rte_eth_trace_timesync_read_rx_timestamp(port_id, timestamp, flags, ret); @@ -6473,11 +6444,10 @@ rte_eth_timesync_read_tx_timestamp(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->timesync_read_tx_timestamp == NULL) + if (dev->dev_ops->timesync_read_tx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_tx_timestamp) - (dev, timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_tx_timestamp(dev, timestamp)); rte_eth_trace_timesync_read_tx_timestamp(port_id, timestamp, ret); @@ -6494,9 +6464,9 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_time == NULL) + if (dev->dev_ops->timesync_adjust_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_time)(dev, delta)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_time(dev, delta)); rte_eth_trace_timesync_adjust_time(port_id, delta, ret); @@ -6512,9 +6482,9 @@ rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_freq == NULL) + if (dev->dev_ops->timesync_adjust_freq == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_freq(dev, ppm)); rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret); @@ -6537,10 +6507,9 @@ rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_read_time == NULL) + if (dev->dev_ops->timesync_read_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_time(dev, timestamp)); rte_eth_trace_timesync_read_time(port_id, timestamp, ret); @@ -6563,10 +6532,9 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_write_time == NULL) + if (dev->dev_ops->timesync_write_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_write_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_write_time(dev, timestamp)); rte_eth_trace_timesync_write_time(port_id, timestamp, ret); @@ -6588,9 +6556,9 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock) return -EINVAL; } - if (*dev->dev_ops->read_clock == NULL) + if (dev->dev_ops->read_clock == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->read_clock)(dev, clock)); + ret = eth_err(port_id, dev->dev_ops->read_clock(dev, clock)); rte_eth_trace_read_clock(port_id, clock, ret); @@ -6645,9 +6613,9 @@ rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info) if (info->names != NULL && info->length != 0) memset(info->names, 0, sizeof(struct rte_eth_reg_name) * info->length); - if (*dev->dev_ops->get_reg == NULL) + if (dev->dev_ops->get_reg == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_reg)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_reg(dev, info)); rte_ethdev_trace_get_reg_info(port_id, info, ret); @@ -6669,9 +6637,9 @@ rte_eth_dev_get_eeprom_length(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->get_eeprom_length == NULL) + if (dev->dev_ops->get_eeprom_length == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom_length)(dev)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom_length(dev)); rte_ethdev_trace_get_eeprom_length(port_id, ret); @@ -6694,9 +6662,9 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->get_eeprom == NULL) + if (dev->dev_ops->get_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom(dev, info)); rte_ethdev_trace_get_eeprom(port_id, info, ret); @@ -6719,9 +6687,9 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->set_eeprom == NULL) + if (dev->dev_ops->set_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->set_eeprom(dev, info)); rte_ethdev_trace_set_eeprom(port_id, info, ret); @@ -6745,9 +6713,9 @@ rte_eth_dev_get_module_info(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_info == NULL) + if (dev->dev_ops->get_module_info == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_info)(dev, modinfo); + ret = dev->dev_ops->get_module_info(dev, modinfo); rte_ethdev_trace_get_module_info(port_id, modinfo, ret); @@ -6785,9 +6753,9 @@ rte_eth_dev_get_module_eeprom(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_eeprom == NULL) + if (dev->dev_ops->get_module_eeprom == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_eeprom)(dev, info); + ret = dev->dev_ops->get_module_eeprom(dev, info); rte_ethdev_trace_get_module_eeprom(port_id, info, ret); @@ -6813,9 +6781,9 @@ rte_eth_dev_get_dcb_info(uint16_t port_id, memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info)); - if (*dev->dev_ops->get_dcb_info == NULL) + if (dev->dev_ops->get_dcb_info == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_dcb_info)(dev, dcb_info)); + ret = eth_err(port_id, dev->dev_ops->get_dcb_info(dev, dcb_info)); rte_ethdev_trace_get_dcb_info(port_id, dcb_info, ret); @@ -6883,10 +6851,10 @@ rte_eth_dev_hairpin_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->hairpin_cap_get == NULL) + if (dev->dev_ops->hairpin_cap_get == NULL) return -ENOTSUP; memset(cap, 0, sizeof(*cap)); - ret = eth_err(port_id, (*dev->dev_ops->hairpin_cap_get)(dev, cap)); + ret = eth_err(port_id, dev->dev_ops->hairpin_cap_get(dev, cap)); rte_ethdev_trace_hairpin_capability_get(port_id, cap, ret); @@ -6909,10 +6877,10 @@ rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool) return -EINVAL; } - if (*dev->dev_ops->pool_ops_supported == NULL) + if (dev->dev_ops->pool_ops_supported == NULL) return 1; /* all pools are supported */ - ret = (*dev->dev_ops->pool_ops_supported)(dev, pool); + ret = dev->dev_ops->pool_ops_supported(dev, pool); rte_ethdev_trace_pool_ops_supported(port_id, pool, ret); @@ -6929,9 +6897,9 @@ rte_eth_representor_info_get(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->representor_info_get == NULL) + if (dev->dev_ops->representor_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->representor_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->representor_info_get(dev, info)); rte_eth_trace_representor_info_get(port_id, info, ret); @@ -6963,10 +6931,10 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t *features) rte_flow_restore_info_dynflag_register() < 0) *features &= ~RTE_ETH_RX_METADATA_TUNNEL_ID; - if (*dev->dev_ops->rx_metadata_negotiate == NULL) + if (dev->dev_ops->rx_metadata_negotiate == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); + dev->dev_ops->rx_metadata_negotiate(dev, features)); rte_eth_trace_rx_metadata_negotiate(port_id, *features, ret); @@ -6995,11 +6963,11 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) + if (dev->dev_ops->ip_reassembly_capability_get == NULL) return -ENOTSUP; memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) + ret = eth_err(port_id, (dev->dev_ops->ip_reassembly_capability_get) (dev, reassembly_capa)); rte_eth_trace_ip_reassembly_capability_get(port_id, reassembly_capa, @@ -7030,11 +6998,11 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_get == NULL) + if (dev->dev_ops->ip_reassembly_conf_get == NULL) return -ENOTSUP; memset(conf, 0, sizeof(struct rte_eth_ip_reassembly_params)); ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_get)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_get(dev, conf)); rte_eth_trace_ip_reassembly_conf_get(port_id, conf, ret); @@ -7071,10 +7039,10 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_set == NULL) + if (dev->dev_ops->ip_reassembly_conf_set == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_set(dev, conf)); rte_eth_trace_ip_reassembly_conf_set(port_id, conf, ret); @@ -7094,9 +7062,9 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) return -EINVAL; } - if (*dev->dev_ops->eth_dev_priv_dump == NULL) + if (dev->dev_ops->eth_dev_priv_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file)); + return eth_err(port_id, dev->dev_ops->eth_dev_priv_dump(dev, file)); } int @@ -7118,11 +7086,11 @@ rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_rx_descriptor_dump == NULL) + if (dev->dev_ops->eth_rx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_rx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_rx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7144,11 +7112,11 @@ rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_tx_descriptor_dump == NULL) + if (dev->dev_ops->eth_tx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_tx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_tx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7170,10 +7138,9 @@ rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t *ptypes return -EINVAL; } - if (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) + if (dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) return -ENOTSUP; - all_types = (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get)(dev, - &no_of_elements); + all_types = dev->dev_ops->buffer_split_supported_hdr_ptypes_get(dev, &no_of_elements); if (all_types == NULL) return 0; @@ -7199,9 +7166,9 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->count_aggr_ports == NULL) + if (dev->dev_ops->count_aggr_ports == NULL) return 0; - ret = eth_err(port_id, (*dev->dev_ops->count_aggr_ports)(dev)); + ret = eth_err(port_id, dev->dev_ops->count_aggr_ports(dev)); rte_eth_trace_count_aggr_ports(port_id, ret); @@ -7223,7 +7190,7 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->map_aggr_tx_affinity == NULL) + if (dev->dev_ops->map_aggr_tx_affinity == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -7255,8 +7222,8 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - ret = eth_err(port_id, (*dev->dev_ops->map_aggr_tx_affinity)(dev, - tx_queue_id, affinity)); + ret = eth_err(port_id, + dev->dev_ops->map_aggr_tx_affinity(dev, tx_queue_id, affinity)); rte_eth_trace_map_aggr_tx_affinity(port_id, tx_queue_id, affinity, ret); diff --git a/lib/ethdev/rte_ethdev_cman.c b/lib/ethdev/rte_ethdev_cman.c index 41e38bdc89..73262ffc5f 100644 --- a/lib/ethdev/rte_ethdev_cman.c +++ b/lib/ethdev/rte_ethdev_cman.c @@ -31,7 +31,7 @@ rte_eth_cman_info_get(uint16_t port_id, struct rte_eth_cman_info *info) } memset(info, 0, sizeof(struct rte_eth_cman_info)); - ret = eth_err(port_id, (*dev->dev_ops->cman_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->cman_info_get(dev, info)); rte_eth_trace_cman_info_get(port_id, info, ret); @@ -59,7 +59,7 @@ rte_eth_cman_config_init(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_init)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_init(dev, config)); rte_eth_trace_cman_config_init(port_id, config, ret); @@ -86,7 +86,7 @@ rte_eth_cman_config_set(uint16_t port_id, const struct rte_eth_cman_config *conf return -ENOTSUP; } - ret = eth_err(port_id, (*dev->dev_ops->cman_config_set)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_set(dev, config)); rte_eth_trace_cman_config_set(port_id, config, ret); @@ -114,7 +114,7 @@ rte_eth_cman_config_get(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_get)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_get(dev, config)); rte_eth_trace_cman_config_get(port_id, config, ret); -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 02/11] eventdev: remover unnecessary deref on function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger 2025-02-17 18:54 ` [RFC 01/11] ethdev: remove unnecessary deref on function pointers Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 03/11] net/ixgbe: remove unnecessary dereference Stephen Hemminger ` (11 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev_dev_ops->foo and dev->dev_ops->foo are equivalent. Cleanup the result by removing unneeded parenthesis and make lines compact. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/eventdev/rte_event_crypto_adapter.c | 36 ++---- lib/eventdev/rte_event_dma_adapter.c | 16 +-- lib/eventdev/rte_event_eth_rx_adapter.c | 50 ++++---- lib/eventdev/rte_eventdev.c | 164 +++++++++++------------- 4 files changed, 118 insertions(+), 148 deletions(-) diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index 939ca1cad9..a6b0b1a85a 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -1132,7 +1132,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_add == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_add == NULL) return -ENOTSUP; if (dev_info->qpairs == NULL) { dev_info->qpairs = @@ -1144,10 +1144,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, - dev_info->dev, - queue_pair_id, - conf); + ret = dev->dev_ops->crypto_adapter_queue_pair_add(dev, dev_info->dev, + queue_pair_id, conf); if (ret) return ret; @@ -1233,11 +1231,9 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, if ((cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_del == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->crypto_adapter_queue_pair_del)(dev, - dev_info->dev, - queue_pair_id); + ret = dev->dev_ops->crypto_adapter_queue_pair_del(dev, dev_info->dev, queue_pair_id); if (ret == 0) { eca_update_qp_info(adapter, &adapter->cdevs[cdev_id], @@ -1308,10 +1304,8 @@ eca_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->crypto_adapter_start)(dev, - &dev_info->dev[i]) : - (*dev->dev_ops->crypto_adapter_stop)(dev, - &dev_info->dev[i]); + start ? dev->dev_ops->crypto_adapter_start(dev, &dev_info->dev[i]) : + dev->dev_ops->crypto_adapter_stop(dev, &dev_info->dev[i]); } if (use_service) @@ -1367,11 +1361,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id, for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_get == NULL) + dev->dev_ops->crypto_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->crypto_adapter_stats_get)(dev, - dev_info->dev, - &dev_stats); + ret = dev->dev_ops->crypto_adapter_stats_get(dev, dev_info->dev, &dev_stats); if (ret) continue; @@ -1418,10 +1410,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id) for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_reset == NULL) + dev->dev_ops->crypto_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->crypto_adapter_stats_reset)(dev, - dev_info->dev); + dev->dev_ops->crypto_adapter_stats_reset(dev, dev_info->dev); } memset(&adapter->crypto_stats, 0, sizeof(adapter->crypto_stats)); @@ -1606,9 +1597,8 @@ rte_event_crypto_adapter_vector_limits_get( return -ENOTSUP; } - if ((*dev->dev_ops->crypto_adapter_vector_limits_get) == NULL) + if (dev->dev_ops->crypto_adapter_vector_limits_get == NULL) return -ENOTSUP; - return dev->dev_ops->crypto_adapter_vector_limits_get( - dev, cdev, limits); + return dev->dev_ops->crypto_adapter_vector_limits_get(dev, cdev, limits); } diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c index 165374d195..d9a02a30f2 100644 --- a/lib/eventdev/rte_event_dma_adapter.c +++ b/lib/eventdev/rte_event_dma_adapter.c @@ -1030,7 +1030,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_add == NULL) + if (dev->dev_ops->dma_adapter_vchan_add == NULL) return -ENOTSUP; if (dev_info->vchanq == NULL) { dev_info->vchanq = rte_zmalloc_socket(adapter->mem_name, @@ -1054,7 +1054,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, } } - ret = (*dev->dev_ops->dma_adapter_vchan_add)(dev, dma_dev_id, vchan, event); + ret = dev->dev_ops->dma_adapter_vchan_add(dev, dma_dev_id, vchan, event); if (ret) return ret; @@ -1132,9 +1132,9 @@ rte_event_dma_adapter_vchan_del(uint8_t id, int16_t dma_dev_id, uint16_t vchan) if ((cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_del == NULL) + if (dev->dev_ops->dma_adapter_vchan_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dma_adapter_vchan_del)(dev, dma_dev_id, vchan); + ret = dev->dev_ops->dma_adapter_vchan_del(dev, dma_dev_id, vchan); if (ret == 0) { edma_update_vchanq_info(adapter, dev_info, vchan, 0); if (dev_info->num_vchanq == 0) { @@ -1212,8 +1212,8 @@ edma_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->dma_adapter_start)(dev, i) : - (*dev->dev_ops->dma_adapter_stop)(dev, i); + start ? dev->dev_ops->dma_adapter_start(dev, i) : + dev->dev_ops->dma_adapter_stop(dev, i); } if (use_service) @@ -1363,7 +1363,7 @@ rte_event_dma_adapter_stats_get(uint8_t id, struct rte_event_dma_adapter_stats * dev->dev_ops->dma_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->dma_adapter_stats_get)(dev, i, &dev_stats); + ret = dev->dev_ops->dma_adapter_stats_get(dev, i, &dev_stats); if (ret) continue; @@ -1404,7 +1404,7 @@ rte_event_dma_adapter_stats_reset(uint8_t id) dev->dev_ops->dma_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->dma_adapter_stats_reset)(dev, i); + dev->dev_ops->dma_adapter_stats_reset(dev, i); } memset(&adapter->dma_stats, 0, sizeof(adapter->dma_stats)); diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index 39674c4604..669788430b 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -2362,10 +2362,8 @@ rxa_ctrl(uint8_t id, int start) dev_info->dev_rx_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->eth_rx_adapter_start)(dev, - &rte_eth_devices[i]) : - (*dev->dev_ops->eth_rx_adapter_stop)(dev, - &rte_eth_devices[i]); + start ? dev->dev_ops->eth_rx_adapter_start(dev, &rte_eth_devices[i]) : + dev->dev_ops->eth_rx_adapter_stop(dev, &rte_eth_devices[i]); } if (use_service) { @@ -2749,7 +2747,7 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_add == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_add == NULL) return -ENOTSUP; if (dev_info->rx_queue == NULL) { dev_info->rx_queue = @@ -2761,9 +2759,8 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->eth_rx_adapter_queue_add)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_add(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); if (ret == 0) { dev_info->internal_event_port = 1; rxa_update_queue(rx_adapter, @@ -2847,11 +2844,10 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, uint16_t eth_dev_id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_del == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->eth_rx_adapter_queue_del)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id); + ret = dev->dev_ops->eth_rx_adapter_queue_del(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id); if (ret == 0) { rxa_update_queue(rx_adapter, &rx_adapter->eth_devices[eth_dev_id], @@ -2959,10 +2955,11 @@ rte_event_eth_rx_adapter_vector_limits_get( } if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) + if (dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) return -ENOTSUP; - ret = dev->dev_ops->eth_rx_adapter_vector_limits_get( - dev, &rte_eth_devices[eth_port_id], limits); + ret = dev->dev_ops->eth_rx_adapter_vector_limits_get(dev, + &rte_eth_devices[eth_port_id], + limits); } else { ret = rxa_sw_vector_limits(limits); } @@ -3051,11 +3048,10 @@ rte_event_eth_rx_adapter_stats_get(uint8_t id, } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_get == NULL) + dev->dev_ops->eth_rx_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->eth_rx_adapter_stats_get)(dev, - &rte_eth_devices[i], - &dev_stats); + ret = dev->dev_ops->eth_rx_adapter_stats_get(dev, &rte_eth_devices[i], + &dev_stats); if (ret) continue; dev_stats_sum.rx_packets += dev_stats.rx_packets; @@ -3127,7 +3123,7 @@ rte_event_eth_rx_adapter_queue_stats_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_get != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_get)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_get(dev, &rte_eth_devices[eth_dev_id], rx_queue_id, stats); } @@ -3172,10 +3168,9 @@ rte_event_eth_rx_adapter_stats_reset(uint8_t id) } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_reset == NULL) + dev->dev_ops->eth_rx_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->eth_rx_adapter_stats_reset)(dev, - &rte_eth_devices[i]); + dev->dev_ops->eth_rx_adapter_stats_reset(dev, &rte_eth_devices[i]); } memset(&rx_adapter->stats, 0, sizeof(rx_adapter->stats)); @@ -3229,7 +3224,7 @@ rte_event_eth_rx_adapter_queue_stats_reset(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_reset != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_reset)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_reset(dev, &rte_eth_devices[eth_dev_id], rx_queue_id); } @@ -3396,10 +3391,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) { - ret = (*dev->dev_ops->eth_rx_adapter_queue_conf_get)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, - queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_conf_get(dev, + &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); return ret; } diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index 1078e0bcee..43cd95d765 100644 --- a/lib/eventdev/rte_eventdev.c +++ b/lib/eventdev/rte_eventdev.c @@ -100,9 +100,9 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_event_dev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns; @@ -137,10 +137,8 @@ rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_rx_adapter_caps_get ? - (*dev->dev_ops->eth_rx_adapter_caps_get)(dev, - &rte_eth_devices[eth_port_id], - caps) - : 0; + dev->dev_ops->eth_rx_adapter_caps_get(dev, &rte_eth_devices[eth_port_id], caps) + : 0; } int @@ -164,11 +162,8 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps) *caps = 0; return dev->dev_ops->timer_adapter_caps_get ? - (*dev->dev_ops->timer_adapter_caps_get)(dev, - 0, - caps, - &ops) - : 0; + dev->dev_ops->timer_adapter_caps_get(dev, 0, caps, &ops) + : 0; } int @@ -196,8 +191,7 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id, *caps = 0; return dev->dev_ops->crypto_adapter_caps_get ? - (*dev->dev_ops->crypto_adapter_caps_get) - (dev, cdev, caps) : 0; + dev->dev_ops->crypto_adapter_caps_get(dev, cdev, caps) : 0; } int @@ -224,10 +218,8 @@ rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_tx_adapter_caps_get ? - (*dev->dev_ops->eth_tx_adapter_caps_get)(dev, - eth_dev, - caps) - : 0; + dev->dev_ops->eth_tx_adapter_caps_get(dev, eth_dev, caps) + : 0; } int @@ -247,7 +239,7 @@ rte_event_dma_adapter_caps_get(uint8_t dev_id, uint8_t dma_dev_id, uint32_t *cap *caps = 0; if (dev->dev_ops->dma_adapter_caps_get) - return (*dev->dev_ops->dma_adapter_caps_get)(dev, dma_dev_id, caps); + return dev->dev_ops->dma_adapter_caps_get(dev, dma_dev_id, caps); return 0; } @@ -264,11 +256,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) if (nb_queues != 0) { queues_cfg = dev->data->queues_cfg; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); if (nb_queues > old_nb_queues) { @@ -278,11 +270,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) sizeof(queues_cfg[0]) * new_qs); } } else { - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); } dev->data->nb_queues = nb_queues; @@ -304,14 +296,14 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) dev->data->dev_id); if (nb_ports != 0) { /* re-config */ - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; ports_cfg = dev->data->ports_cfg; for (i = nb_ports; i < old_nb_ports; i++) - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); if (nb_ports > old_nb_ports) { uint8_t new_ps = nb_ports - old_nb_ports; @@ -331,12 +323,12 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) } } } else { - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; for (i = nb_ports; i < old_nb_ports; i++) { - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); ports[i] = NULL; } } @@ -356,9 +348,9 @@ rte_event_dev_configure(uint8_t dev_id, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -370,7 +362,7 @@ rte_event_dev_configure(uint8_t dev_id, if (dev_conf == NULL) return -EINVAL; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); /* Check dequeue_timeout_ns value is in limit */ if (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) { @@ -524,7 +516,7 @@ rte_event_dev_configure(uint8_t dev_id, event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev); + diag = (dev->dev_ops->dev_configure)(dev); if (diag != 0) { RTE_EDEV_LOG_ERR("dev%d dev_configure = %d", dev_id, diag); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); @@ -564,10 +556,10 @@ rte_event_queue_default_conf_get(uint8_t dev_id, uint8_t queue_id, return -EINVAL; } - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; memset(queue_conf, 0, sizeof(struct rte_event_queue_conf)); - (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf); rte_eventdev_trace_queue_default_conf_get(dev_id, dev, queue_id, queue_conf); @@ -654,19 +646,19 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, return -EBUSY; } - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; if (queue_conf == NULL) { - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, &def_conf); queue_conf = &def_conf; } dev->data->queues_cfg[queue_id] = *queue_conf; rte_eventdev_trace_queue_setup(dev_id, queue_id, queue_conf); - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf); } static inline int @@ -695,10 +687,10 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id, return -EINVAL; } - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; memset(port_conf, 0, sizeof(struct rte_event_port_conf)); - (*dev->dev_ops->port_def_conf)(dev, port_id, port_conf); + dev->dev_ops->port_def_conf(dev, port_id, port_conf); rte_eventdev_trace_port_default_conf_get(dev_id, dev, port_id, port_conf); @@ -770,19 +762,19 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id, return -EBUSY; } - if (*dev->dev_ops->port_setup == NULL) + if (dev->dev_ops->port_setup == NULL) return -ENOTSUP; if (port_conf == NULL) { - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->port_def_conf)(dev, port_id, &def_conf); + dev->dev_ops->port_def_conf(dev, port_id, &def_conf); port_conf = &def_conf; } dev->data->ports_cfg[port_id] = *port_conf; - diag = (*dev->dev_ops->port_setup)(dev, port_id, port_conf); + diag = dev->dev_ops->port_setup(dev, port_id, port_conf); /* Unlink all the queues from this port(default state after setup) */ if (!diag) @@ -812,8 +804,7 @@ rte_event_port_quiesce(uint8_t dev_id, uint8_t port_id, } if (dev->dev_ops->port_quiesce) - (*dev->dev_ops->port_quiesce)(dev, dev->data->ports[port_id], - release_cb, args); + dev->dev_ops->port_quiesce(dev, dev->data->ports[port_id], release_cb, args); } int @@ -979,10 +970,9 @@ rte_event_queue_attr_set(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id, return -ENOTSUP; } - if (*dev->dev_ops->queue_attr_set == NULL) + if (dev->dev_ops->queue_attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_attr_set)(dev, queue_id, attr_id, - attr_value); + return dev->dev_ops->queue_attr_set(dev, queue_id, attr_id, attr_value); } int @@ -1007,23 +997,23 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_link == NULL) { + if (dev->dev_ops->port_link == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_link_profile == NULL) { + if (profile_id && dev->dev_ops->port_link_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1057,11 +1047,11 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t } if (profile_id) - diag = (*dev->dev_ops->port_link_profile)(dev, dev->data->ports[port_id], queues, - priorities, nb_links, profile_id); + diag = dev->dev_ops->port_link_profile(dev, dev->data->ports[port_id], queues, + priorities, nb_links, profile_id); else - diag = (*dev->dev_ops->port_link)(dev, dev->data->ports[port_id], queues, - priorities, nb_links); + diag = dev->dev_ops->port_link(dev, dev->data->ports[port_id], queues, + priorities, nb_links); if (diag < 0) return diag; @@ -1095,23 +1085,23 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_unlink == NULL) { + if (dev->dev_ops->port_unlink == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_unlink_profile == NULL) { + if (profile_id && dev->dev_ops->port_unlink_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1153,11 +1143,11 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], } if (profile_id) - diag = (*dev->dev_ops->port_unlink_profile)(dev, dev->data->ports[port_id], queues, - nb_unlinks, profile_id); + diag = dev->dev_ops->port_unlink_profile(dev, dev->data->ports[port_id], queues, + nb_unlinks, profile_id); else - diag = (*dev->dev_ops->port_unlink)(dev, dev->data->ports[port_id], queues, - nb_unlinks); + diag = dev->dev_ops->port_unlink(dev, dev->data->ports[port_id], queues, + nb_unlinks); if (diag < 0) return diag; @@ -1186,11 +1176,10 @@ rte_event_port_unlinks_in_progress(uint8_t dev_id, uint8_t port_id) * This allows PMDs which handle unlink synchronously to not implement * this function at all. */ - if (*dev->dev_ops->port_unlinks_in_progress == NULL) + if (dev->dev_ops->port_unlinks_in_progress == NULL) return 0; - return (*dev->dev_ops->port_unlinks_in_progress)(dev, - dev->data->ports[port_id]); + return dev->dev_ops->port_unlinks_in_progress(dev, dev->data->ports[port_id]); } int @@ -1237,10 +1226,10 @@ rte_event_port_profile_links_get(uint8_t dev_id, uint8_t port_id, uint8_t queues RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); @@ -1278,13 +1267,13 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->timeout_ticks == NULL) + if (dev->dev_ops->timeout_ticks == NULL) return -ENOTSUP; if (timeout_ticks == NULL) return -EINVAL; - return (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks); + return dev->dev_ops->timeout_ticks(dev, ns, timeout_ticks); } int @@ -1313,12 +1302,12 @@ rte_event_dev_dump(uint8_t dev_id, FILE *f) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; if (f == NULL) return -EINVAL; - (*dev->dev_ops->dump)(dev, f); + dev->dev_ops->dump(dev, f); return 0; } @@ -1329,9 +1318,7 @@ xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, { struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, - NULL, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, NULL, NULL, 0); return 0; } @@ -1352,8 +1339,8 @@ rte_event_dev_xstats_names_get(uint8_t dev_id, const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, xstats_names, ids, size); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, + xstats_names, ids, size); return -ENOTSUP; } @@ -1369,8 +1356,8 @@ rte_event_dev_xstats_get(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, /* implemented by the driver */ if (dev->dev_ops->xstats_get != NULL) - return (*dev->dev_ops->xstats_get)(dev, mode, queue_port_id, - ids, values, n); + return dev->dev_ops->xstats_get(dev, mode, queue_port_id, + ids, values, n); return -ENOTSUP; } @@ -1389,7 +1376,7 @@ rte_event_dev_xstats_by_name_get(uint8_t dev_id, const char *name, /* implemented by driver */ if (dev->dev_ops->xstats_get_by_name != NULL) - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); return -ENOTSUP; } @@ -1401,8 +1388,7 @@ int rte_event_dev_xstats_reset(uint8_t dev_id, struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_reset != NULL) - return (*dev->dev_ops->xstats_reset)(dev, mode, queue_port_id, - ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, mode, queue_port_id, ids, nb_ids); return -ENOTSUP; } @@ -1423,7 +1409,7 @@ int rte_event_dev_selftest(uint8_t dev_id) rte_mbuf_dynfield_register(&test_seqn_dynfield_desc); if (rte_event_pmd_selftest_seqn_dynfield_offset < 0) return -ENOMEM; - return (*dev->dev_ops->dev_selftest)(); + return dev->dev_ops->dev_selftest(); } return -ENOTSUP; } @@ -1483,7 +1469,7 @@ rte_event_dev_start(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1492,7 +1478,7 @@ rte_event_dev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = (dev->dev_ops->dev_start)(dev); rte_eventdev_trace_start(dev_id, diag); if (diag == 0) dev->data->dev_started = 1; @@ -1533,7 +1519,7 @@ rte_event_dev_stop(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_RET(dev_id); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1543,7 +1529,7 @@ rte_event_dev_stop(uint8_t dev_id) } dev->data->dev_started = 0; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_eventdev_trace_stop(dev_id); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); } @@ -1555,7 +1541,7 @@ rte_event_dev_close(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -1567,7 +1553,7 @@ rte_event_dev_close(uint8_t dev_id) event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); rte_eventdev_trace_close(dev_id); - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } static inline int -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 03/11] net/ixgbe: remove unnecessary dereference 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger 2025-02-17 18:54 ` [RFC 01/11] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-17 18:54 ` [RFC 02/11] eventdev: remover " Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 04/11] net/memif: remove unnecessary deref of function pointers Stephen Hemminger ` (10 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->vlan_strip_queue_set and dev->dev_ops->vlan_strip_queue are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c index 15c28e7a3f..5a7d66d9b9 100644 --- a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c @@ -291,7 +291,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) if (on > 1) return -EINVAL; - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; /* The PF has 128 queue pairs and in SRIOV configuration @@ -310,8 +310,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) RTE_ETH_64_POOLS; for (q = 0; q < queues_per_pool; q++) - (*dev->dev_ops->vlan_strip_queue_set)(dev, - q + vf * queues_per_pool, on); + dev->dev_ops->vlan_strip_queue_set(dev, q + vf * queues_per_pool, on); return 0; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 04/11] net/memif: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (2 preceding siblings ...) 2025-02-17 18:54 ` [RFC 03/11] net/ixgbe: remove unnecessary dereference Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 05/11] cryptodev: " Stephen Hemminger ` (9 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger Since queue release functions are local to driver, prefer those over dereferencing the dev_ops table. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/memif/rte_eth_memif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index c0bf1e3bbf..f7b04c4f9e 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -70,6 +70,8 @@ static const struct rte_eth_link pmd_link = { static int memif_region_init_zc(const struct rte_memseg_list *msl, const struct rte_memseg *ms, void *arg); +static void memif_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid); +static void memif_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); const char * memif_version(void) @@ -1418,9 +1420,9 @@ memif_dev_close(struct rte_eth_dev *dev) memif_msg_enq_disconnect(pmd->cc, "Device closed", 0); for (i = 0; i < dev->data->nb_rx_queues; i++) - (*dev->dev_ops->rx_queue_release)(dev, i); + memif_rx_queue_release(dev, i); for (i = 0; i < dev->data->nb_tx_queues; i++) - (*dev->dev_ops->tx_queue_release)(dev, i); + memif_tx_queue_release(dev, i); memif_socket_remove_device(dev); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 05/11] cryptodev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (3 preceding siblings ...) 2025-02-17 18:54 ` [RFC 04/11] net/memif: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 06/11] crypto/scheduler: remove unnecessary dereference Stephen Hemminger ` (8 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->dev_info_gets are equivalent. Cleanup and remove unnecessary parenthesis as well. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/cryptodev/rte_cryptodev.c | 72 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index a49b0662f3..8df36ea057 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -1194,9 +1194,9 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, memset(&dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if (nb_qpairs > (dev_info.max_nb_queue_pairs)) { CDEV_LOG_ERR("Invalid num queue_pairs (%u) for dev %u", @@ -1224,11 +1224,11 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; qp[i] = NULL; @@ -1256,11 +1256,11 @@ rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_reset == NULL) + if (dev->dev_ops->queue_pair_reset == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_reset(dev_id, queue_pair_id, qp_conf, socket_id); - return (*dev->dev_ops->queue_pair_reset)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->queue_pair_reset(dev, queue_pair_id, qp_conf, socket_id); } int @@ -1282,7 +1282,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; rte_spinlock_lock(&rte_cryptodev_callback_lock); @@ -1307,7 +1307,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) } rte_cryptodev_trace_configure(dev_id, config); - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -1325,7 +1325,7 @@ rte_cryptodev_start(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1334,7 +1334,7 @@ rte_cryptodev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); /* expose selection of PMD fast-path functions */ cryptodev_fp_ops_set(rte_crypto_fp_ops + dev_id, dev); @@ -1359,7 +1359,7 @@ rte_cryptodev_stop(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1371,7 +1371,7 @@ rte_cryptodev_stop(uint8_t dev_id) /* point fast-path functions to dummy ones */ cryptodev_fp_ops_reset(rte_crypto_fp_ops + dev_id); - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_cryptodev_trace_stop(dev_id); dev->data->dev_started = 0; } @@ -1407,9 +1407,9 @@ rte_cryptodev_close(uint8_t dev_id) } } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); rte_cryptodev_trace_close(dev_id, retval); if (retval < 0) @@ -1518,12 +1518,11 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf); - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf, - socket_id); + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } struct rte_cryptodev_cb * @@ -1837,9 +1836,9 @@ rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats) dev = &rte_crypto_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); rte_cryptodev_trace_stats_get(dev_id, stats); return 0; @@ -1859,9 +1858,9 @@ rte_cryptodev_stats_reset(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } void @@ -1878,9 +1877,9 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; dev_info->device = dev->device; @@ -2017,7 +2016,7 @@ rte_cryptodev_queue_pair_event_error_query(uint8_t dev_id, uint16_t qp_id) if (qp_id >= dev->data->nb_queue_pairs) return -EINVAL; - if (*dev->dev_ops->queue_pair_event_error_query == NULL) + if (dev->dev_ops->queue_pair_event_error_query == NULL) return -ENOTSUP; return dev->dev_ops->queue_pair_event_error_query(dev, qp_id); @@ -2237,7 +2236,7 @@ rte_cryptodev_asym_session_create(uint8_t dev_id, /* Clear device session pointer.*/ memset(sess->sess_private_data, 0, session_priv_data_sz + sess->user_data_sz); - if (*dev->dev_ops->asym_session_configure == NULL) + if (dev->dev_ops->asym_session_configure == NULL) return -ENOTSUP; if (sess->sess_private_data[0] == 0) { @@ -2286,7 +2285,7 @@ rte_cryptodev_sym_session_free(uint8_t dev_id, void *_sess) return -EINVAL; } - if (*dev->dev_ops->sym_session_clear == NULL) + if (dev->dev_ops->sym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->sym_session_clear(dev, sess); @@ -2316,7 +2315,7 @@ rte_cryptodev_asym_session_free(uint8_t dev_id, void *sess) if (dev == NULL || sess == NULL) return -EINVAL; - if (*dev->dev_ops->asym_session_clear == NULL) + if (dev->dev_ops->asym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->asym_session_clear(dev, sess); @@ -2348,10 +2347,10 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_session_get_size == NULL) + if (dev->dev_ops->sym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); rte_cryptodev_trace_sym_get_private_session_size(dev_id, priv_sess_size); @@ -2370,10 +2369,10 @@ rte_cryptodev_asym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->asym_session_get_size == NULL) + if (dev->dev_ops->asym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->asym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->asym_session_get_size(dev); rte_cryptodev_trace_asym_get_private_session_size(dev_id, priv_sess_size); @@ -2474,7 +2473,7 @@ rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id, dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_cpu_process == NULL || + if (dev->dev_ops->sym_cpu_process == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO)) { sym_crypto_fill_status(vec, ENOTSUP); return 0; @@ -2497,12 +2496,12 @@ rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || + if (dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)) { return -ENOTSUP; } - priv_size = (*dev->dev_ops->sym_get_raw_dp_ctx_size)(dev); + priv_size = dev->dev_ops->sym_get_raw_dp_ctx_size(dev); if (priv_size < 0) return -ENOTSUP; @@ -2530,7 +2529,7 @@ rte_cryptodev_configure_raw_dp_ctx(uint8_t dev_id, uint16_t qp_id, rte_cryptodev_trace_configure_raw_dp_ctx(dev_id, qp_id, sess_type); - return (*dev->dev_ops->sym_configure_raw_dp_ctx)(dev, qp_id, ctx, + return dev->dev_ops->sym_configure_raw_dp_ctx(dev, qp_id, ctx, sess_type, session_ctx, is_update); } @@ -2556,8 +2555,7 @@ rte_cryptodev_session_event_mdata_set(uint8_t dev_id, void *sess, rte_cryptodev_trace_session_event_mdata_set(dev_id, sess, op_type, sess_type, ev_mdata, size); - return (*dev->dev_ops->session_ev_mdata_set)(dev, sess, op_type, - sess_type, ev_mdata); + return dev->dev_ops->session_ev_mdata_set(dev, sess, op_type, sess_type, ev_mdata); skip_pmd_op: if (op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 06/11] crypto/scheduler: remove unnecessary dereference 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (4 preceding siblings ...) 2025-02-17 18:54 ` [RFC 05/11] cryptodev: " Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 07/11] compressdev: remove unnecessary deref of function pointers Stephen Hemminger ` (7 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->sym_session_get_size and dev->dev_ops->sym_session_get_size are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/crypto/scheduler/scheduler_pmd_ops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c index 6e43438469..5f6c637682 100644 --- a/drivers/crypto/scheduler/scheduler_pmd_ops.c +++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c @@ -195,10 +195,9 @@ scheduler_session_size_get(struct scheduler_ctx *sched_ctx, uint32_t priv_sess_size = 0; if (session_type == RTE_CRYPTO_OP_WITH_SESSION) { - priv_sess_size = - (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); } else { - priv_sess_size = (*sec_ctx->ops->session_get_size)(dev); + priv_sess_size = sec_ctx->ops->session_get_size(dev); } max_priv_sess_size = RTE_MAX(max_priv_sess_size, priv_sess_size); -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 07/11] compressdev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (5 preceding siblings ...) 2025-02-17 18:54 ` [RFC 06/11] crypto/scheduler: remove unnecessary dereference Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 08/11] dmadev: " Stephen Hemminger ` (6 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/compressdev/rte_compressdev.c | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c index cf2c20a704..1fc4661ef0 100644 --- a/lib/compressdev/rte_compressdev.c +++ b/lib/compressdev/rte_compressdev.c @@ -316,9 +316,9 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, memset(&dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if ((dev_info.max_nb_queue_pairs != 0) && (nb_qpairs > dev_info.max_nb_queue_pairs)) { @@ -346,11 +346,11 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -397,11 +397,11 @@ rte_compressdev_queue_pairs_release(struct rte_compressdev *dev) COMPRESSDEV_LOG(DEBUG, "Free %d queues pairs on device %u", dev->data->nb_queue_pairs, dev->data->dev_id); - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = 0; i < num_qps; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -432,7 +432,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; /* Setup new number of queue pairs and reconfigure device. */ @@ -445,7 +445,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return diag; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -463,7 +463,7 @@ rte_compressdev_start(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -472,7 +472,7 @@ rte_compressdev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -493,7 +493,7 @@ rte_compressdev_stop(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -502,7 +502,7 @@ rte_compressdev_stop(uint8_t dev_id) return; } - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; } @@ -532,9 +532,9 @@ rte_compressdev_close(uint8_t dev_id) if (retval < 0) return retval; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); if (retval < 0) return retval; @@ -571,10 +571,10 @@ rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, max_inflight_ops, socket_id); } @@ -618,9 +618,9 @@ rte_compressdev_stats_get(uint8_t dev_id, struct rte_compressdev_stats *stats) dev = &rte_comp_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); return 0; } @@ -636,9 +636,9 @@ rte_compressdev_stats_reset(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } @@ -656,9 +656,9 @@ rte_compressdev_info_get(uint8_t dev_id, struct rte_compressdev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; } @@ -676,9 +676,9 @@ rte_compressdev_private_xform_create(uint8_t dev_id, if (xform == NULL || priv_xform == NULL || dev == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_create == NULL) + if (dev->dev_ops->private_xform_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->private_xform_create)(dev, xform, priv_xform); + ret = dev->dev_ops->private_xform_create(dev, xform, priv_xform); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create private_xform: err=%d", @@ -700,7 +700,7 @@ rte_compressdev_private_xform_free(uint8_t dev_id, void *priv_xform) if (dev == NULL || priv_xform == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_free == NULL) + if (dev->dev_ops->private_xform_free == NULL) return -ENOTSUP; ret = dev->dev_ops->private_xform_free(dev, priv_xform); if (ret < 0) { @@ -726,9 +726,9 @@ rte_compressdev_stream_create(uint8_t dev_id, if (xform == NULL || dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_create == NULL) + if (dev->dev_ops->stream_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stream_create)(dev, xform, stream); + ret = dev->dev_ops->stream_create(dev, xform, stream); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create stream: err=%d", @@ -751,7 +751,7 @@ rte_compressdev_stream_free(uint8_t dev_id, void *stream) if (dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_free == NULL) + if (dev->dev_ops->stream_free == NULL) return -ENOTSUP; ret = dev->dev_ops->stream_free(dev, stream); if (ret < 0) { -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 08/11] dmadev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (6 preceding siblings ...) 2025-02-17 18:54 ` [RFC 07/11] compressdev: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 09/11] rawdev: " Stephen Hemminger ` (5 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/dmadev/rte_dmadev.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 8bb7824aa1..4a075ee1c6 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -443,11 +443,10 @@ rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info) return -EINVAL; dev = &rte_dma_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; memset(dev_info, 0, sizeof(struct rte_dma_info)); - ret = (*dev->dev_ops->dev_info_get)(dev, dev_info, - sizeof(struct rte_dma_info)); + ret = dev->dev_ops->dev_info_get(dev, dev_info, sizeof(struct rte_dma_info)); if (ret != 0) return ret; @@ -510,10 +509,9 @@ rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf) return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_configure)(dev, dev_conf, - sizeof(struct rte_dma_conf)); + ret = dev->dev_ops->dev_configure(dev, dev_conf, sizeof(struct rte_dma_conf)); if (ret == 0) memcpy(&dev->data->dev_conf, dev_conf, sizeof(struct rte_dma_conf)); @@ -546,7 +544,7 @@ rte_dma_start(int16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); rte_dma_trace_start(dev_id, ret); if (ret != 0) return ret; @@ -574,7 +572,7 @@ rte_dma_stop(int16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); rte_dma_trace_stop(dev_id, ret); if (ret != 0) return ret; @@ -601,9 +599,9 @@ rte_dma_close(int16_t dev_id) return -EBUSY; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_close)(dev); + ret = dev->dev_ops->dev_close(dev); if (ret == 0) dma_release(dev); @@ -698,10 +696,9 @@ rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan, return -EINVAL; } - if (*dev->dev_ops->vchan_setup == NULL) + if (dev->dev_ops->vchan_setup == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vchan_setup)(dev, vchan, conf, - sizeof(struct rte_dma_vchan_conf)); + ret = dev->dev_ops->vchan_setup(dev, vchan, conf, sizeof(struct rte_dma_vchan_conf)); rte_dma_trace_vchan_setup(dev_id, vchan, conf, ret); return ret; @@ -723,11 +720,10 @@ rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats) return -EINVAL; } - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; memset(stats, 0, sizeof(struct rte_dma_stats)); - return (*dev->dev_ops->stats_get)(dev, vchan, stats, - sizeof(struct rte_dma_stats)); + return dev->dev_ops->stats_get(dev, vchan, stats, sizeof(struct rte_dma_stats)); } int @@ -747,9 +743,9 @@ rte_dma_stats_reset(int16_t dev_id, uint16_t vchan) return -EINVAL; } - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev, vchan); + ret = dev->dev_ops->stats_reset(dev, vchan); rte_dma_trace_stats_reset(dev_id, vchan, ret); return ret; @@ -769,9 +765,9 @@ rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status * return -EINVAL; } - if (*dev->dev_ops->vchan_status == NULL) + if (dev->dev_ops->vchan_status == NULL) return -ENOTSUP; - return (*dev->dev_ops->vchan_status)(dev, vchan, status); + return dev->dev_ops->vchan_status(dev, vchan, status); } static const char * @@ -850,7 +846,7 @@ rte_dma_dump(int16_t dev_id, FILE *f) dev->data->dev_conf.enable_silent ? "on" : "off"); if (dev->dev_ops->dev_dump != NULL) - ret = (*dev->dev_ops->dev_dump)(dev, f); + ret = dev->dev_ops->dev_dump(dev, f); rte_dma_trace_dump(dev_id, f, ret); return ret; -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 09/11] rawdev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (7 preceding siblings ...) 2025-02-17 18:54 ` [RFC 08/11] dmadev: " Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 10/11] mldev: " Stephen Hemminger ` (4 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_configure and dev->dev_ops->dev_configure are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/rawdev/rte_rawdev.c | 99 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c index 4f8897b639..810e95a440 100644 --- a/lib/rawdev/rte_rawdev.c +++ b/lib/rawdev/rte_rawdev.c @@ -77,9 +77,9 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info, rawdev = &rte_rawdevs[dev_id]; if (dev_info->dev_private != NULL) { - if (*rawdev->dev_ops->dev_info_get == NULL) + if (rawdev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - ret = (*rawdev->dev_ops->dev_info_get)(rawdev, + ret = rawdev->dev_ops->dev_info_get(rawdev, dev_info->dev_private, dev_private_size); } @@ -104,7 +104,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->started) { @@ -114,8 +114,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, } /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev, dev_conf->dev_private, - dev_private_size); + diag = dev->dev_ops->dev_configure(dev, dev_conf->dev_private, dev_private_size); if (diag != 0) RTE_RDEV_ERR("dev%d dev_configure = %d", dev_id, diag); else @@ -135,10 +134,9 @@ rte_rawdev_queue_conf_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf, queue_conf_size); } int @@ -152,10 +150,9 @@ rte_rawdev_queue_setup(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf, queue_conf_size); } int @@ -166,9 +163,9 @@ rte_rawdev_queue_release(uint16_t dev_id, uint16_t queue_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_release)(dev, queue_id); + return dev->dev_ops->queue_release(dev, queue_id); } uint16_t @@ -179,9 +176,9 @@ rte_rawdev_queue_count(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_count == NULL) + if (dev->dev_ops->queue_count == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_count)(dev); + return dev->dev_ops->queue_count(dev); } int @@ -194,9 +191,9 @@ rte_rawdev_get_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_get == NULL) + if (dev->dev_ops->attr_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_get)(dev, attr_name, attr_value); + return dev->dev_ops->attr_get(dev, attr_name, attr_value); } int @@ -209,9 +206,9 @@ rte_rawdev_set_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_set == NULL) + if (dev->dev_ops->attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_set)(dev, attr_name, attr_value); + return dev->dev_ops->attr_set(dev, attr_name, attr_value); } int @@ -225,9 +222,9 @@ rte_rawdev_enqueue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->enqueue_bufs == NULL) + if (dev->dev_ops->enqueue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->enqueue_bufs)(dev, buffers, count, context); + return dev->dev_ops->enqueue_bufs(dev, buffers, count, context); } int @@ -241,9 +238,9 @@ rte_rawdev_dequeue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dequeue_bufs == NULL) + if (dev->dev_ops->dequeue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->dequeue_bufs)(dev, buffers, count, context); + return dev->dev_ops->dequeue_bufs(dev, buffers, count, context); } int @@ -254,9 +251,9 @@ rte_rawdev_dump(uint16_t dev_id, FILE *f) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; - return (*dev->dev_ops->dump)(dev, f); + return dev->dev_ops->dump(dev, f); } static int @@ -264,9 +261,9 @@ xstats_get_count(uint16_t dev_id) { struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, NULL, 0); } int @@ -287,9 +284,9 @@ rte_rawdev_xstats_names_get(uint16_t dev_id, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, xstats_names, size); + return dev->dev_ops->xstats_get_names(dev, xstats_names, size); } /* retrieve rawdev extended statistics */ @@ -302,9 +299,9 @@ rte_rawdev_xstats_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV); const struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get == NULL) + if (dev->dev_ops->xstats_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get)(dev, ids, values, n); + return dev->dev_ops->xstats_get(dev, ids, values, n); } uint64_t @@ -322,9 +319,9 @@ rte_rawdev_xstats_by_name_get(uint16_t dev_id, id = &temp; /* driver never gets a NULL value */ /* implemented by driver */ - if (*dev->dev_ops->xstats_get_by_name == NULL) + if (dev->dev_ops->xstats_get_by_name == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); } int @@ -334,9 +331,9 @@ rte_rawdev_xstats_reset(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_reset == NULL) + if (dev->dev_ops->xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, ids, nb_ids); } int @@ -345,9 +342,9 @@ rte_rawdev_firmware_status_get(uint16_t dev_id, rte_rawdev_obj_t status_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_status_get == NULL) + if (dev->dev_ops->firmware_status_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_status_get)(dev, status_info); + return dev->dev_ops->firmware_status_get(dev, status_info); } int @@ -356,9 +353,9 @@ rte_rawdev_firmware_version_get(uint16_t dev_id, rte_rawdev_obj_t version_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_version_get == NULL) + if (dev->dev_ops->firmware_version_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_version_get)(dev, version_info); + return dev->dev_ops->firmware_version_get(dev, version_info); } int @@ -370,9 +367,9 @@ rte_rawdev_firmware_load(uint16_t dev_id, rte_rawdev_obj_t firmware_image) if (!firmware_image) return -EINVAL; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_load)(dev, firmware_image); + return dev->dev_ops->firmware_load(dev, firmware_image); } int @@ -381,9 +378,9 @@ rte_rawdev_firmware_unload(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_unload)(dev); + return dev->dev_ops->firmware_unload(dev); } int @@ -392,9 +389,9 @@ rte_rawdev_selftest(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev_id); + return dev->dev_ops->dev_selftest(dev_id); } int @@ -416,7 +413,7 @@ rte_rawdev_start(uint16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag != 0) return diag; @@ -444,7 +441,7 @@ rte_rawdev_stop(uint16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); mark_stopped: dev->started = 0; @@ -458,7 +455,7 @@ rte_rawdev_close(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ if (dev->started == 1) { @@ -467,7 +464,7 @@ rte_rawdev_close(uint16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -478,10 +475,10 @@ rte_rawdev_reset(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; /* Reset is not dependent on state of the device */ - return (*dev->dev_ops->dev_reset)(dev); + return dev->dev_ops->dev_reset(dev); } static inline uint8_t -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 10/11] mldev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (8 preceding siblings ...) 2025-02-17 18:54 ` [RFC 09/11] rawdev: " Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 18:54 ` [RFC 11/11] regexdev: " Stephen Hemminger ` (3 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/mldev/rte_mldev.c | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c index 37d71aebc9..e0e5b8d9e8 100644 --- a/lib/mldev/rte_mldev.c +++ b/lib/mldev/rte_mldev.c @@ -237,7 +237,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; if (dev_info == NULL) { @@ -246,7 +246,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } memset(dev_info, 0, sizeof(struct rte_ml_dev_info)); - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } int @@ -262,7 +262,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -285,7 +285,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) return -EINVAL; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -299,7 +299,7 @@ rte_ml_dev_close(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -308,7 +308,7 @@ rte_ml_dev_close(int16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -323,7 +323,7 @@ rte_ml_dev_start(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -331,7 +331,7 @@ rte_ml_dev_start(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; @@ -350,7 +350,7 @@ rte_ml_dev_stop(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -358,7 +358,7 @@ rte_ml_dev_stop(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; @@ -392,7 +392,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_queue_pair_setup == NULL) + if (dev->dev_ops->dev_queue_pair_setup == NULL) return -ENOTSUP; if (queue_pair_id >= dev->data->nb_queue_pairs) { @@ -410,7 +410,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->dev_queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } int @@ -424,7 +424,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_get == NULL) + if (dev->dev_ops->dev_stats_get == NULL) return -ENOTSUP; if (stats == NULL) { @@ -433,7 +433,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } memset(stats, 0, sizeof(struct rte_ml_dev_stats)); - return (*dev->dev_ops->dev_stats_get)(dev, stats); + return dev->dev_ops->dev_stats_get(dev, stats); } void @@ -447,10 +447,10 @@ rte_ml_dev_stats_reset(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_reset == NULL) + if (dev->dev_ops->dev_stats_reset == NULL) return; - (*dev->dev_ops->dev_stats_reset)(dev); + dev->dev_ops->dev_stats_reset(dev); } int @@ -465,10 +465,10 @@ rte_ml_dev_xstats_names_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, in } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_names_get)(dev, mode, model_id, xstats_map, size); + return dev->dev_ops->dev_xstats_names_get(dev, mode, model_id, xstats_map, size); } int @@ -482,7 +482,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { @@ -495,7 +495,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, stat_id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, stat_id, value); } int @@ -510,7 +510,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (stat_ids == NULL) { @@ -523,7 +523,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, mode, model_id, stat_ids, values, nb_ids); + return dev->dev_ops->dev_xstats_get(dev, mode, model_id, stat_ids, values, nb_ids); } int @@ -538,10 +538,10 @@ rte_ml_dev_xstats_reset(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_ } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_reset)(dev, mode, model_id, stat_ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, mode, model_id, stat_ids, nb_ids); } int @@ -555,7 +555,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (fd == NULL) { @@ -563,7 +563,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, fd); + return dev->dev_ops->dev_dump(dev, fd); } int @@ -577,10 +577,10 @@ rte_ml_dev_selftest(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -594,7 +594,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_load == NULL) + if (dev->dev_ops->model_load == NULL) return -ENOTSUP; if (params == NULL) { @@ -607,7 +607,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * return -EINVAL; } - return (*dev->dev_ops->model_load)(dev, params, model_id); + return dev->dev_ops->model_load(dev, params, model_id); } int @@ -621,10 +621,10 @@ rte_ml_model_unload(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_unload == NULL) + if (dev->dev_ops->model_unload == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_unload)(dev, model_id); + return dev->dev_ops->model_unload(dev, model_id); } int @@ -638,10 +638,10 @@ rte_ml_model_start(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_start == NULL) + if (dev->dev_ops->model_start == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_start)(dev, model_id); + return dev->dev_ops->model_start(dev, model_id); } int @@ -655,10 +655,10 @@ rte_ml_model_stop(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_stop == NULL) + if (dev->dev_ops->model_stop == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_stop)(dev, model_id); + return dev->dev_ops->model_stop(dev, model_id); } int @@ -672,7 +672,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_info_get == NULL) + if (dev->dev_ops->model_info_get == NULL) return -ENOTSUP; if (model_info == NULL) { @@ -681,7 +681,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf return -EINVAL; } - return (*dev->dev_ops->model_info_get)(dev, model_id, model_info); + return dev->dev_ops->model_info_get(dev, model_id, model_info); } int @@ -695,7 +695,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_params_update == NULL) + if (dev->dev_ops->model_params_update == NULL) return -ENOTSUP; if (buffer == NULL) { @@ -703,7 +703,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) return -EINVAL; } - return (*dev->dev_ops->model_params_update)(dev, model_id, buffer); + return dev->dev_ops->model_params_update(dev, model_id, buffer); } int @@ -718,7 +718,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_quantize == NULL) + if (dev->dev_ops->io_quantize == NULL) return -ENOTSUP; if (dbuffer == NULL) { @@ -731,7 +731,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d return -EINVAL; } - return (*dev->dev_ops->io_quantize)(dev, model_id, dbuffer, qbuffer); + return dev->dev_ops->io_quantize(dev, model_id, dbuffer, qbuffer); } int @@ -746,7 +746,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_dequantize == NULL) + if (dev->dev_ops->io_dequantize == NULL) return -ENOTSUP; if (qbuffer == NULL) { @@ -759,7 +759,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * return -EINVAL; } - return (*dev->dev_ops->io_dequantize)(dev, model_id, qbuffer, dbuffer); + return dev->dev_ops->io_dequantize(dev, model_id, qbuffer, dbuffer); } /** Initialise rte_ml_op mempool element */ -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC 11/11] regexdev: remove unnecessary deref of function pointers 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (9 preceding siblings ...) 2025-02-17 18:54 ` [RFC 10/11] mldev: " Stephen Hemminger @ 2025-02-17 18:54 ` Stephen Hemminger 2025-02-17 20:24 ` [RFC 00/11] Fix dev_ops dereferences Morten Brørup ` (2 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-17 18:54 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/regexdev/rte_regexdev.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c index b2c4b49d97..431ed911a1 100644 --- a/lib/regexdev/rte_regexdev.c +++ b/lib/regexdev/rte_regexdev.c @@ -189,9 +189,9 @@ regexdev_info_get(uint8_t dev_id, struct rte_regexdev_info *dev_info) if (dev_info == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } @@ -212,7 +212,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) if (cfg == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -289,7 +289,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) dev_info.max_rules_per_group); return -EINVAL; } - ret = (*dev->dev_ops->dev_configure)(dev, cfg); + ret = dev->dev_ops->dev_configure(dev, cfg); if (ret == 0) dev->data->dev_conf = *cfg; return ret; @@ -303,7 +303,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_qp_setup == NULL) + if (dev->dev_ops->dev_qp_setup == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -324,7 +324,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, dev_id); return -EBUSY; } - return (*dev->dev_ops->dev_qp_setup)(dev, queue_pair_id, qp_conf); + return dev->dev_ops->dev_qp_setup(dev, queue_pair_id, qp_conf); } int @@ -335,9 +335,9 @@ rte_regexdev_start(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; return ret; @@ -350,9 +350,9 @@ rte_regexdev_stop(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; return 0; } @@ -364,9 +364,9 @@ rte_regexdev_close(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_close)(dev); + dev->dev_ops->dev_close(dev); dev->data->dev_started = 0; dev->state = RTE_REGEXDEV_UNUSED; return 0; @@ -380,14 +380,14 @@ rte_regexdev_attr_get(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_get == NULL) + if (dev->dev_ops->dev_attr_get == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_get)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_get(dev, attr_id, attr_value); } int @@ -398,14 +398,14 @@ rte_regexdev_attr_set(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_set == NULL) + if (dev->dev_ops->dev_attr_set == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_set)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_set(dev, attr_id, attr_value); } int @@ -417,14 +417,14 @@ rte_regexdev_rule_db_update(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_update == NULL) + if (dev->dev_ops->dev_rule_db_update == NULL) return -ENOTSUP; if (rules == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_rule_db_update)(dev, rules, nb_rules); + return dev->dev_ops->dev_rule_db_update(dev, rules, nb_rules); } int @@ -434,9 +434,9 @@ rte_regexdev_rule_db_compile_activate(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_compile_activate == NULL) + if (dev->dev_ops->dev_rule_db_compile_activate == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_rule_db_compile_activate)(dev); + return dev->dev_ops->dev_rule_db_compile_activate(dev); } int @@ -447,14 +447,14 @@ rte_regexdev_rule_db_import(uint8_t dev_id, const char *rule_db, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_import == NULL) + if (dev->dev_ops->dev_db_import == NULL) return -ENOTSUP; if (rule_db == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_db_import)(dev, rule_db, rule_db_len); + return dev->dev_ops->dev_db_import(dev, rule_db, rule_db_len); } int @@ -464,9 +464,9 @@ rte_regexdev_rule_db_export(uint8_t dev_id, char *rule_db) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_export == NULL) + if (dev->dev_ops->dev_db_export == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_db_export)(dev, rule_db); + return dev->dev_ops->dev_db_export(dev, rule_db); } int @@ -477,14 +477,14 @@ rte_regexdev_xstats_names_get(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; if (xstats_map == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d xstats map can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_names_get)(dev, xstats_map); + return dev->dev_ops->dev_xstats_names_get(dev, xstats_map); } int @@ -495,7 +495,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); @@ -505,7 +505,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d values can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, ids, values, n); + return dev->dev_ops->dev_xstats_get(dev, ids, values, n); } int @@ -516,7 +516,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d name can't be NULL", dev_id); @@ -530,7 +530,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, id, value); } int @@ -541,13 +541,13 @@ rte_regexdev_xstats_reset(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, ids, nb_ids); } int @@ -557,9 +557,9 @@ rte_regexdev_selftest(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -569,11 +569,11 @@ rte_regexdev_dump(uint8_t dev_id, FILE *f) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (f == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d file can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, f); + return dev->dev_ops->dev_dump(dev, f); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* RE: [RFC 00/11] Fix dev_ops dereferences 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (10 preceding siblings ...) 2025-02-17 18:54 ` [RFC 11/11] regexdev: " Stephen Hemminger @ 2025-02-17 20:24 ` Morten Brørup 2025-02-18 3:01 ` Stephen Hemminger 2025-02-18 8:47 ` Bruce Richardson 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger 13 siblings, 2 replies; 52+ messages in thread From: Morten Brørup @ 2025-02-17 20:24 UTC (permalink / raw) To: Stephen Hemminger, dev > From: Stephen Hemminger [mailto:stephen@networkplumber.org] > Sent: Monday, 17 February 2025 19.54 > > A common pattern in DPDK internals is to have an array of function > pointers. When using these pointers an unnecessary derefence is done; > this is allowed in C because of a historical quirk but unnecessary. > > The PVS Studio checker flags these as: > https://pvs-studio.com/en/docs/warnings/v516/ > > This leads to a large number of warnings marked as High severity. > This patchset simplifies the source and gets rid of these warnings. > > It should have no impact on the resulting binary. +1 to this RFC. The code becomes much cleaner to read. ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC 00/11] Fix dev_ops dereferences 2025-02-17 20:24 ` [RFC 00/11] Fix dev_ops dereferences Morten Brørup @ 2025-02-18 3:01 ` Stephen Hemminger 2025-02-18 8:47 ` Bruce Richardson 1 sibling, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-18 3:01 UTC (permalink / raw) To: Morten Brørup; +Cc: dev [-- Attachment #1: Type: text/plain, Size: 835 bytes --] I found a bunch more cases will send V2 On Mon, Feb 17, 2025, 12:24 Morten Brørup <mb@smartsharesystems.com> wrote: > > From: Stephen Hemminger [mailto:stephen@networkplumber.org] > > Sent: Monday, 17 February 2025 19.54 > > > > A common pattern in DPDK internals is to have an array of function > > pointers. When using these pointers an unnecessary derefence is done; > > this is allowed in C because of a historical quirk but unnecessary. > > > > The PVS Studio checker flags these as: > > https://pvs-studio.com/en/docs/warnings/v516/ > > > > This leads to a large number of warnings marked as High severity. > > This patchset simplifies the source and gets rid of these warnings. > > > > It should have no impact on the resulting binary. > > +1 to this RFC. > The code becomes much cleaner to read. > > [-- Attachment #2: Type: text/html, Size: 1405 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC 00/11] Fix dev_ops dereferences 2025-02-17 20:24 ` [RFC 00/11] Fix dev_ops dereferences Morten Brørup 2025-02-18 3:01 ` Stephen Hemminger @ 2025-02-18 8:47 ` Bruce Richardson 1 sibling, 0 replies; 52+ messages in thread From: Bruce Richardson @ 2025-02-18 8:47 UTC (permalink / raw) To: Morten Brørup; +Cc: Stephen Hemminger, dev On Mon, Feb 17, 2025 at 09:24:04PM +0100, Morten Brørup wrote: > > From: Stephen Hemminger [mailto:stephen@networkplumber.org] > > Sent: Monday, 17 February 2025 19.54 > > > > A common pattern in DPDK internals is to have an array of function > > pointers. When using these pointers an unnecessary derefence is done; > > this is allowed in C because of a historical quirk but unnecessary. > > > > The PVS Studio checker flags these as: > > https://pvs-studio.com/en/docs/warnings/v516/ > > > > This leads to a large number of warnings marked as High severity. > > This patchset simplifies the source and gets rid of these warnings. > > > > It should have no impact on the resulting binary. > > +1 to this RFC. > The code becomes much cleaner to read. > Agreed. Series-acked-by: Bruce Richardson <bruce.richardson@intel.com> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 00/14] Remove unnecessary function pointer deref 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (11 preceding siblings ...) 2025-02-17 20:24 ` [RFC 00/11] Fix dev_ops dereferences Morten Brørup @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger ` (15 more replies) 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger 13 siblings, 16 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger A common pattern in DPDK internals is to have an array of function pointers. When using these pointers an unnecessary derefence is done; this is allowed in C because of a historical quirk but unnecessary. This fixes all instances of PVS Studio checker warning: https://pvs-studio.com/en/docs/warnings/v516/ This leads to a large number of warnings marked as High severity. This patchset simplifies the source and gets rid of these warnings. Stephen Hemminger (14): ethdev: remove unnecessary deref on function pointers eventdev: remover unnecessary deref on function pointers net/bonding: remove unnecessary deref of function pointers net/ixgbe: remove unnecessary dereference net/ipn3ke: remove unnecessary dereference net/memif: remove unnecessary deref of function pointers cryptodev: remove unnecessary deref of function pointers crypto/scheduler: remove unnecessary dereference compressdev: remove unnecessary deref of function pointers dmadev: remove unnecessary deref of function pointers rawdev: remove unnecessary deref of function pointers mldev: remove unnecessary deref of function pointers regexdev: remove unnecessary deref of function pointers security: remove unnecessary dereference .../scheduler/rte_cryptodev_scheduler.c | 8 +- drivers/crypto/scheduler/scheduler_pmd_ops.c | 25 +- drivers/net/bonding/rte_eth_bond_pmd.c | 12 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 27 +- drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 +- drivers/net/memif/rte_eth_memif.c | 6 +- lib/compressdev/rte_compressdev.c | 56 +- lib/cryptodev/rte_cryptodev.c | 72 ++- lib/dmadev/rte_dmadev.c | 38 +- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 492 ++++++++---------- lib/ethdev/rte_ethdev.h | 12 +- lib/ethdev/rte_ethdev_cman.c | 8 +- lib/eventdev/rte_event_crypto_adapter.c | 37 +- lib/eventdev/rte_event_dma_adapter.c | 16 +- lib/eventdev/rte_event_eth_rx_adapter.c | 50 +- lib/eventdev/rte_eventdev.c | 164 +++--- lib/mldev/rte_mldev.c | 88 ++-- lib/rawdev/rte_rawdev.c | 99 ++-- lib/regexdev/rte_regexdev.c | 72 +-- lib/security/rte_security.c | 5 +- 22 files changed, 612 insertions(+), 700 deletions(-) -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 7:09 ` Andrew Rybchenko 2025-02-20 2:32 ` [PATCH v2 02/14] eventdev: remover " Stephen Hemminger ` (14 subsequent siblings) 15 siblings, 1 reply; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Thomas Monjalon, Ferruh Yigit, Andrew Rybchenko The expression *dev->dev_ops->rx_queue_start and dev->dev_ops->rx_queue_start are equivalent. Remove the unnecessary asterisk and parenthesis. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 492 ++++++++++++++++------------------- lib/ethdev/rte_ethdev.h | 12 +- lib/ethdev/rte_ethdev_cman.c | 8 +- 5 files changed, 250 insertions(+), 282 deletions(-) diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c index 13d328d97b..e1976db05f 100644 --- a/lib/ethdev/ethdev_driver.c +++ b/lib/ethdev/ethdev_driver.c @@ -749,11 +749,10 @@ rte_eth_hairpin_queue_peer_bind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_bind == NULL) + if (dev->dev_ops->hairpin_queue_peer_bind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_bind)(dev, cur_queue, - peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_bind(dev, cur_queue, peer_info, direction); } int @@ -764,11 +763,10 @@ rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_unbind == NULL) + if (dev->dev_ops->hairpin_queue_peer_unbind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_unbind)(dev, cur_queue, - direction); + return dev->dev_ops->hairpin_queue_peer_unbind(dev, cur_queue, direction); } int @@ -785,11 +783,11 @@ rte_eth_hairpin_queue_peer_update(uint16_t peer_port, uint16_t peer_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[peer_port]; - if (*dev->dev_ops->hairpin_queue_peer_update == NULL) + if (dev->dev_ops->hairpin_queue_peer_update == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_update)(dev, peer_queue, - cur_info, peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_update(dev, peer_queue, + cur_info, peer_info, direction); } int diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index eed8c78747..cc7fd97d4a 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -398,7 +398,7 @@ eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->rx_queue_release != NULL) - (*dev->dev_ops->rx_queue_release)(dev, qid); + dev->dev_ops->rx_queue_release(dev, qid); rxq[qid] = NULL; } @@ -411,7 +411,7 @@ eth_dev_txq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->tx_queue_release != NULL) - (*dev->dev_ops->tx_queue_release)(dev, qid); + dev->dev_ops->tx_queue_release(dev, qid); txq[qid] = NULL; } diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index c4079bb924..45939e0149 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -859,7 +859,7 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_start == NULL) + if (dev->dev_ops->rx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -896,7 +896,7 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_stop == NULL) + if (dev->dev_ops->rx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -940,7 +940,7 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_start == NULL) + if (dev->dev_ops->tx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -977,7 +977,7 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_stop == NULL) + if (dev->dev_ops->tx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -1308,7 +1308,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -1567,7 +1567,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, goto rollback; } - diag = (*dev->dev_ops->dev_configure)(dev); + diag = dev->dev_ops->dev_configure(dev); if (diag != 0) { RTE_ETHDEV_LOG_LINE(ERR, "Port%u dev_configure = %d", port_id, diag); @@ -1630,12 +1630,12 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, /* replay MAC address configuration including default MAC */ addr = &dev->data->mac_addrs[0]; - if (*dev->dev_ops->mac_addr_set != NULL) - (*dev->dev_ops->mac_addr_set)(dev, addr); - else if (*dev->dev_ops->mac_addr_add != NULL) - (*dev->dev_ops->mac_addr_add)(dev, addr, 0, pool); + if (dev->dev_ops->mac_addr_set != NULL) + dev->dev_ops->mac_addr_set(dev, addr); + else if (dev->dev_ops->mac_addr_add != NULL) + dev->dev_ops->mac_addr_add(dev, addr, 0, pool); - if (*dev->dev_ops->mac_addr_add != NULL) { + if (dev->dev_ops->mac_addr_add != NULL) { for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1648,8 +1648,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, do { if (pool_mask & UINT64_C(1)) - (*dev->dev_ops->mac_addr_add)(dev, - addr, i, pool); + dev->dev_ops->mac_addr_add(dev, addr, i, pool); pool_mask >>= 1; pool++; } while (pool_mask); @@ -1668,9 +1667,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_promiscuous_get(port_id) == 1 && - *dev->dev_ops->promiscuous_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_enable)(dev)); + dev->dev_ops->promiscuous_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable promiscuous mode for device (port %u): %s", @@ -1678,9 +1676,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_promiscuous_get(port_id) == 0 && - *dev->dev_ops->promiscuous_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_disable)(dev)); + dev->dev_ops->promiscuous_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable promiscuous mode for device (port %u): %s", @@ -1703,9 +1700,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_allmulticast_get(port_id) == 1 && - *dev->dev_ops->allmulticast_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_enable)(dev)); + dev->dev_ops->allmulticast_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable allmulticast mode for device (port %u): %s", @@ -1713,9 +1709,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_allmulticast_get(port_id) == 0 && - *dev->dev_ops->allmulticast_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_disable)(dev)); + dev->dev_ops->allmulticast_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable allmulticast mode for device (port %u): %s", @@ -1766,7 +1761,7 @@ rte_eth_dev_start(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -1794,7 +1789,7 @@ rte_eth_dev_start(uint16_t port_id) (restore_flags & RTE_ETH_RESTORE_MAC_ADDR)) eth_dev_mac_restore(dev, &dev_info); - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -1816,9 +1811,9 @@ rte_eth_dev_start(uint16_t port_id) } if (dev->data->dev_conf.intr_conf.lsc == 0) { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); } /* expose selection of PMD fast-path functions */ @@ -1837,7 +1832,7 @@ rte_eth_dev_stop(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -1850,7 +1845,7 @@ rte_eth_dev_stop(uint16_t port_id) /* point fast-path functions to dummy ones */ eth_dev_fp_ops_reset(rte_eth_fp_ops + port_id); - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; rte_ethdev_trace_stop(port_id, ret); @@ -1867,9 +1862,9 @@ rte_eth_dev_set_link_up(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_up == NULL) + if (dev->dev_ops->dev_set_link_up == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_up)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_up(dev)); rte_ethdev_trace_set_link_up(port_id, ret); @@ -1885,9 +1880,9 @@ rte_eth_dev_set_link_down(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_down == NULL) + if (dev->dev_ops->dev_set_link_down == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_down)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_down(dev)); rte_ethdev_trace_set_link_down(port_id, ret); @@ -1902,9 +1897,9 @@ rte_eth_speed_lanes_get(uint16_t port_id, uint32_t *lane) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get == NULL) + if (dev->dev_ops->speed_lanes_get == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_get)(dev, lane)); + return eth_err(port_id, dev->dev_ops->speed_lanes_get(dev, lane)); } int @@ -1918,7 +1913,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get_capa == NULL) + if (dev->dev_ops->speed_lanes_get_capa == NULL) return -ENOTSUP; if (speed_lanes_capa == NULL && num > 0) { @@ -1928,7 +1923,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, return -EINVAL; } - ret = (*dev->dev_ops->speed_lanes_get_capa)(dev, speed_lanes_capa, num); + ret = dev->dev_ops->speed_lanes_get_capa(dev, speed_lanes_capa, num); return ret; } @@ -1941,9 +1936,9 @@ rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_set == NULL) + if (dev->dev_ops->speed_lanes_set == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_set)(dev, speed_lanes_capa)); + return eth_err(port_id, dev->dev_ops->speed_lanes_set(dev, speed_lanes_capa)); } int @@ -1968,9 +1963,9 @@ rte_eth_dev_close(uint16_t port_id) return -EINVAL; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - *lasterr = (*dev->dev_ops->dev_close)(dev); + *lasterr = dev->dev_ops->dev_close(dev); if (*lasterr != 0) lasterr = &binerr; @@ -1989,7 +1984,7 @@ rte_eth_dev_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; ret = rte_eth_dev_stop(port_id); @@ -2017,7 +2012,7 @@ rte_eth_dev_is_removed(uint16_t port_id) if (dev->state == RTE_ETH_DEV_REMOVED) return 1; - if (*dev->dev_ops->is_removed == NULL) + if (dev->dev_ops->is_removed == NULL) return 0; ret = dev->dev_ops->is_removed(dev); @@ -2254,7 +2249,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_queue_setup == NULL) + if (dev->dev_ops->rx_queue_setup == NULL) return -ENOTSUP; if (rx_conf != NULL && @@ -2436,8 +2431,8 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return ret; } - ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, - socket_id, &local_conf, mp); + ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc, + socket_id, &local_conf, mp); if (!ret) { if (!dev->data->min_rx_buf_size || dev->data->min_rx_buf_size > mbp_buf_size) @@ -2484,7 +2479,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->rx_hairpin_queue_setup == NULL) + if (dev->dev_ops->rx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_rx_desc == 0) @@ -2542,8 +2537,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_rxq_release(dev, rx_queue_id); - ret = (*dev->dev_ops->rx_hairpin_queue_setup)(dev, rx_queue_id, - nb_rx_desc, conf); + ret = dev->dev_ops->rx_hairpin_queue_setup(dev, rx_queue_id, nb_rx_desc, conf); if (ret == 0) dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2573,7 +2567,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_queue_setup == NULL) + if (dev->dev_ops->tx_queue_setup == NULL) return -ENOTSUP; if (tx_conf != NULL && @@ -2654,7 +2648,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, } rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf); - return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev, + return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev, tx_queue_id, nb_tx_desc, socket_id, &local_conf)); } @@ -2687,7 +2681,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->tx_hairpin_queue_setup == NULL) + if (dev->dev_ops->tx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_tx_desc == 0) @@ -2745,8 +2739,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_txq_release(dev, tx_queue_id); - ret = (*dev->dev_ops->tx_hairpin_queue_setup) - (dev, tx_queue_id, nb_tx_desc, conf); + ret = dev->dev_ops->tx_hairpin_queue_setup(dev, tx_queue_id, nb_tx_desc, conf); if (ret == 0) dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2772,9 +2765,9 @@ rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_bind == NULL) + if (dev->dev_ops->hairpin_bind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_bind)(dev, rx_port); + ret = dev->dev_ops->hairpin_bind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to bind hairpin Tx %d" " to Rx %d (%d - all ports)", @@ -2799,9 +2792,9 @@ rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_unbind == NULL) + if (dev->dev_ops->hairpin_unbind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_unbind)(dev, rx_port); + ret = dev->dev_ops->hairpin_unbind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to unbind hairpin Tx %d" " from Rx %d (%d - all ports)", @@ -2836,11 +2829,10 @@ rte_eth_hairpin_get_peer_ports(uint16_t port_id, uint16_t *peer_ports, return -EINVAL; } - if (*dev->dev_ops->hairpin_get_peer_ports == NULL) + if (dev->dev_ops->hairpin_get_peer_ports == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports, - len, direction); + ret = dev->dev_ops->hairpin_get_peer_ports(dev, peer_ports, len, direction); if (ret < 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to get %d hairpin peer %s ports", port_id, direction ? "Rx" : "Tx"); @@ -2926,12 +2918,11 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) return ret; #endif - if (*dev->dev_ops->tx_done_cleanup == NULL) + if (dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; /* Call driver to free pending mbufs. */ - ret = (*dev->dev_ops->tx_done_cleanup)(dev->data->tx_queues[queue_id], - free_cnt); + ret = dev->dev_ops->tx_done_cleanup(dev->data->tx_queues[queue_id], free_cnt); ret = eth_err(port_id, ret); rte_eth_trace_tx_done_cleanup(port_id, queue_id, free_cnt, ret); @@ -2951,10 +2942,10 @@ rte_eth_promiscuous_enable(uint16_t port_id) if (dev->data->promiscuous == 1) return 0; - if (*dev->dev_ops->promiscuous_enable == NULL) + if (dev->dev_ops->promiscuous_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->promiscuous_enable)(dev); + diag = dev->dev_ops->promiscuous_enable(dev); dev->data->promiscuous = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -2977,11 +2968,11 @@ rte_eth_promiscuous_disable(uint16_t port_id) if (dev->data->promiscuous == 0) return 0; - if (*dev->dev_ops->promiscuous_disable == NULL) + if (dev->dev_ops->promiscuous_disable == NULL) return -ENOTSUP; dev->data->promiscuous = 0; - diag = (*dev->dev_ops->promiscuous_disable)(dev); + diag = dev->dev_ops->promiscuous_disable(dev); if (diag != 0) dev->data->promiscuous = 1; @@ -3018,9 +3009,9 @@ rte_eth_allmulticast_enable(uint16_t port_id) if (dev->data->all_multicast == 1) return 0; - if (*dev->dev_ops->allmulticast_enable == NULL) + if (dev->dev_ops->allmulticast_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->allmulticast_enable)(dev); + diag = dev->dev_ops->allmulticast_enable(dev); dev->data->all_multicast = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -3043,10 +3034,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) if (dev->data->all_multicast == 0) return 0; - if (*dev->dev_ops->allmulticast_disable == NULL) + if (dev->dev_ops->allmulticast_disable == NULL) return -ENOTSUP; dev->data->all_multicast = 0; - diag = (*dev->dev_ops->allmulticast_disable)(dev); + diag = dev->dev_ops->allmulticast_disable(dev); if (diag != 0) dev->data->all_multicast = 1; @@ -3088,9 +3079,9 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 1); + dev->dev_ops->link_update(dev, 1); *eth_link = dev->data->dev_link; } @@ -3116,9 +3107,9 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); *eth_link = dev->data->dev_link; } @@ -3243,10 +3234,10 @@ rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats) memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; - ret = eth_err(port_id, (*dev->dev_ops->stats_get)(dev, stats)); + ret = eth_err(port_id, dev->dev_ops->stats_get(dev, stats)); rte_eth_trace_stats_get(port_id, stats, ret); @@ -3262,9 +3253,9 @@ rte_eth_stats_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev); + ret = dev->dev_ops->stats_reset(dev); if (ret != 0) return eth_err(port_id, ret); @@ -3302,7 +3293,7 @@ eth_dev_get_xstats_count(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; if (dev->dev_ops->xstats_get_names != NULL) { - count = (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + count = dev->dev_ops->xstats_get_names(dev, NULL, 0); if (count < 0) return eth_err(port_id, count); } else @@ -3438,8 +3429,7 @@ eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy, - xstats_names + m, k); + rc = dev->dev_ops->xstats_get_names_by_id(dev, ids_copy, xstats_names + m, k); if (rc < 0) return rc; m += rc; @@ -3567,7 +3557,7 @@ rte_eth_xstats_get_names(uint16_t port_id, /* If there are any driver-specific xstats, append them * to end of list. */ - cnt_driver_entries = (*dev->dev_ops->xstats_get_names)( + cnt_driver_entries = dev->dev_ops->xstats_get_names( dev, xstats_names + cnt_used_entries, size - cnt_used_entries); @@ -3658,8 +3648,7 @@ eth_xtats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values + m, k); + rc = dev->dev_ops->xstats_get_by_id(dev, ids_copy, values + m, k); if (rc < 0) return rc; m += rc; @@ -3776,7 +3765,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats, /* Retrieve the xstats from the driver at the end of the * xstats struct. */ - xcount = (*dev->dev_ops->xstats_get)(dev, + xcount = dev->dev_ops->xstats_get(dev, (n > count) ? xstats + count : NULL, (n > count) ? n - count : 0); @@ -3816,7 +3805,7 @@ rte_eth_xstats_reset(uint16_t port_id) /* implemented by the driver */ if (dev->dev_ops->xstats_reset != NULL) { - int ret = eth_err(port_id, (*dev->dev_ops->xstats_reset)(dev)); + int ret = eth_err(port_id, dev->dev_ops->xstats_reset(dev)); rte_eth_trace_xstats_reset(port_id, ret); @@ -3844,12 +3833,12 @@ rte_eth_xstats_set_counter(uint16_t port_id, uint64_t id, int on_off) if (rte_eth_xstats_query_state(port_id, id) == 1) return -EEXIST; if (dev->dev_ops->xstats_enable != NULL) - return (*dev->dev_ops->xstats_enable)(dev, id - basic_count); + return dev->dev_ops->xstats_enable(dev, id - basic_count); } else { if (rte_eth_xstats_query_state(port_id, id) == 0) return 0; if (dev->dev_ops->xstats_disable != NULL) - return (*dev->dev_ops->xstats_disable)(dev, id - basic_count); + return dev->dev_ops->xstats_disable(dev, id - basic_count); } return -ENOTSUP; @@ -3871,7 +3860,7 @@ rte_eth_xstats_query_state(uint16_t port_id, uint64_t id) /* implemented by the driver */ if (dev->dev_ops->xstats_query_state != NULL) - return (*dev->dev_ops->xstats_query_state)(dev, id - basic_count); + return dev->dev_ops->xstats_query_state(dev, id - basic_count); return -ENOTSUP; } @@ -3894,9 +3883,9 @@ eth_dev_set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, if (stat_idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS) return -EINVAL; - if (*dev->dev_ops->queue_stats_mapping_set == NULL) + if (dev->dev_ops->queue_stats_mapping_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_stats_mapping_set) (dev, queue_id, stat_idx, is_rx); + return dev->dev_ops->queue_stats_mapping_set(dev, queue_id, stat_idx, is_rx); } int @@ -3947,10 +3936,9 @@ rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size) return -EINVAL; } - if (*dev->dev_ops->fw_version_get == NULL) + if (dev->dev_ops->fw_version_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fw_version_get)(dev, - fw_version, fw_size)); + ret = eth_err(port_id, dev->dev_ops->fw_version_get(dev, fw_version, fw_size)); rte_ethdev_trace_fw_version_get(port_id, fw_version, fw_size, ret); @@ -3995,9 +3983,9 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) dev_info->rss_algo_capa = RTE_ETH_HASH_ALGO_CAPA_MASK(DEFAULT); dev_info->max_rx_bufsize = UINT32_MAX; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->dev_infos_get)(dev, dev_info); + diag = dev->dev_ops->dev_infos_get(dev, dev_info); if (diag != 0) { /* Cleanup already filled in device information */ memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -4063,10 +4051,9 @@ rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL) + if (dev->dev_ops->dev_supported_ptypes_get == NULL) return 0; - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (!all_ptypes) return 0; @@ -4116,15 +4103,14 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL || - *dev->dev_ops->dev_ptypes_set == NULL) { + if (dev->dev_ops->dev_supported_ptypes_get == NULL || + dev->dev_ops->dev_ptypes_set == NULL) { ret = 0; goto ptype_unknown; } if (ptype_mask == 0) { - ret = (*dev->dev_ops->dev_ptypes_set)(dev, - ptype_mask); + ret = dev->dev_ops->dev_ptypes_set(dev, ptype_mask); goto ptype_unknown; } @@ -4143,8 +4129,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, goto ptype_unknown; } - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (all_ptypes == NULL) { ret = 0; goto ptype_unknown; @@ -4173,7 +4158,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, if (set_ptypes != NULL && j < num) set_ptypes[j] = RTE_PTYPE_UNKNOWN; - return (*dev->dev_ops->dev_ptypes_set)(dev, ptype_mask); + return dev->dev_ops->dev_ptypes_set(dev, ptype_mask); ptype_unknown: if (num > 0) @@ -4261,7 +4246,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->mtu_set == NULL) + if (dev->dev_ops->mtu_set == NULL) return -ENOTSUP; /* @@ -4270,7 +4255,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) * that are populated within the call to rte_eth_dev_info_get() * which relies on dev->dev_ops->dev_infos_get. */ - if (*dev->dev_ops->dev_infos_get != NULL) { + if (dev->dev_ops->dev_infos_get != NULL) { ret = rte_eth_dev_info_get(port_id, &dev_info); if (ret != 0) return ret; @@ -4287,7 +4272,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) return -EINVAL; } - ret = (*dev->dev_ops->mtu_set)(dev, mtu); + ret = dev->dev_ops->mtu_set(dev, mtu); if (ret == 0) dev->data->mtu = mtu; @@ -4319,10 +4304,10 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) port_id, vlan_id); return -EINVAL; } - if (*dev->dev_ops->vlan_filter_set == NULL) + if (dev->dev_ops->vlan_filter_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); + ret = dev->dev_ops->vlan_filter_set(dev, vlan_id, on); if (ret == 0) { struct rte_vlan_filter_conf *vfc; int vidx; @@ -4359,9 +4344,9 @@ rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; - (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); + dev->dev_ops->vlan_strip_queue_set(dev, rx_queue_id, on); rte_ethdev_trace_set_vlan_strip_on_queue(port_id, rx_queue_id, on); @@ -4379,10 +4364,9 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_tpid_set == NULL) + if (dev->dev_ops->vlan_tpid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, - tpid)); + ret = eth_err(port_id, dev->dev_ops->vlan_tpid_set(dev, vlan_type, tpid)); rte_ethdev_trace_set_vlan_ether_type(port_id, vlan_type, tpid, ret); @@ -4469,10 +4453,10 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) return -EINVAL; } - if (*dev->dev_ops->vlan_offload_set == NULL) + if (dev->dev_ops->vlan_offload_set == NULL) return -ENOTSUP; dev->data->dev_conf.rxmode.offloads = dev_offloads; - ret = (*dev->dev_ops->vlan_offload_set)(dev, mask); + ret = dev->dev_ops->vlan_offload_set(dev, mask); if (ret) { /* hit an error restore original values */ dev->data->dev_conf.rxmode.offloads = orig_offloads; @@ -4522,9 +4506,9 @@ rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_pvid_set == NULL) + if (dev->dev_ops->vlan_pvid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on)); + ret = eth_err(port_id, dev->dev_ops->vlan_pvid_set(dev, pvid, on)); rte_ethdev_trace_set_vlan_pvid(port_id, pvid, on, ret); @@ -4547,10 +4531,10 @@ rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_get == NULL) + if (dev->dev_ops->flow_ctrl_get == NULL) return -ENOTSUP; memset(fc_conf, 0, sizeof(*fc_conf)); - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_get(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_get(port_id, fc_conf, ret); @@ -4578,9 +4562,9 @@ rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_set == NULL) + if (dev->dev_ops->flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_set(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_set(port_id, fc_conf, ret); @@ -4610,10 +4594,9 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, } /* High water, low water validation are device specific */ - if (*dev->dev_ops->priority_flow_ctrl_set == NULL) + if (dev->dev_ops->priority_flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_set) - (dev, pfc_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_set(dev, pfc_conf)); rte_ethdev_trace_priority_flow_ctrl_set(port_id, pfc_conf, ret); @@ -4686,10 +4669,10 @@ rte_eth_dev_priority_flow_ctrl_queue_info_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_info_get) - (dev, pfc_queue_info)); + ret = eth_err(port_id, + dev->dev_ops->priority_flow_ctrl_queue_info_get(dev, pfc_queue_info)); rte_ethdev_trace_priority_flow_ctrl_queue_info_get(port_id, pfc_queue_info, ret); @@ -4762,10 +4745,9 @@ rte_eth_dev_priority_flow_ctrl_queue_configure(uint16_t port_id, return ret; } - if (*dev->dev_ops->priority_flow_ctrl_queue_config == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_config == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_config) - (dev, pfc_queue_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_queue_config(dev, pfc_queue_conf)); rte_ethdev_trace_priority_flow_ctrl_queue_configure(port_id, pfc_queue_conf, ret); @@ -4859,10 +4841,9 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, return -ENOTSUP; } - if (*dev->dev_ops->reta_update == NULL) + if (dev->dev_ops->reta_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_update(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_update(port_id, reta_conf, reta_size, ret); @@ -4892,10 +4873,9 @@ rte_eth_dev_rss_reta_query(uint16_t port_id, if (ret < 0) return ret; - if (*dev->dev_ops->reta_query == NULL) + if (dev->dev_ops->reta_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_query)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_query(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_query(port_id, reta_conf, reta_size, ret); @@ -4959,10 +4939,9 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->rss_hash_update == NULL) + if (dev->dev_ops->rss_hash_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_update(dev, rss_conf)); rte_ethdev_trace_rss_hash_update(port_id, rss_conf, ret); @@ -5001,10 +4980,9 @@ rte_eth_dev_rss_hash_conf_get(uint16_t port_id, rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_DEFAULT; - if (*dev->dev_ops->rss_hash_conf_get == NULL) + if (dev->dev_ops->rss_hash_conf_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_conf_get)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_conf_get(dev, rss_conf)); rte_ethdev_trace_rss_hash_conf_get(port_id, rss_conf, ret); @@ -5062,10 +5040,9 @@ rte_eth_dev_udp_tunnel_port_add(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_add == NULL) + if (dev->dev_ops->udp_tunnel_port_add == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_add)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_add(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_add(port_id, udp_tunnel, ret); @@ -5094,10 +5071,9 @@ rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_del == NULL) + if (dev->dev_ops->udp_tunnel_port_del == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_del)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_del(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_delete(port_id, udp_tunnel, ret); @@ -5113,9 +5089,9 @@ rte_eth_led_on(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_on == NULL) + if (dev->dev_ops->dev_led_on == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_on)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_on(dev)); rte_eth_trace_led_on(port_id, ret); @@ -5131,9 +5107,9 @@ rte_eth_led_off(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_off == NULL) + if (dev->dev_ops->dev_led_off == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_off(dev)); rte_eth_trace_led_off(port_id, ret); @@ -5158,9 +5134,9 @@ rte_eth_fec_get_capability(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->fec_get_capability == NULL) + if (dev->dev_ops->fec_get_capability == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->fec_get_capability)(dev, speed_fec_capa, num); + ret = dev->dev_ops->fec_get_capability(dev, speed_fec_capa, num); rte_eth_trace_fec_get_capability(port_id, speed_fec_capa, num, ret); @@ -5183,9 +5159,9 @@ rte_eth_fec_get(uint16_t port_id, uint32_t *fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_get == NULL) + if (dev->dev_ops->fec_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_get)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_get(dev, fec_capa)); rte_eth_trace_fec_get(port_id, fec_capa, ret); @@ -5206,9 +5182,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_set == NULL) + if (dev->dev_ops->fec_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_set(dev, fec_capa)); rte_eth_trace_fec_set(port_id, fec_capa, ret); @@ -5260,7 +5236,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -EINVAL; } - if (*dev->dev_ops->mac_addr_add == NULL) + if (dev->dev_ops->mac_addr_add == NULL) return -ENOTSUP; if (rte_is_zero_ether_addr(addr)) { @@ -5290,7 +5266,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, } /* Update NIC */ - ret = (*dev->dev_ops->mac_addr_add)(dev, addr, index, pool); + ret = dev->dev_ops->mac_addr_add(dev, addr, index, pool); if (ret == 0) { /* Update address in NIC data structure */ @@ -5323,7 +5299,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return -EINVAL; } - if (*dev->dev_ops->mac_addr_remove == NULL) + if (dev->dev_ops->mac_addr_remove == NULL) return -ENOTSUP; index = eth_dev_get_mac_addr_index(port_id, addr); @@ -5336,7 +5312,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return 0; /* Do nothing if address wasn't found */ /* Update NIC */ - (*dev->dev_ops->mac_addr_remove)(dev, index); + dev->dev_ops->mac_addr_remove(dev, index); /* Update address in NIC data structure */ rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]); @@ -5369,7 +5345,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) if (!rte_is_valid_assigned_ether_addr(addr)) return -EINVAL; - if (*dev->dev_ops->mac_addr_set == NULL) + if (dev->dev_ops->mac_addr_set == NULL) return -ENOTSUP; /* Keep address unique in dev->data->mac_addrs[]. */ @@ -5381,7 +5357,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) return -EEXIST; } - ret = (*dev->dev_ops->mac_addr_set)(dev, addr); + ret = dev->dev_ops->mac_addr_set(dev, addr); if (ret < 0) return ret; @@ -5467,9 +5443,9 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr, } } - if (*dev->dev_ops->uc_hash_table_set == NULL) + if (dev->dev_ops->uc_hash_table_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on); + ret = dev->dev_ops->uc_hash_table_set(dev, addr, on); if (ret == 0) { /* Update address in NIC data structure */ if (on) @@ -5496,9 +5472,9 @@ rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->uc_all_hash_table_set == NULL) + if (dev->dev_ops->uc_all_hash_table_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->uc_all_hash_table_set)(dev, on)); + ret = eth_err(port_id, dev->dev_ops->uc_all_hash_table_set(dev, on)); rte_ethdev_trace_uc_all_hash_table_set(port_id, on, ret); @@ -5536,10 +5512,9 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, return -EINVAL; } - if (*dev->dev_ops->set_queue_rate_limit == NULL) + if (dev->dev_ops->set_queue_rate_limit == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_queue_rate_limit)(dev, - queue_idx, tx_rate)); + ret = eth_err(port_id, dev->dev_ops->set_queue_rate_limit(dev, queue_idx, tx_rate)); rte_eth_trace_set_queue_rate_limit(port_id, queue_idx, tx_rate, ret); @@ -5568,10 +5543,10 @@ int rte_eth_rx_avail_thresh_set(uint16_t port_id, uint16_t queue_id, port_id); return -EINVAL; } - if (*dev->dev_ops->rx_queue_avail_thresh_set == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_set)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_set(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_set(port_id, queue_id, avail_thresh, ret); @@ -5592,10 +5567,10 @@ int rte_eth_rx_avail_thresh_query(uint16_t port_id, uint16_t *queue_id, if (*queue_id >= dev->data->nb_rx_queues) *queue_id = 0; - if (*dev->dev_ops->rx_queue_avail_thresh_query == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_query)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_query(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_query(port_id, *queue_id, ret); @@ -5886,9 +5861,9 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_enable == NULL) + if (dev->dev_ops->rx_queue_intr_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_enable(dev, queue_id)); rte_ethdev_trace_rx_intr_enable(port_id, queue_id, ret); @@ -5909,9 +5884,9 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_disable == NULL) + if (dev->dev_ops->rx_queue_intr_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_disable(dev, queue_id)); rte_ethdev_trace_rx_intr_disable(port_id, queue_id, ret); @@ -6189,7 +6164,7 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rxq_info_get == NULL) + if (dev->dev_ops->rxq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6237,7 +6212,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->txq_info_get == NULL) + if (dev->dev_ops->txq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6263,7 +6238,7 @@ rte_eth_recycle_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, if (unlikely(ret != 0)) return ret; - if (*dev->dev_ops->recycle_rxq_info_get == NULL) + if (dev->dev_ops->recycle_rxq_info_get == NULL) return -ENOTSUP; dev->dev_ops->recycle_rxq_info_get(dev, queue_id, recycle_rxq_info); @@ -6293,7 +6268,7 @@ rte_eth_rx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_burst_mode_get == NULL) + if (dev->dev_ops->rx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6326,7 +6301,7 @@ rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_burst_mode_get == NULL) + if (dev->dev_ops->tx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6359,7 +6334,7 @@ rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->get_monitor_addr == NULL) + if (dev->dev_ops->get_monitor_addr == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->get_monitor_addr(dev->data->rx_queues[queue_id], pmc)); @@ -6380,7 +6355,7 @@ rte_eth_dev_set_mc_addr_list(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->set_mc_addr_list == NULL) + if (dev->dev_ops->set_mc_addr_list == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr)); @@ -6400,9 +6375,9 @@ rte_eth_timesync_enable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_enable == NULL) + if (dev->dev_ops->timesync_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_enable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_enable(dev)); rte_eth_trace_timesync_enable(port_id, ret); @@ -6418,9 +6393,9 @@ rte_eth_timesync_disable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_disable == NULL) + if (dev->dev_ops->timesync_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_disable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_disable(dev)); rte_eth_trace_timesync_disable(port_id, ret); @@ -6444,11 +6419,10 @@ rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp, return -EINVAL; } - if (*dev->dev_ops->timesync_read_rx_timestamp == NULL) + if (dev->dev_ops->timesync_read_rx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_rx_timestamp) - (dev, timestamp, flags)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_rx_timestamp(dev, timestamp, flags)); rte_eth_trace_timesync_read_rx_timestamp(port_id, timestamp, flags, ret); @@ -6473,11 +6447,10 @@ rte_eth_timesync_read_tx_timestamp(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->timesync_read_tx_timestamp == NULL) + if (dev->dev_ops->timesync_read_tx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_tx_timestamp) - (dev, timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_tx_timestamp(dev, timestamp)); rte_eth_trace_timesync_read_tx_timestamp(port_id, timestamp, ret); @@ -6494,9 +6467,9 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_time == NULL) + if (dev->dev_ops->timesync_adjust_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_time)(dev, delta)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_time(dev, delta)); rte_eth_trace_timesync_adjust_time(port_id, delta, ret); @@ -6512,9 +6485,9 @@ rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_freq == NULL) + if (dev->dev_ops->timesync_adjust_freq == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_freq(dev, ppm)); rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret); @@ -6537,10 +6510,9 @@ rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_read_time == NULL) + if (dev->dev_ops->timesync_read_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_time(dev, timestamp)); rte_eth_trace_timesync_read_time(port_id, timestamp, ret); @@ -6563,10 +6535,9 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_write_time == NULL) + if (dev->dev_ops->timesync_write_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_write_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_write_time(dev, timestamp)); rte_eth_trace_timesync_write_time(port_id, timestamp, ret); @@ -6588,9 +6559,9 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock) return -EINVAL; } - if (*dev->dev_ops->read_clock == NULL) + if (dev->dev_ops->read_clock == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->read_clock)(dev, clock)); + ret = eth_err(port_id, dev->dev_ops->read_clock(dev, clock)); rte_eth_trace_read_clock(port_id, clock, ret); @@ -6645,9 +6616,9 @@ rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info) if (info->names != NULL && info->length != 0) memset(info->names, 0, sizeof(struct rte_eth_reg_name) * info->length); - if (*dev->dev_ops->get_reg == NULL) + if (dev->dev_ops->get_reg == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_reg)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_reg(dev, info)); rte_ethdev_trace_get_reg_info(port_id, info, ret); @@ -6669,9 +6640,9 @@ rte_eth_dev_get_eeprom_length(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->get_eeprom_length == NULL) + if (dev->dev_ops->get_eeprom_length == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom_length)(dev)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom_length(dev)); rte_ethdev_trace_get_eeprom_length(port_id, ret); @@ -6694,9 +6665,9 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->get_eeprom == NULL) + if (dev->dev_ops->get_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom(dev, info)); rte_ethdev_trace_get_eeprom(port_id, info, ret); @@ -6719,9 +6690,9 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->set_eeprom == NULL) + if (dev->dev_ops->set_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->set_eeprom(dev, info)); rte_ethdev_trace_set_eeprom(port_id, info, ret); @@ -6745,9 +6716,9 @@ rte_eth_dev_get_module_info(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_info == NULL) + if (dev->dev_ops->get_module_info == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_info)(dev, modinfo); + ret = dev->dev_ops->get_module_info(dev, modinfo); rte_ethdev_trace_get_module_info(port_id, modinfo, ret); @@ -6785,9 +6756,9 @@ rte_eth_dev_get_module_eeprom(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_eeprom == NULL) + if (dev->dev_ops->get_module_eeprom == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_eeprom)(dev, info); + ret = dev->dev_ops->get_module_eeprom(dev, info); rte_ethdev_trace_get_module_eeprom(port_id, info, ret); @@ -6813,9 +6784,9 @@ rte_eth_dev_get_dcb_info(uint16_t port_id, memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info)); - if (*dev->dev_ops->get_dcb_info == NULL) + if (dev->dev_ops->get_dcb_info == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_dcb_info)(dev, dcb_info)); + ret = eth_err(port_id, dev->dev_ops->get_dcb_info(dev, dcb_info)); rte_ethdev_trace_get_dcb_info(port_id, dcb_info, ret); @@ -6883,10 +6854,10 @@ rte_eth_dev_hairpin_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->hairpin_cap_get == NULL) + if (dev->dev_ops->hairpin_cap_get == NULL) return -ENOTSUP; memset(cap, 0, sizeof(*cap)); - ret = eth_err(port_id, (*dev->dev_ops->hairpin_cap_get)(dev, cap)); + ret = eth_err(port_id, dev->dev_ops->hairpin_cap_get(dev, cap)); rte_ethdev_trace_hairpin_capability_get(port_id, cap, ret); @@ -6909,10 +6880,10 @@ rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool) return -EINVAL; } - if (*dev->dev_ops->pool_ops_supported == NULL) + if (dev->dev_ops->pool_ops_supported == NULL) return 1; /* all pools are supported */ - ret = (*dev->dev_ops->pool_ops_supported)(dev, pool); + ret = dev->dev_ops->pool_ops_supported(dev, pool); rte_ethdev_trace_pool_ops_supported(port_id, pool, ret); @@ -6929,9 +6900,9 @@ rte_eth_representor_info_get(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->representor_info_get == NULL) + if (dev->dev_ops->representor_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->representor_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->representor_info_get(dev, info)); rte_eth_trace_representor_info_get(port_id, info, ret); @@ -6963,10 +6934,10 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t *features) rte_flow_restore_info_dynflag_register() < 0) *features &= ~RTE_ETH_RX_METADATA_TUNNEL_ID; - if (*dev->dev_ops->rx_metadata_negotiate == NULL) + if (dev->dev_ops->rx_metadata_negotiate == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); + dev->dev_ops->rx_metadata_negotiate(dev, features)); rte_eth_trace_rx_metadata_negotiate(port_id, *features, ret); @@ -6995,11 +6966,11 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) + if (dev->dev_ops->ip_reassembly_capability_get == NULL) return -ENOTSUP; memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) + ret = eth_err(port_id, (dev->dev_ops->ip_reassembly_capability_get) (dev, reassembly_capa)); rte_eth_trace_ip_reassembly_capability_get(port_id, reassembly_capa, @@ -7030,11 +7001,11 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_get == NULL) + if (dev->dev_ops->ip_reassembly_conf_get == NULL) return -ENOTSUP; memset(conf, 0, sizeof(struct rte_eth_ip_reassembly_params)); ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_get)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_get(dev, conf)); rte_eth_trace_ip_reassembly_conf_get(port_id, conf, ret); @@ -7071,10 +7042,10 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_set == NULL) + if (dev->dev_ops->ip_reassembly_conf_set == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_set(dev, conf)); rte_eth_trace_ip_reassembly_conf_set(port_id, conf, ret); @@ -7094,9 +7065,9 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) return -EINVAL; } - if (*dev->dev_ops->eth_dev_priv_dump == NULL) + if (dev->dev_ops->eth_dev_priv_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file)); + return eth_err(port_id, dev->dev_ops->eth_dev_priv_dump(dev, file)); } int @@ -7118,11 +7089,11 @@ rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_rx_descriptor_dump == NULL) + if (dev->dev_ops->eth_rx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_rx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_rx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7144,11 +7115,11 @@ rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_tx_descriptor_dump == NULL) + if (dev->dev_ops->eth_tx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_tx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_tx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7170,10 +7141,9 @@ rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t *ptypes return -EINVAL; } - if (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) + if (dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) return -ENOTSUP; - all_types = (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get)(dev, - &no_of_elements); + all_types = dev->dev_ops->buffer_split_supported_hdr_ptypes_get(dev, &no_of_elements); if (all_types == NULL) return 0; @@ -7199,9 +7169,9 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->count_aggr_ports == NULL) + if (dev->dev_ops->count_aggr_ports == NULL) return 0; - ret = eth_err(port_id, (*dev->dev_ops->count_aggr_ports)(dev)); + ret = eth_err(port_id, dev->dev_ops->count_aggr_ports(dev)); rte_eth_trace_count_aggr_ports(port_id, ret); @@ -7223,7 +7193,7 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->map_aggr_tx_affinity == NULL) + if (dev->dev_ops->map_aggr_tx_affinity == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -7255,8 +7225,8 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - ret = eth_err(port_id, (*dev->dev_ops->map_aggr_tx_affinity)(dev, - tx_queue_id, affinity)); + ret = eth_err(port_id, + dev->dev_ops->map_aggr_tx_affinity(dev, tx_queue_id, affinity)); rte_eth_trace_map_aggr_tx_affinity(port_id, tx_queue_id, affinity, ret); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 6a51bfba5f..ea7f8c4a1a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -6399,9 +6399,9 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id) return -EINVAL; #endif - if (*p->rx_queue_count == NULL) + if (p->rx_queue_count == NULL) return -ENOTSUP; - return (int)(*p->rx_queue_count)(qd); + return (int)p->rx_queue_count(qd); } /**@{@name Rx hardware descriptor states @@ -6471,9 +6471,9 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, if (qd == NULL) return -ENODEV; #endif - if (*p->rx_descriptor_status == NULL) + if (p->rx_descriptor_status == NULL) return -ENOTSUP; - return (*p->rx_descriptor_status)(qd, offset); + return p->rx_descriptor_status(qd, offset); } /**@{@name Tx hardware descriptor states @@ -6542,9 +6542,9 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, if (qd == NULL) return -ENODEV; #endif - if (*p->tx_descriptor_status == NULL) + if (p->tx_descriptor_status == NULL) return -ENOTSUP; - return (*p->tx_descriptor_status)(qd, offset); + return p->tx_descriptor_status(qd, offset); } /** diff --git a/lib/ethdev/rte_ethdev_cman.c b/lib/ethdev/rte_ethdev_cman.c index 41e38bdc89..73262ffc5f 100644 --- a/lib/ethdev/rte_ethdev_cman.c +++ b/lib/ethdev/rte_ethdev_cman.c @@ -31,7 +31,7 @@ rte_eth_cman_info_get(uint16_t port_id, struct rte_eth_cman_info *info) } memset(info, 0, sizeof(struct rte_eth_cman_info)); - ret = eth_err(port_id, (*dev->dev_ops->cman_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->cman_info_get(dev, info)); rte_eth_trace_cman_info_get(port_id, info, ret); @@ -59,7 +59,7 @@ rte_eth_cman_config_init(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_init)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_init(dev, config)); rte_eth_trace_cman_config_init(port_id, config, ret); @@ -86,7 +86,7 @@ rte_eth_cman_config_set(uint16_t port_id, const struct rte_eth_cman_config *conf return -ENOTSUP; } - ret = eth_err(port_id, (*dev->dev_ops->cman_config_set)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_set(dev, config)); rte_eth_trace_cman_config_set(port_id, config, ret); @@ -114,7 +114,7 @@ rte_eth_cman_config_get(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_get)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_get(dev, config)); rte_eth_trace_cman_config_get(port_id, config, ret); -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers 2025-02-20 2:32 ` [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger @ 2025-02-20 7:09 ` Andrew Rybchenko 2025-02-20 16:09 ` Stephen Hemminger 0 siblings, 1 reply; 52+ messages in thread From: Andrew Rybchenko @ 2025-02-20 7:09 UTC (permalink / raw) To: Stephen Hemminger, dev; +Cc: Thomas Monjalon, Ferruh Yigit On 2/20/25 05:32, Stephen Hemminger wrote: > The expression *dev->dev_ops->rx_queue_start and > dev->dev_ops->rx_queue_start are equivalent. > Remove the unnecessary asterisk and parenthesis. > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> one nit below > @@ -6995,11 +6966,11 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, > return -EINVAL; > } > > - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) > + if (dev->dev_ops->ip_reassembly_capability_get == NULL) > return -ENOTSUP; > memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); > > - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) > + ret = eth_err(port_id, (dev->dev_ops->ip_reassembly_capability_get) Why are parenthesis kept above instead of moving to the next line and remove parenthesis as it is done in the rest of cases? > (dev, reassembly_capa)); > > rte_eth_trace_ip_reassembly_capability_get(port_id, reassembly_capa, ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers 2025-02-20 7:09 ` Andrew Rybchenko @ 2025-02-20 16:09 ` Stephen Hemminger 0 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:09 UTC (permalink / raw) To: Andrew Rybchenko; +Cc: dev, Thomas Monjalon, Ferruh Yigit On Thu, 20 Feb 2025 10:09:23 +0300 Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> wrote: > On 2/20/25 05:32, Stephen Hemminger wrote: > > The expression *dev->dev_ops->rx_queue_start and > > dev->dev_ops->rx_queue_start are equivalent. > > Remove the unnecessary asterisk and parenthesis. > > > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> > > one nit below > > > @@ -6995,11 +6966,11 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, > > return -EINVAL; > > } > > > > - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) > > + if (dev->dev_ops->ip_reassembly_capability_get == NULL) > > return -ENOTSUP; > > memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); > > > > - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) > > + ret = eth_err(port_id, (dev->dev_ops->ip_reassembly_capability_get) > > Why are parenthesis kept above instead of moving to the next line and > remove parenthesis as it is done in the rest of cases? > > > (dev, reassembly_capa)); Thanks, will fix in next version. The parens were not caught by the regex used to do global replace. ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 02/14] eventdev: remover unnecessary deref on function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger ` (13 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Abhinandan Gujjar, Jerin Jacob, Amit Prakash Shukla, Naga Harish K S V The expression *dev_dev_ops->foo and dev->dev_ops->foo are equivalent. Cleanup the result by removing unneeded parenthesis and make lines compact. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/eventdev/rte_event_crypto_adapter.c | 37 ++---- lib/eventdev/rte_event_dma_adapter.c | 16 +-- lib/eventdev/rte_event_eth_rx_adapter.c | 50 ++++---- lib/eventdev/rte_eventdev.c | 164 +++++++++++------------- 4 files changed, 119 insertions(+), 148 deletions(-) diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index 939ca1cad9..fc43e056d7 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -1132,7 +1132,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_add == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_add == NULL) return -ENOTSUP; if (dev_info->qpairs == NULL) { dev_info->qpairs = @@ -1144,10 +1144,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, - dev_info->dev, - queue_pair_id, - conf); + ret = dev->dev_ops->crypto_adapter_queue_pair_add(dev, dev_info->dev, + queue_pair_id, conf); if (ret) return ret; @@ -1233,11 +1231,10 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, if ((cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_del == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->crypto_adapter_queue_pair_del)(dev, - dev_info->dev, - queue_pair_id); + ret = dev->dev_ops->crypto_adapter_queue_pair_del(dev, + dev_info->dev, queue_pair_id); if (ret == 0) { eca_update_qp_info(adapter, &adapter->cdevs[cdev_id], @@ -1308,10 +1305,8 @@ eca_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->crypto_adapter_start)(dev, - &dev_info->dev[i]) : - (*dev->dev_ops->crypto_adapter_stop)(dev, - &dev_info->dev[i]); + start ? dev->dev_ops->crypto_adapter_start(dev, &dev_info->dev[i]) : + dev->dev_ops->crypto_adapter_stop(dev, &dev_info->dev[i]); } if (use_service) @@ -1367,11 +1362,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id, for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_get == NULL) + dev->dev_ops->crypto_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->crypto_adapter_stats_get)(dev, - dev_info->dev, - &dev_stats); + ret = dev->dev_ops->crypto_adapter_stats_get(dev, dev_info->dev, &dev_stats); if (ret) continue; @@ -1418,10 +1411,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id) for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_reset == NULL) + dev->dev_ops->crypto_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->crypto_adapter_stats_reset)(dev, - dev_info->dev); + dev->dev_ops->crypto_adapter_stats_reset(dev, dev_info->dev); } memset(&adapter->crypto_stats, 0, sizeof(adapter->crypto_stats)); @@ -1606,9 +1598,8 @@ rte_event_crypto_adapter_vector_limits_get( return -ENOTSUP; } - if ((*dev->dev_ops->crypto_adapter_vector_limits_get) == NULL) + if (dev->dev_ops->crypto_adapter_vector_limits_get == NULL) return -ENOTSUP; - return dev->dev_ops->crypto_adapter_vector_limits_get( - dev, cdev, limits); + return dev->dev_ops->crypto_adapter_vector_limits_get(dev, cdev, limits); } diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c index 165374d195..d9a02a30f2 100644 --- a/lib/eventdev/rte_event_dma_adapter.c +++ b/lib/eventdev/rte_event_dma_adapter.c @@ -1030,7 +1030,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_add == NULL) + if (dev->dev_ops->dma_adapter_vchan_add == NULL) return -ENOTSUP; if (dev_info->vchanq == NULL) { dev_info->vchanq = rte_zmalloc_socket(adapter->mem_name, @@ -1054,7 +1054,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, } } - ret = (*dev->dev_ops->dma_adapter_vchan_add)(dev, dma_dev_id, vchan, event); + ret = dev->dev_ops->dma_adapter_vchan_add(dev, dma_dev_id, vchan, event); if (ret) return ret; @@ -1132,9 +1132,9 @@ rte_event_dma_adapter_vchan_del(uint8_t id, int16_t dma_dev_id, uint16_t vchan) if ((cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_del == NULL) + if (dev->dev_ops->dma_adapter_vchan_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dma_adapter_vchan_del)(dev, dma_dev_id, vchan); + ret = dev->dev_ops->dma_adapter_vchan_del(dev, dma_dev_id, vchan); if (ret == 0) { edma_update_vchanq_info(adapter, dev_info, vchan, 0); if (dev_info->num_vchanq == 0) { @@ -1212,8 +1212,8 @@ edma_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->dma_adapter_start)(dev, i) : - (*dev->dev_ops->dma_adapter_stop)(dev, i); + start ? dev->dev_ops->dma_adapter_start(dev, i) : + dev->dev_ops->dma_adapter_stop(dev, i); } if (use_service) @@ -1363,7 +1363,7 @@ rte_event_dma_adapter_stats_get(uint8_t id, struct rte_event_dma_adapter_stats * dev->dev_ops->dma_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->dma_adapter_stats_get)(dev, i, &dev_stats); + ret = dev->dev_ops->dma_adapter_stats_get(dev, i, &dev_stats); if (ret) continue; @@ -1404,7 +1404,7 @@ rte_event_dma_adapter_stats_reset(uint8_t id) dev->dev_ops->dma_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->dma_adapter_stats_reset)(dev, i); + dev->dev_ops->dma_adapter_stats_reset(dev, i); } memset(&adapter->dma_stats, 0, sizeof(adapter->dma_stats)); diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index 39674c4604..669788430b 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -2362,10 +2362,8 @@ rxa_ctrl(uint8_t id, int start) dev_info->dev_rx_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->eth_rx_adapter_start)(dev, - &rte_eth_devices[i]) : - (*dev->dev_ops->eth_rx_adapter_stop)(dev, - &rte_eth_devices[i]); + start ? dev->dev_ops->eth_rx_adapter_start(dev, &rte_eth_devices[i]) : + dev->dev_ops->eth_rx_adapter_stop(dev, &rte_eth_devices[i]); } if (use_service) { @@ -2749,7 +2747,7 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_add == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_add == NULL) return -ENOTSUP; if (dev_info->rx_queue == NULL) { dev_info->rx_queue = @@ -2761,9 +2759,8 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->eth_rx_adapter_queue_add)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_add(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); if (ret == 0) { dev_info->internal_event_port = 1; rxa_update_queue(rx_adapter, @@ -2847,11 +2844,10 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, uint16_t eth_dev_id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_del == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->eth_rx_adapter_queue_del)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id); + ret = dev->dev_ops->eth_rx_adapter_queue_del(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id); if (ret == 0) { rxa_update_queue(rx_adapter, &rx_adapter->eth_devices[eth_dev_id], @@ -2959,10 +2955,11 @@ rte_event_eth_rx_adapter_vector_limits_get( } if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) + if (dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) return -ENOTSUP; - ret = dev->dev_ops->eth_rx_adapter_vector_limits_get( - dev, &rte_eth_devices[eth_port_id], limits); + ret = dev->dev_ops->eth_rx_adapter_vector_limits_get(dev, + &rte_eth_devices[eth_port_id], + limits); } else { ret = rxa_sw_vector_limits(limits); } @@ -3051,11 +3048,10 @@ rte_event_eth_rx_adapter_stats_get(uint8_t id, } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_get == NULL) + dev->dev_ops->eth_rx_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->eth_rx_adapter_stats_get)(dev, - &rte_eth_devices[i], - &dev_stats); + ret = dev->dev_ops->eth_rx_adapter_stats_get(dev, &rte_eth_devices[i], + &dev_stats); if (ret) continue; dev_stats_sum.rx_packets += dev_stats.rx_packets; @@ -3127,7 +3123,7 @@ rte_event_eth_rx_adapter_queue_stats_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_get != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_get)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_get(dev, &rte_eth_devices[eth_dev_id], rx_queue_id, stats); } @@ -3172,10 +3168,9 @@ rte_event_eth_rx_adapter_stats_reset(uint8_t id) } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_reset == NULL) + dev->dev_ops->eth_rx_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->eth_rx_adapter_stats_reset)(dev, - &rte_eth_devices[i]); + dev->dev_ops->eth_rx_adapter_stats_reset(dev, &rte_eth_devices[i]); } memset(&rx_adapter->stats, 0, sizeof(rx_adapter->stats)); @@ -3229,7 +3224,7 @@ rte_event_eth_rx_adapter_queue_stats_reset(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_reset != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_reset)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_reset(dev, &rte_eth_devices[eth_dev_id], rx_queue_id); } @@ -3396,10 +3391,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) { - ret = (*dev->dev_ops->eth_rx_adapter_queue_conf_get)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, - queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_conf_get(dev, + &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); return ret; } diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index 1078e0bcee..43cd95d765 100644 --- a/lib/eventdev/rte_eventdev.c +++ b/lib/eventdev/rte_eventdev.c @@ -100,9 +100,9 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_event_dev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns; @@ -137,10 +137,8 @@ rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_rx_adapter_caps_get ? - (*dev->dev_ops->eth_rx_adapter_caps_get)(dev, - &rte_eth_devices[eth_port_id], - caps) - : 0; + dev->dev_ops->eth_rx_adapter_caps_get(dev, &rte_eth_devices[eth_port_id], caps) + : 0; } int @@ -164,11 +162,8 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps) *caps = 0; return dev->dev_ops->timer_adapter_caps_get ? - (*dev->dev_ops->timer_adapter_caps_get)(dev, - 0, - caps, - &ops) - : 0; + dev->dev_ops->timer_adapter_caps_get(dev, 0, caps, &ops) + : 0; } int @@ -196,8 +191,7 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id, *caps = 0; return dev->dev_ops->crypto_adapter_caps_get ? - (*dev->dev_ops->crypto_adapter_caps_get) - (dev, cdev, caps) : 0; + dev->dev_ops->crypto_adapter_caps_get(dev, cdev, caps) : 0; } int @@ -224,10 +218,8 @@ rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_tx_adapter_caps_get ? - (*dev->dev_ops->eth_tx_adapter_caps_get)(dev, - eth_dev, - caps) - : 0; + dev->dev_ops->eth_tx_adapter_caps_get(dev, eth_dev, caps) + : 0; } int @@ -247,7 +239,7 @@ rte_event_dma_adapter_caps_get(uint8_t dev_id, uint8_t dma_dev_id, uint32_t *cap *caps = 0; if (dev->dev_ops->dma_adapter_caps_get) - return (*dev->dev_ops->dma_adapter_caps_get)(dev, dma_dev_id, caps); + return dev->dev_ops->dma_adapter_caps_get(dev, dma_dev_id, caps); return 0; } @@ -264,11 +256,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) if (nb_queues != 0) { queues_cfg = dev->data->queues_cfg; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); if (nb_queues > old_nb_queues) { @@ -278,11 +270,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) sizeof(queues_cfg[0]) * new_qs); } } else { - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); } dev->data->nb_queues = nb_queues; @@ -304,14 +296,14 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) dev->data->dev_id); if (nb_ports != 0) { /* re-config */ - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; ports_cfg = dev->data->ports_cfg; for (i = nb_ports; i < old_nb_ports; i++) - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); if (nb_ports > old_nb_ports) { uint8_t new_ps = nb_ports - old_nb_ports; @@ -331,12 +323,12 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) } } } else { - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; for (i = nb_ports; i < old_nb_ports; i++) { - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); ports[i] = NULL; } } @@ -356,9 +348,9 @@ rte_event_dev_configure(uint8_t dev_id, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -370,7 +362,7 @@ rte_event_dev_configure(uint8_t dev_id, if (dev_conf == NULL) return -EINVAL; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); /* Check dequeue_timeout_ns value is in limit */ if (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) { @@ -524,7 +516,7 @@ rte_event_dev_configure(uint8_t dev_id, event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev); + diag = (dev->dev_ops->dev_configure)(dev); if (diag != 0) { RTE_EDEV_LOG_ERR("dev%d dev_configure = %d", dev_id, diag); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); @@ -564,10 +556,10 @@ rte_event_queue_default_conf_get(uint8_t dev_id, uint8_t queue_id, return -EINVAL; } - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; memset(queue_conf, 0, sizeof(struct rte_event_queue_conf)); - (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf); rte_eventdev_trace_queue_default_conf_get(dev_id, dev, queue_id, queue_conf); @@ -654,19 +646,19 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, return -EBUSY; } - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; if (queue_conf == NULL) { - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, &def_conf); queue_conf = &def_conf; } dev->data->queues_cfg[queue_id] = *queue_conf; rte_eventdev_trace_queue_setup(dev_id, queue_id, queue_conf); - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf); } static inline int @@ -695,10 +687,10 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id, return -EINVAL; } - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; memset(port_conf, 0, sizeof(struct rte_event_port_conf)); - (*dev->dev_ops->port_def_conf)(dev, port_id, port_conf); + dev->dev_ops->port_def_conf(dev, port_id, port_conf); rte_eventdev_trace_port_default_conf_get(dev_id, dev, port_id, port_conf); @@ -770,19 +762,19 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id, return -EBUSY; } - if (*dev->dev_ops->port_setup == NULL) + if (dev->dev_ops->port_setup == NULL) return -ENOTSUP; if (port_conf == NULL) { - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->port_def_conf)(dev, port_id, &def_conf); + dev->dev_ops->port_def_conf(dev, port_id, &def_conf); port_conf = &def_conf; } dev->data->ports_cfg[port_id] = *port_conf; - diag = (*dev->dev_ops->port_setup)(dev, port_id, port_conf); + diag = dev->dev_ops->port_setup(dev, port_id, port_conf); /* Unlink all the queues from this port(default state after setup) */ if (!diag) @@ -812,8 +804,7 @@ rte_event_port_quiesce(uint8_t dev_id, uint8_t port_id, } if (dev->dev_ops->port_quiesce) - (*dev->dev_ops->port_quiesce)(dev, dev->data->ports[port_id], - release_cb, args); + dev->dev_ops->port_quiesce(dev, dev->data->ports[port_id], release_cb, args); } int @@ -979,10 +970,9 @@ rte_event_queue_attr_set(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id, return -ENOTSUP; } - if (*dev->dev_ops->queue_attr_set == NULL) + if (dev->dev_ops->queue_attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_attr_set)(dev, queue_id, attr_id, - attr_value); + return dev->dev_ops->queue_attr_set(dev, queue_id, attr_id, attr_value); } int @@ -1007,23 +997,23 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_link == NULL) { + if (dev->dev_ops->port_link == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_link_profile == NULL) { + if (profile_id && dev->dev_ops->port_link_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1057,11 +1047,11 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t } if (profile_id) - diag = (*dev->dev_ops->port_link_profile)(dev, dev->data->ports[port_id], queues, - priorities, nb_links, profile_id); + diag = dev->dev_ops->port_link_profile(dev, dev->data->ports[port_id], queues, + priorities, nb_links, profile_id); else - diag = (*dev->dev_ops->port_link)(dev, dev->data->ports[port_id], queues, - priorities, nb_links); + diag = dev->dev_ops->port_link(dev, dev->data->ports[port_id], queues, + priorities, nb_links); if (diag < 0) return diag; @@ -1095,23 +1085,23 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_unlink == NULL) { + if (dev->dev_ops->port_unlink == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_unlink_profile == NULL) { + if (profile_id && dev->dev_ops->port_unlink_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1153,11 +1143,11 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], } if (profile_id) - diag = (*dev->dev_ops->port_unlink_profile)(dev, dev->data->ports[port_id], queues, - nb_unlinks, profile_id); + diag = dev->dev_ops->port_unlink_profile(dev, dev->data->ports[port_id], queues, + nb_unlinks, profile_id); else - diag = (*dev->dev_ops->port_unlink)(dev, dev->data->ports[port_id], queues, - nb_unlinks); + diag = dev->dev_ops->port_unlink(dev, dev->data->ports[port_id], queues, + nb_unlinks); if (diag < 0) return diag; @@ -1186,11 +1176,10 @@ rte_event_port_unlinks_in_progress(uint8_t dev_id, uint8_t port_id) * This allows PMDs which handle unlink synchronously to not implement * this function at all. */ - if (*dev->dev_ops->port_unlinks_in_progress == NULL) + if (dev->dev_ops->port_unlinks_in_progress == NULL) return 0; - return (*dev->dev_ops->port_unlinks_in_progress)(dev, - dev->data->ports[port_id]); + return dev->dev_ops->port_unlinks_in_progress(dev, dev->data->ports[port_id]); } int @@ -1237,10 +1226,10 @@ rte_event_port_profile_links_get(uint8_t dev_id, uint8_t port_id, uint8_t queues RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); @@ -1278,13 +1267,13 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->timeout_ticks == NULL) + if (dev->dev_ops->timeout_ticks == NULL) return -ENOTSUP; if (timeout_ticks == NULL) return -EINVAL; - return (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks); + return dev->dev_ops->timeout_ticks(dev, ns, timeout_ticks); } int @@ -1313,12 +1302,12 @@ rte_event_dev_dump(uint8_t dev_id, FILE *f) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; if (f == NULL) return -EINVAL; - (*dev->dev_ops->dump)(dev, f); + dev->dev_ops->dump(dev, f); return 0; } @@ -1329,9 +1318,7 @@ xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, { struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, - NULL, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, NULL, NULL, 0); return 0; } @@ -1352,8 +1339,8 @@ rte_event_dev_xstats_names_get(uint8_t dev_id, const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, xstats_names, ids, size); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, + xstats_names, ids, size); return -ENOTSUP; } @@ -1369,8 +1356,8 @@ rte_event_dev_xstats_get(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, /* implemented by the driver */ if (dev->dev_ops->xstats_get != NULL) - return (*dev->dev_ops->xstats_get)(dev, mode, queue_port_id, - ids, values, n); + return dev->dev_ops->xstats_get(dev, mode, queue_port_id, + ids, values, n); return -ENOTSUP; } @@ -1389,7 +1376,7 @@ rte_event_dev_xstats_by_name_get(uint8_t dev_id, const char *name, /* implemented by driver */ if (dev->dev_ops->xstats_get_by_name != NULL) - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); return -ENOTSUP; } @@ -1401,8 +1388,7 @@ int rte_event_dev_xstats_reset(uint8_t dev_id, struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_reset != NULL) - return (*dev->dev_ops->xstats_reset)(dev, mode, queue_port_id, - ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, mode, queue_port_id, ids, nb_ids); return -ENOTSUP; } @@ -1423,7 +1409,7 @@ int rte_event_dev_selftest(uint8_t dev_id) rte_mbuf_dynfield_register(&test_seqn_dynfield_desc); if (rte_event_pmd_selftest_seqn_dynfield_offset < 0) return -ENOMEM; - return (*dev->dev_ops->dev_selftest)(); + return dev->dev_ops->dev_selftest(); } return -ENOTSUP; } @@ -1483,7 +1469,7 @@ rte_event_dev_start(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1492,7 +1478,7 @@ rte_event_dev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = (dev->dev_ops->dev_start)(dev); rte_eventdev_trace_start(dev_id, diag); if (diag == 0) dev->data->dev_started = 1; @@ -1533,7 +1519,7 @@ rte_event_dev_stop(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_RET(dev_id); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1543,7 +1529,7 @@ rte_event_dev_stop(uint8_t dev_id) } dev->data->dev_started = 0; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_eventdev_trace_stop(dev_id); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); } @@ -1555,7 +1541,7 @@ rte_event_dev_close(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -1567,7 +1553,7 @@ rte_event_dev_close(uint8_t dev_id) event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); rte_eventdev_trace_close(dev_id); - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } static inline int -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 03/14] net/bonding: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 02/14] eventdev: remover " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger ` (12 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Chas Williams, Min Hu (Connor) The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/bonding/rte_eth_bond_pmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 467f7fe7ea..b742f538fb 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2493,8 +2493,8 @@ bond_ethdev_member_link_status_change_monitor(void *cb_arg) polling_member_found = 1; /* Update member link status */ - (*member_ethdev->dev_ops->link_update)(member_ethdev, - internals->members[i].link_status_wait_to_complete); + member_ethdev->dev_ops->link_update(member_ethdev, + internals->members[i].link_status_wait_to_complete); /* if link status has changed since last checked then call lsc * event callback */ @@ -3275,7 +3275,7 @@ bond_ethdev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mtu_set == NULL) { + if (member_eth_dev->dev_ops->mtu_set == NULL) { rte_spinlock_unlock(&internals->lock); return -ENOTSUP; } @@ -3325,8 +3325,8 @@ bond_ethdev_mac_addr_add(struct rte_eth_dev *dev, for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mac_addr_add == NULL || - *member_eth_dev->dev_ops->mac_addr_remove == NULL) { + if (member_eth_dev->dev_ops->mac_addr_add == NULL || + member_eth_dev->dev_ops->mac_addr_remove == NULL) { ret = -ENOTSUP; goto end; } @@ -3361,7 +3361,7 @@ bond_ethdev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mac_addr_remove == NULL) + if (member_eth_dev->dev_ops->mac_addr_remove == NULL) goto end; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (2 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 9:17 ` Bruce Richardson 2025-02-20 2:32 ` [PATCH v2 05/14] net/ipn3ke: " Stephen Hemminger ` (11 subsequent siblings) 15 siblings, 1 reply; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Anatoly Burakov, Vladimir Medvedkin The expression *dev->dev_ops->vlan_strip_queue_set and dev->dev_ops->vlan_strip_queue are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c index 15c28e7a3f..5a7d66d9b9 100644 --- a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c @@ -291,7 +291,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) if (on > 1) return -EINVAL; - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; /* The PF has 128 queue pairs and in SRIOV configuration @@ -310,8 +310,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) RTE_ETH_64_POOLS; for (q = 0; q < queues_per_pool; q++) - (*dev->dev_ops->vlan_strip_queue_set)(dev, - q + vf * queues_per_pool, on); + dev->dev_ops->vlan_strip_queue_set(dev, q + vf * queues_per_pool, on); return 0; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference 2025-02-20 2:32 ` [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 9:17 ` Bruce Richardson 0 siblings, 0 replies; 52+ messages in thread From: Bruce Richardson @ 2025-02-20 9:17 UTC (permalink / raw) To: Stephen Hemminger; +Cc: dev, Anatoly Burakov, Vladimir Medvedkin On Wed, Feb 19, 2025 at 06:32:08PM -0800, Stephen Hemminger wrote: > The expression *dev->dev_ops->vlan_strip_queue_set and > dev->dev_ops->vlan_strip_queue are equivalent in C. > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > --- > drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 05/14] net/ipn3ke: remove unnecessary dereference 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (3 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger ` (10 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Rosen Xu Since it is a function pointer, the expression *hw->f_mac_read and hw->f_mac_read are equivalent in C. Remove excession indentation here. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 27 +++++------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c index baae80d661..c8f06a06cb 100644 --- a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c +++ b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c @@ -229,34 +229,17 @@ ipn3ke_mtu_set(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t rx; uint32_t tmp; - if (!(*hw->f_mac_read) || !(*hw->f_mac_write)) + if (!hw->f_mac_read || !hw->f_mac_write) return; - (*hw->f_mac_read)(hw, - &tx, - txaddr, - mac_num, - eth_group_sel); + hw->f_mac_read(hw, &tx, txaddr, mac_num, eth_group_sel); - (*hw->f_mac_read)(hw, - &rx, - rxaddr, - mac_num, - eth_group_sel); + hw->f_mac_read(hw, &rx, rxaddr, mac_num, eth_group_sel); tmp = ipn3ke_mtu_cal(tx, rx); - (*hw->f_mac_write)(hw, - tmp, - txaddr, - mac_num, - eth_group_sel); - - (*hw->f_mac_write)(hw, - tmp, - rxaddr, - mac_num, - eth_group_sel); + hw->f_mac_write(hw, tmp, txaddr, mac_num, eth_group_sel); + hw->f_mac_write(hw, tmp, rxaddr, mac_num, eth_group_sel); } static void -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 06/14] net/memif: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (4 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 05/14] net/ipn3ke: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 07/14] cryptodev: " Stephen Hemminger ` (9 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Jakub Grajciar Since queue release functions are local to driver, prefer those over dereferencing the dev_ops table. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/memif/rte_eth_memif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index c0bf1e3bbf..f7b04c4f9e 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -70,6 +70,8 @@ static const struct rte_eth_link pmd_link = { static int memif_region_init_zc(const struct rte_memseg_list *msl, const struct rte_memseg *ms, void *arg); +static void memif_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid); +static void memif_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); const char * memif_version(void) @@ -1418,9 +1420,9 @@ memif_dev_close(struct rte_eth_dev *dev) memif_msg_enq_disconnect(pmd->cc, "Device closed", 0); for (i = 0; i < dev->data->nb_rx_queues; i++) - (*dev->dev_ops->rx_queue_release)(dev, i); + memif_rx_queue_release(dev, i); for (i = 0; i < dev->data->nb_tx_queues; i++) - (*dev->dev_ops->tx_queue_release)(dev, i); + memif_tx_queue_release(dev, i); memif_socket_remove_device(dev); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 07/14] cryptodev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (5 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger ` (8 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Akhil Goyal, Fan Zhang The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->dev_info_gets are equivalent. Cleanup and remove unnecessary parenthesis as well. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/cryptodev/rte_cryptodev.c | 72 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index a49b0662f3..8df36ea057 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -1194,9 +1194,9 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, memset(&dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if (nb_qpairs > (dev_info.max_nb_queue_pairs)) { CDEV_LOG_ERR("Invalid num queue_pairs (%u) for dev %u", @@ -1224,11 +1224,11 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; qp[i] = NULL; @@ -1256,11 +1256,11 @@ rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_reset == NULL) + if (dev->dev_ops->queue_pair_reset == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_reset(dev_id, queue_pair_id, qp_conf, socket_id); - return (*dev->dev_ops->queue_pair_reset)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->queue_pair_reset(dev, queue_pair_id, qp_conf, socket_id); } int @@ -1282,7 +1282,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; rte_spinlock_lock(&rte_cryptodev_callback_lock); @@ -1307,7 +1307,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) } rte_cryptodev_trace_configure(dev_id, config); - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -1325,7 +1325,7 @@ rte_cryptodev_start(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1334,7 +1334,7 @@ rte_cryptodev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); /* expose selection of PMD fast-path functions */ cryptodev_fp_ops_set(rte_crypto_fp_ops + dev_id, dev); @@ -1359,7 +1359,7 @@ rte_cryptodev_stop(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1371,7 +1371,7 @@ rte_cryptodev_stop(uint8_t dev_id) /* point fast-path functions to dummy ones */ cryptodev_fp_ops_reset(rte_crypto_fp_ops + dev_id); - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_cryptodev_trace_stop(dev_id); dev->data->dev_started = 0; } @@ -1407,9 +1407,9 @@ rte_cryptodev_close(uint8_t dev_id) } } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); rte_cryptodev_trace_close(dev_id, retval); if (retval < 0) @@ -1518,12 +1518,11 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf); - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf, - socket_id); + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } struct rte_cryptodev_cb * @@ -1837,9 +1836,9 @@ rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats) dev = &rte_crypto_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); rte_cryptodev_trace_stats_get(dev_id, stats); return 0; @@ -1859,9 +1858,9 @@ rte_cryptodev_stats_reset(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } void @@ -1878,9 +1877,9 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; dev_info->device = dev->device; @@ -2017,7 +2016,7 @@ rte_cryptodev_queue_pair_event_error_query(uint8_t dev_id, uint16_t qp_id) if (qp_id >= dev->data->nb_queue_pairs) return -EINVAL; - if (*dev->dev_ops->queue_pair_event_error_query == NULL) + if (dev->dev_ops->queue_pair_event_error_query == NULL) return -ENOTSUP; return dev->dev_ops->queue_pair_event_error_query(dev, qp_id); @@ -2237,7 +2236,7 @@ rte_cryptodev_asym_session_create(uint8_t dev_id, /* Clear device session pointer.*/ memset(sess->sess_private_data, 0, session_priv_data_sz + sess->user_data_sz); - if (*dev->dev_ops->asym_session_configure == NULL) + if (dev->dev_ops->asym_session_configure == NULL) return -ENOTSUP; if (sess->sess_private_data[0] == 0) { @@ -2286,7 +2285,7 @@ rte_cryptodev_sym_session_free(uint8_t dev_id, void *_sess) return -EINVAL; } - if (*dev->dev_ops->sym_session_clear == NULL) + if (dev->dev_ops->sym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->sym_session_clear(dev, sess); @@ -2316,7 +2315,7 @@ rte_cryptodev_asym_session_free(uint8_t dev_id, void *sess) if (dev == NULL || sess == NULL) return -EINVAL; - if (*dev->dev_ops->asym_session_clear == NULL) + if (dev->dev_ops->asym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->asym_session_clear(dev, sess); @@ -2348,10 +2347,10 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_session_get_size == NULL) + if (dev->dev_ops->sym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); rte_cryptodev_trace_sym_get_private_session_size(dev_id, priv_sess_size); @@ -2370,10 +2369,10 @@ rte_cryptodev_asym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->asym_session_get_size == NULL) + if (dev->dev_ops->asym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->asym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->asym_session_get_size(dev); rte_cryptodev_trace_asym_get_private_session_size(dev_id, priv_sess_size); @@ -2474,7 +2473,7 @@ rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id, dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_cpu_process == NULL || + if (dev->dev_ops->sym_cpu_process == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO)) { sym_crypto_fill_status(vec, ENOTSUP); return 0; @@ -2497,12 +2496,12 @@ rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || + if (dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)) { return -ENOTSUP; } - priv_size = (*dev->dev_ops->sym_get_raw_dp_ctx_size)(dev); + priv_size = dev->dev_ops->sym_get_raw_dp_ctx_size(dev); if (priv_size < 0) return -ENOTSUP; @@ -2530,7 +2529,7 @@ rte_cryptodev_configure_raw_dp_ctx(uint8_t dev_id, uint16_t qp_id, rte_cryptodev_trace_configure_raw_dp_ctx(dev_id, qp_id, sess_type); - return (*dev->dev_ops->sym_configure_raw_dp_ctx)(dev, qp_id, ctx, + return dev->dev_ops->sym_configure_raw_dp_ctx(dev, qp_id, ctx, sess_type, session_ctx, is_update); } @@ -2556,8 +2555,7 @@ rte_cryptodev_session_event_mdata_set(uint8_t dev_id, void *sess, rte_cryptodev_trace_session_event_mdata_set(dev_id, sess, op_type, sess_type, ev_mdata, size); - return (*dev->dev_ops->session_ev_mdata_set)(dev, sess, op_type, - sess_type, ev_mdata); + return dev->dev_ops->session_ev_mdata_set(dev, sess, op_type, sess_type, ev_mdata); skip_pmd_op: if (op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 08/14] crypto/scheduler: remove unnecessary dereference 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (6 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 07/14] cryptodev: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger ` (7 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Kai Ji The expression *dev->dev_ops->sym_session_get_size and dev->dev_ops->sym_session_get_size are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- .../scheduler/rte_cryptodev_scheduler.c | 8 +++--- drivers/crypto/scheduler/scheduler_pmd_ops.c | 25 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c index 9a21edd32a..6013f66aa5 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c @@ -741,10 +741,10 @@ rte_cryptodev_scheduler_option_set(uint8_t scheduler_id, sched_ctx = dev->data->dev_private; - if (*sched_ctx->ops.option_set == NULL) + if (sched_ctx->ops.option_set == NULL) return -ENOTSUP; - return (*sched_ctx->ops.option_set)(dev, option_type, option); + return sched_ctx->ops.option_set(dev, option_type, option); } int @@ -772,10 +772,10 @@ rte_cryptodev_scheduler_option_get(uint8_t scheduler_id, sched_ctx = dev->data->dev_private; - if (*sched_ctx->ops.option_get == NULL) + if (sched_ctx->ops.option_get == NULL) return -ENOTSUP; - return (*sched_ctx->ops.option_get)(dev, option_type, option); + return sched_ctx->ops.option_get(dev, option_type, option); } diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c index 6e43438469..105d9cf02a 100644 --- a/drivers/crypto/scheduler/scheduler_pmd_ops.c +++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c @@ -195,10 +195,9 @@ scheduler_session_size_get(struct scheduler_ctx *sched_ctx, uint32_t priv_sess_size = 0; if (session_type == RTE_CRYPTO_OP_WITH_SESSION) { - priv_sess_size = - (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); } else { - priv_sess_size = (*sec_ctx->ops->session_get_size)(dev); + priv_sess_size = sec_ctx->ops->session_get_size(dev); } max_priv_sess_size = RTE_MAX(max_priv_sess_size, priv_sess_size); @@ -355,22 +354,22 @@ scheduler_pmd_start(struct rte_cryptodev *dev) return -1; } - if (*sched_ctx->ops.worker_attach == NULL) + if (sched_ctx->ops.worker_attach == NULL) return -ENOTSUP; for (i = 0; i < sched_ctx->nb_workers; i++) { uint8_t worker_dev_id = sched_ctx->workers[i].dev_id; - if ((*sched_ctx->ops.worker_attach)(dev, worker_dev_id) < 0) { + if (sched_ctx->ops.worker_attach(dev, worker_dev_id) < 0) { CR_SCHED_LOG(ERR, "Failed to attach worker"); return -ENOTSUP; } } - if (*sched_ctx->ops.scheduler_start == NULL) + if (sched_ctx->ops.scheduler_start == NULL) return -ENOTSUP; - if ((*sched_ctx->ops.scheduler_start)(dev) < 0) { + if (sched_ctx->ops.scheduler_start(dev) < 0) { CR_SCHED_LOG(ERR, "Scheduler start failed"); return -1; } @@ -406,14 +405,14 @@ scheduler_pmd_stop(struct rte_cryptodev *dev) rte_cryptodev_stop(worker_dev_id); } - if (*sched_ctx->ops.scheduler_stop) - (*sched_ctx->ops.scheduler_stop)(dev); + if (sched_ctx->ops.scheduler_stop) + sched_ctx->ops.scheduler_stop(dev); for (i = 0; i < sched_ctx->nb_workers; i++) { uint8_t worker_dev_id = sched_ctx->workers[i].dev_id; - if (*sched_ctx->ops.worker_detach) - (*sched_ctx->ops.worker_detach)(dev, worker_dev_id); + if (sched_ctx->ops.worker_detach) + sched_ctx->ops.worker_detach(dev, worker_dev_id); } } @@ -631,8 +630,8 @@ scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, return ret; } - if (*sched_ctx->ops.config_queue_pair) { - if ((*sched_ctx->ops.config_queue_pair)(dev, qp_id) < 0) { + if (sched_ctx->ops.config_queue_pair) { + if (sched_ctx->ops.config_queue_pair(dev, qp_id) < 0) { CR_SCHED_LOG(ERR, "Unable to configure queue pair"); return -1; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 09/14] compressdev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (7 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 10/14] dmadev: " Stephen Hemminger ` (6 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Fan Zhang, Ashish Gupta The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/compressdev/rte_compressdev.c | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c index cf2c20a704..1fc4661ef0 100644 --- a/lib/compressdev/rte_compressdev.c +++ b/lib/compressdev/rte_compressdev.c @@ -316,9 +316,9 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, memset(&dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if ((dev_info.max_nb_queue_pairs != 0) && (nb_qpairs > dev_info.max_nb_queue_pairs)) { @@ -346,11 +346,11 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -397,11 +397,11 @@ rte_compressdev_queue_pairs_release(struct rte_compressdev *dev) COMPRESSDEV_LOG(DEBUG, "Free %d queues pairs on device %u", dev->data->nb_queue_pairs, dev->data->dev_id); - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = 0; i < num_qps; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -432,7 +432,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; /* Setup new number of queue pairs and reconfigure device. */ @@ -445,7 +445,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return diag; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -463,7 +463,7 @@ rte_compressdev_start(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -472,7 +472,7 @@ rte_compressdev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -493,7 +493,7 @@ rte_compressdev_stop(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -502,7 +502,7 @@ rte_compressdev_stop(uint8_t dev_id) return; } - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; } @@ -532,9 +532,9 @@ rte_compressdev_close(uint8_t dev_id) if (retval < 0) return retval; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); if (retval < 0) return retval; @@ -571,10 +571,10 @@ rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, max_inflight_ops, socket_id); } @@ -618,9 +618,9 @@ rte_compressdev_stats_get(uint8_t dev_id, struct rte_compressdev_stats *stats) dev = &rte_comp_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); return 0; } @@ -636,9 +636,9 @@ rte_compressdev_stats_reset(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } @@ -656,9 +656,9 @@ rte_compressdev_info_get(uint8_t dev_id, struct rte_compressdev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; } @@ -676,9 +676,9 @@ rte_compressdev_private_xform_create(uint8_t dev_id, if (xform == NULL || priv_xform == NULL || dev == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_create == NULL) + if (dev->dev_ops->private_xform_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->private_xform_create)(dev, xform, priv_xform); + ret = dev->dev_ops->private_xform_create(dev, xform, priv_xform); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create private_xform: err=%d", @@ -700,7 +700,7 @@ rte_compressdev_private_xform_free(uint8_t dev_id, void *priv_xform) if (dev == NULL || priv_xform == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_free == NULL) + if (dev->dev_ops->private_xform_free == NULL) return -ENOTSUP; ret = dev->dev_ops->private_xform_free(dev, priv_xform); if (ret < 0) { @@ -726,9 +726,9 @@ rte_compressdev_stream_create(uint8_t dev_id, if (xform == NULL || dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_create == NULL) + if (dev->dev_ops->stream_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stream_create)(dev, xform, stream); + ret = dev->dev_ops->stream_create(dev, xform, stream); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create stream: err=%d", @@ -751,7 +751,7 @@ rte_compressdev_stream_free(uint8_t dev_id, void *stream) if (dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_free == NULL) + if (dev->dev_ops->stream_free == NULL) return -ENOTSUP; ret = dev->dev_ops->stream_free(dev, stream); if (ret < 0) { -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 10/14] dmadev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (8 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 3:00 ` fengchengwen 2025-02-20 2:32 ` [PATCH v2 11/14] rawdev: " Stephen Hemminger ` (5 subsequent siblings) 15 siblings, 1 reply; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Chengwen Feng, Kevin Laatz, Bruce Richardson The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/dmadev/rte_dmadev.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 8bb7824aa1..4a075ee1c6 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -443,11 +443,10 @@ rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info) return -EINVAL; dev = &rte_dma_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; memset(dev_info, 0, sizeof(struct rte_dma_info)); - ret = (*dev->dev_ops->dev_info_get)(dev, dev_info, - sizeof(struct rte_dma_info)); + ret = dev->dev_ops->dev_info_get(dev, dev_info, sizeof(struct rte_dma_info)); if (ret != 0) return ret; @@ -510,10 +509,9 @@ rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf) return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_configure)(dev, dev_conf, - sizeof(struct rte_dma_conf)); + ret = dev->dev_ops->dev_configure(dev, dev_conf, sizeof(struct rte_dma_conf)); if (ret == 0) memcpy(&dev->data->dev_conf, dev_conf, sizeof(struct rte_dma_conf)); @@ -546,7 +544,7 @@ rte_dma_start(int16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); rte_dma_trace_start(dev_id, ret); if (ret != 0) return ret; @@ -574,7 +572,7 @@ rte_dma_stop(int16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); rte_dma_trace_stop(dev_id, ret); if (ret != 0) return ret; @@ -601,9 +599,9 @@ rte_dma_close(int16_t dev_id) return -EBUSY; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_close)(dev); + ret = dev->dev_ops->dev_close(dev); if (ret == 0) dma_release(dev); @@ -698,10 +696,9 @@ rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan, return -EINVAL; } - if (*dev->dev_ops->vchan_setup == NULL) + if (dev->dev_ops->vchan_setup == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vchan_setup)(dev, vchan, conf, - sizeof(struct rte_dma_vchan_conf)); + ret = dev->dev_ops->vchan_setup(dev, vchan, conf, sizeof(struct rte_dma_vchan_conf)); rte_dma_trace_vchan_setup(dev_id, vchan, conf, ret); return ret; @@ -723,11 +720,10 @@ rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats) return -EINVAL; } - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; memset(stats, 0, sizeof(struct rte_dma_stats)); - return (*dev->dev_ops->stats_get)(dev, vchan, stats, - sizeof(struct rte_dma_stats)); + return dev->dev_ops->stats_get(dev, vchan, stats, sizeof(struct rte_dma_stats)); } int @@ -747,9 +743,9 @@ rte_dma_stats_reset(int16_t dev_id, uint16_t vchan) return -EINVAL; } - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev, vchan); + ret = dev->dev_ops->stats_reset(dev, vchan); rte_dma_trace_stats_reset(dev_id, vchan, ret); return ret; @@ -769,9 +765,9 @@ rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status * return -EINVAL; } - if (*dev->dev_ops->vchan_status == NULL) + if (dev->dev_ops->vchan_status == NULL) return -ENOTSUP; - return (*dev->dev_ops->vchan_status)(dev, vchan, status); + return dev->dev_ops->vchan_status(dev, vchan, status); } static const char * @@ -850,7 +846,7 @@ rte_dma_dump(int16_t dev_id, FILE *f) dev->data->dev_conf.enable_silent ? "on" : "off"); if (dev->dev_ops->dev_dump != NULL) - ret = (*dev->dev_ops->dev_dump)(dev, f); + ret = dev->dev_ops->dev_dump(dev, f); rte_dma_trace_dump(dev_id, f, ret); return ret; -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v2 10/14] dmadev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 10/14] dmadev: " Stephen Hemminger @ 2025-02-20 3:00 ` fengchengwen 0 siblings, 0 replies; 52+ messages in thread From: fengchengwen @ 2025-02-20 3:00 UTC (permalink / raw) To: Stephen Hemminger, dev; +Cc: Kevin Laatz, Bruce Richardson Acked-by: Chengwen Feng <fengchengwen@huawei.com> On 2025/2/20 10:32, Stephen Hemminger wrote: > The expression *dev->dev_ops->dev_info_get and > dev->dev_ops->dev_info_get are equivalent. > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 11/14] rawdev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (9 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 10/14] dmadev: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 12/14] mldev: " Stephen Hemminger ` (4 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Sachin Saxena, Hemant Agrawal The expression *dev->dev_ops->dev_configure and dev->dev_ops->dev_configure are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/rawdev/rte_rawdev.c | 99 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c index 4f8897b639..810e95a440 100644 --- a/lib/rawdev/rte_rawdev.c +++ b/lib/rawdev/rte_rawdev.c @@ -77,9 +77,9 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info, rawdev = &rte_rawdevs[dev_id]; if (dev_info->dev_private != NULL) { - if (*rawdev->dev_ops->dev_info_get == NULL) + if (rawdev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - ret = (*rawdev->dev_ops->dev_info_get)(rawdev, + ret = rawdev->dev_ops->dev_info_get(rawdev, dev_info->dev_private, dev_private_size); } @@ -104,7 +104,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->started) { @@ -114,8 +114,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, } /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev, dev_conf->dev_private, - dev_private_size); + diag = dev->dev_ops->dev_configure(dev, dev_conf->dev_private, dev_private_size); if (diag != 0) RTE_RDEV_ERR("dev%d dev_configure = %d", dev_id, diag); else @@ -135,10 +134,9 @@ rte_rawdev_queue_conf_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf, queue_conf_size); } int @@ -152,10 +150,9 @@ rte_rawdev_queue_setup(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf, queue_conf_size); } int @@ -166,9 +163,9 @@ rte_rawdev_queue_release(uint16_t dev_id, uint16_t queue_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_release)(dev, queue_id); + return dev->dev_ops->queue_release(dev, queue_id); } uint16_t @@ -179,9 +176,9 @@ rte_rawdev_queue_count(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_count == NULL) + if (dev->dev_ops->queue_count == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_count)(dev); + return dev->dev_ops->queue_count(dev); } int @@ -194,9 +191,9 @@ rte_rawdev_get_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_get == NULL) + if (dev->dev_ops->attr_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_get)(dev, attr_name, attr_value); + return dev->dev_ops->attr_get(dev, attr_name, attr_value); } int @@ -209,9 +206,9 @@ rte_rawdev_set_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_set == NULL) + if (dev->dev_ops->attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_set)(dev, attr_name, attr_value); + return dev->dev_ops->attr_set(dev, attr_name, attr_value); } int @@ -225,9 +222,9 @@ rte_rawdev_enqueue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->enqueue_bufs == NULL) + if (dev->dev_ops->enqueue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->enqueue_bufs)(dev, buffers, count, context); + return dev->dev_ops->enqueue_bufs(dev, buffers, count, context); } int @@ -241,9 +238,9 @@ rte_rawdev_dequeue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dequeue_bufs == NULL) + if (dev->dev_ops->dequeue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->dequeue_bufs)(dev, buffers, count, context); + return dev->dev_ops->dequeue_bufs(dev, buffers, count, context); } int @@ -254,9 +251,9 @@ rte_rawdev_dump(uint16_t dev_id, FILE *f) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; - return (*dev->dev_ops->dump)(dev, f); + return dev->dev_ops->dump(dev, f); } static int @@ -264,9 +261,9 @@ xstats_get_count(uint16_t dev_id) { struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, NULL, 0); } int @@ -287,9 +284,9 @@ rte_rawdev_xstats_names_get(uint16_t dev_id, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, xstats_names, size); + return dev->dev_ops->xstats_get_names(dev, xstats_names, size); } /* retrieve rawdev extended statistics */ @@ -302,9 +299,9 @@ rte_rawdev_xstats_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV); const struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get == NULL) + if (dev->dev_ops->xstats_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get)(dev, ids, values, n); + return dev->dev_ops->xstats_get(dev, ids, values, n); } uint64_t @@ -322,9 +319,9 @@ rte_rawdev_xstats_by_name_get(uint16_t dev_id, id = &temp; /* driver never gets a NULL value */ /* implemented by driver */ - if (*dev->dev_ops->xstats_get_by_name == NULL) + if (dev->dev_ops->xstats_get_by_name == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); } int @@ -334,9 +331,9 @@ rte_rawdev_xstats_reset(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_reset == NULL) + if (dev->dev_ops->xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, ids, nb_ids); } int @@ -345,9 +342,9 @@ rte_rawdev_firmware_status_get(uint16_t dev_id, rte_rawdev_obj_t status_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_status_get == NULL) + if (dev->dev_ops->firmware_status_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_status_get)(dev, status_info); + return dev->dev_ops->firmware_status_get(dev, status_info); } int @@ -356,9 +353,9 @@ rte_rawdev_firmware_version_get(uint16_t dev_id, rte_rawdev_obj_t version_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_version_get == NULL) + if (dev->dev_ops->firmware_version_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_version_get)(dev, version_info); + return dev->dev_ops->firmware_version_get(dev, version_info); } int @@ -370,9 +367,9 @@ rte_rawdev_firmware_load(uint16_t dev_id, rte_rawdev_obj_t firmware_image) if (!firmware_image) return -EINVAL; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_load)(dev, firmware_image); + return dev->dev_ops->firmware_load(dev, firmware_image); } int @@ -381,9 +378,9 @@ rte_rawdev_firmware_unload(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_unload)(dev); + return dev->dev_ops->firmware_unload(dev); } int @@ -392,9 +389,9 @@ rte_rawdev_selftest(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev_id); + return dev->dev_ops->dev_selftest(dev_id); } int @@ -416,7 +413,7 @@ rte_rawdev_start(uint16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag != 0) return diag; @@ -444,7 +441,7 @@ rte_rawdev_stop(uint16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); mark_stopped: dev->started = 0; @@ -458,7 +455,7 @@ rte_rawdev_close(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ if (dev->started == 1) { @@ -467,7 +464,7 @@ rte_rawdev_close(uint16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -478,10 +475,10 @@ rte_rawdev_reset(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; /* Reset is not dependent on state of the device */ - return (*dev->dev_ops->dev_reset)(dev); + return dev->dev_ops->dev_reset(dev); } static inline uint8_t -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 12/14] mldev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (10 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 11/14] rawdev: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 13/14] regexdev: " Stephen Hemminger ` (3 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Srikanth Yalavarthi The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/mldev/rte_mldev.c | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c index 37d71aebc9..e0e5b8d9e8 100644 --- a/lib/mldev/rte_mldev.c +++ b/lib/mldev/rte_mldev.c @@ -237,7 +237,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; if (dev_info == NULL) { @@ -246,7 +246,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } memset(dev_info, 0, sizeof(struct rte_ml_dev_info)); - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } int @@ -262,7 +262,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -285,7 +285,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) return -EINVAL; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -299,7 +299,7 @@ rte_ml_dev_close(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -308,7 +308,7 @@ rte_ml_dev_close(int16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -323,7 +323,7 @@ rte_ml_dev_start(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -331,7 +331,7 @@ rte_ml_dev_start(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; @@ -350,7 +350,7 @@ rte_ml_dev_stop(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -358,7 +358,7 @@ rte_ml_dev_stop(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; @@ -392,7 +392,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_queue_pair_setup == NULL) + if (dev->dev_ops->dev_queue_pair_setup == NULL) return -ENOTSUP; if (queue_pair_id >= dev->data->nb_queue_pairs) { @@ -410,7 +410,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->dev_queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } int @@ -424,7 +424,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_get == NULL) + if (dev->dev_ops->dev_stats_get == NULL) return -ENOTSUP; if (stats == NULL) { @@ -433,7 +433,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } memset(stats, 0, sizeof(struct rte_ml_dev_stats)); - return (*dev->dev_ops->dev_stats_get)(dev, stats); + return dev->dev_ops->dev_stats_get(dev, stats); } void @@ -447,10 +447,10 @@ rte_ml_dev_stats_reset(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_reset == NULL) + if (dev->dev_ops->dev_stats_reset == NULL) return; - (*dev->dev_ops->dev_stats_reset)(dev); + dev->dev_ops->dev_stats_reset(dev); } int @@ -465,10 +465,10 @@ rte_ml_dev_xstats_names_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, in } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_names_get)(dev, mode, model_id, xstats_map, size); + return dev->dev_ops->dev_xstats_names_get(dev, mode, model_id, xstats_map, size); } int @@ -482,7 +482,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { @@ -495,7 +495,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, stat_id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, stat_id, value); } int @@ -510,7 +510,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (stat_ids == NULL) { @@ -523,7 +523,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, mode, model_id, stat_ids, values, nb_ids); + return dev->dev_ops->dev_xstats_get(dev, mode, model_id, stat_ids, values, nb_ids); } int @@ -538,10 +538,10 @@ rte_ml_dev_xstats_reset(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_ } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_reset)(dev, mode, model_id, stat_ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, mode, model_id, stat_ids, nb_ids); } int @@ -555,7 +555,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (fd == NULL) { @@ -563,7 +563,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, fd); + return dev->dev_ops->dev_dump(dev, fd); } int @@ -577,10 +577,10 @@ rte_ml_dev_selftest(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -594,7 +594,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_load == NULL) + if (dev->dev_ops->model_load == NULL) return -ENOTSUP; if (params == NULL) { @@ -607,7 +607,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * return -EINVAL; } - return (*dev->dev_ops->model_load)(dev, params, model_id); + return dev->dev_ops->model_load(dev, params, model_id); } int @@ -621,10 +621,10 @@ rte_ml_model_unload(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_unload == NULL) + if (dev->dev_ops->model_unload == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_unload)(dev, model_id); + return dev->dev_ops->model_unload(dev, model_id); } int @@ -638,10 +638,10 @@ rte_ml_model_start(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_start == NULL) + if (dev->dev_ops->model_start == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_start)(dev, model_id); + return dev->dev_ops->model_start(dev, model_id); } int @@ -655,10 +655,10 @@ rte_ml_model_stop(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_stop == NULL) + if (dev->dev_ops->model_stop == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_stop)(dev, model_id); + return dev->dev_ops->model_stop(dev, model_id); } int @@ -672,7 +672,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_info_get == NULL) + if (dev->dev_ops->model_info_get == NULL) return -ENOTSUP; if (model_info == NULL) { @@ -681,7 +681,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf return -EINVAL; } - return (*dev->dev_ops->model_info_get)(dev, model_id, model_info); + return dev->dev_ops->model_info_get(dev, model_id, model_info); } int @@ -695,7 +695,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_params_update == NULL) + if (dev->dev_ops->model_params_update == NULL) return -ENOTSUP; if (buffer == NULL) { @@ -703,7 +703,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) return -EINVAL; } - return (*dev->dev_ops->model_params_update)(dev, model_id, buffer); + return dev->dev_ops->model_params_update(dev, model_id, buffer); } int @@ -718,7 +718,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_quantize == NULL) + if (dev->dev_ops->io_quantize == NULL) return -ENOTSUP; if (dbuffer == NULL) { @@ -731,7 +731,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d return -EINVAL; } - return (*dev->dev_ops->io_quantize)(dev, model_id, dbuffer, qbuffer); + return dev->dev_ops->io_quantize(dev, model_id, dbuffer, qbuffer); } int @@ -746,7 +746,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_dequantize == NULL) + if (dev->dev_ops->io_dequantize == NULL) return -ENOTSUP; if (qbuffer == NULL) { @@ -759,7 +759,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * return -EINVAL; } - return (*dev->dev_ops->io_dequantize)(dev, model_id, qbuffer, dbuffer); + return dev->dev_ops->io_dequantize(dev, model_id, qbuffer, dbuffer); } /** Initialise rte_ml_op mempool element */ -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 13/14] regexdev: remove unnecessary deref of function pointers 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (11 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 12/14] mldev: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 14/14] security: remove unnecessary dereference Stephen Hemminger ` (2 subsequent siblings) 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Ori Kam The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/regexdev/rte_regexdev.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c index b2c4b49d97..431ed911a1 100644 --- a/lib/regexdev/rte_regexdev.c +++ b/lib/regexdev/rte_regexdev.c @@ -189,9 +189,9 @@ regexdev_info_get(uint8_t dev_id, struct rte_regexdev_info *dev_info) if (dev_info == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } @@ -212,7 +212,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) if (cfg == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -289,7 +289,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) dev_info.max_rules_per_group); return -EINVAL; } - ret = (*dev->dev_ops->dev_configure)(dev, cfg); + ret = dev->dev_ops->dev_configure(dev, cfg); if (ret == 0) dev->data->dev_conf = *cfg; return ret; @@ -303,7 +303,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_qp_setup == NULL) + if (dev->dev_ops->dev_qp_setup == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -324,7 +324,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, dev_id); return -EBUSY; } - return (*dev->dev_ops->dev_qp_setup)(dev, queue_pair_id, qp_conf); + return dev->dev_ops->dev_qp_setup(dev, queue_pair_id, qp_conf); } int @@ -335,9 +335,9 @@ rte_regexdev_start(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; return ret; @@ -350,9 +350,9 @@ rte_regexdev_stop(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; return 0; } @@ -364,9 +364,9 @@ rte_regexdev_close(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_close)(dev); + dev->dev_ops->dev_close(dev); dev->data->dev_started = 0; dev->state = RTE_REGEXDEV_UNUSED; return 0; @@ -380,14 +380,14 @@ rte_regexdev_attr_get(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_get == NULL) + if (dev->dev_ops->dev_attr_get == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_get)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_get(dev, attr_id, attr_value); } int @@ -398,14 +398,14 @@ rte_regexdev_attr_set(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_set == NULL) + if (dev->dev_ops->dev_attr_set == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_set)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_set(dev, attr_id, attr_value); } int @@ -417,14 +417,14 @@ rte_regexdev_rule_db_update(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_update == NULL) + if (dev->dev_ops->dev_rule_db_update == NULL) return -ENOTSUP; if (rules == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_rule_db_update)(dev, rules, nb_rules); + return dev->dev_ops->dev_rule_db_update(dev, rules, nb_rules); } int @@ -434,9 +434,9 @@ rte_regexdev_rule_db_compile_activate(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_compile_activate == NULL) + if (dev->dev_ops->dev_rule_db_compile_activate == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_rule_db_compile_activate)(dev); + return dev->dev_ops->dev_rule_db_compile_activate(dev); } int @@ -447,14 +447,14 @@ rte_regexdev_rule_db_import(uint8_t dev_id, const char *rule_db, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_import == NULL) + if (dev->dev_ops->dev_db_import == NULL) return -ENOTSUP; if (rule_db == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_db_import)(dev, rule_db, rule_db_len); + return dev->dev_ops->dev_db_import(dev, rule_db, rule_db_len); } int @@ -464,9 +464,9 @@ rte_regexdev_rule_db_export(uint8_t dev_id, char *rule_db) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_export == NULL) + if (dev->dev_ops->dev_db_export == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_db_export)(dev, rule_db); + return dev->dev_ops->dev_db_export(dev, rule_db); } int @@ -477,14 +477,14 @@ rte_regexdev_xstats_names_get(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; if (xstats_map == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d xstats map can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_names_get)(dev, xstats_map); + return dev->dev_ops->dev_xstats_names_get(dev, xstats_map); } int @@ -495,7 +495,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); @@ -505,7 +505,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d values can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, ids, values, n); + return dev->dev_ops->dev_xstats_get(dev, ids, values, n); } int @@ -516,7 +516,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d name can't be NULL", dev_id); @@ -530,7 +530,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, id, value); } int @@ -541,13 +541,13 @@ rte_regexdev_xstats_reset(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, ids, nb_ids); } int @@ -557,9 +557,9 @@ rte_regexdev_selftest(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -569,11 +569,11 @@ rte_regexdev_dump(uint8_t dev_id, FILE *f) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (f == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d file can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, f); + return dev->dev_ops->dev_dump(dev, f); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v2 14/14] security: remove unnecessary dereference 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (12 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 13/14] regexdev: " Stephen Hemminger @ 2025-02-20 2:32 ` Stephen Hemminger 2025-02-20 8:05 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Morten Brørup 2025-02-20 9:17 ` Bruce Richardson 15 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 2:32 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Akhil Goyal, Anoob Joseph The expressions *instance->ops->set_pkt_metadata and instance->ops->set_pkt_metadata are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/security/rte_security.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c index e5c862f5f5..1e980343fe 100644 --- a/lib/security/rte_security.c +++ b/lib/security/rte_security.c @@ -258,10 +258,9 @@ __rte_security_set_pkt_metadata(void *ctx, void *sess, struct rte_mbuf *m, void RTE_PTR_OR_ERR_RET(instance, -EINVAL); RTE_PTR_OR_ERR_RET(instance->ops, -EINVAL); #endif - if (*instance->ops->set_pkt_metadata == NULL) + if (instance->ops->set_pkt_metadata == NULL) return -ENOTSUP; - return instance->ops->set_pkt_metadata(instance->device, - sess, m, params); + return instance->ops->set_pkt_metadata(instance->device, sess, m, params); } const struct rte_security_capability * -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* RE: [PATCH v2 00/14] Remove unnecessary function pointer deref 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (13 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 14/14] security: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 8:05 ` Morten Brørup 2025-02-20 9:17 ` Bruce Richardson 15 siblings, 0 replies; 52+ messages in thread From: Morten Brørup @ 2025-02-20 8:05 UTC (permalink / raw) To: Stephen Hemminger, dev Series-acked-by: Morten Brørup <mb@smartsharesystems.com> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v2 00/14] Remove unnecessary function pointer deref 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger ` (14 preceding siblings ...) 2025-02-20 8:05 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Morten Brørup @ 2025-02-20 9:17 ` Bruce Richardson 15 siblings, 0 replies; 52+ messages in thread From: Bruce Richardson @ 2025-02-20 9:17 UTC (permalink / raw) To: Stephen Hemminger; +Cc: dev On Wed, Feb 19, 2025 at 06:32:04PM -0800, Stephen Hemminger wrote: > A common pattern in DPDK internals is to have an array of function > pointers. When using these pointers an unnecessary derefence is done; > this is allowed in C because of a historical quirk but unnecessary. > > This fixes all instances of PVS Studio checker warning: > https://pvs-studio.com/en/docs/warnings/v516/ > > This leads to a large number of warnings marked as High severity. > This patchset simplifies the source and gets rid of these warnings. > > Stephen Hemminger (14): > ethdev: remove unnecessary deref on function pointers > eventdev: remover unnecessary deref on function pointers > net/bonding: remove unnecessary deref of function pointers > net/ixgbe: remove unnecessary dereference > net/ipn3ke: remove unnecessary dereference > net/memif: remove unnecessary deref of function pointers > cryptodev: remove unnecessary deref of function pointers > crypto/scheduler: remove unnecessary dereference > compressdev: remove unnecessary deref of function pointers > dmadev: remove unnecessary deref of function pointers > rawdev: remove unnecessary deref of function pointers > mldev: remove unnecessary deref of function pointers > regexdev: remove unnecessary deref of function pointers > security: remove unnecessary dereference > Series-acked-by: Bruce Richardson <bruce.richardson@intel.com> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 00/14] Remove unnecessary function pointer deref 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger ` (12 preceding siblings ...) 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger ` (13 more replies) 13 siblings, 14 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger A common pattern in DPDK internals is to have an array of function pointers. When using these pointers an unnecessary derefence is done; this is allowed in C because of a historical quirk but unnecessary. This fixes all instances of PVS Studio checker warning: https://pvs-studio.com/en/docs/warnings/v516/ This leads to a large number of warnings marked as High severity. This patchset simplifies the source and gets rid of these warnings. v3 - remove unnecessary paren in ethdev ip_reassembly capability Stephen Hemminger (14): ethdev: remove unnecessary deref on function pointers eventdev: remover unnecessary deref on function pointers net/bonding: remove unnecessary deref of function pointers net/ixgbe: remove unnecessary dereference net/ipn3ke: remove unnecessary dereference net/memif: remove unnecessary deref of function pointers cryptodev: remove unnecessary deref of function pointers crypto/scheduler: remove unnecessary dereference compressdev: remove unnecessary deref of function pointers dmadev: remove unnecessary deref of function pointers rawdev: remove unnecessary deref of function pointers mldev: remove unnecessary deref of function pointers regexdev: remove unnecessary deref of function pointers security: remove unnecessary dereference .../scheduler/rte_cryptodev_scheduler.c | 8 +- drivers/crypto/scheduler/scheduler_pmd_ops.c | 25 +- drivers/net/bonding/rte_eth_bond_pmd.c | 12 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 27 +- drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 +- drivers/net/memif/rte_eth_memif.c | 6 +- lib/compressdev/rte_compressdev.c | 56 +- lib/cryptodev/rte_cryptodev.c | 72 ++- lib/dmadev/rte_dmadev.c | 38 +- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 494 ++++++++---------- lib/ethdev/rte_ethdev.h | 12 +- lib/ethdev/rte_ethdev_cman.c | 8 +- lib/eventdev/rte_event_crypto_adapter.c | 37 +- lib/eventdev/rte_event_dma_adapter.c | 16 +- lib/eventdev/rte_event_eth_rx_adapter.c | 50 +- lib/eventdev/rte_eventdev.c | 164 +++--- lib/mldev/rte_mldev.c | 88 ++-- lib/rawdev/rte_rawdev.c | 99 ++-- lib/regexdev/rte_regexdev.c | 72 +-- lib/security/rte_security.c | 5 +- 22 files changed, 613 insertions(+), 701 deletions(-) -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 02/14] eventdev: remover " Stephen Hemminger ` (12 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Andrew Rybchenko, Morten Brørup, Bruce Richardson, Thomas Monjalon, Ferruh Yigit The expression *dev->dev_ops->rx_queue_start and dev->dev_ops->rx_queue_start are equivalent. Remove the unnecessary asterisk and parenthesis. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 494 ++++++++++++++++------------------- lib/ethdev/rte_ethdev.h | 12 +- lib/ethdev/rte_ethdev_cman.c | 8 +- 5 files changed, 251 insertions(+), 283 deletions(-) diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c index 13d328d97b..e1976db05f 100644 --- a/lib/ethdev/ethdev_driver.c +++ b/lib/ethdev/ethdev_driver.c @@ -749,11 +749,10 @@ rte_eth_hairpin_queue_peer_bind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_bind == NULL) + if (dev->dev_ops->hairpin_queue_peer_bind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_bind)(dev, cur_queue, - peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_bind(dev, cur_queue, peer_info, direction); } int @@ -764,11 +763,10 @@ rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_unbind == NULL) + if (dev->dev_ops->hairpin_queue_peer_unbind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_unbind)(dev, cur_queue, - direction); + return dev->dev_ops->hairpin_queue_peer_unbind(dev, cur_queue, direction); } int @@ -785,11 +783,11 @@ rte_eth_hairpin_queue_peer_update(uint16_t peer_port, uint16_t peer_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[peer_port]; - if (*dev->dev_ops->hairpin_queue_peer_update == NULL) + if (dev->dev_ops->hairpin_queue_peer_update == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_update)(dev, peer_queue, - cur_info, peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_update(dev, peer_queue, + cur_info, peer_info, direction); } int diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index eed8c78747..cc7fd97d4a 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -398,7 +398,7 @@ eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->rx_queue_release != NULL) - (*dev->dev_ops->rx_queue_release)(dev, qid); + dev->dev_ops->rx_queue_release(dev, qid); rxq[qid] = NULL; } @@ -411,7 +411,7 @@ eth_dev_txq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->tx_queue_release != NULL) - (*dev->dev_ops->tx_queue_release)(dev, qid); + dev->dev_ops->tx_queue_release(dev, qid); txq[qid] = NULL; } diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index c4079bb924..162a6902ee 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -859,7 +859,7 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_start == NULL) + if (dev->dev_ops->rx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -896,7 +896,7 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_stop == NULL) + if (dev->dev_ops->rx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -940,7 +940,7 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_start == NULL) + if (dev->dev_ops->tx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -977,7 +977,7 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_stop == NULL) + if (dev->dev_ops->tx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -1308,7 +1308,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -1567,7 +1567,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, goto rollback; } - diag = (*dev->dev_ops->dev_configure)(dev); + diag = dev->dev_ops->dev_configure(dev); if (diag != 0) { RTE_ETHDEV_LOG_LINE(ERR, "Port%u dev_configure = %d", port_id, diag); @@ -1630,12 +1630,12 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, /* replay MAC address configuration including default MAC */ addr = &dev->data->mac_addrs[0]; - if (*dev->dev_ops->mac_addr_set != NULL) - (*dev->dev_ops->mac_addr_set)(dev, addr); - else if (*dev->dev_ops->mac_addr_add != NULL) - (*dev->dev_ops->mac_addr_add)(dev, addr, 0, pool); + if (dev->dev_ops->mac_addr_set != NULL) + dev->dev_ops->mac_addr_set(dev, addr); + else if (dev->dev_ops->mac_addr_add != NULL) + dev->dev_ops->mac_addr_add(dev, addr, 0, pool); - if (*dev->dev_ops->mac_addr_add != NULL) { + if (dev->dev_ops->mac_addr_add != NULL) { for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1648,8 +1648,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, do { if (pool_mask & UINT64_C(1)) - (*dev->dev_ops->mac_addr_add)(dev, - addr, i, pool); + dev->dev_ops->mac_addr_add(dev, addr, i, pool); pool_mask >>= 1; pool++; } while (pool_mask); @@ -1668,9 +1667,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_promiscuous_get(port_id) == 1 && - *dev->dev_ops->promiscuous_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_enable)(dev)); + dev->dev_ops->promiscuous_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable promiscuous mode for device (port %u): %s", @@ -1678,9 +1676,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_promiscuous_get(port_id) == 0 && - *dev->dev_ops->promiscuous_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_disable)(dev)); + dev->dev_ops->promiscuous_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable promiscuous mode for device (port %u): %s", @@ -1703,9 +1700,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_allmulticast_get(port_id) == 1 && - *dev->dev_ops->allmulticast_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_enable)(dev)); + dev->dev_ops->allmulticast_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable allmulticast mode for device (port %u): %s", @@ -1713,9 +1709,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_allmulticast_get(port_id) == 0 && - *dev->dev_ops->allmulticast_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_disable)(dev)); + dev->dev_ops->allmulticast_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable allmulticast mode for device (port %u): %s", @@ -1766,7 +1761,7 @@ rte_eth_dev_start(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -1794,7 +1789,7 @@ rte_eth_dev_start(uint16_t port_id) (restore_flags & RTE_ETH_RESTORE_MAC_ADDR)) eth_dev_mac_restore(dev, &dev_info); - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -1816,9 +1811,9 @@ rte_eth_dev_start(uint16_t port_id) } if (dev->data->dev_conf.intr_conf.lsc == 0) { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); } /* expose selection of PMD fast-path functions */ @@ -1837,7 +1832,7 @@ rte_eth_dev_stop(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -1850,7 +1845,7 @@ rte_eth_dev_stop(uint16_t port_id) /* point fast-path functions to dummy ones */ eth_dev_fp_ops_reset(rte_eth_fp_ops + port_id); - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; rte_ethdev_trace_stop(port_id, ret); @@ -1867,9 +1862,9 @@ rte_eth_dev_set_link_up(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_up == NULL) + if (dev->dev_ops->dev_set_link_up == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_up)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_up(dev)); rte_ethdev_trace_set_link_up(port_id, ret); @@ -1885,9 +1880,9 @@ rte_eth_dev_set_link_down(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_down == NULL) + if (dev->dev_ops->dev_set_link_down == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_down)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_down(dev)); rte_ethdev_trace_set_link_down(port_id, ret); @@ -1902,9 +1897,9 @@ rte_eth_speed_lanes_get(uint16_t port_id, uint32_t *lane) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get == NULL) + if (dev->dev_ops->speed_lanes_get == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_get)(dev, lane)); + return eth_err(port_id, dev->dev_ops->speed_lanes_get(dev, lane)); } int @@ -1918,7 +1913,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get_capa == NULL) + if (dev->dev_ops->speed_lanes_get_capa == NULL) return -ENOTSUP; if (speed_lanes_capa == NULL && num > 0) { @@ -1928,7 +1923,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, return -EINVAL; } - ret = (*dev->dev_ops->speed_lanes_get_capa)(dev, speed_lanes_capa, num); + ret = dev->dev_ops->speed_lanes_get_capa(dev, speed_lanes_capa, num); return ret; } @@ -1941,9 +1936,9 @@ rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_set == NULL) + if (dev->dev_ops->speed_lanes_set == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_set)(dev, speed_lanes_capa)); + return eth_err(port_id, dev->dev_ops->speed_lanes_set(dev, speed_lanes_capa)); } int @@ -1968,9 +1963,9 @@ rte_eth_dev_close(uint16_t port_id) return -EINVAL; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - *lasterr = (*dev->dev_ops->dev_close)(dev); + *lasterr = dev->dev_ops->dev_close(dev); if (*lasterr != 0) lasterr = &binerr; @@ -1989,7 +1984,7 @@ rte_eth_dev_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; ret = rte_eth_dev_stop(port_id); @@ -2017,7 +2012,7 @@ rte_eth_dev_is_removed(uint16_t port_id) if (dev->state == RTE_ETH_DEV_REMOVED) return 1; - if (*dev->dev_ops->is_removed == NULL) + if (dev->dev_ops->is_removed == NULL) return 0; ret = dev->dev_ops->is_removed(dev); @@ -2254,7 +2249,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_queue_setup == NULL) + if (dev->dev_ops->rx_queue_setup == NULL) return -ENOTSUP; if (rx_conf != NULL && @@ -2436,8 +2431,8 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return ret; } - ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, - socket_id, &local_conf, mp); + ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc, + socket_id, &local_conf, mp); if (!ret) { if (!dev->data->min_rx_buf_size || dev->data->min_rx_buf_size > mbp_buf_size) @@ -2484,7 +2479,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->rx_hairpin_queue_setup == NULL) + if (dev->dev_ops->rx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_rx_desc == 0) @@ -2542,8 +2537,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_rxq_release(dev, rx_queue_id); - ret = (*dev->dev_ops->rx_hairpin_queue_setup)(dev, rx_queue_id, - nb_rx_desc, conf); + ret = dev->dev_ops->rx_hairpin_queue_setup(dev, rx_queue_id, nb_rx_desc, conf); if (ret == 0) dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2573,7 +2567,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_queue_setup == NULL) + if (dev->dev_ops->tx_queue_setup == NULL) return -ENOTSUP; if (tx_conf != NULL && @@ -2654,7 +2648,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, } rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf); - return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev, + return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev, tx_queue_id, nb_tx_desc, socket_id, &local_conf)); } @@ -2687,7 +2681,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->tx_hairpin_queue_setup == NULL) + if (dev->dev_ops->tx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_tx_desc == 0) @@ -2745,8 +2739,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_txq_release(dev, tx_queue_id); - ret = (*dev->dev_ops->tx_hairpin_queue_setup) - (dev, tx_queue_id, nb_tx_desc, conf); + ret = dev->dev_ops->tx_hairpin_queue_setup(dev, tx_queue_id, nb_tx_desc, conf); if (ret == 0) dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2772,9 +2765,9 @@ rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_bind == NULL) + if (dev->dev_ops->hairpin_bind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_bind)(dev, rx_port); + ret = dev->dev_ops->hairpin_bind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to bind hairpin Tx %d" " to Rx %d (%d - all ports)", @@ -2799,9 +2792,9 @@ rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_unbind == NULL) + if (dev->dev_ops->hairpin_unbind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_unbind)(dev, rx_port); + ret = dev->dev_ops->hairpin_unbind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to unbind hairpin Tx %d" " from Rx %d (%d - all ports)", @@ -2836,11 +2829,10 @@ rte_eth_hairpin_get_peer_ports(uint16_t port_id, uint16_t *peer_ports, return -EINVAL; } - if (*dev->dev_ops->hairpin_get_peer_ports == NULL) + if (dev->dev_ops->hairpin_get_peer_ports == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports, - len, direction); + ret = dev->dev_ops->hairpin_get_peer_ports(dev, peer_ports, len, direction); if (ret < 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to get %d hairpin peer %s ports", port_id, direction ? "Rx" : "Tx"); @@ -2926,12 +2918,11 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) return ret; #endif - if (*dev->dev_ops->tx_done_cleanup == NULL) + if (dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; /* Call driver to free pending mbufs. */ - ret = (*dev->dev_ops->tx_done_cleanup)(dev->data->tx_queues[queue_id], - free_cnt); + ret = dev->dev_ops->tx_done_cleanup(dev->data->tx_queues[queue_id], free_cnt); ret = eth_err(port_id, ret); rte_eth_trace_tx_done_cleanup(port_id, queue_id, free_cnt, ret); @@ -2951,10 +2942,10 @@ rte_eth_promiscuous_enable(uint16_t port_id) if (dev->data->promiscuous == 1) return 0; - if (*dev->dev_ops->promiscuous_enable == NULL) + if (dev->dev_ops->promiscuous_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->promiscuous_enable)(dev); + diag = dev->dev_ops->promiscuous_enable(dev); dev->data->promiscuous = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -2977,11 +2968,11 @@ rte_eth_promiscuous_disable(uint16_t port_id) if (dev->data->promiscuous == 0) return 0; - if (*dev->dev_ops->promiscuous_disable == NULL) + if (dev->dev_ops->promiscuous_disable == NULL) return -ENOTSUP; dev->data->promiscuous = 0; - diag = (*dev->dev_ops->promiscuous_disable)(dev); + diag = dev->dev_ops->promiscuous_disable(dev); if (diag != 0) dev->data->promiscuous = 1; @@ -3018,9 +3009,9 @@ rte_eth_allmulticast_enable(uint16_t port_id) if (dev->data->all_multicast == 1) return 0; - if (*dev->dev_ops->allmulticast_enable == NULL) + if (dev->dev_ops->allmulticast_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->allmulticast_enable)(dev); + diag = dev->dev_ops->allmulticast_enable(dev); dev->data->all_multicast = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -3043,10 +3034,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) if (dev->data->all_multicast == 0) return 0; - if (*dev->dev_ops->allmulticast_disable == NULL) + if (dev->dev_ops->allmulticast_disable == NULL) return -ENOTSUP; dev->data->all_multicast = 0; - diag = (*dev->dev_ops->allmulticast_disable)(dev); + diag = dev->dev_ops->allmulticast_disable(dev); if (diag != 0) dev->data->all_multicast = 1; @@ -3088,9 +3079,9 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 1); + dev->dev_ops->link_update(dev, 1); *eth_link = dev->data->dev_link; } @@ -3116,9 +3107,9 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); *eth_link = dev->data->dev_link; } @@ -3243,10 +3234,10 @@ rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats) memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; - ret = eth_err(port_id, (*dev->dev_ops->stats_get)(dev, stats)); + ret = eth_err(port_id, dev->dev_ops->stats_get(dev, stats)); rte_eth_trace_stats_get(port_id, stats, ret); @@ -3262,9 +3253,9 @@ rte_eth_stats_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev); + ret = dev->dev_ops->stats_reset(dev); if (ret != 0) return eth_err(port_id, ret); @@ -3302,7 +3293,7 @@ eth_dev_get_xstats_count(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; if (dev->dev_ops->xstats_get_names != NULL) { - count = (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + count = dev->dev_ops->xstats_get_names(dev, NULL, 0); if (count < 0) return eth_err(port_id, count); } else @@ -3438,8 +3429,7 @@ eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy, - xstats_names + m, k); + rc = dev->dev_ops->xstats_get_names_by_id(dev, ids_copy, xstats_names + m, k); if (rc < 0) return rc; m += rc; @@ -3567,7 +3557,7 @@ rte_eth_xstats_get_names(uint16_t port_id, /* If there are any driver-specific xstats, append them * to end of list. */ - cnt_driver_entries = (*dev->dev_ops->xstats_get_names)( + cnt_driver_entries = dev->dev_ops->xstats_get_names( dev, xstats_names + cnt_used_entries, size - cnt_used_entries); @@ -3658,8 +3648,7 @@ eth_xtats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values + m, k); + rc = dev->dev_ops->xstats_get_by_id(dev, ids_copy, values + m, k); if (rc < 0) return rc; m += rc; @@ -3776,7 +3765,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats, /* Retrieve the xstats from the driver at the end of the * xstats struct. */ - xcount = (*dev->dev_ops->xstats_get)(dev, + xcount = dev->dev_ops->xstats_get(dev, (n > count) ? xstats + count : NULL, (n > count) ? n - count : 0); @@ -3816,7 +3805,7 @@ rte_eth_xstats_reset(uint16_t port_id) /* implemented by the driver */ if (dev->dev_ops->xstats_reset != NULL) { - int ret = eth_err(port_id, (*dev->dev_ops->xstats_reset)(dev)); + int ret = eth_err(port_id, dev->dev_ops->xstats_reset(dev)); rte_eth_trace_xstats_reset(port_id, ret); @@ -3844,12 +3833,12 @@ rte_eth_xstats_set_counter(uint16_t port_id, uint64_t id, int on_off) if (rte_eth_xstats_query_state(port_id, id) == 1) return -EEXIST; if (dev->dev_ops->xstats_enable != NULL) - return (*dev->dev_ops->xstats_enable)(dev, id - basic_count); + return dev->dev_ops->xstats_enable(dev, id - basic_count); } else { if (rte_eth_xstats_query_state(port_id, id) == 0) return 0; if (dev->dev_ops->xstats_disable != NULL) - return (*dev->dev_ops->xstats_disable)(dev, id - basic_count); + return dev->dev_ops->xstats_disable(dev, id - basic_count); } return -ENOTSUP; @@ -3871,7 +3860,7 @@ rte_eth_xstats_query_state(uint16_t port_id, uint64_t id) /* implemented by the driver */ if (dev->dev_ops->xstats_query_state != NULL) - return (*dev->dev_ops->xstats_query_state)(dev, id - basic_count); + return dev->dev_ops->xstats_query_state(dev, id - basic_count); return -ENOTSUP; } @@ -3894,9 +3883,9 @@ eth_dev_set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, if (stat_idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS) return -EINVAL; - if (*dev->dev_ops->queue_stats_mapping_set == NULL) + if (dev->dev_ops->queue_stats_mapping_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_stats_mapping_set) (dev, queue_id, stat_idx, is_rx); + return dev->dev_ops->queue_stats_mapping_set(dev, queue_id, stat_idx, is_rx); } int @@ -3947,10 +3936,9 @@ rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size) return -EINVAL; } - if (*dev->dev_ops->fw_version_get == NULL) + if (dev->dev_ops->fw_version_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fw_version_get)(dev, - fw_version, fw_size)); + ret = eth_err(port_id, dev->dev_ops->fw_version_get(dev, fw_version, fw_size)); rte_ethdev_trace_fw_version_get(port_id, fw_version, fw_size, ret); @@ -3995,9 +3983,9 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) dev_info->rss_algo_capa = RTE_ETH_HASH_ALGO_CAPA_MASK(DEFAULT); dev_info->max_rx_bufsize = UINT32_MAX; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->dev_infos_get)(dev, dev_info); + diag = dev->dev_ops->dev_infos_get(dev, dev_info); if (diag != 0) { /* Cleanup already filled in device information */ memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -4063,10 +4051,9 @@ rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL) + if (dev->dev_ops->dev_supported_ptypes_get == NULL) return 0; - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (!all_ptypes) return 0; @@ -4116,15 +4103,14 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL || - *dev->dev_ops->dev_ptypes_set == NULL) { + if (dev->dev_ops->dev_supported_ptypes_get == NULL || + dev->dev_ops->dev_ptypes_set == NULL) { ret = 0; goto ptype_unknown; } if (ptype_mask == 0) { - ret = (*dev->dev_ops->dev_ptypes_set)(dev, - ptype_mask); + ret = dev->dev_ops->dev_ptypes_set(dev, ptype_mask); goto ptype_unknown; } @@ -4143,8 +4129,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, goto ptype_unknown; } - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (all_ptypes == NULL) { ret = 0; goto ptype_unknown; @@ -4173,7 +4158,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, if (set_ptypes != NULL && j < num) set_ptypes[j] = RTE_PTYPE_UNKNOWN; - return (*dev->dev_ops->dev_ptypes_set)(dev, ptype_mask); + return dev->dev_ops->dev_ptypes_set(dev, ptype_mask); ptype_unknown: if (num > 0) @@ -4261,7 +4246,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->mtu_set == NULL) + if (dev->dev_ops->mtu_set == NULL) return -ENOTSUP; /* @@ -4270,7 +4255,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) * that are populated within the call to rte_eth_dev_info_get() * which relies on dev->dev_ops->dev_infos_get. */ - if (*dev->dev_ops->dev_infos_get != NULL) { + if (dev->dev_ops->dev_infos_get != NULL) { ret = rte_eth_dev_info_get(port_id, &dev_info); if (ret != 0) return ret; @@ -4287,7 +4272,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) return -EINVAL; } - ret = (*dev->dev_ops->mtu_set)(dev, mtu); + ret = dev->dev_ops->mtu_set(dev, mtu); if (ret == 0) dev->data->mtu = mtu; @@ -4319,10 +4304,10 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) port_id, vlan_id); return -EINVAL; } - if (*dev->dev_ops->vlan_filter_set == NULL) + if (dev->dev_ops->vlan_filter_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); + ret = dev->dev_ops->vlan_filter_set(dev, vlan_id, on); if (ret == 0) { struct rte_vlan_filter_conf *vfc; int vidx; @@ -4359,9 +4344,9 @@ rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; - (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); + dev->dev_ops->vlan_strip_queue_set(dev, rx_queue_id, on); rte_ethdev_trace_set_vlan_strip_on_queue(port_id, rx_queue_id, on); @@ -4379,10 +4364,9 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_tpid_set == NULL) + if (dev->dev_ops->vlan_tpid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, - tpid)); + ret = eth_err(port_id, dev->dev_ops->vlan_tpid_set(dev, vlan_type, tpid)); rte_ethdev_trace_set_vlan_ether_type(port_id, vlan_type, tpid, ret); @@ -4469,10 +4453,10 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) return -EINVAL; } - if (*dev->dev_ops->vlan_offload_set == NULL) + if (dev->dev_ops->vlan_offload_set == NULL) return -ENOTSUP; dev->data->dev_conf.rxmode.offloads = dev_offloads; - ret = (*dev->dev_ops->vlan_offload_set)(dev, mask); + ret = dev->dev_ops->vlan_offload_set(dev, mask); if (ret) { /* hit an error restore original values */ dev->data->dev_conf.rxmode.offloads = orig_offloads; @@ -4522,9 +4506,9 @@ rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_pvid_set == NULL) + if (dev->dev_ops->vlan_pvid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on)); + ret = eth_err(port_id, dev->dev_ops->vlan_pvid_set(dev, pvid, on)); rte_ethdev_trace_set_vlan_pvid(port_id, pvid, on, ret); @@ -4547,10 +4531,10 @@ rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_get == NULL) + if (dev->dev_ops->flow_ctrl_get == NULL) return -ENOTSUP; memset(fc_conf, 0, sizeof(*fc_conf)); - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_get(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_get(port_id, fc_conf, ret); @@ -4578,9 +4562,9 @@ rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_set == NULL) + if (dev->dev_ops->flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_set(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_set(port_id, fc_conf, ret); @@ -4610,10 +4594,9 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, } /* High water, low water validation are device specific */ - if (*dev->dev_ops->priority_flow_ctrl_set == NULL) + if (dev->dev_ops->priority_flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_set) - (dev, pfc_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_set(dev, pfc_conf)); rte_ethdev_trace_priority_flow_ctrl_set(port_id, pfc_conf, ret); @@ -4686,10 +4669,10 @@ rte_eth_dev_priority_flow_ctrl_queue_info_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_info_get) - (dev, pfc_queue_info)); + ret = eth_err(port_id, + dev->dev_ops->priority_flow_ctrl_queue_info_get(dev, pfc_queue_info)); rte_ethdev_trace_priority_flow_ctrl_queue_info_get(port_id, pfc_queue_info, ret); @@ -4762,10 +4745,9 @@ rte_eth_dev_priority_flow_ctrl_queue_configure(uint16_t port_id, return ret; } - if (*dev->dev_ops->priority_flow_ctrl_queue_config == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_config == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_config) - (dev, pfc_queue_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_queue_config(dev, pfc_queue_conf)); rte_ethdev_trace_priority_flow_ctrl_queue_configure(port_id, pfc_queue_conf, ret); @@ -4859,10 +4841,9 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, return -ENOTSUP; } - if (*dev->dev_ops->reta_update == NULL) + if (dev->dev_ops->reta_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_update(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_update(port_id, reta_conf, reta_size, ret); @@ -4892,10 +4873,9 @@ rte_eth_dev_rss_reta_query(uint16_t port_id, if (ret < 0) return ret; - if (*dev->dev_ops->reta_query == NULL) + if (dev->dev_ops->reta_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_query)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_query(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_query(port_id, reta_conf, reta_size, ret); @@ -4959,10 +4939,9 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->rss_hash_update == NULL) + if (dev->dev_ops->rss_hash_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_update(dev, rss_conf)); rte_ethdev_trace_rss_hash_update(port_id, rss_conf, ret); @@ -5001,10 +4980,9 @@ rte_eth_dev_rss_hash_conf_get(uint16_t port_id, rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_DEFAULT; - if (*dev->dev_ops->rss_hash_conf_get == NULL) + if (dev->dev_ops->rss_hash_conf_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_conf_get)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_conf_get(dev, rss_conf)); rte_ethdev_trace_rss_hash_conf_get(port_id, rss_conf, ret); @@ -5062,10 +5040,9 @@ rte_eth_dev_udp_tunnel_port_add(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_add == NULL) + if (dev->dev_ops->udp_tunnel_port_add == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_add)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_add(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_add(port_id, udp_tunnel, ret); @@ -5094,10 +5071,9 @@ rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_del == NULL) + if (dev->dev_ops->udp_tunnel_port_del == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_del)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_del(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_delete(port_id, udp_tunnel, ret); @@ -5113,9 +5089,9 @@ rte_eth_led_on(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_on == NULL) + if (dev->dev_ops->dev_led_on == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_on)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_on(dev)); rte_eth_trace_led_on(port_id, ret); @@ -5131,9 +5107,9 @@ rte_eth_led_off(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_off == NULL) + if (dev->dev_ops->dev_led_off == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_off(dev)); rte_eth_trace_led_off(port_id, ret); @@ -5158,9 +5134,9 @@ rte_eth_fec_get_capability(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->fec_get_capability == NULL) + if (dev->dev_ops->fec_get_capability == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->fec_get_capability)(dev, speed_fec_capa, num); + ret = dev->dev_ops->fec_get_capability(dev, speed_fec_capa, num); rte_eth_trace_fec_get_capability(port_id, speed_fec_capa, num, ret); @@ -5183,9 +5159,9 @@ rte_eth_fec_get(uint16_t port_id, uint32_t *fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_get == NULL) + if (dev->dev_ops->fec_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_get)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_get(dev, fec_capa)); rte_eth_trace_fec_get(port_id, fec_capa, ret); @@ -5206,9 +5182,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_set == NULL) + if (dev->dev_ops->fec_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_set(dev, fec_capa)); rte_eth_trace_fec_set(port_id, fec_capa, ret); @@ -5260,7 +5236,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -EINVAL; } - if (*dev->dev_ops->mac_addr_add == NULL) + if (dev->dev_ops->mac_addr_add == NULL) return -ENOTSUP; if (rte_is_zero_ether_addr(addr)) { @@ -5290,7 +5266,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, } /* Update NIC */ - ret = (*dev->dev_ops->mac_addr_add)(dev, addr, index, pool); + ret = dev->dev_ops->mac_addr_add(dev, addr, index, pool); if (ret == 0) { /* Update address in NIC data structure */ @@ -5323,7 +5299,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return -EINVAL; } - if (*dev->dev_ops->mac_addr_remove == NULL) + if (dev->dev_ops->mac_addr_remove == NULL) return -ENOTSUP; index = eth_dev_get_mac_addr_index(port_id, addr); @@ -5336,7 +5312,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return 0; /* Do nothing if address wasn't found */ /* Update NIC */ - (*dev->dev_ops->mac_addr_remove)(dev, index); + dev->dev_ops->mac_addr_remove(dev, index); /* Update address in NIC data structure */ rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]); @@ -5369,7 +5345,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) if (!rte_is_valid_assigned_ether_addr(addr)) return -EINVAL; - if (*dev->dev_ops->mac_addr_set == NULL) + if (dev->dev_ops->mac_addr_set == NULL) return -ENOTSUP; /* Keep address unique in dev->data->mac_addrs[]. */ @@ -5381,7 +5357,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) return -EEXIST; } - ret = (*dev->dev_ops->mac_addr_set)(dev, addr); + ret = dev->dev_ops->mac_addr_set(dev, addr); if (ret < 0) return ret; @@ -5467,9 +5443,9 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr, } } - if (*dev->dev_ops->uc_hash_table_set == NULL) + if (dev->dev_ops->uc_hash_table_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on); + ret = dev->dev_ops->uc_hash_table_set(dev, addr, on); if (ret == 0) { /* Update address in NIC data structure */ if (on) @@ -5496,9 +5472,9 @@ rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->uc_all_hash_table_set == NULL) + if (dev->dev_ops->uc_all_hash_table_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->uc_all_hash_table_set)(dev, on)); + ret = eth_err(port_id, dev->dev_ops->uc_all_hash_table_set(dev, on)); rte_ethdev_trace_uc_all_hash_table_set(port_id, on, ret); @@ -5536,10 +5512,9 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, return -EINVAL; } - if (*dev->dev_ops->set_queue_rate_limit == NULL) + if (dev->dev_ops->set_queue_rate_limit == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_queue_rate_limit)(dev, - queue_idx, tx_rate)); + ret = eth_err(port_id, dev->dev_ops->set_queue_rate_limit(dev, queue_idx, tx_rate)); rte_eth_trace_set_queue_rate_limit(port_id, queue_idx, tx_rate, ret); @@ -5568,10 +5543,10 @@ int rte_eth_rx_avail_thresh_set(uint16_t port_id, uint16_t queue_id, port_id); return -EINVAL; } - if (*dev->dev_ops->rx_queue_avail_thresh_set == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_set)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_set(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_set(port_id, queue_id, avail_thresh, ret); @@ -5592,10 +5567,10 @@ int rte_eth_rx_avail_thresh_query(uint16_t port_id, uint16_t *queue_id, if (*queue_id >= dev->data->nb_rx_queues) *queue_id = 0; - if (*dev->dev_ops->rx_queue_avail_thresh_query == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_query)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_query(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_query(port_id, *queue_id, ret); @@ -5886,9 +5861,9 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_enable == NULL) + if (dev->dev_ops->rx_queue_intr_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_enable(dev, queue_id)); rte_ethdev_trace_rx_intr_enable(port_id, queue_id, ret); @@ -5909,9 +5884,9 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_disable == NULL) + if (dev->dev_ops->rx_queue_intr_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_disable(dev, queue_id)); rte_ethdev_trace_rx_intr_disable(port_id, queue_id, ret); @@ -6189,7 +6164,7 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rxq_info_get == NULL) + if (dev->dev_ops->rxq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6237,7 +6212,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->txq_info_get == NULL) + if (dev->dev_ops->txq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6263,7 +6238,7 @@ rte_eth_recycle_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, if (unlikely(ret != 0)) return ret; - if (*dev->dev_ops->recycle_rxq_info_get == NULL) + if (dev->dev_ops->recycle_rxq_info_get == NULL) return -ENOTSUP; dev->dev_ops->recycle_rxq_info_get(dev, queue_id, recycle_rxq_info); @@ -6293,7 +6268,7 @@ rte_eth_rx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_burst_mode_get == NULL) + if (dev->dev_ops->rx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6326,7 +6301,7 @@ rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_burst_mode_get == NULL) + if (dev->dev_ops->tx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6359,7 +6334,7 @@ rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->get_monitor_addr == NULL) + if (dev->dev_ops->get_monitor_addr == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->get_monitor_addr(dev->data->rx_queues[queue_id], pmc)); @@ -6380,7 +6355,7 @@ rte_eth_dev_set_mc_addr_list(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->set_mc_addr_list == NULL) + if (dev->dev_ops->set_mc_addr_list == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr)); @@ -6400,9 +6375,9 @@ rte_eth_timesync_enable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_enable == NULL) + if (dev->dev_ops->timesync_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_enable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_enable(dev)); rte_eth_trace_timesync_enable(port_id, ret); @@ -6418,9 +6393,9 @@ rte_eth_timesync_disable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_disable == NULL) + if (dev->dev_ops->timesync_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_disable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_disable(dev)); rte_eth_trace_timesync_disable(port_id, ret); @@ -6444,11 +6419,10 @@ rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp, return -EINVAL; } - if (*dev->dev_ops->timesync_read_rx_timestamp == NULL) + if (dev->dev_ops->timesync_read_rx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_rx_timestamp) - (dev, timestamp, flags)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_rx_timestamp(dev, timestamp, flags)); rte_eth_trace_timesync_read_rx_timestamp(port_id, timestamp, flags, ret); @@ -6473,11 +6447,10 @@ rte_eth_timesync_read_tx_timestamp(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->timesync_read_tx_timestamp == NULL) + if (dev->dev_ops->timesync_read_tx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_tx_timestamp) - (dev, timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_tx_timestamp(dev, timestamp)); rte_eth_trace_timesync_read_tx_timestamp(port_id, timestamp, ret); @@ -6494,9 +6467,9 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_time == NULL) + if (dev->dev_ops->timesync_adjust_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_time)(dev, delta)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_time(dev, delta)); rte_eth_trace_timesync_adjust_time(port_id, delta, ret); @@ -6512,9 +6485,9 @@ rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_freq == NULL) + if (dev->dev_ops->timesync_adjust_freq == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_freq(dev, ppm)); rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret); @@ -6537,10 +6510,9 @@ rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_read_time == NULL) + if (dev->dev_ops->timesync_read_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_time(dev, timestamp)); rte_eth_trace_timesync_read_time(port_id, timestamp, ret); @@ -6563,10 +6535,9 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_write_time == NULL) + if (dev->dev_ops->timesync_write_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_write_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_write_time(dev, timestamp)); rte_eth_trace_timesync_write_time(port_id, timestamp, ret); @@ -6588,9 +6559,9 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock) return -EINVAL; } - if (*dev->dev_ops->read_clock == NULL) + if (dev->dev_ops->read_clock == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->read_clock)(dev, clock)); + ret = eth_err(port_id, dev->dev_ops->read_clock(dev, clock)); rte_eth_trace_read_clock(port_id, clock, ret); @@ -6645,9 +6616,9 @@ rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info) if (info->names != NULL && info->length != 0) memset(info->names, 0, sizeof(struct rte_eth_reg_name) * info->length); - if (*dev->dev_ops->get_reg == NULL) + if (dev->dev_ops->get_reg == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_reg)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_reg(dev, info)); rte_ethdev_trace_get_reg_info(port_id, info, ret); @@ -6669,9 +6640,9 @@ rte_eth_dev_get_eeprom_length(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->get_eeprom_length == NULL) + if (dev->dev_ops->get_eeprom_length == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom_length)(dev)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom_length(dev)); rte_ethdev_trace_get_eeprom_length(port_id, ret); @@ -6694,9 +6665,9 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->get_eeprom == NULL) + if (dev->dev_ops->get_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom(dev, info)); rte_ethdev_trace_get_eeprom(port_id, info, ret); @@ -6719,9 +6690,9 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->set_eeprom == NULL) + if (dev->dev_ops->set_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->set_eeprom(dev, info)); rte_ethdev_trace_set_eeprom(port_id, info, ret); @@ -6745,9 +6716,9 @@ rte_eth_dev_get_module_info(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_info == NULL) + if (dev->dev_ops->get_module_info == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_info)(dev, modinfo); + ret = dev->dev_ops->get_module_info(dev, modinfo); rte_ethdev_trace_get_module_info(port_id, modinfo, ret); @@ -6785,9 +6756,9 @@ rte_eth_dev_get_module_eeprom(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_eeprom == NULL) + if (dev->dev_ops->get_module_eeprom == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_eeprom)(dev, info); + ret = dev->dev_ops->get_module_eeprom(dev, info); rte_ethdev_trace_get_module_eeprom(port_id, info, ret); @@ -6813,9 +6784,9 @@ rte_eth_dev_get_dcb_info(uint16_t port_id, memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info)); - if (*dev->dev_ops->get_dcb_info == NULL) + if (dev->dev_ops->get_dcb_info == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_dcb_info)(dev, dcb_info)); + ret = eth_err(port_id, dev->dev_ops->get_dcb_info(dev, dcb_info)); rte_ethdev_trace_get_dcb_info(port_id, dcb_info, ret); @@ -6883,10 +6854,10 @@ rte_eth_dev_hairpin_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->hairpin_cap_get == NULL) + if (dev->dev_ops->hairpin_cap_get == NULL) return -ENOTSUP; memset(cap, 0, sizeof(*cap)); - ret = eth_err(port_id, (*dev->dev_ops->hairpin_cap_get)(dev, cap)); + ret = eth_err(port_id, dev->dev_ops->hairpin_cap_get(dev, cap)); rte_ethdev_trace_hairpin_capability_get(port_id, cap, ret); @@ -6909,10 +6880,10 @@ rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool) return -EINVAL; } - if (*dev->dev_ops->pool_ops_supported == NULL) + if (dev->dev_ops->pool_ops_supported == NULL) return 1; /* all pools are supported */ - ret = (*dev->dev_ops->pool_ops_supported)(dev, pool); + ret = dev->dev_ops->pool_ops_supported(dev, pool); rte_ethdev_trace_pool_ops_supported(port_id, pool, ret); @@ -6929,9 +6900,9 @@ rte_eth_representor_info_get(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->representor_info_get == NULL) + if (dev->dev_ops->representor_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->representor_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->representor_info_get(dev, info)); rte_eth_trace_representor_info_get(port_id, info, ret); @@ -6963,10 +6934,10 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t *features) rte_flow_restore_info_dynflag_register() < 0) *features &= ~RTE_ETH_RX_METADATA_TUNNEL_ID; - if (*dev->dev_ops->rx_metadata_negotiate == NULL) + if (dev->dev_ops->rx_metadata_negotiate == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); + dev->dev_ops->rx_metadata_negotiate(dev, features)); rte_eth_trace_rx_metadata_negotiate(port_id, *features, ret); @@ -6995,12 +6966,12 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) + if (dev->dev_ops->ip_reassembly_capability_get == NULL) return -ENOTSUP; memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) - (dev, reassembly_capa)); + ret = eth_err(port_id, + dev->dev_ops->ip_reassembly_capability_get(dev, reassembly_capa)); rte_eth_trace_ip_reassembly_capability_get(port_id, reassembly_capa, ret); @@ -7030,11 +7001,11 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_get == NULL) + if (dev->dev_ops->ip_reassembly_conf_get == NULL) return -ENOTSUP; memset(conf, 0, sizeof(struct rte_eth_ip_reassembly_params)); ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_get)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_get(dev, conf)); rte_eth_trace_ip_reassembly_conf_get(port_id, conf, ret); @@ -7071,10 +7042,10 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_set == NULL) + if (dev->dev_ops->ip_reassembly_conf_set == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_set(dev, conf)); rte_eth_trace_ip_reassembly_conf_set(port_id, conf, ret); @@ -7094,9 +7065,9 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) return -EINVAL; } - if (*dev->dev_ops->eth_dev_priv_dump == NULL) + if (dev->dev_ops->eth_dev_priv_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file)); + return eth_err(port_id, dev->dev_ops->eth_dev_priv_dump(dev, file)); } int @@ -7118,11 +7089,11 @@ rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_rx_descriptor_dump == NULL) + if (dev->dev_ops->eth_rx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_rx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_rx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7144,11 +7115,11 @@ rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_tx_descriptor_dump == NULL) + if (dev->dev_ops->eth_tx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_tx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_tx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7170,10 +7141,9 @@ rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t *ptypes return -EINVAL; } - if (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) + if (dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) return -ENOTSUP; - all_types = (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get)(dev, - &no_of_elements); + all_types = dev->dev_ops->buffer_split_supported_hdr_ptypes_get(dev, &no_of_elements); if (all_types == NULL) return 0; @@ -7199,9 +7169,9 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->count_aggr_ports == NULL) + if (dev->dev_ops->count_aggr_ports == NULL) return 0; - ret = eth_err(port_id, (*dev->dev_ops->count_aggr_ports)(dev)); + ret = eth_err(port_id, dev->dev_ops->count_aggr_ports(dev)); rte_eth_trace_count_aggr_ports(port_id, ret); @@ -7223,7 +7193,7 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->map_aggr_tx_affinity == NULL) + if (dev->dev_ops->map_aggr_tx_affinity == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -7255,8 +7225,8 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - ret = eth_err(port_id, (*dev->dev_ops->map_aggr_tx_affinity)(dev, - tx_queue_id, affinity)); + ret = eth_err(port_id, + dev->dev_ops->map_aggr_tx_affinity(dev, tx_queue_id, affinity)); rte_eth_trace_map_aggr_tx_affinity(port_id, tx_queue_id, affinity, ret); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 6a51bfba5f..ea7f8c4a1a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -6399,9 +6399,9 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id) return -EINVAL; #endif - if (*p->rx_queue_count == NULL) + if (p->rx_queue_count == NULL) return -ENOTSUP; - return (int)(*p->rx_queue_count)(qd); + return (int)p->rx_queue_count(qd); } /**@{@name Rx hardware descriptor states @@ -6471,9 +6471,9 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, if (qd == NULL) return -ENODEV; #endif - if (*p->rx_descriptor_status == NULL) + if (p->rx_descriptor_status == NULL) return -ENOTSUP; - return (*p->rx_descriptor_status)(qd, offset); + return p->rx_descriptor_status(qd, offset); } /**@{@name Tx hardware descriptor states @@ -6542,9 +6542,9 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, if (qd == NULL) return -ENODEV; #endif - if (*p->tx_descriptor_status == NULL) + if (p->tx_descriptor_status == NULL) return -ENOTSUP; - return (*p->tx_descriptor_status)(qd, offset); + return p->tx_descriptor_status(qd, offset); } /** diff --git a/lib/ethdev/rte_ethdev_cman.c b/lib/ethdev/rte_ethdev_cman.c index 41e38bdc89..73262ffc5f 100644 --- a/lib/ethdev/rte_ethdev_cman.c +++ b/lib/ethdev/rte_ethdev_cman.c @@ -31,7 +31,7 @@ rte_eth_cman_info_get(uint16_t port_id, struct rte_eth_cman_info *info) } memset(info, 0, sizeof(struct rte_eth_cman_info)); - ret = eth_err(port_id, (*dev->dev_ops->cman_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->cman_info_get(dev, info)); rte_eth_trace_cman_info_get(port_id, info, ret); @@ -59,7 +59,7 @@ rte_eth_cman_config_init(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_init)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_init(dev, config)); rte_eth_trace_cman_config_init(port_id, config, ret); @@ -86,7 +86,7 @@ rte_eth_cman_config_set(uint16_t port_id, const struct rte_eth_cman_config *conf return -ENOTSUP; } - ret = eth_err(port_id, (*dev->dev_ops->cman_config_set)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_set(dev, config)); rte_eth_trace_cman_config_set(port_id, config, ret); @@ -114,7 +114,7 @@ rte_eth_cman_config_get(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_get)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_get(dev, config)); rte_eth_trace_cman_config_get(port_id, config, ret); -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 02/14] eventdev: remover unnecessary deref on function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger ` (11 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Abhinandan Gujjar, Jerin Jacob, Amit Prakash Shukla, Naga Harish K S V The expression *dev_dev_ops->foo and dev->dev_ops->foo are equivalent. Cleanup the result by removing unneeded parenthesis and make lines compact. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/eventdev/rte_event_crypto_adapter.c | 37 ++---- lib/eventdev/rte_event_dma_adapter.c | 16 +-- lib/eventdev/rte_event_eth_rx_adapter.c | 50 ++++---- lib/eventdev/rte_eventdev.c | 164 +++++++++++------------- 4 files changed, 119 insertions(+), 148 deletions(-) diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index 939ca1cad9..fc43e056d7 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -1132,7 +1132,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_add == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_add == NULL) return -ENOTSUP; if (dev_info->qpairs == NULL) { dev_info->qpairs = @@ -1144,10 +1144,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, - dev_info->dev, - queue_pair_id, - conf); + ret = dev->dev_ops->crypto_adapter_queue_pair_add(dev, dev_info->dev, + queue_pair_id, conf); if (ret) return ret; @@ -1233,11 +1231,10 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, if ((cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->crypto_adapter_queue_pair_del == NULL) + if (dev->dev_ops->crypto_adapter_queue_pair_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->crypto_adapter_queue_pair_del)(dev, - dev_info->dev, - queue_pair_id); + ret = dev->dev_ops->crypto_adapter_queue_pair_del(dev, + dev_info->dev, queue_pair_id); if (ret == 0) { eca_update_qp_info(adapter, &adapter->cdevs[cdev_id], @@ -1308,10 +1305,8 @@ eca_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->crypto_adapter_start)(dev, - &dev_info->dev[i]) : - (*dev->dev_ops->crypto_adapter_stop)(dev, - &dev_info->dev[i]); + start ? dev->dev_ops->crypto_adapter_start(dev, &dev_info->dev[i]) : + dev->dev_ops->crypto_adapter_stop(dev, &dev_info->dev[i]); } if (use_service) @@ -1367,11 +1362,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id, for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_get == NULL) + dev->dev_ops->crypto_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->crypto_adapter_stats_get)(dev, - dev_info->dev, - &dev_stats); + ret = dev->dev_ops->crypto_adapter_stats_get(dev, dev_info->dev, &dev_stats); if (ret) continue; @@ -1418,10 +1411,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id) for (i = 0; i < rte_cryptodev_count(); i++) { dev_info = &adapter->cdevs[i]; if (dev_info->internal_event_port == 0 || - dev->dev_ops->crypto_adapter_stats_reset == NULL) + dev->dev_ops->crypto_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->crypto_adapter_stats_reset)(dev, - dev_info->dev); + dev->dev_ops->crypto_adapter_stats_reset(dev, dev_info->dev); } memset(&adapter->crypto_stats, 0, sizeof(adapter->crypto_stats)); @@ -1606,9 +1598,8 @@ rte_event_crypto_adapter_vector_limits_get( return -ENOTSUP; } - if ((*dev->dev_ops->crypto_adapter_vector_limits_get) == NULL) + if (dev->dev_ops->crypto_adapter_vector_limits_get == NULL) return -ENOTSUP; - return dev->dev_ops->crypto_adapter_vector_limits_get( - dev, cdev, limits); + return dev->dev_ops->crypto_adapter_vector_limits_get(dev, cdev, limits); } diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c index 165374d195..d9a02a30f2 100644 --- a/lib/eventdev/rte_event_dma_adapter.c +++ b/lib/eventdev/rte_event_dma_adapter.c @@ -1030,7 +1030,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_add == NULL) + if (dev->dev_ops->dma_adapter_vchan_add == NULL) return -ENOTSUP; if (dev_info->vchanq == NULL) { dev_info->vchanq = rte_zmalloc_socket(adapter->mem_name, @@ -1054,7 +1054,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan, } } - ret = (*dev->dev_ops->dma_adapter_vchan_add)(dev, dma_dev_id, vchan, event); + ret = dev->dev_ops->dma_adapter_vchan_add(dev, dma_dev_id, vchan, event); if (ret) return ret; @@ -1132,9 +1132,9 @@ rte_event_dma_adapter_vchan_del(uint8_t id, int16_t dma_dev_id, uint16_t vchan) if ((cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || (cap & RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_NEW && adapter->mode == RTE_EVENT_DMA_ADAPTER_OP_NEW)) { - if (*dev->dev_ops->dma_adapter_vchan_del == NULL) + if (dev->dev_ops->dma_adapter_vchan_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dma_adapter_vchan_del)(dev, dma_dev_id, vchan); + ret = dev->dev_ops->dma_adapter_vchan_del(dev, dma_dev_id, vchan); if (ret == 0) { edma_update_vchanq_info(adapter, dev_info, vchan, 0); if (dev_info->num_vchanq == 0) { @@ -1212,8 +1212,8 @@ edma_adapter_ctrl(uint8_t id, int start) dev_info->dev_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->dma_adapter_start)(dev, i) : - (*dev->dev_ops->dma_adapter_stop)(dev, i); + start ? dev->dev_ops->dma_adapter_start(dev, i) : + dev->dev_ops->dma_adapter_stop(dev, i); } if (use_service) @@ -1363,7 +1363,7 @@ rte_event_dma_adapter_stats_get(uint8_t id, struct rte_event_dma_adapter_stats * dev->dev_ops->dma_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->dma_adapter_stats_get)(dev, i, &dev_stats); + ret = dev->dev_ops->dma_adapter_stats_get(dev, i, &dev_stats); if (ret) continue; @@ -1404,7 +1404,7 @@ rte_event_dma_adapter_stats_reset(uint8_t id) dev->dev_ops->dma_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->dma_adapter_stats_reset)(dev, i); + dev->dev_ops->dma_adapter_stats_reset(dev, i); } memset(&adapter->dma_stats, 0, sizeof(adapter->dma_stats)); diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index 39674c4604..669788430b 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -2362,10 +2362,8 @@ rxa_ctrl(uint8_t id, int start) dev_info->dev_rx_started = start; if (dev_info->internal_event_port == 0) continue; - start ? (*dev->dev_ops->eth_rx_adapter_start)(dev, - &rte_eth_devices[i]) : - (*dev->dev_ops->eth_rx_adapter_stop)(dev, - &rte_eth_devices[i]); + start ? dev->dev_ops->eth_rx_adapter_start(dev, &rte_eth_devices[i]) : + dev->dev_ops->eth_rx_adapter_stop(dev, &rte_eth_devices[i]); } if (use_service) { @@ -2749,7 +2747,7 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_add == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_add == NULL) return -ENOTSUP; if (dev_info->rx_queue == NULL) { dev_info->rx_queue = @@ -2761,9 +2759,8 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, return -ENOMEM; } - ret = (*dev->dev_ops->eth_rx_adapter_queue_add)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_add(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); if (ret == 0) { dev_info->internal_event_port = 1; rxa_update_queue(rx_adapter, @@ -2847,11 +2844,10 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, uint16_t eth_dev_id, dev_info = &rx_adapter->eth_devices[eth_dev_id]; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_queue_del == NULL) + if (dev->dev_ops->eth_rx_adapter_queue_del == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->eth_rx_adapter_queue_del)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id); + ret = dev->dev_ops->eth_rx_adapter_queue_del(dev, &rte_eth_devices[eth_dev_id], + rx_queue_id); if (ret == 0) { rxa_update_queue(rx_adapter, &rx_adapter->eth_devices[eth_dev_id], @@ -2959,10 +2955,11 @@ rte_event_eth_rx_adapter_vector_limits_get( } if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - if (*dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) + if (dev->dev_ops->eth_rx_adapter_vector_limits_get == NULL) return -ENOTSUP; - ret = dev->dev_ops->eth_rx_adapter_vector_limits_get( - dev, &rte_eth_devices[eth_port_id], limits); + ret = dev->dev_ops->eth_rx_adapter_vector_limits_get(dev, + &rte_eth_devices[eth_port_id], + limits); } else { ret = rxa_sw_vector_limits(limits); } @@ -3051,11 +3048,10 @@ rte_event_eth_rx_adapter_stats_get(uint8_t id, } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_get == NULL) + dev->dev_ops->eth_rx_adapter_stats_get == NULL) continue; - ret = (*dev->dev_ops->eth_rx_adapter_stats_get)(dev, - &rte_eth_devices[i], - &dev_stats); + ret = dev->dev_ops->eth_rx_adapter_stats_get(dev, &rte_eth_devices[i], + &dev_stats); if (ret) continue; dev_stats_sum.rx_packets += dev_stats.rx_packets; @@ -3127,7 +3123,7 @@ rte_event_eth_rx_adapter_queue_stats_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_get != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_get)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_get(dev, &rte_eth_devices[eth_dev_id], rx_queue_id, stats); } @@ -3172,10 +3168,9 @@ rte_event_eth_rx_adapter_stats_reset(uint8_t id) } if (dev_info->internal_event_port == 0 || - dev->dev_ops->eth_rx_adapter_stats_reset == NULL) + dev->dev_ops->eth_rx_adapter_stats_reset == NULL) continue; - (*dev->dev_ops->eth_rx_adapter_stats_reset)(dev, - &rte_eth_devices[i]); + dev->dev_ops->eth_rx_adapter_stats_reset(dev, &rte_eth_devices[i]); } memset(&rx_adapter->stats, 0, sizeof(rx_adapter->stats)); @@ -3229,7 +3224,7 @@ rte_event_eth_rx_adapter_queue_stats_reset(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_stats_reset != NULL) { - return (*dev->dev_ops->eth_rx_adapter_queue_stats_reset)(dev, + return dev->dev_ops->eth_rx_adapter_queue_stats_reset(dev, &rte_eth_devices[eth_dev_id], rx_queue_id); } @@ -3396,10 +3391,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, dev = &rte_eventdevs[rx_adapter->eventdev_id]; if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) { - ret = (*dev->dev_ops->eth_rx_adapter_queue_conf_get)(dev, - &rte_eth_devices[eth_dev_id], - rx_queue_id, - queue_conf); + ret = dev->dev_ops->eth_rx_adapter_queue_conf_get(dev, + &rte_eth_devices[eth_dev_id], + rx_queue_id, queue_conf); return ret; } diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index 1078e0bcee..43cd95d765 100644 --- a/lib/eventdev/rte_eventdev.c +++ b/lib/eventdev/rte_eventdev.c @@ -100,9 +100,9 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_event_dev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns; @@ -137,10 +137,8 @@ rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_rx_adapter_caps_get ? - (*dev->dev_ops->eth_rx_adapter_caps_get)(dev, - &rte_eth_devices[eth_port_id], - caps) - : 0; + dev->dev_ops->eth_rx_adapter_caps_get(dev, &rte_eth_devices[eth_port_id], caps) + : 0; } int @@ -164,11 +162,8 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps) *caps = 0; return dev->dev_ops->timer_adapter_caps_get ? - (*dev->dev_ops->timer_adapter_caps_get)(dev, - 0, - caps, - &ops) - : 0; + dev->dev_ops->timer_adapter_caps_get(dev, 0, caps, &ops) + : 0; } int @@ -196,8 +191,7 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id, *caps = 0; return dev->dev_ops->crypto_adapter_caps_get ? - (*dev->dev_ops->crypto_adapter_caps_get) - (dev, cdev, caps) : 0; + dev->dev_ops->crypto_adapter_caps_get(dev, cdev, caps) : 0; } int @@ -224,10 +218,8 @@ rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, *caps = 0; return dev->dev_ops->eth_tx_adapter_caps_get ? - (*dev->dev_ops->eth_tx_adapter_caps_get)(dev, - eth_dev, - caps) - : 0; + dev->dev_ops->eth_tx_adapter_caps_get(dev, eth_dev, caps) + : 0; } int @@ -247,7 +239,7 @@ rte_event_dma_adapter_caps_get(uint8_t dev_id, uint8_t dma_dev_id, uint32_t *cap *caps = 0; if (dev->dev_ops->dma_adapter_caps_get) - return (*dev->dev_ops->dma_adapter_caps_get)(dev, dma_dev_id, caps); + return dev->dev_ops->dma_adapter_caps_get(dev, dma_dev_id, caps); return 0; } @@ -264,11 +256,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) if (nb_queues != 0) { queues_cfg = dev->data->queues_cfg; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); if (nb_queues > old_nb_queues) { @@ -278,11 +270,11 @@ event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues) sizeof(queues_cfg[0]) * new_qs); } } else { - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; for (i = nb_queues; i < old_nb_queues; i++) - (*dev->dev_ops->queue_release)(dev, i); + dev->dev_ops->queue_release(dev, i); } dev->data->nb_queues = nb_queues; @@ -304,14 +296,14 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) dev->data->dev_id); if (nb_ports != 0) { /* re-config */ - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; ports_cfg = dev->data->ports_cfg; for (i = nb_ports; i < old_nb_ports; i++) - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); if (nb_ports > old_nb_ports) { uint8_t new_ps = nb_ports - old_nb_ports; @@ -331,12 +323,12 @@ event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports) } } } else { - if (*dev->dev_ops->port_release == NULL) + if (dev->dev_ops->port_release == NULL) return -ENOTSUP; ports = dev->data->ports; for (i = nb_ports; i < old_nb_ports; i++) { - (*dev->dev_ops->port_release)(ports[i]); + (dev->dev_ops->port_release)(ports[i]); ports[i] = NULL; } } @@ -356,9 +348,9 @@ rte_event_dev_configure(uint8_t dev_id, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -370,7 +362,7 @@ rte_event_dev_configure(uint8_t dev_id, if (dev_conf == NULL) return -EINVAL; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); /* Check dequeue_timeout_ns value is in limit */ if (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) { @@ -524,7 +516,7 @@ rte_event_dev_configure(uint8_t dev_id, event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev); + diag = (dev->dev_ops->dev_configure)(dev); if (diag != 0) { RTE_EDEV_LOG_ERR("dev%d dev_configure = %d", dev_id, diag); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); @@ -564,10 +556,10 @@ rte_event_queue_default_conf_get(uint8_t dev_id, uint8_t queue_id, return -EINVAL; } - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; memset(queue_conf, 0, sizeof(struct rte_event_queue_conf)); - (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf); rte_eventdev_trace_queue_default_conf_get(dev_id, dev, queue_id, queue_conf); @@ -654,19 +646,19 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, return -EBUSY; } - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; if (queue_conf == NULL) { - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf); + dev->dev_ops->queue_def_conf(dev, queue_id, &def_conf); queue_conf = &def_conf; } dev->data->queues_cfg[queue_id] = *queue_conf; rte_eventdev_trace_queue_setup(dev_id, queue_id, queue_conf); - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf); } static inline int @@ -695,10 +687,10 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id, return -EINVAL; } - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; memset(port_conf, 0, sizeof(struct rte_event_port_conf)); - (*dev->dev_ops->port_def_conf)(dev, port_id, port_conf); + dev->dev_ops->port_def_conf(dev, port_id, port_conf); rte_eventdev_trace_port_default_conf_get(dev_id, dev, port_id, port_conf); @@ -770,19 +762,19 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id, return -EBUSY; } - if (*dev->dev_ops->port_setup == NULL) + if (dev->dev_ops->port_setup == NULL) return -ENOTSUP; if (port_conf == NULL) { - if (*dev->dev_ops->port_def_conf == NULL) + if (dev->dev_ops->port_def_conf == NULL) return -ENOTSUP; - (*dev->dev_ops->port_def_conf)(dev, port_id, &def_conf); + dev->dev_ops->port_def_conf(dev, port_id, &def_conf); port_conf = &def_conf; } dev->data->ports_cfg[port_id] = *port_conf; - diag = (*dev->dev_ops->port_setup)(dev, port_id, port_conf); + diag = dev->dev_ops->port_setup(dev, port_id, port_conf); /* Unlink all the queues from this port(default state after setup) */ if (!diag) @@ -812,8 +804,7 @@ rte_event_port_quiesce(uint8_t dev_id, uint8_t port_id, } if (dev->dev_ops->port_quiesce) - (*dev->dev_ops->port_quiesce)(dev, dev->data->ports[port_id], - release_cb, args); + dev->dev_ops->port_quiesce(dev, dev->data->ports[port_id], release_cb, args); } int @@ -979,10 +970,9 @@ rte_event_queue_attr_set(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id, return -ENOTSUP; } - if (*dev->dev_ops->queue_attr_set == NULL) + if (dev->dev_ops->queue_attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_attr_set)(dev, queue_id, attr_id, - attr_value); + return dev->dev_ops->queue_attr_set(dev, queue_id, attr_id, attr_value); } int @@ -1007,23 +997,23 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_link == NULL) { + if (dev->dev_ops->port_link == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_link_profile == NULL) { + if (profile_id && dev->dev_ops->port_link_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1057,11 +1047,11 @@ rte_event_port_profile_links_set(uint8_t dev_id, uint8_t port_id, const uint8_t } if (profile_id) - diag = (*dev->dev_ops->port_link_profile)(dev, dev->data->ports[port_id], queues, - priorities, nb_links, profile_id); + diag = dev->dev_ops->port_link_profile(dev, dev->data->ports[port_id], queues, + priorities, nb_links, profile_id); else - diag = (*dev->dev_ops->port_link)(dev, dev->data->ports[port_id], queues, - priorities, nb_links); + diag = dev->dev_ops->port_link(dev, dev->data->ports[port_id], queues, + priorities, nb_links); if (diag < 0) return diag; @@ -1095,23 +1085,23 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); return -EINVAL; } - if (*dev->dev_ops->port_unlink == NULL) { + if (dev->dev_ops->port_unlink == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; } - if (profile_id && *dev->dev_ops->port_unlink_profile == NULL) { + if (profile_id && dev->dev_ops->port_unlink_profile == NULL) { RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = ENOTSUP; return 0; @@ -1153,11 +1143,11 @@ rte_event_port_profile_unlink(uint8_t dev_id, uint8_t port_id, uint8_t queues[], } if (profile_id) - diag = (*dev->dev_ops->port_unlink_profile)(dev, dev->data->ports[port_id], queues, - nb_unlinks, profile_id); + diag = dev->dev_ops->port_unlink_profile(dev, dev->data->ports[port_id], queues, + nb_unlinks, profile_id); else - diag = (*dev->dev_ops->port_unlink)(dev, dev->data->ports[port_id], queues, - nb_unlinks); + diag = dev->dev_ops->port_unlink(dev, dev->data->ports[port_id], queues, + nb_unlinks); if (diag < 0) return diag; @@ -1186,11 +1176,10 @@ rte_event_port_unlinks_in_progress(uint8_t dev_id, uint8_t port_id) * This allows PMDs which handle unlink synchronously to not implement * this function at all. */ - if (*dev->dev_ops->port_unlinks_in_progress == NULL) + if (dev->dev_ops->port_unlinks_in_progress == NULL) return 0; - return (*dev->dev_ops->port_unlinks_in_progress)(dev, - dev->data->ports[port_id]); + return dev->dev_ops->port_unlinks_in_progress(dev, dev->data->ports[port_id]); } int @@ -1237,10 +1226,10 @@ rte_event_port_profile_links_get(uint8_t dev_id, uint8_t port_id, uint8_t queues RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &info); + dev->dev_ops->dev_infos_get(dev, &info); if (profile_id >= RTE_EVENT_MAX_PROFILES_PER_PORT || profile_id >= info.max_profiles_per_port) { RTE_EDEV_LOG_ERR("Invalid profile_id=%" PRIu8, profile_id); @@ -1278,13 +1267,13 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns, RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->timeout_ticks == NULL) + if (dev->dev_ops->timeout_ticks == NULL) return -ENOTSUP; if (timeout_ticks == NULL) return -EINVAL; - return (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks); + return dev->dev_ops->timeout_ticks(dev, ns, timeout_ticks); } int @@ -1313,12 +1302,12 @@ rte_event_dev_dump(uint8_t dev_id, FILE *f) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; if (f == NULL) return -EINVAL; - (*dev->dev_ops->dump)(dev, f); + dev->dev_ops->dump(dev, f); return 0; } @@ -1329,9 +1318,7 @@ xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, { struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, - NULL, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, NULL, NULL, 0); return 0; } @@ -1352,8 +1339,8 @@ rte_event_dev_xstats_names_get(uint8_t dev_id, const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_get_names != NULL) - return (*dev->dev_ops->xstats_get_names)(dev, mode, - queue_port_id, xstats_names, ids, size); + return dev->dev_ops->xstats_get_names(dev, mode, queue_port_id, + xstats_names, ids, size); return -ENOTSUP; } @@ -1369,8 +1356,8 @@ rte_event_dev_xstats_get(uint8_t dev_id, enum rte_event_dev_xstats_mode mode, /* implemented by the driver */ if (dev->dev_ops->xstats_get != NULL) - return (*dev->dev_ops->xstats_get)(dev, mode, queue_port_id, - ids, values, n); + return dev->dev_ops->xstats_get(dev, mode, queue_port_id, + ids, values, n); return -ENOTSUP; } @@ -1389,7 +1376,7 @@ rte_event_dev_xstats_by_name_get(uint8_t dev_id, const char *name, /* implemented by driver */ if (dev->dev_ops->xstats_get_by_name != NULL) - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); return -ENOTSUP; } @@ -1401,8 +1388,7 @@ int rte_event_dev_xstats_reset(uint8_t dev_id, struct rte_eventdev *dev = &rte_eventdevs[dev_id]; if (dev->dev_ops->xstats_reset != NULL) - return (*dev->dev_ops->xstats_reset)(dev, mode, queue_port_id, - ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, mode, queue_port_id, ids, nb_ids); return -ENOTSUP; } @@ -1423,7 +1409,7 @@ int rte_event_dev_selftest(uint8_t dev_id) rte_mbuf_dynfield_register(&test_seqn_dynfield_desc); if (rte_event_pmd_selftest_seqn_dynfield_offset < 0) return -ENOMEM; - return (*dev->dev_ops->dev_selftest)(); + return dev->dev_ops->dev_selftest(); } return -ENOTSUP; } @@ -1483,7 +1469,7 @@ rte_event_dev_start(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1492,7 +1478,7 @@ rte_event_dev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = (dev->dev_ops->dev_start)(dev); rte_eventdev_trace_start(dev_id, diag); if (diag == 0) dev->data->dev_started = 1; @@ -1533,7 +1519,7 @@ rte_event_dev_stop(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_RET(dev_id); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1543,7 +1529,7 @@ rte_event_dev_stop(uint8_t dev_id) } dev->data->dev_started = 0; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_eventdev_trace_stop(dev_id); event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); } @@ -1555,7 +1541,7 @@ rte_event_dev_close(uint8_t dev_id) RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_eventdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -1567,7 +1553,7 @@ rte_event_dev_close(uint8_t dev_id) event_dev_fp_ops_reset(rte_event_fp_ops + dev_id); rte_eventdev_trace_close(dev_id); - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } static inline int -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 03/14] net/bonding: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 02/14] eventdev: remover " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger ` (10 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Chas Williams, Min Hu (Connor) The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- drivers/net/bonding/rte_eth_bond_pmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 467f7fe7ea..b742f538fb 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2493,8 +2493,8 @@ bond_ethdev_member_link_status_change_monitor(void *cb_arg) polling_member_found = 1; /* Update member link status */ - (*member_ethdev->dev_ops->link_update)(member_ethdev, - internals->members[i].link_status_wait_to_complete); + member_ethdev->dev_ops->link_update(member_ethdev, + internals->members[i].link_status_wait_to_complete); /* if link status has changed since last checked then call lsc * event callback */ @@ -3275,7 +3275,7 @@ bond_ethdev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mtu_set == NULL) { + if (member_eth_dev->dev_ops->mtu_set == NULL) { rte_spinlock_unlock(&internals->lock); return -ENOTSUP; } @@ -3325,8 +3325,8 @@ bond_ethdev_mac_addr_add(struct rte_eth_dev *dev, for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mac_addr_add == NULL || - *member_eth_dev->dev_ops->mac_addr_remove == NULL) { + if (member_eth_dev->dev_ops->mac_addr_add == NULL || + member_eth_dev->dev_ops->mac_addr_remove == NULL) { ret = -ENOTSUP; goto end; } @@ -3361,7 +3361,7 @@ bond_ethdev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) for (i = 0; i < internals->member_count; i++) { member_eth_dev = &rte_eth_devices[internals->members[i].port_id]; - if (*member_eth_dev->dev_ops->mac_addr_remove == NULL) + if (member_eth_dev->dev_ops->mac_addr_remove == NULL) goto end; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 04/14] net/ixgbe: remove unnecessary dereference 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (2 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 05/14] net/ipn3ke: " Stephen Hemminger ` (9 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Bruce Richardson, Morten Brørup, Anatoly Burakov, Vladimir Medvedkin The expression *dev->dev_ops->vlan_strip_queue_set and dev->dev_ops->vlan_strip_queue are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Morten Brørup <mb@smartsharesystems.com> --- drivers/net/intel/ixgbe/rte_pmd_ixgbe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c index 15c28e7a3f..5a7d66d9b9 100644 --- a/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c @@ -291,7 +291,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) if (on > 1) return -EINVAL; - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; /* The PF has 128 queue pairs and in SRIOV configuration @@ -310,8 +310,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on) RTE_ETH_64_POOLS; for (q = 0; q < queues_per_pool; q++) - (*dev->dev_ops->vlan_strip_queue_set)(dev, - q + vf * queues_per_pool, on); + dev->dev_ops->vlan_strip_queue_set(dev, q + vf * queues_per_pool, on); return 0; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 05/14] net/ipn3ke: remove unnecessary dereference 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (3 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger ` (8 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Rosen Xu Since it is a function pointer, the expression *hw->f_mac_read and hw->f_mac_read are equivalent in C. Remove excession indentation here. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 27 +++++------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c index baae80d661..c8f06a06cb 100644 --- a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c +++ b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c @@ -229,34 +229,17 @@ ipn3ke_mtu_set(struct ipn3ke_hw *hw, uint32_t mac_num, uint32_t rx; uint32_t tmp; - if (!(*hw->f_mac_read) || !(*hw->f_mac_write)) + if (!hw->f_mac_read || !hw->f_mac_write) return; - (*hw->f_mac_read)(hw, - &tx, - txaddr, - mac_num, - eth_group_sel); + hw->f_mac_read(hw, &tx, txaddr, mac_num, eth_group_sel); - (*hw->f_mac_read)(hw, - &rx, - rxaddr, - mac_num, - eth_group_sel); + hw->f_mac_read(hw, &rx, rxaddr, mac_num, eth_group_sel); tmp = ipn3ke_mtu_cal(tx, rx); - (*hw->f_mac_write)(hw, - tmp, - txaddr, - mac_num, - eth_group_sel); - - (*hw->f_mac_write)(hw, - tmp, - rxaddr, - mac_num, - eth_group_sel); + hw->f_mac_write(hw, tmp, txaddr, mac_num, eth_group_sel); + hw->f_mac_write(hw, tmp, rxaddr, mac_num, eth_group_sel); } static void -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 06/14] net/memif: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (4 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 05/14] net/ipn3ke: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 07/14] cryptodev: " Stephen Hemminger ` (7 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Jakub Grajciar Since queue release functions are local to driver, prefer those over dereferencing the dev_ops table. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- drivers/net/memif/rte_eth_memif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index c0bf1e3bbf..f7b04c4f9e 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -70,6 +70,8 @@ static const struct rte_eth_link pmd_link = { static int memif_region_init_zc(const struct rte_memseg_list *msl, const struct rte_memseg *ms, void *arg); +static void memif_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid); +static void memif_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); const char * memif_version(void) @@ -1418,9 +1420,9 @@ memif_dev_close(struct rte_eth_dev *dev) memif_msg_enq_disconnect(pmd->cc, "Device closed", 0); for (i = 0; i < dev->data->nb_rx_queues; i++) - (*dev->dev_ops->rx_queue_release)(dev, i); + memif_rx_queue_release(dev, i); for (i = 0; i < dev->data->nb_tx_queues; i++) - (*dev->dev_ops->tx_queue_release)(dev, i); + memif_tx_queue_release(dev, i); memif_socket_remove_device(dev); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 07/14] cryptodev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (5 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger ` (6 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Akhil Goyal, Fan Zhang The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->dev_info_gets are equivalent. Cleanup and remove unnecessary parenthesis as well. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/cryptodev/rte_cryptodev.c | 72 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index a49b0662f3..8df36ea057 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -1194,9 +1194,9 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, memset(&dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if (nb_qpairs > (dev_info.max_nb_queue_pairs)) { CDEV_LOG_ERR("Invalid num queue_pairs (%u) for dev %u", @@ -1224,11 +1224,11 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; qp[i] = NULL; @@ -1256,11 +1256,11 @@ rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_reset == NULL) + if (dev->dev_ops->queue_pair_reset == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_reset(dev_id, queue_pair_id, qp_conf, socket_id); - return (*dev->dev_ops->queue_pair_reset)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->queue_pair_reset(dev, queue_pair_id, qp_conf, socket_id); } int @@ -1282,7 +1282,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; rte_spinlock_lock(&rte_cryptodev_callback_lock); @@ -1307,7 +1307,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) } rte_cryptodev_trace_configure(dev_id, config); - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -1325,7 +1325,7 @@ rte_cryptodev_start(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -1334,7 +1334,7 @@ rte_cryptodev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); /* expose selection of PMD fast-path functions */ cryptodev_fp_ops_set(rte_crypto_fp_ops + dev_id, dev); @@ -1359,7 +1359,7 @@ rte_cryptodev_stop(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -1371,7 +1371,7 @@ rte_cryptodev_stop(uint8_t dev_id) /* point fast-path functions to dummy ones */ cryptodev_fp_ops_reset(rte_crypto_fp_ops + dev_id); - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); rte_cryptodev_trace_stop(dev_id); dev->data->dev_started = 0; } @@ -1407,9 +1407,9 @@ rte_cryptodev_close(uint8_t dev_id) } } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); rte_cryptodev_trace_close(dev_id, retval); if (retval < 0) @@ -1518,12 +1518,11 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf); - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf, - socket_id); + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } struct rte_cryptodev_cb * @@ -1837,9 +1836,9 @@ rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats) dev = &rte_crypto_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); rte_cryptodev_trace_stats_get(dev_id, stats); return 0; @@ -1859,9 +1858,9 @@ rte_cryptodev_stats_reset(uint8_t dev_id) dev = &rte_crypto_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } void @@ -1878,9 +1877,9 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_cryptodev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; dev_info->device = dev->device; @@ -2017,7 +2016,7 @@ rte_cryptodev_queue_pair_event_error_query(uint8_t dev_id, uint16_t qp_id) if (qp_id >= dev->data->nb_queue_pairs) return -EINVAL; - if (*dev->dev_ops->queue_pair_event_error_query == NULL) + if (dev->dev_ops->queue_pair_event_error_query == NULL) return -ENOTSUP; return dev->dev_ops->queue_pair_event_error_query(dev, qp_id); @@ -2237,7 +2236,7 @@ rte_cryptodev_asym_session_create(uint8_t dev_id, /* Clear device session pointer.*/ memset(sess->sess_private_data, 0, session_priv_data_sz + sess->user_data_sz); - if (*dev->dev_ops->asym_session_configure == NULL) + if (dev->dev_ops->asym_session_configure == NULL) return -ENOTSUP; if (sess->sess_private_data[0] == 0) { @@ -2286,7 +2285,7 @@ rte_cryptodev_sym_session_free(uint8_t dev_id, void *_sess) return -EINVAL; } - if (*dev->dev_ops->sym_session_clear == NULL) + if (dev->dev_ops->sym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->sym_session_clear(dev, sess); @@ -2316,7 +2315,7 @@ rte_cryptodev_asym_session_free(uint8_t dev_id, void *sess) if (dev == NULL || sess == NULL) return -EINVAL; - if (*dev->dev_ops->asym_session_clear == NULL) + if (dev->dev_ops->asym_session_clear == NULL) return -ENOTSUP; dev->dev_ops->asym_session_clear(dev, sess); @@ -2348,10 +2347,10 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_session_get_size == NULL) + if (dev->dev_ops->sym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); rte_cryptodev_trace_sym_get_private_session_size(dev_id, priv_sess_size); @@ -2370,10 +2369,10 @@ rte_cryptodev_asym_get_private_session_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->asym_session_get_size == NULL) + if (dev->dev_ops->asym_session_get_size == NULL) return 0; - priv_sess_size = (*dev->dev_ops->asym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->asym_session_get_size(dev); rte_cryptodev_trace_asym_get_private_session_size(dev_id, priv_sess_size); @@ -2474,7 +2473,7 @@ rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id, dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_cpu_process == NULL || + if (dev->dev_ops->sym_cpu_process == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO)) { sym_crypto_fill_status(vec, ENOTSUP); return 0; @@ -2497,12 +2496,12 @@ rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id) dev = rte_cryptodev_pmd_get_dev(dev_id); - if (*dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || + if (dev->dev_ops->sym_get_raw_dp_ctx_size == NULL || !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)) { return -ENOTSUP; } - priv_size = (*dev->dev_ops->sym_get_raw_dp_ctx_size)(dev); + priv_size = dev->dev_ops->sym_get_raw_dp_ctx_size(dev); if (priv_size < 0) return -ENOTSUP; @@ -2530,7 +2529,7 @@ rte_cryptodev_configure_raw_dp_ctx(uint8_t dev_id, uint16_t qp_id, rte_cryptodev_trace_configure_raw_dp_ctx(dev_id, qp_id, sess_type); - return (*dev->dev_ops->sym_configure_raw_dp_ctx)(dev, qp_id, ctx, + return dev->dev_ops->sym_configure_raw_dp_ctx(dev, qp_id, ctx, sess_type, session_ctx, is_update); } @@ -2556,8 +2555,7 @@ rte_cryptodev_session_event_mdata_set(uint8_t dev_id, void *sess, rte_cryptodev_trace_session_event_mdata_set(dev_id, sess, op_type, sess_type, ev_mdata, size); - return (*dev->dev_ops->session_ev_mdata_set)(dev, sess, op_type, - sess_type, ev_mdata); + return dev->dev_ops->session_ev_mdata_set(dev, sess, op_type, sess_type, ev_mdata); skip_pmd_op: if (op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 08/14] crypto/scheduler: remove unnecessary dereference 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (6 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 07/14] cryptodev: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger ` (5 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Kai Ji The expression *dev->dev_ops->sym_session_get_size and dev->dev_ops->sym_session_get_size are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- .../scheduler/rte_cryptodev_scheduler.c | 8 +++--- drivers/crypto/scheduler/scheduler_pmd_ops.c | 25 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c index 9a21edd32a..6013f66aa5 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c @@ -741,10 +741,10 @@ rte_cryptodev_scheduler_option_set(uint8_t scheduler_id, sched_ctx = dev->data->dev_private; - if (*sched_ctx->ops.option_set == NULL) + if (sched_ctx->ops.option_set == NULL) return -ENOTSUP; - return (*sched_ctx->ops.option_set)(dev, option_type, option); + return sched_ctx->ops.option_set(dev, option_type, option); } int @@ -772,10 +772,10 @@ rte_cryptodev_scheduler_option_get(uint8_t scheduler_id, sched_ctx = dev->data->dev_private; - if (*sched_ctx->ops.option_get == NULL) + if (sched_ctx->ops.option_get == NULL) return -ENOTSUP; - return (*sched_ctx->ops.option_get)(dev, option_type, option); + return sched_ctx->ops.option_get(dev, option_type, option); } diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c index 6e43438469..105d9cf02a 100644 --- a/drivers/crypto/scheduler/scheduler_pmd_ops.c +++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c @@ -195,10 +195,9 @@ scheduler_session_size_get(struct scheduler_ctx *sched_ctx, uint32_t priv_sess_size = 0; if (session_type == RTE_CRYPTO_OP_WITH_SESSION) { - priv_sess_size = - (*dev->dev_ops->sym_session_get_size)(dev); + priv_sess_size = dev->dev_ops->sym_session_get_size(dev); } else { - priv_sess_size = (*sec_ctx->ops->session_get_size)(dev); + priv_sess_size = sec_ctx->ops->session_get_size(dev); } max_priv_sess_size = RTE_MAX(max_priv_sess_size, priv_sess_size); @@ -355,22 +354,22 @@ scheduler_pmd_start(struct rte_cryptodev *dev) return -1; } - if (*sched_ctx->ops.worker_attach == NULL) + if (sched_ctx->ops.worker_attach == NULL) return -ENOTSUP; for (i = 0; i < sched_ctx->nb_workers; i++) { uint8_t worker_dev_id = sched_ctx->workers[i].dev_id; - if ((*sched_ctx->ops.worker_attach)(dev, worker_dev_id) < 0) { + if (sched_ctx->ops.worker_attach(dev, worker_dev_id) < 0) { CR_SCHED_LOG(ERR, "Failed to attach worker"); return -ENOTSUP; } } - if (*sched_ctx->ops.scheduler_start == NULL) + if (sched_ctx->ops.scheduler_start == NULL) return -ENOTSUP; - if ((*sched_ctx->ops.scheduler_start)(dev) < 0) { + if (sched_ctx->ops.scheduler_start(dev) < 0) { CR_SCHED_LOG(ERR, "Scheduler start failed"); return -1; } @@ -406,14 +405,14 @@ scheduler_pmd_stop(struct rte_cryptodev *dev) rte_cryptodev_stop(worker_dev_id); } - if (*sched_ctx->ops.scheduler_stop) - (*sched_ctx->ops.scheduler_stop)(dev); + if (sched_ctx->ops.scheduler_stop) + sched_ctx->ops.scheduler_stop(dev); for (i = 0; i < sched_ctx->nb_workers; i++) { uint8_t worker_dev_id = sched_ctx->workers[i].dev_id; - if (*sched_ctx->ops.worker_detach) - (*sched_ctx->ops.worker_detach)(dev, worker_dev_id); + if (sched_ctx->ops.worker_detach) + sched_ctx->ops.worker_detach(dev, worker_dev_id); } } @@ -631,8 +630,8 @@ scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, return ret; } - if (*sched_ctx->ops.config_queue_pair) { - if ((*sched_ctx->ops.config_queue_pair)(dev, qp_id) < 0) { + if (sched_ctx->ops.config_queue_pair) { + if (sched_ctx->ops.config_queue_pair(dev, qp_id) < 0) { CR_SCHED_LOG(ERR, "Unable to configure queue pair"); return -1; } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 09/14] compressdev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (7 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 10/14] dmadev: " Stephen Hemminger ` (4 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Fan Zhang, Ashish Gupta The expression *dev->dev_ops->dev_info_gets and dev->dev_ops->info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/compressdev/rte_compressdev.c | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c index cf2c20a704..1fc4661ef0 100644 --- a/lib/compressdev/rte_compressdev.c +++ b/lib/compressdev/rte_compressdev.c @@ -316,9 +316,9 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, memset(&dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_infos_get)(dev, &dev_info); + dev->dev_ops->dev_infos_get(dev, &dev_info); if ((dev_info.max_nb_queue_pairs != 0) && (nb_qpairs > dev_info.max_nb_queue_pairs)) { @@ -346,11 +346,11 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev, qp = dev->data->queue_pairs; - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = nb_qpairs; i < old_nb_queues; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -397,11 +397,11 @@ rte_compressdev_queue_pairs_release(struct rte_compressdev *dev) COMPRESSDEV_LOG(DEBUG, "Free %d queues pairs on device %u", dev->data->nb_queue_pairs, dev->data->dev_id); - if (*dev->dev_ops->queue_pair_release == NULL) + if (dev->dev_ops->queue_pair_release == NULL) return -ENOTSUP; for (i = 0; i < num_qps; i++) { - ret = (*dev->dev_ops->queue_pair_release)(dev, i); + ret = dev->dev_ops->queue_pair_release(dev, i); if (ret < 0) return ret; } @@ -432,7 +432,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return -EBUSY; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; /* Setup new number of queue pairs and reconfigure device. */ @@ -445,7 +445,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config) return diag; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -463,7 +463,7 @@ rte_compressdev_start(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -472,7 +472,7 @@ rte_compressdev_start(uint8_t dev_id) return 0; } - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -493,7 +493,7 @@ rte_compressdev_stop(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return; if (dev->data->dev_started == 0) { @@ -502,7 +502,7 @@ rte_compressdev_stop(uint8_t dev_id) return; } - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; } @@ -532,9 +532,9 @@ rte_compressdev_close(uint8_t dev_id) if (retval < 0) return retval; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - retval = (*dev->dev_ops->dev_close)(dev); + retval = dev->dev_ops->dev_close(dev); if (retval < 0) return retval; @@ -571,10 +571,10 @@ rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if (*dev->dev_ops->queue_pair_setup == NULL) + if (dev->dev_ops->queue_pair_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, + return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, max_inflight_ops, socket_id); } @@ -618,9 +618,9 @@ rte_compressdev_stats_get(uint8_t dev_id, struct rte_compressdev_stats *stats) dev = &rte_comp_devices[dev_id]; memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; - (*dev->dev_ops->stats_get)(dev, stats); + dev->dev_ops->stats_get(dev, stats); return 0; } @@ -636,9 +636,9 @@ rte_compressdev_stats_reset(uint8_t dev_id) dev = &rte_comp_devices[dev_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return; - (*dev->dev_ops->stats_reset)(dev); + dev->dev_ops->stats_reset(dev); } @@ -656,9 +656,9 @@ rte_compressdev_info_get(uint8_t dev_id, struct rte_compressdev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_compressdev_info)); - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return; - (*dev->dev_ops->dev_infos_get)(dev, dev_info); + dev->dev_ops->dev_infos_get(dev, dev_info); dev_info->driver_name = dev->device->driver->name; } @@ -676,9 +676,9 @@ rte_compressdev_private_xform_create(uint8_t dev_id, if (xform == NULL || priv_xform == NULL || dev == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_create == NULL) + if (dev->dev_ops->private_xform_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->private_xform_create)(dev, xform, priv_xform); + ret = dev->dev_ops->private_xform_create(dev, xform, priv_xform); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create private_xform: err=%d", @@ -700,7 +700,7 @@ rte_compressdev_private_xform_free(uint8_t dev_id, void *priv_xform) if (dev == NULL || priv_xform == NULL) return -EINVAL; - if (*dev->dev_ops->private_xform_free == NULL) + if (dev->dev_ops->private_xform_free == NULL) return -ENOTSUP; ret = dev->dev_ops->private_xform_free(dev, priv_xform); if (ret < 0) { @@ -726,9 +726,9 @@ rte_compressdev_stream_create(uint8_t dev_id, if (xform == NULL || dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_create == NULL) + if (dev->dev_ops->stream_create == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stream_create)(dev, xform, stream); + ret = dev->dev_ops->stream_create(dev, xform, stream); if (ret < 0) { COMPRESSDEV_LOG(ERR, "dev_id %d failed to create stream: err=%d", @@ -751,7 +751,7 @@ rte_compressdev_stream_free(uint8_t dev_id, void *stream) if (dev == NULL || stream == NULL) return -EINVAL; - if (*dev->dev_ops->stream_free == NULL) + if (dev->dev_ops->stream_free == NULL) return -ENOTSUP; ret = dev->dev_ops->stream_free(dev, stream); if (ret < 0) { -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 10/14] dmadev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (8 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 11/14] rawdev: " Stephen Hemminger ` (3 subsequent siblings) 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Chengwen Feng, Morten Brørup, Bruce Richardson, Kevin Laatz The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Chengwen Feng <fengchengwen@huawei.com> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/dmadev/rte_dmadev.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 8bb7824aa1..4a075ee1c6 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -443,11 +443,10 @@ rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info) return -EINVAL; dev = &rte_dma_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; memset(dev_info, 0, sizeof(struct rte_dma_info)); - ret = (*dev->dev_ops->dev_info_get)(dev, dev_info, - sizeof(struct rte_dma_info)); + ret = dev->dev_ops->dev_info_get(dev, dev_info, sizeof(struct rte_dma_info)); if (ret != 0) return ret; @@ -510,10 +509,9 @@ rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf) return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_configure)(dev, dev_conf, - sizeof(struct rte_dma_conf)); + ret = dev->dev_ops->dev_configure(dev, dev_conf, sizeof(struct rte_dma_conf)); if (ret == 0) memcpy(&dev->data->dev_conf, dev_conf, sizeof(struct rte_dma_conf)); @@ -546,7 +544,7 @@ rte_dma_start(int16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); rte_dma_trace_start(dev_id, ret); if (ret != 0) return ret; @@ -574,7 +572,7 @@ rte_dma_stop(int16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); rte_dma_trace_stop(dev_id, ret); if (ret != 0) return ret; @@ -601,9 +599,9 @@ rte_dma_close(int16_t dev_id) return -EBUSY; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_close)(dev); + ret = dev->dev_ops->dev_close(dev); if (ret == 0) dma_release(dev); @@ -698,10 +696,9 @@ rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan, return -EINVAL; } - if (*dev->dev_ops->vchan_setup == NULL) + if (dev->dev_ops->vchan_setup == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vchan_setup)(dev, vchan, conf, - sizeof(struct rte_dma_vchan_conf)); + ret = dev->dev_ops->vchan_setup(dev, vchan, conf, sizeof(struct rte_dma_vchan_conf)); rte_dma_trace_vchan_setup(dev_id, vchan, conf, ret); return ret; @@ -723,11 +720,10 @@ rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats) return -EINVAL; } - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; memset(stats, 0, sizeof(struct rte_dma_stats)); - return (*dev->dev_ops->stats_get)(dev, vchan, stats, - sizeof(struct rte_dma_stats)); + return dev->dev_ops->stats_get(dev, vchan, stats, sizeof(struct rte_dma_stats)); } int @@ -747,9 +743,9 @@ rte_dma_stats_reset(int16_t dev_id, uint16_t vchan) return -EINVAL; } - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev, vchan); + ret = dev->dev_ops->stats_reset(dev, vchan); rte_dma_trace_stats_reset(dev_id, vchan, ret); return ret; @@ -769,9 +765,9 @@ rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status * return -EINVAL; } - if (*dev->dev_ops->vchan_status == NULL) + if (dev->dev_ops->vchan_status == NULL) return -ENOTSUP; - return (*dev->dev_ops->vchan_status)(dev, vchan, status); + return dev->dev_ops->vchan_status(dev, vchan, status); } static const char * @@ -850,7 +846,7 @@ rte_dma_dump(int16_t dev_id, FILE *f) dev->data->dev_conf.enable_silent ? "on" : "off"); if (dev->dev_ops->dev_dump != NULL) - ret = (*dev->dev_ops->dev_dump)(dev, f); + ret = dev->dev_ops->dev_dump(dev, f); rte_dma_trace_dump(dev_id, f, ret); return ret; -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 11/14] rawdev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (9 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 10/14] dmadev: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-21 9:12 ` Hemant Agrawal 2025-02-20 16:55 ` [PATCH v3 12/14] mldev: " Stephen Hemminger ` (2 subsequent siblings) 13 siblings, 1 reply; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Sachin Saxena, Hemant Agrawal The expression *dev->dev_ops->dev_configure and dev->dev_ops->dev_configure are equivalent. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/rawdev/rte_rawdev.c | 99 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c index 4f8897b639..810e95a440 100644 --- a/lib/rawdev/rte_rawdev.c +++ b/lib/rawdev/rte_rawdev.c @@ -77,9 +77,9 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info, rawdev = &rte_rawdevs[dev_id]; if (dev_info->dev_private != NULL) { - if (*rawdev->dev_ops->dev_info_get == NULL) + if (rawdev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - ret = (*rawdev->dev_ops->dev_info_get)(rawdev, + ret = rawdev->dev_ops->dev_info_get(rawdev, dev_info->dev_private, dev_private_size); } @@ -104,7 +104,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->started) { @@ -114,8 +114,7 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf, } /* Configure the device */ - diag = (*dev->dev_ops->dev_configure)(dev, dev_conf->dev_private, - dev_private_size); + diag = dev->dev_ops->dev_configure(dev, dev_conf->dev_private, dev_private_size); if (diag != 0) RTE_RDEV_ERR("dev%d dev_configure = %d", dev_id, diag); else @@ -135,10 +134,9 @@ rte_rawdev_queue_conf_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_def_conf == NULL) + if (dev->dev_ops->queue_def_conf == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_def_conf(dev, queue_id, queue_conf, queue_conf_size); } int @@ -152,10 +150,9 @@ rte_rawdev_queue_setup(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_setup == NULL) + if (dev->dev_ops->queue_setup == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf, - queue_conf_size); + return dev->dev_ops->queue_setup(dev, queue_id, queue_conf, queue_conf_size); } int @@ -166,9 +163,9 @@ rte_rawdev_queue_release(uint16_t dev_id, uint16_t queue_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_release == NULL) + if (dev->dev_ops->queue_release == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_release)(dev, queue_id); + return dev->dev_ops->queue_release(dev, queue_id); } uint16_t @@ -179,9 +176,9 @@ rte_rawdev_queue_count(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->queue_count == NULL) + if (dev->dev_ops->queue_count == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_count)(dev); + return dev->dev_ops->queue_count(dev); } int @@ -194,9 +191,9 @@ rte_rawdev_get_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_get == NULL) + if (dev->dev_ops->attr_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_get)(dev, attr_name, attr_value); + return dev->dev_ops->attr_get(dev, attr_name, attr_value); } int @@ -209,9 +206,9 @@ rte_rawdev_set_attr(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->attr_set == NULL) + if (dev->dev_ops->attr_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->attr_set)(dev, attr_name, attr_value); + return dev->dev_ops->attr_set(dev, attr_name, attr_value); } int @@ -225,9 +222,9 @@ rte_rawdev_enqueue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->enqueue_bufs == NULL) + if (dev->dev_ops->enqueue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->enqueue_bufs)(dev, buffers, count, context); + return dev->dev_ops->enqueue_bufs(dev, buffers, count, context); } int @@ -241,9 +238,9 @@ rte_rawdev_dequeue_buffers(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dequeue_bufs == NULL) + if (dev->dev_ops->dequeue_bufs == NULL) return -ENOTSUP; - return (*dev->dev_ops->dequeue_bufs)(dev, buffers, count, context); + return dev->dev_ops->dequeue_bufs(dev, buffers, count, context); } int @@ -254,9 +251,9 @@ rte_rawdev_dump(uint16_t dev_id, FILE *f) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dump == NULL) + if (dev->dev_ops->dump == NULL) return -ENOTSUP; - return (*dev->dev_ops->dump)(dev, f); + return dev->dev_ops->dump(dev, f); } static int @@ -264,9 +261,9 @@ xstats_get_count(uint16_t dev_id) { struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + return dev->dev_ops->xstats_get_names(dev, NULL, 0); } int @@ -287,9 +284,9 @@ rte_rawdev_xstats_names_get(uint16_t dev_id, dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get_names == NULL) + if (dev->dev_ops->xstats_get_names == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_names)(dev, xstats_names, size); + return dev->dev_ops->xstats_get_names(dev, xstats_names, size); } /* retrieve rawdev extended statistics */ @@ -302,9 +299,9 @@ rte_rawdev_xstats_get(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV); const struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_get == NULL) + if (dev->dev_ops->xstats_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get)(dev, ids, values, n); + return dev->dev_ops->xstats_get(dev, ids, values, n); } uint64_t @@ -322,9 +319,9 @@ rte_rawdev_xstats_by_name_get(uint16_t dev_id, id = &temp; /* driver never gets a NULL value */ /* implemented by driver */ - if (*dev->dev_ops->xstats_get_by_name == NULL) + if (dev->dev_ops->xstats_get_by_name == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_get_by_name)(dev, name, id); + return dev->dev_ops->xstats_get_by_name(dev, name, id); } int @@ -334,9 +331,9 @@ rte_rawdev_xstats_reset(uint16_t dev_id, RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->xstats_reset == NULL) + if (dev->dev_ops->xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->xstats_reset(dev, ids, nb_ids); } int @@ -345,9 +342,9 @@ rte_rawdev_firmware_status_get(uint16_t dev_id, rte_rawdev_obj_t status_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_status_get == NULL) + if (dev->dev_ops->firmware_status_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_status_get)(dev, status_info); + return dev->dev_ops->firmware_status_get(dev, status_info); } int @@ -356,9 +353,9 @@ rte_rawdev_firmware_version_get(uint16_t dev_id, rte_rawdev_obj_t version_info) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_version_get == NULL) + if (dev->dev_ops->firmware_version_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_version_get)(dev, version_info); + return dev->dev_ops->firmware_version_get(dev, version_info); } int @@ -370,9 +367,9 @@ rte_rawdev_firmware_load(uint16_t dev_id, rte_rawdev_obj_t firmware_image) if (!firmware_image) return -EINVAL; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_load)(dev, firmware_image); + return dev->dev_ops->firmware_load(dev, firmware_image); } int @@ -381,9 +378,9 @@ rte_rawdev_firmware_unload(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->firmware_load == NULL) + if (dev->dev_ops->firmware_load == NULL) return -ENOTSUP; - return (*dev->dev_ops->firmware_unload)(dev); + return dev->dev_ops->firmware_unload(dev); } int @@ -392,9 +389,9 @@ rte_rawdev_selftest(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); struct rte_rawdev *dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev_id); + return dev->dev_ops->dev_selftest(dev_id); } int @@ -416,7 +413,7 @@ rte_rawdev_start(uint16_t dev_id) if (dev->dev_ops->dev_start == NULL) goto mark_started; - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag != 0) return diag; @@ -444,7 +441,7 @@ rte_rawdev_stop(uint16_t dev_id) if (dev->dev_ops->dev_stop == NULL) goto mark_stopped; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); mark_stopped: dev->started = 0; @@ -458,7 +455,7 @@ rte_rawdev_close(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ if (dev->started == 1) { @@ -467,7 +464,7 @@ rte_rawdev_close(uint16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -478,10 +475,10 @@ rte_rawdev_reset(uint16_t dev_id) RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_rawdevs[dev_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; /* Reset is not dependent on state of the device */ - return (*dev->dev_ops->dev_reset)(dev); + return dev->dev_ops->dev_reset(dev); } static inline uint8_t -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* RE: [PATCH v3 11/14] rawdev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 11/14] rawdev: " Stephen Hemminger @ 2025-02-21 9:12 ` Hemant Agrawal 0 siblings, 0 replies; 52+ messages in thread From: Hemant Agrawal @ 2025-02-21 9:12 UTC (permalink / raw) To: Stephen Hemminger, dev Cc: Morten Brørup, Bruce Richardson, Sachin Saxena Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 12/14] mldev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (10 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 11/14] rawdev: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 13/14] regexdev: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 14/14] security: remove unnecessary dereference Stephen Hemminger 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Srikanth Yalavarthi The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/mldev/rte_mldev.c | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c index 37d71aebc9..e0e5b8d9e8 100644 --- a/lib/mldev/rte_mldev.c +++ b/lib/mldev/rte_mldev.c @@ -237,7 +237,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; if (dev_info == NULL) { @@ -246,7 +246,7 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info) } memset(dev_info, 0, sizeof(struct rte_ml_dev_info)); - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } int @@ -262,7 +262,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -285,7 +285,7 @@ rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config) return -EINVAL; } - return (*dev->dev_ops->dev_configure)(dev, config); + return dev->dev_ops->dev_configure(dev, config); } int @@ -299,7 +299,7 @@ rte_ml_dev_close(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; /* Device must be stopped before it can be closed */ @@ -308,7 +308,7 @@ rte_ml_dev_close(int16_t dev_id) return -EBUSY; } - return (*dev->dev_ops->dev_close)(dev); + return dev->dev_ops->dev_close(dev); } int @@ -323,7 +323,7 @@ rte_ml_dev_start(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_started != 0) { @@ -331,7 +331,7 @@ rte_ml_dev_start(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; @@ -350,7 +350,7 @@ rte_ml_dev_stop(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -358,7 +358,7 @@ rte_ml_dev_stop(int16_t dev_id) return -EBUSY; } - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; @@ -392,7 +392,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_queue_pair_setup == NULL) + if (dev->dev_ops->dev_queue_pair_setup == NULL) return -ENOTSUP; if (queue_pair_id >= dev->data->nb_queue_pairs) { @@ -410,7 +410,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id, return -EBUSY; } - return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id, qp_conf, socket_id); + return dev->dev_ops->dev_queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id); } int @@ -424,7 +424,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_get == NULL) + if (dev->dev_ops->dev_stats_get == NULL) return -ENOTSUP; if (stats == NULL) { @@ -433,7 +433,7 @@ rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats) } memset(stats, 0, sizeof(struct rte_ml_dev_stats)); - return (*dev->dev_ops->dev_stats_get)(dev, stats); + return dev->dev_ops->dev_stats_get(dev, stats); } void @@ -447,10 +447,10 @@ rte_ml_dev_stats_reset(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_stats_reset == NULL) + if (dev->dev_ops->dev_stats_reset == NULL) return; - (*dev->dev_ops->dev_stats_reset)(dev); + dev->dev_ops->dev_stats_reset(dev); } int @@ -465,10 +465,10 @@ rte_ml_dev_xstats_names_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, in } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_names_get)(dev, mode, model_id, xstats_map, size); + return dev->dev_ops->dev_xstats_names_get(dev, mode, model_id, xstats_map, size); } int @@ -482,7 +482,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { @@ -495,7 +495,7 @@ rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t *stat_i return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, stat_id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, stat_id, value); } int @@ -510,7 +510,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (stat_ids == NULL) { @@ -523,7 +523,7 @@ rte_ml_dev_xstats_get(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_t return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, mode, model_id, stat_ids, values, nb_ids); + return dev->dev_ops->dev_xstats_get(dev, mode, model_id, stat_ids, values, nb_ids); } int @@ -538,10 +538,10 @@ rte_ml_dev_xstats_reset(int16_t dev_id, enum rte_ml_dev_xstats_mode mode, int32_ } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_xstats_reset)(dev, mode, model_id, stat_ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, mode, model_id, stat_ids, nb_ids); } int @@ -555,7 +555,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (fd == NULL) { @@ -563,7 +563,7 @@ rte_ml_dev_dump(int16_t dev_id, FILE *fd) return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, fd); + return dev->dev_ops->dev_dump(dev, fd); } int @@ -577,10 +577,10 @@ rte_ml_dev_selftest(int16_t dev_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -594,7 +594,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_load == NULL) + if (dev->dev_ops->model_load == NULL) return -ENOTSUP; if (params == NULL) { @@ -607,7 +607,7 @@ rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, uint16_t * return -EINVAL; } - return (*dev->dev_ops->model_load)(dev, params, model_id); + return dev->dev_ops->model_load(dev, params, model_id); } int @@ -621,10 +621,10 @@ rte_ml_model_unload(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_unload == NULL) + if (dev->dev_ops->model_unload == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_unload)(dev, model_id); + return dev->dev_ops->model_unload(dev, model_id); } int @@ -638,10 +638,10 @@ rte_ml_model_start(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_start == NULL) + if (dev->dev_ops->model_start == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_start)(dev, model_id); + return dev->dev_ops->model_start(dev, model_id); } int @@ -655,10 +655,10 @@ rte_ml_model_stop(int16_t dev_id, uint16_t model_id) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_stop == NULL) + if (dev->dev_ops->model_stop == NULL) return -ENOTSUP; - return (*dev->dev_ops->model_stop)(dev, model_id); + return dev->dev_ops->model_stop(dev, model_id); } int @@ -672,7 +672,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_info_get == NULL) + if (dev->dev_ops->model_info_get == NULL) return -ENOTSUP; if (model_info == NULL) { @@ -681,7 +681,7 @@ rte_ml_model_info_get(int16_t dev_id, uint16_t model_id, struct rte_ml_model_inf return -EINVAL; } - return (*dev->dev_ops->model_info_get)(dev, model_id, model_info); + return dev->dev_ops->model_info_get(dev, model_id, model_info); } int @@ -695,7 +695,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->model_params_update == NULL) + if (dev->dev_ops->model_params_update == NULL) return -ENOTSUP; if (buffer == NULL) { @@ -703,7 +703,7 @@ rte_ml_model_params_update(int16_t dev_id, uint16_t model_id, void *buffer) return -EINVAL; } - return (*dev->dev_ops->model_params_update)(dev, model_id, buffer); + return dev->dev_ops->model_params_update(dev, model_id, buffer); } int @@ -718,7 +718,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_quantize == NULL) + if (dev->dev_ops->io_quantize == NULL) return -ENOTSUP; if (dbuffer == NULL) { @@ -731,7 +731,7 @@ rte_ml_io_quantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg **d return -EINVAL; } - return (*dev->dev_ops->io_quantize)(dev, model_id, dbuffer, qbuffer); + return dev->dev_ops->io_quantize(dev, model_id, dbuffer, qbuffer); } int @@ -746,7 +746,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * } dev = rte_ml_dev_pmd_get_dev(dev_id); - if (*dev->dev_ops->io_dequantize == NULL) + if (dev->dev_ops->io_dequantize == NULL) return -ENOTSUP; if (qbuffer == NULL) { @@ -759,7 +759,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg * return -EINVAL; } - return (*dev->dev_ops->io_dequantize)(dev, model_id, qbuffer, dbuffer); + return dev->dev_ops->io_dequantize(dev, model_id, qbuffer, dbuffer); } /** Initialise rte_ml_op mempool element */ -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 13/14] regexdev: remove unnecessary deref of function pointers 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (11 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 12/14] mldev: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 14/14] security: remove unnecessary dereference Stephen Hemminger 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Ori Kam The expression *dev->dev_ops->dev_info_get and dev->dev_ops->dev_info_get are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/regexdev/rte_regexdev.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c index b2c4b49d97..431ed911a1 100644 --- a/lib/regexdev/rte_regexdev.c +++ b/lib/regexdev/rte_regexdev.c @@ -189,9 +189,9 @@ regexdev_info_get(uint8_t dev_id, struct rte_regexdev_info *dev_info) if (dev_info == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_info_get == NULL) + if (dev->dev_ops->dev_info_get == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_info_get)(dev, dev_info); + return dev->dev_ops->dev_info_get(dev, dev_info); } @@ -212,7 +212,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) if (cfg == NULL) return -EINVAL; dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -289,7 +289,7 @@ rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg) dev_info.max_rules_per_group); return -EINVAL; } - ret = (*dev->dev_ops->dev_configure)(dev, cfg); + ret = dev->dev_ops->dev_configure(dev, cfg); if (ret == 0) dev->data->dev_conf = *cfg; return ret; @@ -303,7 +303,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_qp_setup == NULL) + if (dev->dev_ops->dev_qp_setup == NULL) return -ENOTSUP; if (dev->data->dev_started) { RTE_REGEXDEV_LOG_LINE @@ -324,7 +324,7 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, dev_id); return -EBUSY; } - return (*dev->dev_ops->dev_qp_setup)(dev, queue_pair_id, qp_conf); + return dev->dev_ops->dev_qp_setup(dev, queue_pair_id, qp_conf); } int @@ -335,9 +335,9 @@ rte_regexdev_start(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->dev_start)(dev); + ret = dev->dev_ops->dev_start(dev); if (ret == 0) dev->data->dev_started = 1; return ret; @@ -350,9 +350,9 @@ rte_regexdev_stop(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_stop)(dev); + dev->dev_ops->dev_stop(dev); dev->data->dev_started = 0; return 0; } @@ -364,9 +364,9 @@ rte_regexdev_close(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - (*dev->dev_ops->dev_close)(dev); + dev->dev_ops->dev_close(dev); dev->data->dev_started = 0; dev->state = RTE_REGEXDEV_UNUSED; return 0; @@ -380,14 +380,14 @@ rte_regexdev_attr_get(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_get == NULL) + if (dev->dev_ops->dev_attr_get == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_get)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_get(dev, attr_id, attr_value); } int @@ -398,14 +398,14 @@ rte_regexdev_attr_set(uint8_t dev_id, enum rte_regexdev_attr_id attr_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_attr_set == NULL) + if (dev->dev_ops->dev_attr_set == NULL) return -ENOTSUP; if (attr_value == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d attribute value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_attr_set)(dev, attr_id, attr_value); + return dev->dev_ops->dev_attr_set(dev, attr_id, attr_value); } int @@ -417,14 +417,14 @@ rte_regexdev_rule_db_update(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_update == NULL) + if (dev->dev_ops->dev_rule_db_update == NULL) return -ENOTSUP; if (rules == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_rule_db_update)(dev, rules, nb_rules); + return dev->dev_ops->dev_rule_db_update(dev, rules, nb_rules); } int @@ -434,9 +434,9 @@ rte_regexdev_rule_db_compile_activate(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_rule_db_compile_activate == NULL) + if (dev->dev_ops->dev_rule_db_compile_activate == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_rule_db_compile_activate)(dev); + return dev->dev_ops->dev_rule_db_compile_activate(dev); } int @@ -447,14 +447,14 @@ rte_regexdev_rule_db_import(uint8_t dev_id, const char *rule_db, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_import == NULL) + if (dev->dev_ops->dev_db_import == NULL) return -ENOTSUP; if (rule_db == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d rules can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_db_import)(dev, rule_db, rule_db_len); + return dev->dev_ops->dev_db_import(dev, rule_db, rule_db_len); } int @@ -464,9 +464,9 @@ rte_regexdev_rule_db_export(uint8_t dev_id, char *rule_db) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_db_export == NULL) + if (dev->dev_ops->dev_db_export == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_db_export)(dev, rule_db); + return dev->dev_ops->dev_db_export(dev, rule_db); } int @@ -477,14 +477,14 @@ rte_regexdev_xstats_names_get(uint8_t dev_id, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_names_get == NULL) + if (dev->dev_ops->dev_xstats_names_get == NULL) return -ENOTSUP; if (xstats_map == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d xstats map can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_names_get)(dev, xstats_map); + return dev->dev_ops->dev_xstats_names_get(dev, xstats_map); } int @@ -495,7 +495,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_get == NULL) + if (dev->dev_ops->dev_xstats_get == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); @@ -505,7 +505,7 @@ rte_regexdev_xstats_get(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d values can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_get)(dev, ids, values, n); + return dev->dev_ops->dev_xstats_get(dev, ids, values, n); } int @@ -516,7 +516,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_by_name_get == NULL) + if (dev->dev_ops->dev_xstats_by_name_get == NULL) return -ENOTSUP; if (name == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d name can't be NULL", dev_id); @@ -530,7 +530,7 @@ rte_regexdev_xstats_by_name_get(uint8_t dev_id, const char *name, RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d value can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, id, value); + return dev->dev_ops->dev_xstats_by_name_get(dev, name, id, value); } int @@ -541,13 +541,13 @@ rte_regexdev_xstats_reset(uint8_t dev_id, const uint16_t *ids, RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_xstats_reset == NULL) + if (dev->dev_ops->dev_xstats_reset == NULL) return -ENOTSUP; if (ids == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d ids can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_xstats_reset)(dev, ids, nb_ids); + return dev->dev_ops->dev_xstats_reset(dev, ids, nb_ids); } int @@ -557,9 +557,9 @@ rte_regexdev_selftest(uint8_t dev_id) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_selftest == NULL) + if (dev->dev_ops->dev_selftest == NULL) return -ENOTSUP; - return (*dev->dev_ops->dev_selftest)(dev); + return dev->dev_ops->dev_selftest(dev); } int @@ -569,11 +569,11 @@ rte_regexdev_dump(uint8_t dev_id, FILE *f) RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, -EINVAL); dev = &rte_regex_devices[dev_id]; - if (*dev->dev_ops->dev_dump == NULL) + if (dev->dev_ops->dev_dump == NULL) return -ENOTSUP; if (f == NULL) { RTE_REGEXDEV_LOG_LINE(ERR, "Dev %d file can't be NULL", dev_id); return -EINVAL; } - return (*dev->dev_ops->dev_dump)(dev, f); + return dev->dev_ops->dev_dump(dev, f); } -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 14/14] security: remove unnecessary dereference 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger ` (12 preceding siblings ...) 2025-02-20 16:55 ` [PATCH v3 13/14] regexdev: " Stephen Hemminger @ 2025-02-20 16:55 ` Stephen Hemminger 13 siblings, 0 replies; 52+ messages in thread From: Stephen Hemminger @ 2025-02-20 16:55 UTC (permalink / raw) To: dev Cc: Stephen Hemminger, Morten Brørup, Bruce Richardson, Akhil Goyal, Anoob Joseph The expressions *instance->ops->set_pkt_metadata and instance->ops->set_pkt_metadata are equivalent in C. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Morten Brørup <mb@smartsharesystems.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- lib/security/rte_security.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c index e5c862f5f5..1e980343fe 100644 --- a/lib/security/rte_security.c +++ b/lib/security/rte_security.c @@ -258,10 +258,9 @@ __rte_security_set_pkt_metadata(void *ctx, void *sess, struct rte_mbuf *m, void RTE_PTR_OR_ERR_RET(instance, -EINVAL); RTE_PTR_OR_ERR_RET(instance->ops, -EINVAL); #endif - if (*instance->ops->set_pkt_metadata == NULL) + if (instance->ops->set_pkt_metadata == NULL) return -ENOTSUP; - return instance->ops->set_pkt_metadata(instance->device, - sess, m, params); + return instance->ops->set_pkt_metadata(instance->device, sess, m, params); } const struct rte_security_capability * -- 2.47.2 ^ permalink raw reply [flat|nested] 52+ messages in thread
end of thread, other threads:[~2025-02-21 9:12 UTC | newest] Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-02-17 18:53 [RFC 00/11] Fix dev_ops dereferences Stephen Hemminger 2025-02-17 18:54 ` [RFC 01/11] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-17 18:54 ` [RFC 02/11] eventdev: remover " Stephen Hemminger 2025-02-17 18:54 ` [RFC 03/11] net/ixgbe: remove unnecessary dereference Stephen Hemminger 2025-02-17 18:54 ` [RFC 04/11] net/memif: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-17 18:54 ` [RFC 05/11] cryptodev: " Stephen Hemminger 2025-02-17 18:54 ` [RFC 06/11] crypto/scheduler: remove unnecessary dereference Stephen Hemminger 2025-02-17 18:54 ` [RFC 07/11] compressdev: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-17 18:54 ` [RFC 08/11] dmadev: " Stephen Hemminger 2025-02-17 18:54 ` [RFC 09/11] rawdev: " Stephen Hemminger 2025-02-17 18:54 ` [RFC 10/11] mldev: " Stephen Hemminger 2025-02-17 18:54 ` [RFC 11/11] regexdev: " Stephen Hemminger 2025-02-17 20:24 ` [RFC 00/11] Fix dev_ops dereferences Morten Brørup 2025-02-18 3:01 ` Stephen Hemminger 2025-02-18 8:47 ` Bruce Richardson 2025-02-20 2:32 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-20 7:09 ` Andrew Rybchenko 2025-02-20 16:09 ` Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 02/14] eventdev: remover " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger 2025-02-20 9:17 ` Bruce Richardson 2025-02-20 2:32 ` [PATCH v2 05/14] net/ipn3ke: " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 07/14] cryptodev: " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 10/14] dmadev: " Stephen Hemminger 2025-02-20 3:00 ` fengchengwen 2025-02-20 2:32 ` [PATCH v2 11/14] rawdev: " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 12/14] mldev: " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 13/14] regexdev: " Stephen Hemminger 2025-02-20 2:32 ` [PATCH v2 14/14] security: remove unnecessary dereference Stephen Hemminger 2025-02-20 8:05 ` [PATCH v2 00/14] Remove unnecessary function pointer deref Morten Brørup 2025-02-20 9:17 ` Bruce Richardson 2025-02-20 16:55 ` [PATCH v3 " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 02/14] eventdev: remover " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 03/14] net/bonding: remove unnecessary deref of " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 04/14] net/ixgbe: remove unnecessary dereference Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 05/14] net/ipn3ke: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 06/14] net/memif: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 07/14] cryptodev: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 08/14] crypto/scheduler: remove unnecessary dereference Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 09/14] compressdev: remove unnecessary deref of function pointers Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 10/14] dmadev: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 11/14] rawdev: " Stephen Hemminger 2025-02-21 9:12 ` Hemant Agrawal 2025-02-20 16:55 ` [PATCH v3 12/14] mldev: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 13/14] regexdev: " Stephen Hemminger 2025-02-20 16:55 ` [PATCH v3 14/14] security: remove unnecessary dereference Stephen Hemminger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).