ethdev: remove useless parameter in callback process
The pointer to the user parameter of the callback registration is automatically pass to the callback function. There is no point to allow changing this user parameter by a caller. That's why this parameter is always set to NULL by PMDs and set only in ethdev layer before calling the callback function. The history is that the user parameter was initially used by the callback implementation to pass some information between the application and the driver:c1ceaf3ad0
("ethdev: add an argument to internal callback function") Then a new parameter has been added to leave the user parameter to its standard usage of context given at registration:d6af1a13d7
("ethdev: add return values to callback process API") The NULL parameter in the internal callback processing function is now removed. It makes clear that the callback parameter is user managed and opaque from a DPDK point of view. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
parent
1e3a958f40
commit
cebe3d7b3d
@ -581,8 +581,8 @@ thread safety all these operations should be called from the same thread.
|
||||
For example when PF is reset, the PF sends a message to notify VFs of
|
||||
this event and also trigger an interrupt to VFs. Then in the interrupt
|
||||
service routine the VFs detects this notification message and calls
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL,
|
||||
NULL). This means that a PF reset triggers an RTE_ETH_EVENT_INTR_RESET
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL).
|
||||
This means that a PF reset triggers an RTE_ETH_EVENT_INTR_RESET
|
||||
event within VFs. The function _rte_eth_dev_callback_process() will
|
||||
call the registered callback function. The callback function can trigger
|
||||
the application to handle all operations the VF reset requires including
|
||||
|
@ -149,7 +149,7 @@ avf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
|
||||
case VIRTCHNL_EVENT_RESET_IMPENDING:
|
||||
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
break;
|
||||
case VIRTCHNL_EVENT_LINK_CHANGE:
|
||||
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
|
||||
@ -157,7 +157,7 @@ avf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
|
||||
vf->link_speed = pf_msg->event_data.link_event.link_speed;
|
||||
avf_dev_link_update(dev, 0);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
break;
|
||||
case VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
|
||||
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event");
|
||||
|
@ -57,7 +57,7 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)
|
||||
ret_param.msg = msg;
|
||||
|
||||
_rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
|
||||
NULL, &ret_param);
|
||||
&ret_param);
|
||||
|
||||
/* Default to approve */
|
||||
if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
|
||||
|
@ -2592,7 +2592,7 @@ bond_ethdev_delayed_lsc_propagation(void *arg)
|
||||
return;
|
||||
|
||||
_rte_eth_dev_callback_process((struct rte_eth_dev *)arg,
|
||||
RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
|
||||
RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
}
|
||||
|
||||
int
|
||||
@ -2700,7 +2700,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
|
||||
else
|
||||
_rte_eth_dev_callback_process(bonded_eth_dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
|
||||
} else {
|
||||
if (internals->link_down_delay_ms > 0)
|
||||
@ -2710,7 +2710,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
|
||||
else
|
||||
_rte_eth_dev_callback_process(bonded_eth_dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
@ -662,7 +662,7 @@ dpaa2_interrupt_handler(void *param)
|
||||
dpaa2_dev_link_update(dev, 0);
|
||||
/* calling all the apps registered for link status event */
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
out:
|
||||
ret = dpni_clear_irq_status(dpni, CMD_PRI_LOW, priv->token,
|
||||
|
@ -1652,7 +1652,7 @@ eth_em_interrupt_handler(void *param)
|
||||
|
||||
eth_em_interrupt_get_status(dev);
|
||||
eth_em_interrupt_action(dev, dev->intr_handle);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -2892,7 +2892,7 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev,
|
||||
E1000_WRITE_REG(hw, E1000_RCTL, rctl);
|
||||
E1000_WRITE_FLUSH(hw);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -2952,7 +2952,7 @@ void igbvf_mbx_process(struct rte_eth_dev *dev)
|
||||
/* PF reset VF event */
|
||||
if (in_msg == E1000_PF_CONTROL_MSG)
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -434,7 +434,7 @@ enic_intr_handler(void *arg)
|
||||
vnic_intr_return_all_credits(&enic->intr);
|
||||
|
||||
enic_link_update(enic);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
enic_log_q_error(enic);
|
||||
}
|
||||
|
||||
|
@ -480,7 +480,7 @@ failsafe_eth_lsc_event_callback(uint16_t port_id __rte_unused,
|
||||
if (ret)
|
||||
return _rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
@ -2598,7 +2598,7 @@ fm10k_dev_interrupt_handler_pf(void *param)
|
||||
dev_info->sm_down = 0;
|
||||
_rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2611,7 +2611,7 @@ fm10k_dev_interrupt_handler_pf(void *param)
|
||||
PMD_INIT_LOG(INFO, "INT: Switch is down");
|
||||
dev_info->sm_down = 1;
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
/* Handle SRAM error */
|
||||
@ -2679,7 +2679,7 @@ fm10k_dev_interrupt_handler_vf(void *param)
|
||||
/* Setting reset flag */
|
||||
dev_info->sm_down = 1;
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
if (dev_info->sm_down == 1 &&
|
||||
@ -2708,7 +2708,7 @@ fm10k_dev_interrupt_handler_vf(void *param)
|
||||
|
||||
dev_info->sm_down = 0;
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
/* Re-enable interrupt from device side */
|
||||
|
@ -6120,7 +6120,7 @@ i40e_dev_handle_aq_msg(struct rte_eth_dev *dev)
|
||||
ret = i40e_dev_link_update(dev, 0);
|
||||
if (!ret)
|
||||
_rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
|
||||
RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
break;
|
||||
default:
|
||||
PMD_DRV_LOG(DEBUG, "Request %u is not supported yet",
|
||||
|
@ -1279,7 +1279,7 @@ i40evf_handle_pf_event(struct rte_eth_dev *dev, uint8_t *msg,
|
||||
case VIRTCHNL_EVENT_RESET_IMPENDING:
|
||||
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
break;
|
||||
case VIRTCHNL_EVENT_LINK_CHANGE:
|
||||
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
|
||||
|
@ -1264,8 +1264,7 @@ i40e_pf_host_handle_vf_msg(struct rte_eth_dev *dev,
|
||||
* do nothing and send not_supported to VF. As PF must send a response
|
||||
* to VF and ACK/NACK is not defined.
|
||||
*/
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
|
||||
NULL, &ret_param);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX, &ret_param);
|
||||
if (ret_param.retval != RTE_PMD_I40E_MB_EVENT_PROCEED) {
|
||||
PMD_DRV_LOG(WARNING, "VF to PF message(%d) is not permitted!",
|
||||
opcode);
|
||||
|
@ -4361,12 +4361,12 @@ ixgbe_dev_interrupt_delayed_handler(void *param)
|
||||
intr->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
|
||||
ixgbe_dev_link_status_print(dev);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
if (intr->flags & IXGBE_FLAG_MACSEC) {
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_MACSEC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
intr->flags &= ~IXGBE_FLAG_MACSEC;
|
||||
}
|
||||
|
||||
@ -8149,7 +8149,7 @@ static void ixgbevf_mbx_process(struct rte_eth_dev *dev)
|
||||
/* PF reset VF event */
|
||||
if (in_msg == IXGBE_PF_CONTROL_MSG)
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -739,7 +739,7 @@ ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
|
||||
|
||||
/* notify application about VF reset */
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
|
||||
NULL, &ret_param);
|
||||
&ret_param);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -751,7 +751,7 @@ ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
|
||||
* if ret_param.retval > 1, do nothing and send NAK to VF
|
||||
*/
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
|
||||
NULL, &ret_param);
|
||||
&ret_param);
|
||||
|
||||
retval = ret_param.retval;
|
||||
|
||||
|
@ -154,7 +154,7 @@ mlx4_link_status_alarm(struct priv *priv)
|
||||
if (intr_conf->lsc && !mlx4_link_status_check(priv))
|
||||
_rte_eth_dev_callback_process(priv->dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -236,7 +236,7 @@ mlx4_interrupt_handler(struct priv *priv)
|
||||
for (i = 0; i != RTE_DIM(caught); ++i)
|
||||
if (caught[i])
|
||||
_rte_eth_dev_callback_process(priv->dev, type[i],
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1193,8 +1193,7 @@ mlx5_dev_link_status_handler(void *arg)
|
||||
ret = priv_link_status_update(priv);
|
||||
priv_unlock(priv);
|
||||
if (!ret)
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL,
|
||||
NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1216,11 +1215,9 @@ mlx5_dev_interrupt_handler(void *cb_arg)
|
||||
events = priv_dev_status_handler(priv);
|
||||
priv_unlock(priv);
|
||||
if (events & (1 << RTE_ETH_EVENT_INTR_LSC))
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL,
|
||||
NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
if (events & (1 << RTE_ETH_EVENT_INTR_RMV))
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RMV, NULL,
|
||||
NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RMV, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1472,7 +1472,7 @@ nfp_net_dev_interrupt_delayed_handler(void *param)
|
||||
struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
|
||||
|
||||
nfp_net_link_update(dev, 0);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
|
||||
nfp_net_dev_link_status_print(dev);
|
||||
|
||||
|
@ -91,7 +91,7 @@ sfc_intr_line_handler(void *cb_arg)
|
||||
"UP" : "DOWN");
|
||||
_rte_eth_dev_callback_process(sa->eth_dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@ -133,7 +133,7 @@ sfc_intr_message_handler(void *cb_arg)
|
||||
sfc_info(sa, "link status change event");
|
||||
_rte_eth_dev_callback_process(sa->eth_dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -106,7 +106,7 @@ nicvf_interrupt(void *arg)
|
||||
if (dev->data->dev_conf.intr_conf.lsc)
|
||||
nicvf_set_eth_link_status(nic, &dev->data->dev_link);
|
||||
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
rte_eal_alarm_set(NICVF_INTR_POLL_INTERVAL_MS * 1000,
|
||||
|
@ -609,8 +609,7 @@ new_device(int vid)
|
||||
|
||||
RTE_LOG(INFO, PMD, "New connection established\n");
|
||||
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -664,8 +663,7 @@ destroy_device(int vid)
|
||||
|
||||
RTE_LOG(INFO, PMD, "Connection closed\n");
|
||||
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -694,8 +692,7 @@ vring_state_changed(int vid, uint16_t vring, int enable)
|
||||
RTE_LOG(INFO, PMD, "vring%u is %s\n",
|
||||
vring, enable ? "enabled" : "disabled");
|
||||
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE,
|
||||
NULL, NULL);
|
||||
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1240,7 +1240,7 @@ virtio_interrupt_handler(void *param)
|
||||
if (virtio_dev_link_update(dev, 0) == 0)
|
||||
_rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1306,7 +1306,7 @@ vmxnet3_process_events(struct rte_eth_dev *dev)
|
||||
if (vmxnet3_dev_link_update(dev, 0) == 0)
|
||||
_rte_eth_dev_callback_process(dev,
|
||||
RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
/* Check if there is an error on xmit/recv queues */
|
||||
|
@ -2935,7 +2935,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
|
||||
|
||||
int
|
||||
_rte_eth_dev_callback_process(struct rte_eth_dev *dev,
|
||||
enum rte_eth_event_type event, void *cb_arg, void *ret_param)
|
||||
enum rte_eth_event_type event, void *ret_param)
|
||||
{
|
||||
struct rte_eth_dev_callback *cb_lst;
|
||||
struct rte_eth_dev_callback dev_cb;
|
||||
@ -2947,8 +2947,6 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
|
||||
continue;
|
||||
dev_cb = *cb_lst;
|
||||
cb_lst->active = 1;
|
||||
if (cb_arg != NULL)
|
||||
dev_cb.cb_arg = cb_arg;
|
||||
if (ret_param != NULL)
|
||||
dev_cb.ret_param = ret_param;
|
||||
|
||||
|
@ -3556,8 +3556,6 @@ int rte_eth_dev_callback_unregister(uint16_t port_id,
|
||||
* Pointer to struct rte_eth_dev.
|
||||
* @param event
|
||||
* Eth device interrupt event type.
|
||||
* @param cb_arg
|
||||
* callback parameter.
|
||||
* @param ret_param
|
||||
* To pass data back to user application.
|
||||
* This allows the user application to decide if a particular function
|
||||
@ -3567,7 +3565,7 @@ int rte_eth_dev_callback_unregister(uint16_t port_id,
|
||||
* int
|
||||
*/
|
||||
int _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
|
||||
enum rte_eth_event_type event, void *cb_arg, void *ret_param);
|
||||
enum rte_eth_event_type event, void *ret_param);
|
||||
|
||||
/**
|
||||
* When there is no rx packet coming in Rx Queue for a long time, we can
|
||||
|
@ -460,7 +460,7 @@ virtual_ethdev_simulate_link_status_interrupt(uint16_t port_id,
|
||||
vrtl_eth_dev->data->dev_link.link_status = link_status;
|
||||
|
||||
_rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
|
||||
NULL, NULL);
|
||||
NULL);
|
||||
}
|
||||
|
||||
int
|
||||
|
Loading…
Reference in New Issue
Block a user