Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

Pull dmaengine updates from Dan Williams:
 "Even though this has fixes marked for -stable, given the size and the
  needed conflict resolutions this is 3.18-rc1/merge-window material.

  These patches have been languishing in my tree for a long while.  The
  fact that I do not have the time to do proper/prompt maintenance of
  this tree is a primary factor in the decision to step down as
  dmaengine maintainer.  That and the fact that the bulk of drivers/dma/
  activity is going through Vinod these days.

  The net_dma removal has not been in -next.  It has developed simple
  conflicts against mainline and net-next (for-3.18).

  Continuing thanks to Vinod for staying on top of drivers/dma/.

  Summary:

   1/ Step down as dmaengine maintainer see commit 08223d80df38
      "dmaengine maintainer update"

   2/ Removal of net_dma, as it has been marked 'broken' since 3.13
      (commit 77873803363c "net_dma: mark broken"), without reports of
      performance regression.

   3/ Miscellaneous fixes"

* tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  net: make tcp_cleanup_rbuf private
  net_dma: revert 'copied_early'
  net_dma: simple removal
  dmaengine maintainer update
  dmatest: prevent memory leakage on error path in thread
  ioat: Use time_before_jiffies()
  dmaengine: fix xor sources continuation
  dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()
  dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()
  dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call
  ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
  drivers: dma: Include appropriate header file in dca.c
  drivers: dma: Mark functions as static in dma_v3.c
  dma: mv_xor: Add DMA API error checks
  ioat/dca: Use dev_is_pci() to check whether it is pci device

1 files changed, 15 insertions, 134 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 541f26a67ba2..8ee43ae90396 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -274,7 +274,6 @@
 #include <net/tcp.h>
 #include <net/xfrm.h>
 #include <net/ip.h>
-#include <net/netdma.h>
 #include <net/sock.h>
 
 #include <asm/uaccess.h>
@@ -1394,7 +1393,7 @@ static int tcp_peek_sndq(struct sock *sk, struct msghdr *msg, int len)
  * calculation of whether or not we must ACK for the sake of
  * a window update.
  */
-void tcp_cleanup_rbuf(struct sock *sk, int copied)
+static void tcp_cleanup_rbuf(struct sock *sk, int copied)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         bool time_to_ack = false;
@@ -1470,39 +1469,6 @@ static void tcp_prequeue_process(struct sock *sk)
         tp->ucopy.memory = 0;
 }
 
-#ifdef CONFIG_NET_DMA
-static void tcp_service_net_dma(struct sock *sk, bool wait)
-{
-        dma_cookie_t done, used;
-        dma_cookie_t last_issued;
-        struct tcp_sock *tp = tcp_sk(sk);
-
-        if (!tp->ucopy.dma_chan)
-                return;
-
-        last_issued = tp->ucopy.dma_cookie;
-        dma_async_issue_pending(tp->ucopy.dma_chan);
-
-        do {
-                if (dma_async_is_tx_complete(tp->ucopy.dma_chan,
-                                              last_issued, &done,
-                                              &used) == DMA_COMPLETE) {
-                        /* Safe to free early-copied skbs now */
-                        __skb_queue_purge(&sk->sk_async_wait_queue);
-                        break;
-                } else {
-                        struct sk_buff *skb;
-                        while ((skb = skb_peek(&sk->sk_async_wait_queue)) &&
-                               (dma_async_is_complete(skb->dma_cookie, done,
-                                                      used) == DMA_COMPLETE)) {
-                                __skb_dequeue(&sk->sk_async_wait_queue);
-                                kfree_skb(skb);
-                        }
-                }
-        } while (wait);
-}
-#endif
-
 static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
 {
         struct sk_buff *skb;
@@ -1520,7 +1486,7 @@ static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
                  * splitted a fat GRO packet, while we released socket lock
                  * in skb_splice_bits()
                  */
-                sk_eat_skb(sk, skb, false);
+                sk_eat_skb(sk, skb);
         }
         return NULL;
 }
@@ -1586,11 +1552,11 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
                                 continue;
                 }
                 if (tcp_hdr(skb)->fin) {
-                        sk_eat_skb(sk, skb, false);
+                        sk_eat_skb(sk, skb);
                         ++seq;
                         break;
                 }
-                sk_eat_skb(sk, skb, false);
+                sk_eat_skb(sk, skb);
                 if (!desc->count)
                         break;
                 tp->copied_seq = seq;
@@ -1628,7 +1594,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         int target;             /* Read at least this many bytes */
         long timeo;
         struct task_struct *user_recv = NULL;
-        bool copied_early = false;
         struct sk_buff *skb;
         u32 urg_hole = 0;
 
@@ -1674,28 +1639,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
         target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
 
