Received-SPF: pass (google.com: domain of linux-kernel+bounces-206627-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 03/16] maple_tree: move up mas_wr_store_setup() and mas_wr_prealloc_setup()
Date: Fri,  7 Jun 2024 11:52:44 -0700
Message-ID: <20240607185257.963768-4-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?h2VlLFcwolEUvlxi3fFsXZToyLt4ytwY+tI53Xc7Ehq7tOu6DJf8PQJQa4/+?=
 =?us-ascii?Q?3TqCUBIyTXrZ0okEIGuxe7fgr35I4bPOAIaC255gmvTeGFwFZUIEn5/Rk0zq?=
 =?us-ascii?Q?Q6y+KCU1UIaI2nRB6PEVS0AqLjQMhdm7jRU9mF+QKI61uqkDUrxoSdc6K/Vm?=
 =?us-ascii?Q?UshIOiMlXYcL//hcdx3qF8BFFv6CN1DkXcUAMnvQqZOkaBVWwdhuamu87BBx?=
 =?us-ascii?Q?BA6din8BLVfBIoOUOJNoqso87yyDXS+LY/yjXN4YaFSy4REgDeL+fZO1yON1?=
 =?us-ascii?Q?1hmKU3vF9o7qA3lsTKBuCGq1eTBMqPlYwPch2H/W9Hkix8KsAif5xQONnKXf?=
 =?us-ascii?Q?ubMFDDiQoZ+aBn+81tnMz+4+CFZppMoeT4ZUjcXGbECJxKghC6S1Lc9zzM/2?=
 =?us-ascii?Q?NvOBJHVXsoRGfN0Uy96qAMUE24m3mSo33c2e2mgrno9F8ti+TY1057cf9gbo?=
 =?us-ascii?Q?YOj2/RzSv03YpVntCQHEIql9w+/H7PoETLzoDhe4YiqMdUWRLDoVg8sKETIV?=
 =?us-ascii?Q?KZ2JXnFRj6kp/OOd0wpL6CfQBrl8/704qr7FC4DpqVm5oqeA6bHo5MGIFPwv?=
 =?us-ascii?Q?K6/Px22M8J3Qdb9ABMIqs0zXVulYkysX2TARQtnsHzMZ5WIv1fZ8NILCXMYU?=
 =?us-ascii?Q?9UxXld4HUKlVMqfysFjseT8ruyujqcOBsFrh30sWNyKeg8HTg1Ppk+3W1DUE?=
 =?us-ascii?Q?KtUTyKq49iGZL6iM5DKpb8rLLEG1Dg85JyGjLmaT2tkS9br5tcwvD8kuYEWE?=
 =?us-ascii?Q?t9dQ3vPX/TAful1mhU3Myhll29YA+qUrbCDKuaX1EmLLvq/EJsYjURmK9YsL?=
 =?us-ascii?Q?q8Z83O4H8zedkGrdRVYwWhCXb5ifd0lgZHxWcNsKSkuRw1HaNJu+xyJxRWer?=
 =?us-ascii?Q?smMluswbOIMLmWfQKWIZH4c/mizd6LajLNk0iK6kd4lgZ6WDZTWs8Dj75NcP?=
 =?us-ascii?Q?0E4xTJ+i6Sz69Cm9ijgZrSk4F4GKHRJP0cY9ol3JnsuLxYR+CeU2snbrvpjW?=
 =?us-ascii?Q?P8efr+FL8gmnRPv1BRhRdHo4Bbf+dzPXRIfdMeiKqVMS/Qn4WNAc61CcYgM4?=
 =?us-ascii?Q?Vf2fVryq9zWrFeYtFRFLPM2X3eI7G4JHf07BOJjDUSrEpWwUvM2498nWn+PI?=
 =?us-ascii?Q?XM99M6KTAfYr3dwqinoD8N7RbL8z6qdfdGB1c9kbDiF+8d0L3P1XLRUgqz4s?=
 =?us-ascii?Q?4VM7VeKPJeZZfVO2uazhO9MfurdQhrKigfs5AYlgMFF6wt+M0yCYwT4eUnn7?=
 =?us-ascii?Q?k55v57opYDgnXvNfjdPNznjja0ufzcCpz0EeiaHtfXsBC8vTSs23GDRUS6Gw?=
 =?us-ascii?Q?FCgrM1JTYptVEI3fs1am3cMhm2GtjP+Jfm58Jh8FADMrUdhvVqBZl+HIv9VR?=
 =?us-ascii?Q?GH+A3Pt32/rAO7HxAbvghnsRQXvQ8pFuyxY/uNfUbsVQDTuxQazMWUohYx9Z?=
 =?us-ascii?Q?WyMXIlaEZka7yeUA9WeohXQUaS0VM6htsyvC6OzV3raE5uvMdWcS/RZbQLGS?=
 =?us-ascii?Q?ppj0NnwZDoaBWbrNJA/w9gHULiNQcHDqKiloLSNXrr2VEUJpFJJpeq0yXDwb?=
 =?us-ascii?Q?cXyDzzhjaoTPMukFpN/QFv2JU8bqjWy7YOY81PHjxgRrL+1MGHMxDeae97RM?=
 =?us-ascii?Q?+QK24FeDabrn8ofTXplXXHU=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	Z0xu6/b4/otVCuodc4D8DiZtksPlckk+ddd2Cl5i3M/VeCAOIOKI0xF1S57tXtPoW8bSn67rsMQFg+L1/+vLbg/wSipSDs4vl8Cnh+xb2WuLE+pvNrZgigUkuihLLu2nrncfUyMyaOfvg+yE13VLubegWdp7uXLoysofW9DwxjwPjwExDV7hitjYDX3h0KfV+25w4JokjBdm2mbICTDLtKbGIlUn5GbJpa7TovmLH836qZcgUWMsAcjOwUHqCuPx4UEmhYZXLZ/+QryswB9vcEWJQoyseUHGfUYRvO7UWkPjrwXqWukOlYx0Is/z0b1Tvf+qfzNeL8K8R0jX9QY+PtvYlQc0mHdlApmpLGFJZHP3YyneNGKMFzHv3iS7Hsk2A7r431HzAfA7bP/f/Ez9FOGe0rJUHf5luIvSu+tpSCRM+tMecktSaz9M964YQdo8/9f2KdcB/TrfIG3vUoWt6xWoHDXym09eGeV0+Lul/XhlpStqh4TuIQT+SDzFQXNT/dnUmIOjDZ6OQQEheYMrWQc6kvuNPUBTNnbA3Ph6hfD6ZmB+WDj5AqsQHQ1AB6cqChVE5PWWCRQhOy6msDc+yNGrcqMKmUvHHmXAFikRtY8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 92f28d1f-1c8f-4264-ea6b-08dc87231374
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:10.0903
 (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: raBcw4kWm4WZ7gDXxBrOK1qp7FuIQgUZHIZBvu6DgMCeFKTM2yEX4vr0WxW/eJScgI6SYjMlhmpIWhEDWeAjrns4x8JmmHmA0K3gp4i0wAo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629
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 bulkscore=0 spamscore=0
 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406070138
X-Proofpoint-ORIG-GUID: Vqs0oFtGowhjzcu6taGi3dfmscJ6TrZF
X-Proofpoint-GUID: Vqs0oFtGowhjzcu6taGi3dfmscJ6TrZF

Subsequent patches require these definitions to be higher, no functional
changes intended.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 lib/maple_tree.c | 96 ++++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index ccbec0f66562..2558d15bb748 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4230,6 +4230,54 @@ static inline void *mas_wr_store_entry(struct ma_wr_state *wr_mas)
 	return wr_mas->content;
 }
 
