From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 401594562AE for ; Tue, 4 Aug 2026 23:54:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785887697; cv=none; b=q7/jq7VB+Me101gVR6p0YJEgnAiHywXcmay8tRZjx1nahdFTgyCz7VH7UyYzaoj3Vl9UlpI/iwSMRPJfW91ACDcUmPHyGbe+2sVKhkqNyDt2ni/j7erGZzNS8i0PLBRH3fF/nEhKW2Ay61f/mJ09TdvJ919QAtxye9zEjrTEWtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785887697; c=relaxed/simple; bh=bYxhmqmIFX9Vs3YJLdvrfZ/i13mZ7a4GJErjKqVa80A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SM0l7FtfPJse6EAKKeX+V/DYk+AvKQho1GduHAbt9x2DkQ70q8b7kyLiHX+if/k6zn5gTS1PntNuy2gZ5u2L3gHyjLGR0ImdhsQzxicN5F9cI3aRNIpiA50G0vDc3DN0cGuWzHxzjbG4AqJ6Wy+bFlVMR+dp1ug11ukd8DZ8+O8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fgJNihuI; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fgJNihuI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785887696; x=1817423696; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bYxhmqmIFX9Vs3YJLdvrfZ/i13mZ7a4GJErjKqVa80A=; b=fgJNihuIj6OPyBASGfnMi1MLDmWouzYypZHroMqZNIy3U3PrhBVbtGKa zC7oz4SQpbntdNIM1xn3gB49ztKz5+9FFv5pnBVJY8m1gN6XczxXRSK7a mkLsMvIJAdBSPWeCb7Ox4Wau9Ml3Y36qPJHoj5eSimNKZQlPZx0puSbyQ 61J5PqoGB11XecnI1vN/WXzaNh4/5YozxiwaBptxwFo/6Rb2tbD7Xal/j TiUHG+5TSXDh2+jDd7MurGPTTlYy8JmaSQVZSvwndPZR53LVflXIxWnP4 Uah8mqgBnTXGiTx8g9lbbz10tUqr2ily55jVJK0HNrqeUuooq18g4glYk g==; X-CSE-ConnectionGUID: isuko/oCQdSLUJ0Q90YP3A== X-CSE-MsgGUID: EfpyB3RVRLu81IwpoBOwow== X-IronPort-AV: E=McAfee;i="6800,10657,11865"; a="90263335" X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="90263335" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2026 16:54:56 -0700 X-CSE-ConnectionGUID: 48gCkU9NTdG3orqSzVx+6Q== X-CSE-MsgGUID: ZkGQZCeSRyy43/R/X+3/gQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="257324397" Received: from allen-box.sh.intel.com ([10.239.159.52]) by fmviesa006.fm.intel.com with ESMTP; 04 Aug 2026 16:54:54 -0700 From: Lu Baolu To: Joerg Roedel Cc: ZhaoJinming , Kevin Tian , Dmitry Antipov , Guanghui Feng , Li RongQing , Desnes Nunes , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/19] iommu/vt-d: Cache max domain ID to avoid redundant calculation Date: Wed, 5 Aug 2026 07:43:08 +0800 Message-ID: <20260804234314.3087110-15-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260804234314.3087110-1-baolu.lu@linux.intel.com> References: <20260804234314.3087110-1-baolu.lu@linux.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 The cap_ndoms() helper calculates the maximum available domain ID from the value of capability register, which can be inefficient if called repeatedly. Cache the maximum supported domain ID in max_domain_id field during initialization to avoid redundant calls to cap_ndoms() throughout the IOMMU driver. No functionality change. Signed-off-by: Lu Baolu Signed-off-by: Xu Yilun Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.h | 1 + drivers/iommu/intel/dmar.c | 1 + drivers/iommu/intel/iommu.c | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 656cd311ed9a..c00f44db0020 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -700,6 +700,7 @@ struct intel_iommu { /* mutex to protect domain_ida */ struct mutex did_lock; struct ida domain_ida; /* domain id allocator */ + unsigned long max_domain_id; unsigned long *copied_tables; /* bitmap of copied tables */ spinlock_t lock; /* protect context, domain ids */ struct root_entry *root_entry; /* virtual address */ diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index 33bfaeafa7c6..c854173f6be9 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -1174,6 +1174,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) spin_lock_init(&iommu->lock); ida_init(&iommu->domain_ida); mutex_init(&iommu->did_lock); + iommu->max_domain_id = cap_ndoms(iommu->cap); ver = readl(iommu->reg + DMAR_VER_REG); pr_info("%s: reg_base_addr %llx ver %d:%d cap %llx ecap %llx\n", diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index a996b72aca57..5ea584b76f77 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1047,7 +1047,7 @@ int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) } num = ida_alloc_range(&iommu->domain_ida, IDA_START_DID, - cap_ndoms(iommu->cap) - 1, GFP_KERNEL); + iommu->max_domain_id - 1, GFP_KERNEL); if (num < 0) { pr_err("%s: No free domain ids\n", iommu->name); goto err_unlock; @@ -1111,7 +1111,7 @@ static void copied_context_tear_down(struct intel_iommu *iommu, did_old = context_domain_id(context); context_clear_entry(context); - if (did_old < cap_ndoms(iommu->cap)) { + if (did_old < iommu->max_domain_id) { iommu->flush.flush_context(iommu, did_old, PCI_DEVID(bus, devfn), DMA_CCMD_MASK_NOBIT, @@ -1511,7 +1511,7 @@ static int copy_context_table(struct intel_iommu *iommu, continue; did = context_domain_id(&ce); - if (did >= 0 && did < cap_ndoms(iommu->cap)) + if (did >= 0 && did < iommu->max_domain_id) ida_alloc_range(&iommu->domain_ida, did, did, GFP_KERNEL); set_context_copied(iommu, bus, devfn); @@ -2431,7 +2431,7 @@ static ssize_t domains_supported_show(struct device *dev, struct device_attribute *attr, char *buf) { struct intel_iommu *iommu = dev_to_intel_iommu(dev); - return sysfs_emit(buf, "%ld\n", cap_ndoms(iommu->cap)); + return sysfs_emit(buf, "%ld\n", iommu->max_domain_id); } static DEVICE_ATTR_RO(domains_supported); @@ -2442,7 +2442,7 @@ static ssize_t domains_used_show(struct device *dev, unsigned int count = 0; int id; - for (id = 0; id < cap_ndoms(iommu->cap); id++) + for (id = 0; id < iommu->max_domain_id; id++) if (ida_exists(&iommu->domain_ida, id)) count++; -- 2.43.0