From patchwork Wed Oct 11 06:51:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp347171vqb; Tue, 10 Oct 2023 23:52:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFg6hLuT8lhXseDhnFAHlDXrRHqev8l/lQeoRVaqevNyGU0I3/ApNGREj7Gi5SmkCfEdRps X-Received: by 2002:a05:6359:694:b0:14d:5f4e:b7b5 with SMTP id ei20-20020a056359069400b0014d5f4eb7b5mr15647890rwb.0.1697007164493; Tue, 10 Oct 2023 23:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697007164; cv=none; d=google.com; s=arc-20160816; b=NgXZZA+7ljhg8b/sbIiyXjKsJrYtJ/ToW65ay/O4HP35Rnf1+Oqh5U6fu6gf5p4vZY JemDHhyS87ITVAm8xnoERQ2Z6/zQW1Ef71P42k7ezRLZ1lcbIgU2vTyrtslwuvZV9eHY YdvsHLQTCuc+gtgmt6FNP5wN22APUu3SJ73bwTZtS2t7SaBeP1OpsWCDTd0eN86vk5mB 4T6+2oZoVlg/e11nQccyjIrx4H4rC889+bfCB8Ahh+P33Mv3EkPCgthWIRP8qtGw8wuE TBn+8TVWiVUatJxXMdErszz8pzZeh3/r3/wCWA0je9Ermdmi91rvTNE/9eRcxmS6ah3K 4W4A== 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=Q9bD7iFXSnVjlANjxYHEZXjN4iWWH4P/4116xLw/iSk=; b=YROIRU1Dq9hCsj/hWDieIgqOiC2nkA0ptDNKDX03MfP7/YI2aO4+YEhPohXgFC/fu8 avR0P1O+Hf9yah8nIhFIR06HmC1zAZI5jfWOB4Ps+tHRqhUooEEmNrvntw2+k9j5peUQ gAy3GDTuDORytlOGxVqJLfGMjmH5pYOvY7YbaPkAg84SuTVLvrRhV6+mcwYsam/ruSsg KaEADcghQ+vvbccgCXATV9YCKG6BoFHUBTYVhSLxLYLIkIQCPqoaNdV6S/GMUQBq6/AN RnsqlcNmncFSLcO39BZM7jZ4pmR21k8O4BgWCfrAec6nLM5N1jD9Q8+OHWgHuPBm4tVc 8mjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CAXNjpQv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id u11-20020a6540cb000000b005440b9f013csi1188172pgp.899.2023.10.10.23.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 23:52:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CAXNjpQv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id CC15180736B3; Tue, 10 Oct 2023 23:52:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345567AbjJKGvx (ORCPT + 19 others); Wed, 11 Oct 2023 02:51:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345542AbjJKGvp (ORCPT ); Wed, 11 Oct 2023 02:51:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76273AC for ; Tue, 10 Oct 2023 23:51: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=1697007102; x=1728543102; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dc0MbEJ8iTAniu2BvDRHDAZHMXmQyjjI1WBQvNDPIaM=; b=CAXNjpQv2bZmyF0RJCFsklhusGctri+kzmZQR9SMM+twx6lFSOH4iKi2 MopkY+6HN/t+elzkuQm3oXSFVhqD5VZ8VXQWp1SnR+HmScpKPrKkmEYoq VfQaaQ5hL6jGOPRqpaKuX99UxQTN0RnqUFa2v8qd8N54S5FGGfIiISR37 KWI/e80m2PvKwu5owGZBzqECDia6uhAGAYqV6YpH1FjYX99Jp3Dsb84l4 bxp2UM1MQxg3nKyE0uESvommnsVRRW+JoWd+wiBZGaQzZn7DIFXO513jt gr8cYIPpeOa1Aw3/QhIqYIjGUwGE5HQVxyGPd2pdKWbVR/75Ht6D4rCQt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="387436954" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="387436954" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 23:51:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="824050233" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="824050233" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by fmsmga004.fm.intel.com with ESMTP; 10 Oct 2023 23:51:39 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [v6 PATCH 1/5] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Wed, 11 Oct 2023 14:51:28 +0800 Message-Id: <20231011065132.102676-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231011065132.102676-1-tina.zhang@intel.com> References: <20231011065132.102676-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Tue, 10 Oct 2023 23:52:30 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779440984753373478 X-GMAIL-MSGID: 1779440984753373478 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 Wed Oct 11 06:51:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp347031vqb; Tue, 10 Oct 2023 23:52:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvcug/rCcrMyvAHS44UD7q7jgQklPEMpcSFA4Z5LNcYTpilZ5M9Rgxyq0ZDWXi2R+49WdD X-Received: by 2002:a05:6a20:8f01:b0:163:d382:ba99 with SMTP id b1-20020a056a208f0100b00163d382ba99mr24764505pzk.5.1697007128551; Tue, 10 Oct 2023 23:52:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697007128; cv=none; d=google.com; s=arc-20160816; b=WMQiLuQBFEOOW7yWlA4DAPI+IiEyCj+4purVQMFYNigFTgS5C4eZBhaa+brOOGei+H HxZKIWI3g1HyQcHasbByi/qK6zGjvqxOnJXkalXRyNNnrl/xyS/AZ2ADsboxkoqwvRDv wrsCjcNKnrcr1L/9JpePnSua9Q/MG3OHnwLm0EEEnNmyDAnn33BwFzfdhStH0gu1KB+O kd5+C73m7/gq4XAXCvmLNA4nhFMOi6551yo2iwTdpWZBPFw2UqDGL4UEXmDEQRyfSUwS 3lBWaOAtWWFR3e5z+EoKbSsqKgXg+7pbusLrOMPpl0QKHgLt0EohwUDN5pTxZPtPT6U0 PxwA== 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=7e0bHZ//9dts768Z7GULi5jYlRiJHnnXAhjKN2l9CzQ=; fh=Q9bD7iFXSnVjlANjxYHEZXjN4iWWH4P/4116xLw/iSk=; b=EB/9WB0I48bLQLPVWISHWv8RLndNDUhHx6bk/5nS9JuSjcjaZhx5ajm5qDWxyuB7eX LhtXMHArFOHQ4HcbH6lSP1gSp6aVdzSRA003SslOzrIqDloOECfHyenrylnNs+RrJsFy YuZMEpkLZXQYnwBWTtgBUHSP4MJdDMms7Jpa++4KKEUH6eSWlQRE6jV2JsUpbeTA52yY 05FOTQwLtyV3Fw9RnZvqC+PWKT59vhB8gz88yI3PZhnZ2P9fr46l4y3yOI6rYVq2pImf I9EyYLvW/bVnKx2gmtq8BJm1zL9aQB5/xWf+bhNN/At3snmKgtQO2bOLCnTwkkj+rxFt JXLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=N6MhBDJk; 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 gw24-20020a17090b0a5800b0026821262c7csi3296254pjb.116.2023.10.10.23.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 23:52:08 -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=N6MhBDJk; 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 E02B781A3359; Tue, 10 Oct 2023 23:52: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 S1344244AbjJKGwB (ORCPT + 19 others); Wed, 11 Oct 2023 02:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345846AbjJKGvq (ORCPT ); Wed, 11 Oct 2023 02:51:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36564B8 for ; Tue, 10 Oct 2023 23:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697007105; x=1728543105; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ijzp8wKJf99JdRnP3ccZa4YN2tbg7sgw5v2etLG+4Vc=; b=N6MhBDJkvWiybhWcDg15SKQFJ+3Hico6RhaHCHROzU/30mNGr9zYI4pT ae95N96Z/jt7nsZWyi8BkRnZEpt+9Yry4ok5XCjNrmlA2p66hABKgqDVS M5tc+ar9cbUzXRkeGjelIf3oiMp1Qb3szq+xX+aqF1PCOYytFubce1NFU KqXCh8IwEutWhT1XkDT3xA3DKs7Q1Rbt4rc+Y2IbadgvLIv0lR5xNq9HQ viqlblBpMcHiHImnBEfbeQdBzPm6GSxDOJNWU5aER078XqB1tg6quUzqM f4ua+wRH8HX9O0443XsoOS//6p8cYlwQIrGb2qSttX8Nqsq8An2NX8FH6 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="387436960" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="387436960" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 23:51:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="824050245" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="824050245" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by fmsmga004.fm.intel.com with ESMTP; 10 Oct 2023 23:51:41 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [v6 PATCH 2/5] iommu: Add mm_get_enqcmd_pasid() helper function Date: Wed, 11 Oct 2023 14:51:29 +0800 Message-Id: <20231011065132.102676-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231011065132.102676-1-tina.zhang@intel.com> References: <20231011065132.102676-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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]); Tue, 10 Oct 2023 23:52:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779440946764443103 X-GMAIL-MSGID: 1779440946764443103 mm_get_enqcmd_pasid() is for getting enqcmd pasid value. 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 Signed-off-by: Tina Zhang --- 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 | 8 ++++++++ 4 files changed, 16 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..a4eab6697fe1 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1189,6 +1189,10 @@ 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 +1215,10 @@ 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 Wed Oct 11 06:51:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp347044vqb; Tue, 10 Oct 2023 23:52:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqQxvhzV9c6pw372mzk84HisrvTkHhLbTNNPoZOpOdhwKzAye6XQa1y964FFappfig3Ay9 X-Received: by 2002:a17:902:f54e:b0:1c2:c60:8387 with SMTP id h14-20020a170902f54e00b001c20c608387mr22823136plf.0.1697007131675; Tue, 10 Oct 2023 23:52:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697007131; cv=none; d=google.com; s=arc-20160816; b=BTIVK+/lJ2OeXtjjzYgs+crv2/0ptVqhj3Tl8G81XPgFDk8nzsaOEFUBXtWGnscXka 6C5jVA6Zg+2Tzqr4FB+llRXlLq00JbBKDVQlEsUYalwGgis/mw2LZzewUXmC3LEAJvHX uRGTRUEpYUp/oh73ryHnbMHVm5l3PPq/OqnfbqZvKXFoDekZq5S3ALRgqx2PyiE2mMqV LDKFJrwgux3odXL/DIJpdHoz5y4adPcT4W8rFmNacXxMQRt9YXi5Zp88AQ6a6prlpYv/ yLtOARa8tcRI0gzqIBXE2GDPr9Qi9lvLvGZtKsd4Cqwd3d69U5u19kDf584zLWF+oFDx Mu5Q== 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=JZ2F8LshQhIPxgQHaUgqsOrSkEbQz+MtiBWUTwXRyWk=; fh=2Ks+q1VI5sIi6LqUZH+DJDRf7Od/7+1TAInH7Sedi5c=; b=z++FK1DXH6yP9eWCdstD2vEhNdrk9IrEEFrSRehAxmNEbPeob7Amc+EXEEx7TBA/6E /ha3aAq7rYPiXm5BCfyHFIe3gKcBzLERMfSOfsgPho/2WtQPB4OYtBc7p994FJH1qsSh lr8Gx1QDF/ZMb6IzpZpCQxZyuQnKZDF2jwxiYfjrI1tfVs67IGbjBV3fJtuuUdFW4SZ1 u/+q5REsOKzlzdDTI1/jqcgXSaxdiUNbyRm4ngX7/qTWRqvRT5TyWNqZu4gC9x8gLDzF 1+dnO2+XAYNpWoVPKooHrfxfuUDxTo1i4ds8MDGuyBT6N0MsXdZJxfpB5JvaOV6gqEn7 t6Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nFBmh0Et; 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 p12-20020a170902e74c00b001c7345bc01csi1091939plf.450.2023.10.10.23.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 23:52:11 -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=nFBmh0Et; 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 D052681A336A; Tue, 10 Oct 2023 23:52:10 -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 S1343923AbjJKGwH (ORCPT + 19 others); Wed, 11 Oct 2023 02:52:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345289AbjJKGvq (ORCPT ); Wed, 11 Oct 2023 02:51:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CDE49D for ; Tue, 10 Oct 2023 23:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697007105; x=1728543105; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GkJWDBRQ1jsnIIVUcbi2Qvjz1LAX/o3/l8N0hK1jUv8=; b=nFBmh0EtinaWdwQkOGT901L6mDj+/A4uLfCiH6CQzi7/QqfjL6Yooeo2 qtvlesa65cDs6hFB8/z/fhefVCeerkYMgMHIxTVhHmviR7njSDzcVXB3y ZQb1OicsmNfoJwKI0MRBEUBrgMinkOgci8Mn3XdwASX3CHBDYEa9qepRh mccOyGyPOPdpoB5xwFfFQ7I+BP7PNle7F93L7G7eCI5dXOU2/casjfeL2 gGD7U5P+6PBN7cuYbHvuDkH3sjW01wiu33i6yQgq0ishDWyVaoe8lfzKf oSp3hTUN0mCU4PMxOylDdjoXBljT6nIRQccJI5SpCZO+/caAMft/h+0gI w==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="387436962" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="387436962" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 23:51:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="824050259" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="824050259" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by fmsmga004.fm.intel.com with ESMTP; 10 Oct 2023 23:51:42 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang , Vasant Hegde , Jason Gunthorpe Subject: [v6 PATCH 3/5] mm: Add structure to keep sva information Date: Wed, 11 Oct 2023 14:51:30 +0800 Message-Id: <20231011065132.102676-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231011065132.102676-1-tina.zhang@intel.com> References: <20231011065132.102676-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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]); Tue, 10 Oct 2023 23:52:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779440950571414334 X-GMAIL-MSGID: 1779440950571414334 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 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 a4eab6697fe1..dc1f98e12f4b 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 Wed Oct 11 06:51:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp347147vqb; Tue, 10 Oct 2023 23:52:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkZWk3KAOdwJXYcLXyJsyORsMv6JdfejiFhhsWsa6ANxMJPu2ncy0tt2iDfu8eBnZNWnuu X-Received: by 2002:a05:6a00:391c:b0:690:d0d4:6fb0 with SMTP id fh28-20020a056a00391c00b00690d0d46fb0mr22065940pfb.3.1697007156994; Tue, 10 Oct 2023 23:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697007156; cv=none; d=google.com; s=arc-20160816; b=bcCUokw322vHy3zQAuRGlLc1W3Qmcvzm3XCN4PX1S8paYYRTxyhJBnfKG6IOYCe4dG G4y0jq4Nyh1GJ877W/RlNDvtVMFZgmNOGv+vQ6XCxjAD9qyV/1YrehZufGlmV5HxnNpg KLB9/dFUTJs2N7wQXC2UwdcGR2sZ31LlPUj3U6Uzs6ODUzKc6Aeik6k+bEp1+U302PrJ QpIrdgXAfEC+vAwBiCFqP0WhSzWqckJ+/fhXESWdDj5kwsfY/nxEGYISLSyOAQUE3G/c HcQNc12kqs9qFzzfaLlZ69z0uh95Ivjc4ltIvmsK15sQPA/sUTtCrQ9pI6N6OpKsRj/J 0Nwg== 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=Zr047+Ig3BU6eDg/bMRFoc/P/p0mRr+tcV/kSvt62TE=; fh=2Ks+q1VI5sIi6LqUZH+DJDRf7Od/7+1TAInH7Sedi5c=; b=oODt7bqwOA3l4+Zx6L4BlDUdea/g4EKPXQUhV1TtpH6tYKc4TSff3jAEHAwuBxKRNy /YPwynfqM5+EsBdfnCmTGycDDUFNBqMG22i2UHKaCpq2ORskDoK4BKHOEe0lERmgYl18 0o4uWQKsOKLUPyPb5oX3L1xKpBgmIQzqTLMlrne6JAAmbOG+611I1YQIC+sTFEGBigGD uz9l7H+uriS1AZ1EfjbPqy4qa3rH0ZGTvlLwav0ItZCFPYClej5FcKvMJdnhnOG7Nrm+ fVB5TvVDQQKqqyQecIi2hbfIOglBufISxIpeot2tOUmt9okXqWVh1wMuC9HTTd7j0T9h gyEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SIdGPSmj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id n2-20020a635c42000000b00578a2142861si13382188pgm.531.2023.10.10.23.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 23:52:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SIdGPSmj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 3F1D5812E00D; Tue, 10 Oct 2023 23:52:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344179AbjJKGwL (ORCPT + 19 others); Wed, 11 Oct 2023 02:52:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344699AbjJKGvv (ORCPT ); Wed, 11 Oct 2023 02:51:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95138B9 for ; Tue, 10 Oct 2023 23:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697007107; x=1728543107; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0gdYVVw2Oz6gBYf/B822DQyIKOOjP+ypYh8dXrRo49c=; b=SIdGPSmj2rfaM8BgFpEeADgtb5QjNj5sv5ADREwr7QhoO6Bi8a0ikUyN XrW70lhtK9RLGWXr1c1lynK0m+BOwszXl6H7H8QX4VLCfm5aGZUz/RECG 2yLEMi137Z5vOd5URMr1ZHuSLdLCoDQT2S1x23OEZC/zurC3rcKE65ejT bR1P4C/xAxMmdj6qo31BPU5pLjsCMqb/wVHgltf5T86cwqAfGLSxD6FP2 dSjZHywMok87l1e9/bBMWZkSdm2OdzaFJDqAFpiJ2JqE1DhrxC/YlvdO2 CjsKxy4sspvA+HTct/7DWERZM1TdgaJcGBqt8LSlpoL3B2Tc5HXibMP/i g==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="387436971" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="387436971" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 23:51:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="824050276" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="824050276" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by fmsmga004.fm.intel.com with ESMTP; 10 Oct 2023 23:51:45 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang , Vasant Hegde , Jason Gunthorpe Subject: [v6 PATCH 4/5] iommu: Support mm PASID 1:n with sva domains Date: Wed, 11 Oct 2023 14:51:31 +0800 Message-Id: <20231011065132.102676-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231011065132.102676-1-tina.zhang@intel.com> References: <20231011065132.102676-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Tue, 10 Oct 2023 23:52:32 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779440976834164527 X-GMAIL-MSGID: 1779440976834164527 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 Signed-off-by: Tina Zhang --- Change 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 | 18 +++++--- kernel/fork.c | 1 - 3 files changed, 65 insertions(+), 46 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 dc1f98e12f4b..bd79d4e4af89 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; }; }; }; @@ -1186,17 +1191,17 @@ 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; -} 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); struct iommu_sva *iommu_sva_bind_device(struct device *dev, @@ -1218,7 +1223,6 @@ static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle) { return IOMMU_PASID_INVALID; } -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) { diff --git a/kernel/fork.c b/kernel/fork.c index 3b6d20dfb9a8..985403a7a747 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1277,7 +1277,6 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, mm_init_cpumask(mm); mm_init_aio(mm); mm_init_owner(mm, p); - mm_pasid_init(mm); RCU_INIT_POINTER(mm->exe_file, NULL); mmu_notifier_subscriptions_init(mm); init_tlb_flush_pending(mm); From patchwork Wed Oct 11 06:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp347097vqb; Tue, 10 Oct 2023 23:52:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRQPCnbrXzZWvtdYUnwiomXmJCOgVYS76dYq9/OKThkXg/czi+k1/MtQFRowmvMhupT7OS X-Received: by 2002:a17:902:ce84:b0:1c6:9312:187 with SMTP id f4-20020a170902ce8400b001c693120187mr22466231plg.3.1697007141483; Tue, 10 Oct 2023 23:52:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697007141; cv=none; d=google.com; s=arc-20160816; b=PAF9gJtFOy1LAWtyhACOLvd05qagDqO//9ik0r/plVDXYDENKaF4NBm1mJDgDs9Uw1 GOa6toIAquf79hssyNsPNQY2ivCKDNxvJ2xooM/4TO/Gz89P4N8viU78Wmj+5s4P/sSI MlvywVgGf7qEO2PoIDU72AhoXrXZBfxwGv+hokE4f9tYDmQWTQYIiQ8/FroDtvGZEsMJ NCs/xAJBsNpE+UGihKNsblEcq9SmKX2pnTwGG3EjTYzsCbgzSXUBIjkJ8cc2R880PdTk gD73Ty2/dpMtr9hUScBzRIv3+YnjA98b0NWPBqSUHlGogXxgyCciOPn6wtCd3ZxQ6zs3 iKvQ== 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=2Ks+q1VI5sIi6LqUZH+DJDRf7Od/7+1TAInH7Sedi5c=; b=iU9gBVA/AyCJAvndRuibE6AfuBhro/i1gPgWbJoSbibmBu3cGR7pl6djAKsy8WfzRr 9Q2rYzJp3sLGGc1c5aJU7pNbAQjVt25Ov1aSjbdl2V/yBcIKBiEkKC9Yi/8fZ8ktmN6p P4iqkg3b3DpRpc1owozpV7OrIMx/+urRbVt8j/VXpJj2LIt8vcPwxeBH+JJRT4FNCFI/ OOoA4L23xS1hoTdWI7Dfuzwk6x+KRnEgexPdGGv+2a7BD5L3lbIpRNTT0UIinWQxIqBc w3Z6U38aq3XY/t1SAD/2MtOp9noV3SfIKv7paQy2Z4jCvWVOzYDephwdT1GIIzilfpCZ KVkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HXGIOgIY; 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 lc7-20020a170902fa8700b001c5c632aea4si12952198plb.217.2023.10.10.23.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 23:52:21 -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=HXGIOgIY; 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 946A181A3375; Tue, 10 Oct 2023 23:52:20 -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 S229708AbjJKGwQ (ORCPT + 19 others); Wed, 11 Oct 2023 02:52:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344920AbjJKGv5 (ORCPT ); Wed, 11 Oct 2023 02:51:57 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13591D9 for ; Tue, 10 Oct 2023 23:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697007110; x=1728543110; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/TKSJz2uqhYSu+kqp+Wq9KnZNxzR/1bl8TV8gHaytgw=; b=HXGIOgIY84TYSAaK01wSTCJBstLaSesSkQAZlvV/P11Lnzc+vuhBKHd2 ITPSjyH3IZ4br+/MNsEbNwl3SnOjSkrthUA4SyaRb0QRgUkIjozBTQ4jP hyygv6PRy3zbgV7GozOl3B774FonmgNEEPpPVvYuQ4WGVxeMlw2949Tyq eAE9FwcKiMwb2WQyooNQQYr/c5QvvAgWusXSlds2a9KsLA/Ug71v877ZU ieJDvKsoDqnuP03sohiVwr2yZxRlHZmajnVCVWUNaBzrmqltCllXqvGpf OiNvGWvGozRUqVWWlpE9GSYW4JslSGSVBduPwFM3zbV3lldpYEZX3ZX08 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="387436975" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="387436975" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 23:51:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="824050289" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="824050289" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by fmsmga004.fm.intel.com with ESMTP; 10 Oct 2023 23:51:47 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang , Vasant Hegde , Jason Gunthorpe Subject: [v6 PATCH 5/5] mm: Deprecate pasid field Date: Wed, 11 Oct 2023 14:51:32 +0800 Message-Id: <20231011065132.102676-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231011065132.102676-1-tina.zhang@intel.com> References: <20231011065132.102676-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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]); Tue, 10 Oct 2023 23:52:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779440960464996468 X-GMAIL-MSGID: 1779440960464996468 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) };