From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA795C48BCF for ; Sun, 13 Jun 2021 13:40:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A76CE6128B for ; Sun, 13 Jun 2021 13:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbhFMNm4 (ORCPT ); Sun, 13 Jun 2021 09:42:56 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:34572 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231846AbhFMNmz (ORCPT ); Sun, 13 Jun 2021 09:42:55 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 22FC921972; Sun, 13 Jun 2021 13:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1623591654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8BQUYBVQ/UYTbG0b/GxopWsB0aWx2Aoyv/KPIamnS/g=; b=qaYXaW7TgIyV22GjU2drkZE7psLE9n0CBMgRz0qV55nCiTmmZn8GlPwtkBM+VIOgjAVqw4 5sjRztpCCDpmkKCkRrXs0Jok9rKyW88SYob2qBt+f3jgW0OdsmtrWqkAkXPePjm0DKjYfu 3U+pDGJWGUN661ZWQKQK4qT0kh7T8qA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1623591654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8BQUYBVQ/UYTbG0b/GxopWsB0aWx2Aoyv/KPIamnS/g=; b=6cP0FydpyqqRu3iabGW7jaeeCqTuoSdDyK4hN+SwVGs3bWP8+o5hfkRRPeMH/5ZPTwhr17 m9ag0sSz8mFC+XAQ== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id BA5F4118DD; Sun, 13 Jun 2021 13:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1623591654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8BQUYBVQ/UYTbG0b/GxopWsB0aWx2Aoyv/KPIamnS/g=; b=qaYXaW7TgIyV22GjU2drkZE7psLE9n0CBMgRz0qV55nCiTmmZn8GlPwtkBM+VIOgjAVqw4 5sjRztpCCDpmkKCkRrXs0Jok9rKyW88SYob2qBt+f3jgW0OdsmtrWqkAkXPePjm0DKjYfu 3U+pDGJWGUN661ZWQKQK4qT0kh7T8qA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1623591654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8BQUYBVQ/UYTbG0b/GxopWsB0aWx2Aoyv/KPIamnS/g=; b=6cP0FydpyqqRu3iabGW7jaeeCqTuoSdDyK4hN+SwVGs3bWP8+o5hfkRRPeMH/5ZPTwhr17 m9ag0sSz8mFC+XAQ== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id 4RtTIeUKxmCGJAAALh3uQQ (envelope-from ); Sun, 13 Jun 2021 13:40:53 +0000 From: Goldwyn Rodrigues To: linux-btrfs@vger.kernel.org Cc: Goldwyn Rodrigues Subject: [RFC PATCH 19/31] btrfs: Add reservation information to btrfs_iomap Date: Sun, 13 Jun 2021 08:39:47 -0500 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goldwyn Rodrigues Move reservation information into btrfs_iomap. Signed-off-by: Goldwyn Rodrigues --- fs/btrfs/file.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 3d4b8fde47f4..ccae8ce7ec4f 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -63,6 +63,11 @@ struct btrfs_iomap { u64 lockend; struct extent_state *cached_state; int extents_locked; + + /* Reservation */ + bool metadata_only; + struct extent_changeset *data_reserved; + size_t reserved_bytes; }; static int __compare_inode_defrag(struct inode_defrag *defrag1, @@ -1630,12 +1635,10 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, struct inode *inode = file_inode(file); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct page **pages = NULL; - struct extent_changeset *data_reserved = NULL; u64 release_bytes = 0; size_t num_written = 0; int nrptrs; - ssize_t ret; - bool only_release_metadata = false; + int ret; loff_t old_isize = i_size_read(inode); unsigned int ilock_flags = 0; struct btrfs_iomap *bi = NULL; @@ -1673,14 +1676,12 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, } while (iov_iter_count(i) > 0) { - struct extent_state *cached_state = NULL; size_t offset = offset_in_page(pos); size_t sector_offset; size_t write_bytes = min(iov_iter_count(i), nrptrs * (size_t)PAGE_SIZE - offset); size_t num_pages; - size_t reserve_bytes; size_t dirty_pages; size_t copied; size_t dirty_sectors; @@ -1696,12 +1697,12 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, } bi->extents_locked = false; - only_release_metadata = false; + bi->metadata_only = false; sector_offset = pos & (fs_info->sectorsize - 1); - extent_changeset_release(data_reserved); + extent_changeset_release(bi->data_reserved); ret = btrfs_check_data_free_space(BTRFS_I(inode), - &data_reserved, pos, + &bi->data_reserved, pos, write_bytes); if (ret < 0) { /* @@ -1711,36 +1712,36 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, */ if (btrfs_check_nocow_lock(BTRFS_I(inode), pos, &write_bytes) > 0) - only_release_metadata = true; + bi->metadata_only = true; else break; } num_pages = DIV_ROUND_UP(write_bytes + offset, PAGE_SIZE); WARN_ON(num_pages > nrptrs); - reserve_bytes = round_up(write_bytes + sector_offset, + bi->reserved_bytes = round_up(write_bytes + sector_offset, fs_info->sectorsize); - WARN_ON(reserve_bytes == 0); + WARN_ON(bi->reserved_bytes == 0); ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), - reserve_bytes); + bi->reserved_bytes); if (ret) { - if (!only_release_metadata) + if (!bi->metadata_only) btrfs_free_reserved_data_space(BTRFS_I(inode), - data_reserved, pos, + bi->data_reserved, pos, write_bytes); else btrfs_check_nocow_unlock(BTRFS_I(inode)); break; } - release_bytes = reserve_bytes; + release_bytes = bi->reserved_bytes; if (pos < inode->i_size) { bi->lockstart = round_down(pos, fs_info->sectorsize); bi->lockend = round_up(pos + write_bytes, fs_info->sectorsize) - 1; btrfs_lock_and_flush_ordered_range(BTRFS_I(inode), bi->lockstart, bi->lockend, - &cached_state); + &bi->cached_state); bi->extents_locked = true; } @@ -1753,13 +1754,13 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, pos, write_bytes); if (ret) { btrfs_delalloc_release_extents(BTRFS_I(inode), - reserve_bytes); + bi->reserved_bytes); break; } copied = btrfs_copy_from_user(pos, write_bytes, pages, i); - num_sectors = BTRFS_BYTES_TO_BLKS(fs_info, reserve_bytes); + num_sectors = BTRFS_BYTES_TO_BLKS(fs_info, bi->reserved_bytes); dirty_sectors = round_up(copied + sector_offset, fs_info->sectorsize); dirty_sectors = BTRFS_BYTES_TO_BLKS(fs_info, dirty_sectors); @@ -1782,7 +1783,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, if (num_sectors > dirty_sectors) { /* release everything except the sectors we dirtied */ release_bytes -= dirty_sectors << fs_info->sectorsize_bits; - if (only_release_metadata) { + if (bi->metadata_only) { btrfs_delalloc_release_metadata(BTRFS_I(inode), release_bytes, true); } else { @@ -1792,7 +1793,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, fs_info->sectorsize) + (dirty_pages << PAGE_SHIFT); btrfs_delalloc_release_space(BTRFS_I(inode), - data_reserved, __pos, + bi->data_reserved, __pos, release_bytes, true); } } @@ -1802,7 +1803,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, ret = btrfs_dirty_pages(BTRFS_I(inode), pages, dirty_pages, pos, copied, - &cached_state, only_release_metadata); + &bi->cached_state, + bi->metadata_only); /* * If we have not locked the extent range, because the range's @@ -1819,14 +1821,14 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, free_extent_state(bi->cached_state); bi->extents_locked = false; - btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes); + btrfs_delalloc_release_extents(BTRFS_I(inode), bi->reserved_bytes); if (ret) { btrfs_drop_pages(pages, num_pages); break; } release_bytes = 0; - if (only_release_metadata) + if (bi->metadata_only) btrfs_check_nocow_unlock(BTRFS_I(inode)); btrfs_drop_pages(pages, num_pages); @@ -1850,7 +1852,6 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, btrfs_check_nocow_unlock(BTRFS_I(inode)); btrfs_iomap_release(inode, pos, release_bytes, bi); out: - kfree(bi); btrfs_inode_unlock(inode, ilock_flags); return num_written ? num_written : ret; } -- 2.31.1