From patchwork Tue Oct 17 00:47:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818109vqb; Mon, 16 Oct 2023 17:48:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfG4NtkbEV//URexnTOL/aZr5YKy9Pq0RmtcfVgxzkul1gu7/Jb6h2oA4xGILz+dU6/d7L X-Received: by 2002:a05:6a00:1c92:b0:690:d0d4:6fb0 with SMTP id y18-20020a056a001c9200b00690d0d46fb0mr785553pfw.3.1697503723599; Mon, 16 Oct 2023 17:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503723; cv=none; d=google.com; s=arc-20160816; b=rUwJpXvWrJJNHlxv6xTMSAv2WQ57sYLi8dnZTGZIMUY/+j77xvdIFoqC/Yo3UC4NQQ UlaxUjm+RPV1ihMrBkyvs0dXExg04VkkBWIxPPn9SSLXozm8KvZieEdyFTswkUp58T2o iHPU7Yp1+giMPI6rR4NpdDbXvN+kk7IkhEvHsjIVdKr37Rh52FHOexWO2xrVlFb//4DY sgYNGRePK2AKUvjj6omAaBKOUStvY4bmQxuttjzy5mXO9xhBhZOyQR6c8W7NECBEc9j9 PAxrPYMYRkecJQ9MeIQzUIV594Mtp69xowYo7UAaV9vvOyttJ2fxndTrszcEKN+KxC7r 1Dhg== 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=XmOXFJayGzWJ026VhE5olz7mMJo0A9jH97oIEDDGY/I=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=X8lKXR7bnBcU0T5BozTdFakjojTBdJMfsPw1Cry8o112uyqiX6iWJm51KR0179f/0I 4qQXNR5+UDCAHe+Q+m5w7TEfllmp6Zm0zN81t37Q63JgFpGHDxlBpLQBEDM/X3SzRWaI vXygbF9ATyOllEjEMsQRD9TJbGKXgX1g1M+4pBrBCG751m0hF2C5IA+P64D77MCrg4BJ q7XxK2sqRtw+VWr2PWLMUUdtlohdJtW25CJPr0AqsDGYpCLs0cDsOfPkRqLN+5JjFRsR DINH25YigFeog2fLLH3TeOVzAJvK/itxZLpaBbDkPw2XG2bl3jMAuHshW7Dw4OQ7GKrC 5NKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=COi217Q3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a193-20020a6390ca000000b005ace065e529si560026pge.333.2023.10.16.17.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:48:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=COi217Q3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E985D805F09C; Mon, 16 Oct 2023 17:48:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234319AbjJQAsi (ORCPT + 18 others); Mon, 16 Oct 2023 20:48:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234300AbjJQAsg (ORCPT ); Mon, 16 Oct 2023 20:48:36 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF5689B for ; Mon, 16 Oct 2023 17:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503714; x=1729039714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dc0MbEJ8iTAniu2BvDRHDAZHMXmQyjjI1WBQvNDPIaM=; b=COi217Q30qWo7xpV4irRogRaRajAj104o0BmpFQIRwYT52xCtwgZq5Pf ShgQbRp9WTmjBG/lxGrd3H3KgDSsaS7aUweujMEYKDsWbcK7OxvISyvZ6 NJFPQcjse0an5iRSabs/tLf71ZH+yOAbQUDq5e0xVRlgzkamGjGWk1D43 PZ48+5ywx+2FfYU93aAHcyT0SKUGrXlHTNaYy15rhFXveawL3fXijElNd 0qz6B7BUGHge2jTMpsF34DVr+ww9UbLzR/lUBGwpe8lCC5+kA6WJUPKlp v+UCYAu/RWQJfBGiDYRwuVONo+1A7jMW2C6JQldrdCp4Y6CA4j+hCFSZM A==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893261" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893261" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793705" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793705" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:29 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 1/5] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Tue, 17 Oct 2023 08:47:58 +0800 Message-Id: <20231017004802.109618-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:48:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961664596916071 X-GMAIL-MSGID: 1779961664596916071 The pasid is passed in as a parameter through .set_dev_pasid() callback. Thus, intel_sva_bind_mm() can directly use it instead of retrieving the pasid value from mm->pasid. Suggested-by: Lu Baolu Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Signed-off-by: Tina Zhang --- drivers/iommu/intel/svm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 50a481c895b8..3c531af58658 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -290,21 +290,22 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, } static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, - struct mm_struct *mm) + struct iommu_domain *domain, ioasid_t pasid) { struct device_domain_info *info = dev_iommu_priv_get(dev); + struct mm_struct *mm = domain->mm; struct intel_svm_dev *sdev; struct intel_svm *svm; unsigned long sflags; int ret = 0; - svm = pasid_private_find(mm->pasid); + svm = pasid_private_find(pasid); if (!svm) { svm = kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) return -ENOMEM; - svm->pasid = mm->pasid; + svm->pasid = pasid; svm->mm = mm; INIT_LIST_HEAD_RCU(&svm->devs); @@ -342,7 +343,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, /* Setup the pasid table: */ sflags = cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0; - ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm->pasid, + ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, pasid, FLPT_DEFAULT_DID, sflags); if (ret) goto free_sdev; @@ -356,7 +357,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, free_svm: if (list_empty(&svm->devs)) { mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(mm->pasid); + pasid_private_remove(pasid); kfree(svm); } @@ -796,9 +797,8 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; - struct mm_struct *mm = domain->mm; - return intel_svm_bind_mm(iommu, dev, mm); + return intel_svm_bind_mm(iommu, dev, domain, pasid); } static void intel_svm_domain_free(struct iommu_domain *domain) From patchwork Tue Oct 17 00:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153840 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818209vqb; Mon, 16 Oct 2023 17:49:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpK2AdQH7nvYfeeHZrSI3puXkFcGK83s3tgZiO3ObRlBJvL5o7tg2TiebBfGgtIFTgwcRl X-Received: by 2002:a05:6808:30a4:b0:3a9:e40c:683c with SMTP id bl36-20020a05680830a400b003a9e40c683cmr1170647oib.1.1697503742184; Mon, 16 Oct 2023 17:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503742; cv=none; d=google.com; s=arc-20160816; b=iPPG/Xgk3C0UOT4j0jL9NYCm0WxYPEhLGSzY+zDQ8jiaO49tz8ccokuAANaXjs5EQG Sp4i8ASf8vrTfZQggiJwQ/m7c1AINiCN9R5lBe1j4hIGhBejBmZvKVouqPCWAASawnfn YUfv5KdymPKHj5iW4MYe69Xld2Fvp6Sf6lzdgxv/YGz1hfyYhxHP/k+5nIdXfwiXg6c3 BgaEFPWW/CIe/A4Ydv/P6/AYvkULVuWjnfJorz91znSRFnqoh1e1AYn1HJQ/u7FsbQIj g4z7C1QgYAoD3tNMpsDwid9cp0FKziMpZwItgOsngXDtV5+oB05ATY45lHztydQ8qzmc 6Xwg== 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=npZ0TzIdXG8O1ekBv/Iol5cEG7oxm0j5wfezHQUMQLM=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=maz5GTipk2z9z0xCSQKjBV6Nd9hfbJJWmvJa9cSegfMMgBCX2zOlxyhbb4afvodAAr VzhwBlpGt5Dm2JRKBV7GO17VHa9ywTkX8c9zULz3+EL1dSKSPpzgcz+DMhSR7M9nx/1a ospIK/UeI9+e3DGSuNnTugQTugae429/dGKdf0ehKv4H2pOBeiCuhsQk+I0d+71JfIX5 iPHWTInd/yMAQZ+FsCGZ0fH0vIYmfCbevbDXw3F2sO4TQvFE21bk6y3ERH43cAAMNVWB 4Dmns2ADtFPNa9dMChk0ckw7KnZXN6xwqULaBkiQi/i/1OBEaAWAJtfF2H+ECdbdiz2z j51w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GrOGJKtc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id i189-20020a639dc6000000b0056569ee3ae6si512924pgd.798.2023.10.16.17.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:49:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GrOGJKtc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D00648033375; Mon, 16 Oct 2023 17:48:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234357AbjJQAsp (ORCPT + 18 others); Mon, 16 Oct 2023 20:48:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234332AbjJQAsk (ORCPT ); Mon, 16 Oct 2023 20:48:40 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D26CF2 for ; Mon, 16 Oct 2023 17:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503718; x=1729039718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=a9SqKUtQWxi9wsxrdsiDkqkB6ZJKJ0NNGX75QDvdcLg=; b=GrOGJKtcT5Tmusbt8yPeRHn62gVtoGNK/yH2dNqDvnu1PoagLqtvQzwV X+xP1I/MHGK2lRNrozShzZlSZ2UJu9A3PSdOhLt6puszuiGNW6oDt6Xwj jXl6jddBvyyeaNUUMwlPvhqsfwCN+gbM+DJ56PBjq76kfwvHp5jk8uDmr wJRrU90chZFfsLR3SQYjbphDNfle2/Ga0jmk65jm2b7J1OifJA4uf6OQo pJOnzOMrasw2AfIXLvpfCBw+y5HSxWbzhF2eXq8uOP8UJfMZW4bphW6DJ 0r6DKjfL+71KVVohTjSRUHJaNL2D78TU6kQeI/MjXHUAzFdk+BbxwAyay A==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893293" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893293" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793729" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793729" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:33 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 2/5] iommu: Add mm_get_enqcmd_pasid() helper function Date: Tue, 17 Oct 2023 08:47:59 +0800 Message-Id: <20231017004802.109618-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:48:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961683131709226 X-GMAIL-MSGID: 1779961683131709226 mm_get_enqcmd_pasid() should be used by architecture code and closely related to learn the PASID value that the x86 ENQCMD operation should use for the mm. For the moment SMMUv3 uses this without any connection to ENQCMD, it will be cleaned up similar to how the prior patch made VT-d use the PASID argument of set_dev_pasid(). The motivation is to replace mm->pasid with an iommu private data structure that is introduced in a later patch. Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Tested-by: Nicolin Chen Signed-off-by: Tina Zhang --- Change in v7: - Update the commit message. Changes in v6: - Let SMMUv3 call mm_get_enqcmd_pasid(). - Let iommu_sva_get_pasid() call mm_get_enqcmd_pasid(). Change in v2: - Change mm_get_pasid() to mm_get_enqcmd_pasid() arch/x86/kernel/traps.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 12 ++++++------ drivers/iommu/iommu-sva.c | 2 +- include/linux/iommu.h | 12 ++++++++++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c876f1d36a81..832f4413d96a 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -591,7 +591,7 @@ static bool try_fixup_enqcmd_gp(void) if (!mm_valid_pasid(current->mm)) return false; - pasid = current->mm->pasid; + pasid = mm_get_enqcmd_pasid(current->mm); /* * Did this thread already have its PASID activated? diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c index 8a16cd3ef487..49aaa7262ea1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -229,7 +229,7 @@ static void arm_smmu_mm_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn, smmu_domain); } - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, start, size); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), start, size); } static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm) @@ -247,10 +247,10 @@ static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm) * DMA may still be running. Keep the cd valid to avoid C_BAD_CD events, * but disable translation. */ - arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, &quiet_cd); + arm_smmu_write_ctx_desc(smmu_domain, mm_get_enqcmd_pasid(mm), &quiet_cd); arm_smmu_tlb_inv_asid(smmu_domain->smmu, smmu_mn->cd->asid); - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), 0, 0); smmu_mn->cleared = true; mutex_unlock(&sva_lock); @@ -304,7 +304,7 @@ arm_smmu_mmu_notifier_get(struct arm_smmu_domain *smmu_domain, goto err_free_cd; } - ret = arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, cd); + ret = arm_smmu_write_ctx_desc(smmu_domain, mm_get_enqcmd_pasid(mm), cd); if (ret) goto err_put_notifier; @@ -329,7 +329,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn) return; list_del(&smmu_mn->list); - arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, NULL); + arm_smmu_write_ctx_desc(smmu_domain, mm_get_enqcmd_pasid(mm), NULL); /* * If we went through clear(), we've already invalidated, and no @@ -337,7 +337,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn) */ if (!smmu_mn->cleared) { arm_smmu_tlb_inv_asid(smmu_domain->smmu, cd->asid); - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), 0, 0); } /* Frees smmu_mn */ diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index b78671a8a914..4a2f5699747f 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -141,7 +141,7 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) { struct iommu_domain *domain = handle->domain; - return domain->mm->pasid; + return mm_get_enqcmd_pasid(domain->mm); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index c50a769d569a..074b98f9e5dc 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1189,6 +1189,12 @@ static inline bool mm_valid_pasid(struct mm_struct *mm) { return mm->pasid != IOMMU_PASID_INVALID; } + +static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +{ + return mm->pasid; +} + void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); @@ -1211,6 +1217,12 @@ static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle) } static inline void mm_pasid_init(struct mm_struct *mm) {} static inline bool mm_valid_pasid(struct mm_struct *mm) { return false; } + +static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +{ + return IOMMU_PASID_INVALID; +} + static inline void mm_pasid_drop(struct mm_struct *mm) {} #endif /* CONFIG_IOMMU_SVA */ From patchwork Tue Oct 17 00:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818186vqb; Mon, 16 Oct 2023 17:49:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGp2J8OlV0VnQ9lZK1UgGIiitBlTJdXsTEd1+p7/BUV+FWSN2akZa862IPZv9sRDnjmgTJC X-Received: by 2002:a05:6359:3118:b0:166:d9b6:1db3 with SMTP id rh24-20020a056359311800b00166d9b61db3mr695835rwb.2.1697503739968; Mon, 16 Oct 2023 17:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503739; cv=none; d=google.com; s=arc-20160816; b=SkEOAMocgAzv/O2JOzqjaOihg/L9NzY/16PpLU2hkLp8gra5jT7nXGIUWsEib8pWaI 2xvfV80RLE4ohUbpGHuPFwEB9gPjUXxTAAjINdE/1kGBKlJ8rix/TwIDL4lCXL3+GYqx +5Qeg1DuHyt5b/t6IhlOn5ylxKTxM7PR9OUrZrjHUj0L5jw2egZ4oj1qe8TRSvDuxf3E U4L1O9evkPzqsePrA1qvw7aMhjHqOFayjrveN/h5VWKm43u5ktX9GJAKwpGriMa8dKX+ DUSPizR/tUc0gXp/3arHOxdopms17kpWVd8m3l4XhuL9o3LqPbrA3ddWsul65POnaFy1 JfSA== 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=B0+sfBNtt8Gk1Af29JHInJiQvk8pFQPSdFHge8Silb4=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=RN7QAyJ+KBKER9ABx5k6FREbXlprqJqfZKfqg606RO5VjbDYIjV9oomj1kTJgSTtWF ipWB3vdjrP5su5SEfz9HSteOIxehvgnWrQv8di4BDC2RXmMcfPiAF+kVBFey83fiOjVX vvwJdB0mcZYXh2R909cwx5qg6EPifO33GAUiihN/0kppN0HeFkVxJzpw7A3zDvSbUePx Hhq7/zD7M4u4Y7F4fjwn/1IKfXi+vSFL0LWtOlEcfoD5ltDxQnNU0l9z5k7TSum+vZYb myaR92He25iKkDKa6ifgQ9OGGHQhWdX7EnKOfj68Nj8W4hQHVYzlMLvMXtFGTA4NwyvQ 5klg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XDx0ZyM0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id x4-20020a056a00188400b006be30cdc3d8si446461pfh.163.2023.10.16.17.48.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XDx0ZyM0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 58DFC80236F1; Mon, 16 Oct 2023 17:48:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234291AbjJQAst (ORCPT + 18 others); Mon, 16 Oct 2023 20:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234350AbjJQAsp (ORCPT ); Mon, 16 Oct 2023 20:48:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35518115 for ; Mon, 16 Oct 2023 17:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503722; x=1729039722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0DTtg53Mry+bx0RWv8c9JmmtiJF5A7k4iMPvgpVkaoA=; b=XDx0ZyM09D5cAU7IFhQon+D2/rpP2/wtAsqnwTn4E288KRWmkL5cRGI9 rAUh8rSjPkPd44Xds5H73EMAKv/IqHh0tqD+bwJWLaiPMaXPiQq8wGIjT e7PK/RsxljI9DgS9l7XdwJmWWOFf+rv//p8jbTlbidNDRF21gK1x+aPfR 66OeUCE8FxoxAElAKzTpBletalaC3L20dBrGAMWhJwRwk/SYItzwUS8PZ KsMrqiAjmgPCut9U91HRmAye5YBOFulyhoeXWQEv1xEI2HooVudzcus1x VLUxWw5y+qRJVtd0W1GAQiIARKPfu8+WDVTZFFlW9R1xNDwdefMRFpAGP Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893318" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893318" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793755" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793755" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:37 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 3/5] mm: Add structure to keep sva information Date: Tue, 17 Oct 2023 08:48:00 +0800 Message-Id: <20231017004802.109618-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:48:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961681605950886 X-GMAIL-MSGID: 1779961681605950886 Introduce iommu_mm_data structure to keep sva information (pasid and the related sva domains). Add iommu_mm pointer, pointing to an instance of iommu_mm_data structure, to mm. Reviewed-by: Vasant Hegde Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Tested-by: Nicolin Chen Signed-off-by: Tina Zhang --- include/linux/iommu.h | 5 +++++ include/linux/mm_types.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 074b98f9e5dc..e350520e3a35 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -670,6 +670,11 @@ struct iommu_sva { struct iommu_domain *domain; }; +struct iommu_mm_data { + u32 pasid; + struct list_head sva_domains; +}; + int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, const struct iommu_ops *ops); void iommu_fwspec_free(struct device *dev); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 36c5b43999e6..9f4efed85f74 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -670,6 +670,7 @@ struct mm_cid { #endif struct kioctx_table; +struct iommu_mm_data; struct mm_struct { struct { /* @@ -883,6 +884,7 @@ struct mm_struct { #ifdef CONFIG_IOMMU_SVA u32 pasid; + struct iommu_mm_data *iommu_mm; #endif #ifdef CONFIG_KSM /* From patchwork Tue Oct 17 00:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818237vqb; Mon, 16 Oct 2023 17:49:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+v81Wq5Anj8tYT6GOBAtlpWGX8GKfQ3I+BTkL9LDqrgQNBNuqswnW5DZUtRcKjynBID0p X-Received: by 2002:a9d:6853:0:b0:6c4:7516:f2cf with SMTP id c19-20020a9d6853000000b006c47516f2cfmr843723oto.2.1697503746832; Mon, 16 Oct 2023 17:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503746; cv=none; d=google.com; s=arc-20160816; b=iOQlm1pMeXvD2DZzvTpSSkrMHg80pZ5eAZPu2a3fZoN7mSBkwDL+7EuhrWLqzv3PW+ vSbCAqoO8Dpw9ZlJ8Thk+gv9K19lsyS5qFVvpFMdTUeZOGYf0qwlXSDDySei5KGY2mB5 Y8Ez2a63GebQIQHEZ6Y/NbdDVbRGVciRyNl+iGGyCTopJB+kLfGB37lkyusiOjj7hRt6 NaDcFuyDWtsAhtGOrWcjfuuV0hO1k+QFB7G+PybSsQhfuBrpEdEPWkgdKoqHVmXONyf6 1zJufvZ8Xsv/W4RGmLp3T9Q26GIwqk83IAOqiFn18izu5ioP4DSsvYKQLGEvQzADjyu0 GALQ== 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=ASVTu/F8C0Zmv1TLGFYrnnVU3RgkOKllT/1mLSaHkk4=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=CRn888fC2S9h7Ovgr7fd9xe39EaJbn3zEnQyZ5pWzP5NwBdDxb7RHOXRo+ouR03EUx EyvM1IVwyXJwOgXMT+q6h7htHZ4RnwyrVSmixE96f68HllrYVo15BB4CzZ+tTBVYqIEz J1rHIlm4WSXcEZqWwwJlfAcE6xu7hM4EVjcRumkM685x/41HzFANHjxhr9AZLwQ6dKlP NKAwUFoqA6+VqxRcNbiNLWfOly7j2B941T5X3oNjvUIhoJBBC2bMZqaaotQHJbhqmiLr aqadwFAPvOx+fYf8MZgVAl9iPnXcM9VXR4ePrJQv+rP+pWMGr6cEkXl00PPDEH52VFhY XVnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=l7tG1vK5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k8-20020aa79d08000000b006be3679b485si390388pfp.396.2023.10.16.17.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=l7tG1vK5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E895E80D7E48; Mon, 16 Oct 2023 17:49:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234373AbjJQAs6 (ORCPT + 18 others); Mon, 16 Oct 2023 20:48:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234365AbjJQAsu (ORCPT ); Mon, 16 Oct 2023 20:48:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A226FF for ; Mon, 16 Oct 2023 17:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503726; x=1729039726; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/qwhtfzvsMcijGtPZ/mvSqJFHLXrk93hlOJKVq+skKk=; b=l7tG1vK5ajcsn0hax0FTLVTKXn7ojtxNfJndSekfYd/ee1mC+oG3rf6B sMdtAHuKV/y1QymN1Jp5M/ULiC6Jk6wwjlQsQlyWo8md9h9Auo31vGo1V NDa9K9j5W+z3cx1KqJeDnoxdUllraSHIbtVda91zctfQugLgz511lFi/i +krJshQjbpEEswot8BexNknvIspYm4sxl8k4V98SnbjqC+ggTR35rRVhh 0qz5HMmn7ChFV9aNJDdH1gw/lvCKQe3BsKVZ2765YpzkmB2oULs+Fi/E1 AUmRXnSgE9TJdmWQJWY9JAJL9tzOU0Fo8euaQo6FETMFZZ0xo6Ymxj15f w==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893351" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893351" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793783" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793783" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:41 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 4/5] iommu: Support mm PASID 1:n with sva domains Date: Tue, 17 Oct 2023 08:48:01 +0800 Message-Id: <20231017004802.109618-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:49:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961688924087741 X-GMAIL-MSGID: 1779961688924087741 Each mm bound to devices gets a PASID and corresponding sva domains allocated in iommu_sva_bind_device(), which are referenced by iommu_mm field of the mm. The PASID is released in __mmdrop(), while a sva domain is released when no one is using it (the reference count is decremented in iommu_sva_unbind_device()). However, although sva domains and their PASID are separate objects such that their own life cycles could be handled independently, an enqcmd use case may require releasing the PASID in releasing the mm (i.e., once a PASID is allocated for a mm, it will be permanently used by the mm and won't be released until the end of mm) and only allows to drop the PASID after the sva domains are released. To this end, mmgrab() is called in iommu_sva_domain_alloc() to increment the mm reference count and mmdrop() is invoked in iommu_domain_free() to decrement the mm reference count. Since the required info of PASID and sva domains is kept in struct iommu_mm_data of a mm, use mm->iommu_mm field instead of the old pasid field in mm struct. The sva domain list is protected by iommu_sva_lock. Besides, this patch removes mm_pasid_init(), as with the introduced iommu_mm structure, initializing mm pasid in mm_init() is unnecessary. Reviewed-by: Lu Baolu Reviewed-by: Vasant Hegde Reviewed-by: Jason Gunthorpe Tested-by: Nicolin Chen Signed-off-by: Tina Zhang --- Change in v7: - Add mm_pasid_init() back and do zeroing mm->iommu_mm pointer in mm_pasid_init() to avoid the use-after-free/double-free problem. Changes in v6: - Rename iommu_sva_alloc_pasid() to iommu_alloc_mm_data(). - Hold the iommu_sva_lock before invoking iommu_alloc_mm_data(). Change in v5: - Use smp_store_release() & READ_ONCE() in storing and loading mm's pasid value. Change in v4: - Rebase to v6.6-rc1. drivers/iommu/iommu-sva.c | 92 +++++++++++++++++++++++---------------- include/linux/iommu.h | 23 ++++++++-- 2 files changed, 74 insertions(+), 41 deletions(-) diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 4a2f5699747f..5175e8d85247 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -12,32 +12,42 @@ static DEFINE_MUTEX(iommu_sva_lock); /* Allocate a PASID for the mm within range (inclusive) */ -static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev) +static struct iommu_mm_data *iommu_alloc_mm_data(struct mm_struct *mm, struct device *dev) { + struct iommu_mm_data *iommu_mm; ioasid_t pasid; - int ret = 0; + + lockdep_assert_held(&iommu_sva_lock); if (!arch_pgtable_dma_compat(mm)) - return -EBUSY; + return ERR_PTR(-EBUSY); - mutex_lock(&iommu_sva_lock); + iommu_mm = mm->iommu_mm; /* Is a PASID already associated with this mm? */ - if (mm_valid_pasid(mm)) { - if (mm->pasid >= dev->iommu->max_pasids) - ret = -EOVERFLOW; - goto out; + if (iommu_mm) { + if (iommu_mm->pasid >= dev->iommu->max_pasids) + return ERR_PTR(-EOVERFLOW); + return iommu_mm; } + iommu_mm = kzalloc(sizeof(struct iommu_mm_data), GFP_KERNEL); + if (!iommu_mm) + return ERR_PTR(-ENOMEM); + pasid = iommu_alloc_global_pasid(dev); if (pasid == IOMMU_PASID_INVALID) { - ret = -ENOSPC; - goto out; + kfree(iommu_mm); + return ERR_PTR(-ENOSPC); } - mm->pasid = pasid; - ret = 0; -out: - mutex_unlock(&iommu_sva_lock); - return ret; + iommu_mm->pasid = pasid; + INIT_LIST_HEAD(&iommu_mm->sva_domains); + /* + * Make sure the write to mm->iommu_mm is not reordered in front of + * initialization to iommu_mm fields. If it does, readers may see a + * valid iommu_mm with uninitialized values. + */ + smp_store_release(&mm->iommu_mm, iommu_mm); + return iommu_mm; } /** @@ -58,31 +68,33 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev) */ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm) { + struct iommu_mm_data *iommu_mm; struct iommu_domain *domain; struct iommu_sva *handle; int ret; + mutex_lock(&iommu_sva_lock); + /* Allocate mm->pasid if necessary. */ - ret = iommu_sva_alloc_pasid(mm, dev); - if (ret) - return ERR_PTR(ret); + iommu_mm = iommu_alloc_mm_data(mm, dev); + if (IS_ERR(iommu_mm)) { + ret = PTR_ERR(iommu_mm); + goto out_unlock; + } handle = kzalloc(sizeof(*handle), GFP_KERNEL); - if (!handle) - return ERR_PTR(-ENOMEM); - - mutex_lock(&iommu_sva_lock); - /* Search for an existing domain. */ - domain = iommu_get_domain_for_dev_pasid(dev, mm->pasid, - IOMMU_DOMAIN_SVA); - if (IS_ERR(domain)) { - ret = PTR_ERR(domain); + if (!handle) { + ret = -ENOMEM; goto out_unlock; } - if (domain) { - domain->users++; - goto out; + /* Search for an existing domain. */ + list_for_each_entry(domain, &mm->iommu_mm->sva_domains, next) { + ret = iommu_attach_device_pasid(domain, dev, iommu_mm->pasid); + if (!ret) { + domain->users++; + goto out; + } } /* Allocate a new domain and set it on device pasid. */ @@ -92,23 +104,23 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm goto out_unlock; } - ret = iommu_attach_device_pasid(domain, dev, mm->pasid); + ret = iommu_attach_device_pasid(domain, dev, iommu_mm->pasid); if (ret) goto out_free_domain; domain->users = 1; + list_add(&domain->next, &mm->iommu_mm->sva_domains); + out: mutex_unlock(&iommu_sva_lock); handle->dev = dev; handle->domain = domain; - return handle; out_free_domain: iommu_domain_free(domain); + kfree(handle); out_unlock: mutex_unlock(&iommu_sva_lock); - kfree(handle); - return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(iommu_sva_bind_device); @@ -124,12 +136,13 @@ EXPORT_SYMBOL_GPL(iommu_sva_bind_device); void iommu_sva_unbind_device(struct iommu_sva *handle) { struct iommu_domain *domain = handle->domain; - ioasid_t pasid = domain->mm->pasid; + struct iommu_mm_data *iommu_mm = domain->mm->iommu_mm; struct device *dev = handle->dev; mutex_lock(&iommu_sva_lock); + iommu_detach_device_pasid(domain, dev, iommu_mm->pasid); if (--domain->users == 0) { - iommu_detach_device_pasid(domain, dev, pasid); + list_del(&domain->next); iommu_domain_free(domain); } mutex_unlock(&iommu_sva_lock); @@ -205,8 +218,11 @@ iommu_sva_handle_iopf(struct iommu_fault *fault, void *data) void mm_pasid_drop(struct mm_struct *mm) { - if (likely(!mm_valid_pasid(mm))) + struct iommu_mm_data *iommu_mm = mm->iommu_mm; + + if (!iommu_mm) return; - iommu_free_global_pasid(mm->pasid); + iommu_free_global_pasid(iommu_mm->pasid); + kfree(iommu_mm); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e350520e3a35..19b5ae2303ff 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -109,6 +109,11 @@ struct iommu_domain { struct { /* IOMMU_DOMAIN_SVA */ struct mm_struct *mm; int users; + /* + * Next iommu_domain in mm->iommu_mm->sva-domains list + * protected by iommu_sva_lock. + */ + struct list_head next; }; }; }; @@ -1188,16 +1193,28 @@ static inline bool tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream #ifdef CONFIG_IOMMU_SVA static inline void mm_pasid_init(struct mm_struct *mm) { - mm->pasid = IOMMU_PASID_INVALID; + /* + * During dup_mm(), a new mm will be memcpy'd from an old one and that makes + * the new mm and the old one point to a same iommu_mm instance. When either + * one of the two mms gets released, the iommu_mm instance is freed, leaving + * the other mm running into a use-after-free/double-free problem. To avoid + * the problem, zeroing the iommu_mm pointer of a new mm is needed here. + */ + mm->iommu_mm = NULL; } + static inline bool mm_valid_pasid(struct mm_struct *mm) { - return mm->pasid != IOMMU_PASID_INVALID; + return READ_ONCE(mm->iommu_mm); } static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) { - return mm->pasid; + struct iommu_mm_data *iommu_mm = READ_ONCE(mm->iommu_mm); + + if (!iommu_mm) + return IOMMU_PASID_INVALID; + return iommu_mm->pasid; } void mm_pasid_drop(struct mm_struct *mm); From patchwork Tue Oct 17 00:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818247vqb; Mon, 16 Oct 2023 17:49:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4n1d99+Otutl4G2Yfp4ASNE8CxFdyVhGTo6dDJ7v5s0ZOYRyPYqsv4PYtNumyF2u9x2sv X-Received: by 2002:a17:90b:1d81:b0:27d:6009:36c7 with SMTP id pf1-20020a17090b1d8100b0027d600936c7mr817010pjb.4.1697503747852; Mon, 16 Oct 2023 17:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503747; cv=none; d=google.com; s=arc-20160816; b=jKo9fPHDCGYe+PGhazUt2EV76XNb7mbBDT7ASmKnT9m7gDqXuEFlEcYU+zP4leP/vA wKGaWw6txowAWY0NXHLtSZq8wnRCILlx58HDxEaWBPFGC6l+/PICS8IhGiW7dz/c/T2Q 9lVeEtpWzK5fWnlbeSekF7lbV36PdMrfD4/pzJ05qiTKQTKlf2i03bnWQ9oFfS663ke5 8WDrpARATV1846yP1Snkm6vPV+C6tX/SjvtlCHdhZX9FMTKqHmKeddUAKxZ0e2+l4jeT 0GgX0X48I5yJxW7zSnuFO30qLw6sTSjZIYz/z4jCP68e9IkgKFcKgebFpLGwV3fXeRyw kFGQ== 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=nxJodcD0A/BVNjC5Ms8LFReraPUssM65AtJgITza2eY=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=e3ZZkfx+52ldQsSH1IufCTToJfJd3CcF9BWsGsTVaWOw4rEINWrq/B9JOlg87u6+b1 qVFiv6/j4QZYAsVDPl88cpvKbhPpkebOrn2mdlyrEKXRd+E5EYLNYFleL65SdSUiporv wz4+sQlLM8ash+TvBTToPIuUe8h+1csnOZ5Rng4WE5jgkmdjZEJOYjgY31mFdMjIuUUj /29T9KlvFW2PKoTif4L6gp19ijhRh6A92MHJ0wK95vHw3dcL1c/37/YoMmKopbmI3y2E H1yya/ruiUa5ZTsCqnkegyOVVX+kBciwHyawJlqGaRdDkF1CSmWFIr0+SdtSutA+Ll86 P/Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Wb2YZt8B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id be3-20020a656e43000000b005789f94cd34si525492pgb.636.2023.10.16.17.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Wb2YZt8B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 50F7C80D7E48; Mon, 16 Oct 2023 17:49:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234357AbjJQAtD (ORCPT + 18 others); Mon, 16 Oct 2023 20:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234311AbjJQAsz (ORCPT ); Mon, 16 Oct 2023 20:48:55 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73AA2134 for ; Mon, 16 Oct 2023 17:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503730; x=1729039730; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/TKSJz2uqhYSu+kqp+Wq9KnZNxzR/1bl8TV8gHaytgw=; b=Wb2YZt8B8HaguTNwmBa6Ic4iiQcoaCDSsUevmElbIJolLKzx+aGIozbj QB4HGJFLNhfyJaV2PhXqnzYIn+ZeGamK57BnqGTbt8mOIpn0QOBPdydPJ aoyvB6b301C7DoZ9Aru49J+1vMtcVhV0fx4J11VdQnHsQl7c4kdafti2g yp7c4cR5itDfg69RYvbOdaBTxb5kPVhcK9t+0Dk9Ist886N/DRyJOxRl5 ZtTti7f2pzEDAU/4bPkrW5Ca26mthuYC5irdoKdnQphJ/1ibaLwtQqDDe 7u+gTt+rjB2vWfyYqo2ebmfG9tksQrngYAJMzi2pW8GtP8sIkYrRJA3Wb Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893373" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893373" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793803" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793803" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:46 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 5/5] mm: Deprecate pasid field Date: Tue, 17 Oct 2023 08:48:02 +0800 Message-Id: <20231017004802.109618-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:49:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961689881669667 X-GMAIL-MSGID: 1779961689881669667 Drop the pasid field, as all the information needed for sva domain management has been moved to the newly added iommu_mm field. Reviewed-by: Lu Baolu Reviewed-by: Vasant Hegde Reviewed-by: Jason Gunthorpe Signed-off-by: Tina Zhang --- include/linux/mm_types.h | 1 - mm/init-mm.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 9f4efed85f74..37f049c4b059 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -883,7 +883,6 @@ struct mm_struct { struct work_struct async_put_work; #ifdef CONFIG_IOMMU_SVA - u32 pasid; struct iommu_mm_data *iommu_mm; #endif #ifdef CONFIG_KSM diff --git a/mm/init-mm.c b/mm/init-mm.c index cfd367822cdd..24c809379274 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -44,9 +44,6 @@ struct mm_struct init_mm = { #endif .user_ns = &init_user_ns, .cpu_bitmap = CPU_BITS_NONE, -#ifdef CONFIG_IOMMU_SVA - .pasid = IOMMU_PASID_INVALID, -#endif INIT_MM_CONTEXT(init_mm) };