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:   Tue, 23 May 2023 13:54:15 -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 v3 03/10] maple_tree: Fix the arguments to __must_hold()
Message-ID: <20230523175415.626iud4x7wpg2cu6@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: <20230522050656.96215-1-zhangpeng.00@bytedance.com>
 <20230522050656.96215-4-zhangpeng.00@bytedance.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230522050656.96215-4-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?eeId1GX/0lujyQUyDyWBY0Xxmr/X3UVnay45CK3Z3HDHDzkzG0Vdz7XHc40W?=
 =?us-ascii?Q?yzuEu2AKYb5hPxANJ8NGIABV4qgjTTI6+tq6rVFD3Db2x+AQ9qpcBJftSYEx?=
 =?us-ascii?Q?mhT+0o0rwHFrqOva/NirDFID9LwHuSQzvTfigtKfGh47s7KsrJEUYTB50R67?=
 =?us-ascii?Q?LwDp4gCLhlEqbnfnkkpdnlRhfUQDG0ffqDMlBfvc0AIVHe2SztTwD08AeDeG?=
 =?us-ascii?Q?mS9b8l5D6dnkdffXnHRcYA+NsZfItsK83jqnDabp2XZ2jVggHTxiHADrZocI?=
 =?us-ascii?Q?NiEwbkktzD5NcyPu79P3A7kShnS0kgij41WNvDozqEGtS6uxt3XisNjRyvpx?=
 =?us-ascii?Q?UXgu79q0iUchDJJ5vy59FQlCWfLr4QVW9Ebm9lxUnh9NKVqHryOY6HV123+O?=
 =?us-ascii?Q?9gUbf28i7lMN+62UDXm6pU0p1vMzsypK/3o5lU0NZw4B+Ta9RcAocgaNTbYM?=
 =?us-ascii?Q?RnpmgcIm1LT2+An4SLVESpG7TkXB8cjrmAJQg7IREZ2UxjT9fIpZOBa5Cz5y?=
 =?us-ascii?Q?ETaA2OTm8pMYBVpLzqXORTc/KAaPzztGWtTvYmwEwS/yDYlB0RSrjvJCDqIW?=
 =?us-ascii?Q?XR+fNGQPwaY5Bi90c/9hw9xuDFVOv0YLCh4DCGl/QpMXxsXjJ3EsmgWPXCIB?=
 =?us-ascii?Q?7ZvvVZq6a6gYLqeEMZZ8rsYkl8UYoBgAHd2N2J/8VAG625PVnAlt7o+X6O6S?=
 =?us-ascii?Q?ML5hK+okpqG5LsgOhw3c1QdNe1UgMCDz32O5YBUg0mlpvoChJac1ZMBzhoJ6?=
 =?us-ascii?Q?aXXPglZxFTdpI4tjxELJ+KiccXV5jjQDz7mNIcOC/MR8m6P9vuQ+gthvf5m/?=
 =?us-ascii?Q?khd9TJ3jKj+VKaJ037tnq4rO6XyInEN9Fm/3TvEJxlQNYblf4dNIx1UR11r/?=
 =?us-ascii?Q?WTAz5Yy/O4BBSCJEd0XIu6wO+4HtveWSqrBhDlBeCH6HYGvnsRSyBr2di0cf?=
 =?us-ascii?Q?rN8flk5t1/iAhmnZHgNVatXD4+7KP8JReogwN0PAS+z08M8wulTfRqz79kfz?=
 =?us-ascii?Q?J4tjqfiwH8ezn751qb4vFYqwN0BhF/uoJqM4DJABBYEpZ1CIedJCN8ELfQI7?=
 =?us-ascii?Q?n4g0zQMF3/MmFojCSEiaau55nJWDxzYaF11kJm2SUhVaDaNXBXbFQNE0vVGG?=
 =?us-ascii?Q?WhrHi9vdBK2PeqwSptCBA8Ag0zXop1wt5UWF8BoekUkU7Nvzbvb9SMCHTnyY?=
 =?us-ascii?Q?s5HdgScH/DhYBWIbo7OeMycnOZjyj/mv1z4AjlGDPJg67hUlgkaSgtaal/1b?=
 =?us-ascii?Q?YLaLaD4WWaX3uHVcndeVMf6evkIJ4xQh6Iac/71jO4KlAMME2MjEQw+6Rt/t?=
 =?us-ascii?Q?NVC/EJ5mTNahUsjBlRI75DlenieO3OwOARxBJM02r1Mssl3+Dday4d/CWNsD?=
 =?us-ascii?Q?TXBGYHO+rvyDmlae52tz9+kbsmTwBlBWKoT3CCvSQ7glFP/wQF+7YzZ17fPj?=
 =?us-ascii?Q?adofhgdl7Q5zfkSZYshBkQnTbLG7/HHlJlPd7kbIGSWrDRWzUEVUwbqyETHz?=
 =?us-ascii?Q?IEo7UVHXeQCbR0LnL9S6WGuLkssmNb/2OegbhV9+0gA0yeiP1Di/C91NS10U?=
 =?us-ascii?Q?v0DDzX38eu89QGQxUCRyMXe/NPF5XOR0AVnBzFYv3mXnFi9b8PS0LmgGCnrT?=
 =?us-ascii?Q?cw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?N4lcLmdiKAO5Fhpo2DWgMOi3GjGFtPNVMhMIt2pSGU0Bogq0HcDOay8vhvbS?=
 =?us-ascii?Q?r4bosL/W/KurNbtNUnpuqYAiwBF3FPMjpQiM/Ueb6Q6eRVJt+OjcrOScdnHp?=
 =?us-ascii?Q?1KQNLKh4hLSS5YVlGYOjB9JDxtj/CLR1OYMgw0nU9wViDeH2ERl/dy6/yzEN?=
 =?us-ascii?Q?ljqG+9LDYIHwFT8O17Ic9X9D5hrLOYaN5URtZT6JZiswC/nu9K0ITTviwA5w?=
 =?us-ascii?Q?7sJ6eSOhUBIE5u05XAOcR8L52cunaVhVJZBL1BLS363A4kDu9/UGhXD5hZQb?=
 =?us-ascii?Q?H6mDbXMTCLc9DI997TsQtYEN/TdPfw5FsBi0Oh8DajGPugtw6BXivC7IixA1?=
 =?us-ascii?Q?WeA0NvX4kMLYTyl2VTTMWLqVceHvoUQmqJJt6dddR9ne/fRPTf0JT4tCdYJn?=
 =?us-ascii?Q?H+pJcxK37TvNUZf36fpKLFKQ5u8JHzAww9Z8Icmfeg/wXmaezGy4GBFzJTuJ?=
 =?us-ascii?Q?w6oBuyKAkxZn7fqbEZNpxmE2Zm36obKIUwV3vLqvTWE9mqUTgDQxzJJbHte9?=
 =?us-ascii?Q?Nov35+nqY24QrWb1vamd1GD8WxgQy2FuJLIfRanlmbbb+zZRiKnM5d87c0zc?=
 =?us-ascii?Q?GLPIR+OvrEHLmRdL9Ds8mDLvngXOrwrqUxFCQkOYhzKGsdkYW0OacPKoDkXL?=
 =?us-ascii?Q?Cif8P1fJBvecgn/7G09+SuYy0qzBFhh1AHW+bhe8MUsVfKBhAqOOBIGn8vvb?=
 =?us-ascii?Q?3YyvuXUlxfdgrBRHvOAmTYSQ321tgL3uQO/YTVn4BZRjvKe3cqqPnQNteeha?=
 =?us-ascii?Q?rJVZcQZqw15U99ZpBj8NPCJ7E+ngE23KgoAo4aWGd6JZyPuzwlaZ1KWgaTg+?=
 =?us-ascii?Q?ilp2kxnoKGLbxjFB9rAaEdFsmiIugErVSPmzuaSwjchp58WwOETypkyWuUgg?=
 =?us-ascii?Q?Y9J2LeeYpeizyrnmT/YtDL/hJhtJRfMA6wfktV10+oe5OWPu/ulStyp4yt5M?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6714374-7b7f-4a9c-4c34-08db5bb6ba8b
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2023 17:54:17.9755
 (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: +csRmfAssVGII8nfJSchSOWRxx+QI0wO1ohNNhN1yLnUxBVDzRS4J6xoe4wulMRdaIM4Lg4VgWtpCvsQ18s4Qg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB5990
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-23_11,2023-05-23_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 bulkscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 spamscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2305230144
X-Proofpoint-ORIG-GUID: tYJnLUN7Mea0j3j07echmnsbVAGwE-Ne
X-Proofpoint-GUID: tYJnLUN7Mea0j3j07echmnsbVAGwE-Ne
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> [230522 01:07]:
> Fix the arguments to __must_hold() to make sparse work.
> 
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>

Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>

> ---
>  lib/maple_tree.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 263bd0ccc31b..3fe6a6685384 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -1752,7 +1752,7 @@ static inline void mas_adopt_children(struct ma_state *mas,
>   * leave the node (true) and handle the adoption and free elsewhere.
>   */
>  static inline void mas_replace(struct ma_state *mas, bool advanced)
> -	__must_hold(mas->tree->lock)
> +	__must_hold(mas->tree->ma_lock)
>  {
>  	struct maple_node *mn = mas_mn(mas);
>  	struct maple_enode *old_enode;
> @@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced)
>   * @child: the maple state to store the child.
>   */
>  static inline bool mas_new_child(struct ma_state *mas, struct ma_state *child)
> -	__must_hold(mas->tree->lock)
> +	__must_hold(mas->tree->ma_lock)
>  {
>  	enum maple_type mt;
>  	unsigned char offset;
> @@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase);
>   * Return: true on allocation, false otherwise.
>   */
>  bool mas_nomem(struct ma_state *mas, gfp_t gfp)
> -	__must_hold(mas->tree->lock)
> +	__must_hold(mas->tree->ma_lock)
>  {
>  	if (likely(mas->node != MA_ERROR(-ENOMEM))) {
>  		mas_destroy(mas);
> -- 
> 2.20.1
>