Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3089537ybt; Mon, 29 Jun 2020 15:05:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyobii0GiPMh3czTW/eEtNkXA/2w4TCPoB5rqGckNVJ4HJhfryuODXPGfgRvGVTvy1+i7R1 X-Received: by 2002:a50:b086:: with SMTP id j6mr17041941edd.6.1593468311923; Mon, 29 Jun 2020 15:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468311; cv=none; d=google.com; s=arc-20160816; b=OTHuJ0P+VF6XNtel4yX3ZFKnKgvItBCtgZLcGFWFS0pFiQYa0ImEk3JukR+dXy54um QwiAFMx6aUAZUtdz27QaFBjq09v6AXae3o7pkG/qNciq4YxLkuUTITldz/DEvIv3D0AD epG3ObgKVP2B2v9yDghbkrMI+KeZYh6I7qiNS9c1YJEPJ+T4rUzpkMbbwmjl/V3+UYfN bU5xV86VFf9ph+2iAW11MBLzqXHztkr8aK/57tAfO7wiFyiK7Xpq0u3ohogwNyDBlotd jn6okA9y3M2is8tmyaluHGAIUl0dbKeizNiZ0DO/J2MIydwJJazzdQsryO1JBWDG9ViT El5g== 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=+ogZbZ5eG8zBEeoJ0f9dkKQPctnrtH9Zh3fn8gzy6eA=; b=cfOQnnxZkB1iW2KsBrfNVXluREHbdVZR4eo3py53k3WE4ABEbWVSPGePu4xrrjFSx/ udR0gDANAmYj/EFZSZ87CQfmA5eWqxGwVd2d5uJSnwwWJpiQLQVi1t+D5sES9gd3xOHZ WLRm7zp1GvV0UKKAawDUMzjTZzfJXJOPVH1W1zWNkwKzf0JwfCJdg+h4KSsIxJSuHiee IhRcuCyOrlGHTh0myG1UoYTIfXiXQ68upxUhfGU88Q+sY7RKnbv9zXH1nDFzHBGBUG1G vnZGFP88tz/62x6reK9SSGsyg14dHs7M2JGuzyl3+pOiysZfIQpCAB95sE6UW7apSQwt PJlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N9KOxRM9; 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 v20si524820ejx.754.2020.06.29.15.04.48; Mon, 29 Jun 2020 15:05:11 -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=N9KOxRM9; 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 S2391728AbgF2WDq (ORCPT + 99 others); Mon, 29 Jun 2020 18:03:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726183AbgF2SfW (ORCPT ); Mon, 29 Jun 2020 14:35:22 -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 C1B0424680; Mon, 29 Jun 2020 15:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443981; bh=Lf6jb8z4iIF/Glg9uv3XNjE9mqcTEL/2yKtxJnHNVOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9KOxRM9E2xGZuZ0BuT+KZlPHSQVqvKu9ysiBVzAzTH7fEkATmmFMeddlSr3jX0d0 OfGV2t6vzBgi9LzuUrV2+cR0ioUkOj3pyWPhcHMYELXNz5nf2py2pWJA7VSRrO28fn e9lQEkbDvSJOcyeO7GlJTmqC8XdfOnwDJpMy3klI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Xiaoxu , Hulk Robot , Pavel Shilovsky , Steve French , Greg Kroah-Hartman Subject: [PATCH 5.7 085/265] cifs/smb3: Fix data inconsistent when zero file range Date: Mon, 29 Jun 2020 11:15:18 -0400 Message-Id: <20200629151818.2493727-86-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 6b69040247e14b43419a520f841f2b3052833df9 upstream. CIFS implements the fallocate(FALLOC_FL_ZERO_RANGE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page cache not update, then the data inconsistent with server, which leads the xfstest generic/008 failed. So we need to remove the local page caches before send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. After next read, it will re-cache it. Fixes: 30175628bf7f5 ("[SMB3] Enable fallocate -z support for SMB3 mounts") Reported-by: Hulk Robot Signed-off-by: Zhang Xiaoxu Reviewed-by: Pavel Shilovsky Cc: stable@vger.kernel.org # v3.17 Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 3de9113eb8e35..6fc69c3b2749d 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -3145,6 +3145,11 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, trace_smb3_zero_enter(xid, cfile->fid.persistent_fid, tcon->tid, ses->Suid, offset, len); + /* + * We zero the range 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); /* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ(cifsi)) -- 2.25.1