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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 60E12C0650F for ; Mon, 5 Aug 2019 13:26:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CBED20651 for ; Mon, 5 Aug 2019 13:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011616; bh=ekhNss4NNs7jA0CkrNtgPv+wTkyyfbEcWNDOz7Y7dYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x8pL3WF4ypoBq/XLwj5DB/yVQYthekI3qhRwgswTmJVBowYAo7BJAbrahbkilZxT6 2L4GRS2GBjUsjTjfMhG0srNCfOZ/1VGADd6qCe7Qthg+ppcte2najhF8nEb01nJAI1 zPxlRv8LNuZSMhZJ/6igSEdFQhtmQdLOD9m4kagA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730493AbfHENZh (ORCPT ); Mon, 5 Aug 2019 09:25:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:34120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731252AbfHENZg (ORCPT ); Mon, 5 Aug 2019 09:25:36 -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 8A5B520644; Mon, 5 Aug 2019 13:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011536; bh=ekhNss4NNs7jA0CkrNtgPv+wTkyyfbEcWNDOz7Y7dYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHNJtOfiwqy+tQXHB+vFw9L/u2LcB+w9KBWd0w34mqeebFANYNGN36gEZZO+u3f+Y w0RJhyc+PeGBl9F0zrP2dgj8SR9D2hcJlp/peOwKXX0nIF7I1th2SAjF4/FN1RUaW1 c/GnGCrEN90TdBTljqSav51DtnjRA8c/Mkr5oyFE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yishai Hadas , Artemy Kovalyov , Leon Romanovsky , Jason Gunthorpe Subject: [PATCH 5.2 125/131] IB/mlx5: Fix clean_mr() to work in the expected order Date: Mon, 5 Aug 2019 15:03:32 +0200 Message-Id: <20190805125000.342651544@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124951.453337465@linuxfoundation.org> References: <20190805124951.453337465@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: Yishai Hadas commit b9332dad987018745a0c0bb718d12dacfa760489 upstream. Any dma map underlying the MR should only be freed once the MR is fenced at the hardware. As of the above we first destroy the MKEY and just after that can safely call to dma_unmap_single(). Link: https://lore.kernel.org/r/20190723065733.4899-6-leon@kernel.org Cc: # 4.3 Fixes: 8a187ee52b04 ("IB/mlx5: Support the new memory registration API") Signed-off-by: Yishai Hadas Reviewed-by: Artemy Kovalyov Signed-off-by: Leon Romanovsky Reviewed-by: Jason Gunthorpe Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/mlx5/mr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1583,10 +1583,10 @@ static void clean_mr(struct mlx5_ib_dev mr->sig = NULL; } - mlx5_free_priv_descs(mr); - - if (!allocated_from_cache) + if (!allocated_from_cache) { destroy_mkey(dev, mr); + mlx5_free_priv_descs(mr); + } } static void dereg_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)