Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbcD1VRy (ORCPT ); Thu, 28 Apr 2016 17:17:54 -0400 Received: from mga01.intel.com ([192.55.52.88]:27659 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753534AbcD1VR0 (ORCPT ); Thu, 28 Apr 2016 17:17:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,548,1455004800"; d="scan'208";a="942415564" From: Vishal Verma To: linux-nvdimm@ml01.01.org Cc: Vishal Verma , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, xfs@oss.sgi.com, linux-ext4@vger.kernel.org, linux-mm@kvack.org, Matthew Wilcox , Ross Zwisler , Dan Williams , Dave Chinner , Jan Kara , Jens Axboe , Al Viro , Andrew Morton , linux-kernel@vger.kernel.org, Christoph Hellwig , Jeff Moyer Subject: [PATCH v4 6/7] dax: for truncate/hole-punch, do zeroing through the driver if possible Date: Thu, 28 Apr 2016 15:16:57 -0600 Message-Id: <1461878218-3844-7-git-send-email-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461878218-3844-1-git-send-email-vishal.l.verma@intel.com> References: <1461878218-3844-1-git-send-email-vishal.l.verma@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2047 Lines: 70 In the truncate or hole-punch path in dax, we clear out sub-page ranges. If these sub-page ranges are sector aligned and sized, we can do the zeroing through the driver instead so that error-clearing is handled automatically. For sub-sector ranges, we still have to rely on clear_pmem and have the possibility of tripping over errors. Cc: Matthew Wilcox Cc: Dan Williams Cc: Ross Zwisler Cc: Jeff Moyer Cc: Christoph Hellwig Cc: Dave Chinner Cc: Jan Kara Signed-off-by: Vishal Verma --- fs/dax.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 5948d9b..d8c974e 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1196,6 +1196,20 @@ out: } EXPORT_SYMBOL_GPL(dax_pfn_mkwrite); +static bool dax_range_is_aligned(struct block_device *bdev, + struct blk_dax_ctl *dax, unsigned int offset, + unsigned int length) +{ + unsigned short sector_size = bdev_logical_block_size(bdev); + + if (((u64)dax->addr + offset) % sector_size) + return false; + if (length % sector_size) + return false; + + return true; +} + /** * dax_zero_page_range - zero a range within a page of a DAX file * @inode: The file being truncated @@ -1240,11 +1254,17 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, .size = PAGE_SIZE, }; - if (dax_map_atomic(bdev, &dax) < 0) - return PTR_ERR(dax.addr); - clear_pmem(dax.addr + offset, length); - wmb_pmem(); - dax_unmap_atomic(bdev, &dax); + if (dax_range_is_aligned(bdev, &dax, offset, length)) + return blkdev_issue_zeroout(bdev, dax.sector, + length / bdev_logical_block_size(bdev), + GFP_NOFS, true); + else { + if (dax_map_atomic(bdev, &dax) < 0) + return PTR_ERR(dax.addr); + clear_pmem(dax.addr + offset, length); + wmb_pmem(); + dax_unmap_atomic(bdev, &dax); + } } return 0; -- 2.5.5