1. 19 10月, 2016 2 次提交
  2. 13 10月, 2016 4 次提交
  3. 07 10月, 2016 4 次提交
  4. 06 10月, 2016 1 次提交
  5. 05 10月, 2016 4 次提交
  6. 04 10月, 2016 25 次提交
    • J
      Merge remote-tracking branch 'net-next/master' into mac80211-next · 1e1430d5
      Johannes Berg 提交于
      Resolve the merge conflict between Felix's/my and Toke's patches
      coming into the tree through net and mac80211-next respectively.
      Most of Felix's changes go away due to Toke's new infrastructure
      work, my patch changes to "goto begin" (the label wasn't there
      before) instead of returning NULL so flow control towards drivers
      is preserved better.
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      1e1430d5
    • D
      Merge branch 'ncsi-next' · 9a8dd213
      David S. Miller 提交于
      Gavin Shan says:
      
      ====================
      net/ncsi: NCSI Improvment and bug fixes
      
      This series of patches improves NCSI stack according to the comments
      I received after the NCSI code was merged to 4.8.rc1:
      
        * PATCH[1/8] fixes the build warning caused by xchg() with ia64-linux-gcc.
          The atomic operations are removed. The NCSI's lock should be taken when
          reading or updating its state and chained state.
        * Channel ID (0x1f) is the reserved one and it cannot be valid channel ID.
          So we needn't try to probe channel whose ID is 0x1f. PATCH[2/8] and
          PATCH[3/8] are addressing this issue.
        * The request IDs are assigned in round-robin fashion, but it's broken.
          PATCH[4/8] make it work.
        * PATCH[5/8] and PATCH[6/8] reworks the channel monitoring to improve the
          code readability and its robustness.
        * PATCH[7/8] and PATCH[8/8] introduces ncsi_stop_dev() so that the network
          device can be closed and opened afterwards. No error will be seen.
      
      Changelog
      =========
      v2:
        * The NCSI's lock is taken when reading or updating its state as the
          {READ,WRITE}_ONCE() isn't reliable.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9a8dd213
    • G
      net/faraday: Stop NCSI device on shutdown · 2c15f25b
      Gavin Shan 提交于
      This stops NCSI device when closing the network device so that the
      NCSI device can be reenabled later.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2c15f25b
    • G
      net/ncsi: Introduce ncsi_stop_dev() · c0cd1ba4
      Gavin Shan 提交于
      This introduces ncsi_stop_dev(), as counterpart to ncsi_start_dev(),
      to stop the NCSI device so that it can be reenabled in future. This
      API should be called when the network device driver is going to
      shutdown the device. There are 3 things done in the function: Stop
      the channel monitoring; Reset channels to inactive state; Report
      NCSI link down.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c0cd1ba4
    • G
      net/ncsi: Rework the channel monitoring · 83afdc6a
      Gavin Shan 提交于
      The original NCSI channel monitoring was implemented based on a
      backoff algorithm: the GLS response should be received in the
      specified interval. Otherwise, the channel is regarded as dead
      and failover should be taken if current channel is an active one.
      There are several problems in the implementation: (A) On BCM5718,
      we found when the IID (Instance ID) in the GLS command packet
      changes from 255 to 1, the response corresponding to IID#1 never
      comes in. It means we cannot make the unfair judgement that the
      channel is dead when one response is missed. (B) The code's
      readability should be improved. (C) We should do failover when
      current channel is active one and the channel monitoring should
      be marked as disabled before doing failover.
      
      This reworks the channel monitoring to address all above issues.
      The fields for channel monitoring is put into separate struct
      and the state of channel monitoring is predefined. The channel
      is regarded alive if the network controller responses to one of
      two GLS commands or both of them in 5 seconds.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      83afdc6a
    • G
      net/ncsi: Allow to extend NCSI request properties · a0509cbe
      Gavin Shan 提交于
      There is only one NCSI request property for now: the response for
      the sent command need drive the workqueue or not. So we had one
      field (@driven) for the purpose. We lost the flexibility to extend
      NCSI request properties.
      
      This replaces @driven with @flags and @req_flags in NCSI request
      and NCSI command argument struct. Each bit of the newly introduced
      field can be used for one property. No functional changes introduced.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a0509cbe
    • G
      net/ncsi: Rework request index allocation · a15af54f
      Gavin Shan 提交于
      The NCSI request index (struct ncsi_request::id) is put into instance
      ID (IID) field while sending NCSI command packet. It was designed the
      available IDs are given in round-robin fashion. @ndp->request_id was
      introduced to represent the next available ID, but it has been used
      as number of successively allocated IDs. It breaks the round-robin
      design. Besides, we shouldn't put 0 to NCSI command packet's IID
      field, meaning ID#0 should be reserved according section 6.3.1.1
      in NCSI spec (v1.1.0).
      
      This fixes above two issues. With it applied, the available IDs will
      be assigned in round-robin fashion and ID#0 won't be assigned.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a15af54f
    • G
      net/ncsi: Don't probe on the reserved channel ID (0x1f) · 55e02d08
      Gavin Shan 提交于
      We needn't send CIS (Clear Initial State) command to the NCSI
      reserved channel (0x1f) in the enumeration. We shouldn't receive
      a valid response from CIS on NCSI channel 0x1f.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      55e02d08
    • G
      net/ncsi: Introduce NCSI_RESERVED_CHANNEL · bc7e0f50
      Gavin Shan 提交于
      This defines NCSI_RESERVED_CHANNEL as the reserved NCSI channel
      ID (0x1f). No logical changes introduced.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bc7e0f50
    • G
      net/ncsi: Avoid unused-value build warning from ia64-linux-gcc · d8cedaab
      Gavin Shan 提交于
      xchg() is used to set NCSI channel's state in order for consistent
      access to the state. xchg()'s return value should be used. Otherwise,
      one build warning will be raised (with -Wunused-value) as below message
      indicates. It is reported by ia64-linux-gcc (GCC) 4.9.0.
      
       net/ncsi/ncsi-manage.c: In function 'ncsi_channel_monitor':
       arch/ia64/include/uapi/asm/cmpxchg.h:56:2: warning: value computed is \
       not used [-Wunused-value]
        ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr))))
         ^
       net/ncsi/ncsi-manage.c:202:3: note: in expansion of macro 'xchg'
        xchg(&nc->state, NCSI_CHANNEL_INACTIVE);
      
      This removes the atomic access to NCSI channel's state avoid the above
      build warning. We have to hold the channel's lock when its state is readed
      or updated. No functional changes introduced.
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Reviewed-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d8cedaab
    • A
      net: Add netdev all_adj_list refcnt propagation to fix panic · 93409033
      Andrew Collins 提交于
      This is a respin of a patch to fix a relatively easily reproducible kernel
      panic related to the all_adj_list handling for netdevs in recent kernels.
      
      The following sequence of commands will reproduce the issue:
      
      ip link add link eth0 name eth0.100 type vlan id 100
      ip link add link eth0 name eth0.200 type vlan id 200
      ip link add name testbr type bridge
      ip link set eth0.100 master testbr
      ip link set eth0.200 master testbr
      ip link add link testbr mac0 type macvlan
      ip link delete dev testbr
      
      This creates an upper/lower tree of (excuse the poor ASCII art):
      
                  /---eth0.100-eth0
      mac0-testbr-
                  \---eth0.200-eth0
      
      When testbr is deleted, the all_adj_lists are walked, and eth0 is deleted twice from
      the mac0 list. Unfortunately, during setup in __netdev_upper_dev_link, only one
      reference to eth0 is added, so this results in a panic.
      
      This change adds reference count propagation so things are handled properly.
      
      Matthias Schiffer reported a similar crash in batman-adv:
      
      https://github.com/freifunk-gluon/gluon/issues/680
      https://www.open-mesh.org/issues/247
      
      which this patch also seems to resolve.
      Signed-off-by: NAndrew Collins <acollins@cradlepoint.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      93409033
    • R
      net: phy: Add Edge-rate driver for Microsemi PHYs. · a4cc96d1
      Raju Lakkaraju 提交于
      Edge-rate:
      As system and networking speeds increase, a signal's output transition,
      also know as the edge rate or slew rate (V/ns), takes on greater importance
      because high-speed signals come with a price. That price is an assortment of
      interference problems like ringing on the line, signal overshoot and
      undershoot, extended signal settling times, crosstalk noise, transmission
      line reflections, false signal detection by the receiving device and
      electromagnetic interference (EMI) -- all of which can negate the potential
      gains designers are seeking when they try to increase system speeds through
      the use of higher performance logic devices. The fact is, faster signaling
      edge rates can cause a higher level of electrical noise or other type of
      interference that can actually lead to slower line speeds and lower maximum
      system frequencies. This parameter allow the board designers to change the
      driving strange, and thereby change the EMI behavioral.
      
      Edge-rate parameters (vddmac, edge-slowdown) get from Device Tree.
      
      Tested on Beaglebone Black with VSC 8531 PHY.
      Signed-off-by: NRaju Lakkaraju <Raju.Lakkaraju@microsemi.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a4cc96d1
    • B
      vmxnet3: Wake queue from reset work · 277964e1
      Benjamin Poirier 提交于
      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: NBenjamin Poirier <bpoirier@suse.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      277964e1
    • D
      Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 0438e3c8
      David S. Miller 提交于
      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: NDavid S. Miller <davem@davemloft.net>
      0438e3c8
    • G
      i40e: avoid NULL pointer dereference and recursive errors on early PCI error · edfc23ee
      Guilherme G Piccoli 提交于
      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: NGuilherme G Piccoli <gpiccoli@linux.vnet.ibm.com>
      Acked-by: NJacob Keller <jacob.e.keller@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      edfc23ee
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 2f8fab7a
      David S. Miller 提交于
      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: NDavid S. Miller <davem@davemloft.net>
      2f8fab7a
    • D
      Merge branch 'qed-qedr-infrastructure' · b462d22b
      David S. Miller 提交于
      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: NDavid S. Miller <davem@davemloft.net>
      b462d22b
    • R
      qed: Add RoCE ll2 & GSI support · abd49676
      Ram Amrani 提交于
      Add the RoCE-specific LL2 logic [as well as GSI support] over
      the 'generic' LL2 interface.
      Signed-off-by: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      abd49676
    • R
      qed: Add support for memory registeration verbs · ee8eaea3
      Ram Amrani 提交于
      Add slowpath configuration support for user, dma and memory
      regions registration.
      Signed-off-by: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ee8eaea3
    • R
      qed: Add support for QP verbs · f1093940
      Ram Amrani 提交于
      Add support for the slowpath configurations of Queue Pair verbs
      which adds, deletes, modifies and queries Queue Pairs.
      Signed-off-by: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f1093940
    • R
      qed: PD,PKEY and CQ verb support · c295f86e
      Ram Amrani 提交于
      Add support for the configurations of the protection domain and
      completion queues.
      Signed-off-by: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c295f86e
    • R
      qed: Add support for RoCE hw init · 51ff1725
      Ram Amrani 提交于
      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: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51ff1725
    • R
      qede: Add qedr framework · cee9fbd8
      Ram Amrani 提交于
      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: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cee9fbd8
    • Y
      qed: Add Light L2 support · 0a7fb11c
      Yuval Mintz 提交于
      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: NYuval Mintz <Yuval.Mintz@caviumnetworks.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@caviumnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0a7fb11c
    • S
      i40e: fix sideband flow director vector allocation · abd97a94
      Stefan Assmann 提交于
      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: NStefan Assmann <sassmann@kpanic.de>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      abd97a94