1. 07 Mar, 2013 23 commits
    • Daniel Pieczko's avatar
      sfc: allocate more RX buffers per page · 1648a23f
      Daniel Pieczko authored
      Allocating 2 buffers per page is insanely inefficient when MTU is 1500
      and PAGE_SIZE is 64K (as it usually is on POWER).  Allocate as many as
      we can fit, and choose the refill batch size at run-time so that we
      still always use a whole page at once.
      
      [bwh: Fix loop condition to allow for compound pages; rebase]
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      1648a23f
    • Ben Hutchings's avatar
      sfc: Replace efx_rx_is_last_buffer() with a flag · 179ea7f0
      Ben Hutchings authored
      This condition is brittle and we have lots of flags to spare.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      179ea7f0
    • Daniel Pieczko's avatar
      sfc: reuse pages to avoid DMA mapping/unmapping costs · 2768935a
      Daniel Pieczko authored
      On POWER systems, DMA mapping/unmapping operations are very expensive.
      These changes reduce these costs by trying to reuse DMA mapped pages.
      
      After all the buffers associated with a page have been processed and
      passed up, the page is placed into a ring (if there is room).  For
      each page that is required for a refill operation, a page in the ring
      is examined to determine if its page count has fallen to 1, ie. the
      kernel has released its reference to these packets.  If this is the
      case, the page can be immediately added back into the RX descriptor
      ring, without having to re-map it for DMA.
      
      If the kernel is still holding a reference to this page, it is removed
      from the ring and unmapped for DMA.  Then a new page, which can
      immediately be used by RX buffers in the descriptor ring, is allocated
      and DMA mapped.
      
      The time a page needs to spend in the recycle ring before the kernel
      has released its page references is based on the number of buffers
      that use this page.  As large pages can hold more RX buffers, the RX
      recycle ring can be shorter.  This reduces memory usage on POWER
      systems, while maintaining the performance gain achieved by recycling
      pages, following the driver change to pack more than two RX buffers
      into large pages.
      
      When an IOMMU is not present, the recycle ring can be small to reduce
      memory usage, since DMA mapping operations are inexpensive.
      
      With a small recycle ring, attempting to refill the descriptor queue
      with more buffers than the equivalent size of the recycle ring could
      ultimately lead to memory leaks if page entries in the recycle ring
      were overwritten.  To prevent this, the check to see if the recycle
      ring is full is changed to check if the next entry to be written is
      NULL.
      
      [bwh: Combine and rebase several commits so this is complete
       before the following buffer-packing changes.  Remove module
       parameter.]
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      2768935a
    • Ben Hutchings's avatar
      sfc: Enable RX DMA scattering where possible · 85740cdf
      Ben Hutchings authored
      Enable RX DMA scattering iff an RX buffer large enough for the current
      MTU will not fit into a single page and the NIC supports DMA
      scattering for kernel-mode RX queues.
      
      On Falcon and Siena, the RX_USR_BUF_SIZE field is used as the DMA
      limit for both all RX queues with scatter enabled.  Set it to 1824,
      matching what Onload uses now.
      
      Maintain a statistic for frames truncated due to lack of descriptors
      (rx_nodesc_trunc).  This is distinct from rx_frm_trunc which may be
      incremented when scattering is disabled and implies an over-length
      frame.
      
      Whenever an MTU change causes scattering to be turned on or off,
      update filters that point to the PF queues, but leave others
      unchanged, as VF drivers assume scattering is off.
      
      Add n_frags parameters to various functions, and make them iterate:
      - efx_rx_packet()
      - efx_recycle_rx_buffers()
      - efx_rx_mk_skb()
      - efx_rx_deliver()
      
      Make efx_handle_rx_event() responsible for updating
      efx_rx_queue::removed_count.
      
      Change the RX pipeline state to a starting ring index and number of
      fragments, and make __efx_rx_packet() responsible for clearing it.
      
      Based on earlier versions by David Riddoch and Jon Cooper.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      85740cdf
    • Ben Hutchings's avatar
      sfc: Update RX buffer address together with length · b74e3e8c
      Ben Hutchings authored
      Adjust rx_buf->page_offset when we eat the RX hash prefix.  Remove
      efx_rx_buf_offset(), which is now redundant.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      b74e3e8c
    • Ben Hutchings's avatar
      sfc: Explicitly prefetch RX hash prefix, not just Ethernet heade · 5036b7c7
      Ben Hutchings authored
      Currently we prefetch from the Ethernet header, but we will also read
      the hash prefix.  In practice they should be in the same cache line
      and this won't hurt, but it is still pointless to add on the hash
      prefix size.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      5036b7c7
    • Ben Hutchings's avatar
      sfc: Replace efx_rx_buf_eh() with simpler efx_rx_buf_va() · b184f16b
      Ben Hutchings authored
      efx_rx_buf_va() returns the virtual address of the current start of
      the buffer.  The callers must add the hash prefix size themselves.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      b184f16b
    • Ben Hutchings's avatar
      sfc: Wrap __efx_rx_packet() with efx_rx_flush_packet() · ff734ef4
      Ben Hutchings authored
      The pipeline mechanism will need to change a bit for scattered
      packets.  Add a wrapper to insulate efx_process_channel() from this.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      ff734ef4
    • Ben Hutchings's avatar
    • Ben Hutchings's avatar
      sfc: Properly distinguish RX buffer and DMA lengths · 272baeeb
      Ben Hutchings authored
      Replace efx_nic::rx_buffer_len with efx_nic::rx_dma_len, the maximum
      RX DMA length.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      272baeeb
    • Ben Hutchings's avatar
    • Alexandre Rames's avatar
      sfc: Add AER and EEH support for Siena · 626950db
      Alexandre Rames authored
      The Linux side of EEH is triggered by MMIO reads, but this
      driver's data path does not issue any MMIO reads (except in
      legacy interrupt mode).  Therefore add a monitor function
      to poll EEH periodically.
      
      When preparing to reset the device based on our own error
      detection, also poll EEH and defer to its recovery mechanism
      if appropriate.
      
      [bwh: Use a separate condition for the initial link poll; fix some
       style errors]
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      626950db
    • Ben Hutchings's avatar
      sfc: Disable RSS when using SR-IOV and only 1 RX queue on the PF · 634ab72c
      Ben Hutchings authored
      On Siena, VFs share RSS configuration with the PF.  We attempted to
      support configurations where the PF only uses 1 RX queue and VFs use
      multiple RX queues, by (1) setting up RSS for the number of RX queues
      per VF (2) disabling RSS in the PF's RX default filters.
      
      Unfortunately commit cd2d5b52 ('sfc: Add SR-IOV back-end support
      for SFC9000 family') only included (1).  This is (2).
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      634ab72c
    • Ben Hutchings's avatar
      sfc: Fix replacement detection in efx_filter_insert_filter() · d9ccfdd4
      Ben Hutchings authored
      efx_filter_insert_filter() uses the first table entry in the hash chain
      that either has the same match values or is empty.  This means that
      replacement doesn't always work correctly:
      
      1. Insert filter F1 with match values M1, hashing to H1, at first
         possible entry E1.
      2. Insert filter F2 with match values M2, hashing to H1, at second
         possible entry E2.
      3. Remove filter F1.
      4. Insert filter F3 with match values M2, hashing to H1, at first
         possible entry E1.
      
      F3 should have either replaced F2 or been rejected (depending on
      priority and the replace_equal parameter).
      
      Instead, search for both a matching filter that the inserted filter
      would replace, and an available insertion point, up to the applicable
      maximum search depths.  If we insert at lower depth than a replaced
      filter, clear the replaced filter.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      d9ccfdd4
    • Ben Hutchings's avatar
      sfc: Merge efx_filter_search() into efx_filter_insert() · 297891ce
      Ben Hutchings authored
      efx_filter_search() is only called from efx_filter_insert(), and
      neither function is very long.  The following bug fix requires a more
      sophisticated search with a third result, which is going to be easier
      to implement as part of the same function.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      297891ce
    • Ben Hutchings's avatar
      sfc: Don't use efx_filter_{build,hash,increment}() for default MAC filters · 385904f8
      Ben Hutchings authored
      These functions happen to work for default MAC filters: they generate
      an initial index of 1/0 for unicast/multicast respectively and an
      increment of 1 for either, so a search succeeds at depth 2.  But this
      is a matter of luck rather than design, and it really won't work well
      with the bug fix we're about to do.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      385904f8
    • Ben Hutchings's avatar
      sfc: Remove redundant parameter to efx_filter_search() · e3a699fa
      Ben Hutchings authored
      The 'for_insert' parameter is redundant since there are no longer
      any other operations that need to search based on a filter spec.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      e3a699fa
    • Ben Hutchings's avatar
      sfc: More sensible semantics for efx_filter_insert_filter() replace flag · 7de07a4d
      Ben Hutchings authored
      The 'replace' flag to efx_filter_insert_filter() controls whether the
      new filter may replace *any* filter, and is checked even before
      priority comparison.  But lower-priority filters should never
      block insertion of higher-priority filters.
      
      Change the priority checking so that lower-priority filters are
      replaced regardless of the value of the flag, and rename the
      flag to 'replace_equal'.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      7de07a4d
    • Alexandre Rames's avatar
      sfc: Remove rx_alloc_method SKB · 97d48a10
      Alexandre Rames authored
      [bwh: Remove more dead code, and make efx_ptp_rx() pull the data it
       needs into the header area.]
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      97d48a10
    • Laurence Evans's avatar
    • Laurence Evans's avatar
      sfc: PTP changes to support improved UUID filtering mode · c939a316
      Laurence Evans authored
      There is a long-standing problem with the packet-timestamp matching in
      the driver. When a PTP packet is received by the MC, the FPGA
      timestamps the packet and the MC sends the timestamp and 6 bytes of
      the UUID to the driver. The driver then matches the timestamp against
      received packets using the same 6 bytes of UUID.
      
      The problem comes from the choice of which 6 bytes to use. The PTP
      spec is slightly contradictory and misleading in one of the two places
      where the UUIDs are discussed. From section 7.2.2.2 of the spec, a
      PTPD2 UUID can be either a EUI-64 or a EUI-64 constructed from a
      EUI-48. The typical ethernet based implementation uses a EUI-64
      constructed from a EUI-48. This works by taking the first 3 bytes of
      the MAC address of the NIC being used for PTP (the OUI), then
      inserting 0xFF, 0xFE, then taking the last 3 bytes of the MAC address
      giving
                MAC[0], MAC[1], MAC[2], 0xFF, 0xFE, MAC[3], MAC[4], MAC[5]
      The current MC firmware and driver discard the first two bytes of this
      UUID and packets are matched against timestamps using bytes 2 to 7 so
      there is a small risk that in a deployment of Solarflare PTP NICs used
      with other vendors NICs, that a PTP packet could be matched against
      the wrong timestamp. This applies to all other organisations whose
      third byte of the OUI is 0x53. It's a long list but I notice that it
      includes Cisco.
      
      The necessary modifications to use bytes 0-2 and 5-7 of the UUID to
      match against are quite small but introduce incompatibility between
      older version of the firmware and driver.
      
      When PTP is enabled via SO_TIMESTAMPING specifying PTP V2, the driver
      will try to enable PTP in the firmware using the enhanced mode
      (above). If the firmware returns an error, the driver will enable PTP
      in the firmware using the old mode.
      
      [bwh: Fix some style errors; remove private ioctl bits]
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      c939a316
    • Ben Hutchings's avatar
      sfc: Allow efx_channel_type::receive_skb() to reject a packet · 4a74dc65
      Ben Hutchings authored
      Instead of having efx_ptp_rx() call netif_receive_skb() for an invalid
      PTP packet, make it return false for rejected packets and have
      efx_rx_deliver() pass them up.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      4a74dc65
    • Ben Hutchings's avatar
      Merge branch 'sfc-3.9' into master · 86c2da58
      Ben Hutchings authored
      86c2da58
  2. 06 Mar, 2013 17 commits