1. 05 8月, 2014 5 次提交
    • J
      nfsd: add a forget_clients "get" routine with proper locking · 7ec0e36f
      Jeff Layton 提交于
      Add a new "get" routine for forget_clients that relies on the
      client_lock instead of the client_mutex.
      Signed-off-by: NJeff Layton <jlayton@primarydata.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      7ec0e36f
    • J
      nfsd: abstract out the get and set routines into the fault injection ops · c96223d3
      Jeff Layton 提交于
      Now that we've added more granular locking in other places, it's time
      to address the fault injection code. This code is currently quite
      reliant on the client_mutex for protection. Start to change this by
      adding a new set of fault injection op vectors.
      
      For now they all use the legacy ones. In later patches we'll add new
      routines that can deal with more granular locking.
      
      Also, move some of the printk routines into the callers to make the
      results of the operations more uniform.
      Signed-off-by: NJeff Layton <jlayton@primarydata.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      c96223d3
    • J
      nfsd: protect clid and verifier generation with client_lock · 294ac32e
      Jeff Layton 提交于
      The clid counter is a global counter currently. Move it to be a per-net
      property so that it can be properly protected by the nn->client_lock
      instead of relying on the client_mutex.
      
      The verifier generator is also potentially racy if there are two
      simultaneous callers. Generate the verifier when we generate the clid
      value, so it's also created under the client_lock. With this, there's
      no need to keep two counters as they'd always be in sync anyway, so
      just use the clientid_counter for both.
      
      As Trond points out, what would be best is to eventually move this
      code to use IDR instead of the hash tables. That would also help ensure
      uniqueness, but that's probably best done as a separate project.
      Signed-off-by: NJeff Layton <jlayton@primarydata.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      294ac32e
    • J
      nfsd: don't destroy clients that are busy · fd699b8a
      Jeff Layton 提交于
      It's possible that we'll have an in-progress call on some of the clients
      while a rogue EXCHANGE_ID or DESTROY_CLIENTID call comes in. Be sure to
      try and mark the client expired first, so that the refcount is
      respected.
      
      This will only be a problem once the client_mutex is removed.
      Signed-off-by: NJeff Layton <jlayton@primarydata.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      fd699b8a
    • K
      NFSD: Put the reference of nfs4_file when freeing stid · fb94d766
      Kinglong Mee 提交于
      After testing nfs4 lock, I restart the nfsd service, got messages as,
      
      [ 5677.403419] nfsd: last server has exited, flushing export cache
      [ 5677.463728] =============================================================================
      [ 5677.463942] BUG nfsd4_files (Tainted: G    B      OE): Objects remaining in nfsd4_files on kmem_cache_close()
      [ 5677.464055] -----------------------------------------------------------------------------
      
      [ 5677.464203] INFO: Slab 0xffffea0000233400 objects=28 used=1 fp=0xffff880008cd3d98 flags=0x3ffc0000004080
      [ 5677.464318] CPU: 0 PID: 3772 Comm: rmmod Tainted: G    B      OE 3.16.0-rc2+ #29
      [ 5677.464420] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013
      [ 5677.464538]  0000000000000000 0000000036af2c9f ffff88000ce97d68 ffffffff816eacfa
      [ 5677.464643]  ffffea0000233400 ffff88000ce97e40 ffffffff811cda44 ffffffff00000020
      [ 5677.464774]  ffff88000ce97e50 ffff88000ce97e00 656a624f00000008 616d657220737463
      [ 5677.464875] Call Trace:
      [ 5677.464925]  [<ffffffff816eacfa>] dump_stack+0x45/0x56
      [ 5677.464983]  [<ffffffff811cda44>] slab_err+0xb4/0xe0
      [ 5677.465040]  [<ffffffff811d0457>] ? __kmalloc+0x117/0x290
      [ 5677.465099]  [<ffffffff81100eec>] ? on_each_cpu_cond+0xac/0xf0
      [ 5677.465158]  [<ffffffff811d1bc0>] ? kmem_cache_close+0x110/0x2e0
      [ 5677.465218]  [<ffffffff811d1be0>] kmem_cache_close+0x130/0x2e0
      [ 5677.465279]  [<ffffffff8135a0c1>] ? kobject_cleanup+0x91/0x1b0
      [ 5677.465338]  [<ffffffff811d22be>] __kmem_cache_shutdown+0xe/0x10
      [ 5677.465399]  [<ffffffff8119bd28>] kmem_cache_destroy+0x48/0x100
      [ 5677.465466]  [<ffffffffa05ef78d>] nfsd4_free_slabs+0x2d/0x50 [nfsd]
      [ 5677.465530]  [<ffffffffa05fa987>] exit_nfsd+0x34/0x6ad [nfsd]
      [ 5677.465589]  [<ffffffff81104ac2>] SyS_delete_module+0x162/0x200
      [ 5677.465649]  [<ffffffff81013b69>] ? do_notify_resume+0x59/0x90
      [ 5677.465759]  [<ffffffff816f2369>] system_call_fastpath+0x16/0x1b
      [ 5677.465822] INFO: Object 0xffff880008cd0000 @offset=0
      [ 5677.465882] INFO: Allocated in nfsd4_process_open1+0x61/0x350 [nfsd] age=7599 cpu=0 pid=3253
      [ 5677.466115]  __slab_alloc+0x3b0/0x4b1
      [ 5677.466166]  kmem_cache_alloc+0x1e4/0x240
      [ 5677.466220]  nfsd4_process_open1+0x61/0x350 [nfsd]
      [ 5677.466276]  nfsd4_open+0xee/0x860 [nfsd]
      [ 5677.466329]  nfsd4_proc_compound+0x4d7/0x7f0 [nfsd]
      [ 5677.466384]  nfsd_dispatch+0xbb/0x200 [nfsd]
      [ 5677.466447]  svc_process_common+0x453/0x6f0 [sunrpc]
      [ 5677.466506]  svc_process+0x103/0x170 [sunrpc]
      [ 5677.466559]  nfsd+0x117/0x190 [nfsd]
      [ 5677.466609]  kthread+0xd8/0xf0
      [ 5677.466656]  ret_from_fork+0x7c/0xb0
      [ 5677.466775] kmem_cache_destroy nfsd4_files: Slab cache still has objects
      [ 5677.466839] CPU: 0 PID: 3772 Comm: rmmod Tainted: G    B      OE 3.16.0-rc2+ #29
      [ 5677.466937] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013
      [ 5677.467049]  0000000000000000 0000000036af2c9f ffff88000ce97eb0 ffffffff816eacfa
      [ 5677.467150]  ffff880020bb2d00 ffff88000ce97ed0 ffffffff8119bdd9 0000000000000000
      [ 5677.467250]  ffffffffa06065c0 ffff88000ce97ee0 ffffffffa05ef78d ffff88000ce97ef0
      [ 5677.467351] Call Trace:
      [ 5677.467397]  [<ffffffff816eacfa>] dump_stack+0x45/0x56
      [ 5677.467454]  [<ffffffff8119bdd9>] kmem_cache_destroy+0xf9/0x100
      [ 5677.467516]  [<ffffffffa05ef78d>] nfsd4_free_slabs+0x2d/0x50 [nfsd]
      [ 5677.467579]  [<ffffffffa05fa987>] exit_nfsd+0x34/0x6ad [nfsd]
      [ 5677.467639]  [<ffffffff81104ac2>] SyS_delete_module+0x162/0x200
      [ 5677.467765]  [<ffffffff81013b69>] ? do_notify_resume+0x59/0x90
      [ 5677.467826]  [<ffffffff816f2369>] system_call_fastpath+0x16/0x1b
      Signed-off-by: NKinglong Mee <kinglongmee@gmail.com>
      Reviewed-by: NJeff Layton <jlayton@primarydata.com>
      Fixes: 11b9164a "nfsd: Add a struct nfs4_file field to struct nfs4_stid"
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      fb94d766
  2. 02 8月, 2014 14 次提交
  3. 01 8月, 2014 21 次提交