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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 30377C10F12 for ; Mon, 15 Apr 2019 15:58:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F06DE20818 for ; Mon, 15 Apr 2019 15:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555343939; bh=XqCOalTtFXGZUWL5HCzbocphFEQkjSJllPK1/pCuYMk=; h=Subject:To:Cc:From:Date:List-ID:From; b=LF5pO41d0TFsiKBAcYZoY5qngIhHR8bHK8hBqf0BYN+BFP4rdR4WVCtOF+A4BcmuY YST46fD51VPgaGzQHUQelNMCFdEK3Na2OGm6lvUprwBxNs12sEdHI7AM6u00N/4uuD Gxl7OjFZ8L6VLHu/IiWaesd0sPXuEJQZ53lia37I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726034AbfDOP65 (ORCPT ); Mon, 15 Apr 2019 11:58:57 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34769 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726094AbfDOP65 (ORCPT ); Mon, 15 Apr 2019 11:58:57 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 120DB25B6C; Mon, 15 Apr 2019 11:58:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 15 Apr 2019 11:58:56 -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=fm2; bh=8HWgyu CaVEhtsDU0kmxicZrhPCnSFhl4b5CscY1NjmQ=; b=poVmg+uGn+9Tjn77IqqzLb FXGJhNhclFEYyhgiYqMuHbcpXXbV42xOYg0XLggZkdirzsGRAk2L/TCHPbd2xNVD 495K7V65GTv4+rEye2TZidycNGhn3alvhA7xDd/Bj+JRQnA3eqbDb2w3PC7NjHxQ EatPMqjPQud4g2wtN51bz761aGStf8WJQki0O0LDvoCBOFq0RY/WPbHbHRLX4lJY Ofj+YUpi7KJBOOgPgjsmYG/pgWMR7AOc8lk5HMySDHPjIT6noEBc7eGuS/37+qXu WEtn/WHpK2rKASzjv+Ptnz17zeG3WlE94YWRNl/oQTW0/SfvniFxm23i7OHd6H6A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrvdelgdelhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpeeg 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 80B4AE4AD3; Mon, 15 Apr 2019 11:58:55 -0400 (EDT) Subject: FAILED: patch "[PATCH] IB/mlx5: Reset access mask when looping inside page fault" failed to apply to 4.9-stable tree To: monis@mellanox.com, jgg@mellanox.com, jglisse@redhat.com, leonro@mellanox.com, stable@vger.kernel.org Cc: From: Date: Mon, 15 Apr 2019 17:58:43 +0200 Message-ID: <155534392344158@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.9-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 1abe186ed8a6593069bc122da55fc684383fdc1c Mon Sep 17 00:00:00 2001 From: Moni Shoua Date: Tue, 19 Mar 2019 11:24:36 +0200 Subject: [PATCH] IB/mlx5: Reset access mask when looping inside page fault handler 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 Signed-off-by: Jason Gunthorpe diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c index c20bfc41ecf1..0aa10ebda5d9 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