From patchwork Mon Sep 11 09:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13379112 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 F2B8DEEB57E for ; Mon, 11 Sep 2023 09:50:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93E336B025A; Mon, 11 Sep 2023 05:50:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8EB4B6B025B; Mon, 11 Sep 2023 05:50:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78D3F6B025C; Mon, 11 Sep 2023 05:50:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 65FA06B025A for ; Mon, 11 Sep 2023 05:50:42 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 36358140928 for ; Mon, 11 Sep 2023 09:50:42 +0000 (UTC) X-FDA: 81223847124.30.544A225 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf26.hostedemail.com (Postfix) with ESMTP id 5C886140010 for ; Mon, 11 Sep 2023 09:50:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WRnEHwKt; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694425840; 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=aAoYQHmeR0aUipRnti9MSoo1QhYW8B305NLCegCj2mc=; b=BM2JSrNVOfScFONXvnubi9kFQXlDKDP/g46DTdk3pItRMmbvEZxIhoOeVubdjD8zL4Obo+ Qc817hILHPcrla0G6nWbgZTogTH388LElYW1P1wfkCExLdJ1bE72bKjhSc9945viIvpbEU M8O5tRdHrtXhrNIuHm7mCbD97PDUTK8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WRnEHwKt; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694425840; a=rsa-sha256; cv=none; b=8IEJGgBcZsbPVWr88CjW7T3b5oeBJz5xW16qwjnihajSHCQeZ1izgDHZ9tlVCurgHo6ot4 uAt4/IYBVOXY3O2Dt9fwbi9tJ33HQ2zOFhhOj3AAb8sQUsQQT6LOfmoYWM3y4BlpWHNbi7 l2dKJc4t3s4Fpcbaczw+MXZwcXfEnnQ= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1befe39630bso9370125ad.0 for ; Mon, 11 Sep 2023 02:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425839; x=1695030639; darn=kvack.org; 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=aAoYQHmeR0aUipRnti9MSoo1QhYW8B305NLCegCj2mc=; b=WRnEHwKtF7OwtNaza9ddcEjzt14pdS6G6rPt+iXXwBoJNeDzVEfZelvad5fDBoTjWK mgXP6CYnUFtetJAHXw6JugCwslDRABb+P+zKoomqvwlcAkv0pWLN/4I5F150dfTb0iAh HN47kErnxXSdBZrB++bGiwrDQtLsoFof8t0gjfHRyJGZQj3oSu/1C8pCXgJzlsP2682u tvFF7VKulJ/W3DUo8cCVRQQfUQjq3YkuxtVy4GfEETEKNtgO7jwJ2ONxIoKnGWtVaoGX ihV5lg5a2vZKBGL+fRKVqkXFHfJbb9F+ZTgenANeWiVuvl5tLtdMHMcOxDG6xEjB2Wjx OWkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425839; x=1695030639; 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=aAoYQHmeR0aUipRnti9MSoo1QhYW8B305NLCegCj2mc=; b=GrsolJx3RmCXl6EXt52s2Rri+UqqiLecFYe3/SsZ3UHrpDhNkulptl+1+un2lFL8kL So+I4DnQUFgGqCA9yxnlj99FPMx79UMb2IiOKVRP/MYU5Gthhqyy9SOi9UCZUbWzsGMj hjEtjqcsvVNyHfnTdvK3+w9pOGzI/usvv1C/hKDq9AYy9/f7z3Cm98pdvuayme0z+bAW xQc3vajPJZYeV3+nRau9eJKXj9+ROlMWTjFvwTLsLP8h9k28dnN0Rpi1iS2Lt+5PvvAl omQtBlZrHA84CyTf8Hctc1AsbrK34NQ93kX8lsaZjzeR/rn1FxOsKWY0FHzIHuqHzbwp w/4A== X-Gm-Message-State: AOJu0Yz8wsdCKjtrXqidzY9Tv7sIwM3aTIsJAjbhhDzspmLg1UgjAKPC ArLBFlhGPmc+qkJMSMM5rm2kCGBd7wH/lNAIwec= X-Google-Smtp-Source: AGHT+IFT+86I6bu5GOdEzWlfUK8qBkCzz3enuPKZPjEpOf5YfG0XONb6VNSqG6hacK72QD8znouzTg== X-Received: by 2002:a17:903:2843:b0:1c3:a4f2:7cc1 with SMTP id kq3-20020a170903284300b001c3a4f27cc1mr5320660plb.5.1694425839278; Mon, 11 Sep 2023 02:50:39 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id az7-20020a170902a58700b001bdc2fdcf7esm5988188plb.129.2023.09.11.02.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:50:38 -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, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song , Chandan Babu R , linux-xfs@vger.kernel.org Subject: [PATCH v6 36/45] xfs: dynamically allocate the xfs-qm shrinker Date: Mon, 11 Sep 2023 17:44:35 +0800 Message-Id: <20230911094444.68966-37-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230911094444.68966-1-zhengqi.arch@bytedance.com> References: <20230911094444.68966-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5C886140010 X-Stat-Signature: rjdzmsoueypcbr4r9rfy11ru1xh634gi X-HE-Tag: 1694425840-351588 X-HE-Meta: U2FsdGVkX182bbqOicZGoKHQFzQ5zho4hjqpHGofyPaI3Ju872GcoWuOBKqv/Flgg0BGFlHcC0YFvrI9a6ghGn+hK0emEmc/39xesMdpRDisijAyE4+ERP9h+eMHIcOgeLwMdQRf9EAGy5ZE7CjT5SGFBi6QK+kDcXbLKEKyp0I5uPrOiNCcOYRg/jwMM0diMwJFHwRAmsICjwm30gr0/pf6BZR0VWYEz5FgJlpJR1lTCYoPb1KK4SNoxlbi/HnIuhxBUfdxbxH3i6ca4ADiTJZHJOU5S59dRjL130DIeObDY8RFrkp/DykkvSZpgdJ8lT337E4FHAy3jWctPdgq1bkl5qWb/zQ7gNzE8mtTDE5x1hqr840uOhcZh8X/SfXYj1xiRSMRls8paqZ4XMKjSbfcHfJI2AXcUDPcpglpINN/ppGFqaiH/C8cft5ju+CotQjbSNyKMAKJLNxrQ9ZX+y2KyuXzDNt4dVjx3/SgXz+myY4/7D87JmjaBJwsLzhPnDFwuQ2uG+Zr3rFH1DyiBObPDpQICta7YRQFyUA8/KCh/PCOrCoRzUB+ESCrPpj6zGJBq+YTNsnbnOMA7rFCWPw3fXj9nDiwC0ypl2CLAgqBHho5mOpfhAHHXXgxM0XpBzfyj+bAsNngj9HW7rKK7frTJaNi8FcCu/8qdOe90QrnbPlQiRvzdzUCtNWv3IVLb/Lg5XaW9UQb7ReUbNLV3amTFxliN3u/zzNHgD0ZP8ANtORV6a+rQHi7HOBbrd+Xq4iP9qLh9L7JYi/ok2NdjGa90A5XBK05gRl/Rf5fGmOVHJanIKNGa0+Rulj/mbJQT/DNkQxK0Ax87tad9bRdHKvDQ7mMpzteDpK7oAHV0pa24UfOnO7m4bcPIV9ubRrfWBDZO75Wy1frrmAYvw0UJk01ac3dv/f8K4X3hV+rLLcMQYgDPZg2Hdlgdw4dBwwqrP+4UnbsiWFFmrRUCgA 3LC3EM2f 8jys7gvRpsp6pnDljWVuGc/Ne1paIYVroJGwj0yrpEYjH9ygHmR/psxhvzVKDRhUDBKPIsX9tQFa8bZIX+OM+c6lFEsmxPxY+QB4cK6y4GXquapAeqvfJzRGSf3GoiQTo1y85bM1DA2VKoSbso4pkipB9rNfTPdg0UtHFWDxaMM8PQ3ZsgyenLgsECPYLbWL8Ti2vvF/Ad2HTLOWESY04tpA5zAI54VZOhARqfq9IT9tNRp9JGkgXL8aApicP3Af065bYha075WuFVV+hVVeYGv/Z91fUxyxHz/HC/ftno3gB1/dv3XwqANc/U6VHOurBgXb+VCRUtHgSDQYtJiUZTmc0TNJYEv75eUsz2bgAxyfADhMQPkwLclkOFrSe4purKdBligRlgQGoVeYmx/5/dUlLUcCZBWgu6Wj2S926YSatGVRAws+1o7zlhO3C3nFfarb2RBrByS7bTSWh1vf4MZBOHjyibd63XPY54m2kLcN/EgBlMpGU471Djw== 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-qm shrinker, so that it can be freed asynchronously via 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 Reviewed-by: Muchun Song CC: Chandan Babu R CC: "Darrick J. Wong" CC: linux-xfs@vger.kernel.org --- fs/xfs/xfs_qm.c | 27 ++++++++++++++------------- fs/xfs/xfs_qm.h | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 6abcc34fafd8..f45de01013ba 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,15 +678,18 @@ 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; - - error = register_shrinker(&qinf->qi_shrinker, "xfs-qm:%s", - mp->m_super->s_id); - if (error) + qinf->qi_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "xfs-qm:%s", + mp->m_super->s_id); + if (!qinf->qi_shrinker) { + error = -ENOMEM; goto out_free_inos; + } + + qinf->qi_shrinker->count_objects = xfs_qm_shrink_count; + qinf->qi_shrinker->scan_objects = xfs_qm_shrink_scan; + qinf->qi_shrinker->private_data = qinf; + + shrinker_register(qinf->qi_shrinker); return 0; @@ -718,7 +719,7 @@ xfs_qm_destroy_quotainfo( qi = mp->m_quotainfo; ASSERT(qi != NULL); - unregister_shrinker(&qi->qi_shrinker); + shrinker_free(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;