From: Christophe LEROY <christophe.leroy@c-s.fr> To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>, qiang.zhao@nxp.com, David Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] wan/fsl_ucc_hdlc: Fix size used in dma_free_coherent() Date: Sat, 8 Oct 2016 09:20:09 +0200 [thread overview] Message-ID: <cceecca5-4085-5c7b-3f94-c2b238619fa8@c-s.fr> (raw) In-Reply-To: <1475873927-14999-1-git-send-email-christophe.jaillet@wanadoo.fr> Le 07/10/2016 à 22:58, Christophe JAILLET a écrit : > Size used with 'dma_alloc_coherent()' and 'dma_free_coherent()' should be > consistent. > Here, the size of a pointer is used in dma_alloc... and the size of the > pointed structure is used in dma_free... > > This has been spotted with coccinelle, using the following script: > //////////////////// > @r@ > expression x0, x1, y0, y1, z0, z1, t0, t1, ret; > @@ > > * ret = dma_alloc_coherent(x0, y0, z0, t0); > ... > * dma_free_coherent(x1, y1, ret, t1); > > > @script:python@ > y0 << r.y0; > y1 << r.y1; > > @@ > if y1.find(y0) == -1: > print "WARNING: sizes look different: '%s' vs '%s'" % (y0, y1) > //////////////////// > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > Untested I don't think the error is in the dma_free_coherent() calls. The issue is for me in the dma_alloc_coherent() call. This call is supposed to allocate a table of buffer descriptors, not a table of pointers to BDs. Later in the code, this is used the following way: iowrite16be(bd_status, &priv->rx_bd_base[i].status); So it is the allocation which should be priv->rx_bd_base = dma_alloc_coherent(priv->dev, RX_BD_RING_LEN * sizeof(struct qe_bd), &priv->dma_rx_bd, GFP_KERNEL); Christophe > --- > drivers/net/wan/fsl_ucc_hdlc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c > index 5fbf83d5aa57..65647533b401 100644 > --- a/drivers/net/wan/fsl_ucc_hdlc.c > +++ b/drivers/net/wan/fsl_ucc_hdlc.c > @@ -295,11 +295,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) > qe_muram_free(priv->ucc_pram_offset); > free_tx_bd: > dma_free_coherent(priv->dev, > - TX_BD_RING_LEN * sizeof(struct qe_bd), > + TX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->tx_bd_base, priv->dma_tx_bd); > free_rx_bd: > dma_free_coherent(priv->dev, > - RX_BD_RING_LEN * sizeof(struct qe_bd), > + RX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->rx_bd_base, priv->dma_rx_bd); > free_uccf: > ucc_fast_free(priv->uccf); > @@ -688,7 +688,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv) > > if (priv->rx_bd_base) { > dma_free_coherent(priv->dev, > - RX_BD_RING_LEN * sizeof(struct qe_bd), > + RX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->rx_bd_base, priv->dma_rx_bd); > > priv->rx_bd_base = NULL; > @@ -697,7 +697,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv) > > if (priv->tx_bd_base) { > dma_free_coherent(priv->dev, > - TX_BD_RING_LEN * sizeof(struct qe_bd), > + TX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->tx_bd_base, priv->dma_tx_bd); > > priv->tx_bd_base = NULL; >
WARNING: multiple messages have this Message-ID (diff)
From: Christophe LEROY <christophe.leroy@c-s.fr> To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>, qiang.zhao@nxp.com, David Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] wan/fsl_ucc_hdlc: Fix size used in dma_free_coherent() Date: Sat, 08 Oct 2016 07:20:09 +0000 [thread overview] Message-ID: <cceecca5-4085-5c7b-3f94-c2b238619fa8@c-s.fr> (raw) In-Reply-To: <1475873927-14999-1-git-send-email-christophe.jaillet@wanadoo.fr> Le 07/10/2016 à 22:58, Christophe JAILLET a écrit : > Size used with 'dma_alloc_coherent()' and 'dma_free_coherent()' should be > consistent. > Here, the size of a pointer is used in dma_alloc... and the size of the > pointed structure is used in dma_free... > > This has been spotted with coccinelle, using the following script: > //////////////////// > @r@ > expression x0, x1, y0, y1, z0, z1, t0, t1, ret; > @@ > > * ret = dma_alloc_coherent(x0, y0, z0, t0); > ... > * dma_free_coherent(x1, y1, ret, t1); > > > @script:python@ > y0 << r.y0; > y1 << r.y1; > > @@ > if y1.find(y0) = -1: > print "WARNING: sizes look different: '%s' vs '%s'" % (y0, y1) > //////////////////// > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > Untested I don't think the error is in the dma_free_coherent() calls. The issue is for me in the dma_alloc_coherent() call. This call is supposed to allocate a table of buffer descriptors, not a table of pointers to BDs. Later in the code, this is used the following way: iowrite16be(bd_status, &priv->rx_bd_base[i].status); So it is the allocation which should be priv->rx_bd_base = dma_alloc_coherent(priv->dev, RX_BD_RING_LEN * sizeof(struct qe_bd), &priv->dma_rx_bd, GFP_KERNEL); Christophe > --- > drivers/net/wan/fsl_ucc_hdlc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c > index 5fbf83d5aa57..65647533b401 100644 > --- a/drivers/net/wan/fsl_ucc_hdlc.c > +++ b/drivers/net/wan/fsl_ucc_hdlc.c > @@ -295,11 +295,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) > qe_muram_free(priv->ucc_pram_offset); > free_tx_bd: > dma_free_coherent(priv->dev, > - TX_BD_RING_LEN * sizeof(struct qe_bd), > + TX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->tx_bd_base, priv->dma_tx_bd); > free_rx_bd: > dma_free_coherent(priv->dev, > - RX_BD_RING_LEN * sizeof(struct qe_bd), > + RX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->rx_bd_base, priv->dma_rx_bd); > free_uccf: > ucc_fast_free(priv->uccf); > @@ -688,7 +688,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv) > > if (priv->rx_bd_base) { > dma_free_coherent(priv->dev, > - RX_BD_RING_LEN * sizeof(struct qe_bd), > + RX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->rx_bd_base, priv->dma_rx_bd); > > priv->rx_bd_base = NULL; > @@ -697,7 +697,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv) > > if (priv->tx_bd_base) { > dma_free_coherent(priv->dev, > - TX_BD_RING_LEN * sizeof(struct qe_bd), > + TX_BD_RING_LEN * sizeof(struct qe_bd *), > priv->tx_bd_base, priv->dma_tx_bd); > > priv->tx_bd_base = NULL; > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-10-08 7:20 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-07 20:58 [PATCH] wan/fsl_ucc_hdlc: Fix size used in dma_free_coherent() Christophe JAILLET 2016-10-07 20:58 ` Christophe JAILLET 2016-10-08 4:05 ` David Miller 2016-10-08 4:05 ` David Miller 2016-10-08 7:20 ` Christophe LEROY [this message] 2016-10-08 7:20 ` Christophe LEROY
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=cceecca5-4085-5c7b-3f94-c2b238619fa8@c-s.fr \ --to=christophe.leroy@c-s.fr \ --cc=christophe.jaillet@wanadoo.fr \ --cc=davem@davemloft.net \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=netdev@vger.kernel.org \ --cc=qiang.zhao@nxp.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.