Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3064051ybt; Mon, 29 Jun 2020 14:19:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyThEQCudQG63oxZI6YjXnaYTuSDBw34PDPMaO9muuA4uYvhpg4jQHAAY53TDxqmHdEvQs X-Received: by 2002:a17:906:c187:: with SMTP id g7mr8112392ejz.108.1593465566840; Mon, 29 Jun 2020 14:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465566; cv=none; d=google.com; s=arc-20160816; b=mSk0WFO0gpL/r9ETmyEVf6CQS6+f8oCgdocK1A4a3rRwHQcujIYmhEkKSK4fZHSKcQ nbQ4sg3bXD1GnDS3lAfLKU484tdaBcfl6T2j44bCTw8kUSXsk3MvP2i4czTtGLiR0D/Z vmbcojW9yIPi/LFtynHXhnAGprlv5SVHWksqXnjElJbY0UWogAKYUq3A/zzZELsj3OpU bjJwzrDRgCIV10WEyZr0OtO061pZF+CcOYQ/dIGsGwxvZUw+dKusCj81gfMhC0epGqiO KTLZayzU5V8/BJRslXov1kmqZNKozMWBRLo9FIBpgBNwxvHHGLGZiP4Hcn5XD4U1MUw1 ztZA== 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=2LgEj3uIbhCc39jX85W9adGNLfjlJr9dfjseKYvxnNY=; b=rwOXrjtKZNrwdFPxA7EyExzKO8UQPDINaYlxxkmLAuaPEW43FKhlA45xI+r7P2ejGU rmDS+s8H3rjcD1NMNaymQ4jHljiwR96wO9JRX3GL6+JrV0pFkfX4Y3gGftdQ1dC583Tj SIDQ+f+V+9ZVBHg2mYZgCDESgSXeViBjgxQm9ylRjpuboKgsHFbrvzdC1sntfJagT1vz waDrWhiFDHnyCGhwIL6xC4NzCzGroCBuheKOJRk66bZLdRHZyjiOJA1nan0Kj2OGfly4 LVhOJ7TPRNTGOa1nSpgMfjjAlt5Fhst1DskQokaxe5YH2Dx+PYKPT/OUUrkgBwNZEto9 4asg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tg8c7WLq; 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 g22si324307edj.310.2020.06.29.14.19.04; Mon, 29 Jun 2020 14:19:26 -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=tg8c7WLq; 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 S2390666AbgF2VPu (ORCPT + 99 others); Mon, 29 Jun 2020 17:15:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:42448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729951AbgF2SzQ (ORCPT ); Mon, 29 Jun 2020 14:55:16 -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 7ACB225299; Mon, 29 Jun 2020 15:55:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446119; bh=S08nYrekJmBOyeiTsbZtC3oLsNMFUCdDZY8lMIQKECY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tg8c7WLq1bbc5FuszN/URA+GWyDvgdjF3cPTUUZLbNlQKhAN/W6zbQ0Zo8kNbhfXU 1qYl+Tsi2dDl28Kqp/2Myu3xUGBJ7p+XK2AusV/OLWzqDlvun14XmKISR/MdU0GVOB 74F8c0YCmOzdMmFMrdebH0Rs8aNOZQaZ0ZLIEJdg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Xiaoxu , Hulk Robot , Pavel Shilovsky , Steve French , Sasha Levin Subject: [PATCH 4.4 110/135] cifs/smb3: Fix data inconsistent when zero file range Date: Mon, 29 Jun 2020 11:52:44 -0400 Message-Id: <20200629155309.2495516-111-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+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 [ Upstream commit 6b69040247e14b43419a520f841f2b3052833df9 ] 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: Sasha Levin --- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 870b7e763bab9..087261ca6d463 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1145,6 +1145,12 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, inode = d_inode(cfile->dentry); cifsi = CIFS_I(inode); + /* + * 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)) if (keep_size == false) -- 2.25.1