From patchwork Thu Nov 15 18:41:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Jaroszy?ski X-Patchwork-Id: 10684835 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 70D1813BF for ; Thu, 15 Nov 2018 18:45:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6353A2CF58 for ; Thu, 15 Nov 2018 18:45:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 574E02CF59; Thu, 15 Nov 2018 18:45:06 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 0308B2CF57 for ; Thu, 15 Nov 2018 18:45:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AC176B0548; Thu, 15 Nov 2018 13:45:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 180FF6B0549; Thu, 15 Nov 2018 13:45:05 -0500 (EST) 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 047E86B054A; Thu, 15 Nov 2018 13:45:04 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id B55CD6B0548 for ; Thu, 15 Nov 2018 13:45:04 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id g21-v6so16592591pfg.18 for ; Thu, 15 Nov 2018 10:45:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=XRloFuhxB5Nn5eRiXHCmZRaeU2mwYezJdiMjdEjkknQ=; b=FpYYtvq2QOPLfM3bFcw1aOtyhrDEZDayhzAwvntpabvbbdZ6tZ8QJKDH5SD+0s9Ej2 YWk+LwL4plqU8QPFOM3jX2M4b7tcLohsrvstV2HgtgzuUJbJexkOoVso921gFDh6V/qX vFCdKC+snItTWl5m/nnJMDnkY9QR8zOpC0MOnFTO2EXoSMZOIcim3wSKMCZv6RiT8x2k iyN9rDS7rvZlewCuQipywYcGgr/kfxDtCQ1CLNJcVNoWMRv++37XGikOO0Ed5WMyeYbd LORoCmzdix3zKYUvFGwb2SdOGHIfUhY/z+1QnQOGxtwEJoiJ2icS9CFu2t08TybsDS8c 5Kwg== X-Gm-Message-State: AGRZ1gIRbqP51PpUXuJjeNS5SVYsTpvlAH2sRWISxf1L56kiegElSAeA ZQ/Ny+nRLw9aXqwF1GSEzVLvj+2IbEW9D7d1Vwsw8yWFVUlzQXVB442mzs0u6yLT7dr54knCX4k bnYdeOwqxEGoYt7H54nZBdz4se4SEJFpUM7aBUpj2tGdvxRPDkGlCwryjWNIGzEnHjGf/eNSpxk 7ZHljLBtx1FDznBfapXvGK0wyyWqR4EQbdTn91/MnucY3u3z2DZjeDu7DrBMzyF45VYsVzg0czl Gmmc9gF1OjL8w9WG1of371EM2OTbbBm+xL6ZQihiiQ+CDmkEDDRVYxfXUMrXe7cL77bLjsdGkMX 7Gu6eFOVIugo1G1nFdl2P06uLbqCW/z7YCOKUbLcz84zOsUstzC20z8wmI16xXckAECbWlubxPp G X-Received: by 2002:a65:63d3:: with SMTP id n19mr6962413pgv.179.1542307504409; Thu, 15 Nov 2018 10:45:04 -0800 (PST) X-Received: by 2002:a65:63d3:: with SMTP id n19mr6962376pgv.179.1542307503498; Thu, 15 Nov 2018 10:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542307503; cv=none; d=google.com; s=arc-20160816; b=DyyM+PVU6oybLCcAvbT5V4my0oaxwfHtSaiJBnd1NGOwRvhFGOgeilSq3WgJUOhWsi ugAEunG2NQtwt8UdejlC+bhpUvWHpW/goT0zpLo8ZyY3woS5vfAoAXu0VHKB+qGNS0lG MpeFzJiI/NWAs5yv0N5NY3KUYph0PugV3YhfRI47UR9xYwJny5t6+TNgUpZu8Qq4sQxf wXCfTJEGIVqJ9pZxQTbhFxTko8e1RxAolS2VF7QR85yMA8Zt+e6QpO9RhhXKaPfBi/4/ HRiKJhJnYMV3PHlTgPI6bNwk9k8WLTmOJaM6ec7ZM9TYcV+j4SvYD+NAXmxbOYFPODBB 3cwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=XRloFuhxB5Nn5eRiXHCmZRaeU2mwYezJdiMjdEjkknQ=; b=A1maISbavk7A/Rl0YZDuuzOosVogGGdxVvMbAqT5lt2aGUF7yrQ92FOfvy7boIC83i KJIHHJlZO+8iMKMW00o91VKt6e+GuDqAh7VKHiIUxPPboSkBe/t9JyK5gfWAAEPFoka3 E7oOd0sumV+P8R72OE1+KIgsKRMNCClzsZ+Fmhi4r7qVsv33RcEHzbguhpGvhiyKZUDl m5J5Fw8Pdk6tJLJAjQtz+un0RcC3LbIpSHzJX5lR9PXmn/YxET/hpPipA14Jy9/G/VIe PJ5boCSFFID3/QdTE635Fdg+gpQ13aU6eqCc0JTdTVbueb/0hj/GlzNWt3fHOC3qKFjW CqSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jTrfAmBW; spf=pass (google.com: domain of p.jaroszynski@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=p.jaroszynski@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x69sor31727195pgx.20.2018.11.15.10.45.03 for (Google Transport Security); Thu, 15 Nov 2018 10:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of p.jaroszynski@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jTrfAmBW; spf=pass (google.com: domain of p.jaroszynski@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=p.jaroszynski@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XRloFuhxB5Nn5eRiXHCmZRaeU2mwYezJdiMjdEjkknQ=; b=jTrfAmBWvWFT1rzTBff5zw0I5WGuqjRI6KNR445oCq5JJBqFQqHVZBQrvCN33zCj4M rhgYeLFPqyIDUfOEHNUMXL9Vn3FEYY9ZgofrrfW32/SPiG+eIcMjN4yZ39jsByj646o/ fp2RW7YNfSzST9LVx/KBpvOm75FEHnQCzbObxdrQ++gQDeBDCcurHUc4WDrpwUvH74PN 64/7HeVa2mLWGzRHF4nMZQolh54PDKj7n63AJSPU5tq/y64fnvryodoXlzkjrUG0/9DS elYjc6PtBAuewI3+8tCJUpqmFztQYXPPlV6SF4rVkI2inTbEp9BsQSHsVuYk1WYsbLa5 NOEw== X-Google-Smtp-Source: AJdET5chD5n7besN+pVBI1nTFvseVg7kwjWoFHi0A8GGD9hD/FgvVIhTR87cMcbqoj1VCw5Jw746PQ== X-Received: by 2002:a63:c503:: with SMTP id f3mr6682649pgd.431.1542307502855; Thu, 15 Nov 2018 10:45:02 -0800 (PST) Received: from box.nvidia.com (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id 189-v6sm27666308pff.101.2018.11.15.10.45.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Nov 2018 10:45:02 -0800 (PST) From: p.jaroszynski@gmail.com X-Google-Original-From: pjaroszynski@nvidia.com To: Alexander Viro Cc: Christoph Hellwig , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Piotr Jaroszynski Subject: [PATCH v2] iomap: get/put the page in iomap_page_create/release() Date: Thu, 15 Nov 2018 10:41:40 -0800 Message-Id: <20181115184140.1388751-1-pjaroszynski@nvidia.com> X-Mailer: git-send-email 2.11.0.262.g4b0a5b2.dirty X-NVConfidentiality: public 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: Piotr Jaroszynski migrate_page_move_mapping() expects pages with private data set to have a page_count elevated by 1. This is what used to happen for xfs through the buffer_heads code before the switch to iomap in commit 82cb14175e7d ("xfs: add support for sub-pagesize writeback without buffer_heads"). Not having the count elevated causes move_pages() to fail on memory mapped files coming from xfs. Make iomap compatible with the migrate_page_move_mapping() assumption by elevating the page count as part of iomap_page_create() and lowering it in iomap_page_release(). Fixes: 82cb14175e7d ("xfs: add support for sub-pagesize writeback without buffer_heads") Signed-off-by: Piotr Jaroszynski Reviewed-by: Christoph Hellwig --- fs/iomap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/iomap.c b/fs/iomap.c index 90c2febc93ac..7c369faea1dc 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -117,6 +117,12 @@ iomap_page_create(struct inode *inode, struct page *page) atomic_set(&iop->read_count, 0); atomic_set(&iop->write_count, 0); bitmap_zero(iop->uptodate, PAGE_SIZE / SECTOR_SIZE); + + /* + * migrate_page_move_mapping() assumes that pages with private data have + * their count elevated by 1. + */ + get_page(page); set_page_private(page, (unsigned long)iop); SetPagePrivate(page); return iop; @@ -133,6 +139,7 @@ iomap_page_release(struct page *page) WARN_ON_ONCE(atomic_read(&iop->write_count)); ClearPagePrivate(page); set_page_private(page, 0); + put_page(page); kfree(iop); }