From patchwork Thu Apr 25 15:26: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: 10917299 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 26C12933 for ; Thu, 25 Apr 2019 15:26:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18C7928B6E for ; Thu, 25 Apr 2019 15:26:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D1CD28BEB; Thu, 25 Apr 2019 15:26:42 +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 8E05828B6E for ; Thu, 25 Apr 2019 15:26:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C60306B000D; Thu, 25 Apr 2019 11:26:40 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id BEAAB6B000E; Thu, 25 Apr 2019 11:26:40 -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 AB1386B0010; Thu, 25 Apr 2019 11:26:40 -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 855CC6B000D for ; Thu, 25 Apr 2019 11:26:40 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id t67so182578qkd.15 for ; Thu, 25 Apr 2019 08:26:40 -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=V8NpsDeHPvVHBQaWoJj6jW9z8yujAEEJRGB7vPrtR4c=; b=GisyLseELbBqCvRHrh213zX0yvbRIh1Gyn5+TSiPQ6rMtigeCRK4ZedT0uUoO8oqf4 94RHfdg+rYwF1B7PBOhS7fdifW2IZUSlzOAcpUzHg/liza8gMyW4m0u5djp5inah1H2s p2GxHvaiWWOSoMU1PGqsbb0xYYHV1mhY1g87V/9by8MJwPw4d5hMIzFZ+kTf4DGFu9zY ahw3tOaVZiB62jvkMOUbcu2le8ccL5y1k/JAP5FC5oEPyxKXxzfWjSL6cwYU2wkfC/7c K/AelE/PyaNPbh9G7CxcElh1CJgDMMi3gZUzJMDq0kK9zjZVswzDNnvH+Xrukm7Bk3xV ZbGQ== 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: APjAAAXTxykoNP3Mc6EiuMcOstU8ST7tAEG1qzErwJgwuo9JAaVCQRK+ 4jueUFi3ZB4KmSac/9wLxRLxiSrdp65gJhijN9MBkL+SCqt+yGSBqlEwNVfzStdFLEaMjRcTAfA WLhfaApNy4HI+3dGJQgQjtauB9PyVERValc0gR1GqqUc98bWznruSqor/t5KszkhBKg== X-Received: by 2002:a0c:e5d0:: with SMTP id u16mr3243761qvm.48.1556206000268; Thu, 25 Apr 2019 08:26:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNj1MMP1PlZFWALYlSCWEKvPSCUWT8X9qS+i3l2tVpXRc/1KxDEOED5zcRUqK2/9jKpG+X X-Received: by 2002:a0c:e5d0:: with SMTP id u16mr3243713qvm.48.1556205999642; Thu, 25 Apr 2019 08:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556205999; cv=none; d=google.com; s=arc-20160816; b=u0zl2lsGFkFQwYIuxGIvy6896PSwWfu3o6xYZFrg4AMRQMa3kDImXxpJmDMSpQOsZu Ao+c2I4mYWp7y0AEn+MzbJbj0OPp06dSew6Ov/qd8W75o3TrsClsxtoMOEnLMzYyouXy OrF/mItby0qEn43s3f2h2CTu3pKDvg14qsBarpOnXtJcu1C4fmzv1vrbBmVU5l3jFyYQ lysqbC+uXI9RQLB9CKYhE/ttd57P4o4tS+eALLqfoht3p075wdqpSqxpnXiWsqq4Ym0g VXUR1jpeRfX1vVTorMsHWDDQruz2rfBrzZRwwmHr8YZ/36esigCHHjlYBv++VLfiSVGT c3Uw== 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=V8NpsDeHPvVHBQaWoJj6jW9z8yujAEEJRGB7vPrtR4c=; b=BoPetP6nT0JtZNBza9eK1Icb6acbGiVEabrPw8+BZwehjqXMrtnpufLEcH0L6OTrjo 24taqxJ9FofAa7Ye+yZ3Vt0HEs6sI5n2IYckIP3r7d6BS46ZDjYqfk6q7QGyKskfKoFZ 8yoYBDwfKivYqmFl6+mHhudJ0BR636JvoG7/r66wdpNV38FCKZZJiQFbIdikK+LzhSmA 0IkoB9x93sTsK9S5UAF6wubTzIB7DMH3dJHg6GAC8uTuahI6q+9U/dGETE1K4cv1M6vD JwiHgNEuhq4o9klGjL2xSSWa6+CED4sNomF8BOCoTs92VVWnKUWDXCoFASQnEiO5nCQX XZrw== 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 n4si653195qkg.43.2019.04.25.08.26.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 08:26:39 -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-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C371FC04BE09; Thu, 25 Apr 2019 15:26:38 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 428E261B9B; Thu, 25 Apr 2019 15:26:33 +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 v2 1/2] iomap: Add a page_prepare callback Date: Thu, 25 Apr 2019 17:26:30 +0200 Message-Id: <20190425152631.633-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 25 Apr 2019 15:26:38 +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 | 21 +++++++++++++++++---- include/linux/iomap.h | 18 +++++++++++++----- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index 97cb9d486a7d..967c985c5310 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -674,9 +674,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 +692,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 +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) { @@ -780,8 +793,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 15:26:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10917303 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 420BD14C0 for ; Thu, 25 Apr 2019 15:26:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3408028B2A for ; Thu, 25 Apr 2019 15:26:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2792528BE5; Thu, 25 Apr 2019 15:26:48 +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 66FAB28B2A for ; Thu, 25 Apr 2019 15:26:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 694F36B000E; Thu, 25 Apr 2019 11:26:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 61CC16B0010; Thu, 25 Apr 2019 11:26:46 -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 4E56B6B0266; Thu, 25 Apr 2019 11:26:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by kanga.kvack.org (Postfix) with ESMTP id 265D06B000E for ; Thu, 25 Apr 2019 11:26:46 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id o16so48463qtp.18 for ; Thu, 25 Apr 2019 08:26:46 -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=1eLtoO5jECxXZIf0RJD13h2qj+eELGXBHn/k+qMAvyc=; b=W9UFpBiWv7kfpczi/Juft/JIn9siofGpLb+XGYktzLiJ2qsGUMTPfP10ryAAtCPzJ0 zJbkXZBplk1w9A07N7Td6EHWhlqykXzR15ic0nV5W0ir2pTl9NWYmZHAzKdzKOdeEOZd jwgJWCloDqkH48d7DZjWSltqryAJeB3B8kviK/9B9TLKEQgnDES3oLgNveKZtu/KbgdF NhJP/I2zJe3EtWz05j9BQzflft3dB+oMIDr0E1ozQXfqSq3c1lszoL9piH5sBocVn55f ie0E4LFkXrv8KYcoD9h8n04fFoMe5nhD85BPWv9Q85e+GuojItXw8L4SNc7PCqRV5KHE /lNw== 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: APjAAAWCoAPw+iRUuJZujSaoy/MSJyj+FZrUilY5/UJbjwyIoNtY9WUp as8bskg5zzTEmhNnDOUlsEdQh6qWueZXeEk3Koj+81Ku30tgMJdBIlTNJZqauW/TlMrLpK5ZHET 9aNTMFvYkR4+Ue83/oUJ/VhmyRQMwdxX2zRm89IYqyEF/36gxjuGaVtU7+NP4XhqqEA== X-Received: by 2002:ac8:524d:: with SMTP id y13mr27324501qtn.99.1556206005837; Thu, 25 Apr 2019 08:26:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLyOSE9j2CWYkf2z/xCKOyUz+fvi8E6/kHkMmMT0j4hmX6TUKEvKcrI9Fgk9uE6glV05zy X-Received: by 2002:ac8:524d:: with SMTP id y13mr27324432qtn.99.1556206004879; Thu, 25 Apr 2019 08:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556206004; cv=none; d=google.com; s=arc-20160816; b=Q+Z3ENdxVOi6qqk8QpMmHOQlGbuGpevdusq8zEEeHi8rKyP+QFLT7eqVNzrICPQ1/G u1cN0ODQYXBjYOxlVCiPZ/GnmQtNOypJZyCEtPuklAnk33F7FP0qR/7Wl/og/vJyQmRa Fvi9oJmCBcWQjXIAxgB2CJgM2WbhtK5RCRAQJb8Ij+2oa9ok93cqHrl/IPobTRmxrcc9 mmV99TnH/gHP4Av6DHhRTOcFOGdXCBXoLCr+nWxTQbKFwqgcQsbhQPjgMos2gAGaPiDp xxUuaSyl8Sbo0OPVTOamP+MFzFisPbgQ8knGaIk+wiwP1akLXNu+PUr0CkcqGKXLESYO 4xKQ== 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=1eLtoO5jECxXZIf0RJD13h2qj+eELGXBHn/k+qMAvyc=; b=zgmYHBqHxbpVhsVMsNcIgYh65rdSRC2Jc04wR6b5hkPmIwlVd2UxRaS8Cy6SOVarq3 gSjR3Z+FvRZSc8+AVASaBCCcr3vzEbyonMmZl8qEaHnQWSMH6PI5O6ZUSbO1HNp6Y4dD v5xvTHYgpj+YwdbgMa8avPI4ugA2xa5S20+hGGdOU+MAQbu5kICUVCk2tU6UV93UR4HJ mB2MtNVQVsCvR7XDbiRZuxG/lgfy1RrtpUR+EC62RdPtC9hg4x9otNQidXEzsuoX42rF XqAIVqmWZwU++e0uK0E7LDcpBAdMhSvtTCY2Yp7+Zw8W1/ml3cy8usKHQBC7N+cO/sFJ E2Ag== 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 w1si7644879qvi.135.2019.04.25.08.26.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 08:26:44 -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-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18558C05B1CB; Thu, 25 Apr 2019 15:26:44 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28D4161D26; Thu, 25 Apr 2019 15:26:38 +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 v2 2/2] gfs2: Fix iomap write page reclaim deadlock Date: Thu, 25 Apr 2019 17:26:31 +0200 Message-Id: <20190425152631.633-2-agruenba@redhat.com> In-Reply-To: <20190425152631.633-1-agruenba@redhat.com> References: <20190425152631.633-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 25 Apr 2019 15:26:44 +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 ++++++++++++++++++++++++++++--------------------- fs/iomap.c | 1 + 3 files changed, 68 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; } diff --git a/fs/iomap.c b/fs/iomap.c index 967c985c5310..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;