Received-SPF: pass (google.com: domain of linux-kernel+bounces-201295-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 4 Jun 2024 15:34:35 -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 13/18] maple_tree: simplify mas_commit_b_node()
Message-ID: <zhbyib7htf37f6sw6futnsjqy4w6ru442jd3v2f3i7hhz35hgz@jkv7i6osu5jz>
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-14-sidhartha.kumar@oracle.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20240604174145.563900-14-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?XrXyv3iECQYJorzttDGI4QCK2RckFEGtpxylqmHmOM2mLbyDLXZuMJuOW9mW?=
 =?us-ascii?Q?jgz1aR84Wx9rizOkJpdRfw3QnEebGRd4Zu6BOVzu/cPjQxJJbEsvOsKS6L3t?=
 =?us-ascii?Q?bup5sSAx8AbYVHZC3xEtH93iwFw3WglS6TOGuz0JUISt9SqwiTC+QVRWErzk?=
 =?us-ascii?Q?fbe+pzajvFDXeLinxcvdB+n+w7Sxdjt0n1yvDNACm/ghye+PMl3Is2gPlaxW?=
 =?us-ascii?Q?jjFyxCFZozOzCluGrHUnkd8Gc0fiw6WhUcBisWKSmAgTwscplDp1tzXJE4pr?=
 =?us-ascii?Q?hKdE/wlGmMzgCUCtc4xs5s4FRoe8/0o/zcGVQkXyMN4jLKOwuUWd1972v/xG?=
 =?us-ascii?Q?mY1hvmJfd9ZCcekAc6+ZLdpiDFIgT+zDAVWNYVZjMz+4WGzr0SrP3jyb7+jC?=
 =?us-ascii?Q?PK36ZTJDgof8BOzv9jFTxHR+t9k3mcBstQi2x+/fE4nzDnInCjTo2YacASLc?=
 =?us-ascii?Q?soMssoO9yZyVDaosBxJQXLFvbT2h6K3E+TJNdI5nqqAMpPLiuaPgcc5k2eb9?=
 =?us-ascii?Q?7ZLtgGVYN+ZR/g2z9rBPbo7GbPD2/7baGcFDBP1Bij0Yl+By2Dpwt9hTHJRu?=
 =?us-ascii?Q?5WDq7hiIqdfLNYpAUBxoI1JPCxiCS9AsVloioE0ncAlQWJ+LXsNMLgF9fFRH?=
 =?us-ascii?Q?nJg0O8LGBu45gUwSXYzJy86lcyXiDi6D7k7oNTs5SpOSKDPTRmZ2nrLKD4NC?=
 =?us-ascii?Q?gevo9inV34qZBUegtOJYjEy8U1/nCa9cZoKcOfBh1MNSTuYWFV5U4uE/cfm5?=
 =?us-ascii?Q?QJVKrDUQxPDQB+XuUwyjegH1AY904/9TGEbjiGjydWs0b6hxMIe7Asd2/w3S?=
 =?us-ascii?Q?omtaT7zWPclvbusXdCczyrks8cT0pDBqPzmMfAQThkIdV0DCzv1Aa5H5QNkY?=
 =?us-ascii?Q?Bam3MH9HCcA5j0ys+HpFD2XnyIRZhwEXTfFaCP9pcyMtSFniQZrWvudiQHVG?=
 =?us-ascii?Q?9dakIspweANl7iP1R6ubspxqO4Pk+lfuWlgX4yMqqBZWQiKN9zEHoaRMkOla?=
 =?us-ascii?Q?+7T1m8+MD99u7EHX0LkS0aWXG3DA5yBA/47iYf2efOChoaqJ3Nk3j9YP0ug2?=
 =?us-ascii?Q?DLUYX01U8MKjkk/LIEjIKinqdaEUwl4Wr/QjEU8L5FQl8a28X/U6wTZjx3IN?=
 =?us-ascii?Q?o+bUwjpK6VuMfBVY4Kp5g14alNJMdEgKfKYsZo3btVHG/iBa/PaE2UUVj6Iu?=
 =?us-ascii?Q?1R0yr+jOnsi6sxdt2Qah1uHtu1rDOdZYcMGFhOQOxIrK5leDm+IwjcE9eyB/?=
 =?us-ascii?Q?7ZBqRhW3ZktiEuORg58l2ORAGDVUdunr2TmdcMqxxYwx4CPR0ouIlGD1ImJo?=
 =?us-ascii?Q?fpx5Ia+CenME5V0Jon7cRn8OU6MrCjKcPdrCZiaoVzv4+UTZtFNKhvajynbk?=
 =?us-ascii?Q?e/BTYOZtaALG2rPfkFYxy3EKC3rKYCPc7Tq1iqx64a4S8TvKRTM2bN1MQXNV?=
 =?us-ascii?Q?meTlfIdUoh7572jrsHxdZasgzsrk6eRb8r3qGBiW5jxvb745yQ1WxZMi7VVk?=
 =?us-ascii?Q?XtsDTvmG8e1O1W2DsUYaAStDmzs74DX3hrz3Wc7AVnKwDm+rCQUvLm7hoS2q?=
 =?us-ascii?Q?DqfvhbYtTXx7obZeKTCz1S9FLCuzM4OFmi90MYll0eYFRnOgl6k2x/0qEgZa?=
 =?us-ascii?Q?wg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	CysA0FZwNxBBgjuez1Kw9aH5ZhCOffxyHF/b6fFuhz4KoYXQocLLbLeqG+V+YWFMvjjReVS+4ONgBGZ4JJS6UkJ9zgdmxFysBDRH/9aaAXwI3gif0nphJ8jBEmW/uH0eD9AkSqGZsMpCPZsO3pBTC2R91tSOxDQAggDBLswkJbQgHN353tCA3Jqu4t/Zn5D4DZwRtT62vGeYPzAF7a2O8pOVCYNyBse+/sMTN/g5Shrajt00y/3TAy4fW4rKLpfN5hZX0Ce63++hnQj+j0rozNX7FbIZp9ktUE7wCn7ZFOICnfZJ3NXg26LumUxVkSJF5lZbIv1knEgBJDNX8q5uMJ9JCL1OlQYsDzlXi0T8S7Y3MRtmJ/xE8PAdGLgs331VxIvWFICvYgKLZ+sTwzEXPWnWtT2FdUPbEH3e64gs09HP6ZAPe+efujNosDo8Q5d0e2Ct9XHTgeKE6MtqWqCfPM/2OYot6aSgacwdMT2VcL3W/K20JfbV/CBdyJ2/TGJjVsw3tHT6glX7i8oyhHcyA6MeLrNyNqR5NCamOibDwQnrMGkhCzo3e0BaTxpdqplJidRThdyAtx+tv+ZQTZGy/WeIFTlwJaZu68K3ABwXQu8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f524396a-d06c-49b8-3f19-08dc84cd5f0d
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:34:37.8466
 (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: rprMWALVspGy+cZCTNk12dyQ7B71QNnNzIlTu8ziSiXvJaHL3RtbKlkj2VSUimiAavIbH3FxWXbxYoCMAEIpzA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6042
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 mlxlogscore=999 phishscore=0
 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406040157
X-Proofpoint-ORIG-GUID: -eWVeXr26t2Oguao0N5eRuNy8WR2m7_g
X-Proofpoint-GUID: -eWVeXr26t2Oguao0N5eRuNy8WR2m7_g

* Sidhartha Kumar <sidhartha.kumar@oracle.com> [240604 13:42]:
> Use mas->store_type to simplify the logic of identifying the type of
> write.

Since b_type is now only used in one location, we can use
mas_new_ma_node() instead of mt_mk_node() and remove b_type entirely
from this function.  This is also true of the maple_node *node pointer.

old_enode and b_end could also be moved below all the returns as they
are only used after all the other options.

>=20
> Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
> ---
>  lib/maple_tree.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>=20
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 314691fd1c67..faadddbe2086 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -3437,12 +3437,10 @@ static noinline_for_kasan int mas_commit_b_node(s=
truct ma_wr_state *wr_mas,
>  	enum maple_type b_type =3D b_node->type;
> =20
>  	old_enode =3D wr_mas->mas->node;
> -	if ((b_end < mt_min_slots[b_type]) &&
> -	    (!mte_is_root(old_enode)) &&
> -	    (mas_mt_height(wr_mas->mas) > 1))
> +	if (wr_mas->mas->store_type =3D=3D wr_rebalance)
>  		return mas_rebalance(wr_mas->mas, b_node);
> =20
> -	if (b_end >=3D mt_slots[b_type])
> +	if (wr_mas->mas->store_type =3D=3D wr_split_store)
>  		return mas_split(wr_mas->mas, b_node);
> =20
>  	if (mas_reuse_node(wr_mas, b_node, end))
> --=20
> 2.45.1
>=20