From mboxrd@z Thu Jan 1 00:00:00 1970 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-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 --- 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 = cfg->iommu_dev; - size_t alloc_size; dma_addr_t dma; void *pages; @@ -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 = max(size, 64); + size = max(size, 64); if (cfg->alloc) - pages = cfg->alloc(cookie, alloc_size, gfp); + pages = cfg->alloc(cookie, size, gfp); else - pages = iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, - alloc_size); + pages = iommu_alloc_pages_node_sz(dev_to_node(dev), gfp, size); if (!pages) return NULL; @@ -303,6 +301,9 @@ static void __arm_lpae_free_pages(void *pages, size_t size, struct io_pgtable_cfg *cfg, void *cookie) { + /* See __arm_lpae_alloc_pages(). */ + size = max(size, 64); + if (!cfg->coherent_walk) dma_unmap_single(cfg->iommu_dev, __arm_lpae_dma_addr(pages), size, DMA_TO_DEVICE); -- 2.54.0.563.g4f69b47b94-goog