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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 79C9CC43219 for ; Tue, 30 Apr 2019 11:56:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EFDC2075E for ; Tue, 30 Apr 2019 11:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625392; bh=QxCnPLDxI3vzo4dtboAXHm8v6VZkQ2zXc8lzd9GYQDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dMTgtBeKZo/yRk22xwfrIJRTJvRgIlCw4M4sjBwlTWFTwfA7QuL87zU2zcB0UM854 /jbysDevNfertxJMDZfi8WufCNi2u3yvE4DDEYLAIImwUg5ENePESHiGTXbX+58u7L aEQYhaZcs60yhALkymR7ztEMoT74cngmmHytk63c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730351AbfD3Lsq (ORCPT ); Tue, 30 Apr 2019 07:48:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:34968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730882AbfD3Lso (ORCPT ); Tue, 30 Apr 2019 07:48:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 2FB282054F; Tue, 30 Apr 2019 11:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624923; bh=QxCnPLDxI3vzo4dtboAXHm8v6VZkQ2zXc8lzd9GYQDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L2OqMQr7bZIAOU8/vWnyNnSWt3N3lrEijKrJmVqvRHCiiXODJrbrFWJ6OPGkd+J7Y QpjyYLj2DfDKS/ewNa85P8BiKg9duOPgFqF3QpgIGvCR5OHpVjiaOuOpTbqywot9cJ wNadJZQlL743ApUrj9tFcm1lv5L8riDdpN9/n7/8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Gunthorpe , Haggai Eran , Leon Romanovsky Subject: [PATCH 5.0 24/89] RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages Date: Tue, 30 Apr 2019 13:38:15 +0200 Message-Id: <20190430113611.159345140@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113609.741196396@linuxfoundation.org> References: <20190430113609.741196396@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gunthorpe commit d5e560d3f72382ac4e3bfe4e0f0420e6a220b039 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/mlx5/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2154,14 +2154,12 @@ static int mlx5_ib_mmap(struct ib_uconte 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);