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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 B2B81C0650E for ; Mon, 1 Jul 2019 17:31:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C59421721 for ; Mon, 1 Jul 2019 17:31:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562002309; bh=u3SppgTway+eXuflscf2TzQ5lfnG2J1fw1rm6YMFVMM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:List-ID:From; b=jPsEC5A+942Xd8I3y/Fy6NB5c8hyK1o+bmnOpBaaQBgCUt4UAxJHC06lfP5saaA1n Lqg9ZBo91E8XQC0MLzJq86J6EyuhS+X1t9QA7jEjJJqSBfjddmynH+J4+nD4Vnmz/v oP/7pM1ELU/S+/1wqtfqEYKObfyX/bNhhfURK/jk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729742AbfGARbs (ORCPT ); Mon, 1 Jul 2019 13:31:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:42760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727849AbfGARbs (ORCPT ); Mon, 1 Jul 2019 13:31:48 -0400 Received: from tleilax.poochiereds.net (cpe-71-70-156-158.nc.res.rr.com [71.70.156.158]) (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 2466521479; Mon, 1 Jul 2019 17:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562002306; bh=u3SppgTway+eXuflscf2TzQ5lfnG2J1fw1rm6YMFVMM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=VwTaLep0ifiWwbXmbblVYjQkPd82by4O+ikcgxPN+f5zQ+4ymF77KBbM+2DnOpW5T Lu+6oHbSgnwbQiwvJMkRFj5j1xEaFXKSc9CEaIDQfBdgigyNMuC0BMDOIJ4ZuTvwNG AfboPV/hlDoi4b6TKZP2krnjXVGx3OiUbnD3onIQ= Message-ID: Subject: Re: [PATCH] ceph: fix end offset in truncate_inode_pages_range call From: Jeff Layton To: Luis Henriques , "Yan, Zheng" , Sage Weil , Ilya Dryomov Cc: zhengbin , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 01 Jul 2019 13:31:44 -0400 In-Reply-To: <20190701171634.20290-1-lhenriques@suse.com> References: <20190701171634.20290-1-lhenriques@suse.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.3 (3.32.3-1.fc30) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2019-07-01 at 18:16 +0100, Luis Henriques wrote: > Commit e450f4d1a5d6 ("ceph: pass inclusive lend parameter to > filemap_write_and_wait_range()") fixed the end offset parameter used to > call filemap_write_and_wait_range and invalidate_inode_pages2_range. > Unfortunately it missed truncate_inode_pages_range, introducing a > regression that is easily detected by xfstest generic/130. > > The problem is that when doing direct IO it is possible that an extra page > is truncated from the page cache when the end offset is page aligned. > This can cause data loss if that page hasn't been sync'ed to the OSDs. > > While there, change code to use PAGE_ALIGN macro instead. > > Fixes: e450f4d1a5d6 ("ceph: pass inclusive lend parameter to filemap_write_and_wait_range()") > Signed-off-by: Luis Henriques > --- > fs/ceph/file.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > index 183c37c0a8fc..7a57db8e2fa9 100644 > --- a/fs/ceph/file.c > +++ b/fs/ceph/file.c > @@ -1007,7 +1007,7 @@ (struct kiocb *iocb, struct iov_iter *iter, > * may block. > */ > truncate_inode_pages_range(inode->i_mapping, pos, > - (pos+len) | (PAGE_SIZE - 1)); > + PAGE_ALIGN(pos + len) - 1); > > req->r_mtime = mtime; > } Reviewed-by: Jeff Layton