1. 10 11月, 2017 17 次提交
    • X
      ip_gre: add the support for i/o_flags update via netlink · dd9d598c
      Xin Long 提交于
      Now ip_gre is using ip_tunnel_changelink to update it's properties, but
      ip_tunnel_changelink in ip_tunnel doesn't update i/o_flags as a common
      function.
      
      o_flags updates would cause that tunnel->tun_hlen / hlen and dev->mtu /
      needed_headroom need to be recalculated, and dev->(hw_)features need to
      be updated as well.
      
      Therefore, we can't just add the update into ip_tunnel_update called
      in ip_tunnel_changelink, and it's also better not to touch ip_tunnel
      codes.
      
      This patch updates i/o_flags and calls ipgre_link_update to recalculate
      these gre properties after ip_tunnel_changelink does the common update.
      
      Note that since ipgre_link_update doesn't know the lower dev, it will
      update gre->hlen, dev->mtu and dev->needed_headroom with the value of
      'new tun_hlen - old tun_hlen'. In this way, we can avoid many redundant
      codes, unlike ip6_gre.
      Reported-by: NJianlin Shi <jishi@redhat.com>
      Signed-off-by: NXin Long <lucien.xin@gmail.com>
      Acked-by: NWilliam Tu <u9012063@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dd9d598c
    • D
      Merge branch 'tcp-ns-rmem-wmem' · c7947e43
      David S. Miller 提交于
      Eric Dumazet says:
      
      ====================
      net: Namespace-ify sysctl_tcp_rmem and sysctl_tcp_wmem
      
      We need to get per netns sysctl for sysctl_[proto]_rmem and sysctl_[proto]_wmem
      
      This patch series adds the basic infrastructure allowing per proto
      conversion, and takes care of TCP.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c7947e43
    • E
      tcp: Namespace-ify sysctl_tcp_rmem and sysctl_tcp_wmem · 356d1833
      Eric Dumazet 提交于
      Note that when a new netns is created, it inherits its
      sysctl_tcp_rmem and sysctl_tcp_wmem from initial netns.
      
      This change is needed so that we can refine TCP rcvbuf autotuning,
      to take RTT into consideration.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Wei Wang <weiwan@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      356d1833
    • E
      net: allow per netns sysctl_rmem and sysctl_wmem for protos · a3dcaf17
      Eric Dumazet 提交于
      As we want to gradually implement per netns sysctl_rmem and sysctl_wmem
      on per protocol basis, add two new fields in struct proto,
      and two new helpers : sk_get_wmem0() and sk_get_rmem0()
      
      First user will be TCP. Then UDP and SCTP can be easily converted,
      while DECNET probably wont get this support.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a3dcaf17
    • A
      net: dsa: Don't add vlans when vlan filtering is disabled · 2ea7a679
      Andrew Lunn 提交于
      The software bridge can be build with vlan filtering support
      included. However, by default it is turned off. In its turned off
      state, it still passes VLANs via switchev, even though they are not to
      be used. Don't pass these VLANs to the hardware. Only do so when vlan
      filtering is enabled.
      
      This fixes at least one corner case. There are still issues in other
      corners, such as when vlan_filtering is later enabled.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2ea7a679
    • D
      Merge tag 'mlx5-updates-2017-11-09' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux · 4fdc3023
      David S. Miller 提交于
      Saeed Mahameed says:
      
      ====================
      mlx5-updates-2017-11-09
      
      This series introduces vlan offloads related improvements for mlx5
      ethernet netdev driver, from Gal Pressman.
      
       - Add support for 802.1ad vlan filter
       - Add support for 802.1ad vlan insertion
       - Add vlan offloads statistics to ethtool (inserted/stripped vlans)
       - CHECKSUM_COMPLETE support for vlan traffic when vlan stripping is off! (Finally)
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4fdc3023
    • D
      Merge branch 'IGMP-snooping-for-local-traffic' · 5d37636a
      David S. Miller 提交于
      Andrew Lunn says:
      
      ====================
      IGMP snooping for local traffic
      
      The linux bridge supports IGMP snooping. It will listen to IGMP
      reports on bridge ports and keep track of which groups have been
      joined on an interface. It will then forward multicast based on this
      group membership.
      
      When the bridge adds or removed groups from an interface, it uses
      switchdev to request the hardware add an mdb to a port, so the
      hardware can perform the selective forwarding between ports.
      
      What is not covered by the current bridge code, is IGMP joins/leaves
      from the host on the brX interface. These are not reported via
      switchdev so that hardware knows the local host is interested in the
      multicast frames.
      
      Luckily, the bridge does track joins/leaves on the brX interface. The
      code is obfusticated, which is why i missed it with my first attempt.
      So the first patch tries to remove this obfustication. Currently,
      there is no notifications sent when the bridge interface joins a
      group. The second patch adds them. bridge monitor then shows
      joins/leaves in the same way as for other ports of the bridge.
      
      Then starts the work passing down to the hardware that the host has
      joined/left a group. The existing switchdev mdb object cannot be used,
      since the semantics are different. The existing
      SWITCHDEV_OBJ_ID_PORT_MDB is used to indicate a specific multicast
      group should be forwarded out that port of the switch. However here we
      require the exact opposite. We want multicast frames for the group
      received on the port to the forwarded to the host. Hence add a new
      object SWITCHDEV_OBJ_ID_HOST_MDB, a multicast database entry to
      forward to the host. This new object is then propagated through the
      DSA layers. No DSA driver changes should be needed, this should just
      work...
      
      This version fixes up the nitpick from Nikolay, removes an unrelated
      white space change, and adds in a patch adding a few const attributes
      to a couple of functions taking a port parameter, in order to stop the
      following patch produces warnings.
      ====================
      Acked-by: NStephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5d37636a
    • A
      net: dsa: switch: Don't add CPU port to an mdb by default · ae45102c
      Andrew Lunn 提交于
      Now that the host indicates when a multicast group should be forwarded
      from the switch to the host, don't do it by default.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ae45102c
    • A
      net: dsa: add more const attributes · bb9f6031
      Andrew Lunn 提交于
      The notify mechanism does not need to modify the port it is notifying.
      So make the parameter const.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bb9f6031
    • A
      net: dsa: slave: Handle switchdev host mdb add/del · 5f4dbc50
      Andrew Lunn 提交于
      Add code to handle switchdev host mdb add/del. Since DSA uses one of
      the switch ports as a transport to the host, we just need to add an
      MDB on this port.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5f4dbc50
    • A
      net: bridge: Add/del switchdev object on host join/leave · 47d5b6db
      Andrew Lunn 提交于
      When the host joins or leaves a multicast group, use switchdev to add
      an object to the hardware to forward traffic for the group to the
      host.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Acked-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      47d5b6db
    • A
      net: bridge: Send notification when host join/leaves a group · 2a26028d
      Andrew Lunn 提交于
      The host can join or leave a multicast group on the brX interface, as
      indicated by IGMP snooping.  This is tracked within the bridge
      multicast code. Send a notification when this happens, in the same way
      a notification is sent when a port of the bridge joins/leaves a group
      because of IGMP snooping.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Acked-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2a26028d
    • A
      net: bridge: Rename mglist to host_joined · ff0fd34e
      Andrew Lunn 提交于
      The boolean mglist indicates the host has joined a particular
      multicast group on the bridge interface. It is badly named, obscuring
      what is means. Rename it.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Acked-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff0fd34e
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4dc6758d
      David S. Miller 提交于
      Simple cases of overlapping changes in the packet scheduler.
      
      Must easier to resolve this time.
      
      Which probably means that I screwed it up somehow.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4dc6758d
    • L
      Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 3fefc318
      Linus Torvalds 提交于
      Pull final power management fixes from Rafael Wysocki:
       "These fix a regression in the schedutil cpufreq governor introduced by
        a recent change and blacklist Dell XPS13 9360 from using the Low Power
        S0 Idle _DSM interface which triggers serious problems on one of these
        machines.
      
        Specifics:
      
         - Prevent the schedutil cpufreq governor from using the utilization
           of a wrong CPU in some cases which started to happen after one of
           the recent changes in it (Chris Redpath).
      
         - Blacklist Dell XPS13 9360 from using the Low Power S0 Idle _DSM
           interface as that causes serious issue (related to NVMe) to appear
           on one of these machines, even though the other Dells XPS13 9360 in
           somewhat different HW configurations behave correctly (Rafael
           Wysocki)"
      
      * tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for Dell XPS13 9360
        cpufreq: schedutil: Examine the correct CPU when we update util
      3fefc318
    • L
      Merge tag 'sound-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d93d4ce1
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "The amount of the changes isn't as quite small as wished, nevertheless
        they are straight fixes that deserve merging to 4.14 final.
      
        Most of fixes are about ALSA core bugs spotted by fuzzer: a follow-up
        fix for the previous nested rwsem patch, a fix to avoid the resource
        hogs due to too many concurrent ALSA timer invocations, and a fix for
        a crash with SYSEX MIDI transfer over OSS sequencer emulation that is
        used by none but fuzzer.
      
        The rest are usual HD-audio and USB-audio device-specific quirks,
        which are safe to apply"
      
      * tag 'sound-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - fix headset mic problem for Dell machines with alc274
        ALSA: seq: Fix OSS sysex delivery in OSS emulation
        ALSA: seq: Avoid invalid lockdep class warning
        ALSA: timer: Limit max instances per timer
        ALSA: usb-audio: support new Amanero Combo384 firmware version
      d93d4ce1
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d1041cdc
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix use-after-free in IPSEC input parsing, desintation address
          pointer was loaded before pskb_may_pull() which can change the SKB
          data pointers. From Florian Westphal.
      
       2) Stack out-of-bounds read in xfrm_state_find(), from Steffen
          Klassert.
      
       3) IPVS state of SKB is not properly reset when moving between
          namespaces, from Ye Yin.
      
       4) Fix crash in asix driver suspend and resume, from Andrey Konovalov.
      
       5) Don't deliver ipv6 l2tp tunnel packets to ipv4 l2tp tunnels, and
          vice versa, from Guillaume Nault.
      
       6) Fix DSACK undo on non-dup ACKs, from Priyaranjan Jha.
      
       7) Fix regression in bond_xmit_hash()'s behavior after the TCP port
          selection changes back in 4.2, from Hangbin Liu.
      
       8) Two divide by zero bugs in USB networking drivers when parsing
          descriptors, from Bjorn Mork.
      
       9) Fix bonding slaves being stuck in BOND_LINK_FAIL state, from Jay
          Vosburgh.
      
      10) Missing skb_reset_mac_header() in qmi_wwan, from Kristian Evensen.
      
      11) Fix the destruction of tc action object races properly, from Cong
          Wang.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (31 commits)
        cls_u32: use tcf_exts_get_net() before call_rcu()
        cls_tcindex: use tcf_exts_get_net() before call_rcu()
        cls_rsvp: use tcf_exts_get_net() before call_rcu()
        cls_route: use tcf_exts_get_net() before call_rcu()
        cls_matchall: use tcf_exts_get_net() before call_rcu()
        cls_fw: use tcf_exts_get_net() before call_rcu()
        cls_flower: use tcf_exts_get_net() before call_rcu()
        cls_flow: use tcf_exts_get_net() before call_rcu()
        cls_cgroup: use tcf_exts_get_net() before call_rcu()
        cls_bpf: use tcf_exts_get_net() before call_rcu()
        cls_basic: use tcf_exts_get_net() before call_rcu()
        net_sched: introduce tcf_exts_get_net() and tcf_exts_put_net()
        Revert "net_sched: hold netns refcnt for each action"
        net: usb: asix: fill null-ptr-deref in asix_suspend
        Revert "net: usb: asix: fill null-ptr-deref in asix_suspend"
        qmi_wwan: Add missing skb_reset_mac_header-call
        bonding: fix slave stuck in BOND_LINK_FAIL state
        qrtr: Move to postcore_initcall
        net: qmi_wwan: fix divide by 0 on bad descriptors
        net: cdc_ether: fix divide by 0 on bad descriptors
        ...
      d1041cdc
  2. 09 11月, 2017 23 次提交