Re: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Veena Parat [EMAIL PROTECTED] : - Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -Nurp 2.0.23.1/drivers/net/s2io.c 2.0.23.1P1/drivers/net/s2io.c --- 2.0.23.1/drivers/net/s2io.c 2007-07-03 08:54:02.0 -0700 +++ 2.0.23.1P1/drivers/net/s2io.c 2007-07-03 11:39:24.0 -0700 [...] @@ -2236,10 +2237,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { ^^ It does not seem to compile against current git kernel. @@ -2256,6 +2266,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } Please sprinkle a few 'struct RxD3 *rd = (struct RxD3 *) rxdp;' here and there. The code will look better. rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2388,6 +2403,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD1*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; A 'struct swStat *stats = nic-mac_control.stats_info-sw_stat;' would not hurt either. [...] @@ -2644,7 +2696,8 @@ static int s2io_poll(struct net_device * for (i = 0; i config-rx_ring_num; i++) { if (fill_rx_buffers(nic, i) == -ENOMEM) { - DBG_PRINT(INFO_DBG, %s:Out of memory, dev-name); + DBG_PRINT(INFO_DBG, %s - %s:Out of memory, + __FUNCTION__, dev-name); DBG_PRINT(INFO_DBG, in Rx Poll!!\n); break; } @@ -2661,7 +2714,8 @@ no_rx: for (i = 0; i config-rx_ring_num; i++) { if (fill_rx_buffers(nic, i) == -ENOMEM) { - DBG_PRINT(INFO_DBG, %s:Out of memory, dev-name); + DBG_PRINT(INFO_DBG, %s - %s:Out of memory, + __FUNCTION__, dev-name); DBG_PRINT(INFO_DBG, in Rx Poll!!\n); break; } @@ -2711,7 +2765,8 @@ static void s2io_netpoll(struct net_devi for (i = 0; i config-rx_ring_num; i++) { if (fill_rx_buffers(nic, i) == -ENOMEM) { - DBG_PRINT(INFO_DBG, %s:Out of memory, dev-name); + DBG_PRINT(INFO_DBG, %s - %s:Out of memory, + __FUNCTION__, dev-name); DBG_PRINT(INFO_DBG, in Rx Netpoll!!\n); break; } Unrelated changes. @@ -2792,24 +2847,27 @@ static void rx_intr_handler(struct ring_ HEADER_SNAP_SIZE, PCI_DMA_FROMDEVICE); } else if (nic-rxd_mode == RXD_MODE_3B) { - pci_dma_sync_single_for_cpu(nic-pdev, (dma_addr_t) + pci_unmap_single(nic-pdev, (dma_addr_t) ((struct RxD3*)rxdp)-Buffer0_ptr, BUF0_LEN, PCI_DMA_FROMDEVICE); pci_unmap_single(nic-pdev, (dma_addr_t) + ((struct RxD3*)rxdp)-Buffer1_ptr, + BUF1_LEN, PCI_DMA_FROMDEVICE); + pci_unmap_single(nic-pdev, (dma_addr_t) ((struct RxD3*)rxdp)-Buffer2_ptr, dev-mtu + 4, PCI_DMA_FROMDEVICE); } else { - pci_dma_sync_single_for_cpu(nic-pdev, (dma_addr_t) - ((struct RxD3*)rxdp)-Buffer0_ptr, BUF0_LEN, - PCI_DMA_FROMDEVICE); pci_unmap_single(nic-pdev, (dma_addr_t) - ((struct
[PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
- Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -Nurp 2.0.23.1/drivers/net/s2io.c 2.0.23.1P1/drivers/net/s2io.c --- 2.0.23.1/drivers/net/s2io.c 2007-07-03 08:54:02.0 -0700 +++ 2.0.23.1P1/drivers/net/s2io.c 2007-07-03 11:39:24.0 -0700 @@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ (lro_flush_due_to_max_pkts), (lro_avg_aggr_pkts), (mem_alloc_fail_cnt), + {pci_map_fail_cnt}, (watchdog_timer_cnt), (mem_allocated), (mem_freed), @@ -2236,10 +2237,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } + /* skb_shinfo(skb)-frag_list will have L4 data payload */ skb_shinfo(skb)-frag_list = dev_alloc_skb(dev-mtu + ALIGN_SIZE); if (skb_shinfo(skb)-frag_list == NULL) { nic-mac_control.stats_info-sw_stat.mem_alloc_fail_cnt++; + pci_unmap_single + (nic-pdev, (dma_addr_t)skb-data, l3l4hdr_size + 4, + PCI_DMA_FROMDEVICE); DBG_PRINT(INFO_DBG, %s: dev_alloc_skb failed\n , dev-name); return -ENOMEM ; } @@ -2256,6 +2266,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2388,6 +2403,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD1*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN); @@ -2419,14 +2444,19 @@ static int fill_rx_buffers(struct s2io_n skb-data = (void *) (unsigned long)tmp; skb_reset_tail_pointer(skb); - if (!(((struct RxD3*)rxdp)-Buffer0_ptr)) - ((struct RxD3*)rxdp)-Buffer0_ptr = - pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, - PCI_DMA_FROMDEVICE); - else - pci_dma_sync_single_for_device(nic-pdev, - (dma_addr_t) ((struct RxD3*)rxdp)-Buffer0_ptr, - BUF0_LEN, PCI_DMA_FROMDEVICE); + ((struct RxD3*)rxdp)-Buffer0_ptr = + pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, + PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN); if (nic-rxd_mode == RXD_MODE_3B) { /* Two buffer mode */ @@ -2436,15 +2466,37 @@ static int fill_rx_buffers(struct s2io_n * L4 payload */ ((struct RxD3*)rxdp)-Buffer2_ptr =
RE: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Hi Jeff, We have the fixed the review comments as part of Patch2 and resubmitted it again yesterday. Thanks, ~Siva -Original Message- From: Jeff Garzik [mailto:[EMAIL PROTECTED] Sent: Monday, July 02, 2007 5:51 PM To: Veena Parat Cc: netdev@vger.kernel.org; Leonid Grossman; Ramkrishna Vepa; Rastapur Santosh; Sivakumar Subramani; Sreenivasa Honnur; Alicia Pena; Sriram Rapuru Subject: Re: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function Veena Parat wrote: Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -urpN org/drivers/net/s2io.c patch_1/drivers/net/s2io.c --- org/drivers/net/s2io.c2007-05-17 20:35:39.0 +0530 +++ patch_1/drivers/net/s2io.c2007-05-17 20:35:55.0 +0530 @@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ (lro_flush_due_to_max_pkts), (lro_avg_aggr_pkts), (mem_alloc_fail_cnt), + {pci_map_fail_cnt}, (watchdog_timer_cnt), (mem_allocated), (mem_freed), @@ -2247,10 +2248,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } + /* skb_shinfo(skb)-frag_list will have L4 data payload */ skb_shinfo(skb)-frag_list = dev_alloc_skb(dev-mtu + ALIGN_SIZE); if (skb_shinfo(skb)-frag_list == NULL) { nic-mac_control.stats_info-sw_stat.mem_alloc_fail_cnt++; + pci_unmap_single + (nic-pdev, (dma_addr_t)skb-data, l3l4hdr_size + 4, + PCI_DMA_FROMDEVICE); DBG_PRINT(INFO_DBG, %s: dev_alloc_skb failed\n , dev-name); return -ENOMEM ; } @@ -2267,6 +2277,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2399,6 +2414,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD1*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN); please provide a prep patch that eliminates all these inline casts. Create temporary variables or whatever you need to do to convert the messy and unreadable (((struct RxD1*)rxdp)-Buffer0_ptr into desc-Buffer0_ptr. otherwise looks OK - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Veena Parat wrote: Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -urpN org/drivers/net/s2io.c patch_1/drivers/net/s2io.c --- org/drivers/net/s2io.c 2007-05-17 20:35:39.0 +0530 +++ patch_1/drivers/net/s2io.c 2007-05-17 20:35:55.0 +0530 @@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ (lro_flush_due_to_max_pkts), (lro_avg_aggr_pkts), (mem_alloc_fail_cnt), + {pci_map_fail_cnt}, (watchdog_timer_cnt), (mem_allocated), (mem_freed), @@ -2247,10 +2248,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } + /* skb_shinfo(skb)-frag_list will have L4 data payload */ skb_shinfo(skb)-frag_list = dev_alloc_skb(dev-mtu + ALIGN_SIZE); if (skb_shinfo(skb)-frag_list == NULL) { nic-mac_control.stats_info-sw_stat.mem_alloc_fail_cnt++; + pci_unmap_single + (nic-pdev, (dma_addr_t)skb-data, l3l4hdr_size + 4, + PCI_DMA_FROMDEVICE); DBG_PRINT(INFO_DBG, %s: dev_alloc_skb failed\n , dev-name); return -ENOMEM ; } @@ -2267,6 +2277,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2399,6 +2414,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || +(((struct RxD1*)rxdp)-Buffer0_ptr == +DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN); please provide a prep patch that eliminates all these inline casts. Create temporary variables or whatever you need to do to convert the messy and unreadable (((struct RxD1*)rxdp)-Buffer0_ptr into desc-Buffer0_ptr. otherwise looks OK - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Hi Jeff, Any update on these patch submission? Is it in queue? Thanks, ~Siva -Original Message- From: Veena Parat [mailto:[EMAIL PROTECTED] Sent: Tuesday, June 19, 2007 3:27 PM To: netdev@vger.kernel.org; [EMAIL PROTECTED] Cc: Leonid Grossman; Ramkrishna Vepa; Rastapur Santosh; Sivakumar Subramani; Sreenivasa Honnur; Alicia Pena; Sriram Rapuru Subject: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -urpN org/drivers/net/s2io.c patch_1/drivers/net/s2io.c --- org/drivers/net/s2io.c 2007-05-17 20:35:39.0 +0530 +++ patch_1/drivers/net/s2io.c 2007-05-17 20:35:55.0 +0530 @@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ (lro_flush_due_to_max_pkts), (lro_avg_aggr_pkts), (mem_alloc_fail_cnt), + {pci_map_fail_cnt}, (watchdog_timer_cnt), (mem_allocated), (mem_freed), @@ -2247,10 +2248,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } + /* skb_shinfo(skb)-frag_list will have L4 data payload */ skb_shinfo(skb)-frag_list = dev_alloc_skb(dev-mtu + ALIGN_SIZE); if (skb_shinfo(skb)-frag_list == NULL) { nic-mac_control.stats_info-sw_stat.mem_alloc_fail_cnt++; + pci_unmap_single + (nic-pdev, (dma_addr_t)skb-data, l3l4hdr_size + 4, + PCI_DMA_FROMDEVICE); DBG_PRINT(INFO_DBG, %s: dev_alloc_skb failed\n , dev-name); return -ENOMEM ; } @@ -2267,6 +2277,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2399,6 +2414,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD1*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN); @@ -2430,14 +2455,19 @@ static int fill_rx_buffers(struct s2io_n skb-data = (void *) (unsigned long)tmp; skb_reset_tail_pointer(skb); - if (!(((struct RxD3*)rxdp)-Buffer0_ptr)) - ((struct RxD3*)rxdp)-Buffer0_ptr = - pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, - PCI_DMA_FROMDEVICE); - else - pci_dma_sync_single_for_device(nic-pdev, - (dma_addr_t) ((struct RxD3*)rxdp)-Buffer0_ptr, - BUF0_LEN, PCI_DMA_FROMDEVICE); + ((struct RxD3*)rxdp)-Buffer0_ptr = + pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, + PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
Re: [PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Sivakumar Subramani wrote: Hi Jeff, Any update on these patch submission? Is it in queue? it's in my mbox queue, to be reviewed. - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2.6.22 1/4]S2IO: Adding checks to check the return value of pci mapping function
Adding checks to check the return value of pci mapping function Signed-off-by: Veena Parat [EMAIL PROTECTED] --- diff -urpN org/drivers/net/s2io.c patch_1/drivers/net/s2io.c --- org/drivers/net/s2io.c 2007-05-17 20:35:39.0 +0530 +++ patch_1/drivers/net/s2io.c 2007-05-17 20:35:55.0 +0530 @@ -282,6 +282,7 @@ static char ethtool_driver_stats_keys[][ (lro_flush_due_to_max_pkts), (lro_avg_aggr_pkts), (mem_alloc_fail_cnt), + {pci_map_fail_cnt}, (watchdog_timer_cnt), (mem_allocated), (mem_freed), @@ -2247,10 +2248,19 @@ static int fill_rxd_3buf(struct s2io_nic (nic-pdev, skb-data, l3l4hdr_size + 4, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer1_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer1_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } + /* skb_shinfo(skb)-frag_list will have L4 data payload */ skb_shinfo(skb)-frag_list = dev_alloc_skb(dev-mtu + ALIGN_SIZE); if (skb_shinfo(skb)-frag_list == NULL) { nic-mac_control.stats_info-sw_stat.mem_alloc_fail_cnt++; + pci_unmap_single + (nic-pdev, (dma_addr_t)skb-data, l3l4hdr_size + 4, + PCI_DMA_FROMDEVICE); DBG_PRINT(INFO_DBG, %s: dev_alloc_skb failed\n , dev-name); return -ENOMEM ; } @@ -2267,6 +2277,11 @@ static int fill_rxd_3buf(struct s2io_nic ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single(nic-pdev, frag_list-data, dev-mtu, PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer2_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer2_ptr == DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat.pci_map_fail_cnt++; + return -ENOMEM; + } rxdp-Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4); rxdp-Control_2 |= SET_BUFFER2_SIZE_3(dev-mtu); @@ -2399,6 +2414,16 @@ static int fill_rx_buffers(struct s2io_n ((struct RxD1*)rxdp)-Buffer0_ptr = pci_map_single (nic-pdev, skb-data, size - NET_IP_ALIGN, PCI_DMA_FROMDEVICE); + if struct RxD1*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD1*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN); @@ -2430,14 +2455,19 @@ static int fill_rx_buffers(struct s2io_n skb-data = (void *) (unsigned long)tmp; skb_reset_tail_pointer(skb); - if (!(((struct RxD3*)rxdp)-Buffer0_ptr)) - ((struct RxD3*)rxdp)-Buffer0_ptr = - pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, - PCI_DMA_FROMDEVICE); - else - pci_dma_sync_single_for_device(nic-pdev, - (dma_addr_t) ((struct RxD3*)rxdp)-Buffer0_ptr, - BUF0_LEN, PCI_DMA_FROMDEVICE); + ((struct RxD3*)rxdp)-Buffer0_ptr = + pci_map_single(nic-pdev, ba-ba_0, BUF0_LEN, + PCI_DMA_FROMDEVICE); + if struct RxD3*)rxdp)-Buffer0_ptr == 0) || + (((struct RxD3*)rxdp)-Buffer0_ptr == + DMA_ERROR_CODE)) { + nic-mac_control.stats_info-sw_stat. + pci_map_fail_cnt++; + nic-mac_control.stats_info-sw_stat.mem_freed + += skb-truesize; + dev_kfree_skb_irq(skb); + return -ENOMEM; + } rxdp-Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN); if (nic-rxd_mode == RXD_MODE_3B) { /* Two buffer mode */ @@ -2447,15 +2477,37 @@ static int fill_rx_buffers(struct s2io_n * L4 payload */ ((struct RxD3*)rxdp)-Buffer2_ptr = pci_map_single -