search for: ocfs2_file_aio_writ

...s.h +++ b/fs/ocfs2/aops.h @@ -74,7 +74,7 @@ static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level) /* * Using a named enum representing lock types in terms of #N bit stored in * iocb->private, which is going to be used for communication between - * ocfs2_dio_end_io() and ocfs2_file_aio_write/read(). + * ocfs2_dio_end_io() and ocfs2_file_write/read_iter(). */ enum ocfs2_iocb_lock_bits { OCFS2_IOCB_RW_LOCK = 0, diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 41000f2..d2d203b 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2220,15 +2220,13 @@ out: return ret; } -sta...

...s.h +++ b/fs/ocfs2/aops.h @@ -72,7 +72,7 @@ static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level) /* * Using a named enum representing lock types in terms of #N bit stored in * iocb->private, which is going to be used for communication between - * ocfs2_dio_end_io() and ocfs2_file_aio_write/read(). + * ocfs2_dio_end_io() and ocfs2_file_write/read_iter(). */ enum ocfs2_iocb_lock_bits { OCFS2_IOCB_RW_LOCK = 0, diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 37d313e..94fc309 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2219,15 +2219,13 @@ out: return ret; } -sta...

In ocfs2_file_aio_write, it does ocfs2_rw_lock first and then ocfs2_inode_lock. But if ocfs2_inode_lock failed, it goes to out_sems without unlocking rw lock. This will cause a bug in ocfs2_lock_res_free when testing res->l_ex_holders, which is increased in __ocfs2_cluster_lock and decreased in __ocfs2_cluster_unlock....

in ocfs2_file_aio_write(), log_exit() could don't log the value which is really returned. this patch fixes it. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/file.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 62442...

