1. 23 Jul, 2018 12 commits
    • David S. Miller's avatar
      Merge branch 'smc-next' · 6a525818
      David S. Miller authored
      Ursula Braun says:
      
      ====================
      net/smc: patches 2018-07-23
      
      here are some small patches for SMC: Just the first patch contains a
      functional change. It allows to differ between the modes SMCR and SMCD
      on s390 when monitoring SMC sockets. The remaining patches are cleanups
      without functional changes.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6a525818
    • Ursula Braun's avatar
      net/smc: remove local variable page in smc_rx_splice() · 48bf5231
      Ursula Braun authored
      The page map address is already stored in the RMB descriptor.
      There is no need to derive it from the cpu_addr value.
      Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      48bf5231
    • Ursula Braun's avatar
      net/smc: use DECLARE_BITMAP for rtokens_used_mask · 144ce4b9
      Ursula Braun authored
      Link group field tokens_used_mask is a bitmap. Use macro
      DECLARE_BITMAP for its definition.
      Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      144ce4b9
    • Stefan Raspl's avatar
      net/smc: add function to get link group from link · 00e5fb26
      Stefan Raspl authored
      Replace a frequently used construct with a more readable variant,
      reducing the code. Also might come handy when we start to support
      more than a single per link group.
      Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
      Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      00e5fb26
    • Stefan Raspl's avatar
      net/smc: eliminate cursor read and write calls · bac6de7b
      Stefan Raspl authored
      The functions to read and write cursors are exclusively used to copy
      cursors. Therefore switch to a respective function instead.
      Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
      Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bac6de7b
    • Karsten Graul's avatar
      net/smc: provide smc mode in smc_diag.c · c601171d
      Karsten Graul authored
      Rename field diag_fallback into diag_mode and set the smc mode of a
      connection explicitly.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c601171d
    • Petr Machata's avatar
      selftests: forwarding: gre_multipath: Drop IPv6 tests · 9a2ad362
      Petr Machata authored
      Support for device-only IPv6 multipath next hops was dropped in
      commit 33bd5ac5 ("net/ipv6: Revert attempt to simplify route replace
      and append") and as of commit b5d2d75e ("net/ipv6: Do not allow
      device only routes via the multipath API"), attempts to add a next hop
      like that yield an explicit diagnostic.
      
      Correspondingly, drop the IPv6 parts of GRE multipath test that are
      supposed to test that code.
      Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9a2ad362
    • YueHaibing's avatar
      ipv6: sr: Use kmemdup instead of duplicating it in parse_nla_srh · 7fa41efa
      YueHaibing authored
      Replace calls to kmalloc followed by a memcpy with a direct call to
      kmemdup.
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7fa41efa
    • David S. Miller's avatar
      Merge branch 'net-bridge-add-support-for-backup-port' · f8b2990f
      David S. Miller authored
      Nikolay Aleksandrov says:
      
      ====================
      net: bridge: add support for backup port
      
      This set introduces a new bridge port option that allows any port to have
      any other port (in the same bridge of course) as its backup and traffic
      will be forwarded to the backup port when the primary goes down. This is
      mainly used in MLAG and EVPN setups where we have peerlink path which is
      a backup of many (or even all) ports and is a participating bridge port
      itself. There's more detailed information in patch 02. Patch 01 just
      prepares the port sysfs code for options that take raw value. The main
      issues that this set solves are scalability and fallback latency.
      
      We have used similar code for over 6 months now to bring the fallback
      latency of the backup peerlink down and avoid fdb notification storms.
      Also due to the nature of master devices such setup is currently not
      possible, and last but not least having tens of thousands of fdbs require
      thousands of calls to switch.
      
      I've also CCed our MLAG experts that have been using similar option.
      
      Roopa also adds:
      
      "Two switches acting in a MLAG pair are connected by the peerlink
      interface which is a bridge port.
      
      the config on one of the switches looks like the below. The other
      switch also has a similar config.
      eth0 is connected to one port on the server. And the server is
      connected to both switches.
      
      br0 -- team0---eth0
            |
            -- switch-peerlink
      
      switch-peerlink becomes the failover/backport port when say team0 to
      the server goes down.
      Today, when team0 goes down, control plane has to withdraw all the fdb
      entries pointing to team0
      and re-install the fdb entries pointing to switch-peerlink...and
      restore the fdb entries when team0 comes back up again.
      and  this is the problem we are trying to solve.
      
      This also becomes necessary when multihoming is implemented by a
      standard like E-VPN https://tools.ietf.org/html/rfc8365#section-8
      where the 'switch-peerlink' is an overlay vxlan port (like nikolay
      mentions in his patch commit). In these implementations, the fdb scale
      can be much larger.
      
      On why bond failover cannot be used here ?: the point that nikolay was
      alluding to is, switch-peerlink in the above example is a bridge port
      and is a failover/backport port for more than one or all ports in the
      bridge br0. And you cannot enslave switch-peerlink into a second level
      team
      with other bridge ports. Hence a multi layered team device is not an
      option (FWIW, switch-peerlink is also a teamed interface to the peer
      switch)."
      
      v3: Added Roopa's explanation and diagram
      v2: In patch 01 use kstrdup/kfree to avoid casting the const buf. In order
      to avoid using GFP_ATOMIC or always allocating I kept the spinlock inside
      each branch.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8b2990f
    • Nikolay Aleksandrov's avatar
      net: bridge: add support for backup port · 2756f68c
      Nikolay Aleksandrov authored
      This patch adds a new port attribute - IFLA_BRPORT_BACKUP_PORT, which
      allows to set a backup port to be used for known unicast traffic if the
      port has gone carrier down. The backup pointer is rcu protected and set
      only under RTNL, a counter is maintained so when deleting a port we know
      how many other ports reference it as a backup and we remove it from all.
      Also the pointer is in the first cache line which is hot at the time of
      the check and thus in the common case we only add one more test.
      The backup port will be used only for the non-flooding case since
      it's a part of the bridge and the flooded packets will be forwarded to it
      anyway. To remove the forwarding just send a 0/non-existing backup port.
      This is used to avoid numerous scalability problems when using MLAG most
      notably if we have thousands of fdbs one would need to change all of them
      on port carrier going down which takes too long and causes a storm of fdb
      notifications (and again when the port comes back up). In a Multi-chassis
      Link Aggregation setup usually hosts are connected to two different
      switches which act as a single logical switch. Those switches usually have
      a control and backup link between them called peerlink which might be used
      for communication in case a host loses connectivity to one of them.
      We need a fast way to failover in case a host port goes down and currently
      none of the solutions (like bond) cannot fulfill the requirements because
      the participating ports are actually the "master" devices and must have the
      same peerlink as their backup interface and at the same time all of them
      must participate in the bridge device. As Roopa noted it's normal practice
      in routing called fast re-route where a precalculated backup path is used
      when the main one is down.
      Another use case of this is with EVPN, having a single vxlan device which
      is backup of every port. Due to the nature of master devices it's not
      currently possible to use one device as a backup for many and still have
      all of them participate in the bridge (which is master itself).
      More detailed information about MLAG is available at the link below.
      https://docs.cumulusnetworks.com/display/DOCS/Multi-Chassis+Link+Aggregation+-+MLAG
      
      Further explanation and a diagram by Roopa:
      Two switches acting in a MLAG pair are connected by the peerlink
      interface which is a bridge port.
      
      the config on one of the switches looks like the below. The other
      switch also has a similar config.
      eth0 is connected to one port on the server. And the server is
      connected to both switches.
      
      br0 -- team0---eth0
            |
            -- switch-peerlink
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2756f68c
    • Nikolay Aleksandrov's avatar
      net: bridge: add support for raw sysfs port options · a5f3ea54
      Nikolay Aleksandrov authored
      This patch adds a new alternative store callback for port sysfs options
      which takes a raw value (buf) and can use it directly. It is needed for the
      backup port sysfs support since we have to pass the device by its name.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5f3ea54
    • YueHaibing's avatar
      net: mediatek: use dma_zalloc_coherent instead of allocator/memset · 0a78c380
      YueHaibing authored
      Use dma_zalloc_coherent instead of dma_alloc_coherent
      followed by memset 0.
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0a78c380
  2. 22 Jul, 2018 18 commits
  3. 21 Jul, 2018 10 commits
    • YueHaibing's avatar
      libcxgb: replace vmalloc and memset with vzalloc · 4c303373
      YueHaibing authored
      Use vzalloc instead of the vmalloc, memset combo
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4c303373
    • YueHaibing's avatar
      net: hix5hd2_gmac: use dma_zalloc_coherent instead of allocator/memset · c1907e53
      YueHaibing authored
      Use dma_zalloc_coherent instead of dma_alloc_coherent
      followed by memset 0.
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c1907e53
    • YueHaibing's avatar
      tipc: make some functions static · e064cce1
      YueHaibing authored
      Fixes the following sparse warnings:
      
      net/tipc/link.c:376:5: warning: symbol 'link_bc_rcv_gap' was not declared. Should it be static?
      net/tipc/link.c:823:6: warning: symbol 'link_prepare_wakeup' was not declared. Should it be static?
      net/tipc/link.c:959:6: warning: symbol 'tipc_link_advance_backlog' was not declared. Should it be static?
      net/tipc/link.c:1009:5: warning: symbol 'tipc_link_retrans' was not declared. Should it be static?
      net/tipc/monitor.c:687:5: warning: symbol '__tipc_nl_add_monitor_peer' was not declared. Should it be static?
      net/tipc/group.c:230:20: warning: symbol 'tipc_group_find_member' was not declared. Should it be static?
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e064cce1
    • Gustavo A. R. Silva's avatar
      net: sched: use PTR_ERR_OR_ZERO macro in tcf_block_cb_register · baa2d2b1
      Gustavo A. R. Silva authored
      This line makes up what macro PTR_ERR_OR_ZERO already does. So,
      make use of PTR_ERR_OR_ZERO rather than an open-code version.
      
      This code was detected with the help of Coccinelle.
      Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      baa2d2b1
    • David S. Miller's avatar
      Merge branch 'tcp-improve-setsockopt-TCP_USER_TIMEOUT-accuracy' · d1afdc51
      David S. Miller authored
      Jon Maxwell says:
      
      ====================
      tcp: improve setsockopt() TCP_USER_TIMEOUT accuracy
      
      The patch was becoming bigger based on feedback therefore I have
      implemented a series of 3 commits instead in V4.
      
      This series is a continuation based on V3 here and associated feedback:
      
      https://patchwork.kernel.org/patch/10516195/
      
      Suggestions by Neal Cardwell:
      
      1) Fix up units mismatch regarding msec/jiffies.
      2) Address possiblility of time_remaining being negative.
      3) Add a helper routine tcp_clamp_rto_to_user_timeout() to do the rto
      calculation.
      4) Move start_ts logic into helper routine tcp_retrans_stamp() to
      validate tcp_sk(sk)->retrans_stamp.
      5) Some u32 declation and return refactoring.
      6) Return 0 instead of false in tcp_retransmit_stamp(), it's not a bool.
      
      Suggestions by David Laight:
      
      1) Don't cache rto in tcp_clamp_rto_to_user_timeout().
      
      Suggestions by Eric Dumazet:
      
      1) Make u32 declartions consistent.
      2) Use patch series for easier review.
      3) Convert icsk->icsk_user_timeout to millisconds to avoid jiffie to
      msec dance.
      4) Use seperate titles for each commit in the series.
      5) Fix fuzzy indentation and line wrap issues.
      6) Make commit titles descriptive.
      
      Changes:
      
      1) Call tcp_clamp_rto_to_user_timeout(sk) as an argument to
      inet_csk_reset_xmit_timer() to save on rto declaration.
      
      Every time the TCP retransmission timer fires. It checks to see if
      there is a timeout before scheduling the next retransmit timer. The
      retransmit interval between each retransmission increases
      exponentially. The issue is that in order for the timeout to occur the
      retransmit timer needs to fire again. If the user timeout check happens
      after the 9th retransmit for example. It needs to wait for the 10th
      retransmit timer to fire in order to evaluate whether a timeout has
      occurred or not. If the interval is large enough then the timeout will
      be inaccurate.
      
      For example with a TCP_USER_TIMEOUT of 10 seconds without patch:
      
      1st retransmit:
      
      22:25:18.973488 IP host1.49310 > host2.search-agent: Flags [.]
      
      Last retransmit:
      
      22:25:26.205499 IP host1.49310 > host2.search-agent: Flags [.]
      
      Timeout:
      
      send: Connection timed out
      Sun Jul  1 22:25:34 EDT 2018
      
      We can see that last retransmit took ~7 seconds. Which pushed the total
      timeout to ~15 seconds instead of the expected 10 seconds. This gets
      more inaccurate the larger the TCP_USER_TIMEOUT value. As the interval
      increases.
      
      Add tcp_clamp_rto_to_user_timeout() to determine if the user rto has
      expired. Or whether the rto interval needs to be recalculated. Use the
      original interval if user rto is not set.
      
      Test results with the patch is the expected 10 second timeout:
      
      1st retransmit:
      
      01:37:59.022555 IP host1.49310 > host2.search-agent: Flags [.]
      
      Last retransmit:
      
      01:38:06.486558 IP host1.49310 > host2.search-agent: Flags [.]
      
      Timeout:
      
      send: Connection timed out
      Mon Jul  2 01:38:09 EDT 2018
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1afdc51
    • Jon Maxwell's avatar
      tcp: Add tcp_clamp_rto_to_user_timeout() helper to improve accuracy · b701a99e
      Jon Maxwell authored
      Create the tcp_clamp_rto_to_user_timeout() helper routine. To calculate
      the correct rto, so that the TCP_USER_TIMEOUT socket option is more
      accurate. Taking suggestions and feedback into account from
      Eric Dumazet, Neal Cardwell and David Laight. Due to the 1st commit we
      can avoid the msecs_to_jiffies() and jiffies_to_msecs() dance.
      Signed-off-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b701a99e
    • Jon Maxwell's avatar
      tcp: Add tcp_retransmit_stamp() helper routine · a7fa3770
      Jon Maxwell authored
      Create a seperate helper routine as per Neal Cardwells suggestion. To
      be used by the final commit in this series and retransmits_timed_out().
      Signed-off-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a7fa3770
    • Jon Maxwell's avatar
      tcp: convert icsk_user_timeout from jiffies to msecs · 9bcc66e1
      Jon Maxwell authored
      This is a preparatory commit. Part of this series that improves the
      socket TCP_USER_TIMEOUT option accuracy. Implement Eric Dumazets idea
      to convert icsk->icsk_user_timeout from jiffies to msecs. To eliminate
      the msecs_to_jiffies() and jiffies_to_msecs() dance in future.
      Signed-off-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9bcc66e1
    • David S. Miller's avatar
      Merge branch 's390-qeth-updates' · 975cd350
      David S. Miller authored
      Julian Wiedmann says:
      
      ====================
      s390/qeth: updates 2018-07-19
      
      please apply one more round of qeth patches to net-next.
      This brings additional performance improvements for the transmit code,
      and some refactoring to pave the way for using netdev_priv.
      Also, two minor fixes for rare corner cases.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      975cd350
    • Julian Wiedmann's avatar
      s390/qeth: speed up L2 IQD xmit · 5f89eca5
      Julian Wiedmann authored
      Modify the L2 OSA xmit path so that it also supports L2 IQD devices
      (in particular, their HW header requirements). This allows IQD devices
      to advertise NETIF_F_SG support, and eliminates the allocation overhead
      for the HW header.
      Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5f89eca5