From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 D44D67261A for ; Wed, 11 Mar 2026 12:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773231885; cv=none; b=RL5QhmgGYwsdsIbQ8yECCkzlLMp+GGL9CzGe4z9K9riP13YUOuusQl8b8UzuWDJIemWQvSZ14Y4huwl32tYO62IJJwjnbKzMcrsCwn/9SY2tijEX09HGqe5luWt6z7SSVMTKc52ZFKhitT/B213tNfJozwq+xNKpCS9Sc1jIkgo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773231885; c=relaxed/simple; bh=rmLt2Zd1Svv94StO58JTVqPThQKGl0ZJLa2inCyuhrU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=QII/twkp4GfrzO4MszNxyNXqQ/tfRjiysV/joyqI3q4KBH102Z2QPao7r2vJj6ujxVR3Gd215WRHHCshSgrRMxLY6llwQuXbod6AvWOp+moyiO5s3xaLN0LP2dPuvJGQmvP4M8kR8TIhBjPdNrtwzier+SM1qpH+byAKLTpQax0= 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=cyQuYyu5; arc=none smtp.client-ip=209.85.128.51 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="cyQuYyu5" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4852ef20fe8so61035e9.1 for ; Wed, 11 Mar 2026 05:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773231879; x=1773836679; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=HeBGnYAajUaTqEiFUt5o86dxRkDw0LV7oFcPjSzEHkE=; b=cyQuYyu5kLlcMxnAsDBJAMr8mhXw/5+Ae/rpwPXMwxw9TV6x8G167xEBF4xmfSUwPT Yn+YBPeOO78HFsyxXYd6vj3DLb9eisHvSnWfWK7IOyHipMKU8eCr6kXyqqHV775xZKQx B7DibYnmcq1cH67LDrZzV0b/k5uhDP72Obim2mCKo4EsqaZyWUrhP+TLi6+LPJmwVGxJ gGeeNLkDzOot+7pea3+KFbN5SOjetkB/qS+4AfgkS7qAaEdBAq4GvwjxNBKHzWi29Mw2 i8sqRd61O6GfKG+O/fY6GopBl9OSEJMqjXt5dyc0f7vJcc+U9JorzdwQKCd9RVHTfv2m 7v4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773231879; x=1773836679; h=in-reply-to:content-disposition: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; bh=HeBGnYAajUaTqEiFUt5o86dxRkDw0LV7oFcPjSzEHkE=; b=Nwwcy9p9Hf1Ote4XdX+6sSBoJMUmcq/OFbX7n2WptQxup3U2PwkO6woAY44t+nm5cD ekGImRs6POtEARsQk9lNSY19RD9kpgWO1smruwbdqKigbsl4gEJgBTQu9iRQznIuimq+ +0Rw//W0S8LRrWaJlhd2DSX5HjQPpGAR3EfqPpwh27UUJNLbxySwK3mvJPJrq1rznYsO c4Sk2GqNeINx12h9h1ddk3UzMCS1zC2gdUf0193E3sFQ8Pql6ed3zNdrdLoLfrVTFe+h MmCOZthu/KaB7ZfeB9m/PpiNPd9WKOCKnzGoP7Gi8Rj+2vc9P0bS4KB7km2zyFu8k3em Zi7A== X-Forwarded-Encrypted: i=1; AJvYcCV4KS8xLmE8fmhdY9ouplscUiThjwKk7Z/EjFrxqYLSyMuldOgolKcdFS/JL61gkXBpFk4REI6nghQ/@lists.linux.dev X-Gm-Message-State: AOJu0YxxdqY9MMSKyI1NDZDW0lkIH0smGJFeOKRpflEjDFh+Vw6eaCOm 9Dl9OJ39q+sODEoNnaLnGceUPEBEfCHL50wvp/c7guDM0X1aE6piv2togh/wADLGhQ== X-Gm-Gg: ATEYQzwHjoS5KbTNbmmuWuhuwOA50HnrxI5oqVPFBkd5sWh/WpvMhu6lwwFHogOIi56 2Ou3X2KR4hGvPgdHZvbDsulhJoYG6/m4Gg3kK05ptnQwzKuS6tND2SX+DDwVo82qxHmINDldSUb yNBa7ZjxyKUHY/9pwTteIuqhC4wq+Qlf0ZD4mRCOQTWRupgciZ/bCIh/LyE2OVbSPypS/PZlX5i 2tMV0n3l6YhbNudwP/V0OGlcr0KcvBh6vEe0aFIACU1bL54y2lEtRJkVJmZhYVZOdS2I43ZQBsb ip5y+EH0Q4p3evVobqqRJKLBBnStDCQAeWUg6C2mEQT1HtknQZIRk6JkQCyH0ZfXgz0kcrqckLD KlcJaGdqq0Mm2NvAq3KQmdZVvmqPABZk9idb4k9PprSjtIoCbJf/8JpytQMUMQvUsKDrszfDH+B jBQ37t0gvj59Qw56yIT7Jz1OB+MHpfGpMCwYwo+YeBV1dG6bo+Llb4Uzbi X-Received: by 2002:a05:600d:8446:10b0:477:86fd:fb47 with SMTP id 5b1f17b1804b1-48549e6f504mr699505e9.8.1773231878612; Wed, 11 Mar 2026 05:24:38 -0700 (PDT) Received: from google.com (54.95.38.34.bc.googleusercontent.com. [34.38.95.54]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439f81f1318sm7153025f8f.21.2026.03.11.05.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 05:24:37 -0700 (PDT) Date: Wed, 11 Mar 2026 12:24:33 +0000 From: Mostafa Saleh To: "Aneesh Kumar K.V" Cc: Suzuki K Poulose , linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-coco@lists.linux.dev, Catalin Marinas , will@kernel.org, maz@kernel.org, tglx@linutronix.de, robin.murphy@arm.com, akpm@linux-foundation.org, jgg@ziepe.ca, steven.price@arm.com Subject: Re: [PATCH v2 4/4] dma: direct: set decrypted flag for remapped dma allocations Message-ID: References: <20251221160920.297689-1-aneesh.kumar@kernel.org> <20251221160920.297689-5-aneesh.kumar@kernel.org> <5820e8f3-9cf8-423f-89df-0df7ca78a84b@arm.com> 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: On Fri, Dec 26, 2025 at 02:29:24PM +0530, Aneesh Kumar K.V wrote: > Aneesh Kumar K.V writes: > > > Suzuki K Poulose writes: > > > >> On 21/12/2025 16:09, Aneesh Kumar K.V (Arm) wrote: > >>> Devices that are DMA non-coherent and need a remap were skipping > >>> dma_set_decrypted(), leaving buffers encrypted even when the device > >>> requires unencrypted access. Move the call after the remap > >>> branch so both paths mark the allocation decrypted (or fail cleanly) > >>> before use. > >>> > >>> Fixes: f3c962226dbe ("dma-direct: clean up the remapping checks in dma_direct_alloc") > >>> Signed-off-by: Aneesh Kumar K.V (Arm) > >>> --- > >>> kernel/dma/direct.c | 8 +++----- > >>> 1 file changed, 3 insertions(+), 5 deletions(-) > >>> > >>> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > >>> index 3448d877c7c6..a62dc25524cc 100644 > >>> --- a/kernel/dma/direct.c > >>> +++ b/kernel/dma/direct.c > >>> @@ -271,9 +271,6 @@ void *dma_direct_alloc(struct device *dev, size_t size, > >>> if (remap) { > >>> pgprot_t prot = dma_pgprot(dev, PAGE_KERNEL, attrs); > >>> > >>> - if (force_dma_unencrypted(dev)) > >>> - prot = pgprot_decrypted(prot); > >> > >> This would be problematic, isn't it ? We don't support decrypted on a > >> vmap area for arm64. If we move this down, we might actually use the > >> vmapped area. Not sure if other archs are fine with "decrypting" a > >> "vmap" address. > >> > >> If we map the "vmap" address with pgprot_decrypted, we could go ahead > >> and further map the linear map (i.e., page_address(page)) decrypted > >> and get everything working. > > > > We still have the problem w.r.t free > > > > dma_direct_free(): > > > > if (is_vmalloc_addr(cpu_addr)) { > > vunmap(cpu_addr); > > } else { > > if (dma_set_encrypted(dev, cpu_addr, size)) > > return; > > } > > > > How about the below change? > > commit 8261c528961c6959b85de87c5659ce9081dc85b7 > Author: Aneesh Kumar K.V (Arm) > Date: Fri Dec 19 14:46:20 2025 +0530 > > dma: direct: set decrypted flag for remapped DMA allocations > > Devices that are DMA non-coherent and require a remap were skipping > dma_set_decrypted(), leaving DMA buffers encrypted even when the device > requires unencrypted access. Move the call after the if (remap) branch > so that both direct and remapped allocation paths correctly mark the > allocation as decrypted (or fail cleanly) before use. > > If CMA allocations return highmem pages, treat this as an allocation > error so that dma_direct_alloc() falls back to the standard allocation > path. This is required because some architectures (e.g. arm64) cannot > mark vmap addresses as decrypted, and highmem pages necessarily require > a vmap remap. As a result, such allocations cannot be safely marked > unencrypted for DMA. > > Other architectures (e.g. x86) do not have this limitation, but instead > of making this architecture-specific, I have made the restriction apply > when the device requires unencrypted DMA access. This was done for > simplicity, > > Fixes: f3c962226dbe ("dma-direct: clean up the remapping checks in dma_direct_alloc") > Signed-off-by: Aneesh Kumar K.V (Arm) Are there any cases this happened in CCA, the only cases I can see remap is true are: - PageHighMem(): Where that fails for CCA - !dev_is_dma_coherent(): AFAIK, all devices with CCA must have an SMMU, so direct DMA is only for virtualized devices which cannot be incoherent. Thanks, Mostafa > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index 7c0b55ca121f..811de37ad81c 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -264,6 +264,15 @@ void *dma_direct_alloc(struct device *dev, size_t size, > * remapped to return a kernel virtual address. > */ > if (PageHighMem(page)) { > + /* > + * Unencrypted/shared DMA requires a linear-mapped buffer > + * address to look up the PFN and set architecture-required PFN > + * attributes. This is not possible with HighMem, so return > + * failure. > + */ > + if (force_dma_unencrypted(dev)) > + goto out_free_pages; > + > remap = true; > set_uncached = false; > } > @@ -284,7 +293,13 @@ 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 (force_dma_unencrypted(dev)) { > + void *lm_addr; > + > + lm_addr = page_address(page); > + if (set_memory_decrypted((unsigned long)lm_addr, PFN_UP(size))) > goto out_leak_pages; > } > > @@ -349,8 +364,16 @@ void dma_direct_free(struct device *dev, size_t size, > } 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 (force_dma_unencrypted(dev)) { > + void *lm_addr; > + > + lm_addr = phys_to_virt(dma_to_phys(dev, dma_addr)); > + if (set_memory_encrypted((unsigned long)lm_addr, PFN_UP(size))) { > + pr_warn_ratelimited("leaking DMA memory that can't be re-encrypted\n"); > return; > + } > } > > __dma_direct_free_pages(dev, dma_direct_to_page(dev, dma_addr), size);