drivers/dma & I/OAT fixes
Subsystems (6)
cover drivers/dma & I/OAT fixes
Various fixes for the hardware memcpy engine code and ioatdma
Most of these I've posted before, except for the patch to handle sysfs errors from Jeff Garzik. I've dropped the controversial change to not offload loopback traffic.
These changes can be pulled from
git://lost.foo-projects.org/~cleech/linux-2.6 master
--
Chris Leech <[email protected]>
I/O Acceleration Technology Software Development
LAN Access Division / Digital Enterprise Group
PATCH 1/7 I/OAT: Push pending transactions to hardware more frequently
Every 20 descriptors turns out to be to few append commands with newer/faster CPUs. Pushing every 4 still cuts down on MMIO writes to an acceptable level without letting the DMA engine run out of work.
---
drivers/dma/ioatdma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/dma/ioatdma.c +2 -2
@@ -310,7 +310,7 @@ static dma_cookie_t do_ioat_dma_memcpy(slist_splice_init (&new_chain, ioat_chan->used_desc.prev); ioat_chan->pending += desc_count; -if (ioat_chan->pending >=20 ) { +if (ioat_chan->pending >=4 ) { append =1 ; ioat_chan->pending =0 ; }
@@ -818,7 +818,7 @@ static void __devexit ioat_remove(struct }/* MODULE API */ -MODULE_VERSION ("1.7" ); +MODULE_VERSION ("1.9" );MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Intel Corporation" );
PATCH 2/7 drivers/dma: handle sysfs errors
In reply to Chris LeechFrom: Jeff Garzik <[email protected]>
---
drivers/dma/dmaengine.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-)
drivers/dma/dmaengine.c +20 -2
@@ -312,7 +312,7 @@ void dma_async_client_chan_request(strucint dma_async_device_register (struct dma_device *device) {static int id; -int chancnt =0 ; +int chancnt =0 , rc;struct dma_chan * chan;if (!device)
@@ -334,8 +334,15 @@ int dma_async_device_register(struct dmasnprintf (chan->class_dev.class_id,BUS_ID_SIZE ,"dma%dchan%d" , device->dev_id, chan->chan_id); + rc =class_device_register (&chan->class_dev); +if (rc) { + chancnt--; +free_percpu (chan->local); + chan->local =NULL ; + goto err_out; + } +kref_get (&device->refcount); -class_device_register (&chan->class_dev); }mutex_lock (&dma_list_mutex);
@@ -345,6 +352,17 @@ int dma_async_device_register(struct dmadma_chans_rebalance ();return 0 ; + +err_out: +list_for_each_entry (chan, &device->channels, device_node) { +if (chan->local ==NULL ) +continue ; +kref_put (&device->refcount, dma_async_device_cleanup); +class_device_unregister (&chan->class_dev); + chancnt--; +free_percpu (chan->local); + } +return rc; }/**
PATCH 3/7 I/OAT: Remove the wrappers around read(bwl)/write(bwl) in ioatdma
In reply to Chris Leech---
drivers/dma/ioatdma.c | 60 +++++++++++------------ drivers/dma/ioatdma_io.h | 118 ---------------------------------------------- 2 files changed, 28 insertions(+), 150 deletions(-)
drivers/dma/ioatdma.c +28 -32
@@ -32,7 +32,6 @@#include <linux/delay.h> #include <linux/dma-mapping.h> #include "ioatdma.h" -#include "ioatdma_io.h" #include "ioatdma_registers.h" #include "ioatdma_hw.h"
@@ -51,8 +50,8 @@ static int enumerate_dma_channels(structint i;struct ioat_dma_chan *ioat_chan; - device->common.chancnt =ioatdma_read8 (device,IOAT_CHANCNT_OFFSET ); - xfercap_scale =ioatdma_read8 (device,IOAT_XFERCAP_OFFSET ); + device->common.chancnt =readb (device->reg_base +IOAT_CHANCNT_OFFSET ); + xfercap_scale =readb (device->reg_base +IOAT_XFERCAP_OFFSET ); xfercap = (xfercap_scale ==0 ?-1 : (1UL << xfercap_scale));for (i =0 ; i < device->common.chancnt; i++) {
@@ -123,7 +122,7 @@ static int ioat_dma_alloc_chan_resources* In-use bit automatically set by reading chanctrl * If 0, we got it, if 1, someone else did */ - chanctrl =ioatdma_chan_read16 (ioat_chan,IOAT_CHANCTRL_OFFSET ); + chanctrl =readw (ioat_chan->reg_base +IOAT_CHANCTRL_OFFSET );if (chanctrl &IOAT_CHANCTRL_CHANNEL_IN_USE )return -EBUSY ;
@@ -132,12 +131,12 @@ static int ioat_dma_alloc_chan_resourcesIOAT_CHANCTRL_ERR_INT_EN |IOAT_CHANCTRL_ANY_ERR_ABORT_EN |IOAT_CHANCTRL_ERR_COMPLETION_EN ; -ioatdma_chan_write16 (ioat_chan,IOAT_CHANCTRL_OFFSET , chanctrl); +writew (chanctrl, ioat_chan->reg_base +IOAT_CHANCTRL_OFFSET ); - chanerr =ioatdma_chan_read32 (ioat_chan,IOAT_CHANERR_OFFSET ); + chanerr =readl (ioat_chan->reg_base +IOAT_CHANERR_OFFSET );if (chanerr) {printk ("IOAT: CHANERR = %x, clearing\n" , chanerr); -ioatdma_chan_write32 (ioat_chan,IOAT_CHANERR_OFFSET , chanerr); +writel (chanerr, ioat_chan->reg_base +IOAT_CHANERR_OFFSET ); }/* Allocate descriptors */
@@ -161,10 +160,10 @@ static int ioat_dma_alloc_chan_resources &ioat_chan->completion_addr);memset (ioat_chan->completion_virt,0 ,sizeof (*ioat_chan->completion_virt)); -ioatdma_chan_write32 (ioat_chan,IOAT_CHANCMP_OFFSET_LOW , - ((u64 ) ioat_chan->completion_addr) &0x00000000FFFFFFFF ); -ioatdma_chan_write32 (ioat_chan,IOAT_CHANCMP_OFFSET_HIGH , - ((u64 ) ioat_chan->completion_addr) >>32 ); +writel (((u64 ) ioat_chan->completion_addr) &0x00000000FFFFFFFF , + ioat_chan->reg_base +IOAT_CHANCMP_OFFSET_LOW ); +writel (((u64 ) ioat_chan->completion_addr) >>32 , + ioat_chan->reg_base +IOAT_CHANCMP_OFFSET_HIGH );ioat_start_null_desc (ioat_chan);return i;
@@ -182,7 +181,7 @@ static void ioat_dma_free_chan_resourcesioat_dma_memcpy_cleanup (ioat_chan); -ioatdma_chan_write8 (ioat_chan,IOAT_CHANCMD_OFFSET ,IOAT_CHANCMD_RESET ); +writeb (IOAT_CHANCMD_RESET , ioat_chan->reg_base +IOAT_CHANCMD_OFFSET );spin_lock_bh (&ioat_chan->desc_lock);list_for_each_entry_safe (desc, _desc, &ioat_chan->used_desc, node) {
@@ -210,9 +209,9 @@ static void ioat_dma_free_chan_resources ioat_chan->last_completion = ioat_chan->completion_addr =0 ;/* Tell hw the chan is free */ - chanctrl =ioatdma_chan_read16 (ioat_chan,IOAT_CHANCTRL_OFFSET ); + chanctrl =readw (ioat_chan->reg_base +IOAT_CHANCTRL_OFFSET ); chanctrl &= ~IOAT_CHANCTRL_CHANNEL_IN_USE ; -ioatdma_chan_write16 (ioat_chan,IOAT_CHANCTRL_OFFSET , chanctrl); +writew (chanctrl, ioat_chan->reg_base +IOAT_CHANCTRL_OFFSET ); }/**
@@ -318,9 +317,8 @@ static dma_cookie_t do_ioat_dma_memcpy(sspin_unlock_bh (&ioat_chan->desc_lock);if (append) -ioatdma_chan_write8 (ioat_chan, -IOAT_CHANCMD_OFFSET , -IOAT_CHANCMD_APPEND ); +writeb (IOAT_CHANCMD_APPEND , + ioat_chan->reg_base +IOAT_CHANCMD_OFFSET );return cookie; }
@@ -417,9 +415,8 @@ static void ioat_dma_memcpy_issue_pendinif (ioat_chan->pending !=0 ) { ioat_chan->pending =0 ; -ioatdma_chan_write8 (ioat_chan, -IOAT_CHANCMD_OFFSET , -IOAT_CHANCMD_APPEND ); +writeb (IOAT_CHANCMD_APPEND , + ioat_chan->reg_base +IOAT_CHANCMD_OFFSET ); } }
@@ -449,7 +446,7 @@ static void ioat_dma_memcpy_cleanup(struif ((chan->completion_virt->full &IOAT_CHANSTS_DMA_TRANSFER_STATUS ) ==IOAT_CHANSTS_DMA_TRANSFER_STATUS_HALTED ) {printk ("IOAT: Channel halted, chanerr = %x\n" , -ioatdma_chan_read32 (chan,IOAT_CHANERR_OFFSET )); +readl (chan->reg_base +IOAT_CHANERR_OFFSET ));/* TODO do something to salvage the situation */ }
@@ -569,21 +566,21 @@ static irqreturn_t ioat_do_interrupt(intunsigned long attnstatus;u8 intrctrl; - intrctrl =ioatdma_read8 (instance,IOAT_INTRCTRL_OFFSET ); + intrctrl =readb (instance->reg_base +IOAT_INTRCTRL_OFFSET );if (!(intrctrl &IOAT_INTRCTRL_MASTER_INT_EN ))return IRQ_NONE ;if (!(intrctrl &IOAT_INTRCTRL_INT_STATUS )) { -ioatdma_write8 (instance,IOAT_INTRCTRL_OFFSET , intrctrl); +writeb (intrctrl, instance->reg_base +IOAT_INTRCTRL_OFFSET );return IRQ_NONE ; } - attnstatus =ioatdma_read32 (instance,IOAT_ATTNSTATUS_OFFSET ); + attnstatus =readl (instance->reg_base +IOAT_ATTNSTATUS_OFFSET );printk (KERN_ERR "ioatdma error: interrupt! status %lx\n" , attnstatus); -ioatdma_write8 (instance,IOAT_INTRCTRL_OFFSET , intrctrl); +writeb (intrctrl, instance->reg_base +IOAT_INTRCTRL_OFFSET );return IRQ_HANDLED ; }
@@ -612,14 +609,13 @@ static void ioat_start_null_desc(structspin_unlock_bh (&ioat_chan->desc_lock);#if (BITS_PER_LONG ==64 ) -ioatdma_chan_write64 (ioat_chan,IOAT_CHAINADDR_OFFSET , desc->phys); +writeq (desc->phys, ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET );#else -ioatdma_chan_write32 (ioat_chan, -IOAT_CHAINADDR_OFFSET_LOW , - (u32 ) desc->phys); -ioatdma_chan_write32 (ioat_chan,IOAT_CHAINADDR_OFFSET_HIGH ,0 ); +writel ((u32 ) desc->phys, + ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET_LOW ); +writel (0 , ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET_HIGH );#endif -ioatdma_chan_write8 (ioat_chan,IOAT_CHANCMD_OFFSET ,IOAT_CHANCMD_START ); +writeb (IOAT_CHANCMD_START , ioat_chan->reg_base +IOAT_CHANCMD_OFFSET ); }/*
@@ -748,7 +744,7 @@ static int __devinit ioat_probe(struct p device->reg_base = reg_base; -ioatdma_write8 (device,IOAT_INTRCTRL_OFFSET ,IOAT_INTRCTRL_MASTER_INT_EN ); +writeb (IOAT_INTRCTRL_MASTER_INT_EN , device->reg_base +IOAT_INTRCTRL_OFFSET );pci_set_master (pdev);INIT_LIST_HEAD (&device->common.channels);
drivers/dma/ioatdma_io.h deleted +0 -118
118 lines not on this page · raw message
PATCH 4/7 I/OAT: Remove the use of writeq from the ioatdma driver
In reply to Chris LeechThere's only one now anyway, and it's not in a performance path, so make it behave the same on 32-bit and 64-bit CPUs.
---
drivers/dma/ioatdma.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/dma/ioatdma.c +4 -6
@@ -608,13 +608,11 @@ static void ioat_start_null_desc(structlist_add_tail (&desc->node, &ioat_chan->used_desc);spin_unlock_bh (&ioat_chan->desc_lock); -#if (BITS_PER_LONG ==64 ) -writeq (desc->phys, ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET ); -#else -writel ((u32 ) desc->phys, +writel (((u64 ) desc->phys) &0x00000000FFFFFFFF , ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET_LOW ); -writel (0 , ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET_HIGH ); -#endif +writel (((u64 ) desc->phys) >>32 , + ioat_chan->reg_base +IOAT_CHAINADDR_OFFSET_HIGH ); +writeb (IOAT_CHANCMD_START , ioat_chan->reg_base +IOAT_CHANCMD_OFFSET ); }
PATCH 5/7 I/OAT: Add documentation for the tcp_dma_copybreak sysctl
In reply to Chris Leech---
Documentation/networking/ip-sysctl.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
Documentation/networking/ip-sysctl.txt +6 -0
@@ -375,6 +375,12 @@ tcp_slow_start_after_idle - BOOLEAN be timed out after an idle period. Default: 1 +tcp_dma_copybreak - INTEGER + Lower limit, in bytes, of the size of socket reads that will be + offloaded to a DMA copy engine, if one is present in the system + and CONFIG_NET_DMA is enabled. + Default: 4096 + CIPSOv4 Variables: cipso_cache_enable - BOOLEAN
PATCH 6/7 I/OAT: Add entries to MAINTAINERS for the DMA memcpy subsystem and ioatdma
In reply to Chris Leech---
MAINTAINERS | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
MAINTAINERS +12 -0
@@ -915,6 +915,12 @@ M: [email protected] L: [email protected] S: Maintained +DMA GENERIC MEMCPY SUBSYSTEM +P: Chris Leech +M: [email protected] +L: [email protected] +S: Maintained + DOCBOOK FOR DOCUMENTATION P: Martin Waitz M: [email protected]
@@ -1516,6 +1522,12 @@ P: Tigran Aivazian M: [email protected] S: Maintained +INTEL I/OAT DMA DRIVER +P: Chris Leech +M: [email protected] +L: [email protected] +S: Supported + INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT P: Deepak Saxena M: [email protected]
PATCH 7/7 I/OAT: Only offload copies for TCP when there will be a context switch
In reply to Chris LeechThe performance wins come with having the DMA copy engine doing the copies in parallel with the context switch. If there is enough data ready on the socket at recv time just use a regular copy.
---
net/ipv4/tcp.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
net/ipv4/tcp.c +7 -3
@@ -1108,6 +1108,8 @@ int tcp_recvmsg(struct kiocb *iocb, strulong timeo;struct task_struct *user_recv =NULL ;int copied_early =0 ; +int available =0 ; +struct sk_buff *skb;lock_sock (sk);
@@ -1134,7 +1136,11 @@ int tcp_recvmsg(struct kiocb *iocb, stru#ifdef CONFIG_NET_DMA tp->ucopy.dma_chan =NULL ;preempt_disable (); -if ((len > sysctl_tcp_dma_copybreak) && !(flags &MSG_PEEK ) && + skb =skb_peek_tail (&sk->sk_receive_queue); +if (skb) + available =TCP_SKB_CB (skb)->seq + skb->len - (*seq); +if ((available < target) && + (len > sysctl_tcp_dma_copybreak) && !(flags &MSG_PEEK ) && !sysctl_tcp_low_latency &&__get_cpu_var (softnet_data).net_dma) {preempt_enable_no_resched (); tp->ucopy.pinned_list =dma_pin_iovec_pages (msg->msg_iov, len);
@@ -1143,7 +1149,6 @@ int tcp_recvmsg(struct kiocb *iocb, stru#endif do { - struct sk_buff *skb; u32 offset; /* Are we at urgent data? Stop if we have read anything or have SIGURG pending. */
@@ -1431,7 +1436,6 @@ skip_copy:#ifdef CONFIG_NET_DMA if (tp->ucopy.dma_chan) { -struct sk_buff *skb;dma_cookie_t done, used;dma_async_memcpy_issue_pending (tp->ucopy.dma_chan);