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=unavailable 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 7BF1DC4160E for ; Wed, 3 Mar 2021 04:23:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39F6964E86 for ; Wed, 3 Mar 2021 04:23:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1449957AbhCCEFG (ORCPT ); Tue, 2 Mar 2021 23:05:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1577327AbhCBSuW (ORCPT ); Tue, 2 Mar 2021 13:50:22 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AFACC061D73 for ; Tue, 2 Mar 2021 10:49:12 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id hs11so37274742ejc.1 for ; Tue, 02 Mar 2021 10:49:11 -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=GO9uM42GAO9SsEmJ1Ud/XfdUbUemfb0O0igeT0Ei1wY=; b=t+mQ5V1ZRGfRvpmCdmHEuOP/59c00rtGZORfMYX7HKfUuez4VJ7P/g2stb8yyUNxst 3ZAjAlPey5b3CJ3WR9ZbMsryiwCGUNYW/0V8k9FMVnjy6hJjBWpzfjjD5WpEm6YYL4Ab VDVjDBBF9XKN9hploWg3HlOF7IJYNs9JpTZHCCfJCqxXUQNTQhM9W/yR+CCle7AFglTR JwLV/77YC40As4lBp9/jzI2lXuADBhVnmmb+HnWiJk2/vGhM19JJYzR+iTV/3LAzusQI oiynfHyWGcjdPd9LU0vnZFJxy701IOZKSClNV6a/o2PekNWwL2Y9/I8/ZykzPbqZDnFy ynbw== 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=GO9uM42GAO9SsEmJ1Ud/XfdUbUemfb0O0igeT0Ei1wY=; b=uAlxIDTnITUglsANgDUopCqjCANgqbDHONyIJ62bmgKQYrFEpMzto7pKRimuXGjeMD wBfitBlC4LBvRncN6JNKijvLQa2KBmeJJSllRmHjSgEjs6o7usROxxViGid0Cr2nTXHK L4fi26SRBt9Btom9rlkl1wl89t+ZD9RKPK6Va+9DcP29CfrNI1joiiIM9L6lE3R7t+5Y a+V6/4Jg1M7IDW1f54Z4Efi9TN5B0kXSiqn2NCfjlZngrNnJlYv5fcBK0Bcyh8Xz9hpu q4gN0KysMI+9OH/tnFUDPTXjQZ2azdxfql6e02w4cCR8U9BjXEdDF2uxVbbZSlFN357g /spA== X-Gm-Message-State: AOAM532dAB49Y9BHFVACir9WcJPhBKUGJkIVEesu93Kd7RcKoAM0Jvm9 nC9pxDEilY8YbxO8lEEe+J0kjg== X-Google-Smtp-Source: ABdhPJwb8YWbEvP6/92V8OGZy5T5rSbr0v1ooPw/xvrT+z5mCXBhQ92a6NJ3tpmWPZhGNU0QVNj88Q== X-Received: by 2002:a17:906:a157:: with SMTP id bu23mr21374870ejb.491.1614710949643; Tue, 02 Mar 2021 10:49:09 -0800 (PST) Received: from enceladus (ppp-94-64-113-158.home.otenet.gr. [94.64.113.158]) by smtp.gmail.com with ESMTPSA id w24sm1645164edt.44.2021.03.02.10.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 10:49:09 -0800 (PST) Date: Tue, 2 Mar 2021 20:49:06 +0200 From: Ilias Apalodimas To: Mel Gorman Cc: Andrew Morton , Chuck Lever , Jesper Dangaard Brouer , LKML , Linux-Net , Linux-MM , Linux-NFS Subject: Re: [PATCH 4/5] net: page_pool: refactor dma_map into own function page_pool_dma_map Message-ID: References: <20210301161200.18852-1-mgorman@techsingularity.net> <20210301161200.18852-5-mgorman@techsingularity.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210301161200.18852-5-mgorman@techsingularity.net> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Mel, Can you please CC me in future revisions. I almost missed that! On Mon, Mar 01, 2021 at 04:11:59PM +0000, Mel Gorman wrote: > From: Jesper Dangaard Brouer > > In preparation for next patch, move the dma mapping into its own > function, as this will make it easier to follow the changes. > > V2: make page_pool_dma_map return boolean (Ilias) > [...] > static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, > gfp_t _gfp) > { > + unsigned int pp_flags = pool->p.flags; > 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,30 +234,14 @@ 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)) { > + if (pp_flags & PP_FLAG_DMA_MAP && Nit pick but can we have if ((pp_flags & PP_FLAG_DMA_MAP) && ... > + unlikely(!page_pool_dma_map(pool, page))) { > put_page(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++; > - > trace_page_pool_state_hold(pool, page, pool->pages_state_hold_cnt); > > /* When page just alloc'ed is should/must have refcnt 1. */ > -- > 2.26.2 > Otherwise Reviewed-by: Ilias Apalodimas