niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ice: do Tx through PF netdev in slow-path

Browse source 
Tx can be done using PF netdev.

Checks before Tx are unnecessary. Checking if switchdev mode is set
seems too defensive (there is no PR netdev in legacy mode). If
corresponding VF is disabled or during reset, PR netdev also should be
down.

Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Michal Swiatkowski 2024-03-01 12:54:08 +01:00 • committed by Tony Nguyen
parent 8c67b7a914
commit defd52455a
3 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/net/ethernet/intel/ice/ice_eswitch.c
View file

@ -236,7 +236,7 @@ ice_eswitch_release_repr(struct ice_pf *pf, struct ice_repr *repr)
*/ */
static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr) static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr)
{ {
struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi; struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;
struct ice_vsi *vsi = repr->src_vsi; struct ice_vsi *vsi = repr->src_vsi;
struct metadata_dst *dst; struct metadata_dst *dst;
@ -255,12 +255,11 @@ static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr)
netif_napi_add(repr->netdev, &repr->q_vector->napi, netif_napi_add(repr->netdev, &repr->q_vector->napi,
ice_napi_poll); ice_napi_poll);
netif_keep_dst(repr->netdev); netif_keep_dst(uplink_vsi->netdev);
dst = repr->dst; dst = repr->dst;
dst->u.port_info.port_id = vsi->vsi_num; dst->u.port_info.port_id = vsi->vsi_num;
dst->u.port_info.lower_dev = repr->netdev; dst->u.port_info.lower_dev = uplink_vsi->netdev;
ice_repr_set_traffic_vsi(repr, ctrl_vsi);
return 0; return 0;
@ -318,27 +317,14 @@ void ice_eswitch_update_repr(unsigned long repr_id, struct ice_vsi *vsi)
netdev_tx_t netdev_tx_t
ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev) ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev)
{ {
struct ice_netdev_priv *np; struct ice_repr *repr = ice_netdev_to_repr(netdev);
struct ice_repr *repr;
struct ice_vsi *vsi;
np = netdev_priv(netdev);
vsi = np->vsi;
if (!vsi || !ice_is_switchdev_running(vsi->back))
return NETDEV_TX_BUSY;
if (ice_is_reset_in_progress(vsi->back->state) ||
test_bit(ICE_VF_DIS, vsi->back->state))
return NETDEV_TX_BUSY;
repr = ice_netdev_to_repr(netdev);
skb_dst_drop(skb); skb_dst_drop(skb);
dst_hold((struct dst_entry *)repr->dst); dst_hold((struct dst_entry *)repr->dst);
skb_dst_set(skb, (struct dst_entry *)repr->dst); skb_dst_set(skb, (struct dst_entry *)repr->dst);
skb->queue_mapping = repr->q_id; skb->dev = repr->dst->u.port_info.lower_dev;
return ice_start_xmit(skb, netdev); return dev_queue_xmit(skb);
} }
/** /**

12
drivers/net/ethernet/intel/ice/ice_repr.c
View file

@ -439,15 +439,3 @@ void ice_repr_stop_tx_queues(struct ice_repr *repr)
netif_carrier_off(repr->netdev); netif_carrier_off(repr->netdev);
netif_tx_stop_all_queues(repr->netdev); netif_tx_stop_all_queues(repr->netdev);
} }
/**
* ice_repr_set_traffic_vsi - set traffic VSI for port representor
* @repr: repr on with VSI will be set
* @vsi: pointer to VSI that will be used by port representor to pass traffic
*/
void ice_repr_set_traffic_vsi(struct ice_repr *repr, struct ice_vsi *vsi)
{
struct ice_netdev_priv *np = netdev_priv(repr->netdev);
np->vsi = vsi;
}

2
drivers/net/ethernet/intel/ice/ice_repr.h
View file

@ -28,8 +28,6 @@ void ice_repr_rem_vf(struct ice_repr *repr);
void ice_repr_start_tx_queues(struct ice_repr *repr); void ice_repr_start_tx_queues(struct ice_repr *repr);
void ice_repr_stop_tx_queues(struct ice_repr *repr); void ice_repr_stop_tx_queues(struct ice_repr *repr);
void ice_repr_set_traffic_vsi(struct ice_repr *repr, struct ice_vsi *vsi);
struct ice_repr *ice_netdev_to_repr(struct net_device *netdev); struct ice_repr *ice_netdev_to_repr(struct net_device *netdev);
bool ice_is_port_repr_netdev(const struct net_device *netdev); bool ice_is_port_repr_netdev(const struct net_device *netdev);