From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.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 8A39141930D for ; Tue, 9 Jun 2026 12:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781009700; cv=none; b=btx2JiErktsH1ZLcnM+O05a3pewqo8KdJuO73EtNm8xvAhVdowLbRZwdgan/uHkfFmR4zUsEbxDwj75CG5KQPAQ5/Y/o3+YjnlrTdIaqc2rTUGyXk5xei5Xtup1lMpdzItLjWjw4KS9PcSb0Rdg2yZRioiy5NdsQQMXOKJDVGoo= 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=eZmUkvwy; arc=none smtp.client-ip=209.85.221.47 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="eZmUkvwy" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-45ef42b6399so416800f8f.0 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=lists.linux.dev; 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=eZmUkvwyGIT/0eRkEpltPjA10MYI+IKpYgstmPlLhB2QnqQWSB0kYQ+bbDgvVXm6mm gpqw4KSfcy774bgoc4N5q/JofX0d3PVPNAQbErs5phLXbxli3pVwnzEyEJqwk3nFCRJ+ i+Lk2Xfx63cAJunPfRyhFINrYyjhTRCx/uV6oQnfElFn9Iek0H8262sAruqO4pVoBik5 NvS4WDrBlpCE1IxMCxxJBJteKbhCebEns4GScbJ1fy/4KFysY0/vNxnBA+Kg4Ka0Aip6 gSwBQmdp/YZZf7hbRcJJj5uBq/hoTyHSwpVjUmTOLaKi5q88l5p2kgQEnnHo9EsAS9hJ jpdQ== 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=dCRZ+d8QGOXrpxoUKXHDtnpSm8nflUI9/CG4yp94O3Zh99AQNwUHIm1q27ZeQV18VQ GyL6aCEjEHLsDCtKIZIwyhFOBJn1MbL4HLvwBKe4ORwXa5MyTdLeIWSlfVV4jacO2Xiu qLPmNw+7j36zGYC4UjMM4oRU51cAgJE4vJYOTNXXuk1mEQgJ6jd2tqztHL9PXgmC+aMA l+3foyXJVL50InUytz9JEMWfuKoBRONBO6dMSLb0u1O5gHHpH5o7UXzzuBVSRsagzNZt WdQ21aZt2MUO/AopQxRznwGPXf3B69AVi+SZtfuWC3HErgx8pkZqyovpnhe65RjLZZQ2 lFFg== X-Forwarded-Encrypted: i=1; AFNElJ/8FT4CnYhTnrhrVxWTCj8lZUUJjjZKR7WqSXuAoEc6vfUfIjgfshoJeWzVXqkN67SHq4qOjU3jZPvi@lists.linux.dev X-Gm-Message-State: AOJu0YzSj631yVSHXl2hTMg+XBKMmXd3oAL341FSWVEEPkgrFql8w3Vw lYx8DBMR/KqjeQbz3FAdSXfBL36fmnU9e3za/dQYdLriJbZYfeZlaHJj+aCIhEvDJ9M= X-Gm-Gg: Acq92OEUyFg4CJtY0YQPidXKGsUoqFO32tJ189OOyNlIqVHFCnLy78nYMcM19S4QEr2 tqiPoaTlXHqA+rh+mI6nLfueyHojl0nRzX4uv4EM0EydND1RuLNEj7TS4bokdHnOhnSACWL3QYf F0u8gjon2Kld8Ro9/6GXFgA6MYSvwsfSMWpoIotNU6QsujPyH3I7X15Tz88Jnu5huMzKGjdo9+n iKH6D13aDoC4Dedcy6HIGC/qFW6wOFZiiUrS20aKL5nlPbv7yPr4a2jsXNWTNSGJwt/LjUR6IQo JMCmMldc7plnES5Iv0OpLWwk/qDMRNUouQOUrcJLP23TCwwBm2F0wd7cTpebbPI2bYv3bJVn83Q gMiDfdBafAMN1Utkj+n1D1dxqusZX2mXxXN9D0a/V+DqXxr4Sgvn2LmLIwp97SpzKpJiCLPPA7I iHKCUX3bPfQyLIYkz0SjDYWLs= 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-coco@lists.linux.dev 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;