Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp3149267rdb; Tue, 26 Dec 2023 19:09:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1POoNWCA+/4DpwXU8Uayl6sUZ6V/Xm1EDhL9SGXqolqG9qa3jED6l0pZCqtY7SL5+Cbdt X-Received: by 2002:a05:620a:2992:b0:781:37bf:8bbe with SMTP id r18-20020a05620a299200b0078137bf8bbemr9300013qkp.74.1703646589707; Tue, 26 Dec 2023 19:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703646589; cv=none; d=google.com; s=arc-20160816; b=cQYD1S0y9emy0QXfO4BwRrmpLTqlXJ/Aa3HXX465vLW1R2/cUTIMoKM1gjzg0dkc5O J9HsA+nfOA0vATEwNFbbyItJpF/ojDsFIbPAWGFZKIvEbCqAWRcJZQvjbGxjuWmXHCQ5 MbzaMu2C+Y+HEjZq+c5ZqG9wWoDsLnQxTPtwAzqsf/X9rSMpmE9K1zZgplS+PTkb7k9t R19cSyhwTM0X3+oJ5mnSYa+8SAXVb13kX+KEzdElM8Lr4N9QKttcp8fQb/vYrs3efk5F fWIQtO6HzGIlamyXkkoB16JicvFLtnktTYtoWwvjtPCswer+nQCrWYSdULGpieoMUPGQ bizA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fmWz0rJh64xdSwkGQodJMwxBiA+ThHiR13FBJgjt8qI=; fh=cQTxynQ7rGExgmbyXq8tNmd/VmE1Fzgt9QW51hABj2c=; b=QM1lR228V1kLbwuh3XwvHOzYBm2PvedyDd3Us8gSBwzP6qcN0rkdXE9+4kybh7doMu Kof6r3t6+y27cervnzrRObIivxTQ32x9FNiFzT8fPcmFv8dG4yUPiL5foXH5f2IhPyAa hBmvzp4O6aDmBy96FD0lsL71S5Z62Tt9YwJ0ACQ+5+Chnog6UPhA/8ES4An4kc5Y6jzm W/szTXQsCUALPnkavSFsWolLtzb+pDVKCk1TP3Hlhi6THGdP/AQ45GtOMwmdhE0h8nEK ugSEqSqPjygtCOB16NnUA4j0FJGurLN7/B+j3xldG+XL1rTXfeT5MMFv7gxoVb2qAUob JJtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gwtX9O+9; spf=pass (google.com: domain of linux-kernel+bounces-11795-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11795-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id w9-20020a05620a444900b007815aadc10fsi1748898qkp.758.2023.12.26.19.09.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 19:09:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11795-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gwtX9O+9; spf=pass (google.com: domain of linux-kernel+bounces-11795-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11795-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 18FC31C22228 for ; Wed, 27 Dec 2023 03:09:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CBF543D64; Wed, 27 Dec 2023 03:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gwtX9O+9" X-Original-To: linux-kernel@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6D7B23C9; Wed, 27 Dec 2023 03:09:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703646567; x=1735182567; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6EZM0STQUmP7aVHDp+0lhBXnIJUofqomOyzh9k1hZec=; b=gwtX9O+9e31vCkBTMXutUNJ4Lrxp0zNADNkENmSQ2lKMkNgCvg1PjWJY 3gIboFEMoIisICdB9M9kCuKnjjNcXv7lE53x0IkDUOMeImRZyqBmv8WUt igtD62CYk/PB70tGGYX++tLnVJFZ+mkFsEmErKTMKgVJj8aTOj5WYp3TE uYxfG3IBE5lNLEd8O1QZKmJpk2ATghR0aRXtDkbJC3GKaNNwEwRlj3Mdx aGbOFX3Fcn7IL4T/zdtYq1ab2pW3iss3+iQb7dK1NfohvpuMlSwk7+mXP nIgB71L/Gac7cCRvTHxqvUjHFBiZ0cMFwXLT49IKJeasiD67YyQinJ8Lc w==; X-IronPort-AV: E=McAfee;i="6600,9927,10935"; a="15077222" X-IronPort-AV: E=Sophos;i="6.04,307,1695711600"; d="scan'208";a="15077222" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2023 19:09:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,307,1695711600"; d="scan'208";a="19839122" Received: from ply01-vm-store.bj.intel.com ([10.238.153.201]) by orviesa002.jf.intel.com with ESMTP; 26 Dec 2023 19:09:24 -0800 From: Ethan Zhao To: bhelgaas@google.com, baolu.lu@linux.intel.com, dwmw2@infradead.org, will@kernel.org, robin.murphy@arm.com, lukas@wunner.de Cc: linux-pci@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH v8 1/5] iommu/vt-d: add flush_target_dev member to struct intel_iommu and pass device info to all ATS invalidation functions Date: Tue, 26 Dec 2023 22:09:14 -0500 Message-Id: <20231227030918.536413-2-haifeng.zhao@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231227030918.536413-1-haifeng.zhao@linux.intel.com> References: <20231227030918.536413-1-haifeng.zhao@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As iommu is a pointer member of device_domain_info, so can't play trick like container_of() to get the info and device instance for qi_submit_sync() low level function to check device status, add a flush_target_dev member to struct inte_iommu and pass dev info to all device-TLB invalidation (a.k.a ATS invalidation) functions. Signed-off-by: Ethan Zhao --- drivers/iommu/intel/iommu.c | 1 + drivers/iommu/intel/iommu.h | 2 ++ drivers/iommu/intel/pasid.c | 1 + drivers/iommu/intel/svm.c | 1 + 4 files changed, 5 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 897159dba47d..c3724f1d86dc 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1461,6 +1461,7 @@ static void __iommu_flush_dev_iotlb(struct device_domain_info *info, sid = info->bus << 8 | info->devfn; qdep = info->ats_qdep; + info->iommu->flush_target_dev = info->dev; qi_flush_dev_iotlb(info->iommu, sid, info->pfsid, qdep, addr, mask); quirk_extra_dev_tlb_flush(info, addr, mask, IOMMU_NO_PASID, qdep); diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index ce030c5b5772..e892c5c7560a 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -731,6 +731,8 @@ struct intel_iommu { void *perf_statistic; struct iommu_pmu *pmu; + + struct device *flush_target_dev; /* the target device TLB to be invalidated. */ }; /* PCI domain-device relationship */ diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c index 74e8e4c17e81..1c87fb1b1039 100644 --- a/drivers/iommu/intel/pasid.c +++ b/drivers/iommu/intel/pasid.c @@ -485,6 +485,7 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, qdep = info->ats_qdep; pfsid = info->pfsid; + info->iommu->flush_target_dev = info->dev; /* * When PASID 0 is used, it indicates RID2PASID(DMA request w/o PASID), * devTLB flush w/o PASID should be used. For non-zero PASID under diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index ac12f76c1212..d42a99801cdf 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -181,6 +181,7 @@ static void __flush_svm_range_dev(struct intel_svm *svm, qi_flush_piotlb(sdev->iommu, sdev->did, svm->pasid, address, pages, ih); if (info->ats_enabled) { + info->iommu->flush_target_dev = info->dev; qi_flush_dev_iotlb_pasid(sdev->iommu, sdev->sid, info->pfsid, svm->pasid, sdev->qdep, address, order_base_2(pages)); -- 2.31.1