1. 19 2月, 2017 5 次提交
  2. 12 2月, 2017 5 次提交
    • J
      i40e: avoid race condition when sending filters to firmware for addition · 671889e6
      Jacob Keller 提交于
      Refactor how we add new filters to firmware to avoid a race condition
      that can occur due to removing filters from the hash temporarily.
      
      To understand the race condition, suppose that you have a number of MAC
      filters, but have not yet added any VLANs. Now, add two VLANs in rapid
      succession. A possible resulting flow would look something like the
      following:
      
      (1) lock hash for add VLAN
      (2) add the new MAC/VLAN combos for each current MAC filter
      (3) unlock hash
      (4) lock hash for filter sync
      (5) notice that we have a VLAN, so prepare to update all MAC filters
          with VLAN=-1 to be VLAN=0.
      (6) move NEW and REMOVE filters to temporary list
      (7) unlock hash
      (8) lock hash for add VLAN
      (9) add new MAC/VLAN combos. Notice that no MAC filters are currently in
          the hash list, so we don't add any VLANs <--- BUG!
      (10) unlock hash
      (11) sync the temporary lists to firmware
      (12) lock hash for post-sync
      (13) move the temporary elements back to the main list
      ....
      
      Because we take filters out of the main hash into temporary lists, we
      introduce a narrow window where it is possible that other callers to the
      list will not see some of the filters which were previously added but
      have not yet been finalized. This results in sometimes dropping VLAN
      additions, and could also result in failing to add a MAC address on the
      newly added VLAN.
      
      One obvious way to avoid this race condition would be to lock the entire
      firmware process. Unfortunately this does not work because adminq
      firmware commands take a mutex which results in a sleep while atomic
      BUG(). So, we can't use the simplest approach.
      
      An alternative approach is to simply not remove the filters from the
      hash list while adding. Instead, add an i40e_new_mac_filter structure
      which we will use to track added filters. This avoids the need to remove
      the filter from the hash list. We'll store a pointer to the original
      i40e_mac_filter, along with our own copy of the state.
      
      We won't update the state directly, so as to avoid race with other code
      that may modify the state while under the lock. We are safe to read
      f->macaddr and f->vlan since these only change in two locations. The
      first is on filter creation, which must have already occurred. The
      second is inside i40e_correct_vlan_filters which was previously run
      after creation of this object and can't be run again until after. Thus,
      we should be safe to read the MAC address and VLAN while outside the
      lock.
      
      We also aren't going to run into a use-after-free issue because the only
      place where we free filters is when they are marked FAILED or when we
      remove them inside the sync subtask. Since the subtask has its own
      critical flag to prevent duplicate runs, we know this won't happen. We
      also know that the only location to transition a filter from NEW to
      FAILED is inside the subtask also, so we aren't worried about that
      either.
      
      Use the wrapper i40e_new_mac_filter for additions, and once we've
      finalized the addition to firmware, we will update the filter state
      inside a lock, and then free the wrapper structure.
      
      In order to avoid a possible race condition with filter deletion, we
      won't update the original filter state unless it is still
      I40E_FILTER_NEW when we finish the firmware sync.
      
      This approach is more complex, but avoids race conditions related to
      filters being temporarily removed from the list. We do not need the same
      behavior for deletion because we always unconditionally removed the
      filters from the list regardless of the firmware status.
      
      Change-Id: I14b74bc2301f8e69433fbe77ebca532db20c5317
      Signed-off-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>
      671889e6
    • J
      i40e: allow i40e_update_filter_state to skip broadcast filters · d88d40b0
      Jacob Keller 提交于
      Fix a bug where we modified the mac_filter_hash while outside a lock,
      when handling addition of broadcast filters.
      
      Normally, we add filters to firmware by batching the additions into
      lists and issuing 1 update for every few filters. Broadcast filters are
      handled differently, by instead setting the broadcast promiscuous mode
      flags. In order to make sure the 1<->1 mapping of filters in our
      addition array lined up with filters in the hlist tmp_add_list, we had
      to remove the filter and move it back to the main hash. However, we
      didn't do this under lock, which could cause consistency problems for
      the list.
      
      Fix this by updating i40e_update_filter_state logic so that it knows to
      avoid broadcast filters. This ensures that we don't have to remove the
      filter separately, and can put it back using the normal flow.
      
      Change-ID: Id288fade80b3e3a9a54b68cc249188cb95147518
      Signed-off-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>
      d88d40b0
    • H
      i40e: Save link FEC info from link up event · 3e03d7cc
      Henry Tieman 提交于
      Store the FEC status bits from the link up event into the
      hw_link_info structure.
      
      Change-ID: I9a7b256f6dfb0dce89c2f503075d0d383526832e
      Signed-off-by: NHenry Tieman <henry.w.tieman@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      3e03d7cc
    • S
      i40e: Add bus number info to i40e_bus_info struct · b3f028fc
      Sudheer Mogilappagari 提交于
      Currently i40e_bus_info has PCI device and function info only and log
      messages print device number as bus number. Added field to provide bus
      number info and modified log statements to print bus, device and
      function information.
      
      Change-ID: I811617cee2714cc0d6bade8d369f57040990756f
      Signed-off-by: NSudheer Mogilappagari <sudheer.mogilappagari@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      b3f028fc
    • B
  3. 03 2月, 2017 8 次提交
  4. 09 1月, 2017 1 次提交
  5. 11 12月, 2016 1 次提交
  6. 07 12月, 2016 14 次提交
    • J
      i40e: move all updates for VLAN mode into i40e_sync_vsi_filters · 489a3265
      Jacob Keller 提交于
      In a similar fashion to how we handled exiting VLAN mode, move the logic
      in i40e_vsi_add_vlan into i40e_sync_vsi_filters. Extract this logic into
      its own function for ease of understanding as it will become quite
      complex.
      
      The new function, i40e_correct_mac_vlan_filters() correctly updates all
      filters for when we need to enter VLAN mode, exit VLAN mode, and also
      enforces the PVID when assigned.
      
      Call i40e_correct_mac_vlan_filters from i40e_sync_vsi_filters passing it
      the number of active VLAN filters, and the two temporary lists.
      
      Remove the function for updating VLAN=0 filters from i40e_vsi_add_vlan.
      
      The end result is that the logic for entering and exiting VLAN mode is
      in one location which has the most knowledge about all filters. This
      ensures that we always correctly have the non-VLAN filters assigned to
      VID=0 or VID=-1 regardless of how we ended up getting to this result.
      
      Additionally this enforces the PVID at sync time so that we know for
      certain that an assigned PVID results in only filters with that PVID
      will be added to the firmware.
      
      Change-ID: I895cee81e9c92d0a16baee38bd0ca51bbb14e372
      Signed-off-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>
      489a3265
    • J
      i40e: use (add|rm)_vlan_all_mac helper functions when changing PVID · 9af52f60
      Jacob Keller 提交于
      The current flow for adding or updating the PVID for a VF uses
      i40e_vsi_add_vlan and i40e_vsi_kill_vlan which each take, then release
      the hash lock. In addition the two functions also must take special care
      that they do not perform VLAN mode changes as this will make the code in
      i40e_ndo_set_vf_port_vlan behave incorrectly.
      
      Fix these issues by using the new helper functions i40e_add_vlan_all_mac
      and i40e_rm_vlan_all_mac which expect the hash lock to already be taken.
      Additionally these functions do not perform any state updates in regards
      to VLAN mode, so they are safe to use in the PVID update flow.
      
      It should be noted that we don't need the VLAN mode update code here,
      because there are only a few flows here.
      
      (a) we're adding a new PVID
        In this case, if we already had VLAN filters the VSI is knocked
        offline so we don't need to worry about pre-existing VLAN filters
      
      (b) we're replacing an existing PVID
        In this case, we can't have any VLAN filters except those with the old
        PVID which we already take care of manually.
      
      (c) we're removing an existing PVID
        Similarly to above, we can't have any existing VLAN filters except
        those with the old PVID which we already take care of correctly.
      
      Because of this, we do not need (or even want) the special accounting
      done in i40e_vsi_add_vlan, so use of the helpers is a saner alternative.
      It also opens the door for a future patch which will refactor the flow
      of i40e_vsi_add_vlan now that it is not needed in this function.
      
      Change-ID: Ia841f63da94e12b106f41cf7d28ce8ce92f2ad99
      Signed-off-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>
      9af52f60
    • J
      i40e: factor out addition/deletion of VLAN per each MAC address · 490a4ad3
      Jacob Keller 提交于
      A future refactor of how the PF assigns a PVID to a VF will want to be
      able to add and remove a block of filters by VLAN without worrying about
      accidentally triggering the accounting for I40E_VLAN_ANY. Additionally
      the PVID assignment would like to be able to batch several changes under
      one use of the mac_filter_hash_lock.
      
      Factor out the addition and deletion of a VLAN on all MACs into their
      own function which i40e_vsi_(add|kill)_vlan can use. These new functions
      expect the caller to take the hash lock, as well as perform any
      necessary accounting for updating I40E_VLAN_ANY filters if we are now
      operating under VLAN mode.
      
      Change-ID: If79e5b60b770433275350a74b3f1880333a185d5
      Signed-off-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>
      490a4ad3
    • J
      i40e: delete filter after adding its replacement when converting · 75697025
      Jacob Keller 提交于
      Fix a subtle issue with the code for converting VID=-1 filters into VID=0
      filters when adding a new VLAN. Previously the code deleted the VID=-1
      filter, and then added a new VID=0 filter. In the rare case that the
      addition fails due to -ENOMEM, we end up completely deleting the filter
      which prevents recovery if memory pressure subsides. While it is not
      strictly an issue because it is likely that memory issues would result
      in many other problems, we shouldn't delete the filter until after the
      addition succeeds.
      
      Change-ID: Icba07ddd04ecc6a3b27c2e29f2c1c8673d266826
      Signed-off-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>
      75697025
    • J
      i40e: refactor i40e_update_filter_state to avoid passing aq_err · ac9e2390
      Jacob Keller 提交于
      The current caller of i40e_update_filter_state incorrectly passes
      aq_ret, an i40e_status variable, instead of the expected aq_err. This
      happens to work because i40e_status is actually just a typedef integer,
      and 0 is still the successful return. However i40e_update_filter_state
      has special handling for ENOSPC which is currently being ignored.
      
      Also notice that firmware does not update the per-filter response for
      many types of errors, such as EINVAL. Thus, modify the filter setup so
      that the firmware response memory is pre-set with I40E_AQC_MM_ERR_NO_RES.
      
      This enables us to refactor i40e_update_filter_state, removing the need
      to pass aq_err and avoiding a need for having 3 different flows for
      checking the filter state.
      
      The resulting code for i40e_update_filter_state is much simpler, only
      a single loop and we always check each filter response value every time.
      Since we pre-set the response value to match our expected error this
      correctly works for all success and error flows.
      
      Change-ID: Ie292c9511f34ee18c6ef40f955ad13e28b7aea7d
      Signed-off-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>
      ac9e2390
    • J
      i40e: recalculate vsi->active_filters from hash contents · 38326218
      Jacob Keller 提交于
      Previous code refactors have accidentally caused issues with the
      counting of active_filters. Avoid similar issues in the future by simply
      re-counting the active filters every time after we handle add and delete
      of all the filters. Additionally this allows us to simplify the check
      for when we exit promiscuous mode since we can combine the check for
      failed filters at the same time.
      
      Additionally since we recount filters at the end we need to set
      vsi->promisc_threshold as well.
      
      The resulting code takes a bit longer since we do have to loop over
      filters again. However, the result is more readable and less likely to
      become incorrect due to failed accounting of filters in the future.
      Finally, this ensures that it is not possible for vsi->active_filters to
      ever underflow since we never decrement it.
      
      Change-ID: Ib4f3a377e60eb1fa6c91ea86cc02238c08edd102
      Signed-off-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>
      38326218
    • J
      i40e: defeature support for PTP L4 frame detection on XL710 · 1e28e861
      Jacob Keller 提交于
      A product decision has been made to defeature detection of PTP frames
      over L4 (UDP) on the XL710 MAC. Do not advertise support for L4
      timestamping.
      
      Change-ID: I41fbb0f84ebb27c43e23098c08156f2625c6ee06
      Signed-off-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>
      1e28e861
    • M
      i40e: lock service task correctly · 91089033
      Mitch Williams 提交于
      The service task lock was being set in the scheduling function, not the
      actual service task. This would potentially leave the bit set for a long
      time before the task actually ran. Furthermore, if the service task
      takes too long, it calls the schedule function to reschedule itself -
      which would fail to take the lock and do nothing.
      
      Instead, set and clear the lock bit in the service task itself. In the
      process, get rid of the i40e_service_event_complete() function, which is
      really just two lines of code that can be put right in the service task
      itself.
      
      Change-ID: I83155e682b686121e2897f4429eb7d3f7c669168
      Signed-off-by: NMitch Williams <mitch.a.williams@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      91089033
    • C
      i40e: Add support for 25G devices · 3123237a
      Carolyn Wyborny 提交于
      Add support for 25G devices - defines and data structures.
      
      One tricky part here is that the firmware support for these
      Devices introduces a mismatch between the PHY type enum and
      the bitfields for the phy types.
      
      This change creates a macro and uses it to increment the 25G
      PHY values when creating 25G bitfields.
      
      Change-ID: I69b24d837d44cf9220bf5cb8dd46c5be89ce490b
      Signed-off-by: NCarolyn Wyborny <carolyn.wyborny@intel.com>
      Signed-off-by: NMitch Williams <mitch.a.williams@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      3123237a
    • B
    • H
      i40e: Blink LED on 1G BaseT boards · 4f9b4307
      Henry Tieman 提交于
      Before this patch "ethtool -p" was not blinking the LEDs on boards
      with 1G BaseT PHYs.
      
      This commit identifies 1G BaseT boards as having the LEDs connected
      to the MAC. Also, renamed the flag to be more descriptive of usage.
      The flag is now I40E_FLAG_PHY_CONTROLS_LEDS.
      
      Change-ID: I4eb741da9780da7849ddf2dc4c0cb27ffa42a801
      Signed-off-by: NHenry Tieman <henry.w.tieman@intel.com>
      Signed-off-by: NHarshitha Ramamurthy <harshitha.ramamurthy@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      4f9b4307
    • J
      i40e: remove code to handle dev_addr specially · 3c7cbd45
      Jacob Keller 提交于
      The netdev->dev_addr MAC filter already exists in the
      MAC/VLAN hash table, as it is added when we configure
      the netdev in i40e_configure_netdev. Because we already
      know that this address will be updated in the
      hash_for_each loops, we do not need to handle it
      specially. This removes duplicate code and simplifies
      the i40e_vsi_add_vlan and i40e_vsi_kill_vlan functions.
      Because we know these filters must be part of the
      MAC/VLAN hash table, this should not have any functional
      impact on what filters are included and is merely a code
      simplification.
      
      Change-ID: I5e648302dbdd7cc29efc6d203b7019c11f0b5705
      Signed-off-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>
      3c7cbd45
    • J
      i40e: restore workaround for removing default MAC filter · 1596b5dd
      Jacob Keller 提交于
      A previous commit 53cb6e9e ("i40e: Removal of workaround for simple
      MAC address filter deletion") removed a workaround for some
      firmware versions which was reported to not be necessary in production
      NICs. Unfortunately this workaround is necessary in some configurations,
      specifically the Ethernet Controller XL710 for 40GbE QSFP+ (8086:1583).
      
      Without this patch, the mentioned NICs with current firmware exhibit
      issues when adding VLANs, as outlined by the following reproduction:
      
        $modprobe i40e
        $ip link set <device> up
        $ip link add link <device> vlan100 type vlan id 100
        $dmesg | tail
        <snip>
        kernel: i40e 0000:82:00.0: Error I40E_AQ_RC_EINVAL adding RX
      filters on PF, promiscuous mode forced on
      
      This results in filters being marked as FAILED and setting the device in
      promiscuous mode.
      
      The root cause of receiving the -EINVAL error response appears to be due
      to a conflict with the default MAC filter which still exists on the
      default firmware for this device. Attempting to add a new VLAN filter on
      the default MAC address conflicts with the IGNORE_VLAN setting on the
      default rule.
      
      Change-ID: I4d8f6d48ac5f60cfe981b3baad30eb4d7c170d61
      Signed-off-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>
      1596b5dd
    • F
      i40e: Driver prints log message on link speed change · 7ec9ba11
      Filip Sadowski 提交于
      This patch makes the driver log link speed change. Before applying the
      patch link messages were printed only on state change. Now message is
      printed when link is brought up or down and when speed changes.
      
      Change-ID: Ifbee14b4b16c24967450b3cecac6e8351dcc8f74
      Signed-off-by: NFilip Sadowski <filip.sadowski@intel.com>
      Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      7ec9ba11
  7. 03 12月, 2016 6 次提交