From patchwork Thu Jun 22 08:53:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288651 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 7B1EBC001DF for ; Thu, 22 Jun 2023 08:56:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C8EF8D0002; Thu, 22 Jun 2023 04:56:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 179148D0001; Thu, 22 Jun 2023 04:56:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 041368D0002; Thu, 22 Jun 2023 04:56:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E6AFE8D0001 for ; Thu, 22 Jun 2023 04:56:38 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C09401A0B20 for ; Thu, 22 Jun 2023 08:56:38 +0000 (UTC) X-FDA: 80929778076.06.290B910 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf24.hostedemail.com (Postfix) with ESMTP id D1BDB180013 for ; Thu, 22 Jun 2023 08:56:36 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="Ekn/zV8B"; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687424196; a=rsa-sha256; cv=none; b=X9EIKwURb1+gKjhun7lWJvDEFk7fQy4F7UXTph+sgTKOcfCvEsFSYzk3oFT6NymqoFYkA7 dPQjtgv6qziZ6Ue7Oqjxa4dkI2MBy5hDNltN+R65y8Z/Hh+c82TJqYAvluYaV/QxVripAa JPe/Ufq1Bv8gzL6QJUEDQKif9FEo/4o= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="Ekn/zV8B"; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.177 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=1687424196; 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=tuTRU39Llc4f1pG+4j4EE0WoT0ftJSPXyoG6lJxyplk=; b=VkfN0shzVMjHoAD9vGcNYXFFYzVy3EgwIdGbkc7D7dYIRCuvpGKeCd9Lu/jZ1ib7/vgjCu i6LL6DeGrzt3FCI3jg7PSA1DqjkwqK6KxE+D+AwDOJoymiNjyvklj65dEfOUkUEKksbC09 Fg3ifOsnLuTNl487exZ5xhJ1beJtk+I= Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-54f73ef19e5so678963a12.0 for ; Thu, 22 Jun 2023 01:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1687424196; x=1690016196; 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=tuTRU39Llc4f1pG+4j4EE0WoT0ftJSPXyoG6lJxyplk=; b=Ekn/zV8B3Pykd2GrPoTdVnpJwk5evd2tyUP0vKsA0sao3e0fC5CJiY4BTrhaxMXIHV uTPkEPgehKIEn13/c91Rf6hAUh1pL4moe2PR0AHRF6Kdv1EoYZyskenz8RKeyckC9Itb y+HACd1zVUdu9ru2Mkg+skG1k3PTY0I37XiwGKuN4fZctDPgzdbV+AVCjywsN0HsaZ69 Cuv8lvpq3tEmZe+xhsg7ur6ivxEYcTfKMKXUZmg3vRSFd562H9J1GbGm5bH6oFZpkxLe LAGfy+lFWFcKu0xxXlVXi22gjm4qtT4oNXfdGZLZ8KWmVvCWym8e4Apiabz+y3j9a60o NyUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687424196; x=1690016196; 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=tuTRU39Llc4f1pG+4j4EE0WoT0ftJSPXyoG6lJxyplk=; b=VjMRDOG/fLld5aHFPumAMJgWCfZCqLupWEU4JKQOgu67okcBMqa4i+LK8sbFlqA6K1 T3Q0moEBqFyPZQUmmQBk24M5xR+o1JAhHXcDQWxB4T6ioJX/21GV/pwpORIlWRQ2fiLo EMPi0pPOAopKlR9YyK9lPoGtXrSY6KBXE6esc1BlzaHYLYdcoaJMJUR9HsIjnvRY2hp5 vKciwZKl6toePTeO1frkpCRzqt2Ba3KZpfudWeMT8CQHD3gVutKc4ixZvygsrZ8U5A7T IP36keGoIN6K2kAV26jmTIXaHksAp+Fc3chQnnl29em0Z9ZS3JiFTnWjQ8xmSP6pQurF lmIA== X-Gm-Message-State: AC+VfDyIsgJ5nBT0luLwO2VGN4jn5yxQCMvLfZ1BRZvC4rTZ4JnJxgKk zJ3XnJthFqq2ieo1y/inXnyu7Q== X-Google-Smtp-Source: ACHHUZ67Tf+k1CheKb86ycYHhx5x/FfiuFJZEOT7coQiqeyoaYPxA8zsjGzghk4F71F8kxwZIRTJAQ== X-Received: by 2002:a17:902:ecc6:b0:1ae:1364:6086 with SMTP id a6-20020a170902ecc600b001ae13646086mr21603647plh.2.1687424195747; Thu, 22 Jun 2023 01:56:35 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id h2-20020a170902f7c200b001b549fce345sm4806971plw.230.2023.06.22.01.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 01:56:35 -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 Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.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-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 19/29] xfs: dynamically allocate the xfs-qm shrinker Date: Thu, 22 Jun 2023 16:53:25 +0800 Message-Id: <20230622085335.77010-20-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230622085335.77010-1-zhengqi.arch@bytedance.com> References: <20230622085335.77010-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D1BDB180013 X-Stat-Signature: cytcm5s5f5trkcckso7nz4h8apwfbfkd X-Rspam-User: X-HE-Tag: 1687424196-949327 X-HE-Meta: U2FsdGVkX19mv7KxeYHy+ELC3A9giFvbaNOHRKOLIIe+f4wm1ha12ecae9VasXXOuv72AL6JFqJMxkRw34JFB9MetW5FylWoCHWlpSIHQcyoLsj0wFVu0KABo/JedjpJmWBtuOUdVdXZE8MbhZh6BwcD6F5GEN/Uog2pHZ9/GU7tai0FTXveKoJMQdyv4zeoMSWjPlPz46o4bR6WhJ8tYUUR7XjsZr59if5POhN5mW80Piwn2uPh6Dgfc3EdGCjacExIPYjPKhLlzsQgQFnnJUc86ZLN/C+M2P9RHwSbZgXhrF3+Y6XJ8Rq6tCR+4nrDDGPvUsNuIFuqQ/H4H5Tv7L+9UgWsLsZFXp9GuibSQmo4texHWc11G2t6eeF7pKGEDvDssWeDyDTebZVbxEUYWsFWGNv1EWWBH7Bdpa6OTuDSRaXcGYwWXEi4pUSPbgQuQMM3DvosS08005AWJ5+UnCeprlTtUmgKFBAgwSESQgTljeX6cumSPeUNTKTKhT2X1jeHyjX+CNx/IVUQSicOPLVEIsgLnxvatZpVseuuGOwhvhKO6dh27dJRv3bXxbwRucj0QCokytacHUC1OXIIe8+fXqrfgJRqSKwpMrvtbjJ68Q34ce0yd2aZSoGStgtk+IgNb2diaUhb9/2UTS/4U/WfoU63BWnmqWWhFVqYtF842WXL0Jn4hhbATY45/3OR3WU0YUijvRMNXcFqT9QnKUB8Ci4gVEMYbWabjqnCddps0ApRv6li1sQM1tJJKxoqi29tDIqmOFbHD8FgzsW6KmuNrM28q1nhNQfE77lFM2CRI8KB08dSHbtxhUOw6FbMB1P0ghZhi4v6l8iCclHjvA3+r1wpiREAmGg5H2zUzjmgFME5vF4t+sBZqItnBv1cMEFfUJgzyhHl0tEmVd894HRbOJVoGfBn1iCpnisy5B5Rcr0Fm69tcnRnGU2oTIWu4G0BhLHWZZfbx5ffan+ mUhoWRiM PGc4VKDhT2QuDNZb70uUovxa0ndfNokUtt8BaXagcLfpNQkKHYa7hV+Yhu6YztDDEp2zIrh48+4J84RvQSK8m8qCOYYcTX0zPgacYMyJ4Sz5C9GiPJd9GHCLifN9gZisKquSkoQTDFpHsOkQohBYVjepXV9ph6n9EYk9dWcRH5/lUPZNXtWnK1o83pRDeEJMRwGZQp/zYTkkohfdm8g5cCVTWc8JHjixPdQ4PJmxn/AefpOywp9ejul7MBo/tGhJAvOrFmgqqJ11+CqpBQobPf6zEELvApnpPszfWwLRHXztAGYZfCqPv2dg4FVLlQySyziD73iTIU/jq2PHr2fLBSKPYJQEkDLkIaKpKla6/Mm9Vc4NtCv6CEPz42Zr5CRGHBBn9b5ajFgGgPIPscaZxz6bmx3wQ49Q0ukvQ 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, we need to dynamically allocate the xfs-qm 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_quotainfo. Signed-off-by: Qi Zheng --- fs/xfs/xfs_qm.c | 24 +++++++++++++----------- fs/xfs/xfs_qm.h | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 6abcc34fafd8..b15320d469cc 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -504,8 +504,7 @@ xfs_qm_shrink_scan( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_quotainfo *qi = container_of(shrink, - struct xfs_quotainfo, qi_shrinker); + struct xfs_quotainfo *qi = shrink->private_data; struct xfs_qm_isolate isol; unsigned long freed; int error; @@ -539,8 +538,7 @@ xfs_qm_shrink_count( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_quotainfo *qi = container_of(shrink, - struct xfs_quotainfo, qi_shrinker); + struct xfs_quotainfo *qi = shrink->private_data; return list_lru_shrink_count(&qi->qi_lru, sc); } @@ -680,18 +678,22 @@ xfs_qm_init_quotainfo( if (XFS_IS_PQUOTA_ON(mp)) xfs_qm_set_defquota(mp, XFS_DQTYPE_PROJ, qinf); - qinf->qi_shrinker.count_objects = xfs_qm_shrink_count; - qinf->qi_shrinker.scan_objects = xfs_qm_shrink_scan; - qinf->qi_shrinker.seeks = DEFAULT_SEEKS; - qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE; + qinf->qi_shrinker = shrinker_alloc_and_init(xfs_qm_shrink_count, + xfs_qm_shrink_scan, + 0, DEFAULT_SEEKS, + SHRINKER_NUMA_AWARE, qinf); + if (!qinf->qi_shrinker) + goto out_free_inos; - error = register_shrinker(&qinf->qi_shrinker, "xfs-qm:%s", + error = register_shrinker(qinf->qi_shrinker, "xfs-qm:%s", mp->m_super->s_id); if (error) - goto out_free_inos; + goto out_shrinker; return 0; +out_shrinker: + shrinker_free(qinf->qi_shrinker); out_free_inos: mutex_destroy(&qinf->qi_quotaofflock); mutex_destroy(&qinf->qi_tree_lock); @@ -718,7 +720,7 @@ xfs_qm_destroy_quotainfo( qi = mp->m_quotainfo; ASSERT(qi != NULL); - unregister_shrinker(&qi->qi_shrinker); + unregister_and_free_shrinker(qi->qi_shrinker); list_lru_destroy(&qi->qi_lru); xfs_qm_destroy_quotainos(qi); mutex_destroy(&qi->qi_tree_lock); diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index 9683f0457d19..d5c9fc4ba591 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -63,7 +63,7 @@ struct xfs_quotainfo { struct xfs_def_quota qi_usr_default; struct xfs_def_quota qi_grp_default; struct xfs_def_quota qi_prj_default; - struct shrinker qi_shrinker; + struct shrinker *qi_shrinker; /* Minimum and maximum quota expiration timestamp values. */ time64_t qi_expiry_min;