Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
  1. Nov 03, 2019
    • Francesco Ruggeri's avatar
      net: icmp6: provide input address for traceroute6 · fac6fce9
      Francesco Ruggeri authored
      
      traceroute6 output can be confusing, in that it shows the address
      that a router would use to reach the sender, rather than the address
      the packet used to reach the router.
      Consider this case:
      
              ------------------------ N2
               |                    |
             ------              ------  N3  ----
             | R1 |              | R2 |------|H2|
             ------              ------      ----
               |                    |
              ------------------------ N1
                        |
                       ----
                       |H1|
                       ----
      
      where H1's default route is through R1, and R1's default route is
      through R2 over N2.
      traceroute6 from H1 to H2 shows R2's address on N1 rather than on N2.
      
      The script below can be used to reproduce this scenario.
      
      traceroute6 output without this patch:
      
      traceroute to 2000:103::4 (2000:103::4), 30 hops max, 80 byte packets
       1  2000:101::1 (2000:101::1)  0.036 ms  0.008 ms  0.006 ms
       2  2000:101::2 (2000:101::2)  0.011 ms  0.008 ms  0.007 ms
       3  2000:103::4 (2000:103::4)  0.013 ms  0.010 ms  0.009 ms
      
      traceroute6 output with this patch:
      
      traceroute to 2000:103::4 (2000:103::4), 30 hops max, 80 byte packets
       1  2000:101::1 (2000:101::1)  0.056 ms  0.019 ms  0.006 ms
       2  2000:102::2 (2000:102::2)  0.013 ms  0.008 ms  0.008 ms
       3  2000:103::4 (2000:103::4)  0.013 ms  0.009 ms  0.009 ms
      
      #!/bin/bash
      #
      #        ------------------------ N2
      #         |                    |
      #       ------              ------  N3  ----
      #       | R1 |              | R2 |------|H2|
      #       ------              ------      ----
      #         |                    |
      #        ------------------------ N1
      #                  |
      #                 ----
      #                 |H1|
      #                 ----
      #
      # N1: 2000:101::/64
      # N2: 2000:102::/64
      # N3: 2000:103::/64
      #
      # R1's host part of address: 1
      # R2's host part of address: 2
      # H1's host part of address: 3
      # H2's host part of address: 4
      #
      # For example:
      # the IPv6 address of R1's interface on N2 is 2000:102::1/64
      #
      # Nets are implemented by macvlan interfaces (bridge mode) over
      # dummy interfaces.
      #
      
      # Create net namespaces
      ip netns add host1
      ip netns add host2
      ip netns add rtr1
      ip netns add rtr2
      
      # Create nets
      ip link add net1 type dummy; ip link set net1 up
      ip link add net2 type dummy; ip link set net2 up
      ip link add net3 type dummy; ip link set net3 up
      
      # Add interfaces to net1, move them to their nemaspaces
      ip link add link net1 dev host1net1 type macvlan mode bridge
      ip link set host1net1 netns host1
      ip link add link net1 dev rtr1net1 type macvlan mode bridge
      ip link set rtr1net1 netns rtr1
      ip link add link net1 dev rtr2net1 type macvlan mode bridge
      ip link set rtr2net1 netns rtr2
      
      # Add interfaces to net2, move them to their nemaspaces
      ip link add link net2 dev rtr1net2 type macvlan mode bridge
      ip link set rtr1net2 netns rtr1
      ip link add link net2 dev rtr2net2 type macvlan mode bridge
      ip link set rtr2net2 netns rtr2
      
      # Add interfaces to net3, move them to their nemaspaces
      ip link add link net3 dev rtr2net3 type macvlan mode bridge
      ip link set rtr2net3 netns rtr2
      ip link add link net3 dev host2net3 type macvlan mode bridge
      ip link set host2net3 netns host2
      
      # Configure interfaces and routes in host1
      ip netns exec host1 ip link set lo up
      ip netns exec host1 ip link set host1net1 up
      ip netns exec host1 ip -6 addr add 2000:101::3/64 dev host1net1
      ip netns exec host1 ip -6 route add default via 2000:101::1
      
      # Configure interfaces and routes in rtr1
      ip netns exec rtr1 ip link set lo up
      ip netns exec rtr1 ip link set rtr1net1 up
      ip netns exec rtr1 ip -6 addr add 2000:101::1/64 dev rtr1net1
      ip netns exec rtr1 ip link set rtr1net2 up
      ip netns exec rtr1 ip -6 addr add 2000:102::1/64 dev rtr1net2
      ip netns exec rtr1 ip -6 route add default via 2000:102::2
      ip netns exec rtr1 sysctl net.ipv6.conf.all.forwarding=1
      
      # Configure interfaces and routes in rtr2
      ip netns exec rtr2 ip link set lo up
      ip netns exec rtr2 ip link set rtr2net1 up
      ip netns exec rtr2 ip -6 addr add 2000:101::2/64 dev rtr2net1
      ip netns exec rtr2 ip link set rtr2net2 up
      ip netns exec rtr2 ip -6 addr add 2000:102::2/64 dev rtr2net2
      ip netns exec rtr2 ip link set rtr2net3 up
      ip netns exec rtr2 ip -6 addr add 2000:103::2/64 dev rtr2net3
      ip netns exec rtr2 sysctl net.ipv6.conf.all.forwarding=1
      
      # Configure interfaces and routes in host2
      ip netns exec host2 ip link set lo up
      ip netns exec host2 ip link set host2net3 up
      ip netns exec host2 ip -6 addr add 2000:103::4/64 dev host2net3
      ip netns exec host2 ip -6 route add default via 2000:103::2
      
      # Ping host2 from host1
      ip netns exec host1 ping6 -c5 2000:103::4
      
      # Traceroute host2 from host1
      ip netns exec host1 traceroute6 2000:103::4
      
      # Delete nets
      ip link del net3
      ip link del net2
      ip link del net1
      
      # Delete namespaces
      ip netns del rtr2
      ip netns del rtr1
      ip netns del host2
      ip netns del host1
      
      Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
      Original-patch-by: default avatarHonggang Xu <hxu@arista.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fac6fce9
    • Tuong Lien's avatar
      tipc: improve message bundling algorithm · 06e7c70c
      Tuong Lien authored
      As mentioned in commit e95584a8
      
       ("tipc: fix unlimited bundling of
      small messages"), the current message bundling algorithm is inefficient
      that can generate bundles of only one payload message, that causes
      unnecessary overheads for both the sender and receiver.
      
      This commit re-designs the 'tipc_msg_make_bundle()' function (now named
      as 'tipc_msg_try_bundle()'), so that when a message comes at the first
      place, we will just check & keep a reference to it if the message is
      suitable for bundling. The message buffer will be put into the link
      backlog queue and processed as normal. Later on, when another one comes
      we will make a bundle with the first message if possible and so on...
      This way, a bundle if really needed will always consist of at least two
      payload messages. Otherwise, we let the first buffer go its way without
      any need of bundling, so reduce the overheads to zero.
      
      Moreover, since now we have both the messages in hand, we can even
      optimize the 'tipc_msg_bundle()' function, make bundle of a very large
      (size ~ MSS) and small messages which is not with the current algorithm
      e.g. [1400-byte message] + [10-byte message] (MTU = 1500).
      
      Acked-by: default avatarYing Xue <ying.xue@windreiver.com>
      Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: default avatarTuong Lien <tuong.t.lien@dektech.com.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06e7c70c
    • Francesco Ruggeri's avatar
      net: icmp: use input address in traceroute · 2adf81c0
      Francesco Ruggeri authored
      
      Even with icmp_errors_use_inbound_ifaddr set, traceroute returns the
      primary address of the interface the packet was received on, even if
      the path goes through a secondary address. In the example:
      
                          1.0.3.1/24
       ---- 1.0.1.3/24    1.0.1.1/24 ---- 1.0.2.1/24    1.0.2.4/24 ----
       |H1|--------------------------|R1|--------------------------|H2|
       ----            N1            ----            N2            ----
      
      where 1.0.3.1/24 is R1's primary address on N1, traceroute from
      H1 to H2 returns:
      
      traceroute to 1.0.2.4 (1.0.2.4), 30 hops max, 60 byte packets
       1  1.0.3.1 (1.0.3.1)  0.018 ms  0.006 ms  0.006 ms
       2  1.0.2.4 (1.0.2.4)  0.021 ms  0.007 ms  0.007 ms
      
      After applying this patch, it returns:
      
      traceroute to 1.0.2.4 (1.0.2.4), 30 hops max, 60 byte packets
       1  1.0.1.1 (1.0.1.1)  0.033 ms  0.007 ms  0.006 ms
       2  1.0.2.4 (1.0.2.4)  0.011 ms  0.007 ms  0.007 ms
      
      Original-patch-by: default avatarBill Fenner <fenner@arista.com>
      Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2adf81c0
    • David S. Miller's avatar
      Merge branch 'optimize-openvswitch-flow-looking-up' · c219a166
      David S. Miller authored
      
      Tonghao Zhang says:
      
      ====================
      optimize openvswitch flow looking up
      
      This series patch optimize openvswitch for performance or simplify
      codes.
      
      Patch 1, 2, 4: Port Pravin B Shelar patches to
      linux upstream with little changes.
      
      Patch 5, 6, 7: Optimize the flow looking up and
      simplify the flow hash.
      
      Patch 8, 9: are bugfix.
      
      The performance test is on Intel Xeon E5-2630 v4.
      The test topology is show as below:
      
      +-----------------------------------+
      |   +---------------------------+   |
      |   | eth0   ovs-switch    eth1 |   | Host0
      |   +---------------------------+   |
      +-----------------------------------+
            ^                       |
            |                       |
            |                       |
            |                       |
            |                       v
      +-----+----+             +----+-----+
      | netperf  | Host1       | netserver| Host2
      +----------+             +----------+
      
      We use netperf send the 64B packets, and insert 255+ flow-mask:
      $ ovs-dpctl add-flow ovs-switch "in_port(1),eth(dst=00:01:00:00:00:00/ff:ff:ff:ff:ff:01),eth_type(0x0800),ipv4(frag=no)" 2
      ...
      $ ovs-dpctl add-flow ovs-switch "in_port(1),eth(dst=00:ff:00:00:00:00/ff:ff:ff:ff:ff:ff),eth_type(0x0800),ipv4(frag=no)" 2
      $
      $ netperf -t UDP_STREAM -H 2.2.2.200 -l 40 -- -m 18
      
      * Without series patch, throughput 8.28Mbps
      * With series patch, throughput 46.05Mbps
      
      v6:
      some coding style fixes
      
      v5:
      rewrite patch 8, release flow-mask when freeing flow
      
      v4:
      access ma->count with READ_ONCE/WRITE_ONCE API. More information,
      see patch 5 comments.
      
      v3:
      update ma point when realloc mask_array in patch 5
      
      v2:
      simplify codes. e.g. use kfree_rcu instead of call_rcu
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c219a166
    • Tonghao Zhang's avatar
      net: openvswitch: simplify the ovs_dp_cmd_new · eec62ead
      Tonghao Zhang authored
      
      use the specified functions to init resource.
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eec62ead
    • Tonghao Zhang's avatar
      net: openvswitch: don't unlock mutex when changing the user_features fails · 4c76bf69
      Tonghao Zhang authored
      Unlocking of a not locked mutex is not allowed.
      Other kernel thread may be in critical section while
      we unlock it because of setting user_feature fail.
      
      Fixes: 95a7233c
      
       ("net: openvswitch: Set OvS recirc_id from tc chain index")
      Cc: Paul Blakey <paulb@mellanox.com>
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4c76bf69
    • Tonghao Zhang's avatar
      net: openvswitch: fix possible memleak on destroy flow-table · 50b0e61b
      Tonghao Zhang authored
      
      When we destroy the flow tables which may contain the flow_mask,
      so release the flow mask struct.
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      50b0e61b
    • Tonghao Zhang's avatar
      net: openvswitch: add likely in flow_lookup · 0a3e0137
      Tonghao Zhang authored
      
      The most case *index < ma->max, and flow-mask is not NULL.
      We add un/likely for performance.
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0a3e0137
    • Tonghao Zhang's avatar
      net: openvswitch: simplify the flow_hash · 515b65a4
      Tonghao Zhang authored
      
      Simplify the code and remove the unnecessary BUILD_BUG_ON.
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      515b65a4
    • Tonghao Zhang's avatar
      net: openvswitch: optimize flow-mask looking up · 57f7d7b9
      Tonghao Zhang authored
      
      The full looking up on flow table traverses all mask array.
      If mask-array is too large, the number of invalid flow-mask
      increase, performance will be drop.
      
      One bad case, for example: M means flow-mask is valid and NULL
      of flow-mask means deleted.
      
      +-------------------------------------------+
      | M | NULL | ...                  | NULL | M|
      +-------------------------------------------+
      
      In that case, without this patch, openvswitch will traverses all
      mask array, because there will be one flow-mask in the tail. This
      patch changes the way of flow-mask inserting and deleting, and the
      mask array will be keep as below: there is not a NULL hole. In the
      fast path, we can "break" "for" (not "continue") in flow_lookup
      when we get a NULL flow-mask.
      
               "break"
                  v
      +-------------------------------------------+
      | M | M |  NULL |...           | NULL | NULL|
      +-------------------------------------------+
      
      This patch don't optimize slow or control path, still using ma->max
      to traverse. Slow path:
      * tbl_mask_array_realloc
      * ovs_flow_tbl_lookup_exact
      * flow_mask_find
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      57f7d7b9
    • Tonghao Zhang's avatar
      net: openvswitch: optimize flow mask cache hash collision · a7f35e78
      Tonghao Zhang authored
      Port the codes to linux upstream and with little changes.
      
      Pravin B Shelar, says:
      | In case hash collision on mask cache, OVS does extra flow
      | lookup. Following patch avoid it.
      
      Link: https://github.com/openvswitch/ovs/commit/0e6efbe2712da03522532dc5e84806a96f6a0dd1
      
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Signed-off-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a7f35e78
    • Tonghao Zhang's avatar
      net: openvswitch: shrink the mask array if necessary · 1689754d
      Tonghao Zhang authored
      
      When creating and inserting flow-mask, if there is no available
      flow-mask, we realloc the mask array. When removing flow-mask,
      if necessary, we shrink mask array.
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1689754d
    • Tonghao Zhang's avatar
      net: openvswitch: convert mask list in mask array · 4bc63b1b
      Tonghao Zhang authored
      Port the codes to linux upstream and with little changes.
      
      Pravin B Shelar, says:
      | mask caches index of mask in mask_list. On packet recv OVS
      | need to traverse mask-list to get cached mask. Therefore array
      | is better for retrieving cached mask. This also allows better
      | cache replacement algorithm by directly checking mask's existence.
      
      Link: https://github.com/openvswitch/ovs/commit/d49fc3ff53c65e4eca9cabd52ac63396746a7ef5
      
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Signed-off-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4bc63b1b
    • Tonghao Zhang's avatar
      net: openvswitch: add flow-mask cache for performance · 04b7d136
      Tonghao Zhang authored
      The idea of this optimization comes from a patch which
      is committed in 2014, openvswitch community. The author
      is Pravin B Shelar. In order to get high performance, I
      implement it again. Later patches will use it.
      
      Pravin B Shelar, says:
      | On every packet OVS needs to lookup flow-table with every
      | mask until it finds a match. The packet flow-key is first
      | masked with mask in the list and then the masked key is
      | looked up in flow-table. Therefore number of masks can
      | affect packet processing performance.
      
      Link: https://github.com/openvswitch/ovs/commit/5604935e4e1cbc16611d2d97f50b717aa31e8ec5
      
      
      Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
      Signed-off-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04b7d136
  2. Nov 02, 2019
  3. Nov 01, 2019
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 1204c70d
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix free/alloc races in batmanadv, from Sven Eckelmann.
      
       2) Several leaks and other fixes in kTLS support of mlx5 driver, from
          Tariq Toukan.
      
       3) BPF devmap_hash cost calculation can overflow on 32-bit, from Toke
          Høiland-Jørgensen.
      
       4) Add an r8152 device ID, from Kazutoshi Noguchi.
      
       5) Missing include in ipv6's addrconf.c, from Ben Dooks.
      
       6) Use siphash in flow dissector, from Eric Dumazet. Attackers can
          easily infer the 32-bit secret otherwise etc.
      
       7) Several netdevice nesting depth fixes from Taehee Yoo.
      
       8) Fix several KCSAN reported errors, from Eric Dumazet. For example,
          when doing lockless skb_queue_empty() checks, and accessing
          sk_napi_id/sk_incoming_cpu lockless as well.
      
       9) Fix jumbo packet handling in RXRPC, from David Howells.
      
      10) Bump SOMAXCONN and tcp_max_syn_backlog values, from Eric Dumazet.
      
      11) Fix DMA synchronization in gve driver, from Yangchun Fu.
      
      12) Several bpf offload fixes, from Jakub Kicinski.
      
      13) Fix sk_page_frag() recursion during memory reclaim, from Tejun Heo.
      
      14) Fix ping latency during high traffic rates in hisilicon driver, from
          Jiangfent Xiao.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (146 commits)
        net: fix installing orphaned programs
        net: cls_bpf: fix NULL deref on offload filter removal
        selftests: bpf: Skip write only files in debugfs
        selftests: net: reuseport_dualstack: fix uninitalized parameter
        r8169: fix wrong PHY ID issue with RTL8168dp
        net: dsa: bcm_sf2: Fix IMP setup for port different than 8
        net: phylink: Fix phylink_dbg() macro
        gve: Fixes DMA synchronization.
        inet: stop leaking jiffies on the wire
        ixgbe: Remove duplicate clear_bit() call
        Documentation: networking: device drivers: Remove stray asterisks
        e1000: fix memory leaks
        i40e: Fix receive buffer starvation for AF_XDP
        igb: Fix constant media auto sense switching when no cable is connected
        net: ethernet: arc: add the missed clk_disable_unprepare
        igb: Enable media autosense for the i350.
        igb/igc: Don't warn on fatal read failures when the device is removed
        tcp: increase tcp_max_syn_backlog max value
        net: increase SOMAXCONN to 4096
        netdevsim: Fix use-after-free during device dismantle
        ...
      1204c70d
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-5.4-3' of git://git.linux-nfs.org/projects/anna/linux-nfs · 372bf6c1
      Linus Torvalds authored
      Pull NFS client bugfixes from Anna Schumaker:
       "This contains two delegation fixes (with the RCU lock leak fix marked
        for stable), and three patches to fix destroying the the sunrpc back
        channel.
      
        Stable bugfixes:
      
         - Fix an RCU lock leak in nfs4_refresh_delegation_stateid()
      
        Other fixes:
      
         - The TCP back channel mustn't disappear while requests are
           outstanding
      
         - The RDMA back channel mustn't disappear while requests are
           outstanding
      
         - Destroy the back channel when we destroy the host transport
      
         - Don't allow a cached open with a revoked delegation"
      
      * tag 'nfs-for-5.4-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()
        NFSv4: Don't allow a cached open with a revoked delegation
        SUNRPC: Destroy the back channel when we destroy the host transport
        SUNRPC: The RDMA back channel mustn't disappear while requests are outstanding
        SUNRPC: The TCP back channel mustn't disappear while requests are outstanding
      372bf6c1
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20191101' of git://git.kernel.dk/linux-block · 0821de28
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
      
       - Two small nvme fixes, one is a fabrics connection fix, the other one
         a cleanup made possible by that fix (Anton, via Keith)
      
       - Fix requeue handling in umb ubd (Anton)
      
       - Fix spin_lock_irq() nesting in blk-iocost (Dan)
      
       - Three small io_uring fixes:
           - Install io_uring fd after done with ctx (me)
           - Clear ->result before every poll issue (me)
           - Fix leak of shadow request on error (Pavel)
      
      * tag 'for-linus-20191101' of git://git.kernel.dk/linux-block:
        iocost: don't nest spin_lock_irq in ioc_weight_write()
        io_uring: ensure we clear io_kiocb->result before each issue
        um-ubd: Entrust re-queue to the upper layers
        nvme-multipath: remove unused groups_only mode in ana log
        nvme-multipath: fix possible io hang after ctrl reconnect
        io_uring: don't touch ctx in setup after ring fd install
        io_uring: Fix leaked shadow_req
      0821de28
    • Linus Torvalds's avatar
      Merge tag 'riscv/for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · e5897c7d
      Linus Torvalds authored
      Pull RISC-V fixes from Paul Walmsley:
       "One fix for PCIe users:
      
         - Fix legacy PCI I/O port access emulation
      
        One set of cleanups:
      
         - Resolve most of the warnings generated by sparse across arch/riscv.
           No functional changes
      
        And one MAINTAINERS update:
      
         - Update Palmer's E-mail address"
      
      * tag 'riscv/for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        MAINTAINERS: Change to my personal email address
        RISC-V: Add PCIe I/O BAR memory mapping
        riscv: for C functions called only from assembly, mark with __visible
        riscv: fp: add missing __user pointer annotations
        riscv: add missing header file includes
        riscv: mark some code and data as file-static
        riscv: init: merge split string literals in preprocessor directive
        riscv: add prototypes for assembly language functions from head.S
      e5897c7d
    • Daniel Borkmann's avatar
      Merge branch 'bpf-xskmap-perf-improvements' · 78db77fa
      Daniel Borkmann authored
      Björn Töpel says:
      
      ====================
      This set consists of three patches from Maciej and myself which are
      optimizing the XSKMAP lookups.  In the first patch, the sockets are
      moved to be stored at the tail of the struct xsk_map. The second
      patch, Maciej implements map_gen_lookup() for XSKMAP. The third patch,
      introduced in this revision, moves various XSKMAP functions, to permit
      the compiler to do more aggressive inlining.
      
      Based on the XDP program from tools/lib/bpf/xsk.c where
      bpf_map_lookup_elem() is explicitly called, this work yields a 5%
      improvement for xdpsock's rxdrop scenario. The last patch yields 2%
      improvement.
      
      Jonathan's Acked-by: for patch 1 and 2 was carried on. Note that the
      overflow checks are done in the bpf_map_area_alloc() and
      bpf_map_charge_init() functions, which was fixed in commit
      ff1c08e1 ("bpf: Change size to u64 for bpf_map_{area_alloc,
      charge_init}()").
      
        [1] https://patchwork.ozlabs.org/patch/1186170/
      
      
      
      v1->v2: * Change size/cost to size_t and use {struct, array}_size
                where appropriate. (Jakub)
      v2->v3: * Proper commit message for patch 2.
      v3->v4: * Change size_t to u64 to handle 32-bit overflows. (Jakub)
              * Introduced patch 3.
      v4->v5: * Use BPF_SIZEOF size, instead of BPF_DW, for correct
                pointer-sized loads. (Daniel)
      ====================
      
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      78db77fa
    • Björn Töpel's avatar
      xsk: Restructure/inline XSKMAP lookup/redirect/flush · d817991c
      Björn Töpel authored
      
      In this commit the XSKMAP entry lookup function used by the XDP
      redirect code is moved from the xskmap.c file to the xdp_sock.h
      header, so the lookup can be inlined from, e.g., the
      bpf_xdp_redirect_map() function.
      
      Further the __xsk_map_redirect() and __xsk_map_flush() is moved to the
      xsk.c, which lets the compiler inline the xsk_rcv() and xsk_flush()
      functions.
      
      Finally, all the XDP socket functions were moved from linux/bpf.h to
      net/xdp_sock.h, where most of the XDP sockets functions are anyway.
      
      This yields a ~2% performance boost for the xdpsock "rx_drop"
      scenario.
      
      Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Link: https://lore.kernel.org/bpf/20191101110346.15004-4-bjorn.topel@gmail.com
      d817991c
    • Maciej Fijalkowski's avatar
      bpf: Implement map_gen_lookup() callback for XSKMAP · e65650f2
      Maciej Fijalkowski authored
      
      Inline the xsk_map_lookup_elem() via implementing the map_gen_lookup()
      callback. This results in emitting the bpf instructions in place of
      bpf_map_lookup_elem() helper call and better performance of bpf
      programs.
      
      Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
      Link: https://lore.kernel.org/bpf/20191101110346.15004-3-bjorn.topel@gmail.com
      e65650f2
    • Björn Töpel's avatar
      xsk: Store struct xdp_sock as a flexible array member of the XSKMAP · 64fe8c06
      Björn Töpel authored
      
      Prior this commit, the array storing XDP socket instances were stored
      in a separate allocated array of the XSKMAP. Now, we store the sockets
      as a flexible array member in a similar fashion as the arraymap. Doing
      so, we do less pointer chasing in the lookup.
      
      Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
      Link: https://lore.kernel.org/bpf/20191101110346.15004-2-bjorn.topel@gmail.com
      64fe8c06
    • Linus Torvalds's avatar
      Merge branch 'parisc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 31408fbe
      Linus Torvalds authored
      Pull parisc fix from Helge Deller:
       "Fix a parisc kernel crash with ftrace functions when compiled without
        frame pointers"
      
      * 'parisc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: fix frame pointer in ftrace_regs_caller()
      31408fbe