Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        Peng Zhang <zhangpeng.00@bytedance.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH] maple_tree: Update forking to separate maple state and node
Date:   Mon,  6 Nov 2023 10:45:51 -0500
Message-Id: <20231106154551.615042-1-Liam.Howlett@oracle.com>
In-Reply-To: <20231101171629.3612299-9-Liam.Howlett@oracle.com>
References: <20231101171629.3612299-9-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IVJL47fXP8iaA/zluAy2V+OrfW3bmsF6dAaEsZu93ynD3J3UmqwKdBRcJ+J1?=
 =?us-ascii?Q?79Df+8re20tj3OGRYtDOweqfxI2Gj4d6UoMGQASi/aIjbsVDKWxQfBgEGyOK?=
 =?us-ascii?Q?X7d0eeiP+TF4KPFxZMku7isUlF38osUgHyC+GK+oREO7dZ9CZ0Utz2UHrzvg?=
 =?us-ascii?Q?XM55t32cZRTd/cruGSwiUYRidhClLr1fv6jeck/L5JYOh6oCHaJQDYBv0+0o?=
 =?us-ascii?Q?C9fQVXLJ2zWlC9itsjbgotH/KsqAyewFBMuU3dmiUfiPm/ewLtpMtxmVGYUe?=
 =?us-ascii?Q?jKYiLMfxq3w8o+eEUAvn941hrZ7TsT3VRiMmWxqQy4/8835bBlFUnQvQxFGF?=
 =?us-ascii?Q?dXqwtOJrQzxfjzXtjQOSJgMPz1/jOYal2wXOp1466CCTrUAIjQjIrj4Tw9yC?=
 =?us-ascii?Q?n80jm6aYG3CCN7X9gYm6jesYtMZa+5ScT/jwQmUTSouwkfBxLQpdu0n8p18d?=
 =?us-ascii?Q?3MonFIVBGgMzwe1FFx9Km3w5hCKkOyqYLPm7Br8/HRC841JcLHJpPVg84fb0?=
 =?us-ascii?Q?J6kR+ILL6s6qqGxUk0H/U3egCJTetpeJbWbTwZmMK+XMCOo8iRtrM7y2Co2c?=
 =?us-ascii?Q?dLCcKG77ynNHglUfRVtFRyOCryYDFIdYzxsb8KuX6zfvAHK8ackfG2V8+yIN?=
 =?us-ascii?Q?ApfrVI1zR8KDSYt1kAUqdlx0OoK4aX8ZNWrH2L6fPHeleANhnlX6fKB//qg3?=
 =?us-ascii?Q?SZC8wYC3F6iWno1L4rJG2e3mUOalq62hNOdl5F4RL7/R4yaM1kCGMFM4i5Jy?=
 =?us-ascii?Q?P+eRyszoxfZOiKAhrsLd51mCejvjdGYjDcPAPylIBbRge/hwDaK7YeJwVDix?=
 =?us-ascii?Q?gQytZl82ZEJd1kgYmTvkJ4nc3hYVa2yVVyUcaK+X+fq5ZwFrPUMLxG/L0suw?=
 =?us-ascii?Q?+BJmSlP1ven0ImetHjBpRuNY6Kw9LnSUIEedonMqhDQrqfRfUC6AC/D1DoO7?=
 =?us-ascii?Q?SeL2+i5kw4P/njkoxL8orOVqP33Fs1MUxxbP9jNVOYiuJGazxhjTLPZ7MN4b?=
 =?us-ascii?Q?lqNiM3ciQm7zQFeGosSKN8VGQhU/MkrleTiFeOzMKRZCQW1PzmRzrnqV0DiW?=
 =?us-ascii?Q?NtCxYYiVWPG9W1pUc2Iu+QdXnPcJhtI+X9N7Viy/G/BUl8RRxIyfvgX4mFHE?=
 =?us-ascii?Q?8nwhhxvwoSopnH8rSV5bTX3z31+NWi3duosHJZ+yBmhYU2/5li4LQDWupksM?=
 =?us-ascii?Q?90bREb125zCfSbvFBZWqmsafhFwPCbwGmJ7A0Hk7kANv1Er+EBpJaVv6+Mwi?=
 =?us-ascii?Q?vyLhVKX1IlA2wukjCQhouKjqPFaa5ScCP+USFnZtgWlrA8hmR+n985E/Y02f?=
 =?us-ascii?Q?U+zbP6w6u7mQgr5Wi/boSiuW8rpJtMDXzRZyckBOnqaTrhzwEEKeB0bXT656?=
 =?us-ascii?Q?GT9zbdebEeo/xegTC8EEh9OXGbPZ3OBC6+07YKEGVHR2KfO3jsj2zXbjcjui?=
 =?us-ascii?Q?i2YmzMyCuiR69IMKXAO1MkVGe3x9jQZnPzi2hlZs0S2/lM0055wvPTOXrULa?=
 =?us-ascii?Q?ET5l8bZeYiwqzb8UWSEj/uyPjFcwsFZvumXx2iKq6qZscmzKo6ADiQlFaFsU?=
 =?us-ascii?Q?E/tu/EN9Fyc0SFsKilMScDRyqHvqANK4nSpLs6mJ?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?CjDI80dgobTMOPzBOzmcPr/MLLR3sqPax7d0z2woTLrRbul32XZfTj75/miA?=
 =?us-ascii?Q?3QPYPDFKwUJkvjzD8Qxj7ZJUSKWEzJfuhrLcrvVch2xoUwI3L8iJWeWWJ9LN?=
 =?us-ascii?Q?OpgWvsqUx3g0ddTyQlKuxVzaGvA5LdtJpIKIhKwt6RO3XQrePvI2DgTcpiaO?=
 =?us-ascii?Q?27e6YbKY+FlSCD8ynN53RijZGl7GAtMOXl9IBfq4HGDyCKB1NcnLmxdZPY7p?=
 =?us-ascii?Q?wHB6wHV5j5wWlwXj7hfSeW3hYH1sDPNJiLjGuF5x4lZqs6mY9uUAx/vQs0Fo?=
 =?us-ascii?Q?mjY9sEDwVmYa3EfOyxCbwVangIDvEmX5DojMXR+mHhq+9XooOcMPiD9idppU?=
 =?us-ascii?Q?iA03zRA1ci2dmZqlEwHcTCms3BvCH6tkdttKlRKYPZd0/arCkOYkv2Lp3Q4E?=
 =?us-ascii?Q?uzCvmEcei8IlnFNAF2H+etw1LTeX6k2flBs+tTljAUEUNfSEhMTOj4weGhTC?=
 =?us-ascii?Q?hM8b8tBy2le36sBaJ25ZaMt4H3aI1OUhqKWDVjIECsB0+6m3q1dSf9sx+tnA?=
 =?us-ascii?Q?X7WkXoWsVuCRlOOKpHSbP3Nt79euyiT+499+h4QN/ncIkbXlVgokq38fnMHT?=
 =?us-ascii?Q?cXMC1gx4OLbnZfCSJTZ1u16EMOUy3/benqEPZM+5k3D8CGaNAHo6XAPSo4Qq?=
 =?us-ascii?Q?W0e3bBa8tb/BmQW3+MhhbpF+WeUlNd36FrMdWGhVEw2lKR21uLQzVhaNMKk4?=
 =?us-ascii?Q?sOMj2I3GFx58X7aNdmtpkaPBZCyda8HWqQvfmCrKi9T+envPqx/dpnOPeBTp?=
 =?us-ascii?Q?Mejq50yRYaDwrCHAJrYPAHg/7QRRhiiAbOX5hO6zYPOYzsRjZJdN7yX35hS7?=
 =?us-ascii?Q?NyKphvG8MeltpKD3fQIenKVrHBX/qhpq56DPvUeWdjbQFlM81PKHQTPITc1F?=
 =?us-ascii?Q?2WOH0elttiaeC7BGoGnlURGNX5y2MnJ0wpUIZPUJCbD5WK8o/tBVHy2L+KN1?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4ada49fd-ef87-4370-2aef-08dbdedfdf79
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 15:48:51.2424
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: U4A+FIX0EgHOKXmto2Qf2yy1lgAaNkGwnJhukPZvlmO+FIiFOdFJ1SITccra+RZYL7NKXlYIj1ytHdH60uuFEA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4180
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-06_12,2023-11-02_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0
 malwarescore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2310240000 definitions=main-2311060126
