Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp4254612rwo; Tue, 25 Jul 2023 03:17:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlGge33N1AHYgCXjBcwJt0oNbf988WI9xujt9K9wEFruyrVDt4CWKDTVdSSNcW+glsZ9QwR4 X-Received: by 2002:a17:902:db06:b0:1bb:5d9a:9054 with SMTP id m6-20020a170902db0600b001bb5d9a9054mr15455517plx.12.1690280229885; Tue, 25 Jul 2023 03:17:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690280229; cv=none; d=google.com; s=arc-20160816; b=TrjyGqnA2LOQscinUbXgHPIJ1ebus9FeWQh8xNZVUqv6deG6zx0HBOW/H7HJaHgqzE iwYQqDbTCwJkDvynWQPQV8Y3CNIM9yh1RwpaEr+fdc92tyjMQLictSTWSn1kyRaESnfM TM5MkjHx3csLvJjEkrqVyG8nFXZDO3+L0BJ3zFAdsvEKtmFaCFAdMngNpYJzTClZeMdc 1o51ZoHsgM+eTUUpy9VhSK3Pq9Pt5y+6LdtW+1MxkLAq72vzWIyhtGqU2PhhT6NYC7Ru 2CJ9th6dCR2tQIKbV6w3Acsorruz/9u1OCMb+Z/BCVxPK42NExbds7bAo9omxPZsEpqj c6lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=/casiWQBa8FLPDyI/Gjog1Q/iFy65e/7JWaM5Gwrppw=; fh=1tw537HxJj8QfRGQ31nxiSonTz8q3rJnaObM9GVPiPs=; b=n8DGrPfCxyI8N/WvbEgp5FnGwBC8we82WfKKUkpb1YcSctyUwEWdSlB5D8d6ZHaA/7 M6GOuOsjv0cUg/jOCvNyqZqoQ386vTjPUSFhENQzaYGKtbqwVPCEKlIYf/IjZnoD63wT 2hKTr3waK5xR78IpOcwEgA5USnZFySeD9phqId9ibURuNNb9ifF870DBNVDC+w5rfD+O Z4lvDu53qKmke+A2t9o/HyZn1qC2s4/DD3zOHaRNnDjETYZz71vJ5FrgT87PwhTPzoUR 1rIm661x4oBXUdgWA826TYbO2JDBxkJ3Qi5rXovxCBfG0ob6c4yqLx6UDlwBHOQiY+iJ A97A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=kzP9jxhd; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b6-20020a170903228600b001b556b0d0b7si11706938plh.480.2023.07.25.03.16.51; Tue, 25 Jul 2023 03:17:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=kzP9jxhd; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231286AbjGYJ5O (ORCPT + 99 others); Tue, 25 Jul 2023 05:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233467AbjGYJ5K (ORCPT ); Tue, 25 Jul 2023 05:57:10 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA55FE76 for ; Tue, 25 Jul 2023 02:56:43 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2659b1113c2so706744a91.1 for ; Tue, 25 Jul 2023 02:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690279003; x=1690883803; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/casiWQBa8FLPDyI/Gjog1Q/iFy65e/7JWaM5Gwrppw=; b=kzP9jxhdW7EUIP2JpY6nQ4V3KB8KzHZHwXd+bJOEeLU9gCN3lvtKTIOyV+D6pg6POw Q2+Agk0fHs6Wf0nJIf8rf8T9VZNFr/hsapg2zga11FSk7AOs0JkWfaLjemq0FDeG0Uw5 HhEk2mitTuKDolaaQqjf+O9IL+c+U5F1pPsQI+4eucs75jhsRhGM9fqq3uQDPTEvroq0 /U4/CVAvtL3Xk0W286vaVtW9MXQ1p85A5kNQw+kxMFfLtXWo8Tn1go6QyxS1jqmnrw9a uFzHc2WhcIqVkW0xdKzdkJ+42hQ6tNSe2IXCsgIEyfURXIjl60ODrk022w8+JVfo8hQI ne/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690279003; x=1690883803; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/casiWQBa8FLPDyI/Gjog1Q/iFy65e/7JWaM5Gwrppw=; b=DChGlN1Yzd+CxaWWLprWE083Knld1HUjNwY0x5tuEs/Z8oYbMR4DXo3tZJQNG7meUx 0S9h/Z6pMkYH5yAVc4qLTeMBHNi5Uv8mbSxZILTykOxZRdzEfy6+WCqiwjdpBngBL94V TyOLO4C4j7X2diGdKTVj3ffwpgD+5zrfNPijCt6EylGvsd9RTrtNPGY+RT0+5Pf57RNL jyt5MG2EZLbF0K0L8kfcUIJ0wpNGysDDwlKabAA8ueu6y8gnwLu6mBKN8uFGIirSkSbq AXINBg9KVcDQ1kt9YnPZXgY5ynJZQ2GEzKlIdz1RnFlSvBbATKp+24GH/cHGMpGtikFL 9yiA== X-Gm-Message-State: ABy/qLZNlGwRzlCBnokO7cv7j+BCxlRiiQD4hTINkLiWLiogVFNGLBN1 dspdQ1EXi1f5kTbkEioijq7wWg== X-Received: by 2002:a17:90a:74cf:b0:268:196f:9656 with SMTP id p15-20020a17090a74cf00b00268196f9656mr4627258pjl.1.1690279003192; Tue, 25 Jul 2023 02:56:43 -0700 (PDT) Received: from [10.70.252.135] ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020a170902da8800b001b39ffff838sm10605398plx.25.2023.07.25.02.56.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Jul 2023 02:56:42 -0700 (PDT) Message-ID: Date: Tue, 25 Jul 2023 17:56:29 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 03/47] mm: shrinker: add infrastructure for dynamically allocating shrinker Content-Language: en-US To: Muchun Song 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, 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 References: <20230724094354.90817-1-zhengqi.arch@bytedance.com> <20230724094354.90817-4-zhengqi.arch@bytedance.com> <3648ca69-d65e-8431-135a-a5738586bc25@linux.dev> From: Qi Zheng In-Reply-To: <3648ca69-d65e-8431-135a-a5738586bc25@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Hi Muchun, On 2023/7/25 17:02, Muchun Song wrote: > > > On 2023/7/24 17:43, Qi Zheng wrote: >> Currently, the shrinker instances can be divided into the following three >> types: >> >> a) global shrinker instance statically defined in the kernel, such as >>     workingset_shadow_shrinker. >> >> b) global shrinker instance statically defined in the kernel modules, >> such >>     as mmu_shrinker in x86. >> >> c) shrinker instance embedded in other structures. >> >> For case a, the memory of shrinker instance is never freed. For case b, >> the memory of shrinker instance will be freed after synchronize_rcu() >> when >> the module is unloaded. For case c, the memory of shrinker instance will >> be freed along with the structure it is embedded in. >> >> In preparation for implementing lockless slab shrink, we need to >> dynamically allocate those shrinker instances in case c, then the memory >> can be dynamically freed alone by calling kfree_rcu(). >> >> So this commit adds the following new APIs for dynamically allocating >> shrinker, and add a private_data field to struct shrinker to record and >> get the original embedded structure. >> >> 1. shrinker_alloc() >> >> Used to allocate shrinker instance itself and related memory, it will >> return a pointer to the shrinker instance on success and NULL on failure. >> >> 2. shrinker_free_non_registered() >> >> Used to destroy the non-registered shrinker instance. > > At least I don't like this name. I know you want to tell others > this function only should be called when shrinker has not been > registed but allocated. Maybe shrinker_free() is more simple. > And and a comment to tell the users when to use it. OK, if no one else objects, I will change it to shrinker_free() in the next version. > >> >> 3. shrinker_register() >> >> Used to register the shrinker instance, which is same as the current >> register_shrinker_prepared(). >> >> 4. shrinker_unregister() >> >> Used to unregister and free the shrinker instance. >> >> In order to simplify shrinker-related APIs and make shrinker more >> independent of other kernel mechanisms, subsequent submissions will use >> the above API to convert all shrinkers (including case a and b) to >> dynamically allocated, and then remove all existing APIs. >> >> This will also have another advantage mentioned by Dave Chinner: >> >> ``` >> The other advantage of this is that it will break all the existing >> out of tree code and third party modules using the old API and will >> no longer work with a kernel using lockless slab shrinkers. They >> need to break (both at the source and binary levels) to stop bad >> things from happening due to using uncoverted shrinkers in the new >> setup. >> ``` >> >> Signed-off-by: Qi Zheng >> --- >>   include/linux/shrinker.h |   6 +++ >>   mm/shrinker.c            | 113 +++++++++++++++++++++++++++++++++++++++ >>   2 files changed, 119 insertions(+) >> >> diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h >> index 961cb84e51f5..296f5e163861 100644 >> --- a/include/linux/shrinker.h >> +++ b/include/linux/shrinker.h >> @@ -70,6 +70,8 @@ struct shrinker { >>       int seeks;    /* seeks to recreate an obj */ >>       unsigned flags; >> +    void *private_data; >> + >>       /* These are for internal use */ >>       struct list_head list; >>   #ifdef CONFIG_MEMCG >> @@ -98,6 +100,10 @@ struct shrinker { >>   unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup >> *memcg, >>                 int priority); >> +struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, >> ...); >> +void shrinker_free_non_registered(struct shrinker *shrinker); >> +void shrinker_register(struct shrinker *shrinker); >> +void shrinker_unregister(struct shrinker *shrinker); >>   extern int __printf(2, 3) prealloc_shrinker(struct shrinker *shrinker, >>                           const char *fmt, ...); >> diff --git a/mm/shrinker.c b/mm/shrinker.c >> index 0a32ef42f2a7..d820e4cc5806 100644 >> --- a/mm/shrinker.c >> +++ b/mm/shrinker.c >> @@ -548,6 +548,119 @@ unsigned long shrink_slab(gfp_t gfp_mask, int >> nid, struct mem_cgroup *memcg, >>       return freed; >>   } >> +struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, >> ...) >> +{ >> +    struct shrinker *shrinker; >> +    unsigned int size; >> +    va_list __maybe_unused ap; >> +    int err; >> + >> +    shrinker = kzalloc(sizeof(struct shrinker), GFP_KERNEL); >> +    if (!shrinker) >> +        return NULL; >> + >> +#ifdef CONFIG_SHRINKER_DEBUG >> +    va_start(ap, fmt); >> +    shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); >> +    va_end(ap); >> +    if (!shrinker->name) >> +        goto err_name; >> +#endif > > So why not introduce another helper to handle this and declare it > as a void function when !CONFIG_SHRINKER_DEBUG? Something like the > following: > > #ifdef CONFIG_SHRINKER_DEBUG > static int shrinker_debugfs_name_alloc(struct shrinker *shrinker, const > char *fmt, >                                        va_list vargs) > > { >     shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, vargs); >     return shrinker->name ? 0 : -ENOMEM; > } > #else > static int shrinker_debugfs_name_alloc(struct shrinker *shrinker, const > char *fmt, >                                        va_list vargs) > { >     return 0; > } > #endif Will do in the next version. > >> +    shrinker->flags = flags; >> + >> +    if (flags & SHRINKER_MEMCG_AWARE) { >> +        err = prealloc_memcg_shrinker(shrinker); >> +        if (err == -ENOSYS) >> +            shrinker->flags &= ~SHRINKER_MEMCG_AWARE; >> +        else if (err == 0) >> +            goto done; >> +        else >> +            goto err_flags; >> +    } >> + >> +    /* >> +     * The nr_deferred is available on per memcg level for memcg aware >> +     * shrinkers, so only allocate nr_deferred in the following cases: >> +     *  - non memcg aware shrinkers >> +     *  - !CONFIG_MEMCG >> +     *  - memcg is disabled by kernel command line >> +     */ >> +    size = sizeof(*shrinker->nr_deferred); >> +    if (flags & SHRINKER_NUMA_AWARE) >> +        size *= nr_node_ids; >> + >> +    shrinker->nr_deferred = kzalloc(size, GFP_KERNEL); >> +    if (!shrinker->nr_deferred) >> +        goto err_flags; >> + >> +done: >> +    return shrinker; >> + >> +err_flags: >> +#ifdef CONFIG_SHRINKER_DEBUG >> +    kfree_const(shrinker->name); >> +    shrinker->name = NULL; > > This could be shrinker_debugfs_name_free() Will do. > >> +err_name: >> +#endif >> +    kfree(shrinker); >> +    return NULL; >> +} >> +EXPORT_SYMBOL(shrinker_alloc); >> + >> +void shrinker_free_non_registered(struct shrinker *shrinker) >> +{ >> +#ifdef CONFIG_SHRINKER_DEBUG >> +    kfree_const(shrinker->name); >> +    shrinker->name = NULL; > > This could be shrinker_debugfs_name_free() > >> +#endif >> +    if (shrinker->flags & SHRINKER_MEMCG_AWARE) { >> +        down_write(&shrinker_rwsem); >> +        unregister_memcg_shrinker(shrinker); >> +        up_write(&shrinker_rwsem); >> +    } >> + >> +    kfree(shrinker->nr_deferred); >> +    shrinker->nr_deferred = NULL; >> + >> +    kfree(shrinker); >> +} >> +EXPORT_SYMBOL(shrinker_free_non_registered); >> + >> +void shrinker_register(struct shrinker *shrinker) >> +{ >> +    down_write(&shrinker_rwsem); >> +    list_add_tail(&shrinker->list, &shrinker_list); >> +    shrinker->flags |= SHRINKER_REGISTERED; >> +    shrinker_debugfs_add(shrinker); >> +    up_write(&shrinker_rwsem); >> +} >> +EXPORT_SYMBOL(shrinker_register); >> + >> +void shrinker_unregister(struct shrinker *shrinker) > > You have made all shrinkers to be dynamically allocated, so > we should prevent users from allocating shrinkers statically and > use this function to unregister it. It is better to add a > flag like SHRINKER_ALLOCATED which is set in shrinker_alloc(), > and check whether it is set in shrinker_unregister(), if not > maybe a warning should be added to tell the users what happened. Make sense, will do. > >> +{ >> +    struct dentry *debugfs_entry; >> +    int debugfs_id; >> + >> +    if (!shrinker || !(shrinker->flags & SHRINKER_REGISTERED)) >> +        return; >> + >> +    down_write(&shrinker_rwsem); >> +    list_del(&shrinker->list); >> +    shrinker->flags &= ~SHRINKER_REGISTERED; >> +    if (shrinker->flags & SHRINKER_MEMCG_AWARE) >> +        unregister_memcg_shrinker(shrinker); >> +    debugfs_entry = shrinker_debugfs_detach(shrinker, &debugfs_id); > > In the internal of this function, you also could use > shrinker_debugfs_name_free(). Yeah, will do. Thanks, Qi > > Thanks. > >> +    up_write(&shrinker_rwsem); >> + >> +    shrinker_debugfs_remove(debugfs_entry, debugfs_id); >> + >> +    kfree(shrinker->nr_deferred); >> +    shrinker->nr_deferred = NULL; >> + >> +    kfree(shrinker); >> +} >> +EXPORT_SYMBOL(shrinker_unregister); >> + >>   /* >>    * Add a shrinker callback to be called from the vm. >>    */ >