From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 568072AB4D for ; Fri, 22 Sep 2023 15:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695395973; x=1726931973; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lpncFO9EBL1O72rF23q9xrrFLTa4Sw3ZpdC9K4pRN7g=; b=J64iVLYqIL9E5ZCy5g9RF6rcboRmINblOSLhID7+U7LG7o9TLpr5Sl4v aOdCNLuRCCLevKl8l2KkZ/SWUE7kr6NdieQlcwAGof4nuqUCschaC8H53 QbcmmYL1kOZJ5cRuFxPk10F3x2JgsUTn6n+efpnA2xIF+i00x0+wpORsR wKZ9+53KBpVUDy04adQnN/ossJNpCZ5CcDO75RiSoN69YmG18+ra+HExI OvR2gLk6XzuCAKWXIR2OJ8/F5M8bg7j6Nga8Y0miCbmJOGVvA4zDUJu7l ihIIrDU3u4oaU8QEt85I1/xCoxqn5wicMAnqD4JsEFwDYVptpzwJdf1EV g==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="360235279" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="360235279" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 08:19:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="741133159" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="741133159" Received: from cascade.sh.intel.com ([10.239.48.35]) by orsmga007.jf.intel.com with ESMTP; 22 Sep 2023 08:19:30 -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: [PATCH v2 1/3] iommu/vt-d: debugfs: Dump entry pointing to huge page Date: Fri, 22 Sep 2023 23:16:34 +0800 Message-Id: <20230922151636.77139-2-Jingqi.liu@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20230922151636.77139-1-Jingqi.liu@intel.com> References: <20230922151636.77139-1-Jingqi.liu@intel.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit For the page table entry pointing to a huge page, the data below the level of the huge page is meaningless and does not need to be dumped. Signed-off-by: Jingqi Liu --- drivers/iommu/intel/debugfs.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel/debugfs.c b/drivers/iommu/intel/debugfs.c index 0255c4a23269..e2a3c37943a0 100644 --- a/drivers/iommu/intel/debugfs.c +++ b/drivers/iommu/intel/debugfs.c @@ -311,9 +311,14 @@ static inline unsigned long level_to_directory_size(int level) static inline void dump_page_info(struct seq_file *m, unsigned long iova, u64 *path) { - seq_printf(m, "0x%013lx |\t0x%016llx\t0x%016llx\t0x%016llx\t0x%016llx\t0x%016llx\n", - iova >> VTD_PAGE_SHIFT, path[5], path[4], - path[3], path[2], path[1]); + seq_printf(m, "0x%013lx |\t0x%016llx\t0x%016llx\t0x%016llx", + iova >> VTD_PAGE_SHIFT, path[5], path[4], path[3]); + if (path[2]) { + seq_printf(m, "\t0x%016llx", path[2]); + if (path[1]) + seq_printf(m, "\t0x%016llx", path[1]); + } + seq_putc(m, '\n'); } static void pgtable_walk_level(struct seq_file *m, struct dma_pte *pde, -- 2.21.3