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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89EA8E7C4F1 for ; Wed, 4 Oct 2023 20:17:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233538AbjJDURO (ORCPT ); Wed, 4 Oct 2023 16:17:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232977AbjJDURM (ORCPT ); Wed, 4 Oct 2023 16:17:12 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA37393 for ; Wed, 4 Oct 2023 13:17:08 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FF79C433CA; Wed, 4 Oct 2023 20:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1696450628; bh=K6BRWh1okNuuwxsy6OHU4BJips8Pnc7YpqWgnUfMjnM=; h=Date:To:From:Subject:From; b=nlShzU9bFMGvFiUzrvEYbO7kkf3l/lLe4w+oIslo1a1vk4HHFs50jIR8m3FeLBhY6 YOzjQbIqfckyGXNF4fhbYRxAB8NCxBiVV732Egvg92UNGbT58IEaB8d1uixZ8rFZe3 8YB9U3xEDJQmUtJaIBufLUEuAI3r0xEaZFNTEBdA= Date: Wed, 04 Oct 2023 13:17:06 -0700 To: mm-commits@vger.kernel.org, dan.carpenter@linaro.org, zhengqi.arch@bytedance.com, akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-shrinker-add-a-secondary-array-for-shrinker_info-map-nr_deferred-fix.patch removed from -mm tree Message-Id: <20231004201708.2FF79C433CA@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: fixup: mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} has been removed from the -mm tree. Its filename was mm-shrinker-add-a-secondary-array-for-shrinker_info-map-nr_deferred-fix.patch This patch was dropped because it was folded into mm-shrinker-add-a-secondary-array-for-shrinker_info-map-nr_deferred.patch ------------------------------------------------------ From: Qi Zheng Subject: fixup: mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} Date: Thu, 28 Sep 2023 22:15:17 +0800 Dan Carpenter reported the following bug: ``` The patch b6884b5f15cf: "mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred}" from Sep 11, 2023 (linux-next), leads to the following Smatch static checker warning: mm/shrinker.c:100 alloc_shrinker_info() warn: inconsistent returns '&shrinker_mutex'. ``` To fix it, unlock the &shrinker_rwsem before the call to free_shrinker_info(). Link: https://lkml.kernel.org/r/20230928141517.12164-1-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng Reported-by: Dan Carpenter Closes: https://lore.kernel.org/linux-mm/f960ae49-078c-4c00-9516-da31fc1a17d6@moroto.mountain/ Signed-off-by: Andrew Morton --- mm/shrinker.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/shrinker.c~mm-shrinker-add-a-secondary-array-for-shrinker_info-map-nr_deferred-fix +++ a/mm/shrinker.c @@ -95,6 +95,7 @@ int alloc_shrinker_info(struct mem_cgrou return ret; err: + up_write(&shrinker_rwsem); free_shrinker_info(memcg); return -ENOMEM; } _ Patches currently in -mm which might be from zhengqi.arch@bytedance.com are mm-move-some-shrinker-related-function-declarations-to-mm-internalh.patch mm-vmscan-move-shrinker-related-code-into-a-separate-file.patch mm-shrinker-remove-redundant-shrinker_rwsem-in-debugfs-operations.patch drm-ttm-introduce-pool_shrink_rwsem.patch mm-shrinker-add-infrastructure-for-dynamically-allocating-shrinker.patch kvm-mmu-dynamically-allocate-the-x86-mmu-shrinker.patch binder-dynamically-allocate-the-android-binder-shrinker.patch drm-ttm-dynamically-allocate-the-drm-ttm_pool-shrinker.patch xenbus-backend-dynamically-allocate-the-xen-backend-shrinker.patch erofs-dynamically-allocate-the-erofs-shrinker.patch f2fs-dynamically-allocate-the-f2fs-shrinker.patch gfs2-dynamically-allocate-the-gfs2-glock-shrinker.patch gfs2-dynamically-allocate-the-gfs2-qd-shrinker.patch nfsv42-dynamically-allocate-the-nfs-xattr-shrinkers.patch nfs-dynamically-allocate-the-nfs-acl-shrinker.patch nfsd-dynamically-allocate-the-nfsd-filecache-shrinker.patch quota-dynamically-allocate-the-dquota-cache-shrinker.patch ubifs-dynamically-allocate-the-ubifs-slab-shrinker.patch rcu-dynamically-allocate-the-rcu-lazy-shrinker.patch rcu-dynamically-allocate-the-rcu-kfree-shrinker.patch mm-thp-dynamically-allocate-the-thp-related-shrinkers.patch sunrpc-dynamically-allocate-the-sunrpc_cred-shrinker.patch mm-workingset-dynamically-allocate-the-mm-shadow-shrinker.patch drm-i915-dynamically-allocate-the-i915_gem_mm-shrinker.patch drm-msm-dynamically-allocate-the-drm-msm_gem-shrinker.patch drm-panfrost-dynamically-allocate-the-drm-panfrost-shrinker.patch dm-dynamically-allocate-the-dm-bufio-shrinker.patch dm-zoned-dynamically-allocate-the-dm-zoned-meta-shrinker.patch md-raid5-dynamically-allocate-the-md-raid5-shrinker.patch bcache-dynamically-allocate-the-md-bcache-shrinker.patch vmw_balloon-dynamically-allocate-the-vmw-balloon-shrinker.patch virtio_balloon-dynamically-allocate-the-virtio-balloon-shrinker.patch mbcache-dynamically-allocate-the-mbcache-shrinker.patch ext4-dynamically-allocate-the-ext4-es-shrinker.patch jbd2ext4-dynamically-allocate-the-jbd2-journal-shrinker.patch nfsd-dynamically-allocate-the-nfsd-client-shrinker.patch nfsd-dynamically-allocate-the-nfsd-reply-shrinker.patch xfs-dynamically-allocate-the-xfs-buf-shrinker.patch xfs-dynamically-allocate-the-xfs-inodegc-shrinker.patch xfs-dynamically-allocate-the-xfs-qm-shrinker.patch zsmalloc-dynamically-allocate-the-mm-zspool-shrinker.patch fs-super-dynamically-allocate-the-s_shrink.patch mm-shrinker-remove-old-apis.patch mm-shrinker-add-a-secondary-array-for-shrinker_info-map-nr_deferred.patch mm-shrinker-rename-preallocunregister_memcg_shrinker-to-shrinker_memcg_allocremove.patch mm-shrinker-make-global-slab-shrink-lockless.patch mm-shrinker-make-memcg-slab-shrink-lockless.patch mm-shrinker-hold-write-lock-to-reparent-shrinker-nr_deferred.patch mm-shrinker-convert-shrinker_rwsem-to-mutex.patch