From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8B58E36F8EA; Mon, 21 Sep 2026 06:38:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789972683; cv=none; b=QzASeOUp82nn5xSXJCwswjXY1q5CSsYTHxG2bMbIh/1+j0fAHX6C0VoRdQbXvnxm32PZWHwcKdlTKA0fvMXHss2qqNApL0f1nh+GsZCUXuHpnx4tKEiQgPciR0UFPu7xf+KUKwttvt+P/fNb64kzzH+q12OZj7Xzu+aJ1HzmUKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789972683; c=relaxed/simple; bh=Fkk3WeO96ahd0kHqCEHayzU9nd2LoU1tvP48FTar0AE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UeT7OkBd5Eq++DCnmzbjokdTHcdNcljBcbmYHFLqFYBY5EsxvBtr8FhfB8Yp6kDnhZ/sgrtBB8KqSN59IvcYLKPg00OazWSSx7bNlCeTagPsF8X32eONUer/ZYKnXM0ZGeoGHZCT9HnR1fnYVxh7VuYzFrBjeMU1Zp7E2M2N0P8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZzMXPOCT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZzMXPOCT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C2311F00893; Mon, 21 Sep 2026 06:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789972681; bh=fFLFmWm1E4cYQvctfCBtN7dfMLeyqysLCL+XSA6T+I0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZzMXPOCTNLT/Q06TPayEJbdJT7MQQSUndDMUDLI3EMDAYQ+ZfmB9ubQwVZW+enXMt uT90JLd+XDvkd0sD6UcZZgSwd4/rSGIVYnHuOlGMF6f2zIm1TBOB3cllrOXnZwMF/P 1pJEuMwCRcF8JyzZRuK0U7VkO/lD2WKx+me+XlL8hLFUHKqX7y64RzH1AoYguyG2GU FC4ngD0nR5T7IQWneSJer06E8CkgWGsL1FfDUbjCNF+4oqtNOBRAYegt1bngwv2fzp t9y2vsjkaS7nevJRsRxHDS/J850Unx3q5CdI+f0YtOFCMlA/x5M0tQc/ZOJrn2O6yw wrDjlEyssQp3w== From: "Aneesh Kumar K.V (Arm)" To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Robin Murphy , Marek Szyprowski , Will Deacon , Marc Zyngier , Steven Price , Suzuki K Poulose , Catalin Marinas , Jiri Pirko , Jason Gunthorpe , Mostafa Saleh , Petr Tesarik , Alexey Kardashevskiy , Dan Williams , Xu Yilun , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , Russell King , Huacai Chen , Thomas Bogendoerfer , Jiaxun Yang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, x86@kernel.org Subject: [PATCH v5 5/6] dma: swiotlb: Add an overridable architecture pool opt-out Date: Mon, 21 Sep 2026 12:06:27 +0530 Message-ID: <20260921063628.362078-6-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921063628.362078-1-aneesh.kumar@kernel.org> References: <20260921063628.362078-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On x86, iommu=off historically prevented SWIOTLB initialization by not setting SWIOTLB_INIT_ADDRESSING_LIMIT. This overloads that flag: it controls both whether a pool is selected and where the pool is allocated. If another requirement, swiotlb=force selects a pool independently, omitting SWIOTLB_INIT_ADDRESSING_LIMIT may place it above the addressable range of devices which need bounce buffering. Add SWIOTLB_INIT_FORCE_DISABLE to let an architecture opt out of normal pool initialization without discarding the pool placement constraints. Unlike swiotlb_force_disable, which is set by swiotlb=noforce and unconditionally prevents pool initialization, the new flag is an architecture default. Explicit requirements such as memory encryption, architecture remapping, or swiotlb=force take precedence over it. iommu=soft retains SWIOTLB_INIT_ADDRESSING_LIMIT because it requests software bounce buffering for devices whose DMA masks cannot address all system memory. Such devices must be able to reach the bounce pool. Clear both flags for Xen because Xen explicitly requires a remapped SWIOTLB pool and may allocate it anywhere in directly mapped memory. With no override, iommu=off disables both hardware IOMMU translation and SWIOTLB bouncing. Direct DMA remains available; mappings outside a device's addressable range fail instead of being bounced. Reviewed-by: Catalin Marinas Signed-off-by: Aneesh Kumar K.V (Arm) --- arch/x86/kernel/pci-dma.c | 11 ++++++++--- include/linux/swiotlb.h | 2 ++ kernel/dma/swiotlb.c | 10 ++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 0cff255827ba..ce257b20ea9c 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -44,9 +44,13 @@ static unsigned int x86_swiotlb_flags; static void __init pci_swiotlb_detect(void) { /* don't initialize swiotlb if iommu=off (no_iommu=1) */ - if (!no_iommu && max_possible_pfn > MAX_DMA32_PFN) { - x86_swiotlb_enable = true; + if (no_iommu) + x86_swiotlb_flags |= SWIOTLB_INIT_DEFAULT_OFF; + + if (max_possible_pfn > MAX_DMA32_PFN) { x86_swiotlb_flags |= SWIOTLB_INIT_ADDRESSING_LIMIT; + if (!no_iommu) + x86_swiotlb_enable = true; } /* @@ -84,7 +88,8 @@ static void __init pci_xen_swiotlb_init(void) return; x86_swiotlb_enable = true; /* Xen can use a SWIOTLB pool anywhere in directly mapped memory. */ - x86_swiotlb_flags &= ~SWIOTLB_INIT_ADDRESSING_LIMIT; + x86_swiotlb_flags &= ~(SWIOTLB_INIT_ADDRESSING_LIMIT | + SWIOTLB_INIT_DEFAULT_OFF); x86_swiotlb_flags |= SWIOTLB_INIT_REMAP | SWIOTLB_ANY; swiotlb_init_remap(x86_swiotlb_flags, xen_swiotlb_fixup); dma_ops = &xen_swiotlb_dma_ops; diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index be3962a33fc6..466c33795db0 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -20,6 +20,8 @@ struct scatterlist; #define SWIOTLB_INIT_ADDRESSING_LIMIT (1 << 2) /* Initialize a default-sized pool that requires architecture remapping. */ #define SWIOTLB_INIT_REMAP (1 << 3) +/* Do not initialize a pool unless SWIOTLB is explicitly required. */ +#define SWIOTLB_INIT_DEFAULT_OFF (1 << 4) /* * Maximum allowable number of contiguous slabs to map, diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index c19675846fc1..46b789eb0806 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -563,10 +563,16 @@ swiotlb_select_pool_policy(unsigned int flags) if (flags & SWIOTLB_INIT_REMAP) return SWIOTLB_POOL_DEFAULT; - if (flags & SWIOTLB_INIT_ADDRESSING_LIMIT) + if (swiotlb_force_bounce) return SWIOTLB_POOL_DEFAULT; - if (swiotlb_force_bounce) + /* + * Explicit requirements above override an architecture's default opt-out. + */ + if (flags & SWIOTLB_INIT_DEFAULT_OFF) + return SWIOTLB_POOL_NONE; + + if (flags & SWIOTLB_INIT_ADDRESSING_LIMIT) return SWIOTLB_POOL_DEFAULT; if (swiotlb_kmalloc_needs_bounce()) -- 2.43.0