From patchwork Tue Oct 17 00:47:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 153838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3818109vqb; Mon, 16 Oct 2023 17:48:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfG4NtkbEV//URexnTOL/aZr5YKy9Pq0RmtcfVgxzkul1gu7/Jb6h2oA4xGILz+dU6/d7L X-Received: by 2002:a05:6a00:1c92:b0:690:d0d4:6fb0 with SMTP id y18-20020a056a001c9200b00690d0d46fb0mr785553pfw.3.1697503723599; Mon, 16 Oct 2023 17:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697503723; cv=none; d=google.com; s=arc-20160816; b=rUwJpXvWrJJNHlxv6xTMSAv2WQ57sYLi8dnZTGZIMUY/+j77xvdIFoqC/Yo3UC4NQQ UlaxUjm+RPV1ihMrBkyvs0dXExg04VkkBWIxPPn9SSLXozm8KvZieEdyFTswkUp58T2o iHPU7Yp1+giMPI6rR4NpdDbXvN+kk7IkhEvHsjIVdKr37Rh52FHOexWO2xrVlFb//4DY sgYNGRePK2AKUvjj6omAaBKOUStvY4bmQxuttjzy5mXO9xhBhZOyQR6c8W7NECBEc9j9 PAxrPYMYRkecJQ9MeIQzUIV594Mtp69xowYo7UAaV9vvOyttJ2fxndTrszcEKN+KxC7r 1Dhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XmOXFJayGzWJ026VhE5olz7mMJo0A9jH97oIEDDGY/I=; fh=dJBxdn+RXcUABM1aUIOqfrsndRxIHilofn8/gNUoPfs=; b=X8lKXR7bnBcU0T5BozTdFakjojTBdJMfsPw1Cry8o112uyqiX6iWJm51KR0179f/0I 4qQXNR5+UDCAHe+Q+m5w7TEfllmp6Zm0zN81t37Q63JgFpGHDxlBpLQBEDM/X3SzRWaI vXygbF9ATyOllEjEMsQRD9TJbGKXgX1g1M+4pBrBCG751m0hF2C5IA+P64D77MCrg4BJ q7XxK2sqRtw+VWr2PWLMUUdtlohdJtW25CJPr0AqsDGYpCLs0cDsOfPkRqLN+5JjFRsR DINH25YigFeog2fLLH3TeOVzAJvK/itxZLpaBbDkPw2XG2bl3jMAuHshW7Dw4OQ7GKrC 5NKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=COi217Q3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a193-20020a6390ca000000b005ace065e529si560026pge.333.2023.10.16.17.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 17:48:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=COi217Q3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E985D805F09C; Mon, 16 Oct 2023 17:48:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234319AbjJQAsi (ORCPT + 18 others); Mon, 16 Oct 2023 20:48:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234300AbjJQAsg (ORCPT ); Mon, 16 Oct 2023 20:48:36 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF5689B for ; Mon, 16 Oct 2023 17:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697503714; x=1729039714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dc0MbEJ8iTAniu2BvDRHDAZHMXmQyjjI1WBQvNDPIaM=; b=COi217Q30qWo7xpV4irRogRaRajAj104o0BmpFQIRwYT52xCtwgZq5Pf ShgQbRp9WTmjBG/lxGrd3H3KgDSsaS7aUweujMEYKDsWbcK7OxvISyvZ6 NJFPQcjse0an5iRSabs/tLf71ZH+yOAbQUDq5e0xVRlgzkamGjGWk1D43 PZ48+5ywx+2FfYU93aAHcyT0SKUGrXlHTNaYy15rhFXveawL3fXijElNd 0qz6B7BUGHge2jTMpsF34DVr+ww9UbLzR/lUBGwpe8lCC5+kA6WJUPKlp v+UCYAu/RWQJfBGiDYRwuVONo+1A7jMW2C6JQldrdCp4Y6CA4j+hCFSZM A==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="382893261" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="382893261" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 17:48:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="705793705" X-IronPort-AV: E=Sophos;i="6.03,230,1694761200"; d="scan'208";a="705793705" Received: from sqa-gate.sh.intel.com (HELO spr-2s5.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 16 Oct 2023 17:48:29 -0700 From: Tina Zhang To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Nicolin Chen , Michael Shavit , Vasant Hegde , Tina Zhang , Jason Gunthorpe Subject: [PATCH v8 1/5] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Tue, 17 Oct 2023 08:47:58 +0800 Message-Id: <20231017004802.109618-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231017004802.109618-1-tina.zhang@intel.com> References: <20231017004802.109618-1-tina.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 17:48:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779961664596916071 X-GMAIL-MSGID: 1779961664596916071 The pasid is passed in as a parameter through .set_dev_pasid() callback. Thus, intel_sva_bind_mm() can directly use it instead of retrieving the pasid value from mm->pasid. Suggested-by: Lu Baolu Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Signed-off-by: Tina Zhang --- drivers/iommu/intel/svm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 50a481c895b8..3c531af58658 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -290,21 +290,22 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, } static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, - struct mm_struct *mm) + struct iommu_domain *domain, ioasid_t pasid) { struct device_domain_info *info = dev_iommu_priv_get(dev); + struct mm_struct *mm = domain->mm; struct intel_svm_dev *sdev; struct intel_svm *svm; unsigned long sflags; int ret = 0; - svm = pasid_private_find(mm->pasid); + svm = pasid_private_find(pasid); if (!svm) { svm = kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) return -ENOMEM; - svm->pasid = mm->pasid; + svm->pasid = pasid; svm->mm = mm; INIT_LIST_HEAD_RCU(&svm->devs); @@ -342,7 +343,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, /* Setup the pasid table: */ sflags = cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0; - ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm->pasid, + ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, pasid, FLPT_DEFAULT_DID, sflags); if (ret) goto free_sdev; @@ -356,7 +357,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, free_svm: if (list_empty(&svm->devs)) { mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(mm->pasid); + pasid_private_remove(pasid); kfree(svm); } @@ -796,9 +797,8 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; - struct mm_struct *mm = domain->mm; - return intel_svm_bind_mm(iommu, dev, mm); + return intel_svm_bind_mm(iommu, dev, domain, pasid); } static void intel_svm_domain_free(struct iommu_domain *domain)