From nobody Fri Jun 12 15:57:54 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 4285426B742 for ; Wed, 13 May 2026 21:52:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709160; cv=none; b=Fw2wYaPSxZFWvHoIhYc9Qs00YTOe/h15zlv2useD2+ufYfqwR/nhbcY2IZo142cz5Md3ANOZqSfZwwZbs2ouAKi+pYWeCCDgsm80+LbIbAy0j9P/O1nJYBFwZlJ0WxIXnb/5d7bsLscdze2zZS7zCenVXOTca9N1Kqvunpf5LQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709160; c=relaxed/simple; bh=3+vC3XhrZHghazZCLS7MjjGZmWC6hN1vdgUjS/12R3g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VYKEs2p7hYswU5GFfDH9xMDSw1fPH2aNXcrfAIe4HQPFqfvWxOYWvOednFoJEfhxV5k4SFawOfzAS+a8b3maBE7cnOLg5sn1DM0CLalPCs1t1bIg4eJAGlCZRCdd6vk8gcTiHw9+IV+uentxwyi2DNjXQCDTXTF2BUNdw4rVuck= 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=oyl/VGgp; arc=none smtp.client-ip=209.85.221.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="oyl/VGgp" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-44a122a5128so5521054f8f.0 for ; Wed, 13 May 2026 14:52:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778709157; x=1779313957; 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=jR1Wv4oMHHpwdm4XGb1XftGJUcGelJg9xckwdNKgGB0=; b=oyl/VGgp2B6JR28F1gxPqvXyJpm0UZT8WHO7FEhqb5iCoFzRO4umO3EyEJ6H2icvGY OK7XgU2VC4E+HkykKvLnLdDo7t5iuMOB7BqCCLp0EM70f+N9f13wUhERMD3YdNtanirP GbqEXp+x508P/xvkuy1KqvB96UXvDhxHvqKyBFfGHlEC3uJKecmBrCQKn+ZG0J1R9l+W CrA4GDPAtnjEb8unmwCb/enZcmxmtI8baf9+TEHlPmFdcbdgqsdXdO/ND6Hczpz8qCz+ zgORXq+pGkIf8j/laJzDejmSje9ejztjn6G9ITOQi/bQjR3pNe3O8ArsXLLOchpr4xrm u3Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778709157; x=1779313957; 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=jR1Wv4oMHHpwdm4XGb1XftGJUcGelJg9xckwdNKgGB0=; b=rFutu1CySZehhg2Y+o2sePlu3gUJ7tWZhGf/rSTktqTq7IyUshw/Rm8ccLS5VLFQYJ +7zL9oZEc34aXsarPkfRpaMES7qkbQ8ZnViJ3J8NpDzA84Jib/6CLaWyKi0iB4tcuqh9 W6gvlxNm3x1pO19OQrVLw5Fit9GY1Mv3D9eDBMi6gu4r5Qx7BDrok9sZfpHjRLkvhNWn hyoe9WnMWpw3dLjOB9+ie1KX/TpsO1K5VWWUiv6Vo7DF31YgTbfoi7daJBX3wNquusEA +CqDRwSDNNsKyoU2m8XF/4afWmpUEHIOxbSx9CtC6sCaWhueSBM3ny+v8TRCy6aX/IrE F23Q== X-Forwarded-Encrypted: i=1; AFNElJ/ye83PlGLG5ajWtNTMzxdGggxOQqQ09F9fDZskds0g/KsjICWIodsieHVTLHKTEuPaBOqQKwFv+IMmbYY=@vger.kernel.org X-Gm-Message-State: AOJu0YxT50RwJfCIOICZC2nhz/gFPjZpwfFlsapams5v92RitrpKsHOe /RVCsj+NoYEFbqAKJ+w2HngfrArEmRIWwu+1NVrF4WW8/EOXuIwhoRmTzZn44F+P+v+Vl2J3gkZ +0X9eehvEugD/bQ== X-Received: from wrxk8.prod.google.com ([2002:a05:6000:48:b0:44c:2fb:a56c]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4008:b0:446:96b1:f51 with SMTP id ffacd0b85a97d-45c59cd2144mr8466705f8f.22.1778709157467; Wed, 13 May 2026 14:52:37 -0700 (PDT) Date: Wed, 13 May 2026 21:52:01 +0000 In-Reply-To: <20260513215203.3852661-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: <20260513215203.3852661-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260513215203.3852661-2-smostafa@google.com> Subject: [PATCH 1/3] iommu/io-pgtable-arm: Use consistent sizes for page allocation and freeing From: Mostafa Saleh To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: robin.murphy@arm.com, will@kernel.org, joro@8bytes.org, jgg@ziepe.ca, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" At the moment we use alloc_size to allocate memory but then there is a logical error where we just size in the error and free path, which might be smaller. Also we size to do DMA-API operations, which is OK, but confusing. Instead of this error-prone handling, just set size to alloc_size and use it everywhere. Signed-off-by: Mostafa Saleh Reviewed-by: Jason Gunthorpe --- drivers/iommu/io-pgtable-arm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0208e5897c29..0cbe545c491d 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -253,7 +253,6 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t = gfp, void *cookie) { struct device *dev =3D cfg->iommu_dev; - size_t alloc_size; dma_addr_t dma; void *pages; =20 @@ -261,12 +260,11 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_= t gfp, * For very small starting-level translation tables the HW requires a * minimum alignment of at least 64 to cover all cases. */ - alloc_size =3D max(size, 64); + size =3D max(size, 64); if (cfg->alloc) - pages =3D cfg->alloc(cookie, alloc_size, gfp); + pages =3D cfg->alloc(cookie, size, gfp); else - pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, - alloc_size); + pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, size); =20 if (!pages) return NULL; @@ -303,6 +301,9 @@ static void __arm_lpae_free_pages(void *pages, size_t s= ize, struct io_pgtable_cfg *cfg, void *cookie) { + /* See __arm_lpae_alloc_pages(). */ + size =3D max(size, 64); + if (!cfg->coherent_walk) dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), size, DMA_TO_DEVICE); --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 15:57:54 2026 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (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 34AAA3C9888 for ; Wed, 13 May 2026 21:52:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709170; cv=none; b=DCenOuOOS3y3SwNyzikpxDfPwplaPc+mkIVfXfA6/81XloPPRPv7ApVO5HV1vGlH3sfFgdbWrKQgJPVEG3PKo1BrCXU52hiHjEis2kJd9usdnvNZOBGcDnc7Z0j6+tp0anMOQG1RBsZ3oNUF82dlw7PplzEW5rH20a/Pb+BH8Ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709170; c=relaxed/simple; bh=mXVlQJDDIGQCBNIOAsjtzOYRiA0kS/fRbsolMHrau7I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V8uSdYJQAN+nU20DtXYuL6N90k1SYL6yU3/Q34213ZC3z2CQ53WL+/e//q8zKLkNSPA12Abn+OKRXQefVnR2cI5ad5L14h76EEk66U744/GNEf5th5d+Eqh/nJTqs2/8fnEYyfLjNTfFfPFJ+FowTu52RuONSkdLMFwayiKs9y0= 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=ktD13ouW; arc=none smtp.client-ip=209.85.208.73 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="ktD13ouW" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-67bca868649so5431178a12.3 for ; Wed, 13 May 2026 14:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778709167; x=1779313967; 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=VmY5S5fM8AoCCFdXEvoltLd2gDk1b3FPoGY3dWz/ZhU=; b=ktD13ouWSztQWxCjQcn/bP7IXASTl/UucZRZy1uPL0dZ2xPIpRsNMeYKAfbcrdCyjN 0/gzmUxTe6UouA2IiNwK9FseE9i71AOK41vo7q42UJPGsNFieGWM4aaFG6JJ6J0V5iXN G+iZaqq4eB9aDNMHtghAM2qyuOt+8G8FTkSW6eQP1XtDzNOiFsq4Kiu7VFblVx2dVviX /7gxYznnbaYiEU5+m5+KxQMko8gXhNGntQfJUSov37kFeJnjE+/8zRic3PQw4QRBXQOp DJFIAMRpGySFX3+CvMj/vvesxe1tYBZwhV3b7gAYV9nLzWpTeVB03KV8s9k4HbrpDBPc 2+qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778709167; x=1779313967; 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=VmY5S5fM8AoCCFdXEvoltLd2gDk1b3FPoGY3dWz/ZhU=; b=jKLAx4Qve8OIArS9x3NkNXF5hMr1G2tKQhNNw7AtoDuPG5xILxPjXpe+wlQAwooe/A zkAaL+idYBbJlKumdzyMCcxjrBDnyoZ4yO4eE8hRLKJClYkZUFWccME/X/e7OgATD6f7 PHkhU1r9zN0TLjnJXm07vJ3RkDzQ6WYE/9M0X/2fhaF9NP0UWHLyMd7W9GGpwPSA+pZ7 KmbjYJNTl9XZgo2ttI3SVu5QLDpcYfS8OW3TLVygxZfrhoJWyCSCPA+XgJ6QIeOJABSn nqn4PHjIwsl/A4yhhCeWhKMFD/hZVSCe9C0Qq3iakhavR2Vu2jeGRg2tmvpsccngGDxU KbEA== X-Forwarded-Encrypted: i=1; AFNElJ8QVYMUhrBB9lGn6DQWx82zAI/D9Rqnt2+FyCGKtORwKsOLUY9Kw9JDqVMDzmdIlmV/bYQc4BR0wAAbrnY=@vger.kernel.org X-Gm-Message-State: AOJu0YxF5wzK8fII0m/O/fhDnL+owim5MFnknSMqmc86HuY8LZogA04V RPveph2JVIcQPjwsYFdYWGVtKcrX4bX67XNlNKmt9783BoZaTia2lw+d2db/qLa0/tP4bLFs8d/ 1Fh9IAeBJx7I/OA== X-Received: from edbel4.prod.google.com ([2002:a05:6402:3604:b0:67c:d93d:89cd]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:8cb:b0:66d:d2f9:520c with SMTP id 4fb4d7f45d1cf-68256d5afa3mr2319843a12.19.1778709167343; Wed, 13 May 2026 14:52:47 -0700 (PDT) Date: Wed, 13 May 2026 21:52:02 +0000 In-Reply-To: <20260513215203.3852661-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: <20260513215203.3852661-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260513215203.3852661-3-smostafa@google.com> Subject: [PATCH 2/3] iommu/io-pgtable-arm: Rework to use the iommu-pages API From: Mostafa Saleh To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: robin.murphy@arm.com, will@kernel.org, joro@8bytes.org, jgg@ziepe.ca, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update the io-pgtable-arm allocator to use the iommu-pages API. Replace the DMA API usage from __arm_lpae_alloc_pages() with iommu_pages_start_incoherent() and from __arm_lpae_free_pages() with iommu_pages_free_incoherent(). Since the iommu-pages API relies on metadata stored in the struct page during iommu_alloc_pages_node_sz(), it cannot be used safely with memory allocated via the custom cfg->alloc (which may not be backed by pages). So, isolate that logic and keep it as it. Suggested-by: Jason Gunthorpe Signed-off-by: Mostafa Saleh Reviewed-by: Jason Gunthorpe --- drivers/iommu/io-pgtable-arm.c | 79 ++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 23 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0cbe545c491d..86b23aa04324 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -248,24 +248,15 @@ static dma_addr_t __arm_lpae_dma_addr(void *pages) return (dma_addr_t)virt_to_phys(pages); } =20 -static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, - struct io_pgtable_cfg *cfg, - void *cookie) +static void *__arm_lpae_cfg_alloc(size_t size, gfp_t gfp, + struct io_pgtable_cfg *cfg, + void *cookie) { struct device *dev =3D cfg->iommu_dev; dma_addr_t dma; void *pages; =20 - /* - * For very small starting-level translation tables the HW requires a - * minimum alignment of at least 64 to cover all cases. - */ - size =3D max(size, 64); - if (cfg->alloc) - pages =3D cfg->alloc(cookie, size, gfp); - else - pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, size); - + pages =3D cfg->alloc(cookie, size, gfp); if (!pages) return NULL; =20 @@ -289,14 +280,55 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_= t gfp, dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); =20 out_free: - if (cfg->free) - cfg->free(cookie, pages, size); - else - iommu_free_pages(pages); - + cfg->free(cookie, pages, size); return NULL; } =20 +static void __arm_lpae_cfg_free(void *pages, size_t size, + struct io_pgtable_cfg *cfg, + void *cookie) +{ + if (!cfg->coherent_walk) + dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), + size, DMA_TO_DEVICE); + + cfg->free(cookie, pages, size); +} + +static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, + struct io_pgtable_cfg *cfg, + void *cookie) +{ + struct device *dev =3D cfg->iommu_dev; + void *pages; + + /* + * For very small starting-level translation tables the HW requires a + * minimum alignment of at least 64 to cover all cases. + */ + size =3D max(size, 64); + + if (cfg->alloc) + return __arm_lpae_cfg_alloc(size, gfp, cfg, cookie); + + pages =3D iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, size); + if (!pages) + return NULL; + + if (!cfg->coherent_walk) { + int ret =3D iommu_pages_start_incoherent(pages, dev); + + if (ret) { + if (ret =3D=3D -EOPNOTSUPP) + dev_err(dev, "Cannot accommodate DMA translation for IOMMU page tables= \n"); + iommu_free_pages(pages); + return NULL; + } + } + + return pages; +} + static void __arm_lpae_free_pages(void *pages, size_t size, struct io_pgtable_cfg *cfg, void *cookie) @@ -304,12 +336,13 @@ static void __arm_lpae_free_pages(void *pages, size_t= size, /* See __arm_lpae_alloc_pages(). */ size =3D max(size, 64); =20 - if (!cfg->coherent_walk) - dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), - size, DMA_TO_DEVICE); + if (cfg->free) { + __arm_lpae_cfg_free(pages, size, cfg, cookie); + return; + } =20 - if (cfg->free) - cfg->free(cookie, pages, size); + if (!cfg->coherent_walk) + iommu_pages_free_incoherent(pages, cfg->iommu_dev); else iommu_free_pages(pages); } --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 15:57:54 2026 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 6E10935F16E for ; Wed, 13 May 2026 21:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709177; cv=none; b=Zgu6XNlquAJrycDjmnFRoI04vJWUNWBKF1751PnzBZuOjnGLwke5ieMHGTCoo5I0weSkw9htKdT/ghhP23WjA3tI5gBmhGuDdtAKtrFkDnjK6k93xVJjIGf2fOESQd5zysjxaWnz5RVI38GTV96Ko7NoC5zfE4McYPmldXoVfIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778709177; c=relaxed/simple; bh=+OczJGrSk8p/b3s2p7AbRUIvZaBMC0oHxGZgBms07fs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=S7C4soz/pswrply2+imVjEsY89kh7bAWXa245pMmGEniCqHV1UJL0YpLysUUpnYiRk/3IbtriNgSET9Xu3IU9rkfPtFiE0RJheBV3S/KfzJdirfVUGudQA3w5nfslkAeqpRIIp/d74lX9rSGc7/KGGxlDEshf9rJV6Tt8ZiOYbc= 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=lvzN8Qfl; arc=none smtp.client-ip=209.85.221.73 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="lvzN8Qfl" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-449dcfe8005so7001301f8f.3 for ; Wed, 13 May 2026 14:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778709175; x=1779313975; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=B4gZFEOmN4BitsxINTjrbRsNtg0gv58NYoTuWrSbwJg=; b=lvzN8Qflf9wn1kYshwNkbvMWICs+XXSMqTQz7IIi4EPaYMXkGrzSRILmCbws7R9Yj8 Li44q2D6BkQpSVJ5NnhA/vVHo8bmSHp1y53W9cJRwB/RNvqdapKOs92IFGWF4ah+c/rD RtM8dLf3zRCqjwrBg5nwfCsbAWYPMWESNT2KNtlYkbTq55/+TkQSiMGVMMA+JJGE1dUB 8mHflkbmS1tuwZiURqqzb5z+1H61fEHxu8HjuDQ5fg06R/aUuQGi65wSLAcplfXUZzQ1 WSMyF/9Cq6DvKSxehiwgimWiBO2v4yijEZCbVEnR4s/p7WHTKorKrXjeI1rAy0MClSdM UezQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778709175; x=1779313975; h=content-transfer-encoding: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=B4gZFEOmN4BitsxINTjrbRsNtg0gv58NYoTuWrSbwJg=; b=Xrjb3zcqBICuzl7p2azPncKm/U3cPKTq29AnjmpY1Vo1RA1TweG8eOJEbwnRqxJ6xi GLfdvDAeITTYPPGPWhwQKwgKH5uFs9KdfSGP4F/dTAh7mDY8uJM6OwJVOpOP75jyFnIv JBKFhBXU6P+FEXwOJ2P7nZCBlQ21IcgOpzxVrFbtCnkH6HlbLqah3TO2aSRsNRfQTXVx Yo0kBLr/VFlfDNVrp0/Qfno45pCLhFK25TuhFm88JkaEil/IiEW2c8YDacgLmLXIoRWR tAxLSbVdxEb8kE7Hr8Hckyd2XX7SQjPcuiV8bIPW/z4Mwj1q7ss31raB94VPEcEmCpae mHLA== X-Forwarded-Encrypted: i=1; AFNElJ+Y9mcm48RBne4kPlz6zFPZiVlbaW1dPS577t3K2U8qaljKctKQNIHBI2FBm7oP8cYx8FzHR8LZAG6HJQ8=@vger.kernel.org X-Gm-Message-State: AOJu0YwrQinGCjJ9MpPMju5Y93TzZV8Ia37yKD/am6vTOsiBhBKvRPiI PzU64KGqneuk7LpvR2KX4mXXMq5YdyiAB47Zs4D2KuRxl++6URpOknBimPunvHyQV8XtJNi8kg+ kUpBZCITEvWw6zg== X-Received: from wroe2.prod.google.com ([2002:adf:ef02:0:b0:43d:6fc6:5521]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2486:b0:44b:e349:e6bc with SMTP id ffacd0b85a97d-45c77b7bacdmr7661958f8f.3.1778709174704; Wed, 13 May 2026 14:52:54 -0700 (PDT) Date: Wed, 13 May 2026 21:52:03 +0000 In-Reply-To: <20260513215203.3852661-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: <20260513215203.3852661-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260513215203.3852661-4-smostafa@google.com> Subject: [PATCH 3/3] iommu/io-pgtable-arm: Use address conversion consistently From: Mostafa Saleh To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: robin.murphy@arm.com, will@kernel.org, joro@8bytes.org, jgg@ziepe.ca, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use consistent address conversions in the driver: - virt_to_phys(): For all virtual to physical address conversion, convert __pa users as we don=E2=80=99t need to rely on it type casting. - phys_to_virt(): For all physical to virtual address conversion, similarly, convert __va users. That changes nothing at all. However, it will be useful when compiling this file for the KVM hypervisor as it can cleanly replace virt_to_phys/phys_to_virt Signed-off-by: Mostafa Saleh Reviewed-by: Jason Gunthorpe --- drivers/iommu/io-pgtable-arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 86b23aa04324..476c0e25631a 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -143,7 +143,7 @@ #define ARM_MALI_LPAE_MEMATTR_WRITE_ALLOC 0x8DULL =20 /* IOPTE accessors */ -#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d)) +#define iopte_deref(pte, d) phys_to_virt(iopte_to_paddr(pte, d)) =20 #define iopte_type(pte) \ (((pte) >> ARM_LPAE_PTE_TYPE_SHIFT) & ARM_LPAE_PTE_TYPE_MASK) @@ -429,7 +429,7 @@ static arm_lpae_iopte arm_lpae_install_table(arm_lpae_i= opte *table, arm_lpae_iopte old, new; struct io_pgtable_cfg *cfg =3D &data->iop.cfg; =20 - new =3D paddr_to_iopte(__pa(table), data) | ARM_LPAE_PTE_TYPE_TABLE; + new =3D paddr_to_iopte(virt_to_phys(table), data) | ARM_LPAE_PTE_TYPE_TAB= LE; if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS) new |=3D ARM_LPAE_PTE_NSTABLE; =20 --=20 2.54.0.563.g4f69b47b94-goog