Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4488976pxj; Wed, 12 May 2021 06:47:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe+PI2rSkxJ7dbFzlKxVWDUWGyoa6pZ+LilfJZ4sbMFuIhkQZdYPdXQp+JSIWkpTsJcWG/ X-Received: by 2002:a17:906:9990:: with SMTP id af16mr36826697ejc.195.1620827236964; Wed, 12 May 2021 06:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620827236; cv=none; d=google.com; s=arc-20160816; b=Q4vpnP772TdAr+doszIs+k5Z8Wql96T+XqveN8craiMDbCLOgpx2a0dk3MYJjCPeN4 Y4Omz7kcOFUVIrc7/Ft7brNPuVNnXNokM7YFyXebZtOn9ETcJVv6VaCO2ProbWYD4L+N 0k6cMyuJ2CQE5LsPkAnzHRbZVud54c7Ma1tCHez8sG14en5nMDCuRtOsWKH3Tj2Au767 Kuse5ZisBAm0iVsKmd7EAAdZ7KqFf1SgF2d5F/d4XQIFAbDyhjPDm9GqyjQiXRUMQKgp V/uj2SzSa0oOFIJYbWHaa1le15AzexTAhQzcUmKfZloJVM/2WVJguZbSxH6NwyU5QR47 hUlw== 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; bh=BsEFJERiVdoUYfzPc0MQwiR+Xi2Dt9ONSRObee+uovk=; b=vvePd4Psl0pDcuB/frBXlDi6HXR6jKIvUyFLGsTZecyj2cbcUuZrZEDs95tCABa8hw tS9YVax2tJfHf3zpQuFNh052rDaRToj49on2W3RaVG/A6yle/hhpPl+lmcs2Gg3H4USH c+k4Di1lexcpvyDRFRF421RNkg+7ofUUDk54drCgcH8EeyFw347RwqyQvw43Jt3TR8HE QsM88QZ9i69E1ARwjwDXWr9BAGUfaUQOpFpw7HDvwvhjW4JsklIwJI+EDNa7NkOGZo8v dqdASfXgXkdbnalEHgamySTcDlnTE+/apo0JeAa+g6UwLYaVugXgm8OTLC6tJAJHcKU6 e78A== ARC-Authentication-Results: i=1; mx.google.com; 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 si17si23247ejb.486.2021.05.12.06.46.53; Wed, 12 May 2021 06:47:16 -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; 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 S231293AbhELNrr (ORCPT + 99 others); Wed, 12 May 2021 09:47:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:41664 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231166AbhELNro (ORCPT ); Wed, 12 May 2021 09:47:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BD05EB1A6; Wed, 12 May 2021 13:46:32 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 0930B1F2B6C; Wed, 12 May 2021 15:46:32 +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 10/11] ceph: Fix race between hole punch and page fault Date: Wed, 12 May 2021 15:46:18 +0200 Message-Id: <20210512134631.4053-10-jack@suse.cz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210512101639.22278-1-jack@suse.cz> References: <20210512101639.22278-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 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