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=-7.0 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,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 2167DC433E0 for ; Tue, 23 Jun 2020 20:21:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E73372070E for ; Tue, 23 Jun 2020 20:21:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943661; bh=4hMKVjlVproshcN/Edkim4wPjbOfJOron7b84ERO0RE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=df1A6K9Sz152TlcXkv3u/u3se/ZeQF8cinN1amvWaejiUgbnxVkrzSJVNf2Dnt8On CicqE5KVVg/DDf0cLG8oodzFPvmWkSFvDMCW0/Hs8zlTlFcHl4rzPWdZV9Fy7FXpXn bksP8hY8sI3I9vdUuYe30Z2VL8fnDquTF6Uu1jsI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389990AbgFWUU7 (ORCPT ); Tue, 23 Jun 2020 16:20:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:38406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387771AbgFWUUz (ORCPT ); Tue, 23 Jun 2020 16:20:55 -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 903D9206C3; Tue, 23 Jun 2020 20:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943655; bh=4hMKVjlVproshcN/Edkim4wPjbOfJOron7b84ERO0RE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DoNZoxPBG3/kJr7N31F5jBz8Ec3GbTZHWkqbk+cfKJAF4gfA1MXvsUwKT/Ik5fIN/ pAAMMzdlkUW5L8Xn2G12mCTCxVGD2eqK2ZPc7BfEdwijs2dNONHaDqjKfePPmNUB+f xJj5+NtfweITaV2h+LIbgIndXm3onUkducrnH448= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jon Derrick , Lu Baolu , Joerg Roedel , Sushma Kalakota Subject: [PATCH 5.7 477/477] iommu/vt-d: Remove real DMA lookup in find_domain Date: Tue, 23 Jun 2020 21:57:54 +0200 Message-Id: <20200623195430.097419726@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jon Derrick commit bba9cc2cf82840bd3c9b3f4f7edac2dc8329c241 upstream. By removing the real DMA indirection in find_domain(), we can allow sub-devices of a real DMA device to have their own valid device_domain_info. The dmar lookup and context entry removal paths have been fixed to account for sub-devices. Fixes: 2b0140c69637 ("iommu/vt-d: Use pci_real_dma_dev() for mapping") Signed-off-by: Jon Derrick Acked-by: Lu Baolu Link: https://lore.kernel.org/r/20200527165617.297470-4-jonathan.derrick@intel.com Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207575 Signed-off-by: Joerg Roedel Signed-off-by: Sushma Kalakota Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/intel-iommu.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2518,9 +2518,6 @@ struct dmar_domain *find_domain(struct d if (unlikely(attach_deferred(dev) || iommu_dummy(dev))) return NULL; - if (dev_is_pci(dev)) - dev = &pci_real_dma_dev(to_pci_dev(dev))->dev; - /* No lock here, assumes no domain exit in normal case */ info = dev->archdata.iommu; if (likely(info))