1. 07 Mar, 2014 16 commits
    • hayeswang's avatar
      r8152: check tx agg list before spin lock · 21949ab7
      hayeswang authored
      
      
      Check tx agg list before spin lock to avoid doing spin lock every
      times.
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      21949ab7
    • hayeswang's avatar
      r8152: replace spin_lock_irqsave and spin_unlock_irqrestore · 2685d410
      hayeswang authored
      
      
      Use spin_lock and spin_unlock in interrupt context.
      
      The ndo_start_xmit would not be called in interrupt context, so
      replace the relative spin_lock_irqsave and spin_unlock_irqrestore
      with spin_lock_bh and spin_unlock_bh.
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2685d410
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 91bd66e4
      David S. Miller authored
      
      
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to i40e and i40evf.
      
      Most notable are:
      Joseph completes the implementation of the ethtool ntuple rule
      management interface by adding the get, update and delete interface
      reset.
      
      Akeem provides a fix to prevent a possible overflow due to multiplication
      of number and size by using kzalloc, so use kcalloc.
      
      Jesse provides an implementation for skb_set_hash() and adds the L4 type
      return when we know it is an L4 hash.  He also adds a counter to
      statistics for Tx timeouts to help users.  Lastly he provides a change
      to stay away from the cache line where the done bit may be getting
      written back for the transmit ring since the hardware may be writing the
      whole cache line for a partial update.
      
      Shannon cleans up code comments.
      
      Anjali removes a firmware workaround for newer firmware since the number
      of MSIx vectors are being reported correctly.
      
      v2:
       -  dropped patch 01 of the series based on feedback from the author
          Joe Perches and Shannon Nelson.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91bd66e4
    • David S. Miller's avatar
      Merge tag 'rxrpc-devel-20140304' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · 38940042
      David S. Miller authored
      
      
      David Howells says:
      
      ====================
      net-next: AF_RXRPC fixes and development
      
      Here are some AF_RXRPC fixes:
      
       (1) Fix to remove incorrect checksum calculation made during recvmsg().  It's
           unnecessary to try to do this there since we check the checksum before
           reading the RxRPC header from the packet.
      
       (2) Fix to prevent the sending of an ABORT packet in response to another
           ABORT packet and inducing a storm.
      
       (3) Fix UDP MTU calculation from parsing ICMP_FRAG_NEEDED packets where we
           don't handle the ICMP packet not specifying an MTU size.
      
      And development patches:
      
       (4) Add sysctls for configuring RxRPC parameters, specifically various delays
           pertaining to ACK generation, the time before we resend a packet for
           which we don't receive an ACK, the maximum time a call is permitted to
           live and the amount of time transport, connection and dead call
           information is cached.
      
       (5) Improve ACK packet production by adjusting the handling of ACK_REQUESTED
           packets, ignoring the MORE_PACKETS flag, delaying the production of
           otherwise immediate ACK_IDLE packets and delaying all ACK_IDLE production
           (barring the call termination) to half a second.
      
       (6) Add more sysctl parameters to expose the Rx window size, the maximum
           packet size that we're willing to receive and the number of jumbo rxrpc
           packets we're willing to handle in a single UDP packet.
      
       (7) Request ACKs on alternate DATA packets so that the other side doesn't
           wait till we fill up the Tx window.
      
       (8) Use a RCU hash table to look up the rxrpc_call for an incoming packet
           rather than stepping through a hierarchy involving several spinlocks.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      38940042
    • David S. Miller's avatar
      Merge branch 'xen-netback-next' · 4caeccb4
      David S. Miller authored
      Zoltan Kiss says:
      
      ====================
      xen-netback: TX grant mapping with SKBTX_DEV_ZEROCOPY instead of copy
      
      A long known problem of the upstream netback implementation that on the TX
      path (from guest to Dom0) it copies the whole packet from guest memory into
      Dom0. That simply became a bottleneck with 10Gb NICs, and generally it's a
      huge perfomance penalty. The classic kernel version of netback used grant
      mapping, and to get notified when the page can be unmapped, it used page
      destructors. Unfortunately that destructor is not an upstreamable solution.
      Ian Campbell's skb fragment destructor patch series [1] tried to solve this
      problem, however it seems to be very invasive on the network stack's code,
      and therefore haven't progressed very well.
      This patch series use SKBTX_DEV_ZEROCOPY flags to tell the stack it needs to
      know when the skb is freed up. That is the way KVM solved the same problem,
      and based on my initial tests it can do the same for us. Avoiding the extra
      copy boosted up TX throughput from 6.8 Gbps to 7.9 (I used a slower AMD
      Interlagos box, both Dom0 and guest on upstream kernel, on the same NUMA node,
      running iperf 2.0.5, and the remote end was a bare metal box on the same 10Gb
      switch)
      Based on my investigations the packet get only copied if it is delivered to
      Dom0 IP stack through deliver_skb, which is due to this [2] patch. This affects
      DomU->Dom0 IP traffic and when Dom0 does routing/NAT for the guest. That's a bit
      unfortunate, but luckily it doesn't cause a major regression for this usecase.
      In the future we should try to eliminate that copy somehow.
      There are a few spinoff tasks which will be addressed in separate patches:
      - grant copy the header directly instead of map and memcpy. This should help
        us avoiding TLB flushing
      - use something else than ballooned pages
      - fix grant map to use page->index properly
      I've tried to broke it down to smaller patches, with mixed results, so I
      welcome suggestions on that part as well:
      1: Use skb->cb to store pending_idx
      2: Some refactoring
      3: Change RX path for mapped SKB fragments (moved here to keep bisectability,
      review it after #4)
      4: Introduce TX grant mapping
      5: Remove old TX grant copy definitons and fix indentations
      6: Add stat counters for zerocopy
      7: Handle guests with too many frags
      8: Timeout packets in RX path
      9: Aggregate TX unmap operations
      
      v2: I've fixed some smaller things, see the individual patches. I've added a
      few new stat counters, and handling the important use case when an older guest
      sends lots of slots. Instead of delayed copy now we timeout packets on the RX
      path, based on the assumption that otherwise packets should get stucked
      anywhere else. Finally some unmap batching to avoid too much TLB flush
      
      v3: Apart from fixing a few things mentioned in responses the important change
      is the use the hypercall directly for grant [un]mapping, therefore we can
      avoid m2p override.
      
      v4: Now we are using a new grant mapping API to avoid m2p_override. The RX queue
      timeout logic changed also.
      
      v5: Only minor fixes based on Wei's comments
      
      v6: Important bugfixes for xenvif_poll exit path and zerocopy callback, see
      first 2 patches. Also rework of handling packets with too many slots, and
      reorder the series a bit.
      
      v7: Small fixes in comments/log messages/error paths, and merging the frag
      overflow stats patch into its parent.
      
      [1] http://lwn.net/Articles/491522/
      [2] https://lkml.org/lkml/2012/7/20/363
      
      
      ====================
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4caeccb4
    • Zoltan Kiss's avatar
      xen-netback: Aggregate TX unmap operations · e9275f5e
      Zoltan Kiss authored
      
      
      Unmapping causes TLB flushing, therefore we should make it in the largest
      possible batches. However we shouldn't starve the guest for too long. So if
      the guest has space for at least two big packets and we don't have at least a
      quarter ring to unmap, delay it for at most 1 milisec.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e9275f5e
    • Zoltan Kiss's avatar
      xen-netback: Timeout packets in RX path · 09350788
      Zoltan Kiss authored
      
      
      A malicious or buggy guest can leave its queue filled indefinitely, in which
      case qdisc start to queue packets for that VIF. If those packets came from an
      another guest, it can block its slots and prevent shutdown. To avoid that, we
      make sure the queue is drained in every 10 seconds.
      The QDisc queue in worst case takes 3 round to flush usually.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09350788
    • Zoltan Kiss's avatar
      xen-netback: Handle guests with too many frags · e3377f36
      Zoltan Kiss authored
      
      
      Xen network protocol had implicit dependency on MAX_SKB_FRAGS. Netback has to
      handle guests sending up to XEN_NETBK_LEGACY_SLOTS_MAX slots. To achieve that:
      - create a new skb
      - map the leftover slots to its frags (no linear buffer here!)
      - chain it to the previous through skb_shinfo(skb)->frag_list
      - map them
      - copy and coalesce the frags into a brand new one and send it to the stack
      - unmap the 2 old skb's pages
      
      It's also introduces new stat counters, which help determine how often the guest
      sends a packet with more than MAX_SKB_FRAGS frags.
      
      NOTE: if bisect brought you here, you should apply the series up until
      "xen-netback: Timeout packets in RX path", otherwise malicious guests can block
      other guests by not releasing their sent packets.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e3377f36
    • Zoltan Kiss's avatar
      xen-netback: Add stat counters for zerocopy · 1bb332af
      Zoltan Kiss authored
      
      
      These counters help determine how often the buffers had to be copied. Also
      they help find out if packets are leaked, as if "sent != success + fail",
      there are probably packets never freed up properly.
      
      NOTE: if bisect brought you here, you should apply the series up until
      "xen-netback: Timeout packets in RX path", otherwise Windows guests can't work
      properly and malicious guests can block other guests by not releasing their sent
      packets.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1bb332af
    • Zoltan Kiss's avatar
      xen-netback: Remove old TX grant copy definitons and fix indentations · 62bad319
      Zoltan Kiss authored
      
      
      These became obsolete with grant mapping. I've left intentionally the
      indentations in this way, to improve readability of previous patches.
      
      NOTE: if bisect brought you here, you should apply the series up until
      "xen-netback: Timeout packets in RX path", otherwise Windows guests can't work
      properly and malicious guests can block other guests by not releasing their sent
      packets.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      62bad319
    • Zoltan Kiss's avatar
      xen-netback: Introduce TX grant mapping · f53c3fe8
      Zoltan Kiss authored
      
      
      This patch introduces grant mapping on netback TX path. It replaces grant copy
      operations, ditching grant copy coalescing along the way. Another solution for
      copy coalescing is introduced in "xen-netback: Handle guests with too many
      frags", older guests and Windows can broke before that patch applies.
      There is a callback (xenvif_zerocopy_callback) from core stack to release the
      slots back to the guests when kfree_skb or skb_orphan_frags called. It feeds a
      separate dealloc thread, as scheduling NAPI instance from there is inefficient,
      therefore we can't do dealloc from the instance.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f53c3fe8
    • Zoltan Kiss's avatar
      xen-netback: Handle foreign mapped pages on the guest RX path · 3e2234b3
      Zoltan Kiss authored
      
      
      RX path need to know if the SKB fragments are stored on pages from another
      domain.
      Logically this patch should be after introducing the grant mapping itself, as
      it makes sense only after that. But to keep bisectability, I moved it here. It
      shouldn't change any functionality here. xenvif_zerocopy_callback and
      ubuf_to_vif are just stubs here, they will be introduced properly later on.
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3e2234b3
    • Zoltan Kiss's avatar
      xen-netback: Minor refactoring of netback code · 121fa4b7
      Zoltan Kiss authored
      
      
      This patch contains a few bits of refactoring before introducing the grant
      mapping changes:
      - introducing xenvif_tx_pending_slots_available(), as this is used several
        times, and will be used more often
      - rename the thread to vifX.Y-guest-rx, to signify it does RX work from the
        guest point of view
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      121fa4b7
    • Zoltan Kiss's avatar
      xen-netback: Use skb->cb for pending_idx · 8f13dd96
      Zoltan Kiss authored
      
      
      Storing the pending_idx at the first byte of the linear buffer never looked
      good, skb->cb is a more proper place for this. It also prevents the header to
      be directly grant copied there, and we don't have the pending_idx after we
      copied the header here, so it's time to change it.
      It also introduces helpers for the RX side
      Signed-off-by: default avatarZoltan Kiss <zoltan.kiss@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8f13dd96
    • Eric Dumazet's avatar
      l2tp: keep original skb ownership · 31c70d59
      Eric Dumazet authored
      There is no reason to orphan skb in l2tp.
      
      This breaks things like per socket memory limits, TCP Small queues...
      
      Fix this before more people copy/paste it.
      
      This is very similar to commit 8f646c92
      
      
      ("vxlan: keep original skb ownership")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: James Chapman <jchapman@katalix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      31c70d59
    • Eric Dumazet's avatar
      tcp: do not leak non zero tstamp in output packets · 21962692
      Eric Dumazet authored
      Usage of skb->tstamp should remain private to TCP stack
      (only set on packets on write queue, not on cloned ones)
      
      Otherwise, packets given to loopback interface with a non null tstamp
      can confuse netif_rx() / net_timestamp_check()
      
      Other possibility would be to clear tstamp in loopback_xmit(),
      as done in skb_scrub_packet()
      
      Fixes: 740b0f18
      
       ("tcp: switch rtt estimations to usec resolution")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarWillem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      21962692
  2. 06 Mar, 2014 24 commits