From patchwork Mon May 6 16:31:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10931671 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 2C431924 for ; Mon, 6 May 2019 17:31:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EF60287A0 for ; Mon, 6 May 2019 17:31:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 027DF28843; Mon, 6 May 2019 17:31:08 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ABC1F287A0 for ; Mon, 6 May 2019 17:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=etcOYzUW7mWN/FTHv8sm/e+mtI94rwQ09av6jjBTxD0=; b=GMe7GyE6yn1May 69kN5FZ4Twl3LHmWhzSISUBzzWDtEyxpvAvdLjcqgqhxbMa3v8BYbgxdKO3fR7tWjKM4vZIhrYjRE rTmVu3HP9gff0HFG/sH31fktfohd9GeMx2ZvvcYykh6V0ihVPDq3rfGc8sWCygk7M6CZk1axazYTk Lv1YNXu0/y7d8oN09VEv4QcRNdxjVw862FzDKDEHvSRTnKZnh+nzxfSPZsg0Le9KWs1NTJNTSBAai HASA8kQZFd7YKyP7vNScOjez5etoOxh1frHY1uNKSuxqNjdo/A8g2Zfrsy0RW5+gFmjfqvSzcZ0AW kIk0oLIiiTcan6/lZz4g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hNhSF-0001ny-6X; Mon, 06 May 2019 17:31:07 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hNhS8-0001hB-Nz for linux-arm-kernel@bombadil.infradead.org; Mon, 06 May 2019 17:31:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=40kxRsKyA2BTdfRG/8ycbW9cjWXHDWQTNAmN4QMp2Tc=; b=tLvUD/dcrOEljghltQ/HEnrbi 4sF+Zv8UD4F7LjKTGXIaM1M2qSmnW2KXNH3ugjX+w5KWtV0ba7BXdu777zlV6m+PifOB1dfCK8fjn J6MiJ/LFVR7/+6SMlbepefoqnpMyAbsQuRuON8ygh4kB9eBic+YDzWGlTK1e2mXxpI3zhN2WaZSYw QaNHMxkPPX8r+m/dPBRAKJTb7WZEOj1XiuQTPDRYXJTYPMHFh+hCk2J7WUK6X4fqm5ItvyCoe/3j+ 0SM/spcLY6wpL90KEIT1nl3YFRBZ2H3a61zMez6tSFkLbgaArCzlM6mpgf5xXTA4xqVyszxZohvfI LigN6CExA==; Received: from mail-yw1-xc49.google.com ([2607:f8b0:4864:20::c49]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hNgX1-00066K-KB for linux-arm-kernel@lists.infradead.org; Mon, 06 May 2019 16:32:00 +0000 Received: by mail-yw1-xc49.google.com with SMTP id g128so26093713ywf.11 for ; Mon, 06 May 2019 09:31:58 -0700 (PDT) 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=40kxRsKyA2BTdfRG/8ycbW9cjWXHDWQTNAmN4QMp2Tc=; b=CbTDaybxwiO68FYaqEU987JbmTIWC/O/zmn5u4LAT2NjIg4zrx3ZZpTdEat2IZI7Zr UMjh3JrD6tSSJSHiA2J1SvwKqxkOFH9jD5t4pSSsFkT8XO0YzO5s2D93y2Fvv558QDT8 PC2RKfy08bb/yMf67M9jkhQd5jNijh0tU+IEPR6RStdwOkRtKLjro1177XiqKVVA8CKn 7nvBlr71nBnQ+GeGRfOaL9uXIjXsWpEFZPxFZ6iufv0v5siPwgW5vA64wYvStilJ/+ml T4dkOygYLm3ryZPhfxVQJsF9+4XGOGyyv3U3USZs8bMzVBnZRwvcMGmsqol00hqY8fWp TxbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=40kxRsKyA2BTdfRG/8ycbW9cjWXHDWQTNAmN4QMp2Tc=; b=kiY8a5nPUjZunD/EJTTpWp2uc6bxXK9qz0VarI4VlyamJUo4MaUeZiryZ77mP1Wt11 w3PImyUv95pKMUFf146fiodOcldxFIdlUlCZ19clOs/P/sEfc4Dtv8vNNZxefFEBUVYm tQuBH6HqCqrLKeKizqqycmWQVUFQlVbKgToyxjWxJ0w1cPvFhswBgB/iyc8HY/ub+rWc RAGO/tKY6S9GPTZvWjGfrQuVMjvqxwr9dfWWAhhW/scsx5M7k7tdqXglHPDCpbuDwWKU 66L785av/jVceowgpQeUOWbaw/dWs1I0EXhSsDXTT8WqEr3q2paiWwQgFAWZDFmVkQnt rMRQ== X-Gm-Message-State: APjAAAUvkz77tn6wEfA/QPlY/W1BfccTdy6m4hvlTMt4GKyF282C02Ao G2Mlw2E6vpRo81NwZy6evzC9iIj4yLANbW/7KU58tV1ONGR/xbDjJ2k743J0n3/72zJyzK2ekDL Kke6OmvxHybzRWneWAreehZgPC+u3uHBFqssDJxHjL1MGfxWNKD43mJBkKIUBiR5zsPRnD2izlb ygVKsZiMLPcv+6+Kc= X-Google-Smtp-Source: APXvYqy7sMh67zqP2gW9MSWmQP0vNhHkuufaU8XQ9cxxJZb1a1Qrmr7t2Ui4wSymuQ40ovJdWXqcMvlrm4Ub8jqq X-Received: by 2002:a25:c5c8:: with SMTP id v191mr18795942ybe.52.1557160316771; Mon, 06 May 2019 09:31:56 -0700 (PDT) Date: Mon, 6 May 2019 18:31:02 +0200 In-Reply-To: Message-Id: <69a675a5c48fa2572162338c51a1bfa2a3ced27d.1557160186.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog Subject: [PATCH v15 16/17] vfio/type1, arm64: untag user pointers in vaddr_get_pfn From: Andrey Konovalov To: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190506_123159_705905_5FAC3001 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Szabolcs Nagy , Catalin Marinas , Will Deacon , Kostya Serebryany , Felix Kuehling , Vincenzo Frascino , Jacob Bramley , Leon Romanovsky , Dave Martin , Evgeniy Stepanov , Kevin Brodsky , Kees Cook , Ruben Ayrapetyan , Andrey Konovalov , Lee Smith , Alex Williamson , Mauro Carvalho Chehab , Dmitry Vyukov , Greg Kroah-Hartman , Yishai Hadas , Jens Wiklander , Ramana Radhakrishnan , Alexander Deucher , Andrew Morton , Robin Murphy , Christian Koenig , Luc Van Oostenryck Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 d0f731c9920a..5daa966d799e 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -382,6 +382,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) {