X-Proofpoint-GUID: lWuLXseu9GgF44HKsiwgCGB4ZOQPz3xs
X-Proofpoint-ORIG-GUID: lWuLXseu9GgF44HKsiwgCGB4ZOQPz3xs
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 06 Nov 2023 07:49:32 -0800 (PST)

Just a small change to the forking code after rebasing the maple status
changes on top.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c                 | 2 +-
 tools/testing/radix-tree/maple.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Andrew,

This is just to try and make life easier on you when you apply the maple
tree changes.  I have applied my patch set on top of Pengs and found I
would have to update my patches.

After rebasing my latest patchs on top of Peng's changes to fork, there
were a few new uses of the #define states.  This patch removes them.

Please squash this into "[PATCH 08/12] maple_tree: Separate ma_state
node from status."

Thanks,
Liam


diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 59dd0e2325e4..85aac746756a 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6674,7 +6674,7 @@ static inline void mas_dup_build(struct ma_state *mas, struct ma_state *new_mas,
 
 	node = mt_alloc_one(gfp);
 	if (!node) {
-		new_mas->node = MAS_NONE;
+		new_mas->status = ma_none;
 		mas_set_err(mas, -ENOMEM);
 		return;
 	}
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 99275945e6d4..56ae47291ee0 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -35958,7 +35958,7 @@ static int __init compare_tree(struct maple_tree *mt_a, struct maple_tree *mt_b)
 
 	if (mas_is_ptr(&mas_a) || mas_is_ptr(&mas_b)) {
 		if (!(mas_is_ptr(&mas_a) && mas_is_ptr(&mas_b))) {
-			pr_err("One is MAS_ROOT and the other is not.\n");
+			pr_err("One is ma_root and the other is not.\n");
 			return -1;
 		}
 		return 0;
@@ -35967,7 +35967,7 @@ static int __init compare_tree(struct maple_tree *mt_a, struct maple_tree *mt_b)
 	while (!mas_is_none(&mas_a) || !mas_is_none(&mas_b)) {
 
 		if (mas_is_none(&mas_a) || mas_is_none(&mas_b)) {
-			pr_err("One is MAS_NONE and the other is not.\n");
+			pr_err("One is ma_none and the other is not.\n");
 			return -1;
 		}
 
-- 
2.40.1