| Message ID | 20230328142129.2636535-1-yebin@huaweicloud.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2259372vqo;
Tue, 28 Mar 2023 07:24:52 -0700 (PDT)
X-Google-Smtp-Source:
AKy350b11Ovd+y0iUxeZI/CE9wghl4EmK32ykBvFJ+c1Q3LrnULpEXYCbWrULx01OScuh7aNP306
X-Received: by 2002:a17:906:5811:b0:931:d644:b9d3 with SMTP id
m17-20020a170906581100b00931d644b9d3mr16252981ejq.59.1680013492386;
Tue, 28 Mar 2023 07:24:52 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1680013492; cv=none;
d=google.com; s=arc-20160816;
b=XQzxAaWBeE/VPor/9b0NPEvOEZG+zhfN+OAVeNmNtuJKYbWJjxB8D0rqjOBHHfUlM/
CXHk4XtDBqnIH1p5HOdp+yoKcs4iWe2cPl2XZ/CZNKGS+9SwxgX0BOBXXrtMHWudD+nd
RLVmEzGYJqUWnxXrRVKFeYoyPuNWovDd7uB+GhFz7PmLIoL/B8ZcsbWHfbDT0Ha9sjNQ
9xk/RGKNz2uiLIQPNefzdXXLUbFTnNZBZ0jhEz2looY+nsg3iohOdTWr10VtLxVESNu9
UsxmCu7GmslD4/RCLfVXWJs8CYN+d8UUq5ubUTUsHHiIThEyS65gwuChfpP5JY4pBIEn
Xd8w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from;
bh=A9I9v+4B1N4R5wzbNW66QyeZ4E70f45zy6d8OeRWri4=;
b=Tuv9FCjyxaNCrYNcnOTV0nHQq8hUY08SSrTif7X+H3R0UmT/vzRh/E/hgIRkae4vPG
suaM6H/9WzV+FbW8Ybvl0Y2YRsm/goE/sP58iwMxOW/VSBDKf0b4KAD6CjghWt1/OGDZ
1VL1N95sfW5AkV8iiMFC6qmAdisiy4fTWKwoBCQMcwGTO6YD+IFFdC+R++uQtUNERlW0
9ySfR9AM7bbYdp6OXDVCY2NaKrFoXN6zDiWm7mHaMydbQtvlL1Y4wiQu+AU3KcRckL1W
F7xTGW0EfOnjXplS5EmLFibxNXrmJAb7kiX+9LXbFMm+oY/rSPy0MPtbVFe0F/LNHwin
/iEw==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
a8-20020a1709062b0800b00933314f56fdsi7824071ejg.737.2023.03.28.07.24.24;
Tue, 28 Mar 2023 07:24:52 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232591AbjC1OV6 (ORCPT <rfc822;kartikey406@gmail.com>
+ 99 others); Tue, 28 Mar 2023 10:21:58 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39424 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231913AbjC1OVz (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 28 Mar 2023 10:21:55 -0400
Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com
[45.249.212.51])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BCE0199;
Tue, 28 Mar 2023 07:21:51 -0700 (PDT)
Received: from mail02.huawei.com (unknown [172.30.67.169])
by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id
4PmBhB4HM4z4f3w0K;
Tue, 28 Mar 2023 22:21:46 +0800 (CST)
Received: from huaweicloud.com (unknown [10.175.127.227])
by APP3 (Coremail) with SMTP id _Ch0CgCnUyH69yJkQ_PfFg--.50877S4;
Tue, 28 Mar 2023 22:21:48 +0800 (CST)
From: Ye Bin <yebin@huaweicloud.com>
To: djwong@kernel.org, linux-xfs@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, yebin10@huawei.com
Subject: [PATCH v2] xfs: fix BUG_ON in xfs_getbmap()
Date: Tue, 28 Mar 2023 22:21:29 +0800
Message-Id: <20230328142129.2636535-1-yebin@huaweicloud.com>
X-Mailer: git-send-email 2.31.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: _Ch0CgCnUyH69yJkQ_PfFg--.50877S4
X-Coremail-Antispam: 1UD129KBjvJXoWxGFy5Gw1UurWxJr43ZFWUurg_yoW5Ar45pr
n3Gr1UGr4vgr1UZr1DJw1UKw1UGr4UCF48Ar1xWr1Sq3WUAw17tr40kFWFyr9rJrW8Xryx
Jr1DJw18t345JaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDU0xBIdaVrnRJUUUgCb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2
6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4
vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7Cj
xVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I
0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E
x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x
0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Y
z7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zV
AF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4l
IxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWrZr1j6s
0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsG
vfC2KfnxnUUI43ZEXa7IU1CPfJUUUUU==
X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/
X-CFilter-Loop: Reflected
X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_NONE
autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1761621827683172671?=
X-GMAIL-MSGID: =?utf-8?q?1761621827683172671?=
|
| Series |
[v2] xfs: fix BUG_ON in xfs_getbmap()
|
|
Commit Message
Ye Bin
March 28, 2023, 2:21 p.m. UTC
From: Ye Bin <yebin10@huawei.com> There's issue as follows: XFS: Assertion failed: (bmv->bmv_iflags & BMV_IF_DELALLOC) != 0, file: fs/xfs/xfs_bmap_util.c, line: 329 ------------[ cut here ]------------ kernel BUG at fs/xfs/xfs_message.c:102! invalid opcode: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 14612 Comm: xfs_io Not tainted 6.3.0-rc2-next-20230315-00006-g2729d23ddb3b-dirty #422 RIP: 0010:assfail+0x96/0xa0 RSP: 0018:ffffc9000fa178c0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff888179a18000 RDX: 0000000000000000 RSI: ffff888179a18000 RDI: 0000000000000002 RBP: 0000000000000000 R08: ffffffff8321aab6 R09: 0000000000000000 R10: 0000000000000001 R11: ffffed1105f85139 R12: ffffffff8aacc4c0 R13: 0000000000000149 R14: ffff888269f58000 R15: 000000000000000c FS: 00007f42f27a4740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000b92388 CR3: 000000024f006000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> xfs_getbmap+0x1a5b/0x1e40 xfs_ioc_getbmap+0x1fd/0x5b0 xfs_file_ioctl+0x2cb/0x1d50 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Above issue may happen as follows: ThreadA ThreadB do_shared_fault __do_fault xfs_filemap_fault __xfs_filemap_fault filemap_fault xfs_ioc_getbmap -> Without BMV_IF_DELALLOC flag xfs_getbmap xfs_ilock(ip, XFS_IOLOCK_SHARED); filemap_write_and_wait do_page_mkwrite xfs_filemap_page_mkwrite __xfs_filemap_fault xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); iomap_page_mkwrite ... xfs_buffered_write_iomap_begin xfs_bmapi_reserve_delalloc -> Allocate delay extent xfs_ilock_data_map_shared(ip) xfs_getbmap_report_one ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0) -> trigger BUG_ON As xfs_filemap_page_mkwrite() only hold XFS_MMAPLOCK_SHARED lock, there's small window mkwrite can produce delay extent after file write in xfs_getbmap(). To solve above issue, just skip delalloc extents. Signed-off-by: Ye Bin <yebin10@huawei.com> --- fs/xfs/xfs_bmap_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Comments
On Tue, Mar 28, 2023 at 10:21:29PM +0800, Ye Bin wrote: > From: Ye Bin <yebin10@huawei.com> > > There's issue as follows: > XFS: Assertion failed: (bmv->bmv_iflags & BMV_IF_DELALLOC) != 0, file: fs/xfs/xfs_bmap_util.c, line: 329 > ------------[ cut here ]------------ > kernel BUG at fs/xfs/xfs_message.c:102! > invalid opcode: 0000 [#1] PREEMPT SMP KASAN > CPU: 1 PID: 14612 Comm: xfs_io Not tainted 6.3.0-rc2-next-20230315-00006-g2729d23ddb3b-dirty #422 > RIP: 0010:assfail+0x96/0xa0 > RSP: 0018:ffffc9000fa178c0 EFLAGS: 00010246 > RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff888179a18000 > RDX: 0000000000000000 RSI: ffff888179a18000 RDI: 0000000000000002 > RBP: 0000000000000000 R08: ffffffff8321aab6 R09: 0000000000000000 > R10: 0000000000000001 R11: ffffed1105f85139 R12: ffffffff8aacc4c0 > R13: 0000000000000149 R14: ffff888269f58000 R15: 000000000000000c > FS: 00007f42f27a4740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000000000b92388 CR3: 000000024f006000 CR4: 00000000000006e0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > <TASK> > xfs_getbmap+0x1a5b/0x1e40 > xfs_ioc_getbmap+0x1fd/0x5b0 > xfs_file_ioctl+0x2cb/0x1d50 > __x64_sys_ioctl+0x197/0x210 > do_syscall_64+0x39/0xb0 > entry_SYSCALL_64_after_hwframe+0x63/0xcd > > Above issue may happen as follows: > ThreadA ThreadB > do_shared_fault > __do_fault > xfs_filemap_fault > __xfs_filemap_fault > filemap_fault > xfs_ioc_getbmap -> Without BMV_IF_DELALLOC flag > xfs_getbmap > xfs_ilock(ip, XFS_IOLOCK_SHARED); > filemap_write_and_wait > do_page_mkwrite > xfs_filemap_page_mkwrite > __xfs_filemap_fault > xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); > iomap_page_mkwrite > ... > xfs_buffered_write_iomap_begin > xfs_bmapi_reserve_delalloc -> Allocate delay extent > xfs_ilock_data_map_shared(ip) > xfs_getbmap_report_one > ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0) > -> trigger BUG_ON > > As xfs_filemap_page_mkwrite() only hold XFS_MMAPLOCK_SHARED lock, there's > small window mkwrite can produce delay extent after file write in xfs_getbmap(). > To solve above issue, just skip delalloc extents. > > Signed-off-by: Ye Bin <yebin10@huawei.com> > --- > fs/xfs/xfs_bmap_util.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c > index a09dd2606479..d2a109ceb922 100644 > --- a/fs/xfs/xfs_bmap_util.c > +++ b/fs/xfs/xfs_bmap_util.c > @@ -322,7 +322,8 @@ xfs_getbmap_report_one( > * extents. > */ > if (got->br_startoff < XFS_B_TO_FSB(ip->i_mount, XFS_ISIZE(ip))) > - ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0); > + if (!(bmv->bmv_iflags & BMV_IF_DELALLOC)) > + return 0; Why only hide the delalloc mapping if it's below EOF? --D > > p->bmv_oflags |= BMV_OF_DELALLOC; > p->bmv_block = -2; > -- > 2.31.1 >
On 2023/3/29 9:02, Darrick J. Wong wrote: > On Tue, Mar 28, 2023 at 10:21:29PM +0800, Ye Bin wrote: >> From: Ye Bin <yebin10@huawei.com> >> >> There's issue as follows: >> XFS: Assertion failed: (bmv->bmv_iflags & BMV_IF_DELALLOC) != 0, file: fs/xfs/xfs_bmap_util.c, line: 329 >> ------------[ cut here ]------------ >> kernel BUG at fs/xfs/xfs_message.c:102! >> invalid opcode: 0000 [#1] PREEMPT SMP KASAN >> CPU: 1 PID: 14612 Comm: xfs_io Not tainted 6.3.0-rc2-next-20230315-00006-g2729d23ddb3b-dirty #422 >> RIP: 0010:assfail+0x96/0xa0 >> RSP: 0018:ffffc9000fa178c0 EFLAGS: 00010246 >> RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff888179a18000 >> RDX: 0000000000000000 RSI: ffff888179a18000 RDI: 0000000000000002 >> RBP: 0000000000000000 R08: ffffffff8321aab6 R09: 0000000000000000 >> R10: 0000000000000001 R11: ffffed1105f85139 R12: ffffffff8aacc4c0 >> R13: 0000000000000149 R14: ffff888269f58000 R15: 000000000000000c >> FS: 00007f42f27a4740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 >> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> CR2: 0000000000b92388 CR3: 000000024f006000 CR4: 00000000000006e0 >> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 >> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 >> Call Trace: >> <TASK> >> xfs_getbmap+0x1a5b/0x1e40 >> xfs_ioc_getbmap+0x1fd/0x5b0 >> xfs_file_ioctl+0x2cb/0x1d50 >> __x64_sys_ioctl+0x197/0x210 >> do_syscall_64+0x39/0xb0 >> entry_SYSCALL_64_after_hwframe+0x63/0xcd >> >> Above issue may happen as follows: >> ThreadA ThreadB >> do_shared_fault >> __do_fault >> xfs_filemap_fault >> __xfs_filemap_fault >> filemap_fault >> xfs_ioc_getbmap -> Without BMV_IF_DELALLOC flag >> xfs_getbmap >> xfs_ilock(ip, XFS_IOLOCK_SHARED); >> filemap_write_and_wait >> do_page_mkwrite >> xfs_filemap_page_mkwrite >> __xfs_filemap_fault >> xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); >> iomap_page_mkwrite >> ... >> xfs_buffered_write_iomap_begin >> xfs_bmapi_reserve_delalloc -> Allocate delay extent >> xfs_ilock_data_map_shared(ip) >> xfs_getbmap_report_one >> ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0) >> -> trigger BUG_ON >> >> As xfs_filemap_page_mkwrite() only hold XFS_MMAPLOCK_SHARED lock, there's >> small window mkwrite can produce delay extent after file write in xfs_getbmap(). >> To solve above issue, just skip delalloc extents. >> >> Signed-off-by: Ye Bin <yebin10@huawei.com> >> --- >> fs/xfs/xfs_bmap_util.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c >> index a09dd2606479..d2a109ceb922 100644 >> --- a/fs/xfs/xfs_bmap_util.c >> +++ b/fs/xfs/xfs_bmap_util.c >> @@ -322,7 +322,8 @@ xfs_getbmap_report_one( >> * extents. >> */ >> if (got->br_startoff < XFS_B_TO_FSB(ip->i_mount, XFS_ISIZE(ip))) >> - ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0); >> + if (!(bmv->bmv_iflags & BMV_IF_DELALLOC)) >> + return 0; > Why only hide the delalloc mapping if it's below EOF? > > --D There should be no concurrency issues with normal buffer writes. But since we need to skip here, we won't make any distinction. I will send another version. >> >> p->bmv_oflags |= BMV_OF_DELALLOC; >> p->bmv_block = -2; >> -- >> 2.31.1 >> > . >
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index a09dd2606479..d2a109ceb922 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -322,7 +322,8 @@ xfs_getbmap_report_one( * extents. */ if (got->br_startoff < XFS_B_TO_FSB(ip->i_mount, XFS_ISIZE(ip))) - ASSERT((bmv->bmv_iflags & BMV_IF_DELALLOC) != 0); + if (!(bmv->bmv_iflags & BMV_IF_DELALLOC)) + return 0; p->bmv_oflags |= BMV_OF_DELALLOC; p->bmv_block = -2;