Changwei Ge
2018-Aug-16 11:43 UTC
[Ocfs2-devel] [PATCH] fix crash on ocfs2_duplicate_clusters_by_page
Hi Larry, Do you have a method to reproduce this issue? I would be nice that such a method is provided :-) On 2018/8/16 19:24, Larry Chen wrote:> ocfs2_duplicate_clusters_by_page may crash if an extent's page is dirty. > When a page has not been written back, it is still in dirty state. If at > that moment, ocfs2_duplicate_clusters_by_page is called against this > page, the crash happens. > > To fix this bug, we can just unlock the page and wait the page until > it's not dirty. > > I don't know whether the patch is appropriate, so I need comments, > thanks. > > The following is the core dump: > > kernel BUG at /root/code/ocfs2/refcounttree.c:2961! > __ocfs2_move_extent+0x80/0x450 [ocfs2]Because we may work on different base of git tree. Can you paste in what function the crash occurs? I guess you might miss something with your backtrace. Function __ocfs2_move_extent shouldn't be in file refcounttree.c Thanks, Changwei> ? __ocfs2_claim_clusters+0x130/0x250 [ocfs2] > ocfs2_defrag_extent+0x5b8/0x5e0 [ocfs2] > __ocfs2_move_extents_range+0x2a4/0x470 [ocfs2] > ocfs2_move_extents+0x180/0x3b0 [ocfs2] > ? ocfs2_wait_for_recovery+0x13/0x70 [ocfs2] > ocfs2_ioctl_move_extents+0x133/0x2d0 [ocfs2] > ocfs2_ioctl+0x253/0x640 [ocfs2] > do_vfs_ioctl+0x90/0x5f0 > SyS_ioctl+0x74/0x80 > do_syscall_64+0x74/0x140 > entry_SYSCALL_64_after_hwframe+0x3d/0xa2 > > To: mfasheh at versity.com, > jlbec at evilplan.org > Cc: linux-kernel at vger.kernel.org, > ocfs2-devel at oss.oracle.com, > akpm at linux-foundation.org > > Signed-off-by: Larry Chen <lchen at suse.com> > --- > fs/ocfs2/refcounttree.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c > index 7869622af22a..ee3b9dbbc310 100644 > --- a/fs/ocfs2/refcounttree.c > +++ b/fs/ocfs2/refcounttree.c > @@ -2946,6 +2946,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, > if (map_end & (PAGE_SIZE - 1)) > to = map_end & (PAGE_SIZE - 1); > > +retry: > page = find_or_create_page(mapping, page_index, GFP_NOFS); > if (!page) { > ret = -ENOMEM; > @@ -2957,8 +2958,13 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, > * In case PAGE_SIZE <= CLUSTER_SIZE, This page > * can't be dirtied before we CoW it out. > */ > - if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) > - BUG_ON(PageDirty(page)); > + if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) { > + if (PageDirty(page)) { > + unlock_page(page); > + cond_resched(); > + goto retry; > + } > + } > > if (!PageUptodate(page)) { > ret = block_read_full_page(page, ocfs2_get_block);
Larry Chen
2018-Aug-17 03:05 UTC
[Ocfs2-devel] [PATCH] fix crash on ocfs2_duplicate_clusters_by_page
Hi Changwei,
It's easy to reproduce the bug.
The bug was found during developing a defragmentation tool for ocfs2.
To achieve that, I use ioctl interface against each file like:
struct ocfs2_move_extents me = {
.me_start = 0,
.me_len = buf->st_size,
.me_flags = OCFS2_MOVE_EXT_FL_AUTO_DEFRAG,
};
fd = open64(file, O_RDWR, 0400);
ret = ioctl(fd, OCFS2_IOC_MOVE_EXT, &me);
Then I setup a cluster with only 1 node, and keep writing and deleting a
file while another process keep using the ioctl to defragment the file.
After the patch applied, the bug disappeared, but I'm not sure whether
it has been totally fixed.
Thanks
Larry
On 08/16/2018 07:43 PM, Changwei Ge wrote:> Hi Larry,
>
> Do you have a method to reproduce this issue?
>
> I would be nice that such a method is provided :-)
>
>
> On 2018/8/16 19:24, Larry Chen wrote:
>> ocfs2_duplicate_clusters_by_page may crash if an extent's page is
dirty.
>> When a page has not been written back, it is still in dirty state. If
at
>> that moment, ocfs2_duplicate_clusters_by_page is called against this
>> page, the crash happens.
>>
>> To fix this bug, we can just unlock the page and wait the page until
>> it's not dirty.
>>
>> I don't know whether the patch is appropriate, so I need comments,
>> thanks.
>>
>> The following is the core dump:
>>
>> kernel BUG at /root/code/ocfs2/refcounttree.c:2961!
>> __ocfs2_move_extent+0x80/0x450 [ocfs2]
>
> Because we may work on different base of git tree.
> Can you paste in what function the crash occurs?
> I guess you might miss something with your backtrace. Function
> __ocfs2_move_extent shouldn't be in
> file refcounttree.c
>
> Thanks,
> Changwei
>
>> ? __ocfs2_claim_clusters+0x130/0x250 [ocfs2]
>> ocfs2_defrag_extent+0x5b8/0x5e0 [ocfs2]
>> __ocfs2_move_extents_range+0x2a4/0x470 [ocfs2]
>> ocfs2_move_extents+0x180/0x3b0 [ocfs2]
>> ? ocfs2_wait_for_recovery+0x13/0x70 [ocfs2]
>> ocfs2_ioctl_move_extents+0x133/0x2d0 [ocfs2]
>> ocfs2_ioctl+0x253/0x640 [ocfs2]
>> do_vfs_ioctl+0x90/0x5f0
>> SyS_ioctl+0x74/0x80
>> do_syscall_64+0x74/0x140
>> entry_SYSCALL_64_after_hwframe+0x3d/0xa2
>>
>> To: mfasheh at versity.com,
>> jlbec at evilplan.org
>> Cc: linux-kernel at vger.kernel.org,
>> ocfs2-devel at oss.oracle.com,
>> akpm at linux-foundation.org
>>
>> Signed-off-by: Larry Chen <lchen at suse.com>
>> ---
>> fs/ocfs2/refcounttree.c | 10 ++++++++--
>> 1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
>> index 7869622af22a..ee3b9dbbc310 100644
>> --- a/fs/ocfs2/refcounttree.c
>> +++ b/fs/ocfs2/refcounttree.c
>> @@ -2946,6 +2946,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t
*handle,
>> if (map_end & (PAGE_SIZE - 1))
>> to = map_end & (PAGE_SIZE - 1);
>>
>> +retry:
>> page = find_or_create_page(mapping, page_index, GFP_NOFS);
>> if (!page) {
>> ret = -ENOMEM;
>> @@ -2957,8 +2958,13 @@ int ocfs2_duplicate_clusters_by_page(handle_t
*handle,
>> * In case PAGE_SIZE <= CLUSTER_SIZE, This page
>> * can't be dirtied before we CoW it out.
>> */
>> - if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize)
>> - BUG_ON(PageDirty(page));
>> + if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) {
>> + if (PageDirty(page)) {
>> + unlock_page(page);
>> + cond_resched();
>> + goto retry;
>> + }
>> + }
>>
>> if (!PageUptodate(page)) {
>> ret = block_read_full_page(page, ocfs2_get_block);
>
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
>