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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32967C433EF for ; Mon, 15 Nov 2021 23:59:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1882F60EE2 for ; Mon, 15 Nov 2021 23:59:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348721AbhKPACZ (ORCPT ); Mon, 15 Nov 2021 19:02:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:47888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344511AbhKOTYy (ORCPT ); Mon, 15 Nov 2021 14:24:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D467663284; Mon, 15 Nov 2021 18:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002742; bh=/n8wCvhgkkLbX4iynyRqxx6C7QkFXUin7z+21XOAiXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1eZ86mJUvkLWIwC3+nRFPe2xpJamJAWay7ub2eL4ebe2XG5eimtCikbhu9xiyI9pw 8vfXPYcXKmB2TdLDW6ZFnnULLxFjF2Qz1ELG/ejvQ55Grf1LOSWQrn6LUYyFUd6qwQ DBio/1nD/RdOzdqvDKVq4ln+oXjsWMF8S1J6sIG8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marshall Midden , Logan Gunthorpe , Joerg Roedel , Will Deacon , Joerg Roedel , Sasha Levin Subject: [PATCH 5.15 681/917] iommu/dma: Fix incorrect error return on iommu deferred attach Date: Mon, 15 Nov 2021 18:02:56 +0100 Message-Id: <20211115165451.988641206@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Logan Gunthorpe [ Upstream commit ac315f96b3bd6f6b8f18f387816c7c2cc6b32e02 ] scsi_dma_map() was reporting a failure during boot on an AMD machine with the IOMMU enabled. scsi_dma_map failed: request for 36 bytes! The issue was tracked down to a mistake in logic: should not return an error if iommu_deferred_attach() returns zero. Reported-by: Marshall Midden Fixes: dabb16f67215 ("iommu/dma: return error code from iommu_dma_map_sg()") Link: https://lore.kernel.org/all/CAD2CkAWjS8=kKwEEN4cgVNjyFORUibzEiCUA-X+SMtbo0JoMmA@mail.gmail.com Signed-off-by: Logan Gunthorpe Cc: Joerg Roedel Cc: Will Deacon Link: https://lore.kernel.org/r/20211027174757.119755-1-logang@deltatee.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/dma-iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 19bebacbf1780..2d60216440009 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1007,7 +1007,8 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, if (static_branch_unlikely(&iommu_deferred_attach_enabled)) { ret = iommu_deferred_attach(dev, domain); - goto out; + if (ret) + goto out; } if (dev_is_untrusted(dev)) -- 2.33.0