From patchwork Thu Apr 25 16:09:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10917451 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 8B51D76 for ; Thu, 25 Apr 2019 16:09:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D41D28BD5 for ; Thu, 25 Apr 2019 16:09:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 715F528C29; Thu, 25 Apr 2019 16:09:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-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 F3BA228BD5 for ; Thu, 25 Apr 2019 16:09:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F5DE6B0003; Thu, 25 Apr 2019 12:09:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 07F9A6B0005; Thu, 25 Apr 2019 12:09:26 -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 E89696B0006; Thu, 25 Apr 2019 12:09:25 -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 BF49F6B0003 for ; Thu, 25 Apr 2019 12:09:25 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id t18so204464qtr.8 for ; Thu, 25 Apr 2019 09:09:25 -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=kOxnVwUn3IXOr62LcEwoXG3HKdaAVpYT02c8a6b1mRY=; b=oWB8AkKjfg9+iqosJyC7xx/ZVZ3DbI9LmafFer1Od31PkU+/lqb+NbJ6eF8DTM5vwj Q/7/LFsRT+98ewdLqU4trASgSB39384GIFdLkFMJneZPZ0O5zSxLzwX7fh9ZTqBBtTLW fHjqoADxO7pyBu3kSJADjHL0I/VQyxO0H/VID1DYk7oSopQdHSeM2lwrJZYzn47iNGHL vCnwWKMF3XYj1NfJm1UUWM5oGHlbal1Ll/DzHlJ6aTKlyDg3Kc6xIgvn788j8dKeL9Xl afnFh9CPOBDarFpiNP/Aqj+lkH6yaj9POevjU9IdnQ5LqCb5Jp1nC4xAuBnQU+hH8WF8 FIWw== 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: APjAAAWpB1U1Vr/DSmL6/s0HpImIuJkcR5pxteK3N0V3QpQK7p/7NE8F rvxibNKVKHliag4ba6Lt++Xm29AXJR6dVDe9KqLDOC23HPypYcRR4eLQpjvdbWFCdGgLI2qCbkA ijy6YczTJp60V1CD2CzD4ACi1vfga72/vX8/m2bEuq7SvI6H3hRhFbEBUJ2XpMe7pfw== X-Received: by 2002:ae9:ee0c:: with SMTP id i12mr15894878qkg.46.1556208565389; Thu, 25 Apr 2019 09:09:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDAoWchgoWOEpf8Brrcx7ojdgv1+YKIogZUsgGVtRalvx154jwm4jeA6grF26/+3KY5AES X-Received: by 2002:ae9:ee0c:: with SMTP id i12mr15894788qkg.46.1556208564371; Thu, 25 Apr 2019 09:09:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556208564; cv=none; d=google.com; s=arc-20160816; b=lO5cT9pfobexHWRJRO7Zw8J8wyIyH/QHzesHlsZDjpc237D/t9t3Z1cxkwU6jtrEBV ZspcFHZ/PqT2miYGtjXZpT0osm72Xlna1bI+tFIFB54eX+bE/eupJOFJvF4cJQOkB78/ a8T8zqf2R6V8M5VA7aOezp74h+YQe5HsjqGOhAQKFgqrKXU8O2VI+5USLpqWLkx0zyHV yvu6C/5rXU0899Cz8iAnJzkK3v3hZaHTOfSu3eWCYirhdQSONvkSmJ+0L2jBacXLck6M 8o0UeerIDnkXfKy9kRPfqlqL+DH2a2HcRC7hMHp7wJ5U4RXUwPyu7rcnjFRECH5tFMuY Eaig== 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=kOxnVwUn3IXOr62LcEwoXG3HKdaAVpYT02c8a6b1mRY=; b=ArbvJ+IMJzf86XeQpIoLsVPUx0cEQj8Fj2TmmgY6ijPai6OtkkB5bEeViTHo7JHPBO Um2uB+vlux5EshCxxh2prE9h1Wz4evJNliojarWLMSNHDRXIBpNBbQU8cFsDbxgKGJyO RExMi3JpbACA1m275a9ke5VAuqfQCculuzeqZQAI8sqnLeuzHEalLBeVqONnU1NxizH3 gBAoDe6NeDx06ZuMpLqYG6FHSCOkb7nfkPiXW5rY/H9bgyug07acV5l2xUx6OEovqGvM 8/AqAPbEnSSetkYUZ0PZzIBC+labsgjRmOjLg3ItlLyTgUcCXEhLHunVrqRBWYzzx/3w cQfA== 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 i8si15270234qkg.40.2019.04.25.09.09.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 09:09:24 -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-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C53A285B1; Thu, 25 Apr 2019 16:09:23 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FAD5600C7; Thu, 25 Apr 2019 16:09:15 +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 v3 1/2] iomap: Add a page_prepare callback Date: Thu, 25 Apr 2019 18:09:12 +0200 Message-Id: <20190425160913.1878-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 25 Apr 2019 16:09:23 +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 a page is written to. In gfs2, we'll want to start a transaction in page_prepare and end it in page_done, and other filesystems that implement data journaling will require the same kind of mechanism. Signed-off-by: Andreas Gruenbacher --- fs/iomap.c | 22 ++++++++++++++++++---- include/linux/iomap.h | 18 +++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index 97cb9d486a7d..667a822ecb7d 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; @@ -769,6 +782,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) { @@ -780,8 +794,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); if (ret < len) iomap_write_failed(inode, pos, 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 Thu Apr 25 16:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10917455 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 4BA851515 for ; Thu, 25 Apr 2019 16:09:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CE1B28BD5 for ; Thu, 25 Apr 2019 16:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D36D28C29; Thu, 25 Apr 2019 16:09: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 7C7B928BD5 for ; Thu, 25 Apr 2019 16:09:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 762556B0005; Thu, 25 Apr 2019 12:09:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6E7556B0006; Thu, 25 Apr 2019 12:09:37 -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 5AFCC6B0008; Thu, 25 Apr 2019 12:09:37 -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 331216B0005 for ; Thu, 25 Apr 2019 12:09:37 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id c44so206724qtb.9 for ; Thu, 25 Apr 2019 09:09:37 -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=s3HqhWtu4G8e1voudsq4L2+v8LgGoUEBlCKrX83DbtM=; b=fgoZuq9WKStm4kcJs3bm5TRtTYdJ4eFBK9Tp1Nhh3Xwm2xx1IEWp4JAvUyF+TojTR0 bap5Wurgt4Xoih71Tjl1oQA+CW4Z0ajG+Dai62iq+MUK/ZuKAWq3maQpsQ9ahyLz1hGK C0UR0naIskVaEidW6/Dk6NRQ2HLUkvfRR3zgUsNcxMipoLONnwTZnABT2EXhuhFX0jy+ rJak5Rnncdogn2ci9wy29A4dwtI6l1VZBHfHbT0nxVGPpI5aOlbbczq+z6ErA0HzSjBJ E84SosZDClE7w8xO0oQxiwJCLGFQPVnnBVgo6zQBFxEYicJ+Y6nl0ShmS+w4gfbmZWts 0wFA== 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: APjAAAU6RxNhhrWjyFSYAQSaKcDs1aGWZVbshe8rU8ngBiEPCaeGF/oX mzkgHBDhw5s3MGxRJQvDgQtTaJ8SB/vffA6hYIdrrHorS+IhVKeedX5CxEz1NTUeqMjs2glCni/ hQhwRyCry2CD1aYMoUNDUc89N94I0JqBMsCHIs8sEaylkMnTPojBrzJ88HRJrPGa11Q== X-Received: by 2002:ac8:367d:: with SMTP id n58mr21586807qtb.276.1556208576856; Thu, 25 Apr 2019 09:09:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbwBZNNC2NNYIfsYPjce55d8ly/0CpZQfbeD9zgScS//hQ+WsglJh+ZoGGldjzzo4TpfJz X-Received: by 2002:ac8:367d:: with SMTP id n58mr21586721qtb.276.1556208575915; Thu, 25 Apr 2019 09:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556208575; cv=none; d=google.com; s=arc-20160816; b=I/vIj5xOUZN4Hxg0twiS2MnQq1t5+5EUjBxufokr3fmCHJ5Hx2bxy1qStualWYY1SP fYfZyVNMRdFYUH5t3EvZzGqMOTUddtCxcuLqdYDn5fPBiLfo/nrjtbK+pIeitC+cxdqR KTtve4j74ezjZtW3tL57Dnfn9f8whFvlnrl/969qq4Mvzil5Rqlzjji4+h5yK+RVGWHI 3BPj0U20TXo1aUgueY79ZoNudLufnrYizwh0fpwI2W1o7h2uY4flzGI/+ddU9EQmH4Bk XQzzd5MO+IlO2GkW9bia5I8cFriGeqs5EsJFhKH24Fld2qRh4LTNlJfK6/QGQ4syuS55 FGyQ== 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=s3HqhWtu4G8e1voudsq4L2+v8LgGoUEBlCKrX83DbtM=; b=xnpjhNkPhoUqIvb8Yp3IOQZU+vydb6/4MMK5G6bIaD4qEc8LeOqNCtUrTfQK+C8PPp 0qCAA0bjYN4aa2ounRtzvK84vrHMLDWBZfzcfwgYiiONRzTilNFgSPGWamjsW9K9v5yH W0NOXkxkMiN+MX7qaZhmpAPvU2auxrRivb2L2Fz23q/Kr/VBbrCSuQWbFlQkwiUmWNjO K/pv1E9yqNXhj6YSwmYvlU+maM7kyXR1GyaIXnwJZRw/IdNvGiVWVnl6DHXMfysMjYYk m6xq51B1pbSs0A/OlZ8QkOZPS31xVK4AgMEdjSUJUFf3Sg3zEHE2E9qF9BsBZ/r7CDlA atgQ== 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 b16si11221531qvi.107.2019.04.25.09.09.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 09:09:35 -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-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A6C4300247E; Thu, 25 Apr 2019 16:09:30 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 153F9600C7; Thu, 25 Apr 2019 16:09:23 +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 v3 2/2] gfs2: Fix iomap write page reclaim deadlock Date: Thu, 25 Apr 2019 18:09:13 +0200 Message-Id: <20190425160913.1878-2-agruenba@redhat.com> In-Reply-To: <20190425160913.1878-1-agruenba@redhat.com> References: <20190425160913.1878-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 25 Apr 2019 16:09:30 +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 | 101 ++++++++++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 48 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 5da4ca9041c0..2fae3f4f5db6 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -991,15 +991,31 @@ 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) +{ + 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); - gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + if (page && !gfs2_is_stuffed(ip)) + gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + gfs2_trans_end(sdp); } +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, @@ -1052,32 +1068,46 @@ 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)) - iomap->page_done = gfs2_iomap_journaled_page_done; + + if (gfs2_is_stuffed(ip) || gfs2_is_jdata(ip)) + iomap->page_ops = &gfs2_iomap_page_ops; return 0; out_trans_end: @@ -1116,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; @@ -1130,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)) { @@ -1170,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; }