From patchwork Wed Sep 27 15:15:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Jingqi" X-Patchwork-Id: 145492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2789097vqu; Wed, 27 Sep 2023 10:35:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHvIBYAEGFpbSiXt1rBCyZ5Jpqg3v+L5ZmhH0/akhku9WDsSa3q1hpJze7sfIF9UnZAJC7 X-Received: by 2002:a17:903:648:b0:1c6:3228:c2ca with SMTP id kh8-20020a170903064800b001c63228c2camr2319817plb.29.1695836124916; Wed, 27 Sep 2023 10:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695836124; cv=none; d=google.com; s=arc-20160816; b=NOXO1Z1iRgSG0IylBrXvm/Ph6Hb+/KOSOhKl2AKl6wxRJ5MXqK0Dkfom2Dn+Iyf+p2 mdfXJf+gYHH1SP9pb6mOlIEeirKzW4oTgSiddy8mb9ZjQeB5vws/fZG0L1pOgVNTEMv9 NKkd2SXPTB4V0qHeQX4mD4osyHXMM1pyw03YnwxLmSXaIPWGfKAuWSe0rNxqkpbi+jUh SGY5l5a9h9bl1tmfLj+v6HjBjMRVLP2qQDRE4j0dwhlCmuHiQAu6joTf2rTArWMiX/cc yNqDVjI4H7PCq4dsek+kAz/42C7wynx3FexAs5kf62+6x4lxOfgXRYLbuYVFkafO3OLp 59xw== 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=+w1I//W85ODct4CRxf6bGdQhBBdYsoEm0jDUPRWlFus=; fh=XFDRxS7z/mPiLWcvDFNXxtez86tw5VSUEAZ1VPulNcQ=; b=nvnxMtjvU3yGQZwEVXAk6PY0v+b58hA1aXns+HGPK9137OiW6uUfeAbuWxhNz9tXzj t+F0PWIgJWM+ITpXr6w656jlBfdohITOwFKo52TLKPy1ttRxvaNB4vK5wf8hDZEARXyC FoCsJe2urZcxAciXFTx/QtHv9KdM9gIGNRsYQJxxDkk6+Yway7GM3uRXPyoW4Te4rQct TxGXzqD+Qcp1TrMqqWewxhlb5xw9tQUE4rBCXVEWY6TPHdv7sFaHiLYSOogWi2sx4JIZ SxMfGwrWgkAHdlknjDbli1okAfkhbU6RmwGw8X8iRRCCoY1L/ZKVvMkErBfGnB9l5vjp NXtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dACwAvyT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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. [23.128.96.31]) by mx.google.com with ESMTPS id l12-20020a170903244c00b001bb02e4b739si17716377pls.475.2023.09.27.10.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:35:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dACwAvyT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 13B5C801CF96; Wed, 27 Sep 2023 08:19:35 -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 S232399AbjI0PTV (ORCPT + 19 others); Wed, 27 Sep 2023 11:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232392AbjI0PTR (ORCPT ); Wed, 27 Sep 2023 11:19:17 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C001C121 for ; Wed, 27 Sep 2023 08:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695827955; x=1727363955; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OsrFI+aCDANZLn+fG167H9Cm0xlCT0Xu8vBM5CGocag=; b=dACwAvyT1aqZ4j6/2oaR5vzDXE3wlISaGiyFHBTfni8I4OvfSMXS7RD6 4DWqyOoYGudn9d+y2BhvsDDlrrnQt4lqw0WzSrIcFqBwnT3gxIG2uyteV QjimSNuhUvGNezEakuadZNcD4urce04VXGAvaxotUUfLoIpY1aaIXqLuE iJgrvKFt+XuId9VK8tucilHvhSX/WUSnC8XFV59J3avZwtNZJ+U/DgJeG FPFGZsSmlwLdCMHMZBmtH2psDU9k29k0LtMkRdkFIadMq9oOACqwanfMJ KOF0exufEOt8LDtZAhvDvfOgyFTHZnv6mQvXTU3/xdzGJGCzQn8KvetRw Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="362098913" X-IronPort-AV: E=Sophos;i="6.03,181,1694761200"; d="scan'208";a="362098913" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 08:19:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="819461130" X-IronPort-AV: E=Sophos;i="6.03,181,1694761200"; d="scan'208";a="819461130" Received: from cascade.sh.intel.com ([10.239.48.35]) by fmsmga004.fm.intel.com with ESMTP; 27 Sep 2023 08:19:13 -0700 From: Jingqi Liu To: iommu@lists.linux.dev, Lu Baolu , Tian Kevin , Joerg Roedel , Will Deacon , Robin Murphy Cc: linux-kernel@vger.kernel.org, Jingqi Liu Subject: [PATH v3 2/3] iommu/vt-d: debugfs: Create/remove debugfs file per {device, pasid} Date: Wed, 27 Sep 2023 23:15:35 +0800 Message-Id: <20230927151536.67319-3-Jingqi.liu@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20230927151536.67319-1-Jingqi.liu@intel.com> References: <20230927151536.67319-1-Jingqi.liu@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, 27 Sep 2023 08:19:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778213060723023474 X-GMAIL-MSGID: 1778213060723023474 Add a debugfs directory per pair of {device, pasid} if the mappings of its page table are created and destroyed by the iommu_map/unmap() interfaces. i.e. /sys/kernel/debug/iommu/intel//. Create a debugfs file in the directory for users to dump the page table corresponding to {device, pasid}. e.g. /sys/kernel/debug/iommu/intel/0000:00:02.0/0/domain_translation_struct. When attaching device without pasid, create a debugfs file with PASID#0, i.e. RID_PASID. When attaching a domain to a pasid of device, create a debugfs file with the specified pasid. When detaching without pasid, remove the directory and file for PASID#0. When detaching with pasid, remove the debugfs directory and file of the specified pasid. Remove the entire debugfs directory of the specified device for releasing device. e.g. /sys/kernel/debug/iommu/intel/0000:00:01.0 Signed-off-by: Jingqi Liu --- drivers/iommu/intel/debugfs.c | 133 ++++++++++++++++++++++++++++++++-- drivers/iommu/intel/iommu.c | 29 ++++++++ drivers/iommu/intel/iommu.h | 12 +++ 3 files changed, 169 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel/debugfs.c b/drivers/iommu/intel/debugfs.c index e2a3c37943a0..50dea53ba87c 100644 --- a/drivers/iommu/intel/debugfs.c +++ b/drivers/iommu/intel/debugfs.c @@ -32,6 +32,11 @@ struct iommu_regset { const char *regs; }; +struct show_domain_info { + struct device *dev; + ioasid_t pasid; +}; + #define DEBUG_BUFFER_SIZE 1024 static char debug_buf[DEBUG_BUFFER_SIZE]; @@ -111,6 +116,8 @@ static const struct iommu_regset iommu_regs_64[] = { IOMMU_REGSET_ENTRY(VCRSP), }; +static struct dentry *intel_iommu_debug; + static int iommu_regset_show(struct seq_file *m, void *unused) { struct dmar_drhd_unit *drhd; @@ -673,16 +680,12 @@ static const struct file_operations dmar_perf_latency_fops = { void __init intel_iommu_debugfs_init(void) { - struct dentry *intel_iommu_debug = debugfs_create_dir("intel", - iommu_debugfs_dir); + intel_iommu_debug = debugfs_create_dir("intel", iommu_debugfs_dir); debugfs_create_file("iommu_regset", 0444, intel_iommu_debug, NULL, &iommu_regset_fops); debugfs_create_file("dmar_translation_struct", 0444, intel_iommu_debug, NULL, &dmar_translation_struct_fops); - debugfs_create_file("domain_translation_struct", 0444, - intel_iommu_debug, NULL, - &domain_translation_struct_fops); debugfs_create_file("invalidation_queue", 0444, intel_iommu_debug, NULL, &invalidation_queue_fops); #ifdef CONFIG_IRQ_REMAP @@ -692,3 +695,123 @@ void __init intel_iommu_debugfs_init(void) debugfs_create_file("dmar_perf_latency", 0644, intel_iommu_debug, NULL, &dmar_perf_latency_fops); } + +/* Create a debugfs directory for each device. */ +void intel_iommu_debugfs_create_dev(struct device *dev) +{ + struct dentry *dev_dir; + + dev_dir = debugfs_lookup(dev_name(dev), intel_iommu_debug); + if (!dev_dir) { + dev_dir = debugfs_create_dir(dev_name(dev), intel_iommu_debug); + if (IS_ERR(dev_dir)) + pr_info("%s: Failed to create debugfs directory.\n", + dev_name(dev)); + } else + dput(dev_dir); +} + +void intel_iommu_debugfs_remove_dev(struct device *dev) +{ + struct dentry *dev_dir, *sub_dir, *dentry; + struct list_head *plist; + + dev_dir = debugfs_lookup(dev_name(dev), intel_iommu_debug); + if (!dev_dir) + return; + + list_for_each(plist, &(dev_dir->d_subdirs)) { + sub_dir = list_entry(plist, struct dentry, d_child); + if(sub_dir) { + dentry = debugfs_lookup("domain_translation_struct", + sub_dir); + if (!dentry) + continue; + + if (dentry->d_inode->i_private) + kfree(dentry->d_inode->i_private); + + dput(dentry); + } + } + + debugfs_remove_recursive(dev_dir); + dput(dev_dir); +} + +/* + * Create a debugfs directory per pair of {device, pasid}, + * then create the corresponding debugfs file in this directory + * for user to dump its page table. e.g. + * /sys/kernel/debug/iommu/intel/0000:00:01.0/0/domain_translation_struct + */ +void intel_iommu_debugfs_create_dev_pasid(struct iommu_domain *domain, + struct device *dev, u32 pasid) +{ + struct dentry *dev_dir, *pasid_dir; + struct show_domain_info *sinfo; + char dir_name[10]; + + /* + * The debugfs only dumps the page tables whose mappings are created + * and destroyed by the iommu_map/unmap() interfaces. Check the + * mapping type of the domain before creating debugfs directory. + */ + if (!domain || !(domain->type & __IOMMU_DOMAIN_PAGING)) + return; + + dev_dir = debugfs_lookup(dev_name(dev), intel_iommu_debug); + if (!dev_dir) + return; + + sprintf(dir_name, "%x", pasid); + pasid_dir = debugfs_create_dir(dir_name, dev_dir); + if (IS_ERR(pasid_dir)) + goto dput_out; + + sinfo = kzalloc(sizeof(*sinfo), GFP_KERNEL); + if (!sinfo) + goto dput_out; + + sinfo->dev = dev; + sinfo->pasid = pasid; + debugfs_create_file("domain_translation_struct", 0444, + pasid_dir, sinfo, + &domain_translation_struct_fops); +dput_out: + dput(dev_dir); +} + +/* + * Remove the debugfs directory and file corresponding to each pair of + * {device, pasid}. + */ +void intel_iommu_debugfs_remove_dev_pasid(struct device *dev, u32 pasid) +{ + struct dentry *dev_dir, *pasid_dir, *dentry; + char dir_name[10]; + + dev_dir = debugfs_lookup(dev_name(dev), intel_iommu_debug); + if (!dev_dir) + return; + + sprintf(dir_name, "%x", pasid); + pasid_dir = debugfs_lookup(dir_name, dev_dir); + if (!pasid_dir) + goto dput_dev; + + dentry = debugfs_lookup("domain_translation_struct", pasid_dir); + if (!dentry) + goto dput_pasid; + + if (dentry->d_inode->i_private) + kfree(dentry->d_inode->i_private); + + debugfs_remove_recursive(pasid_dir); + + dput(dentry); +dput_pasid: + dput(pasid_dir); +dput_dev: + dput(dev_dir); +} diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index dd8ff358867d..af9c989035a2 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -2488,6 +2488,13 @@ static int dmar_domain_attach_device(struct dmar_domain *domain, iommu_enable_pci_caps(info); + /* + * Create a debugfs directory specified by RID_PASID + * in the debugfs device directory. + */ + intel_iommu_debugfs_create_dev_pasid(&info->domain->domain, + dev, IOMMU_NO_PASID); + return 0; } @@ -3997,6 +4004,12 @@ static void device_block_translation(struct device *dev) domain_detach_iommu(info->domain, iommu); info->domain = NULL; + + /* + * Remove the debugfs directory specified by RID_PASID + * in the device debugfs directory. + */ + intel_iommu_debugfs_remove_dev_pasid(dev, IOMMU_NO_PASID); } static int md_domain_init(struct dmar_domain *domain, int guest_width) @@ -4424,6 +4437,9 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) } } + /* Create a debugfs directory per device. */ + intel_iommu_debugfs_create_dev(dev); + return &iommu->iommu; } @@ -4436,6 +4452,7 @@ static void intel_iommu_release_device(struct device *dev) dev_iommu_priv_set(dev, NULL); kfree(info); set_dma_ops(dev, NULL); + intel_iommu_debugfs_remove_dev(dev); } static void intel_iommu_probe_finalize(struct device *dev) @@ -4729,6 +4746,12 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid) out_tear_down: intel_pasid_tear_down_entry(iommu, dev, pasid, false); intel_drain_pasid_prq(dev, pasid); + + /* + * Remove the debugfs directory of the specified pasid + * in the device debugfs directory. + */ + intel_iommu_debugfs_remove_dev_pasid(dev, pasid); } static int intel_iommu_set_dev_pasid(struct iommu_domain *domain, @@ -4777,6 +4800,12 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain, list_add(&dev_pasid->link_domain, &dmar_domain->dev_pasids); spin_unlock_irqrestore(&dmar_domain->lock, flags); + /* + * Create a debugfs directory with specified pasid + * in the debugfs device directory. + */ + intel_iommu_debugfs_create_dev_pasid(domain, dev, pasid); + return 0; out_detach_iommu: domain_detach_iommu(dmar_domain, iommu); diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index c18fb699c87a..f1c27e928886 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -883,8 +883,20 @@ static inline void intel_svm_remove_dev_pasid(struct device *dev, ioasid_t pasid #ifdef CONFIG_INTEL_IOMMU_DEBUGFS void intel_iommu_debugfs_init(void); +void intel_iommu_debugfs_create_dev(struct device *dev); +void intel_iommu_debugfs_create_dev_pasid(struct iommu_domain *domain, + struct device *dev, u32 pasid); +void intel_iommu_debugfs_remove_dev(struct device *dev); +void intel_iommu_debugfs_remove_dev_pasid(struct device *dev, u32 pasid); #else static inline void intel_iommu_debugfs_init(void) {} +static inline void intel_iommu_debugfs_create_dev(struct device *dev) {} +static inline +void intel_iommu_debugfs_create_dev_pasid(struct iommu_domain *domain, + struct device *dev, u32 pasid) {} +static inline void intel_iommu_debugfs_remove_dev(struct device *dev) {} +static inline +void intel_iommu_debugfs_remove_dev_pasid(struct device *dev, u32 pasid) {} #endif /* CONFIG_INTEL_IOMMU_DEBUGFS */ extern const struct attribute_group *intel_iommu_groups[];