Hi,
I've updated e1000e-0.4.1.7 polling extension patch.
Mainly this change set intends to fix kernel oops which happens on
Intel 82571+ with mtu > 1500. (Nuutti Varis <[email protected]>
reported this bug)
It also contains minor fixes to fix another kernel oops and code clean up.
If you are using old version of driver, please try this patch and let
me know how it works. It will be very appreciated.
Patch set contains followings
- e1000e-0.4.1.7-2010-02-21.polling.patch: cumulative patch to apply
to vanilla e1000e-0.4.1.7 driver.
- 0001-PollDevice-allocates-specified-size-of-receive-buffe.patch:
patch to apply to click to get proper rx buffer length.
- 0001-added-rx_buffer_len-to-net_device-structure.patch: patch to
apply to linux after linux-2.6.24.7-patch.
Known issue: It seems to me we've been having race in the driver when
PollDevice() is already running if interface goes up & down (mtu
change also makes device up & down) but I couldn't fix it yet.
Eddie,
Please review this and consider to apply.
Thanks,
Joonwoo
From 0972bbeb5f30b367a435fb9d70b87dd200d61f38 Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwp...@joonwpark-laptop.(none)>
Date: Thu, 21 Jan 2010 21:18:20 -0800
Subject: [PATCH 1/2] applied e1000e-0.4.1.7-click-polling.patch
---
src/netdev.c | 357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 357 insertions(+), 0 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index c7ada12..fd995ea 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -5113,6 +5113,351 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
(pba_num >> 8), (pba_num & 0xff));
}
+/* Click polling extension */
+static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct pci_dev *pdev = adapter->pdev;
+ struct e1000_ring *rx_ring = adapter->rx_ring;
+ struct e1000_rx_desc *rx_desc, *next_rxd;
+ struct e1000_buffer *buffer_info, *next_buffer;
+ u32 length;
+ unsigned int i;
+ int cleaned_count = 0;
+ bool cleaned = 0;
+ unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+ struct sk_buff* skb_head = NULL, **skbs;
+ int got = 0;
+
+ skbs = &skb_head;
+ i = rx_ring->next_to_clean;
+ rx_desc = E1000_RX_DESC(*rx_ring, i);
+ buffer_info = &rx_ring->buffer_info[i];
+
+ while (rx_desc->status & E1000_RXD_STAT_DD) {
+ struct sk_buff *skb;
+ u8 status;
+
+ if (got >= *want)
+ break;
+ got++;
+
+ status = rx_desc->status;
+ skb = buffer_info->skb;
+ buffer_info->skb = NULL;
+
+ skb->dev = netdev;
+
+ prefetch(skb->data - NET_IP_ALIGN);
+
+ i++;
+ if (i == rx_ring->count)
+ i = 0;
+ next_rxd = E1000_RX_DESC(*rx_ring, i);
+ prefetch(next_rxd);
+
+ next_buffer = &rx_ring->buffer_info[i];
+
+ cleaned = 1;
+ cleaned_count++;
+ pci_unmap_single(pdev,
+ buffer_info->dma,
+ adapter->rx_buffer_len,
+ PCI_DMA_FROMDEVICE);
+ buffer_info->dma = 0;
+
+ length = le16_to_cpu(rx_desc->length);
+
+ /* !EOP means multiple descriptors were used to store a single
+ * packet, also make sure the frame isn't just CRC only */
+ if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) {
+ /* All receives must fit into a single buffer */
+ e_dbg("Receive packet consumed multiple buffers\n");
+ /* recycle */
+ buffer_info->skb = skb;
+ goto next_desc;
+ }
+
+ if (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK) {
+ /* recycle */
+ buffer_info->skb = skb;
+ goto next_desc;
+ }
+
+ total_rx_bytes += length;
+ total_rx_packets++;
+
+ /* end copybreak code */
+ skb_put(skb, length);
+
+ /* Receive Checksum Offload */
+ e1000_rx_checksum(adapter,
+ (u32)(status) |
+ ((u32)(rx_desc->errors) << 24),
+ le16_to_cpu(rx_desc->csum), skb);
+
+ skb_pull(skb, netdev->hard_header_len);
+ *skbs = skb;
+ skbs = &(*skbs)->next;
+ *skbs = NULL;
+ netdev->last_rx = jiffies;
+
+next_desc:
+ rx_desc->status = 0;
+
+ /* use prefetched values */
+ rx_desc = next_rxd;
+ buffer_info = next_buffer;
+ }
+ rx_ring->next_to_clean = i;
+
+ cleaned_count = e1000_desc_unused(rx_ring);
+
+ adapter->total_rx_packets += total_rx_packets;
+ adapter->total_rx_bytes += total_rx_bytes;
+ adapter->net_stats.rx_bytes += total_rx_bytes;
+ adapter->net_stats.rx_packets += total_rx_packets;
+
+ *want = got;
+
+ return skb_head;
+}
+
+/* Click polling extension */
+int e1000_rx_refill(struct net_device *netdev, struct sk_buff **skbs)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct pci_dev *pdev = adapter->pdev;
+ struct e1000_ring *rx_ring = adapter->rx_ring;
+ struct e1000_rx_desc *rx_desc;
+ struct e1000_buffer *buffer_info;
+ struct sk_buff *skb;
+ unsigned int i;
+ int refill_count = 0;
+
+ if (skbs == 0)
+ return e1000_desc_unused(rx_ring);
+
+ i = rx_ring->next_to_use;
+ buffer_info = &rx_ring->buffer_info[i];
+
+ while (*skbs) {
+
+ refill_count++;
+ buffer_info->skb = *skbs;
+ *skbs = (*skbs)->next;
+map_skb:
+ buffer_info->dma = pci_map_single(pdev, buffer_info->skb->data,
+ adapter->rx_buffer_len,
+ PCI_DMA_FROMDEVICE);
+ if (pci_dma_mapping_error(buffer_info->dma)) {
+ dev_err(&pdev->dev, "RX DMA map failed\n");
+ adapter->rx_dma_failed++;
+ break;
+ }
+
+ rx_desc = E1000_RX_DESC(*rx_ring, i);
+ rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+
+ i++;
+ if (i == rx_ring->count)
+ i = 0;
+ buffer_info = &rx_ring->buffer_info[i];
+ }
+
+ if (rx_ring->next_to_use != i) {
+ rx_ring->next_to_use = i;
+ if (i-- == 0)
+ i = (rx_ring->count - 1);
+
+ /*
+ * Force memory writes to complete before letting h/w
+ * know there are new descriptors to fetch. (Only
+ * applicable for weak-ordered memory model archs,
+ * such as IA-64).
+ */
+ wmb();
+ writel(i, adapter->hw.hw_addr + rx_ring->tail);
+ }
+
+ return refill_count;
+}
+
+/* Click polling extension */
+static int e1000_tx_pqueue(struct net_device *netdev, struct sk_buff *skb)
+{
+ int res = e1000_xmit_frame(skb, netdev);
+ return res;
+}
+
+/* Click polling extension */
+static int e1000_tx_eob(struct net_device *netdev)
+{
+ return 0;
+}
+
+/* Click polling extension */
+static int e1000_tx_start(struct net_device *netdev)
+{
+ return 0;
+}
+
+/* Click polling extension */
+static struct sk_buff* e1000_tx_clean(struct net_device *netdev)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct e1000_hw *hw = &adapter->hw;
+ struct e1000_ring *tx_ring = adapter->tx_ring;
+ struct e1000_tx_desc *tx_desc, *eop_desc;
+ struct e1000_buffer *buffer_info;
+ unsigned int i, eop;
+ bool cleaned = 0, retval = 1;
+ unsigned int total_tx_bytes = 0, total_tx_packets = 0;
+ struct sk_buff *skb_head, *skb_last;
+
+ skb_head = skb_last = NULL;
+
+ i = tx_ring->next_to_clean;
+ eop = tx_ring->buffer_info[i].next_to_watch;
+ eop_desc = E1000_TX_DESC(*tx_ring, eop);
+
+ while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
+ for (cleaned = 0; !cleaned; ) {
+ tx_desc = E1000_TX_DESC(*tx_ring, i);
+ buffer_info = &tx_ring->buffer_info[i];
+ cleaned = (i == eop);
+
+ if (cleaned) {
+ struct sk_buff *skb = buffer_info->skb;
+#ifdef NETIF_F_TSO
+ unsigned int segs, bytecount;
+ segs = skb_shinfo(skb)->gso_segs ?: 1;
+ /* multiply data chunks by size of headers */
+ bytecount = ((segs - 1) * skb_headlen(skb)) +
+ skb->len;
+ total_tx_packets += segs;
+ total_tx_bytes += bytecount;
+#else
+ total_tx_packets++;
+ total_tx_bytes += skb->len;
+#endif
+ }
+
+ if (buffer_info->dma) {
+ pci_unmap_page(adapter->pdev,
+ buffer_info->dma,
+ buffer_info->length,
+ PCI_DMA_TODEVICE);
+ buffer_info->dma = 0;
+ }
+
+ if (buffer_info->skb) {
+ struct sk_buff *skb = buffer_info->skb;
+ if (skb_head == 0) {
+ skb_head = skb;
+ skb_last = skb;
+ skb_last->next = NULL;
+ } else {
+ skb_last->next = skb;
+ skb->next = NULL;
+ skb_last = skb;
+ }
+ buffer_info->skb = NULL;
+ }
+ buffer_info->time_stamp = 0;
+ tx_desc->upper.data = 0;
+
+ i++;
+ if (i == tx_ring->count)
+ i = 0;
+#ifdef CONFIG_E1000E_NAPI
+ if (total_tx_packets >= tx_ring->count) {
+ retval = 0;
+ goto done_cleaning;
+ }
+#endif
+ }
+
+ eop = tx_ring->buffer_info[i].next_to_watch;
+ eop_desc = E1000_TX_DESC(*tx_ring, eop);
+ }
+
+#ifdef CONFIG_E1000E_NAPI
+done_cleaning:
+#endif
+ tx_ring->next_to_clean = i;
+
+#define TX_WAKE_THRESHOLD 32
+ if (cleaned && netif_carrier_ok(netdev) &&
+ e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
+ /*
+ * Make sure that anybody stopping the queue after this
+ * sees the new next_to_clean.
+ */
+ smp_mb();
+
+ if (netif_queue_stopped(netdev) &&
+ !(test_bit(__E1000_DOWN, &adapter->state))) {
+ netif_wake_queue(netdev);
+ ++adapter->restart_queue;
+ }
+ }
+
+ if (adapter->detect_tx_hung) {
+ /*
+ * Detect a transmit hang in hardware, this serializes the
+ * check with the clearing of time_stamp and movement of i
+ */
+ adapter->detect_tx_hung = 0;
+ if (tx_ring->buffer_info[eop].dma &&
+ time_after(jiffies, tx_ring->buffer_info[eop].time_stamp
+ + (adapter->tx_timeout_factor * HZ))
+ && !(er32(STATUS) & E1000_STATUS_TXOFF)) {
+ e1000_print_tx_hang(adapter);
+ netif_stop_queue(netdev);
+ }
+ }
+ adapter->total_tx_bytes += total_tx_bytes;
+ adapter->total_tx_packets += total_tx_packets;
+ adapter->net_stats.tx_bytes += total_tx_bytes;
+ adapter->net_stats.tx_packets += total_tx_packets;
+
+ return skb_head;
+}
+
+/* Click polling extension */
+static int e1000_poll_off(struct net_device *netdev)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+
+ if (netdev->polling > 0) {
+ netdev->polling = 0;
+ e1000_irq_enable(adapter);
+ }
+
+ return 0;
+}
+
+/* Click polling extension */
+static int e1000_poll_on(struct net_device *netdev)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ unsigned long flags;
+
+ if (!netdev->polling) {
+ local_irq_save(flags);
+ local_irq_disable();
+
+ netdev->polling = 2;
+
+ e1000_irq_disable(adapter);
+
+ local_irq_restore(flags);
+ }
+
+ return 0;
+}
+
/**
* e1000_probe - Device Initialization Routine
* @pdev: PCI device information struct
@@ -5248,6 +5593,18 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
#ifdef CONFIG_NET_POLL_CONTROLLER
netdev->poll_controller = e1000_netpoll;
#endif
+
+ /* Click polling extensions */
+ netdev->polling = 0;
+ netdev->rx_poll = e1000_rx_poll;
+ netdev->rx_refill = e1000_rx_refill;
+ netdev->tx_queue = e1000_tx_pqueue;
+ netdev->tx_eob = e1000_tx_eob;
+ netdev->tx_start = e1000_tx_start;
+ netdev->tx_clean = e1000_tx_clean;
+ netdev->poll_off = e1000_poll_off;
+ netdev->poll_on = e1000_poll_on;
+
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
hw->mac.ops.get_bus_info(&adapter->hw);
--
1.6.3.3
From c81af6ad8e09a2da5b08225ea27eaf0be724ad1b Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwp...@joonwpark-laptop.(none)>
Date: Sun, 21 Feb 2010 21:23:16 -0800
Subject: [PATCH 2/2] click polling extension mtu 1500+
- fixed NULL pointer deference when __e1000_rx_poll got rx_desc error.
- support 82571+ with mtu > 1500; 82571+ splits large size of packets into multiple buffer.
- minor clean up.
---
src/netdev.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 306 insertions(+), 15 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index fd995ea..e2556ac 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -2319,6 +2319,7 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
static void e1000_irq_enable(struct e1000_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
+
#ifdef CONFIG_E1000E_MSIX
if (adapter->msix_entries) {
@@ -3173,7 +3174,8 @@ int e1000_up(struct e1000_adapter *adapter)
if (adapter->msix_entries)
e1000_configure_msix(adapter);
#endif /* CONFIG_E1000E_MSIX */
- e1000_irq_enable(adapter);
+ if (!adapter->netdev->polling)
+ e1000_irq_enable(adapter);
/* fire a link change interrupt to start the watchdog */
ew32(ICS, E1000_ICS_LSC);
@@ -5114,7 +5116,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
}
/* Click polling extension */
-static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
+static struct sk_buff *__e1000_rx_poll(struct net_device *netdev, int *want)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
struct pci_dev *pdev = adapter->pdev;
@@ -5140,8 +5142,6 @@ static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
if (got >= *want)
break;
- got++;
-
status = rx_desc->status;
skb = buffer_info->skb;
buffer_info->skb = NULL;
@@ -5160,8 +5160,7 @@ static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
cleaned = 1;
cleaned_count++;
- pci_unmap_single(pdev,
- buffer_info->dma,
+ pci_unmap_single(pdev, buffer_info->dma,
adapter->rx_buffer_len,
PCI_DMA_FROMDEVICE);
buffer_info->dma = 0;
@@ -5201,7 +5200,7 @@ static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
skbs = &(*skbs)->next;
*skbs = NULL;
netdev->last_rx = jiffies;
-
+ got++;
next_desc:
rx_desc->status = 0;
@@ -5224,14 +5223,190 @@ next_desc:
}
/* Click polling extension */
-int e1000_rx_refill(struct net_device *netdev, struct sk_buff **skbs)
+static struct sk_buff *__e1000_rx_poll_ps(struct net_device *netdev, int *want)
+{
+ union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct pci_dev *pdev = adapter->pdev;
+ struct e1000_ring *rx_ring = adapter->rx_ring;
+ struct e1000_buffer *buffer_info, *next_buffer;
+ struct e1000_ps_page *ps_page;
+ struct sk_buff *skb;
+ unsigned int i, j;
+ u32 length, staterr;
+ unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+ int got = 0;
+ struct sk_buff* skb_head = NULL, **skbs;
+
+ skbs = &skb_head;
+ i = rx_ring->next_to_clean;
+ rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
+ staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
+ buffer_info = &rx_ring->buffer_info[i];
+
+ while (staterr & E1000_RXD_STAT_DD) {
+ if (got >= *want)
+ break;
+ skb = buffer_info->skb;
+
+ /* in the packet split case this is header only */
+ prefetch(skb->data - NET_IP_ALIGN);
+
+ i++;
+ if (i == rx_ring->count)
+ i = 0;
+ next_rxd = E1000_RX_DESC_PS(*rx_ring, i);
+ prefetch(next_rxd);
+
+ next_buffer = &rx_ring->buffer_info[i];
+
+ pci_unmap_single(pdev, buffer_info->dma,
+ adapter->rx_ps_bsize0,
+ PCI_DMA_FROMDEVICE);
+ buffer_info->dma = 0;
+
+ if (!(staterr & E1000_RXD_STAT_EOP)) {
+ e_dbg("Packet Split buffers didn't pick up the full"
+ " packet\n");
+ dev_kfree_skb_irq(skb);
+ goto next_desc;
+ }
+
+ if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+ dev_kfree_skb_irq(skb);
+ goto next_desc;
+ }
+
+ length = le16_to_cpu(rx_desc->wb.middle.length0);
+
+ if (!length) {
+ e_dbg("Last part of the packet spanning multiple"
+ " descriptors\n");
+ dev_kfree_skb_irq(skb);
+ goto next_desc;
+ }
+
+ /* Good Receive */
+ skb_put(skb, length);
+
+#ifdef CONFIG_E1000E_NAPI
+ {
+ /*
+ * this looks ugly, but it seems compiler issues make it
+ * more efficient than reusing j
+ */
+ int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
+
+ /*
+ * page alloc/put takes too long and effects small packet
+ * throughput, so unsplit small packets and save the alloc/put
+ * only valid in softirq (napi) context to call kmap_*
+ */
+ if (l1 && (l1 <= copybreak) &&
+ ((length + l1) <= adapter->rx_ps_bsize0)) {
+ u8 *vaddr;
+
+ ps_page = &buffer_info->ps_pages[0];
+
+ /*
+ * there is no documentation about how to call
+ * kmap_atomic, so we can't hold the mapping
+ * very long
+ */
+ pci_dma_sync_single_for_cpu(pdev, ps_page->dma,
+ PAGE_SIZE, PCI_DMA_FROMDEVICE);
+ vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
+ memcpy(skb_tail_pointer(skb), vaddr, l1);
+ kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+ pci_dma_sync_single_for_device(pdev, ps_page->dma,
+ PAGE_SIZE, PCI_DMA_FROMDEVICE);
+
+ skb_put(skb, l1);
+ goto copydone;
+ } /* if */
+ }
+#endif
+
+ for (j = 0; j < PS_PAGE_BUFFERS; j++) {
+ length = le16_to_cpu(rx_desc->wb.upper.length[j]);
+ if (!length)
+ break;
+
+ ps_page = &buffer_info->ps_pages[j];
+ pci_unmap_page(pdev, ps_page->dma, PAGE_SIZE,
+ PCI_DMA_FROMDEVICE);
+ ps_page->dma = 0;
+ skb_fill_page_desc(skb, j, ps_page->page, 0, length);
+ ps_page->page = NULL;
+ skb->len += length;
+ skb->data_len += length;
+ skb->truesize += length;
+ }
+
+#ifdef CONFIG_E1000E_NAPI
+copydone:
+#endif
+ total_rx_bytes += skb->len;
+ total_rx_packets++;
+
+ e1000_rx_checksum(adapter, staterr, le16_to_cpu(
+ rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
+
+ if (rx_desc->wb.upper.header_status &
+ cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
+ adapter->rx_hdr_split++;
+
+ skb_pull(skb, netdev->hard_header_len);
+ *skbs = skb;
+ skbs = &(*skbs)->next;
+ *skbs = NULL;
+ netdev->last_rx = jiffies;
+ got++;
+
+next_desc:
+ rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
+ buffer_info->skb = NULL;
+
+ /* use prefetched values */
+ rx_desc = next_rxd;
+ buffer_info = next_buffer;
+
+ staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
+ }
+ rx_ring->next_to_clean = i;
+
+ adapter->total_rx_packets += total_rx_packets;
+ adapter->total_rx_bytes += total_rx_bytes;
+ adapter->net_stats.rx_bytes += total_rx_bytes;
+ adapter->net_stats.rx_packets += total_rx_packets;
+
+ *want = got;
+
+ return skb_head;
+}
+
+/* Click polling extension */
+static struct sk_buff *e1000_rx_poll(struct net_device *netdev, int *want)
+{
+ struct sk_buff *skb;
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+
+ if (adapter->rx_ps_pages)
+ skb = __e1000_rx_poll_ps(netdev, want);
+ else
+ skb = __e1000_rx_poll(netdev, want);
+
+ return skb;
+}
+
+/* Click polling extension */
+static int __e1000_rx_refill(struct net_device *netdev, struct sk_buff **skbs)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
struct pci_dev *pdev = adapter->pdev;
struct e1000_ring *rx_ring = adapter->rx_ring;
struct e1000_rx_desc *rx_desc;
struct e1000_buffer *buffer_info;
- struct sk_buff *skb;
unsigned int i;
int refill_count = 0;
@@ -5242,11 +5417,9 @@ int e1000_rx_refill(struct net_device *netdev, struct sk_buff **skbs)
buffer_info = &rx_ring->buffer_info[i];
while (*skbs) {
-
refill_count++;
buffer_info->skb = *skbs;
*skbs = (*skbs)->next;
-map_skb:
buffer_info->dma = pci_map_single(pdev, buffer_info->skb->data,
adapter->rx_buffer_len,
PCI_DMA_FROMDEVICE);
@@ -5284,6 +5457,120 @@ map_skb:
}
/* Click polling extension */
+static int __e1000_rx_refill_ps(struct net_device *netdev, struct sk_buff **skbs)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct pci_dev *pdev = adapter->pdev;
+ union e1000_rx_desc_packet_split *rx_desc;
+ struct e1000_ring *rx_ring = adapter->rx_ring;
+ struct e1000_buffer *buffer_info;
+ struct e1000_ps_page *ps_page;
+ unsigned int i, j;
+ int refill_count = 0;
+
+ if (skbs == 0)
+ return e1000_desc_unused(rx_ring);
+
+ i = rx_ring->next_to_use;
+ buffer_info = &rx_ring->buffer_info[i];
+
+ while (*skbs) {
+ rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
+
+ for (j = 0; j < PS_PAGE_BUFFERS; j++) {
+ ps_page = &buffer_info->ps_pages[j];
+ if (j >= adapter->rx_ps_pages) {
+ /* all unused desc entries get hw null ptr */
+ rx_desc->read.buffer_addr[j+1] = ~0;
+ continue;
+ }
+ if (!ps_page->page) {
+ ps_page->page = alloc_page(GFP_ATOMIC);
+ if (!ps_page->page) {
+ adapter->alloc_rx_buff_failed++;
+ goto no_buffers;
+ }
+ ps_page->dma = pci_map_page(pdev,
+ ps_page->page,
+ 0, PAGE_SIZE,
+ PCI_DMA_FROMDEVICE);
+ if (pci_dma_mapping_error(ps_page->dma)) {
+ dev_err(&adapter->pdev->dev,
+ "RX DMA page map failed\n");
+ adapter->rx_dma_failed++;
+ goto no_buffers;
+ }
+ }
+ /*
+ * Refresh the desc even if buffer_addrs
+ * didn't change because each write-back
+ * erases this info.
+ */
+ rx_desc->read.buffer_addr[j+1] =
+ cpu_to_le64(ps_page->dma);
+ }
+
+ buffer_info->skb = *skbs;
+ buffer_info->dma = pci_map_single(pdev, (*skbs)->data,
+ adapter->rx_ps_bsize0,
+ PCI_DMA_FROMDEVICE);
+ *skbs = (*skbs)->next;
+
+ if (pci_dma_mapping_error(buffer_info->dma)) {
+ dev_err(&pdev->dev, "RX DMA map failed\n");
+ adapter->rx_dma_failed++;
+ break;
+ }
+
+ rx_desc->read.buffer_addr[0] = cpu_to_le64(buffer_info->dma);
+
+ i++;
+ if (i == rx_ring->count)
+ i = 0;
+ buffer_info = &rx_ring->buffer_info[i];
+
+ refill_count++;
+ }
+
+no_buffers:
+ if (rx_ring->next_to_use != i) {
+ rx_ring->next_to_use = i;
+
+ if (!(i--))
+ i = (rx_ring->count - 1);
+
+ /*
+ * Force memory writes to complete before letting h/w
+ * know there are new descriptors to fetch. (Only
+ * applicable for weak-ordered memory model archs,
+ * such as IA-64).
+ */
+ wmb();
+ /*
+ * Hardware increments by 16 bytes, but packet split
+ * descriptors are 32 bytes...so we increment tail
+ * twice as much.
+ */
+ writel(i<<1, adapter->hw.hw_addr + rx_ring->tail);
+ }
+
+ return refill_count;
+}
+
+static int e1000_rx_refill(struct net_device *netdev, struct sk_buff **skbs)
+{
+ int i;
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+
+ if (adapter->rx_ps_pages)
+ i = __e1000_rx_refill_ps(netdev, skbs);
+ else
+ i = __e1000_rx_refill(netdev, skbs);
+
+ return i;
+}
+
+/* Click polling extension */
static int e1000_tx_pqueue(struct net_device *netdev, struct sk_buff *skb)
{
int res = e1000_xmit_frame(skb, netdev);
@@ -5426,6 +5713,13 @@ done_cleaning:
}
/* Click polling extension */
+static int e1000_rx_buffer_len(struct net_device *netdev)
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ return adapter->rx_buffer_len + NET_IP_ALIGN;
+}
+
+/* Click polling extension */
static int e1000_poll_off(struct net_device *netdev)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -5446,12 +5740,8 @@ static int e1000_poll_on(struct net_device *netdev)
if (!netdev->polling) {
local_irq_save(flags);
- local_irq_disable();
-
netdev->polling = 2;
-
e1000_irq_disable(adapter);
-
local_irq_restore(flags);
}
@@ -5602,6 +5892,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
netdev->tx_eob = e1000_tx_eob;
netdev->tx_start = e1000_tx_start;
netdev->tx_clean = e1000_tx_clean;
+ netdev->rx_buffer_len = e1000_rx_buffer_len;
netdev->poll_off = e1000_poll_off;
netdev->poll_on = e1000_poll_on;
--
1.6.3.3
From 40c76730e214b1964b27c87f40e12cab3b27be47 Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwp...@joonwpark-laptop.(none)>
Date: Sun, 21 Feb 2010 21:29:49 -0800
Subject: [PATCH] added rx_buffer_len to net_device structure
---
include/linux/netdevice.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 2f1df8b..670f463 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -747,6 +747,12 @@ struct net_device
* clean tx dma ring. returns the list of skb objects cleaned
*/
struct sk_buff* (*tx_clean)(struct net_device *);
+
+ /*
+ * rx buffer length. returns rx buffer length if necessary
+ */
+ int (*rx_buffer_len)(struct net_device *);
+
/*
* start transmission. returns 0 if successful, 1 otherwise
*/
--
1.6.3.3
From a1282d7827972365ac7c2818755bd7109b5b96ea Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwp...@joonwpark-laptop.(none)>
Date: Sun, 21 Feb 2010 21:22:12 -0800
Subject: [PATCH] PollDevice: allocates specified size of receive buffer when it's needed by polling driver
---
elements/linuxmodule/polldevice.cc | 5 ++++-
elements/linuxmodule/polldevice.hh | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/elements/linuxmodule/polldevice.cc b/elements/linuxmodule/polldevice.cc
index d784ef7..091948d 100644
--- a/elements/linuxmodule/polldevice.cc
+++ b/elements/linuxmodule/polldevice.cc
@@ -89,6 +89,7 @@ PollDevice::configure(Vector<String> &conf, ErrorHandler *errh)
return -1;
if (_dev && (!_dev->poll_on || _dev->polling < 0))
return errh->error("device '%s' not pollable, use FromDevice instead", _devname.c_str());
+ _rx_buffer_len = _dev->rx_buffer_len ? _dev->rx_buffer_len(_dev) : 0;
#endif
return 0;
@@ -227,7 +228,8 @@ PollDevice::run_task(Task *)
* Skbmgr adds 64 bytes of headroom and tailroom, so back request off to
* 1536.
*/
- struct sk_buff *new_skbs = skbmgr_allocate_skbs(_headroom, 1536, &nskbs);
+ const int size = _rx_buffer_len ? _rx_buffer_len : 1536;
+ struct sk_buff *new_skbs = skbmgr_allocate_skbs(_headroom, size, &nskbs);
# if CLICK_DEVICE_STATS
if (_activations > 0)
@@ -324,6 +326,7 @@ PollDevice::change_device(net_device *dev)
_dev->poll_off(_dev);
}
+ _rx_buffer_len = _dev->rx_buffer_len ? _dev->rx_buffer_len(_dev) : 0;
set_device(dev, &poll_device_map, true);
if (dev_change) {
diff --git a/elements/linuxmodule/polldevice.hh b/elements/linuxmodule/polldevice.hh
index 04fc985..1bedfa0 100644
--- a/elements/linuxmodule/polldevice.hh
+++ b/elements/linuxmodule/polldevice.hh
@@ -145,8 +145,9 @@ class PollDevice : public AnyTaskDevice { public:
private:
- unsigned _burst;
- unsigned _headroom;
+ unsigned _burst;
+ unsigned _headroom;
+ uint32_t _rx_buffer_len;
};
--
1.6.3.3
_______________________________________________
click mailing list
[email protected]
https://amsterdam.lcs.mit.edu/mailman/listinfo/click
