From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.48 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794757230; b=0V9++DnaRL2GzsSNy9c2anfP8Kmz2WC8vBQosbBjt998SeZBqwM0U+euAGqOegYL4+xC ZlFXD54KpkA/zlep4EApsypa4YbGqSzGui0oQNGUxm/xy+ce9b6HUQlvHk7XSK7Mo7oRG nAeD3YYS+gJWb1ASQGPLnoB5rG5VB4KtS6JmA6UgF6PM/BNczOTMT5pomhRXf341VAZ7X 9MaUfiZDMBHOCm3ckm6lrusoNWSKTcgjGYRThgjNhpRRgWbnBSC1nk+QLnk1bpdjbRqZ3 /ipq6oXivGY4lpQOB8CzXllGt/DCqDg7uj0vqqBAD+y+nfWYp/yBHQbVgzmBU7TY23w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794757230; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=4ErK0DhGPoN6AMkphEoKsbtXWHONPX5ypGWn26lM2sI=; b=WTOc+bc56+odu7vhWIIiFg+Vv2vYrTakl4xf1II7/1bENpuj+5tDF3U4ckbTSaVflEs9 nXwUcz2EtDisjo7hh+EOaUjHrNHDqCRW6zBeyUQJP83cH8MXWt893Dkjcv6CoI6s7aJl5 VyBiR7uuId/FdWu2FhsEnQA1ugnxuD0AT3rKrPxXyPyaB5o6EaHTNZfAD6YRV7K01bU9o 6sRzsUdH+werUmWn/T7OPnbq5XJSiSCHxJL4TgazZSnUsQpwT/Acz73KOD4RRLHktjErN 1+MnfJD1HPA8/ZYpEEq8f026XjGHOvLSM9t42XIRgdRl0vzHkPeN70K+7+MrtuQs/pQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=diJHMPTA; arc=none smtp.remote-ip=209.85.128.48 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F15D4606A330 for ; Sun, 15 Nov 2026 15:40:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org F15D4606A330 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=diJHMPTA Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4a7a3b29c11so2805635e9.0 for ; Sun, 15 Nov 2026 07:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1794757228; x=1795362028; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4ErK0DhGPoN6AMkphEoKsbtXWHONPX5ypGWn26lM2sI=; b=diJHMPTAZDoVJB49WJJPHLnZ97nTmfnYJ9DMbJDtM1IF9eVP2TdHVE7NbZh9G4q/OR Jn3+jjofKncrT4eDNzrepxklK9Lgez7XdhzfCD8v70AlEt96OfZie+GSw2QkOdUOJUu7 vajHCpMhRrJGXFghAP3gkSlUJ3Zrc9S3//ZfB3e11gtV3yyKRnWAcMEr9PZTa/Qy0TSD 2hASFLqxxUS52e0O9EAx4cLzL9i/TwygqOTLSh0cXnPrOjjqrvtkVLmfLAQ/T9NQdzUf 4Wcek+xlTEZKBhUMvKjAU1M9Egu6hY78G2Ozam/YFH/hjkDUgaG6MbLnWa9qjz3KcN4l hR3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794757228; x=1795362028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4ErK0DhGPoN6AMkphEoKsbtXWHONPX5ypGWn26lM2sI=; b=V0A533cg9t6TbJFE+e7mg2WzMLAMVuYV+kle4ULX2+dINIBtiT5dIHZtAyh8LoZFIk 9t2ErJszjCWFaWqAoxSQKhoDrhvmziH9cMPS/kyv0gtt4eXxXFk7MXMYT2P60NYhHr9q CMQe3xMJsh3afz88ufaIrOqaRDedLpFFPAMe2lBJCwlNOhRviShblsei/faF1WJKCmMl zpvWjN2NHEulesAHx0MDNyf4dBCRwSzf8joClfe2sWm5qNYIIdrS+YizNpKjAShOd7aZ tnpu9+qbI8O72jv6X8ZD1Tkee2e9YFX/FSmykEz1Kr8S5/XnizXbhArnL1t5X45+TTU8 8GUQ== X-Forwarded-Encrypted: i=1; AL+hErE2J9+uBEK3tHjxqH4uoq90hEUWQYhQDpXzXxtKywZsUnPWMCyl2Z12TxcOyWt3zJ5BsT1PVx4x4RPCArk=@vger.kernel.org X-Gm-Message-State: APuU4Z8HhDl/axeWMMGef3eoWlfbQOdsVAdCqa/RNhD5odhHShbd8Ml9 6UGdOGg7obrZDG+PgxKJtPIDeEEUIfSm7PfkRwYe83cQfaDRY5lQVOqsrr6/8We0FwOtZr520yU BM66RqaA= X-Gm-Gg: AYBFou1W6dccou4BYG45AYXOnGKOOsG8uJvkb0h10kZistvnkKDwBf1jQQMlPTkh2fN y85dfA7WMFaHxw+cf1t9G1F+MTNHZ6rgdHyw7sX6nPAR69w58S5anI5Zf9B+1ua6kS/Vvpu7bx5 OMbkl5psc4VQQv7Qn4OGuT6XRSr6QrQn114ZizS8EnKJoj2FIKttnUYF6LCFWOHoL8PARkjDoD/ DoMB0ciQiMiyzolKbahUzuDhhOMLLQyWdjdLDyXkJxjbnSyNRVV+LfkxhL8BcisU0iWdeA8TLU9 XFvZl4mk24vCaepWyeyiL7EI5Y4vCB589r048fT3B5p9OXPEzY3VbSxnl534oVSwfuhnUvkKLcM z0pCMJVksWxsdDxX1b1XvtHcoCg7qPrvYCOvZZEbZeraars4cADYse11ptOD0aEeDDfMsgI8RiH fqP9lvhnTlMfiv+4NMyKuC4R1Keo0GOqfkiPMiakS6orR10VwCteO9VmXCf9yLfhnrdPKxw+deX KIRp/RMfE7LaTOFfv7Ty3pjhC8DamyCub0Nu8fCoiBiIwpEVUyy0dKD3l8vS7yS/J4dR7neZ0hS mVxTBKtUQtJB3U816em2kqxbFlZoG7xhAA7YjWvnNrP9Fuy1guOaueKzlrQuXzHiYA== X-Received: by 2002:a05:600d:644d:20b0:4a1:b027:99ef with SMTP id 5b1f17b1804b1-4bb55a3f05cmr136007195e9.2.1794757228191; Sun, 15 Nov 2026 07:40:28 -0800 (PST) Received: from localhost.localdomain ([202.127.77.110]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-379558231eesm25648733eec.12.2026.11.15.07.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 07:40:27 -0800 (PST) From: Heming Zhao To: joseph.qi@linux.alibaba.com, mark@fasheh.com, jlbec@evilplan.org, hch@lst.de Cc: Heming Zhao , ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH v6 2/3] ocfs2: switch DIO read path from buffer_head to iomap Date: Sun, 15 Nov 2026 23:40:10 +0800 Message-ID: <20261115154013.9379-3-heming.zhao@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261115154013.9379-1-heming.zhao@suse.com> References: <20261115154013.9379-1-heming.zhao@suse.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Migrates the DIO read path from the legacy buffer_head infrastructure to the modern and more efficient iomap framework. Under the current code, ocfs2 holds a cluster lock during DIO via ocfs2_iocb_set_rw_locked(), and releases the cluster lock in ocfs2_dio_end_io() via ocfs2_iocb_clear_rw_locked(). The lock level is stashed in iocb->private. However, iomap DIO owns that field (it stores a bio there for polled I/O and unconditionally clears it before calling ->end_io). Any side-channel state packed into iocb->private is corrupted, which trips the end_io lock-state check. Instead, encode the unlock level by passing distinct iomap_dio_ops methods (ocfs2_iomap_dio_ops_pr for PRMODE or ocfs2_iomap_dio_ops_ex for EXMODE). Additionally, the *_iter() functions use the split __iomap_dio_rw() + iomap_dio_complete() API so they can determine unambiguously, from the return value, whether the completion handler already dropped the lock (real I/O, sync or -EIOCBQUEUED) or whether the caller must drop it (no I/O issued, or buffered fallback). The new function ocfs2_iomap_begin() performs a similar role to ocfs2_get_block(). While ocfs2_get_block() retrieves only one block per call, ocfs2_iomap_begin() can handle multiple blocks at once. Limit the map offset and length in ocfs2_iomap_begin() to OCFS2_MAX_LOGICAL_BLOCK to avoid overflow issues. Co-developed-by: Joseph Qi Signed-off-by: Joseph Qi Signed-off-by: Heming Zhao --- fs/ocfs2/Kconfig | 1 + fs/ocfs2/aops.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/aops.h | 4 ++ fs/ocfs2/file.c | 60 +++++++++++++++++++++++++----- 4 files changed, 150 insertions(+), 12 deletions(-) diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig index 2514d36cbe01..bf1678a5eb01 100644 --- a/fs/ocfs2/Kconfig +++ b/fs/ocfs2/Kconfig @@ -7,6 +7,7 @@ config OCFS2_FS select CRC32 select QUOTA select QUOTA_TREE + select FS_IOMAP select FS_POSIX_ACL select LEGACY_DIRECT_IO help diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 28a13246e9fa..6158ab6515ad 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -39,6 +40,9 @@ #define OCFS2_DIO_MARK_EXTENT_BATCH 200 +int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, + int flags); + static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create) { @@ -126,6 +130,19 @@ static int ocfs2_lock_get_block(struct inode *inode, sector_t iblock, return ret; } +static int ocfs2_lock_map_blocks(struct inode *inode, + struct ocfs2_map_block *map, int flags) +{ + int ret = 0; + struct ocfs2_inode_info *oi = OCFS2_I(inode); + + down_read(&oi->ip_alloc_sem); + ret = ocfs2_map_blocks(inode, map, flags); + up_read(&oi->ip_alloc_sem); + + return ret; +} + /* ocfs2 never allocates in this function */ int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, int flags) @@ -173,8 +190,11 @@ int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, } } + past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode)); + if (!ocfs2_sparse_alloc(osb)) { - if (map->pblk == 0) { + /* detected a hole (unallocated extent) in a file */ + if (map->pblk == 0 && map->pblk < past_eof) { err = -EIO; mlog(ML_ERROR, "iblock = %llu p_blkno = %llu blkno=(%llu)\n", @@ -189,8 +209,6 @@ int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, } } - past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode)); - if (create && (map->lblk >= past_eof)) map->flags |= OCFS2_MAP_NEW; @@ -2534,6 +2552,79 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter) ocfs2_dio_end_io, 0); } +static int ocfs2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, + unsigned int flags, struct iomap *iomap, struct iomap *srcmap) +{ + int ret; + struct ocfs2_map_block map; + u8 blkbits = inode->i_blkbits; + u64 max_lblk = (inode->i_sb->s_maxbytes - 1) >> blkbits; + + if ((offset >> blkbits) > max_lblk) + return -EINVAL; + + /* + * Calculate the first and last logical blocks respectively. + */ + map.lblk = offset >> blkbits; + map.len = min_t(loff_t, (offset + length - 1) >> blkbits, + max_lblk) - map.lblk + 1; + map.flags = 0; + + if (flags & IOMAP_WRITE) { + return -EOPNOTSUPP; + } + + ret = ocfs2_lock_map_blocks(inode, &map, 0); + if (ret < 0) + return ret; + + iomap->bdev = inode->i_sb->s_bdev; + iomap->offset = (u64)map.lblk << blkbits; + iomap->length = (u64)map.len << blkbits; + + if (map.pblk == 0) { + iomap->type = IOMAP_HOLE; + iomap->addr = IOMAP_NULL_ADDR; + } else { + if (map.flags & OCFS2_MAP_UNWRITTEN) { + iomap->type = IOMAP_UNWRITTEN; + } else if (map.flags & OCFS2_MAP_MAPPED) { + iomap->type = IOMAP_MAPPED; + } else { + WARN_ON_ONCE(1); + return -EIO; + } + iomap->addr = (sector_t)map.pblk << blkbits; + } + + if (map.flags & OCFS2_MAP_NEW) + iomap->flags |= IOMAP_F_NEW; + + return 0; +} + +const struct iomap_ops ocfs2_iomap_ops = { + .iomap_begin = ocfs2_iomap_begin, +}; + +static int ocfs2_dio_end_io_r_pr(struct kiocb *iocb, ssize_t size, + int error, unsigned int flags) +{ + struct inode *inode = file_inode(iocb->ki_filp); + + if (error) + mlog_ratelimited(ML_ERROR, "Direct IO failed, bytes = %lld errno:%d", + (long long)size, error); + + ocfs2_rw_unlock(inode, 0); + + return error; +} + +const struct iomap_dio_ops ocfs2_iomap_dio_ops_r_pr = { + .end_io = ocfs2_dio_end_io_r_pr, +}; const struct address_space_operations ocfs2_aops = { .dirty_folio = block_dirty_folio, .read_folio = ocfs2_read_folio, diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h index 8dd6edd7c1a1..2fe3b39e02f7 100644 --- a/fs/ocfs2/aops.h +++ b/fs/ocfs2/aops.h @@ -7,6 +7,10 @@ #define OCFS2_AOPS_H #include +#include + +extern const struct iomap_ops ocfs2_iomap_ops; +extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_r_pr; int ocfs2_map_folio_blocks(struct folio *folio, u64 *p_blkno, struct inode *inode, unsigned int from, diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 82c88fa8e98f..39f4fa924351 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -2399,6 +2400,26 @@ static int ocfs2_prepare_inode_for_write(struct file *file, return ret; } +static bool ocfs2_should_use_dio(struct kiocb *iocb, struct iov_iter *iter, + struct inode *inode) +{ + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); + + /* + * Fallback to buffered I/O if we see an inode without + * extents. + */ + if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) + return false; + + /* Fallback to buffered I/O if we do not support append dio. */ + if (iocb->ki_pos + iter->count > i_size_read(inode) && + !ocfs2_supports_append_dio(osb)) + return false; + + return true; +} + static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) { @@ -2588,7 +2609,8 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, if (!direct_io && nowait) return -EOPNOTSUPP; - ocfs2_iocb_init_rw_locked(iocb); + if (!iov_iter_count(to)) + return 0; /* skip atime */ /* * buffered reads protect themselves in ->read_folio(). O_DIRECT reads @@ -2606,8 +2628,6 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, goto bail; } rw_level = 0; - /* communicate with ocfs2_dio_end_io */ - ocfs2_iocb_set_rw_locked(iocb, rw_level); } /* @@ -2628,17 +2648,39 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, } ocfs2_inode_unlock(inode, lock_level); - ret = generic_file_read_iter(iocb, to); + if (direct_io && ocfs2_should_use_dio(iocb, to, inode)) { + /* + * Use the split iomap DIO API so we can tell who owns the + * rw_lock on return; reads always hold it at PR level, dropped + * by ocfs2_iomap_dio_end_io_pr(). Call it directly rather than + * through generic_file_read_iter(): iomap advances iocb->ki_pos + * itself, so the generic helper would advance ki_pos twice. + */ + struct iomap_dio *dio; + + dio = __iomap_dio_rw(iocb, to, &ocfs2_iomap_ops, + &ocfs2_iomap_dio_ops_r_pr, 0, NULL, 0); + if (dio == NULL) { + /* No I/O issued; rw_lock still held. */ + ret = 0; + } else if (IS_ERR(dio)) { + ret = PTR_ERR(dio); + if (ret == -EIOCBQUEUED) + rw_level = -1; + } else { + ret = iomap_dio_complete(dio); + rw_level = -1; + } + /* never fall back to buffered read */ + } else { + iocb->ki_flags &= ~IOCB_DIRECT; + ret = generic_file_read_iter(iocb, to); + } trace_generic_file_read_iter_ret(ret); /* buffered aio wouldn't have proper lock coverage today */ BUG_ON(ret == -EIOCBQUEUED && !direct_io); - /* see ocfs2_file_write_iter */ - if (ret == -EIOCBQUEUED || !ocfs2_iocb_is_rw_locked(iocb)) { - rw_level = -1; - } - bail: if (rw_level != -1) ocfs2_rw_unlock(inode, rw_level); -- 2.55.0