+static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
+{
+	if (!mas_is_active(wr_mas->mas)) {
+		if (mas_is_start(wr_mas->mas))
+			return;
+
+		if (unlikely(mas_is_paused(wr_mas->mas)))
+			goto reset;
+
+		if (unlikely(mas_is_none(wr_mas->mas)))
+			goto reset;
+
+		if (unlikely(mas_is_overflow(wr_mas->mas)))
+			goto reset;
+
+		if (unlikely(mas_is_underflow(wr_mas->mas)))
+			goto reset;
+	}
+
+	/*
+	 * A less strict version of mas_is_span_wr() where we allow spanning
+	 * writes within this node.  This is to stop partial walks in
+	 * mas_prealloc() from being reset.
+	 */
+	if (wr_mas->mas->last > wr_mas->mas->max)
+		goto reset;
+
+	if (wr_mas->entry)
+		return;
+
+	if (mte_is_leaf(wr_mas->mas->node) &&
+	    wr_mas->mas->last == wr_mas->mas->max)
+		goto reset;
+
+	return;
+
+reset:
+	mas_reset(wr_mas->mas);
+}
+
+static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas)
+{
+	struct ma_state *mas = wr_mas->mas;
+
+	mas_wr_store_setup(wr_mas);
+	wr_mas->content = mas_start(mas);
+}
+
 /**
  * mas_insert() - Internal call to insert a value
  * @mas: The maple state
@@ -5361,54 +5409,6 @@ static inline void mte_destroy_walk(struct maple_enode *enode,
 		mt_destroy_walk(enode, mt, true);
 	}
 }
-
-static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
-{
-	if (!mas_is_active(wr_mas->mas)) {
-		if (mas_is_start(wr_mas->mas))
-			return;
-
-		if (unlikely(mas_is_paused(wr_mas->mas)))
-			goto reset;
-
-		if (unlikely(mas_is_none(wr_mas->mas)))
-			goto reset;
-
-		if (unlikely(mas_is_overflow(wr_mas->mas)))
-			goto reset;
-
-		if (unlikely(mas_is_underflow(wr_mas->mas)))
-			goto reset;
-	}
-
-	/*
-	 * A less strict version of mas_is_span_wr() where we allow spanning
-	 * writes within this node.  This is to stop partial walks in
-	 * mas_prealloc() from being reset.
-	 */
-	if (wr_mas->mas->last > wr_mas->mas->max)
-		goto reset;
-
-	if (wr_mas->entry)
-		return;
-
-	if (mte_is_leaf(wr_mas->mas->node) &&
-	    wr_mas->mas->last == wr_mas->mas->max)
-		goto reset;
-
-	return;
-
-reset:
-	mas_reset(wr_mas->mas);
-}
-
-static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas)
-{
-	struct ma_state *mas = wr_mas->mas;
-
-	mas_wr_store_setup(wr_mas);
-	wr_mas->content = mas_start(mas);
-}
 /* Interface */
 
 /**
-- 
2.45.2