Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4383823pxj; Tue, 25 May 2021 06:52:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9VkHkHnLd+YaMJNWfobusW/NVJ4dX3ko2+v5moDla4xH6x5SXRPuKXZbgmsu2RWLahWAz X-Received: by 2002:a50:f388:: with SMTP id g8mr31643164edm.236.1621950771849; Tue, 25 May 2021 06:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621950771; cv=none; d=google.com; s=arc-20160816; b=s+Vo3kr+yydcxw32A+kgLSQfNgC0cl7Fh4vEYRcfy4kvBtYcmFYFdey/i6Yv9Wu2e9 m6jLXM8AslvyhN17bjEfsaoyXYKF1XrHvBPseKb4tbF1iMTzHmzdCd1bydc3Aa8/aBot ZJ7+1OMGMKp3wS4m+7rLmn81+kmDCUrRPfbVXQ6hD7RdhLDQT+u7UyggY+8Iq0Dr3uHe Xw1SvnvmFcQfr9mk8lSqIIWPSq4A4uwk/LeCrULn9XHWp7A28wBa5qL+tpOR+u3Qn7ZC fVeQZzydXTIQX/XPyCKHALwh5xR/bbLrm9YKn+UaXX161KEj0+BT051zQ6sfpa2UQZWZ 0mYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=J9i26LHL2rlVmaJ49pwJamYptfR6NjvqlSUaLcXXdxM=; b=WdS/TCoYUMpKyo+tPgJ6cNvUWKKcXqnWtXjEYNE+piVMCNJMU52Fh01jftEev6R+/Q ERrGAkjZnjGIdPZ7YJUzG9LPbEtC5Mrgq2dL5e6UULFEJY9SNVI3cbDGyKCqPwVUZAg4 GDW43rytuv/dtdmpAsUbKXlSaqiHeumXOOHnzH3ck8Xt1hzi8rCnCqoM5v8kqIhi+e6j iTzABaD6l01A5aj93thP47htobh1au/MV4I5H11BMwB8kv4RI1OAh6xvLXhHcEH/VC3i /zZCNTRIEGWQDH/kkes7xdKz1Vjayl8xwG1TnRVySpiXCSXe0ZXhzYa+hblU+MR4UhOG yAMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=fVtuBhGB; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519 header.b=6QDtzpba; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ke13si10396203ejc.398.2021.05.25.06.52.28; Tue, 25 May 2021 06:52:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=fVtuBhGB; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519 header.b=6QDtzpba; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233620AbhEYNwz (ORCPT + 99 others); Tue, 25 May 2021 09:52:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:42780 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233435AbhEYNwj (ORCPT ); Tue, 25 May 2021 09:52:39 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1621950662; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J9i26LHL2rlVmaJ49pwJamYptfR6NjvqlSUaLcXXdxM=; b=fVtuBhGBODJ/q4WtenoZlmsUFVoiJdvJk+GxugxWsyTz4LAtQiQS/Iu1ZvwKRd2g3kvS60 MV9ntfut1APeWOS+c7ZH57UOJzZ+5bXN+RW7JyZGFpt7D+YgH/LqFuYPEPP1t0cLyktyzO lgKL7Jn4+a+bkcNdXw+HL5Y2PWcL3po= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1621950662; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J9i26LHL2rlVmaJ49pwJamYptfR6NjvqlSUaLcXXdxM=; b=6QDtzpbab4vaBOv4VCkDNUMcoimrVwb3/6BsjgWKLsuFNnENOviDrGEbqFZnFhIdR38G1M /U3ruX0XChlnCiAQ== Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 35461AF1F; Tue, 25 May 2021 13:51:02 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 41D691F2CBD; Tue, 25 May 2021 15:51:00 +0200 (CEST) From: Jan Kara To: Cc: Christoph Hellwig , Dave Chinner , ceph-devel@vger.kernel.org, Chao Yu , Damien Le Moal , "Darrick J. Wong" , Jaegeuk Kim , Jeff Layton , Johannes Thumshirn , linux-cifs@vger.kernel.org, , linux-f2fs-devel@lists.sourceforge.net, , , Miklos Szeredi , Steve French , Ted Tso , Matthew Wilcox , Jan Kara Subject: [PATCH 12/13] ceph: Fix race between hole punch and page fault Date: Tue, 25 May 2021 15:50:49 +0200 Message-Id: <20210525135100.11221-12-jack@suse.cz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210525125652.20457-1-jack@suse.cz> References: <20210525125652.20457-1-jack@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 Reviewed-by: Jeff Layton 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: -- 2.26.2