linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yunsheng Lin <linyunsheng@huawei.com>
To: Heiner Kallweit <hkallweit1@gmail.com>, <davem@davemloft.net>,
	<kuba@kernel.org>
Cc: <hawk@kernel.org>, <ilias.apalodimas@linaro.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net-next 2/2] page_pool: optimize the cpu sync operation when DMA mapping
Date: Fri, 20 Aug 2021 14:29:46 +0800	[thread overview]
Message-ID: <7a58fbbd-f5d2-1826-1168-ec5da52b794e@huawei.com> (raw)
In-Reply-To: <badfd7fd-ff25-f399-8828-9f44180d6948@gmail.com>

On 2021/8/20 14:10, Heiner Kallweit wrote:
> On 20.08.2021 04:06, Yunsheng Lin wrote:
>> If the DMA_ATTR_SKIP_CPU_SYNC is not set, cpu syncing is
>> also done in dma_map_page_attrs(), so set the attrs according
>> to pool->p.flags to avoid calling dma sync function again.
>>
>> Also mark the dma error as the unlikely case While we are at
>> it.
>>
> This shouldn't be needed. dma_mapping_error() will be (most likely)
> inlined by the compiler, and it includes the unlikely() hint.

Good point, will remove the unlikely() mark.
Thanks.

> 
>> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
>> ---
>>  net/core/page_pool.c | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
>> index 1a69784..8172045 100644
>> --- a/net/core/page_pool.c
>> +++ b/net/core/page_pool.c
>> @@ -191,8 +191,12 @@ static void page_pool_dma_sync_for_device(struct page_pool *pool,
>>  
>>  static bool page_pool_dma_map(struct page_pool *pool, struct page *page)
>>  {
>> +	unsigned long attrs = DMA_ATTR_SKIP_CPU_SYNC;
>>  	dma_addr_t dma;
>>  
>> +	if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
>> +		attrs = 0;
>> +
>>  	/* Setup DMA mapping: use 'struct page' area for storing DMA-addr
>>  	 * since dma_addr_t can be either 32 or 64 bits and does not always fit
>>  	 * into page private data (i.e 32bit cpu with 64bit DMA caps)
>> @@ -200,15 +204,12 @@ static bool page_pool_dma_map(struct page_pool *pool, struct page *page)
>>  	 */
>>  	dma = dma_map_page_attrs(pool->p.dev, page, 0,
>>  				 (PAGE_SIZE << pool->p.order),
>> -				 pool->p.dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
>> -	if (dma_mapping_error(pool->p.dev, dma))
>> +				 pool->p.dma_dir, attrs);
>> +	if (unlikely(dma_mapping_error(pool->p.dev, dma)))
>>  		return false;
>>  
>>  	page_pool_set_dma_addr(page, dma);
>>  
>> -	if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
>> -		page_pool_dma_sync_for_device(pool, page, pool->p.max_len);
>> -
>>  	return true;
>>  }
>>  
>>
> 
> .
> 

      reply	other threads:[~2021-08-20  6:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-20  2:06 [PATCH net-next 0/2] Some minor optimization for page pool Yunsheng Lin
2021-08-20  2:06 ` [PATCH net-next 1/2] page_pool: use relexed atomic for release side accounting Yunsheng Lin
2021-08-20  2:06 ` [PATCH net-next 2/2] page_pool: optimize the cpu sync operation when DMA mapping Yunsheng Lin
2021-08-20  6:10   ` Heiner Kallweit
2021-08-20  6:29     ` Yunsheng Lin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7a58fbbd-f5d2-1826-1168-ec5da52b794e@huawei.com \
    --to=linyunsheng@huawei.com \
    --cc=davem@davemloft.net \
    --cc=hawk@kernel.org \
    --cc=hkallweit1@gmail.com \
    --cc=ilias.apalodimas@linaro.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).