From patchwork Fri Apr 26 13:11:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10919121 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 0D5B3912 for ; Fri, 26 Apr 2019 13:11:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0D0B28D0D for ; Fri, 26 Apr 2019 13:11:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E489328DD0; Fri, 26 Apr 2019 13:11:39 +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 7BD5D28D0D for ; Fri, 26 Apr 2019 13:11:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99D7A6B0008; Fri, 26 Apr 2019 09:11:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 94DB36B000A; Fri, 26 Apr 2019 09:11:38 -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 8162F6B000C; Fri, 26 Apr 2019 09:11:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by kanga.kvack.org (Postfix) with ESMTP id 600866B0008 for ; Fri, 26 Apr 2019 09:11:38 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id e31so2858490qtb.0 for ; Fri, 26 Apr 2019 06:11:38 -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=QvO6jybBiPjVZFCJ1HxGTRMmE8YsY0C+1koHRB/O2AM=; b=n2caN63gVj5sUqoLSOCagucy3oflUaUJ/kA1E7x07W2kIkhE5LK97dyOb1HqHRgYU8 YxxaV2V1cp5ou0R9DByfp30ohcjLKU3qqXKzIIz1tlOsikJcBZmAr0lqVQp8S1raIsxZ pbP9Br+y9eauH1eRKzfQ6T0mRlSbL67GXvHjspLVkolA+L+JVtDjzGdhQG7k15SVl4Qq opVL1xsE2GoHtA2vGDh+DZ1HU89skpD6d+T5BYz5iB2W4i2x3gBioJ664Df5QEgHvwCv G42bdw9fNZz6W0fhdbCwKIFXXUERhbIaLh7s42k/1f2eBRo8aGMJgd9Bo4TM7soZJgwz muZg== 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: APjAAAXh65yaPmIpe7EC9VJvaZAarLJpiKlWaZjnF6qzge7bquGZev2p lxFG3DHb+G1oDcMGloS3L4mrpkRGQgpFh8GR/gR03YrTiclGB1HXnisi+tVxz4CingKDd8G6YuD 1ncVffFNiv4rJ9YWy71qyzyH/jVYcKTODpLp3gQs4eFVW4STVsCbk1FGlxyFfF7Qrrw== X-Received: by 2002:a0c:a286:: with SMTP id g6mr14641905qva.215.1556284298168; Fri, 26 Apr 2019 06:11:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1JQ2xU5O/DMOxBTkGcD+d5c5K/l3JzhwAzm6ZVBQm4tz0FA/6BQuc5JwOkML//67t7FDd X-Received: by 2002:a0c:a286:: with SMTP id g6mr14641845qva.215.1556284297536; Fri, 26 Apr 2019 06:11:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556284297; cv=none; d=google.com; s=arc-20160816; b=sblY2jHOA8ZQ8zpqpW6ah0qkTK2THgVsEU5X7D7Rrqi/MT1KhHbokx9swyDX7MVs6U 8Ca7flaAIg8WO68ZdnleZCGpqx7Yh61JZv/6LRdK1hpH7lewY8Rf80iJwx4H+IcEX6E4 UJE4r3ohk1Y1wK68VfRq3FdBbNt6sdCQTeOEEQ4w7M7YBBv9N7x8QGb/zL6UP9pNfrwq tM7AAwhntyEjm8t8u0VgIaT9A8xobwyYWEjMYfBRMXlCvmaFotndHi7do0JtgbYqUEEF uuxBGLEgjRcy6ewOg9eC2KpvJW8YmPqlN/l1CcbvDcXakiZJZI/0XNZgNLub9ky2p9EU 2vdw== 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=QvO6jybBiPjVZFCJ1HxGTRMmE8YsY0C+1koHRB/O2AM=; b=tZrYKFR3+xZ4ohsgFrPHPjc4YsZ6JtMUHcaxeAdv68m989jh2POCTMgfXWFt6Ouzz7 hBD56xoX3pBH5DBfvLMjYXUDhifAGOA6m92ug4aTU3XHwRkbTctAnhGZ24jqektpWMs7 TAL8yb/IbN3qVlLSEYm11swpdHoCByPSllYNSY7vYFk0HJoKer45se5oXdOAR32i9pra u7Wvs3khse+4dtXxK+Sv8EWH1SY6Y74Oex7OH0GQvMtS1bOjr/B7J18rSO5f3Qz1YI0W C+R3hcoaIrpT3kqoDW+fqB4i5hPXuH74Tsiel2nRABDKn4gkoz24oKIbksaGv745pJZ3 wUag== 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 r12si4889914qvs.31.2019.04.26.06.11.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 06:11:37 -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 C42F4883B8; Fri, 26 Apr 2019 13:11:36 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1ECE648D6; Fri, 26 Apr 2019 13:11:30 +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 v5 1/3] iomap: Fix use-after-free error in page_done callback Date: Fri, 26 Apr 2019 15:11:25 +0200 Message-Id: <20190426131127.19164-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]); Fri, 26 Apr 2019 13:11:36 +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 are 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 Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara --- fs/buffer.c | 5 +++-- fs/iomap.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 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 97cb9d486a7d..3e4652dac9d9 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -765,6 +765,14 @@ iomap_write_end_inline(struct inode *inode, struct page *page, return copied; } +static int +buffer_write_end(struct address_space *mapping, loff_t pos, loff_t len, + unsigned copied, struct page *page) +{ + copied = block_write_end(NULL, mapping, pos, len, copied, page, NULL); + return __generic_write_end(mapping->host, pos, copied, page); +} + static int iomap_write_end(struct inode *inode, loff_t pos, unsigned len, unsigned copied, struct page *page, struct iomap *iomap) @@ -774,14 +782,14 @@ 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 = buffer_write_end(inode->i_mapping, pos, len, copied, page); } else { ret = __iomap_write_end(inode, pos, len, copied, page, iomap); } 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 Fri Apr 26 13:11:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10919125 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 3F03D1398 for ; Fri, 26 Apr 2019 13:11:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FA1E28D0D for ; Fri, 26 Apr 2019 13:11:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 236B528DD9; Fri, 26 Apr 2019 13:11:44 +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 9287528D0D for ; Fri, 26 Apr 2019 13:11:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B0666B000A; Fri, 26 Apr 2019 09:11:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 15DF56B000C; Fri, 26 Apr 2019 09:11:42 -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 025FE6B000D; Fri, 26 Apr 2019 09:11:41 -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 D99846B000A for ; Fri, 26 Apr 2019 09:11:41 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id k68so2655931qkd.21 for ; Fri, 26 Apr 2019 06:11:41 -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=ZBsc3JvTFM/Wu94X9TXfrbjvcLLo3kHBRtLId2sjpu8=; b=FZOAlUG3RhnCjkTmKQ6x1cVEY5ECILHrFa7uWqji+jH4oYVSQYMjtsQ8QsdH+kcErv 0ywIf65DykXIZdmCWW17Mrwd40HqxKNwPgu2EqT0Wgflpl9e5phIDnWB/aKZwoFiNv9v /5F35wOr9i9EeombTFdbOlM2G/kV36u35vhuZS/IX6Y8j3c92OwDOwXcor9z92G/SiYL aMm/o1UoD/4Aim4uDEtS2mTgzsolZ4zWMJ6oCqu2u73/YvTIl1fhJ8NOZooisyipwKbm ROxtCJMVtRgi3u6vGyQ3czBTRl4fqDBTaVkiEIjrb8TJUjRuJwR6LYBrRdIRVZxe5v4O cFRg== 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: APjAAAVRikHzE5/hQgQMGqIJ+zmtfl+/Gu9vt08qn5TNltKO9bAiIvkM M8xbOKvJDYUJ+12mcGVmfmMn1UOKImEowgabirTFDx+vy1MxdRmt65AxIVkyALal+Rln9L6SSdN yU/oNDzKrGXQ5VzCCDe4qnlXkXXFrYcRopm0rmk3v8KDOQ8f9IohvcgATp/1otO+fzA== X-Received: by 2002:a0c:9568:: with SMTP id m37mr5326295qvm.154.1556284301610; Fri, 26 Apr 2019 06:11:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoGBn0fzmgk+VsZ7oW0rw8mmDBqevtrUEl77MaJMUPa67eeLvTKbBSbsJh3y6VkbeyRZNp X-Received: by 2002:a0c:9568:: with SMTP id m37mr5326216qvm.154.1556284300726; Fri, 26 Apr 2019 06:11:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556284300; cv=none; d=google.com; s=arc-20160816; b=L8gcWkFmwSU6hlnLiNYzHkWigarSjczDg21iUpAN1se4jwQXQZJy4kKwvWI4hECkOM LSDgoPpxkolF5Xjp3dmpvcVXcmfoCZdhEtv9yPPfZuwjnlEvKSRPlPiF5ZWJyS7U61de FF1SsDPIOjpzGTgiUhXfCeolkMkY5nf9kUOLa1V1gU44X4ex00rPIHHgEtjeT2yZcrWk HmisPi7ZO2rjy8s9a3um/7baqMjhB4f4ZxiyLaj0n/RF/Jawf53lLco1vd6vfJmXOjyw 0LrEINsmor6flOJE10cL+WZE6/zOaxCf9zeKiKO0xCkDFbwLzOmIMf3ilp2aJ1q+QyG+ dCaA== 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=ZBsc3JvTFM/Wu94X9TXfrbjvcLLo3kHBRtLId2sjpu8=; b=hCU7lEL0Vr4+cQigc3eyjD4CknEwIlF969keki6Y5Y9E2taR2l0KFxEDeQBO0IUc0L E7nIqh/8iF3jdMQeez50bf1YyCQgHdAFFDYhqrNBDCAwV0/E7BkLCWMGqGTwKdlH8xF1 pQ0wjSsAbUSRCn8iSEcccQcOt/5uaxTUobwFdv5CtjxuXDIxKYwEgGqFiNEq8SPsOU0Q tCXPvF+EMZs9mt5Ru41kvzuG3QQVK/DFVfxoqgmFib1pO1kTAFHMIStowHdWzpcScuZo c3evFLb2D7cd18m62K8KIVFLI7jh4u1JovcVDwLf8QQSRG20Bs9NN2HxBQqPK9eXCn3i p2Mw== 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 34si955037qtv.59.2019.04.26.06.11.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 06:11:40 -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 B75FA30ADBDF; Fri, 26 Apr 2019 13:11:39 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28D3A66066; Fri, 26 Apr 2019 13:11:36 +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 v5 2/3] iomap: Add a page_prepare callback Date: Fri, 26 Apr 2019 15:11:26 +0200 Message-Id: <20190426131127.19164-2-agruenba@redhat.com> In-Reply-To: <20190426131127.19164-1-agruenba@redhat.com> References: <20190426131127.19164-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.47]); Fri, 26 Apr 2019 13:11:39 +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 --- fs/gfs2/bmap.c | 22 +++++++++++++++++----- fs/iomap.c | 22 ++++++++++++++++++---- include/linux/iomap.h | 18 +++++++++++++----- 3 files changed, 48 insertions(+), 14 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 3e4652dac9d9..ba2d44b33ed1 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) { + 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 no_page; + } if (iomap->type == IOMAP_INLINE) iomap_read_inline_data(inode, page, iomap); @@ -684,12 +693,16 @@ 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); +no_page: + if (page_ops) + page_ops->page_done(inode, pos, 0, NULL, iomap); } *pagep = page; @@ -777,6 +790,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) { @@ -787,8 +801,8 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, ret = __iomap_write_end(inode, pos, len, copied, page, iomap); } - 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..fd65f27d300e 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,18 @@ 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. - */ +/* + * Called before / after processing a page in the mapping returned in this + * iomap. At least for now, this is only supported in the buffered write path. + * When page_prepare returns 0, page_done is called as well + * (possibly with page == NULL). + */ +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 Fri Apr 26 13:11:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10919129 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 F3565912 for ; Fri, 26 Apr 2019 13:11:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E38FE28D0D for ; Fri, 26 Apr 2019 13:11:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D74DC28DD0; Fri, 26 Apr 2019 13:11:47 +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 ACB4E28D0D for ; Fri, 26 Apr 2019 13:11:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 223CC6B000C; Fri, 26 Apr 2019 09:11:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1D4186B000D; Fri, 26 Apr 2019 09:11:45 -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 0C3796B000E; Fri, 26 Apr 2019 09:11:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by kanga.kvack.org (Postfix) with ESMTP id E0F7A6B000C for ; Fri, 26 Apr 2019 09:11:44 -0400 (EDT) Received: by mail-qk1-f197.google.com with SMTP id k8so2658823qkj.20 for ; Fri, 26 Apr 2019 06:11:44 -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=OA7F3FreQ8PkT1KccUNDDAJaNuU1T6zXuRtnCGciwatk9UKjCPQoEHYbFub4teeBZs MKGzM2OjMrjbv/vEBaLgzGkN/O3grCvHNSvEwpishzf4a2Z8yWSDHXqRfd/2Y97b1Gzr 6ba0ZgJcGG1vgUKVQNwi4IygcOAH+BzpLhlbmvtl5zqrAKc6T9RRob0zoNbWLRfETCEp 3LPTJbigMXAcokhvWzSiECJclPrIAVLCHF9ZSygw2FMA7ghubB/jCSBfsqVLd6R6mOxh 2LmwGTJpeVdqakALoHdAkZDRjFQd4nkdlkhdjMpaOoKB0Wu8hrOxyG8HKEIZyAtQ6Vaf flvw== 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: APjAAAVRQhDEOw6UlZPtLXRuHxO+Ousxi3YQcm+4MrfrDD5ATBr6URQL fSLBKen+w8jLtvDO/adBFjGE7xUU/EOblPtEN2ynfNyW6056K2t63wfLAfDYIYiIQu0gMkOJwTI HURdq44uQR2dM4A9+WtEpqDPKFdmvYR+PGZoaCt4dvQ0/rOGxvN5sCZWFhxQBeUibJQ== X-Received: by 2002:ac8:34ac:: with SMTP id w41mr24353025qtb.186.1556284304634; Fri, 26 Apr 2019 06:11:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+/sDQmIN/MOgIQoSiirJcFhfh1GbmJiBTEqTXZYIzMFZbmzE1lVPBPseepxlRLsgYBUFz X-Received: by 2002:ac8:34ac:: with SMTP id w41mr24352928qtb.186.1556284303515; Fri, 26 Apr 2019 06:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556284303; cv=none; d=google.com; s=arc-20160816; b=uuDz8l6G3/uMasos3ZvglHbr3lJiVGyr3jEsRtWcgGDagItWdjOXfSQShCmUwZfAWc 0s3DF7QjkHJuOKZXU1p1jkzAqjmwXjIAoh1BW6w3etVSV0wB4PkRmeRdb+6Ny5fpD19V JE0Zw9n+lP+DtA6k4LM/77xXoDwZsW0T6jCTOzTvzb/1+64J19iskOQjMZ/1LyAVMJZ6 mlr/72k69qgquEFYaAQ0t70Zk0gqtAvCWXGQzXSKBUkZj80J+68po/glHVaEOPar7R3A W4b82ysJbOb7FHQJ9FEwZFPbCH9Cj6Q7GYW5aykKOlfwY5kdJvYi2L8p6xCWoKkFNB6t kEGw== 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=J8V3r+dQ6JKCf+5GCESZo3yYs87DZzV02kgoeh+eJcU0wUSz0FQS0AmGWaA+Zzrbk1 FHtedjh0XNF1s4WX/3vpXnqoOhvizBR/SwtlyzQtvF1WOm1aRchLpQ3Dd/rFM81GvzO+ 6LdTy+vas/breQ+SIj+btQatyHxEasQbYRRdpok2xixAzcdPTxcpL0mS5MewdxTNtE5+ QZHFHJgBS0F/uQO+VN795q79/bUMjJBVeazZHzj6Kjklw9N5ISr1R8whOUgCcBEMmUNC Yu4VNPBf4ThGbbppdt64yaiEmvW3izsKaZdQLP+qlZ8Nvj7fsVuQThLmhXpWbKcnfGcU +/pg== 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 d8si1002366qti.118.2019.04.26.06.11.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 06:11:43 -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 A16F130ABF2A; Fri, 26 Apr 2019 13:11:42 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D9C36607E; Fri, 26 Apr 2019 13:11:39 +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 v5 3/3] gfs2: Fix iomap write page reclaim deadlock Date: Fri, 26 Apr 2019 15:11:27 +0200 Message-Id: <20190426131127.19164-3-agruenba@redhat.com> In-Reply-To: <20190426131127.19164-1-agruenba@redhat.com> References: <20190426131127.19164-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.40]); Fri, 26 Apr 2019 13:11:42 +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; }