From patchwork Thu Mar 19 12:59:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229145 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 9373EC4332B for ; Thu, 19 Mar 2020 13:06:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6285220722 for ; Thu, 19 Mar 2020 13:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623166; bh=bdEXXqS0SfsFFqlsqir0mBfb/VHPc3nYHPdaexKlG58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oFXR/81+7ucLYW7ia7VGVhb5LRxu8WsrL4lZRxQIIE5NErW4mWUVRuL0dYVYXch3T 9tU8tzAh1GhmPkHMel//JwATwHFCp5sQb7fcLKTaOu5zdeD9PBeE27l+oErJSoePlM q11vNoPTSxEhEZ0ZgDLGCm0F8E60FotxpYTEOhAQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727564AbgCSNGF (ORCPT ); Thu, 19 Mar 2020 09:06:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:49046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727548AbgCSNGD (ORCPT ); Thu, 19 Mar 2020 09:06:03 -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 0761220722; Thu, 19 Mar 2020 13:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623163; bh=bdEXXqS0SfsFFqlsqir0mBfb/VHPc3nYHPdaexKlG58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n9MHy+iG65fJ49on7E3gWAHJ+1haVYLWtRBRS/HJ1q8FpgHMRszlMtqfZLcNFUp/4 ONzJ16/j1GoqB5coEndZT7vgklm+TFNj9XJ8EesKWBVxskelmfeTDZjShccBX3mglt NmhbS5OJoxhsaLdApUAD9DvSGqnqlZ1nb6msaoqY= 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 4.4 29/93] iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page Date: Thu, 19 Mar 2020 13:59:33 +0100 Message-Id: <20200319123934.335068780@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 @@ -5017,8 +5017,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; }