From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBB96C433B4 for ; Wed, 12 May 2021 15:20:00 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7670261C64; Wed, 12 May 2021 15:19:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7670261C64 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1lgqeT-0007mU-Iy; Wed, 12 May 2021 15:19:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lgqeR-0007mE-UY for linux-f2fs-devel@lists.sourceforge.net; Wed, 12 May 2021 15:19:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Content-Type :References:In-Reply-To:Date:Cc:To:From:Subject:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=iY4wgvfRa06L3ZtNsPYW0mfJyyrHCRhlvETBZgFI+/k=; b=Q1aDlqE1S+gUcZRcdvxqwNSBKw zGgeq96xzcoTx/Eu1dCEgYSEXhDIn7/6PjgEIKxFI7aq1A34IklNYcx7T/uaLxksgzSoqJqF9DVfA 78zJVrR+feOFDm8W1HT5ZIe0oDhSR5clFKVgsoY9PLkcORk+4rumaqTa5cEbWce6My88=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References: In-Reply-To:Date:Cc:To:From:Subject:Message-ID:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=iY4wgvfRa06L3ZtNsPYW0mfJyyrHCRhlvETBZgFI+/k=; b=I7FYjMxiCb9uFIecPC7bqyERXb MBsTpsIUYxMQBRuCwhgVWizMYdopswWBCelG+4AiwzTo3mq3gKW0GlYmyGtm96hIf8fZkBXm4vItF wPE5MICmCu8krFhkMurrP+tlWDDdhcIlWKQBLBFe7tTKTVJS3Kd0wfICmXVJ+l4Mg694=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lgqeN-005az3-OU for linux-f2fs-devel@lists.sourceforge.net; Wed, 12 May 2021 15:19:56 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FE946199C; Wed, 12 May 2021 15:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620832786; bh=T6Lawv7Kod9ZP9zSPqwbupin2WcFezRDjXSRCBkOee4=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=RzoUHhzFYiv2mtULMxmuDjagPgzgmkXMANmRZzUsOFxZe0EJoOdJoI3UeoFiOgeLS ZyA4AxCMiJhrZA/Fiju1k5YBKiFqLSd9zFJtLQACa78I5W1/6MkA8ZnX0EzN5LKkyF SJNsE13kpG0/OVLi7EdkVnW6rECToZBiP5iqhnvpFcE9ZXjTvFiD1aTtp3gOHHUGfM fMXm3oeOLg7xhFSqSKUwpvfbZQOt2+gfmyDcCcL5Hr2CdCCFrzzcCHc1yY4SOzKPzC rYL6CqUJiyBelQ3xfS/7gnKKMEptiDJdQ4f1xx072iW3pINIo74zk93ewlLedh1V5h p+g3aZCSUx3CQ== Message-ID: From: Jeff Layton To: Jan Kara , linux-fsdevel@vger.kernel.org, Ilya Dryomov Date: Wed, 12 May 2021 11:19:42 -0400 In-Reply-To: <20210512134631.4053-10-jack@suse.cz> References: <20210512101639.22278-1-jack@suse.cz> <20210512134631.4053-10-jack@suse.cz> User-Agent: Evolution 3.40.1 (3.40.1-1.fc34) MIME-Version: 1.0 X-Headers-End: 1lgqeN-005az3-OU Subject: Re: [f2fs-dev] [PATCH 10/11] ceph: Fix race between hole punch and page fault X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-cifs@vger.kernel.org, Damien Le Moal , linux-ext4@vger.kernel.org, Ted Tso , "Darrick J. Wong" , Steve French , Dave Chinner , Matthew Wilcox , linux-f2fs-devel@lists.sourceforge.net, Christoph Hellwig , linux-mm@kvack.org, Miklos Szeredi , Jaegeuk Kim , ceph-devel@vger.kernel.org, Johannes Thumshirn , linux-xfs@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Wed, 2021-05-12 at 15:46 +0200, Jan Kara wrote: > Ceph has a following race between hole punching and page fault: > > CPU1 CPU2 > ceph_fallocate() > ... > ceph_zero_pagecache_range() > ceph_filemap_fault() > faults in page in the range being > punched > ceph_zero_objects() > > And now we have a page in punched range with invalid data. Fix the > problem by using mapping->invalidate_lock similarly to other > filesystems. Note that using invalidate_lock also fixes a similar race > wrt ->readpage(). > > CC: Jeff Layton > CC: ceph-devel@vger.kernel.org > Signed-off-by: Jan Kara > --- > fs/ceph/addr.c | 9 ++++++--- > fs/ceph/file.c | 2 ++ > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c > index c1570fada3d8..6d868faf97b5 100644 > --- a/fs/ceph/addr.c > +++ b/fs/ceph/addr.c > @@ -1401,9 +1401,11 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) > ret = VM_FAULT_SIGBUS; > } else { > struct address_space *mapping = inode->i_mapping; > - struct page *page = find_or_create_page(mapping, 0, > - mapping_gfp_constraint(mapping, > - ~__GFP_FS)); > + struct page *page; > + > + down_read(&mapping->invalidate_lock); > + page = find_or_create_page(mapping, 0, > + mapping_gfp_constraint(mapping, ~__GFP_FS)); > if (!page) { > ret = VM_FAULT_OOM; > goto out_inline; > @@ -1424,6 +1426,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) > vmf->page = page; > ret = VM_FAULT_MAJOR | VM_FAULT_LOCKED; > out_inline: > + up_read(&mapping->invalidate_lock); > dout("filemap_fault %p %llu read inline data ret %x\n", > inode, off, ret); > } > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > index 77fc037d5beb..91693d8b458e 100644 > --- a/fs/ceph/file.c > +++ b/fs/ceph/file.c > @@ -2083,6 +2083,7 @@ static long ceph_fallocate(struct file *file, int mode, > if (ret < 0) > goto unlock; > > + down_write(&inode->i_mapping->invalidate_lock); > ceph_zero_pagecache_range(inode, offset, length); > ret = ceph_zero_objects(inode, offset, length); > > @@ -2095,6 +2096,7 @@ static long ceph_fallocate(struct file *file, int mode, > if (dirty) > __mark_inode_dirty(inode, dirty); > } > + up_write(&inode->i_mapping->invalidate_lock); > > ceph_put_cap_refs(ci, got); > unlock: Assuming the basic concept is sound, then this looks reasonable. Reviewed-by: Jeff Layton _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel