From patchwork Thu Oct 12 03:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp949145vqb; Wed, 11 Oct 2023 20:01:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd6z8WsTOJWZhwWb/Kwdi2zXQih/uNqvlxSVudVrzVdKJW6pB9vU/BdZePTAYV2U25LV3S X-Received: by 2002:a05:6808:6408:b0:3af:6453:2d83 with SMTP id fg8-20020a056808640800b003af64532d83mr21488479oib.2.1697079716185; Wed, 11 Oct 2023 20:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697079716; cv=none; d=google.com; s=arc-20160816; b=VEB79vkszpEbmKlzm+DmAY+765gGvzq+y3yWqhVLPBzw4P5UPkzdh7wdl10N5IImvB zgB9t3GhRHTAqoaDS66Lh/Ve+jRg5qV7fzuwKH50CzA+cbL97BvTKCpJ6RhbmDQFXGhZ UswMqhBTzY/1RVeDuaKekIAdRR+bsY8Tul4VH1+GdFIoU7Pb54W/yomQSlS5sFzY/9vs jyglZD3gRSHQZQZENqvXFDofXS/rZyQhzBE6Ux0zGW6aVQsudFA4qwKGzGjcn6ZXNPk8 E7ZJxHJkPjDwl9ryLqK6950eth1Tr3RL2AwjUF0dNdtFyOcfxDTi4Q9UeyukCfGD02Em A3Ag== 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=tFmNgJLrbbprZYS9qbPoRomUA/KrST8LSFRT//HpShk=; b=DNuhAh7Mf6U5YRi4xrzKcKYQwcIjB5Sbh4Q0MwIIjCHDBVnr86X4Xo3NOgB0XfUPWb UsuPr52/XaBXYRwtUeWXoAInkUrimA9GYfgECUiCc8bKdv1hi7XDJmTQPS22A+p7/nXN CYZCAi+iyyPAlsiNRDe3ZtZW5+orXJgO98DsOk69E64BPqeu4ffrxOhXkBhIMJekBiql MyWwUpn0jjNClzBVUq3L0xtPF+Roe0rlh14Lrdqv3ozXD/E4481j4QIiY+arlB1hObqn ZNG1Te2ge2kUdbmq0F8oC2whoEvQBiNafWA5dBPoV8bz307fIsUpkgmUr1pfVdjBlgbt hP2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=P4MHNHNV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id n25-20020a635c59000000b00563fac86c55si1180814pgm.134.2023.10.11.20.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:01:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=P4MHNHNV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 25CA5801CFFA; Wed, 11 Oct 2023 20:01:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376775AbjJLDBf (ORCPT + 18 others); Wed, 11 Oct 2023 23:01:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234052AbjJLDBc (ORCPT ); Wed, 11 Oct 2023 23:01:32 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B52C94 for ; Wed, 11 Oct 2023 20:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697079689; x=1728615689; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dc0MbEJ8iTAniu2BvDRHDAZHMXmQyjjI1WBQvNDPIaM=; b=P4MHNHNVBakXTPgiL+u3sSqgtnvzJs40v5V4ztSC7fTMNZKZ2icSQ4by 2pYvOaNXPBO0uf66Mi20UxHxBiDFE0cDrJwA+yNBO0wW4t/3jqkwxAzxH pePLejeiMi3Eb4zMyEz1fGjZAZaHmjy3gAeCcDzn6iUSJw0pGPoqm99iD xTHxTUJagliL+6bMNSp46Tjrf28jjAfkbeckL+3cQlMvzSAxSZXIrzrMz /OvfpyfPKDBycTAgiyUEMEd42nrm45kpmcx4+7TVM2MV65XilqbiBKNFz d/9rx1+O2TlhYheDh3KSqJufitglUrRm8CKeX5jFiB0tu7E+Ctd7SDlpT A==; X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="6371440" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="6371440" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 20:01:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="730736505" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="730736505" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga006.jf.intel.com with ESMTP; 11 Oct 2023 20:01:22 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , "Nicolin Chen ^C-cc=iommu @ lists . linux . dev" , linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [PATCH v7 1/5] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Thu, 12 Oct 2023 11:01:08 +0800 Message-Id: <20231012030112.82270-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231012030112.82270-1-tina.zhang@intel.com> References: <20231012030112.82270-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 agentk.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 (agentk.vger.email [0.0.0.0]); Wed, 11 Oct 2023 20:01:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779517060495357726 X-GMAIL-MSGID: 1779517060495357726 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 Thu Oct 12 03:01:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp949292vqb; Wed, 11 Oct 2023 20:02:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDVuBWePI7GUiWAWOUPLnNj2ZjZDLTgm9MMEsj0C4uXtdP0aqTYXAywm+s30ejQMfTrEyk X-Received: by 2002:a05:6358:e908:b0:147:47f2:2d54 with SMTP id gk8-20020a056358e90800b0014747f22d54mr19187203rwb.0.1697079738585; Wed, 11 Oct 2023 20:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697079738; cv=none; d=google.com; s=arc-20160816; b=FvorOG444PBNeWiSNrxgzmmMqFnWikWTBwYn58TMe0tO5nzNh1jIQNERNWQxEF5Phl 7jbO8YDwTse0RfPC43iLZ6f+MEWwWFp+0x2L1d6UCUWQbNrfjbMoSXqda1Mj9b3eo85r KikRsrfgetqP2+h69Fs+09DuAzODntdvehi77YdKVeuwvBgZ7D5HBMfBO4Pu2V/3j6a5 60+KcRsIGE12bKiKeHe+hnmpuGdlR2dB6XH5jIIvfuyIdzEonVR45mGUn1YSpGLH+KAk 69JNhkNQdGBEviIOUm65x6AebM+UdzgtnBpesnohk8g2KA8P0q7pRl2T1al8wxP4hhry 8Zsw== 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=x9bXVLiN8Hr8GR74jNtpurJqGXRmzfjzGS6vRP02D4o=; fh=tFmNgJLrbbprZYS9qbPoRomUA/KrST8LSFRT//HpShk=; b=kmapShDAM6qsBylKFqfx9FopVPV63W9NxvZBptqxMLu9TXhtNeswXlOUJfeqFYCbdP vC5h7Dc87kX3iGQGy2h/RzHkPNxkNba13ukBJMf398RH5WGbQZ/mjXgevourplLZ51ZW aTAoTL3Xy71AuNyEDLpKsGI3Vtwyk9wzkyp4LzKXwxOjKnz8IjTIKnMTLgyQWSjph9Sb kh07RIq1ZopggoVTybkEaSVt+dTW8rWt76PmSkrUaRVctTzY5zLf5pxB5Vs9sgQgcrnL AO75gzm7DqdseR81lBK9LWtBTULBnXTWx4cAPNsa0g5tDfa11RVhFGFwEONl34RvlXqT b1Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=efX+YZYh; 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 c5-20020a6566c5000000b0058543c16567si1126213pgw.459.2023.10.11.20.02.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:18 -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=efX+YZYh; 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 2B35180A8B58; Wed, 11 Oct 2023 20:02: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 S1347050AbjJLDBu (ORCPT + 18 others); Wed, 11 Oct 2023 23:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235278AbjJLDBd (ORCPT ); Wed, 11 Oct 2023 23:01:33 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8B39A9 for ; Wed, 11 Oct 2023 20:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697079691; x=1728615691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bXCBf0KONmWeJaKefN+QKjDV7h/V464jcFy1XNHAt3g=; b=efX+YZYh5/2PoKwdr5XbjWiIgpyiZLHLjV6ICYWcvpNP/r4jSJApNJR6 nQGEq5ERIHuhuv3YJGvmefJCN3hF3pHJNFmwypGbPCr9uzaoLaGq4ymZn RsNIKWQZs5EBiwQY0nnsHm/+AeiaGaN5uSxhAOhBGeobfr/e07Dn9wX3d yk1QD1LVMm0vFwL4uXIm4xWIWR94c7uY5seEqvUQ3s5qrNab5QuzanxEl K+cJr9emKqw/DgsDNqkhoirRmAEtRxDhSRsnsA9mZuHkZCLYWOqMGDQgF AUorxs1OnIMcwtjQPHcYbfKGumfgdFCBqrP3TZQeWRO6szsj8tbMrt8la w==; X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="6371471" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="6371471" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 20:01:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="730736514" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="730736514" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga006.jf.intel.com with ESMTP; 11 Oct 2023 20:01:25 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , "Nicolin Chen ^C-cc=iommu @ lists . linux . dev" , linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [PATCH v7 2/5] iommu: Add mm_get_enqcmd_pasid() helper function Date: Thu, 12 Oct 2023 11:01:09 +0800 Message-Id: <20231012030112.82270-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231012030112.82270-1-tina.zhang@intel.com> References: <20231012030112.82270-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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]); Wed, 11 Oct 2023 20:02:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779517084219338960 X-GMAIL-MSGID: 1779517084219338960 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 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 | 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 Thu Oct 12 03:01:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp949199vqb; Wed, 11 Oct 2023 20:02:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDuwUdVfU5comf23T8yDUvMhHsBbI7iCLer6478B16wvNhYmLaYhnj/4fk2sKeK+pptbgY X-Received: by 2002:a17:90a:3c8f:b0:269:34a6:d4ca with SMTP id g15-20020a17090a3c8f00b0026934a6d4camr20539159pjc.0.1697079726348; Wed, 11 Oct 2023 20:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697079726; cv=none; d=google.com; s=arc-20160816; b=jtQYF8zNLWY1AtBxswtoktt86NkxTkC6EAHYdCb+40rU0gTtnVtm/UI6EKwjSJclcm Ciaj4mWVdyuJ+O1gQ44Sb5miH4liWvZXU5ZoSTK+rBR4bMQJddkSQbLXASR7Ms0wFQzg rnCOEJ7dWAu6yX4utwwRH/dCRudyG2esYP4VbmQc1n8KzUvAPv5Zy6cr9ISXtuW48T7D o++amfqmVeJCPRnvREpWQvjpr1oRHUfKsjEtX1KcoZFl04R608ZNprLzrv6v5aeZSybe 7GY2nVXKrxWjc+L0uCx5GWVRCMBjgui8XLddcrvPBhPesawhF2C9Gsc/cKIYAm5b+oWR D6Aw== 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=tFmNgJLrbbprZYS9qbPoRomUA/KrST8LSFRT//HpShk=; b=Af7t2Py89vlIZK0BFE+O6k/Qb78mpX8Q2mGKKW3D57JmKmkM2tQ/IG+HglogwU+KxU xs1lh3XBUSXXh7/3Ahn9U00fsACrrty/1yfFn9OvEXkjXyGGwWg4bf/SeHOIM7ZQhp5g 1xpp6FxzBVXHPe0UTs7ermaWPPXDBTkQH15NzRbxmbFvNF4gEZkYnLfC8mvq1Wlm4MIZ AfIT8xbXBUS8zW+nEHRAPfMEi4N10u9pBMaqfV1sKIUf89V2r5vrfoaYsJTSEfmRZyWa sce8MZBMKRpVt7ej1dH47zGcsk0JpyTdkt1Zc7LG00jzAJrqQB1unFD+vPH5JX6AhmFZ CJ2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nMAmFjgI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z14-20020a17090a66ce00b002791d2ce94asi1244223pjl.81.2023.10.11.20.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nMAmFjgI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 62659801CFFA; Wed, 11 Oct 2023 20:02:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235318AbjJLDBq (ORCPT + 18 others); Wed, 11 Oct 2023 23:01:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235281AbjJLDBd (ORCPT ); Wed, 11 Oct 2023 23:01:33 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F7DAB7 for ; Wed, 11 Oct 2023 20:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697079692; x=1728615692; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GkJWDBRQ1jsnIIVUcbi2Qvjz1LAX/o3/l8N0hK1jUv8=; b=nMAmFjgIFrHKU8xv4F+Rh97M3pSo1SN7ADVl2vtAkwU/SpMeEqZZcfzd 0V1lSWv3/Ck7voTjETra2J7uZoUMKhSIcjKu5qOzUU/Xy9ym9HKNP3jVL N8Wky6fRvzOZPvi3nVXV4lnRLuN9VUrz1J+UWeStXx/Be2srsnoiNPF47 1gJqgo8ll/PxgUuud5ufhCSuzAB0HZ8rbj6Hv8JswQvJiYYJLqv25YJTZ GMKMFrFwL7O2JOHlqgzWpIrKFlAEDQ1M65xtaV6EaPBgoGS+W1s2qgYbz wilbURvdtqo/RkNld50+vTst52skfW3w8sBrVslzkMK0EXu2S7q8J4hm/ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="6371502" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="6371502" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 20:01:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="730736523" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="730736523" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga006.jf.intel.com with ESMTP; 11 Oct 2023 20:01:28 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , "Nicolin Chen ^C-cc=iommu @ lists . linux . dev" , linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [PATCH v7 3/5] mm: Add structure to keep sva information Date: Thu, 12 Oct 2023 11:01:10 +0800 Message-Id: <20231012030112.82270-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231012030112.82270-1-tina.zhang@intel.com> References: <20231012030112.82270-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 agentk.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 (agentk.vger.email [0.0.0.0]); Wed, 11 Oct 2023 20:02:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779517070937531833 X-GMAIL-MSGID: 1779517070937531833 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 Thu Oct 12 03:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp949355vqb; Wed, 11 Oct 2023 20:02:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPlHTW8lv8TQZDUpUjUYBPMCoEGMFmMhBFjHm8r1CABtQZR/4PYv6TBoq5VHnF7SQGBLyp X-Received: by 2002:a05:6808:1a1a:b0:3a9:e85d:b689 with SMTP id bk26-20020a0568081a1a00b003a9e85db689mr28215625oib.0.1697079746240; Wed, 11 Oct 2023 20:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697079746; cv=none; d=google.com; s=arc-20160816; b=Ua7UUnZ7SDrx+cqu9rw21ygl3Yd6GSvgTGaSRRH/3QLydi3ftTk7dkji4PbYqQz3GM ME60Gue14lXDxP/XVocnuUCnCy30WxZqwOTQXEEQpRXojtVIGceXSbJ0u8nxvF/aOBCc d0lWF68grKXf+g2E6hY5HfD9wsCVyQ3rH0jELtau26fQ9F7iClNb3xP7fpPOsWSYI62o ZjiogSc6tfmarm7UvcxYwWGVeA6FoV2/wecPv9ADBOOERRcHtKEQyiQ00J6etGeRr/x2 Ii+ma79alL/lvF0nRP89qbyNTy6Lc7r5VMtDJrBt8h37claw6XFt4xC7pSW6+DENI+Q5 sY8w== 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=FWZpANh2HZ6Vl388RxY9IBypbwLbikP5WJazDtC0C/0=; fh=tFmNgJLrbbprZYS9qbPoRomUA/KrST8LSFRT//HpShk=; b=QdNhTuekDe69rwxDQ/QlHeQHwKZjAWdqPJaLYATNu/M0bOgWHLBoEVqxS7r8vB2inf U+3ccD8QZmwSHp811VRkF1/E164zpvk4b7kNkSqzkqlnPQ/XcsO1h6qqROceh0Fzi0Va m4Frz58dkMXO8H9edH89PRjdejNW8u6kfsdtvTHOoWpjMcR5o6tAbh5UwQnTm5Zfzl3N v8/8aB0/gmXjrcbufxqOhMxnb8hOnNqXSmbcwwHvWhzfprZXnplYvfvDRqvyMfoMy5xp DnDZC1SYyym3hoder+P4ER7TGjUQdEWEYG1frHnNJ5FZGCk5KjgKaYHLWlOSa03X4xKp NcFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AVKX+sBs; 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 bu23-20020a632957000000b00578b9757214si1095858pgb.163.2023.10.11.20.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:26 -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=AVKX+sBs; 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 83B7880644DD; Wed, 11 Oct 2023 20:02:23 -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 S1347069AbjJLDBz (ORCPT + 18 others); Wed, 11 Oct 2023 23:01:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235244AbjJLDBn (ORCPT ); Wed, 11 Oct 2023 23:01:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E783C0 for ; Wed, 11 Oct 2023 20:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697079694; x=1728615694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kkKH+uTlnhRFeXQlDjPdyXZlJ+N82DJ6HJj2xSwbyGk=; b=AVKX+sBscugGjkTGL8SsX6GXVSkGMzqAKoAcTFNVQajY0kAp3NzfcsVb a1I2RMV4/TUC7FtC4bXJK434O52h4OZR0BydozMiB/DL174Pp+e5yGlQ7 WZPjbSQcZFk2WmR4a9sQQIXyvx//Wi9jvdlw3ETTyiFj1oZX9IJ8scU+E SFgkHA2R80c6Kt6Da558/fyjdWI7rG3VQ/Q6v13s27tpxkJz0eonq4EKJ Xl7FONUB5bSu1mbJp0hGBlSEoF9cfP62Kh8VtfqUqm9pyEZIezs1iKPhN nLBwmCE1HCiYszMVABJnnOQAg/0TBmBqyR3s8wdhw43g/jYH9S3lHeNzT g==; X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="6371527" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="6371527" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 20:01:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="730736536" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="730736536" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga006.jf.intel.com with ESMTP; 11 Oct 2023 20:01:31 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , "Nicolin Chen ^C-cc=iommu @ lists . linux . dev" , linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [PATCH v7 4/5] iommu: Support mm PASID 1:n with sva domains Date: Thu, 12 Oct 2023 11:01:11 +0800 Message-Id: <20231012030112.82270-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231012030112.82270-1-tina.zhang@intel.com> References: <20231012030112.82270-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 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]); Wed, 11 Oct 2023 20:02:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779517092192686493 X-GMAIL-MSGID: 1779517092192686493 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 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 | 22 ++++++++-- 2 files changed, 73 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 dc1f98e12f4b..cf5ce11fe473 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,15 +1193,26 @@ 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); struct iommu_sva *iommu_sva_bind_device(struct device *dev, From patchwork Thu Oct 12 03:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 151677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp949382vqb; Wed, 11 Oct 2023 20:02:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkQXfqolYmKMbupe6ejZnxcHVhrwlmN48DjnoYCjuZlWOjkpf6FPCJYJJ5Chw28ZfRo7SH X-Received: by 2002:a05:6808:181a:b0:3a9:efde:a022 with SMTP id bh26-20020a056808181a00b003a9efdea022mr28618612oib.5.1697079748336; Wed, 11 Oct 2023 20:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697079748; cv=none; d=google.com; s=arc-20160816; b=pA0iz/KKORSjaO2nz1kUDqQ+mNf+hAUJt55FvAajPp/foiHks44LCQfh5sqMkq7bQT veXYXqQ7iLv4ksUCU8d6IlcdpsZ02cLmqLWWLlnDOtzN5U7pi9f/9+QpA1dPWepFe46l Xs7PGsBPgJ0U5cLbklQIn3bG06AX7IQrmPNZMeto3338qnXZ0qA/X8UFa8RzwtO6+sUY 7P0QUkpOSccK6S0ybSFsulYUxCfY8lCcYkxsAZ9Bs799Lai5nDjYqKERq5PMbOWTO54b XXHJ1ZUGUqd1bxgMRHzr4pi+TSz+anjtAgJzqNgujdZWogFdg18WZChH1UAX0deFrq7u 9Vkg== 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=tFmNgJLrbbprZYS9qbPoRomUA/KrST8LSFRT//HpShk=; b=HsQ0sERM6MROeE2W7WQfzWLCIDR8SKlqgDeSkBTrX231K4IRlLHo48JUsGlfQmg97I /CAQ2O060fOyRbjcZk/xtC7U6hyDPw/fE2/mFjJrXtGtGErnZzttvGHCHEGbdsu4HYeR Sra0XUk643T48LW927ZIpxFsAiQiQs0DO4bmZxwDAf8mC0YqWCMWCDI2D6gBrQSIHcEx cug9CYIl6G0kISnTn65B3T/qHMcWyH8VXXt80KfzJn0O3YNWHRrxFqPBjRjvYQgasuVr sJ+gLp882gx8bKWhPrJVLqhFGKcwod99KQ3Dr71S5FkvIJqvjE8UKwO6/PVArCf05g6P wnYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RagMMJOR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id a70-20020a639049000000b00565ecd01399si1144308pge.783.2023.10.11.20.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RagMMJOR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id BE26F8030D05; Wed, 11 Oct 2023 20:02:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376835AbjJLDB7 (ORCPT + 18 others); Wed, 11 Oct 2023 23:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235296AbjJLDBo (ORCPT ); Wed, 11 Oct 2023 23:01:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81084CC for ; Wed, 11 Oct 2023 20:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697079697; x=1728615697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/TKSJz2uqhYSu+kqp+Wq9KnZNxzR/1bl8TV8gHaytgw=; b=RagMMJORw7AFTKjHbU0sHTDGtfkX3cKIEtggwQXU+c8Whz4RBvBZexBl SbYrYG3TqlscKMjE+cAJ4bRaoHe/gmTu8ViLfuEi+amIYsbDTxpCPkMG+ Aq3GcDpKUokbCxiolHN4B7DV9s0V5uypcFtOvXqZzuMMUZTL0/0pUV8rH acklAy3Wl6el2hFnkhjlsRubRPGMDa3sRTY8Qc9QAJmyiZOFFdfBj2r5r kW7eFP9iby4JTu3sW65utog2f47oyyQ1YIfq9MViVYEtzKttGhI5KxEmZ tJ/lUKEKjL57ZUEuGHO+D1IAmrFI0Juujx5q131eupqYRugEaOORCvXgN Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="6371548" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="6371548" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 20:01:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10860"; a="730736541" X-IronPort-AV: E=Sophos;i="6.03,217,1694761200"; d="scan'208";a="730736541" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga006.jf.intel.com with ESMTP; 11 Oct 2023 20:01:33 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , "Nicolin Chen ^C-cc=iommu @ lists . linux . dev" , linux-kernel@vger.kernel.org, Tina Zhang , Jason Gunthorpe Subject: [PATCH v7 5/5] mm: Deprecate pasid field Date: Thu, 12 Oct 2023 11:01:12 +0800 Message-Id: <20231012030112.82270-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231012030112.82270-1-tina.zhang@intel.com> References: <20231012030112.82270-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 howler.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 (howler.vger.email [0.0.0.0]); Wed, 11 Oct 2023 20:02:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779517094194607814 X-GMAIL-MSGID: 1779517094194607814 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) };