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=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 75A75C43381 for ; Sat, 23 Feb 2019 21:10:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BA242086A for ; Sat, 23 Feb 2019 21:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956211; bh=10mTEbUSS5p8YCheJNv5JViY/FtyzpvZvEC7vU0InC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MZ/Yl+sWva+JQef3Nm/NNcr7PiXePUDiFrR7NhX7VAjfvFllaOzp7evRjMIYIr0v8 OPxnr5z83JxyhBk7UEQLvCbF8zFeSjYncR5pveDgzqy7p1OeDwTMW5JBeZ4+9ZW5L2 XdZooC2IZl4iS0brQLFDdOMPpRS6iQSR7LEmzj60= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729683AbfBWVKJ (ORCPT ); Sat, 23 Feb 2019 16:10:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:45928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729653AbfBWVKB (ORCPT ); Sat, 23 Feb 2019 16:10:01 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4341720855; Sat, 23 Feb 2019 21:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956201; bh=10mTEbUSS5p8YCheJNv5JViY/FtyzpvZvEC7vU0InC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6nvSP0oDaE/ZfcZwuqT14wMAAl1l4hBVsIwQzJIHrhM/ST8rgkjMvcPacnrspO4h 4RGecqYW3Z4+gTmQN22ucLBR+QvWqulXwpCTEscEc9J5HcJ17jnbY4N0+plP2QhVxm RHWKruwK8DaI1xfkdvqMW+76JrWBJVaLBH0jUTos= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jerry Snitselaar , Joerg Roedel , Suravee Suthikulpanit , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.9 06/32] iommu/amd: Call free_iova_fast with pfn in map_sg Date: Sat, 23 Feb 2019 16:09:25 -0500 Message-Id: <20190223210951.202268-6-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190223210951.202268-1-sashal@kernel.org> References: <20190223210951.202268-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jerry Snitselaar [ Upstream commit 51d8838d66d3249508940d8f59b07701f2129723 ] In the error path of map_sg, free_iova_fast is being called with address instead of the pfn. This results in a bad value getting into the rcache, and can result in hitting a BUG_ON when iova_magazine_free_pfns is called. Cc: Joerg Roedel Cc: Suravee Suthikulpanit Signed-off-by: Jerry Snitselaar Fixes: 80187fd39dcb ("iommu/amd: Optimize map_sg and unmap_sg") Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index bba1b9f2f782b..4209aa1c09f9c 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2610,7 +2610,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, } out_free_iova: - free_iova_fast(&dma_dom->iovad, address, npages); + free_iova_fast(&dma_dom->iovad, address >> PAGE_SHIFT, npages); out_err: return 0; -- 2.19.1