From: Ross Zwisler Subject: [PATCH 1/7] ext2: tell DAX the size of allocation holes Date: Mon, 15 Aug 2016 13:09:12 -0600 Message-ID: <20160815190918.20672-2-ross.zwisler@linux.intel.com> References: <20160815190918.20672-1-ross.zwisler@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Theodore Ts'o , Andrew Morton , linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, Dave Chinner , linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, Andreas Dilger , Alexander Viro , Jan Kara , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <20160815190918.20672-1-ross.zwisler-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" List-Id: linux-ext4.vger.kernel.org When DAX calls ext2_get_block() and the file offset points to a hole we currently don't set bh_result->b_size. When we re-enable PMD faults DAX will need bh_result->b_size to tell it the size of the hole so it can decide whether to fault in a 4 KiB zero page or a 2 MiB zero page. For ext2 we always want DAX to use 4 KiB zero pages, so we just tell DAX that all holes are 4 KiB in size. Signed-off-by: Ross Zwisler --- fs/ext2/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index d5c7d09..c6d9763 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -773,6 +773,12 @@ int ext2_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_ if (ret > 0) { bh_result->b_size = (ret << inode->i_blkbits); ret = 0; + } else if (ret == 0 && IS_DAX(inode)) { + /* + * We have hit a hole. Tell DAX it is 4k in size so that it + * uses PTE faults. + */ + bh_result->b_size = PAGE_SIZE; } return ret; -- 2.9.0