Re: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
On Thu, 2019-05-02 at 12:58 +, Laurentiu Tudor wrote: > > > -Original Message- > > From: Joakim Tjernlund > > Sent: Thursday, May 2, 2019 1:37 PM > > > > On Thu, 2019-05-02 at 09:05 +, Laurentiu Tudor wrote: > > > Hi Joakim, > > > > > > > -Original Message- > > > > From: Joakim Tjernlund > > > > Sent: Saturday, April 27, 2019 8:11 PM > > > > > > > > On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tu...@nxp.com wrote: > > > > > From: Laurentiu Tudor > > > > > > > > > > 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 > > > > > Acked-by: Madalin Bucur > > > > > > > > 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://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fstable%2Flinux.git%2Flog%2Fdrivers%2Fnet%2Fethernet%2Ffreescale%2Fdpaa%3Fh%3Dlinux-4.19.y&data=02%7C01%7CJoakim.Tjernlund%40infinera.com%7Cb88ecc951de649e5a55808d6cefdd286%7C285643de5f5b4b03a1530ae2dc8aaf77%7C1%7C0%7C636923986895133037&sdata=ueUWI1%2BmNBHtlCoY9%2B1FreOUM8bHGiTYWhISy5nRoJk%3D&reserved=0 > > Not sure I understand ... I don't see the patch in the link. Sorry, I copied the wrong link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/ethernet/freescale/dpaa?h=linux-4.19.y&id=0aafea5d4b22fe9403e89d82e02597e4493d5d0f > > > is in 4.19 but not in 4.14 , is it not appropriate for 4.14? > > I think it makes sense to go in both stable trees. > > --- > 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 > > > > > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
> -Original Message- > From: Joakim Tjernlund > Sent: Thursday, May 2, 2019 1:37 PM > > On Thu, 2019-05-02 at 09:05 +, Laurentiu Tudor wrote: > > Hi Joakim, > > > > > -Original Message- > > > From: Joakim Tjernlund > > > Sent: Saturday, April 27, 2019 8:11 PM > > > > > > On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tu...@nxp.com wrote: > > > > From: Laurentiu Tudor > > > > > > > > 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 > > > > Acked-by: Madalin Bucur > > > > > > 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 Not sure I understand ... I don't see the patch in the link. > is in 4.19 but not in 4.14 , is it not appropriate for 4.14? I think it makes sense to go in both stable trees. --- 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 > > > > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
On Thu, 2019-05-02 at 09:05 +, Laurentiu Tudor wrote: > Hi Joakim, > > > -Original Message- > > From: Joakim Tjernlund > > Sent: Saturday, April 27, 2019 8:11 PM > > > > On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tu...@nxp.com wrote: > > > From: Laurentiu Tudor > > > > > > 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 > > > Acked-by: Madalin Bucur > > > > 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 > > > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
Hi Joakim, > -Original Message- > From: Joakim Tjernlund > Sent: Saturday, April 27, 2019 8:11 PM > > On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tu...@nxp.com wrote: > > From: Laurentiu Tudor > > > > 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 > > Acked-by: Madalin Bucur > > Wasn't this a stable candidate too? Yes, it is. I forgot to add the cc:stable tag, sorry about that. --- 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 > > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup
On Sat, 2019-04-27 at 10:10 +0300, laurentiu.tu...@nxp.com wrote: > From: Laurentiu Tudor > > 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 > Acked-by: Madalin Bucur Wasn't this a stable candidate too? > --- > 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 > ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu