Re: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup

From: Joakim Tjernlund
Date: Thu May 02 2019 - 06:36:53 EST


On Thu, 2019-05-02 at 09:05 +0000, Laurentiu Tudor wrote:
> Hi Joakim,
>
> > -----Original Message-----
> > From: Joakim Tjernlund <Joakim.Tjernlund@xxxxxxxxxxxx>
> > Sent: Saturday, April 27, 2019 8:11 PM
> >
> > On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tudor@xxxxxxx wrote:
> > > From: Laurentiu Tudor <laurentiu.tudor@xxxxxxx>
> > >
> > > Fix issue with the entry indexing in the sg frame cleanup code being
> > > off-by-1. This problem showed up when doing some basic iperf tests and
> > > manifested in traffic coming to a halt.
> > >
> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@xxxxxxx>
> > > Acked-by: Madalin Bucur <madalin.bucur@xxxxxxx>
> >
> > Wasn't this a stable candidate too?
>
> Yes, it is. I forgot to add the cc:stable tag, sorry about that.

Then this is a bug fix that should go directly to linus/stable.

I note that https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/drivers/net/ethernet/freescale/dpaa?h=linux-4.19.y
is in 4.19 but not in 4.14 , is it not appropriate for 4.14?

Jocke

>
> ---
> Best Regards, Laurentiu
>
> > > ---
> > > drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> > b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> > > index daede7272768..40420edc9ce6 100644
> > > --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> > > +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> > > @@ -1663,7 +1663,7 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const
> > struct dpaa_priv *priv,
> > > qm_sg_entry_get_len(&sgt[0]), dma_dir);
> > >
> > > /* remaining pages were mapped with skb_frag_dma_map()
> > */
> > > - for (i = 1; i < nr_frags; i++) {
> > > + for (i = 1; i <= nr_frags; i++) {
> > > WARN_ON(qm_sg_entry_is_ext(&sgt[i]));
> > >
> > > dma_unmap_page(dev, qm_sg_addr(&sgt[i]),
> > > --
> > > 2.17.1
> > >