> -----Original Message-----
> From: Guoqing Jiang <guoqing.jiang@xxxxxxxxx>
> Sent: Friday, October 27, 2023 3:26 PM
> To: Bernard Metzler <BMT@xxxxxxxxxxxxxx>; jgg@xxxxxxxx; leon@xxxxxxxxxx
> Cc: linux-rdma@xxxxxxxxxxxxxxx
> Subject: [EXTERNAL] [PATCH V4 02/18] RDMA/siw: Introduce
> siw_update_skb_rcvd
>
> There are some places share the same logic, factor a common
> helper for it.
>
> Signed-off-by: Guoqing Jiang <guoqing.jiang@xxxxxxxxx>
> ---
> drivers/infiniband/sw/siw/siw_qp_rx.c | 31 +++++++++++----------------
> 1 file changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/infiniband/sw/siw/siw_qp_rx.c
> b/drivers/infiniband/sw/siw/siw_qp_rx.c
> index 33e0fdb362ff..10805a7d0487 100644
> --- a/drivers/infiniband/sw/siw/siw_qp_rx.c
> +++ b/drivers/infiniband/sw/siw/siw_qp_rx.c
> @@ -881,6 +881,13 @@ int siw_proc_rresp(struct siw_qp *qp)
> return rv;
> }
>
> +static void siw_update_skb_rcvd(struct siw_rx_stream *srx, u16 length)
> +{
> + srx->skb_offset += length;
> + srx->skb_new -= length;
> + srx->skb_copied += length;
> +}
> +
> int siw_proc_terminate(struct siw_qp *qp)
> {
> struct siw_rx_stream *srx = &qp->rx_stream;
> @@ -925,9 +932,7 @@ int siw_proc_terminate(struct siw_qp *qp)
> goto out;
>
> infop += to_copy;
> - srx->skb_offset += to_copy;
> - srx->skb_new -= to_copy;
> - srx->skb_copied += to_copy;
> + siw_update_skb_rcvd(srx, to_copy);
> srx->fpdu_part_rcvd += to_copy;
> srx->fpdu_part_rem -= to_copy;
>
> @@ -949,9 +954,7 @@ int siw_proc_terminate(struct siw_qp *qp)
> term->flag_m ? "valid" : "invalid");
> }
> out:
> - srx->skb_new -= to_copy;
> - srx->skb_offset += to_copy;
> - srx->skb_copied += to_copy;
> + siw_update_skb_rcvd(srx, to_copy);
> srx->fpdu_part_rcvd += to_copy;
> srx->fpdu_part_rem -= to_copy;
>
> @@ -970,9 +973,7 @@ static int siw_get_trailer(struct siw_qp *qp, struct
> siw_rx_stream *srx)
>
> skb_copy_bits(skb, srx->skb_offset, tbuf, avail);
>
> - srx->skb_new -= avail;
> - srx->skb_offset += avail;
> - srx->skb_copied += avail;
> + siw_update_skb_rcvd(srx, avail);
> srx->fpdu_part_rem -= avail;
>
> if (srx->fpdu_part_rem)
> @@ -1023,12 +1024,8 @@ static int siw_get_hdr(struct siw_rx_stream *srx)
> skb_copy_bits(skb, srx->skb_offset,
> (char *)c_hdr + srx->fpdu_part_rcvd, bytes);
>
> + siw_update_skb_rcvd(srx, bytes);
> srx->fpdu_part_rcvd += bytes;
> -
> - srx->skb_new -= bytes;
> - srx->skb_offset += bytes;
> - srx->skb_copied += bytes;
> -
> if (srx->fpdu_part_rcvd < MIN_DDP_HDR)
> return -EAGAIN;
>
> @@ -1091,12 +1088,8 @@ static int siw_get_hdr(struct siw_rx_stream *srx)
> skb_copy_bits(skb, srx->skb_offset,
> (char *)c_hdr + srx->fpdu_part_rcvd, bytes);
>
> + siw_update_skb_rcvd(srx, bytes);
> srx->fpdu_part_rcvd += bytes;
> -
> - srx->skb_new -= bytes;
> - srx->skb_offset += bytes;
> - srx->skb_copied += bytes;
> -
> if (srx->fpdu_part_rcvd < hdrlen)
> return -EAGAIN;
> }
> --
> 2.35.3
Looks good.
Acked-by: Bernard Metzler <bmt@xxxxxxxxxxxxxx>
