1. 30 5月, 2017 18 次提交
  2. 28 5月, 2017 5 次提交
    • F
      net: phy: Relax error checking on sysfs_create_link() · a3995460
      Florian Fainelli 提交于
      Some Ethernet drivers will attach/connect to a PHY device before calling
      register_netdevice() which is responsible for calling netdev_register_kobject()
      which would do the network device's kobject initialization. In such a case,
      sysfs_create_link() would return -ENOENT because the network device's kobject
      is not ready yet, and we would fail to connect to the PHY device.
      
      In order to keep things simple and symetrical, we just take the success path as
      indicative of the ability to access the network device's kobject, and create
      the second link if that's the case.
      
      Fixes: 5568363f ("net: phy: Create sysfs reciprocal links for attached_dev/phydev")
      Reported-by: NWoojung Hung <Woojung.Huh@microchip.com>
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a3995460
    • V
      net: dsa: mv88e6xxx: handle SERDES error appropriately · 523a8904
      Vivien Didelot 提交于
      mv88e6xxx_serdes_power returns an error, so no need to print an error
      message inside of it. Rather print it in its caller when the error is
      ignored, which is in the mv88e6xxx_port_disable void function.
      
      Catch and return its error in the counterpart mv88e6xxx_port_enable.
      
      Fixes: 04aca993 ("dsa: mv88e6xxx: Enable/Disable SERDES on port enable/disable")
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      523a8904
    • D
      Merge branch 'rtnetlink-Updates-to-rtnetlink_event' · 5f1d258d
      David S. Miller 提交于
      Vladislav Yasevich says:
      
      ====================
      rtnetlink: Updates to rtnetlink_event()
      
      First is the patch to add IFLA_EVENT attribute to the netlink message.  It
      supports only currently white-listed events.
      Like before, this is just an attribute that gets added to the rtnetlink
      message only when the messaged was generated as a result of a netdev event.
      In my case, this is necessary since I want to trap NETDEV_NOTIFY_PEERS
      event (also possibly NETDEV_RESEND_IGMP event) and perform certain actions
      in user space.  This is not possible since the messages generated as
      a result of netdev events do not usually contain any changed data.  They
      are just notifications.  This patch exposes this notification type to
      userspace.
      
      Second, I remove duplicate messages that a result of a change to bonding
      options.  If netlink is used to configure bonding options, 2 messages
      are generated, one as a result NETDEV_CHANGEINFODATA event triggered by
      bonding code and one a result of device state changes triggered by
      netdev_state_change (called from do_setlink).
      
      V6: Updated names and refactored to make it less tied to netdev events.
          (From David Ahern)
      V5: Rebased.  Added iproute2 patch to the series.
      V4:
        * Removed the patch the removed NETDEV_CHANGENAME from event whitelist.
          It doesn't trigger duplicate messages since name changes can only be
          done while device is down and netdev_state_change() doesn't report
          changes while device is down.
        * Added a patch to clean-up duplicate messages on bonding option changes.
      
      V3: Rebased.  Cleaned-up duplicate event.
      
      V2: Added missed events (from David Ahern)
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5f1d258d
    • V
      bonding: Prevent duplicate userspace notification · 7a7e96e0
      Vlad Yasevich 提交于
      Whenever a user changes bonding options, a NETDEV_CHANGEINFODATA
      notificatin is generated which results in a rtnelink message to
      be sent.  While runnig 'ip monitor', we can actually see 2 messages,
      one a result of the event, and the other a result of state change
      that is generated bo netdev_state_change().  However, this is not
      always the case. If bonding changes were done via sysfs or ifenslave
      (old ioctl interface), then only 1 message is seen.
      
      This patch removes duplicate messages in the case of using netlink
      to configure bonding.  It introduceds a separte function that
      triggers a netdev event and uses that function in the syfs and ioctl
      cases.
      
      This was discovered while auditing all the different envents and
      continues the effort of cleaning up duplicated netlink messages.
      
      CC: David Ahern <dsa@cumulusnetworks.com>
      CC: Jiri Pirko <jiri@resnulli.us>
      Signed-off-by: NVladislav Yasevich <vyasevic@redhat.com>
      Acked-by: NDavid Ahern <dsahern@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7a7e96e0
    • V
      rtnl: Add support for netdev event to link messages · 3d3ea5af
      Vlad Yasevich 提交于
      When netdev events happen, a rtnetlink_event() handler will send
      messages for every event in it's white list.  These messages contain
      current information about a particular device, but they do not include
      the iformation about which event just happened.  So, it is impossible
      to tell what just happend for these events.
      
      This patch adds a new extension to RTM_NEWLINK message called IFLA_EVENT
      that would have an encoding of event that triggered this
      message.  This would allow the the message consumer to easily determine
      if it needs to perform certain actions.
      Signed-off-by: NVladislav Yasevich <vyasevic@redhat.com>
      Acked-by: NDavid Ahern <dsahern@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3d3ea5af
  3. 27 5月, 2017 17 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 34aa83c2
      David S. Miller 提交于
      Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
      restricting a HW workaround alongside cleanups in 'net-next'.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      34aa83c2
    • L
      Merge tag 'led_fixes_for_4-12-rc3' of... · e2a9aa5a
      Linus Torvalds 提交于
      Merge tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
      
      Pull LED fix from Jacek Anaszewski:
       "A single LED fix for 4.12-rc3.
      
        leds-pca955x driver uses only i2c_smbus API and thus it should pass
        I2C_FUNC_SMBUS_BYTE_DATA flag to i2c_check_functionality"
      
      * tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: pca955x: Correct I2C Functionality
      e2a9aa5a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6741d516
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix state pruning in bpf verifier wrt. alignment, from Daniel
          Borkmann.
      
       2) Handle non-linear SKBs properly in SCTP ICMP parsing, from Davide
          Caratti.
      
       3) Fix bit field definitions for rss_hash_type of descriptors in mlx5
          driver, from Jesper Brouer.
      
       4) Defer slave->link updates until bonding is ready to do a full commit
          to the new settings, from Nithin Sujir.
      
       5) Properly reference count ipv4 FIB metrics to avoid use after free
          situations, from Eric Dumazet and several others including Cong Wang
          and Julian Anastasov.
      
       6) Fix races in llc_ui_bind(), from Lin Zhang.
      
       7) Fix regression of ESP UDP encapsulation for TCP packets, from
          Steffen Klassert.
      
       8) Fix mdio-octeon driver Kconfig deps, from Randy Dunlap.
      
       9) Fix regression in setting DSCP on ipv6/GRE encapsulation, from Peter
          Dawson.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
        ipv4: add reference counting to metrics
        net: ethernet: ax88796: don't call free_irq without request_irq first
        ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets
        sctp: fix ICMP processing if skb is non-linear
        net: llc: add lock_sock in llc_ui_bind to avoid a race condition
        bonding: Don't update slave->link until ready to commit
        test_bpf: Add a couple of tests for BPF_JSGE.
        bpf: add various verifier test cases
        bpf: fix wrong exposure of map_flags into fdinfo for lpm
        bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data
        bpf: properly reset caller saved regs after helper call and ld_abs/ind
        bpf: fix incorrect pruning decision when alignment must be tracked
        arp: fixed -Wuninitialized compiler warning
        tcp: avoid fastopen API to be used on AF_UNSPEC
        net: move somaxconn init from sysctl code
        net: fix potential null pointer dereference
        geneve: fix fill_info when using collect_metadata
        virtio-net: enable TSO/checksum offloads for Q-in-Q vlans
        be2net: Fix offload features for Q-in-Q packets
        vlan: Fix tcp checksum offloads in Q-in-Q vlans
        ...
      6741d516
    • D
      Merge branch 'ibmvnic-Driver-updates' · 47936d35
      David S. Miller 提交于
      Nathan Fontenot says:
      
      ====================
      ibmvnic: Driver updates
      
      This set of patches implements several updates to the ibmvnic driver
      to fix issues that have been found in testing. Most of the updates
      invovle updating queue handling during driver close and reset
      operations.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      47936d35
    • N
      ibmvnic: Reset sub-crqs during driver reset · 57a49436
      Nathan Fontenot 提交于
      When the ibmvnic driver is resetting, we can just reset the sub crqs
      instead of releasing all of their resources and re-allocting them.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      57a49436
    • N
      ibmvnic: Reset tx/rx pools on driver reset · 8c0543ad
      Nathan Fontenot 提交于
      When resetting the ibmvnic driver there is not a need to release
      and re-allocate the resources for the tx and rx pools. These
      resources can just be reset to avoid the re-allocations.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8c0543ad
    • N
      ibmvnic: Reset the CRQ queue during driver reset · 28cde751
      Nathan Fontenot 提交于
      When a driver reset operation occurs there is not a need to release
      the CRQ resources and re-allocate them. Instead a reset of the CRQ
      will suffice.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      28cde751
    • N
      ibmvnic: Check adapter state during ibmvnic_poll · 152ce47d
      Nathan Fontenot 提交于
      We do not want to process any receive frames if the ibmvnic_poll
      routine is invoked while a reset is in process. Also, before
      replenishing the rx pools in the ibmvnic_poll, we want to
      make sure the adapter is not in the process of closing.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      152ce47d
    • T
      ibmvnic: Deactivate RX pool buffer replenishment on H_CLOSED · f185a49a
      Thomas Falcon 提交于
      If H_CLOSED is returned, halt RX buffer replenishment activity
      until firmware sends a notification that the driver can reset.
      Signed-off-by: NThomas Falcon <tlfalcon@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f185a49a
    • T
      ibmvnic: Halt TX and report carrier off on H_CLOSED return code · b8c80b84
      Thomas Falcon 提交于
      This patch disables transmissions and reports carrier off if xmit
      function returns that the hardware TX queue is closed. The driver can
      then await a signal from firmware to determine the correct reset method.
      Signed-off-by: NThomas Falcon <tlfalcon@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b8c80b84
    • J
      ibmvnic: Non-fatal error handling · 8cb31cfc
      John Allen 提交于
      Handle non-fatal error conditions. The process to do this when
      resetting the driver is to just do __ibmvnic_close followed by
      __ibmvnic_open.
      Signed-off-by: NJohn Allen <jallen@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8cb31cfc
    • T
      ibmvnic: Fix cleanup of SKB's on driver close · 10f76215
      Thomas Falcon 提交于
      A race condition occurs when closing the driver. Free'ing of skb's
      can race between the close routine and ibmvnic_tx_interrupt. To fix
      this we move the claenup of tx pools during close to after the
      sub-CRQ interrupts are disabled.
      Signed-off-by: NThomas Falcon <tlfalcon@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      10f76215
    • J
      ibmvnic: Send gratuitous arp on reset · 2ce9e4ef
      John Allen 提交于
      Send gratuitous arp after any reset.
      Signed-off-by: NJohn Allen <jallen@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2ce9e4ef
    • J
      ibmvnic: Handle failover after failed init crq · 017892c1
      John Allen 提交于
      Handle case where phyp sends a failover after failing to send the
      init crq.
      Signed-off-by: NJohn Allen <jallen@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      017892c1
    • J
      ibmvnic: Track state of adapter napis · d944c3d6
      John Allen 提交于
      Track the state of ibmvnic napis. The driver can get into states where it
      can be reset when napis are already disabled and attempting to disable them
      again will cause the driver to hang.
      Signed-off-by: NJohn Allen <jallen@linux.vnet.ibm.com>
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d944c3d6
    • D
      Merge branch 'mlxsw-Improve-extensibility' · 0ca37375
      David S. Miller 提交于
      Jiri Pirko says:
      
      ====================
      mlxsw: Improve extensibility
      
      Ido says:
      
      Since the initial introduction of the bridge offload in commit
      56ade8fe ("mlxsw: spectrum: Add initial support for Spectrum ASIC")
      the per-port struct was used to store both physical properties of the
      port as well as logical bridge properties such as learning and active
      VLANs in the VLAN-aware bridge.
      
      The above resulted in a bloated struct and code that is getting
      increasingly difficult to extend when stacked devices are taken into
      account as well as more advanced use cases such as IGMP snooping.
      
      Due to the incremental development nature of this driver as well as the
      complexity of the underlying hardware, subsequent design decisions failed
      to generalize the FID and RIF resources, which could've benefited from
      a more generic design, resulting in consolidated code paths and better
      extensibility with regards to future ASICs and use cases.
      
      This patchset tries to solve both of these design problems, as they're
      tightly coupled. To ease the code review, the changes are done in a
      bottom-up manner, in which the port struct is the first to be patched,
      then the FIDs the ports are mapped to and finally the RIFs configured on
      top.
      
      The first half of the patchset gradually moves away from the previous
      design to a design that is more in sync with the underlying hardware and
      which clearly separates between hardware-specific structs and logical
      ones such as a bridge port.
      
      All the bridge-specific information is removed from the port struct, as
      well as the list of VLAN devices ("vPorts") configured on top of it.
      Instead, a linked list of VLANs is introduced, which allows each VLAN
      to hold a state, such as mapping to a particular FID and membership in
      a bridge. The data structures are depicted in the following figure:
      
                                        mlxsw_sp_bridge_device
                                             +----------+
                                             |          |
                                        +----+          |
                                        |    |          |
                                        |    +----------+
                                        |
                   mlxsw_sp_bridge_port |
                       +----------+     |
                       |          |     |
                    +-->          +-----+--> ..
                    |  |          |
                    |  +----+-----+
                    |       |
                    |       v
                    | mlxsw_sp_bridge_vlan
                    |  +----------+
                    |  | vid X    |
                    |  |          +--> ..
                    |  |          |
                    |  +----+-----+
                    |       |
                    +--+----v-----+
                       | vid X    |
                    +--+          +--> ..
                    |  |          |
      mlxsw_sp_port |  +----------+
      +----------+  | mlxsw_sp_port_vlan
      |          |  |
      |          +--+
      |          |
      +----------+
      
      This model allows us to consolidate many of the code paths relating to
      VLAN-aware and VLAN-unaware bridges, as the latter is simply represented
      using a bridge port with a VLAN list size of one. Another advantage of
      the model is that it's easy to extend it with future per-VLAN
      attributes - such as mrouter indication - by merely pushing these down
      from the bridge port struct to the bridge VLAN one.
      
      The second half of the patchset builds on top of previous work and
      prepares the driver for the common FID and RIF cores, which are finally
      implemented in the last two patches. These exploit the fact that despite
      the different kinds of FIDs and RIFs, they do share a common object on
      which the core operations can operate on.
      
      By hiding both objects from the rest of the driver and modeling their
      operations using a VFT, it'll be easier to extend the driver for future
      use cases such as VXLAN.
      
      Tested using following LNST recipes:
      https://github.com/jpirko/lnst/tree/master/recipes/switchdev
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0ca37375
    • I
      mlxsw: spectrum_router: Implement common RIF core · e4f3c1c1
      Ido Schimmel 提交于
      The mlxsw driver currently implements three types of RIFs. VLAN and FID
      RIFs for L3 interfaces on top of VLAN-aware and VLAN-unaware bridges
      (respectively) and Subport RIFs for all other L3 interfaces.
      
      All the RIF types follow a common configuration procedure, which only
      differs in the type-specific bits. The patch exploits this fact and
      consolidates the common code paths, thereby simplifying the code and
      making it more extensible.
      
      This work also prepares the driver for use with future ASICs, where the
      range of the Subport RIFs will be extended and their configuration
      modified accordingly. By merely implementing a new RIF operations and
      selecting it during initialization, the same driver could be re-used.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e4f3c1c1