From patchwork Fri Apr 28 16:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 13226626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A2EFC77B61 for ; Fri, 28 Apr 2023 16:16:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1545E6B0081; Fri, 28 Apr 2023 12:16:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DE946B0082; Fri, 28 Apr 2023 12:16:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9A2C6B0083; Fri, 28 Apr 2023 12:16:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D985C6B0081 for ; Fri, 28 Apr 2023 12:16:31 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9DDEF12021E for ; Fri, 28 Apr 2023 16:16:31 +0000 (UTC) X-FDA: 80731302582.30.49F631C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 76BF710002B for ; Fri, 28 Apr 2023 16:16:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CIgu7Uci; spf=pass (imf14.hostedemail.com: domain of brouer@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=brouer@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682698589; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pD9+Y3t6RFlJrpvD6gfCa/QcAc2+1k482K1F2GCeYGI=; b=caZRnmkPhDRwHgA83DEqIanfgzA+mwBPEr21VYe5TEIX+qE9lqkPya/xzIrxa6Zzj2e4jC SlMcQsdKd5sm+Ng+1L84uZNiy5KegEs88bbFI/AaqY6+4G29AImk0xM7i7sqQIkdxqCdaa py8qB35GsR791VDFv7h2l2baQS1Xm7c= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CIgu7Uci; spf=pass (imf14.hostedemail.com: domain of brouer@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=brouer@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682698589; a=rsa-sha256; cv=none; b=Y5Zicle58wjUHLNmk2bKLEOAjZvli2hRmtFn1/jk+7l4JddiYhVem8YubxFGjXC51xUhv4 7hdc91iF+xNRaW0Q5Zt8l0Xgkgr+e2ksODhhQG8LsBaTsOjRUm+d8KYb0Ef/S/SB/IUT5f GWDj9nmQmoWqizkz0E5MU8rfXhwZdnc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682698588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pD9+Y3t6RFlJrpvD6gfCa/QcAc2+1k482K1F2GCeYGI=; b=CIgu7UciZFuabyhIYPAl+YoZPbT6sfUjblX7nHS8hazBu1Cr+4HrIkSXO9+bH0T6xmcB8O cki6mkdyqahoBETzMHdBw39NF5txxkFY5vs/a7MxaW6N6l5D1NSpqlKbPldY8EhANwsp6y KAiThUPq6t2fMutH7624EHYqWggMCy0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-90-iogeSOKmPx-SPjPJs23mwA-1; Fri, 28 Apr 2023 12:16:25 -0400 X-MC-Unique: iogeSOKmPx-SPjPJs23mwA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A1B2B858297; Fri, 28 Apr 2023 16:16:20 +0000 (UTC) Received: from firesoul.localdomain (unknown [10.45.242.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AD4863F41; Fri, 28 Apr 2023 16:16:20 +0000 (UTC) Received: from [10.1.1.1] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id 59BE6307372E8; Fri, 28 Apr 2023 18:16:19 +0200 (CEST) Subject: [PATCH RFC net-next/mm V3 1/2] page_pool: Remove workqueue in new shutdown scheme From: Jesper Dangaard Brouer To: Ilias Apalodimas , netdev@vger.kernel.org, Eric Dumazet , linux-mm@kvack.org, Mel Gorman Cc: Jesper Dangaard Brouer , lorenzo@kernel.org, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , linyunsheng@huawei.com, bpf@vger.kernel.org, "David S. Miller" , Jakub Kicinski , Paolo Abeni , Andrew Morton , willy@infradead.org Date: Fri, 28 Apr 2023 18:16:19 +0200 Message-ID: <168269857929.2191653.13267688321246766547.stgit@firesoul> In-Reply-To: <168269854650.2191653.8465259808498269815.stgit@firesoul> References: <168269854650.2191653.8465259808498269815.stgit@firesoul> User-Agent: StGit/1.4 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 76BF710002B X-Stat-Signature: 9wd314atwews7rs946xu89zfukszcgur X-HE-Tag: 1682698589-599967 X-HE-Meta: U2FsdGVkX1/7E3bHX4Icmf5i5lpiHRCEYEAB+nIkLaot6XNTiGGa7fKFyvdmcBpw4OnEfO85NP2z/5+PM1wtfxoFunRVOejnGg/LfS7U2do4H5uCYpBkA+SwpVw26PI458lFHf8kbxccwrF0Br+wPxCFVxtW87j/XaQfRwVoCeO04SGpq6mr7+noMznjOWZVH/tkRsekQsKLFUgdpeEAkZxZvrfJ4EpqJ2qAqKvhGmFhlqrvgEiRibMCbpqNcmN/mWE88fuamyTeL2iGcaXO4NrkG6rFn6ZOCKI7XnG+VgvzL+d8jokh/6vmBCChLc2ydKSsInfSVdtMGupsKmJ6EdtCLZwrE6koIOKAl32q6vAKvhwEvxfpVTb214IvrGzMFXlS88cFqYDBaEgG1qG4ZCQ1O2sLtztlcfojztQDSWL03+tnZ7F0MU+5+Nz6S19DUB+BFEWb56z4ylh7ngrO1ke5gfsaYT1qNmFiZZgbx8HD5Dk6SX45OGRvXV4TgFb+bxvyIYgWG5cJ1V5GHA839fh3EoY4o/sZ7R8rySEFtpR8GRDHJSwdojTp7ZoiN1Uhct4Q7hplZBfRhgUlcplx7X+wqMh8lhWQTFE1nYo2vsgFq9KdLWQZU1FXAjoKUuXy3577irZUeSey6g3vfC4CYEvwyYkRn7OcJ55ET1PVgqIveR+UlzP2ajm+QVkvmD+zQkbVlyPFHHNOwbRN5QP33uPoP0IzSEPREXWPW+tajX6k1v8PV9i1knSYEh2HWlGmTnlc0f6ja0uqrCM/feDFuAJjhoHFFt3FLhhCjpV483XbzY5kx/GLGdQoa3GhAkdKl6rTSYg8iu7vtzHQtcPtF+1S//eiCO50oQOnhyVcAiVl3wDb7Nr79ZLF0gaPXtPWb2fORnFiV02BRQt81jb5okyxtglHu9fPSGNIZL8vyx2bcoTsYZIFI7TYkHztVFAk8fNanjdM6LH4TVMgLbo ElVYv9Pi aoHZgEsq4v2uzz+IYe6lD2xN8+3q7llFbC8zmcv+Af8uaK4688WU+0KI7s6bBlJi/0OWGJa0Ob2Nck6ZZbkSzFxXDZXaOU4BP9RiHegcZCcJymjSXZh5JuRsZimkgoLZKqsnhPiittLYsP5SsyG8s2ejCV8r4lY2a3/Cxv2Llmk2BbGQFVqI8uJmLs5b4Sqf8/6CE4Ilwkvml5iaH59OOnW2CQCAhLrZyI5fBR5ONsDrQIAVlJSkVTj2x4RvcbXvx2DQ14rbg6ZtCAcIShkCCR8KDoxisGvYvqGsYUgW5cICMUUXolKmBDY5UErQF/wM+aQ5Of7iMOL93PQDK4dW2yM5xbahwvAa5kub4 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: This removes the workqueue scheme that periodically tests when inflight reach zero such that page_pool memory can be freed. This change adds code to fast-path free checking for a shutdown flags bit after returning PP pages. Performance is very important for PP, as the fast path is used for XDP_DROP use-cases where NIC drivers recycle PP pages directly into PP alloc cache. This patch (since V3) shows zero impact on this fast path. Micro benchmarked with [1] on Intel CPU E5-1650 @3.60GHz. The slight code reorg of likely() are deliberate. [1] https://github.com/netoptimizer/prototype-kernel/blob/master/kernel/lib/bench_page_pool_simple.c Signed-off-by: Jesper Dangaard Brouer --- include/net/page_pool.h | 9 +-- net/core/page_pool.c | 138 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 103 insertions(+), 44 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index c8ec2f34722b..a71c0f2695b0 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -50,6 +50,9 @@ PP_FLAG_DMA_SYNC_DEV |\ PP_FLAG_PAGE_FRAG) +/* Internal flag: PP in shutdown phase, waiting for inflight pages */ +#define PP_FLAG_SHUTDOWN BIT(8) + /* * Fast allocation side cache array/stack * @@ -151,11 +154,6 @@ static inline u64 *page_pool_ethtool_stats_get(u64 *data, void *stats) struct page_pool { struct page_pool_params p; - struct delayed_work release_dw; - void (*disconnect)(void *); - unsigned long defer_start; - unsigned long defer_warn; - u32 pages_state_hold_cnt; unsigned int frag_offset; struct page *frag_page; @@ -165,6 +163,7 @@ struct page_pool { /* these stats are incremented while in softirq context */ struct page_pool_alloc_stats alloc_stats; #endif + void (*disconnect)(void *); u32 xdp_mem_id; /* diff --git a/net/core/page_pool.c b/net/core/page_pool.c index e212e9d7edcb..54bdd140b7bd 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -23,9 +23,6 @@ #include -#define DEFER_TIME (msecs_to_jiffies(1000)) -#define DEFER_WARN_INTERVAL (60 * HZ) - #define BIAS_MAX LONG_MAX #ifdef CONFIG_PAGE_POOL_STATS @@ -380,6 +377,10 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, struct page *page; int i, nr_pages; + /* API usage BUG: PP in shutdown phase, cannot alloc new pages */ + if (WARN_ON(pool->p.flags & PP_FLAG_SHUTDOWN)) + return NULL; + /* Don't support bulk alloc for high-order pages */ if (unlikely(pp_order)) return __page_pool_alloc_page_order(pool, gfp); @@ -450,10 +451,9 @@ EXPORT_SYMBOL(page_pool_alloc_pages); */ #define _distance(a, b) (s32)((a) - (b)) -static s32 page_pool_inflight(struct page_pool *pool) +static s32 __page_pool_inflight(struct page_pool *pool, + u32 hold_cnt, u32 release_cnt) { - u32 release_cnt = atomic_read(&pool->pages_state_release_cnt); - u32 hold_cnt = READ_ONCE(pool->pages_state_hold_cnt); s32 inflight; inflight = _distance(hold_cnt, release_cnt); @@ -464,6 +464,17 @@ static s32 page_pool_inflight(struct page_pool *pool) return inflight; } +static s32 page_pool_inflight(struct page_pool *pool) +{ + u32 hold_cnt = READ_ONCE(pool->pages_state_hold_cnt); + u32 release_cnt = atomic_read(&pool->pages_state_release_cnt); + return __page_pool_inflight(pool, hold_cnt, release_cnt); +} + +static int page_pool_free_attempt(struct page_pool *pool, + u32 hold_cnt, u32 release_cnt); +static u32 pp_read_hold_cnt(struct page_pool *pool); + /* Disconnects a page (from a page_pool). API users can have a need * to disconnect a page (from a page_pool), to allow it to be used as * a regular page (that will eventually be returned to the normal @@ -471,8 +482,10 @@ static s32 page_pool_inflight(struct page_pool *pool) */ void page_pool_release_page(struct page_pool *pool, struct page *page) { + unsigned int flags = READ_ONCE(pool->p.flags); dma_addr_t dma; - int count; + u32 release_cnt; + u32 hold_cnt; if (!(pool->p.flags & PP_FLAG_DMA_MAP)) /* Always account for inflight pages, even if we didn't @@ -490,11 +503,15 @@ void page_pool_release_page(struct page_pool *pool, struct page *page) skip_dma_unmap: page_pool_clear_pp_info(page); - /* This may be the last page returned, releasing the pool, so - * it is not safe to reference pool afterwards. - */ - count = atomic_inc_return_relaxed(&pool->pages_state_release_cnt); - trace_page_pool_state_release(pool, page, count); + if (flags & PP_FLAG_SHUTDOWN) + hold_cnt = pp_read_hold_cnt(pool); + + release_cnt = atomic_inc_return(&pool->pages_state_release_cnt); + trace_page_pool_state_release(pool, page, release_cnt); + + /* In shutdown phase, last page will free pool instance */ + if (flags & PP_FLAG_SHUTDOWN) + page_pool_free_attempt(pool, hold_cnt, release_cnt); } EXPORT_SYMBOL(page_pool_release_page); @@ -535,7 +552,7 @@ static bool page_pool_recycle_in_ring(struct page_pool *pool, struct page *page) static bool page_pool_recycle_in_cache(struct page *page, struct page_pool *pool) { - if (unlikely(pool->alloc.count == PP_ALLOC_CACHE_SIZE)) { + if (pool->alloc.count == PP_ALLOC_CACHE_SIZE) { recycle_stat_inc(pool, cache_full); return false; } @@ -546,6 +563,8 @@ static bool page_pool_recycle_in_cache(struct page *page, return true; } +static void page_pool_empty_ring(struct page_pool *pool); + /* If the page refcnt == 1, this will try to recycle the page. * if PP_FLAG_DMA_SYNC_DEV is set, we'll try to sync the DMA area for * the configured size min(dma_sync_size, pool->max_len). @@ -572,7 +591,8 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, page_pool_dma_sync_for_device(pool, page, dma_sync_size); - if (allow_direct && in_softirq() && + /* During PP shutdown, no direct recycle must occur */ + if (likely(allow_direct && in_softirq()) && page_pool_recycle_in_cache(page, pool)) return NULL; @@ -609,6 +629,8 @@ void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, recycle_stat_inc(pool, ring_full); page_pool_return_page(pool, page); } + if (page && pool->p.flags & PP_FLAG_SHUTDOWN) + page_pool_empty_ring(pool); } EXPORT_SYMBOL(page_pool_put_defragged_page); @@ -646,6 +668,9 @@ void page_pool_put_page_bulk(struct page_pool *pool, void **data, recycle_stat_add(pool, ring, i); page_pool_ring_unlock(pool); + if (pool->p.flags & PP_FLAG_SHUTDOWN) + page_pool_empty_ring(pool); + /* Hopefully all pages was return into ptr_ring */ if (likely(i == bulk_len)) return; @@ -737,12 +762,18 @@ struct page *page_pool_alloc_frag(struct page_pool *pool, } EXPORT_SYMBOL(page_pool_alloc_frag); +noinline static void page_pool_empty_ring(struct page_pool *pool) { - struct page *page; + struct page *page, *next; + + next = ptr_ring_consume_bh(&pool->ring); /* Empty recycle ring */ - while ((page = ptr_ring_consume_bh(&pool->ring))) { + while (next) { + page = next; + next = ptr_ring_consume_bh(&pool->ring); + /* Verify the refcnt invariant of cached pages */ if (!(page_ref_count(page) == 1)) pr_crit("%s() page_pool refcnt %d violation\n", @@ -796,39 +827,36 @@ static void page_pool_scrub(struct page_pool *pool) page_pool_empty_ring(pool); } -static int page_pool_release(struct page_pool *pool) +/* Avoid inlining code to avoid speculative fetching cacheline */ +noinline +static u32 pp_read_hold_cnt(struct page_pool *pool) +{ + return READ_ONCE(pool->pages_state_hold_cnt); +} + +noinline +static int page_pool_free_attempt(struct page_pool *pool, + u32 hold_cnt, u32 release_cnt) { int inflight; - page_pool_scrub(pool); - inflight = page_pool_inflight(pool); + inflight = __page_pool_inflight(pool, hold_cnt, release_cnt); if (!inflight) page_pool_free(pool); return inflight; } -static void page_pool_release_retry(struct work_struct *wq) +static int page_pool_release(struct page_pool *pool) { - struct delayed_work *dwq = to_delayed_work(wq); - struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw); int inflight; - inflight = page_pool_release(pool); + page_pool_scrub(pool); + inflight = page_pool_inflight(pool); if (!inflight) - return; - - /* Periodic warning */ - if (time_after_eq(jiffies, pool->defer_warn)) { - int sec = (s32)((u32)jiffies - (u32)pool->defer_start) / HZ; - - pr_warn("%s() stalled pool shutdown %d inflight %d sec\n", - __func__, inflight, sec); - pool->defer_warn = jiffies + DEFER_WARN_INTERVAL; - } + page_pool_free(pool); - /* Still not ready to be disconnected, retry later */ - schedule_delayed_work(&pool->release_dw, DEFER_TIME); + return inflight; } void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *), @@ -856,6 +884,10 @@ EXPORT_SYMBOL(page_pool_unlink_napi); void page_pool_destroy(struct page_pool *pool) { + unsigned int flags; + u32 release_cnt; + u32 hold_cnt; + if (!pool) return; @@ -868,11 +900,39 @@ void page_pool_destroy(struct page_pool *pool) if (!page_pool_release(pool)) return; - pool->defer_start = jiffies; - pool->defer_warn = jiffies + DEFER_WARN_INTERVAL; + /* PP have pages inflight, thus cannot immediately release memory. + * Enter into shutdown phase, depending on remaining in-flight PP + * pages to trigger shutdown process (on concurrent CPUs) and last + * page will free pool instance. + * + * There exist two race conditions here, we need to take into + * account in the following code. + * + * 1. Before setting PP_FLAG_SHUTDOWN another CPU released the last + * pages into the ptr_ring. Thus, it missed triggering shutdown + * process, which can then be stalled forever. + * + * 2. After setting PP_FLAG_SHUTDOWN another CPU released the last + * page, which triggered shutdown process and freed pool + * instance. Thus, its not safe to dereference *pool afterwards. + * + * Handling races by holding a fake in-flight count, via + * artificially bumping pages_state_hold_cnt, which assures pool + * isn't freed under us. For race(1) its safe to recheck ptr_ring + * (it will not free pool). Race(2) cannot happen, and we can + * release fake in-flight count as last step. + */ + hold_cnt = READ_ONCE(pool->pages_state_hold_cnt) + 1; + smp_store_release(&pool->pages_state_hold_cnt, hold_cnt); + barrier(); + flags = READ_ONCE(pool->p.flags) | PP_FLAG_SHUTDOWN; + smp_store_release(&pool->p.flags, flags); + + /* Concurrent CPUs could have returned last pages into ptr_ring */ + page_pool_empty_ring(pool); - INIT_DELAYED_WORK(&pool->release_dw, page_pool_release_retry); - schedule_delayed_work(&pool->release_dw, DEFER_TIME); + release_cnt = atomic_inc_return(&pool->pages_state_release_cnt); + page_pool_free_attempt(pool, hold_cnt, release_cnt); } EXPORT_SYMBOL(page_pool_destroy);