Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-qy0-f174.google.com ([209.85.216.174]:35046 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757100Ab2AXRk4 (ORCPT ); Tue, 24 Jan 2012 12:40:56 -0500 Received: by qcsg15 with SMTP id g15so196747qcs.19 for ; Tue, 24 Jan 2012 09:40:55 -0800 (PST) MIME-Version: 1.0 From: Jeff Layton To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH] sunrpc: initialize delayed work on each rpc_inode allocation Date: Tue, 24 Jan 2012 12:40:50 -0500 Message-Id: <1327426850-14837-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: The debugobjects code will sometimes pop a warning like this when the queue_timeout job is queued to a workqueue: [ 5157.128514] WARNING: at lib/debugobjects.c:262 debug_print_object+0x8c/0xb0() [ 5157.128742] Hardware name: Bochs [ 5157.128742] ODEBUG: activate not available (active state 0) object type: timer_list hint: stub_timer+0x0/0x20 [ 5157.128742] Modules linked in: nfsd(O) nfs_acl auth_rpcgss lockd sunrpc floppy virtio_net i2c_piix4 i2c_core virtio_balloon joydev pcspkr virtio_blk [last unloaded: nfsd] [ 5157.128742] Pid: 1312, comm: rpc.nfsd Tainted: G W O 3.3.0-rc1+ #1 [ 5157.128742] Call Trace: [ 5157.128742] [] warn_slowpath_common+0x7f/0xc0 [ 5157.128742] [] warn_slowpath_fmt+0x46/0x50 [ 5157.128742] [] debug_print_object+0x8c/0xb0 [ 5157.128742] [] ? timer_debug_hint+0x10/0x10 [ 5157.128742] [] debug_object_activate+0xfb/0x190 [ 5157.128742] [] ? lock_timer_base.isra.24+0x38/0x70 [ 5157.128742] [] mod_timer+0xf6/0x450 [ 5157.128742] [] add_timer+0x18/0x20 [ 5157.128742] [] queue_delayed_work_on+0xbe/0x140 [ 5157.128742] [] queue_delayed_work+0x21/0x40 [ 5157.128742] [] rpc_queue_upcall+0xe8/0x100 [sunrpc] [ 5157.128742] [] __cld_pipe_upcall+0x61/0xc0 [nfsd] [ 5157.128742] [] nfsd4_cld_init+0x48/0x140 [nfsd] [ 5157.128742] [] nfsd4_client_tracking_init+0x2a/0xc0 [nfsd] [ 5157.128742] [] ? mutex_unlock+0xe/0x10 [ 5157.128742] [] nfs4_state_start+0x1a/0x100 [nfsd] [ 5157.128742] [] nfsd_svc+0x135/0x200 [nfsd] [ 5157.128742] [] ? write_maxblksize+0x130/0x130 [nfsd] [ 5157.128742] [] write_threads+0x7d/0xd0 [nfsd] [ 5157.128742] [] ? simple_transaction_get+0xca/0xe0 [ 5157.128742] [] nfsctl_transaction_write+0x57/0x90 [nfsd] [ 5157.128742] [] vfs_write+0xaf/0x190 [ 5157.128742] [] sys_write+0x4d/0x90 [ 5157.128742] [] system_call_fastpath+0x16/0x1b This occurs when an rpc_inode object is recycled. The slab constructor routine doesn't necessarily get called on it again, so the debugobjects code isn't aware that it's already initialized. Work around this problem by initializing the delayed work every time an inode is allocated out of the slab, not just when a new slab is. Cc: Boaz Harrosh Signed-off-by: Jeff Layton --- net/sunrpc/rpc_pipe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 63a7a7a..58e1dd1 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -178,6 +178,8 @@ rpc_alloc_inode(struct super_block *sb) rpci = (struct rpc_inode *)kmem_cache_alloc(rpc_inode_cachep, GFP_KERNEL); if (!rpci) return NULL; + + INIT_DELAYED_WORK(&rpci->queue_timeout, rpc_timeout_upcall_queue); return &rpci->vfs_inode; } @@ -1073,8 +1075,6 @@ init_once(void *foo) INIT_LIST_HEAD(&rpci->pipe); rpci->pipelen = 0; init_waitqueue_head(&rpci->waitq); - INIT_DELAYED_WORK(&rpci->queue_timeout, - rpc_timeout_upcall_queue); rpci->ops = NULL; } -- 1.7.7.5