Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3027746ybt; Mon, 29 Jun 2020 13:17:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqEnyM7hXUrXt8YGXdE4B7Bu5r3XqN/BGHXS/TKDi+8yGOrKXRrq8Jmy2f014Uf+UepJKx X-Received: by 2002:a17:906:3b15:: with SMTP id g21mr14896156ejf.221.1593461842658; Mon, 29 Jun 2020 13:17:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461842; cv=none; d=google.com; s=arc-20160816; b=TV7TtPXTyRKQVVcWl/65w7wPBW3FeI+inUhsx1tkP6U564rhFEHZZykEHX9BFa3ros qrKGUAuB6glgkFjIjtnu7jh2HC0aM47+f0+2pdsPR52EwJEscjmIq2Kv4I17lGnZlksF QThJq0rT4Ulqdrmo2mdpY6nBb1Plfrz+BYgZ7N7g4doDGqKpvr3oP8FiMHresouRQrOJ QwE5/g9UOLgkZsfOyQ3nSDTAgbfDK3z7Ae/VdXN7LOtZiYazjSyrk5xIngWUOf8hqo4x kCu7wKqYmxTDNjYdCqG8Ir1XcgaI1IM0lJUNm6kCMu7eYzQhN4dkfa9kQQB0Plda/IsH XjVw== 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=nXNa3iZyD+WSk/bWV2697h0suVnESFvGxlpTwORnY5U=; b=yFQyPINMEVG/Bne4FwYBAmAeCxiST4tmq48hoQJqHrcXXVrn/pAhpFaHpP6Fae8oOA m/gb0xyzWJbLKHqt+SnY4T0sVwyhlhudBLj5RNmT20sfELGZnxA80St9knogefy0IK08 zSAM5HYWbL76idIA1uPXsOmx7AGTWejph+O7T9sN1bIP7hbPLA/bS9fZofQRrwKSIANO EdLneKmSgbAROlQOlArTVhRKdeSo/aRY1bvIEemugnHur1OqYY0cmaSNhrFOAOEWZUbj 64XT/t7qtarvdtAR3nPZIf+vxp+zMHgz/zRPOdF97EUrJjBNehJqT8QILZu+uCWYw166 HIug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BEU5Q6Ey; 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 c3si312661edr.308.2020.06.29.13.16.59; Mon, 29 Jun 2020 13:17:22 -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=BEU5Q6Ey; 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 S1732706AbgF2UPj (ORCPT + 99 others); Mon, 29 Jun 2020 16:15:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:40568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732830AbgF2TaR (ORCPT ); Mon, 29 Jun 2020 15:30:17 -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 16861252BC; Mon, 29 Jun 2020 15:37:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445028; bh=dAQagAwGzha9ayDt2K5dc8ZwEUMXPs7HNP+abuI3+gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BEU5Q6EyHRf0uUq9vYkz4XZKOGl4hYNRorPI1q+AWcAm2XsCHFGSyKl4cDW5bRMXq ipLLkJbomyrgVzpZ47nKZ1AZaZi7+SXYjj3e94UyFSMAULC8BAzfDvIzfMPIe8BD9u LXDVKly00aOkM96UsxwJdNyjtVjwOAxmMycGZo50= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Greg Kroah-Hartman Subject: [PATCH 4.19 126/131] pNFS/flexfiles: Fix list corruption if the mirror count changes Date: Mon, 29 Jun 2020 11:34:57 -0400 Message-Id: <20200629153502.2494656-127-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153502.2494656-1-sashal@kernel.org> References: <20200629153502.2494656-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.131-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.131-rc1 X-KernelTest-Deadline: 2020-07-01T15:34+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: Trond Myklebust commit 8b04013737341442ed914b336cde866b902664ae upstream. If the mirror count changes in the new layout we pick up inside ff_layout_pg_init_write(), then we can end up adding the request to the wrong mirror and corrupting the mirror->pg_list. Fixes: d600ad1f2bdb ("NFS41: pop some layoutget errors to application") Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/flexfilelayout/flexfilelayout.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index e0fe9a0f1bf18..d8cba46a9395c 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -915,9 +915,8 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, goto out_mds; /* Use a direct mapping of ds_idx to pgio mirror_idx */ - if (WARN_ON_ONCE(pgio->pg_mirror_count != - FF_LAYOUT_MIRROR_COUNT(pgio->pg_lseg))) - goto out_mds; + if (pgio->pg_mirror_count != FF_LAYOUT_MIRROR_COUNT(pgio->pg_lseg)) + goto out_eagain; for (i = 0; i < pgio->pg_mirror_count; i++) { ds = nfs4_ff_layout_prepare_ds(pgio->pg_lseg, i, true); @@ -936,11 +935,15 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, } return; - +out_eagain: + pnfs_generic_pg_cleanup(pgio); + pgio->pg_error = -EAGAIN; + return; out_mds: pnfs_put_lseg(pgio->pg_lseg); pgio->pg_lseg = NULL; nfs_pageio_reset_write_mds(pgio); + pgio->pg_error = -EAGAIN; } static unsigned int -- 2.25.1