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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32075C04E69 for ; Thu, 27 Jul 2023 08:13:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7FA98D0007; Thu, 27 Jul 2023 04:13:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0A698D0001; Thu, 27 Jul 2023 04:13:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 884078D0007; Thu, 27 Jul 2023 04:13:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 704EF8D0001 for ; Thu, 27 Jul 2023 04:13:48 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 48CA21C9253 for ; Thu, 27 Jul 2023 08:13:48 +0000 (UTC) X-FDA: 81056678136.29.F0EEFC6 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf21.hostedemail.com (Postfix) with ESMTP id 747A91C0015 for ; Thu, 27 Jul 2023 08:13:46 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=dkRrWVkS; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690445626; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vAE6p5mA5n3yxm+4IPfXfMLc8MGv4J5wg3qHubren08=; b=2ClKWz+f/ghtcbNwfsssE1O7aj78nq71jzvEiijlzELqumCox6Gb+9QIbZYdpqj7R+7myw gg82gri1amGe/TYtDNO6t/tav3Dzi8Y+QFCHBlbzrUP4xHKtmm51x738ezP/fZsUiUwMv2 pw1L5AFBgO8dtqiM2evHzx2d2eDm6Go= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445626; a=rsa-sha256; cv=none; b=RObdaIAwruwO/VR0BClT/7MmGakJhuow345kgYx8mD89qeWrzSAy8Apwy+pLlLHqrI/yaM Kjutxdrfdpvx4IR6JQbxC45GHYH85fQqQRfIfQYDCzmaIvLpYIZ0s45+XHIyS4dQUJ5GWJ h8CxO9IYtUNXyfAZDJvLYt6zpKRN91o= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=dkRrWVkS; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-66d6a9851f3so168744b3a.0 for ; Thu, 27 Jul 2023 01:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445625; x=1691050425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vAE6p5mA5n3yxm+4IPfXfMLc8MGv4J5wg3qHubren08=; b=dkRrWVkSv9/U3+e6QsQd29dMPuttcg2M13ZLMDEEIMbfSamBJHJdLtNY2sbEZ+YzhY 5BtYLYzutGknAA+e956eNSlbl7nK+9UwGbTk4YjZb6fHHFpCk0FXoHpJAi6M0jM7aFZF +CarAybA7Fmb9F2zoNtgG1DfzDYBp6eqgkICDj2Asy83tRT0LF5pvIpkdtR75UYStLmf 37kqliTWk9DV3Fw2NufQf0BV5/WVkKX05IEilefRJ/OwJCaH2LBTkZCCI3ZIC5RNHqLc p1thIF8tkbzc9m+CHBYGB6mtVDqiYNqHlAVUDSIfQN8XwfU9rYwJVwEXJvC3bJUByZYt Gdag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445625; x=1691050425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vAE6p5mA5n3yxm+4IPfXfMLc8MGv4J5wg3qHubren08=; b=imdKpSPthQsHJczelwzJgnNzE61xRMB3C2kx5z6JcyymqKCWApLYD76HGzG4TENp6t mVtcN8f7rF0R3XaDOXoNkNN6OAzLBCy3QIGrvplOepfXMjgAhoOR3kca/OJgbx/f/2hy rV2LH06TMHxXlEEn3vvUnKRXCBRo1jEpz0b2hWLtIMrwim4NC5DH48dmslpQmXWhkbO8 6kDGU1e+hbxQY/GHFSRF9lIwlhMpeslcq7lumeb84Fk8S1t4EB8qfBOB4ugbkRbrXlLM Ou11Q8ssOLolEFnbBzrONYhmA9onimY/AC2elkRnLDTNT+kdxfkIXuRpRVGBH6Q3Vlqc n6WQ== X-Gm-Message-State: ABy/qLbHtsztk9j+vARxIqdZxavK9H0UsRaeOvPnenDrEN95GXdZsPDC wIrR9HRkRMCtN9tBHrE+72LIMg== X-Google-Smtp-Source: APBJJlGsGKc/yd3ypxFPLcm5JieT1oixTNIsPQhWBcbXzQEArQwAQppjIOSAREcWHLbqRGZH8ALcGA== X-Received: by 2002:a05:6a20:7d87:b0:12e:f6e6:882b with SMTP id v7-20020a056a207d8700b0012ef6e6882bmr6446407pzj.1.1690445625322; Thu, 27 Jul 2023 01:13:45 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:13:44 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 39/49] xfs: dynamically allocate the xfs-inodegc shrinker Date: Thu, 27 Jul 2023 16:04:52 +0800 Message-Id: <20230727080502.77895-40-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 4jjfjb68wjqy3rbaeoxpezbps6b5sg3m X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 747A91C0015 X-Rspam-User: X-HE-Tag: 1690445626-535448 X-HE-Meta: U2FsdGVkX1+vmI3xxAaLadO/fmjnqT9t9+C0S5JweSUvFyKXnaexWLR8jKslF/+eEsWXgqx9P5vORy2Y+t6GzHcYNeeDRFraPlmTN2VJHZG12urvkd7nKijB/8hsB0GbfhzO1vmKrrUmQ6Aittuzn/vSDWnCuoYQeQEVO1CpvFPjkgP2GyTV7r+NLncSm/bBF7laANE2gdR1g34VbBBrtPyy4qiupbB4bHLODmhr4sD4SiGslfEiS/dVyOo319eLTATPMzc8dbyZqdAUe47aq2A0zZ5tuUPSU7h+VMnSbQkgBaQI9TRDpWWTHaheWVlQ7fsJHS/+Z7OCn9LVTDwvYlZU2rpSmZRx09vedTk9BPIE+a3Lj4O1sqOXQx8EQrmTG8g9kpTqPUXc3aXa38nAXfs0KhbShRjGkUsMzGWDL1lbpJ8UnUtZs4iKwWHFMGnf84eU2g3V84qTADdP1WXRWzTyJYy8klnfpMb+P7sI9UrlU/n+yaxbW/v04sFa9kjJhC7OBsisZMDV8IwmX5Gp3BRPk0idci7T/4BTvknEKBgWKfn2UiUCSvJkdOtSbZp/wNaongJF+vkDAFDVTgCgLQb1nblZAKqpeKc5OKUtp+21u8Z0EjNXxTwTTwkwnO4rWLEREEstZuG4GQPq1JhYYP9+KSudRoFeotqIRiiUmhw7jfRfvMpKiic0L7nDGBjgWkNs7Pe6zUUAlnOQI8wA6hRb4c35hO1RwxrO9UUMBtcQw4aiLw+fsdSxrdvExozMfXXGUYjxegKOIow2cPi9UdOTFqSF1vujsyNVi1SHJE/X2gjDh11yAYQPBv7lCSGMncNhSzLcvUrDqefuEZv65AYT5oEfX1NdQuMvKFqBZkHLB6CBIFK/eQ9JQXcZR8BjYFqG18Krm94CKJeg3UJ+ckAyGqD7J0/kg3YWRa3eBzWD0SIw86ek7CuhA/dIWvRqOVZCn5Kxutz4Ug0lYfc WqiD2j50 tqNngrU/DxoEv9k6G8p4/IK7htp9UWsh8xX/gpmi0iLjmi9xyHJi1UZ3xNF2qQ3ye+8bhWE/1zQE14s+44aCz4ZdemOTH+NKFLFpsmFdlnIYjDXTZvfAG55AAOWewRaZ2CIBQpP/gNyZzyO8xBwVD6+5ztSbxCOK1dywJFdo2HdI73QSZtkzwkdtI5U3Gb9Qv44P8K8+nUPhyggohFZL+Shs+sNNaFdftfDgn0W4c2lmC6RSghZTsKCfM8g85jtsUIn1HhPPrcLYIqKwNfUfnJnLGi1tqOt5weCKEFRvTJCNX51W0wMgqEfponFZvMxqFApgSs062a5CO0TZ/o0OUwb2K75K/N8sxgsiNntq2npNKWubgO/ula69a5W+2k1EElDb4bUIor1rBVS4LXllZnIC0vRAP+gYjFWEi 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: In preparation for implementing lockless slab shrink, use new APIs to dynamically allocate the xfs-inodegc shrinker, so that it can be freed asynchronously using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical section when releasing the struct xfs_mount. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/xfs/xfs_icache.c | 26 +++++++++++++++----------- fs/xfs/xfs_mount.c | 4 ++-- fs/xfs/xfs_mount.h | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 453890942d9f..751c380afd5a 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -2225,8 +2225,7 @@ xfs_inodegc_shrinker_count( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_mount *mp = container_of(shrink, struct xfs_mount, - m_inodegc_shrinker); + struct xfs_mount *mp = shrink->private_data; struct xfs_inodegc *gc; int cpu; @@ -2247,8 +2246,7 @@ xfs_inodegc_shrinker_scan( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_mount *mp = container_of(shrink, struct xfs_mount, - m_inodegc_shrinker); + struct xfs_mount *mp = shrink->private_data; struct xfs_inodegc *gc; int cpu; bool no_items = true; @@ -2284,13 +2282,19 @@ int xfs_inodegc_register_shrinker( struct xfs_mount *mp) { - struct shrinker *shrink = &mp->m_inodegc_shrinker; + mp->m_inodegc_shrinker = shrinker_alloc(SHRINKER_NONSLAB, + "xfs-inodegc:%s", + mp->m_super->s_id); + if (!mp->m_inodegc_shrinker) + return -ENOMEM; + + mp->m_inodegc_shrinker->count_objects = xfs_inodegc_shrinker_count; + mp->m_inodegc_shrinker->scan_objects = xfs_inodegc_shrinker_scan; + mp->m_inodegc_shrinker->seeks = 0; + mp->m_inodegc_shrinker->batch = XFS_INODEGC_SHRINKER_BATCH; + mp->m_inodegc_shrinker->private_data = mp; - shrink->count_objects = xfs_inodegc_shrinker_count; - shrink->scan_objects = xfs_inodegc_shrinker_scan; - shrink->seeks = 0; - shrink->flags = SHRINKER_NONSLAB; - shrink->batch = XFS_INODEGC_SHRINKER_BATCH; + shrinker_register(mp->m_inodegc_shrinker); - return register_shrinker(shrink, "xfs-inodegc:%s", mp->m_super->s_id); + return 0; } diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index fb87ffb48f7f..640d09891a4e 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -1018,7 +1018,7 @@ xfs_mountfs( out_log_dealloc: xfs_log_mount_cancel(mp); out_inodegc_shrinker: - unregister_shrinker(&mp->m_inodegc_shrinker); + shrinker_free(mp->m_inodegc_shrinker); out_fail_wait: if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) xfs_buftarg_drain(mp->m_logdev_targp); @@ -1100,7 +1100,7 @@ xfs_unmountfs( #if defined(DEBUG) xfs_errortag_clearall(mp); #endif - unregister_shrinker(&mp->m_inodegc_shrinker); + shrinker_free(mp->m_inodegc_shrinker); xfs_free_perag(mp); xfs_errortag_del(mp); diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e2866e7fa60c..562c294ca08e 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -217,7 +217,7 @@ typedef struct xfs_mount { atomic_t m_agirotor; /* last ag dir inode alloced */ /* Memory shrinker to throttle and reprioritize inodegc */ - struct shrinker m_inodegc_shrinker; + struct shrinker *m_inodegc_shrinker; /* * Workqueue item so that we can coalesce multiple inode flush attempts * into a single flush. -- 2.30.2