...2 changes: - update the patch header of the first patch to make it more clear. This patch list fixes an issue about ocfs2 aio/dio write process hang. The call trace is like this: @ cat /proc/15913/stack @ [<ffffffffa06e1085>] ocfs2_aiodio_wait+0x85/0xc0 [ocfs2] @ [<ffffffffa06e3e39>] ocfs2_file_aio_write+0x99/0xa0 [ocfs2] @ [<ffffffff811ace97>] aio_rw_vect_retry+0x87/0x150 @ [<ffffffff811aebd1>] aio_run_iocb+0x71/0x170 @ [<ffffffff811af59b>] io_submit_one+0x1ab/0x280 @ [<ffffffff811af77c>] do_io_submit+0x10c/0x1c0 @ [<ffffffff811af840>] sys_io_submit+0x10/0x20 @ [<...

...0 [79915.815111] ffffffff00000001 0000000000000000 00000000ffffffff 0000000000000000 [79915.815113] Call Trace: [79915.815139] [<ffffffff8042978d>] __mutex_lock_slowpath+0x64/0x9b [79915.815145] [<ffffffff804295f2>] mutex_lock+0xa/0xb [79915.815167] [<ffffffffa03ad83d>] :ocfs2:ocfs2_file_aio_write+0x187/0x562 [79915.815171] [<ffffffff802aca5a>] find_inode+0x28/0x6d [79915.815177] [<ffffffff802acb89>] ifind+0x44/0x88 [79915.815181] [<ffffffff802ad42c>] iget5_locked+0x46/0x176 [79915.815193] [<ffffffffa03afd91>] :ocfs2:ocfs2_init_locked_inode+0x0/0xca [79915.815207...

Former logic of ocfs2_file_aio_write() was a bit stricky to unlock the rw_lock and i_alloc_sem, by using some private bits in struct 'iocb' to communite with ocfs2_dio_end_io(), it did work before we introduce the patch of supporting 'coherency=full,buffered' option, since rw_lock and i_alloc_sem were never acquired b...

...kernel: [678904.825342] [<ffffffff8115342b>] generic_file_buffered_write+0xfb/0x280 > Aug 11 11:32:25 cvknode73 kernel: [678904.825370] [<ffffffffa051a1c5>] ? ocfs2_rw_lock+0x75/0x1b0 [ocfs2] > Aug 11 11:32:25 cvknode73 kernel: [678904.825398] [<ffffffffa0527f3f>] ocfs2_file_aio_write+0x79f/0x830 [ocfs2] > Aug 11 11:32:25 cvknode73 kernel: [678904.825407] [<ffffffff811c14ba>] do_sync_write+0x5a/0x90 > Aug 11 11:32:25 cvknode73 kernel: [678904.825413] [<ffffffff811c1fc5>] vfs_write+0xc5/0x1f0 > Aug 11 11:32:25 cvknode73 kernel: [678904.825418]...

...73 kernel: [678904.825342] [<ffffffff8115342b>] generic_file_buffered_write+0xfb/0x280 > Aug 11 11:32:25 cvknode73 kernel: [678904.825370] [<ffffffffa051a1c5>] ? ocfs2_rw_lock+0x75/0x1b0 [ocfs2] > Aug 11 11:32:25 cvknode73 kernel: [678904.825398] [<ffffffffa0527f3f>] ocfs2_file_aio_write+0x79f/0x830 [ocfs2] > Aug 11 11:32:25 cvknode73 kernel: [678904.825407] [<ffffffff811c14ba>] do_sync_write+0x5a/0x90 > Aug 11 11:32:25 cvknode73 kernel: [678904.825413] [<ffffffff811c1fc5>] vfs_write+0xc5/0x1f0 > Aug 11 11:32:25 cvknode73 kernel: [678904.825418] [&...

...19 14:22:45 posta2 kernel: [885017.413900] [<ffffffff810fa1a2>] generic_perform_write+0xc2/0x1c0 Jun 19 14:22:45 posta2 kernel: [885017.413907] [<ffffffff810fa301>] generic_file_buffered_write+0x61/0xa0 Jun 19 14:22:45 posta2 kernel: [885017.413936] [<ffffffffa050055f>] ocfs2_file_aio_write+0x92f/0x960 [ocfs2] Jun 19 14:22:45 posta2 kernel: [885017.413966] [<ffffffff8115d478>] do_sync_write+0xc8/0x110 Jun 19 14:22:45 posta2 kernel: [885017.413972] [<ffffffff8115daae>] vfs_write+0xce/0x140 Jun 19 14:22:45 posta2 kernel: [885017.413977] [<ffffffff8115dc23>]...

...H3CRDS11-RD kernel: [17509.034991] [<ffffffffa053d9b9>] ? ocfs2_inode_unlock+0xb9/0x130 [ocfs2] Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.034998] [<ffffffff811176cd>] generic_file_buffered_write+0x5d/0x90 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035023] [<ffffffffa054c601>] ocfs2_file_aio_write+0x821/0x870 [ocfs2] Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035032] [<ffffffff81177342>] do_sync_write+0xd2/0x110 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035043] [<ffffffff812d7448>] ? apparmor_file_permission+0x18/0x20 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035052] [<f...

...H3CRDS11-RD kernel: [17509.034991] [<ffffffffa053d9b9>] ? ocfs2_inode_unlock+0xb9/0x130 [ocfs2] Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.034998] [<ffffffff811176cd>] generic_file_buffered_write+0x5d/0x90 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035023] [<ffffffffa054c601>] ocfs2_file_aio_write+0x821/0x870 [ocfs2] Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035032] [<ffffffff81177342>] do_sync_write+0xd2/0x110 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035043] [<ffffffff812d7448>] ? apparmor_file_permission+0x18/0x20 Jun 20 20:42:01 H3CRDS11-RD kernel: [17509.035052] [<f...

...extend Tao Ma (3): ocfs2: Add extra credits and access the modified bh in update_edge_lengths. ocfs2: Use ocfs2_rec_clusters in ocfs2_adjust_adjacent_records. ocfs2/quota: Release lock for error in ocfs2_quota_write. Wengang Wang (3): ocfs2: log the actual return value of ocfs2_file_aio_write() ocfs2: Fix error return in ocfs2_write_cluster() ocfs2: Fail ocfs2_get_block() immediately when a block needs allocation fs/ocfs2/alloc.c | 47 +++++++++++++-- fs/ocfs2/aops.c | 69 ++++++++++++++++------- fs/ocfs2/dcache.c | 35 +++++++++--- fs/...

...<ffffffff8115342b>] generic_file_buffered_write+0xfb/0x280 >> > Aug 11 11:32:25 cvknode73 kernel: [678904.825370] [<ffffffffa051a1c5>] ? ocfs2_rw_lock+0x75/0x1b0 [ocfs2] >> > Aug 11 11:32:25 cvknode73 kernel: [678904.825398] [<ffffffffa0527f3f>] ocfs2_file_aio_write+0x79f/0x830 [ocfs2] >> > Aug 11 11:32:25 cvknode73 kernel: [678904.825407] [<ffffffff811c14ba>] do_sync_write+0x5a/0x90 >> > Aug 11 11:32:25 cvknode73 kernel: [678904.825413] [<ffffffff811c1fc5>] vfs_write+0xc5/0x1f0 >> > Aug 11 11:...

