1. 02 Nov, 2013 1 commit
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec · 2e19ef02
      David S. Miller authored
      Steffen Klassert says:
      
      ====================
      1) Fix a possible race on ipcomp scratch buffers because
         of too early enabled siftirqs. From Michal Kubecek.
      
      2) The current xfrm garbage collector threshold is too small
         for some workloads, resulting in bad performance on these
         workloads. Increase the threshold from 1024 to 32768.
      
      3) Some codepaths might not have a dst_entry attached to the
         skb when calling xfrm_decode_session(). So add a check
         to prevent a null pointer dereference in this case.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2e19ef02
  2. 01 Nov, 2013 1 commit
  3. 30 Oct, 2013 5 commits
    • Masanari Iida's avatar
      doc:net: Fix typo in Documentation/networking · c17cb8b5
      Masanari Iida authored
      Correct spelling typo in Documentation/networking
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c17cb8b5
    • Nathan Hintz's avatar
      bgmac: don't update slot on skb alloc/dma mapping error · b757a62e
      Nathan Hintz authored
      Don't update the slot in "bgmac_dma_rx_skb_for_slot" unless both the
      skb alloc and dma mapping are successful; and free the newly allocated
      skb if a dma mapping error occurs.  This relieves the caller of the need
      to deduce/execute the appropriate cleanup action required when an error
      occurs.
      Signed-off-by: default avatarNathan Hintz <nlhintz@hotmail.com>
      Acked-by: default avatarRafał Miłecki <zajec5@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b757a62e
    • Alistair Popple's avatar
      ibm emac: Fix locking for enable/disable eob irq · 32663b8b
      Alistair Popple authored
      Calls to mal_enable_eob_irq perform a read-write-modify of a dcr to
      enable device irqs which is protected by a spin lock. However calls to
      mal_disable_eob_irq do not take the corresponding lock.
      
      This patch resolves the problem by ensuring that calls to
      mal_disable_eob_irq also take the lock.
      Signed-off-by: default avatarAlistair Popple <alistair@popple.id.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32663b8b
    • Alistair Popple's avatar
      ibm emac: Don't call napi_complete if napi_reschedule failed · b4dfd326
      Alistair Popple authored
      This patch fixes a bug which would trigger the BUG_ON() at
      net/core/dev.c:4156. It was found that this was due to continuing
      processing in the current poll call even when the call to
      napi_reschedule failed, indicating the device was already on the
      polling list. This resulted in an extra call to napi_complete which
      triggered the BUG_ON().
      
      This patch ensures that we only contine processing rotting packets in
      the current mal_poll call if we are not already on the polling list.
      Signed-off-by: default avatarAlistair Popple <alistair@popple.id.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b4dfd326
    • Jason Wang's avatar
      virtio-net: correctly handle cpu hotplug notifier during resuming · ec9debbd
      Jason Wang authored
      commit 3ab098df (virtio-net: don't respond to
      cpu hotplug notifier if we're not ready) tries to bypass the cpu hotplug
      notifier by checking the config_enable and does nothing is it was false. So it
      need to try to hold the config_lock mutex which may happen in atomic
      environment which leads the following warnings:
      
      [  622.944441] CPU0 attaching NULL sched-domain.
      [  622.944446] CPU1 attaching NULL sched-domain.
      [  622.944485] CPU0 attaching NULL sched-domain.
      [  622.950795] BUG: sleeping function called from invalid context at kernel/mutex.c:616
      [  622.950796] in_atomic(): 1, irqs_disabled(): 1, pid: 10, name: migration/1
      [  622.950796] no locks held by migration/1/10.
      [  622.950798] CPU: 1 PID: 10 Comm: migration/1 Not tainted 3.12.0-rc5-wl-01249-gb91e82d #317
      [  622.950799] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  622.950802]  0000000000000000 ffff88001d42dba0 ffffffff81a32f22 ffff88001bfb9c70
      [  622.950803]  ffff88001d42dbb0 ffffffff810edb02 ffff88001d42dc38 ffffffff81a396ed
      [  622.950805]  0000000000000046 ffff88001d42dbe8 ffffffff810e861d 0000000000000000
      [  622.950805] Call Trace:
      [  622.950810]  [<ffffffff81a32f22>] dump_stack+0x54/0x74
      [  622.950815]  [<ffffffff810edb02>] __might_sleep+0x112/0x114
      [  622.950817]  [<ffffffff81a396ed>] mutex_lock_nested+0x3c/0x3c6
      [  622.950818]  [<ffffffff810e861d>] ? up+0x39/0x3e
      [  622.950821]  [<ffffffff8153ea7c>] ? acpi_os_signal_semaphore+0x21/0x2d
      [  622.950824]  [<ffffffff81565ed1>] ? acpi_ut_release_mutex+0x5e/0x62
      [  622.950828]  [<ffffffff816d04ec>] virtnet_cpu_callback+0x33/0x87
      [  622.950830]  [<ffffffff81a42576>] notifier_call_chain+0x3c/0x5e
      [  622.950832]  [<ffffffff810e86a8>] __raw_notifier_call_chain+0xe/0x10
      [  622.950835]  [<ffffffff810c5556>] __cpu_notify+0x20/0x37
      [  622.950836]  [<ffffffff810c5580>] cpu_notify+0x13/0x15
      [  622.950838]  [<ffffffff81a237cd>] take_cpu_down+0x27/0x3a
      [  622.950841]  [<ffffffff81136289>] stop_machine_cpu_stop+0x93/0xf1
      [  622.950842]  [<ffffffff81136167>] cpu_stopper_thread+0xa0/0x12f
      [  622.950844]  [<ffffffff811361f6>] ? cpu_stopper_thread+0x12f/0x12f
      [  622.950847]  [<ffffffff81119710>] ? lock_release_holdtime.part.7+0xa3/0xa8
      [  622.950848]  [<ffffffff81135e4b>] ? cpu_stop_should_run+0x3f/0x47
      [  622.950850]  [<ffffffff810ea9b0>] smpboot_thread_fn+0x1c5/0x1e3
      [  622.950852]  [<ffffffff810ea7eb>] ? lg_global_unlock+0x67/0x67
      [  622.950854]  [<ffffffff810e36b7>] kthread+0xd8/0xe0
      [  622.950857]  [<ffffffff81a3bfad>] ? wait_for_common+0x12f/0x164
      [  622.950859]  [<ffffffff810e35df>] ? kthread_create_on_node+0x124/0x124
      [  622.950861]  [<ffffffff81a45ffc>] ret_from_fork+0x7c/0xb0
      [  622.950862]  [<ffffffff810e35df>] ? kthread_create_on_node+0x124/0x124
      [  622.950876] smpboot: CPU 1 is now offline
      [  623.194556] SMP alternatives: lockdep: fixing up alternatives
      [  623.194559] smpboot: Booting Node 0 Processor 1 APIC 0x1
      ...
      
      A correct fix is to unregister the hotcpu notifier during restore and register a
      new one in resume.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Cc: Wanlong Gao <gaowanlong@cn.fujitsu.com>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ec9debbd
  4. 29 Oct, 2013 10 commits
  5. 28 Oct, 2013 2 commits
  6. 27 Oct, 2013 5 commits
  7. 26 Oct, 2013 3 commits
  8. 25 Oct, 2013 7 commits
  9. 23 Oct, 2013 6 commits