[Intel-wired-lan] [PATCH net v1 1/2] ice: fix W=1 headers mismatch

Alexander Lobakin aleksander.lobakin at intel.com
Tue Mar 14 13:54:19 UTC 2023


From: Brandeburg, Jesse <jesse.brandeburg at intel.com>
Date: Mon, 13 Mar 2023 13:36:07 -0700

> make modules W=1 returns:
> .../ice/ice_txrx_lib.c:448: warning: Function parameter or member 'first_idx' not described in 'ice_finalize_xdp_rx'
> .../ice/ice_txrx.c:948: warning: Function parameter or member 'ntc' not described in 'ice_get_rx_buf'
> .../ice/ice_txrx.c:1038: warning: Excess function parameter 'rx_buf' description in 'ice_construct_skb'
> 
> Fix these warnings by adding and deleting the deviant arguments.
> 
> Fixes: 2fba7dc5157b ("ice: Add support for XDP multi-buffer on Rx side")
> Fixes: d7956d81f150 ("ice: Pull out next_to_clean bump out of ice_put_rx_buf()")
> CC: Maciej Fijalkowski <maciej.fijalkowski at intel.com>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
> Reviewed-by: Piotr Raczynski <piotr.raczynski at intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_txrx.c     | 2 +-
>  drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
> index dfd22862e926..21c1e1bb214a 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
> @@ -938,6 +938,7 @@ ice_reuse_rx_page(struct ice_rx_ring *rx_ring, struct ice_rx_buf *old_buf)
>   * ice_get_rx_buf - Fetch Rx buffer and synchronize data for use
>   * @rx_ring: Rx descriptor ring to transact packets on
>   * @size: size of buffer to add to skb
> + * @ntc: index of next to clean element
>   *
>   * This function will pull an Rx buffer from the ring and synchronize it
>   * for use by the CPU.
> @@ -1026,7 +1027,6 @@ ice_build_skb(struct ice_rx_ring *rx_ring, struct xdp_buff *xdp)
>  /**
>   * ice_construct_skb - Allocate skb and populate it
>   * @rx_ring: Rx descriptor ring to transact packets on
> - * @rx_buf: Rx buffer to pull data from
>   * @xdp: xdp_buff pointing to the data
>   *
>   * This function allocates an skb. It then populates it with the page
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> index 7bc5aa340c7d..c8322fb6f2b3 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> @@ -438,6 +438,7 @@ int __ice_xmit_xdp_ring(struct xdp_buff *xdp, struct ice_tx_ring *xdp_ring,
>   * ice_finalize_xdp_rx - Bump XDP Tx tail and/or flush redirect map
>   * @xdp_ring: XDP ring
>   * @xdp_res: Result of the receive batch
> + * @first_idx: index to write from caller
>   *
>   * This function bumps XDP Tx tail and/or flush redirect map, and
>   * should be called when a batch of packets has been processed in the

How is Rx hotpath related to "ice_switch" O_o :D Those are 2 separate
fixes or at least the cover shouldn't say they belong to one topic.

Thanks,
Olek


More information about the Intel-wired-lan mailing list