From patchwork Wed Mar 20 14:51:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10861935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A79813B5 for ; Wed, 20 Mar 2019 14:52:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A39028BF0 for ; Wed, 20 Mar 2019 14:52:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37E0C29D9D; Wed, 20 Mar 2019 14:52:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B21E29DAC for ; Wed, 20 Mar 2019 14:52:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49E786B0271; Wed, 20 Mar 2019 10:52:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 42FFE6B0273; Wed, 20 Mar 2019 10:52:38 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2534B6B0272; Wed, 20 Mar 2019 10:52:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yw1-f70.google.com (mail-yw1-f70.google.com [209.85.161.70]) by kanga.kvack.org (Postfix) with ESMTP id EF6786B0270 for ; Wed, 20 Mar 2019 10:52:37 -0400 (EDT) Received: by mail-yw1-f70.google.com with SMTP id x185so3430892ywd.4 for ; Wed, 20 Mar 2019 07:52:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=JYfYaqFkvasJC562WHpti4tYqqXwAjMl9KNYEduKdaE=; b=InXhwHNB1PwZoFY11lg4e0J1CKF7W4wh3jnhuyjRe5nR7VQsm1viUUzFhDHTE/Zq4Z TNLgiojUZq7pehhTMJFli03Es+9u/NdZJNqEz63k7Jv3OQ2tmc9nCmmbd3hoqmRQnSx/ MW1aMwTkbyCp6f3++tIe+fHm7SZIlDzNMVLdmCAp2LUxFZ6ah+lvvPxQzQEm8M9r+H2b PtSxYJ8gNmTzOplhbQLdbslXf4+rZTzYyM/WWy5UxZvbXzDxVzkgDZIuv7jj79g8265H 9Ynt+ZywW1Q67D/ephPFUAINZIQ8TkGp47UKjgB5reZBn/aNzMzIJwj0ezCibFgR7MAa KUTQ== X-Gm-Message-State: APjAAAX65/1Fx4FfaZAMI5JZyvnjqIqmVQk6eB3bGRif3yPYbINDzapI YaJVYrxuW76NkfS3p9ZR39kRVRF0yBpkUoPYxebNba0yRxiajR/NTqEDSHlI2+Ghn94BlhSP1LX 5DvW0gWlLI4x18F0zdJybPkAKa22moVsuZc1IAwD+sExzOS2BxRPdLfr7ejrgxSSR+w== X-Received: by 2002:a25:ea02:: with SMTP id p2mr7284814ybd.41.1553093557730; Wed, 20 Mar 2019 07:52:37 -0700 (PDT) X-Received: by 2002:a25:ea02:: with SMTP id p2mr7284754ybd.41.1553093556781; Wed, 20 Mar 2019 07:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553093556; cv=none; d=google.com; s=arc-20160816; b=HH4K+13dLZ2GQas3t3wwKwsBXjP787V82yH6WUW01sC5zYd9M6X8znXKFlwIN9YHfr ZT+B/+pin3UxLMjraTBY1bOln4QbEKAzg3IhsdgwGKUC8UcoFz4fl1sZCSn8C7kZn2Su uurKx2QJCbq8RTYnt7HeJrmtkpZ30mzJ3Sd9rFUsNlOu+fBmThaSgenFukqjLanpnexl RdXQmN7/MtLdlS6z2x4Uzm2H+wPgpBQcdI2rdqyG3xsBivksQuxgrKSPxk+ndgWbQuTs DBW1ManBTEoHHQ2YlGTf7p37uKqtNUzGu76XjUz7oFOyRgqeNuXQJYSe3fanFl9QobIf 7YVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=JYfYaqFkvasJC562WHpti4tYqqXwAjMl9KNYEduKdaE=; b=OaOJA6H9v28gCvTpXMmIaDtYMzyxAdhDG8zjVU3MdFjsVBVPROTzIsS8B3Z3NMr7c+ cogD2QMhHuqx8hSxTJffcQezBjtmwl76N5TmjG9jrJhgIBsX5lCdamknplfqoMrYJAYl uijPlk+6lBC3iurnizX2tP7Hb2ZWZPn5xv4rvj2cnGUYDF0CosoTexw7IXqiOD2bFUjd zpWKJLQ8ppI4b9xSs6A9ejbZF3Loz0BpX+UuCrmf2RyyfJxYAH1RQmBf+izpOwZ+Ygtt YiSMcpz4Mv8RcAjVbKjINpcIAJoX7MARdQ1SjBEbgOuNbhC0vcYSCjMkmmhV+Km9P7ZR HNzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sexMIu8a; spf=pass (google.com: domain of 3tfosxaokci8t6waxh36e4z77z4x.v75416dg-553etv3.7az@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3tFOSXAoKCI8t6wAxH36E4z77z4x.v75416DG-553Etv3.7Az@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id i23sor1028257yba.65.2019.03.20.07.52.36 for (Google Transport Security); Wed, 20 Mar 2019 07:52:36 -0700 (PDT) Received-SPF: pass (google.com: domain of 3tfosxaokci8t6waxh36e4z77z4x.v75416dg-553etv3.7az@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sexMIu8a; spf=pass (google.com: domain of 3tfosxaokci8t6waxh36e4z77z4x.v75416dg-553etv3.7az@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3tFOSXAoKCI8t6wAxH36E4z77z4x.v75416DG-553Etv3.7Az@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=JYfYaqFkvasJC562WHpti4tYqqXwAjMl9KNYEduKdaE=; b=sexMIu8avs3PQT75uBvPTQ7a6BwfzDpDtEim0BHpT2lZIdVCSQQNJCOv1y+KBVjuwz NX0TZsiakkaHgGM438rpKshO2lygtlHGBjF9I7HIZlISq6IjvdJBMN68/khgYyArgEAc 8tbatLWytzPpO7bRWCVSIFqMId8s/P66Z59No3RuANZfIft4UrNO78pUbAaCEl8oBE2Q qNCkyYahb1b1Pv7Y/SBLJD0dj0RxnH2fWpp5qHUGdBZK+/bAoxPvBHDVj/4wKQ82tyl8 DVhiys3Wu1xJZ38zAN40H2K69ZFtxYiDzY02fAJ60bAOEsljjjp1FIjebecLuWwY+E7M Zatw== X-Google-Smtp-Source: APXvYqz/OFC1PuPZodVHMFKw9kUzVJMyrdAYISJ9xGPWIvonfiJf4upSDw3KUidiP9gNNGgKCiqyzVAdZse9Ion/ X-Received: by 2002:a25:bb8c:: with SMTP id y12mr2095179ybg.89.1553093556448; Wed, 20 Mar 2019 07:52:36 -0700 (PDT) Date: Wed, 20 Mar 2019 15:51:30 +0100 In-Reply-To: Message-Id: <1e2824fd77e8eeb351c6c6246f384d0d89fd2d58.1553093421.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH v13 16/20] IB/mlx4, arm64: untag user pointers in mlx4_get_umem_mr From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Alex Deucher , " =?utf-8?q?Christian_K=C3=B6ni?= =?utf-8?q?g?= " , "David (ChunMing) Zhou" , Yishai Hadas , Mauro Carvalho Chehab , Jens Wiklander , Alex Williamson , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Kevin Brodsky , Szabolcs Nagy , Andrey Konovalov X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This patch is a part of a series that extends arm64 kernel ABI to allow to pass tagged user pointers (with the top byte set to something else other than 0x00) as syscall arguments. mlx4_get_umem_mr() uses provided user pointers for vma lookups, which can only by done with untagged pointers. Untag user pointers in this function. Signed-off-by: Andrey Konovalov Reviewed-by: Leon Romanovsky --- drivers/infiniband/hw/mlx4/mr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index 395379a480cb..9a35ed2c6a6f 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c @@ -378,6 +378,7 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_udata *udata, u64 start, * again */ if (!ib_access_writable(access_flags)) { + unsigned long untagged_start = untagged_addr(start); struct vm_area_struct *vma; down_read(¤t->mm->mmap_sem); @@ -386,9 +387,9 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_udata *udata, u64 start, * cover the memory, but for now it requires a single vma to * entirely cover the MR to support RO mappings. */ - vma = find_vma(current->mm, start); - if (vma && vma->vm_end >= start + length && - vma->vm_start <= start) { + vma = find_vma(current->mm, untagged_start); + if (vma && vma->vm_end >= untagged_start + length && + vma->vm_start <= untagged_start) { if (vma->vm_flags & VM_WRITE) access_flags |= IB_ACCESS_LOCAL_WRITE; } else {