From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 910C32D6407 for ; Tue, 9 Jun 2026 13:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781011609; cv=none; b=BsOG07sCaxq9jpgvCLO0SAAWxvcPNX9mBQ07TKMo7Mw9jv5PooFhCc67Ko6x2vU/rHND9dTSkAiKmppmPHwx9sF219xSvs3mZqMX3/q5wcvlVrDU6AsYaeYk8A5sawtAKBBqYP8gYoVqHEi20vfb109/o2GtTN3ZIuNgaU3Y7I4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781011609; c=relaxed/simple; bh=twwp9hFllxfAH5zTiaxs+mflqhqxD3N7oFJ/LghNab4=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A66goM9iwCfCRJoebMNGZ0bf1FjngBr5OC/vrz9lio1j5pxWkHDOSZg6sR550Ijy5JNR/2NY7ePy0H3lwaGGqHq5AuIMar7l4hrNvgQGa1OI1pr+c3c7FT0lli2UUQxKNxHgePv8iDWEU+Vny+UGUm/sMDMKHMxWLjMl20PF2b4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=JqwJYwP5; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="JqwJYwP5" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-490b1df16acso5141475e9.3 for ; Tue, 09 Jun 2026 06:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1781011606; x=1781616406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=5Mb3ECCQF4KDrnD1oEZunr+tebvyQKuHVVgCgeE/hK8=; b=JqwJYwP5rsw5mLds8y/xfXTBC4ZsdPTXG57lP+trT+Nq8qLLXF1IeBaqqTGs5JnIAv 1nfzR2K5zqGxc01dJfyEw20tAeoxz9tZWTjLhRldM1l/6e0G9vFl7C7ezD+/Zc0Cb/TD yyrxJjD0U7S6HoTgohT0l0r0QApXMa8obNj9sNrzZ/8kWqKMBu3O4wMj1jrW9wIX2s4V BzLHkTWhE1u9E3wRwD31JWFmqS8DJ4X+ofKSkS2DLhGfFcPZf1uDJBVKEEVHoQCydYvE cxLHIsbQUmFKfwB9qmVifKiuONS4QzSUyCjNEPpA4n26S9mq6j2+8FDJSefwH2OR+dFc TL2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781011606; x=1781616406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5Mb3ECCQF4KDrnD1oEZunr+tebvyQKuHVVgCgeE/hK8=; b=jxnPc0GmV6+tANgHeK6MGTmKe59hDi54w0OkpRtllbb9UIaAKPShfetBT52T09iohg nulnojkXDyV2xj0szc6IP51gsyTq2C4JNCEb+xUI/xUXQgr0HVoor+B1bZr4LgFRx805 s2fUYVzhjfTU//BnoFMuc8AcFql32yCEk0+jAiSwUwnNuEac56RtFR/xd5Q7T9Y7WwGG qu9tt/tVRjUhgRyK/QAf7ZGmETRR2hE5Cd4KYQp1tTqFn4iLC/hVd7NkXHqQqyVX5RAZ DJYP9JojPNPJEHdSFKpdGFJmZY8Wl/oJF9r9vkZN/FgZIoMFd6x6HvkOUv0wyUHHwD3q V+SA== X-Forwarded-Encrypted: i=1; AFNElJ+HymqBi2qrVkh4hWaOr9OrgR6EhimnFP8wJ4P6o+uhq55tx9YDa31u+jAjZoEN6HNNfE4H2zsmYUJLR70=@vger.kernel.org X-Gm-Message-State: AOJu0YxxqWsCuK0CEn8HBi5Iu3XY2asQv2AFZeXcirGa3KgGqzSuz6oO ncz3pFP0pudLG8e+0trl+kg9OPNHMW5zIubP7RGi36SIxQ6Xqhh171CEBGFslTwgqaI= X-Gm-Gg: Acq92OHYUI/2Ewu1YY0lgjKFzenTbkQx1BvMYX4MFXgNzq69BE7Bkep6xIujzpqeXBa nhD7im9I3pSScsLJp2jw58rMFTwYg4L4AjnPd6Z91LUW85tnyDhxqtcln9DYLWNwYSxCpyYnGGW wZb/uLZPJiKKhFUmI4tAm/7/XU4Mw5SaUb5VZQFtdSI3EL7nFWV9bLYEHssxy348JgSWkoet4kV tec+6wWlg2nauGVzTnNLZ5RB4WCHzBW8X96a/uCQIh0hI1nxhHzrLphU5n3KT2k27hsEByiBGkd aYUSk2CNYyibpeChB/SWV3ty46LJa+qIGdxBbd9CpTsiLs6fCOqb9kt3nx24ZtZ7CEwilteKpo8 CakKeB2QT5qiVzsiOl0FwMPBFuGhTKF7UzS7IZ3GdpThzMae22TMCcQkXeizFw5Nq7M5gbir1BW pCoJJfBEWPokbyHnNKfK62OPY= X-Received: by 2002:a05:600c:8705:b0:490:3fdd:d344 with SMTP id 5b1f17b1804b1-490c25897eamr150306735e9.1.1781011605912; Tue, 09 Jun 2026 06:26:45 -0700 (PDT) Received: from mordecai ([62.77.90.70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490bc39def5sm469464095e9.5.2026.06.09.06.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 06:26:45 -0700 (PDT) Date: Tue, 9 Jun 2026 15:13:54 +0200 From: Petr Tesarik To: "Aneesh Kumar K.V (Arm)" Cc: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, Robin Murphy , Marek Szyprowski , Will Deacon , Marc Zyngier , Steven Price , Suzuki K Poulose , Catalin Marinas , Jiri Pirko , Jason Gunthorpe , Mostafa Saleh , Alexey Kardashevskiy , Dan Williams , Xu Yilun , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , x86@kernel.org, Michael Kelley Subject: Re: [PATCH v6 15/20] iommu/dma: Check atomic pool allocation result directly Message-ID: <20260609151354.534bb18d@mordecai> In-Reply-To: <20260604083959.1265923-16-aneesh.kumar@kernel.org> References: <20260604083959.1265923-1-aneesh.kumar@kernel.org> <20260604083959.1265923-16-aneesh.kumar@kernel.org> X-Mailer: Claws Mail 4.4.0 (GTK 3.24.52; x86_64-suse-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 4 Jun 2026 14:09:54 +0530 "Aneesh Kumar K.V (Arm)" wrote: > The non-blocking, non-coherent allocation path uses dma_alloc_from_pool(), > which returns the allocated page and fills cpu_addr only on success. > > Do not rely on cpu_addr to detect allocation failure in this path. Check > the returned page directly before using it for the IOMMU mapping. > > Fixes: 9420139f516d ("dma-pool: fix coherent pool allocations for IOMMU mappings") > Tested-by: Michael Kelley > Tested-by: Mostafa Saleh > Signed-off-by: Aneesh Kumar K.V (Arm) Reviewed-by: Petr Tesarik Petr T > --- > drivers/iommu/dma-iommu.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 725c7adb0a8d..52c599f4472c 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1671,13 +1671,16 @@ void *iommu_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, > } > > if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && > - !gfpflags_allow_blocking(gfp) && !coherent) > + !gfpflags_allow_blocking(gfp) && !coherent) { > page = dma_alloc_from_pool(dev, PAGE_ALIGN(size), &cpu_addr, > gfp, attrs, NULL); > - else > + if (!page) > + return NULL; > + } else { > cpu_addr = iommu_dma_alloc_pages(dev, size, &page, gfp, attrs); > - if (!cpu_addr) > - return NULL; > + if (!cpu_addr) > + return NULL; > + } > > *handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot, > dev->coherent_dma_mask);