Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 32/36] maple_tree: Clear up index and last setting in single entry tree
Date:   Fri,  5 May 2023 13:42:00 -0400
Message-Id: <20230505174204.2665599-33-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-1-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?D7dBLONcqYLjARsooyVd65lOPLZ03jlYoVPhnhHHb3G7OnPj9mKFbx5CrEXy?=
 =?us-ascii?Q?BiNvb/ScWgxRlnK0xgpV/j9WtgW8wk0hRjPgggicpIyeZjrNG7bCdKvKVIlz?=
 =?us-ascii?Q?a+pyS0Gga7a6cU80yvwbAQ/sI//h/fe9utJSAuID0LEOidexLgKk2AoSSamQ?=
 =?us-ascii?Q?cjl9CItq2AoCugrJJhWIlF5W2O/lcLO+goz/u2NXbKDiy6SomDqLVZYr8Byu?=
 =?us-ascii?Q?W0vpsiEew2RVAxDkjaBc9gtzg++TxMLjyMW4IkdrD8SOXQdyuVuJdZK1IaCT?=
 =?us-ascii?Q?IBgHIJO0FkuQOCkmu4Kfo0LGWdiOudQ+KL9/s1tYMJvfaSWbuCcu0rXcCYf/?=
 =?us-ascii?Q?GafAyk+hO8ZrJw5ypK9G6vGisGQS3EKKUlQKKD3x396XI8dM+IcVye+tdY9H?=
 =?us-ascii?Q?2Jt3XHopUSNtP8beLTdU1TqzChMu9pzT7L7C+apIHi7n3GETX/80b8KTUj30?=
 =?us-ascii?Q?GRm0LXpsaNbK2TvnJk8qV0mQJnAzMmQVmU6v6RyhW5mwKLQstMAliO9IpcH6?=
 =?us-ascii?Q?dz+P3dOMboCbfJbhknLwV41f2wjYEybVZ2R9PHgk+gtn8uPU0LcfMJg2xgQf?=
 =?us-ascii?Q?C/TpsseVyztoS0riwEXDG3hAHNoMO97wb/tbu/DXWtL3i69E/Bv4NiKmea5z?=
 =?us-ascii?Q?pZ2mlu02phuy5HNpN3cJa8SezZIB8RZghpkIzC6703r200d37+p6mFE75rja?=
 =?us-ascii?Q?CCIutdSoBJgpz+iNXQ26Q6l5DVJ9AjKrIp8owuhL9z2ygRhU52l4Of6FXHDd?=
 =?us-ascii?Q?Gw1pLcr4ugHyKaD8UP7TlL/xlxIb46xeZD6gQuNuvCiwmyBM8tz0qNo00iQU?=
 =?us-ascii?Q?eM/z0ANOSYHLbgEmETJmo38Qn49UqjeW4WIG8etdvpXRSrcF/Jk3axS/7lT/?=
 =?us-ascii?Q?1AZXhQ/+rdHF4YrlIZjMsB7iALei+cpf7Op7cRyM4h6r7/INe4prDtm5xNCd?=
 =?us-ascii?Q?EvoeQcAoywT/OnDo05rl8hKI/pXCiJntPPms8xtJZR+QfUODiPwQUQ/p7Gzt?=
 =?us-ascii?Q?d92EJzWEVWCf/f3wIvjiBjFMZic3qBT09yL/9a9x+HbY1Gzcumy3zonlu3jv?=
 =?us-ascii?Q?kTxX+Ob3BCoayOy15KOrpZRHUy8naNbWegrXRTjWh03ZP7TxCTdb5hh3xMuf?=
 =?us-ascii?Q?SfaQ7300DIHF052RmyzTQvFt25F4Z15uQnuD1yQM0+YLJq/XK07kS8g3RfuB?=
 =?us-ascii?Q?lHRfgzdAOSQp8MRI46JJ+PII3eDGkJAeFM/oc6RcwKqEHmP5UGnOL8OSgRfP?=
 =?us-ascii?Q?FNvDtYCoouPOuVtUOQ48IFPjxuLa/FdpVx+H1aOIdg1WHx4xqc1ApkhyqIwW?=
 =?us-ascii?Q?917GEwOxEhgJdPDCJVAzZDgpGBNB/ciPLMsGMW6awXbvbBXrPSCEA8e3vz7Q?=
 =?us-ascii?Q?+onPEjEY9bmFJOdB9oURJd6cuqRiSNX6rYk2NmS3S/mEkRuWf+CduVNvSWnp?=
 =?us-ascii?Q?+SztlCouQFSdnHkVSeE3sCwxvQmNfCBwTKjtw7quSQ8Nx7lkDC33X1u7byzk?=
 =?us-ascii?Q?6YpnbCjCrdfO9msWO8rlXi+bVJ5bkGA3S2GgsILS7fhPY335UZb5o/Y7yFkj?=
 =?us-ascii?Q?sM7ZKGxLl2SJt3unKVQV35WioWkhY6CtwNKsxSNynu7ND1RKQftuE0Vsyui7?=
 =?us-ascii?Q?Vg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MoC6P2vwQKtePk+mWPcGlHe8T5QGhozThSs0gA5j1cq8hsW2THkfeDvDYUhxnmMcghe8Fmx02FpUKm+99wLXf60epT524qIRI5uroQgky98AEhaB1NFXEmqipBBn4LUk6952PJ7P0hXfKzkG0WUhgvb5sPFN/3aQ6uVZUrJio6HuDEqh02WWjtHSLevgB5/q3i/xAzYIb9Qvu5bCuQF+8b/G6cyJyrQOYslUFhEj4D7t8+NtrcrULaKRrE0BIhogfkX5kHqvjPOYtiNPUMqV032xHQAUmtu8wd45300w7L3EH8mLLTOtroQPiTGM0OVKOz/zkA++UQjXHp1/SsXo5lxIO4CZzOUTUzZnSDTVAua4tNVXuM9jx2ANQIav56rWsn1cPfESc8S/T2/PsC3RUxF/gVxUl1Dxx3j+j0o1mL/xGfLOUKBHKHz49bNjNv1ajwJquDTumUBMsjMDDULsRlOs8n82RVR3rhDVNY1XlQNQjJV/BOtZrUF3bzAfGnzN6/3GbBZS1cNoYSRqjiRCwc9H++PRhpB9LfaW1PijEpOIZo3uwKKlWv7rJSdhBBs6SkauMnziJ5ij7pIVVHWv4Oqo7HTjBoowD80YwS74ivp04GJvL4AlFVr67BPjMEPShPunCFEJ2DpfIRkJJVU/vuWDEePj9tILwMy52Ro2QMRXxfXeNhKlB4OkkbB1YiUG/mrIK3kmR82W6Uc12oURSuLmE00byXdmS49x4b0hgJGjyqzKMLnyoQFN+hSYBXdwcaatHV9gemDohkq5TTuXRFoTbzHLl/+8fVn8XDCain4ERQY3ia+19Qr5q9IwbYZnPC0PpqgUOCxsIGhgs6FQPPB5wzvQ6Sv9qSlvYYr3enHKD5EdX1Psnbx18pYNVq5E4TuPMX7SjEmcIV/mdg6kfA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7bd5c748-5c0d-4b33-d9a0-08db4d907140
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:44:57.4888
 (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: Pu6caMv+N1IXiYGAmcOi/fKGrx8BxenzDhgIMvcGGfWVisdREw1hjmQJW2mRr6MGWD/DPF7iAtDs5Lf7NvUj+w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6895
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 adultscore=0
 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: IWiT81jmCRPMkQ_TitPZY2Uewq18osnx
X-Proofpoint-ORIG-GUID: IWiT81jmCRPMkQ_TitPZY2Uewq18osnx
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When there is a single entry tree (range of 0-0 pointing to an entry),
then ensure the limit is either 0-0 or 1-oo, depending on where the user
walks.  Ensure the correct node setting as well; either MAS_ROOT or
MAS_NONE.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index f060c71965c0d..914399519cf54 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5022,24 +5022,25 @@ void *mas_walk(struct ma_state *mas)
 {
 	void *entry;
 
+	if (mas_is_none(mas) || mas_is_paused(mas))
+		mas->node = MAS_START;
 retry:
 	entry = mas_state_walk(mas);
-	if (mas_is_start(mas))
+	if (mas_is_start(mas)) {
 		goto retry;
-
-	if (mas_is_ptr(mas)) {
+	} else if (mas_is_none(mas)) {
+		mas->index = 0;
+		mas->last = ULONG_MAX;
+	} else if (mas_is_ptr(mas)) {
 		if (!mas->index) {
 			mas->last = 0;
-		} else {
-			mas->index = 1;
-			mas->last = ULONG_MAX;
+			return entry;
 		}
-		return entry;
-	}
 
-	if (mas_is_none(mas)) {
-		mas->index = 0;
+		mas->index = 1;
 		mas->last = ULONG_MAX;
+		mas->node = MAS_NONE;
+		return NULL;
 	}
 
 	return entry;
-- 
2.39.2