From patchwork Mon Oct 24 11:26:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp439443wru; Mon, 24 Oct 2022 06:02:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vOZ2H610salWiYmrSN2RwukcES08cvXbzF1woQqhu/l50hrGmdhq8qylLAVUKEx3WakPj X-Received: by 2002:a17:902:d485:b0:186:bb44:9459 with SMTP id c5-20020a170902d48500b00186bb449459mr359885plg.101.1666616565734; Mon, 24 Oct 2022 06:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616565; cv=none; d=google.com; s=arc-20160816; b=yWRHWlPshOW37KanHsb+ecJIWk/xbyZqWY/eUGLXqhlVoYlyiydPRDR7wA5ESNrQNg 70O1hOcRx2PhANvP6M8hfKRcBfdGH2YEjZxRFJLVAakmroyEKYYawMZK9KKd5E1l6q/a xQRcJ9dSaw22OdsIMxGfTgTUg5J4bY0MRBVLgS9rvwTSeg9/lKktOSvGhWFA7L87WQMM h2/6OWXhWCvakWdC/PwyS8Sl9LMxcQMdtMlR84283iiCziknPgnt3FeGDxE+Kitixk6+ 75Tal3aGt3Mn0RzGKCZfx/fnHZNBHZmXhQvzYTj5jy2FO3iHSIOSpGiw/0I2+XmzorAh MjTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2xbjc9z3iTAHZRokWY3K57VgfZJN4YQAHWMCobO9N5c=; b=pir6PxpwKVHROtp9USQJHGg3enSlC2E4rYcaeQMvjme3V2ALlHu/WUxHPEavfXGTy2 9Oxy9a6XJArck62BjtvmBzfVRsMPnueF7oMEz4zzp1Hz+XxuAktL489J3vxckPbsI0y+ l0yHjqdYgXVH6gSTJbLV84Hr1E/561F3I9x4mt7PaqwAtRiYQuJmjpRgp8Lyq+InSy5X AxBaY30ozl2rVRa/ubiBBxjIWou6hpaJizuMZBD0YO9k3gBelomNTLFCVlf0WUW6lQo7 qctVh+HJNLXJYalenIdX+Qnik3uPvsYDVaQ5dkxqH6t/HH54y5e8Tpcg7fTPfUBPwRp/ Cq6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vtiyyUWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e23-20020a635017000000b0045a6c6c559bsi34747183pgb.305.2022.10.24.06.01.57; Mon, 24 Oct 2022 06:02:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vtiyyUWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235075AbiJXNBT (ORCPT + 99 others); Mon, 24 Oct 2022 09:01:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234982AbiJXM7E (ORCPT ); Mon, 24 Oct 2022 08:59:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D4A495AC1; Mon, 24 Oct 2022 05:18:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EC9F5612FD; Mon, 24 Oct 2022 12:16:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F320C433C1; Mon, 24 Oct 2022 12:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613776; bh=oUV8zeZQN2y6uAKtvwYQIIk6Cb4xc8dJvWlOpMz+ogA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vtiyyUWJE9TDCoiw3NwthZjG7TYL+JMCRD9PA6AzHJmUgeRpCqA4GE9tLIG/mgEoS WxMuU47oJXkHiejRpaUgNuJUwTik+75uNVeDM2r+9bjH4M1NQ8Xp7ILCb/YCG/3URK 1DyltbX2PmNG/ETC2plL4MkCEQWtvInSTdcxqB5Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Paulo Alcantara (SUSE)" , Enzo Matsumiya , Ronnie Sahlberg , Steve French Subject: [PATCH 5.10 010/390] cifs: destage dirty pages before re-reading them for cache=none Date: Mon, 24 Oct 2022 13:26:47 +0200 Message-Id: <20221024113022.976438310@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574131630562654?= X-GMAIL-MSGID: =?utf-8?q?1747574131630562654?= From: Ronnie Sahlberg commit bb44c31cdcac107344dd2fcc3bd0504a53575c51 upstream. This is the opposite case of kernel bugzilla 216301. If we mmap a file using cache=none and then proceed to update the mmapped area these updates are not reflected in a later pread() of that part of the file. To fix this we must first destage any dirty pages in the range before we allow the pread() to proceed. Cc: stable@vger.kernel.org Reviewed-by: Paulo Alcantara (SUSE) Reviewed-by: Enzo Matsumiya Signed-off-by: Ronnie Sahlberg Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/file.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3936,6 +3936,15 @@ static ssize_t __cifs_readv( len = ctx->len; } + if (direct) { + rc = filemap_write_and_wait_range(file->f_inode->i_mapping, + offset, offset + len - 1); + if (rc) { + kref_put(&ctx->refcount, cifs_aio_ctx_release); + return -EAGAIN; + } + } + /* grab a lock here due to read response handlers can access ctx */ mutex_lock(&ctx->aio_mutex);