From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 D25FA435535 for ; Tue, 28 Jul 2026 14:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785248828; cv=none; b=uU8nOIJj2xrieqS6m8zVK0fIpDf5i5fG64zi2O1xr3bqpg/1LfTF9poV9ZGhHxfDn2R4+f6mUbASM15jcA63ur1K2AOahYpftgJUDurHnDPmAj8YkhgCGgI2FQG48aWVPP1Z0N1eSrpn0rPECanJC405bDUhOZxKEfdkm0VOMsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785248828; c=relaxed/simple; bh=gVq0Fz3g+XDQCPf7dOicHGB4Jxifut+ZUEFvN2XpjTs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rkZd8FiiM90suI+utAiycEXLG/gm6uj24PPrJvlEFFY7d2LQeSc3TwngWrhuAQJy4nF9uDz0g27DhcbD6Et5078NSQ3FIqd6m3DAZq0GwUNyoJBvsFd9gbqVDTztJMlfNxqwXp62LxJW7rtdXFP+SyMt0cCqHqryzdITiuSoNC4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=fXVsC7sp; arc=none smtp.client-ip=209.85.208.47 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=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fXVsC7sp" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-69fec8b4638so12818a12.0 for ; Tue, 28 Jul 2026 07:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785248825; x=1785853625; darn=lists.linux.dev; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=xBoFAKEkC+vfpGEapr3+3YEZ3mSu2No6TKaGaOQmWRI=; b=fXVsC7spec+If+KHmmvqNsO9/gM6KDOhvK66ymjMcS/w3Gdh9iIDLf+O2ILoN51GlQ uHT6cF4eEw0KGxPtxb2b4QCsN7dEXIVypAbDrL4DXR3dG/OjAi+9YebDDe82vKWw71tr HBdeq4BR/KS7It3hUu1nLqEaViqmwjdO3YuLemDhzarddSxOZQYH9JK04cDKajoYtP7T fZNC40w1ZWZpASEPAS5i50jC/PmhjoueiQ8GWlSNdm0Xyt/zbqVbXJDSBcsklT5YKYzB ZNwxP4H/1sMxDLphA9S9dnwursusMGt6TXv13Hvlmk7Quu0tEUqzvtpzTEyUI8dbgrWn UQLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785248825; x=1785853625; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=xBoFAKEkC+vfpGEapr3+3YEZ3mSu2No6TKaGaOQmWRI=; b=RLf8m5ik3wKaiOwBy9C4bpTzGExkFsMmmmjrK4Vx3+kDGhANjGTethq0iBCgbBRgBw J9BS4Mt/rQNZVBRIDukBTwSQpGGC/8BWsIzm4v2DKF1aYytxfil24dnMgCwDiRIDYusr b0NuG3+t2BCgXQqH2DjaqzjMEwWydrIQ4s2Bx4fLyibleGeJWGrB1YaQa+RxcNTWU4Xy pflUS0xJBmQTMjoe3XvRMLYfLe5FqVS4xrAk5hsoVNE++zvoDAA9Zijfzmfm6yy99k2M C8cwfsnQ8RHUyAbLJjOjraIXgkKU8oGzD1MkIm518O3vt7bCo9zbIh8bbtWzeqng5H+Q XRTQ== X-Forwarded-Encrypted: i=1; AHgh+RqPLwgYI7ONE45AHXXivpmrIYfJtNbXJc8xVKnjQlGyKZKGevPTVBLlcXV/yAiXSGAsdJRr7t3m3s70@lists.linux.dev X-Gm-Message-State: AOJu0YymZ1qCYyt9JefHXGZiJH1TARi51RgymxJ9c1Iqs6gzHbBGRNOj RGyX6KEnNxCIBKAkBjgcCam6jeb4q/eqNw8iBJiHG9CYrkWeQqC7vjVpYBn50iLstQ== X-Gm-Gg: AR+sD13qgQdzdEJw0cMlFKLw2+ziFE6WDKmxNOWE3pO7gc5xvFCAq9OKYb7qIsXO8Bv MctDbOS8E2vcglGWUxEh8dNB9AA30USS1M4doLi3iV14QEv1J5iztj4kLe6+OOVQnqy/ET9dfrG 9CvzrpE1dhaqGAQ344fVUs+YSFp7HKC1n9T+frcoMG4xF45DqYrDgYAhQqN43e4wJIRmAsKHzWo Mno93AnpjAva3UlillhQat4GGTFaav6mb9OHxka+IPh80vxxLh2I9lRzbhWB6ExRTfufHS9sFTZ ynr1ixDSnvNMT/PTT5cHL67QdOc/IpPqE307ntI9dEU0fhG7rKN+BE7opNK+GOIKtwrPfXLEDgS oQzO13xN63qmFLpMTaKyVdmtt1fVrJLtm0RmVRZqt1ulRPV3r1PjtU97R6CDz1j8C9pGPgJ7njh QjVlgKN4NS2Bbm5pN14VczS6m9rcM87HM50zfgDej7DCw= X-Received: by 2002:a05:6402:a20f:10b0:697:e82f:e4f2 with SMTP id 4fb4d7f45d1cf-69fb80feebemr4712a12.4.1785248824492; Tue, 28 Jul 2026 07:27:04 -0700 (PDT) Received: from google.com (250.192.189.35.bc.googleusercontent.com. [35.189.192.250]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69fb594622asm4455060a12.26.2026.07.28.07.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 07:27:03 -0700 (PDT) Date: Tue, 28 Jul 2026 14:26:56 +0000 From: Mostafa Saleh 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 , Petr Tesarik , 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, Jason Gunthorpe , Jiri Pirko , Michael Kelley Subject: Re: [PATCH v8 07/23] dma-direct: swiotlb: handle swiotlb alloc/free outside __dma_direct_alloc_pages Message-ID: References: <20260717180442.110954-1-aneesh.kumar@kernel.org> <20260717180442.110954-8-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260717180442.110954-8-aneesh.kumar@kernel.org> On Fri, Jul 17, 2026 at 11:34:25PM +0530, Aneesh Kumar K.V (Arm) wrote: > Move swiotlb allocation out of __dma_direct_alloc_pages() and handle it in > dma_direct_alloc() / dma_direct_alloc_pages(). > > This is needed for follow-up changes that simplify the handling of > memory encryption/decryption based on the DMA attribute flags. > > swiotlb backing pages are already mapped decrypted by > swiotlb_update_mem_attributes() and rmem_swiotlb_device_init(), so > dma-direct should not call dma_set_decrypted() on allocation nor > dma_set_encrypted() on free for swiotlb-backed memory. > > Update alloc/free paths to detect swiotlb-backed pages and skip > encrypt/decrypt transitions for those paths. Keep the existing highmem > rejection in dma_direct_alloc_pages() for swiotlb allocations. > > Only for "restricted-dma-pool", we currently set `for_alloc = true`, while > rmem_swiotlb_device_init() decrypts the whole pool up front. This pool is > typically used together with "shared-dma-pool", where the shared region is > accessed after remap/ioremap and the returned address is suitable for > decrypted memory access. So existing code paths remain valid. > > Reviewed-by: Jason Gunthorpe > Tested-by: Jiri Pirko > Tested-by: Michael Kelley > Tested-by: Mostafa Saleh > Signed-off-by: Aneesh Kumar K.V (Arm) Reviewed-by: Mostafa Saleh Thanks, Mostafa > --- > include/linux/swiotlb.h | 6 ++++ > kernel/dma/direct.c | 71 ++++++++++++++++++++++++++++++----------- > kernel/dma/swiotlb.c | 6 ++++ > 3 files changed, 65 insertions(+), 18 deletions(-) > > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h > index 3dae0f592063..c92ff6791595 100644 > --- a/include/linux/swiotlb.h > +++ b/include/linux/swiotlb.h > @@ -284,6 +284,8 @@ extern void swiotlb_print_info(void); > #ifdef CONFIG_DMA_RESTRICTED_POOL > struct page *swiotlb_alloc(struct device *dev, size_t size); > bool swiotlb_free(struct device *dev, struct page *page, size_t size); > +void swiotlb_free_from_pool(struct device *dev, > + phys_addr_t tlb_addr, struct io_tlb_pool *pool); > > static inline bool is_swiotlb_for_alloc(struct device *dev) > { > @@ -299,6 +301,10 @@ static inline bool swiotlb_free(struct device *dev, struct page *page, > { > return false; > } > +static inline void swiotlb_free_from_pool(struct device *dev, > + phys_addr_t tlb_addr, struct io_tlb_pool *pool) > +{ > +} > static inline bool is_swiotlb_for_alloc(struct device *dev) > { > return false; > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index a81597f8c3ed..171c89fe99c9 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -96,14 +96,6 @@ static int dma_set_encrypted(struct device *dev, void *vaddr, size_t size) > return ret; > } > > -static void __dma_direct_free_pages(struct device *dev, struct page *page, > - size_t size) > -{ > - if (swiotlb_free(dev, page, size)) > - return; > - dma_free_contiguous(dev, page, size); > -} > - > static struct page *dma_direct_alloc_swiotlb(struct device *dev, size_t size) > { > struct page *page = swiotlb_alloc(dev, size); > @@ -125,9 +117,6 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size, > > WARN_ON_ONCE(!PAGE_ALIGNED(size)); > > - if (is_swiotlb_for_alloc(dev)) > - return dma_direct_alloc_swiotlb(dev, size); > - > gfp |= dma_direct_optimal_gfp_mask(dev, &phys_limit); > page = dma_alloc_contiguous(dev, size, gfp); > if (page) { > @@ -203,6 +192,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) > { > bool remap = false, set_uncached = false; > + bool mark_mem_decrypt = true; > struct page *page; > void *ret; > > @@ -252,11 +242,21 @@ void *dma_direct_alloc(struct device *dev, size_t size, > return page ? ret : NULL; > } > > + if (is_swiotlb_for_alloc(dev)) { > + page = dma_direct_alloc_swiotlb(dev, size); > + if (page) { > + mark_mem_decrypt = false; > + goto setup_page; > + } > + return NULL; > + } > + > /* we always manually zero the memory once we are done */ > page = __dma_direct_alloc_pages(dev, size, gfp & ~__GFP_ZERO, true); > if (!page) > return NULL; > > +setup_page: > /* > * dma_alloc_contiguous can return highmem pages depending on a > * combination the cma= arguments and per-arch setup. These need to be > @@ -283,7 +283,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, > goto out_free_pages; > } else { > ret = page_address(page); > - if (dma_set_decrypted(dev, ret, size)) > + if (mark_mem_decrypt && dma_set_decrypted(dev, ret, size)) > goto out_leak_pages; > } > > @@ -300,10 +300,11 @@ void *dma_direct_alloc(struct device *dev, size_t size, > return ret; > > out_encrypt_pages: > - if (dma_set_encrypted(dev, page_address(page), size)) > + if (mark_mem_decrypt && dma_set_encrypted(dev, page_address(page), size)) > return NULL; > out_free_pages: > - __dma_direct_free_pages(dev, page, size); > + if (!swiotlb_free(dev, page, size)) > + dma_free_contiguous(dev, page, size); > return NULL; > out_leak_pages: > return NULL; > @@ -312,6 +313,9 @@ void *dma_direct_alloc(struct device *dev, size_t size, > void dma_direct_free(struct device *dev, size_t size, > void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs) > { > + phys_addr_t phys; > + bool mark_mem_encrypted = true; > + struct io_tlb_pool *swiotlb_pool; > unsigned int page_order = get_order(size); > > if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) && > @@ -340,16 +344,25 @@ void dma_direct_free(struct device *dev, size_t size, > dma_free_from_pool(dev, cpu_addr, PAGE_ALIGN(size))) > return; > > + phys = dma_to_phys(dev, dma_addr); > + swiotlb_pool = swiotlb_find_pool(dev, phys); > + if (swiotlb_pool) > + /* Swiotlb doesn't need a page attribute update on free */ > + mark_mem_encrypted = false; > + > if (is_vmalloc_addr(cpu_addr)) { > vunmap(cpu_addr); > } else { > if (IS_ENABLED(CONFIG_ARCH_HAS_DMA_CLEAR_UNCACHED)) > arch_dma_clear_uncached(cpu_addr, size); > - if (dma_set_encrypted(dev, cpu_addr, size)) > + if (mark_mem_encrypted && dma_set_encrypted(dev, cpu_addr, size)) > return; > } > > - __dma_direct_free_pages(dev, dma_direct_to_page(dev, dma_addr), size); > + if (swiotlb_pool) > + swiotlb_free_from_pool(dev, phys, swiotlb_pool); > + else > + dma_free_contiguous(dev, dma_direct_to_page(dev, dma_addr), size); > } > > struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > @@ -361,6 +374,15 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > if (force_dma_unencrypted(dev) && dma_direct_use_pool(dev, gfp)) > return dma_direct_alloc_from_pool(dev, size, dma_handle, &ret, gfp); > > + if (is_swiotlb_for_alloc(dev)) { > + page = dma_direct_alloc_swiotlb(dev, size); > + if (!page) > + return NULL; > + > + ret = page_address(page); > + goto setup_page; > + } > + > page = __dma_direct_alloc_pages(dev, size, gfp, false); > if (!page) > return NULL; > @@ -368,6 +390,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > ret = page_address(page); > if (dma_set_decrypted(dev, ret, size)) > goto out_leak_pages; > +setup_page: > memset(ret, 0, size); > *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); > return page; > @@ -379,16 +402,28 @@ void dma_direct_free_pages(struct device *dev, size_t size, > struct page *page, dma_addr_t dma_addr, > enum dma_data_direction dir) > { > + phys_addr_t phys; > void *vaddr = page_address(page); > + struct io_tlb_pool *swiotlb_pool; > + bool mark_mem_encrypted = true; > > /* If page is not from an atomic pool, dma_free_from_pool_page() fails */ > if (IS_ENABLED(CONFIG_DMA_COHERENT_POOL) && > dma_free_from_pool_page(dev, page, size)) > return; > > - if (dma_set_encrypted(dev, vaddr, size)) > + phys = page_to_phys(page); > + swiotlb_pool = swiotlb_find_pool(dev, phys); > + if (swiotlb_pool) > + mark_mem_encrypted = false; > + > + if (mark_mem_encrypted && dma_set_encrypted(dev, vaddr, size)) > return; > - __dma_direct_free_pages(dev, page, size); > + > + if (swiotlb_pool) > + swiotlb_free_from_pool(dev, phys, swiotlb_pool); > + else > + dma_free_contiguous(dev, page, size); > } > > #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \ > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 6e8db52866bf..d54154c165e5 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -1815,6 +1815,12 @@ bool swiotlb_free(struct device *dev, struct page *page, size_t size) > return true; > } > > +void swiotlb_free_from_pool(struct device *dev, > + phys_addr_t tlb_addr, struct io_tlb_pool *pool) > +{ > + swiotlb_release_slots(dev, tlb_addr, pool); > +} > + > static int rmem_swiotlb_device_init(struct reserved_mem *rmem, > struct device *dev) > { > -- > 2.43.0 >