From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 2129644781A for ; Tue, 28 Jul 2026 14:31:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785249101; cv=none; b=IvZgIOA9/DH7irrCqdkm6CbW5YUOM7v9uTu8GSZr70hEdNV9mgVG5TWoj3osZO/mYd37Fh4jZsP9TViTMZAy1WfgikXIf1veGEkNEcDBjOoaluOmPRZPDPqqGKSEXaH+Cp7RzoxM9Y0Qs+y3g4u0Bks7YczJ6nR15VVzV4Z6C4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785249101; c=relaxed/simple; bh=6NJ7tOMwjbPhaKtcUtOtEU/HVu8ov9rsYzJHH2Qdc70=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=RNq1B8t/c93BAVVU9KnaU7TH77Wta4H+1Bkt5geUxIb1G3A8umzTHbE6HgfD+oCdbwXLVPC/wuxaJIt5zOvhZs3wFR4PbnZoLrJ2AaAdsUizggM3aLFvt5OP1sRGp4yFyGaaHe2RiL4noiu0+d7Rur8tTRBVC9R2/mb0Qchiw5w= 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=tVcw/OsZ; arc=none smtp.client-ip=209.85.128.46 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="tVcw/OsZ" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-495509b08ebso50175e9.1 for ; Tue, 28 Jul 2026 07:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785249098; x=1785853898; darn=vger.kernel.org; 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=ZXqe2wlo2yiPOh072n71Jij5i60MC3cIjM/IN/S3eis=; b=tVcw/OsZ07nd3hmCSWGVH4cvDjInf4Lo1VPUuh00atyJ2xXYRWBYinUWQVXDnK7E2z cXHMV67wnyAdwZddQCTRrj6efjUdcGNWnBPIr+punCmLLWaP9agao7T5/lu1yUypE+o7 3fyTFruTnO400GFEthUmDEb1vifLto193sDk+tkL7g/0IvXKosQcIo7stw1Ik5sqEI6b t//oJtNWm1WEZo+vHwXOYQyT13iuMSTt5TDBNeXN5nHKEZYGtcdruFGBa84MLJmxleQ2 WZ5AE7M9Hh26oKfiyjUzBCD3ndf6ut1sqx1/1rtAu7cuGZd4AJn3SqxjKan7XpWcpk48 OR3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785249098; x=1785853898; 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=ZXqe2wlo2yiPOh072n71Jij5i60MC3cIjM/IN/S3eis=; b=UI33Gig8b5iMmSVUGyRAasRdeFCOkwXy5zg1tAj+WXBk9Uuh03YsjWtD+yYq0QW0CV j05FqpESNKKZ12ApaT38t2o+H7x5NhOsPJnlw+WZsgFPCIDnSW+fy9y4Pt7EhuGzW1hz GBE1VvOlQuTVVhVDzA76WNnhypGp1Y1xA1kj4H0XsKjhhEZMf3KqR2g6DZPqi4VllFXD aIB80qPwqbiTiNrBJAkAFF5lDgR01lX0JE/Uc6FaICRElEkncXQlzNMLI8m7zcqd53aK R9xYAQDPav/ycbJnRCBnYlKdaMS/cN2j16i5NUGZ4yzAelVqKnxemYoIKgEc5wytCakf R9Jw== X-Forwarded-Encrypted: i=1; AHgh+RoF3yT9YVwdqPSlxwgnd5ic+Rlo3192RXWmb2uhzOybVoX2tyWTSXOZa1IR/8J0xR/VRTxf6AwiBSrv@vger.kernel.org X-Gm-Message-State: AOJu0YzTbx+qQ7sw7yEX5R+qsbOenLZBhtYLzOrwFAQFKB5nYhTrKJFh atsA6s6G9bzQaU0D9KxGJ2ztU0AkXcipnqSeu3rQeMT3M88neKQSYQT8dUUJAQv44Q== X-Gm-Gg: AR+sD11/76rcqMGDS1UrkVbfvK4RzbZCZ4oQfcPn4jUTpylVaHsxiZzNo6X0ovKNBCD F25LhmwKGcF1RFNYEzwkzf6BUTNIRSn1ydBXaTKOBu6u+3Ztl1nPRcJUm85IATWJ2LXioT8yp3M 3dc15dZUYl9+wuJpNgXejkCSnZ2aFAnRBsHT5r18OXBLdRTDE83/hUbt1GrtiZRCwvAHBNo7veG 8mdCO1K0eL18IDgN8gk1eUM6gaZqADh1OgW/IIpOPFV4R2oaY2Az2FQYt4YhzDJVLlm2rQ8ZULF MVXFBrl9FNi6rWcm/JexwhypokejQgOTMTFGYQm8OsRuwggjly/XuaN+SchxMCkknHESocCtQ34 0tF9DL2uxYTXT1h9lSsZVwZlCaTcj7q/LiyGIh67YrmbaUlRkMWOLQAsw10pCR7s3i8u/6ciWFb SM9omc4Z9khvi0HWzUWGExUfu7gV69B5a8QFvmjZ98J+8= X-Received: by 2002:a05:600d:6405:20b0:48a:5618:b4d4 with SMTP id 5b1f17b1804b1-496b53e888dmr48025e9.1.1785249097771; Tue, 28 Jul 2026 07:31:37 -0700 (PDT) Received: from google.com (250.192.189.35.bc.googleusercontent.com. [35.189.192.250]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c6ef25sm54228115f8f.36.2026.07.28.07.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 07:31:36 -0700 (PDT) Date: Tue, 28 Jul 2026 14:31:30 +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 19/23] dma-direct: select DMA address encoding from __DMA_ATTR_ALLOC_CC_SHARED Message-ID: References: <20260717180442.110954-1-aneesh.kumar@kernel.org> <20260717180442.110954-20-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org 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-20-aneesh.kumar@kernel.org> On Fri, Jul 17, 2026 at 11:34:37PM +0530, Aneesh Kumar K.V (Arm) wrote: > Make the dma-direct helpers derive the DMA address encoding from > __DMA_ATTR_ALLOC_CC_SHARED instead of implicitly relying on > force_dma_unencrypted() inside phys_to_dma_direct() > > Pass an explicit unencrypted/decrypted state into phys_to_dma_direct(), > make the alloc paths return DMA addresses that match the requested buffer > encryption state. Also only call dma_set_decrypted() when > __DMA_ATTR_ALLOC_CC_SHARED is actually set. > > 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 > --- > kernel/dma/direct.c | 43 ++++++++++++++++++++++++++----------------- > 1 file changed, 26 insertions(+), 17 deletions(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index f7f064323bd9..eb0ce0787885 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -26,11 +26,11 @@ > u64 zone_dma_limit __ro_after_init = DMA_BIT_MASK(24); > > static inline dma_addr_t phys_to_dma_direct(struct device *dev, > - phys_addr_t phys) > + phys_addr_t phys, bool unencrypted) > { > - if (force_dma_unencrypted(dev)) > + if (unencrypted) > return phys_to_dma_unencrypted(dev, phys); > - return phys_to_dma(dev, phys); > + return phys_to_dma_encrypted(dev, phys); > } > > static inline struct page *dma_direct_to_page(struct device *dev, > @@ -41,8 +41,9 @@ static inline struct page *dma_direct_to_page(struct device *dev, > > u64 dma_direct_get_required_mask(struct device *dev) > { > + bool require_decrypted = force_dma_unencrypted(dev); > phys_addr_t phys = ((phys_addr_t)max_pfn << PAGE_SHIFT) - 1; > - u64 max_dma = phys_to_dma_direct(dev, phys); > + u64 max_dma = phys_to_dma_direct(dev, phys, require_decrypted); > > return (1ULL << (fls64(max_dma) - 1)) * 2 - 1; > } > @@ -71,7 +72,8 @@ static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 *phys_limit) > > bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) > { > - dma_addr_t dma_addr = phys_to_dma_direct(dev, phys); > + bool require_decrypted = force_dma_unencrypted(dev); > + dma_addr_t dma_addr = phys_to_dma_direct(dev, phys, require_decrypted); > > if (dma_addr == DMA_MAPPING_ERROR) > return false; > @@ -81,17 +83,18 @@ bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) > > static int dma_set_decrypted(struct device *dev, void *vaddr, size_t size) > { > - if (!force_dma_unencrypted(dev)) > - return 0; > - return set_memory_decrypted((unsigned long)vaddr, PFN_UP(size)); > + int ret; > + > + ret = set_memory_decrypted((unsigned long)vaddr, PFN_UP(size)); > + if (ret) > + pr_warn_ratelimited("leaking DMA memory that can't be decrypted\n"); > + return ret; > } > > static int dma_set_encrypted(struct device *dev, void *vaddr, size_t size) > { > int ret; > > - if (!force_dma_unencrypted(dev)) > - return 0; > ret = set_memory_encrypted((unsigned long)vaddr, PFN_UP(size)); > if (ret) > pr_warn_ratelimited("leaking DMA memory that can't be re-encrypted\n"); > @@ -171,7 +174,8 @@ static struct page *dma_direct_alloc_from_pool(struct device *dev, size_t size, > dma_coherent_ok); > if (!page) > return NULL; > - *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); > + *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), > + attrs & __DMA_ATTR_ALLOC_CC_SHARED); > return page; > } > > @@ -187,9 +191,11 @@ static void *dma_direct_alloc_no_mapping(struct device *dev, size_t size, > /* remove any dirty cache lines on the kernel alias */ > if (!PageHighMem(page)) > arch_dma_prep_coherent(page, size); > - > - /* return the page pointer as the opaque cookie */ > - *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); > + /* > + * return the page pointer as the opaque cookie. > + * Never used for unencrypted allocation > + */ > + *dma_handle = phys_to_dma_encrypted(dev, page_to_phys(page)); > return page; > } > > @@ -329,7 +335,8 @@ void *dma_direct_alloc(struct device *dev, size_t size, > ret = uncached_cpu_addr; > } > > - *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); > + *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), > + attrs & __DMA_ATTR_ALLOC_CC_SHARED); > return ret; > > > @@ -450,11 +457,13 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > return NULL; > > ret = page_address(page); > - if (dma_set_decrypted(dev, ret, size)) > + if ((attrs & __DMA_ATTR_ALLOC_CC_SHARED) && > + 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)); > + *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), > + attrs & __DMA_ATTR_ALLOC_CC_SHARED); > return page; > out_leak_pages: > return NULL; > -- > 2.43.0 >