On Tue, Aug 13, 2019 at 10:58:42PM +1000, Matthew Bobrowski wrote: > On Mon, Aug 12, 2019 at 10:34:29PM +0530, RITESH HARJANI wrote: > > > + if (offset + count > i_size_read(inode) || > > > + offset + count > EXT4_I(inode)->i_disksize) { > > > + ext4_update_i_disksize(inode, inode->i_size); > > > + extend = true; > > > + } > > > + > > > + ret = iomap_dio_rw(iocb, from, &ext4_iomap_ops, ext4_dio_write_end_io); > > > + > > > + /* > > > + * Unaligned direct AIO must be the only IO in flight or else > > > + * any overlapping aligned IO after unaligned IO might result > > > + * in data corruption. > > > + */ > > > + if (ret == -EIOCBQUEUED && (unaligned_aio || extend)) > > > + inode_dio_wait(inode); > > > > Could you please add explain & add a comment about why we wait in AIO DIO > > case > > when extend is true? As I see without iomap code this case was not present > > earlier. > > Because while using the iomap infrastructure for AIO writes, we return to the > caller prior to invoking the ->end_io() handler. This callback is responsible > for performing the in-core/on-disk inode extension if it is deemed > necessary. If we don't wait in the case of an extend, we run the risk of > loosing inode size consistencies in addition to things leading to possible > data corruption... > > > > + > > > + if (ret >= 0 && iov_iter_count(from)) { > > > + overwrite ? inode_unlock_shared(inode) : inode_unlock(inode); > > > + return ext4_buffered_write_iter(iocb, from); > > > + } > > should not we copy code from "__generic_file_write_iter" which does below? > > > > 3436 /* > > 3437 * We need to ensure that the page cache pages are > > written to > > 3438 * disk and invalidated to preserve the expected > > O_DIRECT > > 3439 * semantics. > > 3440 */ > > Hm, I don't see why this would be required seeing as though the page cache > invalidation semantics pre and post write are handled by iomap_dio_rw() and > iomap_dio_complete(). But, I could be completely wrong here, so we may need to > wait for some others to provide comments on this. iomap_dio_rw is supposed to zap the page cache before the write and again afterwards (and whine if someone is racing buffered and direct writes to the same file location), so ext4 shouldn't need to do that itself. --D > > > + WARN_ON(!(flags & IOMAP_DIRECT)); > > > + if (round_down(offset, i_blocksize(inode)) >= > > > + i_size_read(inode)) { > > > + ret = ext4_map_blocks(handle, inode, &map, > > > + EXT4_GET_BLOCKS_CREATE); > > > + } else if (!ext4_test_inode_flag(inode, > > > + EXT4_INODE_EXTENTS)) { > > > + /* > > > + * We cannot fill holes in indirect > > > + * tree based inodes as that could > > > + * expose stale data in the case of a > > > + * crash. Use magic error code to > > > + * fallback to buffered IO. > > > + */ > > > + ret = ext4_map_blocks(handle, inode, &map, 0); > > > + if (ret == 0) > > > + ret = -ENOTBLK; > > > + } else { > > > + ret = ext4_map_blocks(handle, inode, &map, > > > + EXT4_GET_BLOCKS_IO_CREATE_EXT); > > > + } > > > + } > > > > Could you please check & confirm on below points - > > 1. Do you see a problem @above in case of *overwrite* with extents mapping? > > It will fall into EXT4_GET_BLOCKS_IO_CREATE_EXT case. > > So are we piggy backing on the fact that ext4_map_blocks first call > > ext4_ext_map_blocks > > with flags & EXT4_GET_BLOCKS_KEEP_SIZE. And so for overwrite case since it > > will return > > val > 0 then we will anyway not create any blocks and so we don't need to > > check overwrite > > case specifically here? > > > > > > 2. For cases with flags passed is 0 to ext4_map_blocks (overwrite & > > fallocate without extent case), > > we need not start the journaling transaction. But in above we are doing > > ext4_journal_start/stop unconditionally > > & unnecessarily reserving dio_credits blocks. > > We need to take care of that right? > > Hm, I think you raise valid points here. > > Jan, do you have any comments on the above? I vaguely remember having a > discussion around dropping the overwrite checks in ext4_iomap_begin() as we're > removing the inode_lock() early on in ext4_dio_write_iter(), so it woudln't be > necessary to do so. But, now that Ritesh mentioned it again I'm thinking it > may actually be required... > > > > if (ret < 0) { > > > ext4_journal_stop(handle); > > > if (ret == -ENOSPC && > > > @@ -3581,10 +3611,10 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, > > > iomap->type = delalloc ? IOMAP_DELALLOC : IOMAP_HOLE; > > > iomap->addr = IOMAP_NULL_ADDR; > > > } else { > > > - if (map.m_flags & EXT4_MAP_MAPPED) { > > > - iomap->type = IOMAP_MAPPED; > > > - } else if (map.m_flags & EXT4_MAP_UNWRITTEN) { > > > + if (map.m_flags & EXT4_MAP_UNWRITTEN) { > > > iomap->type = IOMAP_UNWRITTEN; > > > + } else if (map.m_flags & EXT4_MAP_MAPPED) { > > > + iomap->type = IOMAP_MAPPED; > > Maybe a comment as to explaining why checking UNWRITTEN before is necessary > > for others. > > So in case of fallocate & DIO write case we may get extent which is both > > unwritten & mapped (right?). > > so we need to check if we have an unwritten extent first so that it will > > need the conversion in ->end_io > > callback. > > Yes, that is essentially correct. > > --M