Received-SPF: pass (google.com: domain of linux-kernel+bounces-206629-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 15/16] maple_tree: remove repeated sanity checks from mas_wr_append()
Date: Fri,  7 Jun 2024 11:52:56 -0700
Message-ID: <20240607185257.963768-16-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?nsB2iuhWAqqTPKpKAbHU7OtSE6dDDv8aow8MXzJ5HIRVp3IcjtaIME/qyZ0o?=
 =?us-ascii?Q?PU6IIRnnwGwB3DSKWROiU4hBw4ZY38IRtp/itX//ybybIaR+Q2IDeJDRnE2+?=
 =?us-ascii?Q?NJkkoId2dmjwMAumvRi1guQeN2sRal8FlRDalY62LOnwkRSMfM8LEyZVGYoH?=
 =?us-ascii?Q?Hn28Aue5rDbr81oecU9JBBcMmup3dktTmmO2JhcAOu1qBqvaryMRz6wQeaD5?=
 =?us-ascii?Q?5Ba91cm+ZSGltTkzfKScxlEVigkZp3/3OMZXj4pAbBykW4nBgHEoSxzTs5UN?=
 =?us-ascii?Q?DKBezXLNSGqIUFlwfSShHdCDiJNURMMslRieIc/Y5bj5FgyGMiO2G22Ijggs?=
 =?us-ascii?Q?G9UAQ4zo7OcfDM//uGadtg8JTf35clDllRIm4mjNDTkP2/p7yXbCwUZQLx2r?=
 =?us-ascii?Q?lPZ7baupm2h90lrcKfpFl+hcpxCdE4bENf819zwYQD7t8e82MiOl1E2KKxKH?=
 =?us-ascii?Q?3f4VCbvu95+sHQaKKrMBDB3Snz7TAFoZFjJJDsrABr/J4OIPeazMFbw2E/Pz?=
 =?us-ascii?Q?TqOjfTd9gmr+5Om5WtpwC0rTT508SDiPNmnSyZDYhzNfrA+pUogAqUvgV/7Q?=
 =?us-ascii?Q?WnnkuV/SHM55D+nacl2y5cjrn3U4Kk5LcBLmqWndNWhfFUXAtCwTMsZ5F527?=
 =?us-ascii?Q?Ws1D1gJw7GNxUiCNAVruOa2TTVJq1cZQvzEv35a/55QzrYgey50eY7znI/Sx?=
 =?us-ascii?Q?jgq8aNGLVq2keIRSuvCA3eo5Wfa7X8Jf/WxxE54klIHd6Pi11p5OAWKbLJRN?=
 =?us-ascii?Q?eX7YSthSvdTYHhKn5M5IM7oV0hQIuP0h8YXFwwrATJjJEmf5okcljuJMQp5V?=
 =?us-ascii?Q?44u42+XsKYfEAKOfydAgD+aGNkf/RZzMThozZKq04M41KWIGdwn3PuYsFDgY?=
 =?us-ascii?Q?6xLu9uZxviFByhDfEKYIzzB8P+m2h+eS0yujYYzWVZXOQIBdgy6lxo7d59Ym?=
 =?us-ascii?Q?xranvHgbhEHLRVDYcRauqKktlwQVb0qs2AOclfGz2NhXsQkRZlYsEMVo2eKj?=
 =?us-ascii?Q?0nDa77eKM95u+omEjHvYbLDiEJXTpZ75LMGikdisrbRPKa7o1AzHUqLGbn/0?=
 =?us-ascii?Q?ixmTZUjdYzj71GOe8xdmK4gNJI4IB0zcaC3QMj5DtP68aiV9dypHcur/CoCF?=
 =?us-ascii?Q?wtlZVrrL34SbofA6t85xS1L32qn5Iu7XEUR/cQL6xmFSA7sOGEKAYLdNtQTp?=
 =?us-ascii?Q?N27WElhNMPd+xz0vszwCoxUJPskq3aSP/ijv9OidoTxGQVT7REUfV9S2UcAw?=
 =?us-ascii?Q?O8HKsQAowY93G/zGj8ZmBUUXZjcQgaSr/mb3sC8fZbfs/LQspyuemmJt86eY?=
 =?us-ascii?Q?l2cQoCANqqJsj67GLz+yLnvjUbMBhBUoYJ2jWw3vbOiP0mgF7RcHdfX0tT9o?=
 =?us-ascii?Q?4C8JtkfCc9Uz3P5NC79kdOUfLp8NgBzeWlPzGgMlG8uaWWirzqOWK2ye+32p?=
 =?us-ascii?Q?o7Gmb5ibU3PPr3VpC7I+Dv88v31ey2AzbpN66oO+PNZpu2EOCxRac6jNLIN6?=
 =?us-ascii?Q?6C7hspyxb+1YSylI4RQvJOjIBi6KkjnfaRAY6G1Z5E5gh79leeQjRJr7D1bd?=
 =?us-ascii?Q?9Ke1B56Oph0ACIvi9bAnMrmWdKkuhTPIOAVDESij7BJu5ORQUTesw5io5qEG?=
 =?us-ascii?Q?Kt+9Z2LJXA0EyjEmV+6d88U=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	9j24szKgbDMOtp25WrY+dQjj6Z9f+ZUaqYGPOTvfjngl3c0CwVsimUIb6P1YxzGDuladSwTOg/LZCcZgF7EoCzgYJnNim7T37H01KrotL2DZ3oQjKxaa7pqFG/1ziw/zCyMdNhCA6hqoytSDnZ7CZPExqk50etgQDy8NBqgbsxs+0lJs4u/VK3HKLIlaG3bygDF/t8xsSnGii7xu6ffy0hpQhDbRoTJ5GDRMS0KU2Kkd2A6Wg4BhnkxXbgtuNfiTrgv4A3+Mm9GyczLMOGEVGZHfm9O/XPb/YCGv3TzzBhF41wHozXK/sK6At46YXuggROoFuDjB6Ew1XKhfY3r9zFLpwst/NgzEXn0qMTDLSIOuBiFj6YsDYJVbJERTW9R5bCNz7sZy1eIo6sqVUrqoMVfeimGdjkDjcy66mgpw/EzSa9LmihgpG2GlNhxP3fWelC9j9EbgeNlFBHAwft0EEGhvl7AiOlwRSdAN/wudRKdXR1k9vCSETD93rGCnXhA2JngjkJUdlQvfkplfxmjMOTsdTRtzt0UVWOQNJfx6XXGiG7AQuAmNMxChx/+TiABjzG2cs29WjvtyrWY4zjk+MMccFI2Vtw356pwMEFkiZVc=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ad19298e-5ab0-4cfd-80d1-08dc87232b4b
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:50.1525
 (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: qx7uA8Gmg3RhZFMoZNnlLZ0f5YrfKoNgl/TuCsc8ijSkpikDO3qWIgGIr0fBu54uZ3OBN7rBT2Vy09c7UVEY624kHKQLvhOYmrVwxV1rRf8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6640
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 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-2406070138
X-Proofpoint-GUID: fmwPz5ngUnBY-ED8L7xBSPWBZw_do3pF
X-Proofpoint-ORIG-GUID: fmwPz5ngUnBY-ED8L7xBSPWBZw_do3pF

These sanity checks are now redundant as they are already checked in
mas_wr_store_type(). We can remove them from mas_wr_append().

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 7e1f64490662..3d334e7c19a5 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4061,17 +4061,9 @@ static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas)
 static inline bool mas_wr_append(struct ma_wr_state *wr_mas,
 		unsigned char new_end)
 {
-	struct ma_state *mas;
+	struct ma_state *mas = wr_mas->mas;
 	void __rcu **slots;
-	unsigned char end;
-
-	mas = wr_mas->mas;
-	if (mt_in_rcu(mas->tree))
-		return false;
-
-	end = mas->end;
-	if (mas->offset != end)
-		return false;
+	unsigned char end = mas->end;
 
 	if (new_end < mt_pivots[wr_mas->type]) {
 		wr_mas->pivots[new_end] = wr_mas->pivots[end];
-- 
2.45.2