From patchwork Mon Apr 29 16:32:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922077 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 98C8314C0 for ; Mon, 29 Apr 2019 16:32:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 899E628685 for ; Mon, 29 Apr 2019 16:32:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D817286DF; Mon, 29 Apr 2019 16:32:51 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27DA228685 for ; Mon, 29 Apr 2019 16:32:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CE3F6B0003; Mon, 29 Apr 2019 12:32:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0800A6B0005; Mon, 29 Apr 2019 12:32:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAFB16B0007; Mon, 29 Apr 2019 12:32:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id CBE206B0003 for ; Mon, 29 Apr 2019 12:32:48 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id u65so9387524qkd.17 for ; Mon, 29 Apr 2019 09:32:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; bh=MB8wp8of2OYZa15Lmvh7DUDyr38wa320YQjPc02TbLM=; b=OFFeO2KVgymKkLNTWvq9+X/hZyvwGLXzM2Pha7TESTQ2+s9NTgy7/k6mNbTMhsQ87c dU3Llf6o2JXZCbXeMePDK+A/yn0wHOT8RtBRjKxSauv/itswjbgdBaWbzAm7BrifCsJc O36pxV7wAdQIdTxAzCeEAOWt2EYKgEirGNpnY1vUuyM9qg9ehUpro3HuExFH/5YxL12M udYwQIL4//ZpeNLxPAYviHTUIPEXXEeZPnU3WWr8Fvl5ELMq0WdjC2kjWwQ1mMF+oQyp bJnfpBBY5+QvL48MeB7aG8JCQd06Wysd5aU0hqilAlPEwWJNxAzAn7N6S2K9oHRBtkgo uBoQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAV15cAkePXBoEwwt3/oEBn3wxWIBWP8saCSFcgUcUUSST1K71aH yOua57urkI99bBh6aSK4UBWY+SUbEMrL3V+eUfxZBGlXXGsAOJR8HDT7hMAKl6A95jEh7f1/hTu CsJ08goE3d8DU8MwoH7PoBBuOrtjP0M7xPz5GnbSzZxsJepteAsRJHUJt/duR+84DXg== X-Received: by 2002:ac8:1673:: with SMTP id x48mr9002670qtk.353.1556555568567; Mon, 29 Apr 2019 09:32:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAl4kPmfxJIDn1Jl17HVmPzagu37tsLNcSTMwXry7zIEVhtqM5VO6SoHRLw649Ju4AZRfm X-Received: by 2002:ac8:1673:: with SMTP id x48mr9002613qtk.353.1556555567699; Mon, 29 Apr 2019 09:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556555567; cv=none; d=google.com; s=arc-20160816; b=ge9jZO+SybfB3NiN8uFvD7iyi9NSbh9/USPRgbAGQzkDd/bd84cBfyWkPl0DLaIgXs 7nLnltRzDDoUppJ+zklLAHi1EqpuCb00FDaMrii8fKt1q7d7RYuzZlNEtHQaZs9clD6/ kerQTzLCxjI5heHxVFcniq0JenKH+0802pwTRlr0Kmj2XrphQTv0xPiba0BeeRa2IiUl X1ONbbaEe/7xgMQHqj1YSXmA3qAxsdWMew/9pfqvpfk3iakFvQDboNSbjVu5UsxwiRRo Tkxrh85P7EMf3l5Mb617CqPsL0pSG42J24KFhbQ9TJclVBQiskM3hdYyfsLnYAcBbAOS N3QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=MB8wp8of2OYZa15Lmvh7DUDyr38wa320YQjPc02TbLM=; b=Cb9CHcVJsefYEaAl3rlGKy8kwS/SIttPP0C9Zq+s4mGH9+PywZlXNYA6JhUpTwoyHv GHY4K/AZhuQbpR0mTfyua1tOvvvYmGzA2RvnShtGmZdtRmS0NslYs0iWJ0bqqUQ9JGbF k1irb9b9WioNTtrtnO+N2wDoUc0eFlqYmU8+2RLvc0Hyemmg6p5d1fT2jFvAhEw9BOQ0 ZoCMW82GR8OxpmVwr2DSyOCtNIS1JnJnIfco57hv9moUi8Y92SzhlVNVZBO6Tg+LNTWl PZy/KtLIu4H2auCekldEd2JoM85hf5sv8NO6WG2src4JLVoxmZqVE6ObmlJZDP0qvW0O ohcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id s187si767293qkh.257.2019.04.29.09.32.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 09:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B32A5308FB9D; Mon, 29 Apr 2019 16:32:46 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFEC0190D7; Mon, 29 Apr 2019 16:32:41 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH v6 1/4] iomap: Clean up __generic_write_end calling Date: Mon, 29 Apr 2019 18:32:36 +0200 Message-Id: <20190429163239.4874-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 29 Apr 2019 16:32:46 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Christoph Hellwig Move the call to __generic_write_end into iomap_write_end instead of duplicating it in each of the three branches. This requires open coding the generic_write_end for the buffer_head case. Signed-off-by: Christoph Hellwig Signed-off-by: Andreas Gruenbacher Reviewed-by: Jan Kara --- fs/iomap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index 97cb9d486a7d..2344c662e6fc 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -738,13 +738,11 @@ __iomap_write_end(struct inode *inode, loff_t pos, unsigned len, * uptodate page as a zero-length write, and force the caller to redo * the whole thing. */ - if (unlikely(copied < len && !PageUptodate(page))) { - copied = 0; - } else { - iomap_set_range_uptodate(page, offset_in_page(pos), len); - iomap_set_page_dirty(page); - } - return __generic_write_end(inode, pos, copied, page); + if (unlikely(copied < len && !PageUptodate(page))) + return 0; + iomap_set_range_uptodate(page, offset_in_page(pos), len); + iomap_set_page_dirty(page); + return copied; } static int @@ -761,7 +759,6 @@ iomap_write_end_inline(struct inode *inode, struct page *page, kunmap_atomic(addr); mark_inode_dirty(inode); - __generic_write_end(inode, pos, copied, page); return copied; } @@ -774,12 +771,13 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, if (iomap->type == IOMAP_INLINE) { ret = iomap_write_end_inline(inode, page, iomap, pos, copied); } else if (iomap->flags & IOMAP_F_BUFFER_HEAD) { - ret = generic_write_end(NULL, inode->i_mapping, pos, len, - copied, page, NULL); + ret = block_write_end(NULL, inode->i_mapping, pos, len, copied, + page, NULL); } else { ret = __iomap_write_end(inode, pos, len, copied, page, iomap); } + ret = __generic_write_end(inode, pos, ret, page); if (iomap->page_done) iomap->page_done(inode, pos, copied, page, iomap); From patchwork Mon Apr 29 16:32:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922081 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 2BA0692A for ; Mon, 29 Apr 2019 16:32:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AAA028161 for ; Mon, 29 Apr 2019 16:32:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C86A28685; Mon, 29 Apr 2019 16:32:55 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A606328161 for ; Mon, 29 Apr 2019 16:32:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FF1F6B0007; Mon, 29 Apr 2019 12:32:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5AE6C6B0008; Mon, 29 Apr 2019 12:32:53 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4774E6B000A; Mon, 29 Apr 2019 12:32:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id 213956B0007 for ; Mon, 29 Apr 2019 12:32:53 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id r13so9365931qke.22 for ; Mon, 29 Apr 2019 09:32:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=P96q6ty/O2QML/E66Bqt9ZOvxzjhotk8fjwe1hzcff0=; b=dorjYZi89QcbldEpojL3clzxYr7tQv+IELbUbih3sXpCb/1T9T2JBQXe4cjPe0QR5Q OEc9pIzJcq5P2/akPJsPXih6KhnH+GykmkM3jeZNUq9gJHuQ3wQOd89dbIgzAx4XkgzM m3XgBDZP3V2Kxyor6NJs/kEKRasIG+0PDjjpCG379RmTtgJsNoUtOxijwQsIkiZWesxc 6cRHdyfnNz/Hlc7css0UIGJUDZWgghm/eshIGkdUfdCnHiu0YTFvuGJnXsxBSDASR8mF JBBkl5akq2EleN+QR/xdHumDrR1mPu/zczv1qX1+2EKb566hka5FaDCWntH3CKv9BX0T ovsg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAWaHDnHs9PXhtnMaEigv5oP54wMMFhfOO4CFoMN3PKVwF9Oe8Yh OMrFvLvZjh9OtK86QH9R3EKLE45ALqMSj+boolBYYVRTt1B1//zNuyL1LLsqW5INJxALtw15vmI WlnFPn64Abju9hs6rm1ccM3leB5DRYaP0Q28xYRm6SZv1Dsbbll1+AxhjFZMA8UTGAg== X-Received: by 2002:a37:9c55:: with SMTP id f82mr18321269qke.101.1556555572905; Mon, 29 Apr 2019 09:32:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHeHRIY85s8uMG8E3Iu7M3D2zSondf9VLN0GOkpvVgAajA2oZoJInAFVWOcE0iXtM3/c2L X-Received: by 2002:a37:9c55:: with SMTP id f82mr18321209qke.101.1556555572041; Mon, 29 Apr 2019 09:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556555572; cv=none; d=google.com; s=arc-20160816; b=0TBfvhbXhlW360YsJbqCbh+asSDTzTyO7KEzniv9DJJgmXj2112v2xfUmksHuZzneZ ECnndw/U9xccJNVXfMTF5dUY7F2uIYdIhsPEncbrM3KVwFdWZHHKHIN7as6FmBuYmt74 usUeOr8rda1dGo+Jg0ujzqV3ObOKfGEX7GbFJy5IW8nGQib1peclE1lbxgOVn2oVMAkt 78bPsi667ivePIkx7Ph+8xFwaHFbrIRu+HJymaZzJSA1Or1d0/2O9suQtpaRMGuxC7yP 9mG0qLr6iBeBdg/WzrT9bHtQTNbaYHMFD/bw3FiSNwHB5LzQMJjXSGGuj1Bdcss0V7Ne wt7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=P96q6ty/O2QML/E66Bqt9ZOvxzjhotk8fjwe1hzcff0=; b=JUoOlqKdav4bdV9LseEjrkoaSx87n5/t0PONFGbRQ7/OJfopvLCV1D89UbYJ1h+1aw RN6h7Cdm9IJjXX1LinfUiiZTUARF28GArM2kkR2rYZ6cCD1/JHHyPUUlZe/Li0UKvEI+ bpquYJHQBPFCryiUnbaRb1dWl/GjKLTLrb8VUrrDLhZPmVUBQQr27+Ci8GA0cOSRpjE2 UScdT8PZ9JeSNN4Oc+FNX220qaHh+JdFkUHmYwfzgEPKOw0fry6U0x2B73QGLCFBRSa7 qzVB/vzRuxlFYNR+m3HrH8Zi40/R1TI5Fs7NMNYUu8V3RnoxbUoL9AALSf6CgrrPbv7S qD8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d33si930567qtc.23.2019.04.29.09.32.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 09:32:52 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E995887623; Mon, 29 Apr 2019 16:32:50 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17BCD17A64; Mon, 29 Apr 2019 16:32:46 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH v6 2/4] iomap: Fix use-after-free error in page_done callback Date: Mon, 29 Apr 2019 18:32:37 +0200 Message-Id: <20190429163239.4874-2-agruenba@redhat.com> In-Reply-To: <20190429163239.4874-1-agruenba@redhat.com> References: <20190429163239.4874-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 29 Apr 2019 16:32:51 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In iomap_write_end, we're not holding a page reference anymore when calling the page_done callback, but the callback needs that reference to access the page. To fix that, move the put_page call in __generic_write_end into the callers of __generic_write_end. Then, in iomap_write_end, put the page after calling the page_done callback. Reported-by: Jan Kara Fixes: 63899c6f8851 ("iomap: add a page_done callback") Signed-off-by: Andreas Gruenbacher Reviewed-by: Jan Kara Reviewed-by: Christoph Hellwig --- fs/buffer.c | 5 +++-- fs/iomap.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index ce357602f471..6e2c95160ce3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2104,7 +2104,6 @@ int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, } unlock_page(page); - put_page(page); if (old_size < pos) pagecache_isize_extended(inode, old_size, pos); @@ -2160,7 +2159,9 @@ int generic_write_end(struct file *file, struct address_space *mapping, struct page *page, void *fsdata) { copied = block_write_end(file, mapping, pos, len, copied, page, fsdata); - return __generic_write_end(mapping->host, pos, copied, page); + copied = __generic_write_end(mapping->host, pos, copied, page); + put_page(page); + return copied; } EXPORT_SYMBOL(generic_write_end); diff --git a/fs/iomap.c b/fs/iomap.c index 2344c662e6fc..b01ed5a28d2c 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -780,6 +780,7 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, ret = __generic_write_end(inode, pos, ret, page); if (iomap->page_done) iomap->page_done(inode, pos, copied, page, iomap); + put_page(page); if (ret < len) iomap_write_failed(inode, pos, len); From patchwork Mon Apr 29 16:32:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922085 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 47A5B14C0 for ; Mon, 29 Apr 2019 16:32:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 396A328161 for ; Mon, 29 Apr 2019 16:32:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D99028689; Mon, 29 Apr 2019 16:32:58 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B0EA28161 for ; Mon, 29 Apr 2019 16:32:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 192016B000A; Mon, 29 Apr 2019 12:32:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 145566B000C; Mon, 29 Apr 2019 12:32:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00A196B000D; Mon, 29 Apr 2019 12:32:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id D2EE36B000A for ; Mon, 29 Apr 2019 12:32:55 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id t63so9463855qkh.0 for ; Mon, 29 Apr 2019 09:32:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VMreTKTST33hsgVkWvM5nBdkRLJ3YgBtCHnvJjhLtlA=; b=C+TJkCYP1qnh34lHd3McmprNp16qOw4nDlC85dq3drEPkmMcupeCP/5dTf2NgIg+xS taiyqtiUaPU6SgUS/KX5o1DB/G9nPRq/KQel+IXzr6n6WRBCp4+8j6HcMDIYDcCj0S3k DSsKAh+GOP1vNjScMm7pI7xT6UXEpqT7xQt/BOJdH6lZbFOhA4UhHTVyJvSR0zyg47iW tQvNSD9A1qZ8Eb5aGmGNBvWx9/TpBm0ahPs2+Wy/SRgSqbkfzWT9lfF/M4+nnJTj+oF8 5Dn/sG/xBv7TFjsaNL3KbVI40e+kawAq+wh1ukdVxeRCHToKVJvzee2kf11gHKp5wPXG Olkw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAUGIlTzOP7tUM3D/46zbJl5DyXRTvCNcM43pzTEQxzRcKZp+hgT jurcD2xVMGKWYyL4xHJYI0lRY8BQnfdnPPnANIkwYLSY9GRzPIy5Brp2e3keRm/hYPXhIsma9Y7 16LRKtqXmDhYJvGuAlMY/1rVkpeNpV+Gcby/MIhWXFezlZs11NAcjLB8+X6QABvsraQ== X-Received: by 2002:ae9:ee1a:: with SMTP id i26mr6634831qkg.13.1556555575576; Mon, 29 Apr 2019 09:32:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxidAsCKO8FhRepSR0g9bcoinXgx0K8lNV7xb/PKSxz9l1P7vTWGgz18Xg3uXl62pSnCy/T X-Received: by 2002:ae9:ee1a:: with SMTP id i26mr6634780qkg.13.1556555574724; Mon, 29 Apr 2019 09:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556555574; cv=none; d=google.com; s=arc-20160816; b=AKFk6YVhrcS56iBT3KN/wY/gL1yX6UtWTbwt9z66+HUYeTGRqQiptBfxPacvVqNEDt jbeckTzMlMqnQt4H10v9tACdwXKHdaqQs5yZ7wo3AGQWzLoCf+Yleg6nTgOmNw0IM9VI 3T8ggjkcgzHqRToKUTyoLYVCRjEFxSs7sikB3qe/+I0Et4a7NIxHkPF3xOW80IfpB3WM twX/IaA1psvqgw/fsfKGpaFs89Z30IABFqOqMMtfunrIxO0g1Xwjay06yz7fyXeAS8Ui F6qOvgfN4F7DaIKNtlG1e9XF1efqSlCy5Af7oTZGCyZWhXaegYX7+iPtJZmx+pyzO7Lk 9khg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=VMreTKTST33hsgVkWvM5nBdkRLJ3YgBtCHnvJjhLtlA=; b=D8yyNqRwAWhkXg8dN4v8nJdrkxli6IdEVbQST358752Ttd3hC9S4czCUec0epWkS3e awHUnnizjO0S9CtE/nIEVZ9hIANrWT9UfRWvxYb1+2V/vxDOBkOdLpJuzrqoTZORLVPk jkLIMJvADueZad0B0AMGK8dOuWOFLGqgQSJtFHDVoPbkHwuzGTbGJ4gev2yg4I+kx/vM o4YreXA0iglQS9xeF8GitxZ3B+A+lQBKdwmcOoG8iOxn3EcPput6d8m+I8TPhDSkbP03 ZICbRot4hj0P8Js3vmVyDAG1lHBY1FSeYzn0dUURhzqTl/UA9oGgedpPl9sBPE5PPfXp JxPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id h50si3650160qvd.87.2019.04.29.09.32.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 09:32:54 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D55B459454; Mon, 29 Apr 2019 16:32:53 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F8DA17A64; Mon, 29 Apr 2019 16:32:51 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH v6 3/4] iomap: Add a page_prepare callback Date: Mon, 29 Apr 2019 18:32:38 +0200 Message-Id: <20190429163239.4874-3-agruenba@redhat.com> In-Reply-To: <20190429163239.4874-1-agruenba@redhat.com> References: <20190429163239.4874-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 29 Apr 2019 16:32:53 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Move the page_done callback into a separate iomap_page_ops structure and add a page_prepare calback to be called before the next page is written to. In gfs2, we'll want to start a transaction in page_prepare and end it in page_done. Other filesystems that implement data journaling will require the same kind of mechanism. Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig Reviewed-by: Jan Kara --- fs/gfs2/bmap.c | 22 +++++++++++++++++----- fs/iomap.c | 36 ++++++++++++++++++++++++++---------- include/linux/iomap.h | 22 +++++++++++++++++----- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 5da4ca9041c0..6b980703bae7 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -991,15 +991,27 @@ static void gfs2_write_unlock(struct inode *inode) gfs2_glock_dq_uninit(&ip->i_gh); } -static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos, - unsigned copied, struct page *page, - struct iomap *iomap) +static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, + unsigned len, struct iomap *iomap) +{ + return 0; +} + +static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, + unsigned copied, struct page *page, + struct iomap *iomap) { struct gfs2_inode *ip = GFS2_I(inode); - gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + if (page) + gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); } +static const struct iomap_page_ops gfs2_iomap_page_ops = { + .page_prepare = gfs2_iomap_page_prepare, + .page_done = gfs2_iomap_page_done, +}; + static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, loff_t length, unsigned flags, struct iomap *iomap, @@ -1077,7 +1089,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, } } if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip)) - iomap->page_done = gfs2_iomap_journaled_page_done; + iomap->page_ops = &gfs2_iomap_page_ops; return 0; out_trans_end: diff --git a/fs/iomap.c b/fs/iomap.c index b01ed5a28d2c..ee9ce7a06244 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -665,6 +665,7 @@ static int iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, struct page **pagep, struct iomap *iomap) { + const struct iomap_page_ops *page_ops = iomap->page_ops; pgoff_t index = pos >> PAGE_SHIFT; struct page *page; int status = 0; @@ -674,9 +675,17 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, if (fatal_signal_pending(current)) return -EINTR; + if (page_ops && page_ops->page_prepare) { + status = page_ops->page_prepare(inode, pos, len, iomap); + if (status) + return status; + } + page = grab_cache_page_write_begin(inode->i_mapping, index, flags); - if (!page) - return -ENOMEM; + if (!page) { + status = -ENOMEM; + goto out_no_page; + } if (iomap->type == IOMAP_INLINE) iomap_read_inline_data(inode, page, iomap); @@ -684,15 +693,21 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, status = __block_write_begin_int(page, pos, len, NULL, iomap); else status = __iomap_write_begin(inode, pos, len, page, iomap); - if (unlikely(status)) { - unlock_page(page); - put_page(page); - page = NULL; - iomap_write_failed(inode, pos, len); - } + if (unlikely(status)) + goto out_unlock; *pagep = page; + return 0; + +out_unlock: + unlock_page(page); + put_page(page); + iomap_write_failed(inode, pos, len); + +out_no_page: + if (page_ops && page_ops->page_done) + page_ops->page_done(inode, pos, 0, NULL, iomap); return status; } @@ -766,6 +781,7 @@ static int iomap_write_end(struct inode *inode, loff_t pos, unsigned len, unsigned copied, struct page *page, struct iomap *iomap) { + const struct iomap_page_ops *page_ops = iomap->page_ops; int ret; if (iomap->type == IOMAP_INLINE) { @@ -778,8 +794,8 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, } ret = __generic_write_end(inode, pos, ret, page); - if (iomap->page_done) - iomap->page_done(inode, pos, copied, page, iomap); + if (page_ops) + page_ops->page_done(inode, pos, copied, page, iomap); put_page(page); if (ret < len) diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 0fefb5455bda..2103b94cb1bf 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -53,6 +53,8 @@ struct vm_fault; */ #define IOMAP_NULL_ADDR -1ULL /* addr is not valid */ +struct iomap_page_ops; + struct iomap { u64 addr; /* disk offset of mapping, bytes */ loff_t offset; /* file offset of mapping, bytes */ @@ -63,12 +65,22 @@ struct iomap { struct dax_device *dax_dev; /* dax_dev for dax operations */ void *inline_data; void *private; /* filesystem private */ + const struct iomap_page_ops *page_ops; +}; - /* - * Called when finished processing a page in the mapping returned in - * this iomap. At least for now this is only supported in the buffered - * write path. - */ +/* + * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare + * and page_done will be called for each page written to. This only applies to + * buffered writes as unbuffered writes will not typically have pages + * associated with them. + * + * When page_prepare succeeds, page_done will always be called to do any + * cleanup work necessary. In that page_done call, @page will be NULL if the + * associated page could not be obtained. + */ +struct iomap_page_ops { + int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len, + struct iomap *iomap); void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, struct page *page, struct iomap *iomap); }; From patchwork Mon Apr 29 16:32:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922089 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 B192E92A for ; Mon, 29 Apr 2019 16:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1BDB28161 for ; Mon, 29 Apr 2019 16:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9523228685; Mon, 29 Apr 2019 16:33:01 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA32728161 for ; Mon, 29 Apr 2019 16:33:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 980DB6B000D; Mon, 29 Apr 2019 12:32:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 936FE6B000E; Mon, 29 Apr 2019 12:32:59 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7ACEB6B0010; Mon, 29 Apr 2019 12:32:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id 5A2496B000D for ; Mon, 29 Apr 2019 12:32:59 -0400 (EDT) Received: by mail-qk1-f200.google.com with SMTP id k8so9407710qkj.20 for ; Mon, 29 Apr 2019 09:32:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cn1DePKLmV5y3t5+SaCnxtJvgiy5550Pyj5j1sjrJLE=; b=oIdatnsTNIfKZJzt2XyVSbrX3Mq+eB4eKkjirjy+8D/Gvvl+YSkZHTOvLbSDmhgIx5 MAkQ8NZTz9Cz0vjJUsk8uhutklHhWlxO2SU0xNa3uwB0eAjsJV0yCGi7ywl4YJVw8jmH aWMflIXLG/KAolGfXxc0bngH2h4o4W1MKTeOhdIYTkOAfxLim8qzwh5mFipNwR6KjMMn V/Wn45UQ/7XoVHIyPPpO7rlNH10LXqduUXUQD+dkHikRxCeo4WUb1KkzmNaTK2ugg5Mx nitOLKJZaDMdD0MqPrjWbXtHOT6ZuCd9MzFgIld4N92dBD5gmt8EbJ3AKnSmP6VGYXj2 JpEA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAWvWdBXGxnn3ifuVQdZUx8sLzUr8A1eq9nfJbDDLByR7L77njvO Zq0kx/Lzi6o7kTo546YlR1LCIwOx0TuYljzHhg8NTHikTeYrSXwf0HWRyZ+KlM8ZoL7N7zTOmGx +6/6mu9szP2cUKJkKJIoLUzhKxMesn4lfEKgBt/dElNw+b8Nl0fc7Qz6XuebFOxJ+Rg== X-Received: by 2002:ac8:30cb:: with SMTP id w11mr40672140qta.210.1556555579041; Mon, 29 Apr 2019 09:32:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqydHNZE6Tyfe3JR1k6YbGYsIFUE2cdexDRIJtQa/WeuTXnM310uDMKCTFP1TlZCK8oOIIiC X-Received: by 2002:ac8:30cb:: with SMTP id w11mr40672044qta.210.1556555577665; Mon, 29 Apr 2019 09:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556555577; cv=none; d=google.com; s=arc-20160816; b=BXG/+m3pAwpMgv96uSUDIxhGHpI9CsQR5FawHMJENz8aRsvCg6MfpsQ6ap0cb5bt0q 7XOrtE87ZsB20IBXGyBKmjNNtJ4+pcVC2UzKzcTV/EDzLhn8NDRHwkBTFjyIg1Is1tbo 6DkhqHxY5obNRBIgULGhz6HAfdwppjtZ3ViKqR/uQlo16kMBRQm4BJcN0A+9BqnPfzDQ TOV87I9RYbpZOXRrzKcgLF7LijuBi1hid1GN1f6erWeHldHB3xq+g9hDnVV3zWKNxKW2 AU7ylIOQJTnQnSrSFzc5Ihv7eMugFMB3zlpyK5ZFsvdL0MUynuvx4xvfydUCtNYX/5p6 qygQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Cn1DePKLmV5y3t5+SaCnxtJvgiy5550Pyj5j1sjrJLE=; b=nKtk9/NFTvj6JPIYUVup8GYQGbRYyTtelas3+9vnQd8cq0/Wetar5NCK8Empn/pRVy 8ofsnFz0pYSi0vnVSfor+odDZmXkG452hmm35lH6ZO15STyLfROwyCaVLVdKTXTG4yxZ +YDfWDcZ+pe2hGiwsbxoClt7F7JyAB9g5t8psPjmXDAKiiFkwGiLs7g69eJF25vpe0ym XtPIMWcinar8cd0LwD1HlOViugcCYHZ5T6SQ7jlKNMChLWyNat+wGgM1qMbn4ZJDOoHI v+fZh32ska+Psrz2uG19D3TTPifvDi1+6gZmKc8R0Q7I8osD8CphU+LucnHvn73TfVWg a6IA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d21si31098qkb.125.2019.04.29.09.32.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 09:32:57 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C721B3087924; Mon, 29 Apr 2019 16:32:56 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B11557980; Mon, 29 Apr 2019 16:32:54 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH v6 4/4] gfs2: Fix iomap write page reclaim deadlock Date: Mon, 29 Apr 2019 18:32:39 +0200 Message-Id: <20190429163239.4874-4-agruenba@redhat.com> In-Reply-To: <20190429163239.4874-1-agruenba@redhat.com> References: <20190429163239.4874-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 29 Apr 2019 16:32:56 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Since commit 64bc06bb32ee ("gfs2: iomap buffered write support"), gfs2 is doing buffered writes by starting a transaction in iomap_begin, writing a range of pages, and ending that transaction in iomap_end. This approach suffers from two problems: (1) Any allocations necessary for the write are done in iomap_begin, so when the data aren't journaled, there is no need for keeping the transaction open until iomap_end. (2) Transactions keep the gfs2 log flush lock held. When iomap_file_buffered_write calls balance_dirty_pages, this can end up calling gfs2_write_inode, which will try to flush the log. This requires taking the log flush lock which is already held, resulting in a deadlock. Fix both of these issues by not keeping transactions open from iomap_begin to iomap_end. Instead, start a small transaction in page_prepare and end it in page_done when necessary. Reported-by: Edwin Török Fixes: 64bc06bb32ee ("gfs2: iomap buffered write support") Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson --- fs/gfs2/aops.c | 14 ++++++--- fs/gfs2/bmap.c | 83 +++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 05dd78f4b2b3..6210d4429d84 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -649,7 +649,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, */ void adjust_fs_space(struct inode *inode) { - struct gfs2_sbd *sdp = inode->i_sb->s_fs_info; + struct gfs2_sbd *sdp = GFS2_SB(inode); struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master; @@ -657,10 +657,13 @@ void adjust_fs_space(struct inode *inode) struct buffer_head *m_bh, *l_bh; u64 fs_total, new_free; + if (gfs2_trans_begin(sdp, 2 * RES_STATFS, 0) != 0) + return; + /* Total up the file system space, according to the latest rindex. */ fs_total = gfs2_ri_total(sdp); if (gfs2_meta_inode_buffer(m_ip, &m_bh) != 0) - return; + goto out; spin_lock(&sdp->sd_statfs_spin); gfs2_statfs_change_in(m_sc, m_bh->b_data + @@ -675,11 +678,14 @@ void adjust_fs_space(struct inode *inode) gfs2_statfs_change(sdp, new_free, new_free, 0); if (gfs2_meta_inode_buffer(l_ip, &l_bh) != 0) - goto out; + goto out2; update_statfs(sdp, m_bh, l_bh); brelse(l_bh); -out: +out2: brelse(m_bh); +out: + sdp->sd_rindex_uptodate = 0; + gfs2_trans_end(sdp); } /** diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 6b980703bae7..27c82f4aaf32 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -994,7 +994,9 @@ static void gfs2_write_unlock(struct inode *inode) static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, unsigned len, struct iomap *iomap) { - return 0; + struct gfs2_sbd *sdp = GFS2_SB(inode); + + return gfs2_trans_begin(sdp, RES_DINODE + (len >> inode->i_blkbits), 0); } static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, @@ -1002,9 +1004,11 @@ static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, struct iomap *iomap) { struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); - if (page) + if (page && !gfs2_is_stuffed(ip)) gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + gfs2_trans_end(sdp); } static const struct iomap_page_ops gfs2_iomap_page_ops = { @@ -1064,31 +1068,45 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, if (alloc_required) rblocks += gfs2_rg_blocks(ip, data_blocks + ind_blocks); - ret = gfs2_trans_begin(sdp, rblocks, iomap->length >> inode->i_blkbits); - if (ret) - goto out_trans_fail; + if (unstuff || iomap->type == IOMAP_HOLE) { + struct gfs2_trans *tr; - if (unstuff) { - ret = gfs2_unstuff_dinode(ip, NULL); - if (ret) - goto out_trans_end; - release_metapath(mp); - ret = gfs2_iomap_get(inode, iomap->offset, iomap->length, - flags, iomap, mp); + ret = gfs2_trans_begin(sdp, rblocks, + iomap->length >> inode->i_blkbits); if (ret) - goto out_trans_end; - } + goto out_trans_fail; - if (iomap->type == IOMAP_HOLE) { - ret = gfs2_iomap_alloc(inode, iomap, flags, mp); - if (ret) { - gfs2_trans_end(sdp); - gfs2_inplace_release(ip); - punch_hole(ip, iomap->offset, iomap->length); - goto out_qunlock; + if (unstuff) { + ret = gfs2_unstuff_dinode(ip, NULL); + if (ret) + goto out_trans_end; + release_metapath(mp); + ret = gfs2_iomap_get(inode, iomap->offset, + iomap->length, flags, iomap, mp); + if (ret) + goto out_trans_end; } + + if (iomap->type == IOMAP_HOLE) { + ret = gfs2_iomap_alloc(inode, iomap, flags, mp); + if (ret) { + gfs2_trans_end(sdp); + gfs2_inplace_release(ip); + punch_hole(ip, iomap->offset, iomap->length); + goto out_qunlock; + } + } + + tr = current->journal_info; + if (tr->tr_num_buf_new) + __mark_inode_dirty(inode, I_DIRTY_DATASYNC); + else + gfs2_trans_add_meta(ip->i_gl, mp->mp_bh[0]); + + gfs2_trans_end(sdp); } - if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip)) + + if (gfs2_is_stuffed(ip) || gfs2_is_jdata(ip)) iomap->page_ops = &gfs2_iomap_page_ops; return 0; @@ -1128,10 +1146,6 @@ static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, iomap->type != IOMAP_MAPPED) ret = -ENOTBLK; } - if (!ret) { - get_bh(mp.mp_bh[0]); - iomap->private = mp.mp_bh[0]; - } release_metapath(&mp); trace_gfs2_iomap_end(ip, iomap, ret); return ret; @@ -1142,27 +1156,16 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length, { struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_sbd *sdp = GFS2_SB(inode); - struct gfs2_trans *tr = current->journal_info; - struct buffer_head *dibh = iomap->private; if ((flags & (IOMAP_WRITE | IOMAP_DIRECT)) != IOMAP_WRITE) goto out; - if (iomap->type != IOMAP_INLINE) { + if (!gfs2_is_stuffed(ip)) gfs2_ordered_add_inode(ip); - if (tr->tr_num_buf_new) - __mark_inode_dirty(inode, I_DIRTY_DATASYNC); - else - gfs2_trans_add_meta(ip->i_gl, dibh); - } - - if (inode == sdp->sd_rindex) { + if (inode == sdp->sd_rindex) adjust_fs_space(inode); - sdp->sd_rindex_uptodate = 0; - } - gfs2_trans_end(sdp); gfs2_inplace_release(ip); if (length != written && (iomap->flags & IOMAP_F_NEW)) { @@ -1182,8 +1185,6 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length, gfs2_write_unlock(inode); out: - if (dibh) - brelse(dibh); return 0; }