[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <48ADC4D3.4000201@linux.vnet.ibm.com>
Date: Thu, 21 Aug 2008 14:41:07 -0500
From: Brian King <brking@...ux.vnet.ibm.com>
To: Santiago Leon <santil@...ibm.com>
CC: jeff@...zik.org, netdev@...r.kernel.org
Subject: Re: [PATCH] ibmveth: fix bad UDP checksums
Acked by: Brian King <brking@...ux.vnet.ibm.com>
Santiago Leon wrote:
> This patch fixes a ibmveth bug where bad UDP checksums are being transmitted
> when checksum offloading is enabled.
> The hypervisor does checksum offloading only on TCP packets, so ibmveth calls
> skb_checksum_help() for any other protocol. The bug happens because
> the packet is being modified after the DMA map, so we would need a memory
> barrier before making the hypervisor call. Reordering the code so that the
> DMA map happens after skb_checksum_help() has the additional advantage of
> fixing a DMA map leak if skb_checksum_help() where to fail.
>
> Please consider applying.
>
> Signed-off-by: Santiago Leon <santil@...ibm.com>
> ---
>
> ibmveth.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> --- a/drivers/net/ibmveth.c 2008-08-19 07:31:29.000000000 -0400
> +++ b/drivers/net/ibmveth.c 2008-08-19 07:46:24.000000000 -0400
> @@ -904,8 +904,6 @@ static int ibmveth_start_xmit(struct sk_
> unsigned long data_dma_addr;
>
> desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len;
> - data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
> - skb->len, DMA_TO_DEVICE);
>
> if (skb->ip_summed == CHECKSUM_PARTIAL &&
> ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) {
> @@ -924,6 +922,8 @@ static int ibmveth_start_xmit(struct sk_
> buf[1] = 0;
> }
>
> + data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
> + skb->len, DMA_TO_DEVICE);
> if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) {
> if (!firmware_has_feature(FW_FEATURE_CMO))
> ibmveth_error_printk("tx: unable to map xmit buffer\n");
> @@ -932,6 +932,7 @@ static int ibmveth_start_xmit(struct sk_
> desc.fields.address = adapter->bounce_buffer_dma;
> tx_map_failed++;
> used_bounce = 1;
> + wmb();
> } else
> desc.fields.address = data_dma_addr;
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists