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;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        Suren Baghdasaryan <surenb@google.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v3 09/15] mm: Use vma_iter_clear_gfp() in nommu
Date:   Mon, 24 Jul 2023 14:31:51 -0400
Message-Id: <20230724183157.3939892-10-Liam.Howlett@oracle.com>
In-Reply-To: <20230724183157.3939892-1-Liam.Howlett@oracle.com>
References: <20230724183157.3939892-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3kiDznrgR1eArGIuoofkMZiVoiAXpGIBgsAPRP0U2DmUY+WRzepPQkjkqhhu?=
 =?us-ascii?Q?cAXo+Ho4fv3WYGTD63R+KOPSreLnE/CpUSK1v+88NMXo7rEfafpLfROw95wW?=
 =?us-ascii?Q?3RUduBTQvFRHyEh2nZM/VDw9qCOSWdOBFIBHTvjQ3XYMfnBHpJxOHFFwcked?=
 =?us-ascii?Q?KWULW4n4p4VyX42rXGQDWPs0C62YRZzfIzONXqGx2ZrQ502w6ju/1ifZTs1C?=
 =?us-ascii?Q?X5Crr9qDXMoK8a/lrfOLyIJ4xJU5l8LzEQIhypuUtlwhnAMoh2KoZPPXEP0w?=
 =?us-ascii?Q?QtqWxKOPcNZFZc6VDCftQ81iywuRS7rFQymhoyYwO4LCYXOY93J6ul/o/Kx4?=
 =?us-ascii?Q?+b99cgIeehx3Mgqh9xChn7FLWrQURZOb1tjN0CP9n8dC2+y8fJIkL2bzl/wZ?=
 =?us-ascii?Q?xU8tH1F1TtK8dzuhj3EFUk/IpBNjo/SqNuNdATB+VI9uYDexSc/pWnZCEnkH?=
 =?us-ascii?Q?0BIn0YMcex5QuDNDYaCgIsiO6gPCzW/WdKsZt5jnIYyslL2Zj+wAzjGnCuM6?=
 =?us-ascii?Q?z0bmsDH7ZiAE6UaSJhxD3yxkVRPvmJ76sr1vjY+bcMOZ5SByPzZd8atDAQDQ?=
 =?us-ascii?Q?l0uMO9mt1ocZgy+CIFuzz+loR7PDImPd9jX/clQ2sBvzWb7LrHy8eC+7R3Mt?=
 =?us-ascii?Q?f+K47xlqQp0LY2oz500Z3mQCy+H4M1Wfsn6UPg456RfmpTIZMC8keie2+U98?=
 =?us-ascii?Q?r8ImRZpVGGJJeL3FJ/d9J8/x1TL+DhtN4jK3+JpJnyZv6oDYVKUP/IESZlfa?=
 =?us-ascii?Q?J2BRQ4xr5YDTcomT10DszvGNXhs4pLB/56UhJc7xDV0abn7C7MzNEsiZDPQ6?=
 =?us-ascii?Q?P+PhKgGrbN89JP1Lj7xo0yoe9aFYDOhYn+3kfYw1vN+5uZ7MAhCoseKSJjIQ?=
 =?us-ascii?Q?zqELP4A31jlqZzQ/NOnQb5qKFjkD9FeZPNzOiwT6ltccxILFykwkQjrlTgoG?=
 =?us-ascii?Q?NyCyasRqySaKZUrTEFV1DPLS5rwx9O5awhI64WhCAgKFOj9DuIG6notltws3?=
 =?us-ascii?Q?TUkvWp+wEni+BZ4ffUnR4HOeccwXxsy3B7DP3kWpQRf5ZGtY2KY5CFKJ9W6C?=
 =?us-ascii?Q?xsiMe8/113w3Sic2kRtpspqc19CVuB+csAmdJOx/RDRMbd+bfGTegbFGjhvK?=
 =?us-ascii?Q?rQzgBQbPDEn40XuiJS5woQMH3o0PTkkzx/gSbtsUhxFLQHlTmlrhKtbUmXp7?=
 =?us-ascii?Q?VqpbQpWGVoq2B/By4e9zwOrNX1fT+k2sNbvN53286LJfZL+W5lp1iNGxtG6M?=
 =?us-ascii?Q?WSwwAKdgXMoEpox8Q9REbTPmUc7IuECwKZb+Yfld5Ah4IeiS1FlLevyAmeo/?=
 =?us-ascii?Q?fIbrchxT3mernaxFAPORvUx02KWVxpO7gWlpDK6VyeL6EHUkRtoDWlIcdMk8?=
 =?us-ascii?Q?LUZaNR7eitqnJT4hYeb8KupCsYJfgA+BSeuWiULv5xxyfTpXQanW/qqF65iU?=
 =?us-ascii?Q?bw5BChfYCHcBjrJ3mbUDdKud8yengdwe6iWOBOTHhLiEKVd1d/duuVXTkHxN?=
 =?us-ascii?Q?/IHACuioqTdCkaPDTkZ1Uzhu6ns05YE9it5jmMJFJzPjIXQN/g4OTEUwlIx7?=
 =?us-ascii?Q?cZovQY3d2sm/W3jF21uox4drJ/XAoif5fDjRkipbRzcJHCVNdRqURMGeWUVA?=
 =?us-ascii?Q?yQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: bbZhfsaReDBh5YZgmeZ9vNA+IUbetRoxXJsyTd26GImrL4VKtGloXQh9H7iV38blq0xOaWKBfk3X+q9OhnKVy4Vfp7R8SmRhjyCSSXqkr9z1hxj4pXy8rgD5wjZ/Eo1ibnoa6vjp/Dd19ZrBrCgQjiY1PkyTHnyhXQQVojw44ExB5fr9SD1xAIlyMnQNuDRBMG/5RAelAgDp592NjfmdVOmiNRhuyEjinZXEyeUyLM2lukt/dhEhidAAw12S3IXBHxzi1Ke2A9ZYdUIp+Yhd/MqPjqjvQoC3vc5mLG73PvAGihNeC+sDiLbXowcK2zPs1SNXRq7Gh0rRogxBv0Owae3+VKkXldiTX3yCosISO/e4WW7BdYK5QYjzXxVF9ZZ5NudKKUjNOSckY4ZvBtt+p0cO5iN5zldaSjVvFK3t+tkesl7NBB/3bl25/4gDWHLxF8snOzcgjhO3qOad5CfW2rCU8rd5bCjnlnWD/mvGNPcnRj56YuXRa26qDVw1ZI/aBPjCcjgV/95Shfx2kuFrCjzSJYVPtSWFWNShoe5iXHlCdov0k+FJdBPT67VDvk7MYacdt72idtFE0O7dXnTOFxTECFgNDnndftfhY5+3OsnEFa1miduQ7mmt5JBQIEGwrlg9KODjC7ZO5TamT9D3PBJoWn/dNFTRSP1F5eLFd0VQR+TEJ6t0IkEZMa7fzouAx8hYd8TUJ0JZriuD9eAFKrtLlagXx+Xczz4Zr2HyOJZYsdqlOyyXWFy9WbvnMbyFtXPht1pHdCk806vGMFem7BUgIdOd8oP77D96H6/KmJzRROy3K8I8BxSBhC2YP3H0bMbOWxQtlmeDTF5YBBPKlU9ukSWX+6AprvxygO3wBBinjQLGa/rfHUpRpt7n3Sn9Rl9f+Jk+AKZS2G2q7tgrCQPKHUcnRC8iTPzu5j6FDfk=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0af05131-b7c4-4b32-b1eb-08db8c745c56
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 18:32:39.7325
 (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: eqCptlumz+RJv+loFufi+zHcMSPRLGZ/3Ww59q79Wk3MUgL3WEG13DYarhmXqVAanjYHZm3lZ30CwLcHXNvy+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6609
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-07-24_14,2023-07-24_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 bulkscore=0
 mlxlogscore=977 suspectscore=0 phishscore=0 malwarescore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000
 definitions=main-2307240164
X-Proofpoint-ORIG-GUID: IgcTSrN3O8tnsnrEJ47nfyIqF40EnByr
X-Proofpoint-GUID: IgcTSrN3O8tnsnrEJ47nfyIqF40EnByr
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_H5,RCVD_IN_MSPIKE_WL,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

Move the definition of vma_iter_clear_gfp() from mmap.c to internal.h so
it can be used in the nommu code.  This will reduce node preallocations
in nommu.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/internal.h | 12 ++++++++++++
 mm/mmap.c     | 12 ------------
 mm/nommu.c    | 12 ++++--------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/mm/internal.h b/mm/internal.h
index 65f646c2ccf3..2f35c0ef7b7f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1064,6 +1064,18 @@ static inline void vma_iter_clear(struct vma_iterator *vmi,
 	mas_store_prealloc(&vmi->mas, NULL);
 }
 
+static inline int vma_iter_clear_gfp(struct vma_iterator *vmi,
+			unsigned long start, unsigned long end, gfp_t gfp)
+{
+	vmi->mas.index = start;
+	vmi->mas.last = end - 1;
+	mas_store_gfp(&vmi->mas, NULL, gfp);
+	if (unlikely(mas_is_err(&vmi->mas)))
+		return -ENOMEM;
+
+	return 0;
+}
+
 static inline struct vm_area_struct *vma_iter_load(struct vma_iterator *vmi)
 {
 	return mas_walk(&vmi->mas);
diff --git a/mm/mmap.c b/mm/mmap.c
index 625d7411d5a0..d09f11a9ad85 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -154,18 +154,6 @@ static inline struct vm_area_struct *vma_prev_limit(struct vma_iterator *vmi,
 	return mas_prev(&vmi->mas, min);
 }
 
-static inline int vma_iter_clear_gfp(struct vma_iterator *vmi,
-			unsigned long start, unsigned long end, gfp_t gfp)
-{
-	vmi->mas.index = start;
-	vmi->mas.last = end - 1;
-	mas_store_gfp(&vmi->mas, NULL, gfp);
-	if (unlikely(mas_is_err(&vmi->mas)))
-		return -ENOMEM;
-
-	return 0;
-}
-
 /*
  * check_brk_limits() - Use platform specific check of range & verify mlock
  * limits.
diff --git a/mm/nommu.c b/mm/nommu.c
index 9826f6101a05..418cc0669c1f 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1396,17 +1396,13 @@ static int vmi_shrink_vma(struct vma_iterator *vmi,
 
 	/* adjust the VMA's pointers, which may reposition it in the MM's tree
 	 * and list */
-	if (vma_iter_prealloc(vmi)) {
-		pr_warn("Allocation of vma tree for process %d failed\n",
-		       current->pid);
-		return -ENOMEM;
-	}
-
 	if (from > vma->vm_start) {
-		vma_iter_clear(vmi, from, vma->vm_end);
+		if (vma_iter_clear_gfp(vmi, from, vma->vm_end, GFP_KERNEL))
+			return -ENOMEM;
 		vma->vm_end = from;
 	} else {
-		vma_iter_clear(vmi, vma->vm_start, to);
+		if (vma_iter_clear_gfp(vmi, vma->vm_start, to, GFP_KERNEL))
+			return -ENOMEM;
 		vma->vm_start = to;
 	}
 
-- 
2.39.2