Received-SPF: pass (google.com: domain of linux-kernel+bounces-201281-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 4 Jun 2024 15:24:26 -0400
From: "Liam R. Howlett" <Liam.Howlett@oracle.com>
To: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org,
        linux-mm@kvack.org, akpm@linux-foundation.org,
        zhangpeng.00@bytedance.com, willy@infradead.org
Subject: Re: [PATCH 09/18] maple_tree: use mas_store_gfp() in
 mtree_store_range()
Message-ID: <mk46fjiuvfcmgic4wboa7ylgmag3upj4vcmo3344ulqmmjc4bc@mr27caxx2zq6>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@oracle.com>, 
	Sidhartha Kumar <sidhartha.kumar@oracle.com>, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, 
	linux-mm@kvack.org, akpm@linux-foundation.org, zhangpeng.00@bytedance.com, 
	willy@infradead.org
References: <20240604174145.563900-1-sidhartha.kumar@oracle.com>
 <20240604174145.563900-10-sidhartha.kumar@oracle.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240604174145.563900-10-sidhartha.kumar@oracle.com>
User-Agent: NeoMutt/20231103
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?6nqfGn3Rid0nGJCqhni8mN2mkHEbdTW8VN7nVZQV0duj+1kyqmLrSFqZvgmk?=
 =?us-ascii?Q?W8y5R4YPtV/bf1YRMt22XZQfRMqZcT7J9Xcg0gyIOis7pYU5EWcvQQB7JIXf?=
 =?us-ascii?Q?CPJ4FKoZCRIZ4grJjnuOU98gXi8Uc4kNkoiV90pla+YzNNJ5OUTFr4caPdEK?=
 =?us-ascii?Q?UwbtGygsY59RE48MOUVbtSDtpilNl4KO6ntKP9nu3E7GoXsm5YNrz6Lbe1CO?=
 =?us-ascii?Q?wC6+OUwrORHGMg1M+0lNC2tiqwHpkQp5lvsBbBbBqhmldsjzshtrJkWlCQLX?=
 =?us-ascii?Q?fBgpvcOKkMELXqA/PIOclvqypo4/xYOezX+8+yqgNvA2O7U+Eaex22ZZBOXU?=
 =?us-ascii?Q?UBos/TA5wGUosW6rxhAIizky6GSqiMo2ZjnOWkyvW1wP/wYwiBf2GiNxhVg0?=
 =?us-ascii?Q?51EpqOOyaTUEZ4Jbd0IxnvFFJFoRlFpr6w0YynhOJUZD4/4M5XRpCoTckCMz?=
 =?us-ascii?Q?LPSbMmEssgTQlX+Akp+ZnmvBX2Rg+h0dlOPYqp0k3eYAPjmZr+nG2O56p0zS?=
 =?us-ascii?Q?qitnem8S7Jo0IKUW27hIStXdhOnra4bx78nmGFG/Rni3QBLJ3XFJUK/XZd8f?=
 =?us-ascii?Q?WV23SOKIVibiNHU/kTnf72/FkExNbA9fBmK1Ei80KxtkHsnQfCSRNjMKvmer?=
 =?us-ascii?Q?lrzcGfI4d7zrTqjP1N7xPiWkEaHVN9dKDCzWzbxu50OzyApDTRFEFthf2m1P?=
 =?us-ascii?Q?9YNog2TKFR6sWvu1SoZkasRZDua9vXLAzZWwino1XCo3lYNNcUjtjtKe7Nmq?=
 =?us-ascii?Q?z4ZUxK0unUaIsC8GPVfPe9ui1UCIc8+w61c4wrzqSsQzlrocXlQugDb4nUxI?=
 =?us-ascii?Q?arcwLlymsKl7Ndy735/lvqjZQ0XotxJODIbPcl7VeR+OAzxPYeD5pf5wIwg0?=
 =?us-ascii?Q?Nh6KfbdvORSxubBNvnwk2XVBmw2P2Aa8nxRhkOzq/js4UqOaRaa2NlQ6WKAS?=
 =?us-ascii?Q?5WlQ4KYC7I7V+5Kx17i/UyvpnUrbh8KspUHBx3RO//qJ99n/FDScYZ2oqniJ?=
 =?us-ascii?Q?mv+rOxUHn67RlMjrhHLr8zURNB8Zy2tq+9yccILnRCHFeTf0n/Djx3FCudFF?=
 =?us-ascii?Q?x+eb8+NFmgZm9RPNJHAUYE16sws+/RTk9zHX1PAgpgyy087oLSUTrIGSMVoF?=
 =?us-ascii?Q?jUXQ2v9NgwE7H7pBLsujFhPgJkpr3g+a4UezpSGy2LSOgGH5oiLEUDOnXv1m?=
 =?us-ascii?Q?tSMPZEfB9It0WltbwLj0Iu2Vxg/QfwPjZtzN4Yj15z16mKm7RecvA1Au189a?=
 =?us-ascii?Q?I6pe5aOvLSNusMl3/sRbBoqkDMBPE2BC/NzvAYxShRQUpEQfDTvYwJvilALB?=
 =?us-ascii?Q?EWOBuZFfzatjo1Q5X7dNbceX73TEN/UszHP7hNmcTaJM0qHvQUP8BKug5RvC?=
 =?us-ascii?Q?/WHVRj7JxITyaYinvSKT76X7Ki67D8AiwqIEKBORNHkGhesuaAn/cPGTETYx?=
 =?us-ascii?Q?Tyr0TzdTyTe4oRD+OwfFtjVHivPuGph+K1fuX5GXJ/Wrnutbuwo3sUyZ4fQ0?=
 =?us-ascii?Q?UOP7/rngWXldS2Cwm3TmdGqjm4HdJeReVBWoE9+EvpI6wMMAuHXoHrVj9fv2?=
 =?us-ascii?Q?PLebhS3DmZuQPdnpCezQYnSWCb1fMwJIfqyxELlX?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	17886ymFWPmg5iYjfMWHjKfbdhr4M8VuFziH2TEj+5FdM3eJL9HECCgaEGkCDYl+ax8M0gm+vCmzbxX/zDvmJTSOPWsj0nLDGEp/dK4ZbAm7YrBHs6lqR1O1Pnqp/d2DHfAnaMXBOc0Y+OcqdwsW1VPuukuHSo+Kj9TMdaCUhwUcS/bP4LOdhl0SFsPlmOGw2L5KfLdenHdWFqp89XCLdUxAnH82nitnpInjrlgfzHe2yxTDfl9x58FptBdZahs0hAIb2doO8/str+wxQk+mzRtwVErrazA/yaSQs6m9eZeazQyAre35Hke57oXOFfG5K1zHZNWK4xSvfZEScKw2o3NkfEWxs1vI+v8JnaBVGAmIJiGidWt+uoMYsRSiLAl56sH55PgP/G/GrziwTddb+zoAIHCkbuVfP3thPNSDBTsNLZHRdE+5P8cgymaTup4YV3/avMdH+s0x4qbbQVpo71ZpnzbDoL081IY0ci8IOeDGB9WZKdkSqVPbVI0Ka6JmOyLigMDKsdtzYk+ocudY2lJI+Y88c0icuQodAS2XSm5AAkIbBOgjuWm9rBkeRCGbgKZX6omDyNmGuaw1p0i56xHQioV7kU6hs3a5/9kEAdo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ac4ad638-21e4-4ade-8ed1-08dc84cbf3f1
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 19:24:28.6780
 (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: V6xFxH57veNjGacH7hq+j0oZZUegbbaJe6KrYhFUsCBBZMfj+1ypE1ixFvADk2XtruRT4PvJqibHPA+eE4WlbQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6186
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_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-2406040156
X-Proofpoint-GUID: gUwIvr8BZu5UzIDpMXQaW1hBMmYRoFTC
X-Proofpoint-ORIG-GUID: gUwIvr8BZu5UzIDpMXQaW1hBMmYRoFTC

* Sidhartha Kumar <sidhartha.kumar@oracle.com> [240604 13:42]:
> 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);

This check should be inside the lock as it dumps the tree.

>  	return ret;
>  }
>  EXPORT_SYMBOL(mtree_store_range);
> -- 
> 2.45.1
>