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,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 94855C4CECE for ; Tue, 17 Mar 2020 11:05:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E5E120714 for ; Tue, 17 Mar 2020 11:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443102; bh=CXa6+Oy4cYgvS6HMmSIaGEclgxScLnsJDezz74767Co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1DCSiMo2XgbRxPqXMMAIrSjqtGunojUcaujmKVX4ZkcV5A7xb6ASnztI331qjQXIy Op84RR635JSB5SMNXggqCIFmuLEIN+C3Aj7LeVSNRdcxyLsqdyS38rP1kXBXD87+DC gyuYho1OdBXK5Z649+iPkiXpc1A9ViQ3qeRO2G1k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728355AbgCQLFB (ORCPT ); Tue, 17 Mar 2020 07:05:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728353AbgCQLFB (ORCPT ); Tue, 17 Mar 2020 07:05:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7366920735; Tue, 17 Mar 2020 11:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443099; bh=CXa6+Oy4cYgvS6HMmSIaGEclgxScLnsJDezz74767Co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jkSEPL6tpYbHPTJiPOLyn7wHVshylrtD1i0JPmlN8BBUPFciIpb+hCZtTzfqgK+A6 uj4QiBpMWogNiBbIH9cWpCj6rFA9Nq8lzhf9Cf8tGpU9dnjMGqsog1WVDp2vsTV2fU nAgKqo9mGGQWAK7C1oJ4HbaghXYpLrI0stQiSEMA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lu Baolu , Moritz Fischer , Yonghyun Hwang , Joerg Roedel Subject: [PATCH 5.4 096/123] iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page Date: Tue, 17 Mar 2020 11:55:23 +0100 Message-Id: <20200317103317.569328637@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103307.343627747@linuxfoundation.org> References: <20200317103307.343627747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yonghyun Hwang commit 77a1bce84bba01f3f143d77127b72e872b573795 upstream. intel_iommu_iova_to_phys() has a bug when it translates an IOVA for a huge page onto its corresponding physical address. This commit fixes the bug by accomodating the level of page entry for the IOVA and adds IOVA's lower address to the physical address. Cc: Acked-by: Lu Baolu Reviewed-by: Moritz Fischer Signed-off-by: Yonghyun Hwang Fixes: 3871794642579 ("VT-d: Changes to support KVM") Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/intel-iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5524,8 +5524,10 @@ static phys_addr_t intel_iommu_iova_to_p u64 phys = 0; pte = pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level); - if (pte) - phys = dma_pte_addr(pte); + if (pte && dma_pte_present(pte)) + phys = dma_pte_addr(pte) + + (iova & (BIT_MASK(level_to_offset_bits(level) + + VTD_PAGE_SHIFT) - 1)); return phys; }