Received-SPF: pass (google.com: domain of linux-kernel+bounces-201187-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com,
        zhangpeng.00@bytedance.com, willy@infradead.org,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 09/18] maple_tree: use mas_store_gfp() in mtree_store_range()
Date: Tue,  4 Jun 2024 10:41:36 -0700
Message-ID: <20240604174145.563900-10-sidhartha.kumar@oracle.com>
In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com>
References: <20240604174145.563900-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?qz3gg/tYo3HyH3+xeMOp5zOQcwC9eOeaJBrnbV9cd1DvXn+BChSK3ENUV7va?=
 =?us-ascii?Q?fSVmci91UgS+UXXB68SbRAD620Yj80bIqkqeTxKDIoDbYa+pa/lPvqH/bl2+?=
 =?us-ascii?Q?r1DMRZM1yw8VKlH2SCXzkU22G5kmWKthqHV7ik9UGCZ8gG3otmGofqpv1rep?=
 =?us-ascii?Q?QME+f/vCV5geXU5rPwLutJzF47l1P8+R/GPTe+nht6mQ38jRyDy3g5MW3UaF?=
 =?us-ascii?Q?D8pRKFhf3AlqTKIzz3hzfM1Fe7aySi9ZlvnJX4GRbU2HPcdDB892o+wRTTN7?=
 =?us-ascii?Q?6LIN5irhbqnw1nGZjq7hYl1kGlug8rQNfFCW3LIUQK2Oh2dLcx5zr8rlS+it?=
 =?us-ascii?Q?0R0LtUBJDB1ri6Pdii8JJC1M0EmczwhjPUgBdHswGljycJm+NCG7OZDekVrV?=
 =?us-ascii?Q?1zKXso8abhMOMW6F2UVzrgboeR4V0bh48kUNj9iblOHShF6U75OE9PrI0Wkk?=
 =?us-ascii?Q?dRz+B8zSvVpFbCz7A2kJtQBSXwfODI66aa9+82I0Te1DX1g7k6g5www1JUwd?=
 =?us-ascii?Q?51XrFYk2QXzbzN71zn1mPXrgeoq7GgT1//nGu27u9B7FzMFDfDH4Ka4IGtSV?=
 =?us-ascii?Q?iT1M9gVi/SbIwbTkM38AgOwgr75b3mkCm89PQcfxJlvAhJag3gSXclTV31DX?=
 =?us-ascii?Q?1GGb/V68zunycSbFM944SeLFkoD4J61gjjm5MTVFuwVFQyPMTopuMaY0YlmI?=
 =?us-ascii?Q?rHt4tJvISN/b5RxE3qiD8McegrRuTDYD1sbGyb7LreAuqhnP9oMYla/sdmUD?=
 =?us-ascii?Q?vW2mkBAt2x+9vHifW7kovlQS5YSeAgnYKYmoJJbUPMI6bvi1Y7ThWqR8p3A8?=
 =?us-ascii?Q?H65yrioM1D02fKUVZTJY5JIwCXfHYGRnIC0EOMbL6RnmY0BH92C0dTLLkFD3?=
 =?us-ascii?Q?OmYJHwIThnPjt+wt1Ezull0s/qzNd1IGN0cltc02xDonH+zMhxQCoeNKlvU9?=
 =?us-ascii?Q?JGxnNZg+OutC7+rIocn6iyjMkIvl5fk4ajyxVFDUM9cGsUmwUvqseBCgkyrT?=
 =?us-ascii?Q?PrLJnynTJ2a0Zyt/qJtHW51No2P8pdFYsz6iDYeOz2Ndxukk8qJXoWO2gno1?=
 =?us-ascii?Q?AB+KldvwzPzeSEQHOdNSBvTCLSVmKGPwYCQrP6Jp0J4sDC3PEJEH7+5DqJyX?=
 =?us-ascii?Q?XXC4WVSdzlxJyK511NvqlWP2q3cE3KfZAUpO/a0/yJuvShcoWL8pF0ElvQbR?=
 =?us-ascii?Q?wehrd4elkbzRyvHdgTFKxU8nXHuOZglVaiQyHDj0bNR70q0fZTKSVNwT2qP+?=
 =?us-ascii?Q?QucEl7zJCr5G4AxBqn/+EjfZulUN7UHTrIFrhp9glg9AOEMsxWbWi5IysKot?=
 =?us-ascii?Q?aRJT9QF7juZDK3gG2kSHT9+haY0TiJMbF/tojcCmz09lQbYVAOjuLpZixoea?=
 =?us-ascii?Q?CExoHmIGZAOrhuMFbDyFwbcFPxOpamP0hGJQX23GsScOdSRGNn9Q9pPrmLah?=
 =?us-ascii?Q?4Ur50Kb6kKBkalrVYNKUqioyrDYLq3als0PA0Rn00Hr6cdOzys7lVt6YXBF+?=
 =?us-ascii?Q?P2EPYOlbXoHpUVlinaG0kJ9WrSXhAI2vzRXwlHknlXIr+iAwLjzbjqeJUOAa?=
 =?us-ascii?Q?Io8vlhjhj6ZQkM2FDaT+OuZQyby/iDj0Jy3HI5fj/+inr4OB3Zu3ALhlMC1h?=
 =?us-ascii?Q?whGNXrt3Ny+2bnCpd+DJK/A=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	1BqzvqVH1AJn7nLZK26jIvq2Ajz6XTYh/bX2MwYMJAORQM+pIq0JY5uISAcmzFdloLxdJA9T+Turo0FOh/Jn9k82jtiAgHziYY7p+H+0H55Yim1v+dlXoutP6F8jaB4PKLovwpgpaCvIEvs0hogaQjR7Zgjjs2lJw+HQB8HsvGm9w6X6i3l9RTDItcD7a3pAh9/gYlaWneHKCgr2tKaW8OU43oyGS86LzZPxCjZNSae443/uHfSghda4KSMBesYvV2C7AiTp/bFW8WYjObpqZLhMBtrWRvG1nWFo0I/kxdfTLfPLQSoO9CDZZAmxRCGT2AVXoPAgBU+kB9bSJXCjkqzUEVepwrcakeZBsOCktjG5JwyEZG23an06nDsqbXsrJKOIuf6Uzgx50yLnWRgH0UQGe7EoIJVnBS3iUxg7RN/u7AvDsz/4p8K10HOVS6zyf9rRYEpaqilsoDuScnXS8reWcuAXa6obY5iUACwReiMnADc/MSLtNDzQBfos8MEO8QfWEw/wUjhpAl7Rz1FpToOsGB6SldYFiucH9WBkZmhsztgV5L5iHkvBnb2z0Af9RZLdd5zfyC2j95ULqouDrhKJJJpn76oyYHTSz2giUZQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 242bdf31-f1cd-4638-0e83-08dc84bda9e5
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:11.5062
 (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: PwM1NUKD8GvnhIWhG9hdh4iTki9PWtMFIiZxDJn5hiV4ITbbhdiXjiYoYwmPdmsQg5AcPAKNMas7EY1J6wuZyZpKxTmPzbCaQa6WQtmj1DQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0
 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406040142
X-Proofpoint-ORIG-GUID: fpFyMsYOsUmCGYh3QBXmq5tmS-FwDlOW
X-Proofpoint-GUID: fpFyMsYOsUmCGYh3QBXmq5tmS-FwDlOW

Refactor mtree_store_range() to use mas_store_gfp() which will abstract
the store, memory allocation, and error handling.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 lib/maple_tree.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 34ff1b3f729c..e3ec6649f7da 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6457,7 +6457,6 @@ int mtree_store_range(struct maple_tree *mt, unsigned long index,
 		unsigned long last, void *entry, gfp_t gfp)
 {
 	MA_STATE(mas, mt, index, last);
-	MA_WR_STATE(wr_mas, &mas, entry);
 	int ret = 0;
 
 	trace_ma_write(__func__, &mas, 0, entry);
@@ -6468,17 +6467,10 @@ int mtree_store_range(struct maple_tree *mt, unsigned long index,
 		return -EINVAL;
 
 	mtree_lock(mt);
-retry:
-	mas_wr_store_entry(&wr_mas);
-	if (mas_nomem(&mas, gfp))
-		goto retry;
-
+	ret = mas_store_gfp(&mas, entry, gfp);
 	mtree_unlock(mt);
 
-	if (mas_is_err(&mas))
-		ret = xa_err(mas.node);
-
-	mas_destroy(&mas);
+	MT_BUG_ON(mas.tree, mas.store_type == wr_invalid);
 	return ret;
 }
 EXPORT_SYMBOL(mtree_store_range);
-- 
2.45.1