From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC42C2BA83 for ; Fri, 14 Feb 2020 16:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BC9624698 for ; Fri, 14 Feb 2020 16:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696247; bh=amYH3ceF7CJnpOkXmLfBOhz0UF9g7Vo4PvHExPucgLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QYI+ErIYdBGpBQP5qlEWXOeAnM7oOsL9kGM0sjZJsu4Lf3QGtQqVWbSvxAUs4CzQb RMRJ46HM20Bt6IUJ6avwOlQDvFlgtajb28kuCOwJdDLb5K4TyPg/HVQM4sV6jrLfAt e76nMGXXkLui98GAodp7fT6B5PRcEPx6evL9JXeQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388822AbgBNQEG (ORCPT ); Fri, 14 Feb 2020 11:04:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:51876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389841AbgBNQEF (ORCPT ); Fri, 14 Feb 2020 11:04:05 -0500 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 C614F24676; Fri, 14 Feb 2020 16:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696244; bh=amYH3ceF7CJnpOkXmLfBOhz0UF9g7Vo4PvHExPucgLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fo60p2OdVQkdaJU5HcwGRGyvBtNuwhaM8Vl6I4STAUIzxGjCtTx5j4Ts2s/RFwWB4 9JT/LscJyblTh36Di89a6egCzIa+vGqgrt1k8rZGbYF7okXuRyLCbURmjCxkXYfka6 0J+YJz9DkTJq0yS9wYjCkTCN7N/PFVykMAgaRLw8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Artemy Kovalyov , Leon Romanovsky , Gal Pressman , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 102/459] RDMA/umem: Fix ib_umem_find_best_pgsz() Date: Fri, 14 Feb 2020 10:55:52 -0500 Message-Id: <20200214160149.11681-102-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Artemy Kovalyov [ Upstream commit 36798d5ae1af62e830c5e045b2e41ce038690c61 ] Except for the last entry, the ending iova alignment sets the maximum possible page size as the low bits of the iova must be zero when starting the next chunk. Fixes: 4a35339958f1 ("RDMA/umem: Add API to find best driver supported page size in an MR") Link: https://lore.kernel.org/r/20200128135612.174820-1-leon@kernel.org Signed-off-by: Artemy Kovalyov Signed-off-by: Leon Romanovsky Tested-by: Gal Pressman Reviewed-by: Jason Gunthorpe Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/umem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 24244a2f68cc5..0d42ba8c0b696 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -166,10 +166,13 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem, * for any address. */ mask |= (sg_dma_address(sg) + pgoff) ^ va; - if (i && i != (umem->nmap - 1)) - /* restrict by length as well for interior SGEs */ - mask |= sg_dma_len(sg); va += sg_dma_len(sg) - pgoff; + /* Except for the last entry, the ending iova alignment sets + * the maximum possible page size as the low bits of the iova + * must be zero when starting the next chunk. + */ + if (i != (umem->nmap - 1)) + mask |= va; pgoff = 0; } best_pg_bit = rdma_find_pg_bit(mask, pgsz_bitmap); -- 2.20.1