From patchwork Tue Sep 12 12:59: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: 138388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp620572vqx; Tue, 12 Sep 2023 12:05:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4MxpvDuGxxFdCUEIhUqdy+fi4IvtSnyLJJhxHvp7NtFkog/MedMaWfP563anU0vcnfkSY X-Received: by 2002:a17:903:1c5:b0:1bb:55be:e198 with SMTP id e5-20020a17090301c500b001bb55bee198mr769321plh.0.1694545510230; Tue, 12 Sep 2023 12:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694545510; cv=none; d=google.com; s=arc-20160816; b=r+h12BAgHzIlc4tvB0+6NOjY/4JdoBTp/oNtzWu04LrvO1JHgmen4QO9Yajnu6hn95 Pcn/t7IqWCRNS2oDh3p6vMDn1mVk04+sy6vQsu2UADQ5HntLzYOS15PO6IZfTWoi4GjY /oVDv6Aw+FpQUbUOO6w4xkFLT3UYeJ/Geev4rqMeSGkjLlH478NoHCz+Oj2u8QJkozfO 0RAXfY39HHbuYeZn8jCdy1jWAXVUOQzJ09wM7+Gpb/GqANuw3l419pLMWkYNirhmlftH HFUhjl5/WnLD3C4x9diGtju/2Q/lW1d0PHpmLURppuUVQudQoW0u3T4834exA+LZsYw4 Av7A== 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=kyD20IWhVaNZrswDkwvGF5JY8PTtcHOyFU4S4oYzpR4=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=D7Ig2tu+fJxjUBhHE+9xqUXPZdu0679197OGuQpWwsfZz+X/b1Z7j2s7RJTrimfSvt jFNCbeYaiQnkpWch7RwGtwLoAwRANrwxejhrOPRpvkggc6YeY21MGd6zvSSKv88qd3Xm 9Q7K/Zp1fbeFDokqzyH5pRAeIafv/r3pX4fNm7ZfFAyvUQz9XRgOMX1s97lErDr8X4l5 c14psivOWOG8k8axFCC2Rrl3jsYYD1vSFiuSs3QIIB8uW3EE4/ORtq/5coRpadTcF5By QrecRwMaVJ3htjR6hEv9ePOOKFTm9uP5wFPiYd28W9FyRWqBhRQ/HOSDWVwj9yDT7eMd vFoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=N00++X9z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id j3-20020a170903028300b001b9d180fd9asi7453435plr.121.2023.09.12.12.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 12:05:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=N00++X9z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id B694881DF778; Tue, 12 Sep 2023 06:00:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235320AbjILM74 (ORCPT + 37 others); Tue, 12 Sep 2023 08:59:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235286AbjILM7y (ORCPT ); Tue, 12 Sep 2023 08:59:54 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3A9310CA for ; Tue, 12 Sep 2023 05:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523590; x=1726059590; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UkPWO7fE+y65rWaaiU51i7SbuwuOUve8DJxS805k7Cc=; b=N00++X9zH/0nN6kfLAvBgu1HD7US1jwF4ZJPVkFO66iwnf5EawzvFGNp 5c6LA1gRLXmB++JakeSO1PlWwD6LAPDZhqJ//AlUIYqdlpBMgqZ646w7X v0DirHzDrBun73YR/5yeAzis9/M9EgCOL30IasVWCMr1efYgq3Q+p/1Q3 YnPXEj8piU5CZhDUjO2qNQjs0fq5nHT7nh81G+Gs8C2/x5B24g7NV1kNJ fo8hctZA+OGC/+SWXKxzgU7oQ1zUKUputRglXziE0X6Q9B7sEvZSh+WK4 ygyfUqarcxlDe0YbQEX0ME0vmClxRhU+3+AJJSbEhoMf+81ROccLIi3Tk Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277303" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277303" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799246" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799246" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:48 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 1/6] iommu: Add mm_get_enqcmd_pasid() helper function Date: Tue, 12 Sep 2023 20:59:31 +0800 Message-Id: <20230912125936.722348-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 06:00:17 -0700 (PDT) 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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776859752829283105 X-GMAIL-MSGID: 1776859752829283105 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 Signed-off-by: Tina Zhang --- Changes in v2: - Change mm_get_pasid() to mm_get_enqcmd_pasid() arch/x86/kernel/traps.c | 2 +- include/linux/iommu.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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/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 Tue Sep 12 12:59: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: 138189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp414660vqx; Tue, 12 Sep 2023 06:40:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0lv7POWi7i/6bu7iZfqq7Ex2sEc7WKdaTWMgeRFebYPm0c990ZZuPSwJuMTKkYejELgs5 X-Received: by 2002:a17:902:a5c7:b0:1c0:6dcd:453d with SMTP id t7-20020a170902a5c700b001c06dcd453dmr11290553plq.20.1694526031568; Tue, 12 Sep 2023 06:40:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694526031; cv=none; d=google.com; s=arc-20160816; b=emgy01NIVgt/KFFlXHs4YQNuJcuoJ7mFdyf/GhOlnSif1lCAwQK0DqWjNerYczkSib oNW0AYTw2bIEx450/Aq/i7BVtb/v4+9G2oA7p4i5IeiDixh7YNJtoGG+oMhpdId8V5/x XRn3Qh1vNaZKQEyqK16wk+uL2H+QCdopfZ9j2ZC0VZ4VUkUDuv89EB8qe+EalIGfdPxn 1YqpxJT1o8i/XXbuIjrTJ11TcafbFaHcHL/QC8UjwOsOmPrTYiISjg6EzAExMW5TMpfU rE/sEWjzFo5yCMV5bVQvgDpoXVIdOVdAncDFiydQmU3NRkmRAhVBkNC3YfZbnVJ191DS W+EQ== 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=4gjICGx4WCASMpHl4lNwISwav25pnY+x58hru6m066c=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=trRiGmGJGPJTVsGqGTQgvHLnFsCSP5oj+rRonXbwSUqeyRzzhTAVuAoz+3eUiI1LlD J08Fv7WH45tP7uol2XfhpptrGHJPQki/mi5K1ZLWzsYyKfNBrkpN55PxXp/l9tkiGYs1 LaGR7aLc5pCzUYqdnnwpWpUXkG+AWpg7rfzYHN6qHcBIAvJL1ODItKaRZo5VrL1+zn9m jz3PEL5ImunDwgpQyQn66oTV9+9AAsoPRparqEnQYlxOdPngje3J2+nflDys75KIT0Bf ZgiT5pHbY4epE0BOPaQvT3+fgFvLgp9BspBCd9J9JwiPOUKTVm3+dzO+1hVF1J/qGZdV QjaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="ctsn/YQl"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id y4-20020a17090322c400b001bb42c27496si8418460plg.233.2023.09.12.06.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 06:40:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="ctsn/YQl"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 9914E826ECBE; Tue, 12 Sep 2023 06:00:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235378AbjILNAF (ORCPT + 37 others); Tue, 12 Sep 2023 09:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235295AbjILM74 (ORCPT ); Tue, 12 Sep 2023 08:59:56 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2254510CA for ; Tue, 12 Sep 2023 05:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523593; x=1726059593; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KfYy3F3Rl5zG+xoLgJl8yhPbh8RLafKcWQHwtyfaBaA=; b=ctsn/YQlCzuijcKACTjr1fTFFtXC8ktxPlPvxhhyF+YGufmMogWAWiIs F7y+xrlqSmpVs25DThcithpXcl1/kN9vB+DFbdTGK2iqJspbx56fFyYBd gAgscOmnsw6ExakZm6IAhgqx64UKTta00ilkqEtQkOi3h3fikdX4tFC30 1T5Xw+mEhvM0Gp0IEUkHSe1+8J6MvnwQ3fiWo/5yHWyz1LFPyfU1ucCQy QDrecmjuL6miNLhRItLjyOQx3MSdGVLMBze9Gu2RtiShT9l0yoU3nBi9h xf33fS7gIbCCNF0oLlE5Y7PUYdafVGtBeT2rQrpDER+jHK1beOE/KtNrO g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277313" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277313" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799297" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799297" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:50 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 2/6] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Tue, 12 Sep 2023 20:59:32 +0800 Message-Id: <20230912125936.722348-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 06:00:15 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776839328130475424 X-GMAIL-MSGID: 1776839328130475424 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 Signed-off-by: Tina Zhang Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe --- drivers/iommu/intel/svm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 50a481c895b8..3c531af58658 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -290,21 +290,22 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, } static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, - struct mm_struct *mm) + struct iommu_domain *domain, ioasid_t pasid) { struct device_domain_info *info = dev_iommu_priv_get(dev); + struct mm_struct *mm = domain->mm; struct intel_svm_dev *sdev; struct intel_svm *svm; unsigned long sflags; int ret = 0; - svm = pasid_private_find(mm->pasid); + svm = pasid_private_find(pasid); if (!svm) { svm = kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) return -ENOMEM; - svm->pasid = mm->pasid; + svm->pasid = pasid; svm->mm = mm; INIT_LIST_HEAD_RCU(&svm->devs); @@ -342,7 +343,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, /* Setup the pasid table: */ sflags = cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0; - ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm->pasid, + ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, pasid, FLPT_DEFAULT_DID, sflags); if (ret) goto free_sdev; @@ -356,7 +357,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, free_svm: if (list_empty(&svm->devs)) { mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(mm->pasid); + pasid_private_remove(pasid); kfree(svm); } @@ -796,9 +797,8 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; - struct mm_struct *mm = domain->mm; - return intel_svm_bind_mm(iommu, dev, mm); + return intel_svm_bind_mm(iommu, dev, domain, pasid); } static void intel_svm_domain_free(struct iommu_domain *domain) From patchwork Tue Sep 12 12:59:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 139570 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp325815vqi; Thu, 14 Sep 2023 05:56:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnrDTakBLtXcDoyxCZwWrUANlJTxEzpvFYUCA/dTRuDxn1ve3bMaQ/TuXWWR1+c6XnX4h7 X-Received: by 2002:a05:6a21:7988:b0:157:e67c:59 with SMTP id bh8-20020a056a21798800b00157e67c0059mr4590252pzc.29.1694696213990; Thu, 14 Sep 2023 05:56:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694696213; cv=none; d=google.com; s=arc-20160816; b=RrUP6beBNv9cHXFb0tYuWDQw4GLeELIVg05kqhZF+DM6KuKS6gPs9t/WE8E2QLAHD5 FYigHDGpiTNd7MfOdotDH5ylmaY7dI7F4LgS8yTYfztQSOvU1hGSiQavRLTFByr0SJWI np/2HAmCDSI5a4aMkWkzSr6n0jusP0YYeowkycAuAP3K6yshPFe6wF0f7XAuZvKVAI2P Jur4fFkUVRH7NSZotMVjyjpcTUkeZ9Iyhj7+r99x4Ovmew+2jV/4/RHIwGOFOyB/BkZQ IzV98meJLDrmgloVx2OVJYUunTFnj3IBuEnZmJDygk5DGzy5frKEHRHPbrzJF+lbrMB0 UOhg== 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=1iZIvlQa5pXt8UQjFw1F25c4K9F/kTnWuMnmUfKrJy8=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=GpWA9D7NFxZUZRpq2lUSTqrAgvdpEcYLO4Cx+qdoGaRjUkaSI9jUbSbHvne0NweE2Y QN1WMNc5S2O23wzxhR8LypsVz/ofxjgK6dSqukIakORAAswohXPYMmt0TYBhGrgx4IQp YtMW+zXlFzNZciXowYFd5hTwdV7K3zMJRfz06J4Kx6GVomnnhcBJXuG+qHogtRRlDy0p QOl2Y56BwEKcqBdeSDnYcY0SGrLJYwl1eZBd1o3HaIPPOANT/SOxo6oy2xJY3wZ6YuBx hgfv8fT3pAkk31Z7aET1J9URPtVhejHSW+dnXNi4S71YNR9e23/nWVZXgobg3nf/K5Kv fDFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ef+P3D9n; 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 p10-20020a056a0026ca00b0068e2f34e100si1525064pfw.67.2023.09.14.05.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:56:53 -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=ef+P3D9n; 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 DED3384FF2FF; Tue, 12 Sep 2023 06:00:15 -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 S235413AbjILNAI (ORCPT + 37 others); Tue, 12 Sep 2023 09:00:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235339AbjILM77 (ORCPT ); Tue, 12 Sep 2023 08:59:59 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A086510D8 for ; Tue, 12 Sep 2023 05:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523595; x=1726059595; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uWBODskc0U2+ZZHSwiVmG/haTZP+gN8VzdgvjDqfqdE=; b=ef+P3D9nrT1m2ExT6RdxbbnddiVWLvD/uMqP0qIjeJBxQnaDPDoTTYRv XUkTfTwhzz8UDC3+MV3k/cQU6AAXwIhE/dg0Xi38WhSm+5vQDclpSZrLG 0HF8iOJMB/x4RSSfA1xnajEu+naI0pjSim+Lh2biyYasvM+xVAHUGfeB6 WQKbg8x/DoOGUhK+hGGCpBICIwdeeNFmD02xR0EOTvtf9Sd9PTsjmuZss 5ozt6/YXXjKiVsV3TX6uyyCdhD9FodJ9p0C/Gisx2spF1Kf/OFvui6uS/ Y0iay/9scLLshvh6pdtj0bJT01RcHZ/Cjc5sPJT137abNCXJoLOFVbJhi g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277321" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277321" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799310" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799310" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:53 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 3/6] iommu: Introduce mm_get_pasid() helper function Date: Tue, 12 Sep 2023 20:59:33 +0800 Message-Id: <20230912125936.722348-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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]); Tue, 12 Sep 2023 06:00:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777017777037646800 X-GMAIL-MSGID: 1777017777037646800 Use the helper function mm_get_pasid() to get a mm assigned 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 Signed-off-by: Tina Zhang --- Changes in v4: - Rebase to v6.6-rc1. Changes in v2: - Update commit message. - Let mm_get_enqcmd_pasid() call mm_get_pasid() to get pasid. drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 12 ++++++------ drivers/iommu/iommu-sva.c | 12 ++++++------ include/linux/iommu.h | 10 +++++++++- 3 files changed, 21 insertions(+), 13 deletions(-) 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 4d83edc2be99..dbb3af323ede 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 @@ -215,7 +215,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_pasid(mm), start, size); } static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm) @@ -233,10 +233,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_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_pasid(mm), 0, 0); smmu_mn->cleared = true; mutex_unlock(&sva_lock); @@ -290,7 +290,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_pasid(mm), cd); if (ret) goto err_put_notifier; @@ -315,7 +315,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_pasid(mm), NULL); /* * If we went through clear(), we've already invalidated, and no @@ -323,7 +323,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_pasid(mm), 0, 0); } /* Frees smmu_mn */ diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index b78671a8a914..0f956ecd0c9b 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -23,7 +23,7 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev) mutex_lock(&iommu_sva_lock); /* Is a PASID already associated with this mm? */ if (mm_valid_pasid(mm)) { - if (mm->pasid >= dev->iommu->max_pasids) + if (mm_get_pasid(mm) >= dev->iommu->max_pasids) ret = -EOVERFLOW; goto out; } @@ -73,7 +73,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm mutex_lock(&iommu_sva_lock); /* Search for an existing domain. */ - domain = iommu_get_domain_for_dev_pasid(dev, mm->pasid, + domain = iommu_get_domain_for_dev_pasid(dev, mm_get_pasid(mm), IOMMU_DOMAIN_SVA); if (IS_ERR(domain)) { ret = PTR_ERR(domain); @@ -92,7 +92,7 @@ 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, mm_get_pasid(mm)); if (ret) goto out_free_domain; domain->users = 1; @@ -124,7 +124,7 @@ 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; + ioasid_t pasid = mm_get_pasid(domain->mm); struct device *dev = handle->dev; mutex_lock(&iommu_sva_lock); @@ -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_pasid(domain->mm); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); @@ -208,5 +208,5 @@ void mm_pasid_drop(struct mm_struct *mm) if (likely(!mm_valid_pasid(mm))) return; - iommu_free_global_pasid(mm->pasid); + iommu_free_global_pasid(mm_get_pasid(mm)); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a4eab6697fe1..db2510da28c1 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1189,10 +1189,14 @@ 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) +static inline u32 mm_get_pasid(struct mm_struct *mm) { return mm->pasid; } +static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +{ + return mm_get_pasid(mm); +} void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); @@ -1215,6 +1219,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_pasid(struct mm_struct *mm) +{ + return IOMMU_PASID_INVALID; +} static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) { return IOMMU_PASID_INVALID; From patchwork Tue Sep 12 12:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 138339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp578639vqx; Tue, 12 Sep 2023 10:51:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IES+PKlfW0OGd29c5dA0VaSCqez/yiYsv+RPEp6w22HMsCUc8Yv9w/aFGv6Vy/HtFWMjcta X-Received: by 2002:a05:6a20:3246:b0:157:877a:5f5e with SMTP id hm6-20020a056a20324600b00157877a5f5emr85497pzc.61.1694541078274; Tue, 12 Sep 2023 10:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694541078; cv=none; d=google.com; s=arc-20160816; b=D3Stzgrfprr2bIrx5IV1ziYZmJR2vgPu3lpeFi1ICfQZEw+XBwTPu9DYH6aRtaqW29 m2xTa8PF5zxZgGQAFBEuMKHgHy7QTRa77JsTaDUOGHXa96PqKPxJQ5Ng9QTT9XOlOQYD AE3kXyHH54JBTlSPytOz0BmShsGh3EpewV5+3jbpKyfwC8oBxlKZsjEPMMKLvg9jgTaP C+aLgd+fT0GaYdU0zRBMb40jkDxF89AdCMaNEE1DJuKsfYAanb+cLqM5z0N/hKDS18pj jEyXyez8tZ52quQcnZYYXh2RqKSYfO8WeAIf2CLxGbmjvplwcz3i/fZomVaTPVFRXVjn vKmA== 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=41gBt8KHX1wv3wQueAkK+8oubH9Zs7QDaq3ue3VSfqk=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=SY+USq/3hlBiJBnRc3uhX6S9/NtYqa5mCTWiLpAoLE/Lr2ZPMf8AJxACSOzIcLiIAC cw/maw04dJq7HbzSAOhIJ4y0Oqbi+LeHYVcHTXoITOMiQlRsOGJt2tDWUvpebO6MLfNX FxqF13RgQK7OpygoJMsl3ORQhotDaxiRj+I9h3ywWKFURkgMxzYjNeyLCh9Kb/21gsHB EJi+jKBnTvB2AZp40QhpZSZ5jd5tRiB5/q4Y+ybD3NSs9+IVvjOcjXino8YT6n0qaSbP GygFcWUO3kZtodJsIb7wMdCWSSE+0oXU4gbEXrx74UkUAhbtujfv96uV10u4niaTfB9U tvtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bNG97GLa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id p16-20020a056a000b5000b0068e3b9aeefasi8621315pfo.138.2023.09.12.10.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 10:51:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bNG97GLa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 72CE681F9661; Tue, 12 Sep 2023 06:00:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235434AbjILNAO (ORCPT + 37 others); Tue, 12 Sep 2023 09:00:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235357AbjILNAD (ORCPT ); Tue, 12 Sep 2023 09:00:03 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B02810E4 for ; Tue, 12 Sep 2023 05:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523598; x=1726059598; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CH0kLtQV/Lrtt2u1C1f8cD+t2SUUqoIwKlnXYe5Qiqk=; b=bNG97GLa5Rxvbsh0RMYwtn2PdPq0HPf8cZEvGFnhBcjObM9rjqOcp0ud 1Tg99gMcAcNFfZpHA2Yo4Ey4zojRaKVQmzSAuo0bRJk5zGfgxgnS1GvYM rXpXZ/9F7lT+Vj2V4RUZ5Ycmbr4WaxTfQU953GVwWliXuB5PwO88QJivC UIFDHbsXUcAnuXXWjYTXs1zuElxckpQZsuC+hLU93bv4EnAiPoZepcGJL 5ajnx/xznG4o42x4lESlCLDyi0RZ18GX99ZYkeGnNc++LPLlbQncbG2AP xcPLR9qNDzyTW8Ocpvwdza7/9SFSQeTXTxosJfED7q6+purirndOvJoBb g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277329" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277329" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799347" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799347" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:55 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 4/6] mm: Add structure to keep sva information Date: Tue, 12 Sep 2023 20:59:34 +0800 Message-Id: <20230912125936.722348-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 06:00:59 -0700 (PDT) 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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776855105592623041 X-GMAIL-MSGID: 1776855105592623041 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 Signed-off-by: Tina Zhang Reviewed-by: Lu Baolu --- 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 db2510da28c1..b9c9f14a95cc 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -670,6 +670,11 @@ struct iommu_sva { struct iommu_domain *domain; }; +struct iommu_mm_data { + u32 pasid; + struct list_head sva_domains; +}; + int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, const struct iommu_ops *ops); void iommu_fwspec_free(struct device *dev); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 36c5b43999e6..9f4efed85f74 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -670,6 +670,7 @@ struct mm_cid { #endif struct kioctx_table; +struct iommu_mm_data; struct mm_struct { struct { /* @@ -883,6 +884,7 @@ struct mm_struct { #ifdef CONFIG_IOMMU_SVA u32 pasid; + struct iommu_mm_data *iommu_mm; #endif #ifdef CONFIG_KSM /* From patchwork Tue Sep 12 12:59:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 138445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp693786vqx; Tue, 12 Sep 2023 14:36:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHT64SjK2rPe9EAxH56nD0AdQJzLxmuAKDmg1YkfW5QlZijg/5p9ZTSixxKtxtxTBUjxBZj X-Received: by 2002:a17:902:cec2:b0:1bc:506a:58f2 with SMTP id d2-20020a170902cec200b001bc506a58f2mr1189627plg.46.1694554580975; Tue, 12 Sep 2023 14:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694554580; cv=none; d=google.com; s=arc-20160816; b=SIIyyDZnOw+kx9GlV7pzD8Zk6QV4kCBUPp32eTQESVJLIPJZftwEbmBxrz++mYXvZ5 Bo5XyD9iuHfbL4/68SrLGCatLS8Vv90KfTfzQUjir5GKdT+PCHbESDBL9SbCUxRhj4Fk Hg6QNI2K8Tm+XkOC01fg2hhKnv5tvUtFOZ9gMtaPoiEgM0/HfBXz5/C+xLohlwFNXLHE ITE3jbb666cbDWp02BplN1Wobu9eBkO4+/Gl8C/WONjAaga30+Wg8i9g/ibFJhVVLC9q 2awi+R6qK6zOjGpwEuzE6N4Kl9iPfr+aanr3foopKQdOV3ZugyNpDxBLOhLFTSLDFYkZ 8rcA== 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=fdesQZDa1MZt9gK0z68PS6vtMB5hB9RLzkgOxGWZ04c=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=wUPOwXEb6blXE3KyVJy+aWooxebMA2RRXtpxSz53goRuueI9OhhDP5QA6N3QOzOV59 fa+yWfuTJjL682EwuXdcm4wGYCONf5GCMbZPEwhtSzPdKsrofxGcwQpHQl0iU7oXnNZZ s8l4JI/bEBas+ABdWC422ti5u3uETJFTKL68/nJN36dEFpnNkctsGPgN95V1V5kHW+qW szBBHbpWKE8ON5Iv4Y719Hg6ngaP5bult7Ad8hbxnohR2DWoBvRRxpxTu3KDRJB1Lwaz NfTRCE0fsqFlnSY8rOzRCtVcD1CxD2a4VofYjrCnLuDJesDcQOcOEFOjKG6N+bEYRMk5 oqCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=baxNtPxo; 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 ij24-20020a170902ab5800b001c38c268dc1si7749763plb.455.2023.09.12.14.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 14:36:20 -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=baxNtPxo; 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 32CF585140D1; Tue, 12 Sep 2023 06:00:23 -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 S235312AbjILNAU (ORCPT + 37 others); Tue, 12 Sep 2023 09:00:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235359AbjILNAG (ORCPT ); Tue, 12 Sep 2023 09:00:06 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFD321708 for ; Tue, 12 Sep 2023 06:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523600; x=1726059600; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AEtCz5QpNJCBOMV7ymtz3/MrKBmhEezCWjutjk26iYk=; b=baxNtPxotf1vm9fI4s0Mxr73l8u3dRKAUEO8wI5dacxOV+GuNiOUey/2 hBabKVZdLW0WsjMdv5KJkvsO8bJ4Q/OdZPK09qtJhUH+qXZUiOsaHJl5K l2+DmlEAOUcQLK01h68YHQI31r/TK71wJeAxInx5RlsOyVs2/W4jyJNdm aSfVqkXhUTX/SfHPBI9SE8PtaqkIADm/je9NYY//9kuE6LLzCdqkZnqbc 7/RCSaf2jiasv//75kwv0ujBKfQXFuMTZKjB/0ZkR49QH+hjueTqzbZub u+dRh+4O50ugptbB4J7Oq88ws80RhBilGP5tq7CA5KICA1HXu4kt0GYOC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277337" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277337" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 06:00:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799351" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799351" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 05:59:58 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 5/6] iommu: Support mm PASID 1:n with sva domains Date: Tue, 12 Sep 2023 20:59:35 +0800 Message-Id: <20230912125936.722348-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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]); Tue, 12 Sep 2023 06:00:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776869263949788663 X-GMAIL-MSGID: 1776869263949788663 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 Signed-off-by: Tina Zhang --- Changes in v4: - Rebase to v6.6-rc1. drivers/iommu/iommu-sva.c | 35 +++++++++++++++++++++++------------ include/linux/iommu.h | 14 +++++++------- kernel/fork.c | 1 - 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 0f956ecd0c9b..79779bbef653 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -15,6 +15,7 @@ static DEFINE_MUTEX(iommu_sva_lock); static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev) { ioasid_t pasid; + struct iommu_mm_data *iommu_mm; int ret = 0; if (!arch_pgtable_dma_compat(mm)) @@ -28,12 +29,22 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev) goto out; } + iommu_mm = kzalloc(sizeof(struct iommu_mm_data), GFP_KERNEL); + if (!iommu_mm) { + ret = -ENOMEM; + goto out; + } + pasid = iommu_alloc_global_pasid(dev); if (pasid == IOMMU_PASID_INVALID) { + kfree(iommu_mm); ret = -ENOSPC; goto out; } - mm->pasid = pasid; + iommu_mm->pasid = pasid; + INIT_LIST_HEAD(&iommu_mm->sva_domains); + mm->iommu_mm = iommu_mm; + ret = 0; out: mutex_unlock(&iommu_sva_lock); @@ -73,16 +84,12 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm mutex_lock(&iommu_sva_lock); /* Search for an existing domain. */ - domain = iommu_get_domain_for_dev_pasid(dev, mm_get_pasid(mm), - IOMMU_DOMAIN_SVA); - if (IS_ERR(domain)) { - ret = PTR_ERR(domain); - goto out_unlock; - } - - if (domain) { - domain->users++; - goto out; + list_for_each_entry(domain, &mm->iommu_mm->sva_domains, next) { + ret = iommu_attach_device_pasid(domain, dev, mm_get_pasid(mm)); + if (!ret) { + domain->users++; + goto out; + } } /* Allocate a new domain and set it on device pasid. */ @@ -96,6 +103,8 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm 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; @@ -128,8 +137,9 @@ void iommu_sva_unbind_device(struct iommu_sva *handle) struct device *dev = handle->dev; mutex_lock(&iommu_sva_lock); + iommu_detach_device_pasid(domain, dev, 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); @@ -209,4 +219,5 @@ void mm_pasid_drop(struct mm_struct *mm) return; iommu_free_global_pasid(mm_get_pasid(mm)); + kfree(mm->iommu_mm); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b9c9f14a95cc..c61bc45d5a82 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,13 @@ 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 mm->iommu_mm ? true : false; } static inline u32 mm_get_pasid(struct mm_struct *mm) { - return mm->pasid; + return mm->iommu_mm ? mm->iommu_mm->pasid : IOMMU_PASID_INVALID; } static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) { @@ -1222,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_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 Tue Sep 12 12:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Tina" X-Patchwork-Id: 138429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp670811vqx; Tue, 12 Sep 2023 13:46:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2+mDuexvws/xXxcdfwsyvgGhzut1lH0FCPoamWhSL7RgMtUub3ojiGyBS9ve/2RSmniUd X-Received: by 2002:a05:6a20:3ca9:b0:145:47af:57d8 with SMTP id b41-20020a056a203ca900b0014547af57d8mr628598pzj.2.1694551568291; Tue, 12 Sep 2023 13:46:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694551568; cv=none; d=google.com; s=arc-20160816; b=u2T5gWVIWkvDcVYXdTEMG8aMyqLO+cA2CTnZjKdgXLmyQeU705+QASttprHodYXAAg 7fTIZ6Lr7joNnPpGzCC1OH90cOt5Im1iIJDgFJZELHw7GKdVGXvBD/GWikZbfVIuv2xw TyHMCR/vp+Na2scTG3eaUx8N6utaQW2WGFC8RRTUpU8nNTAuBGIv1oKvMJFTeMZD1dEz cfbkEWcejZYo5QzN8t/5Sx8pFa5/mWwQj+gilj2LnaXln3wZl4BMBfNnAqTX1JsRhgym qWd8JNr/Mmlwp3Lq6yjOkME86a0EOXTBZvvjzFqkE7Tr7Ej5rIF6F8GIVvAVPq1pF5OH EWfA== 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=f4ued0zf2rysKkOOLLWW3WpexywB8PzbB0mgR2mIrRQ=; fh=zW1GPeUL3MQGLvvmLmBmaazP2MzqJ1fOEi8He5Dzy3k=; b=j/OtcWyzBuYTJDCvRKpIRvUNXNQNXKE8iVDOXVbP5TWXecVZMG9XlPf62WFMzKytlf geqgwWwjHUt+rrbkka1XC9qkZgSzPrEvZml4G04RgoKdM903x2qm+lYTUM4lgigYzI19 U3QAILpFhqDAC/yCtQgv5N2Dj+NaIrXos1+2uBArlDUraVHlU/UuauEFCxhgifiChjmg df+s1zeaJhXtMU8yU4Eu3FCei2qwuBK1xhQFa5MhLngv1+zLcJL8zCy5qjaAbYORHUqz GpQQ7HB0pdkEoXUNheidemMrWN5RuM8yjG2f9FCfUFoTNFKFtlMVF+dnvKGlzRkU7oJe cpkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eyRM+Xql; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id s21-20020a63af55000000b0055785a37147si8367600pgo.590.2023.09.12.13.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 13:46:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eyRM+Xql; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 5A6FE8108BD4; Tue, 12 Sep 2023 06:00:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235503AbjILNAb (ORCPT + 37 others); Tue, 12 Sep 2023 09:00:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235381AbjILNAI (ORCPT ); Tue, 12 Sep 2023 09:00:08 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3333910E5 for ; Tue, 12 Sep 2023 06:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694523603; x=1726059603; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sLavevVR2/ebOFF/RgWFP9jTGobd5rMYRFpptbLPi5Y=; b=eyRM+XqltNgo78jiDJN/IOcXYw1V3omhkGWofhekj8y3mqQNe8aVIQLP uuaJly77dr41SC9yyng47yELx9W8hmVLG6JWVjGhNx/Og3Sl2fjCr2vCg 4QgSQO4xz9nsoYyyoTcpQGELiUkfJHXujrv6JfnH5t5tza5xt2dZVP4eY x583Bx5kGHDZ7/bWvPyV00+UeYEULNSsv9O5WQtHfb9eRd1ZuJJJjOL7O ccEIJ1mdPma1ZDH5q8x+DrmOG1G1q79qS1oRNweoGBlTTLW0NtQeGGIwQ 7hz2/ThCLWWpjUAoQz90zPCZHVzSy6IjaaMWbV1+LHurFd6KZPK7W6hKF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="378277348" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="378277348" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 06:00:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="858799363" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="858799363" Received: from tongshi-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.255.28.214]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 06:00:00 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v4 6/6] mm: Deprecate pasid field Date: Tue, 12 Sep 2023 20:59:36 +0800 Message-Id: <20230912125936.722348-7-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230912125936.722348-1-tina.zhang@intel.com> References: <20230912125936.722348-1-tina.zhang@intel.com> MIME-Version: 1.0 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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 06:00:55 -0700 (PDT) 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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776866105135367782 X-GMAIL-MSGID: 1776866105135367782 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 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) };