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,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 4EB89C433FF for ; Mon, 5 Aug 2019 05:36:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 248342086D for ; Mon, 5 Aug 2019 05:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564983405; bh=/d+x5fKVvrGnNnKfD7dUOV0odXWOhiZe6jlvzMN8HPY=; h=Subject:To:Cc:From:Date:List-ID:From; b=EsdvbeyNfC+cFNrDp8s7IOg7rBWLGKnN+sTFQCYxu6MiwAITvx5UAhij0KkNhqN5g AtBdkLjjxlBgsmd7VpC76gJWNeWDnox2TyLvT/bfjNPsqpNrRFamP+kkbapzpOSwRB +WKOv+IpxuVmX4oqGwJPKlaKGi+5ZjS2vMVMXLR8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbfHEFgo (ORCPT ); Mon, 5 Aug 2019 01:36:44 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52551 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725951AbfHEFgo (ORCPT ); Mon, 5 Aug 2019 01:36:44 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 8034120963; Mon, 5 Aug 2019 01:36:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 05 Aug 2019 01:36:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=SIcfm3 S8USn4HZqPD2P+t0f777BtEP+IO58JWFkyXHw=; b=Ih0nCPCUtjk1ZekCCQ4bBX ciX+MH1sqRa+tllLzr4XScJDErCGqCuNkTVQrxwjVCBH+uk1ZLeIkAwdUoWBD6IF YED6R+GVWQTas/5MXJeQr1rxXlm+ADMb8bR+tqViczNRV1QtYulTasNDIonAWKJz JlIbhHFI5Ir5wz9WDsDfcrg3i9/PvcLBOoAP5LEKtVyddcx1gzdjFfNtTYAH8OlC SRqvjHiQTD064OVF9a3K9LTYJLHSzeSz6SSyBl1Vt6kJWqBcVvEtuGyKvVTUGezv gaV6H/UIMHfnrHKfjO9gIClR2mKn5whxx24S5OAx4dTaMrzQM2w70VCCg6uKNXFg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddtiedgkeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepkeefrdekiedrkeelrd dutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhen ucevlhhushhtvghrufhiiigvpeeg X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 03902380088; Mon, 5 Aug 2019 01:36:42 -0400 (EDT) Subject: FAILED: patch "[PATCH] IB/mlx5: Fix clean_mr() to work in the expected order" failed to apply to 4.14-stable tree To: yishaih@mellanox.com, artemyko@mellanox.com, jgg@mellanox.com, leonro@mellanox.com, stable@vger.kernel.org Cc: From: Date: Mon, 05 Aug 2019 07:36:41 +0200 Message-ID: <1564983401234220@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b9332dad987018745a0c0bb718d12dacfa760489 Mon Sep 17 00:00:00 2001 From: Yishai Hadas Date: Tue, 23 Jul 2019 09:57:28 +0300 Subject: [PATCH] IB/mlx5: Fix clean_mr() to work in the expected order 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 diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 7274a9b9df58..2c77456f359f 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1582,10 +1582,10 @@ static void clean_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) 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)