On Thu, Aug 24, 2023 at 09:26:43PM +0200, Larysa Zaremba wrote:
> Currently, rx_ptype variable is used only as an argument
> to ice_process_skb_fields() and is computed
> just before the function call.
>
> Therefore, there is no reason to pass this value as an argument.
> Instead, remove this argument and compute the value directly inside
> ice_process_skb_fields() function.
>
> Also, separate its calculation into a short function, so the code
> can later be reused in .xmo_() callbacks.
>
> Signed-off-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
> ---
> drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +-----
> drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 15 +++++++++++++--
> drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 2 +-
> drivers/net/ethernet/intel/ice/ice_xsk.c | 6 +-----
> 4 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
> index 52d0a126eb61..40f2f6dabb81 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
> @@ -1181,7 +1181,6 @@ int ice_clean_rx_irq(struct ice_rx_ring *rx_ring, int budget)
> unsigned int size;
> u16 stat_err_bits;
> u16 vlan_tag = 0;
> - u16 rx_ptype;
>
> /* get the Rx desc from Rx ring based on 'next_to_clean' */
> rx_desc = ICE_RX_DESC(rx_ring, ntc);
> @@ -1286,10 +1285,7 @@ int ice_clean_rx_irq(struct ice_rx_ring *rx_ring, int budget)
> total_rx_bytes += skb->len;
>
> /* populate checksum, VLAN, and protocol */
> - rx_ptype = le16_to_cpu(rx_desc->wb.ptype_flex_flags0) &
> - ICE_RX_FLEX_DESC_PTYPE_M;
> -
> - ice_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);
> + ice_process_skb_fields(rx_ring, rx_desc, skb);
>
> ice_trace(clean_rx_irq_indicate, rx_ring, rx_desc, skb);
> /* send completed skb up the stack */
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> index 8b155a502b3b..07241f4229b7 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> @@ -241,12 +241,21 @@ ice_ptp_rx_hwts_to_skb(struct ice_rx_ring *rx_ring,
> };
> }
>
> +/**
> + * ice_get_ptype - Read HW packet type from the descriptor
> + * @rx_desc: RX descriptor
> + */
> +static u16 ice_get_ptype(const union ice_32b_rx_flex_desc *rx_desc)
> +{
> + return le16_to_cpu(rx_desc->wb.ptype_flex_flags0) &
> + ICE_RX_FLEX_DESC_PTYPE_M;
> +}
> +
> /**
> * ice_process_skb_fields - Populate skb header fields from Rx descriptor
> * @rx_ring: Rx descriptor ring packet is being transacted on
> * @rx_desc: pointer to the EOP Rx descriptor
> * @skb: pointer to current skb being populated
> - * @ptype: the packet type decoded by hardware
> *
> * This function checks the ring, descriptor, and packet information in
> * order to populate the hash, checksum, VLAN, protocol, and
> @@ -255,8 +264,10 @@ ice_ptp_rx_hwts_to_skb(struct ice_rx_ring *rx_ring,
> void
> ice_process_skb_fields(struct ice_rx_ring *rx_ring,
> union ice_32b_rx_flex_desc *rx_desc,
> - struct sk_buff *skb, u16 ptype)
> + struct sk_buff *skb)
> {
> + u16 ptype = ice_get_ptype(rx_desc);
> +
> ice_rx_hash_to_skb(rx_ring, rx_desc, skb, ptype);
>
> /* modifies the skb - consumes the enet header */
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> index 115969ecdf7b..e1d49e1235b3 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> @@ -148,7 +148,7 @@ void ice_release_rx_desc(struct ice_rx_ring *rx_ring, u16 val);
> void
> ice_process_skb_fields(struct ice_rx_ring *rx_ring,
> union ice_32b_rx_flex_desc *rx_desc,
> - struct sk_buff *skb, u16 ptype);
> + struct sk_buff *skb);
> void
> ice_receive_skb(struct ice_rx_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag);
> #endif /* !_ICE_TXRX_LIB_H_ */
> diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
> index 2a3f0834e139..ef778b8e6d1b 100644
> --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
> +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
> @@ -870,7 +870,6 @@ int ice_clean_rx_irq_zc(struct ice_rx_ring *rx_ring, int budget)
> struct sk_buff *skb;
> u16 stat_err_bits;
> u16 vlan_tag = 0;
> - u16 rx_ptype;
>
> rx_desc = ICE_RX_DESC(rx_ring, ntc);
>
> @@ -950,10 +949,7 @@ int ice_clean_rx_irq_zc(struct ice_rx_ring *rx_ring, int budget)
>
> vlan_tag = ice_get_vlan_tag_from_rx_desc(rx_desc);
>
> - rx_ptype = le16_to_cpu(rx_desc->wb.ptype_flex_flags0) &
> - ICE_RX_FLEX_DESC_PTYPE_M;
> -
> - ice_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);
> + ice_process_skb_fields(rx_ring, rx_desc, skb);
> ice_receive_skb(rx_ring, skb, vlan_tag);
> }
>
> --
> 2.41.0
>
>
