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 B3EE3C10F13 for ; Tue, 16 Apr 2019 11:07:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73F472073F for ; Tue, 16 Apr 2019 11:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555412869; bh=rHrnHy1FQUmSlC9o+JBbyBB6Jlmc2r+9cL7RBvB0mYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YVZ8qh227DSnIfiA9GBp3s28TAeICCndEAdZYHsWGRH52UhWfagV5r51Oto/wZx2U MnXsbfrbKoPMExw8kQWTjOTbCNQor2qYUxVKg3zcVU1OVy2oKcjwZ8vU1Ocu1xNxJw 61ERcaM6Vub6UxdB4jVK0kCIVHNqqZILDYZH9bK0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728985AbfDPLHs (ORCPT ); Tue, 16 Apr 2019 07:07:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:42032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726672AbfDPLHr (ORCPT ); Tue, 16 Apr 2019 07:07:47 -0400 Received: from localhost (unknown [193.47.165.251]) (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 1091C2073F; Tue, 16 Apr 2019 11:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555412867; bh=rHrnHy1FQUmSlC9o+JBbyBB6Jlmc2r+9cL7RBvB0mYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ybt6uwTulMBJ7CB+qTUHKIwDis+4/wrVy6W1nPkzM1L4Awdjyf0xH6oEuKc3/qXsr 7EoTZ1d9g4wVN3AJL5wpW2kzR7ASTaqNWIemPfkPPvKR2ouQkJUrVrJnruqNbbV1cT DcGnwbh4iHhUoWfehyxh0lL1iaME7SYSWh9yxbNI= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Andrea Arcangeli , Feras Daoud , Haggai Eran , Jason Gunthorpe , Saeed Mahameed , linux-netdev Subject: [PATCH rdma-next 2/6] RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages Date: Tue, 16 Apr 2019 14:07:26 +0300 Message-Id: <20190416110730.32230-3-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416110730.32230-1-leon@kernel.org> References: <20190416110730.32230-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: Jason Gunthorpe Since mlx5 supports device disassociate it must use this API for all BAR page mmaps, otherwise the pages can remain mapped after the device is unplugged causing a system crash. Cc: stable@vger.kernel.org Fixes: 5f9794dc94f5 ("RDMA/ucontext: Add a core API for mmaping driver IO memory") Signed-off-by: Jason Gunthorpe Reviewed-by: Haggai Eran Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 73b7f9636f82..77b018c0923f 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2244,14 +2244,12 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm if (PAGE_SIZE > 4096) return -EOPNOTSUPP; - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); pfn = (dev->mdev->iseg_base + offsetof(struct mlx5_init_seg, internal_timer_h)) >> PAGE_SHIFT; - if (io_remap_pfn_range(vma, vma->vm_start, pfn, - PAGE_SIZE, vma->vm_page_prot)) - return -EAGAIN; - break; + return rdma_user_mmap_io(&context->ibucontext, vma, pfn, + PAGE_SIZE, + pgprot_noncached(vma->vm_page_prot)); case MLX5_IB_MMAP_CLOCK_INFO: return mlx5_ib_mmap_clock_info_page(dev, vma, context); -- 2.20.1