From patchwork Wed Jul 19 22:09:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9853269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 32D47602BD for ; Wed, 19 Jul 2017 22:10:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2481A28700 for ; Wed, 19 Jul 2017 22:10:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18A8528717; Wed, 19 Jul 2017 22:10:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF53728700 for ; Wed, 19 Jul 2017 22:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755326AbdGSWKL (ORCPT ); Wed, 19 Jul 2017 18:10:11 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:35311 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753904AbdGSWKK (ORCPT ); Wed, 19 Jul 2017 18:10:10 -0400 Received: by mail-it0-f65.google.com with SMTP id v127so855065itd.2 for ; Wed, 19 Jul 2017 15:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=XSa6da0Z0XBL0cI2SUHPMVzUg6BfjEgxljjS14+8x+A=; b=CfNI4u2lXRXolyRfv2cLA/5qLwpJyWkpcG9zwamHmu4ySyBpRYjjbVILPJQ3XQj/F0 QHVweg0ylWfR/+ujCL/GQirZo636CGH798NfC7oy0f+H9LQTiuK5Tq8iGb/dZij+LrKM ObwG+BJ8StHDRMyD6uC+Uz8c67K/uRNxZtFNenwUl7mDFxxIimPiMaym9WyHm5UBlQkT 0HWSzz2ZA8YS7AV0VcDGgBPXiFO2B6TMs69/g6hLnlhkGJnOoOfoqgrpBniWchMogyMh ZKnw3Qg8BEt78ouX+Yk5EGTd0CeaO7HLC8ZenR7/TvQoGeXtyuZmqgjB7wzaeYlhQhXL NRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=XSa6da0Z0XBL0cI2SUHPMVzUg6BfjEgxljjS14+8x+A=; b=ciplzQUcyAYeikf7GO5AvYVcDTenEHLzfNlsWu+macZdkkXbsDmhqFZajHKNcx/shP 7/7cRMeVat8peLVTFEUGVIe3HappDPNhVXXHULLOCOpbIT400pWODyovg3R5PSSm8NdR 4h98Xytal3Eo9HWyDM746ZyUYhBjOdzawDLbNbhufVG+8LWzIS1FGlXv8dkx8xP8/f+9 BFgp6y08ZWlvNo2d4IOmuJkDm074YKvTBwusWs8CFFaaRnJpfA3J6Vlp63gP2gSFBkPD /2R0xMNSYLgsFavL3hUZ4AeSj19CwTDNXmPK7cDs+kfGk62ZRDXvHsjdEOh5IUWFkVVN Xx7A== X-Gm-Message-State: AIVw112fC3cM0GhH53GKZ5x9ceVrC9uLO5X5XbX8GJa7myrJyjBrGf6K Y+CpvndOg8yjaQ== X-Received: by 10.36.210.194 with SMTP id z185mr1466797itf.102.1500502208924; Wed, 19 Jul 2017 15:10:08 -0700 (PDT) Received: from leira.trondhjem.org (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 9sm518333iop.9.2017.07.19.15.10.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Jul 2017 15:10:08 -0700 (PDT) From: Trond Myklebust To: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH 07/20] NFS: Don't check request offset and size without holding a lock Date: Wed, 19 Jul 2017 18:09:42 -0400 Message-Id: <20170719220955.58210-8-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719220955.58210-7-trond.myklebust@primarydata.com> References: <20170719220955.58210-1-trond.myklebust@primarydata.com> <20170719220955.58210-2-trond.myklebust@primarydata.com> <20170719220955.58210-3-trond.myklebust@primarydata.com> <20170719220955.58210-4-trond.myklebust@primarydata.com> <20170719220955.58210-5-trond.myklebust@primarydata.com> <20170719220955.58210-6-trond.myklebust@primarydata.com> <20170719220955.58210-7-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Request offsets and sizes are not guaranteed to be stable unless you are holding the request locked. Signed-off-by: Trond Myklebust --- fs/nfs/write.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index c940e615f5dc..84b6818e5278 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -523,6 +523,17 @@ nfs_lock_and_join_requests(struct page *page) total_bytes = head->wb_bytes; for (subreq = head->wb_this_page; subreq != head; subreq = subreq->wb_this_page) { + if (!nfs_lock_request(subreq)) { + /* releases page group bit lock and + * inode spin lock and all references */ + ret = nfs_unroll_locks_and_wait(inode, head, + subreq); + + if (ret == 0) + goto try_again; + + return ERR_PTR(ret); + } /* * Subrequests are always contiguous, non overlapping * and in order - but may be repeated (mirrored writes). @@ -533,21 +544,10 @@ nfs_lock_and_join_requests(struct page *page) } else if (WARN_ON_ONCE(subreq->wb_offset < head->wb_offset || ((subreq->wb_offset + subreq->wb_bytes) > (head->wb_offset + total_bytes)))) { + nfs_unlock_request(subreq); nfs_unroll_locks_and_wait(inode, head, subreq); return ERR_PTR(-EIO); } - - if (!nfs_lock_request(subreq)) { - /* releases page group bit lock and - * inode spin lock and all references */ - ret = nfs_unroll_locks_and_wait(inode, head, - subreq); - - if (ret == 0) - goto try_again; - - return ERR_PTR(ret); - } } /* Now that all requests are locked, make sure they aren't on any list.