Received-SPF: pass (google.com: domain of linux-kernel+bounces-206622-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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,
        willy@infradead.org, Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 07/16] maple_tree: use mas_store_gfp() in mtree_store_range()
Date: Fri,  7 Jun 2024 11:52:48 -0700
Message-ID: <20240607185257.963768-8-sidhartha.kumar@oracle.com>
In-Reply-To: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
References: <20240607185257.963768-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?vjhYU2yAcXz47qIIuFAG/FHohrjT+E0e1ayZFVd7Pcy98/HME73djnD+Bel5?=
 =?us-ascii?Q?P0Kw8JllhZbh2LvQ61VzRuJQIH2x4U+QC9QB2IXNyp0yisPhWNVQ97qsmWza?=
 =?us-ascii?Q?5wU/VwW4ORZTVC/AaBDcssjL1PBLfBt+GnMFdLrC9yOFV+2497KodtV/tMBH?=
 =?us-ascii?Q?uCoyRWBOEm81w2mkA9TweL6G69db3gkIibP3U2ZZuRTOZFFuehobXAM87CRE?=
 =?us-ascii?Q?/IiaOYBvPRNW3YFF1d1s1Hc3Mo9MQSKn/qwIj0qBRZB72R/98HPf/aaMhZoL?=
 =?us-ascii?Q?zgv+nh2ZPx9eJTYzmlQUmjchndVoWfyyshFNjAl3EaZ1AublPBIYJ4c+xcYR?=
 =?us-ascii?Q?HQk55BWqPBrpFlOKjV3xwxsUJ9F65ZuX8AtKvpRHfJwfevXKSdS9Q9JpgAwR?=
 =?us-ascii?Q?ZcPkyzZ730hZjDRmZ+Rg0tFPcFzkkbQsnWW7eKf1zd/UN2qzTAKizF54/WV8?=
 =?us-ascii?Q?e41Ka3sKbqizqcCnsKv45EyTNpgodKqasmuNA08+P6j/Z3JiVhAiMWAV7vkB?=
 =?us-ascii?Q?z0ukQRXi7T4XBy9jQZVX5xd84vaNXHvaJMPkZaB7noHD3XsXsGljWikcknYA?=
 =?us-ascii?Q?EYAsI1wA3qbj+99esjrDuhXOWYeqXPpHJjH+yVKm1o593D+WdHOIet0AQofO?=
 =?us-ascii?Q?yYWaTfp+umW1UmB8Opel5A7vV3ru50jtIybnTea++tElTW0JXdBAhcsvPZZR?=
 =?us-ascii?Q?AK1v9AYEfyL6rTaqMFdvg95fEA4+8wzOvOQYEaXnN+2mKSpCBBw2BHt9rDfP?=
 =?us-ascii?Q?f7mOek3E44qIs42sy8MZvYbC3krBL/BFJuOvScDBlT3RnbFMocwPk2nqRJr2?=
 =?us-ascii?Q?MWSSR6izk1vzCNsifq2rSsQfeQFA6lL7k/6aL51OMug2T70Cy8IPsfxZG2Ep?=
 =?us-ascii?Q?SrQEWNzR/f+B6/g3qD1s3ql0aE9ryJ0d84KItW1LlVrd4QXdtNkiv4SAvuM3?=
 =?us-ascii?Q?5s2iDBthtJJxOI3oe/ich4AP3SrWFLs86eUjDmgoFlJ5SVSTykJYqVpzx/jF?=
 =?us-ascii?Q?9Qso5qY9iIwfuv1n+El5Ny43ts713rrTZ3SdiJODEy9S983kt1J2tKzegylx?=
 =?us-ascii?Q?D2AL65hrisC1b/zJo95Sb4i8QTVccSh1oH/Kp8BMM3ZGwE5TtkyTftjQQZic?=
 =?us-ascii?Q?o/FSGhbNu7HyWE6DSG0qdvDQfZgrBQAfSAFBLYQ1o2ubRD6Kfa/fTJ8hS0hj?=
 =?us-ascii?Q?Tjnel8qvIw47/LmKWZ42Fqht2HlpvFCg82BS22zpg0Tex8+p0r17pQVdzo8/?=
 =?us-ascii?Q?lzCPhm9a3q49jGpWJebbyJbLSeOaocyhF+feLLWe8YtXZTXOhhaxkTWfo3Ip?=
 =?us-ascii?Q?76LX2ek/Pw2kbxvtkHdID57sp+2Z7aKiNT87mJpvf1Lv6iWmTsqjt/zRC/gP?=
 =?us-ascii?Q?OUNS2/RAKQ96S2VybwdMSmF8+cD76XUFGmUh6KXdfTlltzLGmr0CwZJk5Z1U?=
 =?us-ascii?Q?IX+WEceNs5j7wGupb5MA6hVg036JyfYrpG1uQvU+0z8DiXizHYwZE6I0xryk?=
 =?us-ascii?Q?A0g3A89kGafxwvqv2MfL7YUlmHhHywU0frbWhJp1xZZPFIVcfItkPitaOoHQ?=
 =?us-ascii?Q?GeHO9bQ2f8eRQCw5IcCekuvTOA2aY1B72y1UZX5Su3WNgDCfLxK3+HqgaVUr?=
 =?us-ascii?Q?TfypB/5ma7Ncdl7VPJx5b+g=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	5FooOIwhayQw3KtO3tZwwZwN8nLFWq8tf4R4MZ9z7vPoKOsP03VGxsplCI1BMZqRRMNq8lgd+yrXetnbBB/pvBIP+suEo5m4Tz7c46khFrM19lJr5heDGF61JWb8Rrz+iXqbuwrtyEAU+3+4xPcfW3J9RIrK/cdQ9q9YTcTdSmAToBduEnbPhHr9QmvXJ0q2zuyUqrklt7dcfSlGocsOL5dl7xV7wmCLhsxViGvQBvjF1WRNggypOLRSkbo/f4gq4lCRmBiJG0bcCVcbx6XH0Migu/pUUu9aXiGdhoIYlZ81ywMjIxldhTy0UJ6jqAF/mn5ZP5FnN0aZWT3270VurV+QB9hRMrfPAU1mPaAuRWkKikRtP3lpY4NlaRfmwTJcEZ6YX5Ykpijni4EYfLG1ogff3/yAGI9+GBkzwO/JFhOkC/3Hn2B0aFzEiRpRCmdA0mu/WZRjhasGhEU/cJ4JOBk6aUj31Ozk02i7TpkLeEDEGuJ1uRZNjM6BMSLN47HlT2k0UaBPGwHXiGpgh3MIg5HUH9WTQZVnnaolnkXFRDVXbsV/na1MUscNcx/gqpn77shmw/6FeRaRcR/Ci/iELjb8NWyObjbnSKG8E5PHFT0=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8cb72308-3c33-405e-e936-08dc8723194c
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2024 18:53:19.8887
 (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: 4tPqoPxWH465rV2OI/3hBgJZTjX2hmjJUxV4tJb8ypyAO9ufFR/vh8Aa+0rJaRZXq3revQnMmbroMXPCZA9zQegAqw63PfU3Lb+rNOdKt/E=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629
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-07_11,2024-06-06_02,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0
 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406070138
X-Proofpoint-GUID: 38jTbIEemBuoqz-hQ_1EJkGhInPKsRSL
X-Proofpoint-ORIG-GUID: 38jTbIEemBuoqz-hQ_1EJkGhInPKsRSL

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 bf309b7515e7..a955316b6745 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6459,7 +6459,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);
@@ -6470,17 +6469,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);
+	MT_BUG_ON(mas.tree, mas.store_type == wr_invalid);
 	mtree_unlock(mt);
 
-	if (mas_is_err(&mas))
-		ret = xa_err(mas.node);
-
-	mas_destroy(&mas);
 	return ret;
 }
 EXPORT_SYMBOL(mtree_store_range);
-- 
2.45.2