-#ifdef CONFIG_NET_DMA
-        tp->ucopy.dma_chan = NULL;
-        preempt_disable();
-        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 &&
-                    net_dma_find_channel()) {
-                        preempt_enable();
-                        tp->ucopy.pinned_list =
-                                        dma_pin_iovec_pages(msg->msg_iov, len);
-                } else {
-                        preempt_enable();
-                }
-        }
-#endif
-
         do {
                 u32 offset;
 
@@ -1826,16 +1769,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                         /* __ Set realtime policy in scheduler __ */
                 }
 
-#ifdef CONFIG_NET_DMA
-                if (tp->ucopy.dma_chan) {
-                        if (tp->rcv_wnd == 0 &&
-                            !skb_queue_empty(&sk->sk_async_wait_queue)) {
-                                tcp_service_net_dma(sk, true);
-                                tcp_cleanup_rbuf(sk, copied);
-                        } else
-                                dma_async_issue_pending(tp->ucopy.dma_chan);
-                }
-#endif
                 if (copied >= target) {
                         /* Do not sleep, just process backlog. */
                         release_sock(sk);
@@ -1843,11 +1776,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 } else
                         sk_wait_data(sk, &timeo);
 
-#ifdef CONFIG_NET_DMA
-                tcp_service_net_dma(sk, false);  /* Don't block */
-                tp->ucopy.wakeup = 0;
-#endif
-
                 if (user_recv) {
                         int chunk;
 
@@ -1905,43 +1833,13 @@ do_prequeue:
                 }
 
                 if (!(flags & MSG_TRUNC)) {
-#ifdef CONFIG_NET_DMA
-                        if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
-                                tp->ucopy.dma_chan = net_dma_find_channel();
-
-                        if (tp->ucopy.dma_chan) {
-                                tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec(
-                                        tp->ucopy.dma_chan, skb, offset,
-                                        msg->msg_iov, used,
-                                        tp->ucopy.pinned_list);
-
-                                if (tp->ucopy.dma_cookie < 0) {
-
-                                        pr_alert("%s: dma_cookie < 0\n",
-                                                 __func__);
-
-                                        /* Exception. Bailout! */
-                                        if (!copied)
-                                                copied = -EFAULT;
-                                        break;
-                                }
-
-                                dma_async_issue_pending(tp->ucopy.dma_chan);
-
-                                if ((offset + used) == skb->len)
-                                        copied_early = true;
-
-                        } else
-#endif
-                        {
-                                err = skb_copy_datagram_iovec(skb, offset,
-                                                msg->msg_iov, used);
-                                if (err) {
-                                        /* Exception. Bailout! */
-                                        if (!copied)
-                                                copied = -EFAULT;
-                                        break;
-                                }
+                        err = skb_copy_datagram_iovec(skb, offset,
+                                                      msg->msg_iov, used);
+                        if (err) {
+                                /* Exception. Bailout! */
+                                if (!copied)
+                                        copied = -EFAULT;
+                                break;
                         }
                 }
 
@@ -1961,19 +1859,15 @@ skip_copy:
 
                 if (tcp_hdr(skb)->fin)
                         goto found_fin_ok;
-                if (!(flags & MSG_PEEK)) {
-                        sk_eat_skb(sk, skb, copied_early);
-                        copied_early = false;
-                }
+                if (!(flags & MSG_PEEK))
+                        sk_eat_skb(sk, skb);
                 continue;
 
         found_fin_ok:
                 /* Process the FIN. */
                 ++*seq;
-                if (!(flags & MSG_PEEK)) {
-                        sk_eat_skb(sk, skb, copied_early);
-                        copied_early = false;
-                }
+                if (!(flags & MSG_PEEK))
+                        sk_eat_skb(sk, skb);
                 break;
         } while (len > 0);
 
@@ -1996,16 +1890,6 @@ skip_copy:
                 tp->ucopy.len = 0;
         }
 
-#ifdef CONFIG_NET_DMA
-        tcp_service_net_dma(sk, true);  /* Wait for queue to drain */
-        tp->ucopy.dma_chan = NULL;
-
-        if (tp->ucopy.pinned_list) {
-                dma_unpin_iovec_pages(tp->ucopy.pinned_list);
-                tp->ucopy.pinned_list = NULL;
-        }
-#endif
-
         /* According to UNIX98, msg_name/msg_namelen are ignored
          * on connected socket. I was just happy when found this 8) --ANK
          */
@@ -2349,9 +2233,6 @@ int tcp_disconnect(struct sock *sk, int flags)
         __skb_queue_purge(&sk->sk_receive_queue);
         tcp_write_queue_purge(sk);
         __skb_queue_purge(&tp->out_of_order_queue);
-#ifdef CONFIG_NET_DMA
-        __skb_queue_purge(&sk->sk_async_wait_queue);
-#endif
 
         inet->inet_dport = 0;