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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 BFF66C43381 for ; Tue, 19 Mar 2019 09:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 949A920989 for ; Tue, 19 Mar 2019 09:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552987492; bh=qdUQ73ap658qpaQZFz9SBeXwGR5iUCbkwlzGogzFuOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QDyIEUdBsd1yY5t99iX7naA+oGL2TUqSNHe1gyTz7nutWTOQEcVyelaHjdrctOZrj ZHmDRyyYvKkLW+QC/+bTUcGN26N3fzwmUPUaOvN5LZBEzuhW667at36Ej8Q1Q70Hk+ OWS4hIaMHZK1wsfZwLTGYpRwqo8HxZWpLV9/aIAQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727533AbfCSJYv (ORCPT ); Tue, 19 Mar 2019 05:24:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:51852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727505AbfCSJYu (ORCPT ); Tue, 19 Mar 2019 05:24:50 -0400 Received: from localhost (unknown [77.138.135.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89FCB20989; Tue, 19 Mar 2019 09:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552987489; bh=qdUQ73ap658qpaQZFz9SBeXwGR5iUCbkwlzGogzFuOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uy9AWcMZ91IqWy/sM0xiRWR3cPKia+p8yzAWqjwql/R10SgyAm1Mp3ogSvVUv+cEi mPLWuFOHw8bZt663j+qyv6jJiNyjF8WwGPExNuK01Vu6XUwm+jzgP/JqUuFFja8/ab CJD0UG2LUd6IShtjeMowkoB0qWbQWCgomvsAM3Gc= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Artemy Kovalyov , Guy Levi , Haggai Eran , Jerome Glisse , Moni Shoua , Saeed Mahameed , linux-netdev Subject: [PATCH rdma-next 1/4] IB/mlx5: Reset access mask when looping inside page fault handler Date: Tue, 19 Mar 2019 11:24:36 +0200 Message-Id: <20190319092439.10701-2-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190319092439.10701-1-leon@kernel.org> References: <20190319092439.10701-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Moni Shoua If page-fault handler spans multiple MRs then the access mask needs to be reset before each MR handling or otherwise write access will be granted to mapped pages instead of read-only. Cc: # 3.19 Fixes: 7bdf65d411c1 ("IB/mlx5: Handle page faults") Reported-by: Jerome Glisse Signed-off-by: Moni Shoua Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/odp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c index ec8381d1e0f2..95dccac1f844 100644 --- a/drivers/infiniband/hw/mlx5/odp.c +++ b/drivers/infiniband/hw/mlx5/odp.c @@ -585,7 +585,7 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr, struct ib_umem_odp *odp_mr = to_ib_umem_odp(mr->umem); bool downgrade = flags & MLX5_PF_FLAGS_DOWNGRADE; bool prefetch = flags & MLX5_PF_FLAGS_PREFETCH; - u64 access_mask = ODP_READ_ALLOWED_BIT; + u64 access_mask; u64 start_idx, page_mask; struct ib_umem_odp *odp; size_t size; @@ -607,6 +607,7 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr, page_shift = mr->umem->page_shift; page_mask = ~(BIT(page_shift) - 1); start_idx = (io_virt - (mr->mmkey.iova & page_mask)) >> page_shift; + access_mask = ODP_READ_ALLOWED_BIT; if (prefetch && !downgrade && !mr->umem->writable) { /* prefetch with write-access must -- 2.20.1