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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 797FAC4167D for ; Tue, 14 Nov 2023 01:15:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231912AbjKNBPM (ORCPT ); Mon, 13 Nov 2023 20:15:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230437AbjKNBPE (ORCPT ); Mon, 13 Nov 2023 20:15:04 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5BA4D5A for ; Mon, 13 Nov 2023 17:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699924501; x=1731460501; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S/Mo+SEe2nMEOiLcS05N5VORyWVbnY8E6CLbpkYork4=; b=LZhNXfpMUADYlrle3BHoUpZIcFSC27t+fGkUD3kqCR4r4jm3D8KwEz5U Djn8gmsevry98Z+Ey20gko+7hOVIRzzd9ze+OL6yEgMHohHVAvnU2PbZE RaFZEg5K3lDWAxNOAocDLH1CPebWoPSuKn255Q/zyoTh0xt0HUH55Qwp9 7FP6Ed4X0WtCoqQleXhkwYq25J654qaiSUYW5k5CcOcVzp4CJaVTFDXBK q00QR63sQHC0gIqaXUV2bnfOk4lC/KksHlN4pLATutfPDqof9iZVj9q++ kBBs/MlAsByUzA9jko0fQ3Y9V3sQ7kI1WwoXjReVIAYBXusdFC70xcyY3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="454833584" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="454833584" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2023 17:15:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="740928125" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="740928125" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orsmga006.jf.intel.com with ESMTP; 13 Nov 2023 17:14:59 -0800 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/1] iommu/vt-d: Make context clearing consistent with context mapping Date: Tue, 14 Nov 2023 09:10:36 +0800 Message-Id: <20231114011036.70142-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114011036.70142-1-baolu.lu@linux.intel.com> References: <20231114011036.70142-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the iommu probe_device path, domain_context_mapping() allows setting up the context entry for a non-PCI device. However, in the iommu release_device path, domain_context_clear() only clears context entries for PCI devices. Make domain_context_clear() behave consistently with domain_context_mapping() by clearing context entries for both PCI and non-PCI devices. Fixes: 579305f75d34 ("iommu/vt-d: Update to use PCI DMA aliases") Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index c3ec09118ab1..061df1b68ff7 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3931,8 +3931,8 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op */ static void domain_context_clear(struct device_domain_info *info) { - if (!info->iommu || !info->dev || !dev_is_pci(info->dev)) - return; + if (!dev_is_pci(info->dev)) + domain_context_clear_one(info, info->bus, info->devfn); pci_for_each_dma_alias(to_pci_dev(info->dev), &domain_context_clear_one_cb, info); -- 2.34.1