From patchwork Thu Nov 3 05:53:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 14667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp342426wru; Wed, 2 Nov 2022 23:03:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5G/oCOH43FXXPJvoe2v/cwt1/sC8XKT62Ti73thIx+m97xzaPi/5yWFgQFT9KvDnBj0I1Z X-Received: by 2002:a17:907:88ca:b0:7ad:b635:2f1c with SMTP id rq10-20020a17090788ca00b007adb6352f1cmr25464038ejc.6.1667455381286; Wed, 02 Nov 2022 23:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667455381; cv=none; d=google.com; s=arc-20160816; b=DMPxgaPxhsFkerK9YEjCMdl0oDqFTBgZ0V8yrTZ1ujiW+IzntDHanyW6pZfnVXwTCd Rq2WCZwlykTq0r+44v1V7l0uSdT2qu7mc67pVBP+Nn5HS51hLf/hw9/L5+F+tGorEhhQ aBsSfoiRarLKIO0F4jBoXuPOtzRsa4592kJVk2aY/wMRpaRElbhKbUNd6Sz9HOzGzAXZ 3IwL7j6AaQ6ehhLVCNNQqOySOl/aEiwbM3H0wgKeMHzsstRyF43pfUV0cBK/wk5Xc9Av YEmY1fH7NvrmVVhyZKtXRPpGHAfJVTNd/vtNv+KIhVIvhoM8jzOChWG4pRjDOVLatS3U i3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dwOhU1EkDMmkzttssl6h6X5wQ07QnP9eKga2EkKRzUA=; b=kdtW0M6eewCc2/2XqIrCL+m3wLq4I5iM/B4KkWbEwGRdZ6+03l8BahwkjdA7APYu1/ yDk6E3Gve12NZHZkiaRDl9vOrBpdri5mL+XIbglYTxUWnMtVwYuoq21AB2IRO/TagT9K +kKzrbEQdN39CbhjFxugYzYm3E8E5vfJYst87m443BbtW9go4UgGeJftoIpr5wp6GNP9 mvW56+mZPSSks8Ijsp5PAPF6TTeZNt1LO3j671AxxI8sn7g39MJrz6Otm2UvT2SOByZZ qWvdAFs9lZwcNJMXShRDDV0HtLoIIgn2BTHDss7pEDgZqzwnTqJfEKeEjReSt715pYsf oQ3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=icdIz2Xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di21-20020a170906731500b00783ac0b4d32si80294ejc.941.2022.11.02.23.02.37; Wed, 02 Nov 2022 23:03:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=icdIz2Xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbiKCGAV (ORCPT + 99 others); Thu, 3 Nov 2022 02:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbiKCGAT (ORCPT ); Thu, 3 Nov 2022 02:00:19 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0474011145 for ; Wed, 2 Nov 2022 23:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667455218; x=1698991218; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JboFRltoczbXP4x/urgFAYiKbX2mR+qR0k/5T6o9tzA=; b=icdIz2XuAtpL2Rj1cR+rBLAJtS/desmlTYNnrFeAAoYD1ousUOUnp4Mm aD6YpZuiyUsYhznHMpTxLePu2Wt/j/IpmxH17kjj8m/09EAPFlhSfKlMT JC4iiIdGW9gYEH9Z1hLC2mNhi7cTZc1pxXpf8G6OM5KrTIT8W4eRWQkB0 aCzFxyNTahPODYBY61FIoFb4/FOg2orOQ/dOA6Yc9hTUqK/Uk28GLEnHu x/ZZlX4Bd/9+VcUqWJqizGUAaqdfYJtzCqjCebb4nwm8sPfWzP9WGeVwQ 7sdnCWxyl8OSno+PK/bcGS88D0zuhXS7rlpSgZxbQkqm/0dq9Qq5JA2bV Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10519"; a="311322481" X-IronPort-AV: E=Sophos;i="5.95,235,1661842800"; d="scan'208";a="311322481" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2022 23:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10519"; a="723819282" X-IronPort-AV: E=Sophos;i="5.95,235,1661842800"; d="scan'208";a="723819282" Received: from allen-box.sh.intel.com ([10.239.159.48]) by FMSMGA003.fm.intel.com with ESMTP; 02 Nov 2022 23:00:15 -0700 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Kevin Tian , Will Deacon , Robin Murphy , Liu Yi L , Jacob jun Pan , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/7] iommu/vt-d: Allocate pasid table in device probe path Date: Thu, 3 Nov 2022 13:53:23 +0800 Message-Id: <20221103055329.633052-2-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103055329.633052-1-baolu.lu@linux.intel.com> References: <20221103055329.633052-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748453694082540604?= X-GMAIL-MSGID: =?utf-8?q?1748453694082540604?= Whether or not a domain is attached to the device, the pasid table should always be valid as long as it has been probed. This moves the pasid table allocation from the domain attaching device path to device probe path and frees it in the device release path. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index a934a46bb9e6..e28faba1095f 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -2477,13 +2477,6 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev) /* PASID table is mandatory for a PCI device in scalable mode. */ if (sm_supported(iommu) && !dev_is_real_dma_subdevice(dev)) { - ret = intel_pasid_alloc_table(dev); - if (ret) { - dev_err(dev, "PASID table allocation failed\n"); - dmar_remove_one_dev_info(dev); - return ret; - } - /* Setup the PASID entry for requests without PASID: */ if (hw_pass_through && domain_type_is_si(domain)) ret = intel_pasid_setup_pass_through(iommu, domain, @@ -4108,7 +4101,6 @@ static void dmar_remove_one_dev_info(struct device *dev) iommu_disable_dev_iotlb(info); domain_context_clear(info); - intel_pasid_free_table(info->dev); } spin_lock_irqsave(&domain->lock, flags); @@ -4470,6 +4462,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) struct device_domain_info *info; struct intel_iommu *iommu; u8 bus, devfn; + int ret; iommu = device_to_iommu(dev, &bus, &devfn); if (!iommu || !iommu->iommu.ops) @@ -4513,6 +4506,16 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) dev_iommu_priv_set(dev, info); + if (sm_supported(iommu) && !dev_is_real_dma_subdevice(dev)) { + ret = intel_pasid_alloc_table(dev); + if (ret) { + dev_err(dev, "PASID table allocation failed\n"); + dev_iommu_priv_set(dev, NULL); + kfree(info); + return ERR_PTR(ret); + } + } + return &iommu->iommu; } @@ -4521,6 +4524,7 @@ static void intel_iommu_release_device(struct device *dev) struct device_domain_info *info = dev_iommu_priv_get(dev); dmar_remove_one_dev_info(dev); + intel_pasid_free_table(dev); dev_iommu_priv_set(dev, NULL); kfree(info); set_dma_ops(dev, NULL);