From nobody Wed Dec 17 19:39:23 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA4F32DAFA9 for ; Fri, 3 Oct 2025 17:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759512772; cv=none; b=UVPPBG5bOS7jV9gurfwg3Gb/BsLcs6AdZ9nf6+XhVb6D+Ts/HuXw1wuhYX7lJ0D7/iX4BTifr2oCvrvDULh/xp5aMYmomDIXQ04Zn1QnK2wCXfc5u4eVZNfKJdIRbR4OzK+pRv1luVhG40/1XkwCzg7j9V0t1h76z5+dWJ3GzgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759512772; c=relaxed/simple; bh=h8HRZAYE3mjXSc5Xyx6cIjeKK3BF7I4Fd5OR1DdLMiY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ric8rQkUBPt6l4F8alkaHenuUvySryvquI/b1D9GkpeYjDxFaMB2XGMbSCvxwmCIxEBo2yB408ENbJHPSG3Z0EW1W6dsxXg9NNq+b3T1Ey3gYqNb0PHbSL+d7n4eHJpQr483OB24V1zzYbMdUsOWd1P92mtX3C8sTPV9sxKUcZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RipcE+HB; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RipcE+HB" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-46e44b9779eso10258725e9.1 for ; Fri, 03 Oct 2025 10:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759512767; x=1760117567; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=MSJf223vDYvCAejMgpz8FoiY2GVLX/OUVEV8AW8P3rE=; b=RipcE+HBunm1LAWdVy/tQHlnskUKKlmTsX3e7PrCC5gslRSMr1iKOaRRFi2bcS7eV2 ZJz69qcrahzXrEJJWH0rE1YYT8ryA9+dm5//pC19fUfGl4AmKhwMP3E9J1FcFk7oEsRF eqrDhQO5DNRtb8OrkjYVONTgC94d/xNZx/1OGXJFNwSIPMt2SKgYeavfZCL6GtQs1Ytd NnA6yJLpUhuPpiHmkJYaLTTn1sCbI22YJ6CK3mXEmw77oplJJEV1E8fLl0Tf4W/bCqgB 41/CrLUtp6ZLwFntaQ6znQV90US4xxJs2o9xCXRmO+1MpBX+hyyT4KumXTrSgzGRla67 kTDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759512767; x=1760117567; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MSJf223vDYvCAejMgpz8FoiY2GVLX/OUVEV8AW8P3rE=; b=m/B9f1MpaGeTwI9igopfuBP8cvDfvObWZKEHohKBKAMWUIcm3TQIKQ74ppvaQqYsnx FI/rMimHcqISwwumIqH52GHw87DGFkWa3AF0uuGS6hcI47+6RJzbqX2wPd/LRbwtELnV 0c4Urtc16Ox1NInftGhS1Ny22xVdjknoUQKnwHra5YLir5kSgt02h8ezgIqYoIYkE/de JHcy2UeY4GeY86FJmUT+fqglPFyg/bTITBktpe6Eu1N2v6Vw7AxT0oo+AW2dSAThAnaB nxgtxYMRTYKvMMWaWCv3rUqip12zYqDu0syyZA9rE74tVwfQS/KoMi85E5nEtlhIWLiS DCkw== X-Forwarded-Encrypted: i=1; AJvYcCVRqI9LW5R+ISKyeaZS++odTjF60USqgKbBcTzJUo+9Kf7nVeQEqGrXvJak5B/W1I4wZbNcU/dbZnZLUYA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4Oh/+a75KPWi6Oixe7fRWKS6wgJaHiiyC4eoYhB3v0ISQc8ui atZrxpnt5UEmsB5iR2/UdJY1negcUQhzjEiahtl6L8YgsSkC+LE2dHaXnRDQl+ithnqeCUy9Uip YkExgORRRNsxH9A== X-Google-Smtp-Source: AGHT+IEWfYLAMSMP+OGgRaTAc1dXj7/wh5+WqknFdRddjMd1FN58CkXD5Dr6K3xA5OvV0fh2LeDAOUQkcNX7zw== X-Received: from wmna4.prod.google.com ([2002:a05:600c:684:b0:46d:6939:1b46]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:37c9:b0:46e:4341:7302 with SMTP id 5b1f17b1804b1-46e71155b8cmr26105425e9.34.1759512767276; Fri, 03 Oct 2025 10:32:47 -0700 (PDT) Date: Fri, 3 Oct 2025 17:32:27 +0000 In-Reply-To: <20251003173229.1533640-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251003173229.1533640-1-smostafa@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251003173229.1533640-3-smostafa@google.com> Subject: [RFC PATCH 2/4] drivers/iommu: Add calls for iommu debug From: Mostafa Saleh To: linux-mm@kvack.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Cc: corbet@lwn.net, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, akpm@linux-foundation.org, vbabka@suse.cz, surenb@google.com, mhocko@suse.com, jackmanb@google.com, hannes@cmpxchg.org, ziy@nvidia.com, david@redhat.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, rppt@kernel.org, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add calls for the new iommu debug config IOMMU_DEBUG_PAGEALLOC: - iommu_debug_init: Enable the debug mode if configured by the user. - iommu_debug_map: Track iommu pages mapped, using physical address. - iommu_debug_unmap: Track iommu pages unmapped, using IO virtual address. - iommu_debug_remap: Track iommu pages, already mapped using IOVA. We have to do the unmap/remap as once pages are unmapped we lose the information of the physical address. This is racy, but the API is racy by construction as it uses refcounts and doesn't attempt to lock/synchronize with the IOMMU API as that will be costly, meaning that possibility of false negative exists. Signed-off-by: Mostafa Saleh --- drivers/iommu/iommu-debug.c | 23 +++++++++++++++++++++++ drivers/iommu/iommu.c | 21 +++++++++++++++++++-- include/linux/iommu-debug.h | 6 ++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c index 297a35137b38..607f1fcf2235 100644 --- a/drivers/iommu/iommu-debug.c +++ b/drivers/iommu/iommu-debug.c @@ -5,11 +5,13 @@ * IOMMU API santaizers and debug */ #include +#include #include #include #include =20 static bool needed; +static DEFINE_STATIC_KEY_FALSE(iommu_debug_initialized); =20 struct iommu_debug_metadate { atomic_t ref; @@ -25,6 +27,27 @@ struct page_ext_operations page_iommu_debug_ops =3D { .need =3D need_iommu_debug, }; =20 +void iommu_debug_map(struct iommu_domain *domain, phys_addr_t phys, size_t= size) +{ +} + +void iommu_debug_unmap(struct iommu_domain *domain, unsigned long iova, si= ze_t size) +{ +} + +void iommu_debug_remap(struct iommu_domain *domain, unsigned long iova, si= ze_t size) +{ +} + +void iommu_debug_init(void) +{ + if (!needed) + return; + + pr_info("iommu: Debugging page allocations, expect overhead or disable io= mmu.debug_pagealloc"); + static_branch_enable(&iommu_debug_initialized); +} + static int __init iommu_debug_pagealloc(char *str) { return kstrtobool(str, &needed); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 060ebe330ee1..56c89636a33c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -231,6 +232,9 @@ static int __init iommu_subsys_init(void) if (!nb) return -ENOMEM; =20 +#ifdef CONFIG_IOMMU_DEBUG_PAGEALLOC + iommu_debug_init(); +#endif for (int i =3D 0; i < ARRAY_SIZE(iommu_buses); i++) { nb[i].notifier_call =3D iommu_bus_notifier; bus_register_notifier(iommu_buses[i], &nb[i]); @@ -2518,10 +2522,14 @@ int iommu_map_nosync(struct iommu_domain *domain, u= nsigned long iova, } =20 /* unroll mapping in case something went wrong */ - if (ret) + if (ret) { iommu_unmap(domain, orig_iova, orig_size - size); - else + } else { trace_map(orig_iova, orig_paddr, orig_size); +#ifdef CONFIG_IOMMU_DEBUG_PAGEALLOC + iommu_debug_map(domain, orig_paddr, orig_size); +#endif + } =20 return ret; } @@ -2583,6 +2591,10 @@ static size_t __iommu_unmap(struct iommu_domain *dom= ain, =20 pr_debug("unmap this: iova 0x%lx size 0x%zx\n", iova, size); =20 +#ifdef CONFIG_IOMMU_DEBUG_PAGEALLOC + iommu_debug_unmap(domain, iova, size); +#endif + /* * Keep iterating until we either unmap 'size' bytes (or more) * or we hit an area that isn't mapped. @@ -2602,6 +2614,11 @@ static size_t __iommu_unmap(struct iommu_domain *dom= ain, unmapped +=3D unmapped_page; } =20 +#ifdef CONFIG_IOMMU_DEBUG_PAGEALLOC + if (unmapped < size) + iommu_debug_remap(domain, iova, size - unmapped); +#endif + trace_unmap(orig_iova, size, unmapped); return unmapped; } diff --git a/include/linux/iommu-debug.h b/include/linux/iommu-debug.h index a9c11855c4ed..8d3ea661660f 100644 --- a/include/linux/iommu-debug.h +++ b/include/linux/iommu-debug.h @@ -11,6 +11,12 @@ #ifdef CONFIG_IOMMU_DEBUG_PAGEALLOC =20 extern struct page_ext_operations page_iommu_debug_ops; +struct iommu_domain; + +void iommu_debug_map(struct iommu_domain *domain, phys_addr_t phys, size_t= size); +void iommu_debug_unmap(struct iommu_domain *domain, unsigned long iova, si= ze_t size); +void iommu_debug_remap(struct iommu_domain *domain, unsigned long iova, si= ze_t size); +void iommu_debug_init(void); =20 #endif /* CONFIG_IOMMU_DEBUG_PAGEALLOC */ =20 --=20 2.51.0.618.g983fd99d29-goog