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 7FC0AC7619A for ; Wed, 12 Apr 2023 08:13:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C74128000A; Wed, 12 Apr 2023 04:13:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 17751280003; Wed, 12 Apr 2023 04:13:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 017E528000A; Wed, 12 Apr 2023 04:13:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E6497280003 for ; Wed, 12 Apr 2023 04:13:48 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CA43F140DB8 for ; Wed, 12 Apr 2023 08:13:48 +0000 (UTC) X-FDA: 80672025336.01.C550160 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 0F06F1C0017 for ; Wed, 12 Apr 2023 08:13:46 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=emBCKp+K; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681287227; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=+l5PYlsdIGzvjidEjS3S3VoLUtcIHDnvdOSU7Gi8d+A=; b=DLgk+owU94ghshG7GEVz2S96nXsQ1iF1auBZojrARxwSRtg/tfZVKkMYFcn02A+fPR2iHM FTqKQfE5zfRpt9F5NkIv+em04GX+4VxXoZZdY3xPpxmRQTYgtpNtrREC4R4EYQTaMoi8AV ZlxNSY4FHVPHytS8h03o//7WcMfKihc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=emBCKp+K; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681287227; a=rsa-sha256; cv=none; b=SPtnoHiNSYX4F34i1QPYaTFLxh62S4T8NuW9r2HznRP3NlS+SbvKJsUJ/RC7tvFgGIBmvd 35KyuYGs5GBsDm62XZR+qXcFZ2mNlz8W7Qs6dZP8wavW5YULnKtS7i/HzW2P/mz7iCCEHy s8E3ixTDu8aTEZHq8BHrLhvv0LgPmGg= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4683762F53; Wed, 12 Apr 2023 08:13:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EB29C433EF; Wed, 12 Apr 2023 08:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287225; bh=TQznziSl8XlnSfOM0G8ITdoFNYcPjbtHSq7fjSG7J6s=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=emBCKp+K4eAAYEO9a2+z0UpZQD0Fsmkm2SuaLXxeF1jEcPFz+rjg3n7KnGXFS3cIf 2hyiZi3oN3UpVW5Pm3diUpulE83hh9rcl0UyoC6EEUkzDkOCZpwHxhkcyDJPOpTfMq X2r8yeFwD/9OCCW8h7RbmqXNpRceNWhbtMPf6Pis= Subject: Patch "maple_tree: refine ma_state init from mas_start()" has been added to the 6.1-stable tree To: Liam.Howlett@Oracle.com,Liam.Howlett@oracle.com,gregkh@linuxfoundation.org,linux-mm@kvack.org,maple-tree@lists.infradead.org,vernon2gm@gmail.com Cc: From: Date: Wed, 12 Apr 2023 10:13:28 +0200 In-Reply-To: <20230411151055.2910579-9-Liam.Howlett@oracle.com> Message-ID: <2023041227-jogging-unlucky-150c@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0F06F1C0017 X-Stat-Signature: 91fgpmpf4mjgbq8i55pqg1ycte4wz4og X-Rspam-User: X-HE-Tag: 1681287226-842087 X-HE-Meta: U2FsdGVkX1+UghKyxdyqeuMNbaw6pUISochcHqvtyJ0bQ6R/572X1PJNc34kDGlPowl0LrZYEzufQLPXzIVOoeeDRGu6Y6VaUP69A5yelTz05mT/DCNrKu5PdXqnGESQYWNPCpv9p+QmihDrs1nExhfkW+ZkgHt5b1aTFiwYuOkxOom+FYdoDcSFalrs9gW9Luyv6AgOaRpu3TZTt0tit6d5tvxEDtNvr/WgPJZmoS7+IrgwtfXIFcyXjcURwpziHHwIEjO+4rLgzRpvHglx9NCFXE3S3CVCyo+Tmr/z+KQidI0WuG8qpFcSMCmcjv8qPaQ4ULkxCVy4isdwYl4QijGgElRrxGK4BOyEEi3GlTS1H9qD+6LCylviaMFX3p2MtNVotN3kWdtcweBy9X772vN23V/WUkNzXhywLjfKfM3qN0vZrv2BKL1Tsts+gF11LYJs87eZW3SA/1ORI2OQoCqCh0dlBXolKGfdu65vRReMrKs/4Zw+0XK6lQz2EBDaqxEbPSqg1wiXeNbSWGsbtLHPPUgJzHLN4LONnuxMvzM18uW1/WrB54pd5GrJmubNv87y/qKig1zcinRek658el0b4c89zgg3xWw19ic4dMYyLkh0TeneB4AHzry8vzRhDteE+h8XFSsXk1TCX6U0rwfOozeA1tgBODVVB3CIUGiDs0gbDuz/qiK0m1REasfTvJxa24tNUdifhnhyqFzFmFHMkN6CakXx4QSCZj+Q1elcLQFiJiEG0xDIvdHNh+mQ97uWm/iY2YjKyuRr6f3yVY3v01vq2CyKp/Iy9/zyIh4bUoR7q/GZRigYUaj6Vq9loxhpQ4eyUVqAbQ3NRx5TylZjFUb7DwxVm0InHxabPn0EUgJ5+g78EONbs7tGyYC8JWYmjTH0biUTqyd+OGf2sdcSP8sIJrQF0csR5NdVZqcA9LiUnYuD2Rdp3ik+bQw3sVmQHxulV4JlCjGb2MS ka66isgE i2Qake2FKty8zNjm9kVuB9Mua93qSuXXUyv04zKMV6tP3MvrliTdKeQbm0Jz9jDA1/DI522ihFNzdxcvQHiZg+P3kWyADBX5YZoTwgKIUQSLwyV8AXfI7OVTdRqIkp036jyJqTt8fuGtn6+79eOeoqaeSlB3zCPBMpi4D8DqAYbipiGHQ6sqEZiQitzfPYGoCPVsa75/bhto4PrlHK2V+Ag3+degWqrdN4dqvYGcYqWRC3kNWhShcVZZ7YgmdY5Fimm5VxO2mINGG/xV65ECpXS0R0SwvnUKeK6kAiTd26/s+18sllXhpreVY8JkPyw7vfO7BXpsjQ6OmAjilhb69/8qjcf4MUkI+I4I0s23MAsh6ES1v1rChF4nKIfDmkDi+qCDMsWxcw9xUgmEKOpFSMVGMM/5OGatELAXqZgpLUZFOSTjpPHmeJtft91L1gOYJk7A956gk0qn6sQfLQ+GxFM1iTyQEV1QBDh0g6gJtYMDH6dH4RojAzSnmIXqWjqRPyTswRBC8ejsCll+pec53HpQj5KuRS4eBj42rlYmvE4+EMYOydBZjlYhz0KKkNYfVRZjy/xWjby4IRIy2M4+yLFRdnihsTYx/svVCZNJdrnX0/Cb9ioOIqVi6yjpdWp8tbgO2Lj9vCjj1uqz7/ZQA3R5Wzw== 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: This is a note to let you know that I've just added the patch titled maple_tree: refine ma_state init from mas_start() to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: maple_tree-refine-ma_state-init-from-mas_start.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable-owner@vger.kernel.org Tue Apr 11 17:13:00 2023 From: "Liam R. Howlett" Date: Tue, 11 Apr 2023 11:10:49 -0400 Subject: maple_tree: refine ma_state init from mas_start() To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Liam R. Howlett" , Stable@vger.kernel.org, Vernon Yang , "Liam R . Howlett" Message-ID: <20230411151055.2910579-9-Liam.Howlett@oracle.com> From: "Liam R. Howlett" commit 46b345848261009477552d654cb2f65000c30e4d upstream. If mas->node is an MAS_START, there are three cases, and they all assign different values to mas->node and mas->offset. So there is no need to set them to a default value before updating. Update them directly to make them easier to understand and for better readability. Link: https://lkml.kernel.org/r/20221221060058.609003-7-vernon2gm@gmail.com Cc: Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Vernon Yang Signed-off-by: Liam R. Howlett Signed-off-by: Greg Kroah-Hartman --- lib/maple_tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1334,7 +1334,7 @@ static void mas_node_count(struct ma_sta * mas_start() - Sets up maple state for operations. * @mas: The maple state. * - * If mas->node == MAS_START, then set the min, max, depth, and offset to + * If mas->node == MAS_START, then set the min, max and depth to * defaults. * * Return: @@ -1348,22 +1348,22 @@ static inline struct maple_enode *mas_st if (likely(mas_is_start(mas))) { struct maple_enode *root; - mas->node = MAS_NONE; mas->min = 0; mas->max = ULONG_MAX; mas->depth = 0; - mas->offset = 0; root = mas_root(mas); /* Tree with nodes */ if (likely(xa_is_node(root))) { mas->depth = 1; mas->node = mte_safe_root(root); + mas->offset = 0; return NULL; } /* empty tree */ if (unlikely(!root)) { + mas->node = MAS_NONE; mas->offset = MAPLE_NODE_SLOTS; return NULL; } Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are queue-6.1/maple_tree-fix-potential-rcu-issue.patch queue-6.1/maple_tree-add-smp_rmb-to-dead-node-detection.patch queue-6.1/maple_tree-add-rcu-lock-checking-to-rcu-callback-functions.patch queue-6.1/maple_tree-fix-handle-of-invalidated-state-in-mas_wr_store_setup.patch queue-6.1/maple_tree-reduce-user-error-potential.patch queue-6.1/maple_tree-fix-mas_prev-and-mas_find-state-handling.patch queue-6.1/maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch queue-6.1/maple_tree-be-more-cautious-about-dead-nodes.patch queue-6.1/mm-enable-maple-tree-rcu-mode-by-default.patch queue-6.1/maple_tree-detect-dead-nodes-in-mas_start.patch queue-6.1/maple_tree-fix-freeing-of-nodes-in-rcu-mode.patch queue-6.1/maple_tree-remove-extra-smp_wmb-from-mas_dead_leaves.patch queue-6.1/maple_tree-refine-ma_state-init-from-mas_start.patch