From patchwork Thu Jul 4 23:14:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 168497 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2795362ilk; Thu, 4 Jul 2019 16:14:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAAs1Vd4BxIYNmEt9p6U6fCnKBx0ry38UG2ystsg09/BQRjWfyAgNUcx/4P3CNGJCV2Y33 X-Received: by 2002:a17:90a:1785:: with SMTP id q5mr516331pja.106.1562282070130; Thu, 04 Jul 2019 16:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562282070; cv=none; d=google.com; s=arc-20160816; b=T+h+ZFn5ur2SixbMjmxjpg5dskXBvjVArLd427DON075SScA79LpPPy4hb9lt7l4CK 5UW2TIHUgAAf4ZOI+oy/FdURCo3VXtYcwKS56p2gqPOrRI7slcimwtybcQXO2v6nj2sy cIptZ9N7HxgTlDTBBjJa/7RIkaanWtJ5uWivRBkef2j+huCNEaVrIALFC579GEy7cN9V dW6NyrZpzMrXQlkNG9s9RnbmCiZfDEaHqN4Lw1NwSwNDbQPMAw3xFxZ0hnlFDDdJqBCZ 9EhA94XV/ZexkYdt3J3eHImXbGrExGR9/3ZkRal1sh70JCDM/RsZgKcIAFcdT/1OJ7oP GLgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=SGQUYbY4XW1Z9XXXeZ4lJkDSGyOAypA/R60V5jpvUd8=; b=ggYhUz3zK40Nalm6X15tCs77AyFg346EJRHNRZ1cCih9yQaqD4kpxlutn6frpgA5Er A5MBsmBrbXl8ebrAG55nkhzE/JnvNm5ItK+wfKI7+xLfF28ki6IIbB14vX+HXzPWVOmv B1jk26oQAODQYNJjTL7UQo2gN+IdlEKUKJbV9wtyfZFLDnqoCXweaaOMi0R5P8sbzxlh vYb9imoD4qS81cjsOWaLIfAIPiyXQZkr0AmhT2bkHcU26vQWmhm0pPN7s97mVK8KGW/5 RzLrgJlwr1HkdsklLKKIVhSHkY//5Mpn1NbGigBisPe7xbGKuxQyizij9Wl1eCpVdBjq 6qpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xbu2Hxe0; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a187si6843970pge.269.2019.07.04.16.14.29; Thu, 04 Jul 2019 16:14:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xbu2Hxe0; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727598AbfGDXO3 (ORCPT + 9 others); Thu, 4 Jul 2019 19:14:29 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35112 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727564AbfGDXO2 (ORCPT ); Thu, 4 Jul 2019 19:14:28 -0400 Received: by mail-lj1-f196.google.com with SMTP id x25so687416ljh.2 for ; Thu, 04 Jul 2019 16:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SGQUYbY4XW1Z9XXXeZ4lJkDSGyOAypA/R60V5jpvUd8=; b=xbu2Hxe03NBLxwu4IknzvQfUw0/N7DIWdtGDkQd8QnxxNP2OpyAw8SqgFDQsg6EQ56 5TarBFeO2+7JhvInQOj3MxGr/inW24WnZgQxAurMpIOMyZ4bSIs49ORFP44KO2HkPLXU ENfegxzCxDICgc4zgNn9dcv6KBuDTCcAGHI/At2TazrwzSi2GDGeIJpNFQwmv5zMr9ZD VRWqXK57NTFitmqTaZ+ttr+RSMzTk8YEr0wHBVMEIkbYau2ZEEFc2U5Lr/szSADeshx/ ia+UDiHob74RrfXvx59Vi91wMOHisbcGTcciaP3slh6TyMzW5t0U0bFVjh9x7tf+dw79 9Wgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SGQUYbY4XW1Z9XXXeZ4lJkDSGyOAypA/R60V5jpvUd8=; b=hWMo9pdlfdfWdk8rlvNwr5DIZ9h7/O9EXuqrMve55BLoo7qqoNPyvSgGuOUcddOCsK QrnSXsaUIEqTmKEHKNApuOGI4leQVH7zPKkLzCXnL2SYnwdZz2JCsWiFgtTOP0uXwwb+ RaSZ0q1r8ghejGZNs2KzE13RyUbAbQsNAZL/MU2b6gZurOXMAkLWFLyIkgniJJrqj+AZ 9BOGbN6DIUSCuj/DdVtlKDmFQP+12bq3A7tnWOT2A+1QGJZwQdQM2z71AP9uhRzwjFok dgax22bVGYrCtp/97MR8eGbHjfipGyEG+E5Tx96fnt7Yid6GXymQUbvWYRV4M/ZUxHRp ELNQ== X-Gm-Message-State: APjAAAXzVCpg++wu1BwlmSZ1KmwuwZmb/20I2yLyRVoYNz+SVBeLT5CZ gpjYvYl525C8p50i2erLuJzgJQ== X-Received: by 2002:a2e:854d:: with SMTP id u13mr309338ljj.236.1562282066340; Thu, 04 Jul 2019 16:14:26 -0700 (PDT) Received: from localhost.localdomain ([46.211.39.135]) by smtp.gmail.com with ESMTPSA id q6sm1407269lji.70.2019.07.04.16.14.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 04 Jul 2019 16:14:25 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, hawk@kernel.org, davem@davemloft.net Cc: ast@kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, xdp-newbies@vger.kernel.org, ilias.apalodimas@linaro.org, netdev@vger.kernel.org, daniel@iogearbox.net, jakub.kicinski@netronome.com, john.fastabend@gmail.com, Ivan Khoronzhuk , Jesper Dangaard Brouer Subject: [PATCH v7 net-next 1/5] net: core: page_pool: add user refcnt and reintroduce page_pool_destroy Date: Fri, 5 Jul 2019 02:14:02 +0300 Message-Id: <20190704231406.27083-2-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190704231406.27083-1-ivan.khoronzhuk@linaro.org> References: <20190704231406.27083-1-ivan.khoronzhuk@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jesper recently removed page_pool_destroy() (from driver invocation) and moved shutdown and free of page_pool into xdp_rxq_info_unreg(), in-order to handle in-flight packets/pages. This created an asymmetry in drivers create/destroy pairs. This patch reintroduce page_pool_destroy and add page_pool user refcnt. This serves the purpose to simplify drivers error handling as driver now drivers always calls page_pool_destroy() and don't need to track if xdp_rxq_info_reg_mem_model() was unsuccessful. This could be used for a special cases where a single RX-queue (with a single page_pool) provides packets for two net_device'es, and thus needs to register the same page_pool twice with two xdp_rxq_info structures. This patch is primarily to ease API usage for drivers. The recently merged netsec driver, actually have a bug in this area, which is solved by this API change. This patch is a modified version of Ivan Khoronzhu's original patch. Link: https://lore.kernel.org/netdev/20190625175948.24771-2-ivan.khoronzhuk@linaro.org/ Fixes: 5c67bf0ec4d0 ("net: netsec: Use page_pool API") Signed-off-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas Signed-off-by: Ivan Khoronzhuk --- .../net/ethernet/mellanox/mlx5/core/en_main.c | 4 +-- drivers/net/ethernet/socionext/netsec.c | 8 ++---- include/net/page_pool.h | 25 +++++++++++++++++++ net/core/page_pool.c | 8 ++++++ net/core/xdp.c | 3 +++ 5 files changed, 40 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 2f9093ba82aa..ac882b2341d0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -575,8 +575,6 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, } err = xdp_rxq_info_reg_mem_model(&rq->xdp_rxq, MEM_TYPE_PAGE_POOL, rq->page_pool); - if (err) - page_pool_free(rq->page_pool); } if (err) goto err_free; @@ -644,6 +642,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, if (rq->xdp_prog) bpf_prog_put(rq->xdp_prog); xdp_rxq_info_unreg(&rq->xdp_rxq); + page_pool_destroy(rq->page_pool); mlx5_wq_destroy(&rq->wq_ctrl); return err; @@ -678,6 +677,7 @@ static void mlx5e_free_rq(struct mlx5e_rq *rq) } xdp_rxq_info_unreg(&rq->xdp_rxq); + page_pool_destroy(rq->page_pool); mlx5_wq_destroy(&rq->wq_ctrl); } diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 5544a722543f..43ab0ce90704 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -1210,15 +1210,11 @@ static void netsec_uninit_pkt_dring(struct netsec_priv *priv, int id) } } - /* Rx is currently using page_pool - * since the pool is created during netsec_setup_rx_dring(), we need to - * free the pool manually if the registration failed - */ + /* Rx is currently using page_pool */ if (id == NETSEC_RING_RX) { if (xdp_rxq_info_is_reg(&dring->xdp_rxq)) xdp_rxq_info_unreg(&dring->xdp_rxq); - else - page_pool_free(dring->page_pool); + page_pool_destroy(dring->page_pool); } memset(dring->desc, 0, sizeof(struct netsec_desc) * DESC_NUM); diff --git a/include/net/page_pool.h b/include/net/page_pool.h index ee9c871d2043..2cbcdbdec254 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -101,6 +101,12 @@ struct page_pool { struct ptr_ring ring; atomic_t pages_state_release_cnt; + + /* A page_pool is strictly tied to a single RX-queue being + * protected by NAPI, due to above pp_alloc_cache. This + * refcnt serves purpose is to simplify drivers error handling. + */ + refcount_t user_cnt; }; struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp); @@ -134,6 +140,15 @@ static inline void page_pool_free(struct page_pool *pool) #endif } +/* Drivers use this instead of page_pool_free */ +static inline void page_pool_destroy(struct page_pool *pool) +{ + if (!pool) + return; + + page_pool_free(pool); +} + /* Never call this directly, use helpers below */ void __page_pool_put_page(struct page_pool *pool, struct page *page, bool allow_direct); @@ -201,4 +216,14 @@ static inline bool is_page_pool_compiled_in(void) #endif } +static inline void page_pool_get(struct page_pool *pool) +{ + refcount_inc(&pool->user_cnt); +} + +static inline bool page_pool_put(struct page_pool *pool) +{ + return refcount_dec_and_test(&pool->user_cnt); +} + #endif /* _NET_PAGE_POOL_H */ diff --git a/net/core/page_pool.c b/net/core/page_pool.c index b366f59885c1..3272dc7a8c81 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -49,6 +49,9 @@ static int page_pool_init(struct page_pool *pool, atomic_set(&pool->pages_state_release_cnt, 0); + /* Driver calling page_pool_create() also call page_pool_destroy() */ + refcount_set(&pool->user_cnt, 1); + if (pool->p.flags & PP_FLAG_DMA_MAP) get_device(pool->p.dev); @@ -70,6 +73,7 @@ struct page_pool *page_pool_create(const struct page_pool_params *params) kfree(pool); return ERR_PTR(err); } + return pool; } EXPORT_SYMBOL(page_pool_create); @@ -356,6 +360,10 @@ static void __warn_in_flight(struct page_pool *pool) void __page_pool_free(struct page_pool *pool) { + /* Only last user actually free/release resources */ + if (!page_pool_put(pool)) + return; + WARN(pool->alloc.count, "API usage violation"); WARN(!ptr_ring_empty(&pool->ring), "ptr_ring is not empty"); diff --git a/net/core/xdp.c b/net/core/xdp.c index 829377cc83db..d7bf62ffbb5e 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -370,6 +370,9 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq, goto err; } + if (type == MEM_TYPE_PAGE_POOL) + page_pool_get(xdp_alloc->page_pool); + mutex_unlock(&mem_id_lock); trace_mem_connect(xdp_alloc, xdp_rxq);