1. 22 Mar, 2011 29 commits
    • Venkateswararao Jujjuri (JV)'s avatar
    • Venkateswararao Jujjuri (JV)'s avatar
      [net/9p] Set the condition just before waking up. · a01a9840
      Venkateswararao Jujjuri (JV) authored
      Given that the sprious wake-ups are common, we need to move the
      condition setting right next to the wake_up().  After setting the condition
      to req->status = REQ_STATUS_RCVD, sprious wakeups may cause the
      virtqueue back on the free list for someone else to use.
      This may result in kernel panic while relasing the pinned pages
      in p9_release_req_pages().
      
      Also rearranged the while loop in req_done() for better redability.
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      a01a9840
    • Venkateswararao Jujjuri (JV)'s avatar
      [net/9p] unconditional wake_up to proc waiting for space on VirtIO ring · 53bda3e5
      Venkateswararao Jujjuri (JV) authored
      Process may wait to get space on VirtIO ring to send a transaction to
      VirtFS server. Current code just does a conditional wake_up() which
      means only one process will be woken up even if multiple processes
      are waiting.
      
      This fix makes the wake_up unconditional. Hence we won't have any
      processes waiting for-ever.
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      53bda3e5
    • Aneesh Kumar K.V's avatar
      fs/9p: Add v9fs_dentry2v9ses · 42869c8a
      Aneesh Kumar K.V authored
      Add the new static inline and use the same
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      42869c8a
    • Aneesh Kumar K.V's avatar
      fs/9p: Attach writeback_fid on first open with WR flag · 7add697a
      Aneesh Kumar K.V authored
      We don't need writeback fid if we are only doing O_RDONLY open
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      7add697a
    • Aneesh Kumar K.V's avatar
      fs/9p: Open writeback fid in O_SYNC mode · ea59bb75
      Aneesh Kumar K.V authored
      Older version of protocol don't support tsyncfs operation.
      So for them force a O_SYNC flag on the server
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      ea59bb75
    • Aneesh Kumar K.V's avatar
      fs/9p: Use truncate_setsize instead of vmtruncate · 059c138b
      Aneesh Kumar K.V authored
      convert vmtruncate usage to truncate_setsize. We also writeback
      all dirty pages before doing 9p operations and on success call truncate_setsize.
      This ensure that we continue sanely on failed truncate on the server. The
      disadvantage is that we are now going to write back the content that get
      thrown away later as a part of truncate.
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      059c138b
    • Aneesh Kumar K.V's avatar
    • Aneesh Kumar K.V's avatar
      net/9p: Convert the in the 9p rpc call path to GFP_NOFS · eeff66ef
      Aneesh Kumar K.V authored
      Without this we can cause reclaim allocation in writepage.
      
      [ 3433.448430] =================================
      [ 3433.449117] [ INFO: inconsistent lock state ]
      [ 3433.449117] 2.6.38-rc5+ #84
      [ 3433.449117] ---------------------------------
      [ 3433.449117] inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-R} usage.
      [ 3433.449117] kswapd0/505 [HC0[0]:SC0[0]:HE1:SE1] takes:
      [ 3433.449117]  (iprune_sem){+++++-}, at: [<ffffffff810ebbab>] shrink_icache_memory+0x45/0x2b1
      [ 3433.449117] {RECLAIM_FS-ON-W} state was registered at:
      [ 3433.449117]   [<ffffffff8107fe5f>] mark_held_locks+0x52/0x70
      [ 3433.449117]   [<ffffffff8107ff02>] lockdep_trace_alloc+0x85/0x9f
      [ 3433.449117]   [<ffffffff810d353d>] slab_pre_alloc_hook+0x18/0x3c
      [ 3433.449117]   [<ffffffff810d3fd5>] kmem_cache_alloc+0x23/0xa2
      [ 3433.449117]   [<ffffffff8127be77>] idr_pre_get+0x2d/0x6f
      [ 3433.449117]   [<ffffffff815434eb>] p9_idpool_get+0x30/0xae
      [ 3433.449117]   [<ffffffff81540123>] p9_client_rpc+0xd7/0x9b0
      [ 3433.449117]   [<ffffffff815427b0>] p9_client_clunk+0x88/0xdb
      [ 3433.449117]   [<ffffffff811d56e5>] v9fs_evict_inode+0x3c/0x48
      [ 3433.449117]   [<ffffffff810eb511>] evict+0x1f/0x87
      [ 3433.449117]   [<ffffffff810eb5c0>] dispose_list+0x47/0xe3
      [ 3433.449117]   [<ffffffff810eb8da>] evict_inodes+0x138/0x14f
      [ 3433.449117]   [<ffffffff810d90e2>] generic_shutdown_super+0x57/0xe8
      [ 3433.449117]   [<ffffffff810d91e8>] kill_anon_super+0x11/0x50
      [ 3433.449117]   [<ffffffff811d4951>] v9fs_kill_super+0x49/0xab
      [ 3433.449117]   [<ffffffff810d926e>] deactivate_locked_super+0x21/0x46
      [ 3433.449117]   [<ffffffff810d9e84>] deactivate_super+0x40/0x44
      [ 3433.449117]   [<ffffffff810ef848>] mntput_no_expire+0x100/0x109
      [ 3433.449117]   [<ffffffff810f0aeb>] sys_umount+0x2f1/0x31c
      [ 3433.449117]   [<ffffffff8102c87b>] system_call_fastpath+0x16/0x1b
      [ 3433.449117] irq event stamp: 192941
      [ 3433.449117] hardirqs last  enabled at (192941): [<ffffffff81568dcf>] _raw_spin_unlock_irq+0x2b/0x30
      [ 3433.449117] hardirqs last disabled at (192940): [<ffffffff810b5f97>] shrink_inactive_list+0x290/0x2f5
      [ 3433.449117] softirqs last  enabled at (188470): [<ffffffff8105fd65>] __do_softirq+0x133/0x152
      [ 3433.449117] softirqs last disabled at (188455): [<ffffffff8102d7cc>] call_softirq+0x1c/0x28
      [ 3433.449117]
      [ 3433.449117] other info that might help us debug this:
      [ 3433.449117] 1 lock held by kswapd0/505:
      [ 3433.449117]  #0:  (shrinker_rwsem){++++..}, at: [<ffffffff810b52e2>] shrink_slab+0x38/0x15f
      [ 3433.449117]
      [ 3433.449117] stack backtrace:
      [ 3433.449117] Pid: 505, comm: kswapd0 Not tainted 2.6.38-rc5+ #84
      [ 3433.449117] Call Trace:
      [ 3433.449117]  [<ffffffff8107fbce>] ? valid_state+0x17e/0x191
      [ 3433.449117]  [<ffffffff81036896>] ? save_stack_trace+0x28/0x45
      [ 3433.449117]  [<ffffffff81080426>] ? check_usage_forwards+0x0/0x87
      [ 3433.449117]  [<ffffffff8107fcf4>] ? mark_lock+0x113/0x22c
      [ 3433.449117]  [<ffffffff8108105f>] ? __lock_acquire+0x37a/0xcf7
      [ 3433.449117]  [<ffffffff8107fc0e>] ? mark_lock+0x2d/0x22c
      [ 3433.449117]  [<ffffffff81081077>] ? __lock_acquire+0x392/0xcf7
      [ 3433.449117]  [<ffffffff810b14d2>] ? determine_dirtyable_memory+0x15/0x28
      [ 3433.449117]  [<ffffffff81081a33>] ? lock_acquire+0x57/0x6d
      [ 3433.449117]  [<ffffffff810ebbab>] ? shrink_icache_memory+0x45/0x2b1
      [ 3433.449117]  [<ffffffff81567d85>] ? down_read+0x47/0x5c
      [ 3433.449117]  [<ffffffff810ebbab>] ? shrink_icache_memory+0x45/0x2b1
      [ 3433.449117]  [<ffffffff810ebbab>] ? shrink_icache_memory+0x45/0x2b1
      [ 3433.449117]  [<ffffffff810b5385>] ? shrink_slab+0xdb/0x15f
      [ 3433.449117]  [<ffffffff810b69bc>] ? kswapd+0x574/0x96a
      [ 3433.449117]  [<ffffffff810b6448>] ? kswapd+0x0/0x96a
      [ 3433.449117]  [<ffffffff810714e2>] ? kthread+0x7d/0x85
      [ 3433.449117]  [<ffffffff8102d6d4>] ? kernel_thread_helper+0x4/0x10
      [ 3433.449117]  [<ffffffff81569200>] ? restore_args+0x0/0x30
      [ 3433.449117]  [<ffffffff81071465>] ? kthread+0x0/0x85
      [ 3433.449117]  [<ffffffff8102d6d0>] ? kernel_thread_helper+0x0/0x10
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      eeff66ef
    • Aneesh Kumar K.V's avatar
      fs/9p: Fix race in initializing writeback fid · 5a7e0a8c
      Aneesh Kumar K.V authored
      When two process open the same file we can end up with both of them
      allocating the writeback_fid. Add a new mutex which can be used
      for synchronizing v9fs_inode member values.
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      5a7e0a8c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · f741a79e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: make fuse_dentry_revalidate() RCU aware
        fuse: make fuse_permission() RCU aware
        fuse: wakeup pollers on connection release/abort
        fuse: reduce size of struct fuse_request
      f741a79e
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 73d5a867
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        xen: update mask_rw_pte after kernel page tables init changes
        xen: set max_pfn_mapped to the last pfn mapped
        x86: Cleanup highmap after brk is concluded
      
      Fix up trivial onflict (added header file includes) in
      arch/x86/mm/init_64.c
      73d5a867
    • Linus Torvalds's avatar
      Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux · e77277df
      Linus Torvalds authored
      * 'next-samsung' of git://git.fluff.org/bjdooks/linux:
        ARM: H1940/RX1950: Change default LED triggers
        ARM: S3C2442: RX1950: Add support for LED blinking
        ARM: S3C2442: RX1950: Retain LEDs state in suspend
        ARM: S3C2410: H1940: Fix lcd_power_set function
        ARM: S3C2410: H1940: Add battery support
        ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing
        ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again
        ARM: S3C2410: H1940: Add keys device
      e77277df
    • Linus Torvalds's avatar
      Merge branch 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux · 75ea6358
      Linus Torvalds authored
      * 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux:
        i2c-pxa2xx: Don't clear isr bits too early
        i2c-pxa2xx: Fix register offsets
        i2c-pxa2xx: pass of_node from platform driver to adapter and publish
        i2c-pxa2xx: check timeout correctly
        i2c-pxa2xx: add support for shared IRQ handler
        i2c-pxa2xx: Add PCI support for PXA I2C controller
        ARM: pxa2xx: reorganize I2C files
        i2c-pxa2xx: use dynamic register layout
        i2c-mxs: set controller to pio queue mode after reset
        i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH
        i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter
      75ea6358
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 14577beb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case
        slab,rcu: don't assume the size of struct rcu_head
        slub,rcu: don't assume the size of struct rcu_head
        slub: automatically reserve bytes at the end of slab
        Lockless (and preemptless) fastpaths for slub
        slub: Get rid of slab_free_hook_irq()
        slub: min_partial needs to be in first cacheline
        slub: fix ksize() build error
        slub: fix kmemcheck calls to match ksize() hints
        Revert "slab: Fix missing DEBUG_SLAB last user"
        mm: Remove support for kmem_cache_name()
      14577beb
    • Martin K. Petersen's avatar
      sd: Fail discard requests when logical block provisioning has been disabled · 09b9cc44
      Martin K. Petersen authored
      Ensure that we kill discard requests after logical block provisioning
      has been disabled in sysfs.
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      09b9cc44
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c62b3898
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
        IPVS: Use global mutex in ip_vs_app.c
        ipvs: fix a typo in __ip_vs_control_init()
        veth: Fix the byte counters
        net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries.
        macvlan: Fix use after free of struct macvlan_port.
        net: fix incorrect spelling in drop monitor protocol
        can: c_can: Do basic c_can configuration _before_ enabling the interrupts
        net/appletalk: fix atalk_release use after free
        ipx: fix ipx_release()
        snmp: SNMP_UPD_PO_STATS_BH() always called from softirq
        l2tp: fix possible oops on l2tp_eth module unload
        xfrm: Fix initialize repl field of struct xfrm_state
        netfilter: ipt_CLUSTERIP: fix buffer overflow
        netfilter: xtables: fix reentrancy
        netfilter: ipset: fix checking the type revision at create command
        netfilter: ipset: fix address ranges at hash:*port* types
        niu: Rename NIU parent platform device name to fix conflict.
        r8169: fix a bug in rtl8169_init_phy()
        bonding: fix a typo in a comment
        ftmac100: use resource_size()
        ...
      c62b3898
    • Simon Horman's avatar
      IPVS: Use global mutex in ip_vs_app.c · 736561a0
      Simon Horman authored
      As part of the work to make IPVS network namespace aware
      __ip_vs_app_mutex was replaced by a per-namespace lock,
      ipvs->app_mutex. ipvs->app_key is also supplied for debugging purposes.
      
      Unfortunately this implementation results in ipvs->app_key residing
      in non-static storage which at the very least causes a lockdep warning.
      
      This patch takes the rather heavy-handed approach of reinstating
      __ip_vs_app_mutex which will cover access to the ipvs->list_head
      of all network namespaces.
      
      [   12.610000] IPVS: Creating netns size=2456 id=0
      [   12.630000] IPVS: Registered protocols (TCP, UDP, SCTP, AH, ESP)
      [   12.640000] BUG: key ffff880003bbf1a0 not in .data!
      [   12.640000] ------------[ cut here ]------------
      [   12.640000] WARNING: at kernel/lockdep.c:2701 lockdep_init_map+0x37b/0x570()
      [   12.640000] Hardware name: Bochs
      [   12.640000] Pid: 1, comm: swapper Tainted: G        W 2.6.38-kexec-06330-g69b7efe-dirty #122
      [   12.650000] Call Trace:
      [   12.650000]  [<ffffffff8102e685>] warn_slowpath_common+0x75/0xb0
      [   12.650000]  [<ffffffff8102e6d5>] warn_slowpath_null+0x15/0x20
      [   12.650000]  [<ffffffff8105967b>] lockdep_init_map+0x37b/0x570
      [   12.650000]  [<ffffffff8105829d>] ? trace_hardirqs_on+0xd/0x10
      [   12.650000]  [<ffffffff81055ad8>] debug_mutex_init+0x38/0x50
      [   12.650000]  [<ffffffff8104bc4c>] __mutex_init+0x5c/0x70
      [   12.650000]  [<ffffffff81685ee7>] __ip_vs_app_init+0x64/0x86
      [   12.660000]  [<ffffffff81685a3b>] ? ip_vs_init+0x0/0xff
      [   12.660000]  [<ffffffff811b1c33>] T.620+0x43/0x170
      [   12.660000]  [<ffffffff811b1e9a>] ? register_pernet_subsys+0x1a/0x40
      [   12.660000]  [<ffffffff81685a3b>] ? ip_vs_init+0x0/0xff
      [   12.660000]  [<ffffffff81685a3b>] ? ip_vs_init+0x0/0xff
      [   12.660000]  [<ffffffff811b1db7>] register_pernet_operations+0x57/0xb0
      [   12.660000]  [<ffffffff81685a3b>] ? ip_vs_init+0x0/0xff
      [   12.670000]  [<ffffffff811b1ea9>] register_pernet_subsys+0x29/0x40
      [   12.670000]  [<ffffffff81685f19>] ip_vs_app_init+0x10/0x12
      [   12.670000]  [<ffffffff81685a87>] ip_vs_init+0x4c/0xff
      [   12.670000]  [<ffffffff8166562c>] do_one_initcall+0x7a/0x12e
      [   12.670000]  [<ffffffff8166583e>] kernel_init+0x13e/0x1c2
      [   12.670000]  [<ffffffff8128c134>] kernel_thread_helper+0x4/0x10
      [   12.670000]  [<ffffffff8128ad40>] ? restore_args+0x0/0x30
      [   12.680000]  [<ffffffff81665700>] ? kernel_init+0x0/0x1c2
      [   12.680000]  [<ffffffff8128c130>] ? kernel_thread_helper+0x0/0x1global0
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Eric Dumazet <eric.dumazet@gmail.com>
      Cc: Julian Anastasov <ja@ssi.bg>
      Cc: Hans Schillstrom <hans@schillstrom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      736561a0
    • Eric Dumazet's avatar
      ipvs: fix a typo in __ip_vs_control_init() · f40f94fc
      Eric Dumazet authored
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Cc: Simon Horman <horms@verge.net.au>
      Cc: Julian Anastasov <ja@ssi.bg>
      Acked-by: default avatarSimon Horman <horms@verge.net.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f40f94fc
    • Eric W. Biederman's avatar
      veth: Fix the byte counters · 675071a2
      Eric W. Biederman authored
      Commit 44540960 "veth: move loopback logic to common location" introduced
      a bug in the packet counters.  I don't understand why that happened as it
      is not explained in the comments and the mut check in dev_forward_skb
      retains the assumption that skb->len is the total length of the packet.
      
      I just measured this emperically by setting up a veth pair between two
      noop network namespaces setting and attempting a telnet connection between
      the two.  I saw three packets in each direction and the byte counters were
      exactly 14*3 = 42 bytes high in each direction.  I got the actual
      packet lengths with tcpdump.
      
      So remove the extra ETH_HLEN from the veth byte count totals.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      675071a2
    • Eric W. Biederman's avatar
      net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries. · 9d2a8fa9
      Eric W. Biederman authored
      When I was fixing issues with unregisgtering tables under /proc/sys/net/ipv6/neigh
      by adding a mount point it appears I missed a critical ordering issue, in the
      ipv6 initialization.  I had not realized that ipv6_sysctl_register is called
      at the very end of the ipv6 initialization and in particular after we call
      neigh_sysctl_register from ndisc_init.
      
      "neigh" needs to be initialized in ipv6_static_sysctl_register which is
      the first ipv6 table to initialized, and definitely before ndisc_init.
      This removes the weirdness of duplicate tables while still providing a
      "neigh" mount point which prevents races in sysctl unregistering.
      
      This was initially reported at https://bugzilla.kernel.org/show_bug.cgi?id=31232
      Reported-by: sunkan@zappa.cx
      Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9d2a8fa9
    • Eric W. Biederman's avatar
      macvlan: Fix use after free of struct macvlan_port. · d5cd9244
      Eric W. Biederman authored
      When the macvlan driver was extended to call unregisgter_netdevice_queue
      in 23289a37, a use after free of struct
      macvlan_port was introduced.  The code in dellink relied on unregister_netdevice
      actually unregistering the net device so it would be safe to free macvlan_port.
      
      Since unregister_netdevice_queue can just queue up the unregister instead of
      performing the unregiser immediately we free the macvlan_port too soon and
      then the code in macvlan_stop removes the macaddress for the set of macaddress
      to listen for and uses memory that has already been freed.
      
      To fix this add a reference count to track when it is safe to free the macvlan_port
      and move the call of macvlan_port_destroy into macvlan_uninit which is guaranteed
      to be called after the final macvlan_port_close.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d5cd9244
    • Neil Horman's avatar
      net: fix incorrect spelling in drop monitor protocol · ac0a121d
      Neil Horman authored
      It was pointed out to me recently that my spelling could be better :)
      Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac0a121d
    • Jan Altenberg's avatar
      can: c_can: Do basic c_can configuration _before_ enabling the interrupts · 4f2d56c4
      Jan Altenberg authored
      I ran into some trouble while testing the SocketCAN driver for the BOSCH
      C_CAN controller. The interface is not correctly initialized, if I put
      some CAN traffic on the line, _while_ the interface is being started
      (which means: the interface doesn't come up correcty, if there's some RX
      traffic while doing 'ifconfig can0 up').
      
      The current implementation enables the controller interrupts _before_
      doing the basic c_can configuration. I think, this should be done the
      other way round.
      
      The patch below fixes things for me.
      Signed-off-by: default avatarJan Altenberg <jan@linutronix.de>
      Acked-by: default avatarKurt Van Dijck <kurt.van.dijck@eia.be>
      Acked-by: default avatarWolfgang Grandegger <wg@grandegger.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4f2d56c4
    • Arnd Bergmann's avatar
      net/appletalk: fix atalk_release use after free · b20e7bbf
      Arnd Bergmann authored
      The BKL removal in appletalk introduced a use-after-free problem,
      where atalk_destroy_socket frees a sock, but we still release
      the socket lock on it.
      
      An easy fix is to take an extra reference on the sock and sock_put
      it when returning from atalk_release.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b20e7bbf
    • Eric Dumazet's avatar
      ipx: fix ipx_release() · 674f2115
      Eric Dumazet authored
      Commit b0d0d915 (remove the BKL) added a regression, because
      sock_put() can free memory while we are going to use it later.
      
      Fix is to delay sock_put() _after_ release_sock().
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Tested-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      674f2115
    • Eric Dumazet's avatar
      snmp: SNMP_UPD_PO_STATS_BH() always called from softirq · 20246a80
      Eric Dumazet authored
      We dont need to test if we run from softirq context, we definitely are.
      
      This saves few instructions in ip_rcv() & ip_rcv_finish()
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      20246a80
    • James Chapman's avatar
      l2tp: fix possible oops on l2tp_eth module unload · 8aa525a9
      James Chapman authored
      A struct used in the l2tp_eth driver for registering network namespace
      ops was incorrectly marked as __net_initdata, leading to oops when
      module unloaded.
      
      BUG: unable to handle kernel paging request at ffffffffa00ec098
      IP: [<ffffffff8123dbd8>] ops_exit_list+0x7/0x4b
      PGD 142d067 PUD 1431063 PMD 195da8067 PTE 0
      Oops: 0000 [#1] SMP 
      last sysfs file: /sys/module/l2tp_eth/refcnt
      Call Trace:
       [<ffffffff8123dc94>] ? unregister_pernet_operations+0x32/0x93
       [<ffffffff8123dd20>] ? unregister_pernet_device+0x2b/0x38
       [<ffffffff81068b6e>] ? sys_delete_module+0x1b8/0x222
       [<ffffffff810c7300>] ? do_munmap+0x254/0x318
       [<ffffffff812c64e5>] ? page_fault+0x25/0x30
       [<ffffffff812c6952>] ? system_call_fastpath+0x16/0x1b
      Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8aa525a9
    • Wei Yongjun's avatar
      xfrm: Fix initialize repl field of struct xfrm_state · a454f0cc
      Wei Yongjun authored
      Commit 'xfrm: Move IPsec replay detection functions to a separate file'
        (9fdc4883)
      introduce repl field to struct xfrm_state, and only initialize it
      under SA's netlink create path, the other path, such as pf_key,
      ipcomp/ipcomp6 etc, the repl field remaining uninitialize. So if
      the SA is created by pf_key, any input packet with SA's encryption
      algorithm will cause panic.
      
          int xfrm_input()
          {
              ...
              x->repl->advance(x, seq);
              ...
          }
      
      This patch fixed it by introduce new function __xfrm_init_state().
      
      Pid: 0, comm: swapper Not tainted 2.6.38-next+ #14 Bochs Bochs
      EIP: 0060:[<c078e5d5>] EFLAGS: 00010206 CPU: 0
      EIP is at xfrm_input+0x31c/0x4cc
      EAX: dd839c00 EBX: 00000084 ECX: 00000000 EDX: 01000000
      ESI: dd839c00 EDI: de3a0780 EBP: dec1de88 ESP: dec1de64
       DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
      Process swapper (pid: 0, ti=dec1c000 task=c09c0f20 task.ti=c0992000)
      Stack:
       00000000 00000000 00000002 c0ba27c0 00100000 01000000 de3a0798 c0ba27c0
       00000033 dec1de98 c0786848 00000000 de3a0780 dec1dea4 c0786868 00000000
       dec1debc c074ee56 e1da6b8c de3a0780 c074ed44 de3a07a8 dec1decc c074ef32
      Call Trace:
       [<c0786848>] xfrm4_rcv_encap+0x22/0x27
       [<c0786868>] xfrm4_rcv+0x1b/0x1d
       [<c074ee56>] ip_local_deliver_finish+0x112/0x1b1
       [<c074ed44>] ? ip_local_deliver_finish+0x0/0x1b1
       [<c074ef32>] NF_HOOK.clone.1+0x3d/0x44
       [<c074ef77>] ip_local_deliver+0x3e/0x44
       [<c074ed44>] ? ip_local_deliver_finish+0x0/0x1b1
       [<c074ec03>] ip_rcv_finish+0x30a/0x332
       [<c074e8f9>] ? ip_rcv_finish+0x0/0x332
       [<c074ef32>] NF_HOOK.clone.1+0x3d/0x44
       [<c074f188>] ip_rcv+0x20b/0x247
       [<c074e8f9>] ? ip_rcv_finish+0x0/0x332
       [<c072797d>] __netif_receive_skb+0x373/0x399
       [<c0727bc1>] netif_receive_skb+0x4b/0x51
       [<e0817e2a>] cp_rx_poll+0x210/0x2c4 [8139cp]
       [<c072818f>] net_rx_action+0x9a/0x17d
       [<c0445b5c>] __do_softirq+0xa1/0x149
       [<c0445abb>] ? __do_softirq+0x0/0x149
      Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a454f0cc
  2. 21 Mar, 2011 11 commits
    • Vasily Khoruzhick's avatar
      ARM: H1940/RX1950: Change default LED triggers · 9edb2406
      Vasily Khoruzhick authored
      Change LED triggers to mimic WinMobile behavior:
      red blinking when battery is charging,
      orange solid when battery is charged.
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      9edb2406
    • Vasily Khoruzhick's avatar
      i2c-pxa2xx: Don't clear isr bits too early · 97491ba3
      Vasily Khoruzhick authored
      isr is passed later into i2c_pxa_irq_txempty and
      i2c_pxa_irq_rxfull and they may use some other bits
      than irq sources.
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      97491ba3
    • Ben Dooks's avatar
      Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and... · a0774f45
      Ben Dooks authored
      Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2
      a0774f45
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · eddecbb6
      Linus Torvalds authored
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default
        genksyms: Regenerate lexer and parser
        genksyms: Track changes to enum constants
        genksyms: simplify usage of find_symbol()
        genksyms: Add helpers for building string lists
        genksyms: Simplify printing of symbol types
        genksyms: Simplify lexer
        genksyms: Do not paste the bison header file to lex.c
        modpost: fix trailing comma
        KBuild: silence "'scripts/unifdef' is up to date."
        kbuild: Add extra gcc checks
        kbuild: reenable section mismatch analysis
        unifdef: update to upstream version 2.5
      eddecbb6
    • Jesper Juhl's avatar
      Reduce sequential pointer derefs in scsi_error.c and reduce size as well · 0bf8c869
      Jesper Juhl authored
      This patch reduces the number of sequential pointer derefs in
      drivers/scsi/scsi_error.c
      
      This has been submitted a number of times over a couple of years.  I
      believe this version adresses all comments it has gathered over time.
      Please apply or reject with a reason.
      
      The benefits are:
      
       - makes the code easier to read.  Lots of sequential derefs of the same
         pointers is not easy on the eye.
      
       - theoretically at least, just dereferencing the pointers once can
         allow the compiler to generally slightly faster code, so in theory
         this could also be a micro speed optimization.
      
       - reduces size of object file (tiny effect: on x86-64, in at least one
         configuration, the text size decreased from 9439 bytes to 9400)
      
       - removes some pointless (mostly trailing) whitespace.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0bf8c869
    • Gary Hade's avatar
      matroxfb: remove incorrect Matrox G200eV support · 38f7aa23
      Gary Hade authored
      Remove incorrect Matrox G200eV support that was previously added by
      commit e3a19388
      
      A serious issue with the incorrect G200eV support that reproduces on the
      Matrox G200eV equipped IBM x3650 M2 is the total lack of text (login
      banner, login prompt, etc) on the console when X is not running and
      total lack of text on all of the virtual consoles after X is started.
      
      Any concerns that the incorrect code (upstream since October 2008) has
      been successfully used on non-IBM G200eV equipped system(s) appear to be
      unwarranted.  In addition to the serious/non-intermittent nature of
      issues that have been spotted on IBM systems, complete removal of the
      incorrect code is clearly supported by the following Matrox (Yannick
      Heneault) provided input:
       "It impossible that this patch should have work on a system.
       The patch only declare the G200eV as a regular G200 which is
       not case. Many registers are different, including at least the
       PLL programming sequence. If the G200eV is programmed like a
       regular G200, it will not display anything."
      
      v1 - Initial patch that removed the incorrect code for _all_
           G200eV equipped systems.
      v2 - Darrick Wong provided patch that blacklisted the incorrect
           code on G200eV equipped IBM systems leaving it enabled on
           all G200eV equipped non-IBM systems.
      v3 - Same code changes included with v1 plus additional
           justification for complete removal of the incorrect code.
      Signed-off-by: default avatarGary Hade <garyhade@us.ibm.com>
      Cc: Darrick J. Wong <djwong@us.ibm.com>
      Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
      Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Yannick Heneault <yannick_heneault@matrox.com>
      Cc: Christian Toutant <ctoutant@matrox.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      38f7aa23
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 3155fe6d
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
        xfs: don't name variables "panic"
        xfs: factor agf counter updates into a helper
        xfs: clean up the xfs_alloc_compute_aligned calling convention
        xfs: kill support/debug.[ch]
        xfs: Convert remaining cmn_err() callers to new API
        xfs: convert the quota debug prints to new API
        xfs: rename xfs_cmn_err_fsblock_zero()
        xfs: convert xfs_fs_cmn_err to new error logging API
        xfs: kill xfs_fs_mount_cmn_err() macro
        xfs: kill xfs_fs_repair_cmn_err() macro
        xfs: convert xfs_cmn_err to xfs_alert_tag
        xfs: Convert xlog_warn to new logging interface
        xfs: Convert linux-2.6/ files to new logging interface
        xfs: introduce new logging API.
        xfs: zero proper structure size for geometry calls
        xfs: enable delaylog by default
        xfs: more sensible inode refcounting for ialloc
        xfs: stop using xfs_trans_iget in the RT allocator
        xfs: check if device support discard in xfs_ioc_trim()
        xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
        ...
      3155fe6d
    • Julien Tinnes's avatar
      Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code · da48524e
      Julien Tinnes authored
      Userland should be able to trust the pid and uid of the sender of a
      signal if the si_code is SI_TKILL.
      
      Unfortunately, the kernel has historically allowed sigqueueinfo() to
      send any si_code at all (as long as it was negative - to distinguish it
      from kernel-generated signals like SIGILL etc), so it could spoof a
      SI_TKILL with incorrect siginfo values.
      
      Happily, it looks like glibc has always set si_code to the appropriate
      SI_QUEUE, so there are probably no actual user code that ever uses
      anything but the appropriate SI_QUEUE flag.
      
      So just tighten the check for si_code (we used to allow any negative
      value), and add a (one-time) warning in case there are binaries out
      there that might depend on using other si_code values.
      Signed-off-by: default avatarJulien Tinnes <jln@google.com>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      da48524e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest · b52307ca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
        ktest: Add STOP_TEST_AFTER to stop the test after a period of time
        ktest: Monitor kernel while running of user tests
        ktest: Fix bug where the test would not end after failure
        ktest: Add BISECT_FILES to run git bisect on paths
        ktest: Add BISECT_SKIP
        ktest: Add manual bisect
        ktest: Handle kernels before make oldnoconfig
        ktest: Start failure timeout on panic too
        ktest: Print logfile name on failure
      b52307ca
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · afd8c404
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (ads1015) Make gain and datarate configurable
        hwmon: (ads1015) Drop dynamic attribute group
        hwmon: Add support for Texas Instruments ADS1015
        hwmon: New driver for SMSC SCH5627
        hwmon: (abituguru*) Update my email address
        hwmon: (lm75) Speed up detection
        hwmon: (lm75) Add detection of the National Semiconductor LM75A
        hp_accel: Fix driver name
        Move lis3lv02d drivers to drivers/misc
        Move hp_accel to drivers/platform/x86
        Let Kconfig handle lis3lv02d dependencies
        hwmon: (sht15) Fix integer overflow in humidity calculation
        hwmon: (sht15) Spelling fix
        hwmon: (w83795) Document pin mapping
      afd8c404
    • Luck, Tony's avatar
      pstore: use mount option instead sysfs to tweak kmsg_bytes · 366f7e7a
      Luck, Tony authored
      /sys/fs is a somewhat strange way to tweak what could more
      obviously be tuned with a mount option.
      Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      366f7e7a