Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3090092ybt; Mon, 29 Jun 2020 15:05:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLYwwsXQ+73Vao9kRGc38YYACYgb2rwLn4snZ4C3Gry2RxYoRLmLPsuONBltc4FcNa/hMp X-Received: by 2002:a17:906:1447:: with SMTP id q7mr14807168ejc.363.1593468356731; Mon, 29 Jun 2020 15:05:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468356; cv=none; d=google.com; s=arc-20160816; b=GmfcQVmctcsmzupEGCT50ht0WyW16QWEilGNu1pknCHWwbay0W7wgiSNk6qH4tlXI8 LT7qqvf22zR7QC/xuAlIiVPJmryNO42/HxMZCZJGNP5YvWliboFfCUuBJG8Na+BEMzZQ CwTu+I4pVdVEwRbjIhwL3rJrVt8iBREP2rw3CM8uQUnyfBoY9LaPTsxODCmesDVNqbEl V+bODKLoiCjExYfGROccYm1T9pSArTIkAmyduukaWUTEdNwNgjQ8/aLzTbqXy8UlX3qv Bd5C5qIEYWgHqqpIsNUpHpmV3agb0B6X0wHlaBWil+TzX7/US+4GEA5tF4UXkjmNsvdV PU3g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hecH60b7djXyljzYMP40R7+PK/gXqFsZI91BIMzPVC4=; b=LahXf3DR3J/Ydli+4uemygeJNZMSR6HtqiOAEUa5YHyED+ZcLvYRK0rDPdLBTRYFH0 3ppy66nlBxO7QpHkTG5KSdHrJjIbg5rX0eEsAUa4Cj4nItMEoVzqZWmPYt4TRedDcS8U +q4d6NtHQ2RV8GcOt02RyiupR/i03oCZdEtVycNQ4YgJgHm6Tao88K/6tkmMZP9od7mr cMWWYKR5Lcr74blScUI46SLXgnHyLHzj1HLCLlFqABtcSyZ7SxH8u5dyM3q91wYml3OZ rQslVABdf8HxRcw7fUfCPLNR/Fp12hujsyeetVXxGXQotZ0Jdt7YuSaw1X5UiPKUDS2s SvJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ahSGoEoi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a3si558492ejd.449.2020.06.29.15.05.33; Mon, 29 Jun 2020 15:05:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=ahSGoEoi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390535AbgF2WDO (ORCPT + 99 others); Mon, 29 Jun 2020 18:03:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:56786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726207AbgF2SfX (ORCPT ); Mon, 29 Jun 2020 14:35:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC4A02467C; Mon, 29 Jun 2020 15:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443980; bh=2Jf2AjL9AF4SMS47FIBNC+yP7b1wJtwLXKl98jffVM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahSGoEoiRIpYNG9AWAACk+ePFzJIVW3ajTZzmAko61RvQRkj3OSVhrRWF12cOGrgT w0oqteKuCKW3260iaOUZF56ubuvhX1P4gLm6grj16iCSEF2hcXSXfejRoYKLPx+qZ1 PAoq93vj2YvYBFOideHyxg9bbgwyoHlOisdyUP7k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Xiaoxu , Pavel Shilovsky , Steve French , Greg Kroah-Hartman Subject: [PATCH 5.7 084/265] cifs/smb3: Fix data inconsistent when punch hole Date: Mon, 29 Jun 2020 11:15:17 -0400 Message-Id: <20200629151818.2493727-85-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Xiaoxu commit acc91c2d8de4ef46ed751c5f9df99ed9a109b100 upstream. When punch hole success, we also can read old data from file: # strace -e trace=pread64,fallocate xfs_io -f -c "pread 20 40" \ -c "fpunch 20 40" -c"pread 20 40" file pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40 fallocate(3, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 20, 40) = 0 pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40 CIFS implements the fallocate(FALLOCATE_FL_PUNCH_HOLE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page caches not updated, then the local page caches inconsistent with server. Also can be found by xfstests generic/316. So, we need to remove the page caches before send the SMB ioctl(FSCTL_SET_ZERO_DATA) to server. Fixes: 31742c5a33176 ("enable fallocate punch hole ("fallocate -p") for SMB3") Suggested-by: Pavel Shilovsky Reviewed-by: Pavel Shilovsky Signed-off-by: Zhang Xiaoxu Cc: stable@vger.kernel.org # v3.17 Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index c6a4caa7053e9..3de9113eb8e35 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -3211,6 +3211,12 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, return rc; } + /* + * We implement the punch hole through ioctl, so we need remove the page + * caches first, otherwise the data may be inconsistent with the server. + */ + truncate_pagecache_range(inode, offset, offset + len - 1); + cifs_dbg(FYI, "Offset %lld len %lld\n", offset, len); fsctl_buf.FileOffset = cpu_to_le64(offset); -- 2.25.1