Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp608667img; Fri, 22 Mar 2019 05:05:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9n6HjxMs8rExbjuXCNRr3DzeDBu6KiZHg3xSPvTfx33oapLpJ8j57FrHqS2dkOqUjGk91 X-Received: by 2002:a62:1701:: with SMTP id 1mr1444761pfx.120.1553256339467; Fri, 22 Mar 2019 05:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553256339; cv=none; d=google.com; s=arc-20160816; b=o7hwAZWB79CigBkW/CNh1+B9jgY4bxH1VKZtqxewr7JvFm3ACgEGwkjzyA87JoE77b Jt4yoHH8/zXz0wUdGkDNPV4bYwi+kpSRuJ+B0qgrBhYatTtPIAOW0ZPAolyJ06L4ZyeE SILkhQG7oS7qwSX0Jj+b8GOLoFHOrnT/w67W+vPE3582hsyvZMKei6rAtZVJ1iiBsELG A0XqDIPVfPjhOreqoDEc7uaB+JNL1AROhhuECr12gpT82/t4eVBR3PJd8NgccO6vmewx VjA2autG9L4C9ZRvoPo/IRU8Kk7H0GT4leWV+i3wJEhY/6SGIIB8KJoGXG6R6jtE9Hqd LHyg== 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=/83SxRbXJHl7QGy83XMcywCYcK8LjjJuNEkqZzXp0rs=; b=ZX9YbX6K6M5MozolO8/hMzQIMvlrnX0fygL8qKcIb8RLAbvU32KfwIAOGC56tW1BLB /pfv028RlX7tKj61sWBNv1q1LOorCJqukAlCTNrsk2i9PO59s819F7LnoZsZ4tiyeqaa MX0A2UZWEb9DosIOsx2xtsIL7nN3s/25oyUdhawo9pzSn6OogxPUxjMAmuw3M3zBFAli errPPT/gHf/VK1drKUlXPa0bGiy1B5vpwZqjdn/CZuxJy98yQ1vV1NXSgtpBz21jTTI1 DRgOfxPNNddk5Lss2l4kQDsB5FchV1NCgrQLEY0q+rc/7TGMUr1KfzWGgL4eRdVEU9eF Z7Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ds8hz87h; 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 n1si7072940pld.251.2019.03.22.05.05.23; Fri, 22 Mar 2019 05:05:39 -0700 (PDT) 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=Ds8hz87h; 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 S2388580AbfCVMDw (ORCPT + 99 others); Fri, 22 Mar 2019 08:03:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:42212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388576AbfCVMDt (ORCPT ); Fri, 22 Mar 2019 08:03:49 -0400 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 779C8204FD; Fri, 22 Mar 2019 12:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256229; bh=elFe8A4KLWRXsj0lLmL+wyS1fuQD7a4WM9PmRNeDU1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ds8hz87hC9XaC2ccd+7/3q7py+u3fQzsbg1TwpOnGyy63boNuxFN21vvRZcSMMNSt 2TFs2mD13b6zxMqq9u9V4ZgwEOBXJf4NtfMHdlzD3hImdNaUb3fokyDd/jqmYY9/eB KRZMHytAF0JlnfaSkf2elTTM+FtOgH6dVIaL93nM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Shilovsky , Steve French , Ronnie Sahlberg Subject: [PATCH 4.19 139/280] CIFS: Fix read after write for files with read caching Date: Fri, 22 Mar 2019 12:14:52 +0100 Message-Id: <20190322111318.017883204@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pavel Shilovsky commit 6dfbd84684700cb58b34e8602c01c12f3d2595c8 upstream. When we have a READ lease for a file and have just issued a write operation to the server we need to purge the cache and set oplock/lease level to NONE to avoid reading stale data. Currently we do that only if a write operation succedeed thus not covering cases when a request was sent to the server but a negative error code was returned later for some other reasons (e.g. -EIOCBQUEUED or -EINTR). Fix this by turning off caching regardless of the error code being returned. The patches fixes generic tests 075 and 112 from the xfs-tests. Cc: Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg Signed-off-by: Greg Kroah-Hartman --- fs/cifs/file.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2871,14 +2871,16 @@ cifs_strict_writev(struct kiocb *iocb, s * these pages but not on the region from pos to ppos+len-1. */ written = cifs_user_writev(iocb, from); - if (written > 0 && CIFS_CACHE_READ(cinode)) { + if (CIFS_CACHE_READ(cinode)) { /* - * Windows 7 server can delay breaking level2 oplock if a write - * request comes - break it on the client to prevent reading - * an old data. + * We have read level caching and we have just sent a write + * request to the server thus making data in the cache stale. + * Zap the cache and set oplock/lease level to NONE to avoid + * reading stale data from the cache. All subsequent read + * operations will read new data from the server. */ cifs_zap_mapping(inode); - cifs_dbg(FYI, "Set no oplock for inode=%p after a write operation\n", + cifs_dbg(FYI, "Set Oplock/Lease to NONE for inode=%p after write\n", inode); cinode->oplock = 0; }