From patchwork Mon Apr 29 22:09:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922567 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 9CF071395 for ; Mon, 29 Apr 2019 22:09:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F09B289EA for ; Mon, 29 Apr 2019 22:09:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82C2D289ED; Mon, 29 Apr 2019 22:09:49 +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 1E808289EA for ; Mon, 29 Apr 2019 22:09:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3CBF6B0005; Mon, 29 Apr 2019 18:09:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EC4106B0007; Mon, 29 Apr 2019 18:09:47 -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 DB2746B0008; Mon, 29 Apr 2019 18:09:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by kanga.kvack.org (Postfix) with ESMTP id BDD8C6B0005 for ; Mon, 29 Apr 2019 18:09:47 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id o34so11657569qte.5 for ; Mon, 29 Apr 2019 15:09:47 -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=+NMe/1QosNo0ZlIV/VjhqfQJiDc8qYgxFPf9mMzErkU=; b=bkfIlI7JT0PJjNP2tUedxml/5sZ211+fAKBXvMhGr0UhAt91adkjkZvIQBk3pVuHwh Lf+oNLXyhGEcD5BXuZfHISEBDe+3Xj3sANfw+MoUPzGNMDOF4MH9NAB8NLUfugXohkta yGksTXTLW8BwrQvIAIIUbm/0ctwIqI+X3t3gxPB8o5/zSpbxsHoWF4SrRLGKfQjrg2zw nfc4iySotA3AyHjMnqaYzY1BF5b2EyPdRh+MI8jfwRMqr+eWB4ol8cCQ+doIn/x4aFEw xU6xNQ+B4TUd76a41uIFLgOAgONFlKG587fI5fLA54g38ThPZvD9LZ2XWWLaMlQ0xBZt cWuQ== 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: APjAAAXyKZigXN8IUVwB8Kzj13UBOUs41ox3FPj03VGLVUGZb4FhLg6F kTChD18kEIFZWyWFeV3aDMcP4S52KytvjospGIbiIttAMMc+qmRSa0QXC1u0T4eDikxwQ/8GBFG R2pmdzmiHVdrAYYtdfKu1M5CLbZi5FyvP6LODKBHT8rcWhxFQdMvY+ch/wJNlnFD3uw== X-Received: by 2002:a37:78f:: with SMTP id 137mr10439163qkh.66.1556575787529; Mon, 29 Apr 2019 15:09:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyypN6QC67w/WMZrLajSCmpvz6Xy0WINqoTb3KdsRwnB7tFbKod/Vo18OjDY/gsZeKyB9+M X-Received: by 2002:a37:78f:: with SMTP id 137mr10439120qkh.66.1556575786873; Mon, 29 Apr 2019 15:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556575786; cv=none; d=google.com; s=arc-20160816; b=tlcxoYx0cwMvgv/s/kg90X+Jy+i+4fDyHIA1krME8S6rxKVdgQJQG1tQZjjtjZuE1B lDGCjiZW/2EabGWaB4/MdngQl9WX97tue1u5lntOoacAaj4URpdVhFE92dzSoT9DNwAq b8vsCcDaXmUQo20cwnsHYdKBLCee4qamiOYufOYyz6PPQV8Y6pwOJ+1aUQiBkf3fs41g 99cPRenDd49srpKgg0hwoRkS6G+zR9d9PVqiRaELgX6XLZfZyzDJDHSY0Rbyw/VR1Ntd zGuYFkjkodbhai82QG5rfE3Bdm3h6Y0RtDRGjszrPDxC5j06DbmR374dmGK0cHMOtgp/ knLQ== 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=+NMe/1QosNo0ZlIV/VjhqfQJiDc8qYgxFPf9mMzErkU=; b=axQg4oaleyMKQvM2XPkFGVYlh3HPCqRgh+7rHqOQdytRXaeF131+4jXOsbS9zy/iO+ VFHK8shPX6MQL31iTsMYK6VbypVaycIa/XUf1lnpFz8ZKu4ypCRtZDYkQHs0YmX5eOKo LNiZXAOc5Zqt5yvcBiddbHEyTLuAepKrnaprCrsoKcP1/gF+zykFSNFFPI0AQqxt+nG4 kLoKQrjzHmf6D7LZdDJkFNssGyaQIw6rdO2hNrG1UboZVQt9MknXBugCGoBG5n6dU2qu Hno2kJgauP8Ps2cmKcipOp6XLjrmVVmCzrELIujNlxDUPOd1P00w4KU30AVbdvwyT1Lx nl/Q== 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 y4si2641966qve.195.2019.04.29.15.09.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 15:09:46 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00F4E307EA82; Mon, 29 Apr 2019 22:09:46 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E9BC57AA; Mon, 29 Apr 2019 22:09:43 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, "Darrick J . Wong" Cc: Christoph Hellwig , 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 v7 1/5] iomap: Clean up __generic_write_end calling Date: Tue, 30 Apr 2019 00:09:30 +0200 Message-Id: <20190429220934.10415-2-agruenba@redhat.com> In-Reply-To: <20190429220934.10415-1-agruenba@redhat.com> References: <20190429220934.10415-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 29 Apr 2019 22:09: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 Reviewed-by: Darrick J. Wong --- 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 22:09:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922571 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 D5D6B1390 for ; Mon, 29 Apr 2019 22:09:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7F53285BA for ; Mon, 29 Apr 2019 22:09:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC6F9287EA; Mon, 29 Apr 2019 22:09:52 +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 5496A287C3 for ; Mon, 29 Apr 2019 22:09:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FD636B0007; Mon, 29 Apr 2019 18:09:51 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6ADC26B0008; Mon, 29 Apr 2019 18:09:51 -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 5C4746B000A; Mon, 29 Apr 2019 18:09:51 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by kanga.kvack.org (Postfix) with ESMTP id 3400A6B0007 for ; Mon, 29 Apr 2019 18:09:51 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id n1so11586843qte.12 for ; Mon, 29 Apr 2019 15:09:51 -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=CCsyaAq6NUSRHpNkWBkGVY0ELs69+m3iSE/8GgOpi8Y=; b=PswsPrgo+1ZOW59fMpbjsnQgOLpHp4M3DlW0fMwyUtz0hTMTag+PeZPGu/FKck2qob rS8LsWG4/boWYFA+ihQv/yWk0gdxdUhgCimqwxYDAZq1SzYSVxwGYQZrC4J9Cv3L6YeG eii7fs7/0gzE4Cxw4f0RFY7Y9zItXrrUBksZUsZZ2/5XJZ2BvOZTVEoaIrtEgb+wvhal +sfNyhTozD2fYlsUi9lSBFUmjP9WyarAO/xi/GGaGD5pnsdC9YqT6VTu8Xih8YcYPaTi vjyMHZVtwYCw36RMLCGvMDmLXvpOMB3Ud0nj0Yh1LvQCvfPlVdO6HQ/GybwHI5lkXAFL 6yVg== 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: APjAAAW/0MwYrQXPRDEKenwiblp79H/3BXMQ/Khqp8SAvZIKfF0Tv4BR J23iXt5sWpGEThkOUQaGO1H0HZpBwvbMTViklNvofqdpSOoxIessmls2/EgfioOknPSv1oDRY/z +ah7b2Q/kdJF/fek+mglIbWIuz3FwVknaUcdSplOnP8qOh7If2JutKy8xeZALLvzcFg== X-Received: by 2002:a05:620a:1088:: with SMTP id g8mr24473164qkk.173.1556575790991; Mon, 29 Apr 2019 15:09:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyt3AOwKIcDw98UGhiJbEomrEUxOj9gyjN307ipcoSfk27U/bGg/BRxXus7MntgJ8sdg4pD X-Received: by 2002:a05:620a:1088:: with SMTP id g8mr24473100qkk.173.1556575789983; Mon, 29 Apr 2019 15:09:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556575789; cv=none; d=google.com; s=arc-20160816; b=unPvEq0Uec2cDGXdMAdKitZSgU0kjjicWYZWzzxirQNlpgRZlwu404KQ/+TfoKQzV5 rjWx9502B8fbxu2uRp4q0V8/bAAokVUF7IWkFIGWuzhMUxCPBGF5lBBh1YxbaYViFNP1 pEkPv0KyOIrAqbmfTTn4mwK197pZ6+YMQauDyJzbFUQmIqeM4ULAYdHtmX8mI5IyH6T5 QiOjebc2rzI4MNL1p7UJ/AcKUdkZvihW9jbfAu0KvhX3fnbhALLHUskoYI8aCfei18LW N+fc7VDJM9CG1LVBgCRqh2luZoNMV+GvvZLIFPnotoXc7mhROnvUJOfaqfJ83iRnfaS2 k0pw== 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=CCsyaAq6NUSRHpNkWBkGVY0ELs69+m3iSE/8GgOpi8Y=; b=vD1U2ZfC5XdWRKFhO2ZVgTIZyM9RraX7Qfx19tRu0Eqz/OaOdBwrCmMtbLz4yGPNPx s2SBQ6S6/s0n0lNFuxpQ5uRRFA0Zb4c9MslxkcAGOQy49lBM2N8zMsZ4VH+6NK1CWKhC 47CKXuRV37twieN+AwOhcYamAg8oa50Yo7L1h5RS6CY2fTGbQ8aekPR3hSVrTWfkadi0 ZFIN/SlViF//VN43TN/Fcxi+DWujQtqmaMKNRHFxVW4WYi+m4kYXxTJsJa8xZmK7J2HN GWRNyNdv52XifuvIcviiwwGwRJxA9RbeieZ1O0Bp4Bo5pOVkdO0+43hFsdk0+UPyT1zx +zjw== 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 14si6787733qtw.393.2019.04.29.15.09.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 15:09:49 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1A3BC308624B; Mon, 29 Apr 2019 22:09:49 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D9AA1850B; Mon, 29 Apr 2019 22:09:46 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, "Darrick J . Wong" Cc: Christoph Hellwig , 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 v7 2/5] fs: Turn __generic_write_end into a void function Date: Tue, 30 Apr 2019 00:09:31 +0200 Message-Id: <20190429220934.10415-3-agruenba@redhat.com> In-Reply-To: <20190429220934.10415-1-agruenba@redhat.com> References: <20190429220934.10415-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 29 Apr 2019 22:09:49 +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 The VFS-internal __generic_write_end helper always returns the value of its @copied argument. This can be confusing, and it isn't very useful anyway, so turn __generic_write_end into a function returning void instead. Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/buffer.c | 6 +++--- fs/internal.h | 2 +- fs/iomap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index ce357602f471..e0d4c6a5e2d2 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2085,7 +2085,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, } EXPORT_SYMBOL(block_write_begin); -int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, +void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, struct page *page) { loff_t old_size = inode->i_size; @@ -2116,7 +2116,6 @@ int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, */ if (i_size_changed) mark_inode_dirty(inode); - return copied; } int block_write_end(struct file *file, struct address_space *mapping, @@ -2160,7 +2159,8 @@ 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); + __generic_write_end(mapping->host, pos, copied, page); + return copied; } EXPORT_SYMBOL(generic_write_end); diff --git a/fs/internal.h b/fs/internal.h index 6a8b71643af4..530587fdf5d8 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -44,7 +44,7 @@ static inline int __sync_blockdev(struct block_device *bdev, int wait) extern void guard_bio_eod(int rw, struct bio *bio); extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, get_block_t *get_block, struct iomap *iomap); -int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, +void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, struct page *page); /* diff --git a/fs/iomap.c b/fs/iomap.c index 2344c662e6fc..f8c9722d1a97 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -777,7 +777,7 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, ret = __iomap_write_end(inode, pos, len, copied, page, iomap); } - ret = __generic_write_end(inode, pos, ret, page); + __generic_write_end(inode, pos, ret, page); if (iomap->page_done) iomap->page_done(inode, pos, copied, page, iomap); From patchwork Mon Apr 29 22:09:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922575 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 990EB1395 for ; Mon, 29 Apr 2019 22:09:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A595285BA for ; Mon, 29 Apr 2019 22:09:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EC34287EA; Mon, 29 Apr 2019 22:09: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 2A19F285BA for ; Mon, 29 Apr 2019 22:09:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E2CF6B0008; Mon, 29 Apr 2019 18:09:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0947B6B000A; Mon, 29 Apr 2019 18:09:54 -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 EECC46B000C; Mon, 29 Apr 2019 18:09:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by kanga.kvack.org (Postfix) with ESMTP id CD4F36B0008 for ; Mon, 29 Apr 2019 18:09:53 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id p26so11591312qtq.21 for ; Mon, 29 Apr 2019 15:09: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=XPoMyuuM4ApL6KB762g1/x7lGygMjp3tNkFYSkeVl1Y=; b=mrjlJOCTMhR4Nk0WsWlU9JhPIfs4fAj7G1q/SGkiP7fN7tsup0a4Dq/aJ6hB5d7zvM rzlyDSweidDx34aoy/X1QaaIUEfLQnWn1v0KkEMnel896IoSccYCuNqFJJ3KxT7rwSiq 2V2SH6GAn6b3BIYWRZwGKdy7YOh1x1OkeWqbRfTD/KftQF5AnyiuScgooLl381jj1AW0 bdEMfLPQBJaJ63pp/5m75Y2DufuWlgiqKUSfm9iRB3o8ls1llKXYaZOtKKAmRwqae+Yb l/AXXSjIrsuRZMJOIEDBuL0HCZovH3fXGoTcQbMtSUnywz66xx0TcJRwXIQhpRfjJ64L tkPA== 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: APjAAAXFzIRcHH/gwTIy6z8a1t01S13t6fXbszre7B0s1wLLM1i51vzi xA8sT/rzOojRfrOQl1S52rjJrTtlSfvA0c0FhQFlBy1XJC6tIFv4TnTHTgFTvX/d0l8FDsiPkvI MxtgTwPLPYRyIQNPzXJRUt+mUUJtGgxTwBllJaigeu46SZsWjPxy5ODILbGKXDw3OJQ== X-Received: by 2002:a37:6315:: with SMTP id x21mr40254052qkb.265.1556575793621; Mon, 29 Apr 2019 15:09:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJGwcHKSMvSJzQ8NmatdhdlK1HoDNg1QkcJDdIV8xPHWF0xMouZ+YZegcDWr2GYrsxqYpC X-Received: by 2002:a37:6315:: with SMTP id x21mr40254007qkb.265.1556575792965; Mon, 29 Apr 2019 15:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556575792; cv=none; d=google.com; s=arc-20160816; b=iNvrPJyHvapKRp6QzEzlpIC5L3NAPQnXhK2WSFTkzK21zXMD/vAa/xy5T0jlwBHdQq 4OGCSfD9WXWjkhEgHqrMSqNiY9uIn6XmRjeh2hXZT/Ou6XQlaQLrKNuE5ZDGOK87ro6c XZ+/YJ4HzZPSXcXKLUuh8phNvLOeDnWRAf8SrRQ4IiPf1emBd5KoqYQKP4objcY7P7LG 6muQSZAZQgMjy23x/jpr1E2s1q+BXU3MwZLQoY/wCgKreAyTgDPIuY+5dX01uMA7lS+N mi0MOozZlN9EzLlrVhkovHYUuQm5EqNrHSPGHsklPNtlDrc+usMraUUDP5Hjcyag9jRE AngQ== 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=XPoMyuuM4ApL6KB762g1/x7lGygMjp3tNkFYSkeVl1Y=; b=HeyFlnMZqyYNAYr+yn2rTKfe6rZ5vGHNeiTBmKaTc8rvOdMHIxFP9ZeuXT3TRwCXsL oDHuDmjgFKMSxzebXtnOY2nQ+M6wdBxfbDJuCstiXoAwu6jrLVsX37xTqbSQgKvq3R0z nJFapZDVJE88aAnx6HyntXP86MGSj400p0hEkkT1wbKxD0j8qVl4WPtX7OT8v94UEd6I Vj6MrBQ+cXQGWX8gzuTG6RTac0QlSowhrYl4nf7ACCROjhGwn5ndNcoznzIoux8b13TQ uSjhBQWe1qXJXi3srPySlo1jwmFNXNF6NY+oWPTCaSMetwQcKE6xFGHv//7PUGhdQICo ok9Q== 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 55si1269525qtt.144.2019.04.29.15.09.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 15:09: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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E63C308624B; Mon, 29 Apr 2019 22:09:52 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7467717CCB; Mon, 29 Apr 2019 22:09:49 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, "Darrick J . Wong" Cc: Christoph Hellwig , 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 v7 3/5] iomap: Fix use-after-free error in page_done callback Date: Tue, 30 Apr 2019 00:09:32 +0200 Message-Id: <20190429220934.10415-4-agruenba@redhat.com> In-Reply-To: <20190429220934.10415-1-agruenba@redhat.com> References: <20190429220934.10415-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 29 Apr 2019 22:09:52 +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 Reviewed-by: Darrick J. Wong --- fs/buffer.c | 2 +- fs/iomap.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/buffer.c b/fs/buffer.c index e0d4c6a5e2d2..0faa41fb4c88 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2104,7 +2104,6 @@ void __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,6 +2159,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, { copied = block_write_end(file, mapping, pos, len, copied, page, fsdata); __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 f8c9722d1a97..62e3461704ce 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -780,6 +780,7 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, __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 22:09:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922579 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 2D0031395 for ; Mon, 29 Apr 2019 22:09:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EC56285BA for ; Mon, 29 Apr 2019 22:09:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12DD3287EA; Mon, 29 Apr 2019 22:09:59 +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 7B506285BA for ; Mon, 29 Apr 2019 22:09:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E8506B000A; Mon, 29 Apr 2019 18:09:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 797316B000C; Mon, 29 Apr 2019 18:09:57 -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 6ADC36B000D; Mon, 29 Apr 2019 18:09:57 -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 481DE6B000A for ; Mon, 29 Apr 2019 18:09:57 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id d39so6799326qtc.15 for ; Mon, 29 Apr 2019 15:09:57 -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=VboLrhX6IZm0XCpFQw6CvpRSBiSYOxhg4MUyBAEKY4g=; b=FhXUU1DFQtPBxBKOr4iuBarKjRq7YgxP4hNbotf9CnQrQWU3P21HXi6V3/FG3xKMIN EdNWlC5IqvM4VHaewASFC5z9kqsBNPRFx6DqNdZwepQDtU4IwDPlPAYjpEjV1E+Nx9QO IlaFH8PttqKPykgHeLzD9rekXizuXJYTbwfocHyWhJy6oYTf/r5kR8K61AqqXkhu1Ozw WJOV8WXc27v7jB/KcnhYajhrNhK4s36Yr7XitOKJxcVw7UowJiA4gVEn+XWud45DVfZ0 XRTube0qtGtyE9SyE2fu4YHGDaMwrti5ES5sV+IJimPEwF12lbGBYiUvgNgw9ekoIZMB 7t9Q== 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: APjAAAX0zZJi7iQP7odZHcfniiQG5RwWoG1zRX298xdwjTwfKapl6c7E CWOOHPuLbfSdGNmjcKRhlKCB5iM58hoFGYZmFThwU1fL6165rJiUJnOsEThdQDMtlamRnJIMS6B lhQ7NwQ+NLRqtFTjE/vm9/6HU7AcaM5l38dyWDqAnOWDJkPIuKoAkVNWC3tbnOKq3Ig== X-Received: by 2002:ac8:28f4:: with SMTP id j49mr51159745qtj.310.1556575797019; Mon, 29 Apr 2019 15:09:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLnboyXT6k/YM9/Sm7IUNLpO1eIdnNf9tB2Mz0Nz0lTw0T6mdtiH+PbB8PbuKudrLvrwtO X-Received: by 2002:ac8:28f4:: with SMTP id j49mr51159681qtj.310.1556575796177; Mon, 29 Apr 2019 15:09:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556575796; cv=none; d=google.com; s=arc-20160816; b=tsZJNZuNhQMjDn6LUdcHjXHG+9piARcgIwn8xw5ICW0vT78u+FFv0LHpqCkw/XYeYi L7mX4UahGF7XIsrhIsXR69edvqgZ2DmQPN6UImSgGPwWcBnui7iJn9pgxjJpy6+F1iXB EF5g1vG+SoNxNyB8rqu3DBfSpZCPdWBKtPgFy5NmKYd87W7DgIssOcC3NrMvuq8O31m2 sJarwpzc8hhE2EYC/n9AOFgZhrgd/Z0PTDEEcnoPekwCDBWNTGfnKoMAdgea2VrtW/Ub Sr7rx89IDtMJGtx5QJxJeJPGUuDD6zii5AHGxifJ5vFTaSUDIn0r0M6c/HxKDvndRI4z VIaA== 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=VboLrhX6IZm0XCpFQw6CvpRSBiSYOxhg4MUyBAEKY4g=; b=Pkx70urAxF6MABnzEmcEidZtoaWEtpAGVdvlZr1VV/hiUf3OrJUpOC9f0dUX62h9mC reVy0sITIbscX+f1d5VOGJ543ne5Pbw5Pkh6lOaiVGzi05aOwbaJySDMzUaJXoxJt87j HvLb5svConn1IbURptyHS5Y7BSBSOvX6yBJ/WFepcLDbliUTaH8n7gVUG6aB531KuzP1 /9rqNRhOqzJLvprThCvcQWKW4fT/dP862CJUubpfVuSd6jIFMlOlRPLslmXoFP8Uktmp cN1ojfnI0p9IzA7UwiPvoQvEDRXAUvl9cTA1TzH0vnOBXCY60wblREHT/7lL/iPeUPKg d8MQ== 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 g9si1300029qkb.8.2019.04.29.15.09.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 15:09:56 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B936307EA86; Mon, 29 Apr 2019 22:09:55 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C4C4891C; Mon, 29 Apr 2019 22:09:52 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, "Darrick J . Wong" Cc: Christoph Hellwig , 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 v7 4/5] iomap: Add a page_prepare callback Date: Tue, 30 Apr 2019 00:09:33 +0200 Message-Id: <20190429220934.10415-5-agruenba@redhat.com> In-Reply-To: <20190429220934.10415-1-agruenba@redhat.com> References: <20190429220934.10415-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 29 Apr 2019 22:09:55 +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 Reviewed-by: Darrick J. Wong --- fs/gfs2/bmap.c | 15 ++++++++++----- fs/iomap.c | 36 ++++++++++++++++++++++++++---------- include/linux/iomap.h | 22 +++++++++++++++++----- 3 files changed, 53 insertions(+), 20 deletions(-) diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 5da4ca9041c0..aa014725f84a 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -991,15 +991,20 @@ 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 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_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 +1082,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 62e3461704ce..a3ffc83134ee 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, } __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) + 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 22:09:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10922583 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 A57421390 for ; Mon, 29 Apr 2019 22:10:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 969D4285BA for ; Mon, 29 Apr 2019 22:10:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A73D287EA; Mon, 29 Apr 2019 22:10:04 +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 EBFAE285BA for ; Mon, 29 Apr 2019 22:10:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E77036B000C; Mon, 29 Apr 2019 18:10:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E25DA6B000D; Mon, 29 Apr 2019 18:10:02 -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 D3D0F6B000E; Mon, 29 Apr 2019 18:10:02 -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 AB2746B000C for ; Mon, 29 Apr 2019 18:10:02 -0400 (EDT) Received: by mail-qk1-f197.google.com with SMTP id u65so10192513qkd.17 for ; Mon, 29 Apr 2019 15:10:02 -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=v58+6ZMN9LUAKNi07d/G/1pAeuHeXGsQZky0Htelx9g=; b=f3srz2fJJxLxlU7atgdrFjFgwQA9+segnvx/YPhD7whsHigdpl5eYXJja37tYrlThR vzQgAd/TftycNACTvPaqfOCwEO7bj2TKby20vCMfAJNNxjera2+UGz1biyVtwAkunedx yoYBY7yel+SfD2xnMadNmQywKGoHzw9xh1CCAuvvbvTepXiZtVPdLscpToUY27ty91tv EjmjWwdk6RNZlj4ZV+uSvXEx7i90OBXy2XQfI5ZER8q4nie2v4yEL12QFUqqVsfLF9jK h/MiAa5bcNjpUrhHrKBceRobXVj7Zb5FAlZ/wLM6CkirnkZTXRSLNC9+BcgdYZfRxKU6 +kWw== 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: APjAAAUa8l9RlO4vdnSbcmhpMPZ67ivgEdn9U/R4PSfs35elW67R7GdG vnfGIFBd0PlEO6ElIgNbxu7upBOkSyWstbDstVF5zI9Q+M1enJu9FaDRyapTjaM4bfQcg0gbo30 WHUF4z4QDpC7Ep3VrRPQ9nSP/jgwvm2xTpjaFvmB+tbp4JRAztkSKBNBD0YHTCyhSUA== X-Received: by 2002:ae9:c109:: with SMTP id z9mr10457250qki.309.1556575802439; Mon, 29 Apr 2019 15:10:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwwAPYWKdKXaLaSHiGJ6OMJGqcBjGurlptb1LOG7aa7D1eWr+f23FgiIUTIMdpOHPbe+hD2 X-Received: by 2002:ae9:c109:: with SMTP id z9mr10457192qki.309.1556575801522; Mon, 29 Apr 2019 15:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556575801; cv=none; d=google.com; s=arc-20160816; b=EToR7eFuxHKjQTjUeLXJq2pXtBfa19Uyxq7DYquF2W8X2FPK7Pf1phhhWz71yU0alm dvVoaXLJVr79jMxKOx2kN49GwDQ935G0VLEC5KB/cN9aNmtPaDXX0yGhdEaB/uiFdhnW mCKiByqcovoSXceHWJelcSHLGdk9I4XP9jqCJe6QMtFpk1QrYNsREciJBFHdoRLGkCpq uN/81OihRqo879Ms3yohYoPNu8TdmhJpF17JM1UcWlzQqMgORwQaVzETRosx002Aaygj R6IK+RRBlweWtgFAB+msW7UZCZAZZS5PVYKoClOAWIfcrXGB2BuNlVgI7/Pw1ET+N4BJ Apxg== 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=v58+6ZMN9LUAKNi07d/G/1pAeuHeXGsQZky0Htelx9g=; b=WtoUV7QuOJ1hqNl+izeUIPaAGYTOmWLehR7/PQ831S5Fz8ncr2xo3Js4p2f4fDEjFs S4OpITwcH5MlmUnyGUohJ1e7kgpDe5piRvjOt+yPW9NIcyZwsqoya/Z8gmdz2rZFGBaz Vyju/qBOHgvzK+crKBlWIP/chkQ+X98oE7PwVwxoLERfOoWd7qAZoODAHU/ENvc/EP8K ftUCfc6oLEehlEQ2/HH/gNKfSglkd8zIhZmB+AfQwCpQaiZ8iAqh9zvJGJPOkT22YpKj UI7TDfwbNACytUJUWdXP6JCYS3LcsrwOs1dUX3RyG97HESsaVOcFbZ3n7ECyhOnIRdt0 0dmg== 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 n186si1583769qkc.99.2019.04.29.15.10.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 15:10:01 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 956E53082E70; Mon, 29 Apr 2019 22:10:00 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3C4E891C; Mon, 29 Apr 2019 22:09:55 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, "Darrick J . Wong" Cc: Christoph Hellwig , 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 v7 5/5] gfs2: Fix iomap write page reclaim deadlock Date: Tue, 30 Apr 2019 00:09:34 +0200 Message-Id: <20190429220934.10415-6-agruenba@redhat.com> In-Reply-To: <20190429220934.10415-1-agruenba@redhat.com> References: <20190429220934.10415-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 29 Apr 2019 22:10:00 +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 | 88 +++++++++++++++++++++++++++----------------------- 2 files changed, 58 insertions(+), 44 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 aa014725f84a..27c82f4aaf32 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -991,17 +991,28 @@ static void gfs2_write_unlock(struct inode *inode) gfs2_glock_dq_uninit(&ip->i_gh); } +static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, + unsigned len, struct iomap *iomap) +{ + 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, unsigned copied, struct page *page, 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 = { + .page_prepare = gfs2_iomap_page_prepare, .page_done = gfs2_iomap_page_done, }; @@ -1057,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); + ret = gfs2_trans_begin(sdp, rblocks, + iomap->length >> inode->i_blkbits); 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; - } + 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; @@ -1121,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; @@ -1135,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)) { @@ -1175,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; }