1. 19 3月, 2014 2 次提交
  2. 18 3月, 2014 34 次提交
    • D
      Merge branch 'altera_tse' · 33125df3
      David S. Miller 提交于
      Vince Bridgers says:
      
      ====================
      Altera Triple Speed Ethernet (TSE) Driver
      
      This is the version 6 submission for the Altera Triple Speed Ethernet (TSE)
      driver. All comments received during the version 2, 3, 4, and 5 submissions
      have been accepted. Please find the change log and a description of the
      submission below.
      
      If you find the submission acceptable, please consider this patch set for
      inclusion into the Linux kernel.
      
      V6: Address comments from V5 review
          - add call to skb_tx_timestamp in the drivers transmit path
          - correct use of unsigned int where it was cast to pointer. Use types
            appropriate for intended and correct use to let the compiler warn us
            when type usage is incorrect.
          - use correct semantics for pointer arithmetic in same code path
      
      V5: Address comments from V4 review
          - Add descriptions of statistics to driver documentation. The statstics
            supported by the driver/controller map to IEEE and RFC statistics, and
            the names and mappings are described in the user documentation.
          - Change "unsigned int" to u32 in device structure definitions
          - Change used of netdev_warn to netif_warn in altera_sgdma.c
          - Change stat name rx_fifo_drops to ether_drops to match the event
            actually counted by the hardware.
      
      V4: Address comments from V3 review
          - Change statistics names in ethtool module to follow common use in
            other ethernet drivers.
          - remove an unnecessary case in ethtool module
          - change logging to use netdev_* where possible instead of dev_*
          - remove logging for OOM errors since those are already logged
      
      V3: Address comments from V2 review
          - Reorder patch submission so that net/ethernet Makefile and Kconfig
            are committed last, thus not breaking bisect
          - Use of_get_mac_address instead of of_get_property
          - Change supplemental and hash configuration bindings to boolean/empty,
            and more meaningful names
          - Add check for failure from calls to of_phy_connect and
            connect_local_phy
          - Correct code to find mdio child node
          - Update bindings document
          - Remove cast to u64 when not necessary
          - add use of const for statistics strings
      
      V2: Address comments from initial RFC review.
          - The driver files were broken up by major sections of functionality.
            These include MSGDMA, SGDMA, Misc, and Main.
          - Add patch for MAINTAINERS file, add the maintainer for this submission
          - Use 32-bit lower/upper physical address accessor functions so the driver
            is 64-bit ready.
          - Use standard bindings where applicable. Especially phy-addr, and change
            "altr,rx-fifo-depth" to "rx-fifo-depth" and "altr,tx-fifo-depth" to
            "tx-fifo-depth".
          - Add use of max-frame-size property
          - Update bindings documents accordingly
          - Correct interrupt handler to use budget parameter in the convential way
          - Use macros consistently to define bit fields across files
          - Correct include exclusion macro in altera_msgdmahw.h (typo)
          - Remove use of barriers, these were not necessary since the DMA APIs
            ensure memory & buffer consistency
          - Remove use of netif_carrier_off in driver
          - move probing of phy from the open function to the probe function
          - use of_get_phy_mode instead of custom function
          - Use the .data field in the device structure to obtain a pointer
            to SGDMA or MSGDMA device specific properties and functions.
          - remove custom function to access devicetree since Altera specific
            bindings requiring it's use have been deprecated in favor of
            standard bindings.
      
      The Altera TSE is a 10/100/1000 Mbps Ethernet soft IP component that can be
      configured and synthesized using Quartus, and programmed into Altera FPGAs.
      Two types of soft DMA IP components are supported by this driver - the Altera
      SGDMA and the MSGDMA. The MSGDMA DMA component is preferred over the SGDMA,
      since the SGDMA will be deprecated in favor of the MSGDMA. Software supporting
      both is provided for customers still using the SGDMA and to demonstrate how
      multiple types of DMA engines may be supported by the TSE driver in the event
      customers wish to develop their own custom soft DMA engine for particular
      applications.
      
      The design has been tested on Altera's Cyclone 4, 5, and Cyclone 5 SOC
      development kits using an ARM A9 processor and an Altera NIOS2 processor.
      Differences in CPU/DMA coherency management and address alignment are
      addressed by proper use of driver APIs and semantics.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      33125df3
    • V
      net: ethernet: Change Ethernet Makefile and Kconfig for Altera TSE driver · f7b18249
      Vince Bridgers 提交于
      This patch changes the Ethernet Makefile and Kconfig files to add the Altera
      Ethernet driver component.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f7b18249
    • V
      MAINTAINERS: Add entry for Altera Triple Speed Ethernet Driver · 16b8b922
      Vince Bridgers 提交于
      Add a MAINTAINERS entry covering the Altera Triple Speed
      Ethernet Driver, with support for the MSGDMA and SGDMA
      soft DMA IP components.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      16b8b922
    • V
      Altera TSE: Add Altera Ethernet Driver Makefile and Kconfig · ed33ef64
      Vince Bridgers 提交于
      This patch adds the Altera Triple Speed Ethernet Makfile and
      Kconfig file.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ed33ef64
    • V
      Altera TSE: Add main and header file for Altera Ethernet Driver · bbd2190c
      Vince Bridgers 提交于
      This patch adds the main driver and header file for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bbd2190c
    • V
      Altera TSE: Add Miscellaneous Files for Altera Ethernet Driver · 6c3324a9
      Vince Bridgers 提交于
      This patch adds miscellaneous files for the Altera Ethernet Driver,
      including ethtool support.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6c3324a9
    • V
      Altera TSE: Add Altera Ethernet Driver SGDMA file components · f64f8808
      Vince Bridgers 提交于
      This patch adds the SGDMA soft IP support for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f64f8808
    • V
      Altera TSE: Add Altera Ethernet Driver MSGDMA File Components · 94fb0ef4
      Vince Bridgers 提交于
      This patch adds the MSGDMA soft IP support for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      94fb0ef4
    • V
      Documentation: networking: Add Altera Ethernet (TSE) Documentation · 04add4ab
      Vince Bridgers 提交于
      This patch adds a bindings description for the Altera Triple Speed Ethernet
      (TSE) driver. The bindings support the legacy SGDMA soft IP as well as the
      preferred MSGDMA soft IP. The TSE can be configured and synthesized in soft
      logic using Altera's Quartus toolchain. Please consult the bindings document
      for supported options.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      04add4ab
    • V
      dts: Add bindings for the Altera Triple Speed Ethernet driver · d6da06fc
      Vince Bridgers 提交于
      This patch adds a bindings description for the Altera Triple Speed Ethernet
      (TSE) driver. The bindings support the legacy SGDMA soft IP as well as the
      preferred MSGDMA soft IP. The TSE can be configured and synthesized in soft
      logic using Altera's Quartus toolchain. Please consult the bindings document
      for supported options.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d6da06fc
    • E
      netfilter: conntrack: Fix UP builds · d5d20912
      Eric Dumazet 提交于
      ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
      empty structure. Replace it by CONNTRACK_LOCKS
      
      Fixes: 93bb0ceb ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Jesper Dangaard Brouer <brouer@redhat.com>
      Cc: Pablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d5d20912
    • D
      Merge branch 'at86rf230' · e73087af
      David S. Miller 提交于
      Alexander Aring says:
      
      ====================
      at86rf230: various fixes and devicetree support
      
      this patch series fix some bugs with the at86rf231 chip and cleaup some code.
      Also add devicetree support for the at86rf230 driver.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e73087af
    • A
      at86rf230: add support for devicetree · fa2d3e94
      Alexander Aring 提交于
      This patch adds devicetree support for the at86rf230 driver.
      
      Possible gpios to configure are "reset-gpio" and "sleep-gpio".
      Also add support to configure the "irq-type" for the irq polarity
      register.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fa2d3e94
    • A
      at86rf230: make reset pin optionally · 3fa27571
      Alexander Aring 提交于
      This patch make the reset pin optionally. Some devices like the atben
      from qi-hardware don't have a reset pin externally. The usually way is
      to turn power off/on for the atben device to initiate a device reset.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3fa27571
    • A
      at86rf230: change reset timings · 56f023fb
      Alexander Aring 提交于
      While checkpatch another patch I got a:
      
      "WARNING: msleep < 20ms can sleep for up to 20ms"
      
      The datasheet of at86rf231 and at86rf212 says a minimum delay for reset
      pulse width and spi access latency after reset is 625 nanoseconds.
      
      This patch removes the 1 milliseconds sleep and replace it with a 1
      microseconds udelay which should be also okay for the reset pulse width.
      
      To change the state from RESET -> TRX_OFF the at86rf230 device needs 120
      microseconds, this is a worst case of all at86rf* chips.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      56f023fb
    • A
      at86rf230: move locking state in xmit · 7e814618
      Alexander Aring 提交于
      There is no need to lock the clearing of IRQ_TRX_END in status.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7e814618
    • A
      at86rf230: fix unexpected state change · 7332fcb8
      Alexander Aring 提交于
      This patch fix a unexpected state change for the at86rf231 chip.
      We can't change into STATE_FORCE_TX_ON while the chip is in one of
      SLEEP, P_ON, RESET, TRX_OFF, and all *_NOCLK states.
      
      In this case we are in the TRX_OFF state. See datasheet [1] page 71 for
      more information.
      
      Without this patch you will get the following message on a at86rf231 device:
      
      [   20.065218] unexpected state change: 8, asked for 4
      [   20.070527] ------------[ cut here ]------------
      [   20.075414] WARNING: CPU: 0 PID: 160 at net/mac802154/ieee802154_dev.c:43 mac802154_slave_open+0x70/0xb8()
      [   20.085594] Modules linked in: autofs4
      [   20.089667] CPU: 0 PID: 160 Comm: ifconfig Not tainted 3.14.0-20140108-1-00993-g905c192 #162
      [   20.098612] [<c00127b8>] (unwind_backtrace) from [<c0010b1c>] (show_stack+0x10/0x14)
      [   20.106819] [<c0010b1c>] (show_stack) from [<c0033838>] (warn_slowpath_common+0x60/0x80)
      [   20.115311] [<c0033838>] (warn_slowpath_common) from [<c00338e8>] (warn_slowpath_null+0x18/0x20)
      [   20.124590] [<c00338e8>] (warn_slowpath_null) from [<c057b7e8>] (mac802154_slave_open+0x70/0xb8)
      [   20.133880] [<c057b7e8>] (mac802154_slave_open) from [<c0488a58>] (__dev_open+0xa8/0x108)
      [   20.142553] [<c0488a58>] (__dev_open) from [<c0488cb0>] (__dev_change_flags+0x8c/0x148)
      [   20.151051] [<c0488cb0>] (__dev_change_flags) from [<c0488d84>] (dev_change_flags+0x18/0x48)
      [   20.159968] [<c0488d84>] (dev_change_flags) from [<c04e2e9c>] (devinet_ioctl+0x2b0/0x63c)
      [   20.168623] [<c04e2e9c>] (devinet_ioctl) from [<c04712e4>] (sock_ioctl+0x23c/0x29c)
      [   20.176727] [<c04712e4>] (sock_ioctl) from [<c00e3cb8>] (do_vfs_ioctl+0x4a8/0x578)
      [   20.184671] [<c00e3cb8>] (do_vfs_ioctl) from [<c00e3dd4>] (SyS_ioctl+0x4c/0x78)
      [   20.192402] [<c00e3dd4>] (SyS_ioctl) from [<c000da00>] (ret_fast_syscall+0x0/0x48)
      [   20.200392] ---[ end trace 9a34542f4ea08e47 ]---
      
      This patch was tested on at86rf231 and at86rf212.
      
      [1] http://www.atmel.com/images/doc8111.pdfSigned-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7332fcb8
    • D
      Merge branch 'sh_eth' · d5c065e3
      David S. Miller 提交于
      Sergei Shtylyov says:
      
      ====================
      Beautify 'sh_eth' driver's messages
      
      This patchset converts te driver to using netdev_*() and netif_*() to print out
      its messages whenever possible.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d5c065e3
    • S
      sh_eth: fold netif_msg_*() and netdev_*() calls into netif_*() invocations · 8d5009f6
      Sergei Shtylyov 提交于
      Now that we call netdev_*() under netif_msg_*() checks, we can fold these into
      netif_*() macro invocations.
      Suggested-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8d5009f6
    • S
      sh_eth: convert dev_*() to netdev_*() calls · da246855
      Sergei Shtylyov 提交于
      Convert dev_*(&ndev->dev, ...) to netdev_*(ndev, ...) calls since they are a bit
      shorter and at the same time give more information on a device.
      Suggested-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      da246855
    • S
      sh_eth: convert pr_*() to netdev_*() calls · f75f14ec
      Sergei Shtylyov 提交于
      Convert pr_*() to netdev_*() calls as the latter provide info on a device.
      Suggested-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f75f14ec
    • S
      sh_eth: exit probe with unknown register layout · 264be2f5
      Sergei Shtylyov 提交于
      Exit the driver's probe() method when the register layout is unknown as the
      driver would cause kernel oops in this case anyway.
      
      While at it, move the corresponding error message printout and convert it from
      pr_err() to dev_err().
      Suggested-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      264be2f5
    • D
      Merge branch 'netpoll-next' · 7c169445
      David S. Miller 提交于
      Eric W. Biederman says:
      
      ====================
      netpoll: Cleanup received packet processing
      
      This is the long-winded, careful, and polite version of removing the netpoll
      receive packet processing.
      
      First I untangle the code in small steps.  Then I modify the code to not
      force reception and dropping of packets when we are transmiting a packet
      with netpoll.  Finally I move all of the packet reception under
      CONFIG_NETPOLL_TRAP and delete CONFIG_NETPOLL_TRAP.
      
      If someone wants to do a stable backport of these patches, it would
      require backporting the first 18 patches that handle the budget == 0 in
      the networking drivers, and the first 6 of these patches.
      
      If anyone wants to resurrect netpoll packet reception someday it should
      just be a matter of reverting the last patch.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7c169445
    • E
      netpoll: Remove dead packet receive code (CONFIG_NETPOLL_TRAP) · 9c62a68d
      Eric W. Biederman 提交于
      The netpoll packet receive code only becomes active if the netpoll
      rx_skb_hook is implemented, and there is not a single implementation
      of the netpoll rx_skb_hook in the kernel.
      
      All of the out of tree implementations I have found all call
      netpoll_poll which was removed from the kernel in 2011, so this
      change should not add any additional breakage.
      
      There are problems with the netpoll packet receive code.  __netpoll_rx
      does not call dev_kfree_skb_irq or dev_kfree_skb_any in hard irq
      context.  netpoll_neigh_reply leaks every skb it receives.  Reception
      of packets does not work successfully on stacked devices (aka bonding,
      team, bridge, and vlans).
      
      Given that the netpoll packet receive code is buggy, there are no
      out of tree users that will be merged soon, and the code has
      not been used for in tree for a decade let's just remove it.
      
      Reverting this commit can server as a starting point for anyone
      who wants to resurrect netpoll packet reception support.
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9c62a68d
    • E
      netpoll: Move all receive processing under CONFIG_NETPOLL_TRAP · e1bd4d3d
      Eric W. Biederman 提交于
      Make rx_skb_hook, and rx in struct netpoll depend on
      CONFIG_NETPOLL_TRAP Make rx_lock, rx_np, and neigh_tx in struct
      netpoll_info depend on CONFIG_NETPOLL_TRAP
      
      Make the functions netpoll_rx_on, netpoll_rx, and netpoll_receive_skb
      no-ops when CONFIG_NETPOLL_TRAP is not set.
      
      Only build netpoll_neigh_reply, checksum_udp service_neigh_queue,
      pkt_is_ns, and __netpoll_rx when CONFIG_NETPOLL_TRAP is defined.
      
      Add helper functions netpoll_trap_setup, netpoll_trap_setup_info,
      netpoll_trap_cleanup, and netpoll_trap_cleanup_info that initialize
      and cleanup the struct netpoll and struct netpoll_info receive
      specific fields when CONFIG_NETPOLL_TRAP is enabled and do nothing
      otherwise.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e1bd4d3d
    • E
      netpoll: Consolidate neigh_tx processing in service_neigh_queue · 18b37535
      Eric W. Biederman 提交于
      Move the bond slave device neigh_tx handling into service_neigh_queue.
      
      In connection with neigh_tx processing remove unnecessary tests of
      a NULL netpoll_info.  As the netpoll_poll_dev has already used
      and thus verified the existince of the netpoll_info.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      18b37535
    • E
      netpoll: Move netpoll_trap under CONFIG_NETPOLL_TRAP · ad8d4752
      Eric W. Biederman 提交于
      Now that we no longer need to receive packets to safely drain the
      network drivers receive queue move netpoll_trap and netpoll_set_trap
      under CONFIG_NETPOLL_TRAP
      
      Making netpoll_trap and netpoll_set_trap noop inline functions
      when CONFIG_NETPOLL_TRAP is not set.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ad8d4752
    • E
      netpoll: Don't drop all received packets. · b6bacd55
      Eric W. Biederman 提交于
      Change the strategy of netpoll from dropping all packets received
      during netpoll_poll_dev to calling napi poll with a budget of 0
      (to avoid processing drivers rx queue), and to ignore packets received
      with netif_rx (those will safely be placed on the backlog queue).
      
      All of the netpoll supporting drivers have been reviewed to ensure
      either thay use netif_rx or that a budget of 0 is supported by their
      napi poll routine and that a budget of 0 will not process the drivers
      rx queues.
      
      Not dropping packets makes NETPOLL_RX_DROP unnecesary so it is removed.
      
      npinfo->rx_flags is removed  as rx_flags with just the NETPOLL_RX_ENABLED
      flag becomes just a redundant mirror of list_empty(&npinfo->rx_np).
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b6bacd55
    • E
      netpoll: Add netpoll_rx_processing · ff607631
      Eric W. Biederman 提交于
      Add a helper netpoll_rx_processing that reports when netpoll has
      receive side processing to perform.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff607631
    • E
      netpoll: Warn if more packets are processed than are budgeted · e97dc3fc
      Eric W. Biederman 提交于
      There is already a warning for this case in the normal netpoll path,
      but put a copy here in case how netpoll calls the poll functions
      causes a differenet result.
      
      netpoll will shortly call the napi poll routine with a budget 0 to
      avoid any rx packets being processed.  As nothing does that today
      we may encounter drivers that have problems so a netpoll specific
      warning seems desirable.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e97dc3fc
    • E
      netpoll: Visit all napi handlers in poll_napi · eb8143b4
      Eric W. Biederman 提交于
      In poll_napi loop through all of the napi handlers even when the
      budget falls to 0 to ensure that we process all of the tx_queues, and
      so that we continue to call into drivers when our initial budget is 0.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eb8143b4
    • E
      netpoll: Pass budget into poll_napi · 9852fbec
      Eric W. Biederman 提交于
      This moves the control logic to the top level in netpoll_poll_dev
      instead of having it dispersed throughout netpoll_poll_dev,
      poll_napi and poll_one_napi.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9852fbec
    • E
      netpoll: move setting of NETPOLL_RX_DROP into netpoll_poll_dev · b249b51b
      Eric W. Biederman 提交于
      Today netpoll depends on setting NETPOLL_RX_DROP before networking
      drivers receive packets in interrupt context so that the packets can
      be dropped.  Move this setting into netpoll_poll_dev from
      poll_one_napi so that if ndo_poll_controller happens to receive
      packets we will drop the packets on the floor instead of letting the
      packets bounce through the networking stack and potentially cause problems.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b249b51b
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · e86e180b
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter/IPVS updates for net-next
      
      The following patchset contains Netfilter/IPVS updates for net-next,
      most relevantly they are:
      
      * cleanup to remove double semicolon from stephen hemminger.
      
      * calm down sparse warning in xt_ipcomp, from Fan Du.
      
      * nf_ct_labels support for nf_tables, from Florian Westphal.
      
      * new macros to simplify rcu dereferences in the scope of nfnetlink
        and nf_tables, from Patrick McHardy.
      
      * Accept queue and drop (including reason for drop) to verdict
        parsing in nf_tables, also from Patrick.
      
      * Remove unused random seed initialization in nfnetlink_log, from
        Florian Westphal.
      
      * Allow to attach user-specific information to nf_tables rules, useful
        to attach user comments to rule, from me.
      
      * Return errors in ipset according to the manpage documentation, from
        Jozsef Kadlecsik.
      
      * Fix coccinelle warnings related to incorrect bool type usage for ipset,
        from Fengguang Wu.
      
      * Add hash:ip,mark set type to ipset, from Vytas Dauksa.
      
      * Fix message for each spotted by ipset for each netns that is created,
        from Ilia Mirkin.
      
      * Add forceadd option to ipset, which evicts a random entry from the set
        if it becomes full, from Josh Hunt.
      
      * Minor IPVS cleanups and fixes from Andi Kleen and Tingwei Liu.
      
      * Improve conntrack scalability by removing a central spinlock, original
        work from Eric Dumazet. Jesper Dangaard Brouer took them over to address
        remaining issues. Several patches to prepare this change come in first
        place.
      
      * Rework nft_hash to resolve bugs (leaking chain, missing rcu synchronization
        on element removal, etc. from Patrick McHardy.
      
      * Restore context in the rule deletion path, as we now release rule objects
        synchronously, from Patrick McHardy. This gets back event notification for
        anonymous sets.
      
      * Fix NAT family validation in nft_nat, also from Patrick.
      
      * Improve scalability of xt_connlimit by using an array of spinlocks and
        by introducing a rb-tree of hashtables for faster lookup of accounted
        objects per network. This patch was preceded by several patches and
        refactorizations to accomodate this change including the use of kmem_cache,
        from Florian Westphal.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e86e180b
  3. 17 3月, 2014 3 次提交
    • F
      netfilter: connlimit: use rbtree for per-host conntrack obj storage · 7d084877
      Florian Westphal 提交于
      With current match design every invocation of the connlimit_match
      function means we have to perform (number_of_conntracks % 256) lookups
      in the conntrack table [ to perform GC/delete stale entries ].
      This is also the reason why ____nf_conntrack_find() in perf top has
      > 20% cpu time per core.
      
      This patch changes the storage to rbtree which cuts down the number of
      ct objects that need testing.
      
      When looking up a new tuple, we only test the connections of the host
      objects we visit while searching for the wanted host/network (or
      the leaf we need to insert at).
      
      The slot count is reduced to 32.  Increasing slot count doesn't
      speed up things much because of rbtree nature.
      
      before patch (50kpps rx, 10kpps tx):
      +  20.95%  ksoftirqd/0  [nf_conntrack] [k] ____nf_conntrack_find
      +  20.50%  ksoftirqd/1  [nf_conntrack] [k] ____nf_conntrack_find
      +  20.27%  ksoftirqd/2  [nf_conntrack] [k] ____nf_conntrack_find
      +   5.76%  ksoftirqd/1  [nf_conntrack] [k] hash_conntrack_raw
      +   5.39%  ksoftirqd/2  [nf_conntrack] [k] hash_conntrack_raw
      +   5.35%  ksoftirqd/0  [nf_conntrack] [k] hash_conntrack_raw
      
      after (90kpps, 51kpps tx):
      +  17.24%       swapper  [nf_conntrack]    [k] ____nf_conntrack_find
      +   6.60%   ksoftirqd/2  [nf_conntrack]    [k] ____nf_conntrack_find
      +   2.73%       swapper  [nf_conntrack]    [k] hash_conntrack_raw
      +   2.36%       swapper  [xt_connlimit]    [k] count_tree
      
      Obvious disadvantages to previous version are the increase in code
      complexity and the increased memory cost.
      
      Partially based on Eric Dumazets fq scheduler.
      Reviewed-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      7d084877
    • F
      netfilter: connlimit: make same_source_net signed · 50e0e9b1
      Florian Westphal 提交于
      currently returns 1 if they're the same.  Make it work like mem/strcmp
      so it can be used as rbtree search function.
      Reviewed-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      50e0e9b1
    • F
      netfilter: connlimit: use keyed locks · 1442e750
      Florian Westphal 提交于
      connlimit currently suffers from spinlock contention, example for
      4-core system with rps enabled:
      
      +  20.84%   ksoftirqd/2  [kernel.kallsyms] [k] _raw_spin_lock_bh
      +  20.76%   ksoftirqd/1  [kernel.kallsyms] [k] _raw_spin_lock_bh
      +  20.42%   ksoftirqd/0  [kernel.kallsyms] [k] _raw_spin_lock_bh
      +   6.07%   ksoftirqd/2  [nf_conntrack]    [k] ____nf_conntrack_find
      +   6.07%   ksoftirqd/1  [nf_conntrack]    [k] ____nf_conntrack_find
      +   5.97%   ksoftirqd/0  [nf_conntrack]    [k] ____nf_conntrack_find
      +   2.47%   ksoftirqd/2  [nf_conntrack]    [k] hash_conntrack_raw
      +   2.45%   ksoftirqd/0  [nf_conntrack]    [k] hash_conntrack_raw
      +   2.44%   ksoftirqd/1  [nf_conntrack]    [k] hash_conntrack_raw
      
      May allow parallel lookup/insert/delete if the entry is hashed to
      another slot.  With patch:
      
      +  20.95%  ksoftirqd/0  [nf_conntrack] [k] ____nf_conntrack_find
      +  20.50%  ksoftirqd/1  [nf_conntrack] [k] ____nf_conntrack_find
      +  20.27%  ksoftirqd/2  [nf_conntrack] [k] ____nf_conntrack_find
      +   5.76%  ksoftirqd/1  [nf_conntrack] [k] hash_conntrack_raw
      +   5.39%  ksoftirqd/2  [nf_conntrack] [k] hash_conntrack_raw
      +   5.35%  ksoftirqd/0  [nf_conntrack] [k] hash_conntrack_raw
      +   2.00%  ksoftirqd/1  [kernel.kallsyms] [k] __rcu_read_unlock
      
      Improved rx processing rate from ~35kpps to ~50 kpps.
      Reviewed-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      1442e750
  4. 15 3月, 2014 1 次提交
    • D
      Merge branch 'napi_budget_zero' · e7ef085d
      David S. Miller 提交于
      Eric W. Biederman says:
      
      ====================
      Don't receive packets when the napi budget == 0
      
      After reading through all 120 drivers supporting netpoll I have found 16
      more that process at least received packet when the napi budget == 0.
      
      Processing more packets than your budget has always been a bug but
      we haven't cared before so it looks like these drivers slipped through,
      and need fixes.
      
      As netpoll will shortly be using a budget of 0 to get the tx queue
      processing with the rx queue processing we now care.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e7ef085d