From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S965196AbcCOPiE (ORCPT <rfc822;w@1wt.eu>);
	Tue, 15 Mar 2016 11:38:04 -0400
Received: from foss.arm.com ([217.140.101.70]:37176 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752313AbcCOPiD (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 15 Mar 2016 11:38:03 -0400
Date: Tue, 15 Mar 2016 15:37:58 +0000
From: Catalin Marinas <catalin.marinas@arm.com>
To: Zhen Lei <thunder.leizhen@huawei.com>
Cc: Will Deacon <will.deacon@arm.com>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Zefan Li <lizefan@huawei.com>, Xinwei Hu <huxinwei@huawei.com>,
        Tianhong Ding <dingtianhong@huawei.com>,
        Hanjun Guo <guohanjun@huawei.com>
Subject: Re: [PATCH 1/1] arm64/dma-mapping: remove an unnecessary conversion
Message-ID: <20160315153757.GF12311@e104818-lin.cambridge.arm.com>
References: <1458007931-14432-1-git-send-email-thunder.leizhen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1458007931-14432-1-git-send-email-thunder.leizhen@huawei.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Mar 15, 2016 at 10:12:11AM +0800, Zhen Lei wrote:
> 1. In swiotlb_alloc_coherent, the branch of __get_free_pages. Directly
>    return vaddr on success, and pass vaddr to free_pages on failure.
> 2. So, we can directly transparent pass vaddr from __dma_free to
>    swiotlb_free_coherent, keep consistent with swiotlb_alloc_coherent.
> 
> This patch have no functional change,

I don't think so.

> but can obtain a bit performance improvement.

Have you actually measured it?

> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
> index a6e757c..b2f2834 100644
> --- a/arch/arm64/mm/dma-mapping.c
> +++ b/arch/arm64/mm/dma-mapping.c
> @@ -187,8 +187,6 @@ static void __dma_free(struct device *dev, size_t size,
>  		       void *vaddr, dma_addr_t dma_handle,
>  		       struct dma_attrs *attrs)
>  {
> -	void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle));
> -
>  	size = PAGE_ALIGN(size);
> 
>  	if (!is_device_dma_coherent(dev)) {
> @@ -196,7 +194,7 @@ static void __dma_free(struct device *dev, size_t size,
>  			return;
>  		vunmap(vaddr);
>  	}
> -	__dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs);
> +	__dma_free_coherent(dev, size, vaddr, dma_handle, attrs);
>  }

What happens when !is_device_dma_coherent(dev)? (hint: read two lines
above __dma_free_coherent).

-- 
Catalin