From patchwork Mon Jul 4 04:34:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 9211609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1AFC060467 for ; Mon, 4 Jul 2016 04:36:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C5B32862D for ; Mon, 4 Jul 2016 04:36:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F36E32863D; Mon, 4 Jul 2016 04:36:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A0AA2862D for ; Mon, 4 Jul 2016 04:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbcGDEgF (ORCPT ); Mon, 4 Jul 2016 00:36:05 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:60843 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720AbcGDEgC (ORCPT ); Mon, 4 Jul 2016 00:36:02 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u644Yh2D015873 for ; Mon, 4 Jul 2016 00:36:02 -0400 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0a-001b2d01.pphosted.com with ESMTP id 23x9ppexy4-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 04 Jul 2016 00:36:02 -0400 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Jul 2016 00:36:01 -0400 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 4 Jul 2016 00:35:58 -0400 X-IBM-Helo: d01dlp01.pok.ibm.com X-IBM-MailFrom: chandan@linux.vnet.ibm.com Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 00C6B38C8046; Mon, 4 Jul 2016 00:35:58 -0400 (EDT) Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u644a0XA11076022; Mon, 4 Jul 2016 04:36:00 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C5381AC041; Mon, 4 Jul 2016 00:35:57 -0400 (EDT) Received: from localhost.in.ibm.com (unknown [9.124.208.86]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 0213FAC040; Mon, 4 Jul 2016 00:35:55 -0400 (EDT) From: Chandan Rajendra To: clm@fb.com, jbacik@fb.com, dsterba@suse.com Cc: Chandan Rajendra , linux-btrfs@vger.kernel.org Subject: [PATCH V20 16/19] Btrfs: subpage-blocksize: Make file extent relocate code subpage blocksize aware Date: Mon, 4 Jul 2016 10:04:36 +0530 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467606879-14181-1-git-send-email-chandan@linux.vnet.ibm.com> References: <1467606879-14181-1-git-send-email-chandan@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070404-0056-0000-0000-000000B102A9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070404-0057-0000-0000-000004CAFFDA Message-Id: <1467606879-14181-17-git-send-email-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-04_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607040043 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The file extent relocation code currently assumes blocksize to be same as PAGE_SIZE. This commit adds code to support subpage blocksize scenario. Signed-off-by: Chandan Rajendra --- fs/btrfs/relocation.c | 89 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 19 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 05b88f8..fc0ac5d 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3106,14 +3106,19 @@ static int relocate_file_extent_cluster(struct inode *inode, { u64 page_start; u64 page_end; + u64 block_start; u64 offset = BTRFS_I(inode)->index_cnt; + u64 blocksize = BTRFS_I(inode)->root->sectorsize; + u64 reserved_space; unsigned long index; unsigned long last_index; struct page *page; struct file_ra_state *ra; gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping); + int nr_blocks; int nr = 0; int ret = 0; + int i; if (!cluster->nr) return 0; @@ -3133,13 +3138,19 @@ static int relocate_file_extent_cluster(struct inode *inode, if (ret) goto out; + page_start = cluster->start - offset; + page_end = min_t(u64, round_down(page_start, PAGE_SIZE) + PAGE_SIZE - 1, + cluster->end - offset); + index = (cluster->start - offset) >> PAGE_SHIFT; last_index = (cluster->end - offset) >> PAGE_SHIFT; while (index <= last_index) { - ret = btrfs_delalloc_reserve_metadata(inode, PAGE_SIZE); + reserved_space = page_end - page_start + 1; + + ret = btrfs_delalloc_reserve_metadata(inode, reserved_space); if (ret) goto out; - +again: page = find_lock_page(inode->i_mapping, index); if (!page) { page_cache_sync_readahead(inode->i_mapping, @@ -3149,7 +3160,7 @@ static int relocate_file_extent_cluster(struct inode *inode, mask); if (!page) { btrfs_delalloc_release_metadata(inode, - PAGE_SIZE); + reserved_space); ret = -ENOMEM; goto out; } @@ -3161,6 +3172,37 @@ static int relocate_file_extent_cluster(struct inode *inode, last_index + 1 - index); } + if (PageDirty(page)) { + u64 pg_offset = page_offset(page); + + unlock_page(page); + put_page(page); + ret = btrfs_fdatawrite_range(inode, pg_offset, + page_start - 1); + if (ret) { + btrfs_delalloc_release_metadata(inode, + reserved_space); + goto out; + } + + ret = filemap_fdatawait_range(inode->i_mapping, + pg_offset, page_start - 1); + if (ret) { + btrfs_delalloc_release_metadata(inode, + reserved_space); + goto out; + } + + goto again; + } + + if (BTRFS_I(inode)->root->sectorsize < PAGE_SIZE) { + ClearPageUptodate(page); + if (page->private) + clear_page_blks_state(page, 1 << BLK_STATE_UPTODATE, + page_start, page_end); + } + if (!PageUptodate(page)) { btrfs_readpage(NULL, page); lock_page(page); @@ -3168,41 +3210,50 @@ static int relocate_file_extent_cluster(struct inode *inode, unlock_page(page); put_page(page); btrfs_delalloc_release_metadata(inode, - PAGE_SIZE); + reserved_space); ret = -EIO; goto out; } } - page_start = page_offset(page); - page_end = page_start + PAGE_SIZE - 1; - lock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end); set_page_extent_mapped(page); - if (nr < cluster->nr && - page_start + offset == cluster->boundary[nr]) { - set_extent_bits(&BTRFS_I(inode)->io_tree, - page_start, page_end, - EXTENT_BOUNDARY); - nr++; + nr_blocks = (page_end + 1 - page_start) >> inode->i_blkbits; + + block_start = page_start; + for (i = 0; i < nr_blocks; i++) { + if (nr < cluster->nr && + block_start + offset == cluster->boundary[nr]) { + set_extent_bits(&BTRFS_I(inode)->io_tree, + block_start, block_start + blocksize - 1, + EXTENT_BOUNDARY); + nr++; + } + + block_start += blocksize; } btrfs_set_extent_delalloc(inode, page_start, page_end, NULL); - set_page_blks_state(page, - 1 << BLK_STATE_DIRTY | 1 << BLK_STATE_UPTODATE, - page_start, page_end); - set_page_dirty(page); + if (blocksize < PAGE_SIZE) + set_page_blks_state(page, + 1 << BLK_STATE_DIRTY | 1 << BLK_STATE_UPTODATE, + page_start, page_end); - unlock_extent(&BTRFS_I(inode)->io_tree, - page_start, page_end); + unlock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end); + + set_page_dirty(page); unlock_page(page); put_page(page); index++; balance_dirty_pages_ratelimited(inode->i_mapping); btrfs_throttle(BTRFS_I(inode)->root); + + page_start = page_end + 1; + page_end = min_t(u64, page_start + PAGE_SIZE - 1, + cluster->end - offset); } WARN_ON(nr != cluster->nr); out: