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 AAA13C10F1B for ; Wed, 21 Dec 2022 22:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234972AbiLUWcl (ORCPT ); Wed, 21 Dec 2022 17:32:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234978AbiLUWck (ORCPT ); Wed, 21 Dec 2022 17:32:40 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2448DAC; Wed, 21 Dec 2022 14:32:35 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id 22911CE18E0; Wed, 21 Dec 2022 22:32:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0B9CC433EF; Wed, 21 Dec 2022 22:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1671661953; bh=EPXdbjYGCyigKH+6ptBsZrzj6M2dJrE+nCJDYIV2wKM=; h=Date:To:From:Subject:From; b=0aHQWHYItc0hubKotxoMeSW5AGqKWdISbx0H1Ls9YGCCte6QSFoff4I1lSU+Qe5XD +NIespNApDiP9OaOt5jDeNC1jpYlWBOHdZqWpSqX5C3bMHkoPqNuQ0sXCt5PXP2Zma yNXEKZduG9KT5bt9IjjefmChqHMRYOlu7Lomb/n4= Date: Wed, 21 Dec 2022 14:32:32 -0800 To: mm-commits@vger.kernel.org, usama.anjum@collabora.com, stable@vger.kernel.org, rppt@kernel.org, Liam.Howlett@oracle.com, avagin@gmail.com, liam.howlett@oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] maple_tree-fix-mas_spanning_rebalance-on-insufficient-data.patch removed from -mm tree Message-Id: <20221221223233.A0B9CC433EF@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: maple_tree: fix mas_spanning_rebalance() on insufficient data has been removed from the -mm tree. Its filename was maple_tree-fix-mas_spanning_rebalance-on-insufficient-data.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Liam Howlett Subject: maple_tree: fix mas_spanning_rebalance() on insufficient data Date: Mon, 19 Dec 2022 16:20:15 +0000 Mike Rapoport contacted me off-list with a regression in running criu. Periodic tests fail with an RCU stall during execution. Although rare, it is possible to hit this with other uses so this patch should be backported to fix the regression. This patchset adds the fix and a test case to the maple tree test suite. This patch (of 2): An insufficient node was causing an out-of-bounds access on the node in mas_leaf_max_gap(). The cause was the faulty detection of the new node being a root node when overwriting many entries at the end of the tree. Fix the detection of a new root and ensure there is sufficient data prior to entering the spanning rebalance loop. Link: https://lkml.kernel.org/r/20221219161922.2708732-1-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20221219161922.2708732-2-Liam.Howlett@oracle.com Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Liam R. Howlett Reported-by: Mike Rapoport Tested-by: Mike Rapoport Cc: Andrei Vagin Cc: Mike Rapoport Cc: Muhammad Usama Anjum Cc: Signed-off-by: Andrew Morton --- lib/maple_tree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/lib/maple_tree.c~maple_tree-fix-mas_spanning_rebalance-on-insufficient-data +++ a/lib/maple_tree.c @@ -2994,7 +2994,9 @@ static int mas_spanning_rebalance(struct mast->free = &free; mast->destroy = &destroy; l_mas.node = r_mas.node = m_mas.node = MAS_NONE; - if (!(mast->orig_l->min && mast->orig_r->max == ULONG_MAX) && + + /* Check if this is not root and has sufficient data. */ + if (((mast->orig_l->min != 0) || (mast->orig_r->max != ULONG_MAX)) && unlikely(mast->bn->b_end <= mt_min_slots[mast->bn->type])) mast_spanning_rebalance(mast); _ Patches currently in -mm which might be from liam.howlett@oracle.com are