Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 15 May 2023 13:07:22 -0400
From:   "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To:     Peng Zhang <zhangpeng.00@bytedance.com>
Cc:     akpm@linux-foundation.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Subject: Re: [PATCH 06/10] maple_tree: Wrap the replace operation with an
 inline function.
Message-ID: <20230515170722.6eqyckjaggw5wijq@revolver>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        Peng Zhang <zhangpeng.00@bytedance.com>, akpm@linux-foundation.org,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        maple-tree@lists.infradead.org
References: <20230515131757.60035-1-zhangpeng.00@bytedance.com>
 <20230515131757.60035-7-zhangpeng.00@bytedance.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230515131757.60035-7-zhangpeng.00@bytedance.com>
User-Agent: NeoMutt/20220429
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nZULbXjc2jNt9vDheVCuBYTism3o5IGUYLqLq8f42r4dv9BlLlChYfNPFOmB?=
 =?us-ascii?Q?JQaUjRKp0i3S7CaO9BCZW04oUYBzDPLnAFTSdQpvIYCnUsm1d0jThCTXfneR?=
 =?us-ascii?Q?I0uwfETpecucAanrBmyZSWm4mEaI5EAJnwLCiLJP05B6SNsV/f0LkCy+YPd/?=
 =?us-ascii?Q?X9I6qsI/c+7DS6PIDN4Mw9E8nTQPmbmVFl6Lq+0Fzpw4VfvrVQwTo1oaINr8?=
 =?us-ascii?Q?4Q2RBJXc8iKxMf2rlg0mqQDgrhWmklNn9GS/5LLpLoo+xl7eJsAmUhlqDpQk?=
 =?us-ascii?Q?Nfu31zRvqMloIwC2HVnT2va5GnutDDeRRIEEjYem7Gc494h1XSmmCj7SRgny?=
 =?us-ascii?Q?OLLYbGmkCaFMOGcY8/OIM+xXgixz3HjLVL5nBBfgCI95WTI42WxxUt4OTqJs?=
 =?us-ascii?Q?eh1+qjhph631yJTjR6M2nEcxFEQuHIunAEtYMfIi/5s4ED/HZHsys+qngm8C?=
 =?us-ascii?Q?6nrzuB8ADT54qM9KjkxCKwezOtTw+OOmFp9dIgYNkAfVXe6bqickkw0ne5tb?=
 =?us-ascii?Q?lRSK8YaGygttfYBeYLy3YT8kxp/5ujf9Pv8+roSRUy344ZF0zGj0oJ1jE1Kb?=
 =?us-ascii?Q?IdJEG0hBZhjuqzN2TTXZy5Q71QGmW7bDVYl3MMVvllZ0xlBeXgK0DUX9AZo/?=
 =?us-ascii?Q?W8e9aMVnxZIVQHi1grVIkoxrED6ztFFVAtGYx10Z0e826LUbtTJOP2SuxOu1?=
 =?us-ascii?Q?ZFtmrHLo4KQ6ErzDvS4glf6/gNkx5o8E53ycJ94UbleVKHqh0OyUOKKgb9Aa?=
 =?us-ascii?Q?owKSw6BZLWC2vHSDoFrti6/C9L8VHr1oRG7cWqUFWFMVurDcVSkZtfu0wfjH?=
 =?us-ascii?Q?JCEoxSX5bQPTsRKxVZSpaxLLgZFN/EzEcKDP5YtAATeFr2+vtHR9ogzVF58t?=
 =?us-ascii?Q?mscsMrSht5RyNY5A0rr11PzMKFr2Q2NEShTBjHFLv9j6sxVbzgkTeIkb5B5F?=
 =?us-ascii?Q?mUSHsPheKVLHr/tW4a5cQwWCJ8P1g13k/7I5GYDQPkkTbXZfDOecodn0JuJC?=
 =?us-ascii?Q?3vHm1/YFWUx/UgvBfbjTBEjYt+XKYMFtnDCQsT2tnPp5RWeKFE0uCnDkYe+9?=
 =?us-ascii?Q?SBBagIUKSa9edsTS8WqV536PKe/HTkqw9/ahiMOFBfU9j6F2UV4pqp/QN+Sq?=
 =?us-ascii?Q?rLmK/rO32V15qMbSq8b1bq5nWa6NUaj1j8TE6/R1puL3to/APGkzWLn3Qphb?=
 =?us-ascii?Q?8SR1Iqbf73MEz/JSn09qoqTx2jq7HysNJEAUVujNgdIvxRzB0ZXxWCyoGH6u?=
 =?us-ascii?Q?EI0Lrs9txhOtUNm31mOkN4qkrMnTN6HgTnQ8uJnVi10Hd3bBJtnSJ1VH+Soh?=
 =?us-ascii?Q?OCLOBPn/c8y4FvZ7n/A8lSztj77U5NHbF1WYHn37n8XzlC9T5qhYFKJw83oK?=
 =?us-ascii?Q?2k3ZtD8/XU8d8DZuLy4ZDN3PHxBJMpImoLp3iSgQ0gAaPW3AEu3aHKod4DIm?=
 =?us-ascii?Q?CTxhJepVTToban+1ibKSya4exHV1Yb7HgjhOA8Wz0uMPHfCArs0RcB/oI1YI?=
 =?us-ascii?Q?7sD0rNl0CGEGg5dHokL43RQF5oS1vz5Hc9QMArJZ1Ft11oNqOy4ud88FMQyS?=
 =?us-ascii?Q?pLm0+MHSFyaMm6SJDb1eMCLx1vNSG9qoAHiQleddrsMrYWYrj7lm68WfbYG/?=
 =?us-ascii?Q?jA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?9yLDU0P9wypc5NfhP583Whk+2nOfE1r04ErEcHREPaPyjhwWmUS+IZ75RC9L?=
 =?us-ascii?Q?tk9BNdkJBDBHeNz1VDIpTnUiuoYay31f0ZGthPXwj3u1AUvzJI41R3GLALlY?=
 =?us-ascii?Q?9Q6gdbQXiLZ+Q78DzhrTymuXjc6BUUlUryBZ9IUD7dMSSbz45NO9aYrsHzRy?=
 =?us-ascii?Q?A4V5q41iuxRGM6gTOzHETZhKCxdOSQh99RkC91XROgjI4lyOanyinqmjuDUM?=
 =?us-ascii?Q?VNh6FGB2084vQpiThWdo6eH2pNEUgqmr4hYAiUZz5kHJVHCxI9l01qOV651H?=
 =?us-ascii?Q?7m5lZeH2RkrgO1rvG2LSQoizK/AE5lmn91LUhDzTIaks0nwbrQzrTF0F/oaJ?=
 =?us-ascii?Q?kiteF/bhQrH5F3qGTiIfs3JL650tV/6XK+Fdoz/ep9qodIuiW5nQ+F7K0iQt?=
 =?us-ascii?Q?rpoc1zICwGuuVVMAprmjk3rmnek5Im98J7wMPIfbcPWDl8uVwsPhr8Bm/C0X?=
 =?us-ascii?Q?6cwzEqK/6nLyH2UvscmhcgU/3v7W5jRuolVTI87LtZxURx6jRKT52RHUsuSm?=
 =?us-ascii?Q?7qnepov2rkBL90QfTkkKA19M8Gum5b3/8TbIZDBay58wgFMbQU8ST5pwkIlK?=
 =?us-ascii?Q?QfaopBmbmLoj+wGW2LCf8EVP3j/OS4yetzcqbEDNfpr01QzKlOAcUvyTd3+F?=
 =?us-ascii?Q?Qddg22jJ7P01f/btHJv6ylFotdnZUDf/mOY4FbmchtZvA7x54c4+D0GuvbZu?=
 =?us-ascii?Q?KgINjzUdU7clz1UAHiEA7bAsHO9omSvTyrbB5UbVAnJZTJgZaB9ilBwRyPu2?=
 =?us-ascii?Q?VGbhwCfQ+pL1I88Pj+VjSR2RnX6kYZwWyOyF1qm8fwlwDvUyIgbm/GFlyEK+?=
 =?us-ascii?Q?xM+F4EUSTThSZYO3IJtiFHvbmBobcRnEmDua0S9yWsPrZTjXCqv7btc+8ZVE?=
 =?us-ascii?Q?Og/1caVUD5YqBeLPvKwWvgN3WQ5pESHlu42xdDD8h4vFNUW2kZRmMW5rcM18?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c5155c03-7035-4b71-9429-08db5566da82
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2023 17:07:24.5281
 (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: YLmjUn2vyci3yEDWqpERvgeuwAurEDssdl9yrlpuoY0Po21jFnkaXR4iTkIafwIUKfEC5Ic2OKaFrlo3X6oJAw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7838
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-15_15,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=980 adultscore=0
 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305150143
X-Proofpoint-ORIG-GUID: jsubA-mK-OhpzdsWDPwQ4Dc761-c9fvY
X-Proofpoint-GUID: jsubA-mK-OhpzdsWDPwQ4Dc761-c9fvY
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Peng Zhang <zhangpeng.00@bytedance.com> [230515 09:18]:
> To make mas_wr_modify() cleaner, wrap the replace operation with an
> inline function.

mas_wr_modify() is already pretty small.  Is there any reason you want
this in its own function besides it looking cleaner?

> 
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> ---
>  lib/maple_tree.c | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 4c649d75a4923..ce695adc670ec 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -4288,6 +4288,19 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas)
>  	}
>  }
>  
> +static inline bool mas_wr_replace(struct ma_wr_state *wr_mas)
> +{
> +	struct ma_state *mas = wr_mas->mas;
> +
> +	if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) {
> +		rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry);
> +		if (!!wr_mas->entry ^ !!wr_mas->content)
> +			mas_update_gap(mas);
> +		return true;
> +	}
> +	return false;
> +}
> +
>  static inline bool mas_wr_append(struct ma_wr_state *wr_mas)
>  {
>  	unsigned char end = wr_mas->node_end;
> @@ -4347,13 +4360,9 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas)
>  	unsigned char node_size;
>  	struct ma_state *mas = wr_mas->mas;
>  
> -	/* Direct replacement */
> -	if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) {
> -		rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry);
> -		if (!!wr_mas->entry ^ !!wr_mas->content)
> -			mas_update_gap(mas);
> +	/* Attempt to direct replace */
> +	if (mas_wr_replace(wr_mas))
>  		return;
> -	}
>  
>  	/* Attempt to append */
>  	node_slots = mt_slots[wr_mas->type];
> -- 
> 2.20.1
>