From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 83E4741930A for ; Tue, 9 Jun 2026 12:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781009700; cv=none; b=HiL88DQ/PWo8Hf15ruyLEHwQFKhMRidz7jG4s6z9JXC0KNpU7wouol+D8lXqhy/cBP+ouR6BNgtfg8i1QFsnD3lhhhlrqZTsU4WnVYczKA18gS/jF0dkXvGQ5p+UhOTIiBjrVk7RdW470lXrh9j0eEtlAcr5+SO1czilS9MGhCI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781009700; c=relaxed/simple; bh=OgLNrWHYEcaZ4Zdrui9d0vfhtIPJeVbTPOTGD0Cye5E=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=taewL1gUx3JImqYOCArhOAkgAjwnmzI1WbebGOuTSeS3jfBTeWnT5GBH3NNEnFiCuAcWGi9YaEOoRRYhHtAy6KeqG7fC3EiyqBWqeN7aOF3AikWmGPhP4hv8x/YSCjQCXRtalJGLCQI+aDPprvA0GjIFrpL9KVoAkj17HS4EdcI= 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=Exbx1iWG; arc=none smtp.client-ip=209.85.221.44 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="Exbx1iWG" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-45ef7720385so374639f8f.3 for ; Tue, 09 Jun 2026 05:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1781009691; x=1781614491; 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=vkYHspRdfakTgJWTmfOhWR71X/NTXsb3/ZhoDPOxGQs=; b=Exbx1iWG3pLi2DK8XWDxpPKJDzFqobAYFKTJnY3xM+IF7/lxW8ZGxrzAjPHk+gyVJp FSpEOnq3ClNp/zGH+W3hcG8rekfXTw3z2eU6NhhuYaqcOS9VwpX7jDnmkYLnZcKS6Bo7 3ZAPJh/f0xr5k8llNueJxITCxmwrfowRSi4YqzawrCth57TCmdHl9R4TvYbHFNP/nfDm Plq392qFXp+0UtpLqtUP+0+raPbFqb0ZW3DKsZW+FzACFOfNS8uowWmqibEvv+ZxrB8C ZCBHQXGt7rLW49/3AIybq343Q8R8CHJ4H1q1Cdd3zHSqOzwktvwNWJWnv046aPm217y+ tEhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781009691; x=1781614491; 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=vkYHspRdfakTgJWTmfOhWR71X/NTXsb3/ZhoDPOxGQs=; b=fGEcJeHxrMXsnWViVKvW8rPLxfzm8QMlbgD1d4H+smDz8L3rpzb1YNVDA37olexzco Ii9naPe3Z9Jmb+aPflUabXJSmEJxJ7ckPrVjB3giJaY1HZ5JVdT+CxLCp6xSL8sV4Hzo bEcao06GaZfn5LsTPXeZBwSOp64am1lul6tASwfNrMAilFQDSi8NIA0KZx5+ndK05hV4 hQ+nHYPdKW/3jJtz9yyXrNUv3ncvAWwNXgrgm4whpec0a8wt2NSLoPQ/ILj9BcHneHMF PJoF5WY1aF8MQjleT928RLajO4Wy+yWoxUlsOgWEuji9xBWDXrNWmE1/cxq+pk6lslR2 o7OA== X-Forwarded-Encrypted: i=1; AFNElJ9B+QEqrMr9wF2lAFohfAVVoVS57EVHM27qAFBggyxtBv/n/gGF4/nxiGMCidszaDx3wgUxk/5qKNgXoTU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/LROi3yLwTDTUVYd/2IKaIjuuOjuNBTS560sKAtZoBi6WmZa8 rPJvkhS/BbB2XiDDkEJmn22bpPrVkArURgXDe706jZw6HRTyMC7EdVqxL4uEZ1JtaAU= X-Gm-Gg: Acq92OEFW1C0MyOSmyOxDz7yc35zW8LRzVg83W34/S+08366JN9MKUHUVajbrcANDtI HPbS2W920Yp3Yv/Wjeh5vnBCmGWqmWzOPPLcWEKeMlmbexmhFJg2OqhVwoZIFw2q9MOPyrA2Sgf dKC9whI+vkTPtgve0xuVg9hdiOH4BzuSFloovzbo2onbGa6RUqoooulxKc6YXdrQYn0CL47ppvH IJHw07YYH8/SKunCghcL2Xgivf4cLakH2BhTGKM0rw51+f1xqw/wFu+1WlHsTt+mnqGASvrr4oA j91Z4DE+HIphjdVfOKhLIcw0q5wcK1v1N+z03lUf4GwL+MKgY5oMdvRBj5GmKwLnDomCuc+F9Vx PcTlByagXGzd50HrmLpajFWC3teQKBM3n4DpJLPzkUNUcSXFCfxWxRkTlP6+u2t2p+0SS9PXhto RfvweelrRleTP+JZlOcYKJAGk= X-Received: by 2002:a05:6000:4a02:b0:45e:ced1:19c1 with SMTP id ffacd0b85a97d-4603063eee7mr14300728f8f.3.1781009690891; Tue, 09 Jun 2026 05:54:50 -0700 (PDT) Received: from mordecai ([62.77.90.70]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2dc577sm63402978f8f.3.2026.06.09.05.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 05:54:50 -0700 (PDT) Date: Tue, 9 Jun 2026 14:54:45 +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 13/20] dma-direct: rename ret to cpu_addr in alloc helpers Message-ID: <20260609145445.6144add4@mordecai> In-Reply-To: <20260604083959.1265923-14-aneesh.kumar@kernel.org> References: <20260604083959.1265923-1-aneesh.kumar@kernel.org> <20260604083959.1265923-14-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:52 +0530 "Aneesh Kumar K.V (Arm)" wrote: > ret in dma_direct_alloc() and dma_direct_alloc_pages() holds the returned > CPU mapping, not a generic return value. Rename it to cpu_addr and update > the remaining uses to match. > > This makes the allocation paths easier to follow and keeps the local naming > consistent with what the variable actually represents. > > Tested-by: Michael Kelley > Tested-by: Mostafa Saleh > Signed-off-by: Aneesh Kumar K.V (Arm) I wondered if cpu_addr is descriptive enough (a CPU address could theoretically be virtual or physical), but I can see that a few other places already use cpu_addr to hold virtual addresses, so yeah, let's keep this name. Reviewed-by: Petr Tesarik Petr T > --- > kernel/dma/direct.c | 31 +++++++++++++++---------------- > 1 file changed, 15 insertions(+), 16 deletions(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index aa3489aa10a0..4e446aa4130e 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -204,7 +204,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, > bool mark_mem_decrypt = false; > bool allow_highmem = true; > struct page *page; > - void *ret; > + void *cpu_addr; > > /* > * DMA_ATTR_CC_SHARED is not a caller-visible dma_alloc_*() > @@ -318,34 +318,33 @@ void *dma_direct_alloc(struct device *dev, size_t size, > arch_dma_prep_coherent(page, size); > > /* create a coherent mapping */ > - ret = dma_common_contiguous_remap(page, size, prot, > - __builtin_return_address(0)); > - if (!ret) > + cpu_addr = dma_common_contiguous_remap(page, size, prot, > + __builtin_return_address(0)); > + if (!cpu_addr) > goto out_encrypt_pages; > } else { > - ret = page_address(page); > + cpu_addr = page_address(page); > } > > - memset(ret, 0, size); > + memset(cpu_addr, 0, size); > > if (set_uncached) { > void *uncached_cpu_addr; > > arch_dma_prep_coherent(page, size); > - uncached_cpu_addr = arch_dma_set_uncached(ret, size); > + uncached_cpu_addr = arch_dma_set_uncached(cpu_addr, size); > if (IS_ERR(uncached_cpu_addr)) > goto out_free_remap_pages; > - ret = uncached_cpu_addr; > + cpu_addr = uncached_cpu_addr; > } > > *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), > !!(attrs & DMA_ATTR_CC_SHARED)); > - return ret; > - > + return cpu_addr; > > out_free_remap_pages: > if (remap) > - dma_common_free_remap(ret, size); > + dma_common_free_remap(cpu_addr, size); > > out_encrypt_pages: > if (mark_mem_decrypt && > @@ -439,7 +438,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > { > unsigned long attrs = 0; > struct page *page; > - void *ret; > + void *cpu_addr; > > if (force_dma_unencrypted(dev)) > attrs |= DMA_ATTR_CC_SHARED; > @@ -453,7 +452,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > if (!page) > return NULL; > > - ret = page_address(page); > + cpu_addr = page_address(page); > goto setup_page; > } > > @@ -461,11 +460,11 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > if (!page) > return NULL; > > - ret = page_address(page); > - if ((attrs & DMA_ATTR_CC_SHARED) && dma_set_decrypted(dev, ret, size)) > + cpu_addr = page_address(page); > + if ((attrs & DMA_ATTR_CC_SHARED) && dma_set_decrypted(dev, cpu_addr, size)) > goto out_leak_pages; > setup_page: > - memset(ret, 0, size); > + memset(cpu_addr, 0, size); > *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), > !!(attrs & DMA_ATTR_CC_SHARED)); > return page;