Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
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 02/12] maple_tree: Make mas_erase() more robust
Date:   Wed,  1 Nov 2023 13:16:19 -0400
Message-Id: <20231101171629.3612299-3-Liam.Howlett@oracle.com>
In-Reply-To: <20231101171629.3612299-1-Liam.Howlett@oracle.com>
References: <20231101171629.3612299-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?3JPP0hnmCJmVVkybsYwzDbvJvhRIE1UuNeBys1v5NBMUuC+Oll2uB1I8JzgD?=
 =?us-ascii?Q?gXOe9AMEsNZ+zg9Y6aSWTaiw4EC6kuU59aQ9PDxNMbolR52sNcn68dgYZOww?=
 =?us-ascii?Q?bv5gq9WswORxsN8R8we20xxNTzZkvZpOUWIpOgPqwpsD70FtPNsteYE8Rq9o?=
 =?us-ascii?Q?FNutbpr4Wg7FmnNoO3AR6ljAKW2wzdD/ozNy0SDplFJQGLqqJqDOJ3e4P7Wq?=
 =?us-ascii?Q?gjkTsSd53HXJ7JlFOgxaCCMoM0NRQh3tUBlnEYjHn9JW0DHFwqF0RLjKsehC?=
 =?us-ascii?Q?YxxQME11lMhzihQ5686H9l0OIlvgnKIxtZ6r71RFrlfY3+YhlbitCDxvnFzn?=
 =?us-ascii?Q?2StihnY/weJJdFgLdElX98JjUTWVk/2bsi94WrOUyoTHFLodgGbZBc8jlN4P?=
 =?us-ascii?Q?Ehm9YgJn6pukZC5+w0R4lL6QT95jtstiC3C5szYfLKtA/auaDf9VPwrvTneB?=
 =?us-ascii?Q?V+sXVCNGRw7d5RMx61dE0LO7B7zEn9lf1um9S7LodRNkqnzInatIySyYPH/j?=
 =?us-ascii?Q?dOhiTa/II/32ZOAJMDl7e1jA725X3PIA7lVznsizkZedBY9fFtfDOAf+GOVd?=
 =?us-ascii?Q?zAd8OIWxpkooTOcfBIApBkDnsv+PUYNKHUZy5CbJ5gt6uMvEl8nCtmiag9yW?=
 =?us-ascii?Q?WFn4Cb2Murb0/7iiUXrT+6Wgw8wRWQRL+82ja2V2FaPd4nmRrKufWWfASnit?=
 =?us-ascii?Q?od7CkcQ25977XUi1XrTYAJifq80xXso8vV4ZpaKtEY9qzlpZY/4JDvs3qtxy?=
 =?us-ascii?Q?i7D9kaXB1PUVQ2WAMb/z1igHZki38wZj1tmB+aS5oPPcnlaGzak+YYySaa3/?=
 =?us-ascii?Q?iBnG+iBmvwXay31KXzTsUCzwO0LADkCVaYGNTbvQ0T2MNxCbX0pqWsDvoreU?=
 =?us-ascii?Q?+SJd4LLyxjGgXUtGODsK1Y5LWjrY6EJzfZb2KEMWTU6q064/e742q02gZQl6?=
 =?us-ascii?Q?lH+mhH+iliKrzYkI4tzQpO/bP5+LdSPviO10+FU/1z7BEAjap6W1AATGuJHv?=
 =?us-ascii?Q?HyOngr/n2GmAE8jTKfTSjdJCfFJjkQ0vj0SiB1IoEwSyv5RcRiU70QEzHuw0?=
 =?us-ascii?Q?PfdxMEqjVXCYEG9CzKoOYPLiKxpTQ64+sNDn2sJ/3JH0x+fexhImyPLneirx?=
 =?us-ascii?Q?1cBmbf2d+ELBKzsPN4uOMKYra1iIj5BHyX1h+ENA2hxeNV1k3JatdbLA5LEx?=
 =?us-ascii?Q?C2vMhIzPJBDVprurY8NBeEZ1od0HtMbPVan3KAD0RMZTdDLVK+00eiyuiBlr?=
 =?us-ascii?Q?4giY0Pup5KkVOxaa+DSJDT2kPTZP1tUqLa3WoKUmLdEdPN9VcwiC5wGhQXao?=
 =?us-ascii?Q?lNQoTtYjQtLDjSdjq1ERDvBJENTt5C5X7Q7tPVyA+r+7KhPscs8XfWbvsN53?=
 =?us-ascii?Q?AcJmIQCFg6rUs+fPrvu1eZObxgpTAVMiPixKqybs2i5NydNo2WRsLIfIpDJR?=
 =?us-ascii?Q?9uwE+nqydaAV3MQt4RlAbxOyU4O15G1fuPqvRzrpDVeGJj9aMJXkkup18UCb?=
 =?us-ascii?Q?/2W5AJGJXv/TR70JPVhnH1hgUAnp4ndzgV53q2Ud/I1pe3Za9ranAAEPhqoj?=
 =?us-ascii?Q?GibU+P+kPPtkHvhikztxqQ94fzQKhXI2KvlIPUYz?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VbxbxRsEponxjTIDccFQ/k4qNCLVQDiOR5U6Hqx5t5JwUDPobjbVCbCSj2wgUsUTcUewGMLc6/FpGRZFLu8OtVEyQDn5cpxmOV7c05zLBc+ikHadbtbYW2BH9Ryy3gQzitmX3ewaRlo0Rngg+87qo7g61j3vH29lrg5N6ehxpGaUhIgaarJwHLb+vH9hF6xD+B3Mn3BtdE9q9o64AKeBMFJLS5OUirdVLV+fO6DyTKligkxxjqUD8OlGJXRVaeo+uao3MM5W5oh0GFA3GNVOudNChloLxWBH9T6Y9Sug75Jq+6JNhGNtYVWREfbB8Pcv2N+GIeGxbZHOP0V+/hvEuW8rop/sgI4tXbfTyusyuX4pzm/rO54pHhkVVrcil8PfD27yLJqIEiFTIhlyDIaEELvelqOxbHcvOPlWbRzg8u7p6ENc5jeChkI3Bj5S84ha2VbV4rUXa6xD7890I995OnGFy0kyVQzK3vX4C3EFJXzoiI9RYRW+dyXCnTcj26z+4J3sDhGtUpPb+zQGHYBK4RCG6pp26uj7DC+EqKMwsdFsrx1zGC7fDzIRUu/wNoQh3HhkUkQYVpOQah8utMtPmcEprdQHWjTyHdMPjon4bg1XPdDABBAm5H4CqJbPNAvZuDlVsRxJhQ/LgIpWacRzQI722SbW5DTD+nFieREpn/yoX7sdIjdXX/bsv4Oei5rwVMO2sOeBUWS12Rvl3kekQOLIj+zSWHdIxWwseawA6/ZZ8Ui1FSUSTtrOgPjOMmBeDLPHxmPP7Ctr7wk4t8LX7M6N9uHcc/nyu2KSBHHgBHoTA3VXzgbeom7pX74QCUmr8LDrLpv8hRbqOBCUbnEtRQ5tEYo2TRIflVEz6fbnrdSaSxNkitQqQKPher9VNMnB5Udi7BA81L4j5usV4bONeA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ad6d2a9c-9aa2-4d0c-bdea-08dbdafe5007
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 17:16:40.3679
 (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: bO8vUXqp8Y60B+ZwWLUA7WHgON74z6jcPj4u3gOmBUuir5MIlFYeRIPhgX2dJz8m9TUqSLgSHwWO6se0tiBDZw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7684
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-01_15,2023-11-01_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0
 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2310240000 definitions=main-2311010134
X-Proofpoint-GUID: 6kGqw8JWo8JFCm603ROyXiBMqoodNANf
X-Proofpoint-ORIG-GUID: 6kGqw8JWo8JFCm603ROyXiBMqoodNANf
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 fry.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 (fry.vger.email [0.0.0.0]); Wed, 01 Nov 2023 10:18:24 -0700 (PDT)

mas_erase() may not deal correctly with all maple states.  Make the
function more robust by ensuring the state is in one of the two
acceptable states.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 0fcbfa7e9942..b6b2d7031cae 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6161,7 +6161,7 @@ void *mas_erase(struct ma_state *mas)
 	void *entry;
 	MA_WR_STATE(wr_mas, mas, NULL);
 
-	if (mas_is_none(mas) || mas_is_paused(mas))
+	if (!mas_is_active(mas) || !mas_is_start(mas))
 		mas->node = MAS_START;
 
 	/* Retry unnecessary when holding the write lock. */
-- 
2.40.1