From: "Michał Mirosław" <mirqus@gmail.com> To: Jonas Jensen <jonas.jensen@gmail.com> Cc: netdev <netdev@vger.kernel.org>, f.fainelli@gmail.com, Linux Kernel <linux-kernel@vger.kernel.org>, Ben Hutchings <bhutchings@solarflare.com>, David Miller <davem@davemloft.net>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH v4 2/2] net: moxa: replace build_skb() with netdev_alloc_skb_ip_align() / memcpy() Date: Thu, 21 Aug 2014 23:43:38 +0200 [thread overview] Message-ID: <CAHXqBFJ3bWW8NVYcjxLnkk=6qxcRv75iCuBLrHuF91wxcL=61g@mail.gmail.com> (raw) In-Reply-To: <1408459784-9385-2-git-send-email-jonas.jensen@gmail.com> 2014-08-19 16:49 GMT+02:00 Jonas Jensen <jonas.jensen@gmail.com>: [...] > diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c > index aa45607..17c9f0e 100644 > --- a/drivers/net/ethernet/moxa/moxart_ether.c > +++ b/drivers/net/ethernet/moxa/moxart_ether.c > @@ -226,14 +226,21 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) > if (len > RX_BUF_SIZE) > len = RX_BUF_SIZE; > > - skb = build_skb(priv->rx_buf[rx_head], priv->rx_buf_size); > + dma_sync_single_for_cpu(&ndev->dev, > + priv->rx_mapping[rx_head], > + priv->rx_buf_size, DMA_FROM_DEVICE); > + skb = netdev_alloc_skb_ip_align(ndev, len); > if (unlikely(!skb)) { > - net_dbg_ratelimited("build_skb failed\n"); > + net_dbg_ratelimited("netdev_alloc_skb_ip_align failed\n"); > priv->stats.rx_dropped++; > priv->stats.rx_errors++; > } > - > + memcpy(skb->data, priv->rx_buf[rx_head], len); This has implicit: if (!skb) BUG(); There should probably be a return or continue inside the if (!skb). > skb_put(skb, len); > + dma_sync_single_for_device(&ndev->dev, > + priv->rx_mapping[rx_head], > + priv->rx_buf_size, DMA_FROM_DEVICE); > + dma_sync_single_for_device() is not needed here as CPU does not and should not write to the DMA_FROM_DEVICE mapping. > skb->protocol = eth_type_trans(skb, ndev); > napi_gro_receive(&priv->napi, skb); > rx++; Best Regards, Michał Mirosław
WARNING: multiple messages have this Message-ID (diff)
From: mirqus@gmail.com (Michał Mirosław) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/2] net: moxa: replace build_skb() with netdev_alloc_skb_ip_align() / memcpy() Date: Thu, 21 Aug 2014 23:43:38 +0200 [thread overview] Message-ID: <CAHXqBFJ3bWW8NVYcjxLnkk=6qxcRv75iCuBLrHuF91wxcL=61g@mail.gmail.com> (raw) In-Reply-To: <1408459784-9385-2-git-send-email-jonas.jensen@gmail.com> 2014-08-19 16:49 GMT+02:00 Jonas Jensen <jonas.jensen@gmail.com>: [...] > diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c > index aa45607..17c9f0e 100644 > --- a/drivers/net/ethernet/moxa/moxart_ether.c > +++ b/drivers/net/ethernet/moxa/moxart_ether.c > @@ -226,14 +226,21 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) > if (len > RX_BUF_SIZE) > len = RX_BUF_SIZE; > > - skb = build_skb(priv->rx_buf[rx_head], priv->rx_buf_size); > + dma_sync_single_for_cpu(&ndev->dev, > + priv->rx_mapping[rx_head], > + priv->rx_buf_size, DMA_FROM_DEVICE); > + skb = netdev_alloc_skb_ip_align(ndev, len); > if (unlikely(!skb)) { > - net_dbg_ratelimited("build_skb failed\n"); > + net_dbg_ratelimited("netdev_alloc_skb_ip_align failed\n"); > priv->stats.rx_dropped++; > priv->stats.rx_errors++; > } > - > + memcpy(skb->data, priv->rx_buf[rx_head], len); This has implicit: if (!skb) BUG(); There should probably be a return or continue inside the if (!skb). > skb_put(skb, len); > + dma_sync_single_for_device(&ndev->dev, > + priv->rx_mapping[rx_head], > + priv->rx_buf_size, DMA_FROM_DEVICE); > + dma_sync_single_for_device() is not needed here as CPU does not and should not write to the DMA_FROM_DEVICE mapping. > skb->protocol = eth_type_trans(skb, ndev); > napi_gro_receive(&priv->napi, skb); > rx++; Best Regards, Micha? Miros?aw
next prev parent reply other threads:[~2014-08-21 21:44 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-19 14:49 [PATCH v4 1/2] net: moxa: clear TX descriptor length bits Jonas Jensen 2014-08-19 14:49 ` Jonas Jensen 2014-08-19 14:49 ` [PATCH v4 2/2] net: moxa: replace build_skb() with netdev_alloc_skb_ip_align() / memcpy() Jonas Jensen 2014-08-19 14:49 ` Jonas Jensen 2014-08-19 18:31 ` Eric Dumazet 2014-08-19 18:31 ` Eric Dumazet 2014-08-20 14:24 ` Jonas Jensen 2014-08-20 14:24 ` Jonas Jensen 2014-08-20 14:24 ` Jonas Jensen 2014-08-20 14:19 ` [PATCH v5 " Jonas Jensen 2014-08-20 14:19 ` Jonas Jensen 2014-08-25 14:22 ` [PATCH v6 2/4] " Jonas Jensen 2014-08-25 14:22 ` Jonas Jensen 2014-08-26 0:26 ` David Miller 2014-08-26 0:26 ` David Miller 2014-08-26 9:04 ` Arnd Bergmann 2014-08-26 9:04 ` Arnd Bergmann 2014-08-26 9:10 ` David Laight 2014-08-26 9:10 ` David Laight 2014-08-26 9:10 ` David Laight 2014-08-26 10:55 ` Eric Dumazet 2014-08-26 10:55 ` Eric Dumazet 2014-08-26 10:55 ` Eric Dumazet 2014-08-21 21:43 ` Michał Mirosław [this message] 2014-08-21 21:43 ` [PATCH v4 2/2] " Michał Mirosław 2014-08-21 21:43 ` Michał Mirosław 2014-08-25 14:23 ` Jonas Jensen 2014-08-25 14:23 ` Jonas Jensen 2014-08-25 14:23 ` Jonas Jensen 2014-08-20 14:18 ` [PATCH v5 1/2] net: moxa: clear TX descriptor length bits Jonas Jensen 2014-08-20 14:18 ` Jonas Jensen 2014-08-20 17:10 ` Eric Dumazet 2014-08-20 17:10 ` Eric Dumazet 2014-08-25 14:23 ` Jonas Jensen 2014-08-25 14:23 ` Jonas Jensen 2014-08-22 4:39 ` David Miller 2014-08-22 4:39 ` David Miller 2014-08-25 14:22 ` [PATCH v6 1/4] net: moxa: clear DESC1 on ndo_start_xmit() Jonas Jensen 2014-08-25 14:22 ` Jonas Jensen 2014-08-26 0:25 ` David Miller 2014-08-26 0:25 ` David Miller
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='CAHXqBFJ3bWW8NVYcjxLnkk=6qxcRv75iCuBLrHuF91wxcL=61g@mail.gmail.com' \ --to=mirqus@gmail.com \ --cc=bhutchings@solarflare.com \ --cc=davem@davemloft.net \ --cc=f.fainelli@gmail.com \ --cc=jonas.jensen@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /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.