From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69E8BC433E0 for ; Wed, 24 Feb 2021 20:11:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F36CC64E20 for ; Wed, 24 Feb 2021 20:11:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F36CC64E20 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 82A568D0065; Wed, 24 Feb 2021 15:11:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DA568D0063; Wed, 24 Feb 2021 15:11:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 716A48D0065; Wed, 24 Feb 2021 15:11:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id 5D8328D0063 for ; Wed, 24 Feb 2021 15:11:30 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2A372184B40D3 for ; Wed, 24 Feb 2021 20:11:30 +0000 (UTC) X-FDA: 77854256340.26.19F9E3E Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf06.hostedemail.com (Postfix) with ESMTP id 2FC0EC0007C4 for ; Wed, 24 Feb 2021 20:11:31 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id n4so1509716wmq.3 for ; Wed, 24 Feb 2021 12:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yoEBD3kTTwguyjWERZTod9djozhi6l4dnUPRSHxjTUM=; b=IDa0GpfeP5aGN3GSvoQacCquWbdfOYSqZNBxEXraKvzRfYcg2ZMYsUckANfQlJ431j nEjzppt0eSyjwbbsniAUk959xpfFeBgl4+c91jVlHR2vKPCRRTOkfUVBurIfT5/NfX5Q 5bsVrahyZtGmG02NUw/8aZUCq1eQ11oOsh96y3vPBFJsjVsVku6G5hHgCHfuQQ0seszf fcFP3GucFRPafZM72k1YQB9ZcshrOGJkuSz2mvACeQsF4RMpErl31Zp4FfUahKHqZRD8 ejrunv9KOFfsVx/z0KtJk2+Wk78L9s49mq3plPL6FTRZqOK/iBtLrJnY9JPcmAsfrhJs OB9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yoEBD3kTTwguyjWERZTod9djozhi6l4dnUPRSHxjTUM=; b=kdCKalXvWnl1TI/REnaQMAElFZ/u9surdW+sf3xsCyvQEhd8/stssePqlXAZAn+Pig voGdwN9bd1C/QKMWf0Jmw+fdswje16MK1Mx9tTge5dgo8JpgdZ4InF30Jv1m0aZL1rO5 JDsakoKoEn6zfS14Hld3OZdfzyV+Z//3QuYp4hZkGuIhkMKKB5oby25O5UJNM5c8v/Tg xE1R6klllVfUk6znsvNKIaNLNmZ5yFV/b+TpwCOPua8wAAZn6iOCr891M4RTzyjGHsM6 P0fj7b1cllUYBydA5F85QngFRt2m9YBErseVQV1zWUGhkH2ce4qA+A56jTfuFxkPzGwf o+4Q== X-Gm-Message-State: AOAM531o2Omxtaq5/ncYvtQCtmrdeiXYL6aAk8GroihWUKtlGoGUM928 3muvmolcKKrNnouZoBX4WyXAKw== X-Google-Smtp-Source: ABdhPJyvwGC+daxO0xCmJulZwCgtYwQwlrWimSlxEh8LDTFVXZ7EXZ0tb5TomXORGHyjv9ogkVJSKA== X-Received: by 2002:a1c:dc56:: with SMTP id t83mr5231391wmg.176.1614197488328; Wed, 24 Feb 2021 12:11:28 -0800 (PST) Received: from apalos.home (ppp-94-64-113-158.home.otenet.gr. [94.64.113.158]) by smtp.gmail.com with ESMTPSA id s124sm4268340wms.40.2021.02.24.12.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 12:11:27 -0800 (PST) Date: Wed, 24 Feb 2021 22:11:25 +0200 From: Ilias Apalodimas To: Jesper Dangaard Brouer Cc: Mel Gorman , linux-mm@kvack.org, chuck.lever@oracle.com, netdev@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH RFC net-next 1/3] net: page_pool: refactor dma_map into own function page_pool_dma_map Message-ID: References: <161419296941.2718959.12575257358107256094.stgit@firesoul> <161419300107.2718959.18302883670835746249.stgit@firesoul> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <161419300107.2718959.18302883670835746249.stgit@firesoul> X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2FC0EC0007C4 X-Stat-Signature: isfznrem7e8pm33pwt1zxbr6wnia7nwk Received-SPF: none (linaro.org>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mail-wm1-f45.google.com; client-ip=209.85.128.45 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614197491-275693 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Feb 24, 2021 at 07:56:41PM +0100, Jesper Dangaard Brouer wrote: > In preparation for next patch, move the dma mapping into its own > function, as this will make it easier to follow the changes. > > Signed-off-by: Jesper Dangaard Brouer > --- > net/core/page_pool.c | 49 +++++++++++++++++++++++++++++-------------------- > 1 file changed, 29 insertions(+), 20 deletions(-) > > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index ad8b0707af04..50d52aa6fbeb 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -180,6 +180,31 @@ static void page_pool_dma_sync_for_device(struct page_pool *pool, > pool->p.dma_dir); > } > > +static struct page * page_pool_dma_map(struct page_pool *pool, > + struct page *page) > +{ Why return a struct page* ? boolean maybe? > + dma_addr_t dma; > + > + /* 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) > + * This mapping is kept for lifetime of page, until leaving pool. > + */ > + 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)) { > + put_page(page); This is a bit confusing when reading it. The name of the function should try to map the page and report a yes/no, instead of trying to call put_page as well. Can't we explicitly ask the user to call put_page() if the mapping failed? A clear example is on patch 2/3, when on the first read I was convinced there was a memory leak. > + return NULL; > + } > + page->dma_addr = dma; > + > + if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) > + page_pool_dma_sync_for_device(pool, page, pool->p.max_len); > + > + return page; > +} > + > /* slow path */ > noinline > static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, > @@ -187,7 +212,6 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, > { > struct page *page; > gfp_t gfp = _gfp; > - dma_addr_t dma; > > /* We could always set __GFP_COMP, and avoid this branch, as > * prep_new_page() can handle order-0 with __GFP_COMP. > @@ -211,27 +235,12 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, > if (!page) > return NULL; > > - if (!(pool->p.flags & PP_FLAG_DMA_MAP)) > - goto skip_dma_map; > - > - /* 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) > - * This mapping is kept for lifetime of page, until leaving pool. > - */ > - 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)) { > - put_page(page); > - return NULL; > + if (pool->p.flags & PP_FLAG_DMA_MAP) { > + page = page_pool_dma_map(pool, page); > + if (!page) > + return NULL; > } > - page->dma_addr = dma; > - > - if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) > - page_pool_dma_sync_for_device(pool, page, pool->p.max_len); > > -skip_dma_map: > /* Track how many pages are held 'in-flight' */ > pool->pages_state_hold_cnt++; > > > Thanks! /Ilias