From patchwork Wed Mar 20 14:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10861947 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 83DD813B5 for ; Wed, 20 Mar 2019 14:52:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6768D29DA3 for ; Wed, 20 Mar 2019 14:52:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 598F329DAD; Wed, 20 Mar 2019 14:52:55 +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 97AD229DA3 for ; Wed, 20 Mar 2019 14:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F0126B0276; Wed, 20 Mar 2019 10:52:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2C8166B0277; Wed, 20 Mar 2019 10:52:48 -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 141E16B0278; Wed, 20 Mar 2019 10:52:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) by kanga.kvack.org (Postfix) with ESMTP id D727E6B0276 for ; Wed, 20 Mar 2019 10:52:47 -0400 (EDT) Received: by mail-it1-f198.google.com with SMTP id q192so2449383itb.9 for ; Wed, 20 Mar 2019 07:52:47 -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=cu+3rmCpd9l5R/y3h5ye/p2bAO3sj0NL49uODSAFDdE=; b=pQ36lh5rsR7vYRANwlWWltHGxgakZma4DtkX0c3HQqlHrq1Xgc54EmAADaRPGmKr+f 8ip5ZWg7Y8IN/9X/vYhyuix1NtFZ8QBcFQkowY8hDKU0qjYwajcl+jnjB+313H5v4d7r rJhYSbYC8Pi+VtNIZ4i0X9RXKcbufhQHdqnkfTfI9mbCrOhcY3W03aGKZgPQfgZPyo3S CaOyFzwIwwLX1FLazEBxkeDrt7D6ddx+kHLDi3LLdV9xmrE/6MEoUrJ8Ow0KSTF2HaMQ qdazpBmYE66D6ezEqh2iXvcPPZ9vrfUEV7tvIYYGPIQWXQqgI4pEmApdtoKnr9H884rF UX9w== X-Gm-Message-State: APjAAAUTn7By5QjIkDLVXZMkCmeu5AJM+8nArdiMd5Fm9Ojvkf/fpM0b lHROIZXocAX7qXmojYT7EI5fPH6BFEyntZM1SdK9sV+MBnbDHZSuLOCqU+C3xxBhaWoIb1ecBSJ LkTWlEir3v+Alma4ikxfZYq1Wm7nQlsbmEWrBobZvvWF553973nDQPhL4fgkmmc4M2Q== X-Received: by 2002:a6b:7517:: with SMTP id l23mr5715309ioh.74.1553093567606; Wed, 20 Mar 2019 07:52:47 -0700 (PDT) X-Received: by 2002:a6b:7517:: with SMTP id l23mr5715259ioh.74.1553093566827; Wed, 20 Mar 2019 07:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553093566; cv=none; d=google.com; s=arc-20160816; b=hvealJLKJD9MkkPTPjdnoON03xtm+y5Shsz6G3rEwUlPbyJUE11l1vjq5YyvTRD/BO 6JDPmIplkS5lY7STZJ/W/wxEwYTjGaEnBU4W6BUqXxAvYmpndkwaB7BhItFmndD7/vVG yfcRN07KbRjJ7IA0hPUSB0PmS0vb7wXn7ZLh/7dn7weOZvBfPK5HBA9VOBERKb/ZcxZc Q3WXOeYHKohQZWdRbSeknM7AMAznH5gmdlJlQFVBCB7Yoz2gpPVgYxG1pCt34813HC0O 9fpx4s5WHuZ8epX6E7pQovNIP1Kgln1MpoKEoYS0WA9xsEtiUtCGRrMBFUTg/K/8jp6l rohA== 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=cu+3rmCpd9l5R/y3h5ye/p2bAO3sj0NL49uODSAFDdE=; b=ysvZw5W+o46LQiJbRXDhofATcsX+7WhgmyU2UnNzrjlirf8MKJrhXOeccF7EoxbFuH x1ifxgxjpTpIhztaD7kuk/aRr+NUC3RKTs/LE2gNr5xUXTZXJXkpSx2lb6sbQ+SNfcqH QuVAWrSaFMInOG9FnH8x5xnPvQ618ITRa/UzmN53Wa2w7y4p4AO+2txli4hJJCz7Kmlo zwyCFEPVJGUxn68qxh1OpDTxaHQf5aVKGnbVJ0TNvmrj1HjPAT2eniPX9+oFofNSs33x IfV/jlCdve/7JJLYCWyE8ah4vXlTeJyMypDg+gqdQVVyKuJJ0xp8SiUThtoioFKCNqoP JqrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qURJbhCG; spf=pass (google.com: domain of 3vlosxaokcjk3g6k7rdgoe9hh9e7.5hfebgnq-ffdo35d.hk9@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3vlOSXAoKCJk3G6K7RDGOE9HH9E7.5HFEBGNQ-FFDO35D.HK9@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 s5sor4472485itb.19.2019.03.20.07.52.46 for (Google Transport Security); Wed, 20 Mar 2019 07:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of 3vlosxaokcjk3g6k7rdgoe9hh9e7.5hfebgnq-ffdo35d.hk9@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=qURJbhCG; spf=pass (google.com: domain of 3vlosxaokcjk3g6k7rdgoe9hh9e7.5hfebgnq-ffdo35d.hk9@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3vlOSXAoKCJk3G6K7RDGOE9HH9E7.5HFEBGNQ-FFDO35D.HK9@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=cu+3rmCpd9l5R/y3h5ye/p2bAO3sj0NL49uODSAFDdE=; b=qURJbhCG7KHqBQdB9/tW98IIzZBOYUsNCATGgXe4awlobm2aNwlvzelxDOnoumvmrK b/mIN1JLFUKKEWmVODg3dQknY4u8cwFqoBa4ozFLzZZmudKVb83CGFLq+FRv9y/TTY/5 rSAaXeLT2zCRImT4RVHFaAYM6bwxS8DucSU4cUJk/3I0DGhDXWwcI81c67HCNpygji6O BQV4zKGeru6kOZ2vSpeEayFmHj/NHgdIhgoL99CR9cRbaTnADs3WAujfChTy8IoPizRb Mdk25Ol5EHmWTCbmZlyFv2SlYAe5UuS3bv3kmLeOg32bRFdSdDmDonpBZBZt7FJH+Ous ilbA== X-Google-Smtp-Source: APXvYqzqObcBEgYzlcxCxTM9fSSNzVasJ/zSQwN6PhFl+/lgxd7D8DoZLa9+GTthl0M6pkpwMktv8E+fN9uDrpLf X-Received: by 2002:a05:660c:68d:: with SMTP id n13mr4682397itk.24.1553093566394; Wed, 20 Mar 2019 07:52:46 -0700 (PDT) Date: Wed, 20 Mar 2019 15:51:33 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH v13 19/20] vfio/type1, arm64: untag user pointers in vaddr_get_pfn 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. vaddr_get_pfn() 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 --- drivers/vfio/vfio_iommu_type1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 73652e21efec..e556caa64f83 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -376,6 +376,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr, down_read(&mm->mmap_sem); + vaddr = untagged_addr(vaddr); + vma = find_vma_intersection(mm, vaddr, vaddr + 1); if (vma && vma->vm_flags & VM_PFNMAP) {