Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp777551ybl; Wed, 11 Dec 2019 07:22:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxrNJmh37H7VdXf62mwUTTBSAPvmmuaFSYPdEFbgwGM+9jBvel6uLchkC4qxr4WoRWyEa1t X-Received: by 2002:aca:4f86:: with SMTP id d128mr3285505oib.25.1576077747973; Wed, 11 Dec 2019 07:22:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077747; cv=none; d=google.com; s=arc-20160816; b=BCLCd6wc+PkxZbJ2VYijaJ/aUfKayHPB23jbxTxm3oeC/HOmBidpiqPTF7C2yIAdLm nhc5uR93YkDw7J5cNHbMG4ICOG//KdCBPKjCZDclF554oebvtLXvg0OkskMjsrKzyWPj vW/4VWin8f0OPKkHhEGr9calE6IWDx8VlMb6r22pRpzVXkYatsW5qmiDfiHbWkOImTZD aRSKMYw1x0mjj3kIn14x9Jjbmub4WrfkIl/0iUjVY2JPS7mWMz8tFXZWEu5Xe9tKR4PY fnj96W807fF5eoH9Rjf9H4a8MsiLImR41LfA/xTH7L47Ss/eT+XZme+pZCH+q2/WucEc rXjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gb9t5gdMvENrwE8+t1huVMPY2LkrRj/2NT5dfcdD72w=; b=XPFHRDvnsSgU2EbwihKKEY/SCcu1KEKzyV7Iumd5TVgc/RAv3yc0kKYVdfzLKTk7uS YXCncftpzZPbxgDD7XzbEBQbUEqNPt0B7cpxojynbOzW4MlGWv2eX/I3oeU51PDbFKNp z7QZG+TYZ95HiDEHKFNvQeiaetf7E/YKu+PpCXQRh9jaAXWRfxi0hoSWANuKKEREQcRm UB2N76ELS6o5i4al+zO9kxF8xCa5xMDWGzgPbMtFKVxapX/dhYIPbg1CxU6H4z3S7bE2 e8TEaL2k761psjzBrI00tleb903l1f7T0ymx6y1nvvX/qSg283hrm5S+ejP1iHPyImXO 4Y0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Pb3u8GK/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l6si1366746oti.249.2019.12.11.07.22.14; Wed, 11 Dec 2019 07:22:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Pb3u8GK/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732360AbfLKPUk (ORCPT + 99 others); Wed, 11 Dec 2019 10:20:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:50092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732355AbfLKPUh (ORCPT ); Wed, 11 Dec 2019 10:20:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AD6B72073D; Wed, 11 Dec 2019 15:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077637; bh=G5OC/VI4Alby3PvzflFKsf7W2Ngi9FARGAmkruBD+BA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pb3u8GK/qcb9rTi49O660UvsAgc3liZRnPA7jXy7PHtfvDNTUoD8sw20OrTg8xTB5 T0ss2s2HQX9AaBW1uHMEWUgNZRu4tNcLMWSUIBsbdTn/F3n91KUGo5xwY71WZNc2wU sSWXBMUeUK7PpoFvtqgRIZbleDiu2sFLWUABHAw8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Chinner , Christoph Hellwig , "Darrick J. Wong" , Sasha Levin Subject: [PATCH 4.19 075/243] iomap: FUA is wrong for DIO O_DSYNC writes into unwritten extents Date: Wed, 11 Dec 2019 16:03:57 +0100 Message-Id: <20191211150344.165936043@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Chinner [ Upstream commit 0929d8580071c6a1cec1a7916a8f674c243ceee1 ] When we write into an unwritten extent via direct IO, we dirty metadata on IO completion to convert the unwritten extent to written. However, when we do the FUA optimisation checks, the inode may be clean and so we issue a FUA write into the unwritten extent. This means we then bypass the generic_write_sync() call after unwritten extent conversion has ben done and we don't force the modified metadata to stable storage. This violates O_DSYNC semantics. The window of exposure is a single IO, as the next DIO write will see the inode has dirty metadata and hence will not use the FUA optimisation. Calling generic_write_sync() after completion of the second IO will also sync the first write and it's metadata. Fix this by avoiding the FUA optimisation when writing to unwritten extents. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Sasha Levin --- fs/iomap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index fac45206418a2..914c07c9e0d6f 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1619,12 +1619,13 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length, if (iomap->flags & IOMAP_F_NEW) { need_zeroout = true; - } else { + } else if (iomap->type == IOMAP_MAPPED) { /* - * Use a FUA write if we need datasync semantics, this - * is a pure data IO that doesn't require any metadata - * updates and the underlying device supports FUA. This - * allows us to avoid cache flushes on IO completion. + * Use a FUA write if we need datasync semantics, this is a pure + * data IO that doesn't require any metadata updates (including + * after IO completion such as unwritten extent conversion) and + * the underlying device supports FUA. This allows us to avoid + * cache flushes on IO completion. */ if (!(iomap->flags & (IOMAP_F_SHARED|IOMAP_F_DIRTY)) && (dio->flags & IOMAP_DIO_WRITE_FUA) && -- 2.20.1