From patchwork Thu Aug 15 21:04:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 11096471 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F55956FF for ; Thu, 15 Aug 2019 21:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 015671FF40 for ; Thu, 15 Aug 2019 21:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E98AA204FF; Thu, 15 Aug 2019 21:04:22 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 DCA871FF82 for ; Thu, 15 Aug 2019 21:04:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732117AbfHOVEU (ORCPT ); Thu, 15 Aug 2019 17:04:20 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33320 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731891AbfHOVEU (ORCPT ); Thu, 15 Aug 2019 17:04:20 -0400 Received: by mail-pf1-f193.google.com with SMTP id g2so1958277pfq.0 for ; Thu, 15 Aug 2019 14:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yb5MuXDtp5/ug4m1ACXUxjVR5CvLpRxfqu2oJ4pk/yA=; b=rTJMEsfkXYJfdfbByBhO81xJgi+7r2etgFiG5b0yxq6AXcccarzzVCzNjiQfo8C41C ET0Rxf/vYHvTBlQpWb442SL3uku1euWSzWmMimDMdvx4L716e/UAUOrt3iFThQZaCB0g xORYRl8fJD29soY232uysJQBVmYhdBNlgRJVBvtjuZxL28tdtS/ra4uu5AYMZoZif/4n WbNpbBV9WKoc3HIxyPLT2Il0X3XlAiM4fEQ61FSroddADwq+q8HEMt3DKpoGGv9zYvMF IuiRG1nXw9Do5qJgOUJTOyvCNZoVKHjQysfrGUFes6hg8a1avsaM1WEKMjt++Cl3kQtB s5bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yb5MuXDtp5/ug4m1ACXUxjVR5CvLpRxfqu2oJ4pk/yA=; b=BGQmHNZK9tD3d3uiCDvS6xUARtGXkwJoyIdIat9/IMhNfBjOgcHh5VV6EIrVY3S2pS wT2uac6fz4F2ZRPFfLiD1SxhLYJSuq3epPuOwFOcmimRZc7zs2wis6VkAvTsnJGzNQ0j PeDDj7AhLQK5RdKOhmI3OCszdgS9pENkiJ3MCevW7FB18WRBWDW4Y953ErXacTLTkZYS +8uT0jHo7lDGGE6xPJdbCXKYkz/EqIlT2mYlXMIxbAo4lEerf5qR4tTfUqhJYhi4nhMM qfgNxdA64gZb2LRPXyGZ4VhsleuXNIid6/TfyZrdSdXI7Gc0+qjlJ8fH4aQ/oSMwWseR UACA== X-Gm-Message-State: APjAAAWl+L+kERpJvzT7zF3mVEDI6uMeX1eIMpmxwioLCGDH/WyBLxgW JnNCK3tjmtpwAtham/w5GONJzqxGvKw= X-Google-Smtp-Source: APXvYqyka8tU+/79QeTkjlIBe+kdEzZihNcKKtUwtRCf/pDfR6HflDBMb2bUmp8QKqb1RIhZvM422Q== X-Received: by 2002:a62:7789:: with SMTP id s131mr7351815pfc.50.1565903059178; Thu, 15 Aug 2019 14:04:19 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::3:2aa9]) by smtp.gmail.com with ESMTPSA id i124sm4073230pfe.61.2019.08.15.14.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 14:04:18 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 1/5] Btrfs: use correct count in btrfs_file_write_iter() Date: Thu, 15 Aug 2019 14:04:02 -0700 Message-Id: <06b24b06988a5fac5881a0eef613aa2ef0c63834.1565900769.git.osandov@fb.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: References: MIME-Version: 1.0 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 From: Omar Sandoval generic_write_checks() may modify iov_iter_count(), so we must get the count after the call, not before. Using the wrong one has a couple of consequences: 1. We check a longer range in check_can_nocow() for nowait than we're actually writing. 2. We create extra hole extent maps in btrfs_cont_expand(). As far as I can tell, this is harmless, but I might be missing something. These issues are pretty minor, but let's fix it before something more important trips on it. Fixes: edf064e7c6fe ("btrfs: nowait aio support") Signed-off-by: Omar Sandoval Reviewed-by: Josef Bacik --- fs/btrfs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index b31991f0f440..4393b6b24e02 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1885,7 +1885,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host); ssize_t err; loff_t pos; - size_t count = iov_iter_count(from); + size_t count; loff_t oldsize; int clean_page = 0; @@ -1906,6 +1906,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, } pos = iocb->ki_pos; + count = iov_iter_count(from); if (iocb->ki_flags & IOCB_NOWAIT) { /* * We will allocate space in case nodatacow is not set, From patchwork Thu Aug 15 21:04:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 11096473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E33CD13A0 for ; Thu, 15 Aug 2019 21:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5AEB1FF40 for ; Thu, 15 Aug 2019 21:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C993A204FF; Thu, 15 Aug 2019 21:04:23 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 7CCCA1FF40 for ; Thu, 15 Aug 2019 21:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732901AbfHOVEW (ORCPT ); Thu, 15 Aug 2019 17:04:22 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:41332 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731891AbfHOVEV (ORCPT ); Thu, 15 Aug 2019 17:04:21 -0400 Received: by mail-pg1-f196.google.com with SMTP id x15so1825642pgg.8 for ; Thu, 15 Aug 2019 14:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nzvhP7oZSYNZD4sI7ZmaVO+DL6Z60759QPD7Y9bxg2E=; b=mOhSs+ZS/1ya+QNErGzP9WnCDoaEvfOdZ7wmbPtPr+axBCingCGhGjepwIzrZxZpNc 6kGVPVBkMEnxnKGU6fWOd5+PZcGU/EO0vlANhkgD2u7JxJHU9UvCk3gm/50PfrYZwRel rIKiq+8geebbIDOQn/+qyzdT754OzR18QIdlDWhM4pp9urMc3CtCijVG9LuqcmxfLR2U wHHosJYHoCLhOcCiihXCkv76VHT56PfyxuE6GiQVSIyfzxsritLoYj97T6yVtjHLOBrx qeWjWdax8F1pM0u4xIf9u/bAOg5Y43+epxG4tssD08szZEVI9gkxi3PanN5kjZa04p02 FdwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nzvhP7oZSYNZD4sI7ZmaVO+DL6Z60759QPD7Y9bxg2E=; b=ZvP4SyhzhV+y+g4qWHe2pfIEz5T8xJjRbtUxa7aOefaQ9VRI4avUxgRs+9Lp6V3N20 H16imBNt050Zw7FSRCr3Eks1aWQX1oW7H1nMpusJGkhhRi0RT+CliQKCSPc/T7C+yqRo dvXo3gdBE+9ip2J/s/NVatc2hBx7OpoYBZxDsDbGA6KjyRiNKOsd1a5nLHJVKlawzYcC ED52nWM8U1yQ6jRKyzaNb+jpGbuavDYJnji/AXfSEgiQ5rJh1bzokqU2IE1DAmqI+zDE aOIh5zNSnZ4eSCKro16sPk+ORQvRB3Sf/j1b0FV76aQbur8GLi6x0X8ZT04cpPTw7Ijm nxPw== X-Gm-Message-State: APjAAAUFojYOYuEfQGxOdjgTvTm8Yg7QFE3SxXO/7L7LAFu8yvlvaETA 7OA1aonY+bilm+Rc80kSwggVnVWJP0E= X-Google-Smtp-Source: APXvYqw8OHfPtIAkwUnd7GuwbzgEJ5ce99a4V8KpIEeybYfQ5srIn/0ICHv+qPn8izutyjTcN4eZlg== X-Received: by 2002:aa7:9293:: with SMTP id j19mr7607913pfa.90.1565903060267; Thu, 15 Aug 2019 14:04:20 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::3:2aa9]) by smtp.gmail.com with ESMTPSA id i124sm4073230pfe.61.2019.08.15.14.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 14:04:19 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 2/5] Btrfs: treat RWF_{,D}SYNC writes as sync for CRCs Date: Thu, 15 Aug 2019 14:04:03 -0700 Message-Id: X-Mailer: git-send-email 2.22.1 In-Reply-To: References: MIME-Version: 1.0 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 From: Omar Sandoval In btrfs_file_write_iter(), we treat a write as synchrononous if the file is marked as synchronous. However, with pwritev2(), a write with RWF_SYNC or RWF_DSYNC is also synchronous even if the file isn't by default. Make sure we bump the sync_writers counter in that case, too, so that we'll do the CRCs synchronously. Signed-off-by: Omar Sandoval Reviewed-by: Josef Bacik --- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 4393b6b24e02..27223753da7b 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1882,7 +1882,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, u64 start_pos; u64 end_pos; ssize_t num_written = 0; - bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host); + bool sync = iocb->ki_flags & IOCB_DSYNC; ssize_t err; loff_t pos; size_t count; From patchwork Thu Aug 15 21:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 11096475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0987B13A0 for ; Thu, 15 Aug 2019 21:04:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF4A81FF40 for ; Thu, 15 Aug 2019 21:04:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3D33204FF; Thu, 15 Aug 2019 21:04:24 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 2831F1FF40 for ; Thu, 15 Aug 2019 21:04:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731303AbfHOVEX (ORCPT ); Thu, 15 Aug 2019 17:04:23 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42205 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732124AbfHOVEW (ORCPT ); Thu, 15 Aug 2019 17:04:22 -0400 Received: by mail-pf1-f193.google.com with SMTP id i30so1926817pfk.9 for ; Thu, 15 Aug 2019 14:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QQD1Wzh+eK794Ap752FKwUYZlZQqcmk1MAQEbQF6Cfs=; b=Qb/Cna7hlQtJp4MOaWoONYB7V/Md5Jly/TUSenRnJGPaFK3oXo3dEJdQc7yvXRU6Yp pAMxRRhE0nn6lJ8gt3ZWdsWo/VHvGPb2kl18iuGuw88EaXkakcLPz3R7jSyOrsysLSlR oGbArVhQ5i9DForD4RSS5nMCp7UH0ouI49UNkIUgNbSvc8FO9UUhQj4T7ywNsIXnrQQV 8Nhi1ssGM05v5fmUMbuH/EoRtzODo3Evmvxeb7mLaF1E0+5dE09J9reG2HheuHtdRVK2 sGr2+FIaaYFxY2UVx/nEQ0AxG/kCwNfQofp9uBOuYvtkVeRKUcExBB+q94XrmejN60Es 7ldQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QQD1Wzh+eK794Ap752FKwUYZlZQqcmk1MAQEbQF6Cfs=; b=eq3mI7U7deBb+SCbH+4t+uUSGmVO9zMhaoHwNnAFlIm5ExWDa3hCPIA57cIHVFwolF O/FLq0xkIODDoOzwfUNNOL3ZFByJMuMk44dIzzeG20tCTfuxvqB+0FhTGr53TQliXWpC Vy2jH4w2hegfbOeHXglivImaLLbygPtc2jBl5IDCQbm48/bOV2znbBcMzkUFnqmeBbg8 GKuydIGUqVNgh5bsdEcemUfpjgcl0rBAm1Dwmtr+XQxdeQlVASIS4r1sxbBGbiuZA/AK fe4soVxHcOX9l+hqdmbkB+XlzAFPazMKxGUGmUort7s5kCWv+v+oguQ5U+82glVdlc38 adLg== X-Gm-Message-State: APjAAAWfyUQFMtGPGT8Tf2wMh0lp5E6lSNKlRTExepO6OqR8/BP40J+1 ZD8MDesM1u6j1PEC0VkNDm9shXfg2sM= X-Google-Smtp-Source: APXvYqz1xCalV8EyNBjtVCbeB/rukt9cthsA2yP1xNHCATz8QkQssW3c6/4BNOgRcvm9A9QaAcYEIQ== X-Received: by 2002:a63:c84d:: with SMTP id l13mr4969070pgi.154.1565903060986; Thu, 15 Aug 2019 14:04:20 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::3:2aa9]) by smtp.gmail.com with ESMTPSA id i124sm4073230pfe.61.2019.08.15.14.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 14:04:20 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 3/5] Btrfs: stop clearing EXTENT_DIRTY in inode I/O tree Date: Thu, 15 Aug 2019 14:04:04 -0700 Message-Id: <8aa3a13a33ef65994613409ea605e22280a23480.1565900769.git.osandov@fb.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: References: MIME-Version: 1.0 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 From: Omar Sandoval Since commit fee187d9d9dd ("Btrfs: do not set EXTENT_DIRTY along with EXTENT_DELALLOC"), we never set EXTENT_DIRTY in inode->io_tree, so we can simplify and stop trying to clear it. Signed-off-by: Omar Sandoval Reviewed-by: Josef Bacik --- fs/btrfs/extent_io.c | 6 ++---- fs/btrfs/file.c | 4 ++-- fs/btrfs/free-space-cache.c | 9 ++++---- fs/btrfs/inode.c | 41 ++++++++++++++---------------------- fs/btrfs/ioctl.c | 5 ++--- fs/btrfs/tests/inode-tests.c | 12 ++++------- 6 files changed, 30 insertions(+), 47 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index bac59d721b54..4dc5e6939856 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4322,10 +4322,8 @@ int extent_invalidatepage(struct extent_io_tree *tree, lock_extent_bits(tree, start, end, &cached_state); wait_on_page_writeback(page); - clear_extent_bit(tree, start, end, - EXTENT_LOCKED | EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DO_ACCOUNTING, - 1, 1, &cached_state); + clear_extent_bit(tree, start, end, EXTENT_LOCKED | EXTENT_DELALLOC | + EXTENT_DO_ACCOUNTING, 1, 1, &cached_state); return 0; } diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 27223753da7b..c080fbcbda11 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -537,8 +537,8 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages, * we can set things up properly */ clear_extent_bit(&BTRFS_I(inode)->io_tree, start_pos, end_of_last_block, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 0, 0, cached); + EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, + 0, 0, cached); if (!btrfs_is_free_space_inode(BTRFS_I(inode))) { if (start_pos >= isize && diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index faaf57a7c289..96cf1e2dc388 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1005,7 +1005,7 @@ update_cache_item(struct btrfs_trans_handle *trans, ret = btrfs_search_slot(trans, root, &key, path, 0, 1); if (ret < 0) { clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1, - EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL); + EXTENT_DELALLOC, 0, 0, NULL); goto fail; } leaf = path->nodes[0]; @@ -1017,9 +1017,8 @@ update_cache_item(struct btrfs_trans_handle *trans, if (found_key.objectid != BTRFS_FREE_SPACE_OBJECTID || found_key.offset != offset) { clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, - inode->i_size - 1, - EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, - NULL); + inode->i_size - 1, EXTENT_DELALLOC, 0, + 0, NULL); btrfs_release_path(path); goto fail; } @@ -1115,7 +1114,7 @@ static int flush_dirty_cache(struct inode *inode) ret = btrfs_wait_ordered_range(inode, 0, (u64)-1); if (ret) clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1, - EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL); + EXTENT_DELALLOC, 0, 0, NULL); return ret; } diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 612c25aac15c..491755921c4b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4935,9 +4935,8 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, } clear_extent_bit(&BTRFS_I(inode)->io_tree, block_start, block_end, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, - 0, 0, &cached_state); + EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, + 0, 0, &cached_state); ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0, &cached_state); @@ -5321,9 +5320,9 @@ static void evict_inode_truncate_pages(struct inode *inode) btrfs_qgroup_free_data(inode, NULL, start, end - start + 1); clear_extent_bit(io_tree, start, end, - EXTENT_LOCKED | EXTENT_DIRTY | - EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | - EXTENT_DEFRAG, 1, 1, &cached_state); + EXTENT_LOCKED | EXTENT_DELALLOC | + EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 1, + &cached_state); cond_resched(); spin_lock(&io_tree->lock); @@ -7690,12 +7689,9 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, u64 start = iblock << inode->i_blkbits; u64 lockstart, lockend; u64 len = bh_result->b_size; - int unlock_bits = EXTENT_LOCKED; int ret = 0; - if (create) - unlock_bits |= EXTENT_DIRTY; - else + if (!create) len = min_t(u64, len, fs_info->sectorsize); lockstart = start; @@ -7754,9 +7750,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, if (ret < 0) goto unlock_err; - /* clear and unlock the entire range */ - clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend, - unlock_bits, 1, 0, &cached_state); + unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, + lockend, &cached_state); } else { ret = btrfs_get_blocks_direct_read(em, bh_result, inode, start, len); @@ -7772,9 +7767,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, */ lockstart = start + bh_result->b_size; if (lockstart < lockend) { - clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, - lockend, unlock_bits, 1, 0, - &cached_state); + unlock_extent_cached(&BTRFS_I(inode)->io_tree, + lockstart, lockend, &cached_state); } else { free_extent_state(cached_state); } @@ -7785,8 +7779,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, return 0; unlock_err: - clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend, - unlock_bits, 1, 0, &cached_state); + unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend, + &cached_state); err: if (dio_data) current->journal_info = dio_data; @@ -8801,8 +8795,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, */ if (!inode_evicting) clear_extent_bit(tree, start, end, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DELALLOC_NEW | + EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | EXTENT_LOCKED | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 0, &cached_state); /* @@ -8857,8 +8850,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, if (PageDirty(page)) btrfs_qgroup_free_data(inode, NULL, page_start, PAGE_SIZE); if (!inode_evicting) { - clear_extent_bit(tree, page_start, page_end, - EXTENT_LOCKED | EXTENT_DIRTY | + clear_extent_bit(tree, page_start, page_end, EXTENT_LOCKED | EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 1, &cached_state); @@ -8986,9 +8978,8 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) * reserve data&meta space before lock_page() (see above comments). */ clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, end, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, - 0, 0, &cached_state); + EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | + EXTENT_DEFRAG, 0, 0, &cached_state); ret2 = btrfs_set_extent_delalloc(inode, page_start, end, 0, &cached_state); diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4eabd419aaca..4b383811a7d2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1333,9 +1333,8 @@ static int cluster_pages_for_defrag(struct inode *inode, lock_extent_bits(&BTRFS_I(inode)->io_tree, page_start, page_end - 1, &cached_state); clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, - page_end - 1, EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 0, 0, - &cached_state); + page_end - 1, EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | + EXTENT_DEFRAG, 0, 0, &cached_state); if (i_done != page_cnt) { spin_lock(&BTRFS_I(inode)->lock); diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c index b363fb990cec..09ecf7dc7b08 100644 --- a/fs/btrfs/tests/inode-tests.c +++ b/fs/btrfs/tests/inode-tests.c @@ -988,8 +988,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, BTRFS_MAX_EXTENT_SIZE >> 1, (BTRFS_MAX_EXTENT_SIZE >> 1) + sectorsize - 1, - EXTENT_DELALLOC | EXTENT_DIRTY | - EXTENT_UPTODATE, 0, 0, NULL); + EXTENT_DELALLOC | EXTENT_UPTODATE, 0, 0, NULL); if (ret) { test_err("clear_extent_bit returned %d", ret); goto out; @@ -1056,8 +1055,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, BTRFS_MAX_EXTENT_SIZE + sectorsize, BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_UPTODATE, 0, 0, NULL); + EXTENT_DELALLOC | EXTENT_UPTODATE, 0, 0, NULL); if (ret) { test_err("clear_extent_bit returned %d", ret); goto out; @@ -1089,8 +1087,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) /* Empty */ ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_UPTODATE, 0, 0, NULL); + EXTENT_DELALLOC | EXTENT_UPTODATE, 0, 0, NULL); if (ret) { test_err("clear_extent_bit returned %d", ret); goto out; @@ -1105,8 +1102,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize) out: if (ret) clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, - EXTENT_DIRTY | EXTENT_DELALLOC | - EXTENT_UPTODATE, 0, 0, NULL); + EXTENT_DELALLOC | EXTENT_UPTODATE, 0, 0, NULL); iput(inode); btrfs_free_dummy_root(root); btrfs_free_dummy_fs_info(fs_info); From patchwork Thu Aug 15 21:04:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 11096479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4717914F7 for ; Thu, 15 Aug 2019 21:04:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38AAC1FF40 for ; Thu, 15 Aug 2019 21:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D338204FF; Thu, 15 Aug 2019 21:04:29 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 CBD911FF40 for ; Thu, 15 Aug 2019 21:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733103AbfHOVEY (ORCPT ); Thu, 15 Aug 2019 17:04:24 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39333 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733066AbfHOVEX (ORCPT ); Thu, 15 Aug 2019 17:04:23 -0400 Received: by mail-pg1-f193.google.com with SMTP id u17so1829751pgi.6 for ; Thu, 15 Aug 2019 14:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CLmdrP3jD5HVPP2Cz3irDkNqURlCkLxkHINRWjSCIkg=; b=DalCDu+u/1WFZ1z4Kh7e9tksjQRn5M/LpfC9YEz8MS2UGJ/L0Avoc1dAUXw7fdW87L 6qD8N2n4lSjJhIdDqp32RFPzZD+iMktKpAocr2AdtYeSmhnU/Ooe/BuEOEaa6JsldOSn 472ArrV9WO3A1Zkdfc+6/n52gb9NyEUv60gsnDW+F+xC76z0dCejGBBs8Sr0VTaSfs3M 2LkcENqMLBCrfWgx9KSQCGY38RNW8w+cHVS3op6Ti7LI74vxMKHxvmeOouMwJrCmNNS5 730YvN6qVW2R5eVGfd/nW/+eS7StIeZGBHv9B5QD9OsiCEWvsADNGCkrzlp+k8rASoFf FVSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CLmdrP3jD5HVPP2Cz3irDkNqURlCkLxkHINRWjSCIkg=; b=Vr+Si73WZNHceJaMSaDiZubVKQPZPGden2huTBhOtKhNCt4aDpaEn4neCOsharnq+y Wp0mSwwhZiNxrw3pseoqcgzVdLbprlcDOd4LvJYu+s98DU/Al7ab2WZ4rbQ/R2gX8ESx pXJI6Vc9dCchFYak6OQuP/mC2DzAUBAZlxM2eYFNUwB7lYHIQpIwIXSyAAttI5U6zcGO ORfKA9NapCSLs9cAk6urFveJwkzOHDvRSZ7grK7IDVF4txXjNPKbEm0dGh0XSE4Ge70S LkF+btYxXWvWoE00aapymM1fNWYR1efk3Z2bbm0y2RsoctGhKlndPwaW8IuzIIr6b1FX 7LAQ== X-Gm-Message-State: APjAAAXv/1zSt3QnXTktOBbk2RPZmnyXHyDf+M4i46NfSzbVCwOIgZeu mXnSTMxPMFeBOrz81zN9jji3Fgh+wqk= X-Google-Smtp-Source: APXvYqyW9mdTGSJrnCfzDbA5xM68zGti+UeyvDAbtf8r2DmaEhaHCypxrt2WRzpIEVI77cidab2TlA== X-Received: by 2002:a62:1d8a:: with SMTP id d132mr3888769pfd.187.1565903062624; Thu, 15 Aug 2019 14:04:22 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::3:2aa9]) by smtp.gmail.com with ESMTPSA id i124sm4073230pfe.61.2019.08.15.14.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 14:04:21 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [RFC PATCH 4/5] fs: export rw_verify_area() Date: Thu, 15 Aug 2019 14:04:05 -0700 Message-Id: <0f80a1adaf1dfd1eec71cf937db76a1b0459a0bf.1565900769.git.osandov@fb.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: References: MIME-Version: 1.0 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 From: Omar Sandoval I'm adding a Btrfs ioctl to write compressed data, and rather than duplicating the checks in rw_verify_area(), let's just export it. Signed-off-by: Omar Sandoval Reviewed-by: Josef Bacik --- fs/internal.h | 5 ----- fs/read_write.c | 1 + include/linux/fs.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 315fcd8d237c..94e1831d4c95 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -160,11 +160,6 @@ extern char *simple_dname(struct dentry *, char *, int); extern void dput_to_list(struct dentry *, struct list_head *); extern void shrink_dentry_list(struct list_head *); -/* - * read_write.c - */ -extern int rw_verify_area(int, struct file *, const loff_t *, size_t); - /* * pipe.c */ diff --git a/fs/read_write.c b/fs/read_write.c index 1f5088dec566..9d95491ce9ab 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -399,6 +399,7 @@ int rw_verify_area(int read_write, struct file *file, const loff_t *ppos, size_t return security_file_permission(file, read_write == READ ? MAY_READ : MAY_WRITE); } +EXPORT_SYMBOL(rw_verify_area); static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos) { diff --git a/include/linux/fs.h b/include/linux/fs.h index 997a530ff4e9..a9a1884768e4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3082,6 +3082,7 @@ extern loff_t fixed_size_llseek(struct file *file, loff_t offset, int whence, loff_t size); extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t); extern loff_t no_seek_end_llseek(struct file *, loff_t, int); +extern int rw_verify_area(int, struct file *, const loff_t *, size_t); extern int generic_file_open(struct inode * inode, struct file * filp); extern int nonseekable_open(struct inode * inode, struct file * filp); extern int stream_open(struct inode * inode, struct file * filp); From patchwork Thu Aug 15 21:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 11096477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2E7B14F7 for ; Thu, 15 Aug 2019 21:04:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2A0C1FF40 for ; Thu, 15 Aug 2019 21:04:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B63D528994; Thu, 15 Aug 2019 21:04:27 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 716BE1FF40 for ; Thu, 15 Aug 2019 21:04:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733122AbfHOVEZ (ORCPT ); Thu, 15 Aug 2019 17:04:25 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38561 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733107AbfHOVEZ (ORCPT ); Thu, 15 Aug 2019 17:04:25 -0400 Received: by mail-pg1-f193.google.com with SMTP id e11so1830198pga.5 for ; Thu, 15 Aug 2019 14:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TQMBwcjDQ8X2m0tfFenFQWXn8bt8wkTENACslMpuR40=; b=pTuCnkFZcdmGy+0lKxBGHKLL8v96U7lxQiCuM9Y2XN5rScCjCGSz8CBNGLgy/cNcG7 pnEo99v+z9q4fGkzXXAqGcmxXGAhvE76Zy3169/MGnHvMCnWHc5gYshQkVy3UAxbU4pm 4PvXYImwmGyaMSEjA1EXE1YO+mw/b9hiB4Zb1QlG6Op4Cw7Z2LtHNMrcQEbH1k5z0UbS UuAwKMEm06pn/lLPPrmt9CLpt1tPkRWxtMNXcvdO2JW/LmCnaVLQBuqs8ZGc5400m+sJ Ib7meAqgVXMzyZ81rWiXC3z0ICclGJiJFqR5XGCyhjlTfeu1l6zAZUULxMTzDCxgIUI8 /w2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TQMBwcjDQ8X2m0tfFenFQWXn8bt8wkTENACslMpuR40=; b=E7hd4V5c3RrKDK45VA0zFHqVSSMkMyeH8WWaOvQ1idh8bNq/mysSwkqwUmwQACUI7U is/w5dqMrgOluw9MX+vqeFnr0+OdsevT2eTu4h/QyP35g5b3LyY4T17xVc0dNeiie+HH UgMLKyT8fKg6nKeOlFhxzU6fqLzWk55Ydkb6fH2pcRFyxcc4mV0h4+8TDS+keqd/0jY6 LdQQC0isE9HJL9y5U+IwvW8N/taGvh0a6Z6604R2Trs08AAWyDjmg5+rqcY6wGgxj0P7 kl+KFF2Tkh2NLEXM8MgiqUc24k58xilsDRxOaYFMkQ88JYRb/i3ltS8MA5+LZewC2g/4 Mlog== X-Gm-Message-State: APjAAAW11zn+CVWtZX4JTbbAufglNwZqCO3hU8hcDe83+pQJjebfAk/x ivozjCen/EUQaeylh1EJaoQxJygL0g8= X-Google-Smtp-Source: APXvYqwrriVC6Ksmdu70S+3BxPRKGbt9gUpKd50WHlSqeX9sBLXceY2Rr+bIz1GBjS/0ElXvC1dgSQ== X-Received: by 2002:a63:fe15:: with SMTP id p21mr4978752pgh.149.1565903063783; Thu, 15 Aug 2019 14:04:23 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::3:2aa9]) by smtp.gmail.com with ESMTPSA id i124sm4073230pfe.61.2019.08.15.14.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 14:04:22 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [RFC PATCH 5/5] Btrfs: add ioctl for directly writing compressed data Date: Thu, 15 Aug 2019 14:04:06 -0700 Message-Id: <78747c3028ce91db9856e7fbd98ccbb2609acdc6.1565900769.git.osandov@fb.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: References: MIME-Version: 1.0 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 From: Omar Sandoval This adds an API for writing compressed data directly to the filesystem. The use case that I have in mind is send/receive: currently, when sending data from one compressed filesystem to another, the sending side decompresses the data and the receiving side recompresses it before writing it out. This is wasteful and can be avoided if we can just send and write compressed extents. The send part will be implemented in a separate series, as this ioctl can stand alone. The interface is essentially pwrite(2) with some extra information: - The input buffer contains the compressed data. - Both the compressed and decompressed sizes of the data are given. - The compression type (zlib, lzo, or zstd) is given. A more detailed description of the interface, including restrictions and edge cases, is included in include/uapi/linux/btrfs.h. The implementation is similar to direct I/O: we have to flush any ordered extents, invalidate the page cache, and do the io tree/delalloc/extent map/ordered extent dance. From there, we can reuse the compression code with a minor modification to distinguish the new ioctl from writeback. Signed-off-by: Omar Sandoval --- fs/btrfs/compression.c | 6 +- fs/btrfs/compression.h | 14 +-- fs/btrfs/ctree.h | 12 +++ fs/btrfs/file.c | 13 ++- fs/btrfs/inode.c | 191 ++++++++++++++++++++++++++++++++++++- fs/btrfs/ioctl.c | 96 +++++++++++++++++++ include/uapi/linux/btrfs.h | 63 ++++++++++++ 7 files changed, 380 insertions(+), 15 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 60c47b417a4b..50e3a9a7e829 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -275,7 +275,8 @@ static void end_compressed_bio_write(struct bio *bio) bio->bi_status == BLK_STS_OK); cb->compressed_pages[0]->mapping = NULL; - end_compressed_writeback(inode, cb); + if (cb->writeback) + end_compressed_writeback(inode, cb); /* note, our inode could be gone now */ /* @@ -310,7 +311,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, unsigned long compressed_len, struct page **compressed_pages, unsigned long nr_pages, - unsigned int write_flags) + unsigned int write_flags, bool writeback) { struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct bio *bio = NULL; @@ -335,6 +336,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, cb->mirror_num = 0; cb->compressed_pages = compressed_pages; cb->compressed_len = compressed_len; + cb->writeback = writeback; cb->orig_bio = NULL; cb->nr_pages = nr_pages; diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index 2035b8eb1290..f39b69e8fbd7 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h @@ -6,6 +6,7 @@ #ifndef BTRFS_COMPRESSION_H #define BTRFS_COMPRESSION_H +#include #include /* @@ -47,6 +48,9 @@ struct compressed_bio { /* the compression algorithm for this bio */ int compress_type; + /* Whether this is a write for writeback. */ + bool writeback; + /* number of compressed pages in the array */ unsigned long nr_pages; @@ -93,20 +97,12 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, unsigned long compressed_len, struct page **compressed_pages, unsigned long nr_pages, - unsigned int write_flags); + unsigned int write_flags, bool writeback); blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, int mirror_num, unsigned long bio_flags); unsigned int btrfs_compress_str2level(unsigned int type, const char *str); -enum btrfs_compression_type { - BTRFS_COMPRESS_NONE = 0, - BTRFS_COMPRESS_ZLIB = 1, - BTRFS_COMPRESS_LZO = 2, - BTRFS_COMPRESS_ZSTD = 3, - BTRFS_COMPRESS_TYPES = 3, -}; - struct workspace_manager { const struct btrfs_compress_op *ops; struct list_head idle_ws; diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 85b808e3ea42..e2854345a3a6 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2985,6 +2985,16 @@ int btrfs_run_delalloc_range(struct inode *inode, struct page *locked_page, int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end); void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start, u64 end, int uptodate); + +struct btrfs_compressed_write { + void __user *buf; + unsigned long compressed_len; + unsigned long orig_len; + int compress_type; +}; +ssize_t btrfs_compressed_write(struct kiocb *iocb, struct iov_iter *from, + struct btrfs_compressed_write *compressed); + extern const struct dentry_operations btrfs_dentry_operations; /* ioctl.c */ @@ -3008,6 +3018,8 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, struct btrfs_inode *inode); int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info); void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info); +ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from, + struct btrfs_compressed_write *compressed); int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync); void btrfs_drop_extent_cache(struct btrfs_inode *inode, u64 start, u64 end, int skip_pinned); diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index c080fbcbda11..1fcaa338baf5 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1872,8 +1872,8 @@ static void update_time_for_write(struct inode *inode) inode_inc_iversion(inode); } -static ssize_t btrfs_file_write_iter(struct kiocb *iocb, - struct iov_iter *from) +ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from, + struct btrfs_compressed_write *compressed) { struct file *file = iocb->ki_filp; struct inode *inode = file_inode(file); @@ -1965,7 +1965,9 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, if (sync) atomic_inc(&BTRFS_I(inode)->sync_writers); - if (iocb->ki_flags & IOCB_DIRECT) { + if (compressed) { + num_written = btrfs_compressed_write(iocb, from, compressed); + } else if (iocb->ki_flags & IOCB_DIRECT) { num_written = __btrfs_direct_write(iocb, from); } else { num_written = btrfs_buffered_write(iocb, from); @@ -1996,6 +1998,11 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, return num_written ? num_written : err; } +static ssize_t btrfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) +{ + return btrfs_do_write_iter(iocb, from, NULL); +} + int btrfs_release_file(struct inode *inode, struct file *filp) { struct btrfs_file_private *private = filp->private_data; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 491755921c4b..4ed8ba97b7d4 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -863,7 +863,7 @@ static noinline void submit_compressed_extents(struct async_chunk *async_chunk) ins.objectid, ins.offset, async_extent->pages, async_extent->nr_pages, - async_chunk->write_flags)) { + async_chunk->write_flags, true)) { struct page *p = async_extent->pages[0]; const u64 start = async_extent->start; const u64 end = start + async_extent->ram_size - 1; @@ -10541,6 +10541,195 @@ void btrfs_set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end) } } +ssize_t btrfs_compressed_write(struct kiocb *iocb, struct iov_iter *from, + struct btrfs_compressed_write *compressed) +{ + struct file *file = iocb->ki_filp; + struct inode *inode = file_inode(file); + struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_root *root = BTRFS_I(inode)->root; + struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; + struct extent_changeset *data_reserved = NULL; + struct extent_state *cached_state = NULL; + unsigned long nr_pages, i; + struct page **pages; + unsigned long disk_num_bytes, ram_bytes; + u64 start, end; + struct btrfs_key ins; + struct extent_map *em; + ssize_t ret; + + if (iov_iter_count(from) != compressed->orig_len) { + /* + * The write got truncated by generic_write_checks(). We can't + * do a partial compressed write. + */ + return -EFBIG; + } + + /* This should be handled higher up. */ + ASSERT(compressed->orig_len != 0); + + /* The extent size must be sane. */ + if (compressed->compressed_len > BTRFS_MAX_COMPRESSED || + compressed->orig_len > BTRFS_MAX_UNCOMPRESSED || + compressed->compressed_len == 0) + return -EINVAL; + + /* + * The compressed data on disk must be sector-aligned. For convenience, + * we extend the compressed data with zeroes if it isn't. + */ + disk_num_bytes = ALIGN(compressed->compressed_len, fs_info->sectorsize); + /* + * The extent in the file must also be sector-aligned. However, we allow + * a write which ends at or extends i_size to have an unaligned length; + * we round up the extent size and set i_size to the given length. + */ + start = iocb->ki_pos; + if ((start & (fs_info->sectorsize - 1))) + return -EINVAL; + if (start + compressed->orig_len >= inode->i_size) { + ram_bytes = ALIGN(compressed->orig_len, fs_info->sectorsize); + } else { + ram_bytes = compressed->orig_len; + if ((ram_bytes & (fs_info->sectorsize - 1))) + return -EINVAL; + } + end = start + ram_bytes - 1; + + /* + * It's valid for compressed data to be larger than or the same size as + * the decompressed data. However, for buffered I/O, we never write out + * a compressed extent unless it's smaller than the decompressed data, + * so for now, let's not allow creating such extents with the ioctl, + * either. + */ + if (disk_num_bytes >= ram_bytes) + return -EINVAL; + + nr_pages = DIV_ROUND_UP(disk_num_bytes, PAGE_SIZE); + pages = kcalloc(nr_pages, sizeof(struct page *), + GFP_USER | __GFP_NOWARN); + if (!pages) + return -ENOMEM; + for (i = 0; i < nr_pages; i++) { + unsigned long offset = i << PAGE_SHIFT, n; + char *kaddr; + + pages[i] = alloc_page(GFP_USER | __GFP_NOWARN); + if (!pages[i]) { + ret = -ENOMEM; + goto out_pages; + } + kaddr = kmap(pages[i]); + if (offset < compressed->compressed_len) { + n = min(PAGE_SIZE, compressed->compressed_len - offset); + if (copy_from_user(kaddr, compressed->buf + offset, + n)) { + kunmap(pages[i]); + ret = -EFAULT; + goto out_pages; + } + } else { + n = 0; + } + if (n < PAGE_SIZE) + memset(kaddr + n, 0, PAGE_SIZE - n); + kunmap(pages[i]); + } + + for (;;) { + struct btrfs_ordered_extent *ordered; + + lock_extent_bits(io_tree, start, end, &cached_state); + ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), start, + end - start + 1); + if (!ordered && + !filemap_range_has_page(inode->i_mapping, start, end)) + break; + if (ordered) + btrfs_put_ordered_extent(ordered); + unlock_extent_cached(&BTRFS_I(inode)->io_tree, start, end, + &cached_state); + cond_resched(); + ret = btrfs_wait_ordered_range(inode, start, end); + if (ret) + goto out_pages; + ret = invalidate_inode_pages2_range(inode->i_mapping, + start >> PAGE_SHIFT, + end >> PAGE_SHIFT); + if (ret) + goto out_pages; + } + + ret = btrfs_delalloc_reserve_space(inode, &data_reserved, start, + ram_bytes); + if (ret) + goto out_unlock; + + ret = btrfs_reserve_extent(root, ram_bytes, disk_num_bytes, + disk_num_bytes, 0, 0, &ins, 1, 1); + if (ret) + goto out_delalloc_release; + + em = create_io_em(inode, start, ram_bytes, start, ins.objectid, + ins.offset, ins.offset, ram_bytes, + compressed->compress_type, BTRFS_ORDERED_COMPRESSED); + if (IS_ERR(em)) { + ret = PTR_ERR(em); + goto out_free_reserve; + } + free_extent_map(em); + + ret = btrfs_add_ordered_extent_compress(inode, start, ins.objectid, + ram_bytes, ins.offset, + BTRFS_ORDERED_COMPRESSED, + compressed->compress_type); + if (ret) { + btrfs_drop_extent_cache(BTRFS_I(inode), start, end, 0); + goto out_free_reserve; + } + btrfs_dec_block_group_reservations(fs_info, ins.objectid); + + if (start + compressed->orig_len > inode->i_size) + i_size_write(inode, start + compressed->orig_len); + + unlock_extent_cached(io_tree, start, end, &cached_state); + + btrfs_delalloc_release_extents(BTRFS_I(inode), ram_bytes, false); + + if (btrfs_submit_compressed_write(inode, start, ram_bytes, ins.objectid, + ins.offset, pages, nr_pages, 0, + false)) { + struct page *page = pages[0]; + + page->mapping = inode->i_mapping; + btrfs_writepage_endio_finish_ordered(page, start, end, 0); + page->mapping = NULL; + ret = -EIO; + goto out_pages; + } + iocb->ki_pos += compressed->orig_len; + return compressed->orig_len; + +out_free_reserve: + btrfs_dec_block_group_reservations(fs_info, ins.objectid); + btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1); +out_delalloc_release: + btrfs_delalloc_release_space(inode, data_reserved, start, ram_bytes, + true); +out_unlock: + unlock_extent_cached(io_tree, start, end, &cached_state); +out_pages: + for (i = 0; i < nr_pages; i++) { + if (pages[i]) + put_page(pages[i]); + } + kfree(pages); + return ret; +} + #ifdef CONFIG_SWAP /* * Add an entry indicating a block group or device which is pinned by a diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4b383811a7d2..7c829cd21d8e 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "ctree.h" #include "disk-io.h" #include "transaction.h" @@ -84,6 +85,18 @@ struct btrfs_ioctl_send_args_32 { #define BTRFS_IOC_SEND_32 _IOW(BTRFS_IOCTL_MAGIC, 38, \ struct btrfs_ioctl_send_args_32) + +struct btrfs_ioctl_compressed_pwrite_args_32 { + __u64 offset; /* in */ + __u32 compressed_len; /* in */ + __u32 orig_len; /* in */ + __u32 compress_type; /* in */ + __u32 reserved[9]; + compat_uptr_t buf; /* in */ +} __attribute__ ((__packed__)); + +#define BTRFS_IOC_COMPRESSED_PWRITE_32 _IOW(BTRFS_IOCTL_MAGIC, 63, \ + struct btrfs_ioctl_compressed_pwrite_args_32) #endif static int btrfs_clone(struct inode *src, struct inode *inode, @@ -5424,6 +5437,83 @@ static int _btrfs_ioctl_send(struct file *file, void __user *argp, bool compat) return ret; } +static int btrfs_ioctl_compressed_pwrite(struct file *file, void __user *argp, + bool compat) +{ + struct btrfs_ioctl_compressed_pwrite_args args; + struct btrfs_compressed_write compressed; + struct iov_iter iter; + loff_t pos; + struct kiocb kiocb; + ssize_t ret; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + if (!(file->f_mode & FMODE_WRITE)) + return -EBADF; + + if (compat) { +#if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT) + struct btrfs_ioctl_compressed_pwrite_args_32 args32; + + if (copy_from_user(&args32, argp, sizeof(args32))) + return -EFAULT; + args.offset = args32.offset; + args.buf = compat_ptr(args32.buf); + args.compressed_len = args32.compressed_len; + args.orig_len = args32.orig_len; + args.compress_type = args32.compress_type; + memcpy(args.reserved, args32.reserved, sizeof(args.reserved)); +#else + return -ENOTTY; +#endif + } else { + if (copy_from_user(&args, argp, sizeof(args))) + return -EFAULT; + } + + /* The compression type must be valid. */ + if (args.compress_type == BTRFS_COMPRESS_NONE || + args.compress_type > BTRFS_COMPRESS_TYPES) + return -EINVAL; + /* Reserved fields must be zero. */ + if (memchr_inv(args.reserved, 0, sizeof(args.reserved))) + return -EINVAL; + + if (unlikely(!access_ok(args.buf, args.compressed_len))) + return -EFAULT; + + pos = args.offset; + ret = rw_verify_area(WRITE, file, &pos, args.orig_len); + if (ret) + return ret; + + init_sync_kiocb(&kiocb, file); + kiocb.ki_pos = pos; + /* + * This iov_iter is a lie; we only construct it so that we can use + * write_iter. + */ + iov_iter_init(&iter, WRITE, NULL, 0, args.orig_len); + + compressed.buf = args.buf; + compressed.compressed_len = args.compressed_len; + compressed.orig_len = args.orig_len; + compressed.compress_type = args.compress_type; + + file_start_write(file); + ret = btrfs_do_write_iter(&kiocb, &iter, &compressed); + if (ret > 0) { + ASSERT(ret == compressed.orig_len); + fsnotify_modify(file); + add_wchar(current, ret); + } + inc_syscw(current); + file_end_write(file); + return ret < 0 ? ret : 0; +} + long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -5570,6 +5660,12 @@ long btrfs_ioctl(struct file *file, unsigned int return btrfs_ioctl_get_subvol_rootref(file, argp); case BTRFS_IOC_INO_LOOKUP_USER: return btrfs_ioctl_ino_lookup_user(file, argp); + case BTRFS_IOC_COMPRESSED_PWRITE: + return btrfs_ioctl_compressed_pwrite(file, argp, false); +#if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT) + case BTRFS_IOC_COMPRESSED_PWRITE_32: + return btrfs_ioctl_compressed_pwrite(file, argp, true); +#endif } return -ENOTTY; diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 3ee0678c0a83..d0c803e3edae 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -822,6 +822,67 @@ struct btrfs_ioctl_get_subvol_rootref_args { __u8 align[7]; }; +enum btrfs_compression_type { + BTRFS_COMPRESS_NONE = 0, + BTRFS_COMPRESS_ZLIB = 1, + BTRFS_COMPRESS_LZO = 2, + BTRFS_COMPRESS_ZSTD = 3, + BTRFS_COMPRESS_TYPES = 3, +}; + +/* + * Write compressed data directly to the filesystem. CAP_SYS_ADMIN is required + * and the file descriptor must be open for writing. + */ +struct btrfs_ioctl_compressed_pwrite_args { + /* + * Offset in file where to write. This must be aligned to the sector + * size of the filesystem. + */ + __u64 offset; /* in */ + /* + * Length of the decompressed data in the file, in bytes. This must be + * aligned to the sector size of the filesystem unless the data ends at + * or beyond the current end of file; this special case is to support + * creating compressed files whose length is not aligned to the sector + * size. + * + * If this length does not match the actual length of the decompressed + * data, then reading may return an error. + * + * This must be less than 128k (BTRFS_MAX_UNCOMPRESSED), although that + * limit may increase in the future. + */ + __u32 orig_len; /* in */ + /* + * Length of compressed data (see buf below) in bytes. This does not + * need to be aligned to a sector. + * + * This must be less than 128k (BTRFS_MAX_COMPRESSED), although that + * limit may increase in the future. + */ + __u32 compressed_len; /* in */ + /* + * The compression type (enum btrfs_compression_type). This must not be + * BTRFS_COMPRESS_NONE. + */ + __u32 compress_type; /* in */ + /* Reserved for future extensions. Must be zero. */ + __u32 reserved[9]; + /* + * The compressed data. The format is as follows: + * + * - zlib: The extent is a single zlib stream. + * - lzo: The extent is compressed page by page with LZO1X and wrapped + * according to the format documented in fs/btrfs/lzo.c. + * - zstd: The extent is a single zstd stream. The windowLog compression + * parameter must be no more than 17 (ZSTD_BTRFS_MAX_WINDOWLOG). + * + * If the compressed data is invalid, reading will return an error. + */ + void __user *buf; /* in */ +} __attribute__ ((__packed__)); + /* Error codes as returned by the kernel */ enum btrfs_err_code { BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1, @@ -946,5 +1007,7 @@ enum btrfs_err_code { struct btrfs_ioctl_get_subvol_rootref_args) #define BTRFS_IOC_INO_LOOKUP_USER _IOWR(BTRFS_IOCTL_MAGIC, 62, \ struct btrfs_ioctl_ino_lookup_user_args) +#define BTRFS_IOC_COMPRESSED_PWRITE _IOW(BTRFS_IOCTL_MAGIC, 63, \ + struct btrfs_ioctl_compressed_pwrite_args) #endif /* _UAPI_LINUX_BTRFS_H */