1. 04 Oct, 2016 19 commits
    • Benjamin Poirier's avatar
      vmxnet3: Wake queue from reset work · 277964e1
      Benjamin Poirier authored
      vmxnet3_reset_work() expects tx queues to be stopped (via
      vmxnet3_quiesce_dev -> netif_tx_disable). However, this races with the
      netif_wake_queue() call in netif_tx_timeout() such that the driver's
      start_xmit routine may be called unexpectedly, triggering one of the BUG_ON
      in vmxnet3_map_pkt with a stack trace like this:
      
      RIP: 0010:[<ffffffffa00cf4bc>] vmxnet3_map_pkt+0x3ac/0x4c0 [vmxnet3]
       [<ffffffffa00cf7e0>] vmxnet3_tq_xmit+0x210/0x4e0 [vmxnet3]
       [<ffffffff813ab144>] dev_hard_start_xmit+0x2e4/0x4c0
       [<ffffffff813c956e>] sch_direct_xmit+0x17e/0x1e0
       [<ffffffff813c96a7>] __qdisc_run+0xd7/0x130
       [<ffffffff813a6a7a>] net_tx_action+0x10a/0x200
       [<ffffffff810691df>] __do_softirq+0x11f/0x260
       [<ffffffff81472fdc>] call_softirq+0x1c/0x30
       [<ffffffff81004695>] do_softirq+0x65/0xa0
       [<ffffffff81069b89>] local_bh_enable_ip+0x99/0xa0
       [<ffffffffa031ff36>] destroy_conntrack+0x96/0x110 [nf_conntrack]
       [<ffffffff813d65e2>] nf_conntrack_destroy+0x12/0x20
       [<ffffffff8139c6d5>] skb_release_head_state+0xb5/0xf0
       [<ffffffff8139d299>] skb_release_all+0x9/0x20
       [<ffffffff8139cfe9>] __kfree_skb+0x9/0x90
       [<ffffffffa00d0069>] vmxnet3_quiesce_dev+0x209/0x340 [vmxnet3]
       [<ffffffffa00d020a>] vmxnet3_reset_work+0x6a/0xa0 [vmxnet3]
       [<ffffffff8107d7cc>] process_one_work+0x16c/0x350
       [<ffffffff810804fa>] worker_thread+0x17a/0x410
       [<ffffffff810848c6>] kthread+0x96/0xa0
       [<ffffffff81472ee4>] kernel_thread_helper+0x4/0x10
      Signed-off-by: default avatarBenjamin Poirier <bpoirier@suse.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      277964e1
    • David S. Miller's avatar
      Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 0438e3c8
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      100GbE Intel Wired LAN Driver Updates 2016-10-02
      
      This series contains updates to fm10k only.
      
      Jake fixes an issue where PTP applications requesting software timestamps
      may complain that the requested mode is not supported, so add a generic
      callback for those drivers that have software transmit timestamp support
      enabled.  Then provides a trivial cleanup where a code was not wrapped
      properly.  Got make sure that code looks good in a 80 character limit.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0438e3c8
    • Guilherme G Piccoli's avatar
      i40e: avoid NULL pointer dereference and recursive errors on early PCI error · edfc23ee
      Guilherme G Piccoli authored
      Although rare, it's possible to hit PCI error early on device
      probe, meaning possibly some structs are not entirely initialized,
      and some might even be completely uninitialized, leading to NULL
      pointer dereference.
      
      The i40e driver currently presents a "bad" behavior if device hits
      such early PCI error: firstly, the struct i40e_pf might not be
      attached to pci_dev yet, leading to a NULL pointer dereference on
      access to pf->state.
      
      Even checking if the struct is NULL and avoiding the access in that
      case isn't enough, since the driver cannot recover from PCI error
      that early; in our experiments we saw multiple failures on kernel
      log, like:
      
        [549.664] i40e 0007:01:00.1: Initial pf_reset failed: -15
        [549.664] i40e: probe of 0007:01:00.1 failed with error -15
        [...]
        [871.644] i40e 0007:01:00.1: The driver for the device stopped because the
        device firmware failed to init. Try updating your NVM image.
        [871.644] i40e: probe of 0007:01:00.1 failed with error -32
        [...]
        [872.516] i40e 0007:01:00.0: ARQ: Unknown event 0x0000 ignored
      
      Between the first probe failure (error -15) and the second (error -32)
      another PCI error happened due to the first bad probe. Also, driver
      started to flood console with those ARQ event messages.
      
      This patch will prevent these issues by allowing error recovery
      mechanism to remove the failed device from the system instead of
      trying to recover from early PCI errors during device probe.
      
      CC: <stable@vger.kernel.org>
      Signed-off-by: default avatarGuilherme G Piccoli <gpiccoli@linux.vnet.ibm.com>
      Acked-by: default avatarJacob Keller <jacob.e.keller@intel.com>
      Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      edfc23ee
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 2f8fab7a
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2016-10-03
      
      This series contains fixes to i40e only.
      
      Stefan Assmann provides the changes in this series to resolve an issue
      where when we run out of MSIx vectors, iWARP gets disabled automatically.
      First adds a check for "no vectors left" during MSIx vector allocation
      for VMDq, which will prevent more vectors being allocated than available.
      Then fixed the MSIx vector redistribution when we reach the hardware limit
      for vectors so that additional features like VMDq, iWARP, etc do not get
      starved for vectors because the PF is hogging all the resources.  Lastly,
      fix the issue for flow director by moving the check for the reaching the
      vector limit earlier in the code so that a decision can be made on
      disabling flow director.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2f8fab7a
    • David S. Miller's avatar
      Merge branch 'qed-qedr-infrastructure' · b462d22b
      David S. Miller authored
      Yuval Mintz says:
      
      ====================
      qed*: Add qedr infrastructure support
      
      In the last couple of weeks we've been sending RFCs for the qedr
      driver - the RoCE driver for QLogic FastLinQ 4xxxx line of adapters.
      Latest RFC can be found at [1].
      
      At Doug's advice [2], we've decided to split the series into two:
       - first part contains the qed backbone that's necessary for all the
      configurations relating to the qedr driver, as well as the qede
      infrastructure that is used for communication between the qedr and qede.
       - Second part consists of the actual qedr driver and introduces almost
      no changes to qed/qede.
      
      This is the first of said two parts. The second half would be sent
      later this week.
      
      The only 'oddity' in the devision are the Kconfig options -
      As this series introduces both LL2 and QEDR-based logic in qed/qede,
      I wanted to add the CONFIG_INFINIBAND_QEDR option here [with default n].
      Otherwise, a lot of the code introduced would be dead-code [won't even
      be compiled] until qedr is accepted.
      As a result I've placed the config option in an odd place - under
      qlogic's Kconfig. The second series would then remove that option
      and add it in its correct place under the infiniband Kconfig.
      [I'm fine with pushing it there to begin with, but I didn't want to
      'contaminate' non-qlogic configuration files with half-baked options].
      
      Dave - I don't think you were E-mailed with Doug's suggestion.
      I think the notion was to have the two halves accepted side-by-side,
      but actually the first has no dependency issues, so it's also
      possible to simply take this first to net-next, and push the qedr
      into rdma once it's merged. But it's basically up to you and Doug;
      We'd align with whatever suits you best.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b462d22b
    • Ram Amrani's avatar
      qed: Add RoCE ll2 & GSI support · abd49676
      Ram Amrani authored
      Add the RoCE-specific LL2 logic [as well as GSI support] over
      the 'generic' LL2 interface.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      abd49676
    • Ram Amrani's avatar
      qed: Add support for memory registeration verbs · ee8eaea3
      Ram Amrani authored
      Add slowpath configuration support for user, dma and memory
      regions registration.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ee8eaea3
    • Ram Amrani's avatar
      qed: Add support for QP verbs · f1093940
      Ram Amrani authored
      Add support for the slowpath configurations of Queue Pair verbs
      which adds, deletes, modifies and queries Queue Pairs.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f1093940
    • Ram Amrani's avatar
      qed: PD,PKEY and CQ verb support · c295f86e
      Ram Amrani authored
      Add support for the configurations of the protection domain and
      completion queues.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c295f86e
    • Ram Amrani's avatar
      qed: Add support for RoCE hw init · 51ff1725
      Ram Amrani authored
      This adds the backbone required for the various HW initalizations
      which are necessary for the qedr driver - FW notification, resource
      initializations, etc.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      51ff1725
    • Ram Amrani's avatar
      qede: Add qedr framework · cee9fbd8
      Ram Amrani authored
      Adds a skeletal implementation of the qede RoCE driver -
      The qedr has some dependencies of the state of the underlying base
      interface. This adds some logic required with mutual registrations
      and the ability to pass updates on 'intresting' events.
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cee9fbd8
    • Yuval Mintz's avatar
      qed: Add Light L2 support · 0a7fb11c
      Yuval Mintz authored
      Other protocols beside the networking driver need the ability
      of passing some L2 traffic, usually [although not limited] for the
      purpose of some management traffic.
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: default avatarRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0a7fb11c
    • Stefan Assmann's avatar
      i40e: fix sideband flow director vector allocation · abd97a94
      Stefan Assmann authored
      Currently if the MSI-X vector limit is reached the sideband flow
      director gets disabled. A bit too early to make that decision, as
      vectors may get re-distributed. So move the check further back.
      Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
      Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      abd97a94
    • Stefan Assmann's avatar
      i40e: fix MSI-X vector redistribution if hw limit is reached · 4ce20abc
      Stefan Assmann authored
      The driver allocates 1 vector per CPU thread and the current hardware
      limit for vectors is 129 per PF. On systems with 128 or more threads
      this currently means all vectors are used by the PF leaving no room for
      additional features like VMDq, iWARP, etc...
      The code that should redistribute the vectors in this case is broken and
      never triggers. Fixed the code so that it actually triggers if the
      hardware limit is reached and adjust the number of queue pairs
      accordingly.
      Also the number of initially requested iWARP vectors was not properly
      saved when the vector limit was reached, and therefore always zero.
      
      Comparison with debug statement.
      Before:
      i40e 0000:2d:00.0: VMDq disabled, not enough MSI-X vectors
      i40e 0000:2d:00.0: IWARP disabled, not enough MSI-X vectors
      i40e 00.0 MSI-X vector distribution: PF 128, VMDq 0, FDSB 0, iWARP 0
      After:
      i40e 0000:2d:00.0: MSI-X vector limit reached, attempting to redistribute vectors
      i40e 00.0 MSI-X vector distribution: PF 78, VMDq 8, FDSB 0, iWARP 42
      Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
      Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      4ce20abc
    • Stefan Assmann's avatar
      i40e: check if vectors are already depleted when doing VMDq allocation · 9ca57e97
      Stefan Assmann authored
      During MSI-X vector allocation for VMDq, a check for "no vectors left"
      was missing, add it. This prevents more vectors to be allocated than
      available.
      Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
      Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9ca57e97
    • Christophe Jaillet's avatar
      ptp: Fix resource leak in case of error · b9118b72
      Christophe Jaillet authored
      A call to 'ida_simple_remove()' is missing in the error handling path.
      
      This as been spotted with the following coccinelle script which tries to
      detect missing 'ida_simple_remove()' call in error handling paths.
      
      ///////////////
      @@
      expression x;
      identifier l;
      @@
      
      *   x = ida_simple_get(...);
          ...
          if (...) {
          ...
          }
          ...
          if (...) {
             ...
             goto l;
          }
          ...
      *   l: ... when != ida_simple_remove(...);
      Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
      Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9118b72
    • Wei Yongjun's avatar
      net: qcom/emac: fix return value check in emac_sgmii_config() · 0fd7d43f
      Wei Yongjun authored
      In case of error, the function ioremap() returns NULL pointer
      not ERR_PTR(). The IS_ERR() test in the return value check
      should be replaced with NULL test.
      
      Also add check for return value of platform_get_resource().
      
      Fixes: 54e19bc7 ("net: qcom/emac: do not use devm on internal
      phy pdev")
      Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
      Acked-by: default avatarTimur Tabi <timur@codeaurora.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fd7d43f
    • Shmulik Ladkani's avatar
      net: skbuff: Limit skb_vlan_pop/push() to expect skb->data at mac header · b6a79208
      Shmulik Ladkani authored
      skb_vlan_pop/push were too generic, trying to support the cases where
      skb->data is at mac header, and cases where skb->data is arbitrarily
      elsewhere.
      
      Supporting an arbitrary skb->data was complex and bogus:
       - It failed to unwind skb->data to its original location post actual
         pop/push.
         (Also, semantic is not well defined for unwinding: If data was into
          the eth header, need to use same offset from start; But if data was
          at network header or beyond, need to adjust the original offset
          according to the push/pull)
       - It mangled the rcsum post actual push/pop, without taking into account
         that the eth bytes might already have been pulled out of the csum.
      
      Most callers (ovs, bpf) already had their skb->data at mac_header upon
      invoking skb_vlan_pop/push.
      Last caller that failed to do so (act_vlan) has been recently fixed.
      
      Therefore, to simplify things, no longer support arbitrary skb->data
      inputs for skb_vlan_pop/push().
      
      skb->data is expected to be exactly at mac_header; WARN otherwise.
      Signed-off-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: Pravin Shelar <pshelar@ovn.org>
      Cc: Jiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b6a79208
    • Shmulik Ladkani's avatar
      net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() functions · f39acc84
      Shmulik Ladkani authored
      Generic skb_vlan_push/skb_vlan_pop functions don't properly handle the
      case where the input skb data pointer does not point at the mac header:
      
      - They're doing push/pop, but fail to properly unwind data back to its
        original location.
        For example, in the skb_vlan_push case, any subsequent
        'skb_push(skb, skb->mac_len)' calls make the skb->data point 4 bytes
        BEFORE start of frame, leading to bogus frames that may be transmitted.
      
      - They update rcsum per the added/removed 4 bytes tag.
        Alas if data is originally after the vlan/eth headers, then these
        bytes were already pulled out of the csum.
      
      OTOH calling skb_vlan_push/skb_vlan_pop with skb->data at mac_header
      present no issues.
      
      act_vlan is the only caller to skb_vlan_*() that has skb->data pointing
      at network header (upon ingress).
      Other calles (ovs, bpf) already adjust skb->data at mac_header.
      
      This patch fixes act_vlan to point to the mac_header prior calling
      skb_vlan_*() functions, as other callers do.
      Signed-off-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: Pravin Shelar <pshelar@ovn.org>
      Cc: Jiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f39acc84
  2. 03 Oct, 2016 19 commits
  3. 02 Oct, 2016 2 commits
    • Linus Torvalds's avatar
      Linux 4.8 · c8d2bc9b
      Linus Torvalds authored
      c8d2bc9b
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · f76d9c61
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Three relatively small fixes for ARM:
      
         - Roger noticed that dma_max_pfn() was calculating the upper limit
           wrongly, by adding the PFN offset of memory twice.
      
         - A fix from Robin to correct parsing of MPIDR values when the
           address size is larger than one BE32 unit.
      
         - A fix from Srinivas to ensure that we do not rely on the boot
           loader (or previous Linux kernel) setting the translation table
           base register a certain way in the decompressor, which can lead to
           crashes"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7
        ARM: 8617/1: dma: fix dma_max_pfn()
        ARM: 8616/1: dt: Respect property size when parsing CPUs
      f76d9c61