From patchwork Tue Dec 22 08:08:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxiao Bi X-Patchwork-Id: 7902301 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D08BFBEEE5 for ; Tue, 22 Dec 2015 08:11:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 053A02057F for ; Tue, 22 Dec 2015 08:11:16 +0000 (UTC) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A7992053D for ; Tue, 22 Dec 2015 08:11:14 +0000 (UTC) Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id tBM89rJB027690 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 22 Dec 2015 08:09:53 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id tBM89qCv006162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Dec 2015 08:09:52 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1aBI12-0000ff-Jx; Tue, 22 Dec 2015 00:09:52 -0800 Received: from userv0022.oracle.com ([156.151.31.74]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1aBI0e-0000eT-2z for ocfs2-devel@oss.oracle.com; Tue, 22 Dec 2015 00:09:28 -0800 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id tBM89Rth003740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 22 Dec 2015 08:09:27 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id tBM89RA4015956; Tue, 22 Dec 2015 08:09:27 GMT Received: from bijx-OptiPlex-780.cn.oracle.com (/10.182.32.177) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 22 Dec 2015 00:09:26 -0800 From: Junxiao Bi To: ocfs2-devel@oss.oracle.com Date: Tue, 22 Dec 2015 16:08:27 +0800 Message-Id: <1450771707-11568-1-git-send-email-junxiao.bi@oracle.com> X-Mailer: git-send-email 1.7.9.5 Cc: mfasheh@suse.com Subject: [Ocfs2-devel] [PATCH] ocfs2: fix flock panic issue X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()") move flock/posix lock indentify code to locks_lock_inode_wait(), but missed to set fl_flags to FL_FLOCK which caused the following kernel panic on 4.4.0_rc5. [19343.650448] kernel BUG at fs/locks.c:1895! [19343.650448] invalid opcode: 0000 [#1] SMP [19343.650448] Modules linked in: ocfs2(O) ocfs2_dlmfs(O) ocfs2_stack_o2cb(O) ocfs2_dlm(O) ocfs2_nodemanager(O) ocfs2_stackglue(O) iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi xen_kbdfront xen_netfront xen_fbfront xen_blkfront [19343.650448] CPU: 0 PID: 20268 Comm: flock_unit_test Tainted: G O 4.4.0-rc5-next-20151217 #1 [19343.650448] Hardware name: Xen HVM domU, BIOS 4.3.1OVM 05/14/2014 [19343.650448] task: ffff88007b3672c0 ti: ffff880028b58000 task.ti: ffff880028b58000 [19343.650448] RIP: 0010:[] [] locks_lock_inode_wait+0x2e/0x160 [19343.650448] RSP: 0018:ffff880028b5bce8 EFLAGS: 00010293 [19343.650448] RAX: 0000000000000000 RBX: ffff880028b5bdb8 RCX: 0000000000000000 [19343.650448] RDX: 0000000000000007 RSI: ffff880028b5bdb8 RDI: ffff88006842bb08 [19343.650448] RBP: ffff880028b5bd98 R08: ffff88007d21b930 R09: ffff880076a005b0 [19343.650448] R10: ffff88007a0e9360 R11: ffff880028b5be78 R12: ffff880040b45408 [19343.650448] R13: ffff880079cbf000 R14: ffff88006842bb08 R15: 0000000000000001 [19343.650448] FS: 00007f17572c7700(0000) GS:ffff88007d200000(0000) knlGS:0000000000000000 [19343.650448] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [19343.650448] CR2: 00007f17572d7000 CR3: 000000007b2cf000 CR4: 00000000000406f0 [19343.650448] Stack: [19343.650448] ffff880028a70a38 ffffffff0000005a ffff880028a70800 000000000000005a [19343.650448] ffff880028b5bda8 0000000100000001 000000000000005a ffff880028a70a30 [19343.650448] 0000000000000292 0000000000000001 0000000000000001 0000000000000292 [19343.650448] Call Trace: [19343.650448] [] ? __wake_up+0x4e/0x70 [19343.650448] [] ? bit_waitqueue+0x90/0x90 [19343.650448] [] ocfs2_do_flock+0x91/0x160 [ocfs2] [19343.650448] [] ocfs2_flock+0x76/0xd0 [ocfs2] [19343.650448] [] SyS_flock+0x10f/0x1a0 [19343.650448] [] entry_SYSCALL_64_fastpath+0x12/0x71 [19343.650448] Code: e5 41 57 41 56 49 89 fe 41 55 41 54 53 48 89 f3 48 81 ec 88 00 00 00 8b 46 40 83 e0 03 83 f8 01 0f 84 ad 00 00 00 83 f8 02 74 04 <0f> 0b eb fe 4c 8d ad 60 ff ff ff 4c 8d 7b 58 e8 0e 8e 73 00 4d [19343.650448] RIP [] locks_lock_inode_wait+0x2e/0x160 [19343.650448] RSP [19343.819187] ---[ end trace dfca74ec9b5b274c ]--- Fixes: 4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()") Signed-off-by: Junxiao Bi --- fs/ocfs2/locks.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c index 652ece4a9d9e..d56f0079b858 100644 --- a/fs/ocfs2/locks.c +++ b/fs/ocfs2/locks.c @@ -67,7 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode, */ locks_lock_file_wait(file, - &(struct file_lock){.fl_type = F_UNLCK}); + &(struct file_lock) { + .fl_type = F_UNLCK, + .fl_flags = FL_FLOCK + }); ocfs2_file_unlock(file); }