* [PATCH 08/21] net: natsemi: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 06/21] net: ibmveth: make rx_copybreak threshold consistent with other drivers Michał Mirosław
` (20 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Tim Hockin
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/natsemi.c | 30 +++++-------------------------
1 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 8f8b65a..b461321 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2340,31 +2340,11 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
*/
} else {
struct sk_buff *skb;
- /* Omit CRC size. */
- /* Check if the packet is long enough to accept
- * without copying to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + RX_OFFSET)) != NULL) {
- /* 16 byte align the IP header */
- skb_reserve(skb, RX_OFFSET);
- pci_dma_sync_single_for_cpu(np->pci_dev,
- np->rx_dma[entry],
- buflen,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb,
- np->rx_skbuff[entry]->data, pkt_len);
- skb_put(skb, pkt_len);
- pci_dma_sync_single_for_device(np->pci_dev,
- np->rx_dma[entry],
- buflen,
- PCI_DMA_FROMDEVICE);
- } else {
- pci_unmap_single(np->pci_dev, np->rx_dma[entry],
- buflen + NATSEMI_PADDING,
- PCI_DMA_FROMDEVICE);
- skb_put(skb = np->rx_skbuff[entry], pkt_len);
- np->rx_skbuff[entry] = NULL;
- }
+
+ skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev, np->rx_dma[entry], buflen);
+
skb->protocol = eth_type_trans(skb, dev);
netif_receive_skb(skb);
dev->stats.rx_packets++;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 06/21] net: ibmveth: make rx_copybreak threshold consistent with other drivers
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
2011-07-09 17:17 ` [PATCH 08/21] net: natsemi: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 04/21] net: fealnx: use common rx_copybreak handling Michał Mirosław
` (19 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Santiago Leon
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/ibmveth.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 838c5b6..70c177d 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1074,7 +1074,7 @@ restart_poll:
skb = ibmveth_rxq_get_buffer(adapter);
new_skb = NULL;
- if (length < rx_copybreak)
+ if (length <= rx_copybreak)
new_skb = netdev_alloc_skb(netdev, length);
if (new_skb) {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 04/21] net: fealnx: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
2011-07-09 17:17 ` [PATCH 08/21] net: natsemi: use common rx_copybreak handling Michał Mirosław
2011-07-09 17:17 ` [PATCH 06/21] net: ibmveth: make rx_copybreak threshold consistent with other drivers Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 02/21] net: 3c59x: " Michał Mirosław
` (18 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/fealnx.c | 39 +++++++--------------------------------
1 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index fa8677c..b692a4d 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1693,46 +1693,21 @@ static int netdev_rx(struct net_device *dev)
struct sk_buff *skb;
/* Omit the four octet CRC from the length. */
- short pkt_len = ((rx_status & FLNGMASK) >> FLNGShift) - 4;
+ short pkt_len = ((rx_status & FLNGMASK) >> FLNGShift) - ETH_FCS_LEN;
#ifndef final_version
if (debug)
printk(KERN_DEBUG " netdev_rx() normal Rx pkt length %d"
" status %x.\n", pkt_len, rx_status);
#endif
+ skb = dev_skb_finish_rx_dma(&np->cur_rx->skbuff,
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev, np->cur_rx->buffer,
+ np->rx_buf_sz);
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(np->pci_dev,
- np->cur_rx->buffer,
- np->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- /* Call copy + cksum if available. */
-
-#if ! defined(__alpha__)
- skb_copy_to_linear_data(skb,
- np->cur_rx->skbuff->data, pkt_len);
- skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- np->cur_rx->skbuff->data, pkt_len);
-#endif
- pci_dma_sync_single_for_device(np->pci_dev,
- np->cur_rx->buffer,
- np->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- } else {
- pci_unmap_single(np->pci_dev,
- np->cur_rx->buffer,
- np->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- skb_put(skb = np->cur_rx->skbuff, pkt_len);
- np->cur_rx->skbuff = NULL;
+ if (!np->cur_rx->skbuff)
--np->really_rx_count;
- }
+
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->stats.rx_packets++;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 02/21] net: 3c59x: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (2 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 04/21] net: fealnx: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 22:22 ` Francois Romieu
2011-07-09 17:17 ` [PATCH 07/21] net: lib82596: use common rx_copybreak handling [strict refill!] Michał Mirosław
` (17 subsequent siblings)
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Steffen Klassert
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/3c59x.c | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 8cc2256..456726c 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2576,25 +2576,14 @@ boomerang_rx(struct net_device *dev)
pr_debug("Receiving packet size %d status %4.4x.\n",
pkt_len, rx_status);
- /* Check if the packet is long enough to just accept without
- copying to a properly sized skbuff. */
- if (pkt_len < rx_copybreak && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */
- pci_dma_sync_single_for_cpu(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
- /* 'skb_put()' points to the start of sk_buff data area. */
- memcpy(skb_put(skb, pkt_len),
- vp->rx_skbuff[entry]->data,
- pkt_len);
- pci_dma_sync_single_for_device(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
+ skb = dev_skb_finish_rx_dma(&vp->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &VORTEX_PCI(vp)->dev, dma, PKT_BUF_SZ);
+ if (skb)
vp->rx_copy++;
- } else {
- /* Pass up the skbuff already on the Rx ring. */
- skb = vp->rx_skbuff[entry];
- vp->rx_skbuff[entry] = NULL;
- skb_put(skb, pkt_len);
- pci_unmap_single(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
+ else
vp->rx_nocopy++;
- }
+
skb->protocol = eth_type_trans(skb, dev);
{ /* Use hardware checksum info. */
int csum_bits = rx_status & 0xee000000;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 02/21] net: 3c59x: use common rx_copybreak handling
2011-07-09 17:17 ` [PATCH 02/21] net: 3c59x: " Michał Mirosław
@ 2011-07-09 22:22 ` Francois Romieu
2011-07-09 23:23 ` Michał Mirosław
0 siblings, 1 reply; 34+ messages in thread
From: Francois Romieu @ 2011-07-09 22:22 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev, Steffen Klassert
Michał Mirosław <mirq-linux@rere.qmqm.pl> :
[...]
> diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
> index 8cc2256..456726c 100644
> --- a/drivers/net/3c59x.c
> +++ b/drivers/net/3c59x.c
[...]
> + skb = dev_skb_finish_rx_dma(&vp->rx_skbuff[entry],
> + pkt_len, rx_copybreak,
> + &VORTEX_PCI(vp)->dev, dma, PKT_BUF_SZ);
> + if (skb)
s/if (skb)/if (vp->rx_skbuff[entry])/ probably
--
Ueimor
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 02/21] net: 3c59x: use common rx_copybreak handling
2011-07-09 22:22 ` Francois Romieu
@ 2011-07-09 23:23 ` Michał Mirosław
2011-07-10 7:24 ` Francois Romieu
0 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 23:23 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, Steffen Klassert
On Sun, Jul 10, 2011 at 12:22:58AM +0200, Francois Romieu wrote:
> Michał Mirosław <mirq-linux@rere.qmqm.pl> :
> [...]
> > diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
> > index 8cc2256..456726c 100644
> > --- a/drivers/net/3c59x.c
> > +++ b/drivers/net/3c59x.c
> [...]
> > + skb = dev_skb_finish_rx_dma(&vp->rx_skbuff[entry],
> > + pkt_len, rx_copybreak,
> > + &VORTEX_PCI(vp)->dev, dma, PKT_BUF_SZ);
> > + if (skb)
> s/if (skb)/if (vp->rx_skbuff[entry])/ probably
For this driver and via-velocity - you're right (fixed). For others no -
they always refill the rx ring, possibly discarding the packet.
Best Regards,
Michał Mirosław
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 07/21] net: lib82596: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (3 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 02/21] net: 3c59x: " Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 22:25 ` Francois Romieu
2011-07-09 17:17 ` [PATCH 05/21] net: hamachi: use common rx_copybreak handling Michał Mirosław
` (16 subsequent siblings)
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/lib82596.c | 66 ++++++++++-------------------------------------
1 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 9e04289..d19e05b 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -679,67 +679,29 @@ static inline int i596_rx(struct net_device *dev)
if (rbd != NULL && (rfd->stat & SWAP16(STAT_OK))) {
/* a good frame */
int pkt_len = SWAP16(rbd->count) & 0x3fff;
- struct sk_buff *skb = rbd->skb;
- int rx_in_place = 0;
+ struct sk_buff *skb;
+ dma_addr_t dma_addr;
DEB(DEB_RXADDR, print_eth(rbd->v_data, "received"));
frames++;
- /* Check if the packet is long enough to just accept
- * without copying to a properly sized skbuff.
- */
+ dma_addr = SWAP32(rbd->b_data);
+ skb = dev_skb_finish_rx_dma_refill(&rbd->skb,
+ pkt_len, rx_copybreak, NET_IP_ALIGN, 0,
+ dev->dev.parent, &dma_addr, PKT_BUF_SZ);
+ rbd->v_data = rbd->skb->data;
+ rbd->b_data = SWAP32(dma_addr);
+ DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
- if (pkt_len > rx_copybreak) {
- struct sk_buff *newskb;
- dma_addr_t dma_addr;
-
- dma_unmap_single(dev->dev.parent,
- (dma_addr_t)SWAP32(rbd->b_data),
- PKT_BUF_SZ, DMA_FROM_DEVICE);
- /* Get fresh skbuff to replace filled one. */
- newskb = netdev_alloc_skb_ip_align(dev,
- PKT_BUF_SZ);
- if (newskb == NULL) {
- skb = NULL; /* drop pkt */
- goto memory_squeeze;
- }
-
- /* Pass up the skb already on the Rx ring. */
- skb_put(skb, pkt_len);
- rx_in_place = 1;
- rbd->skb = newskb;
- dma_addr = dma_map_single(dev->dev.parent,
- newskb->data,
- PKT_BUF_SZ,
- DMA_FROM_DEVICE);
- rbd->v_data = newskb->data;
- rbd->b_data = SWAP32(dma_addr);
- DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
- } else
- skb = netdev_alloc_skb_ip_align(dev, pkt_len);
-memory_squeeze:
- if (skb == NULL) {
- /* XXX tulip.c can defer packets here!! */
- printk(KERN_ERR
- "%s: i596_rx Memory squeeze, dropping packet.\n",
- dev->name);
- dev->stats.rx_dropped++;
- } else {
- if (!rx_in_place) {
- /* 16 byte align the data fields */
- dma_sync_single_for_cpu(dev->dev.parent,
- (dma_addr_t)SWAP32(rbd->b_data),
- PKT_BUF_SZ, DMA_FROM_DEVICE);
- memcpy(skb_put(skb, pkt_len), rbd->v_data, pkt_len);
- dma_sync_single_for_device(dev->dev.parent,
- (dma_addr_t)SWAP32(rbd->b_data),
- PKT_BUF_SZ, DMA_FROM_DEVICE);
- }
- skb->len = pkt_len;
+ if (likely(skb)) {
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len;
+ } else {
+ netdev_err(dev,
+ "i596_rx Memory squeeze, dropping packet.\n");
+ dev->stats.rx_dropped++;
}
} else {
DEB(DEB_ERRORS, printk(KERN_DEBUG
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 07/21] net: lib82596: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 ` [PATCH 07/21] net: lib82596: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 22:25 ` Francois Romieu
0 siblings, 0 replies; 34+ messages in thread
From: Francois Romieu @ 2011-07-09 22:25 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev
Michał Mirosław <mirq-linux@rere.qmqm.pl> :
[...]
> diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
> index 9e04289..d19e05b 100644
> --- a/drivers/net/lib82596.c
> +++ b/drivers/net/lib82596.c
> @@ -679,67 +679,29 @@ static inline int i596_rx(struct net_device *dev)
> if (rbd != NULL && (rfd->stat & SWAP16(STAT_OK))) {
> /* a good frame */
> int pkt_len = SWAP16(rbd->count) & 0x3fff;
> - struct sk_buff *skb = rbd->skb;
> - int rx_in_place = 0;
> + struct sk_buff *skb;
> + dma_addr_t dma_addr;
>
> DEB(DEB_RXADDR, print_eth(rbd->v_data, "received"));
> frames++;
>
> - /* Check if the packet is long enough to just accept
> - * without copying to a properly sized skbuff.
> - */
> + dma_addr = SWAP32(rbd->b_data);
> + skb = dev_skb_finish_rx_dma_refill(&rbd->skb,
> + pkt_len, rx_copybreak, NET_IP_ALIGN, 0,
> + dev->dev.parent, &dma_addr, PKT_BUF_SZ);
[...]
> + if (likely(skb)) {
s/skb/rbd->skb/
--
Ueimor
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 05/21] net: hamachi: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (4 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 07/21] net: lib82596: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 01/21] net: wrap common patterns of rx handler code Michał Mirosław
` (15 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/hamachi.c | 43 ++++++++-----------------------------------
1 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index c274b3d..68ee914 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1465,7 +1465,7 @@ static int hamachi_rx(struct net_device *dev)
} else {
struct sk_buff *skb;
/* Omit CRC */
- u16 pkt_len = (frame_status & 0x07ff) - 4;
+ u16 pkt_len = (frame_status & 0x07ff) - ETH_FCS_LEN;
#ifdef RX_CHECKSUM
u32 pfck = *(u32 *) &buf_addr[data_size - 8];
#endif
@@ -1485,42 +1485,15 @@ static int hamachi_rx(struct net_device *dev)
*(s32*)&(buf_addr[data_size - 8]),
*(s32*)&(buf_addr[data_size - 4]));
#endif
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
-#ifdef RX_CHECKSUM
- printk(KERN_ERR "%s: rx_copybreak non-zero "
- "not good with RX_CHECKSUM\n", dev->name);
-#endif
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(hmp->pci_dev,
- leXX_to_cpu(hmp->rx_ring[entry].addr),
- hmp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- /* Call copy + cksum if available. */
-#if 1 || USE_IP_COPYSUM
- skb_copy_to_linear_data(skb,
- hmp->rx_skbuff[entry]->data, pkt_len);
- skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len), hmp->rx_ring_dma
- + entry*sizeof(*desc), pkt_len);
-#endif
- pci_dma_sync_single_for_device(hmp->pci_dev,
- leXX_to_cpu(hmp->rx_ring[entry].addr),
- hmp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- } else {
- pci_unmap_single(hmp->pci_dev,
- leXX_to_cpu(hmp->rx_ring[entry].addr),
- hmp->rx_buf_sz, PCI_DMA_FROMDEVICE);
- skb_put(skb = hmp->rx_skbuff[entry], pkt_len);
- hmp->rx_skbuff[entry] = NULL;
- }
+
+ skb = dev_skb_finish_rx_dma(&hmp->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &hmp->pci_dev->dev,
+ leXX_to_cpu(hmp->rx_ring[entry].addr),
+ hmp->rx_buf_sz);
+
skb->protocol = eth_type_trans(skb, dev);
-
#ifdef RX_CHECKSUM
/* TCP or UDP on ipv4, DIX encoding */
if (pfck>>24 == 0x91 || pfck>>24 == 0x51) {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 01/21] net: wrap common patterns of rx handler code
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (5 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 05/21] net: hamachi: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 03/21] net: epic100: use common rx_copybreak handling Michał Mirosław
` (14 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Cc: Steffen Klassert, Santiago Leon, Tim Hockin, Don Fry,
Francois Romieu, Ion Badulescu, Matt Carlson, Michael Chan,
Grant Grundler, David Dillow, Roger Luethi, David S. Miller
Introduce dev_skb_finish_rx_dma() and dev_skb_finish_rx_dma_refill() ---
two common patterns for rx handling as seen in various network drivers
that implement rx_copybreak idea (copying smaller packets, passing larger
ones in original skb).
The common pattern (as implemented in dev_skb_finish_rx_dma()) is:
if (packet len <= threshold)
allocate new, smaller skb
sync DMA buffer to cpu
copy packet's data
give DMA buffer back to device
pass new skb
reuse buffer in rx ring
else (or if skb alloc for copy failed)
unmap DMA buffer
pass skb
remove buffer from rx ring
[refill rx ring later]
This scheme is modified by some drivers to immediately refill rx slot before
passing original rx skb up the stack. Those drivers have also a problem that
they drop packets from the head of the queue when that allocation fails. This
forces unnecessary retransmits and can deadlock if the device is used for
swapping over network. To mark this case, dev_skb_finish_rx_dma_refill()
implementing it, is marked as deprecated to encourage driver maintainers to
look into the matter.
Those functions are called from rx handler hot path and have a lot of arguments,
and so are inlined. This should allow compiler to better optimize the code with
calling code.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
include/linux/skbuff.h | 129 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 08d4507..8f81972 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -29,6 +29,7 @@
#include <linux/rcupdate.h>
#include <linux/dmaengine.h>
#include <linux/hrtimer.h>
+#include <linux/dma-mapping.h>
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
@@ -2281,5 +2282,133 @@ static inline void skb_checksum_none_assert(struct sk_buff *skb)
bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
+/**
+ * __dev_skb_finish_rx_dma - finish skb after DMA'd RX
+ * @skb: skb to finish
+ * @len: packet data length
+ * @copybreak: maximum packet size to copy
+ * @dma_dev: device used for DMA
+ * @dma_buf: DMA mapping address
+ * @dma_len: DMA mapping length
+ *
+ * This function finishes DMA mapping (sync for copied, unmap otherwise) for
+ * a packet and copies it to new skb if its size is at or below @copybreak
+ * threshold.
+ *
+ * Returns new skb or NULL if the copy wasn't made.
+ */
+static inline struct sk_buff *__dev_skb_finish_rx_dma(
+ struct sk_buff *skb, unsigned int len, unsigned int copybreak,
+ struct device *dma_dev, dma_addr_t dma_buf, size_t dma_len)
+{
+ if (len <= copybreak) {
+ struct sk_buff *skb2 = netdev_alloc_skb_ip_align(skb->dev, len);
+ if (likely(skb2)) {
+ dma_sync_single_for_cpu(dma_dev, dma_buf, dma_len,
+ DMA_FROM_DEVICE);
+ skb_copy_to_linear_data(skb2, skb->data, len);
+ dma_sync_single_for_device(dma_dev, dma_buf, dma_len,
+ DMA_FROM_DEVICE);
+ return skb2;
+ }
+ }
+
+ /* else or copy failed */
+
+ dma_unmap_single(dma_dev, dma_buf, dma_len, DMA_FROM_DEVICE);
+ return NULL;
+}
+
+/**
+ * dev_skb_finish_rx_dma - finish skb after DMA'd RX
+ * @pskb: pointer to variable holding skb to finish
+ * @len: packet data length
+ * @copybreak: maximum packet size to copy
+ * @dma_dev: device used for DMA
+ * @dma_buf: DMA mapping address
+ * @dma_len: DMA mapping length
+ *
+ * This function finishes DMA mapping (sync for copied, unmap otherwise) for
+ * a packet and copies it to new skb if its size is at or below @copybreak
+ * threshold. Like __dev_skb_finish_rx_dma().
+ *
+ * Returns the skb - old or copied. *pskb is cleared if the skb wasn't copied.
+ */
+static inline struct sk_buff *dev_skb_finish_rx_dma(
+ struct sk_buff **pskb, unsigned int len, unsigned int copybreak,
+ struct device *dma_dev, dma_addr_t dma_buf, size_t dma_len)
+{
+ struct sk_buff *skb2;
+
+ skb2 = __dev_skb_finish_rx_dma(*pskb, len, copybreak,
+ dma_dev, dma_buf, dma_len);
+
+ if (!skb2) {
+ /* not copied */
+ skb2 = *pskb;
+ *pskb = NULL;
+ }
+
+ skb_put(skb2, len);
+ return skb2;
+}
+
+/**
+ * dev_skb_finish_rx_dma_refill - finish skb after DMA'd RX and refill the slot
+ * @pskb: pointer to variable holding skb to finish
+ * @len: packet data length
+ * @copybreak: maximum packet size to copy
+ * @ip_align: new skb's alignment offset
+ * @rx_offset: count of bytes prepended by HW before packet's data
+ * @dma_dev: device used for DMA
+ * @dma_buf: DMA mapping address
+ * @dma_len: DMA mapping length
+ *
+ * This function finishes DMA mapping (sync for copied, unmap otherwise) for
+ * a packet and copies it to new skb if its size is at or below @copybreak
+ * threshold. Like __dev_skb_finish_rx_dma().
+ *
+ * *pskb is filled with new mapped skb if the skb wasn't copied.
+ * Returns the skb - old or copied, or NULL if refill failed.
+ *
+ * NOTE:
+ * This will effectively drop the packet in case of memory pressure. This
+ * might not be wanted when swapping over network. It's better to throttle
+ * the receiver queue (refill later) as the packet might be needed to
+ * reclaim some memory.
+ */
+static inline __deprecated struct sk_buff *dev_skb_finish_rx_dma_refill(
+ struct sk_buff **pskb, unsigned int len, unsigned int copybreak,
+ unsigned int ip_align, unsigned int rx_offset,
+ struct device *dma_dev, dma_addr_t *dma_buf, size_t dma_len)
+{
+ struct sk_buff *skb;
+
+ skb = __dev_skb_finish_rx_dma(*pskb, len, copybreak,
+ dma_dev, *dma_buf, dma_len);
+
+ if (!skb) {
+ /* not copied */
+ skb = *pskb;
+ /* netdev_alloc_skb_ip_align() */
+ *pskb = netdev_alloc_skb(skb->dev, dma_len + ip_align);
+ if (likely(*pskb))
+ skb_reserve(*pskb, ip_align + rx_offset);
+ else {
+ /* no memory - drop packet */
+ *pskb = skb;
+ skb = NULL;
+ }
+
+ *dma_buf = dma_map_single(dma_dev, (*pskb)->data - rx_offset,
+ dma_len, DMA_FROM_DEVICE);
+ }
+
+ if (likely(skb))
+ skb_put(skb, len);
+
+ return skb;
+}
+
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 03/21] net: epic100: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (6 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 01/21] net: wrap common patterns of rx handler code Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 10/21] net: sgiseeq: use common rx_copybreak handling [strict refill!] Michał Mirosław
` (13 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/epic100.c | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 814c187..0a22072 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1188,37 +1188,21 @@ static int epic_rx(struct net_device *dev, int budget)
} else {
/* Malloc up new buffer, compatible with net-2e. */
/* Omit the four octet CRC from the length. */
- short pkt_len = (status >> 16) - 4;
+ short pkt_len = (status >> 16) - ETH_FCS_LEN;
struct sk_buff *skb;
- if (pkt_len > PKT_BUF_SZ - 4) {
+ if (pkt_len > PKT_BUF_SZ - ETH_FCS_LEN) {
printk(KERN_ERR "%s: Oversized Ethernet frame, status %x "
"%d bytes.\n",
dev->name, status, pkt_len);
pkt_len = 1514;
}
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(ep->pci_dev,
- ep->rx_ring[entry].bufaddr,
- ep->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb, ep->rx_skbuff[entry]->data, pkt_len);
- skb_put(skb, pkt_len);
- pci_dma_sync_single_for_device(ep->pci_dev,
- ep->rx_ring[entry].bufaddr,
- ep->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- } else {
- pci_unmap_single(ep->pci_dev,
- ep->rx_ring[entry].bufaddr,
- ep->rx_buf_sz, PCI_DMA_FROMDEVICE);
- skb_put(skb = ep->rx_skbuff[entry], pkt_len);
- ep->rx_skbuff[entry] = NULL;
- }
+
+ skb = dev_skb_finish_rx_dma(&ep->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &ep->pci_dev->dev, ep->rx_ring[entry].bufaddr,
+ ep->rx_buf_sz);
+
skb->protocol = eth_type_trans(skb, dev);
netif_receive_skb(skb);
dev->stats.rx_packets++;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 10/21] net: sgiseeq: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (7 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 03/21] net: epic100: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 13/21] net: sundance: use common rx_copybreak handling Michał Mirosław
` (12 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Does this card really loop back transmitted packets? The code can be
cleaned up further if it isn't.
Because buffer status is written in it, there is additional pair of
DMA sync to cpu/device before the common path. If it turns out to be
big performance hit this patch should be reverted.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/sgiseeq.c | 66 ++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 52fb7ed..a4c6d93 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -340,9 +340,8 @@ static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp
{
struct sgiseeq_rx_desc *rd;
struct sk_buff *skb = NULL;
- struct sk_buff *newskb;
unsigned char pkt_status;
- int len = 0;
+ int packet_ok, len = 0;
unsigned int orig_end = PREV_RX(sp->rx_new);
/* Service every received packet. */
@@ -350,53 +349,38 @@ static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp
dma_sync_desc_cpu(dev, rd);
while (!(rd->rdma.cntinfo & HPCDMA_OWN)) {
len = PKT_BUF_SZ - (rd->rdma.cntinfo & HPCDMA_BCNT) - 3;
- dma_unmap_single(dev->dev.parent, rd->rdma.pbuf,
+ dma_sync_single_for_cpu(dev->dev.parent, rd->rdma.pbuf,
PKT_BUF_SZ, DMA_FROM_DEVICE);
pkt_status = rd->skb->data[len];
if (pkt_status & SEEQ_RSTAT_FIG) {
/* Packet is OK. */
/* We don't want to receive our own packets */
- if (memcmp(rd->skb->data + 6, dev->dev_addr, ETH_ALEN)) {
- if (len > rx_copybreak) {
- skb = rd->skb;
- newskb = netdev_alloc_skb(dev, PKT_BUF_SZ);
- if (!newskb) {
- newskb = skb;
- skb = NULL;
- goto memory_squeeze;
- }
- skb_reserve(newskb, 2);
- } else {
- skb = netdev_alloc_skb_ip_align(dev, len);
- if (skb)
- skb_copy_to_linear_data(skb, rd->skb->data, len);
-
- newskb = rd->skb;
- }
-memory_squeeze:
- if (skb) {
- skb_put(skb, len);
- skb->protocol = eth_type_trans(skb, dev);
- netif_rx(skb);
- dev->stats.rx_packets++;
- dev->stats.rx_bytes += len;
- } else {
- printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n",
- dev->name);
- dev->stats.rx_dropped++;
- }
- } else {
- /* Silently drop my own packets */
- newskb = rd->skb;
- }
+ packet_ok = memcmp(rd->skb->data + 6, dev->dev_addr, ETH_ALEN);
} else {
record_rx_errors(dev, pkt_status);
- newskb = rd->skb;
+ packet_ok = 0;
+ }
+ dma_sync_single_for_device(dev->dev.parent, rd->rdma.pbuf,
+ PKT_BUF_SZ, DMA_FROM_DEVICE);
+
+ if (packet_ok) {
+ dma_addr_t dma = rd->rdma.pbuf;
+ skb = dev_skb_finish_rx_dma_refill(&rd->skb,
+ len, rx_copybreak, 0, 2,
+ dev->dev.parent, &dma, PKT_BUF_SZ);
+ rd->rdma.pbuf = dma;
+
+ if (likely(skb)) {
+ skb->protocol = eth_type_trans(skb, dev);
+ netif_rx(skb);
+ dev->stats.rx_packets++;
+ dev->stats.rx_bytes += len;
+ } else {
+ printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
+ dev->name);
+ dev->stats.rx_dropped++;
+ }
}
- rd->skb = newskb;
- rd->rdma.pbuf = dma_map_single(dev->dev.parent,
- newskb->data - 2,
- PKT_BUF_SZ, DMA_FROM_DEVICE);
/* Return the entry to the ring pool. */
rd->rdma.cntinfo = RCNTINFO_INIT;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 13/21] net: sundance: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (8 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 10/21] net: sgiseeq: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 12/21] net: starfire: " Michał Mirosław
` (11 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/sundance.c | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 4793df8..0a16798 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1355,26 +1355,12 @@ static void rx_poll(unsigned long data)
", bogus_cnt %d.\n",
pkt_len, boguscnt);
#endif
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- dma_sync_single_for_cpu(&np->pci_dev->dev,
- le32_to_cpu(desc->frag[0].addr),
- np->rx_buf_sz, DMA_FROM_DEVICE);
- skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len);
- dma_sync_single_for_device(&np->pci_dev->dev,
- le32_to_cpu(desc->frag[0].addr),
- np->rx_buf_sz, DMA_FROM_DEVICE);
- skb_put(skb, pkt_len);
- } else {
- dma_unmap_single(&np->pci_dev->dev,
- le32_to_cpu(desc->frag[0].addr),
- np->rx_buf_sz, DMA_FROM_DEVICE);
- skb_put(skb = np->rx_skbuff[entry], pkt_len);
- np->rx_skbuff[entry] = NULL;
- }
+ skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev,
+ le32_to_cpu(desc->frag[0].addr),
+ np->rx_buf_sz);
+
skb->protocol = eth_type_trans(skb, dev);
/* Note: checksum -> skb->ip_summed = CHECKSUM_UNNECESSARY; */
netif_rx(skb);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 12/21] net: starfire: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (9 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 13/21] net: sundance: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 09/21] net: pcnet32: use common rx_copybreak handling [strict refill!] Michał Mirosław
` (10 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Ion Badulescu
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/starfire.c | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 860a508..1664f25 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1475,26 +1475,15 @@ static int __netdev_rx(struct net_device *dev, int *quota)
if (debug > 4)
printk(KERN_DEBUG " netdev_rx() normal Rx pkt length %d, quota %d.\n", pkt_len, *quota);
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(np->pci_dev,
- np->rx_info[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb, np->rx_info[entry].skb->data, pkt_len);
- pci_dma_sync_single_for_device(np->pci_dev,
- np->rx_info[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
- skb_put(skb, pkt_len);
- } else {
- pci_unmap_single(np->pci_dev, np->rx_info[entry].mapping, np->rx_buf_sz, PCI_DMA_FROMDEVICE);
- skb = np->rx_info[entry].skb;
- skb_put(skb, pkt_len);
- np->rx_info[entry].skb = NULL;
+
+ skb = dev_skb_finish_rx_dma(&np->rx_info[entry].skb,
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev, np->rx_info[entry].mapping,
+ np->rx_buf_sz);
+
+ if (!np->rx_info[entry].skb) /* not copied */
np->rx_info[entry].mapping = 0;
- }
+
#ifndef final_version /* Remove after testing. */
/* You will want this info for the initial debug. */
if (debug > 5) {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 09/21] net: pcnet32: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (10 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 12/21] net: starfire: " Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 22:28 ` Francois Romieu
2011-07-09 17:17 ` [PATCH 11/21] net: sis190: use common rx_copybreak handling Michał Mirosław
` (9 subsequent siblings)
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Don Fry
Also use netdev_alloc_skb_ip_align() to make code correct (skb->dev
is needed in new common path) and easier to follow.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/pcnet32.c | 52 ++++++++----------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 8b3090d..baae404 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -588,7 +588,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
/* now allocate any new buffers needed */
for (; new < size; new++) {
struct sk_buff *rx_skbuff;
- new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
+ new_skb_list[new] = netdev_alloc_skb_ip_align(dev, PKT_BUF_SKB);
rx_skbuff = new_skb_list[new];
if (!rx_skbuff) {
/* keep the original lists and buffers */
@@ -596,7 +596,6 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
__func__);
goto free_all_new;
}
- skb_reserve(rx_skbuff, NET_IP_ALIGN);
new_dma_addr_list[new] =
pci_map_single(lp->pci_dev, rx_skbuff->data,
@@ -1147,51 +1146,18 @@ static void pcnet32_rx_entry(struct net_device *dev,
return;
}
- if (pkt_len > rx_copybreak) {
- struct sk_buff *newskb;
-
- newskb = dev_alloc_skb(PKT_BUF_SKB);
- if (newskb) {
- skb_reserve(newskb, NET_IP_ALIGN);
- skb = lp->rx_skbuff[entry];
- pci_unmap_single(lp->pci_dev,
- lp->rx_dma_addr[entry],
- PKT_BUF_SIZE,
- PCI_DMA_FROMDEVICE);
- skb_put(skb, pkt_len);
- lp->rx_skbuff[entry] = newskb;
- lp->rx_dma_addr[entry] =
- pci_map_single(lp->pci_dev,
- newskb->data,
- PKT_BUF_SIZE,
- PCI_DMA_FROMDEVICE);
- rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
- rx_in_place = 1;
- } else
- skb = NULL;
- } else
- skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
+ skb = dev_skb_finish_rx_dma_refill(&lp->rx_skbuff[entry],
+ pkt_len, rx_copybreak, NET_IP_ALIGN, 0,
+ &lp->pci_dev->dev, &lp->rx_dma_addr[entry],
+ PKT_BUF_SIZE);
+ rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
if (skb == NULL) {
netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}
- if (!rx_in_place) {
- skb_reserve(skb, NET_IP_ALIGN);
- skb_put(skb, pkt_len); /* Make room */
- pci_dma_sync_single_for_cpu(lp->pci_dev,
- lp->rx_dma_addr[entry],
- pkt_len,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb,
- (unsigned char *)(lp->rx_skbuff[entry]->data),
- pkt_len);
- pci_dma_sync_single_for_device(lp->pci_dev,
- lp->rx_dma_addr[entry],
- pkt_len,
- PCI_DMA_FROMDEVICE);
- }
+
dev->stats.rx_bytes += skb->len;
skb->protocol = eth_type_trans(skb, dev);
netif_receive_skb(skb);
@@ -2271,7 +2237,8 @@ static int pcnet32_init_ring(struct net_device *dev)
for (i = 0; i < lp->rx_ring_size; i++) {
struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
if (rx_skbuff == NULL) {
- lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB);
+ lp->rx_skbuff[i] =
+ netdev_alloc_skb_ip_align(dev, PKT_BUF_SKB);
rx_skbuff = lp->rx_skbuff[i];
if (!rx_skbuff) {
/* there is not much we can do at this point */
@@ -2279,7 +2246,6 @@ static int pcnet32_init_ring(struct net_device *dev)
__func__);
return -1;
}
- skb_reserve(rx_skbuff, NET_IP_ALIGN);
}
rmb();
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 09/21] net: pcnet32: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 ` [PATCH 09/21] net: pcnet32: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 22:28 ` Francois Romieu
0 siblings, 0 replies; 34+ messages in thread
From: Francois Romieu @ 2011-07-09 22:28 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev, Don Fry
Michał Mirosław <mirq-linux@rere.qmqm.pl> :
[...]
> diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
> index 8b3090d..baae404 100644
> --- a/drivers/net/pcnet32.c
> +++ b/drivers/net/pcnet32.c
> @@ -1147,51 +1146,18 @@ static void pcnet32_rx_entry(struct net_device *dev,
> return;
> }
>
> - if (pkt_len > rx_copybreak) {
> - struct sk_buff *newskb;
> -
> - newskb = dev_alloc_skb(PKT_BUF_SKB);
> - if (newskb) {
> - skb_reserve(newskb, NET_IP_ALIGN);
> - skb = lp->rx_skbuff[entry];
> - pci_unmap_single(lp->pci_dev,
> - lp->rx_dma_addr[entry],
> - PKT_BUF_SIZE,
> - PCI_DMA_FROMDEVICE);
> - skb_put(skb, pkt_len);
> - lp->rx_skbuff[entry] = newskb;
> - lp->rx_dma_addr[entry] =
> - pci_map_single(lp->pci_dev,
> - newskb->data,
> - PKT_BUF_SIZE,
> - PCI_DMA_FROMDEVICE);
> - rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
> - rx_in_place = 1;
> - } else
> - skb = NULL;
> - } else
> - skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
> + skb = dev_skb_finish_rx_dma_refill(&lp->rx_skbuff[entry],
> + pkt_len, rx_copybreak, NET_IP_ALIGN, 0,
> + &lp->pci_dev->dev, &lp->rx_dma_addr[entry],
> + PKT_BUF_SIZE);
> + rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
>
> if (skb == NULL) {
s/skb/lp->rx_skbuff[entry]/
--
Ueimor
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 11/21] net: sis190: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (11 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 09/21] net: pcnet32: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 14/21] net: tg3: mark bad rx handler behaviour [strict refill!] Michał Mirosław
` (8 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Francois Romieu
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/sis190.c | 38 +++++---------------------------------
1 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 8ad7bfb..6836e0d 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -530,29 +530,6 @@ static u32 sis190_rx_fill(struct sis190_private *tp, struct net_device *dev,
return cur - start;
}
-static bool sis190_try_rx_copy(struct sis190_private *tp,
- struct sk_buff **sk_buff, int pkt_size,
- dma_addr_t addr)
-{
- struct sk_buff *skb;
- bool done = false;
-
- if (pkt_size >= rx_copybreak)
- goto out;
-
- skb = netdev_alloc_skb_ip_align(tp->dev, pkt_size);
- if (!skb)
- goto out;
-
- pci_dma_sync_single_for_cpu(tp->pci_dev, addr, tp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size);
- *sk_buff = skb;
- done = true;
-out:
- return done;
-}
-
static inline int sis190_rx_pkt_err(u32 status, struct net_device_stats *stats)
{
#define ErrMask (OVRUN | SHORT | LIMIT | MIIER | NIBON | COLON | ABORT)
@@ -612,19 +589,14 @@ static int sis190_rx_interrupt(struct net_device *dev,
continue;
}
-
- if (sis190_try_rx_copy(tp, &skb, pkt_size, addr)) {
- pci_dma_sync_single_for_device(pdev, addr,
- tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ skb = dev_skb_finish_rx_dma(&tp->Rx_skbuff[entry],
+ pkt_size, rx_copybreak,
+ &pdev->dev, addr, tp->rx_buf_sz);
+ if (tp->Rx_skbuff[entry]) /* copied */
sis190_give_to_asic(desc, tp->rx_buf_sz);
- } else {
- pci_unmap_single(pdev, addr, tp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- tp->Rx_skbuff[entry] = NULL;
+ else
sis190_make_unusable_by_asic(desc);
- }
- skb_put(skb, pkt_size);
skb->protocol = eth_type_trans(skb, dev);
sis190_rx_skb(skb);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 14/21] net: tg3: mark bad rx handler behaviour [strict refill!]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (12 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 11/21] net: sis190: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 21/21] net: yellowfin: use common rx_copybreak handling Michał Mirosław
` (7 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Matt Carlson, Michael Chan
This could use common rx handler code, but the code is too complex for
a simple conversion. Just warn about its behaviour.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/tg3.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 8211b9a..c64b403 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4973,6 +4973,8 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key,
*post_ptr);
+#warning drops packets from rx queue head on memory pressure
+#warning (like dev_skb_finish_rx_dma_refill() users)
if (skb_size < 0)
goto drop_it;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 21/21] net: yellowfin: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (13 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 14/21] net: tg3: mark bad rx handler behaviour [strict refill!] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 16/21] net: tulip/interrupt.c: " Michał Mirosław
` (6 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/yellowfin.c | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 3e5ac60..e1aa4a6 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -1124,27 +1124,12 @@ static int yellowfin_rx(struct net_device *dev)
printk(KERN_DEBUG " %s() normal Rx pkt length %d of %d, bogus_cnt %d\n",
__func__, pkt_len, data_size, boguscnt);
#endif
- /* Check if the packet is long enough to just pass up the skbuff
- without copying to a properly sized skbuff. */
- if (pkt_len > rx_copybreak) {
- skb_put(skb = rx_skb, pkt_len);
- pci_unmap_single(yp->pci_dev,
- le32_to_cpu(yp->rx_ring[entry].addr),
- yp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- yp->rx_skbuff[entry] = NULL;
- } else {
- skb = dev_alloc_skb(pkt_len + 2);
- if (skb == NULL)
- break;
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- skb_copy_to_linear_data(skb, rx_skb->data, pkt_len);
- skb_put(skb, pkt_len);
- pci_dma_sync_single_for_device(yp->pci_dev,
- le32_to_cpu(desc->addr),
- yp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- }
+ skb = dev_skb_finish_rx_dma(&yp->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &yp->pci_dev->dev,
+ le32_to_cpu(desc->addr),
+ yp->rx_buf_sz);
+
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->stats.rx_packets++;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 16/21] net: tulip/interrupt.c: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (14 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 21/21] net: yellowfin: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 15/21] net: tulip/de2104x: use common rx_copybreak handling [strict refill!] Michał Mirosław
` (5 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Grant Grundler
Note:
The driver has NAPI and non-NAPI versions that look the same.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/tulip/interrupt.c | 77 ++++++++--------------------------------
1 files changed, 16 insertions(+), 61 deletions(-)
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 5350d75..990f2a7 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -200,32 +200,14 @@ int tulip_poll(struct napi_struct *napi, int budget)
dev->stats.rx_fifo_errors++;
}
} else {
- struct sk_buff *skb;
-
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < tulip_rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(tp->pdev,
- tp->rx_buffers[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
-#if ! defined(__alpha__)
- skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
- pkt_len);
- skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- tp->rx_buffers[entry].skb->data,
- pkt_len);
-#endif
- pci_dma_sync_single_for_device(tp->pdev,
- tp->rx_buffers[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
- } else { /* Pass up the skb already on the Rx ring. */
- char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
- pkt_len);
+ struct sk_buff *skb = dev_skb_finish_rx_dma(
+ &tp->rx_buffers[entry].skb,
+ pkt_len, tulip_rx_copybreak,
+ &tp->pdev->dev,
+ tp->rx_buffers[entry].mapping,
+ PKT_BUF_SZ);
+ if (!tp->rx_buffers[entry].skb) {
#ifndef final_version
if (tp->rx_buffers[entry].mapping !=
le32_to_cpu(tp->rx_ring[entry].buffer1)) {
@@ -233,14 +215,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
"Internal fault: The skbuff addresses do not match in tulip_rx: %08x vs. %08llx %p / %p\n",
le32_to_cpu(tp->rx_ring[entry].buffer1),
(unsigned long long)tp->rx_buffers[entry].mapping,
- skb->head, temp);
+ skb->head, skb->data);
}
#endif
-
- pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
- PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
-
- tp->rx_buffers[entry].skb = NULL;
tp->rx_buffers[entry].mapping = 0;
}
skb->protocol = eth_type_trans(skb, dev);
@@ -426,32 +403,14 @@ static int tulip_rx(struct net_device *dev)
dev->stats.rx_fifo_errors++;
}
} else {
- struct sk_buff *skb;
-
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < tulip_rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(tp->pdev,
- tp->rx_buffers[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
-#if ! defined(__alpha__)
- skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
- pkt_len);
- skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- tp->rx_buffers[entry].skb->data,
- pkt_len);
-#endif
- pci_dma_sync_single_for_device(tp->pdev,
- tp->rx_buffers[entry].mapping,
- pkt_len, PCI_DMA_FROMDEVICE);
- } else { /* Pass up the skb already on the Rx ring. */
- char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
- pkt_len);
+ struct sk_buff *skb = dev_skb_finish_rx_dma(
+ &tp->rx_buffers[entry].skb,
+ pkt_len, tulip_rx_copybreak,
+ &tp->pdev->dev,
+ tp->rx_buffers[entry].mapping,
+ PKT_BUF_SZ);
+ if (!tp->rx_buffers[entry].skb) {
#ifndef final_version
if (tp->rx_buffers[entry].mapping !=
le32_to_cpu(tp->rx_ring[entry].buffer1)) {
@@ -459,14 +418,10 @@ static int tulip_rx(struct net_device *dev)
"Internal fault: The skbuff addresses do not match in tulip_rx: %08x vs. %Lx %p / %p\n",
le32_to_cpu(tp->rx_ring[entry].buffer1),
(long long)tp->rx_buffers[entry].mapping,
- skb->head, temp);
+ skb->head, skb->data);
}
#endif
- pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
- PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
-
- tp->rx_buffers[entry].skb = NULL;
tp->rx_buffers[entry].mapping = 0;
}
skb->protocol = eth_type_trans(skb, dev);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 15/21] net: tulip/de2104x: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (15 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 16/21] net: tulip/interrupt.c: " Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 22:31 ` Francois Romieu
2011-07-09 17:17 ` [PATCH 17/21] net: tulip/winbond-840: use common rx_copybreak handling Michał Mirosław
` (4 subsequent siblings)
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Grant Grundler
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/tulip/de2104x.c | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index ce90efc..80a34b6 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -409,8 +409,7 @@ static void de_rx (struct de_private *de)
while (--rx_work) {
u32 status, len;
dma_addr_t mapping;
- struct sk_buff *skb, *copy_skb;
- unsigned copying_skb, buflen;
+ struct sk_buff *skb;
skb = de->rx_skb[rx_tail].skb;
BUG_ON(!skb);
@@ -432,42 +431,22 @@ static void de_rx (struct de_private *de)
goto rx_next;
}
- copying_skb = (len <= rx_copybreak);
-
netif_dbg(de, rx_status, de->dev,
"rx slot %d status 0x%x len %d copying? %d\n",
- rx_tail, status, len, copying_skb);
+ rx_tail, status, len, len <= rx_copybreak);
- buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
- copy_skb = dev_alloc_skb (buflen);
- if (unlikely(!copy_skb)) {
+ skb = dev_skb_finish_rx_dma_refill(&de->rx_skb[rx_tail].skb,
+ len, rx_copybreak, 0, RX_OFFSET,
+ &de->pdev->dev, &mapping, de->rx_buf_sz);
+ de->rx_skb[rx_tail].mapping = mapping;
+
+ if (unlikely(!skb)) {
de->net_stats.rx_dropped++;
drop = 1;
rx_work = 100;
goto rx_next;
}
- if (!copying_skb) {
- pci_unmap_single(de->pdev, mapping,
- buflen, PCI_DMA_FROMDEVICE);
- skb_put(skb, len);
-
- mapping =
- de->rx_skb[rx_tail].mapping =
- pci_map_single(de->pdev, copy_skb->data,
- buflen, PCI_DMA_FROMDEVICE);
- de->rx_skb[rx_tail].skb = copy_skb;
- } else {
- pci_dma_sync_single_for_cpu(de->pdev, mapping, len, PCI_DMA_FROMDEVICE);
- skb_reserve(copy_skb, RX_OFFSET);
- skb_copy_from_linear_data(skb, skb_put(copy_skb, len),
- len);
- pci_dma_sync_single_for_device(de->pdev, mapping, len, PCI_DMA_FROMDEVICE);
-
- /* We'll reuse the original ring buffer. */
- skb = copy_skb;
- }
-
skb->protocol = eth_type_trans (skb, de->dev);
de->net_stats.rx_packets++;
@@ -1292,6 +1271,7 @@ static int de_refill_rx (struct de_private *de)
de->rx_skb[i].mapping = pci_map_single(de->pdev,
skb->data, de->rx_buf_sz, PCI_DMA_FROMDEVICE);
de->rx_skb[i].skb = skb;
+ skb_reserve(skb, RX_OFFSET);
de->rx_ring[i].opts1 = cpu_to_le32(DescOwn);
if (i == (DE_RX_RING_SIZE - 1))
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 15/21] net: tulip/de2104x: use common rx_copybreak handling [strict refill!]
2011-07-09 17:17 ` [PATCH 15/21] net: tulip/de2104x: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 22:31 ` Francois Romieu
0 siblings, 0 replies; 34+ messages in thread
From: Francois Romieu @ 2011-07-09 22:31 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev, Grant Grundler
Michał Mirosław <mirq-linux@rere.qmqm.pl> :
[...]
> diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
> index ce90efc..80a34b6 100644
> --- a/drivers/net/tulip/de2104x.c
> +++ b/drivers/net/tulip/de2104x.c
> @@ -432,42 +431,22 @@ static void de_rx (struct de_private *de)
> goto rx_next;
> }
>
> - copying_skb = (len <= rx_copybreak);
> -
> netif_dbg(de, rx_status, de->dev,
> "rx slot %d status 0x%x len %d copying? %d\n",
> - rx_tail, status, len, copying_skb);
> + rx_tail, status, len, len <= rx_copybreak);
>
> - buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
> - copy_skb = dev_alloc_skb (buflen);
> - if (unlikely(!copy_skb)) {
> + skb = dev_skb_finish_rx_dma_refill(&de->rx_skb[rx_tail].skb,
> + len, rx_copybreak, 0, RX_OFFSET,
> + &de->pdev->dev, &mapping, de->rx_buf_sz);
> + de->rx_skb[rx_tail].mapping = mapping;
> +
> + if (unlikely(!skb)) {
s/skb/de->rx_skb[rx_tail].skb/
--
Ueimor
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 17/21] net: tulip/winbond-840: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (16 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 15/21] net: tulip/de2104x: use common rx_copybreak handling [strict refill!] Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:17 ` [PATCH 20/21] net: via-velocity: " Michał Mirosław
` (3 subsequent siblings)
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Grant Grundler
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/tulip/winbond-840.c | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 862eadf..c023512 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1228,26 +1228,11 @@ static int netdev_rx(struct net_device *dev)
netdev_dbg(dev, " netdev_rx() normal Rx pkt length %d status %x\n",
pkt_len, status);
#endif
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
- np->rx_skbuff[entry]->len,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len);
- skb_put(skb, pkt_len);
- pci_dma_sync_single_for_device(np->pci_dev,np->rx_addr[entry],
- np->rx_skbuff[entry]->len,
- PCI_DMA_FROMDEVICE);
- } else {
- pci_unmap_single(np->pci_dev,np->rx_addr[entry],
- np->rx_skbuff[entry]->len,
- PCI_DMA_FROMDEVICE);
- skb_put(skb = np->rx_skbuff[entry], pkt_len);
- np->rx_skbuff[entry] = NULL;
- }
+ skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev, np->rx_addr[entry],
+ np->rx_buf_sz);
+
#ifndef final_version /* Remove after testing. */
/* You will want this info for the initial debug. */
if (debug > 5)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 20/21] net: via-velocity: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (17 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 17/21] net: tulip/winbond-840: use common rx_copybreak handling Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 22:19 ` Francois Romieu
2011-07-09 17:17 ` [PATCH 18/21] net: typhoon: " Michał Mirosław
` (2 subsequent siblings)
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Francois Romieu
This also fixes a bug, where FCS was not stripped from copied packets.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/via-velocity.c | 59 +++++++------------------------------------
1 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index f929242..cdc51de 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1987,37 +1987,6 @@ static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb)
}
/**
- * velocity_rx_copy - in place Rx copy for small packets
- * @rx_skb: network layer packet buffer candidate
- * @pkt_size: received data size
- * @rd: receive packet descriptor
- * @dev: network device
- *
- * Replace the current skb that is scheduled for Rx processing by a
- * shorter, immediately allocated skb, if the received packet is small
- * enough. This function returns a negative value if the received
- * packet is too big or if memory is exhausted.
- */
-static int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
- struct velocity_info *vptr)
-{
- int ret = -1;
- if (pkt_size < rx_copybreak) {
- struct sk_buff *new_skb;
-
- new_skb = netdev_alloc_skb_ip_align(vptr->dev, pkt_size);
- if (new_skb) {
- new_skb->ip_summed = rx_skb[0]->ip_summed;
- skb_copy_from_linear_data(*rx_skb, new_skb->data, pkt_size);
- *rx_skb = new_skb;
- ret = 0;
- }
-
- }
- return ret;
-}
-
-/**
* velocity_iph_realign - IP header alignment
* @vptr: velocity we are handling
* @skb: network layer packet buffer
@@ -2027,10 +1996,10 @@ static int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
* configured by the user.
*/
static inline void velocity_iph_realign(struct velocity_info *vptr,
- struct sk_buff *skb, int pkt_size)
+ struct sk_buff *skb)
{
if (vptr->flags & VELOCITY_FLAGS_IP_ALIGN) {
- memmove(skb->data + 2, skb->data, pkt_size);
+ memmove(skb->data + 2, skb->data, skb->len);
skb_reserve(skb, 2);
}
}
@@ -2064,9 +2033,6 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
skb = rd_info->skb;
- pci_dma_sync_single_for_cpu(vptr->pdev, rd_info->skb_dma,
- vptr->rx.buf_sz, PCI_DMA_FROMDEVICE);
-
/*
* Drop frame not meeting IEEE 802.3
*/
@@ -2078,30 +2044,25 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
}
}
- pci_action = pci_dma_sync_single_for_device;
+ skb = dev_skb_finish_rx_dma(&rd_info->skb,
+ pkt_len - ETH_FCS_LEN, rx_copybreak,
+ &vptr->pdev->dev, rd_info->skb_dma, vptr->rx.buf_sz);
+ if (!skb)
+ /* not copied */
+ velocity_iph_realign(vptr, skb);
velocity_rx_csum(rd, skb);
- if (velocity_rx_copy(&skb, pkt_len, vptr) < 0) {
- velocity_iph_realign(vptr, skb, pkt_len);
- pci_action = pci_unmap_single;
- rd_info->skb = NULL;
- }
-
- pci_action(vptr->pdev, rd_info->skb_dma, vptr->rx.buf_sz,
- PCI_DMA_FROMDEVICE);
-
- skb_put(skb, pkt_len - 4);
skb->protocol = eth_type_trans(skb, vptr->dev);
+ stats->rx_bytes += skb->len;
+
if (vptr->vlgrp && (rd->rdesc0.RSR & RSR_DETAG)) {
vlan_hwaccel_rx(skb, vptr->vlgrp,
swab16(le16_to_cpu(rd->rdesc1.PQTAG)));
} else
netif_rx(skb);
- stats->rx_bytes += pkt_len;
-
return 0;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 20/21] net: via-velocity: use common rx_copybreak handling
2011-07-09 17:17 ` [PATCH 20/21] net: via-velocity: " Michał Mirosław
@ 2011-07-09 22:19 ` Francois Romieu
0 siblings, 0 replies; 34+ messages in thread
From: Francois Romieu @ 2011-07-09 22:19 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev
Michał Mirosław <mirq-linux@rere.qmqm.pl> :
[...]
> diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
> index f929242..cdc51de 100644
> --- a/drivers/net/via-velocity.c
> +++ b/drivers/net/via-velocity.c
[...]
> @@ -2027,10 +1996,10 @@ static int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
> * configured by the user.
> */
> static inline void velocity_iph_realign(struct velocity_info *vptr,
> - struct sk_buff *skb, int pkt_size)
> + struct sk_buff *skb)
> {
> if (vptr->flags & VELOCITY_FLAGS_IP_ALIGN) {
> - memmove(skb->data + 2, skb->data, pkt_size);
> + memmove(skb->data + 2, skb->data, skb->len);
> skb_reserve(skb, 2);
> }
> }
[...]
> @@ -2078,30 +2044,25 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
> }
> }
>
> - pci_action = pci_dma_sync_single_for_device;
> + skb = dev_skb_finish_rx_dma(&rd_info->skb,
> + pkt_len - ETH_FCS_LEN, rx_copybreak,
> + &vptr->pdev->dev, rd_info->skb_dma, vptr->rx.buf_sz);
> + if (!skb)
> + /* not copied */
> + velocity_iph_realign(vptr, skb);
s/if (!skb)/if (!rd_info->skb)/ ?
--
Ueimor
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 18/21] net: typhoon: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (18 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 20/21] net: via-velocity: " Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 17:46 ` David Dillow
2011-07-09 17:17 ` [PATCH 19/21] net: via-rhine: " Michał Mirosław
2011-07-09 18:20 ` [PATCH 00/21] clean up rx_copybreak handling [split version] Joe Perches
21 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: David Dillow
v2: fix inverted test on skb refill/reuse
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/typhoon.c | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 1d5091a..e769cad 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -1646,7 +1646,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read
volatile __le32 * cleared, int budget)
{
struct rx_desc *rx;
- struct sk_buff *skb, *new_skb;
+ struct sk_buff *new_skb;
struct rxbuff_ent *rxb;
dma_addr_t dma_addr;
u32 local_ready;
@@ -1663,7 +1663,6 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read
rx = (struct rx_desc *) (rxRing->ringBase + rxaddr);
idx = rx->addr;
rxb = &tp->rxbuffers[idx];
- skb = rxb->skb;
dma_addr = rxb->dma_addr;
typhoon_inc_rx_index(&rxaddr, 1);
@@ -1675,25 +1674,14 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read
pkt_len = le16_to_cpu(rx->frameLen);
- if(pkt_len < rx_copybreak &&
- (new_skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb_reserve(new_skb, 2);
- pci_dma_sync_single_for_cpu(tp->pdev, dma_addr,
- PKT_BUF_SZ,
- PCI_DMA_FROMDEVICE);
- skb_copy_to_linear_data(new_skb, skb->data, pkt_len);
- pci_dma_sync_single_for_device(tp->pdev, dma_addr,
- PKT_BUF_SZ,
- PCI_DMA_FROMDEVICE);
- skb_put(new_skb, pkt_len);
+ new_skb = dev_skb_finish_rx_dma(&rxb->skb, pkt_len,
+ rx_copybreak, &tp->pdev->dev,
+ dma_addr, PKT_BUF_SZ);
+ if (rxb->skb)
typhoon_recycle_rx_skb(tp, idx);
- } else {
- new_skb = skb;
- skb_put(new_skb, pkt_len);
- pci_unmap_single(tp->pdev, dma_addr, PKT_BUF_SZ,
- PCI_DMA_FROMDEVICE);
+ else
typhoon_alloc_rx_skb(tp, idx);
- }
+
new_skb->protocol = eth_type_trans(new_skb, tp->dev);
csum_bits = rx->rxStatus & (TYPHOON_RX_IP_CHK_GOOD |
TYPHOON_RX_UDP_CHK_GOOD | TYPHOON_RX_TCP_CHK_GOOD);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 19/21] net: via-rhine: use common rx_copybreak handling
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (19 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 18/21] net: typhoon: " Michał Mirosław
@ 2011-07-09 17:17 ` Michał Mirosław
2011-07-09 18:20 ` [PATCH 00/21] clean up rx_copybreak handling [split version] Joe Perches
21 siblings, 0 replies; 34+ messages in thread
From: Michał Mirosław @ 2011-07-09 17:17 UTC (permalink / raw)
To: netdev; +Cc: Roger Luethi
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/via-rhine.c | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 7f23ab9..c97265e 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1764,40 +1764,13 @@ static int rhine_rx(struct net_device *dev, int limit)
} else {
struct sk_buff *skb = NULL;
/* Length should omit the CRC */
- int pkt_len = data_size - 4;
+ int pkt_len = data_size - ETH_FCS_LEN;
u16 vlan_tci = 0;
- /* Check if the packet is long enough to accept without
- copying to a minimally-sized skbuff. */
- if (pkt_len < rx_copybreak)
- skb = netdev_alloc_skb_ip_align(dev, pkt_len);
- if (skb) {
- pci_dma_sync_single_for_cpu(rp->pdev,
- rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
-
- skb_copy_to_linear_data(skb,
- rp->rx_skbuff[entry]->data,
- pkt_len);
- skb_put(skb, pkt_len);
- pci_dma_sync_single_for_device(rp->pdev,
- rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- } else {
- skb = rp->rx_skbuff[entry];
- if (skb == NULL) {
- netdev_err(dev, "Inconsistent Rx descriptor chain\n");
- break;
- }
- rp->rx_skbuff[entry] = NULL;
- skb_put(skb, pkt_len);
- pci_unmap_single(rp->pdev,
- rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
- }
+ skb = dev_skb_finish_rx_dma(&rp->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &rp->pdev->dev, rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz);
if (unlikely(desc_length & DescTag))
vlan_tci = rhine_get_vlan_tci(skb, data_size);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 00/21] clean up rx_copybreak handling [split version]
2011-07-09 17:17 [PATCH 00/21] clean up rx_copybreak handling [split version] Michał Mirosław
` (20 preceding siblings ...)
2011-07-09 17:17 ` [PATCH 19/21] net: via-rhine: " Michał Mirosław
@ 2011-07-09 18:20 ` Joe Perches
2011-07-10 11:28 ` Michał Mirosław
21 siblings, 1 reply; 34+ messages in thread
From: Joe Perches @ 2011-07-09 18:20 UTC (permalink / raw)
To: Michał Mirosław
Cc: netdev, Steffen Klassert, Santiago Leon, Tim Hockin, Don Fry,
Francois Romieu, Ion Badulescu, Matt Carlson, Michael Chan,
Grant Grundler, David Dillow, Roger Luethi, David S. Miller
On Sat, 2011-07-09 at 19:17 +0200, Michał Mirosław wrote:
> Split version of rx_copybreak cleanup patch.
Hello Michał.
Looks good, thanks for doing this work.
One style quibble.
You use this style:
+ skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev,
+ le32_to_cpu(desc->frag[0].addr),
+ np->rx_buf_sz);
where almost all other uses throughout drivers/net
align arguments to open parenthesis instead.
+ skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
+ pkt_len, rx_copybreak,
+ &np->pci_dev->dev,
+ le32_to_cpu(desc->frag[0].addr),
+ np->rx_buf_sz);
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH 00/21] clean up rx_copybreak handling [split version]
2011-07-09 18:20 ` [PATCH 00/21] clean up rx_copybreak handling [split version] Joe Perches
@ 2011-07-10 11:28 ` Michał Mirosław
2011-07-10 11:52 ` Michał Mirosław
0 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-10 11:28 UTC (permalink / raw)
To: Joe Perches
Cc: netdev, Steffen Klassert, Santiago Leon, Tim Hockin, Don Fry,
Francois Romieu, Ion Badulescu, Matt Carlson, Michael Chan,
Grant Grundler, David Dillow, Roger Luethi, David S. Miller
On Sat, Jul 09, 2011 at 11:20:32AM -0700, Joe Perches wrote:
> On Sat, 2011-07-09 at 19:17 +0200, Michał Mirosław wrote:
> > Split version of rx_copybreak cleanup patch.
>
> Hello Michał.
>
> Looks good, thanks for doing this work.
>
> One style quibble.
>
> You use this style:
>
> + skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
> + pkt_len, rx_copybreak,
> + &np->pci_dev->dev,
> + le32_to_cpu(desc->frag[0].addr),
> + np->rx_buf_sz);
>
> where almost all other uses throughout drivers/net
> align arguments to open parenthesis instead.
>
> + skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
> + pkt_len, rx_copybreak,
> + &np->pci_dev->dev,
> + le32_to_cpu(desc->frag[0].addr),
> + np->rx_buf_sz);
I'll fix that in v2 where the style differs.
Best Regards,
Michał Mirosław
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 00/21] clean up rx_copybreak handling [split version]
2011-07-10 11:28 ` Michał Mirosław
@ 2011-07-10 11:52 ` Michał Mirosław
2011-07-10 15:11 ` Joe Perches
0 siblings, 1 reply; 34+ messages in thread
From: Michał Mirosław @ 2011-07-10 11:52 UTC (permalink / raw)
To: Joe Perches
Cc: netdev, Steffen Klassert, Santiago Leon, Tim Hockin, Don Fry,
Francois Romieu, Ion Badulescu, Matt Carlson, Michael Chan,
Grant Grundler, David Dillow, Roger Luethi, David S. Miller
On Sun, Jul 10, 2011 at 01:28:18PM +0200, Michał Mirosław wrote:
> On Sat, Jul 09, 2011 at 11:20:32AM -0700, Joe Perches wrote:
> > On Sat, 2011-07-09 at 19:17 +0200, Michał Mirosław wrote:
> > > Split version of rx_copybreak cleanup patch.
> >
> > Hello Michał.
> >
> > Looks good, thanks for doing this work.
> >
> > One style quibble.
> >
> > You use this style:
> >
> > + skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
> > + pkt_len, rx_copybreak,
> > + &np->pci_dev->dev,
> > + le32_to_cpu(desc->frag[0].addr),
> > + np->rx_buf_sz);
> >
> > where almost all other uses throughout drivers/net
> > align arguments to open parenthesis instead.
> >
> > + skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
> > + pkt_len, rx_copybreak,
> > + &np->pci_dev->dev,
> > + le32_to_cpu(desc->frag[0].addr),
> > + np->rx_buf_sz);
>
> I'll fix that in v2 where the style differs.
I modified patches where surrounding code had been consistent. I'm now
convinced I don't like this style, especially when combined with 80-column
limit and no limit on indentation levels.
Best Regards,
Michał Mirosław
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 00/21] clean up rx_copybreak handling [split version]
2011-07-10 11:52 ` Michał Mirosław
@ 2011-07-10 15:11 ` Joe Perches
0 siblings, 0 replies; 34+ messages in thread
From: Joe Perches @ 2011-07-10 15:11 UTC (permalink / raw)
To: Michał Mirosław
Cc: netdev, Steffen Klassert, Santiago Leon, Tim Hockin, Don Fry,
Francois Romieu, Ion Badulescu, Matt Carlson, Michael Chan,
Grant Grundler, David Dillow, Roger Luethi, David S. Miller
On Sun, 2011-07-10 at 13:52 +0200, Michał Mirosław wrote:
> On Sun, Jul 10, 2011 at 01:28:18PM +0200, Michał Mirosław wrote:
> > On Sat, Jul 09, 2011 at 11:20:32AM -0700, Joe Perches wrote:
> > > where almost all other uses throughout drivers/net
> > > align arguments to open parenthesis instead.
> > > + skb = dev_skb_finish_rx_dma(&np->rx_skbuff[entry],
> > > + pkt_len, rx_copybreak,
> > > + &np->pci_dev->dev,
> > > + le32_to_cpu(desc->frag[0].addr),
> > > + np->rx_buf_sz);
> > I'll fix that in v2 where the style differs.
> I modified patches where surrounding code had been consistent. I'm now
> convinced I don't like this style, especially when combined with 80-column
> limit and no limit on indentation levels.
Heh.
It truly can be a bad form when combined with
long variable or function names or multiple
indirections or string constants, etc.
I chose to ignore 80 columns on the
"le32_to_cpu(desc->frag[0].addr)," argument to
dev_skb_finish_rx_dma.
It can look hideous when slavish to 80 columns.
Feel free to ignore those checkpatch warnings
when you think appropriate.
cheers, Joe
^ permalink raw reply [flat|nested] 34+ messages in thread