From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CD3F1917ED; Tue, 26 Aug 2025 13:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214690; cv=none; b=YgI9r7sv9fYwlCd1tgDwWa9i0TcMMcRZ5n3EIOfHKeO/QyfYRFVWfsmW4hZ2ze/g9Lho8wU7RpGjWCy9A2V8ItmXLebMr3Xs1v//zHNUpPhjd2Xbhq+mKH5ZoPXSodtL+DfevhpEkKQGiLXPdzjWOMebvu36wiGoXbgBy2dSfdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214690; c=relaxed/simple; bh=Hx9VbZTPlUq6OoWEN1lWFhRM2B46JY2US+ZwjTx5waY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TOuNa7kZYmSEBQrq7j7vdewPRAQUEC+nypiq1BJsxP7mLkjSdRInMhRiVncjFqJsl6QEmOF2jGdC25UaTZEYKj9iWw3hCm1S0QaGvjb9/uVkDq3th997ca2C1FvWB3I4Yo5UBlf0VSe+pCYjP4DtpbwP0qPW1j/QzBhywROItGM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fMOQlZmT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fMOQlZmT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC84BC4CEF1; Tue, 26 Aug 2025 13:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214690; bh=Hx9VbZTPlUq6OoWEN1lWFhRM2B46JY2US+ZwjTx5waY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fMOQlZmTPLAsawnzfI2YPDQYqTqY5tGjfR0FrgvTXvZpkFf3Yvtsh/wjaUxjbuk5e FDk7k/2XxAwjN1TFqnk0nUyGQpbVU1ZJPUodpiX0P/9Dqz2/wCUAbqX12dfmGBYVMZ R7hfKLqadf4P7Pft7LmQxEMwyfpCXKO8QgHKv3o0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sergey Bashirov , Christoph Hellwig , Trond Myklebust , Sasha Levin Subject: [PATCH 6.1 233/482] pNFS: Fix stripe mapping in block/scsi layout Date: Tue, 26 Aug 2025 13:08:06 +0200 Message-ID: <20250826110936.528091416@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sergey Bashirov [ Upstream commit 81438498a285759f31e843ac4800f82a5ce6521f ] Because of integer division, we need to carefully calculate the disk offset. Consider the example below for a stripe of 6 volumes, a chunk size of 4096, and an offset of 70000. chunk = div_u64(offset, dev->chunk_size) = 70000 / 4096 = 17 offset = chunk * dev->chunk_size = 17 * 4096 = 69632 disk_offset_wrong = div_u64(offset, dev->nr_children) = 69632 / 6 = 11605 disk_chunk = div_u64(chunk, dev->nr_children) = 17 / 6 = 2 disk_offset = disk_chunk * dev->chunk_size = 2 * 4096 = 8192 Signed-off-by: Sergey Bashirov Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20250701122341.199112-1-sergeybashirov@gmail.com Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/blocklayout/dev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c index ce2ea6239797..fc6413953600 100644 --- a/fs/nfs/blocklayout/dev.c +++ b/fs/nfs/blocklayout/dev.c @@ -199,10 +199,11 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset, struct pnfs_block_dev *child; u64 chunk; u32 chunk_idx; + u64 disk_chunk; u64 disk_offset; chunk = div_u64(offset, dev->chunk_size); - div_u64_rem(chunk, dev->nr_children, &chunk_idx); + disk_chunk = div_u64_rem(chunk, dev->nr_children, &chunk_idx); if (chunk_idx >= dev->nr_children) { dprintk("%s: invalid chunk idx %d (%lld/%lld)\n", @@ -215,7 +216,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset, offset = chunk * dev->chunk_size; /* disk offset of the stripe */ - disk_offset = div_u64(offset, dev->nr_children); + disk_offset = disk_chunk * dev->chunk_size; child = &dev->children[chunk_idx]; child->map(child, disk_offset, map); -- 2.39.5