...1 11:32:25 cvknode73 kernel: [678904.825342] [<ffffffff8115342b>] generic_file_buffered_write+0xfb/0x280 Aug 11 11:32:25 cvknode73 kernel: [678904.825370] [<ffffffffa051a1c5>] ? ocfs2_rw_lock+0x75/0x1b0 [ocfs2] Aug 11 11:32:25 cvknode73 kernel: [678904.825398] [<ffffffffa0527f3f>] ocfs2_file_aio_write+0x79f/0x830 [ocfs2] Aug 11 11:32:25 cvknode73 kernel: [678904.825407] [<ffffffff811c14ba>] do_sync_write+0x5a/0x90 Aug 11 11:32:25 cvknode73 kernel: [678904.825413] [<ffffffff811c1fc5>] vfs_write+0xc5/0x1f0 Aug 11 11:32:25 cvknode73 kernel: [678904.825418] [<ffffffff811c24c2>] Sy...

...1 11:32:25 cvknode73 kernel: [678904.825342] [<ffffffff8115342b>] generic_file_buffered_write+0xfb/0x280 Aug 11 11:32:25 cvknode73 kernel: [678904.825370] [<ffffffffa051a1c5>] ? ocfs2_rw_lock+0x75/0x1b0 [ocfs2] Aug 11 11:32:25 cvknode73 kernel: [678904.825398] [<ffffffffa0527f3f>] ocfs2_file_aio_write+0x79f/0x830 [ocfs2] Aug 11 11:32:25 cvknode73 kernel: [678904.825407] [<ffffffff811c14ba>] do_sync_write+0x5a/0x90 Aug 11 11:32:25 cvknode73 kernel: [678904.825413] [<ffffffff811c1fc5>] vfs_write+0xc5/0x1f0 Aug 11 11:32:25 cvknode73 kernel: [678904.825418] [<ffffffff811c24c2>] Sy...

...hain+0x131c/0x165c [ocfs2] .ocfs2_claim_suballoc_bits+0xadc/0xd94 [ocfs2] .__ocfs2_claim_clusters+0x1b0/0x348 [ocfs2] .ocf2_do_extend_allocation+0x1f8/0x5b4 [ocfs2] .ocfs2_write_cluster_by_desc+0x128/0x850 [ocfs2] .ocfs2_write_begin_nolock+0xdc0/0xfbc [ocfs2] .ocfs2_write_begin+0x124/0x224 [ocfs2] .ocfs2_file_aio_write+0x6a4/0xb40 [ocfs2] .aio_pwrite+0x50/0xb4 .aio_run_iocb+0x140/0x214 .io_submit_one+0x2fc/0x3a8 .sys_io_submit+0xd0/0x17c syscall_exit+0x0/0x40 In the last crash case, the file system was full. Any clues? There seems to be a ocfs2 kernel patch some time ago for the 2.6.20.2 kernel that fixed som...

...f802608a9>] generic_file_buffered_write+0x132/0x2ee [<ffffffff8029ac8a>] mnt_want_write+0x10/0x80 [<ffffffff80260f50>] __generic_file_aio_write_nolock+0x34c/0x380 [<ffffffff8026162b>] generic_file_aio_write_nolock+0x33/0x7f [<ffffffffa02f4a43>] ocfs2_file_aio_write+0x438/0x558 [ocfs2] [<ffffffff80286e7a>] do_sync_write+0xce/0x113 [<ffffffff80221336>] do_page_fault+0x442/0x7bc [<ffffffff80240db5>] autoremove_wake_function+0x0/0x2e [<ffffffff802876c5>] vfs_write+0xad/0x123 [<ffffffff802877f7>] sy...

...In function `ocfs2_file_aio_read': /data/images/keymaker/home/accountadmin/ocfs2-1.2.6/fs/ocfs2/aio.c:281: warning: passing arg 2 of `generic_file_aio_read' from incompatible pointer type /data/images/keymaker/home/accountadmin/ocfs2-1.2.6/fs/ocfs2/aio.c: In function `ocfs2_file_aio_write': /data/images/keymaker/home/accountadmin/ocfs2-1.2.6/fs/ocfs2/aio.c:381: warning: passing arg 4 of `generic_file_aio_write_nolock' makes integer from pointer without a cast CC [M] /data/images/keymaker/home/accountadmin/ocfs2-1.2.6/fs/ocfs2/alloc.o In file inclu...

i_alloc_sem has always been a bit of an odd "lock". It''s the only remaining rw_semaphore that can be released by a different thread than the one that locked it, and it''s use case in the core direct I/O code is more like a counter given that the writers already have external serialization. This series removes it in favour of a simpler counter scheme, thus getting rid