From nobody Wed Dec 17 20:40:31 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C21AAC61D9C for ; Wed, 22 Nov 2023 23:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344409AbjKVXZo (ORCPT ); Wed, 22 Nov 2023 18:25:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344564AbjKVXZg (ORCPT ); Wed, 22 Nov 2023 18:25:36 -0500 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D21251AB for ; Wed, 22 Nov 2023 15:25:31 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1700695530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+xIe2DoE21qrt9LSNcAUwIwIwHsNrxaH9AQLMP04McM=; b=o3CvX/g1Mo37OAG87L/6Vu3aVXW2glLs+ZCCGUrP4H0SA8cPtcuDyYy22kVuLNkWtpIA9Q /HbvDCodA7ny8mu2ew1QagbLzcTglJHQRpbARFoW4RvMBKCAQNlLos+/qEMrNpU12NLKky vaSlk3dtsvcNkFHaJ0XGnT1dL407Frk= From: Kent Overstreet To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Kent Overstreet Subject: [PATCH 6/7] bcachefs: shrinker.to_text() methods Date: Wed, 22 Nov 2023 18:25:11 -0500 Message-ID: <20231122232515.177833-7-kent.overstreet@linux.dev> In-Reply-To: <20231122232515.177833-1-kent.overstreet@linux.dev> References: <20231122232515.177833-1-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds shrinker.to_text() methods for our shrinkers and hooks them up to our existing to_text() functions. Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_cache.c | 13 +++++++++++++ fs/bcachefs/btree_key_cache.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c index 47e7770d0583..aab279dff944 100644 --- a/fs/bcachefs/btree_cache.c +++ b/fs/bcachefs/btree_cache.c @@ -13,6 +13,7 @@ =20 #include #include +#include =20 const char * const bch2_btree_node_flags[] =3D { #define x(f) #f, @@ -392,6 +393,17 @@ static unsigned long bch2_btree_cache_count(struct shr= inker *shrink, return btree_cache_can_free(bc); } =20 +static void bch2_btree_cache_shrinker_to_text(struct seq_buf *s, struct sh= rinker *shrink) +{ + struct bch_fs *c =3D shrink->private_data; + char *cbuf; + size_t buflen =3D seq_buf_get_buf(s, &cbuf); + struct printbuf out =3D PRINTBUF_EXTERN(cbuf, buflen); + + bch2_btree_cache_to_text(&out, c); + seq_buf_commit(s, out.pos); +} + void bch2_fs_btree_cache_exit(struct bch_fs *c) { struct btree_cache *bc =3D &c->btree_cache; @@ -478,6 +490,7 @@ int bch2_fs_btree_cache_init(struct bch_fs *c) bc->shrink =3D shrink; shrink->count_objects =3D bch2_btree_cache_count; shrink->scan_objects =3D bch2_btree_cache_scan; + shrink->to_text =3D bch2_btree_cache_shrinker_to_text; shrink->seeks =3D 4; shrink->private_data =3D c; shrinker_register(shrink); diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index 4402cf068c56..e14e9b4cd029 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -13,6 +13,7 @@ #include "trace.h" =20 #include +#include =20 static inline bool btree_uses_pcpu_readers(enum btree_id id) { @@ -1028,6 +1029,18 @@ void bch2_fs_btree_key_cache_init_early(struct btree= _key_cache *c) INIT_LIST_HEAD(&c->freed_nonpcpu); } =20 +static void bch2_btree_key_cache_shrinker_to_text(struct seq_buf *s, struc= t shrinker *shrink) +{ + struct bch_fs *c =3D shrink->private_data; + struct btree_key_cache *bc =3D &c->btree_key_cache; + char *cbuf; + size_t buflen =3D seq_buf_get_buf(s, &cbuf); + struct printbuf out =3D PRINTBUF_EXTERN(cbuf, buflen); + + bch2_btree_key_cache_to_text(&out, bc); + seq_buf_commit(s, out.pos); +} + int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc) { struct bch_fs *c =3D container_of(bc, struct bch_fs, btree_key_cache); @@ -1051,6 +1064,7 @@ int bch2_fs_btree_key_cache_init(struct btree_key_cac= he *bc) shrink->seeks =3D 0; shrink->count_objects =3D bch2_btree_key_cache_count; shrink->scan_objects =3D bch2_btree_key_cache_scan; + shrink->to_text =3D bch2_btree_key_cache_shrinker_to_text; shrink->private_data =3D c; shrinker_register(shrink); return 0; --=20 2.42.0