Netdev List
 help / color / mirror / Atom feed
From: Sathya Perla <Sathya.Perla@Emulex.Com>
To: Ivan Vecera <ivecera@redhat.com>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: Subramanian Seetharaman <subbu.seetharaman@emulex.com>,
	Ajit Khaparde <Ajit.Khaparde@Emulex.Com>
Subject: RE: [PATCH net v2] be2net: add dma_mapping_error() check for dma_map_page()
Date: Wed, 15 Jan 2014 10:28:27 +0000	[thread overview]
Message-ID: <6ddd3386-58df-4d51-a9c1-e6c184bc12af@CMEXHTCAS1.ad.emulex.com> (raw)
In-Reply-To: <1389780694-6299-1-git-send-email-ivecera@redhat.com>

> -----Original Message-----
> From: Ivan Vecera [mailto:ivecera@redhat.com]
> 
> The driver does not check value returned by dma_map_page. The patch
> fixes this.
> 
> v2: Removed the bugfix for non-bug ;-) (thanks Sathya)
> 
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>

Acked-by: Sathya Perla <Sathya.perla@emulex.com>

> ---
>  drivers/net/ethernet/emulex/benet/be_main.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/emulex/benet/be_main.c
> b/drivers/net/ethernet/emulex/benet/be_main.c
> index bf40fda..a37039d 100644
> --- a/drivers/net/ethernet/emulex/benet/be_main.c
> +++ b/drivers/net/ethernet/emulex/benet/be_main.c
> @@ -1776,6 +1776,7 @@ static void be_post_rx_frags(struct be_rx_obj *rxo, gfp_t gfp)
>  	struct be_rx_page_info *page_info = NULL, *prev_page_info = NULL;
>  	struct be_queue_info *rxq = &rxo->q;
>  	struct page *pagep = NULL;
> +	struct device *dev = &adapter->pdev->dev;
>  	struct be_eth_rx_d *rxd;
>  	u64 page_dmaaddr = 0, frag_dmaaddr;
>  	u32 posted, page_offset = 0;
> @@ -1788,9 +1789,15 @@ static void be_post_rx_frags(struct be_rx_obj *rxo, gfp_t gfp)
>  				rx_stats(rxo)->rx_post_fail++;
>  				break;
>  			}
> -			page_dmaaddr = dma_map_page(&adapter->pdev->dev, pagep,
> -						    0, adapter->big_page_size,
> +			page_dmaaddr = dma_map_page(dev, pagep, 0,
> +						    adapter->big_page_size,
>  						    DMA_FROM_DEVICE);
> +			if (dma_mapping_error(dev, page_dmaaddr)) {
> +				put_page(pagep);
> +				pagep = NULL;
> +				rx_stats(rxo)->rx_post_fail++;
> +				break;
> +			}
>  			page_info->page_offset = 0;
>  		} else {
>  			get_page(pagep);
> --
> 1.8.3.2

  reply	other threads:[~2014-01-15 10:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-15 10:11 [PATCH net v2] be2net: add dma_mapping_error() check for dma_map_page() Ivan Vecera
2014-01-15 10:28 ` Sathya Perla [this message]
2014-01-16  0:50 ` 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=6ddd3386-58df-4d51-a9c1-e6c184bc12af@CMEXHTCAS1.ad.emulex.com \
    --to=sathya.perla@emulex.com \
    --cc=Ajit.Khaparde@Emulex.Com \
    --cc=ivecera@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=subbu.seetharaman@emulex.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox