1. 24 Mar, 2015 9 commits
    • Herbert Xu's avatar
      netlink: Use default rhashtable hashfn · 11b58ba1
      Herbert Xu authored
      This patch removes the explicit jhash value for the hashfn parameter
      of rhashtable.  As the key length is a multiple of 4, this means that
      we will actually end up using jhash2.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11b58ba1
    • Herbert Xu's avatar
      rhashtable: Allow hashfn to be unset · 31ccde2d
      Herbert Xu authored
      Since every current rhashtable user uses jhash as their hash
      function, the fact that jhash is an inline function causes each
      user to generate a copy of its code.
      
      This function provides a solution to this problem by allowing
      hashfn to be unset.  In which case rhashtable will automatically
      set it to jhash.  Furthermore, if the key length is a multiple
      of 4, we will switch over to jhash2.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      31ccde2d
    • Herbert Xu's avatar
      rhashtable: Eliminate unnecessary branch in rht_key_hashfn · de91b25c
      Herbert Xu authored
      When rht_key_hashfn is called from rhashtable itself and params
      is equal to ht->p, there is no point in checking params.key_len
      and falling back to ht->p.key_len.
      
      For some reason gcc couldn't figure out that params is the same
      as ht->p.  So let's help it by only checking params.key_len when
      it's a constant.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      de91b25c
    • Herbert Xu's avatar
      rhashtable: Add barrier to ensure we see new tables in walker · d88252f9
      Herbert Xu authored
      The walker is a lockless reader so it too needs an smp_rmb before
      reading the future_tbl field in order to see any new tables that
      may contain elements that we should have walked over.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d88252f9
    • David S. Miller's avatar
      Merge tag 'linux-can-next-for-4.1-20150323' of... · e167359b
      David S. Miller authored
      Merge tag 'linux-can-next-for-4.1-20150323' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2015-03-23
      
      this is a pull request of 6 patches for net-next/master.
      
      A patch by Florian Westphal, converts the skb->destructor to use
      sock_efree() instead of own destructor. Ahmed S. Darwish's patch
      converts the kvaser_usb driver to use unregister_candev(). A patch by
      me removes a return from a void function in the m_can driver. Yegor
      Yefremov contributes a patch for combined rx/tx LED trigger support. A
      sparse warning in the esd_usb2 driver was fixes by Thomas Körper. Ben
      Dooks converts the at91_can driver to use endian agnostic IO accessors.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e167359b
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 40451fd0
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for net-next.
      Basically, more incremental updates for br_netfilter from Florian
      Westphal, small nf_tables updates (including one fix for rb-tree
      locking) and small two-liner to add extra validation for the REJECT6
      target.
      
      More specifically, they are:
      
      1) Use the conntrack status flags from br_netfilter to know that DNAT is
         happening. Patch for Florian Westphal.
      
      2) nf_bridge->physoutdev == NULL already indicates that the traffic is
         bridged, so let's get rid of the BRNF_BRIDGED flag. Also from Florian.
      
      3) Another patch to prepare voidization of seq_printf/seq_puts/seq_putc,
         from Joe Perches.
      
      4) Consolidation of nf_tables_newtable() error path.
      
      5) Kill nf_bridge_pad used by br_netfilter from ip_fragment(),
         from Florian Westphal.
      
      6) Access rb-tree root node inside the lock and remove unnecessary
         locking from the get path (we already hold nfnl_lock there), from
         Patrick McHardy.
      
      7) You cannot use a NFT_SET_ELEM_INTERVAL_END when the set doesn't
         support interval, also from Patrick.
      
      8) Enforce IP6T_F_PROTO from ip6t_REJECT to make sure the core is
         actually restricting matches to TCP.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      40451fd0
    • Alexander Drozdov's avatar
      af_packet: pass checksum validation status to the user · 682f048b
      Alexander Drozdov authored
      Introduce TP_STATUS_CSUM_VALID tp_status flag to tell the
      af_packet user that at least the transport header checksum
      has been already validated.
      
      For now, the flag may be set for incoming packets only.
      Signed-off-by: default avatarAlexander Drozdov <al.drozdov@gmail.com>
      Cc: Willem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      682f048b
    • Alexander Drozdov's avatar
      af_packet: make tpacket_rcv to not set status value before run_filter · 68c2e5de
      Alexander Drozdov authored
      It is just an optimization. We don't need the value of status variable
      if the packet is filtered.
      Signed-off-by: default avatarAlexander Drozdov <al.drozdov@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      68c2e5de
    • Fan Du's avatar
      inet: fix double request socket freeing · c6973669
      Fan Du authored
      Eric Hugne reported following error :
      
      I'm hitting this warning on latest net-next when i try to SSH into a machine
      with eth0 added to a bridge (but i think the problem is older than that)
      
      Steps to reproduce:
      node2 ~ # brctl addif br0 eth0
      [  223.758785] device eth0 entered promiscuous mode
      node2 ~ # ip link set br0 up
      [  244.503614] br0: port 1(eth0) entered forwarding state
      [  244.505108] br0: port 1(eth0) entered forwarding state
      node2 ~ # [  251.160159] ------------[ cut here ]------------
      [  251.160831] WARNING: CPU: 0 PID: 3 at include/net/request_sock.h:102 tcp_v4_err+0x6b1/0x720()
      [  251.162077] Modules linked in:
      [  251.162496] CPU: 0 PID: 3 Comm: ksoftirqd/0 Not tainted 4.0.0-rc3+ #18
      [  251.163334] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  251.164078]  ffffffff81a8365c ffff880038a6ba18 ffffffff8162ace4 0000000000009898
      [  251.165084]  0000000000000000 ffff880038a6ba58 ffffffff8104da85 ffff88003fa437c0
      [  251.166195]  ffff88003fa437c0 ffff88003fa74e00 ffff88003fa43bb8 ffff88003fad99a0
      [  251.167203] Call Trace:
      [  251.167533]  [<ffffffff8162ace4>] dump_stack+0x45/0x57
      [  251.168206]  [<ffffffff8104da85>] warn_slowpath_common+0x85/0xc0
      [  251.169239]  [<ffffffff8104db65>] warn_slowpath_null+0x15/0x20
      [  251.170271]  [<ffffffff81559d51>] tcp_v4_err+0x6b1/0x720
      [  251.171408]  [<ffffffff81630d03>] ? _raw_read_lock_irq+0x3/0x10
      [  251.172589]  [<ffffffff81534e20>] ? inet_del_offload+0x40/0x40
      [  251.173366]  [<ffffffff81569295>] icmp_socket_deliver+0x65/0xb0
      [  251.174134]  [<ffffffff815693a2>] icmp_unreach+0xc2/0x280
      [  251.174820]  [<ffffffff8156a82d>] icmp_rcv+0x2bd/0x3a0
      [  251.175473]  [<ffffffff81534ea2>] ip_local_deliver_finish+0x82/0x1e0
      [  251.176282]  [<ffffffff815354d8>] ip_local_deliver+0x88/0x90
      [  251.177004]  [<ffffffff815350f0>] ip_rcv_finish+0xf0/0x310
      [  251.177693]  [<ffffffff815357bc>] ip_rcv+0x2dc/0x390
      [  251.178336]  [<ffffffff814f5da3>] __netif_receive_skb_core+0x713/0xa20
      [  251.179170]  [<ffffffff814f7fca>] __netif_receive_skb+0x1a/0x80
      [  251.179922]  [<ffffffff814f97d4>] process_backlog+0x94/0x120
      [  251.180639]  [<ffffffff814f9612>] net_rx_action+0x1e2/0x310
      [  251.181356]  [<ffffffff81051267>] __do_softirq+0xa7/0x290
      [  251.182046]  [<ffffffff81051469>] run_ksoftirqd+0x19/0x30
      [  251.182726]  [<ffffffff8106cc23>] smpboot_thread_fn+0x153/0x1d0
      [  251.183485]  [<ffffffff8106cad0>] ? SyS_setgroups+0x130/0x130
      [  251.184228]  [<ffffffff8106935e>] kthread+0xee/0x110
      [  251.184871]  [<ffffffff81069270>] ? kthread_create_on_node+0x1b0/0x1b0
      [  251.185690]  [<ffffffff81631108>] ret_from_fork+0x58/0x90
      [  251.186385]  [<ffffffff81069270>] ? kthread_create_on_node+0x1b0/0x1b0
      [  251.187216] ---[ end trace c947fc7b24e42ea1 ]---
      [  259.542268] br0: port 1(eth0) entered forwarding state
      
      Remove the double calls to reqsk_put()
      
      [edumazet] :
      
      I got confused because reqsk_timer_handler() _has_ to call
      reqsk_put(req) after calling inet_csk_reqsk_queue_drop(), as
      the timer handler holds a reference on req.
      Signed-off-by: default avatarFan Du <fan.du@intel.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarErik Hugne <erik.hugne@ericsson.com>
      Fixes: fa76ce73 ("inet: get rid of central tcp/dccp listener timer")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c6973669
  2. 23 Mar, 2015 26 commits
  3. 22 Mar, 2015 5 commits