Merge branch 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop

* 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop: (28 commits)
  ioatdma: add the unisys "i/oat" pci vendor/device id
  ARM: Add drivers/dma to arch/arm/Kconfig
  iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver
  iop13xx: surface the iop13xx adma units to the iop-adma driver
  dmaengine: driver for the iop32x, iop33x, and iop13xx raid engines
  md: remove raid5 compute_block and compute_parity5
  md: handle_stripe5 - request io processing in raid5_run_ops
  md: handle_stripe5 - add request/completion logic for async expand ops
  md: handle_stripe5 - add request/completion logic for async read ops
  md: handle_stripe5 - add request/completion logic for async check ops
  md: handle_stripe5 - add request/completion logic for async compute ops
  md: handle_stripe5 - add request/completion logic for async write ops
  md: common infrastructure for running operations with raid5_run_ops
  md: raid5_run_ops - run stripe operations outside sh->lock
  raid5: replace custom debug PRINTKs with standard pr_debug
  raid5: refactor handle_stripe5 and handle_stripe6 (v3)
  async_tx: add the async_tx api
  xor: make 'xor_blocks' a library routine for use with async_tx
  dmaengine: make clients responsible for managing channels
  dmaengine: refactor dmaengine around dma_async_tx_descriptor
  ...

1 files changed, 18 insertions, 8 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 450f44bb2c8e..987b94403be5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1116,6 +1116,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         long timeo;
         struct task_struct *user_recv = NULL;
         int copied_early = 0;
+        struct sk_buff *skb;
 
         lock_sock(sk);
 
@@ -1142,16 +1143,26 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 #ifdef CONFIG_NET_DMA
         tp->ucopy.dma_chan = NULL;
         preempt_disable();
-        if ((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);
-        } else
-                preempt_enable_no_resched();
+        skb = skb_peek_tail(&sk->sk_receive_queue);
+        {
+                int available = 0;
+
+                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);
+                } else {
+                        preempt_enable_no_resched();
+                }
+        }
 #endif
 
         do {
-                struct sk_buff *skb;
                 u32 offset;
 
                 /* Are we at urgent data? Stop if we have read anything or have SIGURG pending. */
@@ -1439,7 +1450,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);